June 2019 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_draw_textured_quad().
by Alexandre Julliard June 20, 2019

June 20, 2019

Module: wine Branch: master Commit: f89a303bcb54c7760cc02622ba4c7f3a2223798f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f89a303bcb54c7760cc02622… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 20 02:00:19 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_draw_textured_quad(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 9 ++++----- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 29908b8..89f9b5a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7915,7 +7915,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl arbfp_blit_set(arbfp_blitter, context_gl, src_texture_gl, src_sub_resource_idx, color_key); /* Draw a textured quad */ - context_draw_textured_quad(context, src_texture_gl, + wined3d_context_gl_draw_textured_quad(context_gl, src_texture_gl, src_sub_resource_idx, src_rect, dst_rect, filter); /* Leave the opengl state valid for blitting */ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e74ec69..5b293b4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5669,12 +5669,11 @@ void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, } /* Context activation is done by the caller. */ -void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, - unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, - enum wined3d_texture_filter_type filter) +void wined3d_context_gl_draw_textured_quad(struct wined3d_context_gl *context_gl, + struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, + const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_blt_info info; unsigned int level; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a28a427..6d3590b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2089,7 +2089,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit checkGLcall("glAlphaFunc"); } - context_draw_textured_quad(context, src_texture_gl, + wined3d_context_gl_draw_textured_quad(context_gl, src_texture_gl, src_sub_resource_idx, src_rect, dst_rect, filter); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ea0096c..8e23653 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2093,6 +2093,9 @@ void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_ void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; +void wined3d_context_gl_draw_textured_quad(struct wined3d_context_gl *context_gl, + struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, + const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context_gl, uint32_t mask) DECLSPEC_HIDDEN; void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; @@ -2257,9 +2260,6 @@ BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; -void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, - unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, - enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_gl_resource_released(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_unload_numbered_arrays().
by Alexandre Julliard June 20, 2019

June 20, 2019

Module: wine Branch: master Commit: 292a15886ad1d1e239a8d8dfd13caae41fb8c88a URL: https://source.winehq.org/git/wine.git/?a=commit;h=292a15886ad1d1e239a8d8df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 20 02:00:17 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_unload_numbered_arrays(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c88e2b3..e722944 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5315,14 +5315,14 @@ static void wined3d_context_gl_unload_numbered_array(struct wined3d_context_gl * context_gl->c.numbered_array_mask &= ~(1u << i); } -static void context_unload_numbered_arrays(struct wined3d_context *context) +static void wined3d_context_gl_unload_numbered_arrays(struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + uint32_t mask = context_gl->c.numbered_array_mask; unsigned int i; - while (context->numbered_array_mask) + while (mask) { - i = wined3d_bit_scan(&context->numbered_array_mask); + i = wined3d_bit_scan(&mask); wined3d_context_gl_unload_numbered_array(context_gl, i); } } @@ -5555,7 +5555,7 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context } TRACE("Loading named arrays.\n"); - context_unload_numbered_arrays(&context_gl->c); + wined3d_context_gl_unload_numbered_arrays(context_gl); wined3d_context_gl_load_vertex_data(context_gl, &context_gl->c.stream_info, state); context_gl->c.namedArraysLoaded = TRUE; } @@ -5635,7 +5635,7 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context_gl->blit_vbo)); wined3d_context_gl_unload_vertex_data(context_gl); - context_unload_numbered_arrays(context); + wined3d_context_gl_unload_numbered_arrays(context_gl); GL_EXTCALL(glBufferData(GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STREAM_DRAW)); GL_EXTCALL(glVertexAttribPointer(0, 2, GL_FLOAT, FALSE, sizeof(*quad), NULL));

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_draw_shaded_quad().
by Alexandre Julliard June 20, 2019

June 20, 2019

Module: wine Branch: master Commit: a668fa89497928c3e7cd9bf6701f1ffd91592d5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a668fa89497928c3e7cd9bf6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 20 02:00:18 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_draw_shaded_quad(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 5 ++--- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e722944..e74ec69 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5584,12 +5584,11 @@ static void apply_texture_blit_state(const struct wined3d_gl_info *gl_info, stru } /* Context activation is done by the caller. */ -void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, +void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_blt_info info; unsigned int level, w, h, i; SIZE dst_size; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 326733d..c1f9d4c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13085,7 +13085,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli location = GL_EXTCALL(glGetUniformLocation(program->id, "colour_key.high")); GL_EXTCALL(glUniform4fv(location, 1, &float_key[1].r)); } - context_draw_shaded_quad(context, src_texture_gl, src_sub_resource_idx, src_rect, dst_rect, filter); + wined3d_context_gl_draw_shaded_quad(context_gl, src_texture_gl, src_sub_resource_idx, src_rect, dst_rect, filter); GL_EXTCALL(glUseProgram(0)); if (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 51a4f64..ea0096c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2090,6 +2090,9 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, + unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, + enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context_gl, uint32_t mask) DECLSPEC_HIDDEN; void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; @@ -2254,9 +2257,6 @@ BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; -void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, - unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, - enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN;

1 0

Andrew Eikum : kernel32: Link against RT_LIBS.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: d5d43ac9071cf53ca3f6eaa7179f55c6e28c5825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5d43ac9071cf53ca3f6eaa7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 19 13:03:46 2019 -0500 kernel32: Link against RT_LIBS. Fixes linking against glibc < 2.17 where clock_gettime needs -lrt. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 2c0bbc9..981b8b2 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_KERNEL32_ -D_NORMALIZE_ MODULE = kernel32.dll IMPORTLIB = kernel32 IMPORTS = winecrt0 ntdll -EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS) +EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS) $(RT_LIBS) EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b400000 C_SRCS = \

