diff --git a/CONFIG/config.cpp b/CONFIG/config.cpp index b9c0345f..fc4ba324 100644 --- a/CONFIG/config.cpp +++ b/CONFIG/config.cpp @@ -374,19 +374,3 @@ int main(int argc, char* argv[]) g_theApp.ExitInstance(); return result; } - -#ifdef _WIN32 -extern "C" int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR /*cmdParamarg*/, int cmdShow) -{ - // Work-around problems with wchar_t as a native type - const unsigned short* cmdLineUtf16 = reinterpret_cast(GetCommandLineW()); - QByteArray cmdParam = QString::fromUtf16(cmdLineUtf16).toLocal8Bit(); - - int argc = 0; - QVector argv(8); - qWinMain(instance, prevInstance, cmdParam.data(), cmdShow, argc, argv); - - int result = main(argc, argv.data()); - return result; -} -#endif diff --git a/miniwin/include/miniwin/windows.h b/miniwin/include/miniwin/windows.h index c7679f5c..bd54249d 100644 --- a/miniwin/include/miniwin/windows.h +++ b/miniwin/include/miniwin/windows.h @@ -79,7 +79,7 @@ typedef struct HWND__* HWND; typedef HINSTANCE HMODULE; typedef struct HDC__* HDC; typedef struct HPALETTE__* HPALETTE; -typedef struct HCURSOR__* HCURSOR; +typedef HICON HCURSOR; typedef HANDLE HFILE; typedef int LSTATUS, HKEY, REGSAM;