September 2020 - Wine-Commits

Kevin Puetz : include: Fix undefined char16_t in C11.
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: d45b3d4fdd7cbcfdba70c327ab90976a3b658da2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45b3d4fdd7cbcfdba70c327… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Sep 24 10:12:09 2020 -0500 include: Fix undefined char16_t in C11. In c++11 char16_t is a distinct fundamental type, but in c11 it is merely a typedef in <uchar.h>. Explicitly mention char16_t only in c++11 (where it is built-in), otherwise define WCHAR as unsigned short (without naming char16_t) and just hope that on C11 this matches u"..." Remove WINE_UNICODE_CHAR16; it is now the default when supported. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sqltypes.h | 2 +- include/tchar.h | 2 +- include/winnt.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sqltypes.h b/include/sqltypes.h index 0923f6b362..4c45de7e98 100644 --- a/include/sqltypes.h +++ b/include/sqltypes.h @@ -30,7 +30,7 @@ extern "C" { typedef unsigned char SQLCHAR; #if defined(WINE_UNICODE_NATIVE) typedef wchar_t SQLWCHAR; -#elif defined(WINE_UNICODE_CHAR16) +#elif __cpp_unicode_literals >= 200710 typedef char16_t SQLWCHAR; #else typedef unsigned short SQLWCHAR; diff --git a/include/tchar.h b/include/tchar.h index 9fc4c72099..a8e64b4bf6 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -240,7 +240,7 @@ typedef unsigned short wctype_t; #ifndef __TCHAR_DEFINED #if defined(WINE_UNICODE_NATIVE) typedef wchar_t _TCHAR; -#elif defined(WINE_UNICODE_CHAR16) +#elif __cpp_unicode_literals >= 200710 typedef char16_t _TCHAR; #else typedef unsigned short _TCHAR; diff --git a/include/winnt.h b/include/winnt.h index f59a63c041..10b3253923 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -462,7 +462,7 @@ typedef int LONG, *PLONG; /* Some systems might have wchar_t, but we really need 16 bit characters */ #if defined(WINE_UNICODE_NATIVE) typedef wchar_t WCHAR; -#elif defined(WINE_UNICODE_CHAR16) +#elif __cpp_unicode_literals >= 200710 typedef char16_t WCHAR; #else typedef unsigned short WCHAR;

1 0

Piotr Caban : winmm: Avoid allocations in timeSetEvent.
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: b07504224e05bd104e9ad4f1fef7980c64ab2148 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b07504224e05bd104e9ad4f1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 30 14:37:52 2020 +0200 winmm: Avoid allocations in timeSetEvent. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/time.c | 122 ++++++++++++++++++++++++------------------------------ 1 file changed, 55 insertions(+), 67 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 814d97def0..2d5f3db389 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -30,13 +30,11 @@ #include "winemm.h" -#include "wine/list.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mmtime); typedef struct tagWINE_TIMERENTRY { - struct list entry; UINT wDelay; UINT wResol; LPTIMECALLBACK lpFunc; /* can be lots of things */ @@ -46,7 +44,8 @@ typedef struct tagWINE_TIMERENTRY { DWORD dwTriggerTime; } WINE_TIMERENTRY, *LPWINE_TIMERENTRY; -static struct list timer_list = LIST_INIT(timer_list); +static WINE_TIMERENTRY timers[16]; +static UINT timers_created; static CRITICAL_SECTION TIME_cbcrst; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -60,17 +59,6 @@ static CRITICAL_SECTION TIME_cbcrst = { &critsect_debug, -1, 0, 0, 0, 0 }; static HANDLE TIME_hMMTimer; static CONDITION_VARIABLE TIME_cv; -/* link timer at the appropriate spot in the list */ -static inline void link_timer( WINE_TIMERENTRY *timer ) -{ - WINE_TIMERENTRY *next; - - LIST_FOR_EACH_ENTRY( next, &timer_list, WINE_TIMERENTRY, entry ) - if ((int)(next->dwTriggerTime - timer->dwTriggerTime) >= 0) break; - - list_add_before( &next->entry, &timer->entry ); -} - /* * Some observations on the behavior of winmm on Windows. * @@ -119,8 +107,8 @@ static inline void link_timer( WINE_TIMERENTRY *timer ) */ static int TIME_MMSysTimeCallback(void) { - WINE_TIMERENTRY *timer, *to_free; - int delta_time; + WINE_TIMERENTRY *timer, copy; + int i, delta_time; /* since timeSetEvent() and timeKillEvent() can be called * from 16 bit code, there are cases where win16 lock is @@ -136,25 +124,30 @@ static int TIME_MMSysTimeCallback(void) for (;;) { - struct list *ptr = list_head( &timer_list ); - if (!ptr) + for (i = 0; i < ARRAY_SIZE(timers); i++) + if (timers[i].wTimerID) break; + if (i == ARRAY_SIZE(timers)) return -1; + timer = timers + i; + for (i++; i < ARRAY_SIZE(timers); i++) { - delta_time = -1; - break; + if (!timers[i].wTimerID) continue; + if (timers[i].dwTriggerTime < timer->dwTriggerTime) + timer = timers + i; } - timer = LIST_ENTRY( ptr, WINE_TIMERENTRY, entry ); delta_time = timer->dwTriggerTime - timeGetTime(); if (delta_time > 0) break; - list_remove( &timer->entry ); if (timer->wFlags & TIME_PERIODIC) { timer->dwTriggerTime += timer->wDelay; - link_timer( timer ); /* restart it */ - to_free = NULL; } - else to_free = timer; + else + { + copy = *timer; + timer->wTimerID = 0; + timer = © + } switch(timer->wFlags & (TIME_CALLBACK_EVENT_SET|TIME_CALLBACK_EVENT_PULSE)) { @@ -181,7 +174,6 @@ static int TIME_MMSysTimeCallback(void) } break; } - HeapFree( GetProcessHeap(), 0, to_free ); } return delta_time; } @@ -281,36 +273,37 @@ DWORD WINAPI timeGetTime(void) MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, DWORD_PTR dwUser, UINT wFlags) { - WORD wNewID = 0; - LPWINE_TIMERENTRY lpNewTimer; - LPWINE_TIMERENTRY lpTimer; + WORD new_id = 0; + int i; TRACE("(%u, %u, %p, %08lX, %04X);\n", wDelay, wResol, lpFunc, dwUser, wFlags); if (wDelay < MMSYSTIME_MININTERVAL || wDelay > MMSYSTIME_MAXINTERVAL) return 0; - lpNewTimer = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_TIMERENTRY)); - if (lpNewTimer == NULL) - return 0; - - lpNewTimer->wDelay = wDelay; - lpNewTimer->dwTriggerTime = timeGetTime() + wDelay; + EnterCriticalSection(&WINMM_cs); - /* FIXME - wResol is not respected, although it is not clear - that we could change our precision meaningfully */ - lpNewTimer->wResol = wResol; - lpNewTimer->lpFunc = lpFunc; - lpNewTimer->dwUser = dwUser; - lpNewTimer->wFlags = wFlags; + for (i = 0; i < ARRAY_SIZE(timers); i++) + if (!timers[i].wTimerID) break; + if (i == ARRAY_SIZE(timers)) + { + LeaveCriticalSection(&WINMM_cs); + return 0; + } - EnterCriticalSection(&WINMM_cs); + new_id = ARRAY_SIZE(timers)*(++timers_created) + i; + if (!new_id) new_id = ARRAY_SIZE(timers)*(++timers_created) + i; - LIST_FOR_EACH_ENTRY( lpTimer, &timer_list, WINE_TIMERENTRY, entry ) - wNewID = max(wNewID, lpTimer->wTimerID); + timers[i].wDelay = wDelay; + timers[i].dwTriggerTime = timeGetTime() + wDelay; - link_timer( lpNewTimer ); - lpNewTimer->wTimerID = wNewID + 1; + /* FIXME - wResol is not respected, although it is not clear + that we could change our precision meaningfully */ + timers[i].wResol = wResol; + timers[i].lpFunc = lpFunc; + timers[i].dwUser = dwUser; + timers[i].wFlags = wFlags; + timers[i].wTimerID = new_id; TIME_MMTimeStart(); @@ -319,9 +312,9 @@ MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, /* Wake the service thread in case there is work to be done */ WakeConditionVariable(&TIME_cv); - TRACE("=> %u\n", wNewID + 1); + TRACE("=> %u\n", new_id); - return wNewID + 1; + return new_id; } /************************************************************************** @@ -329,35 +322,30 @@ MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, */ MMRESULT WINAPI timeKillEvent(UINT wID) { - WINE_TIMERENTRY *lpSelf = NULL, *lpTimer; - DWORD wFlags; + WINE_TIMERENTRY *timer; + WORD flags; TRACE("(%u)\n", wID); EnterCriticalSection(&WINMM_cs); - /* remove WINE_TIMERENTRY from list */ - LIST_FOR_EACH_ENTRY( lpTimer, &timer_list, WINE_TIMERENTRY, entry ) + + timer = &timers[wID % ARRAY_SIZE(timers)]; + if (timer->wTimerID != wID) { - if (wID == lpTimer->wTimerID) { - lpSelf = lpTimer; - list_remove( &lpTimer->entry ); - break; - } + LeaveCriticalSection(&WINMM_cs); + WARN("wID=%u is not a valid timer ID\n", wID); + return TIMERR_NOCANDO; } - if (list_empty(&timer_list)) - WakeConditionVariable(&TIME_cv); + + timer->wTimerID = 0; + flags = timer->wFlags; LeaveCriticalSection(&WINMM_cs); - if (!lpSelf) + if (flags & TIME_KILL_SYNCHRONOUS) { - WARN("wID=%u is not a valid timer ID\n", wID); - return MMSYSERR_INVALPARAM; - } - wFlags = lpSelf->wFlags; - if (wFlags & TIME_KILL_SYNCHRONOUS) EnterCriticalSection(&TIME_cbcrst); - HeapFree(GetProcessHeap(), 0, lpSelf); - if (wFlags & TIME_KILL_SYNCHRONOUS) LeaveCriticalSection(&TIME_cbcrst); + } + WakeConditionVariable(&TIME_cv); return TIMERR_NOERROR; }

1 0

Zhiyi Zhang : winemac.drv: Fix monitor_id_fmtW variable name typo.
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: 40d3b9469dc20d65a7318a19419ba67b534097ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=40d3b9469dc20d65a7318a19… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 30 22:06:30 2020 +0800 winemac.drv: Fix monitor_id_fmtW variable name typo. Spotted by Matteo. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 078cb55ab8..f6390becea 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -70,7 +70,7 @@ static const WCHAR pciW[] = {'P','C','I',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; -static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR monitor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; static const WCHAR adapter_prefixW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; static const WCHAR adapter_name_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; @@ -1598,7 +1598,7 @@ static BOOL macdrv_init_adapter(HKEY video_hkey, int video_index, int gpu_index, /* Write all monitor instance paths under this adapter */ for (i = 0; i < monitor_count; i++) { - sprintfW(key_nameW, mointor_id_fmtW, i); + sprintfW(key_nameW, monitor_id_fmtW, i); sprintfW(bufferW, monitor_instance_fmtW, video_index, i); if (RegSetValueExW(hkey, key_nameW, 0, REG_SZ, (const BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR))) goto done;

1 0

Piotr Caban : winmm: Add more timer tests.
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: bda21aa992c18b8e02dcbf4ba7f31138d465aa23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bda21aa992c18b8e02dcbf4b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 30 14:38:01 2020 +0200 winmm: Add more timer tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/timer.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/winmm/tests/timer.c b/dlls/winmm/tests/timer.c index be63f6b032..9fba2ec055 100644 --- a/dlls/winmm/tests/timer.c +++ b/dlls/winmm/tests/timer.c @@ -193,6 +193,60 @@ static void test_priority(void) timeKillEvent(id); } +static void CALLBACK kill_timer_callback(UINT id, UINT msg, + DWORD_PTR arg, DWORD_PTR dw1, DWORD_PTR dw2) +{ + HANDLE event = (HANDLE)arg; + MMRESULT res; + + res = timeKillEvent(id); + ok(res == TIMERR_NOERROR, "timeKillEvent failed in callback\n"); + SetEvent(event); +} + +static void test_timer_lifetime(void) +{ + UINT timers[20], i; + HANDLE event; + MMRESULT res; + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "CreateEvent failed\n"); + + for (i = 0; i < 20; i++) + { + timers[i] = timeSetEvent(10000, 0, event, 0, TIME_CALLBACK_EVENT_SET); + if (i < 16) + ok(timers[i] != 0, "%d) timeSetEvent failed\n", i); + else + ok(!timers[i], "%d) timeSetEvent succeeded\n", i); + } + + for (i = 0; i < 16; i++) + { + res = timeKillEvent(timers[i]); + ok(res == TIMERR_NOERROR, "%d) timeKillEvent failed\n", i); + } + + timers[0] = timeSetEvent(10, 0, event, 0, TIME_CALLBACK_EVENT_SET); + ok(timers[0], "timeSetEvent failed\n"); + WaitForSingleObject(event, 1000); + timers[1] = timeSetEvent(1000, 0, event, 0, TIME_CALLBACK_EVENT_SET); + ok(timers[1], "timeSetEvent failed\n"); + ok(timers[0] != timers[1], "timer got the same id as just destroyed timer\n"); + res = timeKillEvent(timers[0]); + ok(res == TIMERR_NOCANDO, "timeKillEvent returned %d\n", res); + res = timeKillEvent(timers[1]); + ok(res == TIMERR_NOERROR, "timeKillEvent returned %d\n", res); + + timers[0] = timeSetEvent(10, 0, kill_timer_callback, (DWORD_PTR)event, TIME_ONESHOT); + WaitForSingleObject(event, 1000); + timers[0] = timeSetEvent(10, 0, kill_timer_callback, (DWORD_PTR)event, TIME_KILL_SYNCHRONOUS); + WaitForSingleObject(event, 1000); + + CloseHandle(event); +} + START_TEST(timer) { test_timeGetDevCaps(); @@ -216,4 +270,5 @@ START_TEST(timer) } test_priority(); + test_timer_lifetime(); }

1 0

Piotr Caban : winmm: Destroy timer after calling callback.
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: daec24a9d6adc25954a239a588f4019acd79609a URL: https://source.winehq.org/git/wine.git/?a=commit;h=daec24a9d6adc25954a239a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 30 14:37:57 2020 +0200 winmm: Destroy timer after calling callback. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/time.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 2d5f3db389..634b5df792 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -107,7 +107,7 @@ static CONDITION_VARIABLE TIME_cv; */ static int TIME_MMSysTimeCallback(void) { - WINE_TIMERENTRY *timer, copy; + WINE_TIMERENTRY *timer; int i, delta_time; /* since timeSetEvent() and timeKillEvent() can be called @@ -139,15 +139,7 @@ static int TIME_MMSysTimeCallback(void) if (delta_time > 0) break; if (timer->wFlags & TIME_PERIODIC) - { timer->dwTriggerTime += timer->wDelay; - } - else - { - copy = *timer; - timer->wTimerID = 0; - timer = © - } switch(timer->wFlags & (TIME_CALLBACK_EVENT_SET|TIME_CALLBACK_EVENT_PULSE)) { @@ -171,9 +163,12 @@ static int TIME_MMSysTimeCallback(void) EnterCriticalSection(&WINMM_cs); if (flags & TIME_KILL_SYNCHRONOUS) LeaveCriticalSection(&TIME_cbcrst); + if (id != timer->wTimerID) timer = NULL; } break; } + if (timer && !(timer->wFlags & TIME_PERIODIC)) + timer->wTimerID = 0; } return delta_time; }

1 0

Piotr Caban : winmm: Remove unneeded TIME_TimeToDie, the thread ends when list is empty.
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: 39968ccdba2e89d5b5490dab786d4ba309f6ca7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=39968ccdba2e89d5b5490dab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 30 14:37:45 2020 +0200 winmm: Remove unneeded TIME_TimeToDie, the thread ends when list is empty. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/time.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 9bb948efbd..814d97def0 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -58,7 +58,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION TIME_cbcrst = { &critsect_debug, -1, 0, 0, 0, 0 }; static HANDLE TIME_hMMTimer; -static BOOL TIME_TimeToDie = TRUE; static CONDITION_VARIABLE TIME_cv; /* link timer at the appropriate spot in the list */ @@ -198,7 +197,7 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) TRACE("Starting main winmm thread\n"); EnterCriticalSection(&WINMM_cs); - while (! TIME_TimeToDie) + while (1) { sleep_time = TIME_MMSysTimeCallback(); @@ -228,7 +227,6 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) static void TIME_MMTimeStart(void) { HMODULE mod; - TIME_TimeToDie = 0; if (TIME_hMMTimer) return; GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)TIME_MMSysTimeThread, &mod); @@ -345,10 +343,8 @@ MMRESULT WINAPI timeKillEvent(UINT wID) break; } } - if (list_empty(&timer_list)) { - TIME_TimeToDie = 1; + if (list_empty(&timer_list)) WakeConditionVariable(&TIME_cv); - } LeaveCriticalSection(&WINMM_cs); if (!lpSelf)

