- Wine-Commits - list.winehq.org

Jacek Caban : win32u: Don't use CDECL for __wine_get_wgl_driver.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: c2a43defec3efca05d38cd83ffa53412766fdc80 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2a43defec3efca05d38cd83ffa534… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 22 16:46:14 2022 +0100 win32u: Don't use CDECL for __wine_get_wgl_driver. --- dlls/opengl32/make_opengl | 2 +- dlls/win32u/dc.c | 2 +- include/wine/gdi_driver.h | 2 -- include/wine/wgl_driver.h | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 5654ddfa824..5d995495abd 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -925,7 +925,7 @@ foreach (sort keys %norm_functions) } print HEADER "\n\n"; -print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; +print HEADER "extern struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n"; close HEADER; diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 2e59dc8dc9c..8379cd353ef 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -1491,7 +1491,7 @@ BOOL CDECL __wine_get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, WCH /*********************************************************************** * __wine_get_wgl_driver (win32u.@) */ -struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) +struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ) { BOOL is_display, is_memdc; DC *dc; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index edde473b4d1..d074c09cceb 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -340,6 +340,4 @@ extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT #endif /* WINE_UNIX_LIB */ -extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); - #endif /* __WINE_WINE_GDI_DRIVER_H */ diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h index 36b1f384ddf..c35847ff2e4 100644 --- a/include/wine/wgl_driver.h +++ b/include/wine/wgl_driver.h @@ -7,7 +7,7 @@ #define WINE_GLAPI #endif -#define WINE_WGL_DRIVER_VERSION 21 +#define WINE_WGL_DRIVER_VERSION 22 struct wgl_context; struct wgl_pbuffer; @@ -3405,6 +3405,6 @@ struct opengl_funcs USE_GL_FUNC(glVertexPointer) \ USE_GL_FUNC(glViewport) -extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); +extern struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ); #endif /* __WINE_WGL_DRIVER_H */

1 0

Martin Storsjö : ntdll: Avoid accidentally picking up ntdll's __wine_unix_call_funcs for other DLLs.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: d6829bdcbabd5e1a32a2585604eb0aa96b2a6271 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6829bdcbabd5e1a32a2585604eb0a… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Nov 23 14:41:14 2022 +0200 ntdll: Avoid accidentally picking up ntdll's __wine_unix_call_funcs for other DLLs. When f7332ab4a6e199d03e4318d82c0b16a0396b935c switched load_so_dll over to a proper Unix syscall, ntdll.so started providing the symbol __wine_unix_call_funcs. When a DLL calls NtQueryVirtualMemory(MemoryWineUnixFuncs), it can do so speculatively, not knowing whether the corresponding unix lib actually does provide anything. When ntdll.so started providing this symbol, then such speculative calls to NtQueryVirtualMemory(MemoryWineUnixFuncs) would end up returning ntdll's __wine_unix_call_funcs if the intended DLL's unix library lacked one. This is the case with bcrypt, where the unix library doesn't provide __wine_unix_call_funcs if gnutls is unavailable. This fixes crashes after f7332ab4a6e199d03e4318d82c0b16a0396b935c, in builds without gnutls. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/unix/unix_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a7fae7ab7ab..aad472faff8 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -43,8 +43,8 @@ static const WORD current_machine = IMAGE_FILE_MACHINE_ARM64; extern WORD native_machine DECLSPEC_HIDDEN; extern HMODULE ntdll_module DECLSPEC_HIDDEN; -extern const unixlib_entry_t __wine_unix_call_funcs[]; -extern const unixlib_entry_t __wine_unix_call_wow64_funcs[]; +extern const unixlib_entry_t __wine_unix_call_funcs[] DECLSPEC_HIDDEN; +extern const unixlib_entry_t __wine_unix_call_wow64_funcs[] DECLSPEC_HIDDEN; static const BOOL is_win64 = (sizeof(void *) > sizeof(int));

1 0

Zebediah Figura : ntdll: Avoid casting a struct to its first field.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 793cc934d98b4c753abc60eebc94d3ada5238867 URL: https://gitlab.winehq.org/wine/wine/-/commit/793cc934d98b4c753abc60eebc94d3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 9 16:17:33 2022 -0600 ntdll: Avoid casting a struct to its first field. --- dlls/ntdll/heap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 014851c0dae..fd761215c5a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1022,7 +1022,7 @@ static struct block *find_free_block( struct heap *heap, SIZE_T block_size, SUBH while ((ptr = list_next( &heap->free_lists[0].entry, ptr ))) { entry = LIST_ENTRY( ptr, struct entry, entry ); - block = (struct block *)entry; + block = &entry->block; if (block_get_flags( block ) == BLOCK_FLAG_FREE_LINK) continue; if (block_get_size( block ) >= block_size) { @@ -1062,7 +1062,7 @@ static struct block *find_free_block( struct heap *heap, SIZE_T block_size, SUBH entry = first_block( *subheap ); list_remove( &entry->entry ); - return (struct block *)entry; + return &entry->block; } @@ -1091,11 +1091,11 @@ static BOOL validate_free_block( const struct heap *heap, const SUBHEAP *subheap err = "invalid block flags"; else if (!contains( base, subheap_size( subheap ), block, block_get_size( block ) )) err = "invalid block size"; - else if (!is_valid_free_block( heap, (next = (struct block *)LIST_ENTRY( entry->entry.next, struct entry, entry )) )) + else if (!is_valid_free_block( heap, (next = &LIST_ENTRY( entry->entry.next, struct entry, entry )->block) )) err = "invalid next free block pointer"; else if (!(block_get_flags( next ) & BLOCK_FLAG_FREE) || block_get_type( next ) != BLOCK_TYPE_FREE) err = "invalid next free block header"; - else if (!is_valid_free_block( heap, (prev = (struct block *)LIST_ENTRY( entry->entry.prev, struct entry, entry )) )) + else if (!is_valid_free_block( heap, (prev = &LIST_ENTRY( entry->entry.prev, struct entry, entry )->block) )) err = "invalid previous free block pointer"; else if (!(block_get_flags( prev ) & BLOCK_FLAG_FREE) || block_get_type( prev ) != BLOCK_TYPE_FREE) err = "invalid previous free block header";

1 0

Zebediah Figura : ntdll: Always trace sizes with %#x.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 5741f94d1bebbb32eb32b422745e016866cd8a2a URL: https://gitlab.winehq.org/wine/wine/-/commit/5741f94d1bebbb32eb32b422745e01… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 9 16:16:57 2022 -0600 ntdll: Always trace sizes with %#x. --- dlls/ntdll/heap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index a6db3444374..014851c0dae 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -507,7 +507,7 @@ static void heap_dump( const struct heap *heap ) TRACE( " free_lists: %p\n", heap->free_lists ); for (i = 0; i < HEAP_NB_FREE_LISTS; i++) - TRACE( " %p: size %8Ix, prev %p, next %p\n", heap->free_lists + i, get_free_list_block_size( i ), + TRACE( " %p: size %#8Ix, prev %p, next %p\n", heap->free_lists + i, get_free_list_block_size( i ), LIST_ENTRY( heap->free_lists[i].entry.prev, struct entry, entry ), LIST_ENTRY( heap->free_lists[i].entry.next, struct entry, entry ) ); @@ -801,7 +801,7 @@ static struct block *allocate_large_block( struct heap *heap, DWORD flags, SIZE_ if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &total_size, MEM_COMMIT, get_protection_type( flags ))) { - WARN("Could not allocate block for %08Ix bytes\n", size ); + WARN( "Could not allocate block for %#Ix bytes\n", size ); return NULL; } @@ -860,7 +860,7 @@ static struct block *realloc_large_block( struct heap *heap, DWORD flags, struct if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return NULL; if (!(block = allocate_large_block( heap, flags, size ))) { - WARN("Could not allocate block for %08Ix bytes\n", size ); + WARN( "Could not allocate block for %#Ix bytes\n", size ); return NULL; } @@ -934,13 +934,13 @@ static SUBHEAP *HEAP_CreateSubHeap( struct heap **heap_ptr, LPVOID address, DWOR if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &totalSize, MEM_RESERVE, get_protection_type( flags ) )) { - WARN("Could not allocate %08Ix bytes\n", totalSize ); + WARN( "Could not allocate %#Ix bytes\n", totalSize ); return NULL; } if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &commitSize, MEM_COMMIT, get_protection_type( flags ) )) { - WARN("Could not commit %08Ix bytes for sub-heap %p\n", commitSize, address ); + WARN( "Could not commit %#Ix bytes for sub-heap %p\n", commitSize, address ); return NULL; } } @@ -1037,7 +1037,7 @@ static struct block *find_free_block( struct heap *heap, SIZE_T block_size, SUBH if (!(heap->flags & HEAP_GROWABLE)) { - WARN("Not enough space in heap %p for %08Ix bytes\n", heap, block_size ); + WARN( "Not enough space in heap %p for %#Ix bytes\n", heap, block_size ); return NULL; } @@ -1058,7 +1058,7 @@ static struct block *find_free_block( struct heap *heap, SIZE_T block_size, SUBH max( heap->grow_size, total_size ) ); } - TRACE( "created new sub-heap %p of %08Ix bytes for heap %p\n", *subheap, subheap_size( *subheap ), heap ); + TRACE( "created new sub-heap %p of %#Ix bytes for heap %p\n", *subheap, subheap_size( *subheap ), heap ); entry = first_block( *subheap ); list_remove( &entry->entry );

1 0

Zebediah Figura : ntdll: Remove an unnecessary cast.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: fadefecd156bfd54f34bea660231c173e7070a6d URL: https://gitlab.winehq.org/wine/wine/-/commit/fadefecd156bfd54f34bea660231c1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 9 16:19:47 2022 -0600 ntdll: Remove an unnecessary cast. --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index fd761215c5a..048fc0e5264 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1099,7 +1099,7 @@ static BOOL validate_free_block( const struct heap *heap, const SUBHEAP *subheap err = "invalid previous free block pointer"; else if (!(block_get_flags( prev ) & BLOCK_FLAG_FREE) || block_get_type( prev ) != BLOCK_TYPE_FREE) err = "invalid previous free block header"; - else if ((next = next_block( subheap, (struct block *)block ))) + else if ((next = next_block( subheap, block ))) { if (!(block_get_flags( next ) & BLOCK_FLAG_PREV_FREE)) err = "invalid next block flags";

1 0

Nikolay Sivov : oleaut32/safearray: Fix an error code when trying to redim fixed arrays.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 7f01fdb6d4600308d811213323c579b838f649fb URL: https://gitlab.winehq.org/wine/wine/-/commit/7f01fdb6d4600308d811213323c579… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 23 07:11:05 2022 +0300 oleaut32/safearray: Fix an error code when trying to redim fixed arrays. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/safearray.c | 4 +- dlls/oleaut32/tests/safearray.c | 102 ++++++++++++++++++++++++++++------------ 2 files changed, 74 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 92d55752e8a..92a73c768da 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -1460,10 +1460,10 @@ HRESULT WINAPI SafeArrayRedim(SAFEARRAY *psa, SAFEARRAYBOUND *psabound) TRACE("(%p,%p)\n", psa, psabound); - if (!psa || psa->fFeatures & FADF_FIXEDSIZE || !psabound) + if (!psa || !psabound) return E_INVALIDARG; - if (psa->cLocks > 0) + if (psa->fFeatures & FADF_FIXEDSIZE || psa->cLocks) return DISP_E_ARRAYISLOCKED; hr = SafeArrayLock(psa); diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index dbbe86994f5..9bbb59193e4 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1291,35 +1291,6 @@ static void test_SafeArrayGetPutElement_IUnknown(void) ok(xtunk.ref == 2,"Failed to decrement refcount of iface.\n"); } -static void test_SafeArrayRedim_IUnknown(void) -{ - SAFEARRAYBOUND sab; - LONG indices[1]; - SAFEARRAY *sa; - HRESULT hres; - - sab.lLbound = 1; - sab.cElements = 2; - sa = SafeArrayCreate(VT_UNKNOWN, 1, &sab); - ok(sa != NULL, "UNKNOWN test couldn't create array\n"); - if (!sa) - return; - - ok(sa->cbElements == sizeof(LPUNKNOWN), "LPUNKNOWN size mismatch\n"); - - indices[0] = 2; - xtunk.ref = 1; - hres = SafeArrayPutElement(sa, indices, &xtunk.IUnknown_iface); - ok(hres == S_OK, "Failed to put IUnknown element hres 0x%lx\n", hres); - ok(xtunk.ref == 2,"Failed to increment refcount of iface.\n"); - sab.cElements = 1; - hres = SafeArrayRedim(sa, &sab); - ok(hres == S_OK, "Failed to shrink array hres 0x%lx\n", hres); - ok(xtunk.ref == 1, "Failed to decrement refcount\n"); - hres = SafeArrayDestroy(sa); - ok(hres == S_OK, "got 0x%08lx\n", hres); -} - static void test_SafeArrayGetPutElement_VARIANT(void) { SAFEARRAYBOUND sab; @@ -2063,6 +2034,77 @@ static void test_safearray_layout(void) IRecordInfo_Release(&irec->IRecordInfo_iface); } +static void test_SafeArrayRedim(void) +{ + SAFEARRAYBOUND sab; + LONG indices[1]; + SAFEARRAY *sa; + HRESULT hres; + + sab.lLbound = 1; + sab.cElements = 2; + hres = SafeArrayRedim(NULL, &sab); + ok(hres == E_INVALIDARG, "Unexpected hr %#lx.\n", hres); + sa = SafeArrayCreate(VT_UNKNOWN, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + hres = SafeArrayRedim(sa, NULL); + ok(hres == E_INVALIDARG, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + + /* VT_UNKNOWN */ + sab.lLbound = 1; + sab.cElements = 2; + sa = SafeArrayCreate(VT_UNKNOWN, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + ok(sa->cbElements == sizeof(IUnknown *), "Unexpected element size.\n"); + + indices[0] = 2; + xtunk.ref = 1; + hres = SafeArrayPutElement(sa, indices, &xtunk.IUnknown_iface); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + ok(xtunk.ref == 2,"Failed to increment refcount of iface.\n"); + sab.cElements = 1; + hres = SafeArrayRedim(sa, &sab); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + ok(xtunk.ref == 1, "Failed to decrement refcount\n"); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + + /* FADF_FIXEDSIZE */ + sab.lLbound = 1; + sab.cElements = 2; + sa = SafeArrayCreate(VT_I4, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + sab.cElements = 3; + hres = SafeArrayRedim(sa, &sab); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + sab.cElements = 4; + sa->fFeatures |= FADF_FIXEDSIZE; + hres = SafeArrayRedim(sa, &sab); + ok(hres == DISP_E_ARRAYISLOCKED, "Unexpected hr %#lx.\n", hres); + sa->fFeatures &= ~FADF_FIXEDSIZE; + hres = SafeArrayRedim(sa, &sab); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + + /* Locked array */ + sab.lLbound = 1; + sab.cElements = 2; + sa = SafeArrayCreate(VT_I4, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + hres = SafeArrayLock(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + sab.cElements = 3; + hres = SafeArrayRedim(sa, &sab); + ok(hres == DISP_E_ARRAYISLOCKED, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayUnlock(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); +} + START_TEST(safearray) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -2089,7 +2131,7 @@ START_TEST(safearray) test_SafeArrayGetPutElement(); test_SafeArrayGetPutElement_BSTR(); test_SafeArrayGetPutElement_IUnknown(); - test_SafeArrayRedim_IUnknown(); + test_SafeArrayRedim(); test_SafeArrayGetPutElement_VARIANT(); test_safearray_layout(); }

1 0

Alex Henrie : dnsapi: Use the strdup and wcsdup functions instead of reimplementing them.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: b81a5718492f498b6b88dd927ba6dbf53f6db5c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/b81a5718492f498b6b88dd927ba6db… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 22 22:16:47 2022 -0700 dnsapi: Use the strdup and wcsdup functions instead of reimplementing them. --- dlls/dnsapi/dnsapi.h | 27 --------------------------- dlls/dnsapi/query.c | 2 +- dlls/dnsapi/record.c | 6 +++--- 3 files changed, 4 insertions(+), 31 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index a81cb712f3e..250b0a1b4c3 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -25,33 +25,6 @@ #include "winternl.h" #include "wine/unixlib.h" -static inline char *strdup_a( const char *src ) -{ - char *dst; - if (!src) return NULL; - dst = malloc( (lstrlenA( src ) + 1) * sizeof(char) ); - if (dst) lstrcpyA( dst, src ); - return dst; -} - -static inline char *strdup_u( const char *src ) -{ - char *dst; - if (!src) return NULL; - dst = malloc( (strlen( src ) + 1) * sizeof(char) ); - if (dst) strcpy( dst, src ); - return dst; -} - -static inline WCHAR *strdup_w( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - dst = malloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ); - if (dst) lstrcpyW( dst, src ); - return dst; -} - static inline WCHAR *strdup_aw( const char *str ) { WCHAR *ret = NULL; diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 0e2f1b39ece..90a3a3e9950 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -73,7 +73,7 @@ static DNS_STATUS do_query_netbios( PCSTR name, DNS_RECORDA **recp ) } else { - record->pName = strdup_u( name ); + record->pName = strdup( name ); if (!record->pName) { status = ERROR_NOT_ENOUGH_MEMORY; diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 04694fc575c..01786842b73 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -455,7 +455,7 @@ static LPVOID strdupX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) { switch (out) { - case DnsCharSetUnicode: return strdup_w( src ); + case DnsCharSetUnicode: return wcsdup( src ); case DnsCharSetUtf8: return strdup_wu( src ); case DnsCharSetAnsi: return strdup_wa( src ); default: @@ -468,7 +468,7 @@ static LPVOID strdupX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) switch (out) { case DnsCharSetUnicode: return strdup_uw( src ); - case DnsCharSetUtf8: return strdup_u( src ); + case DnsCharSetUtf8: return strdup( src ); case DnsCharSetAnsi: return strdup_ua( src ); default: WARN( "unhandled target charset: %d\n", out ); @@ -480,7 +480,7 @@ static LPVOID strdupX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) { case DnsCharSetUnicode: return strdup_aw( src ); case DnsCharSetUtf8: return strdup_au( src ); - case DnsCharSetAnsi: return strdup_a( src ); + case DnsCharSetAnsi: return strdup( src ); default: WARN( "unhandled target charset: %d\n", out ); break;

1 0

Jacek Caban : win32u: Remove __wine_get_wgl_driver PE entry point.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 65835e4b74f76f8e74e94c50558224993349bca1 URL: https://gitlab.winehq.org/wine/wine/-/commit/65835e4b74f76f8e74e94c50558224… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 22 16:43:24 2022 +0100 win32u: Remove __wine_get_wgl_driver PE entry point. --- dlls/win32u/gdiobj.c | 1 - dlls/win32u/win32u.spec | 3 --- dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ 4 files changed, 11 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 81451399902..f88efbaa679 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1149,7 +1149,6 @@ static struct unix_funcs unix_funcs = __wine_get_brush_bitmap_info, __wine_get_file_outline_text_metric, __wine_get_icm_profile, - __wine_get_wgl_driver, __wine_send_input, }; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 3771dafcf76..c9c126ec2f3 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1323,9 +1323,6 @@ # Graphics drivers @ cdecl __wine_send_input(long ptr ptr) -# OpenGL -@ cdecl __wine_get_wgl_driver(long long) - # gdi32 @ stdcall SetDIBits(long long long long ptr ptr long) @ cdecl __wine_get_brush_bitmap_info(long ptr ptr ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index f77a56d6d58..8fc00cf3296 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -207,7 +207,6 @@ struct unix_funcs BOOL (CDECL *get_brush_bitmap_info)( HBRUSH handle, BITMAPINFO *info, void *bits, UINT *usage ); BOOL (CDECL *get_file_outline_text_metric)( const WCHAR *path, OUTLINETEXTMETRICW *otm ); BOOL (CDECL *get_icm_profile)( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ); - struct opengl_funcs * (CDECL *get_wgl_driver)( HDC hdc, UINT version ); BOOL (CDECL *wine_send_input)( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ); }; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index c5078c8a7f7..e128705ef37 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -798,12 +798,6 @@ BOOL CDECL __wine_get_file_outline_text_metric( const WCHAR *path, OUTLINETEXTME return unix_funcs->get_file_outline_text_metric( path, otm ); } -struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) -{ - if (!unix_funcs) return NULL; - return unix_funcs->get_wgl_driver( hdc, version ); -} - BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ) { if (!unix_funcs) return FALSE;

1 0

Zebediah Figura : ntdll: Add a get_free_list_block_size() helper.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: c9cf44a3638e07b2e57fc467158cb5064de626fe URL: https://gitlab.winehq.org/wine/wine/-/commit/c9cf44a3638e07b2e57fc467158cb5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 9 16:11:42 2022 -0600 ntdll: Add a get_free_list_block_size() helper. --- dlls/ntdll/heap.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 11c07d2e332..a6db3444374 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -488,26 +488,28 @@ static void heap_set_status( const struct heap *heap, ULONG flags, NTSTATUS stat if (status) RtlSetLastWin32ErrorAndNtStatusFromNtStatus( status ); } +static size_t get_free_list_block_size( unsigned int index ) +{ + if (index < HEAP_NB_SMALL_FREE_LISTS) + return index * ALIGNMENT + HEAP_MIN_BLOCK_SIZE; + return free_list_sizes[index - HEAP_NB_SMALL_FREE_LISTS]; +} + static void heap_dump( const struct heap *heap ) { const struct block *block; const ARENA_LARGE *large; const SUBHEAP *subheap; unsigned int i; - SIZE_T size; TRACE( "heap: %p\n", heap ); TRACE( " next %p\n", LIST_ENTRY( heap->entry.next, struct heap, entry ) ); TRACE( " free_lists: %p\n", heap->free_lists ); for (i = 0; i < HEAP_NB_FREE_LISTS; i++) - { - if (i < HEAP_NB_SMALL_FREE_LISTS) size = HEAP_MIN_BLOCK_SIZE + i * ALIGNMENT; - else size = free_list_sizes[i - HEAP_NB_SMALL_FREE_LISTS]; - TRACE( " %p: size %8Ix, prev %p, next %p\n", heap->free_lists + i, size, + TRACE( " %p: size %8Ix, prev %p, next %p\n", heap->free_lists + i, get_free_list_block_size( i ), LIST_ENTRY( heap->free_lists[i].entry.prev, struct entry, entry ), LIST_ENTRY( heap->free_lists[i].entry.next, struct entry, entry ) ); - } TRACE( " subheaps: %p\n", &heap->subheap_list ); LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry )

1 0

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

Nov. 23, 2022

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