April 2018 - Wine-commits - list.winehq.org

Dmitry Timoshkov : netapi32: Properly implement NetApiBufferFree.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 67968b88057868ceecca4e5e52e014aeeb33fcb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67968b88057868ceecca4e5e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 5 15:55:58 2018 +0800 netapi32: Properly implement NetApiBufferFree. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/netapi32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 4c4333c..620df79 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -1204,7 +1204,7 @@ NET_API_STATUS WINAPI NetApiBufferAllocate(DWORD ByteCount, LPVOID* Buffer) NET_API_STATUS WINAPI NetApiBufferFree(LPVOID Buffer) { TRACE("(%p)\n", Buffer); - HeapFree(GetProcessHeap(), 0, Buffer); + MIDL_user_free(Buffer); return NERR_Success; }

1 0

Józef Kucia : winevulkan: Get rid of unused "phys_dev " field from VkDevice_T.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 9451a42cf72ba0ba62fb98340d467e028a5c5042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9451a42cf72ba0ba62fb9834… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 9 10:25:56 2018 +0200 winevulkan: Get rid of unused "phys_dev" field from VkDevice_T. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 2 -- dlls/winevulkan/vulkan_private.h | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index c507e37..8f67483 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -532,8 +532,6 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, return res; } - object->phys_dev = phys_dev; - /* Just load all function pointers we are aware off. The loader takes care of filtering. * We use vkGetDeviceProcAddr as opposed to vkGetInstanceProcAddr for efficiency reasons * as functions pass through fewer dispatch tables within the loader. diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index ce13b1a..86b8e31 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -64,7 +64,7 @@ struct wine_vk_base struct VkCommandBuffer_T { struct wine_vk_base base; - VkDevice device; /* parent */ + struct VkDevice_T *device; /* parent */ VkCommandBuffer command_buffer; /* native command buffer */ }; @@ -72,7 +72,6 @@ struct VkDevice_T { struct wine_vk_base base; struct vulkan_device_funcs funcs; - struct VkPhysicalDevice_T *phys_dev; /* parent */ uint32_t max_queue_families; struct VkQueue_T **queues; @@ -112,7 +111,7 @@ struct VkPhysicalDevice_T struct VkQueue_T { struct wine_vk_base base; - VkDevice device; /* parent */ + struct VkDevice_T *device; /* parent */ VkQueue queue; /* native queue */ };

1 0

Józef Kucia : winevulkan: Pack structures better.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: cf5f750ed888456b5912f386ff8d75b56180b684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf5f750ed888456b5912f386… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 9 10:25:57 2018 +0200 winevulkan: Pack structures better. Makes structures slightly smaller on 64-bit. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan_private.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 86b8e31..582fb78 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -72,11 +72,10 @@ struct VkDevice_T { struct wine_vk_base base; struct vulkan_device_funcs funcs; + VkDevice device; /* native device */ - uint32_t max_queue_families; struct VkQueue_T **queues; - - VkDevice device; /* native device */ + uint32_t max_queue_families; unsigned int quirks; }; @@ -85,14 +84,13 @@ struct VkInstance_T { struct wine_vk_base base; struct vulkan_instance_funcs funcs; + VkInstance instance; /* native instance */ /* We cache devices as we need to wrap them as they are * dispatchable objects. */ - uint32_t num_phys_devs; struct VkPhysicalDevice_T **phys_devs; - - VkInstance instance; /* native instance */ + uint32_t num_phys_devs; unsigned int quirks; }; @@ -101,11 +99,10 @@ struct VkPhysicalDevice_T { struct wine_vk_base base; struct VkInstance_T *instance; /* parent */ + VkPhysicalDevice phys_dev; /* native physical device */ - uint32_t extension_count; VkExtensionProperties *extensions; - - VkPhysicalDevice phys_dev; /* native physical device */ + uint32_t extension_count; }; struct VkQueue_T

1 0

Józef Kucia : winevulkan: Fix typos.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: f1b88ab1f63e6116fed34cc6781d2219cd04fed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1b88ab1f63e6116fed34cc6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 9 10:25:58 2018 +0200 winevulkan: Fix typos. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 14 +++++++------- dlls/winevulkan/vulkan.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 94941c1..7d84cfb 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -124,12 +124,12 @@ CORE_EXTENSIONS = [ DRIVER_VERSION = 3 # Table of functions for which we have a special implementation. -# This are regular device / instance functions for which we need -# to more work compared to a regular thunk or because they are +# These are regular device / instance functions for which we need +# to do more work compared to a regular thunk or because they are # part of the driver interface. # - dispatch set whether we need a function pointer in the device # / instance dispatch table. -# - driver sets whether the api is part of the driver interface. +# - driver sets whether the API is part of the driver interface. # - thunk sets whether to create a thunk in vulkan_thunks.c. FUNCTION_OVERRIDES = { # Global functions @@ -1199,7 +1199,7 @@ class VkParam(object): else: proto += " " + self.name - # Allows appeninding something to the variable name useful for + # Allows appending something to the variable name useful for # win32 to host conversion. if postfix is not None: proto += postfix @@ -1371,7 +1371,7 @@ class VkParam(object): return "NULL" # Dispatchable objects wrap the native handle. For thunk generation we - # need to pass the native handle to the native vulkan calls. + # need to pass the native handle to the native Vulkan calls. if self.is_dispatchable(): return "{0}->{1}".format(self.name, self.handle.native_handle()) elif conv and self.needs_conversion(): @@ -2250,7 +2250,7 @@ class VkRegistry(object): funcs[func.name] = func # To make life easy for the code generation, separate all function - # calls out in the 3 types of vulkan functions: device, global and instance. + # calls out in the 3 types of Vulkan functions: device, global and instance. device_funcs = [] global_funcs = [] instance_funcs = [] @@ -2474,7 +2474,7 @@ class VkRegistry(object): if type_info["category"] in ["struct", "union"]: # We store unions among structs as some structs depend # on unions. The types are very similar in parsing and - # generation anyway. The official vulkan scripts use + # generation anyway. The official Vulkan scripts use # a similar kind of hack. struct = VkStruct.from_xml(t) structs.append(struct) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 8f67483..ef9f095 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -136,7 +136,7 @@ err: return NULL; } -/* Helper function for release command buffers. */ +/* Helper function to release command buffers. */ static void wine_vk_command_buffers_free(struct VkDevice_T *device, VkCommandPool pool, uint32_t count, const VkCommandBuffer *buffers) { @@ -799,7 +799,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * /* Per the spec, we are only supposed to return device functions as in functions * for which the first parameter is vkDevice or a child of vkDevice like a * vkCommandBuffer or vkQueue. - * Loader takes are of filtering of extensions which are enabled or not. + * Loader takes care of filtering of extensions which are enabled or not. */ func = wine_vk_get_device_proc_addr(name); if (func)

1 0

Dmitry Timoshkov : services: Add a 3000 ms timeout to StartService.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: b5c1a8f635f2f8f8ccf7c85ad52c40a632711a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5c1a8f635f2f8f8ccf7c85a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 9 19:29:02 2018 +0800 services: Add a 3000 ms timeout to StartService. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 4 ++-- programs/services/services.c | 15 ++++++++++++--- programs/services/services.h | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 5ecd660..efbcd76 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1212,7 +1212,7 @@ DWORD __cdecl svcctl_StartServiceW( if (service->service_entry->config.dwStartType == SERVICE_DISABLED) return ERROR_SERVICE_DISABLED; - if (!scmdatabase_lock_startup(service->service_entry->db)) + if (!scmdatabase_lock_startup(service->service_entry->db, 3000)) return ERROR_SERVICE_DATABASE_LOCKED; err = service_start(service->service_entry, dwNumServiceArgs, lpServiceArgVectors); @@ -1374,7 +1374,7 @@ DWORD __cdecl svcctl_LockServiceDatabase( if ((err = validate_scm_handle(hSCManager, SC_MANAGER_LOCK, &manager)) != ERROR_SUCCESS) return err; - if (!scmdatabase_lock_startup(manager->db)) + if (!scmdatabase_lock_startup(manager->db, 0)) return ERROR_SERVICE_DATABASE_LOCKED; lock = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sc_lock)); diff --git a/programs/services/services.c b/programs/services/services.c index f7c47b5..eba98d6 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -361,7 +361,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) scmdatabase_unlock(db); qsort(services_list, size, sizeof(services_list[0]), compare_tags); - while (!scmdatabase_lock_startup(db)) Sleep(10); + scmdatabase_lock_startup(db, INFINITE); for (i = 0; i < size; i++) { @@ -619,9 +619,18 @@ static DWORD scmdatabase_load_services(struct scmdatabase *db) return ERROR_SUCCESS; } -BOOL scmdatabase_lock_startup(struct scmdatabase *db) +BOOL scmdatabase_lock_startup(struct scmdatabase *db, int timeout) { - return !InterlockedCompareExchange(&db->service_start_lock, TRUE, FALSE); + while (InterlockedCompareExchange(&db->service_start_lock, TRUE, FALSE)) + { + if (timeout != INFINITE) + { + timeout -= 10; + if (timeout <= 0) return FALSE; + } + Sleep(10); + } + return TRUE; } void scmdatabase_unlock_startup(struct scmdatabase *db) diff --git a/programs/services/services.h b/programs/services/services.h index fd19ed3..5a79c35 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -77,7 +77,7 @@ struct service_entry *scmdatabase_find_service(struct scmdatabase *db, LPCWSTR n struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase *db, LPCWSTR name); DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *entry); -BOOL scmdatabase_lock_startup(struct scmdatabase *db); +BOOL scmdatabase_lock_startup(struct scmdatabase *db, int timeout); void scmdatabase_unlock_startup(struct scmdatabase *db); void scmdatabase_lock(struct scmdatabase *db);

