wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : ver.dll16: Enable compilation with long types.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 4690d5f0205c4f31cb9add852c7d3f4aa48fe0d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4690d5f0205c4f31cb9add85… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:32 2022 +0100 ver.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ver.dll16/Makefile.in | 1 - dlls/ver.dll16/version.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ver.dll16/Makefile.in b/dlls/ver.dll16/Makefile.in index ca72752ca4f..1c68dfc5035 100644 --- a/dlls/ver.dll16/Makefile.in +++ b/dlls/ver.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ver.dll16 IMPORTS = version lz32 diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index dac9ff28ddf..6dfbc55c33b 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -436,7 +436,7 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, OFSTRUCT ofs; DWORD reslen = dwResLen; - TRACE("(%s,type=%p,id=%p,off=%d,len=%d,data=%p)\n", + TRACE("(%s,type=%p,id=%p,off=%ld,len=%ld,data=%p)\n", debugstr_a(lpszFileName), lpszResType, lpszResId, dwFileOffset, dwResLen, lpvData ); @@ -476,7 +476,7 @@ DWORD WINAPI GetFileVersionInfoSize16( LPCSTR filename, LPDWORD handle ) */ DWORD WINAPI GetFileVersionInfo16( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { - TRACE("(%s, %08x, %d, %p)\n", debugstr_a(filename), handle, datasize, data ); + TRACE("(%s, %08lx, %ld, %p)\n", debugstr_a(filename), handle, datasize, data ); return GetFileResource16( filename, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, 0, datasize, data ); }

1 0

Eric Pouech : vdmdbg: Enable compilation with long types.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: fdc7a21748c35407f901a1cd868f1780e91a08e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdc7a21748c35407f901a1cd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:26 2022 +0100 vdmdbg: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vdmdbg/Makefile.in | 1 - dlls/vdmdbg/vdmdbg.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/vdmdbg/Makefile.in b/dlls/vdmdbg/Makefile.in index 8b99c6ba891..63051c1c23c 100644 --- a/dlls/vdmdbg/Makefile.in +++ b/dlls/vdmdbg/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vdmdbg.dll IMPORTLIB = vdmdbg diff --git a/dlls/vdmdbg/vdmdbg.c b/dlls/vdmdbg/vdmdbg.c index b56c62535ac..c988fd6461f 100644 --- a/dlls/vdmdbg/vdmdbg.c +++ b/dlls/vdmdbg/vdmdbg.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vdmdbg); */ INT WINAPI VDMEnumTaskWOW(DWORD dwProcessId, TASKENUMPROC fp, LPARAM lparam) { - FIXME("(%d, %p): stub!\n", dwProcessId, fp); + FIXME("(%ld, %p): stub!\n", dwProcessId, fp); return 0; }

1 0

Eric Pouech : vdhcp.vxd: Enable compilation with long types.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 6c505ec991fbe0cecd2381f8e229ee9d3ea7190f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c505ec991fbe0cecd2381f8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:20 2022 +0100 vdhcp.vxd: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vdhcp.vxd/Makefile.in | 1 - dlls/vdhcp.vxd/vdhcp.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/vdhcp.vxd/Makefile.in b/dlls/vdhcp.vxd/Makefile.in index 715a2acf6b0..b27d520f256 100644 --- a/dlls/vdhcp.vxd/Makefile.in +++ b/dlls/vdhcp.vxd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vdhcp.vxd C_SRCS = \ diff --git a/dlls/vdhcp.vxd/vdhcp.c b/dlls/vdhcp.vxd/vdhcp.c index a7b97a338cb..b00d0380e7b 100644 --- a/dlls/vdhcp.vxd/vdhcp.c +++ b/dlls/vdhcp.vxd/vdhcp.c @@ -62,7 +62,7 @@ BOOL WINAPI VDHCP_DeviceIoControl(DWORD dwIoControlCode, LPVOID lpvInBuffer, break; default: - FIXME("(%d,%p,%d,%p,%d,%p,%p): stub\n", + FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n", dwIoControlCode, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer,

1 0

Eric Pouech : vcruntime140_1: Enable compilation with long types.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 8256bbf257152b60f4713d47118a7ebead30a7be URL: https://source.winehq.org/git/wine.git/?a=commit;h=8256bbf257152b60f4713d47… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:14 2022 +0100 vcruntime140_1: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/Makefile.in | 1 - dlls/vcruntime140_1/except_x86_64.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/vcruntime140_1/Makefile.in b/dlls/vcruntime140_1/Makefile.in index 5770333edcd..31f15af2989 100644 --- a/dlls/vcruntime140_1/Makefile.in +++ b/dlls/vcruntime140_1/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcruntime140_1.dll C_SRCS = \ diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index b29a2baa696..ec6b06c69d6 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -546,7 +546,7 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec) } __EXCEPT_CTX(cxx_rethrow_filter, &ctx) { - TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); + TRACE("detect rethrow: exception code: %lx\n", prev_rec->ExceptionCode); ctx.rethrow = TRUE; FlsSetValue(fls_index, (void*)(DWORD_PTR)ctx.search_state); @@ -567,8 +567,8 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec) __FINALLY_CTX(cxx_catch_cleanup, &ctx) FlsSetValue(fls_index, (void*)-2); - TRACE("handler returned %p, ret_addr[0] %p, ret_addr[1] %p.\n", - ret_addr, rec->ExceptionInformation[8], rec->ExceptionInformation[9]); + TRACE("handler returned %p, ret_addr[0] %#Ix, ret_addr[1] %#Ix.\n", + ret_addr, rec->ExceptionInformation[8], rec->ExceptionInformation[9]); if (rec->ExceptionInformation[9]) { @@ -690,7 +690,7 @@ static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c) if (rec->ExceptionCode != CXX_EXCEPTION) { - TRACE("non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode); + TRACE("non-c++ exception thrown in SEH handler: %lx\n", rec->ExceptionCode); terminate(); } @@ -730,7 +730,7 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame, { TRACE("nested exception detected\n"); orig_frame = *(ULONG64*)rva_to_ptr(descr->frame, frame); - TRACE("setting orig_frame to %lx\n", orig_frame); + TRACE("setting orig_frame to %Ix\n", orig_frame); } if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) @@ -763,7 +763,7 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame, if (TRACE_ON(seh)) { - TRACE("handling C++ exception rec %p frame %lx descr %p\n", rec, frame, descr); + TRACE("handling C++ exception rec %p frame %Ix descr %p\n", rec, frame, descr); dump_exception_type(exc_type, rec->ExceptionInformation[3]); } } @@ -772,7 +772,7 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame, _se_translator_function se_translator = get_se_translator(); exc_type = NULL; - TRACE("handling C exception code %x rec %p frame %lx descr %p\n", + TRACE("handling C exception code %lx rec %p frame %Ix descr %p\n", rec->ExceptionCode, rec, frame, descr); if (se_translator) { @@ -810,7 +810,7 @@ EXCEPTION_DISPOSITION __cdecl __CxxFrameHandler4(EXCEPTION_RECORD *rec, BYTE *p, *count, *count_end; int trylevel; - TRACE("%p %lx %p %p\n", rec, frame, context, dispatch); + TRACE("%p %Ix %p %p\n", rec, frame, context, dispatch); trylevel = (DWORD_PTR)FlsGetValue(fls_index); FlsSetValue(fls_index, (void*)-2);

1 0

Eric Pouech : vcruntime140: Enable compilation with long types.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 581de3085aabae19f3f04dc5745a3596beec8ed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=581de3085aabae19f3f04dc5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:08 2022 +0100 vcruntime140: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140/Makefile.in | 1 - dlls/vcruntime140/misc.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/vcruntime140/Makefile.in b/dlls/vcruntime140/Makefile.in index af1b62c0b40..2b4d6af7c91 100644 --- a/dlls/vcruntime140/Makefile.in +++ b/dlls/vcruntime140/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcruntime140.dll C_SRCS = \ diff --git a/dlls/vcruntime140/misc.c b/dlls/vcruntime140/misc.c index cc641754389..cc0af902677 100644 --- a/dlls/vcruntime140/misc.c +++ b/dlls/vcruntime140/misc.c @@ -46,7 +46,7 @@ void CDECL __telemetry_main_return_trigger(HINSTANCE hinst) BOOL CDECL __vcrt_InitializeCriticalSectionEx( CRITICAL_SECTION *cs, DWORD spin_count, DWORD flags) { - TRACE("(%p %x %x)\n", cs, spin_count, flags); + TRACE("(%p %lx %lx)\n", cs, spin_count, flags); return InitializeCriticalSectionEx(cs, spin_count, flags); }

1 0

Eric Pouech : vcomp*: Enable compilation with long types.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 7ffff5c5564d0f786452b32cc0171c83f9068d81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ffff5c5564d0f786452b32c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:02 2022 +0100 vcomp*: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/Makefile.in | 1 - dlls/vcomp/main.c | 2 +- dlls/vcomp100/Makefile.in | 1 - dlls/vcomp110/Makefile.in | 1 - dlls/vcomp120/Makefile.in | 1 - dlls/vcomp140/Makefile.in | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/vcomp/Makefile.in b/dlls/vcomp/Makefile.in index 201b855718a..a54a86f8eb6 100644 --- a/dlls/vcomp/Makefile.in +++ b/dlls/vcomp/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp.dll C_SRCS = \ diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index c4f2572c86a..374adf3991a 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -1951,7 +1951,7 @@ void WINAPIV C2VectParallel(int start, int end, int step, BOOL end_included, int BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - TRACE("(%p, %d, %p)\n", instance, reason, reserved); + TRACE("(%p, %ld, %p)\n", instance, reason, reserved); switch (reason) { diff --git a/dlls/vcomp100/Makefile.in b/dlls/vcomp100/Makefile.in index 6c4d19a9797..b087e894ad7 100644 --- a/dlls/vcomp100/Makefile.in +++ b/dlls/vcomp100/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp100.dll PARENTSRC = ../vcomp diff --git a/dlls/vcomp110/Makefile.in b/dlls/vcomp110/Makefile.in index c44f5eae8d8..abd3d465934 100644 --- a/dlls/vcomp110/Makefile.in +++ b/dlls/vcomp110/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp110.dll PARENTSRC = ../vcomp diff --git a/dlls/vcomp120/Makefile.in b/dlls/vcomp120/Makefile.in index c52812f4384..9a2f2428f6f 100644 --- a/dlls/vcomp120/Makefile.in +++ b/dlls/vcomp120/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp120.dll PARENTSRC = ../vcomp diff --git a/dlls/vcomp140/Makefile.in b/dlls/vcomp140/Makefile.in index 10263e2112f..644ac670af9 100644 --- a/dlls/vcomp140/Makefile.in +++ b/dlls/vcomp140/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp140.dll PARENTSRC = ../vcomp

1 0

Eric Pouech : vbscript: Enable compilation with long types.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: d92d623d3260ae46cd3b89d630ffd5457ef9af50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d92d623d3260ae46cd3b89d6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:57:56 2022 +0100 vbscript: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/Makefile.in | 1 - dlls/vbscript/global.c | 12 +++---- dlls/vbscript/interp.c | 14 ++++---- dlls/vbscript/parser.y | 2 +- dlls/vbscript/regexp.c | 6 ++-- dlls/vbscript/utils.c | 6 ++-- dlls/vbscript/vbdisp.c | 74 +++++++++++++++++++++---------------------- dlls/vbscript/vbregexp.c | 54 +++++++++++++++---------------- dlls/vbscript/vbscript.c | 36 ++++++++++----------- dlls/vbscript/vbscript_main.c | 2 +- 10 files changed, 103 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d92d623d3260ae46cd3b…

1 0

Eric Pouech : uxtheme: Enable compilation with long types.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 354be197cddc279ca2afb077be4cc0b9f7c6b514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=354be197cddc279ca2afb077… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:57:50 2022 +0100 uxtheme: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/Makefile.in | 1 - dlls/uxtheme/draw.c | 12 ++++++------ dlls/uxtheme/main.c | 2 +- dlls/uxtheme/msstyles.c | 2 +- dlls/uxtheme/scrollbar.c | 2 +- dlls/uxtheme/system.c | 22 +++++++++++----------- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index 42f4c9867b4..933650f4261 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uxtheme.dll IMPORTLIB = uxtheme IMPORTS = user32 gdi32 advapi32 diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 75db466967c..d503fad3fea 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -57,7 +57,7 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD new_flag) DWORD old_flag = 0; BOOL res; - TRACE("(%p,%#x\n", hwnd, new_flag); + TRACE("(%p,%#lx\n", hwnd, new_flag); new_flag &= ETDT_VALIDBITS; @@ -267,7 +267,7 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStat } } if(reqsize.x <= size.x && reqsize.y <= size.y) { - TRACE("Using image size %dx%d, image %d\n", reqsize.x, reqsize.y, + TRACE("Using image size %ldx%ld, image %d\n", reqsize.x, reqsize.y, imagefile_index_to_property(i)); return fileProp; } @@ -957,7 +957,7 @@ static HRESULT UXTHEME_DrawBackgroundFill(HTHEME hTheme, HDC hdc, int iPartId, HRESULT hr = S_OK; int filltype = FT_SOLID; - TRACE("(%d,%d,%d)\n", iPartId, iStateId, pOptions->dwFlags); + TRACE("(%d,%d,%ld)\n", iPartId, iStateId, pOptions->dwFlags); if(pOptions->dwFlags & DTBG_OMITCONTENT) return S_OK; @@ -1055,7 +1055,7 @@ HRESULT WINAPI DrawThemeBackgroundEx(HTHEME hTheme, HDC hdc, int iPartId, int bgtype = BT_BORDERFILL; RECT rt; - TRACE("(%p,%p,%d,%d,%d,%d)\n", hTheme, hdc, iPartId, iStateId,pRect->left,pRect->top); + TRACE("(%p,%p,%d,%d,%ld,%ld)\n", hTheme, hdc, iPartId, iStateId,pRect->left,pRect->top); if(!hTheme) return E_HANDLE; @@ -1744,14 +1744,14 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId int oldBkMode; int fontProp; - TRACE("%p %p %d %d %s:%d 0x%08x %p %p\n", hTheme, hdc, iPartId, iStateId, + TRACE("%p %p %d %d %s:%d 0x%08lx %p %p\n", hTheme, hdc, iPartId, iStateId, debugstr_wn(pszText, iCharCount), iCharCount, flags, rect, options); if(!hTheme) return E_HANDLE; if (options->dwFlags & ~(DTT_TEXTCOLOR | DTT_FONTPROP)) - FIXME("unsupported flags 0x%08x\n", options->dwFlags); + FIXME("unsupported flags 0x%08lx\n", options->dwFlags); if (options->dwFlags & DTT_FONTPROP) fontProp = options->iFontPropId; diff --git a/dlls/uxtheme/main.c b/dlls/uxtheme/main.c index 5f79dd6ed0d..211b6e3bddc 100644 --- a/dlls/uxtheme/main.c +++ b/dlls/uxtheme/main.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *reserved) { - TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, reserved); + TRACE("%p 0x%lx %p\n", hInstDLL, fdwReason, reserved); switch(fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 376d8bc6db9..7d3ee72efe8 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -98,7 +98,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST } if((versize = SizeofResource(hTheme, hrsc)) != 2) { - TRACE("Version resource found, but wrong size: %d\n", versize); + TRACE("Version resource found, but wrong size: %ld\n", versize); hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); goto invalid_theme; } diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index e96e5e89b69..719081ad5b8 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -273,7 +273,7 @@ LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR HTHEME theme; LRESULT result; - TRACE("(%p, 0x%x, %lu, %lu, %d)\n", hwnd, msg, wParam, lParam, unicode); + TRACE("(%p, 0x%x, %Iu, %Iu, %d)\n", hwnd, msg, wParam, lParam, unicode); switch (msg) { case WM_CREATE: diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 37c484387ec..8333d6b99ce 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -153,7 +153,7 @@ static void UXTHEME_LoadTheme(void) } else { bThemeActive = FALSE; - TRACE("Failed to get ThemeActive: %d\n", GetLastError()); + TRACE("Failed to get ThemeActive: %ld\n", GetLastError()); } buffsize = sizeof(szCurrentColor); if (RegQueryValueExW(hKey, L"ColorName", NULL, NULL, (BYTE*)szCurrentColor, &buffsize)) @@ -446,7 +446,7 @@ HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) if (!RegQueryValueExW(hKey, L"LoadedBefore", NULL, NULL, (BYTE *)tmp, &size)) loaded_before = (tmp[0] != '0'); else - WARN("Failed to get LoadedBefore: %d\n", GetLastError()); + WARN("Failed to get LoadedBefore: %ld\n", GetLastError()); RegCloseKey(hKey); } if (loaded_before && same_theme) @@ -621,7 +621,7 @@ static HTHEME open_theme_data(HWND hwnd, LPCWSTR pszClassList, DWORD flags, UINT LPCWSTR pszAppName; LPCWSTR pszUseClassList; HTHEME hTheme = NULL; - TRACE("(%p,%s, %x)\n", hwnd, debugstr_w(pszClassList), flags); + TRACE("(%p,%s, %lx)\n", hwnd, debugstr_w(pszClassList), flags); if(!pszClassList) { @@ -630,7 +630,7 @@ static HTHEME open_theme_data(HWND hwnd, LPCWSTR pszClassList, DWORD flags, UINT } if(flags) - FIXME("unhandled flags: %x\n", flags); + FIXME("unhandled flags: %lx\n", flags); if(bThemeActive) { @@ -738,7 +738,7 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, HRESULT WINAPI SetWindowThemeAttribute(HWND hwnd, enum WINDOWTHEMEATTRIBUTETYPE type, PVOID attribute, DWORD size) { - FIXME("(%p,%d,%p,%d): stub\n", hwnd, type, attribute, size); + FIXME("(%p,%d,%p,%ld): stub\n", hwnd, type, attribute, size); return E_NOTIMPL; } @@ -770,7 +770,7 @@ DWORD WINAPI GetThemeAppProperties(void) */ void WINAPI SetThemeAppProperties(DWORD dwFlags) { - TRACE("(0x%08x)\n", dwFlags); + TRACE("(0x%08lx)\n", dwFlags); dwThemeAppProperties = dwFlags; } @@ -793,7 +793,7 @@ HRESULT WINAPI HitTestThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, const RECT *pRect, HRGN hrgn, POINT ptTest, WORD *pwHitTestCode) { - FIXME("%d %d 0x%08x: stub\n", iPartId, iStateId, dwOptions); + FIXME("%d %d 0x%08lx: stub\n", iPartId, iStateId, dwOptions); if(!hTheme) return E_HANDLE; return E_NOTIMPL; @@ -912,7 +912,7 @@ HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, LPCWSTR pszColorName, LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile, DWORD unknown) { - TRACE("(%s,%s,%s,%p,%d)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%s,%s,%p,%ld)\n", debugstr_w(pszThemeFileName), debugstr_w(pszColorName), debugstr_w(pszSizeName), hThemeFile, unknown); return MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, pszSizeName, (PTHEME_FILE*)hThemeFile); @@ -992,7 +992,7 @@ HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, LPWSTR pszColorName, { PTHEME_FILE pt; HRESULT hr; - TRACE("(%s,%p,%d,%p,%d)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%p,%ld,%p,%ld)\n", debugstr_w(pszThemeFileName), pszColorName, dwColorNameLen, pszSizeName, dwSizeNameLen); @@ -1107,7 +1107,7 @@ HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName, LPWSTR pszSizeName, HRESULT hr; LPWSTR tmp; UINT resourceId = dwColorNum + 1000; - TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName), debugstr_w(pszSizeName), dwColorNum); hr = MSSTYLES_OpenThemeFile(pszThemeFileName, NULL, pszSizeName, &pt); @@ -1165,7 +1165,7 @@ HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, LPWSTR pszColorName, HRESULT hr; LPWSTR tmp; UINT resourceId = dwSizeNum + 3000; - TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName), debugstr_w(pszColorName), dwSizeNum); hr = MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, NULL, &pt);

