wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Alex Henrie : d3dcompiler_43: Turn variable 'c' into a static constant.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: cbae62ba9e427216a45cfd88f113178684169d59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbae62ba9e427216a45cfd88… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 11 20:51:37 2018 -0700 d3dcompiler_43: Turn variable 'c' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 748501f..bda41c4 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2176,7 +2176,7 @@ static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle *swizzle) } else { - char c[] = {'x', 'y', 'z', 'w'}; + static const char c[] = {'x', 'y', 'z', 'w'}; for (i = 0; i < swizzle->node.data_type->dimx; ++i) TRACE("%c", c[(swizzle->swizzle >> i * 2) & 0x3]);

1 0

Alex Henrie : atl: Turn variable 'mshtml_prefixW' into a static constant.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: b6e87cd48cd4441d387d292e8f91be8e34a19440 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6e87cd48cd4441d387d292e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 11 20:51:15 2018 -0700 atl: Turn variable 'mshtml_prefixW' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl_ax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index ff627cc..8121278 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1001,9 +1001,9 @@ enum content static enum content get_content_type(LPCOLESTR name, CLSID *control_id) { + static const WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':',0}; WCHAR new_urlW[MAX_PATH]; DWORD size = MAX_PATH; - WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':','\0'}; if (!name || !name[0]) {

1 0

Jacek Caban : widl: Don't make proxy vtbl const in interpreted mode.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: a514aa7653d96afd8c49f0d28c8e207b6707c800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a514aa7653d96afd8c49f0d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 11 20:42:55 2018 +0100 widl: Don't make proxy vtbl const in interpreted mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/proxy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 4c7d85d..87c27be 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -664,7 +664,8 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) /* proxy vtable */ print_proxy( "static %sCINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", - need_delegation_indirect(iface) ? "" : "const ", count, iface->name); + (get_stub_mode() != MODE_Os || need_delegation_indirect(iface)) ? "" : "const ", + count, iface->name); print_proxy( "{\n"); indent++; print_proxy( "{\n");

1 0

Jacek Caban : widl: Write async interface IIDs to _i.c file.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: da6b0ca6e69fe77fcbcadf0af62b0c7d4f381a45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da6b0ca6e69fe77fcbcadf0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 11 20:42:30 2018 +0100 widl: Write async interface IIDs to _i.c file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 410efb4..7e411cf 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -483,6 +483,11 @@ static void write_id_data_stmts(const statement_list_t *stmts) uuid = get_attrp(type->attrs, ATTR_UUID); write_id_guid(idfile, "IID", is_attr(type->attrs, ATTR_DISPINTERFACE) ? "DIID" : "IID", type->name, uuid); + if (type->details.iface->async_iface) + { + uuid = get_attrp(type->details.iface->async_iface->attrs, ATTR_UUID); + write_id_guid(idfile, "IID", "IID", type->details.iface->async_iface->name, uuid); + } } else if (type_get_type(type) == TYPE_COCLASS) {

1 0

Gabriel Ivăncescu : comctl32/listbox: Clear LBS_OWNERDRAWVARIABLE if LBS_OWNERDRAWFIXED is set.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: 2813b43aebaa11970716a2423f6b947b0f447cd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2813b43aebaa11970716a242… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Sun Nov 11 10:04:14 2018 +0300 comctl32/listbox: Clear LBS_OWNERDRAWVARIABLE if LBS_OWNERDRAWFIXED is set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 ++ dlls/comctl32/tests/listbox.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2137ef8..d0e8e60 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2520,6 +2520,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) if (descr->style & LBS_OWNERDRAWFIXED) { + descr->style &= ~LBS_OWNERDRAWVARIABLE; + if( descr->lphc && (descr->lphc->dwStyle & CBS_DROPDOWN)) { /* WinWord gets VERY unhappy if we send WM_MEASUREITEM from here */ diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index a0ef9f5..c560ce1 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -435,6 +435,8 @@ static void test_ownerdraw(void) NULL, NULL, NULL, 0); ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); @@ -450,7 +452,6 @@ static void test_ownerdraw(void) ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); -todo_wine ok(ret == 42, "Unexpected item height %d.\n", ret); ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0);

1 0

Gabriel Ivăncescu : comctl32/tests: Test incompatible styles for LBS_NODATA.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: 4c5f38493d07e0a1d5e7520ea3d37416bb91520b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c5f38493d07e0a1d5e7520e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Sun Nov 11 10:04:13 2018 +0300 comctl32/tests: Test incompatible styles for LBS_NODATA. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 387660d..a0ef9f5 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2239,14 +2239,23 @@ static void test_WM_MEASUREITEM(void) static void test_LBS_NODATA(void) { + static const DWORD invalid_styles[] = + { + 0, + LBS_OWNERDRAWVARIABLE, + LBS_SORT, + LBS_HASSTRINGS, + LBS_OWNERDRAWFIXED | LBS_SORT, + LBS_OWNERDRAWFIXED | LBS_HASSTRINGS, + }; static const UINT invalid_idx[] = { -2, 2 }; static const UINT valid_idx[] = { 0, 1 }; static const ULONG_PTR zero_data; + HWND listbox, parent; INT ret, text_len; unsigned int i; ULONG_PTR data; BOOL is_wow64; - HWND listbox; listbox = CreateWindowA(WC_LISTBOXA, "TestList", LBS_NODATA | LBS_OWNERDRAWFIXED | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, 0); @@ -2315,6 +2324,28 @@ todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); DestroyWindow(listbox); + + /* Invalid window style combinations. */ + parent = create_parent(); + ok(parent != NULL, "Failed to create parent window.\n"); + + for (i = 0; i < ARRAY_SIZE(invalid_styles); ++i) + { + DWORD style; + + listbox = CreateWindowA(WC_LISTBOXA, "TestList", LBS_NODATA | WS_CHILD | invalid_styles[i], + 0, 0, 100, 100, parent, (HMENU)ID_LISTBOX, NULL, 0); + ok(listbox != NULL, "Failed to create a listbox.\n"); + + style = GetWindowLongA(listbox, GWL_STYLE); + ok((style & invalid_styles[i]) == invalid_styles[i], "%u: unexpected window styles %#x.\n", i, style); + ret = SendMessageA(listbox, LB_SETCOUNT, 100, 0); + todo_wine_if(i == 1 || i == 4) + ok(ret == LB_ERR, "%u: unexpected return value %d.\n", i, ret); + DestroyWindow(listbox); + } + + DestroyWindow(parent); } START_TEST(listbox)