1 0

Alistair Leslie-Hughes : winedevice: Improve error handling when a driver fails to load.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: dd2624a24fba400bf59b9396e496d16c43d399d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd2624a24fba400bf59b9396… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 9 02:18:01 2018 +0000 winedevice: Improve error handling when a driver fails to load. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 9da34ec..fa8b268 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -50,12 +50,15 @@ static SC_HANDLE manager_handle; static BOOL shutdown_in_progress; static HANDLE stop_event; +#define EVENT_STARTED 0 +#define EVENT_ERROR 1 + struct wine_driver { struct wine_rb_entry entry; SERVICE_STATUS_HANDLE handle; - HANDLE started; + HANDLE events[2]; DRIVER_OBJECT *driver_obj; WCHAR name[1]; }; @@ -391,7 +394,7 @@ static void WINAPI async_create_driver( PTP_CALLBACK_INSTANCE instance, void *co goto error; } - SetEvent(driver->started); + SetEvent(driver->events[EVENT_STARTED]); EnterCriticalSection( &drivers_cs ); driver->driver_obj = driver_obj; @@ -401,6 +404,7 @@ static void WINAPI async_create_driver( PTP_CALLBACK_INSTANCE instance, void *co return; error: + SetEvent(driver->events[EVENT_ERROR]); EnterCriticalSection( &drivers_cs ); wine_rb_remove( &wine_drivers, &driver->entry ); LeaveCriticalSection( &drivers_cs ); @@ -416,6 +420,7 @@ static NTSTATUS create_driver( const WCHAR *driver_name ) TP_CALLBACK_ENVIRON environment; struct wine_driver *driver; DWORD length; + DWORD ret; length = FIELD_OFFSET( struct wine_driver, name[strlenW(driver_name) + 1] ); if (!(driver = HeapAlloc( GetProcessHeap(), 0, length ))) @@ -444,14 +449,18 @@ static NTSTATUS create_driver( const WCHAR *driver_name ) environment.Version = 1; environment.CleanupGroup = cleanup_group; - driver->started = CreateEventW(NULL, TRUE, FALSE, NULL); + driver->events[EVENT_STARTED] = CreateEventW(NULL, TRUE, FALSE, NULL); + driver->events[EVENT_ERROR] = CreateEventW(NULL, TRUE, FALSE, NULL); /* don't block the service control handler */ if (!TrySubmitThreadpoolCallback( async_create_driver, driver, &environment )) async_create_driver( NULL, driver ); /* Windows wait 30 Seconds */ - if(WaitForSingleObject(driver->started, 30000) == WAIT_TIMEOUT) + ret = WaitForMultipleObjects(2, driver->events, FALSE, 30000); + if(ret == WAIT_OBJECT_0 + EVENT_ERROR) + return STATUS_UNSUCCESSFUL; + else if(ret == WAIT_TIMEOUT) return ERROR_SERVICE_REQUEST_TIMEOUT; return STATUS_SUCCESS; @@ -462,7 +471,8 @@ static void wine_drivers_rb_destroy( struct wine_rb_entry *entry, void *context if (unload_driver( entry, TRUE ) != STATUS_SUCCESS) { struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, struct wine_driver, entry ); - CloseHandle(driver->started); + CloseHandle(driver->events[EVENT_STARTED]); + CloseHandle(driver->events[EVENT_ERROR]); ObDereferenceObject( driver->driver_obj ); CloseServiceHandle( (void *)driver->handle ); HeapFree( GetProcessHeap(), 0, driver );

