November 2022 - Wine-commits

Alex Henrie : urlmon: Use standard C functions for memory allocation.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 80175e41da9ced0b5fbaa250e9dab4d4a69400f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/80175e41da9ced0b5fbaa250e9dab4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 22 22:33:41 2022 -0700 urlmon: Use standard C functions for memory allocation. --- dlls/urlmon/axinstall.c | 14 +++--- dlls/urlmon/bindctx.c | 8 ++-- dlls/urlmon/binding.c | 46 ++++++++++---------- dlls/urlmon/bindprot.c | 50 ++++++++++----------- dlls/urlmon/download.c | 22 +++++----- dlls/urlmon/file.c | 4 +- dlls/urlmon/format.c | 8 ++-- dlls/urlmon/ftp.c | 4 +- dlls/urlmon/gopher.c | 4 +- dlls/urlmon/http.c | 22 +++++----- dlls/urlmon/mimefilter.c | 8 ++-- dlls/urlmon/mk.c | 12 +++--- dlls/urlmon/protocol.c | 6 +-- dlls/urlmon/sec_mgr.c | 57 ++++++++++++------------ dlls/urlmon/session.c | 38 ++++++++-------- dlls/urlmon/umon.c | 18 ++++---- dlls/urlmon/umstream.c | 8 ++-- dlls/urlmon/uri.c | 108 +++++++++++++++++++++++----------------------- dlls/urlmon/urlmon_main.c | 6 +-- dlls/urlmon/urlmon_main.h | 30 ++----------- dlls/urlmon/usrmarshal.c | 4 +- 21 files changed, 229 insertions(+), 248 deletions(-)

1 0

Rémi Bernon : rpcss: Use I_Rpc(Free|Allocate) in MIDL_user_(allocate|free).
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: f810a57590fa84f6684300516e1d160cb3109082 URL: https://gitlab.winehq.org/wine/wine/-/commit/f810a57590fa84f6684300516e1d16… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 18 18:37:44 2022 +0100 rpcss: Use I_Rpc(Free|Allocate) in MIDL_user_(allocate|free). In ept_map, rpcss uses TowerConstruct to allocate tower array elements. The array is later released by the generated stub code, and each element is ultimately freed using MIDL_user_free. TowerConstruct always allocate memory using I_RpcAllocate, we must use I_RpcFree to free it. --- programs/rpcss/irotp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/rpcss/irotp.c b/programs/rpcss/irotp.c index daf48daf0a7..357a7f84cd9 100644 --- a/programs/rpcss/irotp.c +++ b/programs/rpcss/irotp.c @@ -368,10 +368,10 @@ void __RPC_USER IrotContextHandle_rundown(IrotContextHandle ctxt_handle) void * __RPC_USER MIDL_user_allocate(SIZE_T size) { - return malloc(size); + return I_RpcAllocate(size); } void __RPC_USER MIDL_user_free(void * p) { - free(p); + I_RpcFree(p); }

1 0

