November 2017 - Wine-Commits

Alex Henrie : d3dx9/tests: Relax D3DXQuaternionToAxisAngle test stringency a bit.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: f6fdcc848d75de583be9492e65d39661bfcea993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6fdcc848d75de583be9492e6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 9 21:36:10 2017 -0700 d3dx9/tests: Relax D3DXQuaternionToAxisAngle test stringency a bit. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index cb9bf1c..ec07348 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1099,7 +1099,7 @@ static void D3DXQuaternionTest(void) expectedvec.x = 1.0f/22.0f; expectedvec.y = 2.0f/22.0f; expectedvec.z = 4.0f/22.0f; D3DXQuaternionToAxisAngle(&Nq,&axis,&angle); expect_vec3(&expectedvec, &axis, 0); - equal = compare_float(angle, 2.197869f, 0); + equal = compare_float(angle, 2.197869f, 1); ok(equal, "Got unexpected angle %.8e.\n", angle); /* Test if |w|>1.0f */ expectedvec.x = 1.0f; expectedvec.y = 2.0f; expectedvec.z = 4.0f;

1 0

Huw Davies : ole32: Correctly track the number of inits when auto-joining the MTA.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: fef5871e289baee99e8a8b4bce74c5c0cb60d2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef5871e289baee99e8a8b4bc… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 10 12:56:05 2017 +0000 ole32: Correctly track the number of inits when auto-joining the MTA. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 70 +++++++++++++++++++++++--------------------- dlls/ole32/compobj_private.h | 4 +-- dlls/ole32/rpc.c | 9 +++--- dlls/ole32/tests/marshal.c | 8 ++++- 4 files changed, 51 insertions(+), 40 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 6fb07bf..d136ee6 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1724,12 +1724,6 @@ HWND apartment_getwindow(const struct apartment *apt) return apt->win; } -void apartment_joinmta(void) -{ - apartment_addref(MTA); - COM_CurrentInfo()->apt = MTA; -} - static void COM_TlsDestroy(void) { struct oletls *info = NtCurrentTeb()->ReservedForOle; @@ -1834,6 +1828,40 @@ HRESULT WINAPI CoRevokeInitializeSpy(ULARGE_INTEGER cookie) return S_OK; } +HRESULT enter_apartment( struct oletls *info, DWORD model ) +{ + HRESULT hr = S_OK; + + if (!info->apt) + { + if (!apartment_get_or_create( model )) + return E_OUTOFMEMORY; + } + else if (!apartment_is_model( info->apt, model )) + { + WARN( "Attempt to change threading model of this apartment from %s to %s\n", + info->apt->multi_threaded ? "multi-threaded" : "apartment threaded", + model & COINIT_APARTMENTTHREADED ? "apartment threaded" : "multi-threaded" ); + return RPC_E_CHANGED_MODE; + } + else + hr = S_FALSE; + + info->inits++; + + return hr; +} + +void leave_apartment( struct oletls *info ) +{ + if (!--info->inits) + { + if (info->ole_inits) + WARN( "Uninitializing apartment while Ole is still initialized\n" ); + apartment_release( info->apt ); + info->apt = NULL; + } +} /****************************************************************************** * CoInitialize [OLE32.@] @@ -1892,8 +1920,7 @@ HRESULT WINAPI CoInitialize(LPVOID lpReserved) HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit) { struct oletls *info = COM_CurrentInfo(); - HRESULT hr = S_OK; - APARTMENT *apt; + HRESULT hr; TRACE("(%p, %x)\n", lpReserved, (int)dwCoInit); @@ -1922,24 +1949,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoIni if (info->spy) IInitializeSpy_PreInitialize(info->spy, dwCoInit, info->inits); - if (!(apt = info->apt)) - { - apt = apartment_get_or_create(dwCoInit); - if (!apt) return E_OUTOFMEMORY; - } - else if (!apartment_is_model(apt, dwCoInit)) - { - /* Changing the threading model after it's been set is illegal. If this warning is triggered by Wine - code then we are probably using the wrong threading model to implement that API. */ - ERR("Attempt to change threading model of this apartment from %s to %s\n", - apt->multi_threaded ? "multi-threaded" : "apartment threaded", - dwCoInit & COINIT_APARTMENTTHREADED ? "apartment threaded" : "multi-threaded"); - return RPC_E_CHANGED_MODE; - } - else - hr = S_FALSE; - - info->inits++; + hr = enter_apartment( info, dwCoInit ); if (info->spy) IInitializeSpy_PostInitialize(info->spy, hr, dwCoInit, info->inits); @@ -1986,13 +1996,7 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) return; } - if (!--info->inits) - { - if (info->ole_inits) - WARN("uninitializing apartment while Ole is still initialized\n"); - apartment_release(info->apt); - info->apt = NULL; - } + leave_apartment( info ); /* * Decrease the reference count. diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index fd88ed9..0f10a7c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -244,8 +244,8 @@ static inline HRESULT apartment_getoxid(const struct apartment *apt, OXID *oxid) } HRESULT apartment_createwindowifneeded(struct apartment *apt) DECLSPEC_HIDDEN; HWND apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN; -void apartment_joinmta(void) DECLSPEC_HIDDEN; - +HRESULT enter_apartment(struct oletls *info, DWORD model) DECLSPEC_HIDDEN; +void leave_apartment(struct oletls *info) DECLSPEC_HIDDEN; /* DCOM messages used by the apartment window (not compatible with native) */ #define DM_EXECUTERPC (WM_USER + 0) /* WPARAM = 0, LPARAM = (struct dispatch_params *) */ diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index ec5dc59..8d8276e 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1495,16 +1495,17 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) else { BOOL joined = FALSE; - if (!COM_CurrentInfo()->apt) + struct oletls *info = COM_CurrentInfo(); + + if (!info->apt) { - apartment_joinmta(); + enter_apartment(info, COINIT_MULTITHREADED); joined = TRUE; } RPC_ExecuteCall(params); if (joined) { - apartment_release(COM_CurrentInfo()->apt); - COM_CurrentInfo()->apt = NULL; + leave_apartment(info); } } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e43439c..12c46e9 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2968,6 +2968,12 @@ static HRESULT WINAPI local_server_GetClassID(IPersist *iface, CLSID *clsid) hr = CoDisconnectObject((IUnknown *)iface, 0); ok(hr == S_OK, "got %08x\n", hr); + /* Initialize and uninitialize the apartment to show that we + * remain in the autojoined mta */ + hr = pCoInitializeEx( NULL, COINIT_MULTITHREADED ); + ok( hr == S_FALSE, "got %08x\n", hr ); + CoUninitialize(); + return S_OK; } @@ -3749,7 +3755,7 @@ START_TEST(marshal) argc = winetest_get_mainargs( &argv ); if (argc > 2 && (!strcmp(argv[2], "-Embedding"))) { - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + pCoInitializeEx(NULL, COINIT_MULTITHREADED); test_register_local_server(); CoUninitialize();

