wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Józef Kucia : wined3d: Silence false FIXME message.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: eb5ed66aec7a7ccdd55f5dd402cc1bfc2b1ead60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5ed66aec7a7ccdd55f5dd40… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 5 19:41:41 2016 +0200 wined3d: Silence false FIXME message. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 626432b..5ccb027 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1784,7 +1784,7 @@ static void shader_glsl_declare_generic_vertex_attribute(struct wined3d_string_b index); return; } - if (e->sysval_semantic) + if (e->sysval_semantic && e->sysval_semantic != WINED3D_SV_POSITION) FIXME("Unhandled sysval semantic %#x.\n", e->sysval_semantic); if (shader_glsl_use_explicit_attrib_location(gl_info))

1 0

Nikolay Sivov : comctl32/treeview: Fix hot-tracking with TVS_FULLROWSELECT.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: 0220d47c0293545a60dea87af7383edee2fc0000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0220d47c0293545a60dea87af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 8 10:57:16 2016 +0300 comctl32/treeview: Fix hot-tracking with TVS_FULLROWSELECT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 6540fdb..dc31a9b 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -353,6 +353,20 @@ TREEVIEW_IsChildOf(const TREEVIEW_ITEM *parent, const TREEVIEW_ITEM *child) return FALSE; } +static BOOL +TREEVIEW_IsFullRowSelect(const TREEVIEW_INFO *infoPtr) +{ + return !(infoPtr->dwStyle & TVS_HASLINES) && (infoPtr->dwStyle & TVS_FULLROWSELECT); +} + +static BOOL +TREEVIEW_IsItemHit(const TREEVIEW_INFO *infoPtr, const TVHITTESTINFO *ht) +{ + if (TREEVIEW_IsFullRowSelect(infoPtr)) + return ht->flags & (TVHT_ONITEMINDENT | TVHT_ONITEMBUTTON | TVHT_ONITEM | TVHT_ONITEMRIGHT); + else + return ht->flags & TVHT_ONITEM; +} /* Tree Traversal *******************************************************/ @@ -5334,6 +5348,7 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) TRACKMOUSEEVENT trackinfo; TREEVIEW_ITEM * item; TVHITTESTINFO ht; + BOOL item_hit; if (!(infoPtr->dwStyle & TVS_TRACKSELECT)) return 0; @@ -5362,12 +5377,13 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) ht.pt.y = (short)HIWORD(lParam); item = TREEVIEW_HitTest(infoPtr, &ht); - if ((item != infoPtr->hotItem) || !(ht.flags & TVHT_ONITEM)) + item_hit = TREEVIEW_IsItemHit(infoPtr, &ht); + if ((item != infoPtr->hotItem) || !item_hit) { /* redraw old hot item */ TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); infoPtr->hotItem = NULL; - if (item && (ht.flags & TVHT_ONITEM)) + if (item && item_hit) { infoPtr->hotItem = item; /* redraw new hot item */ @@ -5532,7 +5548,7 @@ TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (TREEVIEW_SendRealNotify(infoPtr, NM_SETCURSOR, &nmmouse.hdr)) return 0; - if (item && (infoPtr->dwStyle & TVS_TRACKSELECT) && (ht.flags & TVHT_ONITEM)) + if (item && (infoPtr->dwStyle & TVS_TRACKSELECT) && TREEVIEW_IsItemHit(infoPtr, &ht)) { SetCursor(infoPtr->hcurHand); return 0;

1 0

Nikolay Sivov : comctl32/tests: Basic test for TVS_FULLROWSELECT style bit.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: 2728909e6ce18e7a149a2dda8c0a787ca13ac06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2728909e6ce18e7a149a2dda8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 8 10:57:15 2016 +0300 comctl32/tests: Basic test for TVS_FULLROWSELECT style bit. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 25 +++++++++++++++++++++++++ include/commctrl.h | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 7e6c731..e2fb443 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2369,6 +2369,30 @@ static void test_WM_KEYDOWN(void) DestroyWindow(hwnd); } +static void test_TVS_FULLROWSELECT(void) +{ + DWORD style; + HWND hwnd; + + /* try to create both with TVS_HASLINES and TVS_FULLROWSELECT */ + hwnd = create_treeview_control(TVS_FULLROWSELECT); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & (TVS_FULLROWSELECT | TVS_HASLINES)) == (TVS_FULLROWSELECT | TVS_HASLINES), "got style 0x%08x\n", style); + + DestroyWindow(hwnd); + + /* create just with TVS_HASLINES, try to enable TVS_FULLROWSELECT later */ + hwnd = create_treeview_control(0); + + style = GetWindowLongA(hwnd, GWL_STYLE); + SetWindowLongA(hwnd, GWL_STYLE, style | TVS_FULLROWSELECT); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(style & TVS_FULLROWSELECT, "got style 0x%08x\n", style); + + DestroyWindow(hwnd); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -2444,6 +2468,7 @@ START_TEST(treeview) test_WM_GETDLGCODE(); test_customdraw(); test_WM_KEYDOWN(); + test_TVS_FULLROWSELECT(); if (!load_v6_module(&ctx_cookie, &hCtx)) { diff --git a/include/commctrl.h b/include/commctrl.h index 7d6f5c5..dde038b 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2400,7 +2400,7 @@ static const WCHAR WC_TREEVIEWW[] = { 'S','y','s', #define TVHT_ONITEMBUTTON 0x0010 #define TVHT_ONITEMRIGHT 0x0020 #define TVHT_ONITEMSTATEICON 0x0040 -#define TVHT_ONITEM 0x0046 +#define TVHT_ONITEM (TVHT_ONITEMICON | TVHT_ONITEMLABEL | TVHT_ONITEMSTATEICON) #define TVHT_ABOVE 0x0100 #define TVHT_BELOW 0x0200 #define TVHT_TORIGHT 0x0400

1 0

Jeremy Audiger : winhttp: Prevent console spamming in get_system_proxy_autoconfig_url.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: 6c0fdc05167a5a41b2a7f2f3748e97d17eb6a0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0fdc05167a5a41b2a7f2f37… Author: Jeremy Audiger <audiger(a)live.fr> Date: Sat Jul 30 16:13:59 2016 +0000 winhttp: Prevent console spamming in get_system_proxy_autoconfig_url. Signed-off-by: Jérémy Audiger <audiger(a)live.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 28587f5..30909ff 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1351,7 +1351,14 @@ static BOOL get_system_proxy_autoconfig_url( char *buf, DWORD buflen ) CFRelease( settings ); return ret; #else - FIXME( "no support on this platform\n" ); + static BOOL first = TRUE; + if (first) + { + FIXME( "no support on this platform\n" ); + first = FALSE; + } + else + TRACE( "no support on this platform\n" ); return FALSE; #endif }

1 0

Francois Gouget : webservices: A spelling fix for an ERR() message.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: 5bc60d23423613b1b1c01fc41d4e049132b7a7ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc60d23423613b1b1c01fc41… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 26 16:52:23 2016 +0200 webservices: A spelling fix for an ERR() message. 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/webservices/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 1182919..d7898a2 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -351,7 +351,7 @@ static HRESULT get_addr_namespace( WS_ADDRESSING_VERSION ver, WS_XML_STRING *str return S_OK; default: - ERR( "unhandled adressing version %u\n", ver ); + ERR( "unhandled addressing version %u\n", ver ); return E_NOTIMPL; } }

1 0

Francois Gouget : msi: Make parse_platform() static.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: a8e401839ef1861d4d6f4ce12cee0c4cd3414380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e401839ef1861d4d6f4ce12… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 26 16:51:56 2016 +0200 msi: Make parse_platform() static. 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/msi/msipriv.h | 1 - dlls/msi/package.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index d457a54..8e7b592 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -954,7 +954,6 @@ extern LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ) DECL extern INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) DECLSPEC_HIDDEN; extern LPWSTR msi_get_suminfo_product( IStorage *stg ) DECLSPEC_HIDDEN; extern UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ) DECLSPEC_HIDDEN; -extern enum platform parse_platform( const WCHAR *str ) DECLSPEC_HIDDEN; extern UINT msi_load_suminfo_properties( MSIPACKAGE *package ) DECLSPEC_HIDDEN; /* undocumented functions */ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 01d2e89..330f80f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1195,7 +1195,7 @@ UINT msi_create_empty_local_file( LPWSTR path, LPCWSTR suffix ) return ERROR_SUCCESS; } -enum platform parse_platform( const WCHAR *str ) +static enum platform parse_platform( const WCHAR *str ) { if (!str[0] || !strcmpW( str, szIntel )) return PLATFORM_INTEL; else if (!strcmpW( str, szIntel64 )) return PLATFORM_INTEL64;

1 0

Andrey Gusev : msi: Use debugstr_guid() in TRACE() messages.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: e48b8a4fd16db46be72982ab7196ff2f0f14ddde URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48b8a4fd16db46be72982ab7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 22 13:00:09 2016 +0300 msi: Use debugstr_guid() in TRACE() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/automation.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index c3d2c67..b94fa84 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -289,7 +289,8 @@ static HRESULT WINAPI AutomationObject_GetIDsOfNames( ITypeInfo *ti; HRESULT hr; - TRACE("(%p/%p)->(%p,%p,%d,%d,%p)\n", iface, This, riid, rgszNames, cNames, lcid, rgDispId); + TRACE("(%p/%p)->(%s, %p, %d, %d, %p)\n", iface, This, + debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); if (!IsEqualGUID(riid, &IID_NULL)) return E_INVALIDARG; @@ -332,7 +333,9 @@ static HRESULT WINAPI AutomationObject_Invoke( BSTR bstrName = NULL; ITypeInfo *ti; - TRACE("(%p/%p)->(%d,%p,%d,%d,%p,%p,%p,%p)\n", iface, This, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p/%p)->(%d, %s, %d, %d, %p, %p, %p, %p)\n", iface, This, + dispIdMember, debugstr_guid(riid), lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); if (!IsEqualIID(riid, &IID_NULL)) {

1 0

Hugh McMaster : reg/tests: Add more tests for 'reg import'.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: e4da2c59cfdef875bd7996faef690fe10d993dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4da2c59cfdef875bd7996fae… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 8 03:17:52 2016 +0000 reg/tests: Add more tests for 'reg import'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index b163cf0..bd5695f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -699,6 +699,66 @@ static BOOL write_reg_file(const char *value, char *tmp_name) return ret; } +#define test_import_str(c,r) test_import_str_(__LINE__,c,r) +static BOOL test_import_str_(unsigned line, const char *file_contents, DWORD *rc) +{ + HANDLE regfile; + DWORD written; + BOOL ret; + + regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); + if(regfile == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(regfile, file_contents, strlen(file_contents), &written, NULL); + lok(ret, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(regfile); + + run_reg_exe("reg import test.reg", rc); + + ret = DeleteFileA("test.reg"); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); + + return ret; +} + +#define test_import_wstr(c,r) test_import_wstr_(__LINE__,c,r) +static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *rc) +{ + int len, memsize; + WCHAR *wstr; + HANDLE regfile; + DWORD written; + BOOL ret; + + len = MultiByteToWideChar(CP_UTF8, 0, file_contents, -1, NULL, 0); + memsize = len * sizeof(WCHAR); + wstr = HeapAlloc(GetProcessHeap(), 0, memsize); + if (!wstr) return FALSE; + MultiByteToWideChar(CP_UTF8, 0, file_contents, -1, wstr, memsize); + + regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); + if(regfile == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(regfile, wstr, memsize, &written, NULL); + lok(ret, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(regfile); + + HeapFree(GetProcessHeap(), 0, wstr); + + run_reg_exe("reg import test.reg", rc); + + ret = DeleteFileA("test.reg"); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); + + return ret; +} + static void test_import(void) { DWORD r, dword = 0x123; @@ -747,6 +807,103 @@ static void test_import(void) DeleteFileA(test1_reg); DeleteFileA(test2_reg); + + /* Test file contents */ + test_import_str("regedit\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("regedit4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("REGEDIT\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str(" REGEDIT4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("\tREGEDIT4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("\nREGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("AREGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("1REGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("REGEDIT3\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT5\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT9\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT 4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT4 FOO\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("Windows Registry Editor Version 4.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("Windows Registry Editor Version 5.00\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + /* Test file contents - Unicode */ + test_import_wstr("Windows Registry Editor Version 4.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("Windows Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\uFEFFWindows Registry Editor Version 5\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\uFEFFWindows Registry Editor Version 5.00\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\uFEFFWINDOWS Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr(" \uFEFFWindows Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\t\uFEFFWindows Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\n\uFEFFWindows Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\uFEFF Windows Registry Editor Version 5.00\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\uFEFF\tWindows Registry Editor Version 5.00\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\uFEFF\nWindows Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); } START_TEST(reg)

1 0

Piotr Caban : ntdll: Fix KNONVOLATILE_CONTEXT_POINTERS parameter handling in RtlVirtualUnwind.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: 978ee87a25f5717df25ed033ff7d365a8ed20278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978ee87a25f5717df25ed033f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Aug 6 13:58:19 2016 +0200 ntdll: Fix KNONVOLATILE_CONTEXT_POINTERS parameter handling in RtlVirtualUnwind. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index decae5c..009505f 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3099,16 +3099,16 @@ static ULONG64 get_int_reg( CONTEXT *context, int reg ) return *(&context->Rax + reg); } -static void set_int_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, ULONG64 val ) +static void set_int_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, ULONG64 *val ) { - *(&context->Rax + reg) = val; - if (ctx_ptr) ctx_ptr->u2.IntegerContext[reg] = &context->Rax + reg; + *(&context->Rax + reg) = *val; + if (ctx_ptr) ctx_ptr->u2.IntegerContext[reg] = val; } -static void set_float_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, M128A val ) +static void set_float_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, M128A *val ) { - *(&context->u.s.Xmm0 + reg) = val; - if (ctx_ptr) ctx_ptr->u.FloatingContext[reg] = &context->u.s.Xmm0 + reg; + *(&context->u.s.Xmm0 + reg) = *val; + if (ctx_ptr) ctx_ptr->u.FloatingContext[reg] = val; } static int get_opcode_size( struct opcode op ) @@ -3224,7 +3224,7 @@ static void interpret_epilog( BYTE *pc, CONTEXT *context, KNONVOLATILE_CONTEXT_P case 0x5d: /* pop %rbp/r13 */ case 0x5e: /* pop %rsi/r14 */ case 0x5f: /* pop %rdi/r15 */ - set_int_reg( context, ctx_ptr, *pc - 0x58 + (rex & 1) * 8, *(ULONG64 *)context->Rsp ); + set_int_reg( context, ctx_ptr, *pc - 0x58 + (rex & 1) * 8, (ULONG64 *)context->Rsp ); context->Rsp += sizeof(ULONG64); pc++; continue; @@ -3322,7 +3322,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, switch (info->opcodes[i].code) { case UWOP_PUSH_NONVOL: /* pushq %reg */ - set_int_reg( context, ctx_ptr, info->opcodes[i].info, *(ULONG64 *)context->Rsp ); + set_int_reg( context, ctx_ptr, info->opcodes[i].info, (ULONG64 *)context->Rsp ); context->Rsp += sizeof(ULONG64); break; case UWOP_ALLOC_LARGE: /* subq $nn,%rsp */ @@ -3337,19 +3337,19 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, break; case UWOP_SAVE_NONVOL: /* movq %reg,n(%rsp) */ off = frame + *(USHORT *)&info->opcodes[i+1] * 8; - set_int_reg( context, ctx_ptr, info->opcodes[i].info, *(ULONG64 *)off ); + set_int_reg( context, ctx_ptr, info->opcodes[i].info, (ULONG64 *)off ); break; case UWOP_SAVE_NONVOL_FAR: /* movq %reg,nn(%rsp) */ off = frame + *(DWORD *)&info->opcodes[i+1]; - set_int_reg( context, ctx_ptr, info->opcodes[i].info, *(ULONG64 *)off ); + set_int_reg( context, ctx_ptr, info->opcodes[i].info, (ULONG64 *)off ); break; case UWOP_SAVE_XMM128: /* movaps %xmmreg,n(%rsp) */ off = frame + *(USHORT *)&info->opcodes[i+1] * 16; - set_float_reg( context, ctx_ptr, info->opcodes[i].info, *(M128A *)off ); + set_float_reg( context, ctx_ptr, info->opcodes[i].info, (M128A *)off ); break; case UWOP_SAVE_XMM128_FAR: /* movaps %xmmreg,nn(%rsp) */ off = frame + *(DWORD *)&info->opcodes[i+1]; - set_float_reg( context, ctx_ptr, info->opcodes[i].info, *(M128A *)off ); + set_float_reg( context, ctx_ptr, info->opcodes[i].info, (M128A *)off ); break; case UWOP_PUSH_MACHFRAME: FIXME( "PUSH_MACHFRAME %u\n", info->opcodes[i].info );

1 0

Andrew Eikum : user32: Don' t always insert menu items during WM_MDISETMENU.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: c1c3198aa4e7f62eedcd960351fc458694171b99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c3198aa4e7f62eedcd96035… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 5 15:08:38 2016 -0500 user32: Don't always insert menu items during WM_MDISETMENU. MSDN says WM_MDISETMENU shouldn't change the frame menu if it is given as NULL. Tests bear that out. Some other tests are included to show we haven't broken behavior on e.g. initially maximized MDI child windows. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 11 ------ dlls/user32/tests/win.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 97 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1c3198aa4e7f62eedcd9…

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
78
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 August 2016