- wine-devel - winehq.org

[PATCH 2/4] mfplat: Add MFTUnregisterLocal stub
by Alistair Leslie-Hughes 06 Sep '18

06 Sep '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 7 +++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c5c8ad8..c36a5ef 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -240,6 +240,13 @@ HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWST return S_OK; } +HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory) +{ + FIXME("(%p)\n", factory); + + return S_OK; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c143814..1b33e2d 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -141,7 +141,7 @@ @ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) -@ stub MFTUnregisterLocal +@ stdcall MFTUnregisterLocal(ptr) @ stub MFTUnregisterLocalByCLSID @ stub MFTraceError @ stub MFTraceFuncEnter diff --git a/include/mfapi.h b/include/mfapi.h index f889840..890d7bd 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -85,6 +85,7 @@ HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); HRESULT WINAPI MFTUnregister(CLSID clsid); +HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory); HRESULT WINAPI MFGetPluginControl(IMFPluginControl**); #endif /* __WINE_MFAPI_H */ -- 1.9.1

1 0

[PATCH 1/4] mfplat: Add MFTRegisterLocal stub
by Alistair Leslie-Hughes 06 Sep '18

06 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45622 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 10 ++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index df61f3c..c5c8ad8 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -230,6 +230,16 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags return hr; } +HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, + UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, + UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types) +{ + FIXME("(%p, %s, %s, %x, %u, %p, %u, %p)\n", factory, debugstr_guid(category), debugstr_w(name), + flags, cinput, input_types, coutput, output_types); + + return S_OK; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index a66f4d1..c143814 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -138,7 +138,7 @@ @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) -@ stub MFTRegisterLocal +@ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) @ stub MFTUnregisterLocal diff --git a/include/mfapi.h b/include/mfapi.h index 5aead1e..f889840 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -78,6 +78,9 @@ HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes); +HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, + UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, + UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types); HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); -- 1.9.1

1 0

[PATCH 1/3] msvcp110: Export xtime_get.
by Gijs Vermeulen 06 Sep '18

06 Sep '18

This patchset makes the Bethesda Launcher start. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45784 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msvcp110/msvcp110.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 083752663c..7bd35fa455 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3899,4 +3899,4 @@ @ cdecl towctrans(long long) @ cdecl wctrans(str) @ cdecl wctype(str) -@ stub xtime_get +@ cdecl xtime_get(ptr long) -- 2.16.4

3 5

[PATCH] ntdll: Use root of c: drive as fallback cwd during startup.
by Josh DuBois 06 Sep '18

06 Sep '18

Signed-off-by: Josh DuBois <duboisj(a)codeweavers.com> --- dlls/ntdll/server.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index c1f231e..a46d030 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1215,8 +1215,10 @@ static int server_connect(void) /* retrieve the current directory */ fd_cwd = open( ".", O_RDONLY ); if (fd_cwd != -1) fcntl( fd_cwd, F_SETFD, FD_CLOEXEC ); + else WARN( "Failed to open cwd. Will cd to c:\\. (%d : %s)\n", errno, strerror( errno ) ); setup_config_dir(); + if (fd_cwd == -1) fd_cwd = open( "./drive_c", O_RDONLY ); serverdir = wine_get_server_dir(); /* chdir to the server directory */ -- 2.7.4 (Apple Git-66)

1 0

[PATCH v3 01/17] shell32/autocomplete: Revamp pwzsRegKeyPath handling so it can deal with arbitrary sizes and make it more robust
by Gabriel Ivăncescu 06 Sep '18

06 Sep '18

Handle heap_alloc failure, reg strings without a \ character at all, try harder to find the reg path (if only value fails the lookup), and read the registry value with any size. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Supersedes 150480 v2: Retrieve the registry value without failing in rare race conditions. v3: Don't open the HKEY_LOCAL_MACHINE twice under some circumstances. dlls/shell32/autocomplete.c | 90 +++++++++++++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index cf8da50..051644a 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -486,40 +486,66 @@ static HRESULT WINAPI IAutoComplete2_fnInit( if (This->options & ACO_AUTOSUGGEST) create_listbox(This); - if (pwzsRegKeyPath) { - WCHAR *key; - WCHAR result[MAX_PATH]; - WCHAR *value; - HKEY hKey = 0; - LONG res; - LONG len; - - /* pwszRegKeyPath contains the key as well as the value, so we split */ - key = heap_alloc((lstrlenW(pwzsRegKeyPath)+1)*sizeof(WCHAR)); - strcpyW(key, pwzsRegKeyPath); - value = strrchrW(key, '\\'); - *value = 0; - value++; - /* Now value contains the value and buffer the key */ - res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); - if (res != ERROR_SUCCESS) { - /* if the key is not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); - } - if (res == ERROR_SUCCESS) { - res = RegQueryValueW(hKey, value, result, &len); - if (res == ERROR_SUCCESS) { - This->quickComplete = heap_alloc(len*sizeof(WCHAR)); - strcpyW(This->quickComplete, result); - } - RegCloseKey(hKey); - } - heap_free(key); + if (pwzsRegKeyPath) + { + WCHAR *key, *value; + DWORD type, sz = MAX_PATH * sizeof(WCHAR); + BOOL try_HKLM; + BYTE *qc; + HKEY hKey; + LSTATUS res; + size_t len; + + /* pwszRegKeyPath contains the key as well as the value, so split it */ + value = strrchrW(pwzsRegKeyPath, '\\'); + len = value - pwzsRegKeyPath; + + if (value && (key = heap_alloc((len+1) * sizeof(*key))) != NULL) { + memcpy(key, pwzsRegKeyPath, len * sizeof(*key)); + key[len] = '\0'; + value++; + + res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); + try_HKLM = TRUE; + + /* if not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ + if (res != ERROR_SUCCESS) { + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); + try_HKLM = FALSE; + } + + if (res == ERROR_SUCCESS) { + while ((qc = heap_alloc(sz)) != NULL) { + res = RegQueryValueExW(hKey, value, NULL, &type, qc, &sz); + if (res == ERROR_SUCCESS && type == REG_SZ) { + This->quickComplete = heap_realloc(qc, sz); + break; + } + heap_free(qc); + + if (res != ERROR_MORE_DATA || type != REG_SZ) { + if (!try_HKLM) + break; + RegCloseKey(hKey); + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); + if (res != ERROR_SUCCESS) + goto free_key_str; + sz = MAX_PATH * sizeof(WCHAR); + try_HKLM = FALSE; + } + } + RegCloseKey(hKey); + } + free_key_str: + heap_free(key); + } } - if ((pwszQuickComplete) && (!This->quickComplete)) { - This->quickComplete = heap_alloc((lstrlenW(pwszQuickComplete)+1)*sizeof(WCHAR)); - lstrcpyW(This->quickComplete, pwszQuickComplete); + if (!This->quickComplete && pwszQuickComplete) + { + size_t len = strlenW(pwszQuickComplete)+1; + if ((This->quickComplete = heap_alloc(len * sizeof(WCHAR))) != NULL) + memcpy(This->quickComplete, pwszQuickComplete, len * sizeof(WCHAR)); } return S_OK; -- 1.9.1

3 37

Packagers: DOSBox 0.74-2 released containing Wine support patches
by André Hentschel 06 Sep '18

06 Sep '18

Hi, A maintenance release of DOSBox is available which includes Wine support patches and hopefully other patches you already applied on top of 0.74 So upgrading should be considered See also: https://wiki.winehq.org/DOSBox

1 0

Possible to call winlib function from native program ?
by Wilma Feuerstein 06 Sep '18

06 Sep '18

3 5

[PATCH 1/5] msi/tests: Add some tests for remote MSI summary info APIs.
by Dmitry Timoshkov 06 Sep '18

06 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/tests/custom.c | 52 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 6332d68768..1cf24536d0 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -30,6 +30,7 @@ #include <msxml.h> #include <msi.h> #include <msiquery.h> +#include <msidefs.h> static int todo_level, todo_do_loop; @@ -279,7 +280,9 @@ static void test_db(MSIHANDLE hinst) MSIHANDLE hdb, view, rec, rec2, suminfo; char buffer[10]; DWORD sz; - UINT r; + UINT r, count, type; + INT int_value; + FILETIME ft; hdb = MsiGetActiveDatabase(hinst); ok(hinst, hdb, "MsiGetActiveDatabase failed\n"); @@ -452,6 +455,53 @@ static void test_db(MSIHANDLE hinst) r = MsiGetSummaryInformationA(hdb, NULL, 1, &suminfo); ok(hinst, !r, "got %u\n", r); + r = MsiSummaryInfoGetPropertyCount(suminfo, NULL); +todo_wine + ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); + + count = 0xdeadbeef; + r = MsiSummaryInfoGetPropertyCount(suminfo, &count); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, count == 5, "got %u\n", count); + + r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); +todo_wine + ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); + + type = 0xdeadbeef; + int_value = 0xdeadbeef; + strcpy(buffer, "deadbeef"); + sz = sizeof(buffer); + r = MsiSummaryInfoGetPropertyA(suminfo, PID_AUTHOR, &type, &int_value, &ft, buffer, &sz); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, type == 0, "got %u\n", type); +todo_wine + ok(hinst, int_value == 0, "got %u\n", int_value); + ok(hinst, sz == sizeof(buffer), "got %u\n", sz); + ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + + type = 0xdeadbeef; + int_value = 0xdeadbeef; + strcpy(buffer, "deadbeef"); + sz = sizeof(buffer); + r = MsiSummaryInfoGetPropertyA(suminfo, PID_CODEPAGE, &type, &int_value, &ft, buffer, &sz); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, type == 0, "got %u\n", type); +todo_wine + ok(hinst, int_value == 0, "got %u\n", int_value); + ok(hinst, sz == sizeof(buffer), "got %u\n", sz); + ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + + r = MsiSummaryInfoSetPropertyA(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, ""); +todo_wine + ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + r = MsiCloseHandle(suminfo); ok(hinst, !r, "got %u\n", r); -- 2.17.1

4 5

[PATCH 4/4] mshtml: Add IHTMLCSSStyleDeclaration2 stub implementation.
by Jacek Caban 06 Sep '18

06 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 1897 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/style.c | 9 + 4 files changed, 1908 insertions(+)

1 0

[PATCH 3/4] mshtml: Added IHTMLCSSStyleDeclaration::zoom property implementation.
by Jacek Caban 06 Sep '18

06 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/tests/style.c | 25 +++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-)

1 0

[PATCH 2/4] mshtml: Added IHTMLCSSStyleDeclaration::opacity property implementation.
by Jacek Caban 06 Sep '18

06 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 11 +++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 4 deletions(-)

1 0

[PATCH 1/4] mshtml: Added IHTMLCSSStyleDeclaration::backgroundClip property implementation.
by Jacek Caban 06 Sep '18

06 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 ++++++++----- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 23 +++++++++++++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-)

1 0

[PATCH] fltmgr.sys: Add stubs for FltAcquirePushLockExclusive, FltDeletePushLock and FltReleasePushLock.
by Dmitry Timoshkov 06 Sep '18

06 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/fltmgr.sys/fltmgr.sys.spec | 6 +++--- dlls/fltmgr.sys/main.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index 7b1ba2983c..39ce679817 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -1,4 +1,4 @@ -@ stub FltAcquirePushLockExclusive +@ stdcall FltAcquirePushLockExclusive(ptr) @ stub FltAcquirePushLockShared @ stub FltAcquireResourceExclusive @ stub FltAcquireResourceShared @@ -40,7 +40,7 @@ @ stub FltDeleteContext @ stub FltDeleteFileContext @ stub FltDeleteInstanceContext -@ stub FltDeletePushLock +@ stdcall FltDeletePushLock(ptr) @ stub FltDeleteStreamContext @ stub FltDeleteStreamHandleContext @ stub FltDeleteVolumeContext @@ -133,7 +133,7 @@ @ stub FltReleaseContext @ stub FltReleaseContexts @ stub FltReleaseFileNameInformation -@ stub FltReleasePushLock +@ stdcall FltReleasePushLock(ptr) @ stub FltReleaseResource @ stub FltRequestOperationStatusCallback @ stub FltRetainSwappedBufferMdlAddress diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 16ca2845c2..a1b81e5a89 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -43,6 +43,21 @@ void WINAPI FltInitializePushLock( EX_PUSH_LOCK *lock ) FIXME( "(%p): stub\n", lock ); } +void WINAPI FltDeletePushLock( EX_PUSH_LOCK *lock ) +{ + FIXME( "(%p): stub\n", lock ); +} + +void WINAPI FltAcquirePushLockExclusive( EX_PUSH_LOCK *lock ) +{ + FIXME( "(%p): stub\n", lock ); +} + +void WINAPI FltReleasePushLock( EX_PUSH_LOCK *lock ) +{ + FIXME( "(%p): stub\n", lock ); +} + NTSTATUS WINAPI FltRegisterFilter( PDRIVER_OBJECT driver, const FLT_REGISTRATION *reg, PFLT_FILTER *filter ) { FIXME( "(%p,%p,%p): stub\n", driver, reg, filter ); -- 2.17.1

2 2

[PATCH] pidgen.dll: add stub for PIDGenSimpW
by Louis Lenders 06 Sep '18

06 Sep '18

For https://bugs.winehq.org/show_bug.cgi?id=45770 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/pidgen/main.c | 7 +++++++ dlls/pidgen/pidgen.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index cf165eae13..95f5389cc0 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -50,3 +50,10 @@ int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p return 0; } + +int WINAPI PIDGenSimpW(const WCHAR* str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) +{ + FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_w(str), p1, p2, p3, p4, p5, p6, p7, p8); + + return 0; +} diff --git a/dlls/pidgen/pidgen.spec b/dlls/pidgen/pidgen.spec index 8b7e778b91..aba010715f 100644 --- a/dlls/pidgen/pidgen.spec +++ b/dlls/pidgen/pidgen.spec @@ -1,7 +1,7 @@ @ stub PIDGenA @ stub PIDGenW @ stdcall PIDGenSimpA(str long long long long long long long long) -@ stub PIDGenSimpW +@ stdcall PIDGenSimpW(wstr long long long long long long long long) @ stub SetupPIDGenA @ stub SetupPIDGenW @ stub VerifyPIDSequenceW -- 2.17.1

1 0

[PATCH] ntoskrnl: Add a test for a failing to load driver.
by Dmitry Timoshkov 06 Sep '18

06 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntoskrnl.exe/tests/Makefile.in | 4 ++++ dlls/ntoskrnl.exe/tests/driver3.c | 31 ++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver3.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 22 ++++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 dlls/ntoskrnl.exe/tests/driver3.c create mode 100644 dlls/ntoskrnl.exe/tests/driver3.spec diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index fae11bb703..7946b8de22 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -5,10 +5,14 @@ driver_IMPORTS = winecrt0 ntoskrnl driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver2_IMPORTS = winecrt0 ntoskrnl driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver3_IMPORTS = winecrt0 ntoskrnl +driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ driver.c \ driver.spec \ driver2.c \ driver2.spec \ + driver3.c \ + driver3.spec \ ntoskrnl.c diff --git a/dlls/ntoskrnl.exe/tests/driver3.c b/dlls/ntoskrnl.exe/tests/driver3.c new file mode 100644 index 0000000000..a7737a960a --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/driver3.c @@ -0,0 +1,31 @@ +/* + * Copyright 2018 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "ddk/wdm.h" + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *obj, UNICODE_STRING *path) +{ + DbgPrint("driver3: DriverEntry\n"); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/tests/driver3.spec b/dlls/ntoskrnl.exe/tests/driver3.spec new file mode 100644 index 0000000000..ad33444716 --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/driver3.spec @@ -0,0 +1 @@ +# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 73f0e85a51..fe070d4e8b 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -219,6 +219,26 @@ static void test_load_driver(SC_HANDLE service) ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); } +static void test_driver3(void) +{ + char filename[MAX_PATH]; + SC_HANDLE service; + BOOL ret; + + service = load_driver(filename, "driver3.dll", "WineTestDriver3"); + ok(service != NULL, "driver3 failed to load\n"); + + ret = StartServiceA(service, 0, NULL); + ok(!ret, "driver3 should fail to start\n"); +todo_wine + ok(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED || GetLastError() == ERROR_PROC_NOT_FOUND /* XP */ || + GetLastError() == ERROR_FILE_NOT_FOUND /* Win7 */, "got %u\n", GetLastError()); + + DeleteService(service); + CloseServiceHandle(service); + DeleteFileA(filename); +} + START_TEST(ntoskrnl) { char filename[MAX_PATH], filename2[MAX_PATH]; @@ -247,4 +267,6 @@ START_TEST(ntoskrnl) unload_driver(service); ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); ok(DeleteFileA(filename2), "DeleteFile failed: %u\n", GetLastError()); + + test_driver3(); } -- 2.17.1

2 2

[PATCH v4] kernel32: Correct ReplaceFileW behaviour
by Brock York 06 Sep '18

06 Sep '18

ReplaceFileW should fail with ERROR_ACCESS_DENIED when either the replaced or replacement file is set to read only using SetFileAttributes. Testing for the return values of ReplaceFileW was performed on a Windows XP SP3 and Windows 10 vm. Remove GENERIC_WRITE flag when opening replaced file. ReplaceFileW will fail when called to replace the current executable. This is not the same behaviour as tested on Windows 7, 10 and XP this is because the "replaced" file is opened with the GENERIC_WRITE flag. The MSDN also mentions that the replaced file is only opened with GENERIC_READ, DELETE and SYNCHRONIZE. This patch will fix the following bug once it is merged into Wine-Staging as the WarFrame launcher requires patches from Wine-Staging to work. Wine-Bug:https://bugs.winehq.org/show_bug.cgi?id=33845 Signed-off-by: Brock York <twunknown(a)gmail.com> --- dlls/kernel32/file.c | 29 ++++++++++++++++++++++++++++- dlls/kernel32/tests/file.c | 4 ++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 081f0760a5..bc916f26c3 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1738,6 +1738,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa NTSTATUS status; IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; + BY_HANDLE_FILE_INFORMATION file_info; TRACE("%s %s %s 0x%08x %p %p\n", debugstr_w(lpReplacedFileName), debugstr_w(lpReplacementFileName), debugstr_w(lpBackupFileName), @@ -1772,7 +1773,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa } replaced_flags = lpBackupFileName ? FILE_OPEN : FILE_OPEN_IF; attr.ObjectName = &nt_replaced_name; - status = NtOpenFile(&hReplaced, GENERIC_READ|GENERIC_WRITE|DELETE|SYNCHRONIZE, + status = NtOpenFile(&hReplaced, GENERIC_READ|DELETE|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); @@ -1788,6 +1789,19 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa goto fail; } + /* Replacement should fail if replaced is READ_ONLY */ + if (!GetFileInformationByHandle(hReplaced, &file_info)) + { + error = GetLastError(); + goto fail; + } + + if (file_info->dwFileAttributes & FILE_ATTRIBUTE_READONLY) + { + error = ERROR_ACCESS_DENIED; + goto fail; + } + /* * Open the replacement file for reading, writing, and deleting * (writing and deleting are needed when finished) @@ -1811,6 +1825,19 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa goto fail; } + /* Replacement should fail if replacement is READ_ONLY */ + if (!GetFileInformationByHandle(hReplacement, &file_info)) + { + error = GetLastError(); + goto fail; + } + + if (file_info->dwFileAttributes & FILE_ATTRIBUTE_READONLY) + { + error = ERROR_ACCESS_DENIED; + goto fail; + } + /* If the user wants a backup then that needs to be performed first */ if (lpBackupFileName) { diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33cae4b7c4..8e4a994142 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3666,7 +3666,7 @@ static void test_ReplaceFileA(void) */ SetLastError(0xdeadbeef); ret = pReplaceFileA(replaced, replacement, backup, 0, 0, 0); - todo_wine ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); /* make sure that the replacement file still exists */ hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hReplacementFile != INVALID_HANDLE_VALUE || @@ -3698,7 +3698,7 @@ static void test_ReplaceFileA(void) "unexpected error, replaced file should be able to be opened %d\n", GetLastError()); /*Calling ReplaceFileA on an exe should succeed*/ ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); - todo_wine ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); CloseHandle(hReplacedFile); /* replacement file still exists, make pass w/o "replaced" */ -- 2.18.0

2 1

[PATCH] ntoskrnl.exe: Fix cross-compilation of the driver tests.
by Dmitry Timoshkov 06 Sep '18

06 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++-- dlls/ntoskrnl.exe/tests/driver.h | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index d424396d4c..68b6730c9b 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -75,8 +75,8 @@ static void WINAPIV ok_(const char *file, int line, int condition, const char *m const char *current_file; __ms_va_list args; - if (!(current_file = strrchr(file, '/')) && - !(current_file = strrchr(file, '\\'))) + if (!(current_file = drv_strrchr(file, '/')) && + !(current_file = drv_strrchr(file, '\\'))) current_file = file; else current_file++; diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 6a4179ed00..be4a9dc837 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -35,3 +35,10 @@ struct test_input int winetest_debug; WCHAR path[1]; }; + +static inline char *drv_strrchr( const char *str, char ch ) +{ + char *ret = NULL; + do { if (*str == ch) ret = (char *)(ULONG_PTR)str; } while (*str++); + return ret; +} -- 2.17.1

1 0

[PATCH] ntoskrnl.exe: Add a stub for MmCreateSection.
by Dmitry Timoshkov 06 Sep '18

