July 2018 - Wine-Commits - list.winehq.org

Fabian Maurer : msvcrt: Use cdecl calling convention for atexit callback.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 1bc84577fffe09781cccb3263eafb5e5557823a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bc84577fffe09781cccb326… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jul 9 18:03:41 2018 +0200 msvcrt: Use cdecl calling convention for atexit callback. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 4109f05..77743d5 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -397,7 +397,7 @@ void CDECL MSVCRT_exit(int exitcode) /********************************************************************* * atexit (MSVCRT.@) */ -int CDECL MSVCRT_atexit(void (*func)(void)) +int CDECL MSVCRT_atexit(void (__cdecl *func)(void)) { TRACE("(%p)\n", func); return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; @@ -408,7 +408,7 @@ int CDECL MSVCRT_atexit(void (*func)(void)) /********************************************************************* * _crt_atexit (UCRTBASE.@) */ -int CDECL MSVCRT__crt_atexit(void (*func)(void)) +int CDECL MSVCRT__crt_atexit(void (__cdecl *func)(void)) { TRACE("(%p)\n", func); return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1;

1 0

Dmitry Timoshkov : oleaut32/tests: Add tests for IPicture::get_hPal() and IPicture::set_hPal().
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: bab5a703da91c106aadb43349fd9f742cd9c84e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bab5a703da91c106aadb4334… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 6 16:10:37 2018 +0800 oleaut32/tests: Add tests for IPicture::get_hPal() and IPicture::set_hPal(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olepicture.c | 105 ++++++++++++++++++++++++++++++++++----- 1 file changed, 93 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 50ba765..c06cec1 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -539,12 +539,61 @@ static void test_Invoke(void) IPictureDisp_Release(picdisp); } +static HRESULT create_picture(short type, IPicture **pict) +{ + PICTDESC desc; + + desc.cbSizeofstruct = sizeof(desc); + desc.picType = type; + + switch (type) + { + case PICTYPE_UNINITIALIZED: + return OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)pict); + + case PICTYPE_NONE: + break; + + case PICTYPE_BITMAP: + desc.u.bmp.hbitmap = CreateBitmap(1, 1, 1, 1, NULL); + desc.u.bmp.hpal = (HPALETTE)0xbeefdead; + break; + + case PICTYPE_ICON: + desc.u.icon.hicon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + break; + + case PICTYPE_METAFILE: + { + HDC hdc = CreateMetaFileA(NULL); + desc.u.wmf.hmeta = CloseMetaFile(hdc); + desc.u.wmf.xExt = 1; + desc.u.wmf.yExt = 1; + break; + } + + case PICTYPE_ENHMETAFILE: + { + HDC hdc = CreateEnhMetaFileA(0, NULL, NULL, NULL); + desc.u.emf.hemf = CloseEnhMetaFile(hdc); + break; + } + + default: + ok(0, "picture type %d is not supported\n", type); + return E_NOTIMPL; + } + + return OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (void **)pict); +} + static void test_OleCreatePictureIndirect(void) { + PICTDESC desc; OLE_HANDLE handle; IPicture *pict; HRESULT hr; - short type; + short type, i; if (0) { @@ -552,20 +601,52 @@ if (0) OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, NULL); } - hr = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void**)&pict); - ok(hr == S_OK, "hr %08x\n", hr); + desc.cbSizeofstruct = sizeof(desc); + desc.picType = PICTYPE_UNINITIALIZED; + pict = (void *)0xdeadbeef; + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (void **)&pict); + ok(hr == E_UNEXPECTED, "got %#x\n", hr); + ok(pict == NULL, "got %p\n", pict); - type = PICTYPE_NONE; - hr = IPicture_get_Type(pict, &type); - ok(hr == S_OK, "hr %08x\n", hr); - ok(type == PICTYPE_UNINITIALIZED, "type %d\n", type); + for (i = PICTYPE_UNINITIALIZED; i <= PICTYPE_ENHMETAFILE; i++) + { + hr = create_picture(i, &pict); + ok(hr == S_OK, "%d: got %#x\n", i, hr); + + type = 0xdead; + hr = IPicture_get_Type(pict, &type); + ok(hr == S_OK, "%d: got %#x\n", i, hr); + ok(type == i, "%d: got %d\n", i, type); + + handle = 0xdeadbeef; + hr = IPicture_get_Handle(pict, &handle); + ok(hr == S_OK, "%d: got %#x\n", i, hr); + if (type == PICTYPE_UNINITIALIZED || type == PICTYPE_NONE) + ok(handle == 0, "%d: got %#x\n", i, handle); + else + ok(handle != 0 && handle != 0xdeadbeef, "%d: got %#x\n", i, handle); + + handle = 0xdeadbeef; + hr = IPicture_get_hPal(pict, &handle); + if (type == PICTYPE_BITMAP) + { + ok(hr == S_OK, "%d: got %#x\n", i, hr); + ok(handle == 0xbeefdead, "%d: got %#x\n", i, handle); + } + else + { + ok(hr == E_FAIL, "%d: got %#x\n", i, hr); + ok(handle == 0xdeadbeef || handle == 0 /* win64 */, "%d: got %#x\n", i, handle); + } - handle = 0xdeadbeef; - hr = IPicture_get_Handle(pict, &handle); - ok(hr == S_OK, "hr %08x\n", hr); - ok(handle == 0, "handle %08x\n", handle); + hr = IPicture_set_hPal(pict, HandleToUlong(GetStockObject(DEFAULT_PALETTE))); + if (type == PICTYPE_BITMAP) + ok(hr == S_OK, "%d: got %#x\n", i, hr); + else + ok(hr == E_FAIL, "%d: got %#x\n", i, hr); - IPicture_Release(pict); + IPicture_Release(pict); + } } static void test_apm(void)

1 0

Michał Janiszewski : msvcrt: Don' t forget to free the buffer in scanf.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 32e65acc007a03b61d379874d10f4809a5b66f64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32e65acc007a03b61d379874… Author: Michał Janiszewski <janisozaur(a)gmail.com> Date: Sun Jul 1 23:51:23 2018 +0200 msvcrt: Don't forget to free the buffer in scanf. Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index cbbcae4..734fe8b 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -667,6 +667,7 @@ _FUNCTION_ { else { _UNLOCK_FILE_(file); *str = 0; + HeapFree(GetProcessHeap(), 0, Mask); return rd; } }

1 0

Mark Jansen : ntdll/tests: Tests for RtlIpv6StringToAddress.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 4ad6e1b084bc8a9ba439d377ff9b9a3f839662be URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ad6e1b084bc8a9ba439d377… Author: Mark Jansen <learn0more+wine(a)gmail.com> Date: Mon Jul 9 04:31:20 2018 +0000 ntdll/tests: Tests for RtlIpv6StringToAddress. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 430 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 430 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ad6e1b084bc8a9ba439…

1 0

Alexander Morozov : ntoskrnl.exe: Improve KeInitializeTimerEx stub.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 7df543438a90ca6f740609eba8c3270beb7cf121 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7df543438a90ca6f740609eb… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Jul 9 01:07:02 2018 +0000 ntoskrnl.exe: Improve KeInitializeTimerEx stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c8f9173..41f3862 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1923,6 +1923,9 @@ void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock ) void WINAPI KeInitializeTimerEx( PKTIMER Timer, TIMER_TYPE Type ) { FIXME( "stub: %p %d\n", Timer, Type ); + + RtlZeroMemory(Timer, sizeof(KTIMER)); + Timer->Header.Type = Type ? 9 : 8; }

1 0

Alex Henrie : include: Add SYSTEM_FIRMWARE_TABLE_INFORMATION to winternl.h.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 21f6655fc5edb7f94cf9b68140940a62974e48b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21f6655fc5edb7f94cf9b681… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 20 23:18:45 2018 -0600 include: Add SYSTEM_FIRMWARE_TABLE_INFORMATION to winternl.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index cbf5c66..8ccbfd7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1579,6 +1579,23 @@ typedef struct _SYSTEM_TIME_ADJUSTMENT { BOOLEAN TimeAdjustmentDisabled; } SYSTEM_TIME_ADJUSTMENT, *PSYSTEM_TIME_ADJUSTMENT; +typedef enum _SYSTEM_FIRMWARE_TABLE_ACTION +{ + SystemFirmwareTable_Enumerate = 0, + SystemFirmwareTable_Get = 1 +} SYSTEM_FIRMWARE_TABLE_ACTION, *PSYSTEM_FIRMWARE_TABLE_ACTION; + +/* System Information Class 0x4C */ + +typedef struct _SYSTEM_FIRMWARE_TABLE_INFORMATION +{ + ULONG ProviderSignature; + SYSTEM_FIRMWARE_TABLE_ACTION Action; + ULONG TableID; + ULONG TableBufferLength; + UCHAR TableBuffer[1]; +} SYSTEM_FIRMWARE_TABLE_INFORMATION, *PSYSTEM_FIRMWARE_TABLE_INFORMATION; + typedef struct _TIME_FIELDS { CSHORT Year; CSHORT Month;

1 0

Dmitry Timoshkov : oleaut32: IPicture::set_hPal() supports only bitmaps.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: e34d570b451b30cdfef130ef0134821046ffcb62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e34d570b451b30cdfef130ef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 6 16:09:59 2018 +0800 oleaut32: IPicture::set_hPal() supports only bitmaps. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 773bc21..a2a54bd 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -739,10 +739,18 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, static HRESULT WINAPI OLEPictureImpl_set_hPal(IPicture *iface, OLE_HANDLE hpal) { - OLEPictureImpl *This = impl_from_IPicture(iface); - FIXME("(%p)->(%08x): stub\n", This, hpal); - OLEPicture_SendNotify(This,DISPID_PICT_HPAL); - return E_NOTIMPL; + OLEPictureImpl *This = impl_from_IPicture(iface); + + TRACE("(%p)->(%08x)\n", This, hpal); + + if (This->desc.picType == PICTYPE_BITMAP) + { + This->desc.u.bmp.hpal = ULongToHandle(hpal); + OLEPicture_SendNotify(This,DISPID_PICT_HPAL); + return S_OK; + } + + return E_FAIL; } /************************************************************************

1 0

Dmitry Timoshkov : oleaut32: Don' t accept unsupported picture types in OleCreatePictureIndirect.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: ee08f1cf5b6e24febeda15ce0b9b9f3cb2e884ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee08f1cf5b6e24febeda15ce… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 6 16:09:24 2018 +0800 oleaut32: Don't accept unsupported picture types in OleCreatePictureIndirect. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index ac8b207..da71946 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -275,9 +275,10 @@ static void OLEPictureImpl_SetIcon(OLEPictureImpl * This) * The caller of this method must release the object when it's * done with it. */ -static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) +static HRESULT OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn, OLEPictureImpl **pict) { - OLEPictureImpl* newObject = 0; + OLEPictureImpl *newObject; + HRESULT hr; if (pictDesc) TRACE("(%p) type = %d\n", pictDesc, pictDesc->picType); @@ -286,9 +287,8 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) * Allocate space for the object. */ newObject = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(OLEPictureImpl)); - - if (newObject==0) - return newObject; + if (!newObject) + return E_OUTOFMEMORY; /* * Initialize the virtual function table. @@ -299,12 +299,12 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) newObject->IConnectionPointContainer_iface.lpVtbl = &OLEPictureImpl_IConnectionPointContainer_VTable; newObject->pCP = NULL; - CreateConnectionPoint((IUnknown*)&newObject->IPicture_iface, &IID_IPropertyNotifySink, + hr = CreateConnectionPoint((IUnknown*)&newObject->IPicture_iface, &IID_IPropertyNotifySink, &newObject->pCP); - if (!newObject->pCP) + if (hr != S_OK) { HeapFree(GetProcessHeap(), 0, newObject); - return NULL; + return hr; } /* @@ -347,18 +347,24 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) case PICTYPE_ICON: OLEPictureImpl_SetIcon(newObject); break; + case PICTYPE_ENHMETAFILE: + FIXME("EMF is not supported\n"); + newObject->himetricWidth = newObject->himetricHeight = 0; + break; + default: - FIXME("Unsupported type %d\n", pictDesc->picType); - newObject->himetricWidth = newObject->himetricHeight = 0; - break; + WARN("Unsupported type %d\n", pictDesc->picType); + IPicture_Release(&newObject->IPicture_iface); + return E_UNEXPECTED; } } else { newObject->desc.picType = PICTYPE_UNINITIALIZED; } TRACE("returning %p\n", newObject); - return newObject; + *pict = newObject; + return S_OK; } /************************************************************************ @@ -2217,10 +2223,8 @@ HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, *ppvObj = NULL; - newPict = OLEPictureImpl_Construct(lpPictDesc, Own); - - if (newPict == NULL) - return E_OUTOFMEMORY; + hr = OLEPictureImpl_Construct(lpPictDesc, Own, &newPict); + if (hr != S_OK) return hr; /* * Make sure it supports the interface required by the caller.

1 0

Michael Müller : msvcr120: Add stub for _SetWinRTOutOfMemoryExceptionCallback.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 0dde2b8a2f15251cf1cd9738c6e30fbbc30369fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dde2b8a2f15251cf1cd9738… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jul 9 13:41:45 2018 +0200 msvcr120: Add stub for _SetWinRTOutOfMemoryExceptionCallback. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/misc.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 9ddb5dd..7cf4201 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -10,7 +10,7 @@ @ stub _NLG_Return2 @ stub _SetImageBase @ stub _SetThrowImageBase -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) ucrtbase._SetWinRTOutOfMemoryExceptionCallback @ cdecl __AdjustPointer(ptr ptr) ucrtbase.__AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 00f622b..b7d644a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -844,7 +844,7 @@ @ stub -arch=i386 _NLG_Return @ stub -arch=i386 _NLG_Return2 @ stub -arch=arm,win64 __NLG_Return2 -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) MSVCR120__SetWinRTOutOfMemoryExceptionCallback @ stub -arch=win64 _SetImageBase @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(ptr long str ptr ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index af1b129..2d096fc 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -838,7 +838,7 @@ @ stub -arch=i386 _NLG_Return @ stub -arch=i386 _NLG_Return2 @ stub -arch=arm,win64 __NLG_Return2 -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) msvcr120._SetWinRTOutOfMemoryExceptionCallback @ stub -arch=win64 _SetImageBase @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(ptr long str ptr ptr) msvcr120._Strftime diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index d760e17..5a4e77b 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -580,4 +580,12 @@ void CDECL MSVCRT__crtSleep(DWORD timeout) TRACE("(%u)\n", timeout); Sleep(timeout); } + +/********************************************************************* + * _SetWinRTOutOfMemoryExceptionCallback (MSVCR120.@) + */ +void CDECL MSVCR120__SetWinRTOutOfMemoryExceptionCallback(void *callback) +{ + FIXME("(%p): stub\n", callback); +} #endif diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 236b0d5..b8e765c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -39,7 +39,7 @@ @ stub _NLG_Dispatch2 @ stub _NLG_Return @ stub _NLG_Return2 -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) MSVCR120__SetWinRTOutOfMemoryExceptionCallback @ cdecl _Strftime(ptr long str ptr ptr) @ cdecl _W_Getdays() @ cdecl _W_Getmonths() diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index d304de6..bca405e 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -6,7 +6,7 @@ @ stub _NLG_Dispatch2 @ stub _NLG_Return @ stub _NLG_Return2 -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) ucrtbase._SetWinRTOutOfMemoryExceptionCallback @ cdecl __AdjustPointer(ptr ptr) ucrtbase.__AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper

1 0

Alistair Leslie-Hughes : ntoskrnl.exe/tests: Add KeInitializeTimerEx tests.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: d6a2f5e23899c1f1d4a425059e442fb909aa6294 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6a2f5e23899c1f1d4a42505… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 9 01:07:03 2018 +0000 ntoskrnl.exe/tests: Add KeInitializeTimerEx tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 06b365f..cde78e5 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -172,6 +172,21 @@ todo_wine IoFreeMdl(mdl); } +static void test_init_funcs(void) +{ + KTIMER timer, timer2; + + KeInitializeTimerEx(&timer, NotificationTimer); + ok(timer.Header.Type == 8, "got: %u\n", timer.Header.Type); + ok(timer.Header.Size == 0 || timer.Header.Size == 10, "got: %u\n", timer.Header.Size); + ok(timer.Header.SignalState == 0, "got: %u\n", timer.Header.SignalState); + + KeInitializeTimerEx(&timer2, SynchronizationTimer); + ok(timer2.Header.Type == 9, "got: %u\n", timer2.Header.Type); + ok(timer2.Header.Size == 0 || timer2.Header.Size == 10, "got: %u\n", timer2.Header.Size); + ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState); +} + static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -197,6 +212,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) test_currentprocess(); test_mdl_map(); + test_init_funcs(); /* print process report */ if (test_input->winetest_debug)

1 0

Dmitry Timoshkov : oleaut32: IPicture::get_hPal() supports only bitmaps.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: e5553bbd05c84fb0f5073cb931a46e15dfbb1257 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5553bbd05c84fb0f5073cb9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 6 16:09:38 2018 +0800 oleaut32: IPicture::get_hPal() supports only bitmaps. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index da71946..773bc21 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -555,37 +555,19 @@ static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface, static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface, OLE_HANDLE *phandle) { - OLEPictureImpl *This = impl_from_IPicture(iface); - HRESULT hres; - TRACE("(%p)->(%p)\n", This, phandle); + OLEPictureImpl *This = impl_from_IPicture(iface); - if (!phandle) - return E_POINTER; + TRACE("(%p)->(%p)\n", This, phandle); - switch (This->desc.picType) { - case (UINT)PICTYPE_UNINITIALIZED: - case PICTYPE_NONE: - *phandle = 0; - hres = S_FALSE; - break; - case PICTYPE_BITMAP: - *phandle = HandleToUlong(This->desc.u.bmp.hpal); - hres = S_OK; - break; - case PICTYPE_METAFILE: - hres = E_FAIL; - break; - case PICTYPE_ICON: - case PICTYPE_ENHMETAFILE: - default: - FIXME("unimplemented for type %d. Returning 0 palette.\n", - This->desc.picType); - *phandle = 0; - hres = S_OK; - } + if (!phandle) return E_POINTER; - TRACE("returning 0x%08x, palette handle %08x\n", hres, *phandle); - return hres; + if (This->desc.picType == PICTYPE_BITMAP) + { + *phandle = HandleToUlong(This->desc.u.bmp.hpal); + return S_OK; + } + + return E_FAIL; } /************************************************************************

1 0

Huw Davies : ntdll/tests: Skip the map protect tests if we can' t disable no-exec.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 986d5a9958ee767ee3c358fe676dde95dc0a3279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=986d5a9958ee767ee3c358fe… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 9 11:12:56 2018 +0100 ntdll/tests: Skip the map protect tests if we can't disable no-exec. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 4a2d9e6..7d60b94 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1776,20 +1776,30 @@ static void test_mapprotection(void) NTSTATUS status; SIZE_T retlen, count; void (*f)(void); + BOOL reset_flags = FALSE; - if (!pNtClose) { - skip("No NtClose ... Win98\n"); - return; - } /* Switch to being a noexec unaware process */ status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof (oldflags), &flagsize); - if (status == STATUS_INVALID_PARAMETER) { - skip("Invalid Parameter on ProcessExecuteFlags query?\n"); + if (status == STATUS_INVALID_PARAMETER) + { + skip("Unable to query process execute flags on this platform\n"); return; } - ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); - status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); - ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + trace("Process execute flags %08x\n", oldflags); + + if (oldflags & MEM_EXECUTE_OPTION_DISABLE) + { + if (oldflags & MEM_EXECUTE_OPTION_PERMANENT) + { + skip("Unable to turn off noexec\n"); + return; + } + + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + reset_flags = TRUE; + } size.u.LowPart = 0x2000; size.u.HighPart = 0; @@ -1832,8 +1842,8 @@ static void test_mapprotection(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); pNtClose (h); - /* Switch back */ - pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof(oldflags) ); + if (reset_flags) + pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof(oldflags) ); } static void test_queryvirtualmemory(void)

1 0

