August 2019 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : urlmon: Pass unescaped URLs to InternetOpenUrl in ftp protocol handler.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 6a5ecfedbc3dfbe0bdd79902ca6f8178c9e66268 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a5ecfedbc3dfbe0bdd79902… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 26 15:21:32 2019 +0100 urlmon: Pass unescaped URLs to InternetOpenUrl in ftp protocol handler. Based on a patch by André Hentschel. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26445 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d99605d714fcc947b4ba597a9975cf143f61f2dd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/ftp.c | 21 ++++++++++++--------- dlls/urlmon/tests/Makefile.in | 2 +- dlls/urlmon/tests/url.c | 10 +++++++++- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index aef4a6c..75704ce 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -66,6 +66,7 @@ static HRESULT FtpProtocol_open_request(Protocol *prot, IUri *uri, DWORD request HINTERNET internet_session, IInternetBindInfo *bind_info) { FtpProtocol *This = impl_from_Protocol(prot); + DWORD path_size = 0; BSTR url; HRESULT hres; @@ -73,16 +74,18 @@ static HRESULT FtpProtocol_open_request(Protocol *prot, IUri *uri, DWORD request if(FAILED(hres)) return hres; - This->base.request = InternetOpenUrlW(internet_session, url, NULL, 0, - request_flags|INTERNET_FLAG_EXISTING_CONNECT|INTERNET_FLAG_PASSIVE, - (DWORD_PTR)&This->base); - SysFreeString(url); - if (!This->base.request && GetLastError() != ERROR_IO_PENDING) { - WARN("InternetOpenUrl failed: %d\n", GetLastError()); - return INET_E_RESOURCE_NOT_FOUND; + hres = UrlUnescapeW(url, NULL, &path_size, URL_UNESCAPE_INPLACE); + if(SUCCEEDED(hres)) { + This->base.request = InternetOpenUrlW(internet_session, url, NULL, 0, + request_flags|INTERNET_FLAG_EXISTING_CONNECT|INTERNET_FLAG_PASSIVE, + (DWORD_PTR)&This->base); + if (!This->base.request && GetLastError() != ERROR_IO_PENDING) { + WARN("InternetOpenUrl failed: %d\n", GetLastError()); + hres = INET_E_RESOURCE_NOT_FOUND; + } } - - return S_OK; + SysFreeString(url); + return hres; } static HRESULT FtpProtocol_end_request(Protocol *prot) diff --git a/dlls/urlmon/tests/Makefile.in b/dlls/urlmon/tests/Makefile.in index 2eef129..7217f53 100644 --- a/dlls/urlmon/tests/Makefile.in +++ b/dlls/urlmon/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = urlmon.dll -IMPORTS = urlmon wininet ole32 oleaut32 user32 advapi32 +IMPORTS = urlmon wininet ole32 oleaut32 shlwapi user32 advapi32 C_SRCS = \ generated.c \ diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index ada78c9..0f2b14e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -32,6 +32,7 @@ #include "urlmon.h" #include "wininet.h" #include "mshtml.h" +#include "shlwapi.h" #include "wine/test.h" @@ -2905,7 +2906,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) url_a = (flags & BINDTEST_INVALID_CN) ? "https://4.15.184.77/favicon.ico" : "https://test.winehq.org/tests/hello.html"; break; case FTP_TEST: - url_a = "ftp://ftp.winehq.org/welcome.msg"; + url_a = "ftp://ftp.winehq.org/welcome%2emsg"; break; default: url_a = "winetest:test"; @@ -2969,6 +2970,13 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(FAILED(hres)) return; + if(protocol == FTP_TEST) + { + /* FTP url dont have any escape characters, so convert the url to what is expected */ + DWORD size = 0; + UrlUnescapeW(current_url, NULL, &size, URL_UNESCAPE_INPLACE); + } + hres = IMoniker_QueryInterface(mon, &IID_IBinding, (void**)&bind); ok(hres == E_NOINTERFACE, "IMoniker should not have IBinding interface\n"); if(SUCCEEDED(hres))

1 0

Sebastian Lackner : winex11: Forward all clipping requests to the right thread.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 9e5e27a7d2a4c61d5eead8b29ad12cf03b506d05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e5e27a7d2a4c61d5eead8b2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 18 13:39:57 2019 +0100 winex11: Forward all clipping requests to the right thread. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38087 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e2389c015c69a036aab183eaf16a2dd1e7341330) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/mouse.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d678706..f737a30 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -464,6 +464,8 @@ void reset_clipping_window(void) ClipCursor( NULL ); /* make sure the clip rectangle is reset too */ } +BOOL CDECL X11DRV_ClipCursor( const RECT *clip ); + /*********************************************************************** * clip_cursor_notify * @@ -492,12 +494,10 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) } else if (hwnd == GetForegroundWindow()) /* request to clip */ { - RECT clip, virtual_rect = get_virtual_screen_rect(); + RECT clip; GetClipCursor( &clip ); - if (clip.left > virtual_rect.left || clip.right < virtual_rect.right || - clip.top > virtual_rect.top || clip.bottom < virtual_rect.bottom) - return grab_clipping_window( &clip ); + X11DRV_ClipCursor( &clip ); } return 0; } @@ -1471,22 +1471,22 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (grab_pointer) { HWND foreground = GetForegroundWindow(); + DWORD tid, pid; + + /* forward request to the foreground window if it's in a different thread */ + tid = GetWindowThreadProcessId( foreground, &pid ); + if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) + { + TRACE( "forwarding clip request to %p\n", foreground ); + SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 ); + return TRUE; + } /* we are clipping if the clip rectangle is smaller than the screen */ if (clip->left > virtual_rect.left || clip->right < virtual_rect.right || clip->top > virtual_rect.top || clip->bottom < virtual_rect.bottom) { - DWORD tid, pid; - - /* forward request to the foreground window if it's in a different thread */ - tid = GetWindowThreadProcessId( foreground, &pid ); - if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) - { - TRACE( "forwarding clip request to %p\n", foreground ); - SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 ); - return TRUE; - } - else if (grab_clipping_window( clip )) return TRUE; + if (grab_clipping_window( clip )) return TRUE; } else /* if currently clipping, check if we should switch to fullscreen clipping */ {

1 0

Louis Lenders : explorerframe: Return S_OK in ITaskbarList3 SetThumbnailTooltip method.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 7bb2f00bc585d1f394694c4cc84a4ca024c5415f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb2f00bc585d1f394694c4c… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Mar 18 17:42:25 2019 +0100 explorerframe: Return S_OK in ITaskbarList3 SetThumbnailTooltip method. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45429 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 978b7c34740755d8d667e8fdefb126224a3aa866) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/explorerframe/taskbarlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index a50f8a9..afcd7bf 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -234,9 +234,9 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_SetThumbnailTooltip(ITaskbarList4 HWND hwnd, LPCWSTR pszTip) { - FIXME("iface %p, hwnd %p, pszTip %s stub!\n", iface, hwnd, debugstr_w(pszTip)); + FIXME("iface %p, hwnd %p, pszTip %s stub, faking success!\n", iface, hwnd, debugstr_w(pszTip)); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_SetThumbnailClip(ITaskbarList4 *iface,

1 0

Louis Lenders : explorerframe: Return S_OK in ITaskbarList3 ThumbBarAddButtons.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: b49784271f09b6fab83f7281fc3c9013dd934597 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b49784271f09b6fab83f7281… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Mar 18 17:42:26 2019 +0100 explorerframe: Return S_OK in ITaskbarList3 ThumbBarAddButtons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45429 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 570ea014770fd62997be81e88f03829eded98390) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/explorerframe/taskbarlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index afcd7bf..f029cb5 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -195,9 +195,9 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_ThumbBarAddButtons(ITaskbarList4 * UINT cButtons, LPTHUMBBUTTON pButton) { - FIXME("iface %p, hwnd %p, cButtons %u, pButton %p stub!\n", iface, hwnd, cButtons, pButton); + FIXME("iface %p, hwnd %p, cButtons %u, pButton %p stub, faking success!\n", iface, hwnd, cButtons, pButton); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_ThumbBarUpdateButtons(ITaskbarList4 *iface,

1 0

Louis Lenders : explorerframe: Return S_OK in ITaskbarList3 ThumbBarUpdateButtons method.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 788137f83889da00694ec690d3b388c3abb0446e URL: https://source.winehq.org/git/wine.git/?a=commit;h=788137f83889da00694ec690… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Mar 18 17:42:27 2019 +0100 explorerframe: Return S_OK in ITaskbarList3 ThumbBarUpdateButtons method. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45429 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit be6a113190edeedd1f95f99cd84851dd311f807e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/explorerframe/taskbarlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index f029cb5..10ad84b 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -205,9 +205,9 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_ThumbBarUpdateButtons(ITaskbarList UINT cButtons, LPTHUMBBUTTON pButton) { - FIXME("iface %p, hwnd %p, cButtons %u, pButton %p stub!\n", iface, hwnd, cButtons, pButton); + FIXME("iface %p, hwnd %p, cButtons %u, pButton %p stub, faking success!\n", iface, hwnd, cButtons, pButton); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_ThumbBarSetImageList(ITaskbarList4 *iface,

1 0

Paul Gofman : ddraw: Deny adding the same light to viewports multiple times.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: c64f450e6ea283d140941a026d5eff6f5574f24d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c64f450e6ea283d140941a02… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 22 14:17:46 2019 +0300 ddraw: Deny adding the same light to viewports multiple times. According to the logs attached to the bug, the application seems to spin in endless LIST_FOR_EACH_ENTRY() in viewport_activate(), which is the result of adding the same light structure to the list twice. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46807 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9bd6b2c2bf5e7603e65215432f3a3e5dad43616c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 27 +++++++++++++++++---------- dlls/ddraw/viewport.c | 7 +++++++ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index baf7d0a..ad985db 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4051,21 +4051,21 @@ static void test_lighting(void) {&mat_nonaffine, translatedquad, 0x000000ff, "Lit quad with non-affine matrix"}, }; - HWND window; - IDirect3D3 *d3d; + DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; + IDirect3DViewport3 *viewport, *viewport2; + DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE; + IDirect3DMaterial3 *material; + D3DMATERIALHANDLE mat_handle; IDirect3DDevice3 *device; IDirectDrawSurface4 *rt; - IDirect3DViewport3 *viewport; - IDirect3DMaterial3 *material; IDirect3DLight *light; - D3DMATERIALHANDLE mat_handle; D3DLIGHT2 light_desc; - HRESULT hr; - DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE; - DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; + IDirect3D3 *d3d; D3DCOLOR color; ULONG refcount; unsigned int i; + HWND window; + HRESULT hr; window = create_window(); if (!(device = create_device(window, DDSCL_NORMAL))) @@ -4160,9 +4160,16 @@ static void test_lighting(void) U4(light_desc.dcvColor).a = 1.0f; U3(light_desc.dvDirection).z = 1.0f; hr = IDirect3DLight_SetLight(light, (D3DLIGHT *)&light_desc); - ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DViewport3_AddLight(viewport, light); - ok(SUCCEEDED(hr), "Failed to add a light to the viewport, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DViewport3_AddLight(viewport, light); + ok(hr == D3DERR_LIGHTHASVIEWPORT, "Got unexpected hr %#x.\n", hr); + + viewport2 = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DViewport3_AddLight(viewport2, light); + ok(hr == D3DERR_LIGHTHASVIEWPORT, "Got unexpected hr %#x.\n", hr); + IDirect3DViewport3_Release(viewport2); hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 78a2fde..e7e4463 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -760,6 +760,13 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3D return DDERR_INVALIDPARAMS; } + if (light_impl->active_viewport) + { + wined3d_mutex_unlock(); + WARN("Light %p is active in viewport %p.\n", light_impl, light_impl->active_viewport); + return D3DERR_LIGHTHASVIEWPORT; + } + /* Find a light number and update both light and viewports objects accordingly */ while (map & 1) {

1 0

Zebediah Figura : msi/tests: Test calling more functions from custom actions.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: f462faf675026e110433eeea79114ddb141c3ff0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f462faf675026e110433eeea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 25 22:42:00 2019 -0500 msi/tests: Test calling more functions from custom actions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ae0298d46e8d4b7b689783b9c459ceafc3631780) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/tests/custom.c | 54 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index c7ce4d2..6ae5bfc 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1112,11 +1112,57 @@ static void test_costs(MSIHANDLE hinst) ok(hinst, sz == 2, "got size %u\n", sz); } +static void test_invalid_functions(MSIHANDLE hinst) +{ + char path[MAX_PATH], package_name[20]; + MSIHANDLE db, preview, package; + UINT r; + + r = MsiGetDatabaseState(hinst); + todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + + db = MsiGetActiveDatabase(hinst); + ok(hinst, db, "MsiGetActiveDatabase failed\n"); + + r = MsiDatabaseGenerateTransformA(db, db, "bogus.mst", 0, 0); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseApplyTransformA(db, "bogus.mst", 0); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiCreateTransformSummaryInfoA(db, db, "bogus.mst", 0, 0); + todo_wine ok(hinst, r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, "got %u\n", r); + + GetCurrentDirectoryA(sizeof(path), path); + r = MsiDatabaseExportA(db, "Test", path, "bogus.idt"); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseImportA(db, path, "bogus.idt"); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseCommit(db); + ok(hinst, r == ERROR_SUCCESS, "got %u\n", r); + + r = MsiDatabaseMergeA(db, db, "MergeErrors"); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiGetDatabaseState(db); + todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + + r = MsiEnableUIPreview(db, &preview); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + sprintf(package_name, "#%u", db); + r = MsiOpenPackageA(package_name, &package); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + MsiCloseHandle(db); +} + /* Main test. Anything that doesn't depend on a specific install configuration * or have undesired side effects should go here. */ UINT WINAPI main_test(MSIHANDLE hinst) { - UINT res; IUnknown *unk = NULL; HRESULT hr; @@ -1131,11 +1177,6 @@ UINT WINAPI main_test(MSIHANDLE hinst) ok(hinst, hr == S_OK, "got %#x\n", hr); CoUninitialize(); - /* Test MsiGetDatabaseState() */ - res = MsiGetDatabaseState(hinst); - todo_wine - ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); - test_props(hinst); test_db(hinst); test_doaction(hinst); @@ -1144,6 +1185,7 @@ UINT WINAPI main_test(MSIHANDLE hinst) test_feature_states(hinst); test_format_record(hinst); test_costs(hinst); + test_invalid_functions(hinst); return ERROR_SUCCESS; }

