November 2023 - Wine-Commits

Nikolay Sivov : gdi32/emf: Add a helper to pad variable length record data.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 30be9059726f6f9de26e71e405123114b8e3c33f URL: https://gitlab.winehq.org/wine/wine/-/commit/30be9059726f6f9de26e71e4051231… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 08:30:36 2023 +0100 gdi32/emf: Add a helper to pad variable length record data. --- dlls/gdi32/emfdc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 231b4ae217d..83e1b27d27b 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -30,6 +30,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); +static inline UINT aligned_size(UINT size) +{ + return (size + 3) & ~3; +} + +static inline void pad_record(void *record, UINT size) +{ + if (size & 3) memset((char *)record + size, 0, 4 - (size & 3)); +} struct emf { @@ -1159,7 +1168,7 @@ BOOL EMFDC_PolyDraw( DC_ATTR *dc_attr, const POINT *pts, const BYTE *types, DWOR size = use_small_emr ? offsetof( EMRPOLYDRAW16, apts[count] ) : offsetof( EMRPOLYDRAW, aptl[count] ); - size += (count + 3) & ~3; + size += aligned_size(count); if (!(emr = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; @@ -1169,7 +1178,7 @@ BOOL EMFDC_PolyDraw( DC_ATTR *dc_attr, const POINT *pts, const BYTE *types, DWOR types_dest = store_points( emr->aptl, pts, count, use_small_emr ); memcpy( types_dest, types, count ); - if (count & 3) memset( types_dest + count, 0, 4 - (count & 3) ); + pad_record( types_dest, count ); if (!emf->path) get_points_bounds( &emr->rclBounds, pts, count, 0 ); @@ -2510,7 +2519,7 @@ BOOL WINAPI GdiComment( HDC hdc, UINT bytes, const BYTE *buffer ) if (!(dc_attr = get_dc_attr( hdc )) || !get_dc_emf( dc_attr )) return FALSE; - rounded_size = (bytes+3) & ~3; + rounded_size = aligned_size(bytes); total = offsetof(EMRGDICOMMENT,Data) + rounded_size; emr = HeapAlloc(GetProcessHeap(), 0, total);

1 0

Nikolay Sivov : gdi32/emf: Check for allocation failure in GdiComment().
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 4fac4588bb5260b717c9bbeffabd33b06ac0a33b URL: https://gitlab.winehq.org/wine/wine/-/commit/4fac4588bb5260b717c9bbeffabd33… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 27 08:42:15 2023 +0100 gdi32/emf: Check for allocation failure in GdiComment(). --- dlls/gdi32/emfdc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index a3e263ae2a0..0d53fe8d553 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2522,6 +2522,9 @@ BOOL WINAPI GdiComment( HDC hdc, UINT bytes, const BYTE *buffer ) total = offsetof(EMRGDICOMMENT,Data) + aligned_size(bytes); emr = HeapAlloc(GetProcessHeap(), 0, total); + if (!emr) + return FALSE; + emr->emr.iType = EMR_GDICOMMENT; emr->emr.nSize = total; emr->cbData = bytes;

1 0

Aida Jonikienė : wined3d: Add extra debug info to shader_set_limits().
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 9cfb95964bcf16ea0563fe7a854197c17803b47d URL: https://gitlab.winehq.org/wine/wine/-/commit/9cfb95964bcf16ea0563fe7a854197… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Sun Nov 26 11:40:31 2023 +0200 wined3d: Add extra debug info to shader_set_limits(). This should help understand some virgl/ChromeOS-specific WineD3D behavior better. --- dlls/wined3d/shader.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b58546db875..d6f2ce71496 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -638,9 +638,10 @@ static void shader_set_limits(struct wined3d_shader *shader) } if (!shader->limits) { - FIXME("Unexpected shader version \"%u.%u\".\n", + FIXME("Unexpected shader version \"%u.%u\" (shader type %u).\n", shader->reg_maps.shader_version.major, - shader->reg_maps.shader_version.minor); + shader->reg_maps.shader_version.minor, + shader->reg_maps.shader_version.type); shader->limits = &limits_array[max(0, i - 1)].limits; } }

1 0

