August 2018 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : odbccp32: Correcly lookup driver in load_config_driver.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 7973699a8b13893818cbc37444d562a1e6669593 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7973699a8b13893818cbc374… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 16 01:26:21 2018 +0000 odbccp32: Correcly lookup driver in load_config_driver. RegGetValueW doesn't return ERROR_MORE_DATA when the buffer parameter is NULL, unlike other Reg functions. This also passes the correct parameter(reg_driver) on the second call to RegGetValueW. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 08645eb..a253035 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -259,19 +259,25 @@ static HMODULE load_config_driver(const WCHAR *driver) if ((ret = RegOpenKeyW(hkey, driver, &hkeydriver)) == ERROR_SUCCESS) { ret = RegGetValueW(hkeydriver, NULL, reg_driver, RRF_RT_REG_SZ, &type, NULL, &size); - if(ret == ERROR_MORE_DATA) + if(ret != ERROR_SUCCESS || type != REG_SZ) { - filename = HeapAlloc(GetProcessHeap(), 0, size); - if(!filename) - { - RegCloseKey(hkeydriver); - RegCloseKey(hkey); - push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + RegCloseKey(hkeydriver); + RegCloseKey(hkey); + push_error(ODBC_ERROR_INVALID_DSN, odbc_error_invalid_dsn); - return NULL; - } - ret = RegGetValueW(hkeydriver, NULL, driver, RRF_RT_REG_SZ, &type, filename, &size); + return NULL; + } + + filename = HeapAlloc(GetProcessHeap(), 0, size); + if(!filename) + { + RegCloseKey(hkeydriver); + RegCloseKey(hkey); + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + + return NULL; } + ret = RegGetValueW(hkeydriver, NULL, reg_driver, RRF_RT_REG_SZ, &type, filename, &size); RegCloseKey(hkeydriver); }

1 0

Zhiyi Zhang : include: Fix a typo.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 632545162ad07ca0c0614c66bb3331a4bac0ebd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=632545162ad07ca0c0614c66… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 16 11:57:34 2018 +0800 include: Fix a typo. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index c01d7c2..455f8a4 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2792,7 +2792,7 @@ typedef struct tagTVITEMCHANGE UINT uStateNew; UINT uStateOld; LPARAM lParam; -} NVTVITEMCHANGE; +} NMTVITEMCHANGE; typedef struct tagNMTVASYNCDRAW {

1 0

Henri Verbeet : wined3d: Rename build_dxtn_alpha_table() to build_bc3_alpha_table().
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: 43fc25b1fbb6b2221624e199591fc365ff4f996a URL: https://source.winehq.org/git/wine.git/?a=commit;h=43fc25b1fbb6b2221624e199… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 16 12:27:18 2018 +0430 wined3d: Rename build_dxtn_alpha_table() to build_bc3_alpha_table(). Since it's specific to BC3, as pointed out by Matteo. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 491d888..800cdc4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -391,7 +391,7 @@ static void build_dxtn_colour_table(WORD colour0, WORD colour1, } } -static void build_dxtn_alpha_table(BYTE alpha0, BYTE alpha1, BYTE alpha_table[8]) +static void build_bc3_alpha_table(BYTE alpha0, BYTE alpha1, BYTE alpha_table[8]) { unsigned int i; @@ -449,7 +449,7 @@ static void decompress_dxtn_block(const BYTE *src, BYTE *dst, unsigned int width alpha_bits = s[0]; if (format_id == WINED3DFMT_BC3_UNORM) { - build_dxtn_alpha_table(alpha_bits & 0xff, (alpha_bits >> 8) & 0xff, alpha_table); + build_bc3_alpha_table(alpha_bits & 0xff, (alpha_bits >> 8) & 0xff, alpha_table); alpha_bits >>= 16; }

1 0

Michael Stefaniuc : winemac.drv: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: d94de38f459fdccc9d52641abfd21144d7d88f45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94de38f459fdccc9d52641a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Aug 15 23:26:24 2018 +0200 winemac.drv: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 12 ++++---- dlls/winemac.drv/display.c | 8 ++--- dlls/winemac.drv/gdi.c | 3 +- dlls/winemac.drv/keyboard.c | 70 ++++++++++++++++++++---------------------- dlls/winemac.drv/macdrv_main.c | 4 +-- dlls/winemac.drv/mouse.c | 10 +++--- dlls/winemac.drv/opengl.c | 30 +++++++++--------- dlls/winemac.drv/systray.c | 2 +- dlls/winemac.drv/window.c | 2 +- 9 files changed, 69 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d94de38f459fdccc9d52…

1 0

Zhiyi Zhang : include: Add missing notification codes.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: wine Branch: master Commit: e93dcf5ca050653079d257eb255c581c216d91c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e93dcf5ca050653079d257eb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 16 11:57:02 2018 +0800 include: Add missing notification codes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 4 ++++ include/richedit.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index b9e3ae6..c01d7c2 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1034,6 +1034,7 @@ static const WCHAR WC_BUTTONW[] = { 'B','u','t','t','o','n',0 }; #define BCN_HOTITEMCHANGE (BCN_FIRST + 1) #define BCN_DROPDOWN (BCN_FIRST + 2) +#define NM_GETCUSTOMSPLITRECT (BCN_FIRST + 3) #define BCM_FIRST 0x1600 #define BCM_GETIDEALSIZE (BCM_FIRST + 1) @@ -1796,6 +1797,7 @@ static const WCHAR TOOLTIPS_CLASSW[] = { 't','o','o','l','t','i','p','s','_', #define TTN_GETDISPINFO WINELIB_NAME_AW(TTN_GETDISPINFO) #define TTN_SHOW (TTN_FIRST-1) #define TTN_POP (TTN_FIRST-2) +#define TTN_LINKCLICK (TTN_FIRST-3) #define TTN_NEEDTEXT TTN_GETDISPINFO #define TTN_NEEDTEXTA TTN_GETDISPINFOA @@ -2289,6 +2291,7 @@ static const WCHAR WC_PAGESCROLLERW[] = { 'S','y','s','P','a','g','e','r',0 }; #define PGN_LAST (0U-950U) #define PGN_SCROLL (PGN_FIRST-1) #define PGN_CALCSIZE (PGN_FIRST-2) +#define PGN_HOTITEMCHANGE (PGN_FIRST-3) #include <pshpack1.h> @@ -4723,6 +4726,7 @@ static const WCHAR MONTHCAL_CLASSW[] = { 'S','y','s', /* Notifications */ +#define MCN_VIEWCHANGE MCN_FIRST #define MCN_SELCHANGE (MCN_FIRST + 1) #define MCN_GETDAYSTATE (MCN_FIRST + 3) #define MCN_SELECT (MCN_FIRST + 4) diff --git a/include/richedit.h b/include/richedit.h index 63221e2..c224843 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -205,6 +205,9 @@ static const WCHAR RICHEDIT_CLASS20W[] = { 'R','i','c','h','E','d','i','t','2',' #define EN_LOWFIRTF 0x070f #define EN_ALIGNLTR 0x0710 #define EN_ALIGNRTL 0x0711 +#define EN_CLIPFORMAT 0x0712 +#define EN_STARTCOMPOSITION 0x0713 +#define EN_ENDCOMPOSITION 0x0714 typedef DWORD (CALLBACK * EDITSTREAMCALLBACK)( DWORD_PTR, LPBYTE, LONG, LONG * );

1 0

Józef Kucia : build: Disable demos by default.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: aa12c0a7510bd807e7a7ca9df8c44f7791ce4bed URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aa12c0a7510bd807e7a7ca9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 18:13:31 2018 +0200 build: Disable demos by default. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 5 ++++- configure.ac | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index b066d0c..79e3155 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,16 +132,19 @@ TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ +if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ noinst_PROGRAMS += $(vkd3d_demos) -EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) demos_gears_CFLAGS = $(DEMOS_CFLAGS) demos_gears_LDADD = $(DEMOS_LDADD) -lm demos_triangle_CFLAGS = $(DEMOS_CFLAGS) demos_triangle_LDADD = $(DEMOS_LDADD) +endif + +EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) VKD3D_V_WIDL = $(vkd3d_v_widl_(a)AM_V@) vkd3d_v_widl_ = $(vkd3d_v_widl_(a)AM_DEFAULT_V@) diff --git a/configure.ac b/configure.ac index 2773a15..a610449 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,7 @@ AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler]) AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) +AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)])) AC_USE_SYSTEM_EXTENSIONS @@ -95,6 +96,7 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) +AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"])

