February 2016 - Wine-Commits

Sebastian Lackner : vmm.vxd: Fix protection flags passed to VirtualAlloc.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 7fb74ed9450d75bdb504ba81e1bc28e68ad36421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb74ed9450d75bdb504ba81e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 12 07:10:41 2016 +0100 vmm.vxd: Fix protection flags passed to VirtualAlloc. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vmm.vxd/vmm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c index 7327f78..833a8d1 100644 --- a/dlls/vmm.vxd/vmm.c +++ b/dlls/vmm.vxd/vmm.c @@ -159,7 +159,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) if ( page == PR_PRIVATE || page == PR_SHARED ) page = 0; /* FIXME: Handle flags in some way */ address = (LPVOID )(page * page_size); - ret = VirtualAlloc ( address, npages * page_size, MEM_RESERVE, 0 ); + ret = VirtualAlloc ( address, npages * page_size, MEM_RESERVE, PAGE_EXECUTE_READWRITE ); TRACE("PageReserve: returning: %p\n", ret ); if ( ret == NULL ) return -1;

1 0

Nikolay Sivov : dwrite: Support font replacement registry settings.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 5a262d45dcb1b6675e2309e9c0086e0bf2acd20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a262d45dcb1b6675e2309e9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 12 01:51:58 2016 +0300 dwrite: Support font replacement registry settings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index fd64d8b..9bd5404 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2986,6 +2986,88 @@ static void fontfamily_add_oblique_simulated_face(struct dwrite_fontfamily_data } } +static BOOL fontcollection_add_replacement(struct dwrite_fontcollection *collection, const WCHAR *target_name, + const WCHAR *replacement_name) +{ + UINT32 i = collection_find_family(collection, replacement_name); + struct dwrite_fontfamily_data *target; + IDWriteLocalizedStrings *strings; + HRESULT hr; + + /* replacement does not exist */ + if (i == ~0u) + return FALSE; + + hr = create_localizedstrings(&strings); + if (FAILED(hr)) + return FALSE; + + /* add a new family with target name, reuse font data from replacement */ + add_localizedstring(strings, enusW, target_name); + hr = init_fontfamily_data(strings, &target); + if (hr == S_OK) { + struct dwrite_fontfamily_data *replacement = collection->family_data[i]; + WCHAR nameW[255]; + + for (i = 0; i < replacement->font_count; i++) + fontfamily_add_font(target, replacement->fonts[i]); + + fontcollection_add_family(collection, target); + fontstrings_get_en_string(replacement->familyname, nameW, sizeof(nameW)/sizeof(WCHAR)); + TRACE("replacement %s -> %s\n", debugstr_w(target_name), debugstr_w(nameW)); + } + IDWriteLocalizedStrings_Release(strings); + return TRUE; +} + +/* Add family mappings from HKCU\Software\Wine\Fonts\Replacements. This only affects + system font collections. */ +static void fontcollection_add_replacements(struct dwrite_fontcollection *collection) +{ + DWORD max_namelen, max_datalen, i = 0, type, datalen, namelen; + WCHAR *name; + void *data; + HKEY hkey; + + if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts\\Replacements", &hkey)) + return; + + if (RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &max_namelen, &max_datalen, NULL, NULL)) { + RegCloseKey(hkey); + return; + } + + max_namelen++; /* returned value doesn't include room for '\0' */ + name = heap_alloc(max_namelen * sizeof(WCHAR)); + data = heap_alloc(max_datalen); + + datalen = max_datalen; + namelen = max_namelen; + while (RegEnumValueW(hkey, i++, name, &namelen, NULL, &type, data, &datalen) == ERROR_SUCCESS) { + if (collection_find_family(collection, name) == ~0u) { + if (type == REG_MULTI_SZ) { + WCHAR *replacement = data; + while (*replacement) { + if (fontcollection_add_replacement(collection, name, replacement)) + break; + replacement += strlenW(replacement) + 1; + } + } + else if (type == REG_SZ) + fontcollection_add_replacement(collection, name, data); + } + else + TRACE("%s is available, won't be replaced.\n", debugstr_w(name)); + + datalen = max_datalen; + namelen = max_namelen; + } + + heap_free(data); + heap_free(name); + RegCloseKey(hkey); +} + HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerator *enumerator, BOOL is_system, IDWriteFontCollection **ret) { struct fontfile_enum { @@ -3106,6 +3188,9 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat fontfamily_add_oblique_simulated_face(collection->family_data[i]); } + if (is_system) + fontcollection_add_replacements(collection); + return hr; }

1 0

Nikolay Sivov : gdi32: Only REG_SZ and REG_MULTI_SZ types make sense for font replacement, ignore the rest.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 932838faa3d608d2b74cd98b8427389169fbe26e URL: http://source.winehq.org/git/wine.git/?a=commit;h=932838faa3d608d2b74cd98b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 12 01:50:49 2016 +0300 gdi32: Only REG_SZ and REG_MULTI_SZ types make sense for font replacement, ignore the rest. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9fa520f..cf3df53 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2387,7 +2387,7 @@ static void LoadReplaceList(void) replace += strlenW(replace) + 1; } } - else + else if (type == REG_SZ) map_font_family(value, data); } else

1 0

Sebastian Lackner : winmm: Unset DebugInfo->Spare[0] before destroying critical sections.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 4dcb21933981a196830b3ce63cd0b4dfe3ff6211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcb21933981a196830b3ce63… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 12 06:31:55 2016 +0100 winmm: Unset DebugInfo->Spare[0] before destroying critical sections. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/waveform.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index a4917a2..2d8b838 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -206,12 +206,14 @@ void WINMM_DeleteWaveform(void) WINMM_Device *device = mmdevice->devices[j]; if(device->handle) CloseHandle(device->handle); + device->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&device->lock); } if(mmdevice->volume) ISimpleAudioVolume_Release(mmdevice->volume); CoTaskMemFree(mmdevice->dev_id); + mmdevice->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&mmdevice->lock); } @@ -222,12 +224,14 @@ void WINMM_DeleteWaveform(void) WINMM_Device *device = mmdevice->devices[j]; if(device->handle) CloseHandle(device->handle); + device->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&device->lock); } if(mmdevice->volume) ISimpleAudioVolume_Release(mmdevice->volume); CoTaskMemFree(mmdevice->dev_id); + mmdevice->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&mmdevice->lock); }

