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

Piotr Caban : fusion: Fix IAssemblyNameImpl_GetDisplayName behavior on PublicKeyToken containing 0.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: a437382f4d78601963e5ae51d60b2f16c6d98ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a437382f4d78601963e5ae51d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 10 12:25:17 2017 +0100 fusion: Fix IAssemblyNameImpl_GetDisplayName behavior on PublicKeyToken containing 0. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmname.c | 4 ++-- dlls/fusion/tests/asmname.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 96345b6d..ea10434 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -361,8 +361,8 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, if ((dwDisplayFlags & ASM_DISPLAYF_PUBLIC_KEY_TOKEN) && (name->haspubkey)) { WCHAR pkt[CHARS_PER_PUBKEY + 1]; - static const WCHAR spec[] = {'%','0','x','%','0','x','%','0','x', - '%','0','x','%','0','x','%','0','x','%','0','x','%','0','x',0}; + static const WCHAR spec[] = {'%','0','2','x','%','0','2','x','%','0','2','x', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x',0}; lstrcatW(szDisplayName, separator); diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index e1ef1d8..f48fe32 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -306,7 +306,7 @@ static const ASMPROP_RES enname[ASM_NAME_MAX_PARAMS] = static const ASMPROP_RES pubkeyname[ASM_NAME_MAX_PARAMS] = { {S_OK, "", 0}, - {S_OK, "\x12\x34\x56\x78\x90\xab\xcd\xef", 8}, + {S_OK, "\x01\x23\x45\x67\x89\x0a\xbc\xde", 8}, {S_OK, "", 0}, {S_OK, "wine", 10}, {S_OK, "", 0}, @@ -748,8 +748,8 @@ static void test_CreateAssemblyNameObject(void) IAssemblyName_Release(name); - /* 'wine, PublicKeyToken=1234567890abcdef' */ - to_widechar(namestr, "wine, PublicKeyToken=1234567890abcdef"); + /* 'wine, PublicKeyToken=01234567890abcde' */ + to_widechar(namestr, "wine, PublicKeyToken=01234567890abcde"); name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -758,7 +758,7 @@ static void test_CreateAssemblyNameObject(void) size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_aw("wine, PublicKeyToken=1234567890abcdef", str); + ok_aw("wine, PublicKeyToken=01234567890abcde", str); ok(size == 38, "Expected 38, got %d\n", size); size = MAX_PATH;

1 0

Zebediah Figura : quartz/tests: Add test AVI and MPG files.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: 86c3d7293b721f99bd5e67c18fcbc926b23c85f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c3d7293b721f99bd5e67c18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 9 19:09:53 2017 -0600 quartz/tests: Add test AVI and MPG files. Generated with ffmpeg using the following commands: ffmpeg -f lavfi -i smptebars -t 1 -r 1 -f avi -vcodec rawvideo -pix_fmt yuv420p -vf scale=32x24 test.avi ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 0.04 -r 25 -f mpeg -vcodec mpeg1video -vf scale=32x24 -acodec mp2 test.mpg Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 3 +++ dlls/quartz/tests/avisplitter.c | 44 ++++++++++++++++++++++++++++++------ dlls/quartz/tests/filtergraph.c | 48 +++++++++++++++++++++++++++++++++++----- dlls/quartz/tests/rsrc.rc | 27 ++++++++++++++++++++++ dlls/quartz/tests/test.avi | Bin 0 -> 6938 bytes dlls/quartz/tests/test.mpg | Bin 0 -> 6144 bytes 6 files changed, 110 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index ebded4b..2ff1b47 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -13,3 +13,6 @@ C_SRCS = \ videorenderer.c IDL_SRCS = fil_data.idl + +RC_SRCS = \ + rsrc.rc diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 874036d..23167b5 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -270,8 +270,32 @@ static void test_filesourcefilter(void) } } -static const WCHAR wfile[] = {'t','e','s','t','.','a','v','i',0}; -static const char afile[] = "test.avi"; +static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; + +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} static void test_filter_graph(void) { @@ -286,11 +310,14 @@ static void test_filter_graph(void) DWORD readbytes; FILTER_STATE state; - file = CreateFileW(wfile, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, + WCHAR *filename = load_resource(avifile); + + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); if (file == INVALID_HANDLE_VALUE) { - skip("Could not read test file \"%s\", skipping test\n", afile); + skip("Could not read test file \"%s\", skipping test\n", wine_dbgstr_w(filename)); + DeleteFileW(filename); return; } @@ -301,7 +328,8 @@ static void test_filter_graph(void) if (strncmp(buffer, "RIFF", 4) || strcmp(buffer + 8, "AVI ")) { skip("%s is not an avi riff file, not doing the avi splitter test\n", - afile); + wine_dbgstr_w(filename)); + DeleteFileW(filename); return; } @@ -331,10 +359,10 @@ static void test_filter_graph(void) if (hr != S_OK) goto fail; - hr = IFileSourceFilter_Load(pfile, wfile, NULL); + hr = IFileSourceFilter_Load(pfile, filename, NULL); if (hr != S_OK) { - trace("Could not load file\n"); + trace("Could not load file: %08x\n", hr); goto fail; } @@ -509,6 +537,8 @@ fail: IBaseFilter_Release(pavi); if (pfile) IFileSourceFilter_Release(pfile); + + DeleteFileW(filename); } START_TEST(avisplitter) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f9c95ae..e66dc40 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -42,6 +42,31 @@ typedef struct TestFilterImpl static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; static const WCHAR mpegfile[] = {'t','e','s','t','.','m','p','g',0}; +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} + static IGraphBuilder *pgraph; static int createfiltergraph(void) @@ -355,26 +380,39 @@ static void test_render_run(const WCHAR *file) HANDLE h; HRESULT hr; - h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + WCHAR *filename = load_resource(file); + + h = CreateFileW(filename, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (h == INVALID_HANDLE_VALUE) { skip("Could not read test file %s, skipping test\n", wine_dbgstr_w(file)); + DeleteFileW(filename); return; } CloseHandle(h); if (!createfiltergraph()) + { + DeleteFileW(filename); return; + } - hr = IGraphBuilder_RenderFile(pgraph, file, NULL); - ok(hr == S_OK, "RenderFile returned: %x\n", hr); - rungraph(); + hr = IGraphBuilder_RenderFile(pgraph, filename, NULL); + if (hr == VFW_E_CANNOT_RENDER) + skip("%s: codec not supported; skipping test\n", wine_dbgstr_w(file)); + else + { + ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "RenderFile failed: %x\n", hr); + rungraph(); + } releasefiltergraph(); /* check reference leaks */ - h = CreateFileW(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + h = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); ok(h != INVALID_HANDLE_VALUE, "CreateFile failed: err=%d\n", GetLastError()); CloseHandle(h); + + DeleteFileW(filename); } static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) diff --git a/dlls/quartz/tests/rsrc.rc b/dlls/quartz/tests/rsrc.rc new file mode 100644 index 0000000..9bea5be --- /dev/null +++ b/dlls/quartz/tests/rsrc.rc @@ -0,0 +1,27 @@ +/* + * Resource file for quartz tests. + * + * Copyright 2017 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: test.avi */ +test.avi RCDATA "test.avi" + +/* @makedep: test.mpg */ +test.mpg RCDATA "test.mpg" diff --git a/dlls/quartz/tests/test.avi b/dlls/quartz/tests/test.avi new file mode 100644 index 0000000..bec304d Binary files /dev/null and b/dlls/quartz/tests/test.avi differ diff --git a/dlls/quartz/tests/test.mpg b/dlls/quartz/tests/test.mpg new file mode 100644 index 0000000..7fe379a Binary files /dev/null and b/dlls/quartz/tests/test.mpg differ

