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