06 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 577f5b3ba4..292f89c2e7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2357,6 +2357,18 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS return NULL; } +/*********************************************************************** + * MmCreateSection (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI MmCreateSection( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + LARGE_INTEGER *size, ULONG protect, ULONG alloc_attr, + HANDLE file, FILE_OBJECT *file_obj ) +{ + FIXME("%p %#x %p %s %#x %#x %p %p: stub\n", handle, access, attr, + wine_dbgstr_longlong(size->QuadPart), protect, alloc_attr, file, file_obj); + return STATUS_NOT_IMPLEMENTED; +} + /*********************************************************************** * MmFreeNonCachedMemory (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8079114966..e867dbe680 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -669,7 +669,7 @@ @ stub MmCanFileBeTruncated @ stub MmCommitSessionMappedView @ stub MmCreateMdl -@ stub MmCreateSection +@ stdcall MmCreateSection(ptr long ptr ptr long long long ptr) @ stub MmDisableModifiedWriteOfSection @ stub MmFlushImageSection @ stub MmForceSectionClosed -- 2.17.1

1 0

[PATCH 2/3] wsdapi: Implement generation of ProbeMatches message.
by Owen Rudge 06 Sep '18

06 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 169 +++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 169 insertions(+), 2 deletions(-)

2 1

[PATCH 1/5] opcservices: Implement GetSourceUri().
by Nikolay Sivov 06 Sep '18

06 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/factory.c | 2 +- dlls/opcservices/opc_private.h | 2 +- dlls/opcservices/package.c | 40 ++++++++++++++++++++----- dlls/opcservices/tests/opcservices.c | 45 +++++++++++++++++++++++++--- 4 files changed, 76 insertions(+), 13 deletions(-) diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index 0c16cc2501..4578f41d7c 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -336,7 +336,7 @@ static HRESULT WINAPI opc_factory_CreatePackage(IOpcFactory *iface, IOpcPackage { TRACE("iface %p, package %p.\n", iface, package); - return opc_package_create(package); + return opc_package_create(iface, package); } static HRESULT WINAPI opc_factory_ReadPackageFromStream(IOpcFactory *iface, IStream *stream, diff --git a/dlls/opcservices/opc_private.h b/dlls/opcservices/opc_private.h index 80b1e954b7..3c78195242 100644 --- a/dlls/opcservices/opc_private.h +++ b/dlls/opcservices/opc_private.h @@ -45,6 +45,6 @@ static inline BOOL opc_array_reserve(void **elements, size_t *capacity, size_t c return TRUE; } -extern HRESULT opc_package_create(IOpcPackage **package) DECLSPEC_HIDDEN; +extern HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **package) DECLSPEC_HIDDEN; extern HRESULT opc_part_uri_create(const WCHAR *uri, IOpcPartUri **part_uri) DECLSPEC_HIDDEN; extern HRESULT opc_uri_create(const WCHAR *uri, IOpcUri **opc_uri) DECLSPEC_HIDDEN; diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index cac89c523e..c69239b84e 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -37,6 +37,7 @@ struct opc_package IOpcPartSet *part_set; IOpcRelationshipSet *relationship_set; + IOpcUri *source_uri; }; struct opc_part @@ -69,6 +70,7 @@ struct opc_relationship WCHAR *type; IUri *target; OPC_URI_TARGET_MODE target_mode; + IOpcUri *source_uri; }; struct opc_relationship_set @@ -79,6 +81,7 @@ struct opc_relationship_set struct opc_relationship **relationships; size_t size; size_t count; + IOpcUri *source_uri; }; static inline struct opc_package *impl_from_IOpcPackage(IOpcPackage *iface) @@ -106,7 +109,7 @@ static inline struct opc_relationship *impl_from_IOpcRelationship(IOpcRelationsh return CONTAINING_RECORD(iface, struct opc_relationship, IOpcRelationship_iface); } -static HRESULT opc_relationship_set_create(IOpcRelationshipSet **relationship_set); +static HRESULT opc_relationship_set_create(IOpcUri *source_uri, IOpcRelationshipSet **relationship_set); static WCHAR *opc_strdupW(const WCHAR *str) { @@ -177,7 +180,7 @@ static HRESULT WINAPI opc_part_GetRelationshipSet(IOpcPart *iface, IOpcRelations TRACE("iface %p, relationship_set %p.\n", iface, relationship_set); - if (!part->relationship_set && FAILED(hr = opc_relationship_set_create(&part->relationship_set))) + if (!part->relationship_set && FAILED(hr = opc_relationship_set_create((IOpcUri *)part->name, &part->relationship_set))) return hr; *relationship_set = part->relationship_set; @@ -401,6 +404,7 @@ static ULONG WINAPI opc_relationship_Release(IOpcRelationship *iface) { CoTaskMemFree(relationship->id); CoTaskMemFree(relationship->type); + IOpcUri_Release(relationship->source_uri); IUri_Release(relationship->target); heap_free(relationship); } @@ -430,9 +434,14 @@ static HRESULT WINAPI opc_relationship_GetRelationshipType(IOpcRelationship *ifa static HRESULT WINAPI opc_relationship_GetSourceUri(IOpcRelationship *iface, IOpcUri **uri) { - FIXME("iface %p, uri %p stub!\n", iface, uri); + struct opc_relationship *relationship = impl_from_IOpcRelationship(iface); - return E_NOTIMPL; + TRACE("iface %p, uri %p.\n", iface, uri); + + *uri = relationship->source_uri; + IOpcUri_AddRef(*uri); + + return S_OK; } static HRESULT WINAPI opc_relationship_GetTargetUri(IOpcRelationship *iface, IUri **target) @@ -486,6 +495,8 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W relationship->target = target_uri; IUri_AddRef(relationship->target); + relationship->source_uri = set->source_uri; + IOpcUri_AddRef(relationship->source_uri); /* FIXME: test that id is unique */ if (id) @@ -557,6 +568,7 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) for (i = 0; i < relationship_set->count; ++i) IOpcRelationship_Release(&relationship_set->relationships[i]->IOpcRelationship_iface); + IOpcUri_Release(relationship_set->source_uri); heap_free(relationship_set->relationships); heap_free(relationship_set); } @@ -637,7 +649,7 @@ static const IOpcRelationshipSetVtbl opc_relationship_set_vtbl = opc_relationship_set_GetRelationshipsContentStream, }; -static HRESULT opc_relationship_set_create(IOpcRelationshipSet **out) +static HRESULT opc_relationship_set_create(IOpcUri *source_uri, IOpcRelationshipSet **out) { struct opc_relationship_set *relationship_set; @@ -646,6 +658,8 @@ static HRESULT opc_relationship_set_create(IOpcRelationshipSet **out) relationship_set->IOpcRelationshipSet_iface.lpVtbl = &opc_relationship_set_vtbl; relationship_set->refcount = 1; + relationship_set->source_uri = source_uri; + IOpcUri_AddRef(relationship_set->source_uri); *out = &relationship_set->IOpcRelationshipSet_iface; TRACE("Created relationship set %p.\n", *out); @@ -691,6 +705,8 @@ static ULONG WINAPI opc_package_Release(IOpcPackage *iface) IOpcPartSet_Release(package->part_set); if (package->relationship_set) IOpcRelationshipSet_Release(package->relationship_set); + if (package->source_uri) + IOpcUri_Release(package->source_uri); heap_free(package); } @@ -728,8 +744,11 @@ static HRESULT WINAPI opc_package_GetRelationshipSet(IOpcPackage *iface, IOpcRel TRACE("iface %p, relationship_set %p.\n", iface, relationship_set); - if (!package->relationship_set && FAILED(hr = opc_relationship_set_create(&package->relationship_set))) + if (!package->relationship_set) + { + if (FAILED(hr = opc_relationship_set_create(package->source_uri, &package->relationship_set))) return hr; + } *relationship_set = package->relationship_set; IOpcRelationshipSet_AddRef(*relationship_set); @@ -746,9 +765,10 @@ static const IOpcPackageVtbl opc_package_vtbl = opc_package_GetRelationshipSet, }; -HRESULT opc_package_create(IOpcPackage **out) +HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **out) { struct opc_package *package; + HRESULT hr; if (!(package = heap_alloc_zero(sizeof(*package)))) return E_OUTOFMEMORY; @@ -756,6 +776,12 @@ HRESULT opc_package_create(IOpcPackage **out) package->IOpcPackage_iface.lpVtbl = &opc_package_vtbl; package->refcount = 1; + if (FAILED(hr = IOpcFactory_CreatePackageRootUri(factory, &package->source_uri))) + { + heap_free(package); + return hr; + } + *out = &package->IOpcPackage_iface; TRACE("Created package %p.\n", *out); return S_OK; diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 9af7aa49b9..a2a032f406 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -38,12 +38,16 @@ static IOpcFactory *create_factory(void) static void test_package(void) { static const WCHAR typeW[] = {'t','y','p','e','/','s','u','b','t','y','p','e',0}; + static const WCHAR targetW[] = {'t','a','r','g','e','t',0}; static const WCHAR uriW[] = {'/','u','r','i',0}; IOpcRelationshipSet *relset, *relset2; IOpcPartSet *partset, *partset2; + IOpcRelationship *rel; IOpcPartUri *part_uri; IOpcFactory *factory; IOpcPackage *package; + IOpcUri *source_uri; + IUri *target_uri; IOpcPart *part; HRESULT hr; BOOL ret; @@ -81,6 +85,22 @@ static void test_package(void) hr = IOpcPart_GetRelationshipSet(part, &relset2); ok(SUCCEEDED(hr), "Failed to get relationship set, hr %#x.\n", hr); ok(relset == relset2, "Expected same part set instance.\n"); + + hr = CreateUri(targetW, Uri_CREATE_ALLOW_RELATIVE, 0, &target_uri); + ok(SUCCEEDED(hr), "Failed to create target uri, hr %#x.\n", hr); + + hr = IOpcRelationshipSet_CreateRelationship(relset, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); + ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); + + hr = IOpcRelationship_GetSourceUri(rel, &source_uri); + ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); + ok(source_uri == (IOpcUri *)part_uri, "Unexpected source uri.\n"); + + IOpcUri_Release(source_uri); + + IOpcRelationship_Release(rel); + IUri_Release(target_uri); + IOpcRelationshipSet_Release(relset); IOpcRelationshipSet_Release(relset2); @@ -212,11 +232,11 @@ static void test_relationship(void) static const WCHAR typeW[] = {'t','y','p','e',0}; static const WCHAR rootW[] = {'/',0}; IUri *target_uri, *target_uri2, *uri; + IOpcUri *source_uri, *source_uri2; + IOpcRelationship *rel, *rel2; IOpcRelationshipSet *rels; - IOpcRelationship *rel; IOpcFactory *factory; IOpcPackage *package; - IOpcUri *source_uri; IUnknown *unk; DWORD mode; HRESULT hr; @@ -256,6 +276,9 @@ todo_wine hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); + hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel2); + ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); + /* Autogenerated relationship id */ hr = IOpcRelationship_GetId(rel, &id); ok(SUCCEEDED(hr), "Failed to get id, hr %#x.\n", hr); @@ -272,8 +295,17 @@ todo_wine ok(mode == OPC_URI_TARGET_MODE_INTERNAL, "Unexpected mode %d.\n", mode); /* Source uri */ + hr = IOpcFactory_CreatePackageRootUri(factory, &source_uri); + ok(SUCCEEDED(hr), "Failed to create root uri, hr %#x.\n", hr); + + hr = IOpcFactory_CreatePackageRootUri(factory, &source_uri2); + ok(SUCCEEDED(hr), "Failed to create root uri, hr %#x.\n", hr); + ok(source_uri != source_uri2, "Unexpected uri instance.\n"); + + IOpcUri_Release(source_uri); + IOpcUri_Release(source_uri2); + hr = IOpcRelationship_GetSourceUri(rel, &source_uri); -todo_wine ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); hr = IOpcUri_QueryInterface(source_uri, &IID_IOpcPartUri, (void **)&unk); @@ -282,12 +314,17 @@ todo_wine str = NULL; hr = IOpcUri_GetRawUri(source_uri, &str); ok(SUCCEEDED(hr), "Failed to get raw uri, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(rootW, str), "Unexpected uri %s.\n", wine_dbgstr_w(str)); SysFreeString(str); + hr = IOpcRelationship_GetSourceUri(rel2, &source_uri2); + ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); + ok(source_uri2 == source_uri, "Unexpected source uri.\n"); + + IOpcUri_Release(source_uri2); IOpcUri_Release(source_uri); + IOpcRelationship_Release(rel2); IOpcRelationship_Release(rel); IOpcRelationshipSet_Release(rels); -- 2.18.0

1 4

[PATCH 3/3] wsdapi: Send Probe Matches message via UDP unicast.
by Owen Rudge 05 Sep '18

05 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/network.c | 32 ++++++++++++++++++++++++++++++++ dlls/wsdapi/soap.c | 4 ++-- dlls/wsdapi/tests/discovery.c | 22 +++++++++++----------- dlls/wsdapi/wsdapi_internal.h | 1 + 4 files changed, 46 insertions(+), 13 deletions(-)

1 0

[PATCH 1/3] wsdapi: Implement matching of names in MatchProbeEx.
by Owen Rudge 05 Sep '18

05 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 58 ++++++++++++++++++++++++++++++++--- dlls/wsdapi/soap.c | 9 ++++++ dlls/wsdapi/wsdapi_internal.h | 6 ++++ 3 files changed, 69 insertions(+), 4 deletions(-)

1 0

[PATCH v5 1/3] mscoree: Add test for registration-less COM components
by Fabian Maurer 05 Sep '18

05 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43270 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/mscoree/tests/Makefile.in | 6 +- dlls/mscoree/tests/comtest.c | 349 ++++++++++++++++++++++++ dlls/mscoree/tests/comtest.cs | 23 ++ dlls/mscoree/tests/comtest_dll.manifest | 16 ++ dlls/mscoree/tests/comtest_exe.manifest | 11 + dlls/mscoree/tests/interfaces.idl | 33 +++ dlls/mscoree/tests/resource.rc | 30 ++ 7 files changed, 467 insertions(+), 1 deletion(-) create mode 100644 dlls/mscoree/tests/comtest.c create mode 100644 dlls/mscoree/tests/comtest.cs create mode 100644 dlls/mscoree/tests/comtest_dll.manifest create mode 100644 dlls/mscoree/tests/comtest_exe.manifest create mode 100644 dlls/mscoree/tests/interfaces.idl create mode 100644 dlls/mscoree/tests/resource.rc diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index 7c1ba5cb11..f65e1bc6c2 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -1,7 +1,11 @@ TESTDLL = mscoree.dll -IMPORTS = ole32 shlwapi uuid +IMPORTS = ole32 shlwapi uuid shell32 C_SRCS = \ + comtest.c \ debugging.c \ metahost.c \ mscoree.c + +RC_SRCS = resource.rc +IDL_SRCS = interfaces.idl diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c new file mode 100644 index 0000000000..75f9421b59 --- /dev/null +++ b/dlls/mscoree/tests/comtest.c @@ -0,0 +1,349 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include <stdio.h> + +#include "windows.h" +#include "ole2.h" +#include "mscoree.h" +#include "corerror.h" +#include "shlwapi.h" +#include "shlobj.h" + +#include "wine/test.h" + +#include "initguid.h" +#include "interfaces.h" + +HMODULE hmscoree; + +typedef enum _run_type +{ + run_type_current_working_directory = 0, + run_type_exe_directory, + run_type_system32, +} run_type; + +static BOOL write_resource_file(const char *path_tmp, const char *name_res, const char *name_file, char *path_file) +{ + HRSRC rsrc; + void *rsrc_data; + DWORD rsrc_size; + BOOL ret; + HANDLE hfile; + + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)RT_RCDATA); + if (!rsrc) return FALSE; + + rsrc_data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!rsrc_data) return FALSE; + + rsrc_size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!rsrc_size) return FALSE; + + strcpy(path_file, path_tmp); + PathAppendA(path_file, name_file); + hfile = CreateFileA(path_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hfile == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(hfile, rsrc_data, rsrc_size, &rsrc_size, NULL); + + CloseHandle(hfile); + return ret; +} + +static BOOL compile_cs_to_dll(char *source_path, char *dest_path) +{ + const char *path_csc = "C:\\windows\\Microsoft.NET\\Framework\\v2.0.50727\\csc.exe"; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + if (!PathFileExistsA(path_csc)) + { + skip("Can't find csc.exe\n"); + return FALSE; + } + + sprintf(cmdline, "%s /t:library /out:\"%s\" \"%s\"", path_csc, dest_path, source_path); + + si.cb = sizeof(si); + ret = CreateProcessA(path_csc, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + WaitForSingleObject(pi.hProcess, 5000); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + ret = PathFileExistsA(dest_path); + ok(ret, "Compilation failed\n"); + return ret; +} + +static void run_test(BOOL expect_success) +{ + typedef HRESULT (WINAPI *_DllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv); + ITest *test = NULL; + HRESULT hr; + _DllGetClassObject getClassObject; + IClassFactory *classFactory = NULL; + HRESULT result_expected = expect_success ? S_OK : HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); + todo_wine + ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + + if (hr == S_OK) + { + int i = 0; + hr = ITest_Func(test, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + ITest_Release(test); + } + + getClassObject = (_DllGetClassObject)GetProcAddress(hmscoree, "DllGetClassObject"); + hr = getClassObject(&CLSID_Test, &IID_IClassFactory, (void **)&classFactory); + todo_wine_if(!expect_success) + ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + + if (hr == S_OK) + { + ITest *test2 = NULL; + hr = IClassFactory_CreateInstance(classFactory, NULL, &IID_ITest, (void **)&test2); + todo_wine + ok(hr == S_OK, "Got %x\n", hr); + + if (hr == S_OK) + { + int i = 0; + hr = ITest_Func(test2, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + ITest_Release(test2); + } + IClassFactory_Release(classFactory); + } +} + +static void get_dll_path_for_run(char *path_dll, UINT path_dll_size, run_type run) +{ + char path_tmp[MAX_PATH] = {0}; + + GetTempPathA(MAX_PATH, path_tmp); + + switch (run) + { + case run_type_current_working_directory: + strcpy(path_dll, path_tmp); + PathAppendA(path_dll, "comtest.dll"); + break; + case run_type_exe_directory: + GetModuleFileNameA(NULL, path_dll, path_dll_size); + PathRemoveFileSpecA(path_dll); + PathAppendA(path_dll, "comtest.dll"); + break; + case run_type_system32: + GetSystemDirectoryA(path_dll, path_dll_size); + PathAppendA(path_dll, "comtest.dll"); + break; + } +} +static void prepare_and_run_test(const char *dll_source, run_type run) +{ + char path_tmp[MAX_PATH] = {0}; + char path_tmp_manifest[MAX_PATH] = {0}; + char path_dll[MAX_PATH] = {0}; + char path_dll_source[MAX_PATH] = {0}; + char path_manifest_dll[MAX_PATH] = {0}; + char path_manifest_exe[MAX_PATH] = {0}; + BOOL success; + ACTCTXA context = {0}; + ULONG_PTR cookie; + HANDLE handle_context = 0; + + GetTempPathA(MAX_PATH, path_tmp); + GetTempPathA(MAX_PATH, path_tmp_manifest); + PathAppendA(path_tmp_manifest, "manifests"); + + CreateDirectoryA(path_tmp_manifest, NULL); + + if (run == run_type_system32) + { + if (!IsUserAnAdmin()) + { + skip("Can't test dll in system32 due to user not being admin.\n"); + return; + } + } + + if (!write_resource_file(path_tmp, dll_source, "comtest.cs", path_dll_source)) + { + ok(0, "run: %d, Failed to create file for testing\n", run); + goto cleanup; + } + + get_dll_path_for_run(path_dll, sizeof(path_dll), run); + + if (!compile_cs_to_dll(path_dll_source, path_dll)) + goto cleanup; + + if (!write_resource_file(path_tmp_manifest, "comtest_exe.manifest", "exe.manifest", path_manifest_exe)) + { + ok(0, "run: %d, Failed to create file for testing\n", run); + goto cleanup; + } + + if (!write_resource_file(path_tmp_manifest, "comtest_dll.manifest", "comtest.manifest", path_manifest_dll)) + { + ok(0, "run: %d, Failed to create file for testing\n", run); + goto cleanup; + } + + context.cbSize = sizeof(ACTCTXA); + context.lpSource = path_manifest_exe; + context.lpAssemblyDirectory = path_tmp_manifest; + context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + handle_context = CreateActCtxA(&context); + ok(handle_context != NULL && handle_context != INVALID_HANDLE_VALUE, "run: %d, CreateActCtxA failed: %d\n", run, GetLastError()); + + if (handle_context == NULL || handle_context == INVALID_HANDLE_VALUE) + { + ok(0, "run: %d, Failed to create activation context\n", run); + goto cleanup; + } + + success = ActivateActCtx(handle_context, &cookie); + ok(success, "run: %d, ActivateActCtx failed: %d\n", run, GetLastError()); + + if (run == run_type_current_working_directory) + SetCurrentDirectoryA(path_tmp); + + run_test(run == run_type_exe_directory); + +cleanup: + if (handle_context != NULL && handle_context != INVALID_HANDLE_VALUE) + { + success = DeactivateActCtx(0, cookie); + ok(success, "run: %d, DeactivateActCtx failed: %d\n", run, GetLastError()); + ReleaseActCtx(handle_context); + } + if (*path_manifest_exe) + { + success = DeleteFileA(path_manifest_exe); + ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + } + if(*path_manifest_dll) + { + success = DeleteFileA(path_manifest_dll); + ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + } + if(*path_dll_source) + { + success = DeleteFileA(path_dll_source); + ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + } + RemoveDirectoryA(path_tmp_manifest); + /* dll cleanup is handled by the parent, because it might still be used by the child */ +} + + +static void cleanup_test(run_type run) +{ + char path_dll[MAX_PATH] = {0}; + BOOL success; + + get_dll_path_for_run(path_dll, sizeof(path_dll), run); + + if (!PathFileExistsA(path_dll)) + return; + + success = DeleteFileA(path_dll); + if (!success) + { + Sleep(500); + success = DeleteFileA(path_dll); + } + ok(success, "DeleteFileA failed: %d\n", GetLastError()); +} + +static void run_child_process(const char *dll_source, run_type run) +{ + char cmdline[MAX_PATH]; + char exe[MAX_PATH]; + char **argv; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + winetest_get_mainargs(&argv); + + if (strstr(argv[0], ".exe")) + sprintf(exe, "%s", argv[0]); + else + sprintf(exe, "%s.exe", argv[0]); + sprintf(cmdline, "\"%s\" %s %s %d", argv[0], argv[1], dll_source, run); + + si.cb = sizeof(si); + ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + winetest_wait_child_process(pi.hProcess); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + /* Cleanup dll, because it might still have been used by the child */ + cleanup_test(run); +} + +START_TEST(comtest) +{ + int argc; + char **argv; + + CoInitialize(NULL); + + hmscoree = LoadLibraryA("mscoree.dll"); + if (!hmscoree) + { + skip(".NET or mono not available\n"); + return; + } + + argc = winetest_get_mainargs(&argv); + if (argc > 2) + { + const char *dll_source = argv[2]; + run_type run = atoi(argv[3]); + prepare_and_run_test(dll_source, run); + + goto cleanup; + } + + run_child_process("comtest.cs", run_type_current_working_directory); + run_child_process("comtest.cs", run_type_exe_directory); + run_child_process("comtest.cs", run_type_system32); + +cleanup: + FreeLibrary(hmscoree); + CoUninitialize(); +} diff --git a/dlls/mscoree/tests/comtest.cs b/dlls/mscoree/tests/comtest.cs new file mode 100644 index 0000000000..4fe2a718b2 --- /dev/null +++ b/dlls/mscoree/tests/comtest.cs @@ -0,0 +1,23 @@ +/* Compile with + csc /target:library /out:dll.dll comtest.cs +*/ + +using System.Runtime.InteropServices; + +namespace DLL +{ + [Guid("1dbc4491-080d-45c5-a15d-1e3c4610bdd9"), ComVisible(true), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + public interface ITest + { + void Func(ref int i); + } + + [Guid("2e106e50-e7a4-4489-8538-83643f100fdc"), ComVisible(true), ClassInterface(ClassInterfaceType.None)] + public class Test : ITest + { + public void Func(ref int i) + { + i = 42; + } + } +} diff --git a/dlls/mscoree/tests/comtest_dll.manifest b/dlls/mscoree/tests/comtest_dll.manifest new file mode 100644 index 0000000000..ef6924de9e --- /dev/null +++ b/dlls/mscoree/tests/comtest_dll.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32" + /> + <clrClass + clsid="{2e106e50-e7a4-4489-8538-83643f100fdc}" + threadingModel="Both" + name="DLL.Test" + runtimeVersion="v4.0.0.0"> + </clrClass> + <file name="comtest.dll"> + </file> +</assembly> diff --git a/dlls/mscoree/tests/comtest_exe.manifest b/dlls/mscoree/tests/comtest_exe.manifest new file mode 100644 index 0000000000..bc9ce4c045 --- /dev/null +++ b/dlls/mscoree/tests/comtest_exe.manifest @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32"/> + </dependentAssembly> + </dependency> +</assembly> diff --git a/dlls/mscoree/tests/interfaces.idl b/dlls/mscoree/tests/interfaces.idl new file mode 100644 index 0000000000..9e64988197 --- /dev/null +++ b/dlls/mscoree/tests/interfaces.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "unknwn.idl" + +[ + object, + uuid(1dbc4491-080d-45c5-a15d-1e3c4610bdd9), + local +] +interface ITest : IUnknown { + HRESULT Func([in, out] int *i); +}; + +[ + uuid(2e106e50-e7a4-4489-8538-83643f100fdc), +] +coclass Test { interface ITest; }; diff --git a/dlls/mscoree/tests/resource.rc b/dlls/mscoree/tests/resource.rc new file mode 100644 index 0000000000..9a1b89f656 --- /dev/null +++ b/dlls/mscoree/tests/resource.rc @@ -0,0 +1,30 @@ +/* + * Resources for mscoree test suite. + * + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: comtest.cs */ +comtest.cs RCDATA comtest.cs + +/* @makedep: comtest_exe.manifest */ +comtest_exe.manifest RCDATA comtest_exe.manifest + +/* @makedep: comtest_dll.manifest */ +comtest_dll.manifest RCDATA comtest_dll.manifest -- 2.18.0

2 4

[PATCH 7/7] comctl32/button: Support BCM_GETIDEALSIZE message.
by Zhiyi Zhang 05 Sep '18

05 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24623 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 195 ++++++++++++++++++++++- dlls/comctl32/tests/button.c | 296 +++++++++++++++++++++++++++++++++++ include/commctrl.h | 2 + 3 files changed, 491 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index a9ca619e89..5621fda4f3 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -28,7 +28,6 @@ * - WM_SETFOCUS: For (manual or automatic) radio buttons, send the parent window BN_CLICKED * - WM_NCCREATE: Turns any BS_OWNERDRAW button into a BS_PUSHBUTTON button. * - WM_SYSKEYUP - * - BCM_GETIDEALSIZE * * Notifications * - BCN_HOTITEMCHANGE @@ -42,7 +41,6 @@ * * Structures/Macros/Definitions * - NMBCHOTITEM - * - Button_GetIdealSize */ #include <stdarg.h> @@ -187,6 +185,32 @@ static const pfThemedPaint btnThemedPaintFunc[MAX_BTN_TYPE] = NULL, /* BS_DEFCOMMANDLINK */ }; +typedef BOOL (*pfGetIdealSize)(BUTTON_INFO *infoPtr, SIZE *size); + +static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); +static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); +static BOOL GB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); + +static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { + PB_GetIdealSize, /* BS_PUSHBUTTON */ + PB_GetIdealSize, /* BS_DEFPUSHBUTTON */ + CB_GetIdealSize, /* BS_CHECKBOX */ + CB_GetIdealSize, /* BS_AUTOCHECKBOX */ + CB_GetIdealSize, /* BS_RADIOBUTTON */ + GB_GetIdealSize, /* BS_3STATE */ + GB_GetIdealSize, /* BS_AUTO3STATE */ + GB_GetIdealSize, /* BS_GROUPBOX */ + PB_GetIdealSize, /* BS_USERBUTTON */ + CB_GetIdealSize, /* BS_AUTORADIOBUTTON */ + GB_GetIdealSize, /* BS_PUSHBOX */ + GB_GetIdealSize, /* BS_OWNERDRAW */ + /* GetIdealSize() for following types are unimplemented, use BS_PUSHBUTTON's for now */ + PB_GetIdealSize, /* BS_SPLITBUTTON */ + PB_GetIdealSize, /* BS_DEFSPLITBUTTON */ + PB_GetIdealSize, /* BS_COMMANDLINK */ + PB_GetIdealSize /* BS_DEFCOMMANDLINK */ +}; + static inline UINT get_button_type( LONG window_style ) { return (window_style & BS_TYPEMASK); @@ -846,6 +870,15 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L return TRUE; } + case BCM_GETIDEALSIZE: + { + SIZE *size = (SIZE *)lParam; + + if (!size) return FALSE; + + return btnGetIdealSizeFunc[btn_type](infoPtr, size); + } + case WM_NCHITTEST: if(btn_type == BS_GROUPBOX) return HTTRANSPARENT; /* fall through */ @@ -1038,6 +1071,164 @@ static const RECT *BUTTON_GetTextMargin(const BUTTON_INFO *infoPtr) return &oneMargin; } +static void BUTTON_GetClientRectSize(BUTTON_INFO *infoPtr, SIZE *size) +{ + RECT rect; + GetClientRect(infoPtr->hwnd, &rect); + size->cx = rect.right - rect.left; + size->cy = rect.bottom - rect.top; +} + +static void BUTTON_GetTextIdealSize(BUTTON_INFO *infoPtr, LONG maxWidth, SIZE *size) +{ + WCHAR *text = get_button_text(infoPtr); + HDC hdc; + RECT rect; + const RECT *margin = BUTTON_GetTextMargin(infoPtr); + + if (maxWidth != 0) + { + maxWidth -= margin->right + margin->right; + if (maxWidth <= 0) maxWidth = 1; + } + + hdc = GetDC(infoPtr->hwnd); + rect = BUTTON_GetTextRect(infoPtr, hdc, text, maxWidth); + ReleaseDC(infoPtr->hwnd, hdc); + heap_free(text); + + size->cx = rect.right - rect.left + margin->left + margin->right; + size->cy = rect.bottom - rect.top + margin->top + margin->bottom; +} + +static void BUTTON_GetLabelIdealSize(BUTTON_INFO *infoPtr, LONG maxWidth, SIZE *size) +{ + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + SIZE imageSize; + SIZE textSize; + BOOL horizontal; + + imageSize = BUTTON_GetImageSize(infoPtr); + if (infoPtr->imagelist.himl) + { + imageSize.cx += infoPtr->imagelist.margin.left + infoPtr->imagelist.margin.right; + imageSize.cy += infoPtr->imagelist.margin.top + infoPtr->imagelist.margin.bottom; + if (infoPtr->imagelist.uAlign == BUTTON_IMAGELIST_ALIGN_TOP + || infoPtr->imagelist.uAlign == BUTTON_IMAGELIST_ALIGN_BOTTOM) + horizontal = FALSE; + else + horizontal = TRUE; + } + else + { + /* horizontal alignment flags has priority over vertical ones if both are specified */ + if (!(style & (BS_CENTER | BS_VCENTER)) || ((style & BS_CENTER) && (style & BS_CENTER) != BS_CENTER) + || !(style & BS_VCENTER) || (style & BS_VCENTER) == BS_VCENTER) + horizontal = TRUE; + else + horizontal = FALSE; + } + + if (horizontal) + { + if (maxWidth != 0) + { + maxWidth -= imageSize.cx; + if (maxWidth <= 0) maxWidth = 1; + } + BUTTON_GetTextIdealSize(infoPtr, maxWidth, &textSize); + size->cx = textSize.cx + imageSize.cx; + size->cy = max(textSize.cy, imageSize.cy); + } + else + { + BUTTON_GetTextIdealSize(infoPtr, maxWidth, &textSize); + size->cx = max(textSize.cx, imageSize.cx); + size->cy = textSize.cy + imageSize.cy; + } +} + +static BOOL GB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) +{ + BUTTON_GetClientRectSize(infoPtr, size); + return TRUE; +} + +static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) +{ + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + WCHAR *text = get_button_text(infoPtr); + HDC hdc; + HFONT hfont; + SIZE labelSize; + INT textOffset; + INT textLength = 0; + double scaleX; + double scaleY; + LONG checkboxWidth, checkboxHeight; + LONG maxWidth = 0; + + if (text) textLength = lstrlenW(text); + heap_free(text); + if (textLength == 0) + { + BUTTON_GetClientRectSize(infoPtr, size); + return TRUE; + } + + hdc = GetDC(infoPtr->hwnd); + scaleX = GetDeviceCaps(hdc, LOGPIXELSX) / 96.0; + scaleY = GetDeviceCaps(hdc, LOGPIXELSY) / 96.0; + if ((hfont = infoPtr->font)) SelectObject(hdc, hfont); + GetCharWidthW(hdc, '0', '0', &textOffset); + textOffset /= 2; + ReleaseDC(infoPtr->hwnd, hdc); + + checkboxWidth = 12 * scaleX + 1; + checkboxHeight = 12 * scaleY + 1; + if (size->cx) + { + maxWidth = size->cx - checkboxWidth - textOffset; + if (maxWidth <= 0) maxWidth = 1; + } + + /* Checkbox doesn't support both image(but not image list) and text */ + if (!(style & (BS_ICON | BS_BITMAP)) && infoPtr->u.image) + BUTTON_GetTextIdealSize(infoPtr, maxWidth, &labelSize); + else + BUTTON_GetLabelIdealSize(infoPtr, maxWidth, &labelSize); + + size->cx = labelSize.cx + checkboxWidth + textOffset; + size->cy = max(labelSize.cy, checkboxHeight); + + return TRUE; +} + +static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) +{ + WCHAR *text = get_button_text(infoPtr); + SIZE labelSize; + INT textLength = 0; + + if (text) textLength = lstrlenW(text); + + if (textLength == 0) + { + BUTTON_GetClientRectSize(infoPtr, size); + heap_free(text); + return TRUE; + } + heap_free(text); + + /* Ideal size include text size even if image only flags(BS_ICON, BS_BITMAP) are specified */ + BUTTON_GetLabelIdealSize(infoPtr, size->cx, &labelSize); + + size->cx = labelSize.cx; + size->cy = labelSize.cy; + + return TRUE; +} + /********************************************************************** * BUTTON_CalcLayoutRects * diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 1fd644b6f2..81461dee44 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1422,6 +1422,301 @@ static void test_state(void) } } +static void test_bcm_get_ideal_size(void) +{ + static const WCHAR text2_w[] = {'t', 'e', 'x', 't', '\n', 't', 'e', 'x', 't', 0}; + static const WCHAR text_w[] = {'t', 'e', 'x', 't', 0}; + static const DWORD imagelist_aligns[] = {BUTTON_IMAGELIST_ALIGN_LEFT, BUTTON_IMAGELIST_ALIGN_RIGHT, + BUTTON_IMAGELIST_ALIGN_TOP, BUTTON_IMAGELIST_ALIGN_BOTTOM, + BUTTON_IMAGELIST_ALIGN_CENTER}; + static const DWORD aligns[] = {0, BS_TOP, BS_LEFT, BS_RIGHT, BS_BOTTOM, + BS_CENTER, BS_VCENTER, BS_RIGHTBUTTON, WS_EX_RIGHT}; + DWORD default_style = WS_TABSTOP | WS_POPUP | WS_VISIBLE; + LONG client_width = 200, client_height = 200; + LONG width, height, line_count; + DWORD style, type; + BOOL ret; + HWND hwnd; + HDC hdc; + HFONT hfont; + LOGFONTA lf; + TEXTMETRICA tm; + SIZE size; + HBITMAP hmask, hbmp; + ICONINFO icon_info; + HICON hicon; + HIMAGELIST himl; + BUTTON_IMAGELIST biml = {0}; + INT i, j; + + /* Check for NULL pointer handling */ + hwnd = CreateWindowW(WC_BUTTONW, text_w, BS_PUSHBUTTON | default_style, 0, 0, client_width, client_height, NULL, + NULL, 0, NULL); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, 0); + ok(!ret, "Expect BCM_GETIDEALSIZE message to return false.\n"); + + /* Set font so that the test is consistent on Wine and Windows */ + ZeroMemory(&lf, sizeof(lf)); + lf.lfWeight = FW_NORMAL; + lf.lfHeight = 20; + lstrcpyA(lf.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&lf); + + /* Get tmHeight */ + hdc = GetDC(hwnd); + GetTextMetricsA(hdc, &tm); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + + /* XP and 2003 doesn't support command links, getting ideal size with button having only text just return client size on these platforms */ + hwnd = CreateWindowA(WC_BUTTONA, "test", BS_DEFCOMMANDLINK | default_style, 0, 0, client_width, client_height, NULL, + NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + if (size.cx == client_width && size.cy == client_width) + { + /* on XP and 2003, buttons with image are not supported */ + win_skip("Skipping further tests on XP and 2003\n"); + return; + } + + /* Tests for image placements */ + /* Prepare bitmap */ + width = 48; + height = 48; + hdc = GetDC(0); + hmask = CreateCompatibleBitmap(hdc, width, height); + hbmp = CreateCompatibleBitmap(hdc, width, height); + + /* Only bitmap for push button, ideal size should be enough for image and text */ + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | BS_BITMAP | default_style, 0, 0, client_width, + client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + /* Ideal size contains text rect even show bitmap only */ + ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + max(height, tm.tmHeight)); + DestroyWindow(hwnd); + + /* Image alignments when button has bitmap and text*/ + for (i = 0; i < ARRAY_SIZE(aligns); i++) + for (j = 0; j < ARRAY_SIZE(aligns); j++) + { + style = BS_DEFPUSHBUTTON | default_style | aligns[i] | aligns[j]; + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + if (!(style & (BS_CENTER | BS_VCENTER)) || ((style & BS_CENTER) && (style & BS_CENTER) != BS_CENTER) + || !(style & BS_VCENTER) || (style & BS_VCENTER) == BS_VCENTER) + ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + "Style: 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, + width + 4 * tm.tmMaxCharWidth, size.cy, max(height, tm.tmHeight)); + else + ok((size.cx >= max(4 * tm.tmMaxCharWidth, height) && size.cy >= height + tm.tmHeight), + "Style: 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, + max(4 * tm.tmMaxCharWidth, height), size.cy, height + tm.tmHeight); + DestroyWindow(hwnd); + } + + /* Image list alignments */ + himl = pImageList_Create(width, height, ILC_COLOR, 1, 1); + pImageList_Add(himl, hbmp, 0); + biml.himl = himl; + for (i = 0; i < ARRAY_SIZE(imagelist_aligns); i++) + { + biml.uAlign = imagelist_aligns[i]; + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | default_style, 0, 0, client_width, client_height, + NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + SendMessageA(hwnd, BCM_SETIMAGELIST, 0, (LPARAM)&biml); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + if (biml.uAlign == BUTTON_IMAGELIST_ALIGN_TOP || biml.uAlign == BUTTON_IMAGELIST_ALIGN_BOTTOM) + ok((size.cx >= max(4 * tm.tmMaxCharWidth, height) && size.cy >= height + tm.tmHeight), + "Align:%d expect ideal cx %d >= %d and ideal cy %d >= %d\n", biml.uAlign, size.cx, + max(4 * tm.tmMaxCharWidth, height), size.cy, height + tm.tmHeight); + else if (biml.uAlign == BUTTON_IMAGELIST_ALIGN_LEFT || biml.uAlign == BUTTON_IMAGELIST_ALIGN_RIGHT) + ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + "Align:%d expect ideal cx %d >= %d and ideal cy %d >= %d\n", biml.uAlign, size.cx, + width + 4 * tm.tmMaxCharWidth, size.cy, max(height, tm.tmHeight)); + else + ok(size.cx >= width && size.cy >= height, "Align:%d expect ideal cx %d >= %d and ideal cy %d >= %d\n", + biml.uAlign, size.cx, width, size.cy, height); + DestroyWindow(hwnd); + } + + /* Icon as image */ + /* Create icon from bitmap */ + ZeroMemory(&icon_info, sizeof(icon_info)); + icon_info.fIcon = TRUE; + icon_info.hbmMask = hmask; + icon_info.hbmColor = hbmp; + hicon = CreateIconIndirect(&icon_info); + + /* Only icon, ideal size should be enough for image and text */ + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | BS_ICON | default_style, 0, 0, client_width, + client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hicon); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + /* Ideal size contains text rect even show icons only */ + ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + max(height, tm.tmHeight)); + DestroyWindow(hwnd); + + /* Show icon and text */ + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | default_style, 0, 0, client_width, client_height, NULL, + NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hicon); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + max(height, tm.tmHeight)); + DestroyWindow(hwnd); + + /* Checkbox */ + /* Both bitmap and text for checkbox, ideal size is only enough for text because it doesn't support image(but not image list)*/ + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_AUTOCHECKBOX | default_style, 0, 0, client_width, client_height, NULL, + NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + ok((size.cx <= width + 4 * tm.tmMaxCharWidth && size.cx >= 4 * tm.tmMaxCharWidth + && size.cy <= max(height, tm.tmHeight) && size.cy >= tm.tmHeight), + "Expect ideal cx %d within range (%d, %d ) and ideal cy %d within range (%d, %d )\n", size.cx, + 4 * tm.tmMaxCharWidth, width + 4 * tm.tmMaxCharWidth, size.cy, tm.tmHeight, max(height, tm.tmHeight)); + DestroyWindow(hwnd); + + /* Both image list and text for checkbox, ideal size should have enough for image list and text */ + biml.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT; + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_AUTOCHECKBOX | BS_BITMAP | default_style, 0, 0, client_width, + client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BCM_SETIMAGELIST, 0, (LPARAM)&biml); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + max(height, tm.tmHeight)); + DestroyWindow(hwnd); + + /* Only bitmap for checkbox, ideal size should have enough for image and text */ + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_AUTOCHECKBOX | BS_BITMAP | default_style, 0, 0, client_width, + client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + max(height, tm.tmHeight)); + DestroyWindow(hwnd); + + /* Test button with only text */ + /* No text */ + for (type = BS_PUSHBUTTON; type <= BS_DEFCOMMANDLINK; type++) + { + style = type | default_style; + hwnd = CreateWindowA(WC_BUTTONA, "", style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + + if (type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK) + { + todo_wine ok((size.cx == 0 && size.cy > 0), "Style 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", + style, size.cx, 0, size.cy, 0); + } + else + { + ok(size.cx == client_width && size.cy == client_height, + "Style 0x%08x expect size.cx == %d and size.cy == %d, got size.cx: %d size.cy: %d\n", style, + client_width, client_height, size.cx, size.cy); + } + DestroyWindow(hwnd); + } + + /* Single line and multiple lines text */ + for (line_count = 1; line_count <= 2; line_count++) + { + for (type = BS_PUSHBUTTON; type <= BS_DEFCOMMANDLINK; type++) + { + style = line_count > 1 ? type | BS_MULTILINE : type; + style |= default_style; + + hwnd = CreateWindowW(WC_BUTTONW, (line_count == 2 ? text2_w : text_w), style, 0, 0, client_width, + client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + + if (type == BS_3STATE || type == BS_AUTO3STATE || type == BS_GROUPBOX || type == BS_PUSHBOX + || type == BS_OWNERDRAW) + { + ok(size.cx == client_width && size.cy == client_height, + "Style 0x%08x expect ideal size (%d,%d), got (%d,%d)\n", style, client_width, client_height, size.cx, + size.cy); + } + else if (type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK) + { + todo_wine ok((size.cx == 0 && size.cy > 0), + "Style 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, 0, + size.cy, 0); + } + else + { + width = 0; + height = line_count == 2 ? 2 * tm.tmHeight : tm.tmHeight; + ok(size.cx >= width && size.cy >= height, + "Style 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, width, size.cy, + height); + } + DestroyWindow(hwnd); + } + } + + pImageList_Destroy(himl); + DestroyIcon(hicon); + DeleteObject(hbmp); + DeleteObject(hmask); + ReleaseDC(0, hdc); + DeleteObject(hfont); +} + START_TEST(button) { ULONG_PTR ctx_cookie; @@ -1443,6 +1738,7 @@ START_TEST(button) test_get_set_imagelist(); test_get_set_textmargin(); test_state(); + test_bcm_get_ideal_size(); unload_v6_module(ctx_cookie, hCtx); } diff --git a/include/commctrl.h b/include/commctrl.h index 936b2e4026..77f460a99d 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1109,6 +1109,8 @@ typedef struct tagNMBCHOTITEM (BOOL)SNDMSG(button, BCM_GETTEXTMARGIN, 0, (LPARAM)(margin)) #define Button_SetTextMargin(button, margin) \ (BOOL)SNDMSG(button, BCM_SETTEXTMARGIN, 0, (LPARAM)(margin)) +#define Button_GetIdealSize(button, size) \ + (BOOL)SNDMSG(button, BCM_GETIDEALSIZE, 0, (LPARAM)(size)) /* Toolbar */ -- 2.18.0

2 1

wine-3.0.3-rc2 Available
by Michael Stefaniuc 05 Sep '18

05 Sep '18

Hello guys, I have pushed wine-3.0.3-rc2 (with tag) to https://github.com/mstefani/wine-stable/tree/stable http://static-winehq.193b.starter-ca-central-1.openshiftapps.com/stable/ Changes since rc1: - Dropped "mfplat: Return S_OK from MFStartup stub." as Alistair marked it as risky. bye michael

1 0

[PATCH 6/7] comctl32/button: Support text margin rendering.
by Zhiyi Zhang 05 Sep '18

05 Sep '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 5fdfe7f936..a9ca619e89 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1027,6 +1027,17 @@ static SIZE BUTTON_GetImageSize(const BUTTON_INFO *infoPtr) return size; } +static const RECT *BUTTON_GetTextMargin(const BUTTON_INFO *infoPtr) +{ + static const RECT oneMargin = {1, 1, 1, 1}; + + /* Use text margin only when showing both image and text, and image is not imagelist */ + if (show_image_and_text(infoPtr) && !infoPtr->imagelist.himl) + return &infoPtr->text_margin; + else + return &oneMargin; +} + /********************************************************************** * BUTTON_CalcLayoutRects * @@ -1054,7 +1065,8 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la UINT dtStyle = BUTTON_BStoDT(style, ex_style); RECT labelRect, imageRect, imageRectWithMargin, textRect; LONG imageMarginWidth, imageMarginHeight; - RECT emptyMargin = {0}, oneMargin = {1, 1, 1, 1}; + const RECT *textMargin = BUTTON_GetTextMargin(infoPtr); + RECT emptyMargin = {0}; LONG maxTextWidth; /* Calculate label rectangle according to label type */ @@ -1118,7 +1130,7 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la BUTTON_PositionRect(split_style, &boundingImageRect, &imageRect, infoPtr->imagelist.himl ? &infoPtr->imagelist.margin : &emptyMargin); /* Text doesn't use imagelist align */ - BUTTON_PositionRect(style, &boundingTextRect, &textRect, &oneMargin); + BUTTON_PositionRect(style, &boundingTextRect, &textRect, textMargin); } else { @@ -1143,17 +1155,17 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la /* Get text rect */ SubtractRect(&boundingTextRect, &labelRect, &boundingImageRect); /* Text doesn't use imagelist align */ - BUTTON_PositionRect(style, &boundingTextRect, &textRect, &oneMargin); + BUTTON_PositionRect(style, &boundingTextRect, &textRect, textMargin); } } /* Show text only */ else { if (get_button_type(style) != BS_GROUPBOX) - BUTTON_PositionRect(style, labelRc, &textRect, &oneMargin); + BUTTON_PositionRect(style, labelRc, &textRect, textMargin); else /* GroupBox is always top aligned */ - BUTTON_PositionRect((style & ~BS_VCENTER) | BS_TOP, labelRc, &textRect, &oneMargin); + BUTTON_PositionRect((style & ~BS_VCENTER) | BS_TOP, labelRc, &textRect, textMargin); labelRect = textRect; SetRectEmpty(&imageRect); } -- 2.18.0