Michael Stefaniuc : ole32: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 9cad95d198a5d90a3b10b6a4f5dce15b1b608c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cad95d198a5d90a3b10b6a4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 00:21:24 2018 +0200 ole32: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index fb69a66..3487cca 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -70,8 +70,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) - /**************************************************************************** * This section defines variables internal to the COM module. */ @@ -1477,7 +1475,7 @@ static HRESULT apartment_hostobject(struct apartment *apt, TRACE("clsid %s, iid %s\n", debugstr_guid(&params->clsid), debugstr_guid(&params->iid)); - if (COM_RegReadPath(&params->regdata, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(&params->regdata, dllpath, ARRAY_SIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(&params->clsid)); @@ -2356,7 +2354,7 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax) HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *subkey) { static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; - WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) - 1]; + WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(wszCLSIDSlash) - 1]; LONG res; HKEY key; @@ -2391,7 +2389,7 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey static const WCHAR szAppIdKey[] = { 'A','p','p','I','d','\\',0 }; DWORD res; WCHAR buf[CHARS_IN_GUID]; - WCHAR keyname[ARRAYSIZE(szAppIdKey) + CHARS_IN_GUID]; + WCHAR keyname[ARRAY_SIZE(szAppIdKey) + CHARS_IN_GUID]; DWORD size; HKEY hkey; DWORD type; @@ -2599,7 +2597,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) { static const WCHAR wszInterface[] = {'I','n','t','e','r','f','a','c','e','\\',0}; static const WCHAR wszPSC[] = {'\\','P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; - WCHAR path[ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAYSIZE(wszPSC)]; + WCHAR path[ARRAY_SIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAY_SIZE(wszPSC)]; APARTMENT *apt; struct registered_psclsid *registered_psclsid; ACTCTX_SECTION_KEYED_DATA data; @@ -2642,8 +2640,8 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) /* Interface\\{string form of riid}\\ProxyStubClsid32 */ strcpyW(path, wszInterface); - StringFromGUID2(riid, path + ARRAYSIZE(wszInterface) - 1, CHARS_IN_GUID); - strcpyW(path + ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); + StringFromGUID2(riid, path + ARRAY_SIZE(wszInterface) - 1, CHARS_IN_GUID); + strcpyW(path + ARRAY_SIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); hr = get_ps_clsid_from_registry(path, 0, pclsid); if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || @@ -2971,7 +2969,7 @@ static HRESULT get_inproc_class_object(APARTMENT *apt, const struct class_reg_da else apartment_threaded = !apt->multi_threaded; - if (COM_RegReadPath(regdata, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(regdata, dllpath, ARRAY_SIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(rclsid)); @@ -3829,7 +3827,7 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew) if(IsEqualGUID(clsidNew, &CLSID_NULL)){ RegDeleteKeyW(hkey, wszTreatAs); }else{ - if(!StringFromGUID2(clsidNew, szClsidNew, ARRAYSIZE(szClsidNew))){ + if(!StringFromGUID2(clsidNew, szClsidNew, ARRAY_SIZE(szClsidNew))){ WARN("StringFromGUID2 failed\n"); res = E_FAIL; goto done; @@ -5087,7 +5085,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) regdata.u.hkey = hkey; regdata.hkey = TRUE; - if (COM_RegReadPath(&regdata, dllpath, ARRAYSIZE(dllpath)) == ERROR_SUCCESS) + if (COM_RegReadPath(&regdata, dllpath, ARRAY_SIZE(dllpath)) == ERROR_SUCCESS) { static const WCHAR wszOle32[] = {'o','l','e','3','2','.','d','l','l',0}; if (!strcmpiW(dllpath, wszOle32))

1 0

Michael Stefaniuc : shell32: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 1e469c95e63a02df701342fc8eb8b7d252a00fc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e469c95e63a02df701342fc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Jul 7 23:39:07 2018 +0200 shell32: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_mycomp.c | 8 +++----- dlls/shell32/shfldr_printers.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index b5b9ff2..60f32f1 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -87,8 +87,6 @@ static const shvheader mycomputer_header[] = { NULL, 0, IDS_SHV_COLUMN7, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10 }, }; -#define MYCOMPUTERSHELLVIEWCOLUMNS sizeof(mycomputer_header)/sizeof(shvheader) - /************************************************************************** * ISF_MyComputer_Constructor */ @@ -799,7 +797,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumnState ( TRACE ("(%p)->(%d %p)\n", This, iColumn, pcsFlags); - if (!pcsFlags || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (!pcsFlags || iColumn >= ARRAY_SIZE(mycomputer_header)) return E_INVALIDARG; *pcsFlags = mycomputer_header[iColumn].pcsFlags; @@ -826,7 +824,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDetailsOf (IShellFolder2 *iface, TRACE ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); - if (!psd || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (!psd || iColumn >= ARRAY_SIZE(mycomputer_header)) return E_INVALIDARG; if (!pidl) @@ -871,7 +869,7 @@ static HRESULT WINAPI ISF_MyComputer_fnMapColumnToSCID (IShellFolder2 *iface, UI TRACE("(%p)->(%u %p)\n", This, column, scid); - if (column >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (column >= ARRAY_SIZE(mycomputer_header)) return E_INVALIDARG; return shellfolder_map_column_to_scid(mycomputer_header, column, scid); diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 66260ac..8e25e58 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -63,8 +63,6 @@ static const shvheader printers_header[] = { { NULL, 0, IDS_SHV_COL_MODEL, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20 } }; -#define PRINTERS_FOLDER_COL_NUM sizeof(printers_header)/sizeof(shvheader) - static HRESULT WINAPI IShellFolder_Printers_fnQueryInterface(IShellFolder2 *iface, REFIID riid, LPVOID *ppvObj) { @@ -283,7 +281,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetDefaultColumnState ( TRACE("(%p)->(%d %p)\n", This, iColumn, pcsFlags); - if (iColumn >= PRINTERS_FOLDER_COL_NUM) + if (iColumn >= ARRAY_SIZE(printers_header)) return E_INVALIDARG; *pcsFlags = printers_header[iColumn].pcsFlags; @@ -306,7 +304,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetDetailsOf (IShellFolder2 *iface TRACE("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); - if (iColumn >= PRINTERS_FOLDER_COL_NUM) + if (iColumn >= ARRAY_SIZE(printers_header)) return E_NOTIMPL; if (!pidl) @@ -323,7 +321,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnMapColumnToSCID (IShellFolder2 *if TRACE("(%p)->(%u %p)\n", This, column, scid); - if (column >= PRINTERS_FOLDER_COL_NUM) + if (column >= ARRAY_SIZE(printers_header)) return E_INVALIDARG; return shellfolder_map_column_to_scid(printers_header, column, scid);

1 0

Michael Stefaniuc : winex11.drv: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 3e9ce1c26fdeaf5bfef48f4630251e280e7cf718 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e9ce1c26fdeaf5bfef48f46… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Jul 7 23:39:08 2018 +0200 winex11.drv: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 10 +++++----- dlls/winex11.drv/desktop.c | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index c55a266..296c00c 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -187,7 +187,6 @@ static const struct static struct list format_list = LIST_INIT( format_list ); -#define NB_BUILTIN_FORMATS (sizeof(builtin_formats) / sizeof(builtin_formats[0])) #define GET_ATOM(prop) (((prop) < FIRST_XATOM) ? (Atom)(prop) : X11DRV_Atoms[(prop) - FIRST_XATOM]) static DWORD clipboard_thread_id; @@ -295,9 +294,9 @@ static void register_builtin_formats(void) struct clipboard_format *formats; unsigned int i; - if (!(formats = HeapAlloc( GetProcessHeap(), 0, NB_BUILTIN_FORMATS * sizeof(*formats)))) return; + if (!(formats = HeapAlloc( GetProcessHeap(), 0, ARRAY_SIZE(builtin_formats) * sizeof(*formats)))) return; - for (i = 0; i < NB_BUILTIN_FORMATS; i++) + for (i = 0; i < ARRAY_SIZE(builtin_formats); i++) { if (builtin_formats[i].name) formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); @@ -983,7 +982,7 @@ static HANDLE import_targets( Atom type, const void *data, size_t size ) register_x11_formats( properties, count ); /* the builtin formats contain duplicates, so allocate some extra space */ - if (!(formats = HeapAlloc( GetProcessHeap(), 0, (count + NB_BUILTIN_FORMATS) * sizeof(*formats )))) + if (!(formats = HeapAlloc( GetProcessHeap(), 0, (count + ARRAY_SIZE(builtin_formats)) * sizeof(*formats )))) return 0; pos = 0; @@ -1454,7 +1453,8 @@ static BOOL export_targets( Display *display, Window win, Atom prop, Atom target if (!(formats = get_clipboard_formats( &count ))) return FALSE; /* the builtin formats contain duplicates, so allocate some extra space */ - if (!(targets = HeapAlloc( GetProcessHeap(), 0, (count + NB_BUILTIN_FORMATS) * sizeof(*targets) ))) + if (!(targets = HeapAlloc( GetProcessHeap(), 0, + (count + ARRAY_SIZE(builtin_formats)) * sizeof(*targets) ))) { HeapFree( GetProcessHeap(), 0, formats ); return FALSE; diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 4df8784..559efe2 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -73,7 +73,6 @@ static struct screen_size { {1920, 1200}, {2560, 1600} }; -#define NUM_DESKTOP_MODES (sizeof(screen_sizes) / sizeof(struct screen_size)) #define _NET_WM_STATE_REMOVE 0 #define _NET_WM_STATE_ADD 1 @@ -88,7 +87,7 @@ static void make_modes(void) /* original specified desktop size */ X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 60); - for (i=0; i<NUM_DESKTOP_MODES; i++) + for (i=0; i<ARRAY_SIZE(screen_sizes); i++) { if ( (screen_sizes[i].width <= max_width) && (screen_sizes[i].height <= max_height) ) { @@ -160,7 +159,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) dd_modes = X11DRV_Settings_SetHandlers("desktop", X11DRV_desktop_GetCurrentMode, X11DRV_desktop_SetCurrentMode, - NUM_DESKTOP_MODES+2, 1); + ARRAY_SIZE(screen_sizes)+2, 1); make_modes(); X11DRV_Settings_AddDepthModes(); dd_mode_count = X11DRV_Settings_GetModeCount();

1 0

Sebastian Lackner : kernel32: Fill stack with meaningful values in call_process_entry mis-align workaround.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 61d92d1317272c4528872b091a5308905dd00429 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61d92d1317272c4528872b09… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 8 21:19:56 2018 +0200 kernel32: Fill stack with meaningful values in call_process_entry mis-align workaround. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ff56e9a..7787a32 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1042,7 +1042,9 @@ __ASM_GLOBAL_FUNC( call_process_entry, __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") - "subl $12,%esp\n\t" /* deliberately mis-align the stack by 8, Doom 3 needs this */ + "pushl 4(%ebp)\n\t" /* deliberately mis-align the stack by 8, Doom 3 needs this */ + "pushl 4(%ebp)\n\t" /* Driller expects readable address at this offset */ + "pushl 4(%ebp)\n\t" "pushl 8(%ebp)\n\t" "call *12(%ebp)\n\t" "leave\n\t"

1 0

Julian Rüger : German translation for release 3.10
by Jeremy Newman July 9, 2018

July 9, 2018

Module: website Branch: master Commit: 1d62a1fe8c6164739f0f851ef8f8174da14b0243 URL: https://source.winehq.org/git/website.git/?a=commit;h=1d62a1fe8c6164739f0f8… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 5 12:20:09 2018 +0200 German translation for release 3.10 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018061101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018061101.xml b/news/de/2018061101.xml new file mode 100644 index 0000000..6fe5db0 --- /dev/null +++ b/news/de/2018061101.xml @@ -0,0 +1,16 @@ +<news> +<date>11. Juni 2018</date> +<title>Wine 3.10 freigegeben</title> +<body> + Die Entwicklungsversion 3.10 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.10">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Swapchain-Unterstützung in Direct3D 12.</li> + <li>Vulkan-Unterstützung wurde auf die aktuelle Spezifikation aktualisiert.</li> + <li>Debugger-Unterstützung von Wow64-Prozessen.</li> + <li>Noch weitere Unterstützung des Taskplaners.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.10.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 3.9
by Jeremy Newman July 9, 2018

July 9, 2018

Module: website Branch: master Commit: 726eb1d5105bfb4572a556be0b8f96c5b2807ac2 URL: https://source.winehq.org/git/website.git/?a=commit;h=726eb1d5105bfb4572a55… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 5 12:17:41 2018 +0200 German translation for release 3.9 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018052501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2018052501.xml b/news/de/2018052501.xml new file mode 100644 index 0000000..cc5e4c5 --- /dev/null +++ b/news/de/2018052501.xml @@ -0,0 +1,17 @@ +<news> +<date>25. Mai 2018</date> +<title>Wine 3.9 freigegeben</title> +<body> + Die Entwicklungsversion 3.9 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.9">Neuerungen (en)</a> in dieser Version: +<ul> + <li>OpenGL-Kernkontexte sind nun standardmäßig aktiviert in Direct 3D.</li> + <li>Anfänge der Direct3D-12-Implementierung durch vkd3d.</li> + <li>Weitere Unterstützung des Taskplaners.</li> + <li>Fortschritte der Taskdialog-Unterstützung.</li> + <li>Bessere Pfeilunterstützung in GdiPlus.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.9.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 3.11
by Jeremy Newman July 9, 2018

July 9, 2018

Module: website Branch: master Commit: 01ecc521a4a21d1106b41639baa36d5f876e1d58 URL: https://source.winehq.org/git/website.git/?a=commit;h=01ecc521a4a21d1106b41… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 5 12:23:25 2018 +0200 German translation for release 3.11 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018062301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018062301.xml b/news/de/2018062301.xml new file mode 100644 index 0000000..2bcbef2 --- /dev/null +++ b/news/de/2018062301.xml @@ -0,0 +1,16 @@ +<news> +<date>23. Juni 2018</date> +<title>Wine 3.11 freigegeben</title> +<body> + Die Entwicklungsversion 3.11 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.11">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Weitere Debugger-Unterstützung von Wow64-Prozessen.</li> + <li>Unterstützung von sha256/sha384-Hashes in ECDSA-Signaturen.</li> + <li>Bessere Erkennung von CPUs mit Hyperthreading.</li> + <li>Verbesserungen am Standard-Taskdialog.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.11.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for vkd3d release 1.0
by Jeremy Newman July 9, 2018

July 9, 2018

Module: website Branch: master Commit: 741c6a45ed95c89e741c9605a50ef64308b4a00b URL: https://source.winehq.org/git/website.git/?a=commit;h=741c6a45ed95c89e741c9… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jul 9 12:41:53 2018 +0200 German translation for vkd3d release 1.0 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018052301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018052301.xml b/news/de/2018052301.xml new file mode 100644 index 0000000..92e95df --- /dev/null +++ b/news/de/2018052301.xml @@ -0,0 +1,16 @@ +<news> +<date>23. Mai 2018</date> +<title>Vkd3d 1.0 freigegeben</title> +<body> +Das Wine-Team ist stolz verkünden zu können, dass Release 1.0 von vkd3d, +der Übersetzungsbibliothek von Direct3D 12 zu Vulkan, jetzt verfügbar ist. + +Dies ist das erste Release von vkd3d. Viele Direct3D-12-Funktionen fehlen +noch und Fehler sind zu erwarten. Die aktuelle Version wurde hauptsächlich mit +Demo-Anwendungen getestet. Eine Menge Funktionen, an denen noch gearbeitet wird, +wurden auf den nächsten Entwicklungszyklus verschoben. Das betrifft insbesondere +die Unterstützung von Geometrie- und Tessellationsshadern, diverse Verbesserungen +der Shader-Übersetzung, sowie der Direct3D-12-Kernmethoden. + +Der Quelltext ist ab sofort <a href="https://dl.winehq.org/vkd3d/source/vkd3d-1.0.tar.xz">hier verfügbar</a>. +</body></news>

1 0

Alistair Leslie-Hughes : user32: Support SPI_S/ GETAUDIODESCRIPTION in SystemParametersInfo.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 80205232d3ece73d4cc6c7589cea893583aae0b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80205232d3ece73d4cc6c758… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 6 01:16:57 2018 +0000 user32: Support SPI_S/GETAUDIODESCRIPTION in SystemParametersInfo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 32 +++++++++++++++++++++++++++++++- include/winuser.h | 9 +++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 13bd425..95387cd 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -70,6 +70,7 @@ enum parameter_key SHOWSOUNDS_KEY, KEYBOARDPREF_KEY, SCREENREADER_KEY, + AUDIODESC_KEY, NB_PARAM_KEYS }; @@ -94,6 +95,9 @@ static const WCHAR KEYBOARDPREF_REGKEY[] = {'C','o','n','t','r','o','l',' ','P', static const WCHAR SCREENREADER_REGKEY[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', 'A','c','c','e','s','s','i','b','i','l','i','t','y','\\', 'B','l','i','n','d',' ','A','c','c','e','s','s',0}; +static const WCHAR AUDIODESC_REGKEY[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'A','c','c','e','s','s','i','b','i','l','i','t','y','\\', + 'A','u','d','i','o','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR *parameter_key_names[NB_PARAM_KEYS] = { @@ -107,6 +111,7 @@ static const WCHAR *parameter_key_names[NB_PARAM_KEYS] = SHOWSOUNDS_REGKEY, KEYBOARDPREF_REGKEY, SCREENREADER_REGKEY, + AUDIODESC_REGKEY, }; /* parameter key values; the first char is actually an enum parameter_key to specify the key */ @@ -217,6 +222,8 @@ static const WCHAR COLOR_GRADIENTACTIVECAPTION_VALNAME[] = {COLORS_KEY,'G','r',' static const WCHAR COLOR_GRADIENTINACTIVECAPTION_VALNAME[] = {COLORS_KEY,'G','r','a','d','i','e','n','t','I','n','a','c','t','i','v','e','T','i','t','l','e',0}; static const WCHAR COLOR_MENUHILIGHT_VALNAME[] = {COLORS_KEY,'M','e','n','u','H','i','l','i','g','h','t',0}; static const WCHAR COLOR_MENUBAR_VALNAME[] = {COLORS_KEY,'M','e','n','u','B','a','r',0}; +static const WCHAR AUDIODESC_LOCALE_VALNAME[] = {AUDIODESC_KEY,'L','o','c','a','l','e',0}; +static const WCHAR AUDIODESC_ON_VALNAME[] = {AUDIODESC_KEY,'O','n',0}; /* FIXME - real value */ static const WCHAR SCREENSAVERRUNNING_VALNAME[]= {DESKTOP_KEY,'W','I','N','E','_','S','c','r','e','e','n','S','a','v','e','r','R','u','n','n','i','n','g',0}; @@ -1240,6 +1247,7 @@ static BOOL_ENTRY( SCREENSAVERRUNNING, FALSE ); static BOOL_ENTRY( SHOWSOUNDS, FALSE ); static BOOL_ENTRY( SNAPTODEFBUTTON, FALSE ); static BOOL_ENTRY_MIRROR( ICONTITLEWRAP, TRUE ); +static BOOL_ENTRY( AUDIODESC_ON, FALSE); static YESNO_ENTRY( BEEP, TRUE ); @@ -1269,6 +1277,7 @@ static DWORD_ENTRY( FOREGROUNDFLASHCOUNT, 3 ); static DWORD_ENTRY( FOREGROUNDLOCKTIMEOUT, 0 ); static DWORD_ENTRY( LOGPIXELS, 0 ); static DWORD_ENTRY( MOUSECLICKLOCKTIME, 1200 ); +static DWORD_ENTRY( AUDIODESC_LOCALE, 0 ); static PATH_ENTRY( DESKPATTERN ); static PATH_ENTRY( DESKWALLPAPER ); @@ -1399,6 +1408,8 @@ static union sysparam_all_entry * const default_entries[] = (union sysparam_all_entry *)&entry_USERPREFERENCESMASK, (union sysparam_all_entry *)&entry_WHEELSCROLLCHARS, (union sysparam_all_entry *)&entry_WHEELSCROLLLINES, + (union sysparam_all_entry *)&entry_AUDIODESC_LOCALE, + (union sysparam_all_entry *)&entry_AUDIODESC_ON, }; /*********************************************************************** @@ -2334,7 +2345,26 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_SETFONTSMOOTHINGORIENTATION: ret = set_entry( &entry_FONTSMOOTHINGORIENTATION, uiParam, pvParam, fWinIni ); break; - + case SPI_GETAUDIODESCRIPTION: + { + AUDIODESCRIPTION *audio = pvParam; + if (audio && audio->cbSize == sizeof(AUDIODESCRIPTION) && uiParam == sizeof(AUDIODESCRIPTION) ) + { + ret = get_entry( &entry_AUDIODESC_ON, 0, &audio->Enabled ) && + get_entry( &entry_AUDIODESC_LOCALE, 0, &audio->Locale ); + } + break; + } + case SPI_SETAUDIODESCRIPTION: + { + AUDIODESCRIPTION *audio = pvParam; + if (audio && audio->cbSize == sizeof(AUDIODESCRIPTION) && uiParam == sizeof(AUDIODESCRIPTION) ) + { + ret = set_entry( &entry_AUDIODESC_ON, 0, &audio->Enabled, fWinIni) && + set_entry( &entry_AUDIODESC_LOCALE, 0, &audio->Locale, fWinIni ); + } + break; + } default: FIXME( "Unknown action: %u\n", uiAction ); SetLastError( ERROR_INVALID_SPI_VALUE ); diff --git a/include/winuser.h b/include/winuser.h index 24ca055..a653ef4 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2362,6 +2362,8 @@ typedef struct tagDROPSTRUCT #define SPI_SETMOUSESPEED 113 #define SPI_GETSCREENSAVERRUNNING 114 #define SPI_GETDESKWALLPAPER 115 +#define SPI_GETAUDIODESCRIPTION 116 +#define SPI_SETAUDIODESCRIPTION 117 #define SPI_GETACTIVEWINDOWTRACKING 0x1000 #define SPI_SETACTIVEWINDOWTRACKING 0x1001 @@ -3387,6 +3389,13 @@ enum tagPOINTER_INPUT_TYPE }; typedef DWORD POINTER_INPUT_TYPE; +typedef struct tagAUDIODESCRIPTION +{ + UINT cbSize; + BOOL Enabled; + LCID Locale; +} AUDIODESCRIPTION, *LPAUDIODESCRIPTION; + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD);

1 0

Alexandre Julliard : user32: Update RedrawWindow behavior with explicit desktop window handle.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: b73a50a35e2cb5630bac89eafa5487529282a0ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=b73a50a35e2cb5630bac89ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 6 13:20:56 2018 +0200 user32: Update RedrawWindow behavior with explicit desktop window handle. Newer Windows versions behave differently. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 4 +-- dlls/user32/sysparams.c | 3 +- dlls/user32/tests/msg.c | 86 ++++++++++++++++++++++++++++++++++++++++++------- server/window.c | 19 ++++++++--- 4 files changed, 92 insertions(+), 20 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 79db230..9178b61 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1227,8 +1227,6 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ) static const RECT empty; BOOL ret; - if (!hwnd) hwnd = GetDesktopWindow(); - if (TRACE_ON(win)) { if (hrgn) @@ -1272,6 +1270,8 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ) HeapFree( GetProcessHeap(), 0, data ); } + if (!hwnd) hwnd = GetDesktopWindow(); + if (flags & RDW_UPDATENOW) update_now( hwnd, flags ); else if (flags & RDW_ERASENOW) erase_now( hwnd, flags ); diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index fc55b06..13bd425 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2938,8 +2938,7 @@ BOOL WINAPI SetSysColors( INT count, const INT *colors, const COLORREF *values ) /* Repaint affected portions of all visible windows */ - RedrawWindow( GetDesktopWindow(), NULL, 0, - RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); + RedrawWindow( 0, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); return TRUE; } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 80c699f..55d8994 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7229,7 +7229,8 @@ void dump_region(HRGN hrgn) HeapFree( GetProcessHeap(), 0, data ); } -static void check_update_rgn( HWND hwnd, HRGN hrgn ) +#define check_update_rgn( hwnd, hrgn ) check_update_rgn_( __LINE__, hwnd, hrgn ) +static void check_update_rgn_( int line, HWND hwnd, HRGN hrgn ) { INT ret; RECT r1, r2; @@ -7240,13 +7241,13 @@ static void check_update_rgn( HWND hwnd, HRGN hrgn ) ok( ret != ERROR, "GetUpdateRgn failed\n" ); if (ret == NULLREGION) { - ok( !hrgn, "Update region shouldn't be empty\n" ); + ok_(__FILE__,line)( !hrgn, "Update region shouldn't be empty\n" ); } else { if (CombineRgn( tmp, hrgn, update, RGN_XOR ) != NULLREGION) { - ok( 0, "Regions are different\n" ); + ok_(__FILE__,line)( 0, "Regions are different\n" ); if (winetest_debug > 0) { printf( "Update region: " ); @@ -7258,8 +7259,8 @@ static void check_update_rgn( HWND hwnd, HRGN hrgn ) } GetRgnBox( update, &r1 ); GetUpdateRect( hwnd, &r2, FALSE ); - ok( EqualRect( &r1, &r2 ), "Rectangles are different: %s / %s\n", wine_dbgstr_rect( &r1 ), - wine_dbgstr_rect( &r2 )); + ok_(__FILE__,line)( EqualRect( &r1, &r2 ), "Rectangles are different: %s / %s\n", + wine_dbgstr_rect( &r1 ), wine_dbgstr_rect( &r2 )); DeleteObject( tmp ); DeleteObject( update ); @@ -7455,9 +7456,76 @@ static void test_paint_messages(void) /* MSDN: if hwnd parameter is NULL, InvalidateRect invalidates and redraws * all windows and sends WM_ERASEBKGND and WM_NCPAINT. */ - trace("testing InvalidateRect(0, NULL, FALSE)\n"); SetRectEmpty( &rect ); - ok(InvalidateRect(0, &rect, FALSE), "InvalidateRect(0, &rc, FALSE) should fail\n"); + ok(InvalidateRect(0, &rect, FALSE), "InvalidateRect(0, &rc, FALSE) failed\n"); + check_update_rgn( hwnd, hrgn ); + ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + flush_events(); + ok_sequence( WmPaint, "Paint", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + check_update_rgn( hwnd, 0 ); + + SetRectEmpty( &rect ); + ok(RedrawWindow(0, &rect, 0, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, 0 ); + + SetRectEmpty( &rect ); + ok(RedrawWindow(0, &rect, 0, RDW_ALLCHILDREN | RDW_VALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, 0 ); + + GetWindowRect( hwnd, &rect ); + ok(RedrawWindow(0, &rect, 0, RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, 0 ); + + flush_events(); + ok(RedrawWindow(0, &rect, 0, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, hrgn ); + ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + flush_events(); + ok_sequence( WmPaint, "Paint", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + check_update_rgn( hwnd, 0 ); + + ok(RedrawWindow(GetDesktopWindow(), &rect, 0, + RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + ret = GetUpdateRgn( hwnd, hrgn2, FALSE ); + ok( ret == NULLREGION || broken(ret == SIMPLEREGION), /* <= win7 */ + "region should be null (%d)\n", ret ); + if (ret == SIMPLEREGION) ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + flush_events(); + + ok(RedrawWindow(GetDesktopWindow(), NULL, 0, + RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + ret = GetUpdateRgn( hwnd, hrgn2, FALSE ); + ok( ret == NULLREGION || broken(ret == SIMPLEREGION), /* <= win7 */ + "region should be null (%d)\n", ret ); + if (ret == SIMPLEREGION) ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + flush_events(); + + SetRectRgn( hrgn2, rect.left, rect.top, rect.right, rect.bottom ); + ok(RedrawWindow(0, NULL, hrgn2, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, hrgn ); + ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + flush_events(); + ok_sequence( WmPaint, "Paint", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + check_update_rgn( hwnd, 0 ); + + ok(RedrawWindow(0, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); + check_update_rgn( hwnd, 0 ); + + ok(RedrawWindow(0, NULL, 0, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW ), + "RedrawWindow failed\n"); check_update_rgn( hwnd, hrgn ); ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); flush_events(); @@ -7468,7 +7536,6 @@ static void test_paint_messages(void) /* MSDN: if hwnd parameter is NULL, ValidateRect invalidates and redraws * all windows and sends WM_ERASEBKGND and WM_NCPAINT. */ - trace("testing ValidateRect(0, NULL)\n"); SetRectEmpty( &rect ); if (ValidateRect(0, &rect) && /* not supported on Win9x */ GetUpdateRect(hwnd, NULL, FALSE)) /* or >= Win 8 */ @@ -7481,7 +7548,6 @@ static void test_paint_messages(void) check_update_rgn( hwnd, 0 ); } - trace("testing InvalidateRgn(0, NULL, FALSE)\n"); SetLastError(0xdeadbeef); ok(!InvalidateRgn(0, NULL, FALSE), "InvalidateRgn(0, NULL, FALSE) should fail\n"); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || GetLastError() == 0xdeadbeef, @@ -7490,7 +7556,6 @@ static void test_paint_messages(void) flush_events(); ok_sequence( WmEmptySeq, "WmEmptySeq", FALSE ); - trace("testing ValidateRgn(0, NULL)\n"); SetLastError(0xdeadbeef); ok(!ValidateRgn(0, NULL), "ValidateRgn(0, NULL) should fail\n"); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || @@ -7500,7 +7565,6 @@ static void test_paint_messages(void) flush_events(); ok_sequence( WmEmptySeq, "WmEmptySeq", FALSE ); - trace("testing UpdateWindow(NULL)\n"); SetLastError(0xdeadbeef); ok(!UpdateWindow(NULL), "UpdateWindow(NULL) should fail\n"); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || diff --git a/server/window.c b/server/window.c index 322001d..532edd8 100644 --- a/server/window.c +++ b/server/window.c @@ -2634,13 +2634,23 @@ DECL_HANDLER(update_window_zorder) /* mark parts of a window as needing a redraw */ DECL_HANDLER(redraw_window) { + unsigned int flags = req->flags; struct region *region = NULL; - struct window *win = get_window( req->window ); + struct window *win; + + if (!req->window) + { + if (!(win = get_desktop_window( current ))) return; + } + else + { + if (!(win = get_window( req->window ))) return; + if (is_desktop_window( win )) flags &= ~RDW_ALLCHILDREN; + } - if (!win) return; if (!is_visible( win )) return; /* nothing to do */ - if (req->flags & (RDW_VALIDATE|RDW_INVALIDATE)) + if (flags & (RDW_VALIDATE|RDW_INVALIDATE)) { if (get_req_data_size()) /* no data means whole rectangle */ { @@ -2650,8 +2660,7 @@ DECL_HANDLER(redraw_window) } } - redraw_window( win, region, (req->flags & RDW_INVALIDATE) && (req->flags & RDW_FRAME), - req->flags ); + redraw_window( win, region, (flags & RDW_INVALIDATE) && (flags & RDW_FRAME), flags ); if (region) free_region( region ); }

