March 2019 - Wine-Commits - list.winehq.org

Zhiyi Zhang : setupapi: Check registered device duplicate in SetupDiCreateDeviceInfo().
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 1fa7782c080e5d4719bb230110992a0705f9b224 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fa7782c080e5d4719bb2301… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:42:29 2019 +0800 setupapi: Check registered device duplicate in SetupDiCreateDeviceInfo(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 14 ++++++++++++++ dlls/setupapi/tests/devinst.c | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index cdad889..ab7eeeb 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1510,6 +1510,8 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const { WCHAR id[MAX_DEVICE_ID_LEN]; struct DeviceInfoSet *set; + HKEY enum_hkey; + HKEY instance_hkey; struct device *device; TRACE("devinfo %p, name %s, class %s, description %s, hwnd %p, flags %#x, device_data %p.\n", @@ -1570,6 +1572,18 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const } else { + /* Check if instance is already in registry */ + RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_READ, NULL, &enum_hkey, NULL); + if (!RegOpenKeyExW(enum_hkey, name, 0, KEY_READ, &instance_hkey)) + { + RegCloseKey(instance_hkey); + RegCloseKey(enum_hkey); + SetLastError(ERROR_DEVINST_ALREADY_EXISTS); + return FALSE; + } + RegCloseKey(enum_hkey); + + /* Check if instance is already in set */ strcpyW(id, name); LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) { diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 01891b1..2355f30 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -358,9 +358,9 @@ static void test_device_info(void) set = SetupDiCreateDeviceInfoList(&guid, NULL); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); - todo_wine ok(!ret, "Expect failure\n"); - todo_wine ok(GetLastError() == ERROR_DEVINST_ALREADY_EXISTS, "Got error %#x\n", GetLastError()); - todo_wine check_device_info(set, 0, NULL, NULL); + ok(!ret, "Expect failure\n"); + ok(GetLastError() == ERROR_DEVINST_ALREADY_EXISTS, "Got error %#x\n", GetLastError()); + check_device_info(set, 0, NULL, NULL); SetupDiDestroyDeviceInfoList(set); set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0);

1 0

Zhiyi Zhang : setupapi: Implement SetupDiOpenDeviceInfoA().
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 17d58c93f373e636812434711e245f8ac78620af URL: https://source.winehq.org/git/wine.git/?a=commit;h=17d58c93f373e63681243471… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:41:57 2019 +0800 setupapi: Implement SetupDiOpenDeviceInfoA(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 20 ++++++++++++++++++++ dlls/setupapi/stubs.c | 11 ----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 81b6e35..cdad889 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3317,6 +3317,26 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( } /*********************************************************************** + * SetupDiOpenDeviceInfoA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO devinfo, PCSTR instance_id, HWND hwnd_parent, DWORD flags, + PSP_DEVINFO_DATA device_data) +{ + WCHAR instance_idW[MAX_DEVICE_ID_LEN]; + + TRACE("%p %s %p 0x%08x %p\n", devinfo, debugstr_a(instance_id), hwnd_parent, flags, device_data); + + if (!instance_id || strlen(instance_id) >= MAX_DEVICE_ID_LEN) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + MultiByteToWideChar(CP_ACP, 0, instance_id, -1, instance_idW, ARRAY_SIZE(instance_idW)); + return SetupDiOpenDeviceInfoW(devinfo, instance_idW, hwnd_parent, flags, device_data); +} + +/*********************************************************************** * SetupDiOpenDeviceInfoW (SETUPAPI.@) */ BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO devinfo, PCWSTR instance_id, HWND hwnd_parent, DWORD flags, diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index b64c1a1..ede878f 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -312,17 +312,6 @@ BOOL WINAPI SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA ClassImageListData } /*********************************************************************** - * SetupDiOpenDeviceInfoA (SETUPAPI.@) - */ -BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceId, - HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) -{ - FIXME("%p %s %p 0x%08x %p: stub\n", DeviceInfoSet, debugstr_a(DeviceInstanceId), - hwndParent, OpenFlags, DeviceInfoData); - return FALSE; -} - -/*********************************************************************** * CM_Locate_DevNodeA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags)

1 0

Zhiyi Zhang : include: Add more SetupAPI property keys.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: e4d6c3a1173d4ac2c2622207c41cb1e08306f741 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4d6c3a1173d4ac2c2622207… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:42:37 2019 +0800 include: Add more SetupAPI property keys. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/devpkey.h | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 170 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4d6c3a1173d4ac2c262…

1 0