1 0

Andrew Eikum : shell32: Size ShellView column widths by font width.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: db1a3c617e46c4feac69a587a76c7d9b6d91b14c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db1a3c617e46c4feac69a587a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 10 08:28:48 2017 -0600 shell32: Size ShellView column widths by font width. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index e0dbc3b..1628ea3 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -385,6 +385,9 @@ static void ShellView_InitList(IShellViewImpl *This) SHELLDETAILS sd; WCHAR nameW[50]; HRESULT hr; + HFONT list_font, old_font; + HDC list_dc; + TEXTMETRICW tm; TRACE("(%p)\n", This); @@ -406,6 +409,13 @@ static void ShellView_InitList(IShellViewImpl *This) } } + list_font = (HFONT)SendMessageW(This->hWndList, WM_GETFONT, 0, 0); + list_dc = GetDC(This->hWndList); + old_font = SelectObject(list_dc, list_font); + GetTextMetricsW(list_dc, &tm); + SelectObject(list_dc, old_font); + ReleaseDC(This->hWndList, list_dc); + for (This->columns = 0;; This->columns++) { if (This->pSF2Parent) @@ -415,9 +425,9 @@ static void ShellView_InitList(IShellViewImpl *This) if (FAILED(hr)) break; lvColumn.fmt = sd.fmt; - lvColumn.cx = sd.cxChar*8; /* chars->pixel */ - StrRetToStrNW(nameW, sizeof(nameW)/sizeof(WCHAR), &sd.str, NULL); - SendMessageW(This->hWndList, LVM_INSERTCOLUMNW, This->columns, (LPARAM)&lvColumn); + lvColumn.cx = MulDiv(sd.cxChar, tm.tmAveCharWidth * 3, 2); /* chars->pixel */ + StrRetToStrNW(nameW, sizeof(nameW)/sizeof(WCHAR), &sd.str, NULL); + SendMessageW(This->hWndList, LVM_INSERTCOLUMNW, This->columns, (LPARAM)&lvColumn); } if (details) IShellDetails_Release(details);

1 0