1 0

Zebediah Figura : quartz: Use CBaseFilter::FindPin().
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: d88218324bade6d39eb6e0529e8b995258bdfed1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d88218324bade6d39eb6e052… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:34:41 2018 +0200 quartz: Use CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/avisplit.c | 2 +- dlls/quartz/filesource.c | 23 +---------------------- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 10 ---------- dlls/quartz/parser.h | 1 - dlls/quartz/waveparser.c | 2 +- 8 files changed, 6 insertions(+), 38 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 3c1c7cf..77256b7 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -413,7 +413,7 @@ static const IBaseFilterVtbl ACMWrapper_Vtbl = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - TransformFilterImpl_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index c9ca760..f8e4a9c 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -431,7 +431,7 @@ static const IBaseFilterVtbl AVIDec_Vtbl = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - TransformFilterImpl_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index f3ecced..564ccd3 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1421,7 +1421,7 @@ static const IBaseFilterVtbl AVISplitterImpl_Vtbl = Parser_SetSyncSource, Parser_GetSyncSource, Parser_EnumPins, - Parser_FindPin, + BaseFilterImpl_FindPin, Parser_QueryFilterInfo, Parser_JoinFilterGraph, Parser_QueryVendorInfo diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 0413eb4..bcce0e1 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -547,27 +547,6 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart return S_OK; } -/** IBaseFilter methods **/ - -static HRESULT WINAPI AsyncReader_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) -{ - AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("%p->(%s, %p)\n", This, debugstr_w(Id), ppPin); - - if (!Id || !ppPin) - return E_POINTER; - - if (strcmpW(Id, wszOutputPinName)) - { - *ppPin = NULL; - return VFW_E_NOT_FOUND; - } - - *ppPin = This->pOutputPin; - IPin_AddRef(*ppPin); - return S_OK; -} - static const IBaseFilterVtbl AsyncReader_Vtbl = { AsyncReader_QueryInterface, @@ -581,7 +560,7 @@ static const IBaseFilterVtbl AsyncReader_Vtbl = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - AsyncReader_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 41221d4..5869f16 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -804,7 +804,7 @@ static const IBaseFilterVtbl MPEGSplitter_Vtbl = Parser_SetSyncSource, Parser_GetSyncSource, Parser_EnumPins, - Parser_FindPin, + BaseFilterImpl_FindPin, Parser_QueryFilterInfo, Parser_JoinFilterGraph, Parser_QueryVendorInfo diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index f15f364..034bca0 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -402,16 +402,6 @@ HRESULT WINAPI Parser_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) return BaseFilterImpl_EnumPins(iface,ppEnum); } -HRESULT WINAPI Parser_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) -{ - ParserImpl *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%s,%p)\n", This, debugstr_w(Id), ppPin); - - /* FIXME: critical section */ - - return E_NOTIMPL; -} - HRESULT WINAPI Parser_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) { return BaseFilterImpl_QueryFilterInfo(iface, pInfo); diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 996415a..840e475 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -70,7 +70,6 @@ extern HRESULT WINAPI Parser_GetState(IBaseFilter * iface, DWORD dwMilliSecsTime extern HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock); extern HRESULT WINAPI Parser_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock); extern HRESULT WINAPI Parser_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum); -extern HRESULT WINAPI Parser_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin); extern HRESULT WINAPI Parser_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo); extern HRESULT WINAPI Parser_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName); extern HRESULT WINAPI Parser_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index f6bea2c..0a84fcb 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -410,7 +410,7 @@ static const IBaseFilterVtbl WAVEParser_Vtbl = Parser_SetSyncSource, Parser_GetSyncSource, Parser_EnumPins, - Parser_FindPin, + BaseFilterImpl_FindPin, Parser_QueryFilterInfo, Parser_JoinFilterGraph, Parser_QueryVendorInfo

1 0