1 0

Zebediah Figura : msi: Return MSIDBSTATE_ERROR when MsiGetDatabaseState() is called from a custom action.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: b77e677474f29d6d47693a84b7090efcc2bbd79a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b77e677474f29d6d47693a84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 25 22:42:01 2019 -0500 msi: Return MSIDBSTATE_ERROR when MsiGetDatabaseState() is called from a custom action. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46812 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 60b1fd7e8764ab63d79382c1805d4c007a6be332) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/database.c | 13 ++----------- dlls/msi/tests/custom.c | 4 ++-- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index b8ec393..502a411 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1887,17 +1887,8 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle ) TRACE("%d\n", handle); - db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); - if( !db ) - { - MSIHANDLE remote_database = msi_get_remote(handle); - if ( !remote_database ) - return MSIDBSTATE_ERROR; - - WARN("MsiGetDatabaseState not allowed during a custom action!\n"); - - return MSIDBSTATE_READ; - } + if (!(db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ))) + return MSIDBSTATE_ERROR; if (db->mode != MSIDBOPEN_READONLY ) ret = MSIDBSTATE_WRITE; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 6ae5bfc..9e9e2bf 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1119,7 +1119,7 @@ static void test_invalid_functions(MSIHANDLE hinst) UINT r; r = MsiGetDatabaseState(hinst); - todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); db = MsiGetActiveDatabase(hinst); ok(hinst, db, "MsiGetActiveDatabase failed\n"); @@ -1147,7 +1147,7 @@ static void test_invalid_functions(MSIHANDLE hinst) ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiGetDatabaseState(db); - todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); r = MsiEnableUIPreview(db, &preview); todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);

