February 2018 - Wine-devel - list.winehq.org

[PATCH] shell32: Partially implement IShellDispatch::BrowseForFolder()
by Nikolay Sivov 23 Feb '18

23 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For https://bugs.winehq.org/show_bug.cgi?id=44578 dlls/shell32/shelldispatch.c | 76 +++++++++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 2dd52a61c1..66635547ed 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1674,7 +1674,7 @@ static HRESULT Folder_Constructor(IShellFolder2 *folder, LPITEMIDLIST pidl, Fold This->Folder3_iface.lpVtbl = &FolderImpl_Vtbl; This->ref = 1; This->folder = folder; - This->pidl = pidl; + This->pidl = ILClone(pidl); hr = SHBindToParent(pidl, &IID_IShellFolder2, (void **)&parent, &last_part); IShellFolder2_GetDisplayNameOf(parent, last_part, SHGDN_FORPARSING, &strret); @@ -1820,11 +1820,33 @@ static HRESULT WINAPI ShellDispatch_get_Parent(IShellDispatch6 *iface, IDispatch return S_OK; } -static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, - VARIANT dir, Folder **ret) +static HRESULT create_folder_for_pidl(LPITEMIDLIST pidl, Folder **ret) { IShellFolder2 *folder; IShellFolder *desktop; + HRESULT hr; + + *ret = NULL; + + if (FAILED(hr = SHGetDesktopFolder(&desktop))) + return hr; + + if (_ILIsDesktop(pidl)) + hr = IShellFolder_QueryInterface(desktop, &IID_IShellFolder2, (void **)&folder); + else + hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder2, (void **)&folder); + + IShellFolder_Release(desktop); + + if (FAILED(hr)) + return S_FALSE; + + return Folder_Constructor(folder, pidl, ret); +} + +static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, + VARIANT dir, Folder **ret) +{ LPITEMIDLIST pidl; HRESULT hr; @@ -1854,29 +1876,45 @@ static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, return S_FALSE; } - if (FAILED(hr = SHGetDesktopFolder(&desktop))) - return hr; - - if (_ILIsDesktop(pidl)) - hr = IShellFolder_QueryInterface(desktop, &IID_IShellFolder2, (void **)&folder); - else - hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder2, (void **)&folder); - - IShellFolder_Release(desktop); + hr = create_folder_for_pidl(pidl, ret); + ILFree(pidl); - if (FAILED(hr)) - return S_FALSE; + return hr; +} - return Folder_Constructor(folder, pidl, ret); +static BOOL is_optional_argument(const VARIANT *arg) +{ + return V_VT(arg) == VT_ERROR && V_ERROR(arg) == DISP_E_PARAMNOTFOUND; } static HRESULT WINAPI ShellDispatch_BrowseForFolder(IShellDispatch6 *iface, - LONG Hwnd, BSTR Title, LONG Options, VARIANT RootFolder, Folder **ppsdf) + LONG hwnd, BSTR title, LONG options, VARIANT rootfolder, Folder **folder) { - FIXME("(%p,%x,%s,%x,%s,%p)\n", iface, Hwnd, debugstr_w(Title), Options, debugstr_variant(&RootFolder), ppsdf); + PIDLIST_ABSOLUTE selection; + BROWSEINFOW bi = { 0 }; + HRESULT hr; - *ppsdf = NULL; - return E_NOTIMPL; + TRACE("(%p,%x,%s,%x,%s,%p)\n", iface, hwnd, debugstr_w(title), options, debugstr_variant(&rootfolder), folder); + + *folder = NULL; + + if (!is_optional_argument(&rootfolder)) + FIXME("root folder is ignored\n"); + + bi.hwndOwner = LongToHandle(hwnd); + bi.lpszTitle = title; + bi.ulFlags = options; + + selection = SHBrowseForFolderW(&bi); + if (selection) + { + hr = create_folder_for_pidl(selection, folder); + ILFree(selection); + } + else + hr = S_FALSE; + + return hr; } static HRESULT WINAPI ShellDispatch_Windows(IShellDispatch6 *iface, -- 2.16.1