Alex Henrie : gdi32: Add DECLSPEC_HOTPATCH to GetDIBits.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 478a3d64ef7630f16e6c618375a76ad665c7cf63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=478a3d64ef7630f16e6c6183… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 5 08:39:25 2018 +0200 gdi32: Add DECLSPEC_HOTPATCH to GetDIBits. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index c7dcdb1..1312bf0 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1208,7 +1208,7 @@ BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) * Success: Number of scan lines copied from bitmap * Failure: 0 */ -INT WINAPI GetDIBits( +INT WINAPI DECLSPEC_HOTPATCH GetDIBits( HDC hdc, /* [in] Handle to device context */ HBITMAP hbitmap, /* [in] Handle to bitmap */ UINT startscan, /* [in] First scan line to set in dest bitmap */

1 0

Michael Stefaniuc : dssenh/test: Replace a macro with ARRAY_SIZE.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 4a900755f2136a384ba0c619022dcceadcd8a52a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a900755f2136a384ba0c619… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:19 2018 +0200 dssenh/test: Replace a macro with ARRAY_SIZE. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index ccb7dcd..b62f592 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -341,8 +341,6 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t } } -#define TESTLEN(x) (sizeof(x) / sizeof((x)[0])) - static void test_keylength(void) { HCRYPTPROV hProv = 0; @@ -359,7 +357,7 @@ static void test_keylength(void) ok(result, "Expected no errors.\n"); /* perform keylength tests */ - test_keylength_array(hProv, baseDSS_keylength, TESTLEN(baseDSS_keylength)); + test_keylength_array(hProv, baseDSS_keylength, ARRAY_SIZE(baseDSS_keylength)); result = CryptReleaseContext(hProv, 0); ok(result, "Expected release of CSP provider.\n"); @@ -370,7 +368,7 @@ static void test_keylength(void) ok(result, "Expected no errors.\n"); /* perform keylength tests */ - test_keylength_array(hProv, dssDH_keylength, TESTLEN(dssDH_keylength)); + test_keylength_array(hProv, dssDH_keylength, ARRAY_SIZE(dssDH_keylength)); result = CryptReleaseContext(hProv, 0); ok(result, "Expected release of CSP provider.\n"); @@ -387,7 +385,7 @@ static void test_keylength(void) ok(result, "Expected no errors.\n"); /* perform keylength tests */ - test_keylength_array(hProv, dssENH_keylength, TESTLEN(dssENH_keylength)); + test_keylength_array(hProv, dssENH_keylength, ARRAY_SIZE(dssENH_keylength)); result = CryptReleaseContext(hProv, 0); ok(result, "Expected release of CSP provider.\n"); @@ -398,7 +396,7 @@ static void test_keylength(void) ok(result, "Expected no errors.\n"); /* perform keylength tests */ - test_keylength_array(hProv, dssENH_keylength, TESTLEN(dssENH_keylength)); + test_keylength_array(hProv, dssENH_keylength, ARRAY_SIZE(dssENH_keylength)); result = CryptReleaseContext(hProv, 0); ok(result, "Expected release of CSP provider.\n"); @@ -982,7 +980,7 @@ static void test_verify_signature(void) } ok(result, "Failed to acquire CSP.\n"); - test_signhash_array(hProv, dssSign_data, TESTLEN(dssSign_data)); + test_signhash_array(hProv, dssSign_data, ARRAY_SIZE(dssSign_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -991,7 +989,7 @@ static void test_verify_signature(void) result = CryptAcquireContextA(&hProv, NULL, MS_DEF_DSS_DH_PROV_A, PROV_DSS_DH, 0); ok(result, "Failed to acquire CSP.\n"); - test_signhash_array(hProv, dssSign_data, TESTLEN(dssSign_data)); + test_signhash_array(hProv, dssSign_data, ARRAY_SIZE(dssSign_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1007,7 +1005,7 @@ static void test_verify_signature(void) } ok(result, "Failed to acquire CSP.\n"); - test_signhash_array(hProv, dssSign_data, TESTLEN(dssSign_data)); + test_signhash_array(hProv, dssSign_data, ARRAY_SIZE(dssSign_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1016,7 +1014,7 @@ static void test_verify_signature(void) result = CryptAcquireContextA(&hProv, NULL, MS_DEF_DH_SCHANNEL_PROV_A, PROV_DH_SCHANNEL, 0); ok(result, "Failed to acquire CSP.\n"); - test_signhash_array(hProv, dssSign_data, TESTLEN(dssSign_data)); + test_signhash_array(hProv, dssSign_data, ARRAY_SIZE(dssSign_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1376,7 +1374,7 @@ static void test_key_exchange(void) } ok(result, "Failed to acquire CSP.\n"); - test_keyExchange_baseDSS(hProv, baseDSSkey_data, TESTLEN(baseDSSkey_data)); + test_keyExchange_baseDSS(hProv, baseDSSkey_data, ARRAY_SIZE(baseDSSkey_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1386,7 +1384,7 @@ static void test_key_exchange(void) CRYPT_VERIFYCONTEXT); ok(result, "Failed to acquire CSP.\n"); - test_keyExchange_dssDH(hProv, dssDHkey_data, TESTLEN(dssDHkey_data)); + test_keyExchange_dssDH(hProv, dssDHkey_data, ARRAY_SIZE(dssDHkey_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1401,7 +1399,7 @@ static void test_key_exchange(void) } ok(result, "Failed to acquire CSP.\n"); - test_keyExchange_dssDH(hProv, dssDHkey_data, TESTLEN(dssDHkey_data)); + test_keyExchange_dssDH(hProv, dssDHkey_data, ARRAY_SIZE(dssDHkey_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1411,7 +1409,7 @@ static void test_key_exchange(void) CRYPT_VERIFYCONTEXT); ok(result, "Failed to acquire CSP.\n"); - test_keyExchange_dssDH(hProv, dssDHkey_data, TESTLEN(dssDHkey_data)); + test_keyExchange_dssDH(hProv, dssDHkey_data, ARRAY_SIZE(dssDHkey_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1421,9 +1419,9 @@ START_TEST(dssenh) { test_acquire_context(); test_keylength(); - test_hash(hash_data, TESTLEN(hash_data)); - test_data_encryption(encrypt_data, TESTLEN(encrypt_data)); - test_cipher_modes(ciphermode_data, TESTLEN(ciphermode_data)); + test_hash(hash_data, ARRAY_SIZE(hash_data)); + test_data_encryption(encrypt_data, ARRAY_SIZE(encrypt_data)); + test_cipher_modes(ciphermode_data, ARRAY_SIZE(ciphermode_data)); test_verify_signature(); test_key_exchange(); }

1 0

Michael Stefaniuc : winhttp: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: ebc7959e171b4242e1fd9eaa36cc6173976625f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebc7959e171b4242e1fd9eaa… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:14 2018 +0200 winhttp: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 56ec910..5e5b229 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -851,8 +851,6 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, } -#define ARRAYSIZE(array) (sizeof(array) / sizeof((array)[0])) - static const WCHAR basicW[] = {'B','a','s','i','c',0}; static const WCHAR ntlmW[] = {'N','T','L','M',0}; static const WCHAR passportW[] = {'P','a','s','s','p','o','r','t',0}; @@ -867,11 +865,11 @@ static const struct } auth_schemes[] = { - { basicW, ARRAYSIZE(basicW) - 1, WINHTTP_AUTH_SCHEME_BASIC }, - { ntlmW, ARRAYSIZE(ntlmW) - 1, WINHTTP_AUTH_SCHEME_NTLM }, - { passportW, ARRAYSIZE(passportW) - 1, WINHTTP_AUTH_SCHEME_PASSPORT }, - { digestW, ARRAYSIZE(digestW) - 1, WINHTTP_AUTH_SCHEME_DIGEST }, - { negotiateW, ARRAYSIZE(negotiateW) - 1, WINHTTP_AUTH_SCHEME_NEGOTIATE } + { basicW, ARRAY_SIZE(basicW) - 1, WINHTTP_AUTH_SCHEME_BASIC }, + { ntlmW, ARRAY_SIZE(ntlmW) - 1, WINHTTP_AUTH_SCHEME_NTLM }, + { passportW, ARRAY_SIZE(passportW) - 1, WINHTTP_AUTH_SCHEME_PASSPORT }, + { digestW, ARRAY_SIZE(digestW) - 1, WINHTTP_AUTH_SCHEME_DIGEST }, + { negotiateW, ARRAY_SIZE(negotiateW) - 1, WINHTTP_AUTH_SCHEME_NEGOTIATE } }; static const unsigned int num_auth_schemes = sizeof(auth_schemes)/sizeof(auth_schemes[0]);

1 0

Michael Stefaniuc : iphlpapi: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 3aa189ec63ac0f6c385c1c46f61eebb9ed1b7ef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa189ec63ac0f6c385c1c46… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:17 2018 +0200 iphlpapi: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 863edd3..8f6720e 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -349,14 +349,12 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) #elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_IFLIST) { int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_IFLIST, if_nametoindex(name)}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) - size_t needed; char *buf = NULL, *end; struct if_msghdr *ifm; struct if_data ifdata; - if(sysctl(mib, MIB_LEN, NULL, &needed, NULL, 0) == -1) + if(sysctl(mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == -1) { ERR ("failed to get size of iflist\n"); goto done; @@ -367,7 +365,7 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) ret = ERROR_OUTOFMEMORY; goto done; } - if(sysctl(mib, MIB_LEN, buf, &needed, NULL, 0) == -1) + if(sysctl(mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == -1) { ERR ("failed to get iflist\n"); goto done; @@ -514,12 +512,11 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) #elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && (defined(HAVE_STRUCT_ICMPSTAT_ICPS_INHIST) || defined(HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST)) { int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) struct icmpstat icmp_stat; size_t needed = sizeof(icmp_stat); int i; - if(sysctl(mib, MIB_LEN, &icmp_stat, &needed, NULL, 0) != -1) + if(sysctl(mib, ARRAY_SIZE(mib), &icmp_stat, &needed, NULL, 0) != -1) { #ifdef HAVE_STRUCT_ICMPSTAT_ICPS_INHIST /*in stats */ @@ -922,7 +919,6 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) #elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && (defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) || defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL)) { int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) int ip_ttl, ip_forwarding; #if defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) struct ipstat ip_stat; @@ -932,7 +928,7 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) size_t needed; needed = sizeof(ip_stat); - if(sysctl(mib, MIB_LEN, &ip_stat, &needed, NULL, 0) == -1) + if(sysctl(mib, ARRAY_SIZE(mib), &ip_stat, &needed, NULL, 0) == -1) { ERR ("failed to get ipstat\n"); return ERROR_NOT_SUPPORTED; @@ -1103,7 +1099,6 @@ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) #define TCPTV_REXMTMAX 128 #endif int mib[] = {CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) #define hz 1000 #if defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) struct tcpstat tcp_stat; @@ -1112,7 +1107,7 @@ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) #endif size_t needed = sizeof(tcp_stat); - if(sysctl(mib, MIB_LEN, &tcp_stat, &needed, NULL, 0) != -1) + if(sysctl(mib, ARRAY_SIZE(mib), &tcp_stat, &needed, NULL, 0) != -1) { stats->u.RtoAlgorithm = MIB_TCP_RTO_VANJ; stats->dwRtoMin = TCPTV_MIN; @@ -1286,12 +1281,11 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) #elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && defined(HAVE_STRUCT_UDPSTAT_UDPS_IPACKETS) { int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) struct udpstat udp_stat; MIB_UDPTABLE *udp_table; size_t needed = sizeof(udp_stat); - if(sysctl(mib, MIB_LEN, &udp_stat, &needed, NULL, 0) != -1) + if(sysctl(mib, ARRAY_SIZE(mib), &udp_stat, &needed, NULL, 0) != -1) { stats->dwInDatagrams = udp_stat.udps_ipackets; stats->dwOutDatagrams = udp_stat.udps_opackets; @@ -1742,14 +1736,13 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO #elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) { int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) size_t needed; char *buf = NULL, *lim, *next; struct rt_msghdr *rtm; struct sockaddr_inarp *sinarp; struct sockaddr_dl *sdl; - if (sysctl (mib, MIB_LEN, NULL, &needed, NULL, 0) == -1) + if (sysctl (mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == -1) { ERR ("failed to get arp table\n"); ret = ERROR_NOT_SUPPORTED; @@ -1763,7 +1756,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO goto done; } - if (sysctl (mib, MIB_LEN, buf, &needed, NULL, 0) == -1) + if (sysctl (mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == -1) { ret = ERROR_NOT_SUPPORTED; goto done;

1 0

Michael Stefaniuc : user32: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 2d8edab66d331f6ad1b2aed8560e5d4d9efa4573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d8edab66d331f6ad1b2aed8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:13 2018 +0200 user32: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/spy.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 749fc22..ddd90e6 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -39,7 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(message); #define SPY_MAX_MSGNUM WM_USER #define SPY_INDENT_UNIT 4 /* 4 spaces */ -#define ARRAYSIZE(a) ((sizeof(a) / sizeof((a)[0]))) #define DEBUG_SPY 0 @@ -1778,14 +1777,15 @@ static const USER_MSG richedit_array[] = { #undef USM static const CONTROL_CLASS cc_array[] = { - {WC_COMBOBOXEXW, comboex_array, ARRAYSIZE(comboex_array) }, - {WC_PROPSHEETW, propsht_array, ARRAYSIZE(propsht_array) }, - {REBARCLASSNAMEW, rebar_array, ARRAYSIZE(rebar_array) }, - {TOOLBARCLASSNAMEW, toolbar_array, ARRAYSIZE(toolbar_array) }, - {TOOLTIPS_CLASSW, tooltips_array, ARRAYSIZE(tooltips_array) }, - {UPDOWN_CLASSW, updown_array, ARRAYSIZE(updown_array) }, - {RICHEDIT_CLASS20W, richedit_array, ARRAYSIZE(richedit_array) }, - {0, 0, 0} }; + {WC_COMBOBOXEXW, comboex_array, ARRAY_SIZE(comboex_array)}, + {WC_PROPSHEETW, propsht_array, ARRAY_SIZE(propsht_array)}, + {REBARCLASSNAMEW, rebar_array, ARRAY_SIZE(rebar_array)}, + {TOOLBARCLASSNAMEW, toolbar_array, ARRAY_SIZE(toolbar_array)}, + {TOOLTIPS_CLASSW, tooltips_array, ARRAY_SIZE(tooltips_array)}, + {UPDOWN_CLASSW, updown_array, ARRAY_SIZE(updown_array)}, + {RICHEDIT_CLASS20W, richedit_array, ARRAY_SIZE(richedit_array)}, + {0, 0, 0} +}; /************************************************************************/ @@ -2278,7 +2278,7 @@ const char *SPY_GetVKeyName(WPARAM wParam) */ static const SPY_NOTIFY *SPY_Bsearch_Notify( UINT code) { - int low = 0, high = ARRAYSIZE(spnfy_array) - 1; + int low = 0, high = ARRAY_SIZE(spnfy_array) - 1; while (low <= high) {

1 0