2 1

[PATCH 5/7] comctl32/button: Support imagelist rendering.
by Zhiyi Zhang 05 Sep '18

05 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40445 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40062 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45246 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 162 ++++++++++++++++++++++++++++++----------- 1 file changed, 118 insertions(+), 44 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 2fa18f4f47..5fdfe7f936 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -876,16 +876,18 @@ static RECT BUTTON_GetTextRect(const BUTTON_INFO *infoPtr, HDC hdc, const WCHAR static BOOL show_image_only(const BUTTON_INFO *infoPtr) { LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); - return (style & (BS_ICON | BS_BITMAP)) && infoPtr->u.image; + return (style & (BS_ICON | BS_BITMAP)) && (infoPtr->u.image || infoPtr->imagelist.himl); } static BOOL show_image_and_text(const BUTTON_INFO *infoPtr) { LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); UINT type = get_button_type(style); - return !(style & (BS_ICON | BS_BITMAP)) && infoPtr->u.image - && (type == BS_PUSHBUTTON || type == BS_DEFPUSHBUTTON || type == BS_USERBUTTON || type == BS_SPLITBUTTON - || type == BS_DEFSPLITBUTTON || type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK); + return !(style & (BS_ICON | BS_BITMAP)) + && ((infoPtr->u.image + && (type == BS_PUSHBUTTON || type == BS_DEFPUSHBUTTON || type == BS_USERBUTTON || type == BS_SPLITBUTTON + || type == BS_DEFSPLITBUTTON || type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK)) + || (infoPtr->imagelist.himl && type != BS_GROUPBOX)); } static BOOL show_image(const BUTTON_INFO *infoPtr) @@ -978,13 +980,35 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe } } +/* Convert imagelist align style to button align style */ +static UINT BUTTON_ILStoBS(UINT align) +{ + switch (align) + { + case BUTTON_IMAGELIST_ALIGN_TOP: + return BS_CENTER | BS_TOP; + case BUTTON_IMAGELIST_ALIGN_BOTTOM: + return BS_CENTER | BS_BOTTOM; + case BUTTON_IMAGELIST_ALIGN_CENTER: + return BS_CENTER | BS_VCENTER; + case BUTTON_IMAGELIST_ALIGN_RIGHT: + return BS_RIGHT | BS_VCENTER; + case BUTTON_IMAGELIST_ALIGN_LEFT: + default: + return BS_LEFT | BS_VCENTER; + } +} + static SIZE BUTTON_GetImageSize(const BUTTON_INFO *infoPtr) { ICONINFO iconInfo; BITMAP bm = {0}; SIZE size = {0}; - if (infoPtr->u.image) + /* ImageList has priority over image */ + if (infoPtr->imagelist.himl) + ImageList_GetIconSize(infoPtr->imagelist.himl, &size.cx, &size.cy); + else if (infoPtr->u.image) { if (infoPtr->image_type == IMAGE_ICON) { @@ -1024,10 +1048,12 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la { LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); LONG ex_style = GetWindowLongW( infoPtr->hwnd, GWL_EXSTYLE ); + LONG split_style = infoPtr->imagelist.himl ? BUTTON_ILStoBS(infoPtr->imagelist.uAlign) : style; WCHAR *text = get_button_text(infoPtr); SIZE imageSize = BUTTON_GetImageSize(infoPtr); UINT dtStyle = BUTTON_BStoDT(style, ex_style); - RECT labelRect, imageRect, textRect; + RECT labelRect, imageRect, imageRectWithMargin, textRect; + LONG imageMarginWidth, imageMarginHeight; RECT emptyMargin = {0}, oneMargin = {1, 1, 1, 1}; LONG maxTextWidth; @@ -1042,6 +1068,14 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la } SetRect(&imageRect, 0, 0, imageSize.cx, imageSize.cy); + imageRectWithMargin = imageRect; + if (infoPtr->imagelist.himl) + { + imageRectWithMargin.top -= infoPtr->imagelist.margin.top; + imageRectWithMargin.bottom += infoPtr->imagelist.margin.bottom; + imageRectWithMargin.left -= infoPtr->imagelist.margin.left; + imageRectWithMargin.right += infoPtr->imagelist.margin.right; + } /* Show image only */ if (show_image_only(infoPtr)) @@ -1064,30 +1098,53 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la RECT boundingLabelRect, boundingImageRect, boundingTextRect; /* Get label rect */ - /* Get a label bounding rect to position the label in the user specified label rect because text and - * image need to align together. */ - boundingLabelRect = BUTTON_GetBoundingLabelRect(style, &textRect, &imageRect); - BUTTON_PositionRect(style, labelRc, &boundingLabelRect, &emptyMargin); - labelRect = boundingLabelRect; - - /* Get image rect */ - /* Split the label rect to two halves as two bounding rects for image and text */ - boundingImageRect = labelRect; - if ((style & BS_CENTER) == BS_RIGHT) - boundingImageRect.left = boundingImageRect.right - imageSize.cx; - else if ((style & BS_CENTER) == BS_LEFT) - boundingImageRect.right = boundingImageRect.left + imageSize.cx; - else if ((style & BS_VCENTER) == BS_BOTTOM) - boundingImageRect.top = boundingImageRect.bottom - imageSize.cy; - else if ((style & BS_VCENTER) == BS_TOP) - boundingImageRect.bottom = boundingImageRect.top + imageSize.cy; + /* Image list may have different alignment than the button, use the whole rect for label in this case */ + if (infoPtr->imagelist.himl) + labelRect = *labelRc; else - boundingImageRect.right = boundingImageRect.left + imageSize.cx; - BUTTON_PositionRect(style, &boundingImageRect, &imageRect, &emptyMargin); - - /* Get text rect */ - SubtractRect(&boundingTextRect, &labelRect, &boundingImageRect); - BUTTON_PositionRect(style, &boundingTextRect, &textRect, &oneMargin); + { + /* Get a label bounding rectangle to position the label in the user specified label rectangle because + * text and image need to align together. */ + boundingLabelRect = BUTTON_GetBoundingLabelRect(split_style, &textRect, &imageRectWithMargin); + BUTTON_PositionRect(split_style, labelRc, &boundingLabelRect, &emptyMargin); + labelRect = boundingLabelRect; + } + + /* When imagelist has center align, use the whole rect for imagelist and text */ + if(infoPtr->imagelist.himl && infoPtr->imagelist.uAlign == BUTTON_IMAGELIST_ALIGN_CENTER) + { + boundingImageRect = labelRect; + boundingTextRect = labelRect; + BUTTON_PositionRect(split_style, &boundingImageRect, &imageRect, + infoPtr->imagelist.himl ? &infoPtr->imagelist.margin : &emptyMargin); + /* Text doesn't use imagelist align */ + BUTTON_PositionRect(style, &boundingTextRect, &textRect, &oneMargin); + } + else + { + /* Get image rect */ + /* Split the label rect to two halves as two bounding rectangles for image and text */ + boundingImageRect = labelRect; + imageMarginWidth = imageRectWithMargin.right - imageRectWithMargin.left; + imageMarginHeight = imageRectWithMargin.bottom - imageRectWithMargin.top; + if ((split_style & BS_CENTER) == BS_RIGHT) + boundingImageRect.left = boundingImageRect.right - imageMarginWidth; + else if ((split_style & BS_CENTER) == BS_LEFT) + boundingImageRect.right = boundingImageRect.left + imageMarginWidth; + else if ((split_style & BS_VCENTER) == BS_BOTTOM) + boundingImageRect.top = boundingImageRect.bottom - imageMarginHeight; + else if ((split_style & BS_VCENTER) == BS_TOP) + boundingImageRect.bottom = boundingImageRect.top + imageMarginHeight; + else + boundingImageRect.right = boundingImageRect.left + imageMarginWidth; + BUTTON_PositionRect(split_style, &boundingImageRect, &imageRect, + infoPtr->imagelist.himl ? &infoPtr->imagelist.margin : &emptyMargin); + + /* Get text rect */ + SubtractRect(&boundingTextRect, &labelRect, &boundingImageRect); + /* Text doesn't use imagelist align */ + BUTTON_PositionRect(style, &boundingTextRect, &textRect, &oneMargin); + } } /* Show text only */ else @@ -1144,6 +1201,7 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, UINT flags = IsWindowEnabled(infoPtr->hwnd) ? DSS_NORMAL : DSS_DISABLED; UINT imageFlags; LONG state = infoPtr->state; + LONG draw_state; LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); WCHAR *text = NULL; @@ -1158,24 +1216,40 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, flags |= DSS_MONO; } - switch (infoPtr->image_type) + if (show_image(infoPtr)) { - case IMAGE_ICON: - imageFlags = flags | DST_ICON; - lp = (LPARAM)infoPtr->u.icon; - break; - case IMAGE_BITMAP: - imageFlags = flags | DST_BITMAP; - lp = (LPARAM)infoPtr->u.bitmap; - break; - default: - return; + if (infoPtr->imagelist.himl) + { + if (ImageList_GetImageCount(infoPtr->imagelist.himl) == 1) + ImageList_Draw(infoPtr->imagelist.himl, 0, hdc, imageRect->left, imageRect->top, ILD_NORMAL); + else + { + draw_state = get_draw_state(infoPtr); + ImageList_Draw(infoPtr->imagelist.himl, draw_state - 1, hdc, imageRect->left, imageRect->top, + ILD_NORMAL); + } + } + else + { + switch (infoPtr->image_type) + { + case IMAGE_ICON: + imageFlags = flags | DST_ICON; + lp = (LPARAM)infoPtr->u.icon; + break; + case IMAGE_BITMAP: + imageFlags = flags | DST_BITMAP; + lp = (LPARAM)infoPtr->u.bitmap; + break; + default: + return; + } + + DrawStateW(hdc, hbr, lpOutputProc, lp, wp, imageRect->left, imageRect->top, + imageRect->right - imageRect->left, imageRect->bottom - imageRect->top, imageFlags); + } } - if (show_image(infoPtr)) - DrawStateW(hdc, hbr, lpOutputProc, lp, wp, imageRect->left, imageRect->top, - imageRect->right - imageRect->left, imageRect->bottom - imageRect->top, imageFlags); - if (show_image_only(infoPtr)) return; /* DST_COMPLEX -- is 0 */ -- 2.18.0