1 0

[PATCH 1/2] winspool: Accept a backend printer handle when creating a printer handle [resend]
by Detlef Riekenberg 23 Feb '18

23 Feb '18

Needed to reduce the patchsize for moving AddPrinter a bit We need to move AddPrinter to allow importing CUPS printers centralized in the spooler service (bug 3507, bug 10358) -- bye bye ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/winspool.drv/info.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9c24256..d28ca89 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1444,7 +1444,7 @@ static void free_printer_entry( opened_printer_t *printer ) * ToDo: * - pDefault is ignored */ -static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault) +static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault, HANDLE backend_printer) { UINT_PTR handle = nb_printer_handles, i; jobqueue_t *queue = NULL; @@ -1513,10 +1513,15 @@ static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault } /* get a printer handle from the backend */ - if (! backend->fpOpenPrinter(name, &printer->backend_printer, pDefault)) { - handle = 0; - goto end; + if (!backend_printer) + { + if (! backend->fpOpenPrinter(name, &printer->backend_printer, pDefault)) { + handle = 0; + goto end; + } } + else + printer->backend_printer = backend_printer; /* clone the base name. This is NULL for the printserver */ printer->printername = strdupW(printername); @@ -2547,7 +2552,7 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU } /* Get the unique handle of the printer or Printserver */ - *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault); + *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault, NULL); if (*phPrinter && WINSPOOL_GetOpenedPrinterRegKey( *phPrinter, &key ) == ERROR_SUCCESS) { -- 2.7.4

2 2

kernel32/tests: Close process / thread handles.
by Thomas Faber 23 Feb '18

23 Feb '18

From: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/kernel32/tests/process.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 59df58a45961..cbca00eada85 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -618,6 +618,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); GetStartupInfoA(&si); okChildInt("StartupInfoA", "cb", startup.cb); @@ -656,6 +658,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -694,6 +698,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", si.lpDesktop); @@ -732,6 +738,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -770,6 +778,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -810,6 +820,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -848,6 +860,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -888,6 +902,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("Arguments", "argcA", 5); okChildString("Arguments", "argvA4", "C:\\Program Files\\my nice app.exe"); @@ -909,6 +925,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("Arguments", "argcA", 7); okChildString("Arguments", "argvA4", "a\"b\\"); @@ -930,6 +948,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); @@ -945,6 +965,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); sprintf(buffer, ".\\%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); @@ -965,6 +987,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); if (p) sprintf(buffer, "..%s/%s", p, exename); else sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); @@ -988,6 +1012,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); sprintf(buffer, "tests/process.c dump %s", resfile); okChildString("Arguments", "argvA0", "dummy"); okChildString("Arguments", "CommandLineA", buffer2); @@ -1085,6 +1111,8 @@ static void test_Directory(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildIString("Misc", "CurrDirA", windir); release_memory(); @@ -1093,6 +1121,8 @@ static void test_Directory(void) /* search PATH for the exe if directory is NULL */ ok(CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(TerminateProcess(info.hProcess, 0), "Child process termination\n"); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); /* if any directory is provided, don't search PATH, error on bad directory */ SetLastError(0xdeadbeef); -- 2.16.2

1 0

Andrew Comminos Work
by CARLOS RODRIGUEZ 23 Feb '18

23 Feb '18

Leaves this article with andrew comminos work refer impact AZDO extensions on wine Approaching One Driver Overhead - Andrew Comminos' Blog | | | | Approaching One Driver Overhead - Andrew Comminos' Blog | | | Thanks

1 0

[PATCH] ntdll: Don't fail in NtUnmapViewOfSection when trying to unmap builtin view.
by Alistair Leslie-Hughes 23 Feb '18

23 Feb '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Fixes a regression introduced in a557934c76c0e0bed6b73e5c8f79a0df059ff2de. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/virtual.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d26be98bb5..106dab26d4 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3164,7 +3164,11 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) if (!status) delete_view( view ); else FIXME( "failed to unmap %p %x\n", view->base, status ); } - else delete_view( view ); + else + { + delete_view( view ); + status = STATUS_SUCCESS; + } } server_leave_uninterrupted_section( &csVirtual, &sigset ); return status; -- 2.16.1

1 0

[PATCH] crypt32/tests: Add CryptBinaryToStringW test
by Alistair Leslie-Hughes 23 Feb '18

23 Feb '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/crypt32/tests/base64.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 2e7e488..5329c6d 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -25,6 +25,7 @@ #include <winerror.h> #include <wincrypt.h> +#include "wine/heap.h" #include "wine/test.h" #define CERT_HEADER "-----BEGIN CERTIFICATE-----\r\n" @@ -47,6 +48,8 @@ static BOOL (WINAPI *pCryptBinaryToStringA)(const BYTE *pbBinary, static BOOL (WINAPI *pCryptStringToBinaryA)(LPCSTR pszString, DWORD cchString, DWORD dwFlags, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags); +static BOOL (WINAPI *pCryptBinaryToStringW)(const BYTE *pbBinary, + DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString); static BOOL (WINAPI *pCryptStringToBinaryW)(LPCWSTR pszString, DWORD cchString, DWORD dwFlags, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags); @@ -552,12 +555,34 @@ static void testStringToBinaryA(void) } } +static void testBinaryToStringW(void) +{ + BYTE *data; + int size = 16656; + DWORD out = 0; + BOOL ret; + + if (!pCryptBinaryToStringW) + { + win_skip("CryptBinaryToStringW is not available\n"); + return; + } + + data = heap_alloc_zero(size); + ret = pCryptBinaryToStringW(data, size, CRYPT_STRING_BASE64, NULL, &out); + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + todo_wine ok(out == 22903, "return size returned: %d\n", out); + + heap_free(data); +} + START_TEST(base64) { HMODULE lib = GetModuleHandleA("crypt32"); pCryptBinaryToStringA = (void *)GetProcAddress(lib, "CryptBinaryToStringA"); pCryptStringToBinaryA = (void *)GetProcAddress(lib, "CryptStringToBinaryA"); + pCryptBinaryToStringW = (void *)GetProcAddress(lib, "CryptBinaryToStringW"); pCryptStringToBinaryW = (void *)GetProcAddress(lib, "CryptStringToBinaryW"); if (pCryptBinaryToStringA) @@ -569,4 +594,6 @@ START_TEST(base64) testStringToBinaryA(); else win_skip("CryptStringToBinaryA is not available\n"); + + testBinaryToStringW(); } -- 1.9.1

2 2

[PATCH 4/5] wined3d: Explicitly calculate the sub-resource layer in raw_blitter_blit().
by Henri Verbeet 23 Feb '18

23 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b2df8f9..9c0d039 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2587,6 +2587,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int src_sub_resource_idx, dst_sub_resource_idx; struct wined3d_texture *src_texture, *dst_texture; + unsigned int src_layer, dst_layer; struct wined3d_blitter *next; GLuint src_name, dst_name; DWORD location; @@ -2625,6 +2626,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, location)) ERR("Failed to load the source sub-resource into %s.\n", wined3d_debug_location(location)); src_name = wined3d_texture_get_texture_name(src_texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); + src_layer = src_sub_resource_idx / src_texture->level_count; location = dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); if (!location) @@ -2641,12 +2643,12 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(location)); } dst_name = wined3d_texture_get_texture_name(dst_texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); + dst_layer = dst_sub_resource_idx / dst_texture->level_count; GL_EXTCALL(glCopyImageSubData(src_name, src_texture->target, src_surface->texture_level, - src_rect->left, src_rect->top, src_surface->texture_layer, - dst_name, dst_texture->target, dst_surface->texture_level, - dst_rect->left, dst_rect->top, dst_surface->texture_layer, - src_rect->right - src_rect->left, src_rect->bottom - src_rect->top, 1)); + src_rect->left, src_rect->top, src_layer, dst_name, dst_texture->target, dst_surface->texture_level, + dst_rect->left, dst_rect->top, dst_layer, src_rect->right - src_rect->left, + src_rect->bottom - src_rect->top, 1)); checkGLcall("copy image data"); wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, location); -- 2.1.4