Michael Stefaniuc : wininet: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: d870d4105d3c4024bd0e09c8e1ac9042d57268c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d870d4105d3c4024bd0e09c8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:15 2018 +0200 wininet: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b91dbdf..c699c5b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -145,8 +145,6 @@ static const WCHAR emptyW[] = {0}; #define COLLECT_TIME 60000 -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) - struct HttpAuthInfo { LPWSTR scheme; @@ -810,12 +808,12 @@ static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue, LPWSTR *pszRealm ) static const WCHAR szBasic[] = {'B','a','s','i','c'}; /* Note: not nul-terminated */ static const WCHAR szRealm[] = {'r','e','a','l','m'}; /* Note: not nul-terminated */ BOOL is_basic; - is_basic = !strncmpiW(pszAuthValue, szBasic, ARRAYSIZE(szBasic)) && - ((pszAuthValue[ARRAYSIZE(szBasic)] == ' ') || !pszAuthValue[ARRAYSIZE(szBasic)]); + is_basic = !strncmpiW(pszAuthValue, szBasic, ARRAY_SIZE(szBasic)) && + ((pszAuthValue[ARRAY_SIZE(szBasic)] == ' ') || !pszAuthValue[ARRAY_SIZE(szBasic)]); if (is_basic && pszRealm) { LPCWSTR token; - LPCWSTR ptr = &pszAuthValue[ARRAYSIZE(szBasic)]; + LPCWSTR ptr = &pszAuthValue[ARRAY_SIZE(szBasic)]; LPCWSTR realm; ptr++; *pszRealm=NULL; @@ -825,8 +823,8 @@ static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue, LPWSTR *pszRealm ) realm = ptr; while (*realm == ' ') realm++; - if(!strncmpiW(realm, szRealm, ARRAYSIZE(szRealm)) && - (realm[ARRAYSIZE(szRealm)] == ' ' || realm[ARRAYSIZE(szRealm)] == '=')) + if(!strncmpiW(realm, szRealm, ARRAY_SIZE(szRealm)) && + (realm[ARRAY_SIZE(szRealm)] == ' ' || realm[ARRAY_SIZE(szRealm)] == '=')) { token++; while (*token == ' ') @@ -1566,9 +1564,9 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) { signed char in[4]; - if (base64[0] >= ARRAYSIZE(HTTP_Base64Dec) || + if (base64[0] >= ARRAY_SIZE(HTTP_Base64Dec) || ((in[0] = HTTP_Base64Dec[base64[0]]) == -1) || - base64[1] >= ARRAYSIZE(HTTP_Base64Dec) || + base64[1] >= ARRAY_SIZE(HTTP_Base64Dec) || ((in[1] = HTTP_Base64Dec[base64[1]]) == -1)) { WARN("invalid base64: %s\n", debugstr_w(base64)); @@ -1580,7 +1578,7 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) if ((base64[2] == '=') && (base64[3] == '=')) break; - if (base64[2] > ARRAYSIZE(HTTP_Base64Dec) || + if (base64[2] > ARRAY_SIZE(HTTP_Base64Dec) || ((in[2] = HTTP_Base64Dec[base64[2]]) == -1)) { WARN("invalid base64: %s\n", debugstr_w(&base64[2])); @@ -1592,7 +1590,7 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) if (base64[3] == '=') break; - if (base64[3] > ARRAYSIZE(HTTP_Base64Dec) || + if (base64[3] > ARRAY_SIZE(HTTP_Base64Dec) || ((in[3] = HTTP_Base64Dec[base64[3]]) == -1)) { WARN("invalid base64: %s\n", debugstr_w(&base64[3]));

1 0

Zebediah Figura : qcap: Use CBaseFilter::FindPin().
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: ec290906a08b69ff23e119966b30b7b0d2b9f16d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec290906a08b69ff23e11996… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:34:43 2018 +0200 qcap: Use CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 9 +-------- dlls/qcap/avico.c | 9 +-------- dlls/qcap/smartteefilter.c | 22 +--------------------- dlls/qcap/vfwcapture.c | 9 +-------- 4 files changed, 4 insertions(+), 45 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 1187d4a..3674bbb 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -152,13 +152,6 @@ static HRESULT WINAPI AudioRecord_Run(IBaseFilter *iface, REFERENCE_TIME tStart) return E_NOTIMPL; } -static HRESULT WINAPI AudioRecord_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) -{ - AudioRecord *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%s, %p): stub\n", This, debugstr_w(Id), ppPin); - return E_NOTIMPL; -} - static const IBaseFilterVtbl AudioRecordVtbl = { AudioRecord_QueryInterface, AudioRecord_AddRef, @@ -171,7 +164,7 @@ static const IBaseFilterVtbl AudioRecordVtbl = { BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - AudioRecord_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 32f3b56..d5a44b2 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -211,13 +211,6 @@ static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStar return S_OK; } -static HRESULT WINAPI AVICompressor_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(Id), ppPin); - return VFW_E_NOT_FOUND; -} - static HRESULT WINAPI AVICompressor_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *pInfo) { AVICompressor *This = impl_from_IBaseFilter(iface); @@ -244,7 +237,7 @@ static const IBaseFilterVtbl AVICompressorVtbl = { BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - AVICompressor_FindPin, + BaseFilterImpl_FindPin, AVICompressor_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, AVICompressor_QueryVendorInfo diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 220f5eb..f052e2d 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -180,26 +180,6 @@ static HRESULT WINAPI SmartTeeFilter_Run(IBaseFilter *iface, REFERENCE_TIME tSta return hr; } -static HRESULT WINAPI SmartTeeFilter_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%s, %p)\n", This, debugstr_w(Id), ppPin); - if (lstrcmpW(Id, This->input->pin.pinInfo.achName) == 0) { - *ppPin = &This->input->pin.IPin_iface; - IPin_AddRef(*ppPin); - return S_OK; - } else if (lstrcmpW(Id, This->capture->pin.pinInfo.achName) == 0) { - *ppPin = &This->capture->pin.IPin_iface; - IPin_AddRef(*ppPin); - return S_OK; - } else if (lstrcmpW(Id, This->preview->pin.pinInfo.achName) == 0) { - *ppPin = &This->preview->pin.IPin_iface; - IPin_AddRef(*ppPin); - return S_OK; - } - return VFW_E_NOT_FOUND; -} - static const IBaseFilterVtbl SmartTeeFilterVtbl = { SmartTeeFilter_QueryInterface, SmartTeeFilter_AddRef, @@ -212,7 +192,7 @@ static const IBaseFilterVtbl SmartTeeFilterVtbl = { BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - SmartTeeFilter_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index fd35b26..ca804fe 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -298,13 +298,6 @@ static HRESULT WINAPI VfwCapture_Run(IBaseFilter * iface, REFERENCE_TIME tStart) return qcap_driver_run(This->driver_info, &This->filter.state); } -/** IBaseFilter methods **/ -static HRESULT WINAPI VfwCapture_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) -{ - FIXME("(%s, %p) - stub\n", debugstr_w(Id), ppPin); - return E_NOTIMPL; -} - static const IBaseFilterVtbl VfwCapture_Vtbl = { VfwCapture_QueryInterface, @@ -318,7 +311,7 @@ static const IBaseFilterVtbl VfwCapture_Vtbl = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - VfwCapture_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo

1 0

Alexandre Julliard : user32/tests: Remove a duplicate todo test.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 9d3adf687bcb4e0cdf403bdf3712c368e9805ffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d3adf687bcb4e0cdf403bdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 6 10:10:34 2018 +0200 user32/tests: Remove a duplicate todo test. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 45 +-------------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cb918fa..80c699f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -774,37 +774,6 @@ static const struct message WmCreateInvisibleMaxPopupSeq[] = { { 0 } }; /* ShowWindow(SW_SHOWMAXIMIZED) for a resized not visible popup window */ -static const struct message WmShowMaxPopupResizedSeq_todo[] = { - { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, - { WM_GETMINMAXINFO, sent }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED }, - { WM_NCCALCSIZE, sent|wparam, TRUE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, - { HCBT_ACTIVATE, hook }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, - { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, - { WM_NCPAINT, sent|wparam|optional, 1 }, - { WM_ERASEBKGND, sent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, - { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent }, - { WM_ACTIVATE, sent|wparam, 1 }, - { HCBT_SETFOCUS, hook }, - { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, - { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, - { WM_GETTEXT, sent|optional }, - { WM_NCPAINT, sent|wparam|optional, 1 }, - { WM_ERASEBKGND, sent|optional }, - { WM_WINDOWPOSCHANGED, sent }, - /* WinNT4.0 sends WM_MOVE */ - { WM_MOVE, sent|defwinproc|optional }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, - { 0 } -}; static const struct message WmShowMaxPopupResizedSeq[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, { WM_GETMINMAXINFO, sent }, @@ -827,7 +796,7 @@ static const struct message WmShowMaxPopupResizedSeq[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_GETTEXT, sent|optional }, - { WM_NCPAINT, sent|optional }, /* We'll check WM_NCPAINT behaviour in another test */ + { WM_NCPAINT, sent|wparam|optional, 1 }, { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent }, /* WinNT4.0 sends WM_MOVE */ @@ -4752,18 +4721,6 @@ static void test_showwindow(void) DestroyWindow(hwnd); flush_sequence(); - /* Test again, this time the NC_PAINT message */ - hwnd = CreateWindowExA(0, "TestWindowClass", "Test popup", WS_POPUP | WS_MAXIMIZE, - 100, 100, 200, 200, 0, 0, 0, NULL); - ok (hwnd != 0, "Failed to create popup window\n"); - SetWindowPos(hwnd, 0, 10, 10, 200, 200, SWP_NOZORDER | SWP_NOACTIVATE); - flush_sequence(); - ShowWindow(hwnd, SW_SHOWMAXIMIZED); - ok_sequence(WmShowMaxPopupResizedSeq_todo, - "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", FALSE); - DestroyWindow(hwnd); - flush_sequence(); - /* Test 2: * 1. Create invisible maximized popup window. * 2. Show it maximized.

1 0

Michael Stefaniuc : dinput: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 870a87677331a610ca8ada774adaf514eca9b311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=870a87677331a610ca8ada77… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:16 2018 +0200 dinput: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/data_formats.c | 12 +++++------- dlls/dinput/dinput_main.c | 13 ++++++------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/data_formats.c b/dlls/dinput/data_formats.c index 5fac7b7..9c9f00f 100644 --- a/dlls/dinput/data_formats.c +++ b/dlls/dinput/data_formats.c @@ -25,8 +25,6 @@ #include "windef.h" #include "dinput.h" -#define numObjects(x) (sizeof(x) / sizeof(x[0])) - static const DIOBJECTDATAFORMAT dfDIJoystick[] = { { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, @@ -79,7 +77,7 @@ const DIDATAFORMAT c_dfDIJoystick = { sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, sizeof(DIJOYSTATE), - numObjects(dfDIJoystick), + ARRAY_SIZE(dfDIJoystick), (LPDIOBJECTDATAFORMAT)dfDIJoystick }; @@ -255,7 +253,7 @@ const DIDATAFORMAT c_dfDIJoystick2 = { sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, sizeof(DIJOYSTATE2), - numObjects(dfDIJoystick2), + ARRAY_SIZE(dfDIJoystick2), (LPDIOBJECTDATAFORMAT)dfDIJoystick2 }; @@ -274,7 +272,7 @@ const DIDATAFORMAT c_dfDIMouse = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, sizeof(DIMOUSESTATE), - numObjects(dfDIMouse), + ARRAY_SIZE(dfDIMouse), (LPDIOBJECTDATAFORMAT)dfDIMouse }; @@ -297,7 +295,7 @@ const DIDATAFORMAT c_dfDIMouse2 = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, sizeof(DIMOUSESTATE2), - numObjects(dfDIMouse2), + ARRAY_SIZE(dfDIMouse2), (LPDIOBJECTDATAFORMAT)dfDIMouse2 }; @@ -565,6 +563,6 @@ const DIDATAFORMAT c_dfDIKeyboard = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, 256, - numObjects(dfDIKeyboard), + ARRAY_SIZE(dfDIKeyboard), (LPDIOBJECTDATAFORMAT)dfDIKeyboard }; diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index a592174..e4538a0 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -92,7 +92,6 @@ static const struct dinput_device *dinput_devices[] = &joystick_linux_device, &joystick_osx_device }; -#define NB_DINPUT_DEVICES (sizeof(dinput_devices)/sizeof(dinput_devices[0])) static HINSTANCE DINPUT_instance = NULL; @@ -409,7 +408,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( if (!This->initialized) return DIERR_NOTINITIALIZED; - for (i = 0; i < NB_DINPUT_DEVICES; i++) { + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceA) continue; for (j = 0, r = S_OK; SUCCEEDED(r); j++) { devInstance.dwSize = sizeof(devInstance); @@ -449,7 +448,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( if (!This->initialized) return DIERR_NOTINITIALIZED; - for (i = 0; i < NB_DINPUT_DEVICES; i++) { + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceW) continue; for (j = 0, r = S_OK; SUCCEEDED(r); j++) { devInstance.dwSize = sizeof(devInstance); @@ -750,7 +749,7 @@ static HRESULT create_device(IDirectInputImpl *This, REFGUID rguid, REFIID riid, return DIERR_NOTINITIALIZED; /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT ret; @@ -1006,7 +1005,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( } /* Enumerate all the joysticks */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT enumSuccess; @@ -1107,7 +1106,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( didevi.dwSize = sizeof(didevi); /* Enumerate all the joysticks */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT enumSuccess; @@ -1330,7 +1329,7 @@ static HRESULT WINAPI JoyConfig8Impl_GetConfig(IDirectInputJoyConfig8 *iface, UI #undef X /* Enumerate all joysticks in order */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceA) continue;

1 0

Zebediah Figura : winemac.drv: Wake up the display on user input.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 60edba563bbf95d15b7691fc9facbd97fce3f7b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60edba563bbf95d15b7691fc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 5 16:02:32 2018 -0500 winemac.drv: Wake up the display on user input. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e49a445..6558824 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -23,6 +23,13 @@ #include "config.h" +#include <IOKit/pwr_mgt/IOPMLib.h> +#define GetCurrentThread Mac_GetCurrentThread +#define LoadResource Mac_LoadResource +#include <CoreServices/CoreServices.h> +#undef GetCurrentThread +#undef LoadResource + #include "macdrv.h" #include "winuser.h" #include "wine/unicode.h" @@ -1551,13 +1558,44 @@ BOOL CDECL macdrv_CreateDesktopWindow(HWND hwnd) } +static WNDPROC desktop_orig_wndproc; + +#define WM_WINE_NOTIFY_ACTIVITY WM_USER + +static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch (msg) + { + case WM_WINE_NOTIFY_ACTIVITY: + { + /* This wakes from display sleep, but doesn't affect the screen saver. */ + static IOPMAssertionID assertion; + IOPMAssertionDeclareUserActivity(CFSTR("Wine user input"), kIOPMUserActiveLocal, &assertion); + + /* This prevents the screen saver, but doesn't wake from display sleep. */ + /* It's deprecated, but there's no better alternative. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + UpdateSystemActivity(UsrActivity); +#pragma clang diagnostic pop + break; + } + } + return desktop_orig_wndproc( hwnd, msg, wp, lp ); +} + /********************************************************************** * CreateWindow (MACDRV.@) */ BOOL CDECL macdrv_CreateWindow(HWND hwnd) { if (hwnd == GetDesktopWindow()) + { + desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( GetDesktopWindow(), + GWLP_WNDPROC, (LONG_PTR)desktop_wndproc_wrapper ); + macdrv_init_clipboard(); + } return TRUE; }

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 0f5d528f70fe41a05a56110d26b933727b169f2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f5d528f70fe41a05a56110d… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Jul 6 17:09:20 2018 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 74 ++++++++++++++----------------------------------------------- 1 file changed, 17 insertions(+), 57 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index b5d496d..40775b0 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-06-09 23:18+0200\n" +"PO-Revision-Date: 2018-07-06 19:05+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -3436,32 +3436,24 @@ msgid "Publishers..." msgstr "Utgivere..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "Lokal nettverksforbindelse" +msgstr "Nettverksforbindelser" #: inetcpl.rc:125 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Lokal tjener" +msgstr "Mellomtjener" #: inetcpl.rc:126 msgid "Use a proxy server" -msgstr "" +msgstr "Bruk en mellomtjener" #: inetcpl.rc:127 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Adresse" +msgstr "Adresse:" #: inetcpl.rc:129 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Ingen porter" +msgstr "Port:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -4451,7 +4443,7 @@ msgstr "Katalognavnet er ugyldig.\n" #: winerror.mc:918 msgid "Extended attributes didn't fit.\n" -msgstr "De utvidede atributtene fikk ikke plass.\n" +msgstr "De utvidede egenskapene fikk ikke plass.\n" #: winerror.mc:923 msgid "Extended attribute file corrupt.\n" @@ -4467,7 +4459,7 @@ msgstr "Ugyldig referanse for utvidet atributt.\n" #: winerror.mc:938 msgid "Extended attributes not supported.\n" -msgstr "Utvidede atributter støttes ikke.\n" +msgstr "Utvidede egenskaper støttes ikke.\n" #: winerror.mc:943 msgid "Mutex not owned by caller.\n" @@ -6799,7 +6791,7 @@ msgstr "&Format:" #: msacm32.rc:47 msgid "&Attributes:" -msgstr "&Attributter:" +msgstr "&Egenskaper:" #: mshtml.rc:39 msgid "Hyperlink" @@ -8559,7 +8551,7 @@ msgstr "Dato opprettet:" #: shell32.rc:369 shell32.rc:406 msgid "Attributes:" -msgstr "Attributter:" +msgstr "Egenskaper:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8599,7 +8591,7 @@ msgstr "Endret" #: shell32.rc:141 winefile.rc:172 winefile.rc:114 msgid "Attributes" -msgstr "Attributter" +msgstr "Egenskaper" #: shell32.rc:143 msgid "Size available" @@ -9241,10 +9233,12 @@ msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"SSL-sertifikatdato som ble mottatt fra tjeneren er feil. Sertifikatet er " +"utgått.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL-sertifikatets vertsnavn-felt er feil.\n" #: winmm.rc:32 msgid "The specified command was carried out." @@ -12020,7 +12014,7 @@ msgstr "Kopier program:" #: progman.rc:152 msgid "Program Group Attributes" -msgstr "Programgruppeattributter" +msgstr "Programgruppe-egenskaper" #: progman.rc:156 msgid "&Group file:" @@ -12028,7 +12022,7 @@ msgstr "&Gruppefil:" #: progman.rc:168 msgid "Program Attributes" -msgstr "Programattributter" +msgstr "Programegenskaper" #: progman.rc:172 progman.rc:212 msgid "&Command line:" @@ -15664,41 +15658,6 @@ msgid "D" msgstr "K" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15762,6 +15721,7 @@ msgstr "" "[/A] Bare kopier filer som er markert som arkiv.\n" "[/M] Bare kopier filer som er markert som arkiv; fjern denne\n" "\tmerkingen etterpå.\n" +"[/K] Kopier filegenskaper, uten denne blir ikke egenskapene preservert.\n" "[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n" "\t\tden oppgitte datoen. Hvis ingen dato oppgis kopieres det bare hvis\n" "\t\tmålet er eldre enn kilden.\n"

1 0

Zebediah Figura : amstream: Use CBaseFilter::FindPin().
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: fbbde62103c58eb6b41b89de44036dc5d6055d71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbbde62103c58eb6b41b89de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:34:44 2018 +0200 amstream: Use CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastreamfilter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 5abcb2f..8636718 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -159,9 +159,8 @@ static HRESULT WINAPI MediaStreamFilterImpl_EnumPins(IMediaStreamFilter *iface, static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter *iface, LPCWSTR id, IPin **pin) { - FIXME("(%p)->(%s,%p): Stub!\n", iface, debugstr_w(id), pin); - - return E_NOTIMPL; + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + return BaseFilterImpl_FindPin(&This->filter.IBaseFilter_iface, id, pin); } static HRESULT WINAPI MediaStreamFilterImpl_QueryFilterInfo(IMediaStreamFilter *iface, FILTER_INFO *info)

1 0

Zebediah Figura : strmbase: Use CBaseFilter::FindPin().
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: d69a26b21b4bd0c1b95cd19f4885bb0cec821404 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d69a26b21b4bd0c1b95cd19f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:34:42 2018 +0200 strmbase: Use CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 9 --------- include/wine/strmbase.h | 1 - 2 files changed, 10 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 139c581..4d7069d 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -427,15 +427,6 @@ HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *s /** IBaseFilter implementation **/ -HRESULT WINAPI TransformFilterImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) -{ - TransformFilter *This = impl_from_IBaseFilter(iface); - - TRACE("(%p/%p)->(%s,%p)\n", This, iface, debugstr_w(Id), ppPin); - - return E_NOTIMPL; -} - static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b07dfa2..83a9084 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -260,7 +260,6 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface); HRESULT WINAPI TransformFilterImpl_Stop(IBaseFilter * iface); HRESULT WINAPI TransformFilterImpl_Pause(IBaseFilter * iface); HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart); -HRESULT WINAPI TransformFilterImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin); HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *sender, Quality qm); HRESULT TransformFilter_Construct( const IBaseFilterVtbl *filterVtbl, LONG filter_size, const CLSID* pClsid, const TransformFilterFuncTable* pFuncsTable, IBaseFilter ** ppTransformFilter);

1 0

Zebediah Figura : strmbase: Avoid leaking pFilter in CBaseFilter::FindPin( ).
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: bf8637e42b07597e36baca8dc4baebd7aabd9960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf8637e42b07597e36baca8d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 20:02:39 2018 +0200 strmbase: Avoid leaking pFilter in CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 7d33f80..9b14cf0 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -160,6 +160,7 @@ HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin IPin_Release(pin); return hr; } + if (info.pFilter) IBaseFilter_Release(info.pFilter); if (!strcmpW(id, info.achName)) {

1 0

Zebediah Figura : psapi/tests: Call GetPerformanceInfo() after NtQuerySystemInformation().
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: f01b9ab4c15061ba64a4748374c4ccd5d22788eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f01b9ab4c15061ba64a47483… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 6 00:05:39 2018 +0200 psapi/tests: Call GetPerformanceInfo() after NtQuerySystemInformation(). For some reason, this gives consistently much more accurate results. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 99d081f..e61cf02 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -238,11 +238,6 @@ static void test_GetPerformanceInfo(void) ok(!ret, "GetPerformanceInfo unexpectedly succeeded\n"); ok(GetLastError() == ERROR_BAD_LENGTH, "expected error=ERROR_BAD_LENGTH but got %d\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = GetPerformanceInfo(&info, sizeof(info)); - ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); - ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb); - if (!pNtQuerySystemInformation) win_skip("NtQuerySystemInformation not found, skipping tests\n"); else @@ -259,6 +254,10 @@ static void test_GetPerformanceInfo(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); ok(size >= sizeof(SYSTEM_PERFORMANCE_INFORMATION), "incorrect length %d\n", size); + SetLastError(0xdeadbeef); + ret = GetPerformanceInfo(&info, sizeof(info)); + ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); + ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb); ok(check_with_margin(info.CommitTotal, sys_performance_info->TotalCommittedPages, 288), "expected approximately %ld but got %d\n", info.CommitTotal, sys_performance_info->TotalCommittedPages);

1 0

Zebediah Figura : psapi/tests: Avoid using PROCESS_ALL_ACCESS.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 81242f747efc733afbf987f7bc7d168dd4fa2fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81242f747efc733afbf987f7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 6 00:05:37 2018 +0200 psapi/tests: Avoid using PROCESS_ALL_ACCESS. Since its value changed in Windows Vista. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index aba05274..3fec5d7 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -56,7 +56,7 @@ static BOOL init_func_ptrs(void) return TRUE; } -static HANDLE hpSR, hpQI, hpVR, hpQV, hpAA; +static HANDLE hpSR, hpQI, hpVR, hpQV; static const HANDLE hBad = (HANDLE)0xdeadbeef; static void test_EnumProcesses(void) @@ -726,10 +726,15 @@ static void test_ws_functions(void) { PSAPI_WS_WATCH_INFORMATION wswi[4096]; ULONG_PTR pages[4096]; + HANDLE ws_handle; char *addr; unsigned int i; BOOL ret; + ws_handle = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_SET_QUOTA | + PROCESS_SET_INFORMATION, FALSE, GetCurrentProcessId()); + ok(!!ws_handle, "got error %u\n", GetLastError()); + SetLastError(0xdeadbeef); EmptyWorkingSet(NULL); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); @@ -739,7 +744,7 @@ static void test_ws_functions(void) todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = EmptyWorkingSet(hpAA); + ret = EmptyWorkingSet(ws_handle); ok(ret == 1, "failed with %d\n", GetLastError()); SetLastError( 0xdeadbeef ); @@ -755,7 +760,7 @@ static void test_ws_functions(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); } SetLastError(0xdeadbeef); - ret = InitializeProcessForWsWatch(hpAA); + ret = InitializeProcessForWsWatch(ws_handle); ok(ret == 1, "failed with %d\n", GetLastError()); addr = VirtualAlloc(NULL, 1, MEM_COMMIT, PAGE_READWRITE); @@ -817,9 +822,8 @@ START_TEST(psapi_main) hpQI = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid); hpVR = OpenProcess(PROCESS_VM_READ, FALSE, pid); hpQV = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid); - hpAA = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid); - if(hpSR && hpQI && hpVR && hpQV && hpAA) + if(hpSR && hpQI && hpVR && hpQV) { test_EnumProcesses(); test_EnumProcessModules(); @@ -837,5 +841,4 @@ START_TEST(psapi_main) CloseHandle(hpQI); CloseHandle(hpVR); CloseHandle(hpQV); - CloseHandle(hpAA); }