Zhiyi Zhang : setupapi/tests: Test phantom value after device creation.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 35673c7e8e0709276fe6f0bb2727da3da438ec11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35673c7e8e0709276fe6f0bb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:40:41 2019 +0800 setupapi/tests: Test phantom value after device creation. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 004a956..3add9b2 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -742,6 +742,11 @@ static void test_register_device_info(void) SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; + HKEY hkey; + LSTATUS ls; + DWORD type = 0; + DWORD phantom = 0; + DWORD size; int i = 0; SetLastError(0xdeadbeef); @@ -770,8 +775,19 @@ static void test_register_device_info(void) ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Enum\\ROOT\\LEGACY_BOGUS\\0000", &hkey); + size = sizeof(phantom); + ls = RegQueryValueExA(hkey, "Phantom", NULL, &type, (BYTE *)&phantom, &size); + todo_wine ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); + todo_wine ok(phantom == 1, "Got wrong phantom value %d\n", phantom); + todo_wine ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); + ok(size == sizeof(phantom), "Got wrong phantom size %d\n", size); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + size = sizeof(phantom); + ls = RegQueryValueExA(hkey, "Phantom", NULL, NULL, (BYTE *)&phantom, &size); + ok(ls == ERROR_FILE_NOT_FOUND, "Got wrong error code %#x\n", ls); + RegCloseKey(hkey); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError());

1 0

Piotr Caban : msvcrt: Use correct locale when comparing strings in getenv.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: b633777ed4d02821029a3b83fdb89fb6fbb66933 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b633777ed4d02821029a3b83… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 17 20:19:50 2019 +0100 msvcrt: Use correct locale when comparing strings in getenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/environ.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index f48eabf..cce62bc 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -38,7 +38,7 @@ char * CDECL MSVCRT_getenv(const char *name) { char *str = *environ; char *pos = strchr(str,'='); - if (pos && ((pos - str) == length) && !strncasecmp(str,name,length)) + if (pos && ((pos - str) == length) && !MSVCRT__strnicmp(str,name,length)) { TRACE("(%s): got %s\n", debugstr_a(name), debugstr_a(pos + 1)); return pos + 1; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index aad8c95..8df8e3b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1145,6 +1145,7 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg); int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); +int __cdecl MSVCRT__strnicmp(const char*, const char*, MSVCRT_size_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); unsigned int __cdecl MSVCRT__get_output_format(void);

1 0