Hugh McMaster : regedit: Correctly export REG_DWORD values with no data.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: 8a8a2c9bb9a19f62d27520d2ae87c6cf23cd6e50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8a2c9bb9a19f62d27520d2a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Nov 10 12:23:05 2017 +0000 regedit: Correctly export REG_DWORD values with no data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 8 ++++++-- programs/regedit/tests/regedit.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 3d1e3da..0911b50 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1345,8 +1345,12 @@ static void export_data(FILE *fp, WCHAR *value_name, DWORD value_len, DWORD type export_string_data(&buf, data, size); break; case REG_DWORD: - export_dword_data(&buf, data); - break; + if (size) + { + export_dword_data(&buf, data); + break; + } + /* fall through */ case REG_NONE: case REG_EXPAND_SZ: case REG_BINARY: diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 334360b..d558f2b 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3588,7 +3588,7 @@ static void test_export(void) RegCloseKey(hkey); run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); - ok(compare_export("file.reg", empty_hex_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", empty_hex_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -3605,7 +3605,7 @@ static void test_export(void) RegCloseKey(hkey); run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); - ok(compare_export("file.reg", empty_hex_test2, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE);

1 0

Andrew Eikum : shell32: Scale explorer browser sizes by DPI.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: 8d004d5151d66ae4215ef7b176b6f4b573b36bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d004d5151d66ae4215ef7b17… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 9 11:25:35 2017 -0600 shell32: Scale explorer browser sizes by DPI. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/ebrowser.c | 54 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 07046502..45c62c8 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); #define SPLITTER_WIDTH 2 #define NP_MIN_WIDTH 60 +#define NP_DEFAULT_WIDTH 150 #define SV_MIN_WIDTH 150 typedef struct _event_client { @@ -83,6 +84,8 @@ typedef struct _ExplorerBrowserImpl { travellog_entry *travellog_cursor; int travellog_count; + int dpix; + IShellView *psv; RECT sv_rc; LPITEMIDLIST current_pidl; @@ -274,6 +277,8 @@ static void update_layout(ExplorerBrowserImpl *This) RECT rc; INT navpane_width_actual; INT shellview_width_actual; + int np_min_width = MulDiv(NP_MIN_WIDTH, This->dpix, USER_DEFAULT_SCREEN_DPI); + int sv_min_width = MulDiv(SV_MIN_WIDTH, This->dpix, USER_DEFAULT_SCREEN_DPI); TRACE("%p (navpane: %d, EBO_SHOWFRAMES: %d)\n", This, This->navpane.show, This->eb_options & EBO_SHOWFRAMES); @@ -285,10 +290,10 @@ static void update_layout(ExplorerBrowserImpl *This) navpane_width_actual = 0; shellview_width_actual = rc.right - navpane_width_actual; - if(shellview_width_actual < SV_MIN_WIDTH && navpane_width_actual) + if(shellview_width_actual < sv_min_width && navpane_width_actual) { - INT missing_width = SV_MIN_WIDTH - shellview_width_actual; - if(missing_width < (navpane_width_actual - NP_MIN_WIDTH)) + INT missing_width = sv_min_width - shellview_width_actual; + if(missing_width < (navpane_width_actual - np_min_width)) { /* Shrink the navpane */ navpane_width_actual -= missing_width; @@ -327,9 +332,10 @@ static void update_layout(ExplorerBrowserImpl *This) static void size_panes(ExplorerBrowserImpl *This) { + int splitter_width = MulDiv(SPLITTER_WIDTH, This->dpix, USER_DEFAULT_SCREEN_DPI); MoveWindow(This->navpane.hwnd_splitter, - This->navpane.rc.right - SPLITTER_WIDTH, This->navpane.rc.top, - SPLITTER_WIDTH, This->navpane.rc.bottom - This->navpane.rc.top, + This->navpane.rc.right - splitter_width, This->navpane.rc.top, + splitter_width, This->navpane.rc.bottom - This->navpane.rc.top, TRUE); MoveWindow(This->hwnd_sv, @@ -494,12 +500,14 @@ static void splitter_draw(HWND hwnd, RECT *rc) */ static LRESULT navpane_splitter_beginresize(ExplorerBrowserImpl *This, HWND hwnd, LPARAM lParam) { + int splitter_width = MulDiv(SPLITTER_WIDTH, This->dpix, USER_DEFAULT_SCREEN_DPI); + TRACE("\n"); SetCapture(hwnd); This->splitter_rc = This->navpane.rc; - This->splitter_rc.left = This->splitter_rc.right - SPLITTER_WIDTH; + This->splitter_rc.left = This->splitter_rc.right - splitter_width; splitter_draw(GetParent(hwnd), &This->splitter_rc); @@ -510,6 +518,9 @@ static LRESULT navpane_splitter_resizing(ExplorerBrowserImpl *This, HWND hwnd, L { int new_width, dx; RECT rc; + int splitter_width = MulDiv(SPLITTER_WIDTH, This->dpix, USER_DEFAULT_SCREEN_DPI); + int np_min_width = MulDiv(NP_MIN_WIDTH, This->dpix, USER_DEFAULT_SCREEN_DPI); + int sv_min_width = MulDiv(SV_MIN_WIDTH, This->dpix, USER_DEFAULT_SCREEN_DPI); if(GetCapture() != hwnd) return FALSE; @@ -518,10 +529,10 @@ static LRESULT navpane_splitter_resizing(ExplorerBrowserImpl *This, HWND hwnd, L rc = This->navpane.rc; new_width = This->navpane.width + dx; - if(new_width > NP_MIN_WIDTH && This->sv_rc.right - new_width > SV_MIN_WIDTH) + if(new_width > np_min_width && This->sv_rc.right - new_width > sv_min_width) { rc.right = new_width; - rc.left = rc.right - SPLITTER_WIDTH; + rc.left = rc.right - splitter_width; splitter_draw(GetParent(hwnd), &This->splitter_rc); splitter_draw(GetParent(hwnd), &rc); This->splitter_rc = rc; @@ -533,6 +544,8 @@ static LRESULT navpane_splitter_resizing(ExplorerBrowserImpl *This, HWND hwnd, L static LRESULT navpane_splitter_endresize(ExplorerBrowserImpl *This, HWND hwnd, LPARAM lParam) { int new_width, dx; + int np_min_width = MulDiv(NP_MIN_WIDTH, This->dpix, USER_DEFAULT_SCREEN_DPI); + int sv_min_width = MulDiv(SV_MIN_WIDTH, This->dpix, USER_DEFAULT_SCREEN_DPI); if(GetCapture() != hwnd) return FALSE; @@ -542,10 +555,10 @@ static LRESULT navpane_splitter_endresize(ExplorerBrowserImpl *This, HWND hwnd, splitter_draw(GetParent(hwnd), &This->splitter_rc); new_width = This->navpane.width + dx; - if(new_width < NP_MIN_WIDTH) - new_width = NP_MIN_WIDTH; - else if(This->sv_rc.right - new_width < SV_MIN_WIDTH) - new_width = This->sv_rc.right - SV_MIN_WIDTH; + if(new_width < np_min_width) + new_width = np_min_width; + else if(This->sv_rc.right - new_width < sv_min_width) + new_width = This->sv_rc.right - sv_min_width; This->navpane.width = new_width; @@ -649,9 +662,11 @@ static LRESULT navpane_on_wm_create(HWND hwnd, CREATESTRUCTW *crs) static LRESULT navpane_on_wm_size_move(ExplorerBrowserImpl *This) { UINT height, width; + int splitter_width = MulDiv(SPLITTER_WIDTH, This->dpix, USER_DEFAULT_SCREEN_DPI); + TRACE("%p\n", This); - width = This->navpane.rc.right - This->navpane.rc.left - SPLITTER_WIDTH; + width = This->navpane.rc.right - This->navpane.rc.left - splitter_width; height = This->navpane.rc.bottom - This->navpane.rc.top; MoveWindow(This->navpane.hwnd_nstc, @@ -692,6 +707,7 @@ static void initialize_navpane(ExplorerBrowserImpl *This, HWND hwnd_parent, RECT { WNDCLASSW wc; HWND splitter; + int splitter_width = MulDiv(SPLITTER_WIDTH, This->dpix, USER_DEFAULT_SCREEN_DPI); static const WCHAR navpane_classname[] = {'e','b','_','n','a','v','p','a','n','e',0}; if( !GetClassInfoW(shell32_hInstance, navpane_classname, &wc) ) @@ -712,8 +728,8 @@ static void initialize_navpane(ExplorerBrowserImpl *This, HWND hwnd_parent, RECT splitter = CreateWindowExW(0, navpane_classname, NULL, WS_CHILD | WS_TABSTOP | WS_VISIBLE, - rc->right - SPLITTER_WIDTH, rc->top, - SPLITTER_WIDTH, rc->bottom - rc->top, + rc->right - splitter_width, rc->top, + splitter_width, rc->bottom - rc->top, hwnd_parent, 0, shell32_hInstance, This); if(!splitter) ERR("Failed to create navpane : %d.\n", GetLastError()); @@ -849,6 +865,7 @@ static HRESULT WINAPI IExplorerBrowser_fnInitialize(IExplorerBrowser *iface, ExplorerBrowserImpl *This = impl_from_IExplorerBrowser(iface); WNDCLASSW wc; LONG style; + HDC parent_dc; static const WCHAR EB_CLASS_NAME[] = {'E','x','p','l','o','r','e','r','B','r','o','w','s','e','r','C','o','n','t','r','o','l',0}; @@ -876,6 +893,12 @@ static HRESULT WINAPI IExplorerBrowser_fnInitialize(IExplorerBrowser *iface, if (!RegisterClassW(&wc)) return E_FAIL; } + parent_dc = GetDC(hwndParent); + This->dpix = GetDeviceCaps(parent_dc, LOGPIXELSX); + ReleaseDC(hwndParent, parent_dc); + + This->navpane.width = MulDiv(NP_DEFAULT_WIDTH, This->dpix, USER_DEFAULT_SCREEN_DPI); + style = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS; if (!(This->eb_options & EBO_NOBORDER)) style |= WS_BORDER; @@ -2066,7 +2089,6 @@ HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, voi eb->IInputObject_iface.lpVtbl = &vt_IInputObject; /* Default settings */ - eb->navpane.width = 150; eb->navpane.show = TRUE; list_init(&eb->event_clients);

1 0

Piotr Caban : fusion: Fix IAssemblyNameImpl_GetDisplayName behavior on too small buffer.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: d790b160f93bcd6f88d7212678dca0f07e36f044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d790b160f93bcd6f88d721267… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 10 12:25:10 2017 +0100 fusion: Fix IAssemblyNameImpl_GetDisplayName behavior on too small buffer. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmname.c | 5 ++++- dlls/fusion/tests/asmname.c | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 6be8bf6..96345b6d 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -332,7 +332,10 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, size += lstrlenW(separator) + lstrlenW(procarch) + lstrlenW(equals) + lstrlenW(name->procarch); if (size > *pccDisplayName) - return S_FALSE; + { + *pccDisplayName = size; + return E_NOT_SUFFICIENT_BUFFER; + } /* Construct the string */ lstrcpyW(szDisplayName, name->name); diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index aa7e11b..e1ef1d8 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -537,6 +537,13 @@ static void test_CreateAssemblyNameObject(void) ok(str[0] == 'a', "got %c\n", str[0]); ok(size == 5, "got %u\n", size); + size = 0; + str[0] = 'a'; + hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(str[0] == 'a', "got %c\n", str[0]); + ok(size == 5, "Wrong size %u\n", size); + size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Andrew Eikum : explorer: Scale element sizes by DPI.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: 94a857580ca40612338fe4ba11c28bb27ec5b7c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a857580ca40612338fe4ba1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 9 11:25:19 2017 -0600 explorer: Scale element sizes by DPI. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 5144e74..9590027 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -42,9 +42,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorer); #define NAV_TOOLBAR_HEIGHT 30 #define PATHBOX_HEIGHT 24 +static int nav_toolbar_height; +static int pathbox_height; #define DEFAULT_WIDTH 640 #define DEFAULT_HEIGHT 480 +static int default_width; +static int default_height; static const WCHAR EXPLORER_CLASS[] = {'W','I','N','E','_','E','X','P','L','O','R','E','R','\0'}; @@ -313,11 +317,25 @@ static void make_explorer_window(IShellFolder* startFolder) TBBUTTON nav_buttons[3]; int hist_offset,view_offset; REBARBANDINFOW band_info; + UINT dpix, dpiy; + HDC hdc; + memset(nav_buttons,0,sizeof(nav_buttons)); + LoadStringW(explorer_hInstance,IDS_EXPLORER_TITLE,explorer_title, sizeof(explorer_title)/sizeof(WCHAR)); LoadStringW(explorer_hInstance,IDS_PATHBOX_LABEL,pathbox_label, sizeof(pathbox_label)/sizeof(WCHAR)); + + hdc = GetDC(0); + dpix = GetDeviceCaps(hdc, LOGPIXELSX); + dpiy = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + nav_toolbar_height = MulDiv(NAV_TOOLBAR_HEIGHT, dpiy, USER_DEFAULT_SCREEN_DPI); + pathbox_height = MulDiv(PATHBOX_HEIGHT, dpiy, USER_DEFAULT_SCREEN_DPI); + default_width = MulDiv(DEFAULT_WIDTH, dpix, USER_DEFAULT_SCREEN_DPI); + default_height = MulDiv(DEFAULT_HEIGHT, dpiy, USER_DEFAULT_SCREEN_DPI); + info = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(explorer_info)); if(!info) { @@ -335,13 +353,13 @@ static void make_explorer_window(IShellFolder* startFolder) info->rebar_height=0; info->main_window = CreateWindowW(EXPLORER_CLASS,explorer_title,WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT,CW_USEDEFAULT,DEFAULT_WIDTH, - DEFAULT_HEIGHT,NULL,NULL,explorer_hInstance,NULL); + CW_USEDEFAULT,CW_USEDEFAULT,default_width, + default_height,NULL,NULL,explorer_hInstance,NULL); fs.ViewMode = FVM_DETAILS; fs.fFlags = FWF_AUTOARRANGE; - SetRect(&rect, 0, 0, DEFAULT_WIDTH, DEFAULT_HEIGHT); + SetRect(&rect, 0, 0, default_width, default_height); IExplorerBrowser_Initialize(info->browser,info->main_window,&rect,&fs); IExplorerBrowser_SetOptions(info->browser,EBO_SHOWFRAMES); SetWindowLongPtrW(info->main_window,EXPLORER_INFO_INDEX,(LONG_PTR)info); @@ -380,14 +398,14 @@ static void make_explorer_window(IShellFolder* startFolder) band_info.fMask = RBBIM_STYLE|RBBIM_CHILD|RBBIM_CHILDSIZE|RBBIM_SIZE; band_info.hwndChild = nav_toolbar; band_info.fStyle=RBBS_GRIPPERALWAYS|RBBS_CHILDEDGE; - band_info.cyChild=NAV_TOOLBAR_HEIGHT; + band_info.cyChild=nav_toolbar_height; band_info.cx=0; - band_info.cyMinChild=NAV_TOOLBAR_HEIGHT; + band_info.cyMinChild=nav_toolbar_height; band_info.cxMinChild=0; SendMessageW(rebar,RB_INSERTBANDW,-1,(LPARAM)&band_info); info->path_box = CreateWindowW(WC_COMBOBOXEXW,PATH_BOX_NAME, WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, - 0,0,DEFAULT_WIDTH,PATHBOX_HEIGHT,rebar,NULL, + 0,0,default_width,pathbox_height,rebar,NULL, explorer_hInstance,NULL); GetWindowRect(info->path_box, &rect); band_info.cyChild = rect.bottom - rect.top;