2 1

[PATCH 4/7] comctl32/button: Avoid push button content covering frames.
by Zhiyi Zhang 05 Sep '18

05 Sep '18

A focus frame maybe covered by content in the push button. Shrink the label rectangle before layout calculation so that content can never cover the frame. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 653586a748..2fa18f4f47 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1250,6 +1250,8 @@ static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) /* draw button label */ labelRect = rc; + /* Shrink label rect at all sides by 2 so that the content won't touch the surrounding frame */ + InflateRect(&labelRect, -2, -2); dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); if (dtFlags == (UINT)-1L) -- 2.18.0

2 1

[PATCH 3/7] comctl32/button: Support displaying both image and text.
by Zhiyi Zhang 05 Sep '18

05 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45727 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 421 +++++++++++++++++++++++++++++------------ 1 file changed, 295 insertions(+), 126 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 6f9bc39de5..653586a748 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -98,7 +98,7 @@ typedef struct _BUTTON_INFO } u; } BUTTON_INFO; -static UINT BUTTON_CalcLabelRect( const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc ); +static UINT BUTTON_CalcLayoutRects( const BUTTON_INFO *infoPtr, HDC hdc, RECT *labelRc, RECT *imageRc, RECT *textRc ); static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ); static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ); static void GB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ); @@ -615,7 +615,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L /* FIXME: check other BS_* handlers */ if (btn_type == BS_GROUPBOX) InflateRect(&rc, -7, 1); /* GB_Paint does this */ - BUTTON_CalcLabelRect(infoPtr, hdc, &rc); + BUTTON_CalcLayoutRects(infoPtr, hdc, &rc, NULL, NULL); /* Clip by client rect bounds */ if (rc.right > client.right) rc.right = client.right; if (rc.bottom > client.bottom) rc.bottom = client.bottom; @@ -855,95 +855,257 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L return 0; } +/* If maxWidth is zero, rectangle width is unlimited */ +static RECT BUTTON_GetTextRect(const BUTTON_INFO *infoPtr, HDC hdc, const WCHAR *text, LONG maxWidth) +{ + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + LONG exStyle = GetWindowLongW(infoPtr->hwnd, GWL_EXSTYLE); + UINT dtStyle = BUTTON_BStoDT(style, exStyle); + HFONT hPrevFont; + RECT rect = {0}; + + rect.right = maxWidth; + hPrevFont = SelectObject(hdc, infoPtr->font); + /* Calculate height without DT_VCENTER and DT_BOTTOM to get the correct height */ + DrawTextW(hdc, text, -1, &rect, (dtStyle & ~(DT_VCENTER | DT_BOTTOM)) | DT_CALCRECT); + if (hPrevFont) SelectObject(hdc, hPrevFont); + + return rect; +} + +static BOOL show_image_only(const BUTTON_INFO *infoPtr) +{ + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + return (style & (BS_ICON | BS_BITMAP)) && infoPtr->u.image; +} + +static BOOL show_image_and_text(const BUTTON_INFO *infoPtr) +{ + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + UINT type = get_button_type(style); + return !(style & (BS_ICON | BS_BITMAP)) && infoPtr->u.image + && (type == BS_PUSHBUTTON || type == BS_DEFPUSHBUTTON || type == BS_USERBUTTON || type == BS_SPLITBUTTON + || type == BS_DEFSPLITBUTTON || type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK); +} + +static BOOL show_image(const BUTTON_INFO *infoPtr) +{ + return show_image_only(infoPtr) || show_image_and_text(infoPtr); +} + +/* Get a bounding rectangle that is large enough to contain a image and a text side by side. + * Note: (left,top) of the result rectangle may not be (0,0), offset it by yourself if needed */ +static RECT BUTTON_GetBoundingLabelRect(LONG style, const RECT *textRect, const RECT *imageRect) +{ + RECT labelRect; + RECT rect = *imageRect; + INT textWidth = textRect->right - textRect->left; + INT textHeight = textRect->bottom - textRect->top; + INT imageWidth = imageRect->right - imageRect->left; + INT imageHeight = imageRect->bottom - imageRect->top; + + if ((style & BS_CENTER) == BS_RIGHT) + OffsetRect(&rect, textWidth, 0); + else if ((style & BS_CENTER) == BS_LEFT) + OffsetRect(&rect, -imageWidth, 0); + else if ((style & BS_VCENTER) == BS_BOTTOM) + OffsetRect(&rect, 0, textHeight); + else if ((style & BS_VCENTER) == BS_TOP) + OffsetRect(&rect, 0, -imageHeight); + else + OffsetRect(&rect, -imageWidth, 0); + + UnionRect(&labelRect, textRect, &rect); + return labelRect; +} + +/* Position a rectangle inside a bounding rectangle according to button alignment flags */ +static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRect, const RECT *margin) +{ + INT width = innerRect->right - innerRect->left; + INT height = innerRect->bottom - innerRect->top; + + if ((style & WS_EX_RIGHT) && !(style & BS_CENTER)) style |= BS_CENTER; + + if (!(style & BS_CENTER)) + { + /* Push button's text is centered by default, all other types have left aligned text */ + if (get_button_type(style) <= BS_DEFPUSHBUTTON) + style |= BS_CENTER; + else + style |= BS_LEFT; + } + + if (!(style & BS_VCENTER)) + { + /* Group box's text is top aligned by default */ + if (get_button_type(style) == BS_GROUPBOX) + style |= BS_TOP; + } + + switch (style & BS_CENTER) + { + case BS_CENTER: + innerRect->left = outerRect->left + (outerRect->right - outerRect->left - width) / 2; + innerRect->right = innerRect->left + width; + break; + case BS_RIGHT: + innerRect->right = outerRect->right - margin->right; + innerRect->left = innerRect->right - width; + break; + case BS_LEFT: + default: + innerRect->left = outerRect->left + margin->left; + innerRect->right = innerRect->left + width; + break; + } + + switch (style & BS_VCENTER) + { + case BS_TOP: + innerRect->top = outerRect->top + margin->top; + innerRect->bottom = innerRect->top + height; + break; + case BS_BOTTOM: + innerRect->bottom = outerRect->bottom - margin->bottom; + innerRect->top = innerRect->bottom - height; + break; + case BS_VCENTER: + default: + innerRect->top = outerRect->top + (outerRect->bottom - outerRect->top - height) / 2; + innerRect->bottom = innerRect->top + height; + break; + } +} + +static SIZE BUTTON_GetImageSize(const BUTTON_INFO *infoPtr) +{ + ICONINFO iconInfo; + BITMAP bm = {0}; + SIZE size = {0}; + + if (infoPtr->u.image) + { + if (infoPtr->image_type == IMAGE_ICON) + { + GetIconInfo(infoPtr->u.icon, &iconInfo); + GetObjectW(iconInfo.hbmColor, sizeof(bm), &bm); + DeleteObject(iconInfo.hbmColor); + DeleteObject(iconInfo.hbmMask); + } + else if (infoPtr->image_type == IMAGE_BITMAP) + GetObjectW(infoPtr->u.bitmap, sizeof(bm), &bm); + + size.cx = bm.bmWidth; + size.cy = bm.bmHeight; + } + + return size; +} + /********************************************************************** - * BUTTON_CalcLabelRect + * BUTTON_CalcLayoutRects * - * Calculates label's rectangle depending on button style. + * Calculates the rectangles of the button label(image and text) and its parts depending on a button's style. * * Returns flags to be passed to DrawText. * Calculated rectangle doesn't take into account button state * (pushed, etc.). If there is nothing to draw (no text/image) output * rectangle is empty, and return value is (UINT)-1. + * + * PARAMS: + * infoPtr [I] Button pointer + * hdc [I] Handle to device context to draw to + * labelRc [I/O] Input the rect the label to be positioned in, and output the label rect + * imageRc [O] Optional, output the image rect + * textRc [O] Optional, output the text rect */ -static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc) +static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *labelRc, RECT *imageRc, RECT *textRc) { LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); LONG ex_style = GetWindowLongW( infoPtr->hwnd, GWL_EXSTYLE ); WCHAR *text = get_button_text(infoPtr); - ICONINFO iconInfo; - BITMAP bm = { 0 }; - UINT dtStyle = BUTTON_BStoDT( style, ex_style ); - RECT r = *rc; - INT n; + SIZE imageSize = BUTTON_GetImageSize(infoPtr); + UINT dtStyle = BUTTON_BStoDT(style, ex_style); + RECT labelRect, imageRect, textRect; + RECT emptyMargin = {0}, oneMargin = {1, 1, 1, 1}; + LONG maxTextWidth; /* Calculate label rectangle according to label type */ - /* FIXME: Doesn't support showing both image and text yet */ - if (infoPtr->u.image) - { - if (infoPtr->image_type == IMAGE_ICON) - { - GetIconInfo(infoPtr->u.icon, &iconInfo); - GetObjectW(iconInfo.hbmColor, sizeof(bm), &bm); - DeleteObject(iconInfo.hbmColor); - DeleteObject(iconInfo.hbmMask); - } - else if (infoPtr->image_type == IMAGE_BITMAP) - { - GetObjectW(infoPtr->u.bitmap, sizeof(bm), &bm); - } - - r.right = r.left + bm.bmWidth; - r.bottom = r.top + bm.bmHeight; - } - else if (text && text[0]) + if ((imageSize.cx == 0 && imageSize.cy == 0) && (text == NULL || text[0] == '\0')) { - HFONT hFont, hPrevFont = 0; - - if ((hFont = infoPtr->font)) hPrevFont = SelectObject(hdc, hFont); - DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT); - if (hPrevFont) SelectObject(hdc, hPrevFont); - } - - if ((infoPtr->u.image && bm.bmWidth == 0 && bm.bmHeight == 0) - || (text == NULL || text[0] == '\0')) - { - rc->right = r.left; - rc->bottom = r.top; + SetRectEmpty(labelRc); + SetRectEmpty(imageRc); + SetRectEmpty(textRc); heap_free(text); return (UINT)-1; } - heap_free(text); - /* Position label inside bounding rectangle according to - * alignment flags. (calculated rect is always left-top aligned). - * If label is aligned to any side - shift label in opposite - * direction to leave extra space for focus rectangle. - */ - switch (dtStyle & (DT_CENTER|DT_RIGHT)) + SetRect(&imageRect, 0, 0, imageSize.cx, imageSize.cy); + + /* Show image only */ + if (show_image_only(infoPtr)) { - case DT_LEFT: r.left++; r.right++; break; - case DT_CENTER: n = r.right - r.left; - r.left = rc->left + ((rc->right - rc->left) - n) / 2; - r.right = r.left + n; break; - case DT_RIGHT: n = r.right - r.left; - r.right = rc->right - 1; - r.left = r.right - n; - break; + BUTTON_PositionRect(style, labelRc, &imageRect, + infoPtr->imagelist.himl ? &infoPtr->imagelist.margin : &emptyMargin); + labelRect = imageRect; + SetRectEmpty(&textRect); } - - switch (dtStyle & (DT_VCENTER|DT_BOTTOM)) + else { - case DT_TOP: r.top++; r.bottom++; break; - case DT_VCENTER: n = r.bottom - r.top; - r.top = rc->top + ((rc->bottom - rc->top) - n) / 2; - r.bottom = r.top + n; break; - case DT_BOTTOM: n = r.bottom - r.top; - r.bottom = rc->bottom - 1; - r.top = r.bottom - n; - break; + /* Get text rect */ + maxTextWidth = labelRc->right - labelRc->left; + textRect = BUTTON_GetTextRect(infoPtr, hdc, text, maxTextWidth); + heap_free(text); + + /* Show image and text */ + if (show_image_and_text(infoPtr)) + { + RECT boundingLabelRect, boundingImageRect, boundingTextRect; + + /* Get label rect */ + /* Get a label bounding rect to position the label in the user specified label rect because text and + * image need to align together. */ + boundingLabelRect = BUTTON_GetBoundingLabelRect(style, &textRect, &imageRect); + BUTTON_PositionRect(style, labelRc, &boundingLabelRect, &emptyMargin); + labelRect = boundingLabelRect; + + /* Get image rect */ + /* Split the label rect to two halves as two bounding rects for image and text */ + boundingImageRect = labelRect; + if ((style & BS_CENTER) == BS_RIGHT) + boundingImageRect.left = boundingImageRect.right - imageSize.cx; + else if ((style & BS_CENTER) == BS_LEFT) + boundingImageRect.right = boundingImageRect.left + imageSize.cx; + else if ((style & BS_VCENTER) == BS_BOTTOM) + boundingImageRect.top = boundingImageRect.bottom - imageSize.cy; + else if ((style & BS_VCENTER) == BS_TOP) + boundingImageRect.bottom = boundingImageRect.top + imageSize.cy; + else + boundingImageRect.right = boundingImageRect.left + imageSize.cx; + BUTTON_PositionRect(style, &boundingImageRect, &imageRect, &emptyMargin); + + /* Get text rect */ + SubtractRect(&boundingTextRect, &labelRect, &boundingImageRect); + BUTTON_PositionRect(style, &boundingTextRect, &textRect, &oneMargin); + } + /* Show text only */ + else + { + if (get_button_type(style) != BS_GROUPBOX) + BUTTON_PositionRect(style, labelRc, &textRect, &oneMargin); + else + /* GroupBox is always top aligned */ + BUTTON_PositionRect((style & ~BS_VCENTER) | BS_TOP, labelRc, &textRect, &oneMargin); + labelRect = textRect; + SetRectEmpty(&imageRect); + } } - *rc = r; + CopyRect(labelRc, &labelRect); + CopyRect(imageRc, &imageRect); + CopyRect(textRc, &textRect); + return dtStyle; } @@ -962,19 +1124,25 @@ static BOOL CALLBACK BUTTON_DrawTextCallback(HDC hdc, LPARAM lp, WPARAM wp, int return TRUE; } - /********************************************************************** * BUTTON_DrawLabel * * Common function for drawing button label. + * + * FIXME: + * 1. When BS_SINGLELINE is specified and text contains '\t', '\n' or '\r' in the middle, they are rendered as + * squares now whereas they should be ignored. + * 2. When BS_MULTILINE is specified and text contains space in the middle, the space mistakenly be rendered as newline. */ -static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, const RECT *rc) +static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, const RECT *imageRect, + const RECT *textRect) { DRAWSTATEPROC lpOutputProc = NULL; LPARAM lp; WPARAM wp = 0; HBRUSH hbr = 0; UINT flags = IsWindowEnabled(infoPtr->hwnd) ? DSS_NORMAL : DSS_DISABLED; + UINT imageFlags; LONG state = infoPtr->state; LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); WCHAR *text = NULL; @@ -990,35 +1158,34 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, flags |= DSS_MONO; } - /* FIXME: Support drawing label with both image and text */ - if (infoPtr->u.image != 0) + switch (infoPtr->image_type) { - switch (infoPtr->image_type) - { - case IMAGE_ICON: - flags |= DST_ICON; - lp = (LPARAM)infoPtr->u.icon; - break; - case IMAGE_BITMAP: - flags |= DST_BITMAP; - lp = (LPARAM)infoPtr->u.bitmap; - break; - default: - return; - } - } - else - { - /* DST_COMPLEX -- is 0 */ - lpOutputProc = BUTTON_DrawTextCallback; - if (!(text = get_button_text(infoPtr))) return; - lp = (LPARAM)text; - wp = dtFlags; + case IMAGE_ICON: + imageFlags = flags | DST_ICON; + lp = (LPARAM)infoPtr->u.icon; + break; + case IMAGE_BITMAP: + imageFlags = flags | DST_BITMAP; + lp = (LPARAM)infoPtr->u.bitmap; + break; + default: + return; } - DrawStateW(hdc, hbr, lpOutputProc, lp, wp, rc->left, rc->top, - rc->right - rc->left, rc->bottom - rc->top, flags); - heap_free( text ); + if (show_image(infoPtr)) + DrawStateW(hdc, hbr, lpOutputProc, lp, wp, imageRect->left, imageRect->top, + imageRect->right - imageRect->left, imageRect->bottom - imageRect->top, imageFlags); + + if (show_image_only(infoPtr)) return; + + /* DST_COMPLEX -- is 0 */ + lpOutputProc = BUTTON_DrawTextCallback; + if (!(text = get_button_text(infoPtr))) return; + lp = (LPARAM)text; + wp = dtFlags; + DrawStateW(hdc, hbr, lpOutputProc, lp, wp, textRect->left, textRect->top, textRect->right - textRect->left, + textRect->bottom - textRect->top, flags); + heap_free(text); } /********************************************************************** @@ -1026,7 +1193,7 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, */ static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { - RECT rc, r; + RECT rc, labelRect, imageRect, textRect; UINT dtFlags, uState; HPEN hOldPen, hpen; HBRUSH hOldBrush; @@ -1082,18 +1249,17 @@ static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) DrawFrameControl( hDC, &rc, DFC_BUTTON, uState ); /* draw button label */ - r = rc; - dtFlags = BUTTON_CalcLabelRect(infoPtr, hDC, &r); + labelRect = rc; + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); if (dtFlags == (UINT)-1L) goto cleanup; - if (pushedState) - OffsetRect(&r, 1, 1); + if (pushedState) OffsetRect(&labelRect, 1, 1); oldTxtColor = SetTextColor( hDC, GetSysColor(COLOR_BTNTEXT) ); - BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &r); + BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect); SetTextColor( hDC, oldTxtColor ); @@ -1119,7 +1285,7 @@ draw_focus: static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { - RECT rbox, rtext, client; + RECT rbox, labelRect, imageRect, textRect, client; HBRUSH hBrush; int delta, text_offset, checkBoxWidth, checkBoxHeight; UINT dtFlags; @@ -1137,7 +1303,7 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) } GetClientRect(infoPtr->hwnd, &client); - rbox = rtext = client; + rbox = labelRect = client; checkBoxWidth = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; checkBoxHeight = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; @@ -1155,12 +1321,12 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) { - rtext.right -= checkBoxWidth + text_offset; + labelRect.right -= checkBoxWidth + text_offset; rbox.left = rbox.right - checkBoxWidth; } else { - rtext.left += checkBoxWidth + text_offset; + labelRect.left += checkBoxWidth + text_offset; rbox.right = checkBoxWidth; } @@ -1169,14 +1335,14 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) if (action == ODA_DRAWENTIRE) FillRect( hDC, &client, hBrush ); /* Draw label */ - client = rtext; - dtFlags = BUTTON_CalcLabelRect(infoPtr, hDC, &rtext); + client = labelRect; + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); /* Only adjust rbox when rtext is valid */ if (dtFlags != (UINT)-1L) { - rbox.top = rtext.top; - rbox.bottom = rtext.bottom; + rbox.top = labelRect.top; + rbox.bottom = labelRect.bottom; } /* Draw the check-box bitmap */ @@ -1229,16 +1395,15 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) if (dtFlags == (UINT)-1L) /* Noting to draw */ return; - if (action == ODA_DRAWENTIRE) - BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &rtext); + if (action == ODA_DRAWENTIRE) BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect); /* ... and focus */ if (action == ODA_FOCUS || (state & BST_FOCUS)) { - rtext.left--; - rtext.right++; - IntersectRect(&rtext, &rtext, &client); - DrawFocusRect( hDC, &rtext ); + labelRect.left--; + labelRect.right++; + IntersectRect(&labelRect, &labelRect, &client); + DrawFocusRect(hDC, &labelRect); } SelectClipRgn( hDC, hrgn ); if (hrgn) DeleteObject( hrgn ); @@ -1274,7 +1439,7 @@ static void BUTTON_CheckAutoRadioButton( HWND hwnd ) static void GB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { - RECT rc, rcFrame; + RECT labelRect, imageRect, textRect, rcFrame; HBRUSH hbr; HFONT hFont; UINT dtFlags; @@ -1290,16 +1455,16 @@ static void GB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) hbr = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)infoPtr->hwnd); if (!hbr) /* did the app forget to call defwindowproc ? */ hbr = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)infoPtr->hwnd); - GetClientRect( infoPtr->hwnd, &rc); - rcFrame = rc; - hrgn = set_control_clipping( hDC, &rc ); + GetClientRect(infoPtr->hwnd, &labelRect); + rcFrame = labelRect; + hrgn = set_control_clipping(hDC, &labelRect); GetTextMetricsW (hDC, &tm); rcFrame.top += (tm.tmHeight / 2) - 1; DrawEdge (hDC, &rcFrame, EDGE_ETCHED, BF_RECT | ((style & BS_FLAT) ? BF_FLAT : 0)); - InflateRect(&rc, -7, 1); - dtFlags = BUTTON_CalcLabelRect(infoPtr, hDC, &rc); + InflateRect(&labelRect, -7, 1); + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); if (dtFlags != (UINT)-1) { @@ -1309,11 +1474,15 @@ static void GB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) */ /* There is 1-pixel margin at the left, right, and bottom */ - rc.left--; rc.right++; rc.bottom++; - FillRect(hDC, &rc, hbr); - rc.left++; rc.right--; rc.bottom--; - - BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &rc); + labelRect.left--; + labelRect.right++; + labelRect.bottom++; + FillRect(hDC, &labelRect, hbr); + labelRect.left++; + labelRect.right--; + labelRect.bottom--; + + BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect); } SelectClipRgn( hDC, hrgn ); if (hrgn) DeleteObject( hrgn ); -- 2.18.0