1 0

Alexandre Julliard : ntdll: Fix handle/module confusion in Unix module loading.
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: 0167e195e962a427c247e3442abf6ea23fd36156 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0167e195e962a427c247e344… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 30 15:37:34 2020 +0200 ntdll: Fix handle/module confusion in Unix module loading. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 6890a08428..f12cc51899 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -138,7 +138,7 @@ struct builtin_module struct file_id id; void *handle; void *module; - void *unix_module; + void *unix_handle; }; static struct list builtin_modules = LIST_INIT( builtin_modules ); @@ -149,7 +149,7 @@ static NTSTATUS add_builtin_module( void *module, void *handle, const struct sta if (!(builtin = malloc( sizeof(*builtin) ))) return STATUS_NO_MEMORY; builtin->handle = handle; builtin->module = module; - builtin->unix_module = NULL; + builtin->unix_handle = NULL; if (st) { builtin->id.dev = st->st_dev; @@ -1015,23 +1015,24 @@ static NTSTATUS dlopen_unix_dll( void *module, const char *name, void **unix_ent { if (builtin->module == module) { - if (builtin->unix_module == unix_module) /* already loaded */ + if (builtin->unix_handle == handle) /* already loaded */ { + *unix_entry = entry; status = STATUS_SUCCESS; goto done; } - if (builtin->unix_module) + if (builtin->unix_handle) { ERR( "module %p already has a Unix module that's not %s\n", module, debugstr_a(name) ); goto done; } if ((status = map_so_dll( nt, unix_module ))) goto done; if ((status = fixup_ntdll_imports( name, unix_module ))) goto done; - builtin->unix_module = handle; + builtin->unix_handle = handle; *unix_entry = entry; return STATUS_SUCCESS; } - else if (builtin->unix_module == unix_module) + else if (builtin->unix_handle == handle) { ERR( "%s already loaded for module %p\n", debugstr_a(name), module ); goto done; @@ -1339,7 +1340,7 @@ static NTSTATUS CDECL unload_builtin_dll( void *module ) if (builtin->module != module) continue; list_remove( &builtin->entry ); if (builtin->handle) dlclose( builtin->handle ); - if (builtin->unix_module) dlclose( builtin->unix_module ); + if (builtin->unix_handle) dlclose( builtin->unix_handle ); free( builtin ); return STATUS_SUCCESS; }

1 0

Zebediah Figura : wined3d: Check for UAV support in wined3d_check_device_format.
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: 76653835532efb68ce1ce0d3eb34367e0c770262 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76653835532efb68ce1ce0d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 29 16:06:17 2020 -0500 wined3d: Check for UAV support in wined3d_check_device_format. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 386d84e54e..0fa05a06be 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1618,7 +1618,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, case WINED3D_RTYPE_NONE: allowed_usage = 0; allowed_bind_flags = WINED3D_BIND_RENDER_TARGET - | WINED3D_BIND_DEPTH_STENCIL; + | WINED3D_BIND_DEPTH_STENCIL + | WINED3D_BIND_UNORDERED_ACCESS; gl_type = WINED3D_GL_RES_TYPE_TEX_2D; gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; @@ -1633,7 +1634,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; - allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE; + allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE + | WINED3D_BIND_UNORDERED_ACCESS; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_1D; break; @@ -1642,7 +1644,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, if (bind_flags & WINED3D_BIND_RENDER_TARGET) allowed_usage |= WINED3DUSAGE_QUERY_SRGBWRITE; allowed_bind_flags = WINED3D_BIND_RENDER_TARGET - | WINED3D_BIND_DEPTH_STENCIL; + | WINED3D_BIND_DEPTH_STENCIL + | WINED3D_BIND_UNORDERED_ACCESS; if (!(bind_flags & WINED3D_BIND_SHADER_RESOURCE)) { if (!wined3d_check_surface_format(format)) @@ -1683,7 +1686,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; - allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE; + allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE + | WINED3D_BIND_UNORDERED_ACCESS; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; @@ -1713,6 +1717,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, format_flags |= WINED3DFMT_FLAG_RENDERTARGET; if (bind_flags & WINED3D_BIND_DEPTH_STENCIL) format_flags |= WINED3DFMT_FLAG_DEPTH_STENCIL; + if (bind_flags & WINED3D_BIND_UNORDERED_ACCESS) + format_flags |= WINED3DFMT_FLAG_UNORDERED_ACCESS; if (usage & WINED3DUSAGE_QUERY_FILTER) format_flags |= WINED3DFMT_FLAG_FILTERING; if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) @@ -1754,6 +1760,13 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, return WINED3DERR_NOTAVAILABLE; } + if ((bind_flags & WINED3D_BIND_UNORDERED_ACCESS) && wined3d_format_is_typeless(format)) + { + TRACE("Requested WINED3D_BIND_UNORDERED_ACCESS, but format %s is typeless.\n", + debug_d3dformat(check_format_id)); + return WINED3DERR_NOTAVAILABLE; + } + if ((format->flags[gl_type] & format_flags) != format_flags) { TRACE("Requested format flags %#x, but format %s only has %#x.\n",

1 0

Nikolay Sivov : combase: Remove dead assignment (Coverity).
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: 4b8756e0b4530530333670a42e5e9995ae6b3fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b8756e0b4530530333670a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 30 13:51:19 2020 +0300 combase: Remove dead assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/hglobalstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/hglobalstream.c b/dlls/combase/hglobalstream.c index 5cbb280fd5..d957fae2c7 100644 --- a/dlls/combase/hglobalstream.c +++ b/dlls/combase/hglobalstream.c @@ -299,7 +299,7 @@ static HRESULT WINAPI stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGE while (cb.QuadPart > 0) { - ULONG chunk_size = chunk_size = cb.QuadPart >= sizeof(buffer) ? sizeof(buffer) : cb.u.LowPart; + ULONG chunk_size = cb.QuadPart >= sizeof(buffer) ? sizeof(buffer) : cb.u.LowPart; ULONG chunk_read, chunk_written; hr = IStream_Read(iface, buffer, chunk_size, &chunk_read);

1 0

Ziqing Hui : d3dx10: Implement D3DX10GetImageInfoFromFileA().
by Alexandre Julliard Sept. 30, 2020

Sept. 30, 2020

Module: wine Branch: master Commit: 937b585996b0bf4e65170b447cef60bc6d9408d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=937b585996b0bf4e65170b44… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Sep 30 12:53:48 2020 +0200 d3dx10: Implement D3DX10GetImageInfoFromFileA(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 4 +--- dlls/d3dx10_43/texture.c | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 02de73865f..897c54249b 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1395,12 +1395,10 @@ static void test_get_image_info(void) ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromFileW(L"deadbeaf", NULL, &image_info, NULL); ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - todo_wine { hr = D3DX10GetImageInfoFromFileA(NULL, NULL, &image_info, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromFileA("deadbeaf", NULL, &image_info, NULL); ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { @@ -1413,7 +1411,7 @@ static void test_get_image_info(void) check_image_info(&image_info, i, __LINE__); hr = D3DX10GetImageInfoFromFileA(get_str_a(path), NULL, &image_info, NULL); - todo_wine + todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (hr == S_OK) check_image_info(&image_info, i, __LINE__); diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index b871345148..23d7b93e64 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -151,9 +151,29 @@ done: HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { - FIXME("src_file %s, pump %p, info %p, result %p\n", debugstr_a(src_file), pump, info, result); + WCHAR *buffer; + int str_len; + HRESULT hr; - return E_NOTIMPL; + TRACE("src_file %s, pump %p, info %p, result %p.\n", debugstr_a(src_file), pump, info, result); + + if (!src_file || !info) + return E_FAIL; + + str_len = MultiByteToWideChar(CP_ACP, 0, src_file, -1, NULL, 0); + if (!str_len) + return HRESULT_FROM_WIN32(GetLastError()); + + buffer = heap_alloc(str_len * sizeof(*buffer)); + if (!buffer) + return E_OUTOFMEMORY; + + MultiByteToWideChar(CP_ACP, 0, src_file, -1, buffer, str_len); + hr = D3DX10GetImageInfoFromFileW(buffer, pump, info, result); + + heap_free(buffer); + + return hr; } HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info,

1 0