Zebediah Figura : winmm: Reimplement joystick axis mapping.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 8c985449c368c896fa2125090d71959ed6ea299e URL: https://gitlab.winehq.org/wine/wine/-/commit/8c985449c368c896fa2125090d7195… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 3 16:29:04 2023 -0500 winmm: Reimplement joystick axis mapping. This should more closely match the algorithm used by native, discovered through extensive manual testing. This does not include any automated tests, both because I could not get winmm to recognize a second plugged joystick, and (as I eventually discovered while testing) the number of tests that would be necessary to conclusively prove this algorithm turned out to be impractical. --- dlls/dinput/tests/joystick8.c | 16 ++-- dlls/winmm/joystick.c | 203 +++++++++++++++++++++++++++--------------- 2 files changed, 140 insertions(+), 79 deletions(-)

1 0

Zebediah Figura : ntdll: Allow specifying per-process channels.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 62a979347a4dc1bd68f79b86397de85c016ec588 URL: https://gitlab.winehq.org/wine/wine/-/commit/62a979347a4dc1bd68f79b86397de8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 29 17:00:30 2023 -0600 ntdll: Allow specifying per-process channels. Based on a patch by Michael Müller. --- dlls/ntdll/unix/debug.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 11bb7a2df22..e73ee05fc03 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -129,7 +129,7 @@ static void add_option( const char *name, unsigned char set, unsigned char clear } /* parse a set of debugging option specifications and add them to the option list */ -static void parse_options( const char *str ) +static void parse_options( const char *str, const char *app_name ) { char *opt, *next, *options; unsigned int i; @@ -137,11 +137,18 @@ static void parse_options( const char *str ) if (!(options = strdup(str))) return; for (opt = options; opt; opt = next) { - const char *p; + char *p; unsigned char set = 0, clear = 0; if ((next = strchr( opt, ',' ))) *next++ = 0; + if ((p = strchr( opt, ':' ))) + { + *p = 0; + if (strcasecmp( opt, app_name )) continue; + opt = p + 1; + } + p = opt + strcspn( opt, "+-" ); if (!p[0]) p = opt; /* assume it's a debug channel name */ @@ -182,7 +189,7 @@ static void debug_usage(void) { static const char usage[] = "Syntax of the WINEDEBUG variable:\n" - " WINEDEBUG=[class]+xxx,[class]-yyy,...\n\n" + " WINEDEBUG=[[process:]class]+xxx,[[process:]class]-yyy,...\n\n" "Example: WINEDEBUG=+relay,warn-heap\n" " turns on relay traces, disable heap warnings\n" "Available message classes: err, warn, fixme, trace\n"; @@ -194,6 +201,7 @@ static void debug_usage(void) static void init_options(void) { char *wine_debug = getenv("WINEDEBUG"); + const char *app_name, *p; struct stat st1, st2; nb_debug_options = 0; @@ -208,7 +216,11 @@ static void init_options(void) } if (!wine_debug) return; if (!strcmp( wine_debug, "help" )) debug_usage(); - parse_options( wine_debug ); + + app_name = main_argv[1]; + while ((p = strpbrk( app_name, "/\\" ))) app_name = p + 1; + + parse_options( wine_debug, app_name ); } /***********************************************************************

1 0

