May 2022 - Wine-Commits - list.winehq.org

Nikolay Sivov : vbscript: Fix a typo in sizeof() (Coverity).
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: 132539b0531445dee2fd5f5cb33eb7d222b880e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=132539b0531445dee2fd5f5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 21 19:00:49 2022 +0300 vbscript: Fix a typo in sizeof() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9a24657c848..15c0bb0958e 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2028,7 +2028,7 @@ static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *args, unsigned args_cn { /* vbUseSystemDayOfWeek */ GetLocaleInfoW(This->ctx->lcid, LOCALE_RETURN_NUMBER | LOCALE_IFIRSTDAYOFWEEK, (LPWSTR)&first_day, - sizeof(&first_day) / sizeof(WCHAR)); + sizeof(first_day) / sizeof(WCHAR)); first_day = (first_day + 1) % 7; } else if (first_day >= 1 && first_day <= 7)

1 0

Nikolay Sivov : vbscript: Handle negative argument in Space().
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: c56d09722ee394658a635c37994fff60b8899598 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c56d09722ee394658a635c37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 23 09:10:30 2022 +0300 vbscript: Handle negative argument in Space(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 11 +++++++---- dlls/vbscript/tests/api.vbs | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 15c0bb0958e..80348a5288f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1586,14 +1586,17 @@ static HRESULT Global_Space(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, TRACE("%s\n", debugstr_variant(arg)); + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + hres = to_int(arg, &n); if(FAILED(hres)) return hres; - if(n < 0) { - FIXME("n = %d\n", n); - return E_NOTIMPL; - } + if(n < 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); if(!res) return S_OK; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3b67e920c3d..617589053c6 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -747,6 +747,21 @@ Call ok(Space(4.5) = " ", "Space(4.5) = " & Space(4.5) & """") Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") Call ok(Space("1") = " ", "Space(""1"") = " & Space("1") & """") +Call ok(Space(Empty) = "", "Space(Empty) = " & Space(Empty) & """") + +sub testSpaceError() + on error resume next + call Err.clear() + call Space(-1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Space("-1") + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Space(Null) + call ok(Err.number = 94, "Err.number = " & Err.number) +end sub +call testSpaceError() sub test_string(cnt, char, exp) call ok(String(cnt, char) = exp, "String(" & cnt & ", """ & char & """ = """ & _

1 0

Nikolay Sivov : d3drm/tests: Use test context for test ran in a loop.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: 54c27f69f6c6bd7b8273c43cfc6ad97ff19942b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54c27f69f6c6bd7b8273c43c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 23 09:32:00 2022 +0300 d3drm/tests: Use test context for test ran in a loop. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 184 +++++++++++++++++++++++++---------------------- 1 file changed, 100 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54c27f69f6c6bd7b8273…

1 0

Rémi Bernon : kernelbase: Workaround Local(Alloc|Free) invalid access warnings.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: 1e110562565bca8fc1c5d351b96f3cd9a148d030 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e110562565bca8fc1c5d351… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 22:54:03 2022 +0200 kernelbase: Workaround Local(Alloc|Free) invalid access warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 416d7b52a16..b89ab04a38f 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -712,7 +712,7 @@ static struct kernelbase_global_data global_data = {0}; static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { - struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); + struct mem_entry *mem = CONTAINING_RECORD( *(volatile HANDLE *)&handle, struct mem_entry, ptr ); struct kernelbase_global_data *data = &global_data; if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1)) != sizeof(void *)) return NULL; if (mem < data->mem_entries || mem >= data->mem_entries_end) return NULL; @@ -831,7 +831,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalAlloc( UINT flags, SIZE_T size ) return handle; failed: - if (mem) LocalFree( handle ); + if (mem) LocalFree( *(volatile HANDLE *)&handle ); SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return 0; }

1 0

André Zwing : mp3dmod: Avoid mpg123 functions with suffix.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: 8d441659f7c7ae359e06a99e7abaae57792356a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d441659f7c7ae359e06a99e… Author: André Zwing <nerv(a)dawncrow.de> Date: Sat May 21 17:53:07 2022 +0200 mp3dmod: Avoid mpg123 functions with suffix. Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/mp3dmod/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in index dabbb1dfeae..3ba343a4d34 100644 --- a/dlls/mp3dmod/Makefile.in +++ b/dlls/mp3dmod/Makefile.in @@ -1,6 +1,7 @@ MODULE = mp3dmod.dll IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase EXTRAINCL = $(MPG123_PE_CFLAGS) +EXTRADEFS = -DMPG123_NO_LARGENAME C_SRCS = \ mp3dmod.c

