January 2016 - Wine-Commits

Huw Davies : shell32: Set the stream and storage attributes where needed.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: 77c313b8d6cdfaab94758f96b9a59e3107184d3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c313b8d6cdfaab94758f96b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 28 15:32:50 2016 +0000 shell32: Set the stream and storage attributes where needed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 5 ++++- dlls/shell32/tests/shlfolder.c | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 2782157..be1ba81 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1154,7 +1154,10 @@ static HRESULT WINAPI ShellFolder2_GetAttributesOf(IShellFolder2* iface, UINT ci HeapFree( GetProcessHeap(), 0, dos_name ); } if (_ILIsFolder(apidl[i])) - *attrs |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR; + *attrs |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR | + SFGAO_STORAGEANCESTOR | SFGAO_STORAGE; + else + *attrs |= SFGAO_STREAM; } } diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 72aaa02..da903b0 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -388,6 +388,14 @@ static void test_EnumObjects(IShellFolder *iFolder) SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, }; + static const ULONG full_attrs[5] = + { + SFGAO_CAPABILITYMASK | SFGAO_STORAGE | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, + SFGAO_CAPABILITYMASK | SFGAO_STORAGE | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, + SFGAO_CAPABILITYMASK | SFGAO_STREAM | SFGAO_FILESYSTEM, + SFGAO_CAPABILITYMASK | SFGAO_STREAM | SFGAO_FILESYSTEM, + SFGAO_CAPABILITYMASK | SFGAO_STREAM | SFGAO_FILESYSTEM, + }; hr = IShellFolder_EnumObjects(iFolder, NULL, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN, &iEnumList); ok(hr == S_OK, "EnumObjects failed %08x\n", hr); @@ -440,6 +448,11 @@ static void test_EnumObjects(IShellFolder *iFolder) ok(flags == attrs[i] || flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR), /* Win9x, NT4 */ "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); + + flags = ~0u; + hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); + ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); + ok((flags & ~SFGAO_HASSUBFOLDER) == full_attrs[i], "%d: got %08x expected %08x\n", i, flags, full_attrs[i]); } for (i=0;i<5;i++)

1 0