Rémi Bernon : dinput/tests: Use exotic axes ordering for winmm tests.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 9d9d33571657369d598b6cf2986760608cd77c7e URL: https://gitlab.winehq.org/wine/wine/-/commit/9d9d33571657369d598b6cf2986760… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 6 11:21:17 2023 +0200 dinput/tests: Use exotic axes ordering for winmm tests. --- dlls/dinput/tests/joystick8.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 191e5273e1d..29cd0836cbd 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -4434,13 +4434,13 @@ static BOOL test_winmm_joystick(void) REPORT_ID(1, 1), USAGE(1, HID_USAGE_GENERIC_X), - USAGE(1, HID_USAGE_GENERIC_Y), - USAGE(1, HID_USAGE_GENERIC_Z), USAGE(1, HID_USAGE_GENERIC_WHEEL), - USAGE(1, HID_USAGE_GENERIC_SLIDER), USAGE(1, HID_USAGE_GENERIC_RX), - USAGE(1, HID_USAGE_GENERIC_RY), + USAGE(1, HID_USAGE_GENERIC_DIAL), USAGE(1, HID_USAGE_GENERIC_RZ), + USAGE(1, HID_USAGE_GENERIC_SLIDER), + USAGE(1, HID_USAGE_GENERIC_Z), + USAGE(1, HID_USAGE_GENERIC_RY), LOGICAL_MINIMUM(1, 1), LOGICAL_MAXIMUM(4, 0xffff), PHYSICAL_MINIMUM(1, 1), @@ -4498,9 +4498,9 @@ static BOOL test_winmm_joystick(void) .wRmax = 0xffff, .wUmax = 0xffff, .wVmax = 0xffff, - .wCaps = JOYCAPS_HASZ | JOYCAPS_HASR | JOYCAPS_HASU | JOYCAPS_HASV | JOYCAPS_HASPOV | JOYCAPS_POV4DIR, + .wCaps = JOYCAPS_HASZ | JOYCAPS_HASR | JOYCAPS_HASU | JOYCAPS_HASPOV | JOYCAPS_POV4DIR, .wMaxAxes = 6, - .wNumAxes = 6, + .wNumAxes = 5, .wMaxButtons = 32, .szRegKey = L"DINPUT.DLL", }; @@ -4519,19 +4519,19 @@ static BOOL test_winmm_joystick(void) { { .dwSize = sizeof(JOYINFOEX), .dwFlags = 0xff, - .dwXpos = 0x7fff, .dwYpos = 0x7fff, .dwZpos = 0x7fff, .dwRpos = 0x7fff, .dwUpos = 0x7fff, .dwVpos = 0x7fff, + .dwXpos = 0x7fff, .dwYpos = 0x7fff, .dwZpos = 0x7fff, .dwRpos = 0x7fff, .dwUpos = 0x7fff, .dwVpos = 0, .dwButtons = 0, .dwButtonNumber = 0, .dwPOV = 0xffff, .dwReserved1 = 0xcdcdcdcd, .dwReserved2 = 0xcdcdcdcd, }, { .dwSize = sizeof(JOYINFOEX), .dwFlags = 0xff, - .dwXpos = 0, .dwYpos = 0x07ff, .dwZpos = 0x17ff, .dwRpos = 0x37ff, .dwUpos = 0x1fff, .dwVpos = 0x27ff, + .dwXpos = 0, .dwYpos = 0x0fff, .dwZpos = 0x2fff, .dwRpos = 0x1fff, .dwUpos = 0x27ff, .dwVpos = 0, .dwButtons = 0xf, .dwButtonNumber = 0x4, .dwPOV = 0, .dwReserved1 = 0xcdcdcdcd, .dwReserved2 = 0xcdcdcdcd, }, { .dwSize = sizeof(JOYINFOEX), .dwFlags = 0xff, - .dwXpos = 0x37ff, .dwYpos = 0x2fff, .dwZpos = 0x1fff, .dwRpos = 0, .dwUpos = 0x17ff, .dwVpos = 0x0fff, + .dwXpos = 0x37ff, .dwYpos = 0x27ff, .dwZpos = 0x07ff, .dwRpos = 0x17ff, .dwUpos = 0x0fff, .dwVpos = 0, .dwButtons = 0x6, .dwButtonNumber = 0x2, .dwPOV = 0x2328, .dwReserved1 = 0xcdcdcdcd, .dwReserved2 = 0xcdcdcdcd, }, @@ -4641,9 +4641,9 @@ static BOOL test_winmm_joystick(void) check_member( caps, expect_caps, "%#x", wUmax ); check_member( caps, expect_caps, "%#x", wVmin ); check_member( caps, expect_caps, "%#x", wVmax ); - check_member( caps, expect_caps, "%#x", wCaps ); + todo_wine check_member( caps, expect_caps, "%#x", wCaps ); check_member( caps, expect_caps, "%#x", wMaxAxes ); - check_member( caps, expect_caps, "%#x", wNumAxes ); + todo_wine check_member( caps, expect_caps, "%#x", wNumAxes ); check_member( caps, expect_caps, "%#x", wMaxButtons ); check_member_wstr( caps, expect_caps, szRegKey ); check_member_wstr( caps, expect_caps, szOEMVxD ); @@ -4677,11 +4677,11 @@ static BOOL test_winmm_joystick(void) check_member( infoex, expect_infoex[0], "%#lx", dwSize ); check_member( infoex, expect_infoex[0], "%#lx", dwFlags ); check_member( infoex, expect_infoex[0], "%#lx", dwXpos ); - check_member( infoex, expect_infoex[0], "%#lx", dwYpos ); + todo_wine check_member( infoex, expect_infoex[0], "%#lx", dwYpos ); check_member( infoex, expect_infoex[0], "%#lx", dwZpos ); check_member( infoex, expect_infoex[0], "%#lx", dwRpos ); check_member( infoex, expect_infoex[0], "%#lx", dwUpos ); - check_member( infoex, expect_infoex[0], "%#lx", dwVpos ); + todo_wine check_member( infoex, expect_infoex[0], "%#lx", dwVpos ); check_member( infoex, expect_infoex[0], "%#lx", dwButtons ); check_member( infoex, expect_infoex[0], "%#lx", dwButtonNumber ); check_member( infoex, expect_infoex[0], "%#lx", dwPOV ); @@ -4700,7 +4700,7 @@ static BOOL test_winmm_joystick(void) ret = joyGetPos( 0, &info ); ok( ret == 0, "joyGetPos returned %u\n", ret ); check_member( info, expect_info, "%#x", wXpos ); - check_member( info, expect_info, "%#x", wYpos ); + todo_wine check_member( info, expect_info, "%#x", wYpos ); check_member( info, expect_info, "%#x", wZpos ); check_member( info, expect_info, "%#x", wButtons ); @@ -4738,11 +4738,11 @@ static BOOL test_winmm_joystick(void) check_member( infoex, expect_infoex[1], "%#lx", dwSize ); check_member( infoex, expect_infoex[1], "%#lx", dwFlags ); check_member( infoex, expect_infoex[1], "%#lx", dwXpos ); - check_member( infoex, expect_infoex[1], "%#lx", dwYpos ); + todo_wine check_member( infoex, expect_infoex[1], "%#lx", dwYpos ); check_member( infoex, expect_infoex[1], "%#lx", dwZpos ); check_member( infoex, expect_infoex[1], "%#lx", dwRpos ); check_member( infoex, expect_infoex[1], "%#lx", dwUpos ); - check_member( infoex, expect_infoex[1], "%#lx", dwVpos ); + todo_wine check_member( infoex, expect_infoex[1], "%#lx", dwVpos ); check_member( infoex, expect_infoex[1], "%#lx", dwButtons ); check_member( infoex, expect_infoex[1], "%#lx", dwButtonNumber ); check_member( infoex, expect_infoex[1], "%#lx", dwPOV ); @@ -4760,11 +4760,11 @@ static BOOL test_winmm_joystick(void) check_member( infoex, expect_infoex[2], "%#lx", dwSize ); check_member( infoex, expect_infoex[2], "%#lx", dwFlags ); check_member( infoex, expect_infoex[2], "%#lx", dwXpos ); - check_member( infoex, expect_infoex[2], "%#lx", dwYpos ); + todo_wine check_member( infoex, expect_infoex[2], "%#lx", dwYpos ); check_member( infoex, expect_infoex[2], "%#lx", dwZpos ); check_member( infoex, expect_infoex[2], "%#lx", dwRpos ); check_member( infoex, expect_infoex[2], "%#lx", dwUpos ); - check_member( infoex, expect_infoex[2], "%#lx", dwVpos ); + todo_wine check_member( infoex, expect_infoex[2], "%#lx", dwVpos ); check_member( infoex, expect_infoex[2], "%#lx", dwButtons ); check_member( infoex, expect_infoex[2], "%#lx", dwButtonNumber ); check_member( infoex, expect_infoex[2], "%#lx", dwPOV );

