diff --git a/patches/Compiler_Warnings/0005-d3d11-Avoid-implicit-cast-of-interface-pointer.patch b/patches/Compiler_Warnings/0005-d3d11-Avoid-implicit-cast-of-interface-pointer.patch index 31e1728d..8387724a 100644 --- a/patches/Compiler_Warnings/0005-d3d11-Avoid-implicit-cast-of-interface-pointer.patch +++ b/patches/Compiler_Warnings/0005-d3d11-Avoid-implicit-cast-of-interface-pointer.patch @@ -1,4 +1,4 @@ -From 71e593294e868bafa0b0b45c2694d7c0dceb0d64 Mon Sep 17 00:00:00 2001 +From 23e0f029f1cc37d5d33bb39d5277371827b701aa Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 22 Mar 2016 21:54:48 +0100 Subject: d3d11: Avoid implicit cast of interface pointer. @@ -8,16 +8,18 @@ Subject: d3d11: Avoid implicit cast of interface pointer. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c -index 1d9b766..78fc1ad 100644 +index 5e48965..70eae5e 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c -@@ -1559,5 +1559,5 @@ struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D1 +@@ -2191,7 +2191,7 @@ struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D1 if (!iface) return NULL; assert(iface->lpVtbl == (ID3D10ShaderResourceViewVtbl *)&d3d10_shader_resource_view_vtbl); - return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView1_iface); + return CONTAINING_RECORD((ID3D10ShaderResourceView1 *)iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView1_iface); } + + /* ID3D11UnorderedAccessView methods */ -- -2.7.1 +2.8.0 diff --git a/patches/include-webservices/0001-include-Remove-duplicate-definition-of-WS_XML_NODE_P.patch b/patches/include-webservices/0001-include-Remove-duplicate-definition-of-WS_XML_NODE_P.patch deleted file mode 100644 index 1c8ff78a..00000000 --- a/patches/include-webservices/0001-include-Remove-duplicate-definition-of-WS_XML_NODE_P.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 50389a00b3f63757d8cab2b36e63d88f955d5a92 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sat, 25 Jun 2016 07:11:52 +0200 -Subject: include: Remove duplicate definition of WS_XML_NODE_POSITION. - ---- - include/webservices.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/webservices.h b/include/webservices.h -index a5ffd51..3c808f5 100644 ---- a/include/webservices.h -+++ b/include/webservices.h -@@ -73,7 +73,6 @@ typedef struct _WS_CUSTOM_HTTP_PROXY WS_CUSTOM_HTTP_PROXY; - typedef struct _WS_HTTP_MESSAGE_MAPPING WS_HTTP_MESSAGE_MAPPING; - typedef struct _WS_HTTP_HEADER_MAPPING WS_HTTP_HEADER_MAPPING; - typedef struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT WS_HTTP_REDIRECT_CALLBACK_CONTEXT; --typedef struct _WS_XML_NODE_POSITION WS_XML_NODE_POSITION; - - struct _WS_STRUCT_DESCRIPTION; - struct _WS_XML_STRING; --- -2.8.0 - diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index f70143af..c73b50e8 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "a9a6948b7944dccca6831914ea40e5c9aa5929bc" + echo "b1930ee4b8a0f77654bbab65c3bc30d721bf5d6a" } # Show version information @@ -159,7 +159,6 @@ patch_enable_all () enable_imagehlp_Cleanup="$1" enable_imagehlp_ImageLoad="$1" enable_imm32_IMMDisableLegacyIME="$1" - enable_include_webservices="$1" enable_iphlpapi_System_Ping="$1" enable_iphlpapi_TCP_Table="$1" enable_kernel32_COMSPEC="$1" @@ -655,9 +654,6 @@ patch_enable () imm32-IMMDisableLegacyIME) enable_imm32_IMMDisableLegacyIME="$2" ;; - include-webservices) - enable_include_webservices="$2" - ;; iphlpapi-System_Ping) enable_iphlpapi_System_Ping="$2" ;; @@ -3906,18 +3902,6 @@ if test "$enable_imm32_IMMDisableLegacyIME" -eq 1; then ) >> "$patchlist" fi -# Patchset include-webservices -# | -# | Modified files: -# | * include/webservices.h -# | -if test "$enable_include_webservices" -eq 1; then - patch_apply include-webservices/0001-include-Remove-duplicate-definition-of-WS_XML_NODE_P.patch - ( - echo '+ { "Sebastian Lackner", "include: Remove duplicate definition of WS_XML_NODE_POSITION.", 1 },'; - ) >> "$patchlist" -fi - # Patchset iphlpapi-System_Ping # | # | This patchset fixes the following Wine bugs: @@ -6197,7 +6181,6 @@ if test "$enable_shell32_Context_Menu" -eq 1; then patch_apply shell32-Context_Menu/0001-shell32-Fix-copying-of-files-when-using-a-context-me.patch patch_apply shell32-Context_Menu/0002-shell32-Set-return-value-correctly-in-DoPaste.patch patch_apply shell32-Context_Menu/0003-shell32-Implement-insert-paste-for-item-context-menu.patch - patch_apply shell32-Context_Menu/0004-shell32-Correctly-interpret-result-of-SHFileOperatio.patch patch_apply shell32-Context_Menu/0005-shell32-Add-support-for-setting-getting-PREFERREDDRO.patch patch_apply shell32-Context_Menu/0006-shell32-Add-parameter-to-ISFHelper-DeleteItems-to-al.patch patch_apply shell32-Context_Menu/0007-shell32-Remove-source-files-when-using-cut-in-the-co.patch @@ -6206,7 +6189,6 @@ if test "$enable_shell32_Context_Menu" -eq 1; then echo '+ { "Michael Müller", "shell32: Fix copying of files when using a context menu.", 1 },'; echo '+ { "Michael Müller", "shell32: Set return value correctly in DoPaste.", 1 },'; echo '+ { "Michael Müller", "shell32: Implement insert/paste for item context menus.", 1 },'; - echo '+ { "Michael Müller", "shell32: Correctly interpret result of SHFileOperation in UNIXFS copy and delete.", 1 },'; echo '+ { "Michael Müller", "shell32: Add support for setting/getting PREFERREDDROPEFFECT in IDataObject.", 1 },'; echo '+ { "Michael Müller", "shell32: Add parameter to ISFHelper::DeleteItems to allow deleting files without confirmation.", 1 },'; echo '+ { "Michael Müller", "shell32: Remove source files when using cut in the context menu.", 1 },'; diff --git a/patches/shell32-Context_Menu/0004-shell32-Correctly-interpret-result-of-SHFileOperatio.patch b/patches/shell32-Context_Menu/0004-shell32-Correctly-interpret-result-of-SHFileOperatio.patch deleted file mode 100644 index 08f9f011..00000000 --- a/patches/shell32-Context_Menu/0004-shell32-Correctly-interpret-result-of-SHFileOperatio.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 540ec171b1ad3d84c2087f616151103e4a4593df Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sat, 2 Apr 2016 03:47:48 +0200 -Subject: shell32: Correctly interpret result of SHFileOperation in UNIXFS copy - and delete. - ---- - dlls/shell32/shfldr_unixfs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c -index be1ba81..17998f2 100644 ---- a/dlls/shell32/shfldr_unixfs.c -+++ b/dlls/shell32/shfldr_unixfs.c -@@ -847,7 +847,7 @@ static HRESULT UNIXFS_copy(LPCWSTR pwszDosSrc, LPCWSTR pwszDosDst) - op.pFrom = pwszSrc; - op.pTo = pwszDst; - op.fFlags = FOF_ALLOWUNDO; -- if (!SHFileOperationW(&op)) -+ if (SHFileOperationW(&op)) - { - WARN("SHFileOperationW failed\n"); - res = E_FAIL; -@@ -1981,7 +1981,7 @@ static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, const LP - op.wFunc = FO_DELETE; - op.pFrom = wszPathsList; - op.fFlags = FOF_ALLOWUNDO; -- if (!SHFileOperationW(&op)) -+ if (SHFileOperationW(&op)) - { - WARN("SHFileOperationW failed\n"); - ret = E_FAIL; --- -2.7.1 - diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index e0cacc2b..e602e395 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -100,7 +100,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader shader_arb_ps_local_constants(compiled, context, state, rt_height); } -@@ -8018,11 +8030,16 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ +@@ -8020,11 +8032,16 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ /* Leave the opengl state valid for blitting */ arbfp_blit_unset(context->gl_info); @@ -3891,7 +3891,7 @@ diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c -@@ -3018,7 +3018,11 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 +@@ -3050,7 +3050,11 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 UINT i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ @@ -6669,7 +6669,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN; -@@ -1358,8 +1362,10 @@ struct wined3d_occlusion_query +@@ -1363,8 +1367,10 @@ struct wined3d_occlusion_query struct list entry; GLuint id; struct wined3d_context *context; @@ -6680,7 +6680,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; union wined3d_gl_query_object -@@ -1395,6 +1401,7 @@ struct wined3d_timestamp_query +@@ -1400,6 +1406,7 @@ struct wined3d_timestamp_query struct list entry; GLuint id; struct wined3d_context *context; @@ -6688,7 +6688,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h UINT64 timestamp; }; -@@ -1430,6 +1437,12 @@ static inline void wined3d_fb_copy(struct wined3d_fb_state *dst, const struct wi +@@ -1435,6 +1442,12 @@ static inline void wined3d_fb_copy(struct wined3d_fb_state *dst, const struct wi for (i = 0; i < min(dst->rt_size, src->rt_size); i++) dst->render_targets[i] = src->render_targets[i]; } @@ -6701,7 +6701,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_context { -@@ -1445,7 +1458,9 @@ struct wined3d_context +@@ -1450,7 +1463,9 @@ struct wined3d_context DWORD dirtyArray[STATE_HIGHEST + 1]; /* Won't get bigger than that, a state is never marked dirty 2 times */ DWORD numDirtyEntries; DWORD isStateDirty[STATE_HIGHEST / (sizeof(DWORD) * CHAR_BIT) + 1]; /* Bitmap to find out quickly if a state is dirty */ @@ -6711,7 +6711,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_swapchain *swapchain; struct -@@ -1553,6 +1568,14 @@ struct wined3d_context +@@ -1558,6 +1573,14 @@ struct wined3d_context GLuint dummy_arbfp_prog; }; @@ -6726,7 +6726,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id); struct StateEntry -@@ -1691,7 +1714,11 @@ void context_alloc_event_query(struct wined3d_context *context, +@@ -1696,7 +1719,11 @@ void context_alloc_event_query(struct wined3d_context *context, void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; @@ -6738,7 +6738,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN; -@@ -2317,7 +2344,11 @@ struct wined3d_stream_state +@@ -2322,7 +2349,11 @@ struct wined3d_stream_state struct wined3d_state { DWORD flags; @@ -6750,7 +6750,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[MAX_STREAM_OUT]; -@@ -2363,6 +2394,7 @@ struct wined3d_state +@@ -2368,6 +2399,7 @@ struct wined3d_state DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; }; @@ -6758,7 +6758,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_gl_bo { GLuint name; -@@ -2371,6 +2403,7 @@ struct wined3d_gl_bo +@@ -2376,6 +2408,7 @@ struct wined3d_gl_bo UINT size; }; @@ -6766,7 +6766,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h #define WINED3D_UNMAPPED_STAGE ~0U /* Multithreaded flag. Removed from the public header to signal that -@@ -2423,11 +2456,23 @@ struct wined3d_device +@@ -2428,11 +2461,23 @@ struct wined3d_device struct wined3d_rendertarget_view *back_buffer_view; struct wined3d_swapchain **swapchains; UINT swapchain_count; @@ -6790,7 +6790,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* For rendering to a texture using glCopyTexImage */ GLuint depth_blt_texture; -@@ -2475,6 +2520,7 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL +@@ -2480,6 +2525,7 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -6798,7 +6798,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) DECLSPEC_HIDDEN; void device_exec_update_texture(struct wined3d_context *context, struct wined3d_texture *src_texture, -@@ -2486,6 +2532,11 @@ void wined3d_device_release_bo(struct wined3d_device *device, struct wined3d_gl_ +@@ -2491,6 +2537,11 @@ void wined3d_device_release_bo(struct wined3d_device *device, struct wined3d_gl_ void device_create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_delete_opengl_contexts_cs(struct wined3d_device *device, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -6810,7 +6810,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state) { -@@ -2529,9 +2580,14 @@ struct wined3d_resource +@@ -2534,9 +2585,14 @@ struct wined3d_resource UINT depth; UINT size; DWORD priority; @@ -6825,7 +6825,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void *parent; const struct wined3d_parent_ops *parent_ops; -@@ -2557,7 +2613,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * +@@ -2562,7 +2618,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -6835,7 +6835,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; -@@ -2565,6 +2623,7 @@ BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_H +@@ -2570,6 +2628,7 @@ BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_H DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) DECLSPEC_HIDDEN; void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -6843,7 +6843,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h static inline void wined3d_resource_inc_fence(struct wined3d_resource *resource) { InterlockedIncrement(&resource->access_fence); -@@ -2580,6 +2639,7 @@ static inline void wined3d_resource_wait_fence(struct wined3d_resource *resource +@@ -2585,6 +2644,7 @@ static inline void wined3d_resource_wait_fence(struct wined3d_resource *resource while(InterlockedCompareExchange(&resource->access_fence, 0, 0)); } @@ -6851,7 +6851,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16 -@@ -2637,7 +2697,9 @@ struct wined3d_texture +@@ -2642,7 +2702,9 @@ struct wined3d_texture DWORD flags; GLenum target; DWORD update_map_binding; @@ -6861,7 +6861,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h GLuint rb_multisample; GLuint rb_resolved; -@@ -2675,8 +2737,12 @@ struct wined3d_texture +@@ -2680,8 +2742,12 @@ struct wined3d_texture unsigned int map_count; DWORD locations; @@ -6874,7 +6874,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h } sub_resources[1]; }; -@@ -2727,6 +2793,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture, +@@ -2732,6 +2798,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; @@ -6882,7 +6882,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_texture_changed(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_gl_bo *swap_buffer, void *swap_heap_memory) DECLSPEC_HIDDEN; -@@ -2736,6 +2803,13 @@ void wined3d_texture_get_dc_cs(struct wined3d_texture *texture, unsigned int sub +@@ -2741,6 +2808,13 @@ void wined3d_texture_get_dc_cs(struct wined3d_texture *texture, unsigned int sub GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD locations, BOOL map) DECLSPEC_HIDDEN; @@ -6896,7 +6896,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_invalidate_location(struct wined3d_texture *texture, -@@ -2746,6 +2820,7 @@ void *wined3d_texture_map_bo_address(const struct wined3d_bo_address *data, size +@@ -2751,6 +2825,7 @@ void *wined3d_texture_map_bo_address(const struct wined3d_bo_address *data, size const struct wined3d_gl_info *gl_info, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; @@ -6904,7 +6904,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h BOOL wined3d_texture_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); void *wined3d_texture_map_internal(struct wined3d_texture *texture, unsigned int sub_resource_idx, -@@ -2761,6 +2836,15 @@ void wined3d_texture_unmap_bo_address(const struct wined3d_bo_address *data, +@@ -2766,6 +2841,15 @@ void wined3d_texture_unmap_bo_address(const struct wined3d_bo_address *data, const struct wined3d_gl_info *gl_info, GLenum binding) DECLSPEC_HIDDEN; void wined3d_texture_unmap_internal(struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; @@ -6920,7 +6920,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; -@@ -2878,7 +2962,11 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru +@@ -2883,7 +2967,11 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; @@ -6932,7 +6932,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, -@@ -2889,9 +2977,11 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P +@@ -2894,9 +2982,11 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; @@ -6944,7 +6944,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -@@ -2906,10 +2996,12 @@ struct wined3d_sampler +@@ -2911,10 +3001,12 @@ struct wined3d_sampler GLuint name; }; @@ -6957,7 +6957,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_vertex_declaration_element { const struct wined3d_format *format; -@@ -3005,6 +3097,7 @@ struct wined3d_stateblock +@@ -3010,6 +3102,7 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -6965,7 +6965,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h HRESULT state_init(struct wined3d_state *state, const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; -@@ -3055,6 +3148,44 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) DECLSPEC_HID +@@ -3060,6 +3153,44 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) DECLSPEC_HID void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_switch_onscreen_ds(struct wined3d_cs *cs, struct wined3d_context *context, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; @@ -7010,7 +7010,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; -@@ -3105,6 +3236,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform +@@ -3110,6 +3241,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; @@ -7018,7 +7018,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_cs_emit_set_consts_f(struct wined3d_cs *cs, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants, enum wined3d_shader_type type) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_consts_b(struct wined3d_cs *cs, unsigned int start_idx, -@@ -3162,6 +3294,14 @@ HRESULT wined3d_cs_emit_create_swapchain_context(struct wined3d_cs *cs, +@@ -3167,6 +3299,14 @@ HRESULT wined3d_cs_emit_create_swapchain_context(struct wined3d_cs *cs, void wined3d_cs_emit_delete_opengl_contexts(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_cs_emit_update_swap_interval(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -7033,7 +7033,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d -@@ -3176,8 +3316,12 @@ enum query_state { +@@ -3181,8 +3321,12 @@ enum query_state { struct wined3d_query_ops { HRESULT (*query_get_data)(struct wined3d_query *query, void *data, DWORD data_size, DWORD flags); @@ -7046,7 +7046,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; struct wined3d_query -@@ -3191,9 +3335,11 @@ struct wined3d_query +@@ -3196,9 +3340,11 @@ struct wined3d_query enum wined3d_query_type type; DWORD data_size; void *extendedData; @@ -7058,7 +7058,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; /* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other -@@ -3221,7 +3367,9 @@ struct wined3d_buffer +@@ -3226,7 +3372,9 @@ struct wined3d_buffer GLenum buffer_object_usage; GLenum buffer_type_hint; DWORD flags; @@ -7068,7 +7068,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void *map_ptr; struct wined3d_map_range *maps; -@@ -3246,6 +3394,7 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co +@@ -3251,6 +3399,7 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -7076,7 +7076,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, -@@ -3254,6 +3403,13 @@ void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, unsigned int offs +@@ -3259,6 +3408,13 @@ void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, unsigned int offs void buffer_swap_mem(struct wined3d_buffer *buffer, BYTE *mem) DECLSPEC_HIDDEN; void buffer_create_buffer_object(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN; @@ -7090,7 +7090,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_rendertarget_view { -@@ -3315,8 +3471,12 @@ struct wined3d_unordered_access_view +@@ -3320,8 +3476,12 @@ struct wined3d_unordered_access_view struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, @@ -7103,7 +7103,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swapchain); }; -@@ -3352,8 +3512,10 @@ struct wined3d_swapchain +@@ -3357,8 +3517,10 @@ struct wined3d_swapchain void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;