March 2018 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Merge volumetexture_init() and texture_init().
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: eba15f704298aaf98f8dc4247c7665418c6112a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eba15f704298aaf98f8dc424… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 16 13:56:26 2018 +0330 wined3d: Merge volumetexture_init() and texture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 160 +++++++++++++------------------------------------ 1 file changed, 40 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eba15f704298aaf98f8d…

1 0

Henri Verbeet : wined3d: Merge wined3d_texture_init() into texture_init().
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: 549934eeea2a2bfa1cf2eedaf62be8120e57a82e URL: https://source.winehq.org/git/wine.git/?a=commit;h=549934eeea2a2bfa1cf2eeda… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 16 13:56:27 2018 +0330 wined3d: Merge wined3d_texture_init() into texture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 169 ++++++++++++++++++++++--------------------------- 1 file changed, 75 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=549934eeea2a2bfa1cf2…

1 0

Henri Verbeet : winex11: Restore the X11DRV_FLUSH_GL_DRAWABLE XFlush() for setups without OML_sync_control.
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: 14ec499d5b12ac4a1b1b9e8a316f2a6fc3943a1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=14ec499d5b12ac4a1b1b9e8a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 16 13:56:28 2018 +0330 winex11: Restore the X11DRV_FLUSH_GL_DRAWABLE XFlush() for setups without OML_sync_control. This was removed in e75bc6228ebcbdc1a3877a6ac6954611dedf8a71, but appears to mitigate lack of OML_sync_control in at least some setups. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/opengl.c | 3 +++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index be55371..fc7972c 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -259,6 +259,7 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d RECT rect = physDev->dc_rect; OffsetRect( &rect, -physDev->dc_rect.left, -physDev->dc_rect.top ); + if (data->flush) XFlush( gdi_display ); XSetFunction( gdi_display, physDev->gc, GXcopy ); XCopyArea( gdi_display, data->gl_drawable, physDev->drawable, physDev->gc, 0, 0, rect.right, rect.bottom, diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 01b92e3..7aa6448 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1976,6 +1976,7 @@ static void wglFinish(void) escape.code = X11DRV_FLUSH_GL_DRAWABLE; escape.gl_drawable = 0; + escape.flush = FALSE; if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 ))) { @@ -2001,6 +2002,7 @@ static void wglFlush(void) escape.code = X11DRV_FLUSH_GL_DRAWABLE; escape.gl_drawable = 0; + escape.flush = FALSE; if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 ))) { @@ -3286,6 +3288,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) escape.code = X11DRV_FLUSH_GL_DRAWABLE; escape.gl_drawable = 0; + escape.flush = !pglXWaitForSbcOML; if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index abd069e..6781d60 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -304,6 +304,7 @@ struct x11drv_escape_flush_gl_drawable { enum x11drv_escape_codes code; /* escape code (X11DRV_FLUSH_GL_DRAWABLE) */ Drawable gl_drawable; /* GL drawable */ + BOOL flush; /* flush X11 before copying */ }; /**************************************************************************

1 0

Alex Henrie : imm32: Fix capitalization of ImmDisableLegacyIME in its comment.
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: d0ad6316d9d0d0074bc1a2fe2b89e58d732c596a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0ad6316d9d0d0074bc1a2fe… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Mar 15 22:59:15 2018 -0600 imm32: Fix capitalization of ImmDisableLegacyIME in its comment. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 377a277..685eb01 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -3147,7 +3147,7 @@ BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl) } /*********************************************************************** - * IMMDisableLegacyIME(IMM32.@) + * ImmDisableLegacyIME(IMM32.@) */ BOOL WINAPI ImmDisableLegacyIME(void) {

1 0

Francois Gouget : wbemprox: Tweak a comment.
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: f0182f854e75d69e838a0783d40fd29579bf920b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0182f854e75d69e838a0783… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 15 18:12:35 2018 +0100 wbemprox: Tweak a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 33a951b..73f4192 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3285,7 +3285,7 @@ static const WCHAR *get_installeddriver( UINT vendorid ) static const WCHAR driver_nvidiaW[] = {'n','v','d','3','d','u','m','.','d','l','l',0}; static const WCHAR driver_wineW[] = {'w','i','n','e','.','d','l','l',0}; - /* FIXME: wined3d has a better table, but we can not access this information through dxgi */ + /* FIXME: wined3d has a better table, but we cannot access this information through dxgi */ if (vendorid == HW_VENDOR_AMD) return driver_amdW;

1 0

Józef Kucia : winevulkan: Fix vkEnumerateInstanceExtensionProperties().
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: 6d475f150d4b3376c452bc333f2756d9867d901c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d475f150d4b3376c452bc33… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 16 16:30:41 2018 +0100 winevulkan: Fix vkEnumerateInstanceExtensionProperties(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 41a45ef..49ec147 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -823,19 +823,14 @@ static VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *l if (wine_vk_instance_extension_supported(host_properties[i].extensionName)) { TRACE("Enabling extension '%s'\n", host_properties[i].extensionName); - memcpy(&properties[j], &host_properties[i], sizeof(*properties)); + properties[j] = host_properties[i]; j++; } } - - /* Return incomplete if the buffer is smaller than the number of supported extensions. */ - if (*count < num_properties) - res = VK_INCOMPLETE; - else - res = VK_SUCCESS; + *count = min(*count, num_properties); heap_free(host_properties); - return res; + return *count < num_properties ? VK_INCOMPLETE : VK_SUCCESS; } VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *count,

