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

Louis Lenders : kernel32: Add stub for RequestDeviceWakeup.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 56137a59b0ee33cb865f7fad7399dccf0f17400f URL: https://source.winehq.org/git/wine.git/?a=commit;h=56137a59b0ee33cb865f7fad… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Apr 1 11:06:29 2018 +0200 kernel32: Add stub for RequestDeviceWakeup. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b1fa1e9a6da4abb161245b33f7350577d321a277) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/powermgnt.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2c719d4..67fcce6 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1271,12 +1271,12 @@ @ stdcall ReplaceFile(wstr wstr wstr long ptr ptr) ReplaceFileW @ stdcall ReplaceFileA(str str str long ptr ptr) @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) -@ stub RequestDeviceWakeup # @ stub RemoveDirectoryTransactedA # @ stub RemoveDirectoryTransactedW @ stdcall RemoveDllDirectory(ptr) # @ stub RemoveSecureMemoryCacheCallback # @ stub ReplacePartitionUnit +@ stdcall RequestDeviceWakeup(long) @ stdcall RequestWakeupLatency(long) @ stdcall ResetEvent(long) @ stdcall ResetWriteWatch(ptr long) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index b5bd0d9..81e43b4 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -73,6 +73,16 @@ BOOL WINAPI RequestWakeupLatency(LATENCY_TIME latency) } /*********************************************************************** + * RequestDeviceWakeup (KERNEL32.@) + */ +BOOL WINAPI RequestDeviceWakeup(HANDLE device) +{ + FIXME("(%p): stub\n", device); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * SetSystemPowerState (KERNEL32.@) */ BOOL WINAPI SetSystemPowerState(BOOL suspend_or_hibernate, diff --git a/include/winbase.h b/include/winbase.h index cc719c6..74d21c2 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2493,6 +2493,7 @@ WINBASEAPI BOOL WINAPI RemoveDirectoryW(LPCWSTR); #define RemoveDirectory WINELIB_NAME_AW(RemoveDirectory) WINADVAPI BOOL WINAPI ReportEventA(HANDLE,WORD,WORD,DWORD,PSID,WORD,DWORD,LPCSTR *,LPVOID); WINADVAPI BOOL WINAPI ReportEventW(HANDLE,WORD,WORD,DWORD,PSID,WORD,DWORD,LPCWSTR *,LPVOID); +WINBASEAPI BOOL WINAPI RequestDeviceWakeup(HANDLE); WINBASEAPI BOOL WINAPI RequestWakeupLatency(LATENCY_TIME latency); #define ReportEvent WINELIB_NAME_AW(ReportEvent) WINBASEAPI BOOL WINAPI ResetEvent(HANDLE);

1 0

