April 2017 - Wine-Commits - list.winehq.org

Aric Stewart : kernel32: Improve locale detection on Android.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 9dc5d299f11c599862d39af3e32d92e787c1ae7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dc5d299f11c599862d39af3e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 30 12:56:38 2017 -0500 kernel32: Improve locale detection on Android. setlocale is coded to just return 'C' for all inquiries ignoring locale that may be set in the environment. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index e14aedb..a72a8aa 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -985,6 +985,15 @@ static const char* get_locale(int category, const char* category_name) { const char* ret = setlocale(category, NULL); +#ifdef __ANDROID__ + if (!strcmp(ret, "C")) + { + ret = getenv( category_name ); + if (!ret || !ret[0]) ret = getenv( "LC_ALL" ); + if (!ret || !ret[0]) ret = "C"; + } +#endif + #ifdef __APPLE__ /* If LC_ALL is set, respect it as a user override. If LC_* is set, respect it as a user override, except if it's LC_CTYPE

1 0

Francois Gouget : msvcp90: {init, free}_misc() are only used with msvcp >= 100.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 459134b855f4cad5cb83336d7dca9b5f84b08e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459134b855f4cad5cb83336d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 1 14:36:29 2017 +0200 msvcp90: {init,free}_misc() are only used with msvcp >= 100. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 2 ++ dlls/msvcp90/msvcp_main.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 9f3724a..828c4c2 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1364,6 +1364,7 @@ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param) return InitOnceExecuteOnce(flag, func, param, NULL); } +#if _MSVCP_VER >= 100 void init_misc(void *base) { #ifdef __x86_64__ @@ -1393,6 +1394,7 @@ void free_misc(void) HeapFree(GetProcessHeap(), 0, broadcast_at_thread_exit.to_broadcast); #endif } +#endif #if _MSVCP_VER >= 140 LONGLONG __cdecl _Query_perf_counter(void) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 3898c9d..8eb1e21 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -209,14 +209,18 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) init_exception(hinstDLL); init_locale(hinstDLL); init_io(hinstDLL); +#if _MSVCP_VER >= 100 init_misc(hinstDLL); +#endif break; case DLL_PROCESS_DETACH: if (lpvReserved) break; free_io(); free_locale(); free_lockit(); +#if _MSVCP_VER >= 100 free_misc(); +#endif break; }

1 0

Francois Gouget : msvcp140/tests: Make chore_callback() static.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 39314912556f7f68c6a173d3a010a91eb6ec1729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39314912556f7f68c6a173d3a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 1 14:36:42 2017 +0200 msvcp140/tests: Make chore_callback() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 6d1a5f8..1419669 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -410,7 +410,7 @@ static void test__TaskEventLogger(void) ok(logger.started, "logger.started = FALSE\n"); } -void __cdecl chore_callback(void *arg) +static void __cdecl chore_callback(void *arg) { HANDLE event = arg; SetEvent(event);

1 0

Daniel Lehman : msvcr120: Add __crtSleep.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: b5465d9605c2195bfdc0072f2116932d03cf5878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5465d9605c2195bfdc0072f2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 15:20:32 2017 -0700 msvcr120: Add __crtSleep. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/misc.c | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 3ae8098..b58ad8b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -919,7 +919,7 @@ @ stub -arch=i386,win64 __crtSetThreadStackGuarantee @ cdecl __crtSetUnhandledExceptionFilter(ptr) MSVCR110__crtSetUnhandledExceptionFilter @ cdecl -arch=i386,win64 __crtTerminateProcess(long) MSVCR110__crtTerminateProcess -@ stub __crtSleep +@ cdecl __crtSleep(long) MSVCRT__crtSleep @ cdecl -arch=i386,win64 __crtUnhandledException(ptr) MSVCRT__crtUnhandledException @ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 6d48f74..0b896aa 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -895,7 +895,7 @@ @ stub __crtIsPackagedApp @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcr120.__crtLCMapStringA @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcr120.__crtLCMapStringW -@ stub __crtSleep +@ cdecl __crtSleep(long) msvcr120.__crtSleep @ stub __crtWaitForWinRTThreadExit @ cdecl __daylight() msvcr120.__daylight @ cdecl __dllonexit(ptr ptr ptr) msvcr120.__dllonexit diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 767972f..9e38364 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -542,3 +542,12 @@ LONG CDECL MSVCRT__crtUnhandledException(EXCEPTION_POINTERS *ep) SetUnhandledExceptionFilter(NULL); return UnhandledExceptionFilter(ep); } + +/********************************************************************* + * __crtSleep (MSVCR120.@) + */ +void CDECL MSVCRT__crtSleep(DWORD timeout) +{ + TRACE("(%u)\n", timeout); + Sleep(timeout); +}