2 1

[PATCH 2/7] comctl32/button: Use get_draw_state() helper.
by Zhiyi Zhang 05 Sep '18

05 Sep '18

Use a helper so that the get draw state routine can be shared by later code. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 118 +++++++++++++++++++++++++---------------- 1 file changed, 71 insertions(+), 47 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 56968f99e3..6f9bc39de5 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -128,15 +128,16 @@ static const WORD maxCheckState[MAX_BTN_TYPE] = BST_UNCHECKED /* BS_DEFCOMMANDLINK */ }; -/* These are indices into a states array to determine the theme state for a given theme part. */ -typedef enum +/* Generic draw states, use get_draw_state() to get specific state for button type */ +enum draw_state { STATE_NORMAL, STATE_DISABLED, STATE_HOT, STATE_PRESSED, - STATE_DEFAULTED -} ButtonState; + STATE_DEFAULTED, + DRAW_STATE_COUNT +}; typedef void (*pfPaint)( const BUTTON_INFO *infoPtr, HDC hdc, UINT action ); @@ -160,11 +161,11 @@ static const pfPaint btnPaintFunc[MAX_BTN_TYPE] = PB_Paint /* BS_DEFCOMMANDLINK */ }; -typedef void (*pfThemedPaint)( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, ButtonState drawState, UINT dtflags, BOOL focused); +typedef void (*pfThemedPaint)( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); -static void PB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, ButtonState drawState, UINT dtflags, BOOL focused); -static void CB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, ButtonState drawState, UINT dtflags, BOOL focused); -static void GB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, ButtonState drawState, UINT dtflags, BOOL focused); +static void PB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); +static void CB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); +static void GB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); static const pfThemedPaint btnThemedPaintFunc[MAX_BTN_TYPE] = { @@ -286,6 +287,63 @@ static UINT BUTTON_BStoDT( DWORD style, DWORD ex_style ) return dtStyle; } +static int get_draw_state(const BUTTON_INFO *infoPtr) +{ + static const int pb_states[DRAW_STATE_COUNT] = { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_DEFAULTED }; + static const int cb_states[3][DRAW_STATE_COUNT] = + { + { CBS_UNCHECKEDNORMAL, CBS_UNCHECKEDDISABLED, CBS_UNCHECKEDHOT, CBS_UNCHECKEDPRESSED, CBS_UNCHECKEDNORMAL }, + { CBS_CHECKEDNORMAL, CBS_CHECKEDDISABLED, CBS_CHECKEDHOT, CBS_CHECKEDPRESSED, CBS_CHECKEDNORMAL }, + { CBS_MIXEDNORMAL, CBS_MIXEDDISABLED, CBS_MIXEDHOT, CBS_MIXEDPRESSED, CBS_MIXEDNORMAL } + }; + static const int rb_states[2][DRAW_STATE_COUNT] = + { + { RBS_UNCHECKEDNORMAL, RBS_UNCHECKEDDISABLED, RBS_UNCHECKEDHOT, RBS_UNCHECKEDPRESSED, RBS_UNCHECKEDNORMAL }, + { RBS_CHECKEDNORMAL, RBS_CHECKEDDISABLED, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDNORMAL } + }; + static const int gb_states[DRAW_STATE_COUNT] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + UINT type = get_button_type(style); + int check_state = infoPtr->state & 3; + enum draw_state state; + + if (!IsWindowEnabled(infoPtr->hwnd)) + state = STATE_DISABLED; + else if (infoPtr->state & BST_PUSHED) + state = STATE_PRESSED; + else if (infoPtr->state & BST_HOT) + state = STATE_HOT; + else if (infoPtr->state & BST_FOCUS) + state = STATE_DEFAULTED; + else + state = STATE_NORMAL; + + switch (type) + { + case BS_PUSHBUTTON: + case BS_DEFPUSHBUTTON: + case BS_USERBUTTON: + case BS_SPLITBUTTON: + case BS_DEFSPLITBUTTON: + case BS_COMMANDLINK: + case BS_DEFCOMMANDLINK: + return pb_states[state]; + case BS_CHECKBOX: + case BS_AUTOCHECKBOX: + return cb_states[check_state][state]; + case BS_RADIOBUTTON: + case BS_3STATE: + case BS_AUTO3STATE: + case BS_AUTORADIOBUTTON: + return rb_states[check_state][state]; + case BS_GROUPBOX: + return gb_states[state]; + default: + WARN("Unsupported button type 0x%08x\n", type); + return PBS_NORMAL; + } +} + static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { BUTTON_INFO *infoPtr = (BUTTON_INFO *)GetWindowLongPtrW(hWnd, 0); @@ -402,20 +460,9 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L if (theme && btnThemedPaintFunc[btn_type]) { - ButtonState drawState; - UINT dtflags; + int drawState = get_draw_state(infoPtr); + UINT dtflags = BUTTON_BStoDT(style, GetWindowLongW(hWnd, GWL_EXSTYLE)); - if (IsWindowEnabled( hWnd )) - { - if (infoPtr->state & BST_PUSHED) drawState = STATE_PRESSED; - else if (infoPtr->state & BST_HOT) drawState = STATE_HOT; - else if (infoPtr->state & BST_FOCUS) drawState = STATE_DEFAULTED; - else drawState = STATE_NORMAL; - } - else - drawState = STATE_DISABLED; - - dtflags = BUTTON_BStoDT(style, GetWindowLongW(hWnd, GWL_EXSTYLE)); btnThemedPaintFunc[btn_type](theme, infoPtr, hdc, drawState, dtflags, infoPtr->state & BST_FOCUS); } else if (btnPaintFunc[btn_type]) @@ -1352,14 +1399,11 @@ static void OB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) if (hrgn) DeleteObject( hrgn ); } -static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - static const int states[] = { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_DEFAULTED }; - RECT bgRect, textRect; HFONT font = infoPtr->font; HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; - int state = states[ drawState ]; WCHAR *text = get_button_text(infoPtr); GetClientRect(infoPtr->hwnd, &bgRect); @@ -1392,31 +1436,14 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, Bu if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - static const int cb_states[3][5] = - { - { CBS_UNCHECKEDNORMAL, CBS_UNCHECKEDDISABLED, CBS_UNCHECKEDHOT, CBS_UNCHECKEDPRESSED, CBS_UNCHECKEDNORMAL }, - { CBS_CHECKEDNORMAL, CBS_CHECKEDDISABLED, CBS_CHECKEDHOT, CBS_CHECKEDPRESSED, CBS_CHECKEDNORMAL }, - { CBS_MIXEDNORMAL, CBS_MIXEDDISABLED, CBS_MIXEDHOT, CBS_MIXEDPRESSED, CBS_MIXEDNORMAL } - }; - - static const int rb_states[2][5] = - { - { RBS_UNCHECKEDNORMAL, RBS_UNCHECKEDDISABLED, RBS_UNCHECKEDHOT, RBS_UNCHECKEDPRESSED, RBS_UNCHECKEDNORMAL }, - { RBS_CHECKEDNORMAL, RBS_CHECKEDDISABLED, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDNORMAL } - }; - SIZE sz; RECT bgRect, textRect; HFONT font, hPrevFont = NULL; - int checkState = infoPtr->state & 3; DWORD dwStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); UINT btn_type = get_button_type( dwStyle ); int part = (btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON) ? BP_RADIOBUTTON : BP_CHECKBOX; - int state = (part == BP_CHECKBOX) - ? cb_states[ checkState ][ drawState ] - : rb_states[ checkState ][ drawState ]; WCHAR *text = get_button_text(infoPtr); LOGFONTW lf; BOOL created_font = FALSE; @@ -1478,12 +1505,9 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, Bu if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - static const int states[] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; - RECT bgRect, textRect, contentRect; - int state = states[ drawState ]; WCHAR *text = get_button_text(infoPtr); LOGFONTW lf; HFONT font, hPrevFont = NULL; -- 2.18.0

2 1

[PATCH 1/7] comctl32/tests: Add tests for button state.
by Zhiyi Zhang 05 Sep '18

05 Sep '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/button.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index b27ab844b7..1fd644b6f2 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1406,6 +1406,22 @@ static void test_get_set_textmargin(void) } } +static void test_state(void) +{ + HWND hwnd; + DWORD type; + LONG state; + + /* Initial button state */ + for (type = BS_PUSHBUTTON; type <= BS_DEFCOMMANDLINK; type++) + { + hwnd = create_button(type, NULL); + state = SendMessageA(hwnd, BM_GETSTATE, 0, 0); + ok(state == BST_UNCHECKED, "Expect state 0x%08x, got 0x%08x\n", BST_UNCHECKED, state); + DestroyWindow(hwnd); + } +} + START_TEST(button) { ULONG_PTR ctx_cookie; @@ -1426,6 +1442,7 @@ START_TEST(button) test_bm_get_set_image(); test_get_set_imagelist(); test_get_set_textmargin(); + test_state(); unload_v6_module(ctx_cookie, hCtx); } -- 2.18.0

2 1

[PATCH] xmllite/reader: Fix compiler warning.
by Nikolay Sivov 05 Sep '18

05 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9cb7f3bd77..f10c718d80 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1019,9 +1019,9 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding encoded_buffer *src = &readerinput->buffer->encoded; encoded_buffer *dest = &readerinput->buffer->utf16; int len, dest_len; + UINT cp = ~0u; HRESULT hr; WCHAR *ptr; - UINT cp; hr = get_code_page(enc, &cp); if (FAILED(hr)) return; -- 2.18.0

1 0

[PATCH vkd3d 6/6] tests: Add test for combined clip and cull distances.
by Józef Kucia 05 Sep '18

