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

Zebediah Figura : quartz/systemclock: Clean up the remaining IUnknown methods.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 6f3238168ebad9f9955462309b4363577f6d10c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f3238168ebad9f995546230… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 16 09:11:49 2019 -0500 quartz/systemclock: Clean up the remaining IUnknown methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index f22c781..1a1361c 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -108,29 +108,31 @@ static void notify_thread(SystemClockImpl *clock) SetEvent(clock->notify_event); } -static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock* iface) { - SystemClockImpl *This = impl_from_IReferenceClock(iface); - ULONG ref = InterlockedIncrement(&This->ref); +static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock *iface, REFIID iid, void **out) +{ + SystemClockImpl *clock = impl_from_IReferenceClock(iface); + TRACE("clock %p, iid %s, out %p.\n", clock, debugstr_guid(iid), out); - TRACE("(%p): AddRef from %d\n", This, ref - 1); + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IReferenceClock)) + { + IReferenceClock_AddRef(iface); + *out = iface; + return S_OK; + } - return ref; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; } -static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock* iface, REFIID riid, void** ppobj) { - SystemClockImpl *This = impl_from_IReferenceClock(iface); - TRACE("(%p, %s,%p)\n", This, debugstr_guid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown) || - IsEqualIID (riid, &IID_IReferenceClock)) { - SystemClockImpl_AddRef(iface); - *ppobj = &This->IReferenceClock_iface; - return S_OK; - } - - *ppobj = NULL; - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppobj); - return E_NOINTERFACE; +static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock *iface) +{ + SystemClockImpl *clock = impl_from_IReferenceClock(iface); + ULONG refcount = InterlockedIncrement(&clock->ref); + + TRACE("%p increasing refcount to %u.\n", clock, refcount); + + return refcount; } static ULONG WINAPI SystemClockImpl_Release(IReferenceClock *iface)

1 0