1 0

Matteo Bruni : d3dx10: Remove redundant header include.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: e35e3a50a840451bd7852096282249a5656b3921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35e3a50a840451bd78520962… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 9 23:30:19 2017 +0100 d3dx10: Remove redundant header include. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index c910b4a..25df663 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -20,7 +20,6 @@ #include "wine/port.h" #include "d3d10_1.h" #include "d3dx10.h" -#include "d3dx10core.h" #include "d3dcompiler.h" #include "wine/debug.h"

1 0

Matteo Bruni : d3dx10: Fix tracing of shader source data.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: e9e4805d923edf71bf28ffe3e6f2fae4b062cec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e4805d923edf71bf28ffe3e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 10 00:58:43 2017 +0100 d3dx10: Fix tracing of shader source data. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_33/d3dx10_33.spec | 4 ++-- dlls/d3dx10_34/d3dx10_34.spec | 4 ++-- dlls/d3dx10_35/d3dx10_35.spec | 4 ++-- dlls/d3dx10_36/d3dx10_36.spec | 4 ++-- dlls/d3dx10_37/d3dx10_37.spec | 4 ++-- dlls/d3dx10_38/d3dx10_38.spec | 4 ++-- dlls/d3dx10_39/d3dx10_39.spec | 4 ++-- dlls/d3dx10_40/d3dx10_40.spec | 4 ++-- dlls/d3dx10_41/d3dx10_41.spec | 4 ++-- dlls/d3dx10_42/d3dx10_42.spec | 4 ++-- dlls/d3dx10_43/async.c | 7 ++++--- dlls/d3dx10_43/d3dx10_43.spec | 4 ++-- 12 files changed, 26 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9e4805d923edf71bf28f…

1 0

Zebediah Figura : quartz/tests: Skip tests if CLSID_NullRenderer is not available.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: a49aa45c2b1bbf64fa15541d034e73737acf637f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49aa45c2b1bbf64fa15541d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 9 19:09:52 2017 -0600 quartz/tests: Skip tests if CLSID_NullRenderer is not available. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplitter.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 29782a9..874036d 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -387,9 +387,12 @@ static void test_filter_graph(void) hr = CoCreateInstance(&CLSID_NullRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pnull); - ok(hr == S_OK, "Could not create null renderer: %08x\n", hr); - if (hr != S_OK) + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("Null renderer not registered, skipping\n"); break; + } + ok(hr == S_OK, "Could not create null renderer: %08x\n", hr); IBaseFilter_EnumPins(pnull, &nullenum); IEnumPins_Next(nullenum, 1, &nullpin, NULL);

1 0

Alexandre Julliard : testbot: Update documentation to point to wine-devel instead of wine-patches.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: tools Branch: master Commit: bc7d2a84263d536c8c0ba0d6f3c4580ff837c5aa URL: http://source.winehq.org/git/tools.git/?a=commit;h=bc7d2a84263d536c8c0ba0d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 16:38:34 2017 +0100 testbot: Update documentation to point to wine-devel instead of wine-patches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/README | 2 +- testbot/bin/WinePatchesMLSubmit.pl | 2 +- testbot/doc/INSTALL.txt | 11 +++++------ testbot/lib/WineTestBot/Config.pm | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/testbot/README b/testbot/README index 3977c5d..8475abe 100644 --- a/testbot/README +++ b/testbot/README @@ -21,7 +21,7 @@ Windows machines. There are three ways this can happen: * Registered users can submit patches and binaries using the web site and have them run on the set of Windows machines of their choosing. -* Conformance test patches sent to the wine-patches mailing list are +* Conformance test patches sent to the wine-devel mailing list are run on the default set of Windows machines. Any failure is reported to the patch author and to the wine-devel mailing list. diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index 6dc39e8..65fe848 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # -# This script expects to receive a wine-patches email on stdin and submits it +# This script expects to receive a wine-devel email on stdin and submits it # to WineTestBot for testing. It is meant to be called from a tool such as # procmail. # diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 0b95656..9947150 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -89,17 +89,16 @@ Setup for Winetest updates: */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 32 */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 64 -Setup for wine-patches: +Setup for wine-devel: - A proper WineTestBot system should integrate with Wine's patches site. - An alternative is to interface directly with wine-patches as described in + An alternative is to interface directly with wine-devel as described in this section. - Arrange for the WinePatchesMLSubmit.pl script to be fed the - wine-patches emails. One way to do so would be to subscribe the - winehq user to the wine-patches mailing list and to then add the + wine-devel emails. One way to do so would be to subscribe the + winehq user to the wine-devel mailing list and to then add the following lines to the .procmailrc file: :0c: - * ^List-Id: Wine Patch Submissions - * ^TO wine-patches + * ^List-Id:.*wine-devel\.winehq\.org | $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl - Or if you have a set of patches to test in the mbox format you can test with: diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 4f38633..b0492a3 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -96,7 +96,7 @@ $BuildTimeout = 5 * 60; $ReconfigTimeout = 45 * 60; $ProjectName = "Wine"; -$PatchesMailingList = "wine-patches"; +$PatchesMailingList = "wine-devel"; $LDAPServer = undef; $LDAPBindDN = undef;

