December 2014 - Wine-commits

Martin Storsjo : api-ms-win-core-localization-l1-2-1: Add stub dll.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 6ccff80f476b1cc41f7c7d481bcd6268c12bb742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ccff80f476b1cc41f7c7d481… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:12 2014 +0200 api-ms-win-core-localization-l1-2-1: Add stub dll. --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-localization-l1-2-1.spec | 60 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 65 insertions(+) diff --git a/configure b/configure index 8f7d91d..1fde6f8 100755 --- a/configure +++ b/configure @@ -869,6 +869,7 @@ enable_api_ms_win_core_io_l1_1_1 enable_api_ms_win_core_kernel32_legacy_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_1 enable_api_ms_win_core_localization_l1_2_0 +enable_api_ms_win_core_localization_l1_2_1 enable_api_ms_win_core_localization_obsolete_l1_1_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_memory_l1_1_1 @@ -16789,6 +16790,7 @@ 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-libraryloader-l1-1-1 enable_api_ms_win_core_libraryloader_l1_1_1 wine_fn_config_dll api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 +wine_fn_config_dll api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_localization_l1_2_1 wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-1-0 enable_api_ms_win_core_localization_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l1_1_1 diff --git a/configure.ac b/configure.ac index 0e4028f..b43dee1 100644 --- a/configure.ac +++ b/configure.ac @@ -2661,6 +2661,7 @@ 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-libraryloader-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-1) diff --git a/dlls/api-ms-win-core-localization-l1-2-1/Makefile.in b/dlls/api-ms-win-core-localization-l1-2-1/Makefile.in new file mode 100644 index 0000000..e5208a8 --- /dev/null +++ b/dlls/api-ms-win-core-localization-l1-2-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-localization-l1-2-1.dll diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec new file mode 100644 index 0000000..ccba739 --- /dev/null +++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec @@ -0,0 +1,60 @@ +@ stdcall ConvertDefaultLocale(long) kernel32.ConvertDefaultLocale +@ stdcall EnumSystemGeoID(long long ptr) kernel32.EnumSystemGeoID +@ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA +@ stdcall EnumSystemLocalesEx(ptr long long ptr) kernel32.EnumSystemLocalesEx +@ stdcall EnumSystemLocalesW(ptr long) kernel32.EnumSystemLocalesW +@ stub FindNLSString +@ stub FindNLSStringEx +@ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA +@ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW +@ stdcall GetACP() kernel32.GetACP +@ stdcall GetCPInfo(long ptr) kernel32.GetCPInfo +@ stdcall GetCPInfoExW(long long ptr) kernel32.GetCPInfoExW +@ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx +@ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW +@ stub GetFileMUIInfo +@ stub GetFileMUIPath +@ stdcall GetGeoInfoW(long long ptr long long) kernel32.GetGeoInfoW +@ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA +@ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx +@ stdcall GetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW +@ stub GetNLSVersion +@ stub GetNLSVersionEx +@ stdcall GetOEMCP() kernel32.GetOEMCP +@ stub GetProcessPreferredUILanguages +@ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID +@ stdcall GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID +@ stub GetSystemPreferredUILanguages +@ stdcall GetThreadLocale() kernel32.GetThreadLocale +@ stdcall GetThreadPreferredUILanguages(long ptr ptr ptr) kernel32.GetThreadPreferredUILanguages +@ stdcall GetThreadUILanguage() kernel32.GetThreadUILanguage +@ stub GetUILanguageInfo +@ stdcall GetUserDefaultLCID() kernel32.GetUserDefaultLCID +@ stdcall GetUserDefaultLangID() kernel32.GetUserDefaultLangID +@ stdcall GetUserDefaultLocaleName(ptr long) kernel32.GetUserDefaultLocaleName +@ stdcall GetUserGeoID(long) kernel32.GetUserGeoID +@ stub GetUserPreferredUILanguages +@ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii +@ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode +@ stdcall IsDBCSLeadByte(long) kernel32.IsDBCSLeadByte +@ stdcall IsDBCSLeadByteEx(long long) kernel32.IsDBCSLeadByteEx +@ stub IsNLSDefinedString +@ stdcall IsValidCodePage(long) kernel32.IsValidCodePage +@ stdcall IsValidLanguageGroup(long long) kernel32.IsValidLanguageGroup +@ stdcall IsValidLocale(long long) kernel32.IsValidLocale +@ stdcall IsValidLocaleName(wstr) kernel32.IsValidLocaleName +@ stub IsValidNLSVersion +@ stdcall LCMapStringA(long long str long ptr long) kernel32.LCMapStringA +@ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx +@ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW +@ stdcall LocaleNameToLCID(wstr long) kernel32.LocaleNameToLCID +@ stub ResolveLocaleName +@ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW +@ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW +@ stub SetProcessPreferredUILanguages +@ stdcall SetThreadLocale(long) kernel32.SetThreadLocale +@ stdcall SetThreadPreferredUILanguages(long ptr ptr) kernel32.SetThreadPreferredUILanguages +@ stdcall SetThreadUILanguage(long) kernel32.SetThreadUILanguage +@ stdcall SetUserGeoID(long) kernel32.SetUserGeoID +@ stdcall VerLanguageNameA(long str long) kernel32.VerLanguageNameA +@ stdcall VerLanguageNameW(long wstr long) kernel32.VerLanguageNameW diff --git a/tools/make_specfiles b/tools/make_specfiles index d5a7ae2..c0ba789 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -161,6 +161,7 @@ my @dll_groups = "api-ms-win-core-processthreads-l1-1-2", "api-ms-win-core-fibers-l1-1-1", "api-ms-win-core-file-l2-1-0", + "api-ms-win-core-localization-l1-2-1", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-datetime-l1-1-1: Add stub dll.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 3488f88fe686e1cd2e0dfd4ae3ca009258a65ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3488f88fe686e1cd2e0dfd4ae… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:13 2014 +0200 api-ms-win-core-datetime-l1-1-1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-datetime-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-datetime-l1-1-1.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) diff --git a/configure b/configure index 1fde6f8..df48de3 100755 --- a/configure +++ b/configure @@ -855,6 +855,7 @@ enable_advpack enable_amstream enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_console_l1_1_0 +enable_api_ms_win_core_datetime_l1_1_1 enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 enable_api_ms_win_core_fibers_l1_1_1 @@ -16776,6 +16777,7 @@ wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 +wine_fn_config_dll api-ms-win-core-datetime-l1-1-1 enable_api_ms_win_core_datetime_l1_1_1 wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 wine_fn_config_dll api-ms-win-core-fibers-l1-1-1 enable_api_ms_win_core_fibers_l1_1_1 diff --git a/configure.ac b/configure.ac index b43dee1..eea1baf 100644 --- a/configure.ac +++ b/configure.ac @@ -2647,6 +2647,7 @@ WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1) diff --git a/dlls/api-ms-win-core-datetime-l1-1-1/Makefile.in b/dlls/api-ms-win-core-datetime-l1-1-1/Makefile.in new file mode 100644 index 0000000..2bf9501 --- /dev/null +++ b/dlls/api-ms-win-core-datetime-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-datetime-l1-1-1.dll diff --git a/dlls/api-ms-win-core-datetime-l1-1-1/api-ms-win-core-datetime-l1-1-1.spec b/dlls/api-ms-win-core-datetime-l1-1-1/api-ms-win-core-datetime-l1-1-1.spec new file mode 100644 index 0000000..5630929 --- /dev/null +++ b/dlls/api-ms-win-core-datetime-l1-1-1/api-ms-win-core-datetime-l1-1-1.spec @@ -0,0 +1,6 @@ +@ stdcall GetDateFormatA(long long ptr str ptr long) kernel32.GetDateFormatA +@ stub GetDateFormatEx +@ stdcall GetDateFormatW(long long ptr wstr ptr long) kernel32.GetDateFormatW +@ stdcall GetTimeFormatA(long long ptr str ptr long) kernel32.GetTimeFormatA +@ stub GetTimeFormatEx +@ stdcall GetTimeFormatW(long long ptr wstr ptr long) kernel32.GetTimeFormatW diff --git a/tools/make_specfiles b/tools/make_specfiles index c0ba789..641f18e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -162,6 +162,7 @@ my @dll_groups = "api-ms-win-core-fibers-l1-1-1", "api-ms-win-core-file-l2-1-0", "api-ms-win-core-localization-l1-2-1", + "api-ms-win-core-datetime-l1-1-1", ], [ "ole32",

1 0

André Hentschel : fusion: Add implementation for CreateAssemblyCacheItem.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: bf70fe3611c2b655c28d6afc7ff0afd8ccb49e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf70fe3611c2b655c28d6afc7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 30 13:15:45 2014 +0100 fusion: Add implementation for CreateAssemblyCacheItem. --- dlls/fusion/asmcache.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 9125655..dd84d38 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -41,6 +41,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(fusion); +typedef struct { + IAssemblyCache IAssemblyCache_iface; + + LONG ref; + HANDLE lock; +} IAssemblyCacheImpl; + +typedef struct { + IAssemblyCacheItem IAssemblyCacheItem_iface; + + LONG ref; +} IAssemblyCacheItemImpl; + static const WCHAR cache_mutex_nameW[] = {'_','_','W','I','N','E','_','F','U','S','I','O','N','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0}; @@ -141,13 +154,6 @@ static BOOL get_assembly_directory(LPWSTR dir, DWORD size, const char *version, /* IAssemblyCache */ -typedef struct { - IAssemblyCache IAssemblyCache_iface; - - LONG ref; - HANDLE lock; -} IAssemblyCacheImpl; - static inline IAssemblyCacheImpl *impl_from_IAssemblyCache(IAssemblyCache *iface) { return CONTAINING_RECORD(iface, IAssemblyCacheImpl, IAssemblyCache_iface); @@ -351,16 +357,33 @@ done: return hr; } +static const IAssemblyCacheItemVtbl AssemblyCacheItemVtbl; + static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyCacheItem(IAssemblyCache *iface, DWORD dwFlags, PVOID pvReserved, IAssemblyCacheItem **ppAsmItem, LPCWSTR pszAssemblyName) { - FIXME("(%p, %d, %p, %p, %s) stub!\n", iface, dwFlags, pvReserved, + IAssemblyCacheItemImpl *item; + + FIXME("(%p, %d, %p, %p, %s) semi-stub!\n", iface, dwFlags, pvReserved, ppAsmItem, debugstr_w(pszAssemblyName)); - return E_NOTIMPL; + if (!ppAsmItem) + return E_INVALIDARG; + + *ppAsmItem = NULL; + + item = HeapAlloc(GetProcessHeap(), 0, sizeof(IAssemblyCacheItemImpl)); + if (!item) + return E_OUTOFMEMORY; + + item->IAssemblyCacheItem_iface.lpVtbl = &AssemblyCacheItemVtbl; + item->ref = 1; + + *ppAsmItem = &item->IAssemblyCacheItem_iface; + return S_OK; } static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyScavenger(IAssemblyCache *iface, @@ -560,12 +583,6 @@ HRESULT WINAPI CreateAssemblyCache(IAssemblyCache **ppAsmCache, DWORD dwReserved /* IAssemblyCacheItem */ -typedef struct { - IAssemblyCacheItem IAssemblyCacheItem_iface; - - LONG ref; -} IAssemblyCacheItemImpl; - static inline IAssemblyCacheItemImpl *impl_from_IAssemblyCacheItem(IAssemblyCacheItem *iface) { return CONTAINING_RECORD(iface, IAssemblyCacheItemImpl, IAssemblyCacheItem_iface);

1 0

Marc Bessières : riched20/tests: Use SendMessageA with char buffer (Valgrind).
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 85ca920d94c1c3be0c051d4b2a7597b6fdc069eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=85ca920d94c1c3be0c051d4b2… Author: Marc Bessières <marc.bessieres(a)mykolab.com> Date: Mon Nov 24 21:19:49 2014 +0100 riched20/tests: Use SendMessageA with char buffer (Valgrind). --- dlls/riched20/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 244f065..101aec0 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7379,7 +7379,7 @@ static void test_EM_FINDWORDBREAK_A(void) char buf[2]; buf[0] = delimiter_tests[i].c; buf[1] = 0; - SendMessageW(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)buf); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)buf); result = SendMessageA(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER, 0); if (buf[0] == 0x20) todo_wine

1 0

Vincent Povirk : cabinet/tests: Add test for calling FDIIsCabinet with hf == 0.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 685c68ba61cb01f1ab4d68bd5f75fb9bed74bd3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=685c68ba61cb01f1ab4d68bd5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Dec 2 16:27:46 2014 -0600 cabinet/tests: Add test for calling FDIIsCabinet with hf == 0. --- dlls/cabinet/tests/fdi.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 4ed967a..fe9a2e3 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -187,6 +187,39 @@ static LONG CDECL fdi_seek(INT_PTR hf, LONG dist, int seektype) return SetFilePointer(handle, dist, NULL, seektype); } +/* Callbacks for testing FDIIsCabinet with hf == 0 */ +static INT_PTR static_fdi_handle; + +static INT_PTR CDECL fdi_open_static(char *pszFile, int oflag, int pmode) +{ + ok(0, "FDIIsCabinet shouldn't call pfnopen\n"); + return 1; +} + +static UINT CDECL fdi_read_static(INT_PTR hf, void *pv, UINT cb) +{ + ok(hf == 0, "unexpected hf %lx\n", hf); + return fdi_read(static_fdi_handle, pv, cb); +} + +static UINT CDECL fdi_write_static(INT_PTR hf, void *pv, UINT cb) +{ + ok(0, "FDIIsCabinet shouldn't call pfnwrite\n"); + return 0; +} + +static int CDECL fdi_close_static(INT_PTR hf) +{ + ok(0, "FDIIsCabinet shouldn't call pfnclose\n"); + return 0; +} + +static LONG CDECL fdi_seek_static(INT_PTR hf, LONG dist, int seektype) +{ + ok(hf == 0, "unexpected hf %lx\n", hf); + return fdi_seek(static_fdi_handle, dist, seektype); +} + static void test_FDICreate(void) { HFDI hfdi; @@ -683,6 +716,30 @@ static void test_FDIIsCabinet(void) fdi_close(fd); FDIDestroy(hfdi); + + hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open_static, fdi_read_static, + fdi_write_static, fdi_close_static, fdi_seek_static, + cpuUNKNOWN, &erf); + ok(hfdi != NULL, "Expected non-NULL context\n"); + + /* FDIIsCabinet accepts hf == 0 even though it's not a valid result of pfnopen */ + static_fdi_handle = fdi_open(extract, 0, 0); + ZeroMemory(&cabinfo, sizeof(FDICABINETINFO)); + SetLastError(0xdeadbeef); + ret = FDIIsCabinet(hfdi, 0, &cabinfo); +todo_wine { + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(cabinfo.cFiles == 4, "Expected 4, got %d\n", cabinfo.cFiles); + ok(cabinfo.cFolders == 1, "Expected 1, got %d\n", cabinfo.cFolders); + ok(cabinfo.setID == 0xbeef, "Expected 0xbeef, got %d\n", cabinfo.setID); + ok(cabinfo.cbCabinet == 182, "Expected 182, got %d\n", cabinfo.cbCabinet); +} + ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); + + fdi_close(static_fdi_handle); + FDIDestroy(hfdi); + delete_test_files(); }

1 0

Vincent Povirk : cabinet: Accept hf == 0 in FDIIsCabinet.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: c97da4c944743b1f6871cb2e8db0651b8cbabb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c97da4c944743b1f6871cb2e8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Dec 2 16:28:59 2014 -0600 cabinet: Accept hf == 0 in FDIIsCabinet. --- dlls/cabinet/fdi.c | 5 ----- dlls/cabinet/tests/fdi.c | 2 -- 2 files changed, 7 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index ae0576b..aedd972 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -702,11 +702,6 @@ BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici) if (!fdi) return FALSE; - if (!hf) { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!pfdici) { SetLastError(ERROR_BAD_ARGUMENTS); return FALSE; diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index fe9a2e3..b5bec38 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -727,14 +727,12 @@ static void test_FDIIsCabinet(void) ZeroMemory(&cabinfo, sizeof(FDICABINETINFO)); SetLastError(0xdeadbeef); ret = FDIIsCabinet(hfdi, 0, &cabinfo); -todo_wine { ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(cabinfo.cFiles == 4, "Expected 4, got %d\n", cabinfo.cFiles); ok(cabinfo.cFolders == 1, "Expected 1, got %d\n", cabinfo.cFolders); ok(cabinfo.setID == 0xbeef, "Expected 0xbeef, got %d\n", cabinfo.setID); ok(cabinfo.cbCabinet == 182, "Expected 182, got %d\n", cabinfo.cbCabinet); -} ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); fdi_close(static_fdi_handle);

1 0

Henri Verbeet : wined3d: Validate register indices for WINED3DSIH_DCL instructions.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: 5ccda82acce206b72e681d0d7c5505e711df2465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccda82acce206b72e681d0d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 10:28:08 2014 +0100 wined3d: Validate register indices for WINED3DSIH_DCL instructions. --- dlls/wined3d/shader.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 796a924..95ce397 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -634,26 +634,42 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st if (ins.handler_idx == WINED3DSIH_DCL) { struct wined3d_shader_semantic *semantic = &ins.declaration.semantic; + unsigned int reg_idx = semantic->reg.reg.idx[0].offset; switch (semantic->reg.reg.type) { /* Mark input registers used. */ case WINED3DSPR_INPUT: - reg_maps->input_registers |= 1 << semantic->reg.reg.idx[0].offset; - shader_signature_from_semantic(&input_signature[semantic->reg.reg.idx[0].offset], semantic); + if (reg_idx >= MAX_REG_INPUT) + { + ERR("Invalid input register index %u.\n", reg_idx); + break; + } + reg_maps->input_registers |= 1 << reg_idx; + shader_signature_from_semantic(&input_signature[reg_idx], semantic); break; /* Vertex shader: mark 3.0 output registers used, save token. */ case WINED3DSPR_OUTPUT: - reg_maps->output_registers |= 1 << semantic->reg.reg.idx[0].offset; - shader_signature_from_semantic(&output_signature[semantic->reg.reg.idx[0].offset], semantic); + if (reg_idx >= MAX_REG_OUTPUT) + { + ERR("Invalid output register index %u.\n", reg_idx); + break; + } + reg_maps->output_registers |= 1 << reg_idx; + shader_signature_from_semantic(&output_signature[reg_idx], semantic); if (semantic->usage == WINED3D_DECL_USAGE_FOG) reg_maps->fog = 1; break; /* Save sampler usage token. */ case WINED3DSPR_SAMPLER: - reg_maps->sampler_type[semantic->reg.reg.idx[0].offset] = semantic->sampler_type; + if (reg_idx >= ARRAY_SIZE(reg_maps->sampler_type)) + { + ERR("Invalid sampler index %u.\n", reg_idx); + break; + } + reg_maps->sampler_type[reg_idx] = semantic->sampler_type; break; default:

1 0

Henri Verbeet : wined3d: Store resource types instead of sampler types in struct wined3d_shader_reg_maps.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: f5cef4373828a998507d4a02b0cc83d42a49606f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5cef4373828a998507d4a02b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 10:28:09 2014 +0100 wined3d: Store resource types instead of sampler types in struct wined3d_shader_reg_maps. The difference doesn't really matter for SM1-3 since resources and samplers are always tied together, but in SM4 they're separate. --- dlls/wined3d/arb_program_shader.c | 17 ++-- dlls/wined3d/context.c | 42 ++++----- dlls/wined3d/glsl_shader.c | 188 +++++++++++++++++++------------------- dlls/wined3d/shader.c | 64 +++++++------ dlls/wined3d/shader_sm1.c | 34 ++++++- dlls/wined3d/wined3d_private.h | 18 ++-- 6 files changed, 203 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5cef4373828a998507d4…

1 0

Henri Verbeet : wined3d: Handle SM4 resource declarations.
by Alexandre Julliard 03 Dec '14

03 Dec '14

Module: wine Branch: master Commit: f7e485dcf4971973a99ddb2be00d17e1e89e09c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e485dcf4971973a99ddb2be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 10:28:10 2014 +0100 wined3d: Handle SM4 resource declarations. --- dlls/wined3d/shader.c | 47 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 51 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 39ac45e..b0aabd9 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -663,6 +663,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st break; case WINED3DSPR_SAMPLER: + case WINED3DSPR_RESOURCE: if (reg_idx >= ARRAY_SIZE(reg_maps->resource_type)) { ERR("Invalid resource index %u.\n", reg_idx); @@ -1017,6 +1018,52 @@ static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semanti break; } } + else if (semantic->reg.reg.type == WINED3DSPR_RESOURCE) + { + TRACE("_resource_"); + switch (semantic->resource_type) + { + case WINED3D_SHADER_RESOURCE_BUFFER: + TRACE("buffer"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_1D: + TRACE("texture1d"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_2D: + TRACE("texture2d"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_2DMS: + TRACE("texture2dms"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_3D: + TRACE("texture3d"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE: + TRACE("texturecube"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY: + TRACE("texture1darray"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: + TRACE("texture2darray"); + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY: + TRACE("texture2dmsarray"); + break; + + default: + TRACE("unknown"); + break; + } + } else { /* Pixel shaders 3.0 don't have usage semantics. */ diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ac0fab5..b3bf156 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -29,6 +29,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0x1f << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) +#define WINED3D_SM4_RESOURCE_TYPE_SHIFT 11 +#define WINED3D_SM4_RESOURCE_TYPE_MASK (0xf << WINED3D_SM4_RESOURCE_TYPE_SHIFT) + #define WINED3D_SM4_PRIMITIVE_TYPE_SHIFT 11 #define WINED3D_SM4_PRIMITIVE_TYPE_MASK (0x7 << WINED3D_SM4_PRIMITIVE_TYPE_SHIFT) @@ -121,6 +124,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, + WINED3D_SM4_OP_DCL_RESOURCE = 0x58, WINED3D_SM4_OP_DCL_CONSTANT_BUFFER = 0x59, WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY = 0x5c, WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE = 0x5d, @@ -134,6 +138,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_OUTPUT = 0x2, WINED3D_SM4_RT_IMMCONST = 0x4, WINED3D_SM4_RT_SAMPLER = 0x6, + WINED3D_SM4_RT_RESOURCE = 0x7, WINED3D_SM4_RT_CONSTBUFFER = 0x8, WINED3D_SM4_RT_PRIMID = 0xb, WINED3D_SM4_RT_NULL = 0xd, @@ -167,6 +172,19 @@ enum wined3d_sm4_immconst_type WINED3D_SM4_IMMCONST_VEC4 = 0x2, }; +enum wined3d_sm4_resource_type +{ + WINED3D_SM4_RESOURCE_BUFFER = 0x1, + WINED3D_SM4_RESOURCE_TEXTURE_1D = 0x2, + WINED3D_SM4_RESOURCE_TEXTURE_2D = 0x3, + WINED3D_SM4_RESOURCE_TEXTURE_2DMS = 0x4, + WINED3D_SM4_RESOURCE_TEXTURE_3D = 0x5, + WINED3D_SM4_RESOURCE_TEXTURE_CUBE = 0x6, + WINED3D_SM4_RESOURCE_TEXTURE_1DARRAY = 0x7, + WINED3D_SM4_RESOURCE_TEXTURE_2DARRAY = 0x8, + WINED3D_SM4_RESOURCE_TEXTURE_2DMSARRAY = 0x9, +}; + struct wined3d_shader_src_param_entry { struct list entry; @@ -264,6 +282,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "U", "UU"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "F", "U"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "U", "UU"}, + {WINED3D_SM4_OP_DCL_RESOURCE, WINED3DSIH_DCL, "R", ""}, {WINED3D_SM4_OP_DCL_CONSTANT_BUFFER, WINED3DSIH_DCL_CONSTANT_BUFFER, "", ""}, {WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, "", ""}, {WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_INPUT_PRIMITIVE, "", ""}, @@ -323,6 +342,20 @@ static const struct sysval_map sysval_map[] = {WINED3D_SV_TARGET7, WINED3DSPR_COLOROUT, 7}, }; +static const enum wined3d_shader_resource_type resource_type_table[] = +{ + /* 0 */ WINED3D_SHADER_RESOURCE_NONE, + /* WINED3D_SM4_RESOURCE_BUFFER */ WINED3D_SHADER_RESOURCE_BUFFER, + /* WINED3D_SM4_RESOURCE_TEXTURE_1D */ WINED3D_SHADER_RESOURCE_TEXTURE_1D, + /* WINED3D_SM4_RESOURCE_TEXTURE_2D */ WINED3D_SHADER_RESOURCE_TEXTURE_2D, + /* WINED3D_SM4_RESOURCE_TEXTURE_2DMS */ WINED3D_SHADER_RESOURCE_TEXTURE_2DMS, + /* WINED3D_SM4_RESOURCE_TEXTURE_3D */ WINED3D_SHADER_RESOURCE_TEXTURE_3D, + /* WINED3D_SM4_RESOURCE_TEXTURE_CUBE */ WINED3D_SHADER_RESOURCE_TEXTURE_CUBE, + /* WINED3D_SM4_RESOURCE_TEXTURE_1DARRAY */ WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY, + /* WINED3D_SM4_RESOURCE_TEXTURE_2DARRAY */ WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY, + /* WINED3D_SM4_RESOURCE_TEXTURE_2DMSARRAY */ WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY, +}; + static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD **ptr, enum wined3d_data_type data_type, struct wined3d_shader_src_param *src_param); @@ -743,7 +776,23 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi FIXME("Skipping modifier 0x%08x.\n", modifier); } - if (opcode == WINED3D_SM4_OP_DCL_CONSTANT_BUFFER) + if (opcode == WINED3D_SM4_OP_DCL_RESOURCE) + { + enum wined3d_sm4_resource_type resource_type; + + resource_type = (opcode_token & WINED3D_SM4_RESOURCE_TYPE_MASK) >> WINED3D_SM4_RESOURCE_TYPE_SHIFT; + if (!resource_type || (resource_type >= ARRAY_SIZE(resource_type_table))) + { + FIXME("Unhandled resource type %#x.\n", resource_type); + ins->declaration.semantic.resource_type = WINED3D_SHADER_RESOURCE_NONE; + } + else + { + ins->declaration.semantic.resource_type = resource_type_table[resource_type]; + } + shader_sm4_read_dst_param(priv, &p, WINED3D_DATA_RESOURCE, &ins->declaration.semantic.reg); + } + else if (opcode == WINED3D_SM4_OP_DCL_CONSTANT_BUFFER) { shader_sm4_read_src_param(priv, &p, WINED3D_DATA_FLOAT, &ins->declaration.src); if (opcode_token & WINED3D_SM4_INDEX_TYPE_MASK) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2020d78..a1e5dea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -286,10 +286,15 @@ extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN; enum wined3d_shader_resource_type { WINED3D_SHADER_RESOURCE_NONE, + WINED3D_SHADER_RESOURCE_BUFFER, WINED3D_SHADER_RESOURCE_TEXTURE_1D, WINED3D_SHADER_RESOURCE_TEXTURE_2D, + WINED3D_SHADER_RESOURCE_TEXTURE_2DMS, WINED3D_SHADER_RESOURCE_TEXTURE_3D, WINED3D_SHADER_RESOURCE_TEXTURE_CUBE, + WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY, + WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY, + WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY, }; #define WINED3D_SHADER_CONST_VS_F 0x00000001

1 0

Martin Storsjo : api-ms-win-core-processthreads-l1-1-2: Add stub dll.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 73b53905cd0c637f839c42fc962abe9f4d8b5b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73b53905cd0c637f839c42fc9… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:05 2014 +0200 api-ms-win-core-processthreads-l1-1-2: Add stub dll. --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-processthreads-l1-1-2.spec | 70 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 75 insertions(+) diff --git a/configure b/configure index e8b75a8..3ddeb77 100755 --- a/configure +++ b/configure @@ -874,6 +874,7 @@ enable_api_ms_win_core_namedpipe_l1_2_0 enable_api_ms_win_core_processenvironment_l1_2_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 +enable_api_ms_win_core_processthreads_l1_1_2 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 @@ -16790,6 +16791,7 @@ wine_fn_config_dll api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_named wine_fn_config_dll api-ms-win-core-processenvironment-l1-2-0 enable_api_ms_win_core_processenvironment_l1_2_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 +wine_fn_config_dll api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_processthreads_l1_1_2 wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-psapi-l1-1-0 enable_api_ms_win_core_psapi_l1_1_0 wine_fn_config_dll api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 diff --git a/configure.ac b/configure.ac index 15d4dee..61bc2ad 100644 --- a/configure.ac +++ b/configure.ac @@ -2666,6 +2666,7 @@ WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/Makefile.in b/dlls/api-ms-win-core-processthreads-l1-1-2/Makefile.in new file mode 100644 index 0000000..709073d --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-processthreads-l1-1-2.dll diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec new file mode 100644 index 0000000..6894ce8 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -0,0 +1,70 @@ +@ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA +@ stub CreateProcessAsUserW +@ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW +@ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread +@ stub CreateRemoteThreadEx +@ stdcall CreateThread(ptr long ptr long long ptr) kernel32.CreateThread +@ stub DeleteProcThreadAttributeList +@ stdcall ExitProcess(long) kernel32.ExitProcess +@ stdcall ExitThread(long) kernel32.ExitThread +@ stdcall FlushInstructionCache(long long long) kernel32.FlushInstructionCache +@ stdcall FlushProcessWriteBuffers() kernel32.FlushProcessWriteBuffers +@ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess +@ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId +@ stdcall GetCurrentProcessorNumber() kernel32.GetCurrentProcessorNumber +@ stub GetCurrentProcessorNumberEx +@ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread +@ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId +@ stub GetCurrentThreadStackLimits +@ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess +@ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread +@ stdcall GetPriorityClass(long) kernel32.GetPriorityClass +@ stdcall GetProcessHandleCount(long ptr) kernel32.GetProcessHandleCount +@ stdcall GetProcessId(long) kernel32.GetProcessId +@ stub GetProcessIdOfThread +@ stub GetProcessMitigationPolicy +@ stdcall GetProcessPriorityBoost(long ptr) kernel32.GetProcessPriorityBoost +@ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes +@ stdcall GetProcessVersion(long) kernel32.GetProcessVersion +@ stdcall GetStartupInfoW(ptr) kernel32.GetStartupInfoW +@ stdcall GetSystemTimes(ptr ptr ptr) kernel32.GetSystemTimes +@ stdcall GetThreadContext(long ptr) kernel32.GetThreadContext +@ stdcall GetThreadIOPendingFlag(long ptr) kernel32.GetThreadIOPendingFlag +@ stdcall GetThreadId(ptr) kernel32.GetThreadId +@ stub GetThreadIdealProcessorEx +@ stub GetThreadInformation +@ stdcall GetThreadPriority(long) kernel32.GetThreadPriority +@ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost +@ stdcall GetThreadTimes(long ptr ptr ptr ptr) kernel32.GetThreadTimes +@ stub InitializeProcThreadAttributeList +@ stub IsProcessCritical +@ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent +@ stdcall OpenProcess(long long long) kernel32.OpenProcess +@ stub OpenProcessToken +@ stdcall OpenThread(long long long) kernel32.OpenThread +@ stub OpenThreadToken +@ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId +@ stub QueryProcessAffinityUpdateMode +@ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC +@ stdcall ResumeThread(long) kernel32.ResumeThread +@ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass +@ stub SetProcessAffinityUpdateMode +@ stub SetProcessMitigationPolicy +@ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost +@ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters +@ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext +@ stub SetThreadIdealProcessorEx +@ stub SetThreadInformation +@ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority +@ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost +@ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee +@ stub SetThreadToken +@ stdcall SuspendThread(long) kernel32.SuspendThread +@ stdcall SwitchToThread() kernel32.SwitchToThread +@ stdcall TerminateProcess(long long) kernel32.TerminateProcess +@ stdcall TerminateThread(long long) kernel32.TerminateThread +@ stdcall TlsAlloc() kernel32.TlsAlloc +@ stdcall TlsFree(long) kernel32.TlsFree +@ stdcall TlsGetValue(long) kernel32.TlsGetValue +@ stdcall TlsSetValue(long ptr) kernel32.TlsSetValue +@ stub UpdateProcThreadAttribute diff --git a/tools/make_specfiles b/tools/make_specfiles index 226f1ba..411f65e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -158,6 +158,7 @@ my @dll_groups = "api-ms-win-core-timezone-l1-1-0", "api-ms-win-core-file-l2-1-1", "api-ms-win-core-sysinfo-l1-2-1", + "api-ms-win-core-processthreads-l1-1-2", ], [ "ole32",

1 0