1 0

Michael Stefaniuc : winebuild: Use the now available ARRAY_SIZE() macro.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: dd0e2616a7ed27edef08754ab4778d7ba24a6e48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd0e2616a7ed27edef08754a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 19 17:50:29 2019 +0200 winebuild: Use the now available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/main.c | 2 +- tools/winebuild/utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index d308716..2539577 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -225,7 +225,7 @@ static void set_target( const char *target ) /* get the OS part */ target_platform = PLATFORM_UNSPECIFIED; /* default value */ - for (i = 0; i < sizeof(platform_names)/sizeof(platform_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(platform_names); i++) { if (!strncmp( platform_names[i].name, platform, strlen(platform_names[i].name) )) { diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index dbfe7a4..31a6b28 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -943,7 +943,7 @@ int get_cpu_from_name( const char *name ) { unsigned int i; - for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(cpu_names); i++) if (!strcmp( cpu_names[i].name, name )) return cpu_names[i].cpu; return -1; }

1 0

Henri Verbeet : wined3d: Do not acquire/ release the focus window in wined3d_swapchain_set_fullscreen().
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: b94a6b1efd22e4095a131776790c7f2280dfb5a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b94a6b1efd22e4095a131776… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 19 14:59:03 2019 +0430 wined3d: Do not acquire/release the focus window in wined3d_swapchain_set_fullscreen(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 2 -- dlls/wined3d/device.c | 25 +++++++++++++++++++++---- dlls/wined3d/swapchain.c | 10 ---------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index c5e5006..d058122 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4685,7 +4685,6 @@ static void test_swapchain_window_messages(void) hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); flush_events(); - todo_wine ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); expect_messages = NULL; @@ -4717,7 +4716,6 @@ static void test_swapchain_window_messages(void) hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); flush_events(); - todo_wine ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); expect_messages = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 897e2f6..09e3da3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5405,7 +5405,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_rendertarget_view *view; struct wined3d_swapchain *swapchain; struct wined3d_view_desc view_desc; - BOOL backbuffer_resized; + BOOL backbuffer_resized, windowed; HRESULT hr = WINED3D_OK; unsigned int i; @@ -5496,13 +5496,30 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, backbuffer_resized = swapchain_desc->backbuffer_width != swapchain->desc.backbuffer_width || swapchain_desc->backbuffer_height != swapchain->desc.backbuffer_height; + windowed = swapchain->desc.windowed; - if (!swapchain_desc->windowed != !swapchain->desc.windowed - || swapchain->reapply_mode || mode - || (!swapchain_desc->windowed && backbuffer_resized)) + if (!swapchain_desc->windowed != !windowed || swapchain->reapply_mode + || mode || (!swapchain_desc->windowed && backbuffer_resized)) { + /* Switch from windowed to fullscreen. */ + if (windowed && !swapchain_desc->windowed) + { + HWND focus_window = device->create_parms.focus_window; + + if (!focus_window) + focus_window = swapchain->device_window; + if (FAILED(hr = wined3d_device_acquire_focus_window(device, focus_window))) + { + ERR("Failed to acquire focus window, hr %#x.\n", hr); + return hr; + } + } if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain, swapchain_desc, mode))) return hr; + + /* Switch from fullscreen to windowed. */ + if (!windowed && swapchain_desc->windowed) + wined3d_device_release_focus_window(device); } else if (!swapchain_desc->windowed) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dd9ec12..e4882bd 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1474,15 +1474,6 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha if (swapchain->desc.windowed) { /* Switch from windowed to fullscreen */ - HWND focus_window = device->create_parms.focus_window; - if (!focus_window) - focus_window = swapchain->device_window; - if (FAILED(hr = wined3d_device_acquire_focus_window(device, focus_window))) - { - ERR("Failed to acquire focus window, hr %#x.\n", hr); - return hr; - } - wined3d_device_setup_fullscreen_window(device, swapchain->device_window, width, height); } else @@ -1505,7 +1496,6 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha if (swapchain->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) window_rect = &swapchain->original_window_rect; wined3d_device_restore_fullscreen_window(device, swapchain->device_window, window_rect); - wined3d_device_release_focus_window(device); } swapchain->desc.windowed = swapchain_desc->windowed;