1 0

[PATCH 3/5] wined3d: Explicitly calculate the sub-resource layer in wined3d_surface_upload_data().
by Henri Verbeet 23 Feb '18

23 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0d09c2f..b2df8f9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -783,6 +783,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w struct wined3d_texture *texture = surface->container; UINT update_w = src_rect->right - src_rect->left; UINT update_h = src_rect->bottom - src_rect->top; + unsigned int layer; GLenum target; TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", @@ -808,6 +809,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w } target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + layer = sub_resource_idx / texture->level_count; if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { @@ -830,7 +832,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, image_size %#x, addr %p.\n", - target, surface->texture_level, surface->texture_layer, dst_point->x, dst_point->y, + target, surface->texture_level, layer, dst_point->x, dst_point->y, update_w, update_h, internal, dst_slice_pitch, addr); if (dst_row_pitch == src_pitch) @@ -838,7 +840,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w if (target == GL_TEXTURE_2D_ARRAY) { GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, - surface->texture_layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); + layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); } else { @@ -858,7 +860,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w if (target == GL_TEXTURE_2D_ARRAY) { GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, y, - surface->texture_layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); + layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); } else { @@ -881,14 +883,14 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, type %#x, addr %p.\n", - target, surface->texture_level, surface->texture_layer, - dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); + target, surface->texture_level, layer, dst_point->x, dst_point->y, + update_w, update_h, format->glFormat, format->glType, addr); gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); if (target == GL_TEXTURE_2D_ARRAY) { GL_EXTCALL(glTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, - surface->texture_layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); + layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); } else { -- 2.1.4

1 0

[PATCH 2/5] wined3d: Explicitly calculate the sub-resource layer in surface_download_data().
by Henri Verbeet 23 Feb '18

23 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 657127f..0d09c2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -748,7 +748,8 @@ static void surface_download_data(struct wined3d_surface *surface, const struct } else if (temporary_mem) { - void *src_data = temporary_mem + surface->texture_layer * sub_resource->size; + unsigned int layer = sub_resource_idx / texture->level_count; + void *src_data = temporary_mem + layer * sub_resource->size; if (data.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data.buffer_object)); -- 2.1.4

1 0

[PATCH 1/5] wined3d: Pass a texture and sub-resource index to surface_get_blt_info().
by Henri Verbeet 23 Feb '18

23 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d4da824..657127f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -60,10 +60,19 @@ static inline void cube_coords_float(const RECT *r, UINT w, UINT h, struct float f->b = ((r->bottom * 2.0f) / h) - 1.0f; } -static void surface_get_blt_info(GLenum target, const RECT *rect, GLsizei w, GLsizei h, struct blt_info *info) +static void texture2d_get_blt_info(const struct wined3d_texture *texture, + unsigned int sub_resource_idx, const RECT *rect, struct blt_info *info) { struct wined3d_vec3 *coords = info->texcoords; struct float_rect f; + unsigned int level; + GLenum target; + GLsizei w, h; + + level = sub_resource_idx % texture->level_count; + w = wined3d_texture_get_level_pow2_width(texture, level); + h = wined3d_texture_get_level_pow2_height(texture, level); + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); switch (target) { @@ -182,14 +191,8 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour { const struct wined3d_gl_info *gl_info = context->gl_info; struct blt_info info; - unsigned int level; - GLenum target; - level = sub_resource_idx % texture->level_count; - target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); - surface_get_blt_info(target, src_rect, - wined3d_texture_get_level_pow2_width(texture, level), - wined3d_texture_get_level_pow2_height(texture, level), &info); + texture2d_get_blt_info(texture, sub_resource_idx, src_rect, &info); gl_info->gl_ops.gl.p_glEnable(info.bind_target); checkGLcall("glEnable(bind_target)"); -- 2.1.4

1 0