1 0

Józef Kucia : winevulkan: Remove unnecessary cast from wine_vk_device_alloc_queues().
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: 2f51d691f4aae818ecbfb330b4cef76bcdbe2645 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f51d691f4aae818ecbfb330… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 16 16:30:42 2018 +0100 winevulkan: Remove unnecessary cast from wine_vk_device_alloc_queues(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 49ec147..9440000 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -92,7 +92,7 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, device->funcs.p_vkGetDeviceQueue(device->device, family_index, i, &queue->queue); /* Set special header for ICD loader. */ - ((struct wine_vk_base *)queue)->loader_magic = VULKAN_ICD_MAGIC_VALUE; + queue->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; } return queues;

1 0

Nikolay Sivov : comdlg32/tests: Remove a macro.
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: 284bfc677b127a0b72f9963acac69b1c5f7209c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=284bfc677b127a0b72f9963a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 16 15:54:52 2018 +0300 comdlg32/tests: Remove a macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/filedlg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index ff973a7..fd78a64 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -939,29 +939,27 @@ static void test_resizable2(void) ofn.hInstance = GetModuleHandleA(NULL); ofn.lpTemplateName = "template1"; ofn.Flags = OFN_EXPLORER; -#define ISSIZABLE TRUE ret = GetOpenFileNameA(&ofn); - ok( ret == ISSIZABLE, "File Dialog should have been sizable\n"); + ok( ret == TRUE, "File Dialog should have been sizable\n"); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %#x\n", ret); ofn.Flags = OFN_EXPLORER | OFN_ENABLETEMPLATE; ret = GetOpenFileNameA(&ofn); - ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n"); + ok( !ret, "File Dialog should NOT have been sizable\n"); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %#x\n", ret); ofn.Flags = OFN_EXPLORER | OFN_ENABLETEMPLATEHANDLE; ofn.hInstance = LoadResource( GetModuleHandleA(NULL), FindResourceA( GetModuleHandleA(NULL), "template1", (LPSTR)RT_DIALOG)); ofn.lpTemplateName = NULL; ret = GetOpenFileNameA(&ofn); - ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n"); + ok( !ret, "File Dialog should NOT have been sizable\n"); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %#x\n", ret); ofn.Flags = OFN_EXPLORER | OFN_ENABLEHOOK; ret = GetOpenFileNameA(&ofn); - ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n"); + ok( !ret, "File Dialog should NOT have been sizable\n"); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %#x\n", ret); -#undef ISSIZABLE } static void test_mru(void)

1 0

Alexandre Julliard : Release 3.4.
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: master Commit: afe4f54bb439cfa26ca72968cec2da357ea8836e URL: https://source.winehq.org/git/wine.git/?a=commit;h=afe4f54bb439cfa26ca72968… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 16 19:50:20 2018 +0100 Release 3.4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 905 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 417 insertions(+), 511 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=afe4f54bb439cfa26ca7…

1 0

Tag wine-3.4 : Alexandre Julliard : Release 3.4
by Alexandre Julliard 16 Mar '18

16 Mar '18

Module: wine Branch: refs/tags/wine-3.4 Tag: 4b415467bbf398c5fa1c5ec56a38489d27d740e2 URL: https://source.winehq.org/git/wine.git/?a=tag;h=4b415467bbf398c5fa1c5ec56a3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 16 19:50:20 2018 +0100 Release 3.4

1 0