1 0

Zhiyi Zhang : dxgi: Retrieve swapchains' fullscreen state from wined3d.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 2b2ea820a410c3f3e9745a8b32bc2edd89e6c4d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b2ea820a410c3f3e9745a8b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 19 14:59:02 2019 +0430 dxgi: Retrieve swapchains' fullscreen state from wined3d. Once Alt+Enter handling is implemented, the fullscreen state may change without dxgi necessarily being aware of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_private.h | 1 - dlls/dxgi/swapchain.c | 14 ++++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index b6999c7..553eace 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -173,7 +173,6 @@ struct d3d11_swapchain IWineDXGIDevice *device; IDXGIFactory *factory; - BOOL fullscreen; IDXGIOutput *target; }; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e09df48..030bb67 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -388,7 +388,6 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen if (SUCCEEDED(hr)) { - swapchain->fullscreen = fullscreen; if (swapchain->target) IDXGIOutput_Release(swapchain->target); swapchain->target = target; @@ -404,11 +403,17 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapCha BOOL *fullscreen, IDXGIOutput **target) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); + struct wined3d_swapchain_desc swapchain_desc; TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); if (fullscreen) - *fullscreen = swapchain->fullscreen; + { + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); + wined3d_mutex_unlock(); + *fullscreen = !swapchain_desc.windowed; + } if (target) { @@ -781,6 +786,7 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc) { + BOOL fullscreen; HRESULT hr; /* A reference to the implicit swapchain is held by the wined3d device. In @@ -813,7 +819,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi if (!desc->windowed && (!desc->backbuffer_width || !desc->backbuffer_height)) FIXME("Fullscreen swapchain with back buffer width/height equal to 0 not supported properly.\n"); - swapchain->fullscreen = !desc->windowed; + fullscreen = !desc->windowed; desc->windowed = TRUE; if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, &d3d11_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) @@ -823,7 +829,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi } swapchain->target = NULL; - if (swapchain->fullscreen) + if (fullscreen) { desc->windowed = FALSE; if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain,

1 0

Alexandre Julliard : kernelbase: Revert some incorrect differences with shlwapi.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 733cdaa6984f89bd42f04004f93392572beac381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=733cdaa6984f89bd42f04004… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 19:43:11 2019 +0200 kernelbase: Revert some incorrect differences with shlwapi. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index d903841..82708be 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -1518,21 +1518,20 @@ LPSTR WINAPI PathCombineA(char *dst, const char *dir, const char *file) if (!dst) return NULL; - dst[0] = 0; - if (!dir && !file) - return NULL; + goto fail; if (dir && !MultiByteToWideChar(CP_ACP, 0, dir, -1, dirW, ARRAY_SIZE(dirW))) - return NULL; + goto fail; if (file && !MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, ARRAY_SIZE(fileW))) - return NULL; + goto fail; if (PathCombineW(dstW, dir ? dirW : NULL, file ? fileW : NULL)) if (WideCharToMultiByte(CP_ACP, 0, dstW, -1, dst, MAX_PATH, 0, 0)) return dst; - +fail: + dst[0] = 0; return NULL; } @@ -1945,7 +1944,7 @@ void WINAPI PathRemoveExtensionA(char *path) return; path = PathFindExtensionA(path); - if (path && !*path) + if (path && *path) *path = '\0'; } @@ -1957,7 +1956,7 @@ void WINAPI PathRemoveExtensionW(WCHAR *path) return; path = PathFindExtensionW(path); - if (path && !*path) + if (path && *path) *path = '\0'; } @@ -3924,7 +3923,7 @@ static HRESULT url_guess_scheme(const WCHAR *url, WCHAR *out, DWORD *out_len) BOOL j; MultiByteToWideChar(CP_ACP, 0, - "Software\\Microsoft\\Windows\\CurrentVersion\\URL\\Prefixes", 1, reg_path, MAX_PATH); + "Software\\Microsoft\\Windows\\CurrentVersion\\URL\\Prefixes", -1, reg_path, MAX_PATH); RegOpenKeyExW(HKEY_LOCAL_MACHINE, reg_path, 0, 1, &newkey); index = 0; while (value_len = data_len = MAX_PATH,

1 0

Alexandre Julliard : rstrtmgr: Build with msvcrt.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 11475ae174c373072127424a0906a1ea2e4d921c URL: https://source.winehq.org/git/wine.git/?a=commit;h=11475ae174c373072127424a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:32:35 2019 +0200 rstrtmgr: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rstrtmgr/Makefile.in | 2 ++ dlls/rstrtmgr/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/rstrtmgr/Makefile.in b/dlls/rstrtmgr/Makefile.in index eb6e237..b2be9b4 100644 --- a/dlls/rstrtmgr/Makefile.in +++ b/dlls/rstrtmgr/Makefile.in @@ -1,4 +1,6 @@ MODULE = rstrtmgr.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index 433bd17..0aa8094 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : ntdll: Use .so builtin if found instead of falling back to the installed PE file.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: a226e2b7a9651f2d19a953267d3d8ff98d3783e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a226e2b7a9651f2d19a95326… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 11:47:34 2019 +0200 ntdll: Use .so builtin if found instead of falling back to the installed PE file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3d747ed..43ca7c5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2304,6 +2304,7 @@ static NTSTATUS open_builtin_file( char *name, WINE_MODREF **pwm, void **module, { WARN( "%s found in WINEDLLPATH but not a builtin, ignoring\n", debugstr_a(name) ); NtUnmapViewOfSection( NtCurrentProcess(), *module ); + *module = NULL; status = STATUS_DLL_NOT_FOUND; } @@ -2318,6 +2319,8 @@ static NTSTATUS open_builtin_file( char *name, WINE_MODREF **pwm, void **module, { if ((*so_name = RtlAllocateHeap( GetProcessHeap(), 0, strlen(name) + 1 ))) strcpy( *so_name, name ); + NtUnmapViewOfSection( NtCurrentProcess(), *module ); + *module = NULL; status = STATUS_SUCCESS; } else status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; @@ -2505,7 +2508,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, const UNICODE_STRING *nt_na if (status == STATUS_DLL_NOT_FOUND && *module_ptr) { /* builtin not found, load the module we got previously */ - TRACE( "loading %s from PE builtin %s\n", debugstr_w(name), debugstr_us(nt_name) ); + TRACE( "loading %s from PE file %s\n", debugstr_w(name), debugstr_us(nt_name) ); return load_native_dll( load_path, nt_name, module_ptr, &image_info, flags, pwm, &st ); } if (status) return status;

1 0