Zebediah Figura : quartz/systemclock: Get rid of the SystemClockImpl typedef.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: f55e90a508f5d2eb23a076008667156b8576adb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f55e90a508f5d2eb23a07600… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 16 09:11:50 2019 -0500 quartz/systemclock: Get rid of the SystemClockImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 1a1361c..15f8ea0 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -36,7 +36,8 @@ struct advise_sink int cookie; }; -typedef struct SystemClockImpl { +struct system_clock +{ IReferenceClock IReferenceClock_iface; LONG ref; @@ -46,16 +47,16 @@ typedef struct SystemClockImpl { CRITICAL_SECTION cs; struct list sinks; -} SystemClockImpl; +}; -static inline SystemClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) +static inline struct system_clock *impl_from_IReferenceClock(IReferenceClock *iface) { - return CONTAINING_RECORD(iface, SystemClockImpl, IReferenceClock_iface); + return CONTAINING_RECORD(iface, struct system_clock, IReferenceClock_iface); } static DWORD WINAPI SystemClockAdviseThread(void *param) { - SystemClockImpl *clock = param; + struct system_clock *clock = param; struct advise_sink *sink, *cursor; REFERENCE_TIME current_time; DWORD timeout = INFINITE; @@ -97,7 +98,7 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) } } -static void notify_thread(SystemClockImpl *clock) +static void notify_thread(struct system_clock *clock) { if (!InterlockedCompareExchange(&clock->thread_created, TRUE, FALSE)) { @@ -110,7 +111,7 @@ static void notify_thread(SystemClockImpl *clock) static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock *iface, REFIID iid, void **out) { - SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct system_clock *clock = impl_from_IReferenceClock(iface); TRACE("clock %p, iid %s, out %p.\n", clock, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IReferenceClock)) @@ -127,7 +128,7 @@ static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock *iface, REF static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock *iface) { - SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct system_clock *clock = impl_from_IReferenceClock(iface); ULONG refcount = InterlockedIncrement(&clock->ref); TRACE("%p increasing refcount to %u.\n", clock, refcount); @@ -137,7 +138,7 @@ static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock *iface) static ULONG WINAPI SystemClockImpl_Release(IReferenceClock *iface) { - SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct system_clock *clock = impl_from_IReferenceClock(iface); ULONG refcount = InterlockedDecrement(&clock->ref); TRACE("%p decreasing refcount to %u.\n", clock, refcount); @@ -161,7 +162,7 @@ static ULONG WINAPI SystemClockImpl_Release(IReferenceClock *iface) static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_TIME *time) { - SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct system_clock *clock = impl_from_IReferenceClock(iface); REFERENCE_TIME ret; HRESULT hr; @@ -186,7 +187,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, REFERENCE_TIME base, REFERENCE_TIME offset, HEVENT event, DWORD_PTR *cookie) { - SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct system_clock *clock = impl_from_IReferenceClock(iface); struct advise_sink *sink; TRACE("clock %p, base %s, offset %s, event %#lx, cookie %p.\n", @@ -222,7 +223,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, REFERENCE_TIME start, REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) { - SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct system_clock *clock = impl_from_IReferenceClock(iface); struct advise_sink *sink; TRACE("clock %p, start %s, period %s, semaphore %#lx, cookie %p.\n", @@ -257,7 +258,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR cookie) { - SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct system_clock *clock = impl_from_IReferenceClock(iface); struct advise_sink *sink; TRACE("clock %p, cookie %#lx.\n", clock, cookie); @@ -293,7 +294,7 @@ static const IReferenceClockVtbl SystemClock_Vtbl = HRESULT QUARTZ_CreateSystemClock(IUnknown *outer, void **out) { - SystemClockImpl *object; + struct system_clock *object; TRACE("outer %p, out %p.\n", outer, out);

1 0

Francois Gouget : kernel32/tests: A spelling fix in a win_skip() message.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 193df74fde62b65f5a214e9d8c547efd8ceb5647 URL: https://source.winehq.org/git/wine.git/?a=commit;h=193df74fde62b65f5a214e9d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 16 23:48:21 2019 +0100 kernel32/tests: A spelling fix in a win_skip() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 4c7df3d..3f30cce 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3680,7 +3680,7 @@ static void test_multiple_instances(void) if(!pCancelIoEx) { - win_skip("Skiping multiple instance tests on too old Windows\n"); + win_skip("Skipping multiple instance tests on too old Windows\n"); return; }

1 0

Francois Gouget : ntoskrnl.exe/tests: Make vskip_(), win_skip_() and kmemcpy() static.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 7604174e5b9e9ca1ad3121f7ae3ae57bb120b070 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7604174e5b9e9ca1ad3121f7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 16 23:48:41 2019 +0100 ntoskrnl.exe/tests: Make vskip_(), win_skip_() and kmemcpy() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 7f2e68c..ae15df3 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -126,7 +126,7 @@ static void WINAPIV ok_(const char *file, int line, int condition, const char *m __ms_va_end(args); } -void vskip_(const char *file, int line, const char *msg, __ms_va_list args) +static void vskip_(const char *file, int line, const char *msg, __ms_va_list args) { const char *current_file; @@ -141,7 +141,7 @@ void vskip_(const char *file, int line, const char *msg, __ms_va_list args) skipped++; } -void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) +static void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) { __ms_va_list args; __ms_va_start(args, msg); @@ -185,7 +185,7 @@ static unsigned int strlenW( const WCHAR *str ) return s - str; } -void *kmemcpy(void *dest, const void *src, SIZE_T n) +static void *kmemcpy(void *dest, const void *src, SIZE_T n) { const char *s = src; char *d = dest;

1 0

Francois Gouget : dbghelp: Make minidump_add_memory64_block() static.
by Alexandre Julliard 18 Mar '19

18 Mar '19

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

Francois Gouget : mfplat/tests: A wording tweak in a win_skip() messages.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 82060ae8df98cca80016f796675e9adb1ae0c37d URL: https://source.winehq.org/git/wine.git/?a=commit;h=82060ae8df98cca80016f796… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 16 23:50:28 2019 +0100 mfplat/tests: A wording tweak in a win_skip() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 38151d9..3a102e2 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -825,7 +825,7 @@ static void test_MFCreateMFByteStreamOnStream(void) if (hr != S_OK) { - win_skip("Can not retrieve IMFAttributes interface from IMFByteStream\n"); + win_skip("Cannot retrieve IMFAttributes interface from IMFByteStream\n"); IStream_Release(stream); IMFByteStream_Release(bytestream); return;

1 0

Piotr Caban : msvcrt: Correctly set _stat64.st_dev fields in _wstat64.
by Alexandre Julliard 18 Mar '19

18 Mar '19

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

Piotr Caban : msvcrt: Use correct locale when comparing strings in getenv.
by Alexandre Julliard 18 Mar '19

18 Mar '19

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

Zhiyi Zhang : setupapi/tests: Test phantom value after device creation.
by Alexandre Julliard 18 Mar '19

18 Mar '19

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

Francois Gouget : testbot/WineRunWineTest: Fix a typo in an error message.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: tools Branch: master Commit: b244390ccd9e35d6ea286e66d8f9b0d5022b60ab URL: https://source.winehq.org/git/tools.git/?a=commit;h=b244390ccd9e35d6ea286e6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 18 17:00:16 2019 +0100 testbot/WineRunWineTest: Fix a typo in an error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunWineTest.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 8792be3..a74877a 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -423,7 +423,7 @@ if (defined $FileName) my $Dst = $Step->FileType eq "patch" ? "patch.diff" : $FileName; if (!$TA->SendFile($Step->GetFullFileName(), "staging/$Dst", 0)) { - FatalTAError($TA, "Could send '$FileName' to the VM"); + FatalTAError($TA, "Could not send '$FileName' to the VM"); } }

1 0