1 0

Alexandre Julliard : patches: Update documentation to point to wine-devel instead of wine-patches.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: tools Branch: master Commit: 2ac3b11f32c5db5128d893e907bb424a2fc29015 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2ac3b11f32c5db5128d893e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 16:38:21 2017 +0100 patches: Update documentation to point to wine-devel instead of wine-patches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/doc/INSTALL.txt | 13 +++++-------- patches/expire | 2 +- patches/filter | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/patches/doc/INSTALL.txt b/patches/doc/INSTALL.txt index c1570ac..e1ef2b8 100644 --- a/patches/doc/INSTALL.txt +++ b/patches/doc/INSTALL.txt @@ -37,14 +37,13 @@ Apache setup: - Create the $HOME/opt/source/patches directory and copy patches.css there: mkdir $HOME/opt/source/patches cp patches.css $HOME/opt/source/patches -- Create the $HOME/patches and $HOME/patches/OLD directories where the patch - data will live: - mkdir -p $HOME/patches/OLD -- Arrange for the filter script to be fed the wine-patches emails. One way to - do so would be to subscribe the winehq user to the wine-patches mailing list +- Create the $HOME/patches directory where the patch data will live: + mkdir -p $HOME/patches +- Arrange for the filter script to be fed the wine-devel emails. One way to + do so would be to subscribe the winehq user to the wine-devel mailing list and to then add the following lines to the .procmailrc file: :0 - * ^List-Id: Wine Patch Submissions + * ^List-Id:.*wine-devel\.winehq\.org { :0 hbfw | $HOME/tools/patches/filter @@ -55,8 +54,6 @@ Apache setup: formail -ds procmail <mbox-file - Run update regularly to update the website: */5 * * * * $HOME/tools/patches/update -- Run expire regularly to delete old patches: - 0 0 * * * $HOME/tools/patches/expire -v $HOME/patches For integration with the WineTestBot, see the corresponding section in the WineTestBot documentation. diff --git a/patches/expire b/patches/expire index 305e7e5..513a5b1 100755 --- a/patches/expire +++ b/patches/expire @@ -345,7 +345,7 @@ asked to review the following Wine $patch_str: $patch_urls If you think that a patch is correct and can be committed, please send -a mail to wine-patches with your Signed-off-by header, as a reply to +a mail to wine-devel with your Signed-off-by header, as a reply to the original patch email. If you find some issues in a patch, please send a mail to the patch diff --git a/patches/filter b/patches/filter index 62e2a0d..7074d96 100755 --- a/patches/filter +++ b/patches/filter @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# Reformat a wine-patches email so it can be put in a file that the patches +# Reformat a wine-devel email so it can be put in a file that the patches # site can link to. In particular this means only keeping the relevant # header fields and decoding / decompressing the patch. #

1 0

Alexandre Julliard : patches: Also use References: header to build mail threads.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: tools Branch: master Commit: 4e6b4b09d261b86ad0b0768849806294c8292e14 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4e6b4b09d261b86ad0b07688… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 12:32:44 2017 +0100 patches: Also use References: header to build mail threads. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/patches/update b/patches/update index e4ede03..ca4d2e5 100755 --- a/patches/update +++ b/patches/update @@ -154,6 +154,7 @@ foreach my $file (readdir DIR) elsif (/^From: (.*)$/) { $patch{"author"} = format_author($1); } elsif (/^Message-Id: (.*)$/) { $patch{"msgid"} = $1; } elsif (/^In-Reply-To: (.*)$/) { $patch{"reply"} = $1; } + elsif (/^References: (.*)$/) { @{$patch{"refs"}} = split /\s+/, $1; } last if (/^$/); } while (<PATCH>) @@ -225,24 +226,35 @@ closedir DIR; # build mail threads -foreach my $file (sort keys %patches) +sub assign_parent($); +sub assign_parent($) { - my $patch = $patches{$file}; - next if defined $patch->{"has_patch"}; - next unless defined $patch->{"reply"}; - next unless defined $messages{$patch->{"reply"}}; - my $parent = $messages{$patch->{"reply"}}; - # find top parent - while (!defined($parent->{"has_patch"}) && defined($parent->{"reply"})) + my $patch = shift; + + if (defined($patch->{"parent"})) { return $patch->{"parent"}; } + + return $patch if defined $patch->{"has_patch"}; + return $patch unless defined $patch->{"reply"}; + + foreach ($patch->{"reply"}, @{$patch->{"refs"}}) { - $parent = $messages{$parent->{"reply"}}; + next unless defined $messages{$_}; + my $parent = assign_parent( $messages{$_} ); + next unless $parent; + # add it to the parent's children + $patch->{"parent"} = $parent; + push @{$parent->{"children"}}, $patch; + push @{$parent->{"signoff"}}, @{$patch->{"signoff"}} if $patch->{"signoff"}; + return $parent; } - next unless defined $parent; - # add it to the parent's children and remove it from the list - $patch->{"parent"} = $parent; - push @{$parent->{"children"}}, $patch; - push @{$parent->{"signoff"}}, @{$patch->{"signoff"}} if $patch->{"signoff"}; - delete $patches{$file}; + return undef; +} + +foreach my $file (sort keys %patches) +{ + assign_parent( $patches{$file} ); + # remove patches that have a parent + delete $patches{$file} if $patches{$file}->{"parent"}; } my $row = 0; @@ -250,6 +262,12 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k { my $patch = $patches{$file}; + if (!defined $patch->{"has_patch"}) # skip non-patches + { + next if $patch->{"status"} eq "reply"; + next unless $patch->{"subject"} =~ /\[.*PATCH.*\]/; + } + printf INDEX "<tr class=\"%s %s\"><td class=\"id\">%s</td><td class=\"status\"><a href=\"#legend\">%s</a></td>", $row & 1 ? "odd" : "even", $patch->{"status"}, $file, $status_descr{$patch->{"status"}} || $patch->{"status"}; if (defined $patch->{"children"})