1 0

Alex Henrie : uxtheme: Annotate UXINI_LoadINI with __WINE_DEALLOC.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 9947637469a34ffa405c59f6a6ebb41155b683f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/9947637469a34ffa405c59f6a6ebb4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 27 22:40:21 2023 -0700 uxtheme: Annotate UXINI_LoadINI with __WINE_DEALLOC. --- dlls/uxtheme/msstyles.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 38ff94d8c80..b2b0e0d8f22 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -113,8 +113,8 @@ HRESULT MSSTYLES_GetPropertyString(PTHEME_PROPERTY tp, LPWSTR pszBuff, int cchMa HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect); HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMargins); -PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName); void UXINI_CloseINI(PUXINI_FILE uf); +PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, const WCHAR *name) __WINE_DEALLOC(UXINI_CloseINI); LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen); BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName); LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen);

1 0

Alex Henrie : uxtheme: Use CRT allocation functions.
by Alexandre Julliard Nov. 30, 2023

Nov. 30, 2023

Module: wine Branch: master Commit: 4c4eb1129c489f89dc48106d5a25f198fda46ffc URL: https://gitlab.winehq.org/wine/wine/-/commit/4c4eb1129c489f89dc48106d5a25f1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 27 22:40:21 2023 -0700 uxtheme: Use CRT allocation functions. --- dlls/uxtheme/buffer.c | 5 ++--- dlls/uxtheme/msstyles.c | 23 +++++++++++------------ dlls/uxtheme/uxini.c | 5 ++--- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index f159d5c1be0..7003d3da3bc 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -30,7 +30,6 @@ #include "uxtheme.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); @@ -47,7 +46,7 @@ static void free_paintbuffer(struct paintbuffer *buffer) { DeleteObject(buffer->bitmap); DeleteDC(buffer->memorydc); - heap_free(buffer); + free(buffer); } static struct paintbuffer *get_buffer_obj(HPAINTBUFFER handle) @@ -95,7 +94,7 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, if (params) FIXME("painting parameters are ignored\n"); - buffer = heap_alloc(sizeof(*buffer)); + buffer = malloc(sizeof(*buffer)); buffer->targetdc = targetdc; buffer->rect = *rect; buffer->memorydc = CreateCompatibleDC(targetdc); diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 76d2f760b58..71603953ed2 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -34,7 +34,6 @@ #include "wine/exception.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); @@ -162,7 +161,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST goto invalid_theme; } - *tf = heap_alloc_zero(sizeof(THEME_FILE)); + *tf = calloc(1, sizeof(THEME_FILE)); (*tf)->hTheme = hTheme; GetFullPathNameW(lpThemeFile, MAX_PATH, (*tf)->szThemeFile, NULL); @@ -204,14 +203,14 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) while(ps->properties) { PTHEME_PROPERTY prop = ps->properties; ps->properties = prop->next; - heap_free(prop); + free(prop); } pcls->partstate = ps->next; - heap_free(ps); + free(ps); } pcls->signature = 0; - heap_free(pcls); + free(pcls); } } while (tf->images) @@ -219,9 +218,9 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) PTHEME_IMAGE img = tf->images; tf->images = img->next; DeleteObject (img->image); - heap_free(img); + free(img); } - heap_free(tf); + free(tf); } } } @@ -448,7 +447,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST PTHEME_CLASS cur = MSSTYLES_FindClass(tf, pszAppName, pszClassName); if(cur) return cur; - cur = heap_alloc(sizeof(*cur)); + cur = malloc(sizeof(*cur)); cur->signature = THEME_CLASS_SIGNATURE; cur->refcount = 0; cur->hTheme = tf->hTheme; @@ -537,7 +536,7 @@ static PTHEME_PARTSTATE MSSTYLES_AddPartState(PTHEME_CLASS tc, int iPartId, int PTHEME_PARTSTATE cur = MSSTYLES_FindPartState(tc, iPartId, iStateId, NULL); if(cur) return cur; - cur = heap_alloc(sizeof(*cur)); + cur = malloc(sizeof(*cur)); cur->iPartId = iPartId; cur->iStateId = iStateId; cur->properties = NULL; @@ -654,7 +653,7 @@ static PTHEME_PROPERTY MSSTYLES_AddProperty(PTHEME_PARTSTATE ps, int iPropertyPr /* Should duplicate properties overwrite the original, or be ignored? */ if(cur) return cur; - cur = heap_alloc(sizeof(*cur)); + cur = malloc(sizeof(*cur)); cur->iPrimitiveType = iPropertyPrimitive; cur->iPropertyId = iPropertyId; cur->lpValue = lpValue; @@ -695,7 +694,7 @@ static PTHEME_PROPERTY MSSTYLES_AddMetric(PTHEME_FILE tf, int iPropertyPrimitive /* Should duplicate properties overwrite the original, or be ignored? */ if(cur) return cur; - cur = heap_alloc(sizeof(*cur)); + cur = malloc(sizeof(*cur)); cur->iPrimitiveType = iPropertyPrimitive; cur->iPropertyId = iPropertyId; cur->lpValue = lpValue; @@ -1246,7 +1245,7 @@ HBITMAP MSSTYLES_LoadBitmap (PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha img = img->next; } /* Not found? Load from resources */ - img = heap_alloc(sizeof(*img)); + img = malloc(sizeof(*img)); img->image = LoadImageW(tc->hTheme, szFile, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); prepare_alpha (img->image, hasAlpha); img->hasAlpha = *hasAlpha; diff --git a/dlls/uxtheme/uxini.c b/dlls/uxtheme/uxini.c index 41a0551f82b..a5bd3d65467 100644 --- a/dlls/uxtheme/uxini.c +++ b/dlls/uxtheme/uxini.c @@ -25,7 +25,6 @@ #include "winnls.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); @@ -70,7 +69,7 @@ PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName) { } dwIniSize = SizeofResource(hTheme, hrsc) / sizeof(WCHAR); - uf = heap_alloc(sizeof(*uf)); + uf = malloc(sizeof(*uf)); uf->lpIni = lpThemesIni; uf->lpCurLoc = lpThemesIni; uf->lpEnd = lpThemesIni + dwIniSize; @@ -87,7 +86,7 @@ PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName) { */ void UXINI_CloseINI(PUXINI_FILE uf) { - heap_free(uf); + free(uf); } /**********************************************************************