Francois Gouget : shell32/tests: Add server-side DDE checks.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: 805b5e36a99ee1c54c9e4a7e92429974b347a4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805b5e36a99ee1c54c9e4a7e9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:53 2016 +0100 shell32/tests: Add server-side DDE checks. Should something go wrong a failed ok() call will leave a clearer trace in the log than an assert. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 22fa6e8..fc27ed6 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -212,12 +212,7 @@ static void doChild(int argc, char** argv) char *filename, buffer[MAX_PATH]; HANDLE hFile, map; int i; - int rc; - HSZ hszApplication; UINT_PTR timer; - HANDLE dde_ready; - MSG msg; - char *shared_block; filename=argv[2]; hFile=CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); @@ -252,19 +247,28 @@ static void doChild(int argc, char** argv) map = OpenFileMappingA(FILE_MAP_READ, FALSE, "winetest_shlexec_dde_map"); if (map != NULL) { - shared_block = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 4096); + HANDLE dde_ready; + char *shared_block = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 4096); CloseHandle(map); if (shared_block[0] != '\0' || shared_block[1] != '\0') { + HDDEDATA hdde; + HSZ hszApplication; + MSG msg; + UINT rc; + post_quit_on_execute = TRUE; ddeInst = 0; rc = DdeInitializeA(&ddeInst, ddeCb, CBF_SKIP_ALLNOTIFICATIONS | CBF_FAIL_ADVISES | CBF_FAIL_POKES | CBF_FAIL_REQUESTS, 0); - ok(rc == DMLERR_NO_ERROR, "got %d\n", rc); + ok(rc == DMLERR_NO_ERROR, "DdeInitializeA() returned %d\n", rc); hszApplication = DdeCreateStringHandleA(ddeInst, shared_block, CP_WINANSI); - hszTopic = DdeCreateStringHandleA(ddeInst, shared_block + strlen(shared_block) + 1, CP_WINANSI); - assert(hszApplication && hszTopic); - assert(DdeNameService(ddeInst, hszApplication, 0, DNS_REGISTER | DNS_FILTEROFF)); + ok(hszApplication != NULL, "DdeCreateStringHandleA(%s) = NULL\n", shared_block); + shared_block += strlen(shared_block) + 1; + hszTopic = DdeCreateStringHandleA(ddeInst, shared_block, CP_WINANSI); + ok(hszTopic != NULL, "DdeCreateStringHandleA(%s) = NULL\n", shared_block); + hdde = DdeNameService(ddeInst, hszApplication, 0, DNS_REGISTER | DNS_FILTEROFF); + ok(hdde != NULL, "DdeNameService() failed le=%u\n", GetLastError()); timer = SetTimer(NULL, 0, 2500, childTimeout); @@ -273,14 +277,19 @@ static void doChild(int argc, char** argv) CloseHandle(dde_ready); while (GetMessageA(&msg, NULL, 0, 0)) + { + if (winetest_debug > 2) + trace("msg %d lParam=%ld wParam=%lu\n", msg.message, msg.lParam, msg.wParam); DispatchMessageA(&msg); + } Sleep(500); KillTimer(NULL, timer); - assert(DdeNameService(ddeInst, hszApplication, 0, DNS_UNREGISTER)); - assert(DdeFreeStringHandle(ddeInst, hszTopic)); - assert(DdeFreeStringHandle(ddeInst, hszApplication)); - assert(DdeUninitialize(ddeInst)); + hdde = DdeNameService(ddeInst, hszApplication, 0, DNS_UNREGISTER); + ok(hdde != NULL, "DdeNameService() failed le=%u\n", GetLastError()); + ok(DdeFreeStringHandle(ddeInst, hszTopic), "DdeFreeStringHandle(topic)\n"); + ok(DdeFreeStringHandle(ddeInst, hszApplication), "DdeFreeStringHandle(application)\n"); + ok(DdeUninitialize(ddeInst), "DdeUninitialize() failed\n"); } else {

1 0

Francois Gouget : shell32/tests: Test environment variable inheritance with ShellExecute().
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: 446ade3b3cb51a849d22dc6f8dd1d5db859cd44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=446ade3b3cb51a849d22dc6f8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:50 2016 +0100 shell32/tests: Test environment variable inheritance with ShellExecute(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ae91493..22fa6e8 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -209,7 +209,7 @@ static void CALLBACK childTimeout(HWND wnd, UINT msg, UINT_PTR timer, DWORD time static void doChild(int argc, char** argv) { - char *filename, longpath[MAX_PATH] = ""; + char *filename, buffer[MAX_PATH]; HANDLE hFile, map; int i; int rc; @@ -239,8 +239,15 @@ static void doChild(int argc, char** argv) trace("argvA%d='%s'\n", i, argv[i]); childPrintf(hFile, "argvA%d=%s\r\n", i, encodeA(argv[i])); } - GetModuleFileNameA(GetModuleHandleA(NULL), longpath, MAX_PATH); - childPrintf(hFile, "longPath=%s\r\n", encodeA(longpath)); + GetModuleFileNameA(GetModuleHandleA(NULL), buffer, sizeof(buffer)); + childPrintf(hFile, "longPath=%s\r\n", encodeA(buffer)); + + /* Check environment variable inheritance */ + *buffer = '\0'; + SetLastError(0); + GetEnvironmentVariableA("ShlexecVar", buffer, sizeof(buffer)); + childPrintf(hFile, "ShlexecVarLE=%d\r\n", GetLastError()); + childPrintf(hFile, "ShlexecVar=%s\r\n", encodeA(buffer)); map = OpenFileMappingA(FILE_MAP_READ, FALSE, "winetest_shlexec_dde_map"); if (map != NULL) @@ -314,6 +321,11 @@ static void dump_child_(const char* file, int line) trace_(file, line)("%s='%s'\n", key, str); } + c=GetPrivateProfileIntA("Child", "ShlexecVarLE", -1, child_file); + trace_(file, line)("ShlexecVarLE=%d\n", c); + str=getChildString("Child", "ShlexecVar"); + trace_(file, line)("ShlexecVar='%s'\n", str); + c=GetPrivateProfileIntA("Child", "Failures", -1, child_file); trace_(file, line)("Failures=%d\n", c); } @@ -527,10 +539,13 @@ static INT_PTR shell_execute_(const char* file, int line, LPCSTR verb, LPCSTR fi WritePrivateProfileStringA(NULL, NULL, NULL, child_file); if (GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) { - int c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); + int c; + dump_child_(file, line); + c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); if (c > 0) winetest_add_failures(c); - dump_child_(file, line); + okChildInt_(file, line, "ShlexecVarLE", 0); + okChildString_(file, line, "ShlexecVar", "Present", "Present"); } if(!verb) @@ -637,10 +652,13 @@ static INT_PTR shell_execute_ex_(const char* file, int line, WritePrivateProfileStringA(NULL, NULL, NULL, child_file); if (GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) { - int c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); + int c; + dump_child_(file, line); + c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); if (c > 0) winetest_add_failures(c); - dump_child_(file, line); + okChildInt_(file, line, "ShlexecVarLE", 0); + okChildString_(file, line, "ShlexecVar", "Present", "Present"); } return rc; @@ -2736,6 +2754,9 @@ static void init_test(void) create_test_verb(".shlexec", "QuotedLowerL", 0, "QuotedLowerL \"%l\""); create_test_verb(".shlexec", "UpperL", 0, "UpperL %L"); create_test_verb(".shlexec", "QuotedUpperL", 0, "QuotedUpperL \"%L\""); + + /* Set an environment variable to see if it is inherited */ + SetEnvironmentVariableA("ShlexecVar", "Present"); } static void cleanup_test(void)