1 0

Alexandre Julliard : patches: Create an intermediate directory level for patches on the website.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: tools Branch: master Commit: a36a95cfab9a1f984e2649f69e4d4218273600d7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a36a95cfab9a1f984e2649f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 18:21:48 2017 +0100 patches: Create an intermediate directory level for patches on the website. This avoids having hundreds of thousands of files in the same directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/patches/update b/patches/update index 87e640d..e4ede03 100755 --- a/patches/update +++ b/patches/update @@ -91,6 +91,7 @@ my $dir = $ARGV[0] || "$ENV{HOME}/patches"; my $dest = "/home/winehq/opt/source/patches"; my %patches; my %messages; +my %subdirs; sub format_author($) { @@ -218,6 +219,7 @@ foreach my $file (readdir DIR) $messages{$patch{"msgid"}} = \%patch; } $patches{$file} = \%patch; + if ($file =~ /^([0-9]+)[0-9]{4}$/) { $subdirs{$1} = 1; } } closedir DIR; @@ -449,5 +451,9 @@ print INDEX $sorter; print INDEX end_html; close INDEX; -!system "rsync", "-q", "-r", "--chmod=+r", "--exclude=OLD/", "$dir/", "$dest/data" or die "rsync failed: $?"; +foreach (keys %subdirs) +{ + !system "rsync", "-q", "-r", "--chmod=+r", "--include=$_*", "--exclude=*", "$dir/", "$dest/data/$_" or die "rsync failed: $?"; +} + rename "$dest/index.html.new", "$dest/index.html" or die "failed to update index.html";

1 0

Alexandre Julliard : patches: Support showing/ hiding multiple replies per patch.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: tools Branch: master Commit: e00b03b02ad97d4c6686bdbc785c30ac90ee1a90 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e00b03b02ad97d4c6686bdbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 16:44:18 2017 +0100 patches: Support showing/hiding multiple replies per patch. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/patches/update b/patches/update index 5e82927..963a5db 100755 --- a/patches/update +++ b/patches/update @@ -104,9 +104,12 @@ sub uniq my $js = <<END; function toggle_display(id) { - var e = document.getElementById(id); - var display = e.style.display; - e.style.display = display == "none" ? "" : "none"; + var elems = document.getElementById('main_table').getElementsByClassName(id); + for (i = 0; i < elems.length; i++) + { + var display = elems[i].style.display; + elems[i].style.display = display == "none" ? "" : "none"; + } } END @@ -313,17 +316,17 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k print INDEX "</tr>\n"; if (@signoff) { - printf INDEX "<tr class=\"%s\" id=\"$file.signoff\" style=\"display: none;\" onclick=\"toggle_display('$file.signoff')\">" . + printf INDEX "<tr class=\"%s $file.signoff\" id=\"$file.signoff\" style=\"display: none;\" onclick=\"toggle_display('$file.signoff')\">" . "<td colspan=\"5\" /><td colspan=\"4\" class=\"signoffextra author\">%s</td></tr>\n", $row & 1 ? "odd" : "even", join("", map { "Signed-off-by: " . escapeHTML($_) . "<br/>"; } @signoff ); } foreach my $child (@{$patch->{"children"}}) { - printf INDEX "<tr class=\"%s\" id=\"$file.reply\" style=\"display: none;\" onclick=\"toggle_display('$file.reply')\">" . + printf INDEX "<tr class=\"%s\ $file.reply\" id=\"%s\" style=\"display: none;\" onclick=\"toggle_display('$file.reply')\">" . "<td colspan=\"2\" /><td colspan=\"2\" class=\"reply author\"><span class=\"indent\" />%s</td> " . "<td class=\"reply author\"><span class=\"indent\" /><a href=\"data/%s\">%s</a></td> " . "<td colspan=\"4\" /></tr>\n", - $row & 1 ? "odd" : "even", escapeHTML($child->{"author"}), $child->{"id"}, escapeHTML($child->{"subject"}); + $row & 1 ? "odd" : "even", $child->{"id"}, escapeHTML($child->{"author"}), $child->{"id"}, escapeHTML($child->{"subject"}); } $row++; }

1 0