Francois Gouget : dbghelp: Make minidump_add_memory64_block() static.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 5651c9dd2819e67ff8aba698eed8d77abe4abcb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5651c9dd2819e67ff8aba698… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 16 23:50:12 2019 +0100 dbghelp: Make minidump_add_memory64_block() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/minidump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index b096476..6a2525f 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -294,7 +294,7 @@ static BOOL fetch_macho_module_info_cb(const WCHAR* name, unsigned long base, return TRUE; } -void minidump_add_memory64_block(struct dump_context* dc, ULONG64 base, ULONG64 size) +static void minidump_add_memory64_block(struct dump_context* dc, ULONG64 base, ULONG64 size) { if (!dc->mem64) {

1 0

Zebediah Figura : quartz/systemclock: Store all the sinks in a single list.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 1ecf2bf129ab131cf6c900880570ca591409be0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ecf2bf129ab131cf6c90088… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 16 09:11:48 2019 -0500 quartz/systemclock: Store all the sinks in a single list. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 116 ++++++++++++++++------------------------------ 1 file changed, 39 insertions(+), 77 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index f41cdbe..f22c781 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -45,8 +45,7 @@ typedef struct SystemClockImpl { REFERENCE_TIME last_time; CRITICAL_SECTION cs; - /* These lists are ordered by expiration time (soonest first). */ - struct list single_sinks, periodic_sinks; + struct list sinks; } SystemClockImpl; static inline SystemClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) @@ -54,73 +53,48 @@ static inline SystemClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) return CONTAINING_RECORD(iface, SystemClockImpl, IReferenceClock_iface); } -static void insert_advise_sink(struct advise_sink *sink, struct list *queue) +static DWORD WINAPI SystemClockAdviseThread(void *param) { - REFERENCE_TIME due_time = sink->due_time + sink->period; - struct advise_sink *cursor; + SystemClockImpl *clock = param; + struct advise_sink *sink, *cursor; + REFERENCE_TIME current_time; + DWORD timeout = INFINITE; + HANDLE handles[2] = {clock->stop_event, clock->notify_event}; - LIST_FOR_EACH_ENTRY(cursor, queue, struct advise_sink, entry) - { - if (cursor->due_time + cursor->period > due_time) - { - list_add_before(&cursor->entry, &sink->entry); - return; - } - } - - list_add_tail(queue, &sink->entry); -} - -static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { - SystemClockImpl* This = lpParam; - struct advise_sink *sink, *cursor; - struct list *entry; - DWORD timeOut = INFINITE; - REFERENCE_TIME curTime; - HANDLE handles[2] = {This->stop_event, This->notify_event}; - - TRACE("(%p): Main Loop\n", This); + TRACE("Starting advise thread for clock %p.\n", clock); - while (TRUE) { - EnterCriticalSection(&This->cs); - - curTime = GetTickCount64() * 10000; - - /** First SingleShots Advice: sorted list */ - LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &This->single_sinks, struct advise_sink, entry) + for (;;) { - if (sink->due_time + sink->period > curTime) - break; + EnterCriticalSection(&clock->cs); - SetEvent(sink->handle); - list_remove(&sink->entry); - heap_free(sink); - } + current_time = GetTickCount64() * 10000; - if ((entry = list_head(&This->single_sinks))) - { - sink = LIST_ENTRY(entry, struct advise_sink, entry); - timeOut = (sink->due_time + sink->period - curTime) / 10000; - } - else timeOut = INFINITE; - - /** Now Periodics Advice: semi sorted list (sort cannot be used) */ - LIST_FOR_EACH_ENTRY(sink, &This->periodic_sinks, struct advise_sink, entry) - { - if (sink->due_time <= curTime) - { - DWORD periods = ((curTime - sink->due_time) / sink->period) + 1; - ReleaseSemaphore(sink->handle, periods, NULL); - sink->due_time += periods * sink->period; - } - timeOut = min(timeOut, (sink->due_time - curTime) / 10000); - } + LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &clock->sinks, struct advise_sink, entry) + { + if (sink->due_time <= current_time) + { + if (sink->period) + { + DWORD periods = ((current_time - sink->due_time) / sink->period) + 1; + ReleaseSemaphore(sink->handle, periods, NULL); + sink->due_time += periods * sink->period; + } + else + { + SetEvent(sink->handle); + list_remove(&sink->entry); + heap_free(sink); + } + } + + timeout = min(timeout, (sink->due_time - current_time) / 10000); + } - LeaveCriticalSection(&This->cs); + LeaveCriticalSection(&clock->cs); - if (WaitForMultipleObjects(2, handles, FALSE, timeOut) == 0) - return 0; - } + if (WaitForMultipleObjects(2, handles, FALSE, timeout) == 0) + return 0; + } } static void notify_thread(SystemClockImpl *clock) @@ -234,7 +208,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, sink->cookie = InterlockedIncrement(&cookie_counter); EnterCriticalSection(&clock->cs); - insert_advise_sink(sink, &clock->single_sinks); + list_add_tail(&clock->sinks, &sink->entry); LeaveCriticalSection(&clock->cs); notify_thread(clock); @@ -270,7 +244,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, sink->cookie = InterlockedIncrement(&cookie_counter); EnterCriticalSection(&clock->cs); - insert_advise_sink(sink, &clock->periodic_sinks); + list_add_tail(&clock->sinks, &sink->entry); LeaveCriticalSection(&clock->cs); notify_thread(clock); @@ -288,18 +262,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR EnterCriticalSection(&clock->cs); - LIST_FOR_EACH_ENTRY(sink, &clock->single_sinks, struct advise_sink, entry) - { - if (sink->cookie == cookie) - { - list_remove(&sink->entry); - heap_free(sink); - LeaveCriticalSection(&clock->cs); - return S_OK; - } - } - - LIST_FOR_EACH_ENTRY(sink, &clock->periodic_sinks, struct advise_sink, entry) + LIST_FOR_EACH_ENTRY(sink, &clock->sinks, struct advise_sink, entry) { if (sink->cookie == cookie) { @@ -339,8 +302,7 @@ HRESULT QUARTZ_CreateSystemClock(IUnknown *outer, void **out) } object->IReferenceClock_iface.lpVtbl = &SystemClock_Vtbl; - list_init(&object->single_sinks); - list_init(&object->periodic_sinks); + list_init(&object->sinks); InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs");

1 0

Zebediah Figura : quartz/systemclock: Avoid using the sink structure pointer as a cookie.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 76e6fc92f9988acb0d3f96d8e9b7887a3e7db396 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76e6fc92f9988acb0d3f96d8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 16 09:11:47 2019 -0500 quartz/systemclock: Avoid using the sink structure pointer as a cookie. The same pointer address may be allocated to multiple different structures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 0cc6d87..f41cdbe 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -26,11 +26,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); +static int cookie_counter; + struct advise_sink { struct list entry; HANDLE handle; REFERENCE_TIME due_time, period; + int cookie; }; typedef struct SystemClockImpl { @@ -228,6 +231,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, sink->handle = (HANDLE)event; sink->due_time = base + offset; sink->period = 0; + sink->cookie = InterlockedIncrement(&cookie_counter); EnterCriticalSection(&clock->cs); insert_advise_sink(sink, &clock->single_sinks); @@ -235,7 +239,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, notify_thread(clock); - *cookie = (DWORD_PTR)sink; + *cookie = sink->cookie; return S_OK; } @@ -263,6 +267,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, sink->handle = (HANDLE)semaphore; sink->due_time = start; sink->period = period; + sink->cookie = InterlockedIncrement(&cookie_counter); EnterCriticalSection(&clock->cs); insert_advise_sink(sink, &clock->periodic_sinks); @@ -270,7 +275,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, notify_thread(clock); - *cookie = (DWORD_PTR)sink; + *cookie = sink->cookie; return S_OK; } @@ -285,7 +290,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR LIST_FOR_EACH_ENTRY(sink, &clock->single_sinks, struct advise_sink, entry) { - if (sink == (struct advise_sink *)cookie) + if (sink->cookie == cookie) { list_remove(&sink->entry); heap_free(sink); @@ -296,7 +301,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR LIST_FOR_EACH_ENTRY(sink, &clock->periodic_sinks, struct advise_sink, entry) { - if (sink == (struct advise_sink *)cookie) + if (sink->cookie == cookie) { list_remove(&sink->entry); heap_free(sink);

1 0

Piotr Caban : msvcrt: Don't detect overflow in atol implementation.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 8c1684a50a56bdafe38fa5c685f6b367f8a44bc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c1684a50a56bdafe38fa5c6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 16 14:49:08 2019 +0100 msvcrt: Don't detect overflow in atol implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46845 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 4 ++++ dlls/msvcrt/tests/string.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f31ba60..96f67e0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1109,7 +1109,11 @@ MSVCRT_long CDECL MSVCRT__atol_l(const char *str, MSVCRT__locale_t locale) */ MSVCRT_long CDECL MSVCRT_atol(const char *str) { +#if _MSVCR_VER == 0 + return MSVCRT_atoi(str); +#else return MSVCRT__atol_l(str, NULL); +#endif } #if _MSVCR_VER>=120 diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index eb8e304..ff3a87d 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3047,6 +3047,23 @@ static void test_atoi(void) ok(r == 0, "atoi(4294967296) = %d\n", r); } +static void test_atol(void) +{ + int r; + + r = atol("0"); + ok(r == 0, "atol(0) = %d\n", r); + + r = atol("-1"); + ok(r == -1, "atol(-1) = %d\n", r); + + r = atol("1"); + ok(r == 1, "atol(1) = %d\n", r); + + r = atol("4294967296"); + ok(r == 0, "atol(4294967296) = %d\n", r); +} + static void test_atof(void) { double d; @@ -3831,6 +3848,7 @@ START_TEST(string) test__stricmp(); test__wcstoi64(); test_atoi(); + test_atol(); test_atof(); test_strncpy(); test_strxfrm();

1 0

Piotr Caban : msvcrt: Correctly set _stat64.st_dev fields in _wstat64.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 513eb41f9a5f94f792b4eadedad38e95f3a43a59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=513eb41f9a5f94f792b4eade… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 17 20:19:44 2019 +0100 msvcrt: Correctly set _stat64.st_dev fields in _wstat64. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index e06bb00..af769dc 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3157,8 +3157,8 @@ int CDECL MSVCRT__wstat64(const MSVCRT_wchar_t* path, struct MSVCRT__stat64 * bu memset(buf,0,sizeof(struct MSVCRT__stat64)); /* FIXME: rdev isn't drive num, despite what the docs says-what is it? */ - if (MSVCRT_iswalpha(*path)) - buf->st_dev = buf->st_rdev = toupperW(*path - 'A'); /* drive num */ + if (MSVCRT_iswalpha(*path) && path[1] == ':') + buf->st_dev = buf->st_rdev = toupperW(*path) - 'A'; /* drive num */ else buf->st_dev = buf->st_rdev = MSVCRT__getdrive() - 1;

1 0