1 0

Gabriel Ivăncescu : comctl32/tests: Add some tests for LBS_NODATA.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: 9324f89f4bcee9c190629bcd76f2fd235bbfaeef URL: https://source.winehq.org/git/wine.git/?a=commit;h=9324f89f4bcee9c190629bcd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Sun Nov 11 10:04:12 2018 +0300 comctl32/tests: Add some tests for LBS_NODATA. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 154 +++++++++++++++++++++++++++++++----------- 1 file changed, 116 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9324f89f4bcee9c19062…

1 0

Gabriel Ivăncescu : comctl32/tests: Add more Listbox tests for ownerdraw styles.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: ed7804e714a26ea55c993a6b98faca12a3ae5280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed7804e714a26ea55c993a6b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Sun Nov 11 10:04:11 2018 +0300 comctl32/tests: Add more Listbox tests for ownerdraw styles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index d4bb2cc..c118047 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -433,6 +433,35 @@ static void test_ownerdraw(void) ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); DestroyWindow(hLB); + + /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ + hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, + NULL, NULL, NULL, 0); + ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 13, "Unexpected item height %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); +todo_wine + ok(ret == 42, "Unexpected item height %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); + + DestroyWindow (hLB); + DestroyWindow(parent); } @@ -1737,7 +1766,13 @@ static void test_listbox_dlgdir(void) static void test_set_count( void ) { + static const DWORD styles[] = + { + LBS_OWNERDRAWFIXED, + LBS_HASSTRINGS, + }; HWND parent, listbox; + unsigned int i; LONG ret; RECT r; @@ -1767,6 +1802,21 @@ static void test_set_count( void ) ok( !IsRectEmpty( &r ), "got empty rect\n"); DestroyWindow( listbox ); + + for (i = 0; i < ARRAY_SIZE(styles); ++i) + { + listbox = create_listbox( styles[i] | WS_CHILD | WS_VISIBLE, parent ); + + SetLastError( 0xdeadbeef ); + ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); + todo_wine_if(i == 0) + ok( ret == LB_ERR, "expected %d, got %d\n", LB_ERR, ret ); + todo_wine_if(i == 1) + ok( GetLastError() == 0xdeadbeef, "Unexpected error %d.\n", GetLastError() ); + + DestroyWindow( listbox ); + } + DestroyWindow( parent ); }

1 0

Nikolay Sivov : kernel32/tests: Fix skips for implemented functions.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: 982b93148ca102e2e76421401c0288519931600d URL: https://source.winehq.org/git/wine.git/?a=commit;h=982b93148ca102e2e7642140… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 10 21:15:05 2018 +0300 kernel32/tests: Fix skips for implemented functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 6 +++--- dlls/kernel32/tests/process.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0c99fca..168bdd5 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4710,7 +4710,7 @@ static void test_GetFinalPathNameByHandleA(void) if (!pGetFinalPathNameByHandleA) { - skip("GetFinalPathNameByHandleA is missing\n"); + win_skip("GetFinalPathNameByHandleA is missing\n"); return; } @@ -4803,7 +4803,7 @@ static void test_GetFinalPathNameByHandleW(void) if (!pGetFinalPathNameByHandleW) { - skip("GetFinalPathNameByHandleW is missing\n"); + win_skip("GetFinalPathNameByHandleW is missing\n"); return; } @@ -5026,7 +5026,7 @@ static void test_post_completion(void) if (!pGetQueuedCompletionStatusEx) { - skip("GetQueuedCompletionStatusEx not available\n"); + win_skip("GetQueuedCompletionStatusEx not available\n"); CloseHandle( port ); return; } diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9f99720..fe68d28 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2117,7 +2117,7 @@ static void test_IsWow64Process(void) if (!pIsWow64Process) { - skip("IsWow64Process is not available\n"); + win_skip("IsWow64Process is not available\n"); return; } @@ -3660,7 +3660,7 @@ static void test_largepages(void) SIZE_T size; if (!pGetLargePageMinimum) { - skip("No GetLargePageMinimum support.\n"); + win_skip("No GetLargePageMinimum support.\n"); return; } size = pGetLargePageMinimum();

1 0

André Hentschel : include: Add more PROCESSOR_ARCHITECTURE defines.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: 2febd18e2806ffc9914a58807c45bfbdfefce73a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2febd18e2806ffc9914a5880… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 10 15:13:28 2018 +0100 include: Add more PROCESSOR_ARCHITECTURE defines. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 9edd65e..6b5b660 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -653,6 +653,8 @@ typedef DWORD FLONG; #define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10 #define PROCESSOR_ARCHITECTURE_NEUTRAL 11 #define PROCESSOR_ARCHITECTURE_ARM64 12 +#define PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64 13 +#define PROCESSOR_ARCHITECTURE_IA32_ON_ARM64 14 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF /* dwProcessorType */

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2018