1 0

Francois Gouget : shell32/tests: Reorder the functions to avoid forward declarations.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: 38ad0ee01de636219ee755771c04cbc860024a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=38ad0ee01de636219ee755771… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:34 2016 +0100 shell32/tests: Reorder the functions to avoid forward declarations. This also groups the helpers in a more logical fashion. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 999 ++++++++++++++++++++++--------------------- 1 file changed, 508 insertions(+), 491 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38ad0ee01de636219ee75…

1 0

Francois Gouget : shell32/tests: Add traces to the WaitForInputIdle() hooking process.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: 759bd96ac227042024481e9634a3d575c18aee01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=759bd96ac227042024481e963… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:14:38 2016 +0100 shell32/tests: Add traces to the WaitForInputIdle() hooking process. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 7844722..af4563e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2254,6 +2254,8 @@ static dde_tests_t dde_tests[] = static DWORD WINAPI hooked_WaitForInputIdle(HANDLE process, DWORD timeout) { + if (winetest_debug > 1) + trace("WaitForInputIdle() waiting for dde event\n"); return WaitForSingleObject(dde_ready_event, timeout); } @@ -2272,6 +2274,7 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) PIMAGE_NT_HEADERS nt_headers; DWORD import_directory_rva; PIMAGE_IMPORT_DESCRIPTOR import_descriptor; + int hook_count = 0; base = (char *) GetModuleHandleA("shell32.dll"); nt_headers = (PIMAGE_NT_HEADERS)(base + ((PIMAGE_DOS_HEADER) base)->e_lfanew); @@ -2309,6 +2312,9 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) VirtualProtect(&iat_entry->u1.Function, sizeof(ULONG_PTR), PAGE_READWRITE, &old_prot); iat_entry->u1.Function = (ULONG_PTR) new_func; VirtualProtect(&iat_entry->u1.Function, sizeof(ULONG_PTR), old_prot, &old_prot); + if (winetest_debug > 1) + trace("Hooked %s.WaitForInputIdle\n", import_module_name); + hook_count++; break; } } @@ -2320,6 +2326,7 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) import_descriptor++; } + ok(hook_count, "Could not hook WaitForInputIdle()\n"); } static void test_dde(void)