1 0

Zhiyi Zhang : kernel32/nls: Add LOCALE_SPARENT entries.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

1 0

Alexandre Julliard : readme: Patches should now be sent to wine-devel.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: 132817c7d5906513769ea887941f8c6d6d95b1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=132817c7d5906513769ea8879… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 16:40:15 2017 +0100 readme: Patches should now be sent to wine-devel. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 2 +- documentation/README.de | 2 +- documentation/README.es | 2 +- documentation/README.fi | 2 +- documentation/README.fr | 2 +- documentation/README.hu | 2 +- documentation/README.it | 2 +- documentation/README.ja | 2 +- documentation/README.ko | 2 +- documentation/README.no | 2 +- documentation/README.pt | 2 +- documentation/README.pt_br | 2 +- documentation/README.ru | 2 +- documentation/README.sv | 2 +- documentation/README.tr | 2 +- documentation/README.uk | 2 +- documentation/README.zh_cn | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README b/README index 21dabed..7e0f171 100644 --- a/README +++ b/README @@ -163,7 +163,7 @@ Git: The current Wine development tree is available through Git. Go to http://www.winehq.org/git for more information. If you add something, or fix a bug, please send a patch (preferably -using git-format-patch) to the wine-patches(a)winehq.org list for +using git-format-patch) to the wine-devel(a)winehq.org list for inclusion in the next release. -- diff --git a/documentation/README.de b/documentation/README.de index 9e65e97..5f450d1 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -166,7 +166,7 @@ Git: Der aktuelle Wine-Entwicklungsstand ist über Git verfügbar. Besuchen Sie http://www.winehq.org/git für weitere Informationen. Wenn Sie etwas hinzufügen oder einen Fehler beheben, senden Sie bitte einen -Patch (vorzugsweise mit git-format-patch) an die Liste wine-patches(a)winehq.org, +Patch (vorzugsweise mit git-format-patch) an die Liste wine-devel(a)winehq.org, damit dieser in die nächste Ausgabe aufgenommen werden kann. -- diff --git a/documentation/README.es b/documentation/README.es index c0a318d..0816911 100644 --- a/documentation/README.es +++ b/documentation/README.es @@ -166,7 +166,7 @@ Git: El árbol actual de desarrollo de Wine está disponible a través de Git Vaya a http://www.winehq.org/git para más información. Si añade algo, o corrige algún bug, por favor envíe un parche (en formato -git-format-patch) a la lista wine-patches(a)winehq.org para su inclusión +git-format-patch) a la lista wine-devel(a)winehq.org para su inclusión en la siguiente versión. -- diff --git a/documentation/README.fi b/documentation/README.fi index 2c1bd0d..ae167ee 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -161,7 +161,7 @@ Git: Winen tämänhetkinen kehitysversio on jaossa Git-järjestelmän kautta. Jos lisäät jotain tai korjaat jonkin virheen, lähetä toki muutoksesi -(mieluiten komennon git-format-patch avulla) listalle wine-patches(a)winehq.org, +(mieluiten komennon git-format-patch avulla) listalle wine-devel(a)winehq.org, jotta se voidaan lisätä Winen seuraavaan versioon. -- diff --git a/documentation/README.fr b/documentation/README.fr index f3ad98c..d42d20a 100644 --- a/documentation/README.fr +++ b/documentation/README.fr @@ -183,7 +183,7 @@ Git : L'arbre de développement actuel de Wine est disponible via Git. Si vous ajoutez quelque chose ou corrigez un bogue, merci d'envoyer un correctif (de préférence en utilisant git-format-patch) à la liste de -diffusion wine-patches(a)winehq.org pour inclusion dans la version suivante. +diffusion wine-devel(a)winehq.org pour inclusion dans la version suivante. -- Alexandre Julliard diff --git a/documentation/README.hu b/documentation/README.hu index f78165a..d3fee99 100644 --- a/documentation/README.hu +++ b/documentation/README.hu @@ -200,7 +200,7 @@ Levelez http://www.winehq.org/forums c�met a tov�bbi inform�ci�hoz. Ha valamit hozz�ad, vagy hib�t jav�t, k�rem k�ldj�n jav�t�foltot ('diff -u' -form�tumban) a wine-patches(a)winehq.org levelez�lista c�mre, hogy beletehess�k a +form�tumban) a wine-devel(a)winehq.org levelez�lista c�mre, hogy beletehess�k a k�vetkez� kiad�sba. -- diff --git a/documentation/README.it b/documentation/README.it index 46ccf7c..0c2bcd8 100644 --- a/documentation/README.it +++ b/documentation/README.it @@ -166,7 +166,7 @@ Git: L'albero attuale di sviluppo di Wine è disponibile attraverso Git. Se aggiungi qualcosa, o correggi un bug, si prega di mandare una patch (preferibilmente usando git-format-patch) alla mailing list -wine-patches(a)winehq.org per l'inclusione nel prossimo rilascio. +wine-devel(a)winehq.org per l'inclusione nel prossimo rilascio. -- Alexandre Julliard diff --git a/documentation/README.ja b/documentation/README.ja index 5d1fec1..ae21f73 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -159,7 +159,7 @@ Git: 現在のWine開発ツリーはGitを通して入手できます。詳細についてはhttp://www.winehq.org/gitに行ってください。何かを追加するか、バグを修正するならば、次のリリースに含めるためにパッチ -（git-format-patchをなるべく使用）をwine-patches(a)winehq.orgのリストに送って +（git-format-patchをなるべく使用）をwine-devel(a)winehq.orgのリストに送ってください。 -- diff --git a/documentation/README.ko b/documentation/README.ko index 899a024..4686ad8 100644 --- a/documentation/README.ko +++ b/documentation/README.ko @@ -184,7 +184,7 @@ GIT: Wine ��Ű: Wine ��Ű�� http://wiki.winehq.org �� ֽ��ϴ�. �߰�� ̳� �� װ� �ִٸ� �� Ե� �� ֵ�� -wine-patches(a)winehq.org ��ϸ� ��Ʈ�� ġ('diff -u' �� )�� +wine-devel(a)winehq.org ��ϸ� ��Ʈ�� ġ('diff -u' �� )�� ֽñ� �ٶ��ϴ�. -- diff --git a/documentation/README.no b/documentation/README.no index 65d8bbb..5c42500 100644 --- a/documentation/README.no +++ b/documentation/README.no @@ -157,7 +157,7 @@ Git: Wines oppdaterte utvikler-versjon er tilgjengelig gjennom GIT. Hvis du legger til noe eller fikser en feil er det fint som du sender en oppdateringsfil (helst laget med git format-patch) til listen -wine-patches(a)winehq.org, slik at endringen kan tas med i neste Wine-utgivelse. +wine-devel(a)winehq.org, slik at endringen kan tas med i neste Wine-utgivelse. -- Den originale versjonen ble skrevet av diff --git a/documentation/README.pt b/documentation/README.pt index 8d17704..b0914f2 100644 --- a/documentation/README.pt +++ b/documentation/README.pt @@ -205,5 +205,5 @@ Mailing Lists: http://www.winehq.org/forums para mais informa��o. Se tu acrescentaste algo,ou corrigiste um bug, por favor envia um patch -(em 'diff -u' format) para wine-patches_at_winehq.org lista para inclus�o +(em 'diff -u' format) para wine-devel(a)winehq.org lista para inclus�o no pr�ximo lan�amento. diff --git a/documentation/README.pt_br b/documentation/README.pt_br index 619460f..a2cccac 100644 --- a/documentation/README.pt_br +++ b/documentation/README.pt_br @@ -166,7 +166,7 @@ Git: A Visite http://www.winehq.org/git para mais informa��o. Se voc� alterar algo ou reparar um erro, envie, por favor, um patch -(preferencialmente usando git-format-patch) � lista wine-patches(a)winehq.org +(preferencialmente usando git-format-patch) � lista wine-devel(a)winehq.org para inclus�o na pr�xima distribui��o. -- diff --git a/documentation/README.ru b/documentation/README.ru index d103ede..5c068cc 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -153,7 +153,7 @@ Git: Текущие разработки Wine доступны через Git. Смотрите http://www.winehq.org/site/git для дополнительной информации. Если вы что-то добавили или исправили ошибку, пожалуйста отправьте патч -(предпочтительно сгенерированный с помощью git-format-patch) на wine-patches(a)winehq.org +(предпочтительно сгенерированный с помощью git-format-patch) на wine-devel(a)winehq.org для его включения в следующий релиз. -- diff --git a/documentation/README.sv b/documentation/README.sv index 898077b..eb7260e 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -154,7 +154,7 @@ Git: Wines nuvarande utvecklingsversion finns tillgänglig genom Git. Gå till http://www.winehq.org/git för mer information. Om du lägger till något eller fixar ett fel, är det bra om du sänder -en patch (förslagsvis med git-format-patch) till listan wine-patches(a)winehq.org +en patch (förslagsvis med git-format-patch) till listan wine-devel(a)winehq.org för inkludering i nästa utgåva av Wine. -- diff --git a/documentation/README.tr b/documentation/README.tr index 1ddce37..f48422d 100644 --- a/documentation/README.tr +++ b/documentation/README.tr @@ -164,7 +164,7 @@ E-posta listeleri: Daha fazla bilgi için http://www.winehq.org/forums adresine gidiniz. Eğer bir şey eklemek veya hata düzeltmek istiyorsanız, lütfen sonraki -sürümde yer alabilmesii için wine-patches(a)winehq.org e-posta listesine bir +sürümde yer alabilmesii için wine-devel(a)winehq.org e-posta listesine bir yama ('diff -u' biçiminde) gönderiniz. -- diff --git a/documentation/README.uk b/documentation/README.uk index 04a525b..f9a4fa4 100644 --- a/documentation/README.uk +++ b/documentation/README.uk @@ -162,7 +162,7 @@ Git: Поточне дерево розробки Wine доступне чере Дивіться http://www.winehq.org/git за детальною інформацією. Якщо ви щось додали або виправили помилку, надішліть патч (найкраще -використавши git-format-patch) на wine-patches(a)winehq.org для його +використавши git-format-patch) на wine-devel(a)winehq.org для його включення в наступний реліз. -- diff --git a/documentation/README.zh_cn b/documentation/README.zh_cn index d77ad40..ce23c99 100644 --- a/documentation/README.zh_cn +++ b/documentation/README.zh_cn @@ -151,7 +151,7 @@ Git: 当前 Wine 的开发树可经由 Git 获取。请前往 http://www.winehq.org/git 以了解更多信息。如果您在代码中添加了某些内容，或是修复了某个 bug，请向 -wine-patches(a)winehq.org 这个邮件列表发送对应的补丁（建议使用 +wine-devel(a)winehq.org 这个邮件列表发送对应的补丁（建议使用 git-format-patch 生成补丁），以便我们将其加入下一个版本中。 --

1 0

Hugh McMaster : regedit: Correctly export hex values with no data.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: aabdc271f8103465682e5cab81e61892890ce26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aabdc271f8103465682e5cab8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Nov 10 12:23:04 2017 +0000 regedit: Correctly export hex values with no data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index a70a6d1..3d1e3da 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1300,6 +1300,8 @@ static void export_hex_data(FILE *fp, WCHAR **buf, DWORD type, DWORD line_len, line_len += export_hex_data_type(fp, type, unicode); + if (!size) return; + if (!unicode && (type == REG_EXPAND_SZ || type == REG_MULTI_SZ)) data = GetMultiByteStringN(data, size / sizeof(WCHAR), &size); @@ -1354,8 +1356,12 @@ static void export_data(FILE *fp, WCHAR *value_name, DWORD value_len, DWORD type break; } - REGPROC_write_line(fp, buf, unicode); - heap_free(buf); + if (size || type == REG_SZ) + { + REGPROC_write_line(fp, buf, unicode); + heap_free(buf); + } + export_newline(fp, unicode); }

1 0