1 0

Alex Henrie : cabarc: Use CRT allocation functions.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: wine Branch: master Commit: fcddf19498fca9b51baea705f5748b998f4560b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/fcddf19498fca9b51baea705f5748b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 27 19:57:14 2023 -0700 cabarc: Use CRT allocation functions. --- programs/cabarc/cabarc.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index c4622e43046..1bb8c38153e 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -47,12 +47,12 @@ static WCHAR **opt_files; static void * CDECL cab_alloc( ULONG size ) { - return HeapAlloc( GetProcessHeap(), 0, size ); + return malloc( size ); } static void CDECL cab_free( void *ptr ) { - HeapFree( GetProcessHeap(), 0, ptr ); + free( ptr ); } static WCHAR *strdupAtoW( UINT cp, const char *str ) @@ -61,7 +61,7 @@ static WCHAR *strdupAtoW( UINT cp, const char *str ) if (str) { DWORD len = MultiByteToWideChar( cp, 0, str, -1, NULL, 0 ); - if ((ret = cab_alloc( len * sizeof(WCHAR) ))) + if ((ret = malloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( cp, 0, str, -1, ret, len ); } return ret; @@ -73,7 +73,7 @@ static char *strdupWtoA( UINT cp, const WCHAR *str ) if (str) { DWORD len = WideCharToMultiByte( cp, 0, str, -1, NULL, 0, NULL, NULL ); - if ((ret = cab_alloc( len ))) + if ((ret = malloc( len ))) WideCharToMultiByte( cp, 0, str, -1, ret, len, NULL, NULL ); } return ret; @@ -236,21 +236,21 @@ static INT_PTR CDECL fci_get_open_info( char *name, USHORT *date, USHORT *time, { *err = GetLastError(); WINE_ERR( "failed to open %s: error %u\n", wine_dbgstr_w(nameW), *err ); - cab_free( nameW ); + free( nameW ); return -1; } if (!GetFileInformationByHandle( handle, &info )) { *err = GetLastError(); CloseHandle( handle ); - cab_free( nameW ); + free( nameW ); return -1; } FileTimeToDosDateTime( &info.ftLastWriteTime, date, time ); *attribs = info.dwFileAttributes & (_A_RDONLY | _A_HIDDEN | _A_SYSTEM | _A_ARCH); for (p = nameW; *p; p++) if (*p >= 0x80) break; if (*p) *attribs |= _A_NAME_IS_UTF; - cab_free( nameW ); + free( nameW ); return (INT_PTR)handle; } @@ -291,8 +291,7 @@ static void create_directories( const WCHAR *name ) WCHAR *path, *p; /* create the directory/directories */ - path = cab_alloc( (lstrlenW(name) + 1) * sizeof(WCHAR) ); - lstrcpyW(path, name); + path = wcsdup( name ); p = wcschr(path, '\\'); while (p != NULL) @@ -303,7 +302,7 @@ static void create_directories( const WCHAR *name ) *p = '\\'; p = wcschr(p+1, '\\'); } - cab_free( path ); + free( path ); } /* check if file name matches against one of the files specification */ @@ -349,7 +348,7 @@ static INT_PTR CDECL list_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf } wprintf( L"%s\n", nameW ); } - cab_free( nameW ); + free( nameW ); return 0; default: WINE_FIXME( "Unexpected notification type %d.\n", fdint ); @@ -394,7 +393,7 @@ static INT_PTR CDECL extract_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION if (opt_dest_dir) { - path = cab_alloc( (lstrlenW(opt_dest_dir) + lstrlenW(file) + 1) * sizeof(WCHAR) ); + path = malloc( (wcslen(opt_dest_dir) + wcslen(file) + 1) * sizeof(WCHAR) ); lstrcpyW( path, opt_dest_dir ); lstrcatW( path, file ); } @@ -410,8 +409,8 @@ static INT_PTR CDECL extract_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION } else ret = 0; - cab_free( nameW ); - if (path != file) cab_free( path ); + free( nameW ); + if (path != file) free( path ); return ret; case fdintCLOSE_FILE_INFO: @@ -464,7 +463,7 @@ static BOOL add_file( HFCI fci, WCHAR *name ) } ret = FCIAddFile( fci, path, filename, FALSE, fci_get_next_cab, fci_status, fci_get_open_info, opt_compression ); - cab_free( path ); + free( path ); return ret; } @@ -475,7 +474,7 @@ static BOOL add_directory( HFCI fci, WCHAR *dir ) WIN32_FIND_DATAW data; BOOL ret = TRUE; - if (!(buffer = cab_alloc( (lstrlenW(dir) + MAX_PATH + 2) * sizeof(WCHAR) ))) return FALSE; + if (!(buffer = malloc( (wcslen(dir) + MAX_PATH + 2) * sizeof(WCHAR) ))) return FALSE; lstrcpyW( buffer, dir ); p = buffer + lstrlenW( buffer ); if (p > buffer && p[-1] != '\\') *p++ = '\\'; @@ -498,7 +497,7 @@ static BOOL add_directory( HFCI fci, WCHAR *dir ) } while (FindNextFileW( handle, &data )); FindClose( handle ); } - cab_free( buffer ); + free( buffer ); return TRUE; }