1 0

Henri Verbeet : d3d9: Pass non-NULL rectangles to wined3d_texture_blt() in d3d9_device_GetRenderTargetData().
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: 04c216d79806fddbb8f57f9ecbf1e5c8e7fef9a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c216d79806fddbb8f57f9ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 28 18:40:22 2016 +0100 d3d9: Pass non-NULL rectangles to wined3d_texture_blt() in d3d9_device_GetRenderTargetData(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7827c75..7f14cd0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1285,20 +1285,32 @@ static HRESULT WINAPI d3d9_device_GetRenderTargetData(IDirect3DDevice9Ex *iface, struct d3d9_surface *dst_impl = unsafe_impl_from_IDirect3DSurface9(dst_surface); struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *sub_resource; + RECT dst_rect, src_rect; HRESULT hr; TRACE("iface %p, render_target %p, dst_surface %p.\n", iface, render_target, dst_surface); wined3d_mutex_lock(); + sub_resource = wined3d_texture_get_sub_resource(dst_impl->wined3d_texture, dst_impl->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &wined3d_desc); + dst_rect.left = 0; + dst_rect.top = 0; + dst_rect.right = wined3d_desc.width; + dst_rect.bottom = wined3d_desc.height; + sub_resource = wined3d_texture_get_sub_resource(rt_impl->wined3d_texture, rt_impl->sub_resource_idx); wined3d_resource_get_desc(sub_resource, &wined3d_desc); + src_rect.left = 0; + src_rect.top = 0; + src_rect.right = wined3d_desc.width; + src_rect.bottom = wined3d_desc.height; /* TODO: Check surface sizes, pools, etc. */ if (wined3d_desc.multisample_type) hr = D3DERR_INVALIDCALL; else - hr = wined3d_texture_blt(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, NULL, - rt_impl->wined3d_texture, rt_impl->sub_resource_idx, NULL, 0, NULL, WINED3D_TEXF_POINT); + hr = wined3d_texture_blt(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &dst_rect, + rt_impl->wined3d_texture, rt_impl->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT); wined3d_mutex_unlock(); return hr;

1 0

Alexandre Julliard : server: Use a common helper function to implement open object calls.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: ed268bbf9183392e21e771f64bd91c19316f8361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed268bbf9183392e21e771f64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 16:23:29 2016 +0900 server: Use a common helper function to implement open object calls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/completion.c | 16 ++-------------- server/directory.c | 13 ++----------- server/event.c | 26 ++++---------------------- server/handle.c | 21 +++++++++++---------- server/handle.h | 5 +++-- server/mapping.c | 14 ++------------ server/mutex.c | 14 ++------------ server/process.c | 12 ++---------- server/semaphore.c | 14 ++------------ server/symlink.c | 14 ++------------ server/timer.c | 14 ++------------ server/winstation.c | 26 ++++++++++++-------------- 12 files changed, 46 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed268bbf9183392e21e77…

1 0

Henri Verbeet : d3d9: Pass non-NULL rectangles to wined3d_texture_blt() in d3d9_device_StretchRect().
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: 7b266e844e6701c65cb3304c0e1e5b3c110a6b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b266e844e6701c65cb3304c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 28 18:40:21 2016 +0100 d3d9: Pass non-NULL rectangles to wined3d_texture_blt() in d3d9_device_StretchRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f357570..7827c75 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1331,6 +1331,7 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect HRESULT hr = D3DERR_INVALIDCALL; struct wined3d_resource_desc src_desc, dst_desc; struct wined3d_resource *sub_resource; + RECT d, s; TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n", iface, src_surface, src_rect, dst_surface, dst_rect, filter); @@ -1338,9 +1339,25 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect wined3d_mutex_lock(); sub_resource = wined3d_texture_get_sub_resource(dst->wined3d_texture, dst->sub_resource_idx); wined3d_resource_get_desc(sub_resource, &dst_desc); + if (!dst_rect) + { + d.left = 0; + d.top = 0; + d.right = dst_desc.width; + d.bottom = dst_desc.height; + dst_rect = &d; + } sub_resource = wined3d_texture_get_sub_resource(src->wined3d_texture, src->sub_resource_idx); wined3d_resource_get_desc(sub_resource, &src_desc); + if (!src_rect) + { + s.left = 0; + s.top = 0; + s.right = src_desc.width; + s.bottom = src_desc.height; + src_rect = &s; + } if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) { @@ -1350,26 +1367,22 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect goto done; } - if (src_rect) + if (src_rect->left || src_rect->top || src_rect->right != src_desc.width + || src_rect->bottom != src_desc.height) { - if (src_rect->left || src_rect->top || src_rect->right != src_desc.width - || src_rect->bottom != src_desc.height) - { - WARN("Rejecting depth / stencil blit with invalid source rect %s.\n", - wine_dbgstr_rect(src_rect)); - goto done; - } + WARN("Rejecting depth / stencil blit with invalid source rect %s.\n", + wine_dbgstr_rect(src_rect)); + goto done; } - if (dst_rect) + + if (dst_rect->left || dst_rect->top || dst_rect->right != dst_desc.width + || dst_rect->bottom != dst_desc.height) { - if (dst_rect->left || dst_rect->top || dst_rect->right != dst_desc.width - || dst_rect->bottom != dst_desc.height) - { - WARN("Rejecting depth / stencil blit with invalid destination rect %s.\n", - wine_dbgstr_rect(dst_rect)); - goto done; - } + WARN("Rejecting depth / stencil blit with invalid destination rect %s.\n", + wine_dbgstr_rect(dst_rect)); + goto done; } + if (src_desc.width != dst_desc.width || src_desc.height != dst_desc.height) { WARN("Rejecting depth / stencil blit with mismatched surface sizes.\n");

1 0

Alexandre Julliard : wine.inf: Add quotes around the wordpad.exe path.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: c3d602949ca00e88ae9ab11e01121389efd3925f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3d602949ca00e88ae9ab11e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 13:30:29 2016 +0900 wine.inf: Add quotes around the wordpad.exe path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 5d33d17..d22b29b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -218,13 +218,13 @@ HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1""" HKCR,rtffile,,2,"Rich Text Document" -HKCR,rtffile\shell\open\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe %1" -HKCR,rtffile\shell\print\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe /p %1" +HKCR,rtffile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" +HKCR,rtffile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1" HKCR,txtfile,,2,"Text Document" HKCR,txtfile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" -HKCR,wrifile\shell\open\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe %1" -HKCR,wrifile\shell\print\command,,2,"%16422%\Windows NT\Accessories\wordpad.exe /p %1" +HKCR,wrifile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" +HKCR,wrifile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1" HKCR,xmlfile,,2,"XML Document" HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" HKCR,xmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,,"

1 0

Alexandre Julliard : server: Implement NtOpenJobObject.
by Alexandre Julliard Jan. 29, 2016

Jan. 29, 2016

Module: wine Branch: master Commit: b3064d748b1cab6464e8b92a558b2d4ba4fe3909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3064d748b1cab6464e8b92a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 01:32:22 2016 +0900 server: Implement NtOpenJobObject. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 16 ++++++++++++++-- dlls/ntdll/tests/om.c | 3 --- include/wine/server_protocol.h | 22 +++++++++++++++++++++- server/process.c | 18 ++++++++++++++++++ server/protocol.def | 11 +++++++++++ server/request.h | 8 ++++++++ server/trace.c | 18 +++++++++++++++++- 7 files changed, 89 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3064d748b1cab6464e8b…

1 0