1 0

Rémi Bernon : ntdll: Cleanup and rename HEAP_CreateFreeBlock to create_free_block.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: 2db2c94d127e9f8879642484138270872ab35deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2db2c94d127e9f8879642484… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 21 08:34:14 2022 +0200 ntdll: Cleanup and rename HEAP_CreateFreeBlock to create_free_block. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 70 +++++++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 302e6cc75ee..0983dc9d2b4 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -676,58 +676,47 @@ static inline BOOL HEAP_Decommit( SUBHEAP *subheap, void *ptr ) } -/*********************************************************************** - * HEAP_CreateFreeBlock - * - * Create a free block at a specified address. 'size' is the size of the - * whole block, including the new arena. - */ -static void HEAP_CreateFreeBlock( SUBHEAP *subheap, void *ptr, SIZE_T size ) +static void create_free_block( SUBHEAP *subheap, struct block *block, SIZE_T block_size ) { - ARENA_FREE *pFree; - char *pEnd; + struct entry *entry = (struct entry *)block; + HEAP *heap = subheap->heap; + DWORD flags = heap->flags; + char *end; BOOL last; - DWORD flags = subheap->heap->flags; - /* Create a free arena */ - mark_block_uninitialized( ptr, sizeof(ARENA_FREE) ); - pFree = ptr; - pFree->magic = ARENA_FREE_MAGIC; + mark_block_uninitialized( block, sizeof(*entry) ); + entry->magic = ARENA_FREE_MAGIC; /* If debugging, erase the freed block content */ - pEnd = (char *)ptr + size; - if (pEnd > (char *)subheap->base + subheap->commitSize) - pEnd = (char *)subheap->base + subheap->commitSize; - if (pEnd > (char *)(pFree + 1)) mark_block_free( pFree + 1, pEnd - (char *)(pFree + 1), flags ); + end = (char *)block + block_size; + if (end > (char *)subheap->base + subheap->commitSize) + end = (char *)subheap->base + subheap->commitSize; + if (end > (char *)(entry + 1)) mark_block_free( entry + 1, end - (char *)(entry + 1), flags ); - /* Check if next block is free also */ - - if (((char *)ptr + size < (char *)subheap->base + subheap->size) && - (*(DWORD *)((char *)ptr + size) & ARENA_FLAG_FREE)) + if (((char *)block + block_size < (char *)subheap->base + subheap->size) && + (*(DWORD *)((char *)block + block_size) & ARENA_FLAG_FREE)) { - /* Remove the next arena from the free list */ - ARENA_FREE *pNext = (ARENA_FREE *)((char *)ptr + size); - list_remove( &pNext->entry ); - size += (pNext->size & ARENA_SIZE_MASK) + sizeof(*pNext); - mark_block_free( pNext, sizeof(ARENA_FREE), flags ); + /* merge with the next block if it is free */ + struct entry *next_entry = (struct entry *)((char *)block + block_size); + list_remove( &next_entry->entry ); + block_size += (next_entry->size & ARENA_SIZE_MASK) + sizeof(*next_entry); + mark_block_free( next_entry, sizeof(struct entry), flags ); } - /* Set the next block PREV_FREE flag and pointer */ - last = ((char *)ptr + size >= (char *)subheap->base + subheap->size); + last = ((char *)block + block_size >= (char *)subheap->base + subheap->size); if (!last) { - DWORD *pNext = (DWORD *)((char *)ptr + size); - *pNext |= ARENA_FLAG_PREV_FREE; - mark_block_initialized( (ARENA_FREE **)pNext - 1, sizeof( ARENA_FREE * ) ); - *((ARENA_FREE **)pNext - 1) = pFree; + /* set the next block PREV_FREE flag and back pointer */ + DWORD *next = (DWORD *)((char *)block + block_size); + *next |= ARENA_FLAG_PREV_FREE; + mark_block_initialized( (struct block **)next - 1, sizeof(struct block *) ); + *((struct block **)next - 1) = block; } - /* Last, insert the new block into the free list */ - - pFree->size = (size - sizeof(*pFree)) | ARENA_FLAG_FREE; - HEAP_InsertFreeBlock( subheap->heap, pFree, last ); + entry->size = (block_size - sizeof(*entry)) | ARENA_FLAG_FREE; + HEAP_InsertFreeBlock( subheap->heap, entry, last ); } @@ -769,7 +758,7 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) /* Create a free block */ - HEAP_CreateFreeBlock( subheap, pFree, size ); + create_free_block( subheap, (struct block *)pFree, size ); size = (pFree->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE); if ((char *)pFree + size < (char *)subheap->base + subheap->size) return; /* Not the last block, so nothing more to do */ @@ -805,7 +794,7 @@ static void shrink_used_block( SUBHEAP *subheap, struct block *block, SIZE_T dat { block->size = data_size | block_get_flags( block ); block->unused_bytes = data_size - size; - HEAP_CreateFreeBlock( subheap, next_block( subheap, block ), old_data_size - data_size ); + create_free_block( subheap, next_block( subheap, block ), old_data_size - data_size ); } else { @@ -1051,8 +1040,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, /* Create the first free block */ - HEAP_CreateFreeBlock( subheap, (LPBYTE)subheap->base + subheap->headerSize, - subheap->size - subheap->headerSize ); + create_free_block( subheap, first_block( subheap ), subheap->size - subheap->headerSize ); return subheap; }

1 0

Rémi Bernon : ntdll: Introduce new helper to update block flags and size.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: b4655f24577b38893abbedcd846d0cd35d6684d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4655f24577b38893abbedcd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 21 08:26:40 2022 +0200 ntdll: Introduce new helper to update block flags and size. And use them in shrink_used_block to set the block sizes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 7e21593cd56..a22f5ec7f1e 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -253,6 +253,13 @@ static inline UINT block_get_size( const struct block *block ) return size; } +static inline void block_set_size( struct block *block, UINT flags, UINT block_size ) +{ + if (flags & ARENA_FLAG_FREE) block_size -= sizeof(struct entry); + else block_size -= sizeof(*block); + block->size = (block_size & ARENA_SIZE_MASK) | (flags & ~ARENA_SIZE_MASK); +} + static inline void *subheap_base( const SUBHEAP *subheap ) { return subheap->base; @@ -793,18 +800,19 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) } -static void shrink_used_block( SUBHEAP *subheap, struct block *block, SIZE_T data_size, SIZE_T size ) +static inline void shrink_used_block( SUBHEAP *subheap, struct block *block, UINT flags, + SIZE_T old_data_size, SIZE_T data_size, SIZE_T size ) { - SIZE_T old_data_size = block_get_size( block ) - sizeof(*block); if (old_data_size >= data_size + HEAP_MIN_SHRINK_SIZE) { - block->size = data_size | block_get_flags( block ); + block_set_size( block, flags, data_size + sizeof(*block) ); block->unused_bytes = data_size - size; create_free_block( subheap, next_block( subheap, block ), old_data_size - data_size ); } else { struct block *next; + block_set_size( block, flags, old_data_size + sizeof(*block) ); block->unused_bytes = old_data_size - size; if ((next = next_block( subheap, block ))) next->size &= ~ARENA_FLAG_PREV_FREE; } @@ -1521,8 +1529,8 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret ) { + SIZE_T old_data_size, data_size; struct block *block; - SIZE_T data_size; SUBHEAP *subheap; data_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); @@ -1538,15 +1546,11 @@ static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret /* Locate a suitable free block */ if (!(block = find_free_block( heap, data_size, &subheap ))) return STATUS_NO_MEMORY; + /* read the free block size, changing block type or flags may alter it */ + old_data_size = block_get_size( block ) - sizeof(*block); - /* in-use arena is smaller than free arena, - * so we have to add the difference to the size */ - block->size = (block->size & ~ARENA_FLAG_FREE) + sizeof(struct entry) - sizeof(*block); block_set_type( block, ARENA_INUSE_MAGIC ); - - /* Shrink the block */ - - shrink_used_block( subheap, block, data_size, size ); + shrink_used_block( subheap, block, 0, old_data_size, data_size, size ); notify_alloc( block + 1, size, flags & HEAP_ZERO_MEMORY ); initialize_block( block + 1, size, block->unused_bytes, flags ); @@ -1649,10 +1653,10 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size /* The next block is free and large enough */ struct entry *entry = (struct entry *)next; list_remove( &entry->entry ); - block->size += block_get_size( next ); + old_data_size += block_get_size( next ); if (!HEAP_Commit( subheap, block, data_size )) return STATUS_NO_MEMORY; notify_realloc( block + 1, old_size, size ); - shrink_used_block( subheap, block, data_size, size ); + shrink_used_block( subheap, block, block_get_flags( block ), old_data_size, data_size, size ); } else { @@ -1668,7 +1672,7 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size else { notify_realloc( block + 1, old_size, size ); - shrink_used_block( subheap, block, data_size, size ); + shrink_used_block( subheap, block, block_get_flags( block ), old_data_size, data_size, size ); } /* Clear the extra bytes if needed */

1 0

Rémi Bernon : kernel32/tests: Workaround (Local|Global|Heap)Free warnings.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: f7a4ca4446f12a6a717f4b2ad05da337bfc06602 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7a4ca4446f12a6a717f4b2a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 22:54:03 2022 +0200 kernel32/tests: Workaround (Local|Global|Heap)Free warnings. Using function pointers to remove the malloc attributes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 50 +++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7a4ca4446f12a6a717f…

1 0

Jacek Caban : winemac: Directly use win32u for user functions in opengl.c.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: 46af1ada38e95a5adb77202c68f9992463f53908 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46af1ada38e95a5adb77202c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 21:25:08 2022 +0200 winemac: Directly use win32u for user functions in opengl.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/opengl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index bf7effa7aeb..3aa5c340e30 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1330,7 +1330,7 @@ static int get_dc_pixel_format(HDC hdc) int format; HWND hwnd; - if ((hwnd = WindowFromDC(hdc))) + if ((hwnd = NtUserWindowFromDC(hdc))) { struct macdrv_win_data *data; @@ -1526,12 +1526,12 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) { struct macdrv_win_data *data; const pixel_format *pf; - HWND hwnd = WindowFromDC(hdc); + HWND hwnd = NtUserWindowFromDC(hdc); BOOL ret = FALSE; TRACE("hdc %p format %d\n", hdc, fmt); - if (!hwnd || hwnd == GetDesktopWindow()) + if (!hwnd || hwnd == NtUserGetDesktopWindow()) { WARN("not a proper window DC %p/%p\n", hdc, hwnd); return FALSE; @@ -3485,7 +3485,7 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w return TRUE; } - if ((hwnd = WindowFromDC(draw_hdc))) + if ((hwnd = NtUserWindowFromDC(draw_hdc))) { if (!(data = get_win_data(hwnd))) { @@ -3555,7 +3555,7 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w context->read_pbuffer = NULL; if (read_hdc && read_hdc != draw_hdc) { - if ((hwnd = WindowFromDC(read_hdc))) + if ((hwnd = NtUserWindowFromDC(read_hdc))) { if ((data = get_win_data(hwnd))) { @@ -4543,7 +4543,7 @@ static BOOL WINAPI macdrv_wglSwapBuffers(HDC hdc) sync_context(context); } - if ((hwnd = WindowFromDC(hdc))) + if ((hwnd = NtUserWindowFromDC(hdc))) { struct macdrv_win_data *data;

1 0

Jacek Caban : winemac: Directly use win32u for user functions in display.c.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: 973e12daae6356c3cb702dd5fe226a03bf7be05c URL: https://source.winehq.org/git/wine.git/?a=commit;h=973e12daae6356c3cb702dd5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 18:52:38 2022 +0200 winemac: Directly use win32u for user functions in display.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/display.c | 27 ++++++++++++++++----------- dlls/winemac.drv/macdrv.h | 7 +++++++ 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 4b6740b9274..dc22131e36a 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -806,7 +806,7 @@ static BOOL get_primary_adapter(WCHAR *name) DWORD i; dd.cb = sizeof(dd); - for (i = 0; EnumDisplayDevicesW(NULL, i, &dd, 0); ++i) + for (i = 0; !NtUserEnumDisplayDevices(NULL, i, &dd, 0); ++i) { if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) { @@ -856,9 +856,11 @@ LONG macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, if (!devname && !devmode) { + UNICODE_STRING str; memset(&default_mode, 0, sizeof(default_mode)); default_mode.dmSize = sizeof(default_mode); - if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + RtlInitUnicodeString(&str, primary_adapter); + if (!NtUserEnumDisplaySettings(&str, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) { ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); return DISP_CHANGE_BADMODE; @@ -1009,7 +1011,7 @@ better: height *= 2; } - SendMessageW(GetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, + send_message(NtUserGetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, MAKELPARAM(width, height)); ret = DISP_CHANGE_SUCCESSFUL; } @@ -1378,16 +1380,19 @@ static void init_registry_display_settings(void) { DEVMODEW dm = {.dmSize = sizeof(dm)}; DISPLAY_DEVICEW dd = {sizeof(dd)}; + UNICODE_STRING str; DWORD i = 0; LONG ret; - while (EnumDisplayDevicesW(NULL, i++, &dd, 0)) + while (!NtUserEnumDisplayDevices(NULL, i++, &dd, 0)) { + RtlInitUnicodeString(&str, dd.DeviceName); + /* Skip if the device already has registry display settings */ - if (EnumDisplaySettingsExW(dd.DeviceName, ENUM_REGISTRY_SETTINGS, &dm, 0)) + if (NtUserEnumDisplaySettings(&str, ENUM_REGISTRY_SETTINGS, &dm, 0)) continue; - if (!EnumDisplaySettingsExW(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm, 0)) + if (!NtUserEnumDisplaySettings(&str, ENUM_CURRENT_SETTINGS, &dm, 0)) { ERR("Failed to query current display settings for %s.\n", wine_dbgstr_w(dd.DeviceName)); continue; @@ -1397,8 +1402,8 @@ static void init_registry_display_settings(void) wine_dbgstr_w(dd.DeviceName), dm.dmPelsWidth, dm.dmPelsHeight, dm.dmBitsPerPel, dm.dmDisplayFrequency, dm.dmPosition.x, dm.dmPosition.y); - ret = ChangeDisplaySettingsExW(dd.DeviceName, &dm, NULL, - CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL); + ret = NtUserChangeDisplaySettings(&str, &dm, NULL, + CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL); if (ret != DISP_CHANGE_SUCCESSFUL) ERR("Failed to save registry display settings for %s, returned %d.\n", wine_dbgstr_w(dd.DeviceName), ret); @@ -1412,7 +1417,7 @@ static void init_registry_display_settings(void) */ void macdrv_displays_changed(const macdrv_event *event) { - HWND hwnd = GetDesktopWindow(); + HWND hwnd = NtUserGetDesktopWindow(); /* A system display change will get delivered to all GUI-attached threads, so the desktop-window-owning thread will get it and all others should @@ -1420,7 +1425,7 @@ void macdrv_displays_changed(const macdrv_event *event) will only get delivered to the activated process. So, it needs to process it (by sending it to the desktop window). */ if (event->displays_changed.activating || - GetWindowThreadProcessId(hwnd, NULL) == GetCurrentThreadId()) + NtUserGetWindowThread(hwnd, NULL) == GetCurrentThreadId()) { CGDirectDisplayID mainDisplay = CGMainDisplayID(); CGDisplayModeRef mode = CGDisplayCopyDisplayMode(mainDisplay); @@ -1442,7 +1447,7 @@ void macdrv_displays_changed(const macdrv_event *event) height *= 2; } - SendMessageW(hwnd, WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, + send_message(hwnd, WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, MAKELPARAM(width, height)); } } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 29fbe8a8cb9..2cac6acf4f3 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -295,6 +295,13 @@ extern void macdrv_im_set_text(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_sent_text_input(const macdrv_event *event) DECLSPEC_HIDDEN; extern BOOL query_ime_char_rect(macdrv_query* query) DECLSPEC_HIDDEN; +/* user helpers */ + +static inline LRESULT send_message(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + return NtUserMessageCall(hwnd, msg, wparam, lparam, NULL, NtUserSendMessage, FALSE); +} + /* registry helpers */ extern HKEY open_hkcu_key( const char *name ) DECLSPEC_HIDDEN;

1 0