Alexandre Julliard : patches: Remove some no longer used patch states.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: tools Branch: master Commit: d84c6603d7bf9db05318d2c17db6ff9529cb92f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d84c6603d7bf9db05318d2c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 21:08:25 2017 +0100 patches: Remove some no longer used patch states. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 15 ++------------- patches/patches.css | 2 -- patches/update | 5 ----- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/patches/expire b/patches/expire index 4dd8a1a..305e7e5 100755 --- a/patches/expire +++ b/patches/expire @@ -24,7 +24,6 @@ my %status_expiry = ( "nil" => 30, - "pending" => 30, "assigned" => 30, "applied" => 30, "committed" => 1, @@ -35,12 +34,11 @@ my %status_expiry = "formatting" => 7, "other" => 7, "nopatch" => 3, - "reply" => 7, + "reply" => 1, "rejected" => 7, "split" => 7, "depend" => 7, "sequence" => 7, - "signoff" => 1, "superseded" => 1, "testcase" => 7, "testfail" => 7, @@ -49,7 +47,6 @@ my %status_expiry = my %status_descr = ( "nil" => "New", - "pending" => "Pending", "assigned" => "Assigned", "applied" => "Applied", "committed" => "Committed", @@ -65,7 +62,6 @@ my %status_descr = "split" => "Needs splitting", "depend" => "Dependency", "sequence" => "Bad sequence", - "signoff" => "Sign-off", "superseded" => "Superseded", "testcase" => "Needs tests", "testfail" => "Test failure", @@ -73,12 +69,6 @@ my %status_descr = my %status_explanation = ( - "pending" => -"This means that the patch is not necessarily wrong, but its -correctness is not obvious. You should either write a test case -demonstrating that it is correct, try to fix the problem in a more -straightforward way, or better explain why you are doing things this -way.", "assigned" => "This means that the patch has been assigned to a reviewer. If the reviewer signs off on the patch, it will be committed, otherwise @@ -142,7 +132,6 @@ to enable the Testbot to figure it out.", the patch is correct.", # No notifications are sent for the following: # "nil" -# "signoff" # "reply" # "superseded" # "testfail" @@ -213,7 +202,7 @@ sub get_patch_state($) { $status = <STATUS>; chomp $status; - $mtime = (stat STATUS)[9] unless ($status eq "nil" || $status eq "pending"); + $mtime = (stat STATUS)[9] unless $status eq "nil"; close STATUS; } $mtime ||= (stat "$dir/$file")[9]; diff --git a/patches/patches.css b/patches/patches.css index f7bb560..24e8f37 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -153,7 +153,6 @@ tr.odd { background-color: #f8e8e8; } .id :hover, .sha1 :hover, .subject :hover { color: #FF6666; text-decoration: underline; } .nil, .nil :link, .nil :visited { color: blue; font-weight: bold; } -.pending, .pending :link, .pending :visited { color: blue; } .assigned, .assigned :link, .assigned :visited { color: blue; } .committed, .committed :link, .committed :visited { color: green; } .depend, .depend :link, .depend :visited { color: #e08000; } @@ -161,7 +160,6 @@ tr.odd { background-color: #f8e8e8; } .sequence, .sequence :link, .sequence :visited { color: #e08000; } .deferred, .deferred :link, .deferred :visited { color: #e08000; } .testcase, .testcase :link, .testcase :visited { color: #e08000; } -.signoff, .signoff :link, .signoff :visited { color: #e08000; } .reply, .reply :link, .reply :visited { color: #e08000; } .other, .other :link, .other :visited { color: #e08000; } .applyfail, .applyfail :link, .applyfail :visited { color: red; } diff --git a/patches/update b/patches/update index ca4d2e5..5e82927 100755 --- a/patches/update +++ b/patches/update @@ -24,7 +24,6 @@ use CGI qw(:standard); my %status_descr = ( "nil" => "New", - "pending" => "Pending", "assigned" => "Assigned", "applied" => "Applied", "committed" => "Committed", @@ -42,14 +41,12 @@ my %status_descr = "sequence" => "Bad sequence", "testcase" => "Needs tests", "testfail" => "Test failure", - "signoff" => "Sign-off", "reply" => "Reply", ); my @legend = ( [ "nil", "<ul><li>Patch not even looked at yet, there's still hope...</li></ul>" ], - [ "pending", "<ul><li>The patch is not obviously correct at first glance. Making a more convincing argument, preferably in the form of a test case, may help.</li></ul>" ], [ "assigned", "<ul><li>Waiting for sign-off or feedback from the assigned reviewer. If you don't hear anything after a couple of weeks, please resend the patch.</li></ul>" ], [ "committed", "<ul><li>You have done everything right; congratulations!</li>" . "<li>You screwed up but AJ missed it, send a fix before someone notices ;-)</li></ul>" ], @@ -59,8 +56,6 @@ my @legend = "<li>Someone else fixed the problem already.</li></ul>" ], [ "testcase", "<ul><li>You need to write some test cases demonstrating that the patch is correct.</li></ul>" ], [ "deferred", "<ul><li>The patch is deferred because of code freeze for an upcoming release. Either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release.</li></ul>" ], - [ "signoff", "<ul><li>This is a Signed-off-by reply to another patch.</li></ul>" ], - [ "reply", "<ul><li>The mail is a reply to another patch.</li></ul>" ], [ "other", "<ul><li>The patch belongs to another WineHQ project (website, appdb, etc.) and will be applied by the respective maintainer.</li></ul>" ], [ "applyfail", "<ul><li>The patch got mangled in transit.</li>" . "<li>It's not relative to the latest git.</li>" .

1 0

Alexandre Julliard : patches: Expire replies along with their parent patch.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: tools Branch: master Commit: 1654c8a28e36627fba4097c7493663675c7a7e24 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1654c8a28e36627fba4097c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 21:08:44 2017 +0100 patches: Expire replies along with their parent patch. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 96 +++++++++++++++++++++++----------------------------------- 1 file changed, 38 insertions(+), 58 deletions(-) diff --git a/patches/expire b/patches/expire index cba6246..4dd8a1a 100755 --- a/patches/expire +++ b/patches/expire @@ -193,6 +193,21 @@ sub get_patch_state($) my $file = shift; my $status = "nil"; my $mtime = 0; + my ($subject, $msgid, $reply); + + return undef unless open PATCH, "<$dir/$file"; + while (<PATCH>) + { + if (/^Subject: (.*)$/) { $subject = $1; } + elsif (/^Message-Id: (.*)$/) { $msgid = $1; } + elsif (/^In-Reply-To: (.*)$/) { $reply = $1; } + last if (/^$/); + } + while (<PATCH>) + { + if (/^diff --git a\//) { $reply = undef; last; } + } + close PATCH; if (open STATUS, "<$dir/$file.status") { @@ -201,11 +216,8 @@ sub get_patch_state($) $mtime = (stat STATUS)[9] unless ($status eq "nil" || $status eq "pending"); close STATUS; } - if (!$mtime && $file !~ /^OLD\//) - { - $mtime = (stat "$dir/$file")[9]; - } - return ($status, $mtime); + $mtime ||= (stat "$dir/$file")[9]; + return ($subject, $msgid, $reply, $status, $mtime); } sub get_previous_state($) @@ -364,81 +376,49 @@ EOF # expire current patches +my %patches; + opendir DIR, $dir or die "cannot open '$dir': $!\n"; foreach my $file (sort readdir DIR) { next unless $file =~ /^[0-9]+$/; - my ($status, $mtime) = get_patch_state( $file ); + my ($subject, $msgid, $reply, $status, $mtime) = get_patch_state( $file ); my $prev_status = get_previous_state( $file ); my $limit = $status_expiry{$status} || 7; + my $expire = (($now - $mtime - 12*60*60) / (24*60*60) > $limit); notify_state_change( $file, $prev_status, $status ); - if (($now - $mtime - 12*60*60) / (24*60*60) > $limit) - { - if ($status eq "nil" || $status eq "pending") - { - # move to OLD - printf "rename $file -> OLD %s %s\n", $status, get_patch_subject( "$file" ) unless $quiet; - unless ($dry_run) - { - rename "$dir/$file", "$dir/OLD/$file"; - rename "$dir/$file.status", "$dir/OLD/$file.status"; - rename "$dir/$file.order", "$dir/OLD/$file.order"; - rename "$dir/$file.review", "$dir/OLD/$file.review"; - rename "$dir/$file.signoff", "$dir/OLD/$file.signoff"; - rename "$dir/$file.testbot", "$dir/OLD/$file.testbot"; - rename "$dir/$file.testfail", "$dir/OLD/$file.testfail"; - } - } - else - { - printf "unlink $file %s %s\n", $status, get_patch_subject( "$file" ) unless $quiet; - unless ($dry_run) - { - unlink "$dir/$file"; - unlink "$dir/$file.status"; - unlink "$dir/$file.order"; - unlink "$dir/$file.signoff"; - unlink "$dir/$file.review"; - unlink "$dir/$file.testbot"; - unlink "$dir/$file.testfail"; - unlink "$dir/OLD/$file.status"; - } - } - } + $patches{$msgid} = [ $file, $subject, $reply, $status, $expire ]; } closedir DIR; -# expire old patches whose status has changed - -opendir DIR, "$dir/OLD" or die "cannot open '$dir/OLD': $!\n"; -foreach my $file (sort readdir DIR) +foreach my $p (keys %patches) { - next unless $file =~ /^[0-9]+$/; - my ($status, $mtime) = get_patch_state( "OLD/$file" ); + my ($file, $subject, $reply, $status, $expire) = @{$patches{$p}}; + my $orig_status = $status; - if ($status eq "pending") + # for replies, inherit expire flag from top parent + while ($reply && $status eq "reply") { - # remove status file - printf "unlink OLD/$file.status\n" unless $quiet; - unlink "$dir/OLD/$file.status" unless $dry_run; + last unless defined $patches{$reply}; + (undef, undef, $reply, $status, $expire) = @{$patches{$reply}}; } - elsif ($status ne "nil") + + if ($expire) { - printf "unlink OLD/$file %s %s\n", $status, get_patch_subject( "OLD/$file" ) unless $quiet; + printf "unlink $file %s %s\n", $orig_status, $subject unless $quiet; unless ($dry_run) { - unlink "$dir/OLD/$file"; + unlink "$dir/$file"; + unlink "$dir/$file.status"; + unlink "$dir/$file.order"; + unlink "$dir/$file.review"; + unlink "$dir/$file.testbot"; + unlink "$dir/$file.testfail"; unlink "$dir/OLD/$file.status"; - unlink "$dir/OLD/$file.order"; - unlink "$dir/OLD/$file.review"; - unlink "$dir/OLD/$file.signoff"; - unlink "$dir/OLD/$file.testbot"; - unlink "$dir/OLD/$file.testfail"; } } } -closedir DIR; notify_reviewers();

1 0

Ziqing Hui : mlang: Add more Chinese code pages support.
by Alexandre Julliard Nov. 9, 2017

Nov. 9, 2017

Module: wine Branch: master Commit: 88cc2d114a1c393e17cd6175ec805a5f14a194ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=88cc2d114a1c393e17cd6175e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 9 21:17:49 2017 +0800 mlang: Add more Chinese code pages support. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 36 ++++++++++++++++++++++++++++++++---- dlls/mlang/tests/mlang.c | 6 ------ 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 9c76c11..47f9d98 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -118,13 +118,33 @@ static const MIME_CP_INFO baltic_cp[] = }; static const MIME_CP_INFO chinese_simplified_cp[] = { + { "Chinese Simplified (Auto-Select)", + 50936, MIMECONTF_IMPORT | MIMECONTF_VALID | MIMECONTF_VALID_NLS | + MIMECONTF_MIME_LATEST, + "_autodetect_chs", "_autodetect_chs", "_autodetect_chs" }, { "Chinese Simplified (GB2312)", 936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | - MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | + MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_VALID | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST, "gb2312", "gb2312", "gb2312" }, - { "Chinese Simplified (GBK)", + { "Chinese Simplified (GB2312-80)", + 20936, MIMECONTF_IMPORT | MIMECONTF_EXPORT | MIMECONTF_VALID | + MIMECONTF_VALID_NLS | MIMECONTF_MIME_LATEST, + "x-cp20936", "x-cp20936", "x-cp20936" }, + { "Chinese Simplified (HZ)", + 52936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_IMPORT | + MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | + MIMECONTF_VALID | MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 | + MIMECONTF_MIME_LATEST, + "hz-gb-2312", "hz-gb-2312", "hz-gb-2312" }, + { "Chinese Simplified (GB18030)", + 54936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | + MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | + MIMECONTF_EXPORT | MIMECONTF_VALID | MIMECONTF_VALID_NLS | + MIMECONTF_MIME_LATEST, + "GB18030", "GB18030", "GB18030" }, + { "Chinese Simplified (GBK)", 936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS | @@ -133,12 +153,20 @@ static const MIME_CP_INFO chinese_simplified_cp[] = }; static const MIME_CP_INFO chinese_traditional_cp[] = { + { "Chinese Traditional (Auto-Select)", + 50950, MIMECONTF_IMPORT | MIMECONTF_VALID | MIMECONTF_VALID_NLS | + MIMECONTF_MIME_LATEST, + "_autodetect_cht", "_autodetect_cht", "_autodetect_cht" }, { "Chinese Traditional (Big5)", 950, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | - MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | + MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID | MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST, - "big5", "big5", "big5" } + "big5", "big5", "big5" }, + { "Chinese Traditional (CNS)", + 20000, MIMECONTF_IMPORT | MIMECONTF_EXPORT | MIMECONTF_VALID | + MIMECONTF_VALID_NLS | MIMECONTF_MIME_LATEST, + "x-Chinese-CNS", "x-Chinese-CNS", "x-Chinese-CNS" } }; static const MIME_CP_INFO central_european_cp[] = { diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index ffa422c..141af39 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -254,7 +254,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'S','i','m','s','u','n',0}, {'S','i','m','s','u','n',0}, 134 }, - TRUE }, /* 1. Chinese Simplified (GB2312) */ { @@ -282,7 +281,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'S','i','m','s','u','n',0}, {'S','i','m','s','u','n',0}, 134 }, - TRUE }, /* 3. Chinese Simplified (HZ) */ { @@ -297,7 +295,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'S','i','m','s','u','n',0}, {'S','i','m','s','u','n',0}, 134 }, - TRUE }, /* 4. Chinese Simplified (GB18030) */ { @@ -312,7 +309,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'S','i','m','s','u','n',0}, {'S','i','m','s','u','n',0}, 134 }, - TRUE }, /* 5. Chinese Traditional (Auto-Select) */ { @@ -325,7 +321,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'M','i','n','g','L','i','u',0}, {'N','e','w',' ','M','i','n','g','L','i','u',0}, 136 }, - TRUE }, /* 6. Chinese Traditional (Big5) */ { @@ -353,7 +348,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'M','i','n','g','L','i','u',0}, {'N','e','w',' ','M','i','n','g','L','i','u',0}, 136 }, - TRUE } };

1 0

Piotr Caban : fusion: Add support for ASM_NAME_ARCHITECTURE in IAssemblyNameImpl_GetProperty.
by Alexandre Julliard Nov. 9, 2017

Nov. 9, 2017

Module: wine Branch: master Commit: b0aca40d78a9ac95ffe7776a63e665bbf7717b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0aca40d78a9ac95ffe7776a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 9 16:07:53 2017 +0100 fusion: Add support for ASM_NAME_ARCHITECTURE in IAssemblyNameImpl_GetProperty. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmname.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/fusion/tests/asmname.c | 25 +++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index e3f1ee4..6be8bf6 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -55,6 +55,8 @@ typedef struct { BYTE pubkey[8]; BOOL haspubkey; + PEKIND pekind; + LONG ref; } IAssemblyNameImpl; @@ -232,6 +234,17 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, } break; + case ASM_NAME_ARCHITECTURE: + *pcbProperty = 0; + if (name->pekind != peNone) + { + *pcbProperty = sizeof(PEKIND); + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + *((PEKIND *)pvProperty) = name->pekind; + } + break; + default: *pcbProperty = 0; break; @@ -616,6 +629,30 @@ static HRESULT parse_pubkey(IAssemblyNameImpl *name, LPCWSTR pubkey) return S_OK; } +static HRESULT parse_procarch(IAssemblyNameImpl *name, LPCWSTR procarch) +{ + static const WCHAR msilW[] = {'m','s','i','l',0}; + static const WCHAR x86W[] = {'x','8','6',0}; + static const WCHAR ia64W[] = {'i','a','6','4',0}; + static const WCHAR amd64W[] = {'a','m','d','6','4',0}; + + if (!lstrcmpiW(procarch, msilW)) + name->pekind = peMSIL; + else if (!lstrcmpiW(procarch, x86W)) + name->pekind = peI386; + else if (!lstrcmpiW(procarch, ia64W)) + name->pekind = peIA64; + else if (!lstrcmpiW(procarch, amd64W)) + name->pekind = peAMD64; + else + { + ERR("unrecognized architecture: %s\n", wine_dbgstr_w(procarch)); + return FUSION_E_INVALID_NAME; + } + + return S_OK; +} + static WCHAR *parse_value( const WCHAR *str, unsigned int len ) { WCHAR *ret; @@ -726,6 +763,8 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam { name->procarch = value; value = NULL; + + hr = parse_procarch( name, name->procarch ); } HeapFree( GetProcessHeap(), 0, value ); diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 556a143..aa7e11b 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -397,6 +397,7 @@ static void test_CreateAssemblyNameObject(void) WCHAR str[MAX_PATH]; WCHAR namestr[MAX_PATH]; DWORD size, hi, lo; + PEKIND arch; HRESULT hr; static const WCHAR empty[] = {0}; @@ -794,6 +795,12 @@ static void test_CreateAssemblyNameObject(void) ok_aw("wine, processorArchitecture=x86", str); ok(size == 32, "Expected 32, got %d\n", size); + size = sizeof(arch); + hr = IAssemblyName_GetProperty(name, ASM_NAME_ARCHITECTURE, &arch, &size); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(arch == peI386, "Expected peI386, got %d\n", arch); + ok(size == sizeof(arch), "Wrong size %d\n", size); + IAssemblyName_Release(name); /* amd64 */ @@ -808,6 +815,12 @@ static void test_CreateAssemblyNameObject(void) ok_aw("wine, processorArchitecture=AMD64", str); ok(size == 34, "Expected 34, got %d\n", size); + size = sizeof(arch); + hr = IAssemblyName_GetProperty(name, ASM_NAME_ARCHITECTURE, &arch, &size); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(arch == peAMD64, "Expected peAMD64, got %d\n", arch); + ok(size == sizeof(arch), "Wrong size %d\n", size); + IAssemblyName_Release(name); /* ia64 */ @@ -822,6 +835,12 @@ static void test_CreateAssemblyNameObject(void) ok_aw("wine, processorArchitecture=IA64", str); ok(size == 33, "Expected 33, got %d\n", size); + size = sizeof(arch); + hr = IAssemblyName_GetProperty(name, ASM_NAME_ARCHITECTURE, &arch, &size); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(arch == peIA64, "Expected peIA64, got %d\n", arch); + ok(size == sizeof(arch), "Wrong size %d\n", size); + IAssemblyName_Release(name); /* msil */ @@ -836,6 +855,12 @@ static void test_CreateAssemblyNameObject(void) ok_aw("wine, processorArchitecture=MSIL", str); ok(size == 33, "Expected 33, got %d\n", size); + size = sizeof(arch); + hr = IAssemblyName_GetProperty(name, ASM_NAME_ARCHITECTURE, &arch, &size); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(arch == peMSIL, "Expected peMSIL, got %d\n", arch); + ok(size == sizeof(arch), "Wrong size %d\n", size); + IAssemblyName_Release(name); }

1 0

Piotr Caban : fusion: Respect buffer size in IAssemblyNameImpl_GetProperty.
by Alexandre Julliard Nov. 9, 2017

Nov. 9, 2017

Module: wine Branch: master Commit: fac2e9a28297a0186254408bf4fd2a343e822103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac2e9a28297a0186254408bf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 9 16:07:48 2017 +0100 fusion: Respect buffer size in IAssemblyNameImpl_GetProperty. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmname.c | 41 ++++++++++++++++++++++++++++++++--------- dlls/fusion/tests/asmname.c | 16 +++++++++++++++- 2 files changed, 47 insertions(+), 10 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 1bfe9c1..e3f1ee4 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -31,6 +31,7 @@ #include "guiddef.h" #include "fusion.h" #include "corerror.h" +#include "strsafe.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -138,11 +139,11 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, LPDWORD pcbProperty) { IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); + DWORD size; TRACE("(%p, %d, %p, %p)\n", iface, PropertyId, pvProperty, pcbProperty); - *((LPWSTR)pvProperty) = '\0'; - + size = *pcbProperty; switch (PropertyId) { case ASM_NAME_NULL_PUBLIC_KEY: @@ -158,45 +159,65 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, *pcbProperty = 0; if (name->name) { - lstrcpyW(pvProperty, name->name); *pcbProperty = (lstrlenW(name->name) + 1) * 2; + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + lstrcpyW(pvProperty, name->name); } break; case ASM_NAME_MAJOR_VERSION: *pcbProperty = 0; - *((WORD *)pvProperty) = name->version[0]; if (name->versize >= 1) + { *pcbProperty = sizeof(WORD); + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + *((WORD *)pvProperty) = name->version[0]; + } break; case ASM_NAME_MINOR_VERSION: *pcbProperty = 0; - *((WORD *)pvProperty) = name->version[1]; if (name->versize >= 2) + { *pcbProperty = sizeof(WORD); + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + *((WORD *)pvProperty) = name->version[1]; + } break; case ASM_NAME_BUILD_NUMBER: *pcbProperty = 0; - *((WORD *)pvProperty) = name->version[2]; if (name->versize >= 3) + { *pcbProperty = sizeof(WORD); + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + *((WORD *)pvProperty) = name->version[2]; + } break; case ASM_NAME_REVISION_NUMBER: *pcbProperty = 0; - *((WORD *)pvProperty) = name->version[3]; if (name->versize >= 4) + { *pcbProperty = sizeof(WORD); + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + *((WORD *)pvProperty) = name->version[3]; + } break; case ASM_NAME_CULTURE: *pcbProperty = 0; if (name->culture) { - lstrcpyW(pvProperty, name->culture); *pcbProperty = (lstrlenW(name->culture) + 1) * 2; + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + lstrcpyW(pvProperty, name->culture); } break; @@ -204,8 +225,10 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, *pcbProperty = 0; if (name->haspubkey) { - memcpy(pvProperty, name->pubkey, sizeof(DWORD) * 2); *pcbProperty = sizeof(DWORD) * 2; + if (size < *pcbProperty) + return STRSAFE_E_INSUFFICIENT_BUFFER; + memcpy(pvProperty, name->pubkey, sizeof(DWORD) * 2); } break; diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index b93f289..556a143 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -24,6 +24,7 @@ #include <mscoree.h> #include <fusion.h> #include <corerror.h> +#include <strsafe.h> #include "wine/test.h" @@ -362,7 +363,11 @@ static void test_assembly_name_props_line(IAssemblyName *name, if (hr != E_INVALIDARG) { ok(size == vals[i].size, "%d: prop %d: Expected %d, got %d\n", line, i, vals[i].size, size); - if (size && size != MAX_PATH) + if (!size) + { + ok(str[0] == 0xcccc, "%d: prop %d: str[0] = %x\n", line, i, str[0]); + } + else if (size != MAX_PATH) { if (i != ASM_NAME_NAME && i != ASM_NAME_CULTURE) ok( !memcmp( vals[i].val, str, size ), "%d: prop %d: wrong value\n", line, i ); @@ -370,6 +375,15 @@ static void test_assembly_name_props_line(IAssemblyName *name, ok( !lstrcmpW( expect, str ), "%d: prop %d: Expected %s, got %s\n", line, i, wine_dbgstr_w(expect), wine_dbgstr_w(str) ); } + + if (size != 0 && size != MAX_PATH) + { + size--; + hr = IAssemblyName_GetProperty(name, i, str, &size); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, + "%d: prop %d: Expected STRSAFE_E_INSUFFICIENT_BUFFER, got %08x\n", line, i, hr); + ok(size == vals[i].size, "%d: prop %d: Expected %d, got %d\n", line, i, vals[i].size, size); + } } } }

1 0