1 0

Piotr Caban : msvcrt: Don't detect overflow in atol implementation.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: d3eecb9bf24fb8b5fc5141f28b006dcc6e89fc60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3eecb9bf24fb8b5fc5141f2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 16 14:49:08 2019 +0100 msvcrt: Don't detect overflow in atol implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46845 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8c1684a50a56bdafe38fa5c685f6b367f8a44bc5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/string.c | 4 ++++ dlls/msvcrt/tests/string.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index fc827d8..6751cf0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1109,7 +1109,11 @@ MSVCRT_long CDECL MSVCRT__atol_l(const char *str, MSVCRT__locale_t locale) */ MSVCRT_long CDECL MSVCRT_atol(const char *str) { +#if _MSVCR_VER == 0 + return MSVCRT_atoi(str); +#else return MSVCRT__atol_l(str, NULL); +#endif } #if _MSVCR_VER>=120 diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a159132..4af55e5 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3047,6 +3047,23 @@ static void test_atoi(void) ok(r == 0, "atoi(4294967296) = %d\n", r); } +static void test_atol(void) +{ + int r; + + r = atol("0"); + ok(r == 0, "atol(0) = %d\n", r); + + r = atol("-1"); + ok(r == -1, "atol(-1) = %d\n", r); + + r = atol("1"); + ok(r == 1, "atol(1) = %d\n", r); + + r = atol("4294967296"); + ok(r == 0, "atol(4294967296) = %d\n", r); +} + static void test_atof(void) { double d; @@ -3802,6 +3819,7 @@ START_TEST(string) test__stricmp(); test__wcstoi64(); test_atoi(); + test_atol(); test_atof(); test_strncpy(); test_strxfrm();

1 0

Piotr Caban : msvcrt: Use correct locale when comparing strings in getenv.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: ff1ce89f624c2082a4bb8975efb7ba49bddf740a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff1ce89f624c2082a4bb8975… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 17 20:19:50 2019 +0100 msvcrt: Use correct locale when comparing strings in getenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b633777ed4d02821029a3b83fdb89fb6fbb66933) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/environ.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index f48eabf..cce62bc 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -38,7 +38,7 @@ char * CDECL MSVCRT_getenv(const char *name) { char *str = *environ; char *pos = strchr(str,'='); - if (pos && ((pos - str) == length) && !strncasecmp(str,name,length)) + if (pos && ((pos - str) == length) && !MSVCRT__strnicmp(str,name,length)) { TRACE("(%s): got %s\n", debugstr_a(name), debugstr_a(pos + 1)); return pos + 1; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 8654218..2fb26b9 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1143,6 +1143,7 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg); int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); +int __cdecl MSVCRT__strnicmp(const char*, const char*, MSVCRT_size_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); unsigned int __cdecl MSVCRT__get_output_format(void);

1 0