August 2021 - Wine-Commits - list.winehq.org

Nikolay Sivov : d3dx10: Add a stub mesh object.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: fafd607eff251741380e467d06f95398dc57d7b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fafd607eff251741380e467d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 25 19:36:50 2021 +0200 d3dx10: Add a stub mesh object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/mesh.c | 378 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 380 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fafd607eff251741380e…

1 0

Alistair Leslie-Hughes : services: Check correct permission for QueryServiceConfig2W.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 4a18232e455d82c9334c71ebea833dfb5b50b19e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a18232e455d82c9334c71eb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 25 18:04:57 2021 +1000 services: Check correct permission for QueryServiceConfig2W. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50412 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 8d688c2f904..0f0a83df421 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -979,7 +979,7 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, memset(buffer, 0, size); - if ((err = validate_service_handle(hService, SERVICE_QUERY_STATUS, &service)) != 0) + if ((err = validate_service_handle(hService, SERVICE_QUERY_CONFIG, &service)) != 0) return err; switch (level)

1 0

Francois Gouget : winmm/tests: Fix an ASCII / ANSI mixup in a trace() message.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 4eef68eb8dc3da5fd761872051ce5b19c88f47e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eef68eb8dc3da5fd7618720… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 25 15:39:14 2021 +0200 winmm/tests: Fix an ASCII / ANSI mixup in a trace() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index b9e35aa519d..a72966c320b 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -983,7 +983,7 @@ static void mixer_testsA(void) MMRESULT rc; UINT ndev, d; - trace("--- Testing ASCII functions ---\n"); + trace("--- Testing ANSI functions ---\n"); ndev=mixerGetNumDevs(); trace("found %d Mixer devices\n",ndev);

1 0