05 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 283 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 38e757a28748..34b4fdf101fb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18921,6 +18921,288 @@ static void test_clip_distance(void) destroy_test_context(&context); } +static void test_combined_clip_and_cull_distances(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + D3D12_VERTEX_BUFFER_VIEW vbv[2]; + struct test_context_desc desc; + struct test_context context; + struct resource_readback rb; + ID3D12CommandQueue *queue; + ID3D12Resource *vb[2]; + ID3D12Device *device; + unsigned int i, j, k; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct input + { + float4 position : POSITION; + float clip0 : CLIP_DISTANCE0; + float clip1 : CLIP_DISTANCE1; + float clip2 : CLIP_DISTANCE2; + float clip3 : CLIP_DISTANCE3; + float cull0 : CULL_DISTANCE0; + float cull1 : CULL_DISTANCE1; + float cull2 : CULL_DISTANCE2; + float cull3 : CULL_DISTANCE3; + }; + + struct vertex + { + float4 position : SV_Position; + float3 clip0 : SV_ClipDistance1; + float3 cull0 : SV_CullDistance1; + float clip1 : SV_ClipDistance2; + float cull1 : SV_CullDistance2; + }; + + void main(input vin, out vertex vertex) + { + vertex.position = vin.position; + vertex.clip0 = float3(vin.clip0, vin.clip1, vin.clip2); + vertex.cull0 = float3(vin.cull0, vin.cull1, vin.cull2); + vertex.clip1 = vin.clip3; + vertex.cull1 = vin.cull3; + } +#endif + 0x43425844, 0xa24fb3ea, 0x92e2c2b0, 0xb599b1b9, 0xd671f830, 0x00000001, 0x00000374, 0x00000003, + 0x0000002c, 0x0000013c, 0x000001f0, 0x4e475349, 0x00000108, 0x00000009, 0x00000008, 0x000000e0, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x000000e9, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000101, 0x000000e9, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000101, 0x000000e9, 0x00000002, 0x00000000, 0x00000003, 0x00000003, 0x00000101, 0x000000e9, + 0x00000003, 0x00000000, 0x00000003, 0x00000004, 0x00000101, 0x000000f7, 0x00000000, 0x00000000, + 0x00000003, 0x00000005, 0x00000101, 0x000000f7, 0x00000001, 0x00000000, 0x00000003, 0x00000006, + 0x00000101, 0x000000f7, 0x00000002, 0x00000000, 0x00000003, 0x00000007, 0x00000101, 0x000000f7, + 0x00000003, 0x00000000, 0x00000003, 0x00000008, 0x00000101, 0x49534f50, 0x4e4f4954, 0x494c4300, + 0x49445f50, 0x4e415453, 0x43004543, 0x5f4c4c55, 0x54534944, 0x45434e41, 0xababab00, 0x4e47534f, + 0x000000ac, 0x00000005, 0x00000008, 0x00000080, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x0000008c, 0x00000000, 0x00000002, 0x00000003, 0x00000001, 0x00000807, 0x0000008c, + 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000708, 0x0000009c, 0x00000000, 0x00000003, + 0x00000003, 0x00000002, 0x00000807, 0x0000009c, 0x00000001, 0x00000003, 0x00000003, 0x00000002, + 0x00000708, 0x505f5653, 0x7469736f, 0x006e6f69, 0x435f5653, 0x4470696c, 0x61747369, 0x0065636e, + 0x435f5653, 0x446c6c75, 0x61747369, 0x0065636e, 0x52444853, 0x0000017c, 0x00010040, 0x0000005f, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101012, 0x00000001, 0x0300005f, 0x00101012, + 0x00000002, 0x0300005f, 0x00101012, 0x00000003, 0x0300005f, 0x00101012, 0x00000004, 0x0300005f, + 0x00101012, 0x00000005, 0x0300005f, 0x00101012, 0x00000006, 0x0300005f, 0x00101012, 0x00000007, + 0x0300005f, 0x00101012, 0x00000008, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x04000067, + 0x00102072, 0x00000001, 0x00000002, 0x04000067, 0x00102082, 0x00000001, 0x00000002, 0x04000067, + 0x00102072, 0x00000002, 0x00000003, 0x04000067, 0x00102082, 0x00000002, 0x00000003, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102012, 0x00000001, 0x0010100a, + 0x00000001, 0x05000036, 0x00102022, 0x00000001, 0x0010100a, 0x00000002, 0x05000036, 0x00102042, + 0x00000001, 0x0010100a, 0x00000003, 0x05000036, 0x00102082, 0x00000001, 0x0010100a, 0x00000004, + 0x05000036, 0x00102012, 0x00000002, 0x0010100a, 0x00000005, 0x05000036, 0x00102022, 0x00000002, + 0x0010100a, 0x00000006, 0x05000036, 0x00102042, 0x00000002, 0x0010100a, 0x00000007, 0x05000036, + 0x00102082, 0x00000002, 0x0010100a, 0x00000008, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 0, DXGI_FORMAT_R32_FLOAT, 1, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 1, DXGI_FORMAT_R32_FLOAT, 1, 4, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 2, DXGI_FORMAT_R32_FLOAT, 1, 8, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 3, DXGI_FORMAT_R32_FLOAT, 1, 12, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 0, DXGI_FORMAT_R32_FLOAT, 1, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 1, DXGI_FORMAT_R32_FLOAT, 1, 20, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 2, DXGI_FORMAT_R32_FLOAT, 1, 24, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 3, DXGI_FORMAT_R32_FLOAT, 1, 28, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const struct vec4 quad[] = + { + {-1.0f, -1.0f}, + {-1.0f, 1.0f}, + { 1.0f, -1.0f}, + { 1.0f, 1.0f}, + }; + struct + { + float clip_distance[4]; + float cull_distance[4]; + } + vertices[4] = + { + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + }; + static const struct test + { + float vertices[4]; + BOOL triangle_visible[2]; + } + cull_distance_tests[] = + { + {{-1.0f, 1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, + {{ 1.0f, 1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{-1.0f, -1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, + {{-1.0f, 1.0f, -1.0f, 1.0f}, {TRUE, TRUE}}, + {{-1.0f, 1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, -1.0f, 1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{ 1.0f, 1.0f, -1.0f, -1.0f}, {TRUE, TRUE}}, + + {{-1.0f, -1.0f, -1.0f, 1.0f}, {FALSE, TRUE}}, + {{-1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{-1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{-1.0f, 1.0f, -1.0f, -1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, -1.0f, -1.0f}, {TRUE, FALSE}}, + + {{-1.0f, -1.0f, -1.0f, -1.0f}, {FALSE, FALSE}}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = 640; + desc.rt_height = 480; + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, &vs, NULL, &input_layout); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr); + + vb[0] = create_upload_buffer(device, sizeof(quad), quad); + vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]); + vbv[0].StrideInBytes = sizeof(*quad); + vbv[0].SizeInBytes = sizeof(quad); + + vb[1] = create_upload_buffer(device, sizeof(vertices), vertices); + vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]); + vbv[1].StrideInBytes = sizeof(*vertices); + vbv[1].SizeInBytes = sizeof(vertices); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + for (i = 0; i < ARRAY_SIZE(vertices->cull_distance); ++i) + { + for (j = 0; j < ARRAY_SIZE(cull_distance_tests); ++j) + { + const struct test *test = &cull_distance_tests[j]; + unsigned int expected_color[ARRAY_SIZE(test->triangle_visible)]; + unsigned int color; + + for (k = 0; k < ARRAY_SIZE(vertices); ++k) + vertices[k].cull_distance[i] = test->vertices[k]; + update_buffer_data(vb[1], 0, sizeof(vertices), vertices); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + for (k = 0; k < ARRAY_SIZE(expected_color); ++k) + expected_color[k] = test->triangle_visible[k] ? 0xff00ff00 : 0xffffffff; + + if (expected_color[0] == expected_color[1]) + { + check_sub_resource_uint(context.render_target, 0, queue, command_list, expected_color[0], 0); + } + else + { + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + color = get_readback_uint(&rb, 160, 240, 0); + ok(color == expected_color[0], "Got unexpected color 0x%08x.\n", color); + color = get_readback_uint(&rb, 480, 240, 0); + ok(color == expected_color[1], "Got unexpected color 0x%08x.\n", color); + release_resource_readback(&rb); + } + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + for (j = 0; j < ARRAY_SIZE(vertices); ++j) + vertices[j].cull_distance[i] = 1.0f; + } + + for (i = 0; i < ARRAY_SIZE(vertices->clip_distance); ++i) + { + for (j = 0; j < ARRAY_SIZE(vertices); ++j) + vertices[j].clip_distance[i] = -1.0f; + update_buffer_data(vb[1], 0, sizeof(vertices), vertices); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + for (j = 0; j < ARRAY_SIZE(vertices); ++j) + vertices[j].clip_distance[i] = 1.0f; + } + + memset(vertices, 0, sizeof(vertices)); + update_buffer_data(vb[1], 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + for (i = 0; i < ARRAY_SIZE(vb); ++i) + ID3D12Resource_Release(vb[i]); + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -19036,4 +19318,5 @@ START_TEST(d3d12) run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); + run_test(test_combined_clip_and_cull_distances); } -- 2.16.4

2 1

[PATCH vkd3d 5/6] tests: Add test for clip distance.
by Józef Kucia 05 Sep '18

05 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 577 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 577 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1c6b65fa758a..38e757a28748 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18345,6 +18345,582 @@ static void test_cpu_descriptors_lifetime(void) destroy_test_context(&context); } +static void check_clip_distance(struct test_context *context, + ID3D12PipelineState *pso, D3D12_VERTEX_BUFFER_VIEW vbv[2], ID3D12Resource *vb, + ID3D12Resource *vs_cb, ID3D12Resource *gs_cb) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + struct vertex + { + float clip_distance0; + float clip_distance1; + }; + + ID3D12GraphicsCommandList *command_list = context->list; + ID3D12CommandQueue *queue = context->queue; + struct resource_readback rb; + struct vertex vertices[4]; + unsigned int i; + D3D12_BOX box; + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + vertices[i].clip_distance0 = 1.0f; + update_buffer_data(vb, 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context->render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context->allocator); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + vertices[i].clip_distance0 = 0.0f; + update_buffer_data(vb, 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context->render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context->allocator); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + vertices[i].clip_distance0 = -1.0f; + update_buffer_data(vb, 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context->render_target, 0, queue, command_list, 0xffffffff, 0); + + reset_command_list(command_list, context->allocator); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + vertices[i].clip_distance0 = i < 2 ? 1.0f : -1.0f; + update_buffer_data(vb, 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(context->render_target, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 0, 320, 480, 1); + check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + set_box(&box, 320, 0, 0, 320, 480, 1); + check_readback_data_uint(&rb, &box, 0xffffffff, 1); + release_resource_readback(&rb); + + reset_command_list(command_list, context->allocator); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + vertices[i].clip_distance0 = i % 2 ? 1.0f : -1.0f; + update_buffer_data(vb, 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(context->render_target, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 0, 640, 240, 1); + check_readback_data_uint(&rb, &box, 0xff00ff00, 0); + set_box(&box, 0, 240, 0, 640, 240, 1); + check_readback_data_uint(&rb, &box, 0xffffffff, 0); + release_resource_readback(&rb); + + reset_command_list(command_list, context->allocator); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); +} + +static void test_clip_distance(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + D3D12_ROOT_PARAMETER root_parameters[3]; + ID3D12GraphicsCommandList *command_list; + ID3D12Resource *vs_cb, *gs_cb, *vb[2]; + D3D12_INPUT_LAYOUT_DESC input_layout; + D3D12_VERTEX_BUFFER_VIEW vbv[2]; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12PipelineState *pso; + ID3D12Device *device; + unsigned int i; + D3D12_BOX box; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + bool use_constant; + float clip_distance; + + struct input + { + float4 position : POSITION; + float distance0 : CLIP_DISTANCE0; + float distance1 : CLIP_DISTANCE1; + }; + + struct vertex + { + float4 position : SV_POSITION; + float user_clip : CLIP_DISTANCE; + float clip : SV_ClipDistance; + }; + + void main(input vin, out vertex vertex) + { + vertex.position = vin.position; + vertex.user_clip = vin.distance0; + vertex.clip = vin.distance0; + if (use_constant) + vertex.clip = clip_distance; + } +#endif + 0x43425844, 0x09dfef58, 0x88570f2e, 0x1ebcf953, 0x9f97e22a, 0x00000001, 0x000001dc, 0x00000003, + 0x0000002c, 0x0000009c, 0x00000120, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000059, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000101, 0x00000059, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000001, 0x49534f50, 0x4e4f4954, 0x494c4300, 0x49445f50, 0x4e415453, 0xab004543, 0x4e47534f, + 0x0000007c, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000e01, 0x0000006a, + 0x00000000, 0x00000002, 0x00000003, 0x00000002, 0x00000e01, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x50494c43, 0x5349445f, 0x434e4154, 0x56530045, 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065, + 0x52444853, 0x000000b4, 0x00010040, 0x0000002d, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101012, 0x00000001, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000001, 0x04000067, 0x00102012, 0x00000002, + 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102012, + 0x00000001, 0x0010100a, 0x00000001, 0x0b000037, 0x00102012, 0x00000002, 0x0020800a, 0x00000000, + 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0010100a, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD vs_multiple_code[] = + { +#if 0 + bool use_constant; + float clip_distance0; + float clip_distance1; + + struct input + { + float4 position : POSITION; + float distance0 : CLIP_DISTANCE0; + float distance1 : CLIP_DISTANCE1; + }; + + struct vertex + { + float4 position : SV_POSITION; + float user_clip : CLIP_DISTANCE; + float2 clip : SV_ClipDistance; + }; + + void main(input vin, out vertex vertex) + { + vertex.position = vin.position; + vertex.user_clip = vin.distance0; + vertex.clip.x = vin.distance0; + if (use_constant) + vertex.clip.x = clip_distance0; + vertex.clip.y = vin.distance1; + if (use_constant) + vertex.clip.y = clip_distance1; + } +#endif + 0x43425844, 0xef5cc236, 0xe2fbfa69, 0x560b6591, 0x23037999, 0x00000001, 0x00000214, 0x00000003, + 0x0000002c, 0x0000009c, 0x00000120, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000059, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000101, 0x00000059, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000101, 0x49534f50, 0x4e4f4954, 0x494c4300, 0x49445f50, 0x4e415453, 0xab004543, 0x4e47534f, + 0x0000007c, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000e01, 0x0000006a, + 0x00000000, 0x00000002, 0x00000003, 0x00000002, 0x00000c03, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x50494c43, 0x5349445f, 0x434e4154, 0x56530045, 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065, + 0x52444853, 0x000000ec, 0x00010040, 0x0000003b, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101012, 0x00000001, 0x0300005f, 0x00101012, + 0x00000002, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000001, + 0x04000067, 0x00102032, 0x00000002, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, + 0x00000000, 0x05000036, 0x00102012, 0x00000001, 0x0010100a, 0x00000001, 0x0b000037, 0x00102012, + 0x00000002, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0010100a, + 0x00000001, 0x0b000037, 0x00102022, 0x00000002, 0x0020800a, 0x00000000, 0x00000000, 0x0020802a, + 0x00000000, 0x00000000, 0x0010100a, 0x00000002, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs_multiple = {vs_multiple_code, sizeof(vs_multiple_code)}; + static const DWORD gs_code[] = + { +#if 0 + bool use_constant; + float clip_distance; + + struct vertex + { + float4 position : SV_POSITION; + float user_clip : CLIP_DISTANCE; + float clip : SV_ClipDistance; + }; + + [maxvertexcount(3)] + void main(triangle vertex input[3], inout TriangleStream<vertex> output) + { + vertex o; + o = input[0]; + o.clip = input[0].user_clip; + if (use_constant) + o.clip = clip_distance; + output.Append(o); + o = input[1]; + o.clip = input[1].user_clip; + if (use_constant) + o.clip = clip_distance; + output.Append(o); + o = input[2]; + o.clip = input[2].user_clip; + if (use_constant) + o.clip = clip_distance; + output.Append(o); + } +#endif + 0x43425844, 0x9b0823e9, 0xab3ed100, 0xba0ff618, 0x1bbd1cb8, 0x00000001, 0x00000338, 0x00000003, + 0x0000002c, 0x000000b0, 0x00000134, 0x4e475349, 0x0000007c, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x0000005c, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000101, 0x0000006a, 0x00000000, 0x00000002, 0x00000003, 0x00000002, + 0x00000001, 0x505f5653, 0x5449534f, 0x004e4f49, 0x50494c43, 0x5349445f, 0x434e4154, 0x56530045, + 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065, 0x4e47534f, 0x0000007c, 0x00000003, 0x00000008, + 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x00000e01, 0x0000006a, 0x00000000, 0x00000002, 0x00000003, + 0x00000002, 0x00000e01, 0x505f5653, 0x5449534f, 0x004e4f49, 0x50494c43, 0x5349445f, 0x434e4154, + 0x56530045, 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065, 0x52444853, 0x000001fc, 0x00020040, + 0x0000007f, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x05000061, 0x002010f2, 0x00000003, + 0x00000000, 0x00000001, 0x0400005f, 0x00201012, 0x00000003, 0x00000001, 0x0400005f, 0x00201012, + 0x00000003, 0x00000002, 0x02000068, 0x00000001, 0x0100185d, 0x0100285c, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000001, 0x04000067, 0x00102012, 0x00000002, + 0x00000002, 0x0200005e, 0x00000003, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, + 0x00000000, 0x06000036, 0x00102012, 0x00000001, 0x0020100a, 0x00000000, 0x00000001, 0x0c000037, + 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, + 0x0020100a, 0x00000000, 0x00000001, 0x05000036, 0x00102012, 0x00000002, 0x0010000a, 0x00000000, + 0x01000013, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000001, 0x00000000, 0x06000036, + 0x00102012, 0x00000001, 0x0020100a, 0x00000001, 0x00000001, 0x0c000037, 0x00100012, 0x00000000, + 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0020100a, 0x00000001, + 0x00000001, 0x05000036, 0x00102012, 0x00000002, 0x0010000a, 0x00000000, 0x01000013, 0x06000036, + 0x001020f2, 0x00000000, 0x00201e46, 0x00000002, 0x00000000, 0x06000036, 0x00102012, 0x00000001, + 0x0020100a, 0x00000002, 0x00000001, 0x0c000037, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, + 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0020100a, 0x00000002, 0x00000001, 0x05000036, + 0x00102012, 0x00000002, 0x0010000a, 0x00000000, 0x01000013, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE gs = {gs_code, sizeof(gs_code)}; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 0, DXGI_FORMAT_R32_FLOAT, 1, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 1, DXGI_FORMAT_R32_FLOAT, 1, 4, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const struct vec4 quad[] = + { + {-1.0f, -1.0f}, + {-1.0f, 1.0f}, + { 1.0f, -1.0f}, + { 1.0f, 1.0f}, + }; + struct + { + float clip_distance0; + float clip_distance1; + } + vertices[] = + { + {1.0f, 1.0f}, + {1.0f, 1.0f}, + {1.0f, 1.0f}, + {1.0f, 1.0f}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + struct + { + BOOL use_constant; + float clip_distance0; + float clip_distance1; + float padding; + } cb_data; + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = 640; + desc.rt_height = 480; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV; + root_parameters[0].Descriptor.ShaderRegister = 0; + root_parameters[0].Descriptor.RegisterSpace = 0; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_VERTEX; + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV; + root_parameters[1].Descriptor.ShaderRegister = 1; + root_parameters[1].Descriptor.RegisterSpace = 0; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV; + root_parameters[2].Descriptor.ShaderRegister = 0; + root_parameters[2].Descriptor.RegisterSpace = 0; + root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_GEOMETRY; + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, &vs, NULL, &input_layout); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pso); + ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr); + + vb[0] = create_upload_buffer(device, sizeof(quad), quad); + vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]); + vbv[0].StrideInBytes = sizeof(*quad); + vbv[0].SizeInBytes = sizeof(quad); + + vb[1] = create_upload_buffer(device, sizeof(vertices), vertices); + vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]); + vbv[1].StrideInBytes = sizeof(*vertices); + vbv[1].SizeInBytes = sizeof(vertices); + + memset(&cb_data, 0, sizeof(cb_data)); + vs_cb = create_upload_buffer(device, sizeof(cb_data), &cb_data); + gs_cb = create_upload_buffer(device, sizeof(cb_data), &cb_data); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + + /* vertex shader */ + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + check_clip_distance(&context, pso, vbv, vb[1], vs_cb, gs_cb); + + cb_data.use_constant = TRUE; + cb_data.clip_distance0 = -1.0f; + update_buffer_data(vs_cb, 0, sizeof(cb_data), &cb_data); + + ID3D12PipelineState_Release(pso); + + /* geometry shader */ + pso_desc.GS = gs; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pso); + ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr); + + check_clip_distance(&context, pso, vbv, vb[1], vs_cb, gs_cb); + + cb_data.use_constant = TRUE; + cb_data.clip_distance0 = 1.0f; + update_buffer_data(gs_cb, 0, sizeof(cb_data), &cb_data); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12PipelineState_Release(pso); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + /* multiple clip distances */ + pso_desc.VS = vs_multiple; + memset(&pso_desc.GS, 0, sizeof(pso_desc.GS)); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pso); + ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr); + + cb_data.use_constant = FALSE; + update_buffer_data(vs_cb, 0, sizeof(cb_data), &cb_data); + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + vertices[i].clip_distance0 = 1.0f; + update_buffer_data(vb[1], 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + { + vertices[i].clip_distance0 = i < 2 ? 1.0f : -1.0f; + vertices[i].clip_distance1 = i % 2 ? 1.0f : -1.0f; + } + update_buffer_data(vb[1], 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 0, 320, 240, 1); + check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + set_box(&box, 0, 240, 0, 320, 480, 1); + check_readback_data_uint(&rb, &box, 0xffffffff, 1); + set_box(&box, 320, 0, 0, 640, 480, 1); + check_readback_data_uint(&rb, &box, 0xffffffff, 1); + release_resource_readback(&rb); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + cb_data.use_constant = TRUE; + cb_data.clip_distance0 = 0.0f; + cb_data.clip_distance1 = 0.0f; + update_buffer_data(vs_cb, 0, sizeof(cb_data), &cb_data); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12PipelineState_Release(pso); + for (i = 0; i < ARRAY_SIZE(vb); ++i) + ID3D12Resource_Release(vb[i]); + ID3D12Resource_Release(vs_cb); + ID3D12Resource_Release(gs_cb); + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -18459,4 +19035,5 @@ START_TEST(d3d12) run_test(test_layered_rendering); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); + run_test(test_clip_distance); } -- 2.16.4

2 1

[PATCH vkd3d 4/6] vkd3d-shader: Correctly handle multiple clip/cull distance output registers.
by Józef Kucia 05 Sep '18

05 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ca463f85a4d1..1181c8404f35 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1867,7 +1867,7 @@ struct vkd3d_dxbc_compiler { uint32_t id; enum vkd3d_component_type component_type; - bool is_spirv_array; + uint32_t array_element_mask; } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t output_setup_function_id; @@ -3306,6 +3306,7 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ clip_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); vkd3d_spirv_add_iface_variable(builder, clip_distance_id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, clip_distance_id, builtin->spirv_builtin); } if (cull_distance_mask) @@ -3315,6 +3316,7 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ cull_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); vkd3d_spirv_add_iface_variable(builder, cull_distance_id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, cull_distance_id, builtin->spirv_builtin); } for (i = 0; i < output_signature->element_count; ++i) @@ -3325,10 +3327,12 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ { case VKD3D_SV_CLIP_DISTANCE: compiler->output_info[i].id = clip_distance_id; + compiler->output_info[i].array_element_mask = clip_distance_mask; break; case VKD3D_SV_CULL_DISTANCE: compiler->output_info[i].id = cull_distance_id; + compiler->output_info[i].array_element_mask = cull_distance_mask; break; default: @@ -3388,24 +3392,23 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, storage_class, component_type, output_component_count); vkd3d_spirv_add_iface_variable(builder, id); - } - if (builtin) - { - vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); - if (component_idx) - FIXME("Unhandled component index %u.\n", component_idx); - } - else - { - vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); - if (component_idx) - vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); + if (builtin) + { + vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); + if (component_idx) + FIXME("Unhandled component index %u.\n", component_idx); + } + else + { + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); + if (component_idx) + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); + } } compiler->output_info[signature_idx].id = id; compiler->output_info[signature_idx].component_type = component_type; - compiler->output_info[signature_idx].is_spirv_array = builtin && builtin->is_spirv_array; use_private_variable = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE @@ -6361,10 +6364,10 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; - uint32_t write_mask, use_mask, uninit_mask, swizzle; + uint32_t write_mask, use_mask, uninit_mask, swizzle, mask; + uint32_t output_id, indexes[1]; unsigned int component_count; unsigned int i, index; - uint32_t output_id; write_mask = output->mask & 0xff; use_mask = (output->mask >> 8) & 0xff; @@ -6392,7 +6395,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi output_id = output_info->id; - if (!output_info->is_spirv_array) + if (!output_info->array_element_mask) { vkd3d_spirv_build_op_store(builder, output_id, val_id, SpvMemoryAccessMaskNone); return; @@ -6400,10 +6403,14 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); - for (i = 0, index = output->semantic_index * VKD3D_VEC4_SIZE; i < component_count; ++i, ++index) + mask = output_info->array_element_mask; + mask &= (1u << (output->semantic_index * VKD3D_VEC4_SIZE)) - 1; + for (i = 0, index = vkd3d_popcount(mask); i < VKD3D_VEC4_SIZE; ++i) { - uint32_t indexes[] = {vkd3d_dxbc_compiler_get_constant_uint(compiler, index)}; + if (!(write_mask & (VKD3DSP_WRITEMASK_0 << i))) + continue; + indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, index++); chain_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, output_id, indexes, ARRAY_SIZE(indexes)); object_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, -- 2.16.4

2 1

[PATCH vkd3d 3/6] vkd3d-shader: Implement cull distances.
by Józef Kucia 05 Sep '18