1 0

Sebastian Lackner : mciqtz32: Unset DebugInfo->Spare[0] before destroying critical sections.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 3179dd7bb1abee00f33ba2e4484838a7e86f40ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=3179dd7bb1abee00f33ba2e44… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 12 06:16:57 2016 +0100 mciqtz32: Unset DebugInfo->Spare[0] before destroying critical sections. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 24d48f3..aa257a0 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -162,6 +162,7 @@ static DWORD MCIQTZ_drvClose(DWORD dwDevID) CloseHandle(wma->task.notify); CloseHandle(wma->task.done); CloseHandle(wma->task.thread); + wma->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&wma->cs); mciSetDriverData(dwDevID, 0); CloseHandle(wma->stop_event);

1 0

Michael Müller : api-ms-win-core-winrt-registration-l1-1-0: Add dll.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 0fb6168fed427440acca9689d2159db79e3d9d48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb6168fed427440acca9689d… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 11 22:59:32 2016 +0100 api-ms-win-core-winrt-registration-l1-1-0: Add dll. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-winrt-registration-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-winrt-registration-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index 8cc3fb6..b001551 100755 --- a/configure +++ b/configure @@ -932,6 +932,7 @@ enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_1 enable_api_ms_win_core_winrt_l1_1_0 +enable_api_ms_win_core_winrt_registration_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_core_xstate_l2_1_0 enable_api_ms_win_crt_conio_l1_1_0 @@ -17362,6 +17363,7 @@ wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_ wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_winrt_error_l1_1_1 wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_l1_1_0 +wine_fn_config_dll api-ms-win-core-winrt-registration-l1-1-0 enable_api_ms_win_core_winrt_registration_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-core-xstate-l2-1-0 enable_api_ms_win_core_xstate_l2_1_0 wine_fn_config_dll api-ms-win-crt-conio-l1-1-0 enable_api_ms_win_crt_conio_l1_1_0 diff --git a/configure.ac b/configure.ac index 0a2dc68..cef9b96 100644 --- a/configure.ac +++ b/configure.ac @@ -2699,6 +2699,7 @@ WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-winrt-registration-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0) WINE_CONFIG_DLL(api-ms-win-crt-conio-l1-1-0) diff --git a/dlls/api-ms-win-core-winrt-registration-l1-1-0/Makefile.in b/dlls/api-ms-win-core-winrt-registration-l1-1-0/Makefile.in new file mode 100644 index 0000000..3c0c04d --- /dev/null +++ b/dlls/api-ms-win-core-winrt-registration-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-winrt-registration-l1-1-0.dll diff --git a/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec new file mode 100644 index 0000000..350ac04 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stub RoGetActivatableClassRegistration +@ stub RoGetServerActivatableClasses diff --git a/tools/make_specfiles b/tools/make_specfiles index f0574b4..97780a1 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -266,6 +266,7 @@ my @dll_groups = [ "combase", "api-ms-win-core-winrt-l1-1-0", + "api-ms-win-core-winrt-registration-l1-1-0", "api-ms-win-core-winrt-string-l1-1-0", ], [

1 0

Michael Müller : api-ms-win-eventing-classicprovider-l1-1-0: Add dll.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 9de0cb93c3fea3ab2d7f1bd53f15b18eb4d01adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de0cb93c3fea3ab2d7f1bd53… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 11 22:55:00 2016 +0100 api-ms-win-eventing-classicprovider-l1-1-0: Add dll. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-eventing-classicprovider-l1-1-0/Makefile.in | 1 + .../api-ms-win-eventing-classicprovider-l1-1-0.spec | 8 ++++++++ tools/make_specfiles | 1 + 5 files changed, 13 insertions(+) diff --git a/configure b/configure index 067d476..8cc3fb6 100755 --- a/configure +++ b/configure @@ -958,6 +958,7 @@ enable_api_ms_win_downlevel_shlwapi_l1_1_0 enable_api_ms_win_downlevel_shlwapi_l2_1_0 enable_api_ms_win_downlevel_user32_l1_1_0 enable_api_ms_win_downlevel_version_l1_1_0 +enable_api_ms_win_eventing_classicprovider_l1_1_0 enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_security_base_l1_1_0 @@ -17387,6 +17388,7 @@ wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlev wine_fn_config_dll api-ms-win-downlevel-shlwapi-l2-1-0 enable_api_ms_win_downlevel_shlwapi_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 +wine_fn_config_dll api-ms-win-eventing-classicprovider-l1-1-0 enable_api_ms_win_eventing_classicprovider_l1_1_0 wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventing_provider_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 diff --git a/configure.ac b/configure.ac index 675916b..0a2dc68 100644 --- a/configure.ac +++ b/configure.ac @@ -2725,6 +2725,7 @@ WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-eventing-classicprovider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) diff --git a/dlls/api-ms-win-eventing-classicprovider-l1-1-0/Makefile.in b/dlls/api-ms-win-eventing-classicprovider-l1-1-0/Makefile.in new file mode 100644 index 0000000..a0f628b --- /dev/null +++ b/dlls/api-ms-win-eventing-classicprovider-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-eventing-classicprovider-l1-1-0.dll diff --git a/dlls/api-ms-win-eventing-classicprovider-l1-1-0/api-ms-win-eventing-classicprovider-l1-1-0.spec b/dlls/api-ms-win-eventing-classicprovider-l1-1-0/api-ms-win-eventing-classicprovider-l1-1-0.spec new file mode 100644 index 0000000..9b19435 --- /dev/null +++ b/dlls/api-ms-win-eventing-classicprovider-l1-1-0/api-ms-win-eventing-classicprovider-l1-1-0.spec @@ -0,0 +1,8 @@ +@ stdcall GetTraceEnableFlags(int64) advapi32.GetTraceEnableFlags +@ stdcall GetTraceEnableLevel(int64) advapi32.GetTraceEnableLevel +@ stdcall -ret64 GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) advapi32.RegisterTraceGuidsW +@ stdcall TraceEvent(int64 ptr) advapi32.TraceEvent +@ varargs TraceMessage(int64 long ptr long) advapi32.TraceMessage +@ stdcall TraceMessageVa(int64 long ptr long ptr) advapi32.TraceMessageVa +@ stdcall UnregisterTraceGuids(int64) advapi32.UnregisterTraceGuids diff --git a/tools/make_specfiles b/tools/make_specfiles index 3f91bd1..f0574b4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -151,6 +151,7 @@ my @dll_groups = "api-ms-win-downlevel-advapi32-l2-1-0", "api-ms-win-security-base-l1-1-0", "api-ms-win-core-registry-l1-1-0", + "api-ms-win-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-security-base-l1-2-0", "api-ms-win-security-lsalookup-l1-1-0",

1 0

Michael Müller : api-ms-win-core-kernel32-legacy-l1-1-1: Add dll.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 756bc2afdd41c339d0e45d997cfcf09e8e172506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756bc2afdd41c339d0e45d997… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 11 22:54:28 2016 +0100 api-ms-win-core-kernel32-legacy-l1-1-1: Add dll. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-kernel32-legacy-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 15 +++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 20 insertions(+) diff --git a/configure b/configure index 2b9dda7..067d476 100755 --- a/configure +++ b/configure @@ -893,6 +893,7 @@ enable_api_ms_win_core_interlocked_l1_1_0 enable_api_ms_win_core_interlocked_l1_2_0 enable_api_ms_win_core_io_l1_1_1 enable_api_ms_win_core_kernel32_legacy_l1_1_0 +enable_api_ms_win_core_kernel32_legacy_l1_1_1 enable_api_ms_win_core_libraryloader_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_1 enable_api_ms_win_core_libraryloader_l1_2_0 @@ -17321,6 +17322,7 @@ wine_fn_config_dll api-ms-win-core-interlocked-l1-1-0 enable_api_ms_win_core_int wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_interlocked_l1_2_0 wine_fn_config_dll api-ms-win-core-io-l1-1-1 enable_api_ms_win_core_io_l1_1_1 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 +wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-1 enable_api_ms_win_core_kernel32_legacy_l1_1_1 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-0 enable_api_ms_win_core_libraryloader_l1_1_0 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-1 enable_api_ms_win_core_libraryloader_l1_1_1 wine_fn_config_dll api-ms-win-core-libraryloader-l1-2-0 enable_api_ms_win_core_libraryloader_l1_2_0 diff --git a/configure.ac b/configure.ac index 3684747..675916b 100644 --- a/configure.ac +++ b/configure.ac @@ -2660,6 +2660,7 @@ WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-2-0) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/Makefile.in b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/Makefile.in new file mode 100644 index 0000000..c4a5c44 --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-kernel32-legacy-l1-1-1.dll diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec new file mode 100644 index 0000000..579e254 --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec @@ -0,0 +1,15 @@ +@ stdcall FindFirstVolumeMountPointW(wstr ptr long) kernel32.FindFirstVolumeMountPointW +@ stub FindNextVolumeMountPointW +@ stdcall FindVolumeMountPointClose(ptr) kernel32.FindVolumeMountPointClose +@ stub GetFileAttributesTransactedW +@ stub GetFirmwareType +@ stub GetNumaAvailableMemoryNodeEx +@ stdcall GetNumaNodeProcessorMask(long ptr) kernel32.GetNumaNodeProcessorMask +@ stub GetNumaProcessorNodeEx +@ stdcall PowerClearRequest(long long) kernel32.PowerClearRequest +@ stdcall PowerCreateRequest(ptr) kernel32.PowerCreateRequest +@ stdcall PowerSetRequest(long long) kernel32.PowerSetRequest +@ stdcall SetDllDirectoryW(wstr) kernel32.SetDllDirectoryW +@ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor +@ stdcall SetVolumeMountPointW(wstr wstr) kernel32.SetVolumeMountPointW +@ stdcall VerifyVersionInfoW(long long int64) kernel32.VerifyVersionInfoW diff --git a/tools/make_specfiles b/tools/make_specfiles index aedd762..3f91bd1 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -187,6 +187,7 @@ my @dll_groups = "api-ms-win-core-heap-obsolete-l1-1-0", "api-ms-win-core-io-l1-1-1", "api-ms-win-core-kernel32-legacy-l1-1-0", + "api-ms-win-core-kernel32-legacy-l1-1-1", "api-ms-win-core-localization-l1-1-0", "api-ms-win-core-localization-l1-2-0", "api-ms-win-core-localization-obsolete-l1-1-0",

1 0

Akihiro Sagawa : imm32/tests: Use WM_CLOSE instead of DestroyWindow().
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 1fb30e1cabeb7cd626793f1b3e35b37ee93523a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb30e1cabeb7cd626793f1b3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Feb 11 23:03:29 2016 +0900 imm32/tests: Use WM_CLOSE instead of DestroyWindow(). DestroyWindow() call won't work across threads. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 72444e2..9ab55f3 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -639,7 +639,7 @@ static void test_ImmThreads(void) ImmReleaseContext(threadinfo.hwnd,otherHimc); ImmReleaseContext(hwnd,himc); - DestroyWindow(threadinfo.hwnd); + SendMessageA(threadinfo.hwnd, WM_CLOSE, 0, 0); TerminateThread(hThread, 1); himc = ImmGetContext(GetDesktopWindow());

1 0

Nikolay Sivov : advapi32/tests: Simplify tests using todo_wine_if().
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 2abec634aca9fb06d34a646e90ecd354b1190e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2abec634aca9fb06d34a646e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 21:24:30 2016 +0300 advapi32/tests: Simplify tests using todo_wine_if(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8dafb08..742ede1 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3159,12 +3159,7 @@ static void test_inherited_dacl(PACL dacl, PSID admin_sid, PSID user_sid, DWORD bret = pGetAclInformation(dacl, &acl_size, sizeof(acl_size), AclSizeInformation); ok_(__FILE__, line)(bret, "GetAclInformation failed\n"); - if (todo_count) - todo_wine - ok_(__FILE__, line)(acl_size.AceCount == 2, - "GetAclInformation returned unexpected entry count (%d != 2)\n", - acl_size.AceCount); - else + todo_wine_if (todo_count) ok_(__FILE__, line)(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2)\n", acl_size.AceCount); @@ -3175,18 +3170,10 @@ static void test_inherited_dacl(PACL dacl, PSID admin_sid, PSID user_sid, DWORD ok_(__FILE__, line)(bret, "Failed to get Current User ACE\n"); bret = EqualSid(&ace->SidStart, user_sid); - if (todo_sid) - todo_wine - ok_(__FILE__, line)(bret, "Current User ACE (%s) != Current User SID (%s)\n", debugstr_sid(&ace->SidStart), debugstr_sid(user_sid)); - else + todo_wine_if (todo_sid) ok_(__FILE__, line)(bret, "Current User ACE (%s) != Current User SID (%s)\n", debugstr_sid(&ace->SidStart), debugstr_sid(user_sid)); - if (todo_flags) - todo_wine - ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, - "Current User ACE has unexpected flags (0x%x != 0x%x)\n", - ((ACE_HEADER *)ace)->AceFlags, flags); - else + todo_wine_if (todo_flags) ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, "Current User ACE has unexpected flags (0x%x != 0x%x)\n", ((ACE_HEADER *)ace)->AceFlags, flags); @@ -3201,18 +3188,10 @@ static void test_inherited_dacl(PACL dacl, PSID admin_sid, PSID user_sid, DWORD ok_(__FILE__, line)(bret, "Failed to get Administators Group ACE\n"); bret = EqualSid(&ace->SidStart, admin_sid); - if (todo_sid) - todo_wine - ok_(__FILE__, line)(bret, "Administators Group ACE (%s) != Administators Group SID (%s)\n", debugstr_sid(&ace->SidStart), debugstr_sid(admin_sid)); - else + todo_wine_if (todo_sid) ok_(__FILE__, line)(bret, "Administators Group ACE (%s) != Administators Group SID (%s)\n", debugstr_sid(&ace->SidStart), debugstr_sid(admin_sid)); - if (todo_flags) - todo_wine - ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, - "Administators Group ACE has unexpected flags (0x%x != 0x%x)\n", - ((ACE_HEADER *)ace)->AceFlags, flags); - else + todo_wine_if (todo_flags) ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, "Administators Group ACE has unexpected flags (0x%x != 0x%x)\n", ((ACE_HEADER *)ace)->AceFlags, flags);

1 0