Zebediah Figura : ntoskrnl: Set the PendingReturned field in IoCompleteRequest().
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 14d1855a0ca5a0eb08b9e3543f7760e75a22c9d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14d1855a0ca5a0eb08b9e354… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 24 16:11:44 2021 -0500 ntoskrnl: Set the PendingReturned field in IoCompleteRequest(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + dlls/ntoskrnl.exe/tests/driver.c | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fb3f9a23152..b2ffb7cfbb2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1989,6 +1989,7 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) device = IoGetCurrentIrpStackLocation(irp)->DeviceObject; else device = NULL; + irp->PendingReturned = !!(irpsp->Control & SL_PENDING_RETURNED); if (call_flag) { TRACE( "calling %p( %p, %p, %p )\n", routine, device, irp, irpsp->Context ); diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 65c7860e786..8a4856ca3f0 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1746,9 +1746,8 @@ static NTSTATUS WINAPI completion_cb(DEVICE_OBJECT *device, IRP *irp, void *cont if (device == upper_device) { - todo_wine_if (completion_lower_pending) - ok(irp->PendingReturned == completion_lower_pending, "Got PendingReturned %u, expected %u.\n", - irp->PendingReturned, completion_lower_pending); + ok(irp->PendingReturned == completion_lower_pending, "Got PendingReturned %u, expected %u.\n", + irp->PendingReturned, completion_lower_pending); ok(irp->CurrentLocation == 2, "Got current location %u.\n", irp->CurrentLocation); ok(stack->Control == (SL_INVOKE_ON_CANCEL | SL_INVOKE_ON_ERROR | SL_INVOKE_ON_SUCCESS), @@ -1763,9 +1762,8 @@ static NTSTATUS WINAPI completion_cb(DEVICE_OBJECT *device, IRP *irp, void *cont } else { - todo_wine_if (completion_upper_pending) - ok(irp->PendingReturned == completion_upper_pending, "Got PendingReturned %u, expected %u.\n", - irp->PendingReturned, completion_upper_pending); + ok(irp->PendingReturned == completion_upper_pending, "Got PendingReturned %u, expected %u.\n", + irp->PendingReturned, completion_upper_pending); ok(irp->CurrentLocation == 3, "Got current location %u.\n", irp->CurrentLocation); ok(!stack->Control, "Got control flags %#x.\n", stack->Control);

1 0

Zebediah Figura : ntoskrnl: Clear the pending flags for the current stack location before calling the previous location's completion routine.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 2f08e95b4b9bf0e222eb6e051496871d3d7f9f03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f08e95b4b9bf0e222eb6e05… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 24 16:11:45 2021 -0500 ntoskrnl: Clear the pending flags for the current stack location before calling the previous location's completion routine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + dlls/ntoskrnl.exe/tests/driver.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b2ffb7cfbb2..f1248300683 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1990,6 +1990,7 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) else device = NULL; irp->PendingReturned = !!(irpsp->Control & SL_PENDING_RETURNED); + irpsp->Control = 0; if (call_flag) { TRACE( "calling %p( %p, %p, %p )\n", routine, device, irp, irpsp->Context ); diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 8a4856ca3f0..ce74b9e9512 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1753,7 +1753,7 @@ static NTSTATUS WINAPI completion_cb(DEVICE_OBJECT *device, IRP *irp, void *cont ok(stack->Control == (SL_INVOKE_ON_CANCEL | SL_INVOKE_ON_ERROR | SL_INVOKE_ON_SUCCESS), "Got control flags %#x.\n", stack->Control); stack = IoGetNextIrpStackLocation(irp); - todo_wine ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + ok(!stack->Control, "Got control flags %#x.\n", stack->Control); stack = irp->Tail.Overlay.CurrentStackLocation + 1; /* previous location */ ok(!stack->Control, "Got control flags %#x.\n", stack->Control); @@ -1768,9 +1768,9 @@ static NTSTATUS WINAPI completion_cb(DEVICE_OBJECT *device, IRP *irp, void *cont ok(irp->CurrentLocation == 3, "Got current location %u.\n", irp->CurrentLocation); ok(!stack->Control, "Got control flags %#x.\n", stack->Control); stack = IoGetNextIrpStackLocation(irp); - todo_wine ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + ok(!stack->Control, "Got control flags %#x.\n", stack->Control); stack = irp->Tail.Overlay.CurrentStackLocation - 2; /* lowest location */ - todo_wine ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + ok(!stack->Control, "Got control flags %#x.\n", stack->Control); } ++got_completion;

1 0

Francois Gouget : setupapi: Fix a couple of ASCII / ANSI mixups in comments.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: ba7ca2d8a8b6f195ade616a7264be72ebb2d2180 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba7ca2d8a8b6f195ade616a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 25 15:37:04 2021 +0200 setupapi: Fix a couple of ASCII / ANSI mixups in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/misc.c | 2 +- dlls/setupapi/setupapi_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 26e5359804c..4d3ced2e4ae 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1781,7 +1781,7 @@ BOOL WINAPI SetupLogErrorW(LPCWSTR message, LogSeverity severity) WideCharToMultiByte(CP_ACP, 0, message, -1, msg, len, NULL, NULL); } - /* This is the normal way to proceed. The log files are ASCII files + /* This is the normal way to proceed. The log files are ANSI files * and W is to be converted. */ ret = SetupLogErrorA(msg, severity); diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index 21ac50e0f3c..7681348a11c 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -94,7 +94,7 @@ extern const WCHAR *DIRID_get_string( int dirid ) DECLSPEC_HIDDEN; extern const WCHAR *PARSER_get_inf_filename( HINF hinf ) DECLSPEC_HIDDEN; extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context ) DECLSPEC_HIDDEN; -/* support for Ascii queue callback functions */ +/* support for ANSI queue callback functions */ struct callback_WtoA_context {

1 0

Francois Gouget : winspool.drv: Fix ASCII / ANSI mixups in comments and TRACE() messages.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 182a8d88615e098972590a818a759cd046eab5f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=182a8d88615e098972590a81… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 25 15:38:55 2021 +0200 winspool.drv: Fix ASCII / ANSI mixups in comments and TRACE() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d6aa60a028f..8a17355f120 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4047,7 +4047,7 @@ BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault) * Get ValueName from hkey storing result in out * when the Value in the registry has only a filename, use driverdir as prefix * outlen is space left in out - * String is stored either as unicode or ascii + * String is stored either as unicode or ansi * */ @@ -4180,7 +4180,7 @@ static void WINSPOOL_GetDefaultDevMode(LPBYTE ptr, DWORD buflen, DWORD *needed) * WINSPOOL_GetDevModeFromReg * * Get ValueName from hkey storing result in ptr. buflen is space left in ptr - * DevMode is stored either as unicode or ascii. + * DevMode is stored either as unicode or ansi. */ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName, LPBYTE ptr, @@ -6770,7 +6770,7 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, memcpy (ppev->pValueName, pBuffer, len); - TRACE ("Converted '%s' from Unicode to ASCII\n", pBuffer); + TRACE ("Converted '%s' from Unicode to ANSI\n", pBuffer); if (ppev->dwType != REG_SZ && ppev->dwType != REG_EXPAND_SZ && ppev->dwType != REG_MULTI_SZ) @@ -6789,7 +6789,7 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, memcpy (ppev->pData, pBuffer, len); - TRACE ("Converted '%s' from Unicode to ASCII\n", pBuffer); + TRACE ("Converted '%s' from Unicode to ANSI\n", pBuffer); TRACE (" (only first string of REG_MULTI_SZ printed)\n"); }

1 0

Francois Gouget : msi: Fix ASCII / ANSI mixups in comments.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 45fb4ac4e2f94486e36d6d271c08b59feee4d12e URL: https://source.winehq.org/git/wine.git/?a=commit;h=45fb4ac4e2f94486e36d6d27… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 25 15:36:39 2021 +0200 msi: Fix ASCII / ANSI mixups in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 950a18d0e74..a039a5af4c7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -735,7 +735,7 @@ struct tagMSIMIME #define MSIHANDLE_MAGIC 0x4d434923 -/* handle unicode/ascii output in the Msi* API functions */ +/* handle unicode/ansi output in the Msi* API functions */ typedef struct { BOOL unicode; union { diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bf93f3e9afe..23e938f1759 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1806,7 +1806,7 @@ INT MSI_ProcessMessageVerbatim(MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSI_FormatRecordW(package, record, message, &len); } - /* convert it to ASCII */ + /* convert it to ANSI */ len = WideCharToMultiByte( CP_ACP, 0, message, -1, NULL, 0, NULL, NULL ); msg = msi_alloc( len ); WideCharToMultiByte( CP_ACP, 0, message, -1, msg, len, NULL, NULL );

1 0

Francois Gouget : kernel32/tests: Remove the macros from the GetNumberFormatEx() tests.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: 3144fbc347846898a9f84f8e1b6c728bfa6eb545 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3144fbc347846898a9f84f8e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 25 15:35:06 2021 +0200 kernel32/tests: Remove the macros from the GetNumberFormatEx() tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 232 ++++++++++++++++++++----------------------- 1 file changed, 107 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3144fbc347846898a9f8…

1 0

Francois Gouget : kernel32/tests: Remove the macros from the GetDateFormatW() tests.
by Alexandre Julliard Aug. 25, 2021

Aug. 25, 2021

Module: wine Branch: master Commit: b020ab629d2b72930d8fa21127bfe41cb70927ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=b020ab629d2b72930d8fa211… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 25 15:35:04 2021 +0200 kernel32/tests: Remove the macros from the GetDateFormatW() tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 51 ++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 105c839d57f..ee9d3c78379 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1031,31 +1031,33 @@ static void test_GetDateFormatW(void) { int ret; SYSTEMTIME curtime; - WCHAR buffer[BUFFER_SIZE], input[BUFFER_SIZE], Expected[BUFFER_SIZE]; + WCHAR buffer[BUFFER_SIZE]; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); - STRINGSW("",""); /* If flags is not zero then format must be NULL */ - ret = GetDateFormatW(LOCALE_SYSTEM_DEFAULT, DATE_LONGDATE, NULL, input, buffer, ARRAY_SIZE(buffer)); + SetLastError(0xdeadbeef); + + /* If flags is not zero then format must be NULL */ + wcscpy(buffer, L"pristine"); + ret = GetDateFormatW(LOCALE_SYSTEM_DEFAULT, DATE_LONGDATE, NULL, L"", buffer, ARRAY_SIZE(buffer)); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetDateFormatW is not implemented\n"); return; } - ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - EXPECT_EQW; + expect_werr(ret, buffer, ERROR_INVALID_FLAGS); + SetLastError(0xdeadbeef); - STRINGSW("",""); /* NULL buffer, len > 0 */ + /* NULL buffer, len > 0 */ + wcscpy(buffer, L"pristine"); + ret = GetDateFormatW (lcid, 0, NULL, L"", NULL, ARRAY_SIZE(buffer)); + expect_werr(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = GetDateFormatW (lcid, 0, NULL, input, NULL, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - STRINGSW("",""); /* NULL buffer, len == 0 */ - ret = GetDateFormatW (lcid, 0, NULL, input, NULL, 0); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* NULL buffer, len == 0 */ + ret = GetDateFormatW (lcid, 0, NULL, L"", NULL, 0); + expect_wstr(ret, NULL, L""); + /* Incorrect DOW and time */ curtime.wYear = 2002; curtime.wMonth = 10; curtime.wDay = 23; @@ -1064,10 +1066,8 @@ static void test_GetDateFormatW(void) curtime.wMinute = 34512; /* Invalid */ curtime.wSecond = 65535; /* Invalid */ curtime.wMilliseconds = 12345; - STRINGSW("dddd d MMMM yyyy","Wednesday 23 October 2002"); /* Incorrect DOW and time */ - ret = GetDateFormatW (lcid, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + ret = GetDateFormatW (lcid, 0, &curtime, L"dddd d MMMM yyyy", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"Wednesday 23 October 2002"); /* Limit tests */ @@ -1079,11 +1079,8 @@ static void test_GetDateFormatW(void) curtime.wMinute = 0; curtime.wSecond = 0; curtime.wMilliseconds = 0; - STRINGSW("dddd d MMMM yyyy","Monday 1 January 1601"); - SetLastError(0xdeadbeef); - ret = GetDateFormatW (lcid, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + ret = GetDateFormatW (lcid, 0, &curtime, L"dddd d MMMM yyyy", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"Monday 1 January 1601"); curtime.wYear = 1600; curtime.wMonth = 12; @@ -1093,11 +1090,9 @@ static void test_GetDateFormatW(void) curtime.wMinute = 59; curtime.wSecond = 59; curtime.wMilliseconds = 999; - STRINGSW("dddd d MMMM yyyy","Friday 31 December 1600"); - SetLastError(0xdeadbeef); - ret = GetDateFormatW (lcid, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + wcscpy(buffer, L"pristine"); + ret = GetDateFormatW (lcid, 0, &curtime, L"dddd d MMMM yyyy", buffer, ARRAY_SIZE(buffer)); + expect_werr(ret, buffer, ERROR_INVALID_PARAMETER); }

1 0