May 2021 - Wine-commits - list.winehq.org

Zebediah Figura : msi: Write "Clients" value as REG_MULTI_SZ in PublishProduct.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 1951853d06144e67b8a3d9d63c835e06a7232588 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1951853d06144e67b8a3d9d6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 2 21:42:44 2021 -0500 msi: Write "Clients" value as REG_MULTI_SZ in PublishProduct. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index cc5d56fdc2b..bcb1a4f578e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4042,7 +4042,7 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) msi_reg_set_val_dword(hkey, L"Assignment", 0); msi_reg_set_val_dword(hkey, L"AdvertiseFlags", 0x184); msi_reg_set_val_dword(hkey, INSTALLPROPERTY_INSTANCETYPEW, 0); - msi_reg_set_val_str(hkey, L"Clients", L":"); + msi_reg_set_val_multi_str(hkey, L"Clients", L":\0"); if (!(guids = msi_get_package_code(package->db))) return ERROR_OUTOFMEMORY; if ((ptr = wcschr(guids, ';'))) *ptr = 0;

1 0

Zebediah Figura : msi/tests: Always explicitly test REG_MULTI_SZ strings.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 80426fdc76597768b787a38644f1c53110b26f05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80426fdc76597768b787a386… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 2 21:42:45 2021 -0500 msi/tests: Always explicitly test REG_MULTI_SZ strings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index c1263258948..4ede8458070 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2513,7 +2513,7 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase res = RegQueryValueExA(prodkey, name, NULL, &type, (LPBYTE)val, &size); if (res != ERROR_SUCCESS || - (type != REG_SZ && type != REG_EXPAND_SZ && type != REG_MULTI_SZ)) + (type != REG_SZ && type != REG_EXPAND_SZ)) { ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n"); return; @@ -2528,9 +2528,14 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase static void check_reg_multi(HKEY prodkey, const char *name, const char *expect, DWORD line) { char val[MAX_PATH]; - DWORD size, type; + DWORD expect_size = 0, size, type; + const char *p; LONG res; + for (p = expect; *p; p += strlen(p) + 1) + ; + expect_size = (p + 1) - expect; + size = MAX_PATH; val[0] = '\0'; res = RegQueryValueExA(prodkey, name, NULL, &type, (BYTE *)val, &size); @@ -2541,7 +2546,8 @@ static void check_reg_multi(HKEY prodkey, const char *name, const char *expect, return; } - ok_(__FILE__, line)(!memcmp(val, expect, size), "wrong data\n"); + ok_(__FILE__, line)(size == expect_size, "expected size %u, got %u\n", expect_size, size); + ok_(__FILE__, line)(!memcmp(val, expect, size), "got %s\n", debugstr_an(val, size)); } static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD line) @@ -2582,6 +2588,12 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD lin #define CHECK_REG_MULTI(key, name, expect) \ check_reg_multi(key, name, expect, __LINE__); +#define CHECK_DEL_REG_MULTI(key, name, expect) \ + do { \ + check_reg_multi(key, name, expect, __LINE__); \ + RegDeleteValueA(key, name); \ + } while(0) + #define CHECK_REG_DWORD(prodkey, name, expected) \ check_reg_dword(prodkey, name, expected, __LINE__); @@ -3124,7 +3136,7 @@ currentuser: CHECK_DEL_REG_DWORD(hkey, "Assignment", 0); CHECK_DEL_REG_DWORD(hkey, "AdvertiseFlags", 0x184); CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0); - CHECK_DEL_REG_STR(hkey, "Clients", ":"); + CHECK_DEL_REG_MULTI(hkey, "Clients", ":\0"); res = RegOpenKeyA(hkey, "SourceList", &sourcelist); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3205,7 +3217,7 @@ machprod: todo_wine CHECK_DEL_REG_DWORD(hkey, "Assignment", 1); CHECK_DEL_REG_DWORD(hkey, "AdvertiseFlags", 0x184); CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0); - CHECK_DEL_REG_STR(hkey, "Clients", ":"); + CHECK_DEL_REG_MULTI(hkey, "Clients", ":\0"); res = RegOpenKeyExA(hkey, "SourceList", 0, access, &sourcelist); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -6358,24 +6370,24 @@ static void test_publish_assemblies(void) res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_dotnet, "rcHQPHq?CA(a)Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]"); + CHECK_REG_MULTI(hkey, name_dotnet, "rcHQPHq?CA(a)Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]\0"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? path_dotnet_local_wow64 : path_dotnet_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_dotnet_local, "rcHQPHq?CA(a)Uv-XqMI1e>LF,8A?0d.AW(a)vcZ$Cgox"); + CHECK_REG_MULTI(hkey, name_dotnet_local, "rcHQPHq?CA(a)Uv-XqMI1e>LF,8A?0d.AW(a)vcZ$Cgox\0"); RegCloseKey(hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + CHECK_REG_MULTI(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%\0"); 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, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + CHECK_REG_MULTI(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!\0"); RegCloseKey(hkey); /* No registration is done for a local assembly with no matching file */ @@ -6422,24 +6434,24 @@ static void test_publish_assemblies(void) res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_dotnet, 0, access, &hkey); } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_dotnet, "rcHQPHq?CA(a)Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]"); + CHECK_REG_MULTI(hkey, name_dotnet, "rcHQPHq?CA(a)Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]\0"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? classes_path_dotnet_local_wow64 : classes_path_dotnet_local; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_dotnet_local, "rcHQPHq?CA(a)Uv-XqMI1e>LF,8A?0d.AW(a)vcZ$Cgox"); + CHECK_REG_MULTI(hkey, name_dotnet_local, "rcHQPHq?CA(a)Uv-XqMI1e>LF,8A?0d.AW(a)vcZ$Cgox\0"); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_win32, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + CHECK_REG_MULTI(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%\0"); 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, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + CHECK_REG_MULTI(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!\0"); RegCloseKey(hkey); /* No registration is done for a local assembly with no matching file */

1 0

Zebediah Figura : msi/tests: Make check_reg_* helpers more verbose.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: a0f54eee2a5dc985d7e16c382516c8b66e61e54f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0f54eee2a5dc985d7e16c38… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 2 21:42:46 2021 -0500 msi/tests: Make check_reg_* helpers more verbose. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 129 +++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0f54eee2a5dc985d7e1…

1 0

Zebediah Figura : msi: Check for a NULL return from deformat_string() when checking for failure.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 814f18ab756cd69158ce893c4f7898e14d3e46dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=814f18ab756cd69158ce893c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 2 21:42:47 2021 -0500 msi: Check for a NULL return from deformat_string() when checking for failure. An empty string is valid, and can occur if e.g. a nonexistent property is expanded. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51091 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 69 ++++++++++++++++++++++++++++++++----------------- dlls/msi/tests/action.c | 8 +++++- 2 files changed, 52 insertions(+), 25 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index bcb1a4f578e..68688713074 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6790,25 +6790,34 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) if (res != ERROR_SUCCESS || !value) goto done; - if (value && !deformat_string(package, value, &deformatted)) + if (value) { - res = ERROR_OUTOFMEMORY; - goto done; - } + DWORD len = deformat_string( package, value, &deformatted ); + if (!deformatted) + { + res = ERROR_OUTOFMEMORY; + goto done; + } - if ((value = deformatted)) - { - if (flags & ENV_MOD_PREFIX) + if (len) { - p = wcsrchr( value, ';' ); - len_value = p - value; + value = deformatted; + if (flags & ENV_MOD_PREFIX) + { + p = wcsrchr( value, ';' ); + len_value = p - value; + } + else if (flags & ENV_MOD_APPEND) + { + value = wcschr( value, ';' ) + 1; + len_value = lstrlenW( value ); + } + else len_value = lstrlenW( value ); } - else if (flags & ENV_MOD_APPEND) + else { - value = wcschr( value, ';' ) + 1; - len_value = lstrlenW( value ); + value = NULL; } - else len_value = lstrlenW( value ); } res = open_env_key( flags, &env ); @@ -6997,22 +7006,34 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) return ERROR_SUCCESS; } - if (value && !deformat_string( package, value, &deformatted )) - return ERROR_OUTOFMEMORY; - - if ((value = deformatted)) + if (value) { - if (flags & ENV_MOD_PREFIX) + DWORD len = deformat_string( package, value, &deformatted ); + if (!deformatted) + { + res = ERROR_OUTOFMEMORY; + goto done; + } + + if (len) { - p = wcschr( value, ';' ); - len_value = p - value; + value = deformatted; + if (flags & ENV_MOD_PREFIX) + { + p = wcsrchr( value, ';' ); + len_value = p - value; + } + else if (flags & ENV_MOD_APPEND) + { + value = wcschr( value, ';' ) + 1; + len_value = lstrlenW( value ); + } + else len_value = lstrlenW( value ); } - else if (flags & ENV_MOD_APPEND) + else { - value = wcschr( value, ';' ) + 1; - len_value = lstrlenW( value ); + value = NULL; } - else len_value = lstrlenW( value ); } r = open_env_key( flags, &env ); diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index a5d2882acda..17de636ae52 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -249,7 +249,9 @@ static const char env_environment_dat[] = "Var27\t+-MSITESTVAR21\t[~];1\tOne\n" "Var28\t-MSITESTVAR22\t1\tOne\n" "Var29\t-MSITESTVAR23\t2\tOne\n" - "Var30\t*MSITESTVAR100\t1\tOne\n"; + "Var30\t*MSITESTVAR100\t1\tOne\n" + "Var31\t-=MSITESTVAR24\t[SERVNAME]\tOne\n" + "Var32\t-=MSITESTVAR25\t[bogus_prop]\tOne\n"; static const char service_install_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" @@ -5044,6 +5046,7 @@ static void test_envvar(void) CHECK_REG_STR(env, "MSITESTVAR19", "1"); CHECK_REG_STR(env, "MSITESTVAR20", "1"); CHECK_REG_STR(env, "MSITESTVAR21", "1"); + CHECK_REG_STR(env, "MSITESTVAR24", "TestService"); CHECK_REG_STR(env2, "MSITESTVAR100", "1"); res = RegSetValueExA(env, "MSITESTVAR22", 0, REG_SZ, (const BYTE *)"1", 2); @@ -5052,6 +5055,9 @@ static void test_envvar(void) res = RegSetValueExA(env, "MSITESTVAR23", 0, REG_SZ, (const BYTE *)"1", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegDeleteValueA(env, "MSITESTVAR25"); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(!r, "got %u\n", r);