1 0

Zebediah Figura : psapi/tests: Link statically to psapi.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 06deefdb4c390fc490c762c3ff1fcadd79e72cb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06deefdb4c390fc490c762c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 6 00:05:36 2018 +0200 psapi/tests: Link statically to psapi. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/Makefile.in | 2 +- dlls/psapi/tests/psapi_main.c | 220 ++++++++++++++++-------------------------- 2 files changed, 83 insertions(+), 139 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06deefdb4c390fc490c7…

1 0

Michael Stefaniuc : krnl386.exe16: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 38ba364cc4c9c96fdeafe30743aa4f0eeac6f6a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38ba364cc4c9c96fdeafe307… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:23 2018 +0200 krnl386.exe16: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/error.c | 6 ++---- dlls/krnl386.exe16/int21.c | 8 +++----- dlls/krnl386.exe16/vxd.c | 4 +--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/krnl386.exe16/error.c b/dlls/krnl386.exe16/error.c index dc02d21..5508d7c 100644 --- a/dlls/krnl386.exe16/error.c +++ b/dlls/krnl386.exe16/error.c @@ -193,8 +193,6 @@ static const struct { }; #undef ErrorString -#define ErrorStringCount (sizeof(ErrorStrings) / sizeof(ErrorStrings[0])) -#define ParamErrorStringCount (sizeof(ParamErrorStrings) / sizeof(ParamErrorStrings[0])) /*********************************************************************** * GetErrorString (internal) @@ -204,7 +202,7 @@ static const char *GetErrorString(UINT16 uErr) static char buffer[80]; unsigned int n; - for (n = 0; n < ErrorStringCount; n++) { + for (n = 0; n < ARRAY_SIZE(ErrorStrings); n++) { if (uErr == ErrorStrings[n].constant) return ErrorStrings[n].name; } @@ -229,7 +227,7 @@ static const char *GetParamErrorString(UINT16 uErr) { { unsigned int n; - for (n = 0; n < ParamErrorStringCount; n++) { + for (n = 0; n < ARRAY_SIZE(ParamErrorStrings); n++) { if (uErr == ParamErrorStrings[n].constant) { strcat(buffer, ParamErrorStrings[n].name); return buffer; diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 3a08749..f32b1a7 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -282,8 +282,6 @@ static struct magic_device magic_devices[] = { {'h','p','s','c','a','n',0}, NULL, { { 0, 0 } }, INT21_IoctlHPScanHandler }, }; -#define NB_MAGIC_DEVICES (sizeof(magic_devices)/sizeof(magic_devices[0])) - /* Many calls translate a drive argument like this: drive number (00h = default, 01h = A:, etc) @@ -856,13 +854,13 @@ static HANDLE INT21_OpenMagicDevice( LPCWSTR name, DWORD access ) if ((p = strrchrW( name, '/' ))) name = p + 1; if ((p = strrchrW( name, '\\' ))) name = p + 1; - for (i = 0; i < NB_MAGIC_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(magic_devices); i++) { int len = strlenW( magic_devices[i].name ); if (!strncmpiW( magic_devices[i].name, name, len ) && (!name[len] || name[len] == '.' || name[len] == ':')) break; } - if (i == NB_MAGIC_DEVICES) return 0; + if (i == ARRAY_SIZE(magic_devices)) return 0; if (!magic_devices[i].handle) /* need to open it */ { @@ -2639,7 +2637,7 @@ static void INT21_Ioctl_Char( CONTEXT *context ) } } else { UINT i; - for (i = 0; i < NB_MAGIC_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(magic_devices); i++) { if (!magic_devices[i].handle) continue; if (magic_devices[i].index.QuadPart == info.IndexNumber.QuadPart) diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index 7be5f63..dc14600f 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -80,8 +80,6 @@ static struct vxdcall_service vxd_services[] = { {'v','w','i','n','3','2','.','v','x','d',0}, 0x002a, NULL, NULL } }; -#define NB_VXD_SERVICES (sizeof(vxd_services)/sizeof(vxd_services[0])) - #define W32S_APP2WINE(addr) ((addr)? (DWORD)(addr) + W32S_offset : 0) #define W32S_WINE2APP(addr) ((addr)? (DWORD)(addr) - W32S_offset : 0) @@ -293,7 +291,7 @@ void WINAPI DECLSPEC_HIDDEN __regs_VxDCall( CONTEXT *context ) DWORD service = stack32_pop( context ); RtlEnterCriticalSection( &vxd_section ); - for (i = 0; i < NB_VXD_SERVICES; i++) + for (i = 0; i < ARRAY_SIZE(vxd_services); i++) { if (HIWORD(service) != vxd_services[i].service) continue; if (!vxd_services[i].module) /* need to load it */