Louis Lenders : kernel32/tests: Add simple test for SetThreadUILanguage.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 017390a70e9cd8b1087adcb4142f7e39c3fa0678 URL: https://source.winehq.org/git/wine.git/?a=commit;h=017390a70e9cd8b1087adcb4… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Mar 31 11:24:53 2018 +0200 kernel32/tests: Add simple test for SetThreadUILanguage. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 92fde7f35242206ce3e3d557cad00be237439132) Conflicts: dlls/kernel32/tests/locale.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/locale.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index ce2f13b..f3b433e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -103,6 +103,8 @@ static BOOL (WINAPI *pGetThreadPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULON static BOOL (WINAPI *pGetUserPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static WCHAR (WINAPI *pRtlUpcaseUnicodeChar)(WCHAR); static INT (WINAPI *pGetNumberFormatEx)(LPCWSTR, DWORD, LPCWSTR, const NUMBERFMTW *, LPWSTR, int); +static LANGID (WINAPI *pSetThreadUILanguage)(LANGID); +static LANGID (WINAPI *pGetThreadUILanguage)(VOID); static void InitFunctionPointers(void) { @@ -135,6 +137,8 @@ static void InitFunctionPointers(void) X(GetThreadPreferredUILanguages); X(GetUserPreferredUILanguages); X(GetNumberFormatEx); + X(SetThreadUILanguage); + X(GetThreadUILanguage); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -5329,6 +5333,28 @@ static void test_GetUserPreferredUILanguages(void) HeapFree(GetProcessHeap(), 0, buffer); } +static void test_SetThreadUILanguage(void) +{ + LANGID res; + + if (!pGetThreadUILanguage) + { + win_skip("GetThreadUILanguage isn't implemented, skipping SetThreadUILanguage tests for version < Vista\n"); + return; /* BTW SetThreadUILanguage is present on winxp/2003 but doesn`t set the LANGID anyway when tested */ + } + + res = pSetThreadUILanguage(0); + todo_wine ok(res == pGetThreadUILanguage(), "expected %d got %d\n", pGetThreadUILanguage(), res); + + res = pSetThreadUILanguage(MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN)); + ok(res == MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), + "expected %d got %d\n", MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), res); + + res = pSetThreadUILanguage(0); + todo_wine ok(res == MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), + "expected %d got %d\n", MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), res); +} + START_TEST(locale) { InitFunctionPointers(); @@ -5375,6 +5401,7 @@ START_TEST(locale) test_GetSystemPreferredUILanguages(); test_GetThreadPreferredUILanguages(); test_GetUserPreferredUILanguages(); + test_SetThreadUILanguage(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Louis Lenders : kernel32: Improve stub for SetThreadUILanguage.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 696ada6bd01d8d88c2679201a146d28a40b08560 URL: https://source.winehq.org/git/wine.git/?a=commit;h=696ada6bd01d8d88c2679201… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Mar 31 11:26:24 2018 +0200 kernel32: Improve stub for SetThreadUILanguage. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e0f9ff9eb003211ce4fa436b7398851f06e46293) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale.c | 6 +++++- dlls/kernel32/tests/locale.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 7f6c287..b10491a 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2821,7 +2821,11 @@ BOOL WINAPI SetThreadLocale( LCID lcid ) LANGID WINAPI SetThreadUILanguage( LANGID langid ) { TRACE("(0x%04x) stub - returning success\n", langid); - return langid; + + if (!langid) + return GetThreadUILanguage(); + else + return langid; } /****************************************************************************** diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f3b433e..1f0e8fb 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5344,7 +5344,7 @@ static void test_SetThreadUILanguage(void) } res = pSetThreadUILanguage(0); - todo_wine ok(res == pGetThreadUILanguage(), "expected %d got %d\n", pGetThreadUILanguage(), res); + ok(res == pGetThreadUILanguage(), "expected %d got %d\n", pGetThreadUILanguage(), res); res = pSetThreadUILanguage(MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN)); ok(res == MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN),

1 0