1 0

Daniel Lehman : msvcp140: Add __crtGetCurrentProcessorNumber.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: e437438a1248280e133dbcd2de2b022c93ee685d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e437438a1248280e133dbcd2d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 14:18:27 2017 -0700 msvcp140: Add __crtGetCurrentProcessorNumber. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 81a3902..15b558df 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3764,7 +3764,7 @@ @ cdecl __crtCreateThreadpoolWait(ptr ptr ptr) MSVCP__crtCreateThreadpoolWait @ stub __crtFlushProcessWriteBuffers @ cdecl __crtFreeLibraryWhenCallbackReturns(ptr ptr) MSVCP__crtFreeLibraryWhenCallbackReturns -@ stub __crtGetCurrentProcessorNumber +@ cdecl __crtGetCurrentProcessorNumber() MSVCP__crtGetCurrentProcessorNumber @ stub __crtGetFileInformationByHandleEx @ stub __crtGetLocaleInfoEx @ stub __crtGetSystemTimePreciseAsFileTime diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index b358656..7d9c408 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1255,6 +1255,14 @@ ULONGLONG CDECL MSVCP__crtGetTickCount64(void) } /********************************************************************* + * __crtGetCurrentProcessorNumber (MSVCP140.@) + */ +DWORD CDECL MSVCP__crtGetCurrentProcessorNumber(void) +{ + return GetCurrentProcessorNumber(); +} + +/********************************************************************* * __crtCreateSemaphoreExW (MSVCP140.@) */ HANDLE CDECL MSVCP__crtCreateSemaphoreExW(

1 0

Austin English : joy.cpl: Sync spec file to Windows 10.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 83bc9c85e4a8eca4fcfcee62c9a899ef6c6c4e81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83bc9c85e4a8eca4fcfcee62c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 28 15:42:06 2017 -0500 joy.cpl: Sync spec file to Windows 10. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/joy.cpl.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/joy.cpl/joy.cpl.spec b/dlls/joy.cpl/joy.cpl.spec index df77a30..3a7f493 100644 --- a/dlls/joy.cpl/joy.cpl.spec +++ b/dlls/joy.cpl/joy.cpl.spec @@ -1 +1,2 @@ @ stdcall CPlApplet(long long long long) +# @ stub ShowJoyCPL

1 0

Piotr Caban : msvcrt: Add CurrentScheduler:: GetNumberOfVirtualProcessors implementation.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 2d4be5cb35616552eb96cbf42996642c78626c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4be5cb35616552eb96cbf42… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 3 15:05:42 2017 +0200 msvcrt: Add CurrentScheduler::GetNumberOfVirtualProcessors implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index b5dc2f8..ff5cf6f 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -116,6 +116,7 @@ typedef struct Scheduler { const vtable_ptr *vtable; } Scheduler; #define call_Scheduler_Id(this) CALL_VTBL_FUNC(this, 4, unsigned int, (const Scheduler*), (this)) +#define call_Scheduler_GetNumberOfVirtualProcessors(this) CALL_VTBL_FUNC(this, 8, unsigned int, (const Scheduler*), (this)) #define call_Scheduler_Reference(this) CALL_VTBL_FUNC(this, 16, unsigned int, (Scheduler*), (this)) #define call_Scheduler_Release(this) CALL_VTBL_FUNC(this, 20, unsigned int, (Scheduler*), (this)) #define call_Scheduler_Attach(this) CALL_VTBL_FUNC(this, 28, void, (Scheduler*), (this)) @@ -181,6 +182,20 @@ static Context* get_current_context(void) return ret; } +static Scheduler* try_get_current_scheduler(void) +{ + ExternalContextBase *context = (ExternalContextBase*)try_get_current_context(); + + if (!context) + return NULL; + + if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { + ERR("unknown context set\n"); + return NULL; + } + return context->scheduler.scheduler; +} + /* ?CurrentContext(a)Context@Concurrency@@SAPAV12(a)XZ */ /* ?CurrentContext(a)Context@Concurrency@@SAPEAV12(a)XZ */ Context* __cdecl Context_CurrentContext(void) @@ -240,7 +255,7 @@ unsigned int __cdecl Context_ScheduleGroupId(void) unsigned int __cdecl Context_VirtualProcessorId(void) { Context *ctx = try_get_current_context(); - FIXME("()\n"); + TRACE("()\n"); return ctx ? call_Context_GetVirtualProcessorId(ctx) : -1; } @@ -889,8 +904,11 @@ Scheduler* __cdecl CurrentScheduler_Get(void) /* ?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ */ unsigned int __cdecl CurrentScheduler_GetNumberOfVirtualProcessors(void) { - FIXME("() stub\n"); - return 0; + Scheduler *scheduler = try_get_current_scheduler(); + TRACE("()\n"); + if(!scheduler) + return -1; + return call_Scheduler_GetNumberOfVirtualProcessors(scheduler); } /* ?GetPolicy(a)CurrentScheduler@Concurrency@@SA?AVSchedulerPolicy(a)2@XZ */

1 0

Hugh McMaster : reg/tests: Add import tests with various combinations of spaces and tabs.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 19d8fcc42e4ce7cedd171f50340eb5482cd89bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d8fcc42e4ce7cedd171f503… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 3 12:02:04 2017 +0000 reg/tests: Add import tests with various combinations of spaces and tabs. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 246 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 246 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19d8fcc42e4ce7cedd171…

1 0

Hugh McMaster : regedit/tests: Add import tests with various combinations of spaces and tabs.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 0b513778c70943d153624d8d65ebf94276c6c229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b513778c70943d153624d8d6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 3 12:01:51 2017 +0000 regedit/tests: Add import tests with various combinations of spaces and tabs. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 112 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 37ac2c1..354ddac 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -643,6 +643,117 @@ static void test_comments(void) ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); } +static void test_import_with_whitespace(void) +{ + HKEY hkey; + LONG lr; + DWORD dword; + + exec_import_str(" REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); + + lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", lr); + + exec_import_str(" REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine1a\"=\"Value\"\n\n"); + verify_reg(hkey, "Wine1a", REG_SZ, "Value", 6, 0); + + exec_import_str("\tREGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine1b\"=\"Value\"\n\n"); + verify_reg(hkey, "Wine1b", REG_SZ, "Value", 6, 0); + + exec_import_str(" \t REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine1c\"=\"Value\"\n\n"); + verify_reg(hkey, "Wine1c", REG_SZ, "Value", 6, 0); + + exec_import_str("REGEDIT4\n\n" + " [HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine2a\"=\"Value\"\n\n"); + todo_wine verify_reg(hkey, "Wine2a", REG_SZ, "Value", 6, 0); + + exec_import_str("REGEDIT4\n\n" + "\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine2b\"=\"Value\"\n\n"); + todo_wine verify_reg(hkey, "Wine2b", REG_SZ, "Value", 6, 0); + + exec_import_str("REGEDIT4\n\n" + " \t [HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine2c\"=\"Value\"\n\n"); + todo_wine verify_reg(hkey, "Wine2c", REG_SZ, "Value", 6, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + " \"Wine3a\"=\"Two leading spaces\"\n\n"); + todo_wine verify_reg(hkey, "Wine3a", REG_SZ, "Two leading spaces", 19, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\t\"Wine3b\"=\"One leading tab\"\n\n"); + todo_wine verify_reg(hkey, "Wine3b", REG_SZ, "One leading tab", 16, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + " \t \"Wine3c\"=\"Space, tab, space\"\n\n"); + todo_wine verify_reg(hkey, "Wine3c", REG_SZ, "Space, tab, space", 18, 0); + + exec_import_str(" REGEDIT4\n\n" + "\t\t\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\t \"Wine4a\"=\"Tab and four spaces\"\n" + " \"Wine4b\"=dword:00112233\n" + "\t \t \t \t \t \t \"Wine4c\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + "\t\t\t\t63,61,74,\\;comment\n" + " \t65,6e,61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Wine4a", REG_SZ, "Tab and four spaces", 20, 0); + dword = 0x112233; + todo_wine verify_reg(hkey, "Wine4b", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine4c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str(" REGEDIT4\n\n" + "\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + " \"Wine5a\"=\"Leading spaces\"\n" + "\t\t\"Wine5b\"\t\t=\"Leading tabs\"\n" + "\t \"Wine5c\"=\t \"Tabs and spaces\"\n" + " \"Wine5d\" \t = \t \"More whitespace\"\n\n"); + todo_wine verify_reg(hkey, "Wine5a", REG_SZ, "Leading spaces", 15, 0); + todo_wine verify_reg(hkey, "Wine5b", REG_SZ, "Leading tabs", 13, 0); + todo_wine verify_reg(hkey, "Wine5c", REG_SZ, "Tabs and spaces", 16, 0); + todo_wine verify_reg(hkey, "Wine5d", REG_SZ, "More whitespace", 16, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\" Wine6a\"=\"Leading spaces\"\n" + "\"\t\tWine6b\"=\"Leading tabs\"\n" + " \" Wine6c \" = \" Spaces everywhere \" \n\n"); + verify_reg(hkey, " Wine6a", REG_SZ, "Leading spaces", 15, 0); + verify_reg(hkey, "\t\tWine6b", REG_SZ, "Leading tabs", 13, 0); + todo_wine verify_reg(hkey, " Wine6c ", REG_SZ, " Spaces everywhere ", 22, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine7a\"=\" Four spaces in the data\"\n" + "\"Wine7b\"=\"\t\tTwo tabs in the data\"\n\n"); + verify_reg(hkey, "Wine7a", REG_SZ, " Four spaces in the data", 28, 0); + verify_reg(hkey, "Wine7b", REG_SZ, "\t\tTwo tabs in the data", 23, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine8a\"=\"Trailing spaces\" \n" + "\"Wine8b\"=\"Trailing tabs and spaces\"\t \t\n\n"); + verify_reg(hkey, "Wine8a", REG_SZ, "Trailing spaces", 16, 0); + verify_reg(hkey, "Wine8b", REG_SZ, "Trailing tabs and spaces", 25, 0); + + lr = RegCloseKey(hkey); + ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); +} + START_TEST(regedit) { WCHAR wchar_test[] = {0xFEFF,'W','i','n','d','o','w','s',' ','R','e','g', @@ -660,4 +771,5 @@ START_TEST(regedit) test_basic_import_31(); test_invalid_import(); test_comments(); + test_import_with_whitespace(); }

1 0

Paul Gofman : d3dx9/tests: Add more tests for relative addressing in preshaders.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 8b1737c0fdf1d3d905bea281d9241f1f48f333e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b1737c0fdf1d3d905bea281d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 3 19:51:24 2017 +0200 d3dx9/tests: Add more tests for relative addressing in preshaders. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 269 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 269 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b1737c0fdf1d3d905bea…

1 0