1 0

Alexandre Julliard : include: Make strict prototypes the default.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: wine Branch: master Commit: 240e4387e81e0b139138ee2631ac6822acddffbc URL: https://gitlab.winehq.org/wine/wine/-/commit/240e4387e81e0b139138ee2631ac68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 29 20:56:06 2023 +0100 include: Make strict prototypes the default. --- include/mscoree.idl | 2 +- include/rpcndr.h | 2 +- include/vfw.h | 2 +- include/wincrypt.h | 2 +- include/windef.h | 3 +-- include/wine/glu.h | 2 +- include/wine/windef16.h | 6 ------ 7 files changed, 6 insertions(+), 13 deletions(-) diff --git a/include/mscoree.idl b/include/mscoree.idl index d7e3227e6c7..8d3f4d35e52 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -27,7 +27,7 @@ cpp_quote("HRESULT WINAPI GetCORSystemDirectory(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetCORVersion(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,LPWSTR,DWORD,DWORD*,LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI LoadLibraryShim(LPCWSTR,LPCWSTR,LPVOID,HMODULE*);") -cpp_quote("#ifdef WINE_STRICT_PROTOTYPES") +cpp_quote("#ifndef WINE_NO_STRICT_PROTOTYPES") cpp_quote("typedef HRESULT (__stdcall *FLockClrVersionCallback)(void);") cpp_quote("#else") cpp_quote("typedef HRESULT (__stdcall *FLockClrVersionCallback)();") diff --git a/include/rpcndr.h b/include/rpcndr.h index 4e2a4e1ddb6..75f93b48771 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -356,7 +356,7 @@ typedef struct _MIDL_SYNTAX_INFO typedef void (__RPC_API *STUB_THUNK)( PMIDL_STUB_MESSAGE ); -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES typedef LONG (__RPC_API *SERVER_ROUTINE)(void); #else typedef LONG (__RPC_API *SERVER_ROUTINE)(); diff --git a/include/vfw.h b/include/vfw.h index cec5345b01e..762e6af8c1a 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -499,7 +499,7 @@ BOOL VFWAPI ICInstall(DWORD fccType, DWORD fccHandler, LPARAM lParam, LPSTR BOOL VFWAPI ICRemove(DWORD fccType, DWORD fccHandler, UINT wFlags); LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO *picinfo, DWORD cb); HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode); -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPROC lpfnHandler); #else HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC lpfnHandler); diff --git a/include/wincrypt.h b/include/wincrypt.h index 0da94a31f73..c0e95f636ff 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -793,7 +793,7 @@ typedef struct _CRYPT_SMIME_CAPABILITIES { typedef struct _VTableProvStruc { DWORD Version; -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES BOOL (WINAPI *FuncVerifyImage)(LPCSTR,BYTE*); void (WINAPI *FuncReturnhWnd)(HWND*); #else diff --git a/include/windef.h b/include/windef.h index 78e4f56052c..79a96791151 100644 --- a/include/windef.h +++ b/include/windef.h @@ -248,7 +248,6 @@ typedef unsigned int DWORD, *PDWORD, *LPDWORD; #ifdef __WINESRC__ #define WINE_NO_UNICODE_MACROS 1 -#define WINE_STRICT_PROTOTYPES 1 #endif #ifdef WINE_NO_UNICODE_MACROS @@ -326,7 +325,7 @@ typedef HICON HCURSOR; /* Callback function pointers types */ -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES typedef INT_PTR (CALLBACK *FARPROC)(void); typedef INT_PTR (CALLBACK *NEARPROC)(void); typedef INT_PTR (CALLBACK *PROC)(void); diff --git a/include/wine/glu.h b/include/wine/glu.h index cb8b0934584..c5e2ef101cb 100644 --- a/include/wine/glu.h +++ b/include/wine/glu.h @@ -92,7 +92,7 @@ void APIENTRY gluLoadSamplingMatrices(GLUnurbs *nobj,const GLfloat modelMatrix[1 void APIENTRY gluNurbsProperty(GLUnurbs *nobj,GLenum property,GLfloat value); void APIENTRY gluGetNurbsProperty(GLUnurbs *nobj,GLenum property,GLfloat *value); -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES void APIENTRY gluQuadricCallback(GLUquadric *qobj,GLenum which,void (CALLBACK *fn)(void)); void APIENTRY gluTessCallback(GLUtesselator *tess,GLenum which,void (CALLBACK *fn)(void)); void APIENTRY gluNurbsCallback(GLUnurbs *nobj,GLenum which,void (CALLBACK *fn)(void)); diff --git a/include/wine/windef16.h b/include/wine/windef16.h index 40d96ee5706..2d6536fd46e 100644 --- a/include/wine/windef16.h +++ b/include/wine/windef16.h @@ -157,13 +157,7 @@ typedef BOOL16 (CALLBACK *PROPENUMPROC16)(HWND16,SEGPTR,HANDLE16); typedef VOID (CALLBACK *TIMERPROC16)(HWND16,UINT16,UINT16,DWORD); typedef LRESULT (CALLBACK *WNDENUMPROC16)(HWND16,LPARAM); typedef LRESULT (CALLBACK *WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM); - -#ifdef WINE_STRICT_PROTOTYPES typedef LRESULT (CALLBACK *FARPROC16)(void); typedef INT16 (CALLBACK *PROC16)(void); -#else -typedef LRESULT (CALLBACK *FARPROC16)(); -typedef INT16 (CALLBACK *PROC16)(); -#endif #endif /* __WINE_WINDEF16_H */

1 0