Magic-Mirror/x64dbg
1
0
Fork 0
mirror of https://github.com/x64dbg/x64dbg.git synced 2024-11-23 04:50:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compile correctly regardless of the UNICODE macro

Browse Source
This commit is contained in:
Duncan Ogilvie 2024-08-05 15:53:35 +02:00
parent 633a864c9c
commit bd3c2a41ed
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/Src/Gui/HexEditDialog.cpp
View File

@ -758,7 +758,7 @@ void HexEditDialog::printData(DataType type)
{
INETNTOPW InetNtopW;
int numIPs = mData.size() / 16;
HMODULE hWinsock = LoadLibrary(L"ws2_32.dll");
HMODULE hWinsock = LoadLibraryW(L"ws2_32.dll");
InetNtopW = INETNTOPW(GetProcAddress(hWinsock, "InetNtopW"));
if(InetNtopW)
{

2
src/gui/Src/Gui/MainWindow.cpp
View File

@ -2450,7 +2450,7 @@ void MainWindow::clickFavouriteTool()
}
GuiAddLogMessage(tr("Starting tool %1\n").arg(toolPath).toUtf8().constData());
PROCESS_INFORMATION procinfo;
STARTUPINFO startupinfo;
STARTUPINFOW startupinfo;
memset(&procinfo, 0, sizeof(PROCESS_INFORMATION));
memset(&startupinfo, 0, sizeof(startupinfo));
startupinfo.cb = sizeof(startupinfo);

2
src/gui/Src/Utils/MiscUtil.cpp
View File

@ -179,7 +179,7 @@ QString getSymbolicNameStr(duint addr)
QIcon getFileIcon(QString file)
{
SHFILEINFO info;
SHFILEINFOW info;
if(SHGetFileInfoW((const wchar_t*)file.utf16(), 0, &info, sizeof(info), SHGFI_ICON) == 0)
return QIcon(); //API error
QIcon result = QIcon(QtWin::fromHICON(info.hIcon));

2
src/launcher/x64dbg_launcher.cpp
View File

@ -309,7 +309,7 @@ static void restartInstall()
ShellExecute(nullptr, operation, szApplicationDir, TEXT("::install"), szCurrentDir, SW_SHOWNORMAL);
}
static BOOL CALLBACK DlgLauncher(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
static INT_PTR CALLBACK DlgLauncher(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch(uMsg)
{