1 0

Eric Pouech : user.exe16: Enable compilation with long types.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: 341b341605e1130a2f9c0d68263c40a39c477263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=341b341605e1130a2f9c0d68… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:57:44 2022 +0100 user.exe16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/Makefile.in | 1 - dlls/user.exe16/bidi.c | 2 +- dlls/user.exe16/comm.c | 8 ++++---- dlls/user.exe16/dialog.c | 4 ++-- dlls/user.exe16/message.c | 4 ++-- dlls/user.exe16/network.c | 2 +- dlls/user.exe16/user.c | 8 ++++---- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in index e4a2c4a723a..7e2438d033f 100644 --- a/dlls/user.exe16/Makefile.in +++ b/dlls/user.exe16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = user.exe16 IMPORTS = mpr user32 gdi32 win32u EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520 diff --git a/dlls/user.exe16/bidi.c b/dlls/user.exe16/bidi.c index d9a320f0271..7b91a322a10 100644 --- a/dlls/user.exe16/bidi.c +++ b/dlls/user.exe16/bidi.c @@ -309,7 +309,7 @@ void WINAPI SetDlgItemTextEx16( HWND16 hwnd, INT16 id, */ BOOL16 WINAPI SetProcessDefaultLayout16( DWORD dwDefaultLayout ) { - FIXME( "( %08x ): No BiDi16\n", dwDefaultLayout ); + FIXME( "( %08lx ): No BiDi16\n", dwDefaultLayout ); return SetProcessDefaultLayout( dwDefaultLayout ); } diff --git a/dlls/user.exe16/comm.c b/dlls/user.exe16/comm.c index 9125c6d0f37..911e0eeea4b 100644 --- a/dlls/user.exe16/comm.c +++ b/dlls/user.exe16/comm.c @@ -194,11 +194,11 @@ static VOID WINAPI COMM16_ReadComplete(DWORD dwErrorCode, DWORD len, LPOVERLAPPE /* read data from comm port */ if (dwErrorCode != NO_ERROR) { - ERR("async read failed, error %d\n",dwErrorCode); + ERR("async read failed, error %ld\n",dwErrorCode); COM[cid].commerror = CE_RXOVER; return; } - TRACE("async read completed %d bytes\n",len); + TRACE("async read completed %ld bytes\n",len); prev = comm_inbuf(ptr); @@ -274,11 +274,11 @@ static VOID WINAPI COMM16_WriteComplete(DWORD dwErrorCode, DWORD len, LPOVERLAPP /* read data from comm port */ if (dwErrorCode != NO_ERROR) { - ERR("async write failed, error %d\n",dwErrorCode); + ERR("async write failed, error %ld\n",dwErrorCode); COM[cid].commerror = CE_RXOVER; return; } - TRACE("async write completed %d bytes\n",len); + TRACE("async write completed %ld bytes\n",len); /* update the buffer pointers */ prev = comm_outbuf(&COM[cid]); diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index 10416384562..ecd7acb9bfc 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -156,7 +156,7 @@ static LPCSTR DIALOG_GetControl16( LPCSTR p, DLG_CONTROL_INFO *info ) p += *p + 1; - TRACE(" %s %s %d, %d, %d, %d, %d, %08x, %p\n", + TRACE(" %s %s %d, %d, %d, %d, %d, %08lx, %p\n", debugstr_a(info->className), debugstr_a(info->windowName), info->id, info->x, info->y, info->cx, info->cy, info->style, info->data ); @@ -238,7 +238,7 @@ static LPCSTR DIALOG_ParseTemplate16( LPCSTR p, DLG_TEMPLATE * result ) result->cy = GET_WORD(p); p += sizeof(WORD); TRACE("DIALOG %d, %d, %d, %d\n", result->x, result->y, result->cx, result->cy ); - TRACE(" STYLE %08x\n", result->style ); + TRACE(" STYLE %08lx\n", result->style ); /* Get the menu name */ diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 5d388a55312..6d3de0f77e6 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -895,7 +895,7 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 case 1: break; /* atom, nothing to do */ case 3: - WARN("DDE_ACK: %lx both atom and handle... choosing handle\n", hi); + WARN("DDE_ACK: %Ix both atom and handle... choosing handle\n", hi); /* fall through */ case 2: hi = convert_handle_16_to_32(hi, GMEM_DDESHARE); @@ -1278,7 +1278,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT case 1: break; /* atom, nothing to do */ case 3: - WARN("DDE_ACK: %lx both atom and handle... choosing handle\n", hi); + WARN("DDE_ACK: %Ix both atom and handle... choosing handle\n", hi); /* fall through */ case 2: hi = convert_handle_32_to_16(hi, GMEM_DDESHARE); diff --git a/dlls/user.exe16/network.c b/dlls/user.exe16/network.c index c137bb19f70..96135a3064a 100644 --- a/dlls/user.exe16/network.c +++ b/dlls/user.exe16/network.c @@ -319,7 +319,7 @@ WORD WINAPI WNetGetUser16( LPSTR szUser, LPINT16 nBufferSize ) case ERROR_MORE_DATA: return WN16_MORE_DATA; default: - FIXME("Untranslated return value %d\n", ret); + FIXME("Untranslated return value %ld\n", ret); } return ret; } diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 5063f9d2343..4a56a67389b 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1659,7 +1659,7 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr) LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, LPARAM lParam1, LPARAM lParam2) { - FIXME( "devID=0x%08x hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx: stub\n", + FIXME( "devID=0x%08lx hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx: stub\n", dwDevID, hDriv, wMsg, lParam1, lParam2); return 0; } @@ -1681,7 +1681,7 @@ BOOL16 WINAPI GetDriverInfo16(HDRVR16 hDrvr, struct DRIVERINFOSTRUCT16 *lpDrvInf */ HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags) { - FIXME( "(%04x, %08x): stub\n", hDrvr, dwFlags); + FIXME( "(%04x, %08lx): stub\n", hDrvr, dwFlags); return 0; } @@ -3170,7 +3170,7 @@ DWORD WINAPI FormatMessage16( BOOL eos = FALSE; LPSTR allocstring = NULL; - TRACE("(0x%x,%x,%d,0x%x,%p,%d,%p)\n", + TRACE("(0x%lx,%lx,%d,0x%x,%p,%d,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); if ((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) && (dwFlags & FORMAT_MESSAGE_FROM_HMODULE)) return 0; @@ -3179,7 +3179,7 @@ DWORD WINAPI FormatMessage16( || (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0; if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK) - FIXME("line wrapping (%u) not supported.\n", width); + FIXME("line wrapping (%lu) not supported.\n", width); from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_STRING) {

1 0

Eric Pouech : userenv: Enable compilation with long types.
by Alexandre Julliard 21 Feb '22

21 Feb '22

Module: wine Branch: master Commit: f383ad10b1e4011bf3fac64eeb761a454e01fa5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f383ad10b1e4011bf3fac64e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:57:38 2022 +0100 userenv: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/Makefile.in | 1 - dlls/userenv/userenv_main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in index 8dde5344c9c..dcda835708e 100644 --- a/dlls/userenv/Makefile.in +++ b/dlls/userenv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = userenv.dll IMPORTS = advapi32 IMPORTLIB = userenv diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 08dede60d35..2b5171254dc 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -349,7 +349,7 @@ BOOL WINAPI ExpandEnvironmentStringsForUserA( HANDLE hToken, LPCSTR lpSrc, { BOOL ret; - TRACE("%p %s %p %d\n", hToken, debugstr_a(lpSrc), lpDest, dwSize); + TRACE("%p %s %p %ld\n", hToken, debugstr_a(lpSrc), lpDest, dwSize); ret = ExpandEnvironmentStringsA( lpSrc, lpDest, dwSize ); TRACE("<- %s\n", debugstr_a(lpDest)); @@ -361,7 +361,7 @@ BOOL WINAPI ExpandEnvironmentStringsForUserW( HANDLE hToken, LPCWSTR lpSrc, { BOOL ret; - TRACE("%p %s %p %d\n", hToken, debugstr_w(lpSrc), lpDest, dwSize); + TRACE("%p %s %p %ld\n", hToken, debugstr_w(lpSrc), lpDest, dwSize); ret = ExpandEnvironmentStringsW( lpSrc, lpDest, dwSize ); TRACE("<- %s\n", debugstr_w(lpDest)); @@ -648,7 +648,7 @@ BOOL WINAPI LeaveCriticalPolicySection(HANDLE hSection) DWORD WINAPI GetAppliedGPOListW(DWORD dwFlags, LPCWSTR pMachineName, PSID pSidUser, GUID *pGuidExtension, PGROUP_POLICY_OBJECTW *ppGPOList) { - FIXME("(%x %s %p %s %p)\n", dwFlags, debugstr_w(pMachineName), pSidUser, debugstr_guid(pGuidExtension), ppGPOList); + FIXME("(%lx %s %p %s %p)\n", dwFlags, debugstr_w(pMachineName), pSidUser, debugstr_guid(pGuidExtension), ppGPOList); return ERROR_ACCESS_DENIED; } @@ -681,7 +681,7 @@ BOOL WINAPI USERENV_138( int csidl, LPCSTR lnk_dir, LPCSTR lnk_filename, LPCSTR work_directory, WORD hotkey, DWORD win_state, LPCSTR comment, LPCSTR loc_filename_resfile, DWORD loc_filename_resid) { - FIXME("(%d,%s,%s,%s,%s,%d,%s,0x%x,%d,%s,%s,%d) - stub\n", csidl, debugstr_a(lnk_dir), + FIXME("(%d,%s,%s,%s,%s,%ld,%s,0x%x,%ld,%s,%s,%ld) - stub\n", csidl, debugstr_a(lnk_dir), debugstr_a(lnk_filename), debugstr_a(lnk_target), debugstr_a(lnk_iconfile), lnk_iconid, debugstr_a(work_directory), hotkey, win_state, debugstr_a(comment), debugstr_a(loc_filename_resfile), loc_filename_resid );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022