05 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 51 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2e8c5cf4ef7f..ca463f85a4d1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2978,6 +2978,7 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_IS_FRONT_FACE, {VKD3D_TYPE_BOOL, 1, SpvBuiltInFrontFacing, sv_front_face_fixup}}, {VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, NULL, true}}, + {VKD3D_SIV_CULL_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInCullDistance, NULL, true}}, }; static const struct { @@ -3257,12 +3258,25 @@ static unsigned int get_shader_output_swizzle(struct vkd3d_dxbc_compiler *compil return compile_args->output_swizzles[register_idx]; } +static void calculate_clip_or_cull_distance_mask(const struct vkd3d_shader_signature_element *e, + uint32_t *mask) +{ + if (e->semantic_index >= sizeof(*mask) * CHAR_BIT / VKD3D_VEC4_SIZE) + { + FIXME("Invalid semantic index %u for clip/cull distance.\n", e->semantic_index); + return; + } + + *mask |= (e->mask & VKD3DSP_WRITEMASK_ALL) << (VKD3D_VEC4_SIZE * e->semantic_index); +} + /* Emits arrayed SPIR-V built-in variables. */ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_shader_signature *output_signature = compiler->output_signature; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t clip_distance_mask = 0, clip_distance_id = 0; + uint32_t cull_distance_mask = 0, cull_distance_id = 0; const struct vkd3d_spirv_builtin *builtin; unsigned int i, count; @@ -3273,13 +3287,11 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ switch (e->sysval_semantic) { case VKD3D_SV_CLIP_DISTANCE: - if (e->semantic_index >= sizeof(clip_distance_mask) * CHAR_BIT / VKD3D_VEC4_SIZE) - { - ERR("Invalid semantic index %u for clip distance.\n", e->semantic_index); - break; - } + calculate_clip_or_cull_distance_mask(e, &clip_distance_mask); + break; - clip_distance_mask |= (e->mask & VKD3DSP_WRITEMASK_ALL) << (VKD3D_VEC4_SIZE * e->semantic_index); + case VKD3D_SV_CULL_DISTANCE: + calculate_clip_or_cull_distance_mask(e, &cull_distance_mask); break; default: @@ -3287,14 +3299,23 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ } } - if (!clip_distance_mask) - return; + if (clip_distance_mask) + { + count = vkd3d_popcount(clip_distance_mask); + builtin = get_spirv_builtin_for_sysval(VKD3D_SIV_CLIP_DISTANCE); + clip_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); + vkd3d_spirv_add_iface_variable(builder, clip_distance_id); + } - count = vkd3d_popcount(clip_distance_mask); - builtin = get_spirv_builtin_for_sysval(VKD3D_SIV_CLIP_DISTANCE); - clip_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); - vkd3d_spirv_add_iface_variable(builder, clip_distance_id); + if (cull_distance_mask) + { + count = vkd3d_popcount(cull_distance_mask); + builtin = get_spirv_builtin_for_sysval(VKD3D_SIV_CULL_DISTANCE); + cull_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); + vkd3d_spirv_add_iface_variable(builder, cull_distance_id); + } for (i = 0; i < output_signature->element_count; ++i) { @@ -3306,6 +3327,10 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ compiler->output_info[i].id = clip_distance_id; break; + case VKD3D_SV_CULL_DISTANCE: + compiler->output_info[i].id = cull_distance_id; + break; + default: break; } -- 2.16.4

2 1

[PATCH vkd3d 1/6] vkd3d-shader: Add get_type_id() helper functions.
by Józef Kucia 05 Sep '18

05 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 64 ++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d40350f18f4d..96d660136755 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2150,6 +2150,22 @@ static uint32_t vkd3d_dxbc_compiler_get_constant_float_vector(struct vkd3d_dxbc_ VKD3D_TYPE_FLOAT, component_count, (const uint32_t *)values); } +static uint32_t vkd3d_dxbc_compiler_get_type_id_for_reg(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register *reg, DWORD write_mask) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + return vkd3d_spirv_get_type_id(builder, + vkd3d_component_type_from_data_type(reg->data_type), + vkd3d_write_mask_component_count(write_mask)); +} + +static uint32_t vkd3d_dxbc_compiler_get_type_id_for_dst(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_dst_param *dst) +{ + return vkd3d_dxbc_compiler_get_type_id_for_reg(compiler, &dst->reg, dst->write_mask); +} + static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buffer_size, const struct vkd3d_shader_register *reg) { @@ -2655,12 +2671,10 @@ static uint32_t vkd3d_dxbc_compiler_emit_abs(struct vkd3d_dxbc_compiler *compile static uint32_t vkd3d_dxbc_compiler_emit_neg(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) { - unsigned int component_count = vkd3d_write_mask_component_count(write_mask); struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id; - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(reg->data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_reg(compiler, reg, write_mask); if (reg->data_type == VKD3D_DATA_FLOAT) return vkd3d_spirv_build_op_fnegate(builder, type_id, val_id); else if (reg->data_type == VKD3D_DATA_INT) @@ -2771,8 +2785,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_sat(struct vkd3d_dxbc_compiler *compile zero_id = vkd3d_dxbc_compiler_get_constant_float_vector(compiler, 0.0f, component_count); one_id = vkd3d_dxbc_compiler_get_constant_float_vector(compiler, 1.0f, component_count); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(reg->data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_reg(compiler, reg, write_mask); if (reg->data_type == VKD3D_DATA_FLOAT) return vkd3d_spirv_build_op_glsl_std450_nclamp(builder, type_id, val_id, zero_id, one_id); @@ -4092,7 +4105,6 @@ static void vkd3d_dxbc_compiler_emit_alu_instruction(struct vkd3d_dxbc_compiler const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; uint32_t src_ids[VKD3D_DXBC_MAX_SOURCE_COUNT]; - unsigned int component_count; uint32_t type_id, val_id; unsigned int i; SpvOp op; @@ -4107,9 +4119,7 @@ static void vkd3d_dxbc_compiler_emit_alu_instruction(struct vkd3d_dxbc_compiler assert(instruction->dst_count == 1); assert(instruction->src_count <= VKD3D_DXBC_MAX_SOURCE_COUNT); - component_count = vkd3d_write_mask_component_count(dst->write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst->reg.data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, dst); for (i = 0; i < instruction->src_count; ++i) src_ids[i] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[i], dst->write_mask); @@ -4169,7 +4179,6 @@ static void vkd3d_dxbc_compiler_emit_ext_glsl_instruction(struct vkd3d_dxbc_comp const struct vkd3d_shader_src_param *src = instruction->src; uint32_t src_id[VKD3D_DXBC_MAX_SOURCE_COUNT]; uint32_t instr_set_id, type_id, val_id; - unsigned int component_count; enum GLSLstd450 glsl_inst; unsigned int i; @@ -4185,9 +4194,7 @@ static void vkd3d_dxbc_compiler_emit_ext_glsl_instruction(struct vkd3d_dxbc_comp assert(instruction->dst_count == 1); assert(instruction->src_count <= VKD3D_DXBC_MAX_SOURCE_COUNT); - component_count = vkd3d_write_mask_component_count(dst->write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst->reg.data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, dst); for (i = 0; i < instruction->src_count; ++i) src_id[i] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[i], dst->write_mask); @@ -4353,8 +4360,7 @@ static void vkd3d_dxbc_compiler_emit_rcp(struct vkd3d_dxbc_compiler *compiler, unsigned int component_count; component_count = vkd3d_write_mask_component_count(dst->write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst->reg.data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, dst); src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst->write_mask); val_id = vkd3d_spirv_build_op_fdiv(builder, type_id, @@ -4370,14 +4376,10 @@ static void vkd3d_dxbc_compiler_emit_sincos(struct vkd3d_dxbc_compiler *compiler struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_src_param *src = instruction->src; uint32_t type_id, src_id, sin_id = 0, cos_id = 0; - unsigned int component_count; if (dst_sin->reg.type != VKD3DSPR_NULL) { - component_count = vkd3d_write_mask_component_count(dst_sin->write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst_sin->reg.data_type), component_count); - + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, dst_sin); src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst_sin->write_mask); sin_id = vkd3d_spirv_build_op_glsl_std450_sin(builder, type_id, src_id); @@ -4387,10 +4389,7 @@ static void vkd3d_dxbc_compiler_emit_sincos(struct vkd3d_dxbc_compiler *compiler { if (dst_sin->reg.type == VKD3DSPR_NULL || dst_cos->write_mask != dst_sin->write_mask) { - component_count = vkd3d_write_mask_component_count(dst_cos->write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst_cos->reg.data_type), component_count); - + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, dst_cos); src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst_cos->write_mask); } @@ -4411,7 +4410,6 @@ static void vkd3d_dxbc_compiler_emit_imul(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; uint32_t type_id, val_id, src0_id, src1_id; - unsigned int component_count; if (dst[0].reg.type != VKD3DSPR_NULL) FIXME("Extended multiplies not implemented.\n"); /* SpvOpSMulExtended */ @@ -4419,9 +4417,7 @@ static void vkd3d_dxbc_compiler_emit_imul(struct vkd3d_dxbc_compiler *compiler, if (dst[1].reg.type == VKD3DSPR_NULL) return; - component_count = vkd3d_write_mask_component_count(dst[1].write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst[1].reg.data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, &dst[1]); src0_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], dst[1].write_mask); src1_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], dst[1].write_mask); @@ -4464,8 +4460,7 @@ static void vkd3d_dxbc_compiler_emit_udiv(struct vkd3d_dxbc_compiler *compiler, if (dst[0].reg.type != VKD3DSPR_NULL) { component_count = vkd3d_write_mask_component_count(dst[0].write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst[0].reg.data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, &dst[0]); src0_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], dst[0].write_mask); src1_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], dst[0].write_mask); @@ -4487,8 +4482,7 @@ static void vkd3d_dxbc_compiler_emit_udiv(struct vkd3d_dxbc_compiler *compiler, if (!component_count || dst[0].write_mask != dst[1].write_mask) { component_count = vkd3d_write_mask_component_count(dst[1].write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst[1].reg.data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, &dst[1]); src0_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], dst[1].write_mask); src1_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], dst[1].write_mask); @@ -5023,7 +5017,6 @@ static void vkd3d_dxbc_compiler_emit_deriv_instruction(struct vkd3d_dxbc_compile const struct vkd3d_shader_src_param *src = instruction->src; const struct instruction_info *info; uint32_t type_id, src_id, val_id; - unsigned int component_count; unsigned int i; static const struct instruction_info @@ -5063,10 +5056,7 @@ static void vkd3d_dxbc_compiler_emit_deriv_instruction(struct vkd3d_dxbc_compile assert(instruction->dst_count == 1); assert(instruction->src_count == 1); - component_count = vkd3d_write_mask_component_count(dst->write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst->reg.data_type), component_count); - + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, dst); src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst->write_mask); val_id = vkd3d_spirv_build_op_tr1(builder, &builder->function_stream, info->op, type_id, src_id); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); -- 2.16.4

2 1

[PATCH vkd3d 2/6] vkd3d-shader: Implement clip distances.
by Józef Kucia 05 Sep '18

05 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 112 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 104 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 96d660136755..2e8c5cf4ef7f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1867,6 +1867,7 @@ struct vkd3d_dxbc_compiler { uint32_t id; enum vkd3d_component_type component_type; + bool is_spirv_array; } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t output_setup_function_id; @@ -1877,6 +1878,8 @@ struct vkd3d_dxbc_compiler const struct vkd3d_shader_scan_info *scan_info; }; +static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_compiler *compiler); + struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, const struct vkd3d_shader_interface *shader_interface, @@ -1951,6 +1954,8 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader compiler->scan_info = scan_info; + vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); + return compiler; } @@ -2950,6 +2955,7 @@ struct vkd3d_spirv_builtin unsigned int component_count; SpvBuiltIn spirv_builtin; vkd3d_spirv_builtin_fixup_pfn fixup_pfn; + bool is_spirv_array; }; /* @@ -2970,6 +2976,8 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInLayer}}, {VKD3D_SIV_IS_FRONT_FACE, {VKD3D_TYPE_BOOL, 1, SpvBuiltInFrontFacing, sv_front_face_fixup}}, + + {VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, NULL, true}}, }; static const struct { @@ -3249,6 +3257,61 @@ static unsigned int get_shader_output_swizzle(struct vkd3d_dxbc_compiler *compil return compile_args->output_swizzles[register_idx]; } +/* Emits arrayed SPIR-V built-in variables. */ +static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_signature *output_signature = compiler->output_signature; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t clip_distance_mask = 0, clip_distance_id = 0; + const struct vkd3d_spirv_builtin *builtin; + unsigned int i, count; + + for (i = 0; i < output_signature->element_count; ++i) + { + const struct vkd3d_shader_signature_element *e = &output_signature->elements[i]; + + switch (e->sysval_semantic) + { + case VKD3D_SV_CLIP_DISTANCE: + if (e->semantic_index >= sizeof(clip_distance_mask) * CHAR_BIT / VKD3D_VEC4_SIZE) + { + ERR("Invalid semantic index %u for clip distance.\n", e->semantic_index); + break; + } + + clip_distance_mask |= (e->mask & VKD3DSP_WRITEMASK_ALL) << (VKD3D_VEC4_SIZE * e->semantic_index); + break; + + default: + break; + } + } + + if (!clip_distance_mask) + return; + + count = vkd3d_popcount(clip_distance_mask); + builtin = get_spirv_builtin_for_sysval(VKD3D_SIV_CLIP_DISTANCE); + clip_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); + vkd3d_spirv_add_iface_variable(builder, clip_distance_id); + + for (i = 0; i < output_signature->element_count; ++i) + { + const struct vkd3d_shader_signature_element *e = &output_signature->elements[i]; + + switch (e->sysval_semantic) + { + case VKD3D_SV_CLIP_DISTANCE: + compiler->output_info[i].id = clip_distance_id; + break; + + default: + break; + } + } +} + static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3276,22 +3339,32 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); component_count = vkd3d_write_mask_component_count(dst->write_mask); + output_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); if (builtin) { component_type = builtin->component_type; - output_component_count = builtin->component_count; + if (!builtin->is_spirv_array) + output_component_count = builtin->component_count; } else { component_type = signature_element->component_type; - output_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); } assert(component_count <= output_component_count); storage_class = SpvStorageClassOutput; - id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - storage_class, component_type, output_component_count); - vkd3d_spirv_add_iface_variable(builder, id); + + if (compiler->output_info[signature_idx].id) + { + id = compiler->output_info[signature_idx].id; + } + else + { + id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, + storage_class, component_type, output_component_count); + vkd3d_spirv_add_iface_variable(builder, id); + } + if (builtin) { vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); @@ -3307,9 +3380,11 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler compiler->output_info[signature_idx].id = id; compiler->output_info[signature_idx].component_type = component_type; + compiler->output_info[signature_idx].is_spirv_array = builtin && builtin->is_spirv_array; use_private_variable = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE - || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE; + || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE + || (builtin && builtin->is_spirv_array); if (use_private_variable) storage_class = SpvStorageClassPrivate; @@ -6260,9 +6335,11 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi const struct vkd3d_shader_output_info *output_info, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; uint32_t write_mask, use_mask, uninit_mask, swizzle; unsigned int component_count; - uint32_t type_id, zero_id; + unsigned int i, index; + uint32_t output_id; write_mask = output->mask & 0xff; use_mask = (output->mask >> 8) & 0xff; @@ -6288,7 +6365,26 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi val_id, zero_id, uninit_mask, output_info->component_type, component_count); } - vkd3d_spirv_build_op_store(builder, output_info->id, val_id, SpvMemoryAccessMaskNone); + output_id = output_info->id; + + if (!output_info->is_spirv_array) + { + vkd3d_spirv_build_op_store(builder, output_id, val_id, SpvMemoryAccessMaskNone); + return; + } + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); + for (i = 0, index = output->semantic_index * VKD3D_VEC4_SIZE; i < component_count; ++i, ++index) + { + uint32_t indexes[] = {vkd3d_dxbc_compiler_get_constant_uint(compiler, index)}; + + chain_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, + output_id, indexes, ARRAY_SIZE(indexes)); + object_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, + write_mask, output_info->component_type, VKD3D_NO_SWIZZLE, VKD3DSP_WRITEMASK_0 << i); + vkd3d_spirv_build_op_store(builder, chain_id, object_id, SpvMemoryAccessMaskNone); + } } static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_compiler *compiler) -- 2.16.4

2 1

[PATCH] xmllite: Prefere builtin version.
by Jacek Caban 05 Sep '18

05 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/xmllite/Makefile.in | 3 +-- dlls/xmllite/xmllite_main.c | 45 --------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 dlls/xmllite/xmllite_main.c

2 1

[PATCH v2] userenv: Fix setting the ALLUSERSPROFILE environment variable.
by Hans Leidekker 05 Sep '18

05 Sep '18

