diff --git a/patches/Compholio/0002-winelib-Append-Compholio-at-the-end-of-the-version-s.patch b/patches/Compholio/0002-winelib-Append-Compholio-at-the-end-of-the-version-s.patch index 662b5839..54ca246a 100644 --- a/patches/Compholio/0002-winelib-Append-Compholio-at-the-end-of-the-version-s.patch +++ b/patches/Compholio/0002-winelib-Append-Compholio-at-the-end-of-the-version-s.patch @@ -1,7 +1,7 @@ From 0e76401ae2de47285c66ee0b59bdf7449136d060 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 2 Oct 2014 19:53:46 +0200 -Subject: winelib: Append '(Compholio') at the end of the version string. +Subject: winelib: Append '(Compholio)' at the end of the version string. --- libs/wine/Makefile.in | 2 +- diff --git a/patches/atl-IOCS_Property/0001-atl-Don-t-use-GWLP_USERDATA-to-store-IOCS-to-avoid-c.patch b/patches/atl-IOCS_Property/0001-atl-Don-t-use-GWLP_USERDATA-to-store-IOCS-to-avoid-c.patch index 8f888de6..fe00c836 100644 --- a/patches/atl-IOCS_Property/0001-atl-Don-t-use-GWLP_USERDATA-to-store-IOCS-to-avoid-c.patch +++ b/patches/atl-IOCS_Property/0001-atl-Don-t-use-GWLP_USERDATA-to-store-IOCS-to-avoid-c.patch @@ -35,7 +35,7 @@ index 5bafbf1..45936e8 100644 static LRESULT CALLBACK AtlHost_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) { - IOCS *This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA ); -+ IOCS *This = (IOCS*) GetPropA( hWnd, WINE_IOCS_PROPERTY ); ++ IOCS *This = (IOCS *)GetPropA( hWnd, WINE_IOCS_PROPERTY ); return IOCS_OnWndProc( This, hWnd, wMsg, wParam, lParam ); } @@ -53,7 +53,7 @@ index 5bafbf1..45936e8 100644 *host = NULL; - This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA ); -+ This = (IOCS*) GetPropA( hWnd, WINE_IOCS_PROPERTY ); ++ This = (IOCS *)GetPropA( hWnd, WINE_IOCS_PROPERTY ); if ( !This ) { WARN("No container attached to %p\n", hWnd ); @@ -62,7 +62,7 @@ index 5bafbf1..45936e8 100644 *pUnk = NULL; - This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA ); -+ This = (IOCS*) GetPropA ( hWnd, WINE_IOCS_PROPERTY ); ++ This = (IOCS *)GetPropA ( hWnd, WINE_IOCS_PROPERTY ); if ( !This || !This->control ) { WARN("No control attached to %p\n", hWnd ); diff --git a/patches/d3dx9_36-UpdateSkinnedMesh/0001-d3dx9_36-Implement-ID3DXSkinInfoImpl_UpdateSkinnedMe.patch b/patches/d3dx9_36-UpdateSkinnedMesh/0001-d3dx9_36-Implement-ID3DXSkinInfoImpl_UpdateSkinnedMe.patch index eb6eff9f..2c015442 100644 --- a/patches/d3dx9_36-UpdateSkinnedMesh/0001-d3dx9_36-Implement-ID3DXSkinInfoImpl_UpdateSkinnedMe.patch +++ b/patches/d3dx9_36-UpdateSkinnedMesh/0001-d3dx9_36-Implement-ID3DXSkinInfoImpl_UpdateSkinnedMe.patch @@ -1,4 +1,4 @@ -From be168cfe86d540b42e070011ea824138069a32f9 Mon Sep 17 00:00:00 2001 +From 33e4e3219056f09ed8b406d154b87bafedb1ebe0 Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Mon, 22 Jul 2013 21:51:20 +0200 Subject: d3dx9_36: Implement ID3DXSkinInfoImpl_UpdateSkinnedMesh. @@ -6,8 +6,8 @@ Subject: d3dx9_36: Implement ID3DXSkinInfoImpl_UpdateSkinnedMesh. This patch fixes last problem of bug 32572. --- dlls/d3dx9_36/skin.c | 86 ++++++++++++++++++++++++++++++++++++++++++++-- - dlls/d3dx9_36/tests/mesh.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 167 insertions(+), 3 deletions(-) + dlls/d3dx9_36/tests/mesh.c | 83 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 166 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index aa5acf2..bd7e581 100644 @@ -115,10 +115,10 @@ index aa5acf2..bd7e581 100644 static HRESULT WINAPI d3dx9_skin_info_ConvertToBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in, diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c -index 17c5d9c..944a739 100644 +index 17c5d9c..e255eac 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c -@@ -5152,6 +5152,89 @@ static void test_create_skin_info(void) +@@ -5152,6 +5152,88 @@ static void test_create_skin_info(void) ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); } @@ -201,14 +201,13 @@ index 17c5d9c..944a739 100644 + ok(compare(vertices_dest[i*2+1].z, vertices_ref[i*2+1].z), "Vertex[%d].normal.z: got %g, expected %g\n", + i, vertices_dest[i*2+1].z, vertices_ref[i*2+1].z); + } -+ ok(TRUE,"\n"); + skin_info->lpVtbl->Release(skin_info); +} + static void test_convert_adjacency_to_point_reps(void) { HRESULT hr; -@@ -10468,6 +10551,7 @@ START_TEST(mesh) +@@ -10468,6 +10550,7 @@ START_TEST(mesh) D3DXGenerateAdjacencyTest(); test_update_semantics(); test_create_skin_info(); @@ -217,5 +216,5 @@ index 17c5d9c..944a739 100644 test_convert_point_reps_to_adjacency(); test_weld_vertices(); -- -1.9.1 +2.1.2 diff --git a/patches/ntdll-NtQuerySection/0002-ntdll-Implement-NtQuerySection.patch b/patches/ntdll-NtQuerySection/0002-ntdll-Implement-NtQuerySection.patch index b54d0d7a..b34cb48e 100644 --- a/patches/ntdll-NtQuerySection/0002-ntdll-Implement-NtQuerySection.patch +++ b/patches/ntdll-NtQuerySection/0002-ntdll-Implement-NtQuerySection.patch @@ -1,15 +1,16 @@ -From 0cd17445c177428f06fa6dccd724e62fccd7619c Mon Sep 17 00:00:00 2001 +From 7f27b62ee7bc1a498490e8a97717d0fb18d6b716 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Thu, 16 Oct 2014 23:24:37 +0200 Subject: ntdll: Implement NtQuerySection. +Some small modifications by Sebastian Lackner --- - dlls/ntdll/nt.c | 19 ---------- + dlls/ntdll/nt.c | 19 ----------- dlls/ntdll/ntdll.spec | 4 +-- - dlls/ntdll/virtual.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++ - server/mapping.c | 43 ++++++++++++++++++++++ + dlls/ntdll/virtual.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++ + server/mapping.c | 42 +++++++++++++++++++++++ server/protocol.def | 7 ++++ - 5 files changed, 150 insertions(+), 21 deletions(-) + 5 files changed, 146 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 73d9383..f0433db 100644 @@ -64,22 +65,22 @@ index 5bac269..32b023b 100644 @ stdcall ZwQuerySemaphore (long long long long long) NtQuerySemaphore @ stdcall ZwQuerySymbolicLinkObject(long ptr ptr) NtQuerySymbolicLinkObject diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c -index 4c4c05d..c3ed481 100644 +index 4c4c05d..7e75f30 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c -@@ -2553,6 +2553,104 @@ NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ +@@ -2553,6 +2553,101 @@ NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ /*********************************************************************** + * NtQuerySection (NTDLL.@) + */ -+NTSTATUS WINAPI NtQuerySection(HANDLE handle, SECTION_INFORMATION_CLASS info_class, -+ PVOID buffer, ULONG len, PULONG ret_len) ++NTSTATUS WINAPI NtQuerySection( HANDLE handle, SECTION_INFORMATION_CLASS info_class, ++ PVOID buffer, ULONG len, PULONG ret_len ) +{ + HANDLE dup_mapping, shared_file; + unsigned protect; + LARGE_INTEGER size; -+ void *base, *entry; ++ void *entry; + short machine, subsystem; + short major_subsystem, minor_subsystem; + short characteristics, dll_characteristics; @@ -109,13 +110,10 @@ index 4c4c05d..c3ed481 100644 + req->handle = wine_server_obj_handle( handle ); + req->access = SECTION_QUERY; + res = wine_server_call( req ); -+ protect = reply->protect; -+ base = wine_server_get_ptr( reply->base ); -+ size.QuadPart = reply->size; -+ dup_mapping = wine_server_ptr_handle( reply->mapping ); -+ shared_file = wine_server_ptr_handle( reply->shared_file ); -+ if ((ULONG_PTR)base != reply->base) base = NULL; -+ ++ protect = reply->protect; ++ size.QuadPart = reply->size; ++ dup_mapping = wine_server_ptr_handle( reply->mapping ); ++ shared_file = wine_server_ptr_handle( reply->shared_file ); + entry = wine_server_get_ptr( reply->entry ); + subsystem = reply->subsystem; + major_subsystem = reply->major_subsystem; @@ -173,7 +171,7 @@ index 4c4c05d..c3ed481 100644 * ZwMapViewOfSection (NTDLL.@) */ diff --git a/server/mapping.c b/server/mapping.c -index 64b3003..8a04183 100644 +index 64b3003..a701944 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -64,6 +64,15 @@ struct mapping @@ -227,11 +225,8 @@ index 64b3003..8a04183 100644 break; } -@@ -488,8 +514,18 @@ static struct object *create_mapping( struct directory *root, const struct unico - GROUP_SECURITY_INFORMATION| - DACL_SECURITY_INFORMATION| +@@ -490,6 +516,15 @@ static struct object *create_mapping( struct directory *root, const struct unico SACL_SECURITY_INFORMATION ); -+ mapping->header_size = 0; mapping->base = 0; + mapping->entry = 0; @@ -246,7 +241,7 @@ index 64b3003..8a04183 100644 mapping->fd = NULL; mapping->shared_file = NULL; mapping->committed = NULL; -@@ -727,6 +763,13 @@ DECL_HANDLER(get_mapping_info) +@@ -727,6 +762,13 @@ DECL_HANDLER(get_mapping_info) reply->protect = mapping->protect; reply->header_size = mapping->header_size; reply->base = mapping->base; @@ -261,7 +256,7 @@ index 64b3003..8a04183 100644 if ((fd = get_obj_fd( &mapping->obj ))) { diff --git a/server/protocol.def b/server/protocol.def -index c9270ea..9585fe2 100644 +index 4854e3d..d5ca1f1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1619,6 +1619,13 @@ enum char_info_mode