1 0

Piotr Caban : msvcr110: Add __crtCapturePreviousContext implementation.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 19bb93ec100785c6466f211165d2353e96f58d20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19bb93ec100785c6466f2111… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 5 21:02:47 2018 +0200 msvcr110: Add __crtCapturePreviousContext implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/except_x86_64.c | 38 +++++++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1a04161..3572664 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -905,7 +905,7 @@ @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ cdecl __create_locale(long str) MSVCRT__create_locale @ cdecl -arch=win64 -norelay __crtCaptureCurrentContext(ptr) ntdll.RtlCaptureContext -@ stub -arch=win64 __crtCapturePreviousContext +@ cdecl -arch=x86_64 -norelay __crtCapturePreviousContext(ptr) @ cdecl __crtCompareStringA(long long str long str long) @ stub -arch=i386,win64 __crtCompareStringEx @ cdecl __crtCompareStringW(long long wstr long wstr long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f65669c..9e0c395 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -890,7 +890,7 @@ @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ cdecl __create_locale(long str) MSVCRT__create_locale @ cdecl -arch=win64 -norelay __crtCaptureCurrentContext(ptr) ntdll.RtlCaptureContext -@ stub -arch=win64 __crtCapturePreviousContext +@ cdecl -arch=x86_64 -norelay __crtCapturePreviousContext(ptr) @ cdecl __crtCompareStringA(long long str long str long) @ stub -arch=i386,win64 __crtCompareStringEx @ cdecl __crtCompareStringW(long long wstr long wstr long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0ba1780..a732118 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -884,7 +884,7 @@ @ cdecl -arch=i386 __control87_2(long long ptr ptr) msvcr120.__control87_2 @ cdecl __create_locale(long str) msvcr120.__create_locale @ cdecl -arch=win64 -norelay __crtCaptureCurrentContext(ptr) msvcr120.__crtCaptureCurrentContext -@ stub -arch=win64 __crtCapturePreviousContext +@ cdecl -arch=x86_64 -norelay __crtCapturePreviousContext(ptr) msvcr120.__crtCapturePreviousContext @ stub __crtCloseWinRTThreadHandle @ cdecl __crtCompareStringA(long long str long str long) msvcr120.__crtCompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcr120.__crtCompareStringW diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 77c519d..9cd1939 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -798,4 +798,42 @@ int __cdecl _fpieee_flt(ULONG exception_code, EXCEPTION_POINTERS *ep, return EXCEPTION_CONTINUE_SEARCH; } +#if _MSVCR_VER>=110 && _MSVCR_VER<=120 +/********************************************************************* + * __crtCapturePreviousContext (MSVCR110.@) + */ +void __cdecl get_prev_context(CONTEXT *ctx, DWORD64 rip) +{ + ULONG64 frame, image_base; + RUNTIME_FUNCTION *rf; + void *data; + + TRACE("(%p)\n", ctx); + + ctx->Rip = rip; + ctx->Rsp += 3*8; /* Rip, Rcx, return address */ + + rf = RtlLookupFunctionEntry(ctx->Rip, &image_base, NULL); + if(!rf) { + FIXME("RtlLookupFunctionEntry failed\n"); + return; + } + + RtlVirtualUnwind(UNW_FLAG_NHANDLER, image_base, ctx->Rip, + rf, ctx, &data, &frame, NULL); +} + +__ASM_GLOBAL_FUNC( __crtCapturePreviousContext, + "pushq (%rsp)\n\t" /* save Rip */ + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + "pushq %rcx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + "call " __ASM_NAME("RtlCaptureContext") "\n\t" + "popq %rcx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + "popq %rdx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + "jmp " __ASM_NAME("get_prev_context") ); +#endif + #endif /* __x86_64__ */

1 0

Piotr Caban : msvcrt: Support "China" country name in setlocale function.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 8905bd92aa61ed5493844cbe65db4eedca6839c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8905bd92aa61ed5493844cbe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 5 23:13:51 2018 +0200 msvcrt: Support "China" country name in setlocale function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 3 +++ dlls/msvcrt/tests/locale.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 088e1b7..6314840 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -249,6 +249,9 @@ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage) if(!search.search_country[0] && !search.search_codepage[0]) remap_synonym(search.search_language); + if(!strcasecmp(search.search_country, "China")) + strcpy(search.search_country, "People's Republic of China"); + EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, (LPCSTR)LOCALE_ILANGUAGE,find_best_locale_proc, (LONG_PTR)&search); diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index ea42385..5e6d172 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -144,12 +144,10 @@ static void test_setlocale(void) || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "Chinese_China.936"); -todo_wine ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) { trace("Chinese_China.936=%s\n", ret); -todo_wine ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") /* Vista - Win7 */ || !strcmp(ret, "Chinese (Simplified)_China.936") /* Win8 - Win10 */ || broken(!strcmp(ret, "Chinese_People's Republic of China.936")), "ret = %s\n", ret);

1 0

Nikolay Sivov : comctl32/tests: Remove useless trace() message.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: be2bec72ac8117099cad992cb3becce4d8052836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be2bec72ac8117099cad992c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 9 08:53:38 2018 +0300 comctl32/tests: Remove useless trace() message. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index b9d2663..05fa303 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -563,8 +563,8 @@ static void test_button_messages(void) DWORD style, state; HDC hdc; - trace("%d: button test sequence\n", i); hwnd = create_button(button[i].style, parent); + ok(hwnd != NULL, "Failed to create a button.\n"); style = GetWindowLongA(hwnd, GWL_STYLE); style &= ~(WS_CHILD | BS_NOTIFY);

1 0

Nikolay Sivov : user32/tests: Remove menu tests workarounds.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 508e7a88f5f70b16463540ae4c515e83d688535c URL: https://source.winehq.org/git/wine.git/?a=commit;h=508e7a88f5f70b16463540ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 9 08:56:28 2018 +0300 user32/tests: Remove menu tests workarounds. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 273 +++++++++++++++-------------------------------- 1 file changed, 89 insertions(+), 184 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=508e7a88f5f70b164635…

1 0