1 0

Józef Kucia : vkd3d-compiler: Do not overallocate memory for shader code.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: f7a21ad982d8b4105c098d2201f5f64d7bf7a0db URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f7a21ad982d8b4105c098d2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 13:57:52 2018 +0200 vkd3d-compiler: Do not overallocate memory for shader code. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- programs/vkd3d-compiler/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a5dae19..d7c8016 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2509,7 +2509,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_constant(struct vkd3d_dxbc_compile const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask) { unsigned int component_count = vkd3d_write_mask_component_count(write_mask); - uint32_t values[VKD3D_VEC4_SIZE]; + uint32_t values[VKD3D_VEC4_SIZE] = {0}; unsigned int i, j; assert(reg->type == VKD3DSPR_IMMCONST); diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 83ccd3d..5fe4540 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -46,7 +46,7 @@ static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) return false; } - if (!(code = malloc(sizeof(uint32_t) * shader->size))) + if (!(code = malloc(shader->size))) { fprintf(stderr, "Out of memory.\n"); fclose(fd);

1 0

Józef Kucia : libs/vkd3d: Assert that queue is valid in vkd3d_queue_acquire().
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: 29f954be0a14a48c915a586afc1d7464da979ace URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=29f954be0a14a48c915a586… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 13:57:50 2018 +0200 libs/vkd3d: Assert that queue is valid in vkd3d_queue_acquire(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4db9967..4536264 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -66,6 +66,7 @@ static VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue) return VK_NULL_HANDLE; } + assert(queue->vk_queue); return queue->vk_queue; }

1 0

Józef Kucia : libs/vkd3d: Fix return type of d3d12_root_signature_info_count_descriptors() ( Coverity).
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: f0c27af35736661cff3f7526eac177fb6bbb5e24 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f0c27af35736661cff3f752… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 13:57:49 2018 +0200 libs/vkd3d: Fix return type of d3d12_root_signature_info_count_descriptors() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 973caee..8b10a62 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -334,7 +334,7 @@ struct d3d12_root_signature_info size_t cost; }; -static bool d3d12_root_signature_info_count_descriptors(struct d3d12_root_signature_info *info, +static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_signature_info *info, const D3D12_DESCRIPTOR_RANGE *range) { if (range->NumDescriptors == 0xffffffff)

1 0

Chip Davis : build: Use XCB_CFLAGS on libvkd3d-utils.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: da615f05ba1a20cc0c62cddc4ca7eb9a0671a653 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=da615f05ba1a20cc0c62cdd… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Aug 10 16:01:33 2018 -0500 build: Use XCB_CFLAGS on libvkd3d-utils. We need this to pull in <xcb/xcb.h>. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index f696284..b066d0c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,6 +106,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h +libvkd3d_utils_la_CFLAGS = @XCB_CFLAGS@ libvkd3d_utils_la_LDFLAGS = -version-info 1:0:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT

1 0