July 2018 - Wine-commits - list.winehq.org

Zebediah Figura : winegstreamer: Use CBaseFilter::FindPin().
by Alexandre Julliard 04 Jul '18

04 Jul '18

Module: wine Branch: master Commit: b252ef91a29373580d40992e9e2e800787a5fcda URL: https://source.winehq.org/git/wine.git/?a=commit;h=b252ef91a29373580d40992e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 3 23:56:52 2018 +0200 winegstreamer: Use CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 +------- dlls/winegstreamer/gsttffilter.c | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3983a28..7fd1116 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1470,12 +1470,6 @@ static HRESULT WINAPI GST_GetState(IBaseFilter *iface, DWORD dwMilliSecsTimeout, } } -static HRESULT WINAPI GST_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) -{ - FIXME("(%p)->(%s,%p) stub\n", iface, debugstr_w(Id), ppPin); - return E_NOTIMPL; -} - static const IBaseFilterVtbl GST_Vtbl = { GST_QueryInterface, BaseFilterImpl_AddRef, @@ -1488,7 +1482,7 @@ static const IBaseFilterVtbl GST_Vtbl = { BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - GST_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 29e679b..d2d36b6 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -1030,7 +1030,7 @@ static const IBaseFilterVtbl GSTTf_Vtbl = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - TransformFilterImpl_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo

1 0

Zebediah Figura : wineqtdecoder: Use CBaseFilter::FindPin().
by Alexandre Julliard 04 Jul '18

04 Jul '18

Module: wine Branch: master Commit: 466961f2e56b0422a8de5319d6b00c3d8840e3cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=466961f2e56b0422a8de5319… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 3 23:56:53 2018 +0200 wineqtdecoder: Use CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 8 +------- dlls/wineqtdecoder/qtvdecoder.c | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 096d384..2b9ec88 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -794,12 +794,6 @@ static HRESULT WINAPI QT_GetState(IBaseFilter *iface, DWORD dwMilliSecsTimeout, return S_OK; } -static HRESULT WINAPI QT_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) -{ - FIXME("(%p)->(%s,%p) stub\n", iface, debugstr_w(Id), ppPin); - return E_NOTIMPL; -} - static const IBaseFilterVtbl QT_Vtbl = { QT_QueryInterface, BaseFilterImpl_AddRef, @@ -812,7 +806,7 @@ static const IBaseFilterVtbl QT_Vtbl = { BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - QT_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 6e2ceb1..9091da1 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -562,7 +562,7 @@ static const IBaseFilterVtbl QTVDecoder_Vtbl = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - TransformFilterImpl_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo

1 0

Alexandre Julliard : user32: Don' t copy window bits to or from the dummy surface.
by Alexandre Julliard 04 Jul '18

04 Jul '18

Module: wine Branch: master Commit: 3cd66cf7b17affe18d67ae7600349f3a22dd36d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cd66cf7b17affe18d67ae76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 4 16:07:34 2018 +0200 user32: Don't copy window bits to or from the dummy surface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c792b0e..659321c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2091,6 +2091,12 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, old_client_rect = win->client_rect; old_surface = win->surface; if (old_surface != new_surface) swp_flags |= SWP_FRAMECHANGED; /* force refreshing non-client area */ + if (new_surface == &dummy_surface) swp_flags |= SWP_NOREDRAW; + else if (old_surface == &dummy_surface) + { + swp_flags |= SWP_NOCOPYBITS; + valid_rects = NULL; + } SERVER_START_REQ( set_window_pos ) {

1 0

Zebediah Figura : explorer: Wrap the desktop window procedure instead of replacing it.
by Alexandre Julliard 04 Jul '18

04 Jul '18

Module: wine Branch: master Commit: fc14753dc0188a52a05243d5d82c4062b93daaff URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc14753dc0188a52a05243d5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 4 17:16:40 2018 +0200 explorer: Wrap the desktop window procedure instead of replacing it. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index a2d9e1a..4f47ad0 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -599,6 +599,8 @@ static BOOL start_screensaver( void ) return FALSE; } +static WNDPROC desktop_orig_wndproc; + /* window procedure for the desktop window */ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPARAM lp ) { @@ -660,10 +662,9 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR EndPaint( hwnd, &ps ); } return 0; - - default: - return DefWindowProcW( hwnd, message, wp, lp ); } + + return desktop_orig_wndproc( hwnd, message, wp, lp ); } /* create the desktop and the associated driver window, and make it the current desktop */ @@ -978,7 +979,8 @@ void manage_desktop( WCHAR *arg ) CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, 0, 0, 0, NULL ); - SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); + desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( hwnd, GWLP_WNDPROC, + (LONG_PTR)desktop_wnd_proc ); using_root = !desktop || !create_desktop( graphics_driver, name, width, height ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name );

1 0

Zebediah Figura : winex11.drv: Wake up the display on user input.
by Alexandre Julliard 04 Jul '18

04 Jul '18

Module: wine Branch: master Commit: c6b6935bb433dbbd30f5ba122a7c45ad3a2d6eed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b6935bb433dbbd30f5ba12… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 4 17:16:41 2018 +0200 winex11.drv: Wake up the display on user input. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a848dc6..24c9429 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1804,6 +1804,22 @@ BOOL CDECL X11DRV_CreateDesktopWindow( HWND hwnd ) } +static WNDPROC desktop_orig_wndproc; + +#define WM_WINE_NOTIFY_ACTIVITY WM_USER + +static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch (msg) + { + case WM_WINE_NOTIFY_ACTIVITY: + XResetScreenSaver( gdi_display ); + XFlush( gdi_display ); + break; + } + return desktop_orig_wndproc( hwnd, msg, wp, lp ); +} + /********************************************************************** * CreateWindow (X11DRV.@) */ @@ -1814,6 +1830,9 @@ BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) struct x11drv_thread_data *data = x11drv_init_thread_data(); XSetWindowAttributes attr; + desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( hwnd, GWLP_WNDPROC, + (LONG_PTR)desktop_wndproc_wrapper ); + /* create the cursor clipping window */ attr.override_redirect = TRUE; attr.event_mask = StructureNotifyMask | FocusChangeMask;

1 0

Marcus Meissner : amstream/tests: Use correct buffer size for StringFromGUID2.
by Alexandre Julliard 04 Jul '18

04 Jul '18

Module: wine Branch: master Commit: 19802c55bf44520b27e660bbde355aedc379e169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19802c55bf44520b27e660bb… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Jul 4 16:44:34 2018 +0200 amstream/tests: Use correct buffer size for StringFromGUID2. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 70cd18d..1a14572 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -468,7 +468,7 @@ static void test_media_streams(void) /* Pin name is "I{guid MSPID_PrimaryVideo or MSPID_PrimaryAudio}" */ id[0] = 'I'; - StringFromGUID2(i ? &MSPID_PrimaryAudio : &MSPID_PrimaryVideo, id + 1, 40); + StringFromGUID2(i ? &MSPID_PrimaryAudio : &MSPID_PrimaryVideo, id + 1, 39); hr = IPin_ConnectedTo(pins[i], &pin); ok(hr == VFW_E_NOT_CONNECTED, "IPin_ConnectedTo returned: %x\n", hr);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 04 Jul '18

04 Jul '18

Module: wine Branch: master Commit: fc8d9692f8c35e87944784278dbc63d8f16be530 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc8d9692f8c35e8794478427… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Jul 4 20:41:39 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/po/lt.po b/po/lt.po index 5ef49d0..47eaafc 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-06-26 08:26+0300\n" +"PO-Revision-Date: 2018-07-04 20:40+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3433,32 +3433,24 @@ msgid "Publishers..." msgstr "Publikuotojai..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "Vietinio tinklo ryšys" +msgstr "Ryšiai" #: inetcpl.rc:125 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Vietinis serveris" +msgstr "Įgaliotasis serveris" #: inetcpl.rc:126 msgid "Use a proxy server" -msgstr "" +msgstr "Naudoti įgaliotąjį serverį" #: inetcpl.rc:127 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Adresas" +msgstr "Adresas:" #: inetcpl.rc:129 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Be prievadų" +msgstr "Prievadas:" #: inetcpl.rc:31 msgid "Internet Settings"

1 0

André Hentschel : advpack: Use ARRAY_SIZE() macro.
by Alexandre Julliard 04 Jul '18

04 Jul '18

Module: wine Branch: master Commit: e7f5dc194aeb586bb516b5fd191ad6924c4fcdd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7f5dc194aeb586bb516b5fd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 11 21:22:35 2018 +0200 advpack: Use ARRAY_SIZE() macro. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/advpack.c | 18 ++++++------------ dlls/advpack/install.c | 26 +++++++++----------------- dlls/advpack/reg.c | 6 +++--- 3 files changed, 18 insertions(+), 32 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index d2ce60e..2e8027f 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -530,18 +530,12 @@ HRESULT WINAPI SetPerUserSecValuesA(PERUSERSECTIONA* pPerUser) if (!pPerUser) return E_INVALIDARG; - MultiByteToWideChar(CP_ACP, 0, pPerUser->szGUID, -1, perUserW.szGUID, - sizeof(perUserW.szGUID) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, pPerUser->szDispName, -1, perUserW.szDispName, - sizeof(perUserW.szDispName) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, pPerUser->szLocale, -1, perUserW.szLocale, - sizeof(perUserW.szLocale) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, pPerUser->szStub, -1, perUserW.szStub, - sizeof(perUserW.szStub) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, pPerUser->szVersion, -1, perUserW.szVersion, - sizeof(perUserW.szVersion) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, pPerUser->szCompID, -1, perUserW.szCompID, - sizeof(perUserW.szCompID) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szGUID, -1, perUserW.szGUID, ARRAY_SIZE(perUserW.szGUID)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szDispName, -1, perUserW.szDispName, ARRAY_SIZE(perUserW.szDispName)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szLocale, -1, perUserW.szLocale, ARRAY_SIZE(perUserW.szLocale)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szStub, -1, perUserW.szStub, ARRAY_SIZE(perUserW.szStub)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szVersion, -1, perUserW.szVersion, ARRAY_SIZE(perUserW.szVersion)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szCompID, -1, perUserW.szCompID, ARRAY_SIZE(perUserW.szCompID)); perUserW.dwIsInstalled = pPerUser->dwIsInstalled; perUserW.bRollback = pPerUser->bRollback; diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index dcd1dd7..c3caf3a 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -115,28 +115,22 @@ static HRESULT per_user_install_callback(HINF hinf, PCWSTR field, const void *ar per_user.bRollback = FALSE; per_user.dwIsInstalled = 0; - SetupGetLineTextW(NULL, hinf, field, disp_name, per_user.szDispName, - sizeof(per_user.szDispName) / sizeof(WCHAR), &size); + SetupGetLineTextW(NULL, hinf, field, disp_name, per_user.szDispName, ARRAY_SIZE(per_user.szDispName), &size); - SetupGetLineTextW(NULL, hinf, field, version, per_user.szVersion, - sizeof(per_user.szVersion) / sizeof(WCHAR), &size); + SetupGetLineTextW(NULL, hinf, field, version, per_user.szVersion, ARRAY_SIZE(per_user.szVersion), &size); if (SetupFindFirstLineW(hinf, field, is_installed, &context)) { SetupGetIntField(&context, 1, (PINT)&per_user.dwIsInstalled); } - SetupGetLineTextW(NULL, hinf, field, comp_id, per_user.szCompID, - sizeof(per_user.szCompID) / sizeof(WCHAR), &size); + SetupGetLineTextW(NULL, hinf, field, comp_id, per_user.szCompID, ARRAY_SIZE(per_user.szCompID), &size); - SetupGetLineTextW(NULL, hinf, field, guid, per_user.szGUID, - sizeof(per_user.szGUID) / sizeof(WCHAR), &size); + SetupGetLineTextW(NULL, hinf, field, guid, per_user.szGUID, ARRAY_SIZE(per_user.szGUID), &size); - SetupGetLineTextW(NULL, hinf, field, locale, per_user.szLocale, - sizeof(per_user.szLocale) / sizeof(WCHAR), &size); + SetupGetLineTextW(NULL, hinf, field, locale, per_user.szLocale, ARRAY_SIZE(per_user.szLocale), &size); - SetupGetLineTextW(NULL, hinf, field, stub_path, per_user.szStub, - sizeof(per_user.szStub) / sizeof(WCHAR), &size); + SetupGetLineTextW(NULL, hinf, field, stub_path, per_user.szStub, ARRAY_SIZE(per_user.szStub), &size); return SetPerUserSecValuesW(&per_user); } @@ -154,8 +148,7 @@ static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, const void *arg) WCHAR buffer[MAX_INF_STRING_LENGTH]; /* get OCX filename */ - if (!SetupGetStringFieldW(&context, 1, buffer, - sizeof(buffer) / sizeof(WCHAR), NULL)) + if (!SetupGetStringFieldW(&context, 1, buffer, ARRAY_SIZE(buffer), NULL)) continue; hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); @@ -273,7 +266,7 @@ static HRESULT iterate_section_fields(HINF hinf, PCWSTR section, PCWSTR key, { WCHAR static_buffer[200]; WCHAR *buffer = static_buffer; - DWORD size = sizeof(static_buffer) / sizeof(WCHAR); + DWORD size = ARRAY_SIZE(static_buffer); INFCONTEXT context; HRESULT hr = E_FAIL; @@ -645,8 +638,7 @@ HRESULT WINAPI ExecuteCabA(HWND hwnd, CABINFOA* pCab, LPVOID pReserved) RtlCreateUnicodeStringFromAsciiz(&inf, pCab->pszInf); RtlCreateUnicodeStringFromAsciiz(&section, pCab->pszSection); - MultiByteToWideChar(CP_ACP, 0, pCab->szSrcPath, -1, cabinfo.szSrcPath, - sizeof(cabinfo.szSrcPath) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pCab->szSrcPath, -1, cabinfo.szSrcPath, ARRAY_SIZE(cabinfo.szSrcPath)); cabinfo.pszInf = inf.Buffer; cabinfo.pszSection = section.Buffer; diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 9a43015..fd0a199 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -44,7 +44,7 @@ static BOOL get_temp_ini_path(LPWSTR name) WCHAR tmp_dir[MAX_PATH]; WCHAR prefix[] = {'a','v','p',0}; - if(!GetTempPathW(sizeof(tmp_dir)/sizeof(WCHAR), tmp_dir)) + if(!GetTempPathW(ARRAY_SIZE(tmp_dir), tmp_dir)) return FALSE; if(!GetTempFileNameW(tmp_dir, prefix, 0, name)) @@ -177,14 +177,14 @@ static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path) WCHAR sys_root[MAX_PATH]; *mod_path = '\"'; - if (!GetModuleFileNameW(hm, mod_path + 1, sizeof(mod_path) / sizeof(WCHAR) - 2)) + if (!GetModuleFileNameW(hm, mod_path + 1, ARRAY_SIZE(mod_path) - 2)) return E_FAIL; lstrcatW(mod_path, quote); WritePrivateProfileStringW(Strings, MOD_PATH, mod_path, ini_path); *sys_root = '\0'; - GetEnvironmentVariableW(SystemRoot, sys_root, sizeof(sys_root) / sizeof(WCHAR)); + GetEnvironmentVariableW(SystemRoot, sys_root, ARRAY_SIZE(sys_root)); if(!strncmpiW(sys_root, mod_path + 1, strlenW(sys_root))) {

1 0

Michael Stefaniuc : include: Add a generic available ARRAY_SIZE().
by Alexandre Julliard 04 Jul '18

04 Jul '18

Module: wine Branch: master Commit: 962b31c80b74cfc479da386a8c76d55d26aed752 URL: https://source.winehq.org/git/wine.git/?a=commit;h=962b31c80b74cfc479da386a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 4 01:10:37 2018 +0200 include: Add a generic available ARRAY_SIZE(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32_misc.h | 2 -- dlls/appwiz.cpl/appwiz.h | 2 -- dlls/avifil32/avifile_private.h | 2 -- dlls/comctl32/comctl32.h | 2 -- dlls/comdlg32/cdlg.h | 2 -- dlls/crypt32/crypt32_private.h | 2 -- dlls/d2d1/d2d1_private.h | 4 ---- dlls/d3d11/d3d11_private.h | 4 ---- dlls/d3d12/d3d12_main.c | 2 -- dlls/d3d9/d3d9_private.h | 2 -- dlls/d3drm/d3drm_private.h | 4 ---- dlls/d3dx9_36/d3dx9_private.h | 2 -- dlls/ddraw/ddraw_private.h | 2 -- dlls/dmloader/dmloader_private.h | 1 - dlls/dwrite/dwrite_private.h | 2 -- dlls/dxgi/dxgi_private.h | 2 -- dlls/gdiplus/gdiplus_private.h | 2 -- dlls/msi/tokenize.c | 2 -- dlls/msxml3/msxml_private.h | 2 -- dlls/scrrun/scrrun_private.h | 2 -- dlls/shell32/shell32_main.h | 2 -- dlls/user32/user_private.h | 2 -- dlls/usp10/usp10_internal.h | 4 ---- dlls/wined3d/wined3d_private.h | 4 ---- dlls/winevulkan/vulkan_private.h | 4 ---- dlls/wshom.ocx/wshom_private.h | 2 -- dlls/xmllite/xmllite_private.h | 2 -- include/wine/test.h | 4 +++- include/winnt.h | 4 ++++ programs/notepad/main.h | 2 -- programs/reg/reg.h | 1 - programs/regedit/main.h | 2 -- programs/regedit/regproc.c | 2 -- programs/winecfg/winecfg.h | 2 -- programs/winedbg/debugger.h | 2 -- tools/make_xftmpl.c | 2 -- 36 files changed, 7 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=962b31c80b74cfc479da…

1 0

Marcus Meissner : quartz: StringFromGUID2 gets character counts, not bytes.
by Alexandre Julliard 04 Jul '18

04 Jul '18

Module: wine Branch: master Commit: 105e3c434087345be6c4abd837dc4802ded6bf9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=105e3c434087345be6c4abd8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jul 4 09:57:58 2018 +0200 quartz: StringFromGUID2 gets character counts, not bytes. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtermapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 7b6a018..2f82ce0 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -241,7 +241,7 @@ static void test_legacy_filter_registration(void) /* Register* functions need a filter class key to write pin and pin media * type data to. Create a bogus class key for it. */ CoCreateGuid(&clsid); - StringFromGUID2(&clsid, clsidstring, sizeof(clsidstring)); + StringFromGUID2(&clsid, clsidstring, ARRAY_SIZE(clsidstring)); lstrcpyW(key_name, clsidW); lstrcatW(key_name, clsidstring); ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, key_name, 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL);

1 0