diff --git a/DiabloUI/diabloui.h b/DiabloUI/diabloui.h index fe5af1bd7..ebdf2a680 100644 --- a/DiabloUI/diabloui.h +++ b/DiabloUI/diabloui.h @@ -47,7 +47,7 @@ BOOL UiGetDataCallback(int game_type, int data_code, void *a3, int a4, int a5); BOOL UiAuthCallback(int a1, char *a2, char *a3, char a4, char *a5, LPSTR lpBuffer, int cchBufferMax); BOOL UiSoundCallback(int a1, int type, int a3); void UiMessageBoxCallback(HWND hWnd, char *lpText, LPCSTR lpCaption, UINT uType); -BOOL UiDrawDescCallback(int game_type, COLORREF color, LPCSTR lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8); +BOOL UiDrawDescCallback(int game_type, DWORD color, LPCSTR lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8); BOOL UiCreateGameCallback(int a1, int a2, int a3, int a4, int a5, int a6); BOOL UiArtCallback(int game_type, unsigned int art_code, SDL_Color *pPalette, BYTE *pBuffer, DWORD dwBuffersize, DWORD *pdwWidth, DWORD *pdwHeight, DWORD *pdwBpp); int UiSelectGame(int a1, _SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, _SNETVERSIONDATA *file_info, int *a6); diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp index abc2d64df..907a534a8 100644 --- a/Source/scrollrt.cpp +++ b/Source/scrollrt.cpp @@ -1069,7 +1069,7 @@ static void DrawFPS() framerate = 1000 * frameend / frames; frameend = 0; } - wsprintf(String, "%d FPS", framerate); + snprintf(String, 12, "%d FPS", framerate); PrintGameStr(8, 65, String, COL_RED); } } diff --git a/SourceS/miniwin/misc.h b/SourceS/miniwin/misc.h index e233f0c8e..4ad7033a5 100644 --- a/SourceS/miniwin/misc.h +++ b/SourceS/miniwin/misc.h @@ -2,7 +2,6 @@ namespace dvl { -constexpr auto DVL_OFS_MAXPATHNAME = 128; constexpr auto DVL_MAX_PATH = 260; typedef char CHAR; @@ -11,52 +10,32 @@ typedef int32_t LONG; typedef uint8_t BOOLEAN; typedef LONG *PLONG; -typedef uint32_t ULONG; -typedef ULONG *PULONG; -typedef unsigned short USHORT; -typedef USHORT *PUSHORT; typedef unsigned char UCHAR; -typedef UCHAR *PUCHAR; -typedef char *PSZ; typedef uint32_t DWORD; typedef int BOOL, WINBOOL; typedef unsigned char BYTE; typedef unsigned short WORD; typedef float FLOAT; -typedef FLOAT *PFLOAT; -typedef BOOL *LPBOOL; -typedef BYTE *LPBYTE; -typedef int *LPINT; -typedef WORD *LPWORD; -typedef long *LPLONG; typedef DWORD *LPDWORD; typedef void *LPVOID; typedef void *PVOID; typedef const void *LPCVOID; -typedef void *HMENU; -typedef void *LPITEMIDLIST; -typedef LPITEMIDLIST PIDLIST_ABSOLUTE; -typedef LPITEMIDLIST PCIDLIST_ABSOLUTE; typedef int INT; typedef unsigned int UINT; -typedef unsigned int *PUINT; typedef intptr_t INT_PTR, *PINT_PTR; -typedef uintptr_t UINT_PTR, *PUINT_PTR; typedef intptr_t LONG_PTR, *PLONG_PTR; typedef uintptr_t ULONG_PTR, *PULONG_PTR; -typedef ULONG_PTR SIZE_T; typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR; typedef CHAR *LPSTR; -typedef CHAR *LPTSTR; typedef const CHAR *LPCSTR; -typedef UINT_PTR WPARAM; +typedef uintptr_t WPARAM; typedef LONG_PTR LPARAM; typedef LONG_PTR LRESULT; @@ -65,29 +44,12 @@ typedef LONG_PTR LRESULT; // typedef void *HANDLE; -typedef HANDLE HWND, HGDIOBJ, HMODULE, HDC, HRGN, HINSTANCE, HPALETTE, HCURSOR; +typedef HANDLE HWND, HGDIOBJ, HMODULE, HDC, HRGN, HINSTANCE, HCURSOR; typedef LONG LCID; -typedef DWORD COLORREF; - typedef LRESULT(*WNDPROC)(HWND, UINT, WPARAM, LPARAM); -#pragma pack(push, 1) -typedef struct waveformat_tag { - WORD wFormatTag; - WORD nChannels; - DWORD nSamplesPerSec; - DWORD nAvgBytesPerSec; - WORD nBlockAlign; -} WAVEFORMAT, *PWAVEFORMAT, *LPWAVEFORMAT; - -typedef struct pcmwaveformat_tag { - WAVEFORMAT wf; - WORD wBitsPerSample; -} PCMWAVEFORMAT, *PPCMWAVEFORMAT, *LPPCMWAVEFORMAT; -#pragma pack(pop) - typedef struct _FILETIME { DWORD dwLowDateTime; DWORD dwHighDateTime; @@ -120,54 +82,11 @@ typedef struct tagMSG { POINT pt; } MSG, *LPMSG; -typedef uint32_t FOURCC; - -typedef struct { - FOURCC ckid; - DWORD cksize; - FOURCC fccType; - DWORD dwDataOffset; - DWORD dwFlags; -} MMCKINFO; - -// -// System time is represented with the following structure: -// - -typedef struct _SYSTEMTIME { - WORD wYear; - WORD wMonth; - WORD wDayOfWeek; - WORD wDay; - WORD wHour; - WORD wMinute; - WORD wSecond; - WORD wMilliseconds; -} SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME; - -typedef unsigned long _fsize_t; /* Could be 64 bits for Win32 */ - -struct DVL_finddata_t { - unsigned attrib; - time_t time_create; /* -1 for FAT file systems */ - time_t time_access; /* -1 for FAT file systems */ - time_t time_write; - _fsize_t size; - char name[DVL_MAX_PATH]; -}; - -typedef WORD ATOM; - // // Everything else // typedef void *LPSECURITY_ATTRIBUTES; -typedef struct _LIST_ENTRY { - struct _LIST_ENTRY *Flink; - struct _LIST_ENTRY *Blink; -} LIST_ENTRY, *PLIST_ENTRY; - DWORD GetTickCount(); WINBOOL CloseHandle(HANDLE hObject); @@ -198,10 +117,8 @@ DWORD GetCurrentThreadId(); WINBOOL SetThreadPriority(HANDLE hThread, int nPriority); void Sleep(DWORD dwMilliseconds); -int wsprintfA(LPSTR, LPCSTR, ...); int wvsprintfA(LPSTR dest, LPCSTR format, va_list arglist); int _strcmpi(const char *_Str1, const char *_Str2); -int _strnicmp(const char *_Str1, const char *_Str2, size_t n); // // File I/O @@ -209,103 +126,6 @@ int _strnicmp(const char *_Str1, const char *_Str2, size_t n); typedef void *LPOVERLAPPED; -typedef struct _IMAGE_FILE_HEADER { - WORD Machine; - WORD NumberOfSections; - DWORD TimeDateStamp; - DWORD PointerToSymbolTable; - DWORD NumberOfSymbols; - WORD SizeOfOptionalHeader; - WORD Characteristics; -} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; - -typedef struct _IMAGE_OPTIONAL_HEADER { - WORD Magic; - BYTE MajorLinkerVersion; - BYTE MinorLinkerVersion; - DWORD SizeOfCode; - DWORD SizeOfInitializedData; - DWORD SizeOfUninitializedData; - DWORD AddressOfEntryPoint; - DWORD BaseOfCode; - DWORD BaseOfData; - DWORD ImageBase; - DWORD SectionAlignment; - DWORD FileAlignment; - WORD MajorOperatingSystemVersion; - WORD MinorOperatingSystemVersion; - WORD MajorImageVersion; - WORD MinorImageVersion; - WORD MajorSubsystemVersion; - WORD MinorSubsystemVersion; - DWORD Win32VersionValue; - DWORD SizeOfImage; - DWORD SizeOfHeaders; - DWORD CheckSum; - WORD Subsystem; - WORD DllCharacteristics; - DWORD SizeOfStackReserve; - DWORD SizeOfStackCommit; - DWORD SizeOfHeapReserve; - DWORD SizeOfHeapCommit; - DWORD LoaderFlags; - DWORD NumberOfRvaAndSizes; -} IMAGE_OPTIONAL_HEADER32, *PIMAGE_OPTIONAL_HEADER32; - -typedef struct _IMAGE_NT_HEADERS { - DWORD Signature; - IMAGE_FILE_HEADER FileHeader; - IMAGE_OPTIONAL_HEADER32 OptionalHeader; -} IMAGE_NT_HEADERS, *PIMAGE_NT_HEADERS; - -typedef struct _IMAGE_DOS_HEADER { - WORD e_magic; - WORD e_cblp; - WORD e_cp; - WORD e_crlc; - WORD e_cparhdr; - WORD e_minalloc; - WORD e_maxalloc; - WORD e_ss; - WORD e_sp; - WORD e_csum; - WORD e_ip; - WORD e_cs; - WORD e_lfarlc; - WORD e_ovno; - WORD e_res[4]; - WORD e_oemid; - WORD e_oeminfo; - WORD e_res2[10]; - LONG e_lfanew; -} IMAGE_DOS_HEADER, *PIMAGE_DOS_HEADER; - -typedef struct _OSVERSIONINFOA { - DWORD dwOSVersionInfoSize; - DWORD dwMajorVersion; - DWORD dwMinorVersion; - DWORD dwBuildNumber; - DWORD dwPlatformId; - CHAR szCSDVersion[128]; -} OSVERSIONINFO, *LPOSVERSIONINFOA; - -typedef struct _IMAGE_SECTION_HEADER { - union { - DWORD PhysicalAddress; - DWORD VirtualSize; - } Misc; - DWORD VirtualAddress; - DWORD SizeOfRawData; - DWORD PointerToRawData; - DWORD PointerToRelocations; - DWORD PointerToLinenumbers; - WORD NumberOfRelocations; - WORD NumberOfLinenumbers; - DWORD Characteristics; -} IMAGE_SECTION_HEADER, *PIMAGE_SECTION_HEADER; - -typedef LONG LSTATUS, HKEY, REGSAM, PHKEY; - WINBOOL WriteFile(HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten, LPOVERLAPPED lpOverlapped); DWORD SetFilePointer(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod); @@ -318,88 +138,6 @@ WINBOOL ReadFile(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDW DWORD GetFileSize(HANDLE hFile, LPDWORD lpFileSizeHigh); WINBOOL DeleteFileA(LPCSTR lpFileName); -typedef struct _CONTEXT { - - // - // The flags values within this flag control the contents of - // a CONTEXT record. - // - // If the context record is used as an input parameter, then - // for each portion of the context record controlled by a flag - // whose value is set, it is assumed that that portion of the - // context record contains valid context. If the context record - // is being used to modify a threads context, then only that - // portion of the threads context will be modified. - // - // If the context record is used as an IN OUT parameter to capture - // the context of a thread, then only those portions of the thread's - // context corresponding to set flags will be returned. - // - // The context record is never used as an OUT only parameter. - // - - DWORD ContextFlags; - - // - // This section is specified/returned if CONTEXT_DEBUG_REGISTERS is - // set in ContextFlags. Note that CONTEXT_DEBUG_REGISTERS is NOT - // included in CONTEXT_FULL. - // - - DWORD Dr0; - DWORD Dr1; - DWORD Dr2; - DWORD Dr3; - DWORD Dr6; - DWORD Dr7; - - // - // This section is specified/returned if the - // ContextFlags word contains the flag CONTEXT_SEGMENTS. - // - - DWORD SegGs; - DWORD SegFs; - DWORD SegEs; - DWORD SegDs; - - // - // This section is specified/returned if the - // ContextFlags word contains the flag CONTEXT_INTEGER. - // - - DWORD Edi; - DWORD Esi; - DWORD Ebx; - DWORD Edx; - DWORD Ecx; - DWORD Eax; - - // - // This section is specified/returned if the - // ContextFlags word contains the flag CONTEXT_CONTROL. - // - - DWORD Ebp; - DWORD Eip; - DWORD SegCs; // MUST BE SANITIZED - DWORD EFlags; // MUST BE SANITIZED - DWORD Esp; - DWORD SegSs; -} CONTEXT; - -typedef CONTEXT *PCONTEXT; - -typedef struct _MEMORY_BASIC_INFORMATION { - PVOID BaseAddress; - PVOID AllocationBase; - DWORD AllocationProtect; - SIZE_T RegionSize; - DWORD State; - DWORD Protect; - DWORD Type; -} MEMORY_BASIC_INFORMATION, *PMEMORY_BASIC_INFORMATION; - // // Total fakes // @@ -410,13 +148,7 @@ typedef struct { // MSCVRT emulation // -extern void LoadCharNames(); -extern void LoadAndPlaySound(char *FilePath, int lVolume, int lPan); -extern void DrawArtWithMask(int SX, int SY, int SW, int SH, int nFrame, BYTE bMask, void *pBuffer); -extern BOOL LoadArtWithPal(char *pszFile, void **pBuffer, int frames, DWORD *data); - constexpr auto DVL_WM_SYSKEYUP = 0x0105; -constexpr auto DVL_VER_PLATFORM_WIN32_NT = 2; constexpr auto DVL_CREATE_ALWAYS = 2; constexpr auto DVL_GENERIC_READ = 0x80000000L; @@ -431,7 +163,6 @@ constexpr auto DVL_INFINITE = 0xFFFFFFFF; // // Events // -constexpr auto DVL_WM_MOUSEFIRST = 0x0200; constexpr auto DVL_WM_MOUSEMOVE = 0x0200; constexpr auto DVL_WM_LBUTTONDOWN = 0x0201; constexpr auto DVL_WM_LBUTTONUP = 0x0202; @@ -447,14 +178,11 @@ constexpr auto DVL_WM_SYSCOMMAND = 0x0112; constexpr auto DVL_WM_CHAR = 0x0102; constexpr auto DVL_WM_CAPTURECHANGED = 0x0215; -constexpr auto DVL_WM_CREATE = 0x0001; constexpr auto DVL_WM_PAINT = 0x000F; constexpr auto DVL_WM_CLOSE = 0x0010; constexpr auto DVL_WM_QUERYENDSESSION = 0x0011; constexpr auto DVL_WM_ERASEBKGND = 0x0014; -constexpr auto DVL_WM_MOUSEHOVER = 0x02A1; constexpr auto DVL_WM_QUERYNEWPALETTE = 0x030F; -constexpr auto DVL_WM_PALETTECHANGED = 0x0311; constexpr auto DVL_SC_CLOSE = 0xF060; diff --git a/SourceS/miniwin/misc_macro.h b/SourceS/miniwin/misc_macro.h index dc7226a8b..ce55adc64 100644 --- a/SourceS/miniwin/misc_macro.h +++ b/SourceS/miniwin/misc_macro.h @@ -14,26 +14,14 @@ #define CreateEvent CreateEventA -#define PM_NOREMOVE DVL_PM_NOREMOVE -#define PM_REMOVE DVL_PM_REMOVE #define WM_QUIT DVL_WM_QUIT #define PeekMessage PeekMessageA #define DispatchMessage DispatchMessageA #define PostMessage PostMessageA -#define RegisterClassEx RegisterClassExA -#define LoadImage LoadImageA -#define THREAD_BASE_PRIORITY_MAX 2 -#define THREAD_PRIORITY_NORMAL 0 -#define THREAD_PRIORITY_HIGHEST THREAD_BASE_PRIORITY_MAX -#define THREAD_PRIORITY_ABOVE_NORMAL (THREAD_PRIORITY_HIGHEST - 1) +#define THREAD_PRIORITY_HIGHEST 2 -#define NUMRESERVED 106 - -#define _snprintf snprintf -#define _vsnprintf vsnprintf -#define wsprintf wsprintfA #define wvsprintf wvsprintfA // @@ -42,126 +30,25 @@ #define FILE_BEGIN DVL_FILE_BEGIN #define FILE_CURRENT DVL_FILE_CURRENT -#define FILE_END 2 #define FILE_FLAG_WRITE_THROUGH 0x80000000 #define CREATE_ALWAYS DVL_CREATE_ALWAYS #define GENERIC_READ DVL_GENERIC_READ #define GENERIC_WRITE DVL_GENERIC_WRITE #define OPEN_EXISTING DVL_OPEN_EXISTING -#define OPEN_ALWAYS 4 -#define FILE_ATTRIBUTE_NORMAL 128 - -#define OFS_MAXPATHNAME DVL_OFS_MAXPATHNAME // // Calculate the byte offset of a field in a structure of type type. // -#define FIELD_OFFSET(type, field) ((LONG)(INT_PTR) & (((type *)0)->field)) -#define IMAGE_FIRST_SECTION(ntheader) ((PIMAGE_SECTION_HEADER)((UINT_PTR)ntheader + FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader) + ((PIMAGE_NT_HEADERS)(ntheader))->FileHeader.SizeOfOptionalHeader)) - -#define IMAGE_NT_SIGNATURE 0x00004550 // PE00 -#define IMAGE_DOS_SIGNATURE 0x5A4D -#define VER_PLATFORM_WIN32_NT DVL_VER_PLATFORM_WIN32_NT - -#define MEM_COMMIT 0x1000 -#define MEM_RELEASE 0x8000 - -#define SEC_COMMIT 0x8000000 -#define PAGE_READWRITE 0x04 - -#define SECTION_QUERY 0x0001 -#define SECTION_MAP_WRITE 0x0002 -#define SECTION_MAP_READ 0x0004 -#define SECTION_MAP_EXECUTE 0x0008 -#define SECTION_EXTEND_SIZE 0x0010 -#define SECTION_MAP_EXECUTE_EXPLICIT 0x0020 -#define STANDARD_RIGHTS_REQUIRED 0x000F0000 - -#define SECTION_ALL_ACCESS \ - (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_WRITE | SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_EXTEND_SIZE) - -#define HKEY_CURRENT_USER 1 -#define KEY_READ 0x20019 -#define KEY_WRITE 0x20006 -#define REG_SZ 1 - #define CreateFile CreateFileA #define DeleteFile DeleteFileA -#define GWL_STYLE (-16) - -#define WS_SYSMENU 0x00080000L - // // Events // -// were here - -#define FORMAT_MESSAGE_IGNORE_INSERTS 0x00000200 -#define FORMAT_MESSAGE_FROM_HMODULE 0x00000800 - -#define STATUS_BREAKPOINT ((DWORD)0x80000003L) -#define STATUS_GUARD_PAGE_VIOLATION ((DWORD)0x80000001L) -#define STATUS_FLOAT_DIVIDE_BY_ZERO ((DWORD)0xC000008EL) -#define STATUS_SINGLE_STEP ((DWORD)0x80000004L) -#define STATUS_ARRAY_BOUNDS_EXCEEDED ((DWORD)0xC000008CL) -#define STATUS_ACCESS_VIOLATION ((DWORD)0xC0000005L) -#define STATUS_IN_PAGE_ERROR ((DWORD)0xC0000006L) -#define STATUS_ILLEGAL_INSTRUCTION ((DWORD)0xC000001DL) -#define STATUS_DATATYPE_MISALIGNMENT ((DWORD)0x80000002L) -#define STATUS_FLOAT_DENORMAL_OPERAND ((DWORD)0xC000008DL) -#define STATUS_NONCONTINUABLE_EXCEPTION ((DWORD)0xC0000025L) -#define STATUS_INTEGER_DIVIDE_BY_ZERO ((DWORD)0xC0000094L) -#define STATUS_INVALID_HANDLE ((DWORD)0xC0000008L) -#define STATUS_FLOAT_OVERFLOW ((DWORD)0xC0000091L) -#define STATUS_ILLEGAL_INSTRUCTION ((DWORD)0xC000001DL) -#define STATUS_GUARD_PAGE_VIOLATION ((DWORD)0x80000001L) -#define STATUS_ILLEGAL_INSTRUCTION ((DWORD)0xC000001DL) -#define STATUS_INTEGER_OVERFLOW ((DWORD)0xC0000095L) -#define STATUS_PRIVILEGED_INSTRUCTION ((DWORD)0xC0000096L) -#define STATUS_FLOAT_UNDERFLOW ((DWORD)0xC0000093L) -#define STATUS_FLOAT_INEXACT_RESULT ((DWORD)0xC000008FL) -#define STATUS_FLOAT_INVALID_OPERATION ((DWORD)0xC0000090L) -#define STATUS_FLOAT_STACK_CHECK ((DWORD)0xC0000092L) -#define STATUS_INVALID_DISPOSITION ((DWORD)0xC0000026L) -#define STATUS_STACK_OVERFLOW ((DWORD)0xC00000FDL) - -#define EXCEPTION_CONTINUE_SEARCH 0x0 -#define EXCEPTION_ACCESS_VIOLATION STATUS_ACCESS_VIOLATION -#define EXCEPTION_BREAKPOINT STATUS_BREAKPOINT -#define EXCEPTION_GUARD_PAGE STATUS_GUARD_PAGE_VIOLATION -#define EXCEPTION_FLT_DIVIDE_BY_ZERO STATUS_FLOAT_DIVIDE_BY_ZERO -#define EXCEPTION_SINGLE_STEP STATUS_SINGLE_STEP -#define EXCEPTION_ARRAY_BOUNDS_EXCEEDED STATUS_ARRAY_BOUNDS_EXCEEDED -#define EXCEPTION_IN_PAGE_ERROR STATUS_IN_PAGE_ERROR -#define EXCEPTION_ILLEGAL_INSTRUCTION STATUS_ILLEGAL_INSTRUCTION -#define EXCEPTION_DATATYPE_MISALIGNMENT STATUS_DATATYPE_MISALIGNMENT -#define EXCEPTION_FLT_DENORMAL_OPERAND STATUS_FLOAT_DENORMAL_OPERAND -#define EXCEPTION_NONCONTINUABLE_EXCEPTION STATUS_NONCONTINUABLE_EXCEPTION -#define EXCEPTION_INT_DIVIDE_BY_ZERO STATUS_INTEGER_DIVIDE_BY_ZERO -#define EXCEPTION_INVALID_HANDLE STATUS_INVALID_HANDLE -#define EXCEPTION_FLT_OVERFLOW STATUS_FLOAT_OVERFLOW -#define EXCEPTION_ILLEGAL_INSTRUCTION STATUS_ILLEGAL_INSTRUCTION -#define EXCEPTION_GUARD_PAGE STATUS_GUARD_PAGE_VIOLATION -#define EXCEPTION_ILLEGAL_INSTRUCTION STATUS_ILLEGAL_INSTRUCTION -#define EXCEPTION_INT_OVERFLOW STATUS_INTEGER_OVERFLOW -#define EXCEPTION_PRIV_INSTRUCTION STATUS_PRIVILEGED_INSTRUCTION -#define EXCEPTION_FLT_UNDERFLOW STATUS_FLOAT_UNDERFLOW -#define EXCEPTION_FLT_INEXACT_RESULT STATUS_FLOAT_INEXACT_RESULT -#define EXCEPTION_FLT_INVALID_OPERATION STATUS_FLOAT_INVALID_OPERATION -#define EXCEPTION_FLT_STACK_CHECK STATUS_FLOAT_STACK_CHECK -#define EXCEPTION_INVALID_DISPOSITION STATUS_INVALID_DISPOSITION -#define EXCEPTION_STACK_OVERFLOW STATUS_STACK_OVERFLOW - -#define _finddata_t DVL_finddata_t #define _beginthreadex DVL_beginthreadex -// -// Events -// -#define WM_MOUSEFIRST DVL_WM_MOUSEFIRST #define WM_MOUSEMOVE DVL_WM_MOUSEMOVE #define WM_LBUTTONDOWN DVL_WM_LBUTTONDOWN #define WM_LBUTTONUP DVL_WM_LBUTTONUP @@ -177,14 +64,12 @@ #define WM_CHAR DVL_WM_CHAR #define WM_CAPTURECHANGED DVL_WM_CAPTURECHANGED -#define WM_CREATE DVL_WM_CREATE #define WM_PAINT DVL_WM_PAINT #define WM_CLOSE DVL_WM_CLOSE #define WM_QUERYENDSESSION DVL_WM_QUERYENDSESSION #define WM_ERASEBKGND DVL_WM_ERASEBKGND #define WM_SYSKEYUP DVL_WM_SYSKEYUP #define WM_QUERYNEWPALETTE DVL_WM_QUERYNEWPALETTE -#define WM_PALETTECHANGED DVL_WM_PALETTECHANGED #define SC_CLOSE DVL_SC_CLOSE diff --git a/SourceX/DiabloUI/diabloui.cpp b/SourceX/DiabloUI/diabloui.cpp index a9f2128f9..710098585 100644 --- a/SourceX/DiabloUI/diabloui.cpp +++ b/SourceX/DiabloUI/diabloui.cpp @@ -503,7 +503,7 @@ void UiMessageBoxCallback(HWND hWnd, char *lpText, LPCSTR lpCaption, UINT uType) UNIMPLEMENTED(); } -BOOL UiDrawDescCallback(int game_type, COLORREF color, LPCSTR lpString, char *a4, int a5, UINT align, time_t a7, +BOOL UiDrawDescCallback(int game_type, DWORD color, LPCSTR lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8) { UNIMPLEMENTED(); diff --git a/SourceX/miniwin/misc.cpp b/SourceX/miniwin/misc.cpp index 31fd82723..d5b5ddc17 100644 --- a/SourceX/miniwin/misc.cpp +++ b/SourceX/miniwin/misc.cpp @@ -29,13 +29,6 @@ namespace dvl { -int wsprintfA(LPSTR dest, LPCSTR format, ...) -{ - va_list args; - va_start(args, format); - return vsprintf(dest, format, args); -} - int wvsprintfA(LPSTR dest, LPCSTR format, va_list arglist) { return vsnprintf(dest, 256, format, arglist); @@ -46,11 +39,6 @@ int _strcmpi(const char *_Str1, const char *_Str2) return strcasecmp(_Str1, _Str2); } -int _strnicmp(const char *_Str1, const char *_Str2, size_t n) -{ - return strncasecmp(_Str1, _Str2, n); -} - DWORD GetTickCount() { return SDL_GetTicks(); diff --git a/SourceX/miniwin/misc_msg.cpp b/SourceX/miniwin/misc_msg.cpp index 00fe322e8..51f6436ab 100644 --- a/SourceX/miniwin/misc_msg.cpp +++ b/SourceX/miniwin/misc_msg.cpp @@ -599,7 +599,6 @@ WINBOOL PeekMessageA(LPMSG lpMsg) #endif break; case SDL_WINDOWEVENT_ENTER: - lpMsg->message = DVL_WM_MOUSEHOVER; // Bug in SDL, SDL_WarpMouseInWindow doesn't emit SDL_MOUSEMOTION // and SDL_GetMouseState gives previous location if mouse was // outside window (observed on Ubuntu 19.04)