1 0

Alexandre Julliard : ntdll: Fix the check for the main exe in get_load_order().
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: a7b5786f701c319fa6647d6d9af0433c7d0a2fb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7b5786f701c319fa6647d6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 16:28:13 2021 +0200 ntdll: Fix the check for the main exe in get_load_order(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loadorder.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/loadorder.c b/dlls/ntdll/unix/loadorder.c index 4d7ad24d2b7..aa987a80186 100644 --- a/dlls/ntdll/unix/loadorder.c +++ b/dlls/ntdll/unix/loadorder.c @@ -58,6 +58,7 @@ static const WCHAR separatorsW[] = {',',' ','\t',0}; static HANDLE std_key; static HANDLE app_key; static BOOL init_done; +static BOOL main_exe_loaded; /*************************************************************************** @@ -365,6 +366,7 @@ void set_load_order_app_name( const WCHAR *app_name ) if ((p = wcsrchr( app_name, '\\' ))) app_name = p + 1; app_key = open_app_key( app_name ); + main_exe_loaded = TRUE; } @@ -379,7 +381,7 @@ enum loadorder get_load_order( const UNICODE_STRING *nt_name ) static const WCHAR prefixW[] = {'\\','?','?','\\'}; enum loadorder ret = LO_INVALID; const WCHAR *path = nt_name->Buffer; - const WCHAR *p, *app_name = NULL; + const WCHAR *p; WCHAR *module, *basename; int len; @@ -418,7 +420,7 @@ enum loadorder get_load_order( const UNICODE_STRING *nt_name ) goto done; /* if loading the main exe with an explicit path, try native first */ - if (!app_name && basename != module+1) + if (!main_exe_loaded && basename != module+1) { ret = LO_NATIVE_BUILTIN; TRACE( "got main exe default %s for %s\n", debugstr_loadorder(ret), debugstr_w(path) );

1 0

Zhiyi Zhang : dxgi: Introduce a helper to convert between dxgi and wined3d display rotation types.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: bd192cd2c67fbddaf50347b300aef24002c0d576 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd192cd2c67fbddaf50347b3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 5 23:40:06 2021 +0800 dxgi: Introduce a helper to convert between dxgi and wined3d display rotation types. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 632b44526c1..f341388766c 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -28,6 +28,11 @@ static inline DXGI_MODE_SCANLINE_ORDER dxgi_mode_scanline_order_from_wined3d(enu return (DXGI_MODE_SCANLINE_ORDER)ordering; } +static inline DXGI_MODE_ROTATION dxgi_mode_rotation_from_wined3d(enum wined3d_display_rotation rotation) +{ + return (DXGI_MODE_ROTATION)rotation; +} + static void dxgi_mode_from_wined3d(DXGI_MODE_DESC *mode, const struct wined3d_display_mode *wined3d_mode) { mode->Width = wined3d_mode->width; @@ -318,7 +323,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput6 *iface, DXGI_O memcpy(desc->DeviceName, wined3d_desc.device_name, sizeof(desc->DeviceName)); desc->DesktopCoordinates = wined3d_desc.desktop_rect; desc->AttachedToDesktop = wined3d_desc.attached_to_desktop; - desc->Rotation = rotation; + desc->Rotation = dxgi_mode_rotation_from_wined3d(rotation); desc->Monitor = wined3d_desc.monitor; return S_OK; @@ -631,7 +636,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface, memcpy(desc->DeviceName, wined3d_desc.device_name, sizeof(desc->DeviceName)); desc->DesktopCoordinates = wined3d_desc.desktop_rect; desc->AttachedToDesktop = wined3d_desc.attached_to_desktop; - desc->Rotation = rotation; + desc->Rotation = dxgi_mode_rotation_from_wined3d(rotation); desc->Monitor = wined3d_desc.monitor; /* FIXME: fill this from monitor EDID */

1 0

Zebediah Figura : wined3d: Acquire resources through wined3d_device_context_ops.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 1ecc334df87c28524d3c10fd131459ef633bc45e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ecc334df87c28524d3c10fd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 22:23:10 2021 -0500 wined3d: Acquire resources through wined3d_device_context_ops. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 80 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 49 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ecc334df87c28524d3c…

1 0

Zebediah Figura : wined3d: Wait for the resource to become idle in wined3d_cs_map().
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 3f3caa338079d22bd20326d92c921d697360d67e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f3caa338079d22bd20326d9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 22:23:11 2021 -0500 wined3d: Wait for the resource to become idle in wined3d_cs_map(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 ++ dlls/wined3d/device.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d70792084e8..8a78ad13dd2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2303,6 +2303,8 @@ static HRESULT wined3d_cs_map(struct wined3d_device_context *context, struct win * increasing the map count would be visible to applications. */ wined3d_not_from_cs(cs); + wined3d_resource_wait_idle(resource); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_MAP; op->resource = resource; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8f9ca725fd5..085ff70ad76 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5373,7 +5373,6 @@ HRESULT CDECL wined3d_device_context_map(struct wined3d_device_context *context, } flags = sanitise_map_flags(resource, flags); - wined3d_resource_wait_idle(resource); return context->ops->map(context, resource, sub_resource_idx, map_desc, box, flags); }

1 0

Zebediah Figura : wined3d: Modify the query state in wined3d_cs_issue_query().
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 574b7152555abfc26b456a1b53b09ba2d194a55a URL: https://source.winehq.org/git/wine.git/?a=commit;h=574b7152555abfc26b456a1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 22:23:12 2021 -0500 wined3d: Modify the query state in wined3d_cs_issue_query(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++++++ dlls/wined3d/device.c | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 8a78ad13dd2..11f2d7cd5c7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2229,6 +2229,9 @@ static void wined3d_cs_issue_query(struct wined3d_device_context *context, struct wined3d_cs *cs = wined3d_cs_from_context(context); struct wined3d_cs_query_issue *op; + if (flags & WINED3DISSUE_END) + ++query->counter_main; + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_QUERY_ISSUE; op->query = query; @@ -2236,6 +2239,11 @@ static void wined3d_cs_issue_query(struct wined3d_device_context *context, wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); cs->queries_flushed = FALSE; + + if (flags & WINED3DISSUE_BEGIN) + query->state = QUERY_BUILDING; + else + query->state = QUERY_SIGNALLED; } static void wined3d_cs_exec_preload_resource(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 085ff70ad76..0444d569bff 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5390,15 +5390,7 @@ void CDECL wined3d_device_context_issue_query(struct wined3d_device_context *con { TRACE("context %p, query %p, flags %#x.\n", context, query, flags); - if (flags & WINED3DISSUE_END) - ++query->counter_main; - query->device->cs->c.ops->issue_query(context, query, flags); - - if (flags & WINED3DISSUE_BEGIN) - query->state = QUERY_BUILDING; - else - query->state = QUERY_SIGNALLED; } struct wined3d_rendertarget_view * CDECL wined3d_device_context_get_rendertarget_view(

1 0

Zebediah Figura : wined3d: Update resources through wined3d_device_context_ops.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: d5b42009cd6771c91c954027f2967e78925c22e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5b42009cd6771c91c954027… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 22:23:13 2021 -0500 wined3d: Update resources through wined3d_device_context_ops. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cs.c | 6 +++++- dlls/wined3d/device.c | 5 +---- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ea21f85bc9e..12d038c0120 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1047,7 +1047,7 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, if (buffer->flags & WINED3D_BUFFER_USE_BO) { wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); - wined3d_device_context_emit_update_sub_resource(&device->cs->c, resource, + device->cs->c.ops->update_sub_resource(&device->cs->c, resource, 0, &box, data->data, data->row_pitch, data->slice_pitch); } else diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 11f2d7cd5c7..5d9d19a85af 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2548,12 +2548,14 @@ done: wined3d_resource_release(resource); } -void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_context *context, +static void wined3d_cs_update_sub_resource(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int slice_pitch) { struct wined3d_cs_update_sub_resource *op; + wined3d_resource_wait_idle(resource); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE; op->resource = resource; @@ -2823,6 +2825,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_st_push_constants, wined3d_cs_map, wined3d_cs_unmap, + wined3d_cs_update_sub_resource, wined3d_cs_issue_query, wined3d_cs_flush, wined3d_cs_acquire_resource, @@ -2949,6 +2952,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_mt_push_constants, wined3d_cs_map, wined3d_cs_unmap, + wined3d_cs_update_sub_resource, wined3d_cs_issue_query, wined3d_cs_flush, wined3d_cs_acquire_resource, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0444d569bff..b8ec5baa862 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5208,10 +5208,7 @@ void CDECL wined3d_device_context_update_sub_resource(struct wined3d_device_cont return; } - wined3d_resource_wait_idle(resource); - - wined3d_device_context_emit_update_sub_resource(context, resource, - sub_resource_idx, box, data, row_pitch, depth_pitch); + context->ops->update_sub_resource(context, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); } void CDECL wined3d_device_context_resolve_sub_resource(struct wined3d_device_context *context, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5c85b2c91bb..1d1b64ad60d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4380,7 +4380,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct for (i = 0; i < sub_count; ++i) { wined3d_texture_get_level_box(*texture, i % (*texture)->level_count, &box); - wined3d_device_context_emit_update_sub_resource(&device->cs->c, &(*texture)->resource, + device->cs->c.ops->update_sub_resource(&device->cs->c, &(*texture)->resource, i, &box, data[i].data, data[i].row_pitch, data[i].slice_pitch); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 30dee39835f..6565b2044df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4695,6 +4695,9 @@ struct wined3d_device_context_ops unsigned int flags); HRESULT (*unmap)(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx); + void (*update_sub_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, const struct wined3d_box *box, + const void *data, unsigned int row_pitch, unsigned int slice_pitch); void (*issue_query)(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); void (*flush)(struct wined3d_device_context *context); void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); @@ -4830,9 +4833,6 @@ void wined3d_device_context_emit_set_vertex_declaration(struct wined3d_device_co struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN; -void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_context *context, - struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, - const void *data, unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) {

1 0