Mark White : kernel32: Fix forward slash path handling to GetVolumePathNameW.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 205291791e9f70e73238866114c1cb28c3388074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=205291791e9f70e732388661… Author: Mark White <chopinbig2(a)gmail.com> Date: Sat Mar 24 01:08:02 2018 -0400 kernel32: Fix forward slash path handling to GetVolumePathNameW. Signed-off-by: Mark White <chopinbig2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d37d9860a1b598c5a32e4f42e7c5b40224a60de2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/volume.c | 4 ++++ dlls/kernel32/volume.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 365e38c..c47043d 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -772,6 +772,10 @@ static void test_GetVolumePathNameA(void) "s:omefile", "S:\\" /* win2k, winxp */, sizeof(volume_path), ERROR_FILE_NOT_FOUND, NO_ERROR }, + { /* test 42: a reasonable forward slash path that is guaranteed to exist */ + "C:/windows/system32", "C:\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, }; BOOL ret, success; DWORD error; diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index b4163f0..3a4edf8 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1693,6 +1693,10 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu return FALSE; } strcpyW( volumenameW, filename ); + + /* Normalize path */ + for (c = volumenameW; *c; c++) if (*c == '/') *c = '\\'; + stop_pos = 0; /* stop searching slashes early for NT-type and nearly NT-type paths */ if (strncmpW(ntprefixW, filename, strlenW(ntprefixW)) == 0) @@ -1776,14 +1780,10 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu if (last_pos + 1 <= buflen) { - WCHAR *p; memcpy(volumepathname, filename, last_pos * sizeof(WCHAR)); if (last_pos + 2 <= buflen) volumepathname[last_pos++] = '\\'; volumepathname[last_pos] = '\0'; - /* Normalize path */ - for (p = volumepathname; *p; p++) if (*p == '/') *p = '\\'; - /* DOS-style paths always return upper-case drive letters */ if (volumepathname[1] == ':') volumepathname[0] = toupperW(volumepathname[0]);

1 0

Tim Wanders : setupapi: Return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 28e3b41ff5df5852815fcfbf0d26644d7d92a69f URL: https://source.winehq.org/git/wine.git/?a=commit;h=28e3b41ff5df5852815fcfbf… Author: Tim Wanders <timwanders241(a)gmail.com> Date: Sun Apr 1 21:48:49 2018 +0000 setupapi: Return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 074345edd6147a44b1311780c073f13d8114b726) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/stubs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 990974d..7c3413a 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -180,8 +180,9 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG pulLen, PCWSTR pszFilter, DWORD WINAPI CM_Get_Parent(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) { FIXME("%p 0x%08x 0x%08x stub\n", pdnDevInst, dnDevInst, ulFlags); - *pdnDevInst = dnDevInst; - return CR_SUCCESS; + if(pdnDevInst) + *pdnDevInst = 0; + return CR_NO_SUCH_DEVNODE; } /***********************************************************************

1 0

Stefan Leichter : include: Fix declaration of SelectDeviceDlg.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: a60b470754391c583febf39745d383f4b8f51eee URL: https://source.winehq.org/git/wine.git/?a=commit;h=a60b470754391c583febf397… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Thu Mar 29 23:08:21 2018 +0200 include: Fix declaration of SelectDeviceDlg. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 208fa59202227f09e5074b06f5ec8aae1fe6becb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wia_lh.idl | 2 +- include/wia_xp.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wia_lh.idl b/include/wia_lh.idl index 284528a..2e3ecf4 100644 --- a/include/wia_lh.idl +++ b/include/wia_lh.idl @@ -47,7 +47,7 @@ interface IWiaDevMgr : IUnknown [in] HWND hwndParent, [in] LONG lDeviceType, [in] LONG lFlags, - [in, out] BSTR *pbstrDeviceID, + [in, out, unique] BSTR *pbstrDeviceID, [retval, out] IWiaItem **ppItemRoot); HRESULT SelectDeviceDlgID( diff --git a/include/wia_xp.idl b/include/wia_xp.idl index 284528a..2e3ecf4 100644 --- a/include/wia_xp.idl +++ b/include/wia_xp.idl @@ -47,7 +47,7 @@ interface IWiaDevMgr : IUnknown [in] HWND hwndParent, [in] LONG lDeviceType, [in] LONG lFlags, - [in, out] BSTR *pbstrDeviceID, + [in, out, unique] BSTR *pbstrDeviceID, [retval, out] IWiaItem **ppItemRoot); HRESULT SelectDeviceDlgID(

1 0

Andrey Gusev : d3dx11: Add D3DX11CreateTextureFromFileA/W stub.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 22099befd1b43d041eb7c78de9d4095da3c48398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22099befd1b43d041eb7c78d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Mar 24 16:40:22 2018 +0200 d3dx11: Add D3DX11CreateTextureFromFileA/W stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8dedf244f615b68d9013cd1aa77c0edff0d517a8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 4 ++-- dlls/d3dx11_43/d3dx11_43.spec | 4 ++-- dlls/d3dx11_43/texture.c | 20 ++++++++++++++++++++ include/d3dx11tex.h | 8 ++++++++ 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index eaec2fc..e5a70fe 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -20,8 +20,8 @@ @ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW -@ stub D3DX11CreateTextureFromFileA -@ stub D3DX11CreateTextureFromFileW +@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileA +@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileW @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 1cafaa6..76a3916 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -20,8 +20,8 @@ @ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW -@ stub D3DX11CreateTextureFromFileA -@ stub D3DX11CreateTextureFromFileW +@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) +@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index fe291d9..6aaf8a7 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -35,6 +35,26 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co return E_NOTIMPL; } +HRESULT WINAPI D3DX11CreateTextureFromFileA(ID3D11Device *device, const char *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult) +{ + FIXME("device %p, filename %s, load_info %p, pump %p, texture %p, hresult %p stub.\n", + device, debugstr_a(filename), load_info, pump, texture, hresult); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult) +{ + FIXME("device %p, filename %s, load_info %p, pump %p, texture %p, hresult %p stub.\n", + device, debugstr_w(filename), load_info, pump, texture, hresult); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data, SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult) diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index 584a3bd..4f792ec 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -111,6 +111,14 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11ShaderResourceView **view, HRESULT *hresult); +HRESULT WINAPI D3DX11CreateTextureFromFileA(ID3D11Device *device, const char *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult); + +HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult); + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult);

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Implement _chkstk.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 3b216ff5ded073343b17eef5fc7b317c1b4934c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b216ff5ded073343b17eef5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 26 22:58:55 2018 +0000 ntoskrnl.exe: Implement _chkstk. These are just copied from ntdll. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 075cbd34747390720e4b28be6b105b1a026c2844) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 30 ++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 32 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 315402a..5bea991 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3316,3 +3316,33 @@ INT __cdecl NTOSKRNL_wcsncmp( LPCWSTR str1, LPCWSTR str2, INT n ) { return strncmpW( str1, str2, n ); } + + +#ifdef __x86_64__ +/************************************************************************** + * __chkstk (NTOSKRNL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "ret" ); + +#elif defined(__i386__) +/************************************************************************** + * _chkstk (NTOSKRNL.@) + */ +__ASM_STDCALL_FUNC( _chkstk, 0, + "negl %eax\n\t" + "addl %esp,%eax\n\t" + "xchgl %esp,%eax\n\t" + "movl 0(%eax),%eax\n\t" /* copy return address from old location */ + "movl %eax,0(%esp)\n\t" + "ret" ) +#elif defined(__arm__) +/************************************************************************** + * __chkstk (NTDLL.@) + * + * Incoming r4 contains words to allocate, converting to bytes then return + */ +__ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" + "bx lr" ) +#endif diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index e8b8dff..0e4af90 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1397,6 +1397,7 @@ @ stdcall -private ZwWaitForSingleObject(long long ptr) NtWaitForSingleObject @ stdcall -private ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwYieldExecution() NtYieldExecution +@ stdcall -private -arch=arm,x86_64 -norelay __chkstk() @ cdecl -private -arch=i386 _CIcos() msvcrt._CIcos @ cdecl -private -arch=i386 _CIsin() msvcrt._CIsin @ cdecl -private -arch=i386 _CIsqrt() msvcrt._CIsqrt @@ -1412,6 +1413,7 @@ @ stub _aulldvrm @ stdcall -private -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullshr(int64 long) +@ stdcall -private -arch=i386 -norelay _chkstk() @ cdecl -private -arch=i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2 @ cdecl -private -arch=i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3 @ cdecl -private -arch=i386 _global_unwind2(ptr) msvcrt._global_unwind2