v2: Rebased. Since 27edd4e35c1eb3827dfb20578733242d9ed3d460 ALLUSERSPROFILE is set to C:\\users\\C:\\users\\Public. This is because the expanded registry value of "Public" is appended to "ProfilesDirectory" and "Public" expands to a full path. AllUsersProfile, used before this commit, expanded to just "Public". Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/userenv/userenv_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 06c7653836..11a4f75654 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -244,7 +244,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, static const WCHAR SystemRootW[] = {'S','y','s','t','e','m','R','o','o','t',0}; static const WCHAR SystemDriveW[] = {'S','y','s','t','e','m','D','r','i','v','e',0}; - static const WCHAR AllUsersProfileW[] = {'P','u','b','l','i','c',0}; + static const WCHAR PublicW[] = {'P','u','b','l','i','c',0}; static const WCHAR ALLUSERSPROFILEW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; static const WCHAR USERNAMEW[] = {'U','S','E','R','N','A','M','E',0}; static const WCHAR USERPROFILEW[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; @@ -323,8 +323,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, profiles_dir[len] = '\0'; } - memcpy(buf, profiles_dir, len*sizeof(WCHAR)); - if (get_reg_value(env, hkey, AllUsersProfileW, buf+len, UNICODE_STRING_MAX_CHARS-len)) + if (get_reg_value(env, hkey, PublicW, buf, UNICODE_STRING_MAX_CHARS)) { RtlInitUnicodeString(&us_name, ALLUSERSPROFILEW); RtlInitUnicodeString(&us_val, buf); -- 2.11.0

1 0

[PATCH] userenv: Fix setting the ALLUSERSPROFILE environment variable.
by Hans Leidekker 05 Sep '18

05 Sep '18

Since 27edd4e35c1eb3827dfb20578733242d9ed3d460 ALLUSERSPROFILE is set to C:\\users\\C:\\users\\Public. This is because the expanded registry value of "Public" is appended to "ProfilesDirectory" and "Public" expands to a full path. AllUsersProfile, used before this commit, expanded to just "Public". Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/userenv/userenv_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 538b912b20..11a4f75654 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -244,7 +244,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, static const WCHAR SystemRootW[] = {'S','y','s','t','e','m','R','o','o','t',0}; static const WCHAR SystemDriveW[] = {'S','y','s','t','e','m','D','r','i','v','e',0}; - static const WCHAR AllUsersProfileW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e',0}; + static const WCHAR PublicW[] = {'P','u','b','l','i','c',0}; static const WCHAR ALLUSERSPROFILEW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; static const WCHAR USERNAMEW[] = {'U','S','E','R','N','A','M','E',0}; static const WCHAR USERPROFILEW[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; @@ -323,8 +323,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, profiles_dir[len] = '\0'; } - memcpy(buf, profiles_dir, len*sizeof(WCHAR)); - if (get_reg_value(env, hkey, AllUsersProfileW, buf+len, UNICODE_STRING_MAX_CHARS-len)) + if (get_reg_value(env, hkey, PublicW, buf, UNICODE_STRING_MAX_CHARS)) { RtlInitUnicodeString(&us_name, ALLUSERSPROFILEW); RtlInitUnicodeString(&us_val, buf); -- 2.11.0

2 1

[PATCH v4] ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT.
by Jactry Zeng 05 Sep '18

05 Sep '18

Thanks Huw's advice! Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42710 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ole32/ole2impl.c | 97 +++++++++++++++++++- dlls/ole32/tests/ole2.c | 191 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 286 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index fa5777beb0..e3820b9ac2 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -232,9 +232,102 @@ HRESULT WINAPI OleCreateStaticFromData(IDataObject *data, REFIID iid, IOleClientSite *client_site, IStorage *stg, void **obj) { - FIXME("%p,%s,%08x,%p,%p,%p,%p: semi-stub\n", + HRESULT hr; + CLSID clsid; + IOleObject * ole_object = NULL; + IOleCache2 *ole_cache = NULL; + IPersistStorage *persist = NULL; + DWORD connection; + STGMEDIUM stgmedium; + LPOLESTR ole_typename; + + TRACE("(%p, %s, 0x%08x, %p, %p, %p, %p)\n", data, debugstr_guid(iid), renderopt, fmt, client_site, stg, obj); - return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); + + if (!obj || !stg) + return E_INVALIDARG; + + if (renderopt != OLERENDER_FORMAT) + { + FIXME("semi-stub\n"); + return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); + } + + if (!fmt) + return E_INVALIDARG; + + hr = IDataObject_GetData(data, fmt, &stgmedium); + if (FAILED(hr)) return hr; + + switch (fmt->cfFormat) + { + case CF_BITMAP: + case CF_DIB: + clsid = CLSID_Picture_Dib; + break; + case CF_ENHMETAFILE: + clsid = CLSID_Picture_EnhMetafile; + break; + case CF_METAFILEPICT: + clsid = CLSID_Picture_Metafile; + break; + default: + ReleaseStgMedium(&stgmedium); + return DV_E_CLIPFORMAT; + } + hr = OleCreateDefaultHandler(&clsid, NULL, &IID_IOleObject, (void **)&ole_object); + if (FAILED(hr)) goto end; + + if (client_site) + { + hr = IOleObject_SetClientSite(ole_object, client_site); + if (FAILED(hr)) goto end; + } + + hr = IOleObject_QueryInterface(ole_object, &IID_IOleCache2, (void **)&ole_cache); + if (FAILED(hr)) goto end; + + hr = IOleObject_QueryInterface(ole_object, &IID_IPersistStorage, (void **)&persist); + if (FAILED(hr)) goto end; + + hr = WriteClassStg(stg, &clsid); + if (FAILED(hr)) goto end; + + hr = IPersistStorage_InitNew(persist, stg); + if (FAILED(hr)) goto end; + + hr = IOleCache2_Cache(ole_cache, fmt, ADVF_PRIMEFIRST, &connection); + if (FAILED(hr)) goto end; + + hr = IOleCache2_SetData(ole_cache, fmt, &stgmedium, TRUE); + if (FAILED(hr)) goto end; + stgmedium.tymed = TYMED_NULL; + + hr = IOleObject_GetUserType(ole_object, USERCLASSTYPE_FULL, &ole_typename); + if(FAILED(hr)) + ole_typename = NULL; + hr = WriteFmtUserTypeStg(stg, fmt->cfFormat, ole_typename); + CoTaskMemFree(ole_typename); + if (FAILED(hr)) goto end; + + hr = IPersistStorage_Save(persist, stg, TRUE); + if (FAILED(hr)) goto end; + + hr = IPersistStorage_SaveCompleted(persist, NULL); + if (FAILED(hr)) goto end; + + hr = IOleObject_QueryInterface(ole_object, iid, obj); + +end: + if (stgmedium.tymed == TYMED_NULL) + ReleaseStgMedium(&stgmedium); + if (persist) + IPersistStorage_Release(persist); + if (ole_cache) + IOleCache2_Release(ole_cache); + if (ole_object) + IOleObject_Release(ole_object); + return hr; } /****************************************************************************** diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 48c9e0cbab..9b82e49b36 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -257,6 +257,21 @@ static void create_mfpict(STGMEDIUM *med) med->pUnkForRelease = NULL; } +static void create_text(STGMEDIUM *med) +{ + HGLOBAL handle; + char *p; + + handle = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 5); + p = GlobalLock(handle); + strcpy(p, "test"); + GlobalUnlock(handle); + + med->tymed = TYMED_HGLOBAL; + U(med)->hGlobal = handle; + med->pUnkForRelease = NULL; +} + static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, void **ppv) { CHECK_EXPECTED_METHOD("OleObject_QueryInterface"); @@ -1490,6 +1505,12 @@ static HRESULT WINAPI DataObject_GetData( IDataObject *iface, FORMATETC *fmt_in, case CF_BITMAP: create_bitmap( med ); return S_OK; + case CF_ENHMETAFILE: + create_emf( med ); + return S_OK; + case CF_TEXT: + create_text( med ); + return S_OK; default: trace( "unhandled fmt %d\n", fmt->cfFormat ); } @@ -4593,6 +4614,175 @@ todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_4 || } } +static void test_OleCreateStaticFromData(void) +{ + HRESULT hr; + IOleObject *ole_obj = NULL; + IStorage *storage; + ILockBytes *ilb; + IPersist *presist; + CLSID clsid; + STATSTG statstg; + int enumerated_streams, matched_streams; + STGMEDIUM stgmed; + static FORMATETC dib_fmt[] = + { + { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, + { 0 } + }; + static FORMATETC emf_fmt[] = + { + { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF }, + { 0 } + }; + static FORMATETC text_fmt[] = + { + { CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, + { 0 } + }; + static const struct expected_method methods_create_from_dib[] = + { + { "DataObject_EnumFormatEtc", TEST_TODO }, + { "DataObject_GetDataHere", 0 }, + { "DataObject_QueryGetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_ISTORAGE } }, + { NULL } + }; + static const struct expected_method methods_createstatic_from_dib[] = + { + { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, + { NULL } + }; + static const struct expected_method methods_createstatic_from_emf[] = + { + { "DataObject_GetData", 0, { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, + { NULL } + }; + static const struct expected_method methods_createstatic_from_text[] = + { + { "DataObject_GetData", 0, { CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, + { NULL } + }; + static struct storage_def stg_def_dib = + { + &CLSID_Picture_Dib, 3, + {{ "\1Ole", -1, 0, 0, NULL, 0 }, + { "\1CompObj", -1, 0, 0, NULL, 0 }, + { "CONTENTS", -1, 0, 0, NULL, 0 }} + }; + static struct storage_def stg_def_emf = + { + &CLSID_Picture_EnhMetafile, 3, + {{ "\1Ole", -1, 0, 0, NULL, 0 }, + { "\1CompObj", -1, 0, 0, NULL, 0 }, + { "CONTENTS", -1, 0, 0, NULL, 0 }} + }; + + + hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); + ok(hr == S_OK, "CreateILockBytesOnHGlobal failed: 0x%08x.\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_READWRITE, + 0, &storage); + ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); + ILockBytes_Release(ilb); + + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + dib_fmt, NULL, NULL, (void **)&ole_obj); + ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); + + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + dib_fmt, NULL, storage, NULL); + ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); + + /* CF_DIB */ + g_dataobject_fmts = dib_fmt; + expected_method_list = methods_createstatic_from_dib; + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + dib_fmt, NULL, storage, (void **)&ole_obj); + ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); + hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&presist); + ok(hr == S_OK, "IOleObject_QueryInterface failed: 0x%08x.\n", hr); + hr = IPersist_GetClassID(presist, &clsid); + ok(hr == S_OK, "IPersist_GetClassID failed: 0x%08x.\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_Picture_Dib), "Got wrong clsid: %s, expected: %s.\n", + wine_dbgstr_guid(&clsid), wine_dbgstr_guid(&CLSID_Picture_Dib)); + hr = IStorage_Stat(storage, &statstg, STATFLAG_NONAME); + ok_ole_success(hr, "IStorage_Stat"); + ok(IsEqualCLSID(&CLSID_Picture_Dib, &statstg.clsid), "Wrong CLSID in storage.\n"); + enumerated_streams = matched_streams = -1; + get_stgmedium(CF_DIB, &stgmed); + get_stgdef(&stg_def_dib, CF_DIB, &stgmed, 2); + check_storage_contents(storage, &stg_def_dib, &enumerated_streams, &matched_streams); + ok(enumerated_streams == matched_streams, "enumerated %d != matched %d\n", + enumerated_streams, matched_streams); + ok(enumerated_streams == stg_def_dib.stream_count, "created %d != def streams %d\n", + enumerated_streams, stg_def_dib.stream_count); + ReleaseStgMedium(&stgmed); + IPersist_Release(presist); + IStorage_Release(storage); + IOleObject_Release(ole_obj); + + /* CF_ENHMETAFILE */ + hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); + ok(hr == S_OK, "CreateILockBytesOnHGlobal failed: 0x%08x.\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_READWRITE, + 0, &storage); + ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); + ILockBytes_Release(ilb); + g_dataobject_fmts = emf_fmt; + expected_method_list = methods_createstatic_from_emf; + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + emf_fmt, NULL, storage, (void **)&ole_obj); + ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); + hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&presist); + ok(hr == S_OK, "IOleObject_QueryInterface failed: 0x%08x.\n", hr); + hr = IPersist_GetClassID(presist, &clsid); + ok(hr == S_OK, "IPersist_GetClassID failed: 0x%08x.\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_Picture_EnhMetafile), "Got wrong clsid: %s, expected: %s.\n", + wine_dbgstr_guid(&clsid), wine_dbgstr_guid(&CLSID_Picture_EnhMetafile)); + hr = IStorage_Stat(storage, &statstg, STATFLAG_NONAME); + ok_ole_success(hr, "IStorage_Stat"); + ok(IsEqualCLSID(&CLSID_Picture_EnhMetafile, &statstg.clsid), "Wrong CLSID in storage.\n"); + enumerated_streams = matched_streams = -1; + get_stgmedium(CF_ENHMETAFILE, &stgmed); + get_stgdef(&stg_def_emf, CF_ENHMETAFILE, &stgmed, 2); + check_storage_contents(storage, &stg_def_emf, &enumerated_streams, &matched_streams); + ok(enumerated_streams == matched_streams, "enumerated %d != matched %d\n", + enumerated_streams, matched_streams); + ok(enumerated_streams == stg_def_emf.stream_count, "created %d != def streams %d\n", + enumerated_streams, stg_def_emf.stream_count); + ReleaseStgMedium(&stgmed); + IPersist_Release(presist); + IStorage_Release(storage); + IOleObject_Release(ole_obj); + + /* CF_TEXT */ + hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); + ok(hr == S_OK, "CreateILockBytesOnHGlobal failed: 0x%08x.\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_READWRITE, + 0, &storage); + ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); + ILockBytes_Release(ilb); + g_dataobject_fmts = text_fmt; + expected_method_list = methods_createstatic_from_text; + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + text_fmt, NULL, storage, (void **)&ole_obj); + ok(hr == DV_E_CLIPFORMAT, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); + IStorage_Release(storage); + + hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); + ok(hr == S_OK, "CreateILockBytesOnHGlobal failed: 0x%08x.\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_READWRITE, + 0, &storage); + ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); + ILockBytes_Release(ilb); + g_dataobject_fmts = dib_fmt; + expected_method_list = methods_create_from_dib; + hr = OleCreateFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, dib_fmt, NULL, + storage, (void **)&ole_obj); + todo_wine ok(hr == DV_E_FORMATETC, "OleCreateFromData should failed: 0x%08x.\n", hr); + IStorage_Release(storage); +} + START_TEST(ole2) { DWORD dwRegister; @@ -4643,6 +4833,7 @@ START_TEST(ole2) test_data_cache_save(); test_data_cache_save_data(); test_data_cache_contents(); + test_OleCreateStaticFromData(); CoUninitialize(); } -- 2.18.0

2 1

[PATCH 1/7] opcservices: Keep parts in a set.
by Nikolay Sivov 05 Sep '18

05 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/opc_private.h | 26 ++++++++++++++++++++++++++ dlls/opcservices/package.c | 23 +++++++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/opcservices/opc_private.h b/dlls/opcservices/opc_private.h index 4784b6c458..30bcb0090c 100644 --- a/dlls/opcservices/opc_private.h +++ b/dlls/opcservices/opc_private.h @@ -19,5 +19,31 @@ #include "msopc.h" #include "wine/heap.h" +static inline BOOL opc_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + extern HRESULT opc_package_create(IOpcPackage **package) DECLSPEC_HIDDEN; extern HRESULT opc_part_uri_create(const WCHAR *uri, IOpcPartUri **part_uri) DECLSPEC_HIDDEN; diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index cd4741d220..869fb036e2 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -53,6 +53,10 @@ struct opc_part_set { IOpcPartSet IOpcPartSet_iface; LONG refcount; + + struct opc_part **parts; + size_t size; + size_t count; }; struct opc_relationship @@ -220,7 +224,7 @@ static const IOpcPartVtbl opc_part_vtbl = opc_part_GetCompressionOptions, }; -static HRESULT opc_part_create(IOpcPartUri *name, const WCHAR *content_type, +static HRESULT opc_part_create(struct opc_part_set *set, IOpcPartUri *name, const WCHAR *content_type, DWORD compression_options, IOpcPart **out) { struct opc_part *part; @@ -228,6 +232,9 @@ static HRESULT opc_part_create(IOpcPartUri *name, const WCHAR *content_type, if (!name) return E_POINTER; + if (!opc_array_reserve((void **)&set->parts, &set->size, set->count + 1, sizeof(*set->parts))) + return E_OUTOFMEMORY; + if (!(part = heap_alloc_zero(sizeof(*part)))) return E_OUTOFMEMORY; @@ -242,6 +249,9 @@ static HRESULT opc_part_create(IOpcPartUri *name, const WCHAR *content_type, return E_OUTOFMEMORY; } + set->parts[set->count++] = part; + IOpcPart_AddRef(&part->IOpcPart_iface); + *out = &part->IOpcPart_iface; TRACE("Created part %p.\n", *out); return S_OK; @@ -281,7 +291,14 @@ static ULONG WINAPI opc_part_set_Release(IOpcPartSet *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + size_t i; + + for (i = 0; i < part_set->count; ++i) + IOpcPart_Release(&part_set->parts[i]->IOpcPart_iface); + heap_free(part_set->parts); heap_free(part_set); + } return refcount; } @@ -296,10 +313,12 @@ static HRESULT WINAPI opc_part_set_GetPart(IOpcPartSet *iface, IOpcPartUri *name static HRESULT WINAPI opc_part_set_CreatePart(IOpcPartSet *iface, IOpcPartUri *name, LPCWSTR content_type, OPC_COMPRESSION_OPTIONS compression_options, IOpcPart **part) { + struct opc_part_set *part_set = impl_from_IOpcPartSet(iface); + TRACE("iface %p, name %p, content_type %s, compression_options %#x, part %p.\n", iface, name, debugstr_w(content_type), compression_options, part); - return opc_part_create(name, content_type, compression_options, part); + return opc_part_create(part_set, name, content_type, compression_options, part); } static HRESULT WINAPI opc_part_set_DeletePart(IOpcPartSet *iface, IOpcPartUri *name) -- 2.18.0

1 6

Question on launching unix binaries
by Ann and Jason Edmeades 04 Sep '18

04 Sep '18

Hello, I've been working through the 'cmd' component bugs and am looking into bug#37780 (which relates to an old wontfix bug#34730) and wanted to get confirmation from an expert. This bug complains that if you manually create a file with a .exe extension, mark it executable (from Unix permissions perspective) and contains shell script (#!/bin/bash etc) then cmd.exe can launch the process but doesn't wait for it to complete. This is true and reproducible - see 34730 for extensive details including AJ saying that is an ok to launch unix scripts (comment #23) Debugging this, it would appear our cmd code decides not to wait (which is trivial to fix), but even if we try to wait we cannot - It would appear that CreateProcess for such a '.exe' file works, BUT it does not return a valid handle which can be waited on. I cannot say I am massively surprised by this but without a valid waitable handle, we obviously cannot give the user what they want Questions/thoughts - Is it desirable to do anything about this or just close wontfix, ie launching unix shell is asynchronous? - Is it even possible to return a valid handle from CreateProcess that we can WaitForSingleObject on to know when the unix process completes? Thanks, Jason

1 0

[PATCH] winhttp: Improve WINHTTP_OPTION_CONNECT_RETRIES stub.
by Jacek Caban 04 Sep '18

04 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winhttp/session.c | 3 +++ dlls/winhttp/tests/winhttp.c | 5 +++++ 2 files changed, 8 insertions(+)

2 1

Wiki editing permissions
by Hugh McMaster 04 Sep '18

04 Sep '18

Hi, So, I had an account on the old wiki that had editing permissions. I've just created an account on the new wiki and would like to update some pages. But editing is limited to the Administrators and Trustworthy user groups. Can someone please add me to the appropriate group? Thank you -- Hugh McMaster

2 2

[PATCH 1/3 resend] kernel32/tests: Test ReplaceFileW on open "exe"
by Brock York 04 Sep '18

04 Sep '18

Replicate the scenario of an exe calling ReplaceFileW on itself. An exe calling ReplaceFileW on itself will fail in Wine currently but succeed in Windows 7. This seems to be the problem seen in bug 33845 where the WarFrame launcher will keep relaunching itself because the launcher failed to replace itself with the new version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33845 Signed-off-by: Brock York <twunknown(a)gmail.com> --- dlls/kernel32/tests/file.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 1c4157279b..2e2c55bcc9 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3677,6 +3677,30 @@ static void test_ReplaceFileA(void) ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "SetFileAttributesA: error setting to normal %d\n", GetLastError()); + /* re-create replacement file for pass w/ replaced opened with + * the same permissions as an exe (Replicating an exe trying to + * replace itself) + */ + ret = GetTempFileNameA(temp_path, prefix, 0, replacement); + ok(ret != 0, "GetTempFileNameA error (replacement) %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + /* make sure that the replacement file still exists */ + hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacementFile != INVALID_HANDLE_VALUE || + broken(GetLastError() == ERROR_FILE_NOT_FOUND), /* win2k */ + "unexpected error, replacement file should still exist %d\n", GetLastError()); + CloseHandle(hReplacementFile); + + /* make sure that the replaced file is opened like an exe*/ + hReplacedFile = CreateFileA(replaced, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacedFile != INVALID_HANDLE_VALUE, + "unexpected error, replaced file should be able to be opened %d\n", GetLastError()); + /*Calling ReplaceFileA on an exe should succeed*/ + ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); + todo_wine ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + CloseHandle(hReplacedFile); + /* replacement file still exists, make pass w/o "replaced" */ ret = DeleteFileA(replaced); ok(ret || GetLastError() == ERROR_ACCESS_DENIED, -- 2.18.0

2 3

[PATCH 1/2] msi/tests: Remove some workarounds in test_publish_assemblies().
by Zebediah Figura 04 Sep '18

04 Sep '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/action.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index cb8514d..57044bf 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -6192,11 +6192,6 @@ static void test_publish_assemblies(void) skip("Not enough rights to perform tests\n"); goto done; } - if (r == ERROR_INSTALL_FAILURE) - { - skip("No support for installing side-by-side assemblies\n"); - goto done; - } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey); @@ -6211,23 +6206,20 @@ static void test_publish_assemblies(void) RegCloseKey(hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_dotnet); @@ -6240,7 +6232,6 @@ static void test_publish_assemblies(void) ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_win32); @@ -6274,23 +6265,20 @@ static void test_publish_assemblies(void) RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_win32, 0, access, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL ALLUSERS=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_dotnet, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_dotnet); @@ -6303,7 +6291,6 @@ static void test_publish_assemblies(void) ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_win32, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_win32); -- 2.7.4

3 4

[PATCH 2/2] ddraw: Accept d3d1 and d3d2 versions of D3DFINDDEVICERESULT in IDirect3D_FindDevice.
by Alistair Leslie-Hughes 04 Sep '18

04 Sep '18

Based off a patch by Michael Muller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ddraw/ddraw.c | 40 ++++++++++++++++++++++++++++++++++++---- dlls/ddraw/tests/d3d.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e60c5f3..fe81f90 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -25,6 +25,8 @@ #include "wine/port.h" #include "ddraw_private.h" +#include "ddrawi.h" +#include "d3dhal.h" #include "wine/exception.h" @@ -74,6 +76,20 @@ static struct enum_device_entry }, }; +typedef struct _D3DFINDDEVICERESULT1 { + DWORD dwSize; + GUID guid; + D3DDEVICEDESC_V1 ddHwDesc; + D3DDEVICEDESC_V1 ddSwDesc; +} D3DFINDDEVICERESULT_V1; + +typedef struct _D3DFINDDEVICERESULT2 { + DWORD dwSize; + GUID guid; + D3DDEVICEDESC_V2 ddHwDesc; + D3DDEVICEDESC_V2 ddSwDesc; +} D3DFINDDEVICERESULT_V2; + static void STDMETHODCALLTYPE ddraw_null_wined3d_object_destroyed(void *parent) {} const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops = @@ -4045,8 +4061,8 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd if (!fds || !fdr) return DDERR_INVALIDPARAMS; - if (fds->dwSize != sizeof(D3DFINDDEVICESEARCH) - || fdr->dwSize != sizeof(D3DFINDDEVICERESULT)) + if (fds->dwSize != sizeof(D3DFINDDEVICESEARCH) || (fdr->dwSize != sizeof(D3DFINDDEVICERESULT_V1) && + fdr->dwSize != sizeof(D3DFINDDEVICERESULT_V2) && fdr->dwSize != sizeof(D3DFINDDEVICERESULT))) return DDERR_INVALIDPARAMS; if ((fds->dwFlags & D3DFDS_COLORMODEL) @@ -4075,8 +4091,24 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd /* Now return our own GUID */ ddraw_d3dcaps1_from_7(&desc1, &desc7); fdr->guid = IID_D3DDEVICE_WineD3D; - fdr->ddHwDesc = desc1; - fdr->ddSwDesc = desc1; + + if (fdr->dwSize == sizeof(D3DFINDDEVICERESULT_V1)) + { + D3DFINDDEVICERESULT_V1 *fdr1 = (D3DFINDDEVICERESULT_V1 *)fdr; + memcpy(&fdr1->ddHwDesc, &desc1, sizeof(fdr1->ddHwDesc)); + memcpy(&fdr1->ddSwDesc, &desc1, sizeof(fdr1->ddSwDesc)); + } + else if (fdr->dwSize == sizeof(D3DFINDDEVICERESULT_V2)) + { + D3DFINDDEVICERESULT_V2 *fdr2 = (D3DFINDDEVICERESULT_V2 *)fdr; + memcpy(&fdr2->ddHwDesc, &desc1, sizeof(fdr2->ddHwDesc)); + memcpy(&fdr2->ddSwDesc, &desc1, sizeof(fdr2->ddSwDesc)); + } + else + { + fdr->ddHwDesc = desc1; + fdr->ddSwDesc = desc1; + } TRACE("Returning Wine's wined3d device with (undumped) capabilities.\n"); diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ec0f8d7..2234399 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -27,6 +27,8 @@ #include "initguid.h" #include "ddraw.h" #include "d3d.h" +#include "ddrawi.h" +#include "d3dhal.h" #include "unknwn.h" static IDirectDraw7 *lpDD; @@ -44,6 +46,20 @@ static IDirect3DExecuteBuffer *ExecuteBuffer = NULL; static IDirect3DViewport *Viewport = NULL; static IDirect3DLight *Light = NULL; +typedef struct _D3DFINDDEVICERESULT1 { + DWORD dwSize; + GUID guid; + D3DDEVICEDESC_V1 ddHwDesc; + D3DDEVICEDESC_V1 ddSwDesc; +} D3DFINDDEVICERESULT_V1; + +typedef struct _D3DFINDDEVICERESULT2 { + DWORD dwSize; + GUID guid; + D3DDEVICEDESC_V2 ddHwDesc; + D3DDEVICEDESC_V2 ddSwDesc; +} D3DFINDDEVICERESULT_V2; + typedef struct { int total; int rgb; @@ -1628,7 +1644,6 @@ static void FindDevice(void) &IID_IDirect3DRefDevice, &IID_IDirect3DTnLHalDevice, &IID_IDirect3DNullDevice}; - D3DFINDDEVICESEARCH search = {0}; D3DFINDDEVICERESULT result = {0}; IDirect3DDevice *d3dhal; @@ -1671,6 +1686,18 @@ static void FindDevice(void) ok(hr == D3D_OK, "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); + result.dwSize = sizeof(D3DFINDDEVICERESULT_V1); + + hr = IDirect3D_FindDevice(Direct3D1, &search, (D3DFINDDEVICERESULT *)&result); + ok(hr == D3D_OK, + "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); + + result.dwSize = sizeof(D3DFINDDEVICERESULT_V2); + + hr = IDirect3D_FindDevice(Direct3D1, &search, (D3DFINDDEVICERESULT *)&result); + ok(hr == D3D_OK, + "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); + /* Try an arbitrary non-device GUID. */ search.dwSize = sizeof(search); search.dwFlags = D3DFDS_GUID; -- 1.9.1

1 0

[PATCH 1/2] include: Add D3DDeviceDesc_V2/3 structures
by Alistair Leslie-Hughes 04 Sep '18

04 Sep '18

This series Superseds 150562. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/d3dhal.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/include/d3dhal.h b/include/d3dhal.h index 9d43313..c42630d 100644 --- a/include/d3dhal.h +++ b/include/d3dhal.h @@ -47,6 +47,62 @@ typedef struct _D3DDeviceDesc_V1 { DWORD dwMaxVertexCount; } D3DDEVICEDESC_V1,*LPD3DDEVICEDESC_V1; +typedef struct _D3DDeviceDesc_V2 { + DWORD dwSize; + DWORD dwFlags; + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + BOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; + /* DirectX 5 */ + DWORD dwMinTextureWidth, dwMinTextureHeight; + DWORD dwMaxTextureWidth, dwMaxTextureHeight; + DWORD dwMinStippleWidth, dwMaxStippleWidth; + DWORD dwMinStippleHeight, dwMaxStippleHeight; +} D3DDEVICEDESC_V2, *LPD3DDEVICEDESC_V2; + +typedef struct _D3DDeviceDesc_V3 { + DWORD dwSize; + DWORD dwFlags; + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + BOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; + /* DirectX 5 */ + DWORD dwMinTextureWidth, dwMinTextureHeight; + DWORD dwMaxTextureWidth, dwMaxTextureHeight; + DWORD dwMinStippleWidth, dwMaxStippleWidth; + DWORD dwMinStippleHeight, dwMaxStippleHeight; + /* DirectX 6 */ + DWORD dwMaxTextureRepeat; + DWORD dwMaxTextureAspectRatio; + DWORD dwMaxAnisotropy; + D3DVALUE dvGuardBandLeft; + D3DVALUE dvGuardBandTop; + D3DVALUE dvGuardBandRight; + D3DVALUE dvGuardBandBottom; + D3DVALUE dvExtentsAdjust; + DWORD dwStencilCaps; + DWORD dwFVFCaps; + DWORD dwTextureOpCaps; + WORD wMaxTextureBlendStages; + WORD wMaxSimultaneousTextures; +} D3DDEVICEDESC_V3, *LPD3DDEVICEDESC_V3; + typedef struct _D3DHAL_GLOBALDRIVERDATA { DWORD dwSize; D3DDEVICEDESC_V1 hwCaps; -- 1.9.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel