From 27ea029694cedd123d9be238e9d57ac9e1a03dd0 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 12 Jan 2016 21:27:55 +0100 Subject: [PATCH] Rebase against f2ceadc6e6e6b7906400b6df84ac385d263cf394. [quartz-NULL_TargetFormat] Removed patch to handle NULL target format in FilterGraph::ConvertTimeFormat (accepted upstream). --- ...lar-code-in-NtReadFile-and-FILE_Asyn.patch | 26 ++--- patches/patchinstall.sh | 18 +--- ...LL-target-format-in-FilterGraph-Conv.patch | 71 -------------- patches/quartz-NULL_TargetFormat/definition | 1 - .../wined3d-CSMT_Main/9999-IfDefined.patch | 96 +++++++++---------- 5 files changed, 59 insertions(+), 153 deletions(-) delete mode 100644 patches/quartz-NULL_TargetFormat/0001-quartz-Handle-NULL-target-format-in-FilterGraph-Conv.patch delete mode 100644 patches/quartz-NULL_TargetFormat/definition diff --git a/patches/kernel32-Named_Pipe/0006-ntdll-Unify-similar-code-in-NtReadFile-and-FILE_Asyn.patch b/patches/kernel32-Named_Pipe/0006-ntdll-Unify-similar-code-in-NtReadFile-and-FILE_Asyn.patch index b475b63a..451f1048 100644 --- a/patches/kernel32-Named_Pipe/0006-ntdll-Unify-similar-code-in-NtReadFile-and-FILE_Asyn.patch +++ b/patches/kernel32-Named_Pipe/0006-ntdll-Unify-similar-code-in-NtReadFile-and-FILE_Asyn.patch @@ -1,4 +1,4 @@ -From 8ad4ff3e0ed7e3065a1f408873a69d51cb6b3b51 Mon Sep 17 00:00:00 2001 +From 22c72712928594addc4e717d2bb3fd8185db4479 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 15 Aug 2014 22:23:08 +0200 Subject: ntdll: Unify similar code in NtReadFile and FILE_AsyncReadService. @@ -15,14 +15,14 @@ Changes in FILE_AsyncReadService: whereas NtReadFile uses different behaviour based on the fd type. Now both implementations match, and behave the same way. --- - dlls/ntdll/file.c | 108 +++++++++++++++++++++++------------------------------- - 1 file changed, 46 insertions(+), 62 deletions(-) + dlls/ntdll/file.c | 102 ++++++++++++++++++++++++------------------------------ + 1 file changed, 46 insertions(+), 56 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c -index 79daec5..fd88777 100644 +index 4134b9b..72bbaa2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c -@@ -471,6 +471,45 @@ NTSTATUS FILE_GetNtStatus(void) +@@ -486,6 +486,45 @@ NTSTATUS FILE_GetNtStatus(void) } } @@ -68,7 +68,7 @@ index 79daec5..fd88777 100644 /*********************************************************************** * FILE_AsyncReadService (INTERNAL) */ -@@ -478,44 +517,19 @@ static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, +@@ -493,38 +532,19 @@ static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status, void **apc, void **arg ) { struct async_fileio_read *fileio = user; @@ -107,18 +107,12 @@ index 79daec5..fd88777 100644 - if (fileio->already >= fileio->count || fileio->avail_mode) - status = STATUS_SUCCESS; - else -- { -- /* if we only have to read the available data, and none is available, -- * simply cancel the request. If data was available, it has been read -- * while in by previous call (NtDelayExecution) -- */ -- status = (fileio->avail_mode) ? STATUS_SUCCESS : STATUS_PENDING; -- } +- status = STATUS_PENDING; - } break; case STATUS_TIMEOUT: -@@ -762,7 +776,6 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL +@@ -771,7 +791,6 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL return status; } @@ -126,7 +120,7 @@ index 79daec5..fd88777 100644 /****************************************************************************** * NtReadFile [NTDLL.@] * ZwReadFile [NTDLL.@] -@@ -858,38 +871,9 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, +@@ -867,38 +886,9 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, for (;;) { @@ -168,5 +162,5 @@ index 79daec5..fd88777 100644 if (async_read) { -- -2.4.0 +2.6.4 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 0b60d06f..c260c098 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "0f67df657db77ea8aef9c2b9498fb5fa1f514a55" + echo "f2ceadc6e6e6b7906400b6df84ac385d263cf394" } # Show version information @@ -233,7 +233,6 @@ patch_enable_all () enable_openal32_EFX_Extension="$1" enable_opengl32_Revert_Disable_Ext="$1" enable_quartz_MediaSeeking_Positions="$1" - enable_quartz_NULL_TargetFormat="$1" enable_rasapi32_RasEnumDevicesA="$1" enable_riched20_IText_Interface="$1" enable_rpcrt4_Pipe_Transport="$1" @@ -823,9 +822,6 @@ patch_enable () quartz-MediaSeeking_Positions) enable_quartz_MediaSeeking_Positions="$2" ;; - quartz-NULL_TargetFormat) - enable_quartz_NULL_TargetFormat="$2" - ;; rasapi32-RasEnumDevicesA) enable_rasapi32_RasEnumDevicesA="$2" ;; @@ -4881,18 +4877,6 @@ if test "$enable_quartz_MediaSeeking_Positions" -eq 1; then ) >> "$patchlist" fi -# Patchset quartz-NULL_TargetFormat -# | -# | Modified files: -# | * dlls/quartz/filtergraph.c, dlls/quartz/tests/filtergraph.c -# | -if test "$enable_quartz_NULL_TargetFormat" -eq 1; then - patch_apply quartz-NULL_TargetFormat/0001-quartz-Handle-NULL-target-format-in-FilterGraph-Conv.patch - ( - echo '+ { "Anton Baskanov", "quartz: Handle NULL target format in FilterGraph::ConvertTimeFormat.", 2 },'; - ) >> "$patchlist" -fi - # Patchset rasapi32-RasEnumDevicesA # | # | This patchset fixes the following Wine bugs: diff --git a/patches/quartz-NULL_TargetFormat/0001-quartz-Handle-NULL-target-format-in-FilterGraph-Conv.patch b/patches/quartz-NULL_TargetFormat/0001-quartz-Handle-NULL-target-format-in-FilterGraph-Conv.patch deleted file mode 100644 index 32a75c00..00000000 --- a/patches/quartz-NULL_TargetFormat/0001-quartz-Handle-NULL-target-format-in-FilterGraph-Conv.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 31fe7edbf8cc2a2d73c3ab2bc1e835873f6f361d Mon Sep 17 00:00:00 2001 -From: Anton Baskanov -Date: Wed, 6 Jan 2016 23:29:42 +0600 -Subject: quartz: Handle NULL target format in FilterGraph::ConvertTimeFormat. - (try 2) - -Signed-off-by: Anton Baskanov - -try2: - - added tests ---- - dlls/quartz/filtergraph.c | 3 +++ - dlls/quartz/tests/filtergraph.c | 21 +++++++++++++++++++++ - 2 files changed, 24 insertions(+) - -diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c -index 5b4b080..5cb670e 100644 ---- a/dlls/quartz/filtergraph.c -+++ b/dlls/quartz/filtergraph.c -@@ -2530,6 +2530,9 @@ static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, LONGL - if (!pSourceFormat) - pSourceFormat = &This->timeformatseek; - -+ if (!pTargetFormat) -+ pTargetFormat = &This->timeformatseek; -+ - if (IsEqualGUID(pTargetFormat, pSourceFormat)) - *pTarget = Source; - else -diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c -index 39d6e88..87b1123 100644 ---- a/dlls/quartz/tests/filtergraph.c -+++ b/dlls/quartz/tests/filtergraph.c -@@ -255,6 +255,7 @@ static void test_mediacontrol(void) - { - HRESULT hr; - LONGLONG pos = 0xdeadbeef; -+ GUID format = GUID_NULL; - IMediaSeeking *seeking = NULL; - IMediaFilter *filter = NULL; - IMediaControl *control = NULL; -@@ -282,6 +283,26 @@ static void test_mediacontrol(void) - return; - } - -+ format = GUID_NULL; -+ hr = IMediaSeeking_GetTimeFormat(seeking, &format); -+ ok(hr == S_OK, "GetTimeFormat failed: %08x\n", hr); -+ ok(IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME), "GetTimeFormat: unexpected format %s\n", wine_dbgstr_guid(&format)); -+ -+ pos = 0xdeadbeef; -+ hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, NULL); -+ ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); -+ ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); -+ -+ pos = 0xdeadbeef; -+ hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL); -+ ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); -+ ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); -+ -+ pos = 0xdeadbeef; -+ hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME); -+ ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); -+ ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); -+ - hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); - ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); - ok(pos == 0, "Position != 0 (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); --- -2.6.4 - diff --git a/patches/quartz-NULL_TargetFormat/definition b/patches/quartz-NULL_TargetFormat/definition deleted file mode 100644 index 1b7a8329..00000000 --- a/patches/quartz-NULL_TargetFormat/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: Handle NULL target format in FilterGraph::ConvertTimeFormat. diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index cb51d13b..30525da1 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -70,7 +70,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); } -@@ -7849,7 +7857,11 @@ +@@ -7854,7 +7862,11 @@ /* Now load the surface */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO @@ -82,7 +82,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader == WINED3D_LOCATION_DRAWABLE && !wined3d_resource_is_offscreen(&src_surface->container->resource)) { -@@ -7887,6 +7899,7 @@ +@@ -7892,6 +7904,7 @@ /* Leave the opengl state valid for blitting */ arbfp_blit_unset(context->gl_info); @@ -90,7 +90,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader if (wined3d_settings.cs_multithreaded) context->gl_info->gl_ops.gl.p_glFinish(); else if (wined3d_settings.strict_draw_ordering -@@ -7898,6 +7911,17 @@ +@@ -7903,6 +7916,17 @@ wined3d_resource_validate_location(&dst_surface->resource, dst_surface->container->resource.draw_binding); wined3d_resource_invalidate_location(&dst_surface->resource, ~dst_surface->container->resource.draw_binding); @@ -4680,7 +4680,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 -@@ -1887,7 +1887,11 @@ +@@ -1892,7 +1892,11 @@ } } @@ -4692,7 +4692,7 @@ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c { HeapFree(GetProcessHeap(), 0, shader->output_signature.elements); HeapFree(GetProcessHeap(), 0, shader->input_signature.elements); -@@ -2146,10 +2150,16 @@ +@@ -2151,10 +2155,16 @@ if (!refcount) { @@ -4709,7 +4709,7 @@ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c } return refcount; -@@ -2432,7 +2442,11 @@ +@@ -2437,7 +2447,11 @@ memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && state->render_states[WINED3D_RS_SRGBWRITEENABLE]) { @@ -9228,7 +9228,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN; -@@ -1030,9 +1060,14 @@ +@@ -1035,9 +1065,14 @@ WORD use_map; /* MAX_ATTRIBS, 16 */ }; @@ -9243,7 +9243,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define eps 1e-8f -@@ -1120,8 +1155,10 @@ +@@ -1125,8 +1160,10 @@ struct list entry; GLuint id; struct wined3d_context *context; @@ -9254,7 +9254,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; union wined3d_gl_query_object -@@ -1157,6 +1194,7 @@ +@@ -1162,6 +1199,7 @@ struct list entry; GLuint id; struct wined3d_context *context; @@ -9262,7 +9262,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h UINT64 timestamp; }; -@@ -1192,6 +1230,12 @@ +@@ -1197,6 +1235,12 @@ for (i = 0; i < min(dst->rt_size, src->rt_size); i++) dst->render_targets[i] = src->render_targets[i]; } @@ -9275,7 +9275,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_context { -@@ -1207,7 +1251,9 @@ +@@ -1212,7 +1256,9 @@ 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 */ @@ -9285,7 +9285,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_swapchain *swapchain; struct wined3d_surface *current_rt; -@@ -1305,8 +1351,17 @@ +@@ -1310,8 +1356,17 @@ GLfloat fog_coord_value; GLfloat color[4], fogstart, fogend, fogcolor[4]; GLuint dummy_arbfp_prog; @@ -9303,7 +9303,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); -@@ -1449,8 +1504,12 @@ +@@ -1454,8 +1509,12 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; @@ -9316,7 +9316,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN; void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, -@@ -2033,7 +2092,11 @@ +@@ -2038,7 +2097,11 @@ struct wined3d_state { DWORD flags; @@ -9328,7 +9328,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]; -@@ -2078,6 +2141,7 @@ +@@ -2083,6 +2146,7 @@ DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; }; @@ -9336,7 +9336,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_gl_bo { GLuint name; -@@ -2086,6 +2150,7 @@ +@@ -2091,6 +2155,7 @@ UINT size; }; @@ -9344,7 +9344,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 -@@ -2141,11 +2206,23 @@ +@@ -2146,11 +2211,23 @@ struct wined3d_rendertarget_view *back_buffer_view; struct wined3d_swapchain **swapchains; UINT swapchain_count; @@ -9368,7 +9368,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; -@@ -2156,6 +2233,9 @@ +@@ -2161,6 +2238,9 @@ UINT xScreenSpace; UINT yScreenSpace; UINT cursorWidth, cursorHeight; @@ -9378,7 +9378,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h HCURSOR hardwareCursor; /* The Wine logo texture */ -@@ -2190,6 +2270,7 @@ +@@ -2195,6 +2275,7 @@ 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; @@ -9386,7 +9386,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, -@@ -2202,6 +2283,11 @@ +@@ -2207,6 +2288,11 @@ void device_create_default_sampler(struct wined3d_device *device); void device_delete_opengl_contexts_cs(struct wined3d_device *device, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -9398,7 +9398,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) { -@@ -2221,9 +2307,11 @@ +@@ -2226,9 +2312,11 @@ HRESULT (*resource_sub_resource_map)(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); HRESULT (*resource_sub_resource_unmap)(struct wined3d_resource *resource, unsigned int sub_resource_idx); @@ -9410,7 +9410,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; struct wined3d_resource -@@ -2248,6 +2336,7 @@ +@@ -2253,6 +2341,7 @@ UINT depth; UINT size; DWORD priority; @@ -9418,7 +9418,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void *heap_memory, *map_heap_memory, *user_memory, *bitmap_data; UINT custom_row_pitch, custom_slice_pitch; struct wined3d_gl_bo *buffer, *map_buffer; -@@ -2255,6 +2344,10 @@ +@@ -2260,6 +2349,10 @@ DWORD locations; LONG access_fence; BOOL unmap_dirtify; @@ -9429,7 +9429,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void *parent; const struct wined3d_parent_ops *parent_ops; -@@ -2279,6 +2372,7 @@ +@@ -2284,6 +2377,7 @@ void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -9437,7 +9437,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h DWORD wined3d_resource_access_from_location(DWORD location) DECLSPEC_HIDDEN; BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_changed(struct wined3d_resource *resource, -@@ -2327,6 +2421,15 @@ +@@ -2332,6 +2426,15 @@ { while(InterlockedCompareExchange(&resource->access_fence, 0, 0)); } @@ -9453,7 +9453,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 -@@ -2411,7 +2514,9 @@ +@@ -2416,7 +2519,9 @@ void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; @@ -9463,7 +9463,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h 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, -@@ -2443,8 +2548,15 @@ +@@ -2448,8 +2553,15 @@ struct wined3d_resource resource; struct wined3d_texture *container; @@ -9479,7 +9479,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource) -@@ -2452,6 +2564,7 @@ +@@ -2457,6 +2569,7 @@ return CONTAINING_RECORD(resource, struct wined3d_volume, resource); } @@ -9487,7 +9487,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN; -@@ -2467,6 +2580,27 @@ +@@ -2472,6 +2585,27 @@ struct wined3d_surface_dib { HBITMAP DIBsection; @@ -9515,7 +9515,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h UINT bitmap_size; }; -@@ -2492,7 +2626,11 @@ +@@ -2497,7 +2631,11 @@ struct wined3d_surface_ops { HRESULT (*surface_private_setup)(struct wined3d_surface *surface); @@ -9527,7 +9527,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; struct wined3d_surface -@@ -2500,12 +2638,26 @@ +@@ -2505,12 +2643,26 @@ struct wined3d_resource resource; const struct wined3d_surface_ops *surface_ops; struct wined3d_texture *container; @@ -9554,7 +9554,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h GLuint rb_multisample; GLuint rb_resolved; GLenum texture_target; -@@ -2549,11 +2701,22 @@ +@@ -2554,11 +2706,22 @@ GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; @@ -9577,7 +9577,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -@@ -2565,6 +2728,7 @@ +@@ -2570,6 +2733,7 @@ const struct wined3d_gl_info *gl_info, void *mem, unsigned int pitch) DECLSPEC_HIDDEN; HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; @@ -9585,7 +9585,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, GLenum target, unsigned int level, unsigned int layer, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; -@@ -2579,6 +2743,17 @@ +@@ -2584,6 +2748,17 @@ void wined3d_surface_cleanup_cs(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void wined3d_surface_getdc_cs(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void wined3d_surface_releasedc_cs(struct wined3d_surface *surface) DECLSPEC_HIDDEN; @@ -9603,7 +9603,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; -@@ -2599,8 +2774,10 @@ +@@ -2604,8 +2779,10 @@ GLuint name; }; @@ -9614,7 +9614,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; -@@ -2629,8 +2806,10 @@ +@@ -2634,8 +2811,10 @@ BOOL half_float_conv_needed; }; @@ -9625,7 +9625,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_saved_states { DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1]; -@@ -2698,6 +2877,7 @@ +@@ -2703,6 +2882,7 @@ void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -9633,7 +9633,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; -@@ -2748,6 +2928,32 @@ +@@ -2753,6 +2933,32 @@ 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; @@ -9666,7 +9666,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; -@@ -2797,6 +3003,7 @@ +@@ -2802,6 +3008,7 @@ 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; @@ -9674,7 +9674,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, UINT start_register, const float *constants, UINT vector4f_count, enum wined3d_shader_type type) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_consts_b(struct wined3d_cs *cs, UINT start_register, -@@ -2860,6 +3067,7 @@ +@@ -2865,6 +3072,7 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int depth_pitch) DECLSPEC_HIDDEN; @@ -9682,7 +9682,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 -@@ -2874,8 +3082,12 @@ +@@ -2879,8 +3087,12 @@ struct wined3d_query_ops { HRESULT (*query_get_data)(struct wined3d_query *query, void *data, DWORD data_size, DWORD flags); @@ -9695,7 +9695,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; struct wined3d_query -@@ -2889,12 +3101,16 @@ +@@ -2894,12 +3106,16 @@ enum wined3d_query_type type; DWORD data_size; void *extendedData; @@ -9712,7 +9712,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 * fixed function semantics as D3DCOLOR or FLOAT16 */ -@@ -2921,7 +3137,9 @@ +@@ -2926,7 +3142,9 @@ GLenum buffer_object_usage; GLenum buffer_type_hint; DWORD flags; @@ -9722,7 +9722,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void *map_ptr; struct wined3d_map_range *maps; -@@ -2946,11 +3164,15 @@ +@@ -2951,11 +3169,15 @@ BYTE *buffer_get_sysmem(struct wined3d_buffer *This, 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; @@ -9738,7 +9738,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; -@@ -2991,8 +3213,10 @@ +@@ -2996,8 +3218,10 @@ return surface_from_resource(resource); } @@ -9749,7 +9749,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_shader_resource_view { LONG refcount; -@@ -3005,8 +3229,12 @@ +@@ -3010,8 +3234,12 @@ struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect, @@ -9762,7 +9762,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; struct wined3d_swapchain -@@ -3045,8 +3273,10 @@ +@@ -3050,8 +3278,10 @@ void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -9773,7 +9773,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /***************************************************************************** * Utility function prototypes -@@ -3250,7 +3480,9 @@ +@@ -3255,7 +3485,9 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_string_buffer *buffer, const struct wined3d_shader_reg_maps *reg_maps, const DWORD *byte_code, void *backend_ctx) DECLSPEC_HIDDEN; BOOL shader_match_semantic(const char *semantic_name, enum wined3d_decl_usage usage) DECLSPEC_HIDDEN;