1 0

Nikolay Sivov : wincodecs: Use static array for property bag descriptions.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: f38ea8538b7736e60f94bc2c2d690a1d1adf4e97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f38ea8538b7736e60f94bc2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 19:59:32 2018 +0300 wincodecs: Use static array for property bag descriptions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 93afd254bb80d1f4c3e7601b5c2be14a1901a769) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/jpegformat.c | 31 ++++++++++--------------------- dlls/windowscodecs/pngformat.c | 13 +++++-------- dlls/windowscodecs/propertybag.c | 4 ++-- dlls/windowscodecs/tiffformat.c | 20 +++++++------------- dlls/windowscodecs/wincodecs_private.h | 2 +- 5 files changed, 25 insertions(+), 45 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index aab4b92..d4bee24 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1446,7 +1446,15 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, { JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; - PROPBAG2 opts[6] = {{0}}; + static const PROPBAG2 opts[6] = + { + { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszImageQuality }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszBitmapTransform }, + { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, (LPOLESTR)wszLuminance }, + { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, (LPOLESTR)wszChrominance }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszJpegYCrCbSubsampling }, + { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszSuppressApp0 }, + }; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); @@ -1464,26 +1472,7 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - opts[0].pstrName = (LPOLESTR)wszImageQuality; - opts[0].vt = VT_R4; - opts[0].dwType = PROPBAG2_TYPE_DATA; - opts[1].pstrName = (LPOLESTR)wszBitmapTransform; - opts[1].vt = VT_UI1; - opts[1].dwType = PROPBAG2_TYPE_DATA; - opts[2].pstrName = (LPOLESTR)wszLuminance; - opts[2].vt = VT_I4|VT_ARRAY; - opts[2].dwType = PROPBAG2_TYPE_DATA; - opts[3].pstrName = (LPOLESTR)wszChrominance; - opts[3].vt = VT_I4|VT_ARRAY; - opts[3].dwType = PROPBAG2_TYPE_DATA; - opts[4].pstrName = (LPOLESTR)wszJpegYCrCbSubsampling; - opts[4].vt = VT_UI1; - opts[4].dwType = PROPBAG2_TYPE_DATA; - opts[5].pstrName = (LPOLESTR)wszSuppressApp0; - opts[5].vt = VT_BOOL; - opts[5].dwType = PROPBAG2_TYPE_DATA; - - hr = CreatePropertyBag2(opts, 6, ppIEncoderOptions); + hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 1ab2c85..117761c 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -2033,7 +2033,11 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, { PngEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; - PROPBAG2 opts[2]= {{0}}; + static const PROPBAG2 opts[2] = + { + { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszPngInterlaceOption }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszPngFilterOption }, + }; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); @@ -2051,13 +2055,6 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - opts[0].pstrName = (LPOLESTR)wszPngInterlaceOption; - opts[0].vt = VT_BOOL; - opts[0].dwType = PROPBAG2_TYPE_DATA; - opts[1].pstrName = (LPOLESTR)wszPngFilterOption; - opts[1].vt = VT_UI1; - opts[1].dwType = PROPBAG2_TYPE_DATA; - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); if (FAILED(hr)) { diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c index 2f3015c..e9d1af9 100644 --- a/dlls/windowscodecs/propertybag.c +++ b/dlls/windowscodecs/propertybag.c @@ -213,7 +213,7 @@ static HRESULT WINAPI PropertyBag_CountProperties(IPropertyBag2 *iface, ULONG *p return S_OK; } -static HRESULT copy_propbag2(PROPBAG2 *dest, PROPBAG2 *src) +static HRESULT copy_propbag2(PROPBAG2 *dest, const PROPBAG2 *src) { dest->cfType = src->cfType; dest->clsid = src->clsid; @@ -278,7 +278,7 @@ static const IPropertyBag2Vtbl PropertyBag_Vtbl = { PropertyBag_LoadObject }; -HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, +HRESULT CreatePropertyBag2(const PROPBAG2 *options, UINT count, IPropertyBag2 **ppPropertyBag2) { UINT i; diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index a0eec53..f165e18 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1936,7 +1936,11 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, { TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); TiffFrameEncode *result; - + static const PROPBAG2 opts[2] = + { + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszTiffCompressionMethod }, + { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszCompressionQuality }, + }; HRESULT hr=S_OK; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); @@ -1955,24 +1959,14 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (SUCCEEDED(hr)) { - PROPBAG2 opts[2]= {{0}}; - opts[0].pstrName = (LPOLESTR)wszTiffCompressionMethod; - opts[0].vt = VT_UI1; - opts[0].dwType = PROPBAG2_TYPE_DATA; - - opts[1].pstrName = (LPOLESTR)wszCompressionQuality; - opts[1].vt = VT_R4; - opts[1].dwType = PROPBAG2_TYPE_DATA; - - hr = CreatePropertyBag2(opts, 2, ppIEncoderOptions); - + hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); if (SUCCEEDED(hr)) { VARIANT v; VariantInit(&v); V_VT(&v) = VT_UI1; V_UNION(&v, bVal) = WICTiffCompressionDontCare; - hr = IPropertyBag2_Write(*ppIEncoderOptions, 1, opts, &v); + hr = IPropertyBag2_Write(*ppIEncoderOptions, 1, (PROPBAG2 *)opts, &v); VariantClear(&v); if (FAILED(hr)) { diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 2249c13..8bba811 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -120,7 +120,7 @@ extern void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT heigh extern HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp) DECLSPEC_HIDDEN; -extern HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, +extern HRESULT CreatePropertyBag2(const PROPBAG2 *options, UINT count, IPropertyBag2 **property) DECLSPEC_HIDDEN; extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : wincodecs: Encoder options are optional for CreateNewFrame ().
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 15dc40df4801813c8fd1093a669ff32cb6efe0f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15dc40df4801813c8fd1093a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 19:59:33 2018 +0300 wincodecs: Encoder options are optional for CreateNewFrame(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0be89601f57388e5788151d2176c0d24e9aaa76a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/bmpencode.c | 7 +++++-- dlls/windowscodecs/icnsformat.c | 9 ++++++--- dlls/windowscodecs/jpegformat.c | 11 +++++++---- dlls/windowscodecs/pngformat.c | 11 +++++++---- dlls/windowscodecs/tests/converter.c | 18 ++++++++++++++++++ dlls/windowscodecs/tiffformat.c | 2 +- 6 files changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 48a8e27..047154e 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -508,8 +508,11 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (!This->stream) return WINCODEC_ERR_NOTINITIALIZED; - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); - if (FAILED(hr)) return hr; + if (ppIEncoderOptions) + { + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + if (FAILED(hr)) return hr; + } encode = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpFrameEncode)); if (!encode) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 14144f7..aa96404 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -617,9 +617,12 @@ static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, goto end; } - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); - if (FAILED(hr)) - goto end; + if (ppIEncoderOptions) + { + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + if (FAILED(hr)) + goto end; + } frameEncode = HeapAlloc(GetProcessHeap(), 0, sizeof(IcnsFrameEncode)); if (frameEncode == NULL) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index d4bee24..08f1ee7 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1472,11 +1472,14 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); - if (FAILED(hr)) + if (ppIEncoderOptions) { - LeaveCriticalSection(&This->lock); - return hr; + hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); + if (FAILED(hr)) + { + LeaveCriticalSection(&This->lock); + return hr; + } } This->frame_count = 1; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 117761c..26b5fd5 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -2055,11 +2055,14 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); - if (FAILED(hr)) + if (ppIEncoderOptions) { - LeaveCriticalSection(&This->lock); - return hr; + hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); + if (FAILED(hr)) + { + LeaveCriticalSection(&This->lock); + return hr; + } } This->frame_count = 1; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 704ae5d..80423dc 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -804,6 +804,24 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls int i; hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapEncoder, (void **)&encoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + + hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); + ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); + + /* Encoder options are optional. */ + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frameencode, NULL); + ok(SUCCEEDED(hr), "Failed to create encode frame, hr %#x.\n", hr); + + IStream_Release(stream); + IWICBitmapEncoder_Release(encoder); + IWICBitmapFrameEncode_Release(frameencode); + + hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapEncoder, (void**)&encoder); ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); if (SUCCEEDED(hr)) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index f165e18..f125b07 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1957,7 +1957,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, hr = E_FAIL; } - if (SUCCEEDED(hr)) + if (ppIEncoderOptions && SUCCEEDED(hr)) { hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); if (SUCCEEDED(hr))

1 0