1 0

Michael Stefaniuc : glu32: Avoid an ARRAY_SIZE-like macro.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: de8c478c4305ecb8ea5138b4235adb3a4d521cc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de8c478c4305ecb8ea5138b4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:21 2018 +0200 glu32: Avoid an ARRAY_SIZE-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/glu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 973e448..8f0a360 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -91,7 +91,6 @@ static const struct { GLuint err; const char *str; } errors[] = { GLU_NURBS_ERROR36, "null control point reference" }, { GLU_NURBS_ERROR37, "duplicate point on piecewise linear trimming curve" }, }; -#define NB_ERRORS (sizeof(errors) / sizeof(errors[0])) typedef void (*_GLUfuncptr)(void); @@ -148,7 +147,7 @@ const GLubyte * WINAPI wine_gluErrorString( GLenum errCode ) { unsigned int i; - for (i = 0; i < NB_ERRORS; i++) + for (i = 0; i < ARRAY_SIZE(errors); i++) if (errors[i].err == errCode) return (const GLubyte *)errors[i].str; return NULL; @@ -159,10 +158,10 @@ const GLubyte * WINAPI wine_gluErrorString( GLenum errCode ) */ const WCHAR * WINAPI wine_gluErrorUnicodeStringEXT( GLenum errCode ) { - static WCHAR errorsW[NB_ERRORS][64]; + static WCHAR errorsW[ARRAY_SIZE(errors)][64]; unsigned int i, j; - for (i = 0; i < NB_ERRORS; i++) + for (i = 0; i < ARRAY_SIZE(errors); i++) { if (errors[i].err != errCode) continue; if (!errorsW[i][0]) /* errors use only ASCII, do a simple mapping */

1 0

Michael Stefaniuc : mscoree: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: b412c166b3bb1568f1359bb2cc42c5d3984f62bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b412c166b3bb1568f1359bb2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 00:21:23 2018 +0200 mscoree: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 64f345d..0c933ca 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1607,7 +1607,6 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, } #define CHARS_IN_GUID 39 -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) { @@ -1618,7 +1617,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; static const WCHAR wszInprocServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; static const WCHAR wszDLL[] = {'.','d','l','l',0}; - WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) + ARRAYSIZE(wszInprocServer32) - 1]; + WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(wszCLSIDSlash) + ARRAY_SIZE(wszInprocServer32) - 1]; MonoDomain *domain; MonoAssembly *assembly; ICLRRuntimeInfo *info = NULL;

1 0

Michael Stefaniuc : serialui: Replace a macro with ARRAY_SIZE.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 9477a0ad9129891ba05e75439a49acffff0bd623 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9477a0ad9129891ba05e7543… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:20 2018 +0200 serialui: Replace a macro with ARRAY_SIZE. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/serialui/confdlg.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index da14472..7797c23 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -112,36 +112,34 @@ typedef struct tagPARAM2STR } PARAM2STR, *LPPARAM2STR; typedef const PARAM2STR *LPCPARAM2STR; -#define SERIALUI_TABLESIZE(x) ((sizeof (x))/(sizeof (x[0]))) - static PARAM2STRDATA SERIALUI_Baud2StrData[]={ {110, "110"}, {300, "300"}, {600, "600"}, {1200, "1200"}, {2400, "2400"}, {4800, "4800"}, {9600, "9600"}, {14400, "14400"}, {19200, "19200"}, {38400L, "38400"}, {56000L, "56000"}, {57600L, "57600"}, {115200L, "115200"}, {128000L, "128000"}, {256000L, "256000"} }; -static PARAM2STR SERIALUI_Baud2Str={ SERIALUI_TABLESIZE(SERIALUI_Baud2StrData),SERIALUI_Baud2StrData }; +static PARAM2STR SERIALUI_Baud2Str={ ARRAY_SIZE(SERIALUI_Baud2StrData), SERIALUI_Baud2StrData }; static PARAM2STRDATA SERIALUI_Parity2StrData[]={ {NOPARITY,"None"}, {ODDPARITY,"Odd"}, {EVENPARITY,"Even"}, {MARKPARITY,"Mark"}, {SPACEPARITY,"Space"} }; -static PARAM2STR SERIALUI_Parity2Str={ SERIALUI_TABLESIZE(SERIALUI_Parity2StrData),SERIALUI_Parity2StrData }; +static PARAM2STR SERIALUI_Parity2Str={ ARRAY_SIZE(SERIALUI_Parity2StrData), SERIALUI_Parity2StrData }; static PARAM2STRDATA SERIALUI_Stop2StrData[]={ {ONESTOPBIT,"1"}, {ONE5STOPBITS,"1.5"}, {TWOSTOPBITS,"2"} }; -static PARAM2STR SERIALUI_Stop2Str={ SERIALUI_TABLESIZE(SERIALUI_Stop2StrData),SERIALUI_Stop2StrData }; +static PARAM2STR SERIALUI_Stop2Str={ ARRAY_SIZE(SERIALUI_Stop2StrData), SERIALUI_Stop2StrData }; static PARAM2STRDATA SERIALUI_Data2StrData[]={ {5,"5"}, {6,"6"}, {7,"7"}, {8, "8"}, {16,"16"} }; -static PARAM2STR SERIALUI_Data2Str={ SERIALUI_TABLESIZE(SERIALUI_Data2StrData),SERIALUI_Data2StrData }; +static PARAM2STR SERIALUI_Data2Str={ ARRAY_SIZE(SERIALUI_Data2StrData), SERIALUI_Data2StrData }; static PARAM2STRDATA SERIALUI_Flow2StrData[]={ {0,"None"}, {1,"Hardware (RTS/CTS)"}, {2,"Software (XON/XOFF)"} }; -static PARAM2STR SERIALUI_Flow2Str={ SERIALUI_TABLESIZE(SERIALUI_Flow2StrData),SERIALUI_Flow2StrData }; +static PARAM2STR SERIALUI_Flow2Str={ ARRAY_SIZE(SERIALUI_Flow2StrData), SERIALUI_Flow2StrData }; /* * Add all the fields to a combo box and highlight the current value

1 0

Zebediah Figura : psapi/tests: Avoid failing silently.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 42016f6f0e8b3990b570899479dbf5df1c2736cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=42016f6f0e8b3990b5708994… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 6 00:05:38 2018 +0200 psapi/tests: Avoid failing silently. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 3fec5d7..99d081f 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -819,23 +819,24 @@ START_TEST(psapi_main) IsWow64Process(GetCurrentProcess(), &wow64); hpSR = OpenProcess(STANDARD_RIGHTS_REQUIRED, FALSE, pid); + ok(!!hpSR, "got error %u\n", GetLastError()); hpQI = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid); + ok(!!hpQI, "got error %u\n", GetLastError()); hpVR = OpenProcess(PROCESS_VM_READ, FALSE, pid); + ok(!!hpVR, "got error %u\n", GetLastError()); hpQV = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid); - - if(hpSR && hpQI && hpVR && hpQV) - { - test_EnumProcesses(); - test_EnumProcessModules(); - test_GetModuleInformation(); - test_GetPerformanceInfo(); - test_GetProcessMemoryInfo(); - test_GetMappedFileName(); - test_GetProcessImageFileName(); - test_GetModuleFileNameEx(); - test_GetModuleBaseName(); - test_ws_functions(); - } + ok(!!hpQV, "got error %u\n", GetLastError()); + + test_EnumProcesses(); + test_EnumProcessModules(); + test_GetModuleInformation(); + test_GetPerformanceInfo(); + test_GetProcessMemoryInfo(); + test_GetMappedFileName(); + test_GetProcessImageFileName(); + test_GetModuleFileNameEx(); + test_GetModuleBaseName(); + test_ws_functions(); CloseHandle(hpSR); CloseHandle(hpQI);

1 0

Alexandre Julliard : comctl32/taskdialog: Fix pointer cast warnings.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 35289f81a469d0280f40d91475473df9bdd6f8fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=35289f81a469d0280f40d914… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 6 20:51:07 2018 +0200 comctl32/taskdialog: Fix pointer cast warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 42d50a9..ee3b273 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -488,7 +488,7 @@ static void taskdialog_add_radio_buttons(struct taskdialog_info *dialog_info) textW = taskdialog_gettext(dialog_info, TRUE, taskconfig->pRadioButtons[i].pszButtonText); dialog_info->radio_buttons[i] = CreateWindowW(WC_BUTTONW, textW, i == 0 ? style | WS_GROUP : style, 0, 0, 0, 0, dialog_info->hwnd, - (HMENU)taskconfig->pRadioButtons[i].nButtonID, 0, NULL); + ULongToHandle(taskconfig->pRadioButtons[i].nButtonID), 0, NULL); SendMessageW(dialog_info->radio_buttons[i], WM_SETFONT, (WPARAM)dialog_info->font, 0); Free(textW); } @@ -514,7 +514,7 @@ static void taskdialog_add_command_links(struct taskdialog_info *dialog_info) style = is_default ? default_style | BS_DEFCOMMANDLINK : default_style | BS_COMMANDLINK; textW = taskdialog_gettext(dialog_info, TRUE, taskconfig->pButtons[i].pszButtonText); dialog_info->command_links[i] = CreateWindowW(WC_BUTTONW, textW, style, 0, 0, 0, 0, dialog_info->hwnd, - (HMENU)taskconfig->pButtons[i].nButtonID, 0, NULL); + ULongToHandle(taskconfig->pButtons[i].nButtonID), 0, NULL); SendMessageW(dialog_info->command_links[i], WM_SETFONT, (WPARAM)dialog_info->font, 0); Free(textW);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 390532d447d7988aea5266ee5fb4709b0f7fe479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=390532d447d7988aea5266ee… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Jul 6 17:07:49 2018 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/po/fi.po b/po/fi.po index d2d9a47..c563ff6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -15627,41 +15627,6 @@ msgid "D" msgstr "H" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15724,6 +15689,7 @@ msgstr "" "[/A] Kopioi vain tiedostot, joilla on arkistointiattribuutti.\n" "[/M] Kopioi vain tiedostot, joilla on arkistointiattribuutti, ja\n" "\tpoista arkistointiattribuutti.\n" +"[/K] Kopioi myös attribuutit. Muuten attribuutit eivät säily.\n" "[/D | /D:k-p-v] Kopioi uudet tiedostot tai ne, joita on muokattu annetun\n" "\t\tpäivän jälkeen. Jos päivää ei anneta, kopioi vain, jos\n" "\t\tkohde on vanhempi kuin lähde.\n"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 6176bc0842d87315b76e0d6505a6007b82accc76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6176bc0842d87315b76e0d65… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jul 6 09:09:09 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/po/lt.po b/po/lt.po index 0a6f2dc..c2fca3a 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-04 20:40+0300\n" +"PO-Revision-Date: 2018-07-06 09:07+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -15669,41 +15669,6 @@ msgid "D" msgstr "K" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15767,6 +15732,7 @@ msgstr "" "[/A] Kopijuoti tik failus su nustatytu archyvavimo požymiu.\n" "[/M] Kopijuoti tik failus su nustatytu archyvavimo požymiu, pašalinti\n" "\tarchyvavimo požymį.\n" +"[/K] Kopijuoti failų požymius, be šio požymiai neišlaikomi.\n" "[/D | /D:m-d-y] Kopijuoti naujus failus arba modifikuotos po nurodytos " "datos.\n" "\t\tJei data nenurodyta, kopijuoti tik jei paskirties failas yra\n"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 44e5a7f0da9d7d824c89fb8a6c1a854bf92d78d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e5a7f0da9d7d824c89fb8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 6 09:19:22 2018 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/po/ru.po b/po/ru.po index 45dd3a1..9caec7d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-04 13:51+0300\n" +"PO-Revision-Date: 2018-07-06 09:17+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -15658,41 +15658,6 @@ msgid "D" msgstr "D" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15756,6 +15721,7 @@ msgstr "" "[/A] Копирует только файлы с атрибутом «архивный».\n" "[/M] Копирует только файлы с атрибутом «архивный»,\n" "при этом очищает атрибут.\n" +"[/K] Копирует атрибуты, без этого ключа атрибуты не копируются.\n" "[/D | /D:m-d-y] Копирует только новые файлы или файлы, изменённые\n" "\t\tпосле указанной даты. Если дата не указана, заменяет все старые файлы\n" "\t\tсуществующими новыми.\n"

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: 6d13c66dd50a6e1cbb2814ded6f39fa72e41a13d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d13c66dd50a6e1cbb2814de… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 5 11:58:12 2018 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/po/de.po b/po/de.po index a05fee9..2b4f422 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-05-18 15:21+0200\n" +"PO-Revision-Date: 2018-07-05 11:58+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -3437,32 +3437,24 @@ msgid "Publishers..." msgstr "Herausgeber..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "LAN-Verbindung" +msgstr "Verbindungen" #: inetcpl.rc:125 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Lokaler Server" +msgstr "Proxyserver" #: inetcpl.rc:126 msgid "Use a proxy server" -msgstr "" +msgstr "Proxy verwenden" #: inetcpl.rc:127 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Adresse" +msgstr "Adresse:" #: inetcpl.rc:129 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Keine Ports" +msgstr "Port:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -12919,10 +12911,8 @@ msgid "Confirm Value Delete" msgstr "Löschen des Wertes bestätigen" #: regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete the registry value '%1'?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "Sind Sie sicher, dass Sie den Wert '%1' löschen möchten?" +msgstr "Sind Sie sicher, dass Sie den ausgewählten Wert löschen möchten?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -14911,6 +14901,8 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"Ein Programm auf Ihrem System ist abgestürzt, aber WineDbg konnte nicht an " +"den Prozess anknüpfen, um eine Backtrace zu erstellen." #: winedbg.rc:41 msgid "(unidentified)"

1 0