Piotr Caban : winspool: Correctly free data allocated with GdiConvertToDevmodeW.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: f8a0d965675f91c1f447fd901fc1235d1729d990 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8a0d965675f91c1f447fd901fc123… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 22 15:11:21 2022 +0100 winspool: Correctly free data allocated with GdiConvertToDevmodeW. --- dlls/winspool.drv/info.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 6286dc36f3e..1434a5c1e2b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1748,7 +1748,7 @@ static void free_printer_info( void *data, DWORD level ) free( piW->pDriverName ); free( piW->pComment ); free( piW->pLocation ); - free( piW->pDevMode ); + heap_free( piW->pDevMode ); free( piW->pSepFile ); free( piW->pPrintProcessor ); free( piW->pDatatype ); @@ -1761,7 +1761,7 @@ static void free_printer_info( void *data, DWORD level ) { PRINTER_INFO_9W *piW = (PRINTER_INFO_9W *)data; - free( piW->pDevMode ); + heap_free( piW->pDevMode ); break; } @@ -1827,7 +1827,7 @@ INT WINAPI DeviceCapabilitiesA(const char *device, const char *portA, WORD cap, } cleanup: free(device_name); - free(devmode); + heap_free(devmode); free(port); return ret; } @@ -1893,7 +1893,7 @@ LONG WINAPI DocumentPropertiesA(HWND hwnd, HANDLE printer, char *device_name, DE DEVMODEWtoA( outputW, output ); free(device); - free(inputW); + heap_free(inputW); free(outputW); if (!mode && ret > 0) ret -= CCHDEVICENAME + CCHFORMNAME; @@ -2113,7 +2113,7 @@ BOOL WINAPI OpenPrinter2A(LPSTR name, HANDLE *printer, if (p_defaultsW) { RtlFreeUnicodeString(&datatypeU); - free(defaultsW.pDevMode); + heap_free(defaultsW.pDevMode); } RtlFreeUnicodeString(&nameU); @@ -3197,7 +3197,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, free(info2W->pDatatype); free(info2W->pPrintProcessor); free(info2W->pParameters); - free(info2W->pDevMode); + heap_free(info2W->pDevMode); free(info2W->pStatus); break; } @@ -3677,7 +3677,7 @@ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName, if (ptr && (buflen >= sz)) { DEVMODEW *dmW = GdiConvertToDevmodeW((DEVMODEA*)ptr); memcpy(ptr, dmW, sz); - free(dmW); + heap_free(dmW); } *needed = sz; return TRUE;

1 0

Alexandre Julliard : win32u: Use int instead of long types in a few places.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 670033b2cb04eab8575bab070356b1d51a95fe18 URL: https://gitlab.winehq.org/wine/wine/-/commit/670033b2cb04eab8575bab070356b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 16:02:56 2022 +0100 win32u: Use int instead of long types in a few places. To avoid typecasts in debug traces. --- dlls/win32u/clipboard.c | 4 ++-- dlls/win32u/dc.c | 2 +- dlls/win32u/dce.c | 2 +- dlls/win32u/defwnd.c | 8 ++++---- dlls/win32u/dibdrv/dibdrv.h | 2 +- dlls/win32u/font.c | 14 +++++++------- dlls/win32u/input.c | 17 +++++++++-------- dlls/win32u/menu.c | 6 ++++-- dlls/win32u/message.c | 4 ++-- dlls/win32u/ntgdi_private.h | 4 ++-- dlls/win32u/ntuser_private.h | 10 +++++----- dlls/win32u/rawinput.c | 2 +- dlls/win32u/sysparams.c | 6 +++--- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 10 +++++----- dlls/win32u/winstation.c | 2 +- 16 files changed, 49 insertions(+), 46 deletions(-)

1 0

Alexandre Julliard : win32u: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 5084f4da2b5486f2bb6f4a78c5e9762f31ed72b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/5084f4da2b5486f2bb6f4a78c5e976… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 16:13:58 2022 +0100 win32u: Build without -DWINE_NO_LONG_TYPES. --- dlls/win32u/Makefile.in | 1 - dlls/win32u/bitblt.c | 7 +++--- dlls/win32u/bitmap.c | 4 ++-- dlls/win32u/brush.c | 4 ++-- dlls/win32u/cursoricon.c | 2 +- dlls/win32u/dc.c | 6 ++--- dlls/win32u/dce.c | 6 ++--- dlls/win32u/defwnd.c | 14 +++++------ dlls/win32u/dib.c | 10 ++++---- dlls/win32u/dibdrv/bitblt.c | 4 ++-- dlls/win32u/dibdrv/graphics.c | 4 ++-- dlls/win32u/font.c | 55 ++++++++++++++++++++++--------------------- dlls/win32u/freetype.c | 10 ++++---- dlls/win32u/gdiobj.c | 4 ++-- dlls/win32u/hook.c | 11 +++++---- dlls/win32u/imm.c | 8 +++---- dlls/win32u/input.c | 12 +++++----- dlls/win32u/mapping.c | 2 +- dlls/win32u/menu.c | 22 ++++++++--------- dlls/win32u/message.c | 25 +++++++++++--------- dlls/win32u/painting.c | 2 +- dlls/win32u/palette.c | 4 ++-- dlls/win32u/path.c | 4 ++-- dlls/win32u/printdrv.c | 4 ++-- dlls/win32u/rawinput.c | 4 ++-- dlls/win32u/region.c | 6 ++--- dlls/win32u/scroll.c | 10 ++++---- dlls/win32u/spy.c | 30 +++++++++++------------ dlls/win32u/sysparams.c | 42 +++++++++++++++++---------------- dlls/win32u/window.c | 29 ++++++++++++----------- dlls/win32u/winstation.c | 6 ++--- 31 files changed, 181 insertions(+), 171 deletions(-)

1 0

Alexandre Julliard : makedep: Unify the search for static and import libs.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 51087b9b650952b0f62880826792db1a3d2e5dba URL: https://gitlab.winehq.org/wine/wine/-/commit/51087b9b650952b0f62880826792db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 17:47:39 2022 +0100 makedep: Unify the search for static and import libs. --- tools/makedep.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 484d2902817..a3a665cc84a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2065,16 +2065,23 @@ static struct strarray get_local_dependencies( const struct makefile *make, cons /******************************************************************* * get_static_lib * - * Check if makefile builds the named static library and return the full lib path. + * Find the makefile that builds the named static library (which may be an import lib). */ -static const char *get_static_lib( const struct makefile *make, const char *name, unsigned int arch ) +static struct makefile *get_static_lib( const char *name, unsigned int arch ) { - if (!make->staticlib) return NULL; - if (make->disabled[arch]) return NULL; - if (strncmp( make->staticlib, "lib", 3 )) return NULL; - if (strncmp( make->staticlib + 3, name, strlen(name) )) return NULL; - if (strcmp( make->staticlib + 3 + strlen(name), ".a" )) return NULL; - return obj_dir_path( make, strmake( "%s%s", arch_dirs[arch], make->staticlib )); + unsigned int i; + + for (i = 0; i < subdirs.count; i++) + { + if (submakes[i]->importlib && !strcmp( submakes[i]->importlib, name )) return submakes[i]; + if (!submakes[i]->staticlib) continue; + if (submakes[i]->disabled[arch]) continue; + if (strncmp( submakes[i]->staticlib, "lib", 3 )) continue; + if (strncmp( submakes[i]->staticlib + 3, name, strlen(name) )) continue; + if (strcmp( submakes[i]->staticlib + 3 + strlen(name), ".a" )) continue; + return submakes[i]; + } + return NULL; } @@ -2240,12 +2247,12 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra struct strarray imports, enum import_type type, unsigned int arch ) { struct strarray ret = empty_strarray; - unsigned int i, j; + unsigned int i; for (i = 0; i < imports.count; i++) { const char *name = imports.str[i]; - const char *lib = NULL; + struct makefile *submake; /* add crt import lib only when adding the default imports libs */ if (is_crt_module( imports.str[i] ) && type != IMPORT_TYPE_DEFAULT) continue; @@ -2261,21 +2268,10 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra } else name = get_base_name( name ); - for (j = 0; j < subdirs.count; j++) + if ((submake = get_static_lib( name, arch ))) { - if (submakes[j]->importlib && !strcmp( submakes[j]->importlib, name )) - lib = obj_dir_path( submakes[j], strmake( "%slib%s.a", arch_dirs[arch], name )); - else - lib = get_static_lib( submakes[j], name, arch ); - if (lib) break; - } - - if (lib) - { - const char *ext = NULL; - - if (type == IMPORT_TYPE_DELAYED && !delay_load_flags[arch]) ext = ".delay.a"; - if (ext) lib = replace_extension( lib, ".a", ext ); + const char *ext = (type == IMPORT_TYPE_DELAYED && !delay_load_flags[arch]) ? ".delay.a" : ".a"; + const char *lib = obj_dir_path( submake, strmake( "%slib%s%s", arch_dirs[arch], name, ext )); strarray_add_uniq( deps, lib ); strarray_add( &ret, lib ); }

1 0

Alexandre Julliard : makedep: Pass the actual name of the module in the delay load flags.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 020e2b6bb46b3bc39d2088d6ff668e64b2576aae URL: https://gitlab.winehq.org/wine/wine/-/commit/020e2b6bb46b3bc39d2088d6ff668e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 17:50:43 2022 +0100 makedep: Pass the actual name of the module in the delay load flags. --- tools/makedep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index a3a665cc84a..893808930fb 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3323,8 +3323,10 @@ static void output_module( struct makefile *make, unsigned int arch ) if (delay_load_flags[arch]) { for (i = 0; i < make->delayimports.count; i++) - strarray_add( &all_libs, strmake( "%s%s%s", delay_load_flags[arch], make->delayimports.str[i], - strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); + { + struct makefile *import = get_static_lib( make->delayimports.str[i], arch ); + if (import) strarray_add( &all_libs, strmake( "%s%s", delay_load_flags[arch], import->module )); + } } } else module_name = strmake( "%s%s", arch_pe_dirs[arch], make->module );

1 0

Alexandre Julliard : kernel32/tests: Don't filter out the WINELOADER variable.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: b00a831d3d02e77c07dcc0afda23717c9e4fa51b URL: https://gitlab.winehq.org/wine/wine/-/commit/b00a831d3d02e77c07dcc0afda2371… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 11:07:30 2022 +0100 kernel32/tests: Don't filter out the WINELOADER variable. --- dlls/kernel32/tests/process.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b582727f93b..0d877f715aa 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1374,14 +1374,12 @@ static void test_Environment(void) strcpy(ptr, "BAR=FOOBAR"); ptr += strlen(ptr) + 1; /* copy all existing variables except: - * - WINELOADER * - PATH (already set above) * - the directory definitions (=[A-Z]:=) */ for (ptr2 = env; *ptr2; ptr2 += strlen(ptr2) + 1) { if (strncmp(ptr2, "PATH=", 5) != 0 && - strncmp(ptr2, "WINELOADER=", 11) != 0 && !is_str_env_drive_dir(ptr2)) { strcpy(ptr, ptr2); @@ -1420,7 +1418,7 @@ static void test_SuspendFlag(void) ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(GetExitCodeThread(info.hThread, &exit_status) && exit_status == STILL_ACTIVE, "thread still running\n"); - Sleep(1000); + Sleep(100); ok(GetExitCodeThread(info.hThread, &exit_status) && exit_status == STILL_ACTIVE, "thread still running\n"); ok(ResumeThread(info.hThread) == 1, "Resuming thread\n");

1 0

Alexandre Julliard : win32: Fix int/long type mismatches.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 7eb1e94299913a9084c95e065874e2a5ada86bf4 URL: https://gitlab.winehq.org/wine/wine/-/commit/7eb1e94299913a9084c95e065874e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 12:02:27 2022 +0100 win32: Fix int/long type mismatches. --- dlls/win32u/class.c | 4 ++-- dlls/win32u/clipboard.c | 4 +++- dlls/win32u/dibdrv/bitblt.c | 4 ++-- dlls/win32u/dibdrv/objects.c | 4 ++-- dlls/win32u/sysparams.c | 2 +- dlls/win32u/win32u_private.h | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 28eabcc1f51..b18fd69edfc 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -241,9 +241,9 @@ DLGPROC get_dialog_proc( DLGPROC ret, BOOL ansi ) { WINDOWPROC *proc; - if (!(proc = get_winproc_ptr( ret ))) return ret; + if (!(proc = get_winproc_ptr( (WNDPROC)ret ))) return ret; if (proc == WINPROC_PROC16) return WINPROC_PROC16; - return ansi ? proc->procA : proc->procW; + return (DLGPROC)(ansi ? proc->procA : proc->procW); } static void init_user(void) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 23d83863bbb..a3004dd032a 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -570,6 +570,7 @@ void release_clipboard_owner( HWND hwnd ) NTSTATUS WINAPI NtUserSetClipboardData( UINT format, HANDLE data, struct set_clipboard_params *params ) { struct cached_format *cache = NULL, *prev = NULL; + LCID lcid; void *ptr = NULL; data_size_t size = 0; NTSTATUS status = STATUS_SUCCESS; @@ -603,13 +604,14 @@ NTSTATUS WINAPI NtUserSetClipboardData( UINT format, HANDLE data, struct set_cli make_gdi_object_system( cache->handle, TRUE ); } } + NtQueryDefaultLocale( TRUE, &lcid ); pthread_mutex_lock( &clipboard_mutex ); SERVER_START_REQ( set_clipboard_data ) { req->format = format; - NtQueryDefaultLocale( TRUE, &req->lcid ); + req->lcid = lcid; wine_server_add_data( req, ptr, size ); if (!(status = wine_server_call( req ))) { diff --git a/dlls/win32u/dibdrv/bitblt.c b/dlls/win32u/dibdrv/bitblt.c index 131100b01b0..76c46e723a6 100644 --- a/dlls/win32u/dibdrv/bitblt.c +++ b/dlls/win32u/dibdrv/bitblt.c @@ -1111,8 +1111,8 @@ update_format: */ static DWORD calc_1d_stretch_params( INT dst_start, INT dst_length, INT dst_vis_start, INT dst_vis_end, INT src_start, INT src_length, INT src_vis_start, INT src_vis_end, - INT *dst_clipped_start, INT *src_clipped_start, - INT *dst_clipped_end, INT *src_clipped_end, + LONG *dst_clipped_start, LONG *src_clipped_start, + LONG *dst_clipped_end, LONG *src_clipped_end, struct stretch_params *stretch_params, BOOL *stretch ) { bres_params bres_params; diff --git a/dlls/win32u/dibdrv/objects.c b/dlls/win32u/dibdrv/objects.c index d9979a05fa6..a6f5e8d2e3d 100644 --- a/dlls/win32u/dibdrv/objects.c +++ b/dlls/win32u/dibdrv/objects.c @@ -229,11 +229,11 @@ static inline void get_color_masks( DC *dc, const dib_info *dib, UINT rop, COLOR calc_rop_masks( rop, color, bg_mask ); } -static inline void order_end_points(int *s, int *e) +static inline void order_end_points(LONG *s, LONG *e) { if(*s > *e) { - int tmp; + LONG tmp; tmp = *s + 1; *s = *e + 1; *e = tmp; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 85595c0cb9a..db6d07110e3 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -5337,7 +5337,7 @@ BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *va } -static DPI_AWARENESS dpi_awareness; +static LONG dpi_awareness; /*********************************************************************** * NtUserSetProcessDpiAwarenessContext (win32u.@) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index e8ff02ffb75..caab312482e 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -138,7 +138,7 @@ struct unix_funcs INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask, DWORD bk_color ); BOOL (WINAPI *pNtGdiPolyDraw)(HDC hdc, const POINT *points, const BYTE *types, DWORD count ); - ULONG (WINAPI *pNtGdiPolyPolyDraw)( HDC hdc, const POINT *points, const UINT *counts, + ULONG (WINAPI *pNtGdiPolyPolyDraw)( HDC hdc, const POINT *points, const ULONG *counts, DWORD count, UINT function ); BOOL (WINAPI *pNtGdiPtVisible)( HDC hdc, INT x, INT y ); BOOL (WINAPI *pNtGdiRectVisible)( HDC hdc, const RECT *rect );

1 0

Alexandre Julliard : win32u: Add a debug helper to print color values.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 3ae7035afdaa09eade10e33fc3f3609fadfebfdf URL: https://gitlab.winehq.org/wine/wine/-/commit/3ae7035afdaa09eade10e33fc3f360… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 12:02:51 2022 +0100 win32u: Add a debug helper to print color values. --- dlls/win32u/brush.c | 4 ++-- dlls/win32u/dibdrv/graphics.c | 6 +++--- dlls/win32u/palette.c | 4 ++-- dlls/win32u/pen.c | 2 +- dlls/win32u/win32u_private.h | 9 +++++++++ dlls/win32u/window.c | 2 +- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/brush.c b/dlls/win32u/brush.c index f9b718b4d2e..c5a9eb91d7b 100644 --- a/dlls/win32u/brush.c +++ b/dlls/win32u/brush.c @@ -222,7 +222,7 @@ HBRUSH WINAPI NtGdiCreateHatchBrushInternal( INT style, COLORREF color, BOOL pen { LOGBRUSH logbrush; - TRACE( "%d %06x\n", style, color ); + TRACE( "%d %s\n", style, debugstr_color(color) ); logbrush.lbStyle = BS_HATCHED; logbrush.lbColor = color; @@ -282,7 +282,7 @@ HBRUSH WINAPI NtGdiCreateSolidBrush( COLORREF color, HBRUSH brush ) { LOGBRUSH logbrush; - TRACE("%06x\n", color ); + TRACE("%s\n", debugstr_color(color) ); logbrush.lbStyle = BS_SOLID; logbrush.lbColor = color; diff --git a/dlls/win32u/dibdrv/graphics.c b/dlls/win32u/dibdrv/graphics.c index 32d98572801..1eda7d2256a 100644 --- a/dlls/win32u/dibdrv/graphics.c +++ b/dlls/win32u/dibdrv/graphics.c @@ -1056,7 +1056,7 @@ BOOL CDECL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT RECT row; HRGN rgn; - TRACE( "(%p, %d, %d, %08x, %d)\n", pdev, x, y, color, type ); + TRACE( "(%p, %d, %d, %s, %d)\n", pdev, x, y, debugstr_color(color), type ); if (x < 0 || x >= pdev->dib.rect.right - pdev->dib.rect.left || y < 0 || y >= pdev->dib.rect.bottom - pdev->dib.rect.top) return FALSE; @@ -1097,7 +1097,7 @@ COLORREF CDECL dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DC *dc = get_physdev_dc( dev ); DWORD pixel; - TRACE( "(%p, %08x)\n", dev, color ); + TRACE( "(%p, %s)\n", dev, debugstr_color(color) ); pixel = get_pixel_color( dc, &pdev->dib, color, FALSE ); return pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pixel ); @@ -1575,7 +1575,7 @@ COLORREF CDECL dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) POINT pt; DWORD pixel; - TRACE( "(%p, %d, %d, %08x)\n", dev, x, y, color ); + TRACE( "(%p, %d, %d, %s)\n", dev, x, y, debugstr_color(color) ); pt.x = x; pt.y = y; diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index e8fd51dba22..6d5d1feb292 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -384,7 +384,7 @@ UINT WINAPI NtGdiGetNearestPaletteIndex( HPALETTE hpalette, COLORREF color ) } GDI_ReleaseObj( hpalette ); } - TRACE("(%p,%06x): returning %d\n", hpalette, color, index ); + TRACE("(%p,%s): returning %d\n", hpalette, debugstr_color(color), index ); return index; } @@ -413,7 +413,7 @@ COLORREF CDECL nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) if (!get_palette_entries( hpal, index, 1, &entry )) { - WARN("RGB(%x) : idx %d is out of bounds, assuming NULL\n", color, index ); + WARN("%s: idx %d is out of bounds, assuming NULL\n", debugstr_color(color), index ); if (!get_palette_entries( hpal, 0, 1, &entry )) return CLR_INVALID; } color = RGB( entry.peRed, entry.peGreen, entry.peBlue ); diff --git a/dlls/win32u/pen.c b/dlls/win32u/pen.c index 551c4438f3c..f45d7bb1c4e 100644 --- a/dlls/win32u/pen.c +++ b/dlls/win32u/pen.c @@ -59,7 +59,7 @@ HPEN create_pen( INT style, INT width, COLORREF color ) PENOBJ *penPtr; HPEN hpen; - TRACE( "%d %d %06x\n", style, width, color ); + TRACE( "%d %d %s\n", style, width, debugstr_color(color) ); switch (style) { diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index caab312482e..bc64bedb22b 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -506,4 +506,13 @@ static inline const char *debugstr_us( const UNICODE_STRING *us ) return debugstr_wn( us->Buffer, us->Length / sizeof(WCHAR) ); } +static inline const char *debugstr_color( COLORREF color ) +{ + if (color & (1 << 24)) /* PALETTEINDEX */ + return wine_dbg_sprintf( "PALETTEINDEX(%u)", LOWORD(color) ); + if (color >> 16 == 0x10ff) /* DIBINDEX */ + return wine_dbg_sprintf( "DIBINDEX(%u)", LOWORD(color) ); + return wine_dbg_sprintf( "RGB(%02x,%02x,%02x)", GetRValue(color), GetGValue(color), GetBValue(color) ); +} + #endif /* __WINE_WIN32U_PRIVATE */ diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index d92c09689ed..e9328cee55b 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2066,7 +2066,7 @@ BOOL WINAPI NtUserSetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alph { BOOL ret; - TRACE( "(%p,%08x,%d,%x)\n", hwnd, key, alpha, flags ); + TRACE( "(%p,%s,%d,%x)\n", hwnd, debugstr_color(key), alpha, flags ); SERVER_START_REQ( set_window_layered_info ) {

1 0