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

[PATCH] testbot: Sanitize the environment for system() & co.
by Francois Gouget 26 Aug '19

26 Aug '19

system() may start a shell so make sure its behavior will not be modified in unexpected ways by the environment ($CDPATH, $IFS) or an external file ($ENV, $BASH_ENV). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The $ENV{ENV} mystery is finally solved. testbot/lib/WineTestBot/Config.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 44692295..d6267dee 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -69,6 +69,9 @@ $LogDir = "$::RootDir/var"; $DataDir = "$::RootDir/var"; $BinDir = "$::RootDir/bin"; +# Sanitize the environment for system() & co +delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; # from perlsec + # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1; $MaxRevertsWhileRunningVMs = 0; -- 2.20.1

1 0

[PATCH 3/3] user32/tests: Test WM_NEXTDLGCTL with newer button styles.
by Zhiyi Zhang 26 Aug '19

26 Aug '19

Test WM_NEXTDLGCTL with Split Buttons and Command Links with and without common control version 6. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/dialog.c | 102 ++++++++++++++++++++++++++++- dlls/user32/tests/v6util.h | 131 +++++++++++++++++++++++++++++++++++++ 2 files changed, 231 insertions(+), 2 deletions(-) create mode 100644 dlls/user32/tests/v6util.h diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index b72f08816d..20536242e1 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -40,6 +40,8 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "commctrl.h" +#include "v6util.h" #define MAXHWNDS 1024 static HWND hwnd [MAXHWNDS]; @@ -48,7 +50,7 @@ static unsigned int numwnds=1; /* 0 is reserved for null */ /* Global handles */ static HINSTANCE g_hinst; /* This application's HINSTANCE */ static HWND g_hwndMain, g_hwndButton1, g_hwndButton2, g_hwndButtonCancel; -static HWND g_hwndTestDlg, g_hwndTestDlgBut1, g_hwndTestDlgBut2, g_hwndTestDlgEdit; +static HWND g_hwndTestDlg, g_hwndTestDlgBut1, g_hwndTestDlgBut2, g_hwndTestDlgBut3, g_hwndTestDlgBut4, g_hwndTestDlgEdit; static HWND g_hwndInitialFocusT1, g_hwndInitialFocusT2, g_hwndInitialFocusGroupBox; static LONG g_styleInitialFocusT1, g_styleInitialFocusT2; @@ -457,6 +459,16 @@ static BOOL OnTestDlgCreate (HWND hwnd, LPCREATESTRUCTA lpcs) 90,102,80,24, hwnd, (HMENU)IDCANCEL, g_hinst, 0); if (!g_hwndTestDlgBut2) return FALSE; + g_hwndTestDlgBut3 = CreateWindowExA(WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | WS_EX_NOPARENTNOTIFY, + "button", "Button &3", WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | BS_SPLITBUTTON, + 300, 150, 40, 40, hwnd, (HMENU)301, g_hinst, 0); + if (!g_hwndTestDlgBut3) return FALSE; + + g_hwndTestDlgBut4 = CreateWindowExA(WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | WS_EX_NOPARENTNOTIFY, + "button", "Button &4", WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | BS_COMMANDLINK, + 300, 200, 40, 40, hwnd, (HMENU)401, g_hinst, 0); + if (!g_hwndTestDlgBut4) return FALSE; + return TRUE; } @@ -607,6 +619,8 @@ static void test_WM_NEXTDLGCTL(void) HWND child1, child2, child3; MSG msg; DWORD dwVal; + ULONG_PTR ctx_cookie; + HANDLE hCtx; g_hwndTestDlg = CreateWindowExA( WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT | WS_EX_APPWINDOW, @@ -614,12 +628,14 @@ static void test_WM_NEXTDLGCTL(void) "WM_NEXTDLGCTL Message test window", WS_POPUPWINDOW | WS_CLIPSIBLINGS | WS_DLGFRAME | WS_OVERLAPPED | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | DS_3DLOOK | DS_SETFONT | DS_MODALFRAME, - 0, 0, 235, 135, + 0, 0, 400, 300, NULL, NULL, g_hinst, 0); assert (g_hwndTestDlg); assert (g_hwndTestDlgBut1); assert (g_hwndTestDlgBut2); + assert (g_hwndTestDlgBut3); + assert (g_hwndTestDlgBut4); assert (g_hwndTestDlgEdit); /* @@ -656,6 +672,8 @@ static void test_WM_NEXTDLGCTL(void) */ ok(get_button_style(g_hwndTestDlgBut1) == BS_DEFPUSHBUTTON, "Button1's style not set to BS_DEFPUSHBUTTON"); ok(get_button_style(g_hwndTestDlgBut2) == BS_PUSHBUTTON, "Button2's style not set to BS_PUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut3) == BS_SPLITBUTTON, "Button3's style not set to BS_SPLITBUTTON\n"); + ok(get_button_style(g_hwndTestDlgBut4) == BS_COMMANDLINK, "Button4's style not set to BS_COMMANDLINK\n"); /* Move focus to Button2 using "WM_NEXTDLGCTL" */ DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0); @@ -671,6 +689,28 @@ static void test_WM_NEXTDLGCTL(void) */ ok(get_button_style(g_hwndTestDlgBut1) == BS_PUSHBUTTON, "Button1's style not set to BS_PUSHBUTTON"); ok(get_button_style(g_hwndTestDlgBut2) == BS_DEFPUSHBUTTON, "Button2's style not set to BS_DEFPUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut3) == BS_SPLITBUTTON, "Button3's style not set to BS_SPLITBUTTON\n"); + ok(get_button_style(g_hwndTestDlgBut4) == BS_COMMANDLINK, "Button4's style not set to BS_COMMANDLINK\n"); + + /* Move focus to Button3 using "WM_NEXTDLGCTL" */ + DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0); + ok((GetFocus() == g_hwndTestDlgBut3), "Focus didn't move to the third button\n"); + dwVal = DefDlgProcA(g_hwndTestDlg, DM_GETDEFID, 0, 0); + ok(IDCANCEL == (LOWORD(dwVal)), "WM_NEXTDLGCTL changed default button\n"); + ok(get_button_style(g_hwndTestDlgBut1) == BS_PUSHBUTTON, "Button1's style not set to BS_PUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut2) == BS_DEFPUSHBUTTON, "Button2's style not set to BS_DEFPUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut3) == BS_SPLITBUTTON, "Button3's style not set to BS_SPLITBUTTON\n"); + ok(get_button_style(g_hwndTestDlgBut4) == BS_COMMANDLINK, "Button4's style not set to BS_COMMANDLINK\n"); + + /* Move focus to Button4 using "WM_NEXTDLGCTL" */ + DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0); + ok((GetFocus() == g_hwndTestDlgBut4), "Focus didn't move to the fourth button\n"); + dwVal = DefDlgProcA(g_hwndTestDlg, DM_GETDEFID, 0, 0); + ok(IDCANCEL == (LOWORD(dwVal)), "WM_NEXTDLGCTL changed default button\n"); + ok(get_button_style(g_hwndTestDlgBut1) == BS_PUSHBUTTON, "Button1's style not set to BS_PUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut2) == BS_DEFPUSHBUTTON, "Button2's style not set to BS_DEFPUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut3) == BS_SPLITBUTTON, "Button3's style not set to BS_SPLITBUTTON\n"); + ok(get_button_style(g_hwndTestDlgBut4) == BS_COMMANDLINK, "Button4's style not set to BS_COMMANDLINK\n"); /* Move focus to Edit control using "WM_NEXTDLGCTL" */ DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0); @@ -712,6 +752,64 @@ static void test_WM_NEXTDLGCTL(void) DestroyWindow(child2); DestroyWindow(child1); DestroyWindow(g_hwndTestDlg); + + /* WM_NEXTDLGCTL with v6 common controls */ + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + g_hwndTestDlg = CreateWindowExA( WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR + | WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT | WS_EX_APPWINDOW, + "WM_NEXTDLGCTLWndClass", "WM_NEXTDLGCTL Message test window", + WS_POPUPWINDOW | WS_CLIPSIBLINGS | WS_DLGFRAME | WS_OVERLAPPED | + WS_MINIMIZEBOX | WS_MAXIMIZEBOX | DS_3DLOOK | DS_SETFONT | DS_MODALFRAME, + 0, 0, 400, 300, NULL, NULL, g_hinst, 0); + + assert(g_hwndTestDlg); + assert(g_hwndTestDlgBut1); + assert(g_hwndTestDlgBut2); + assert(g_hwndTestDlgBut3); + assert(g_hwndTestDlgBut4); + + /* Set the focus first on edit control */ + SetFocus(g_hwndTestDlgEdit); + ok((GetFocus() == g_hwndTestDlgEdit), "Focus didn't set on Edit control\n"); + + DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0); + ok((GetFocus() == g_hwndTestDlgBut1), "Focus didn't move to first button\n"); + ok(get_button_style(g_hwndTestDlgBut1) == BS_DEFPUSHBUTTON, "Button1's style not set to BS_DEFPUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut2) == BS_PUSHBUTTON, "Button2's style not set to BS_PUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut3) == BS_SPLITBUTTON, "Button3's style not set to BS_SPLITBUTTON\n"); + ok(get_button_style(g_hwndTestDlgBut4) == BS_COMMANDLINK, "Button4's style not set to BS_COMMANDLINK\n"); + + DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0); + ok((GetFocus() == g_hwndTestDlgBut2), "Focus didn't move to second button\n"); + ok(get_button_style(g_hwndTestDlgBut1) == BS_PUSHBUTTON, "Button1's style not set to BS_PUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut2) == BS_DEFPUSHBUTTON, "Button2's style not set to BS_DEFPUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut3) == BS_SPLITBUTTON, "Button3's style not set to BS_SPLITBUTTON\n"); + ok(get_button_style(g_hwndTestDlgBut4) == BS_COMMANDLINK, "Button4's style not set to BS_COMMANDLINK\n"); + + DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0); + ok((GetFocus() == g_hwndTestDlgBut3), "Focus didn't move to the third button\n"); + ok(get_button_style(g_hwndTestDlgBut1) == BS_PUSHBUTTON, "Button1's style not set to BS_PUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut2) == BS_PUSHBUTTON, "Button2's style not set to BS_PUSHBUTTON"); + /* XP/2003 doesn't support common control v6 */ + todo_wine ok(get_button_style(g_hwndTestDlgBut3) == BS_DEFSPLITBUTTON + || broken(get_button_style(g_hwndTestDlgBut3) == BS_SPLITBUTTON), + "Button3's style not set to BS_DEFSPLITBUTTON\n"); + ok(get_button_style(g_hwndTestDlgBut4) == BS_COMMANDLINK, "Button4's style not set to BS_COMMANDLINK\n"); + + DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0); + ok((GetFocus() == g_hwndTestDlgBut4), "Focus didn't move to the third button\n"); + ok(get_button_style(g_hwndTestDlgBut1) == BS_PUSHBUTTON, "Button1's style not set to BS_PUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut2) == BS_PUSHBUTTON, "Button2's style not set to BS_PUSHBUTTON"); + todo_wine ok(get_button_style(g_hwndTestDlgBut3) == BS_SPLITBUTTON, "Button3's style not set to BS_SPLITBUTTON\n"); + /* XP/2003 doesn't support common control v6 */ + todo_wine ok(get_button_style(g_hwndTestDlgBut4) == BS_DEFCOMMANDLINK + || broken(get_button_style(g_hwndTestDlgBut4) == BS_COMMANDLINK), + "Button4's style not set to BS_DEFCOMMANDLINK\n"); + + DestroyWindow(g_hwndTestDlg); + unload_v6_module(ctx_cookie, hCtx); } static LRESULT CALLBACK hook_proc(INT code, WPARAM wParam, LPARAM lParam) diff --git a/dlls/user32/tests/v6util.h b/dlls/user32/tests/v6util.h new file mode 100644 index 0000000000..626f6e6125 --- /dev/null +++ b/dlls/user32/tests/v6util.h @@ -0,0 +1,131 @@ +/* + * Utility routines for comctl32 v6 tests + * + * Copyright 2006 Mike McCormack for CodeWeavers + * Copyright 2007 George Gov + * Copyright 2009 Owen Rudge for CodeWeavers + * + * 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 + */ + +#ifdef __i386__ +#define ARCH "x86" +#elif defined __x86_64__ +#define ARCH "amd64" +#elif defined __arm__ +#define ARCH "arm" +#elif defined __aarch64__ +#define ARCH "arm64" +#else +#define ARCH "none" +#endif + +static const CHAR manifest_name[] = "cc6.manifest"; + +static const CHAR manifest[] = + "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" + "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">\n" + " <assemblyIdentity\n" + " type=\"win32\"\n" + " name=\"Wine.ComCtl32.Tests\"\n" + " version=\"1.0.0.0\"\n" + " processorArchitecture=\"" ARCH "\"\n" + " />\n" + "<description>Wine comctl32 test suite</description>\n" + "<dependency>\n" + " <dependentAssembly>\n" + " <assemblyIdentity\n" + " type=\"win32\"\n" + " name=\"microsoft.windows.common-controls\"\n" + " version=\"6.0.0.0\"\n" + " processorArchitecture=\"" ARCH "\"\n" + " publicKeyToken=\"6595b64144ccf1df\"\n" + " language=\"*\"\n" + " />\n" + "</dependentAssembly>\n" + "</dependency>\n" + "</assembly>\n"; + +static void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx) +{ + DeactivateActCtx(0, cookie); + ReleaseActCtx(hCtx); + + DeleteFileA(manifest_name); +} + +static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) +{ + ACTCTX_SECTION_KEYED_DATA data; + DWORD written; + HMODULE hmod; + ACTCTXA ctx; + HANDLE file; + BOOL ret; + + /* create manifest */ + file = CreateFileA( manifest_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); + if (file != INVALID_HANDLE_VALUE) + { + ret = (WriteFile( file, manifest, sizeof(manifest)-1, &written, NULL ) && + written == sizeof(manifest)-1); + CloseHandle( file ); + if (!ret) + { + DeleteFileA( manifest_name ); + skip("Failed to fill manifest file. Skipping comctl32 V6 tests.\n"); + return FALSE; + } + else + trace("created %s\n", manifest_name); + } + else + { + skip("Failed to create manifest file. Skipping comctl32 V6 tests.\n"); + return FALSE; + } + + memset(&ctx, 0, sizeof(ctx)); + ctx.cbSize = sizeof(ctx); + ctx.lpSource = manifest_name; + + *hCtx = CreateActCtxA(&ctx); + ok(*hCtx != 0, "Expected context handle\n"); + + hmod = GetModuleHandleA("comctl32.dll"); + + ret = ActivateActCtx(*hCtx, pcookie); + ok(ret, "Failed to activate context, error %d.\n", GetLastError()); + + if (!ret) + { + win_skip("A problem during context activation occurred.\n"); + DeleteFileA(manifest_name); + } + + data.cbSize = sizeof(data); + ret = FindActCtxSectionStringA(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, + "comctl32.dll", &data); + ok(ret, "failed to find comctl32.dll in active context, %u\n", GetLastError()); + if (ret) + { + FreeLibrary(hmod); + LoadLibraryA("comctl32.dll"); + } + + return ret; +} + +#undef ARCH -- 2.23.0.rc1

2 1

[PATCH v4] odbccp32: Implement SQLConfigDataSource/W
by Alistair Leslie-Hughes 26 Aug '19

26 Aug '19

Added test to show that ConfigDSNW is called from the ASCII version. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 121 +++++++++++++++++++++++++++++-------- dlls/odbccp32/tests/misc.c | 15 +++++ 2 files changed, 112 insertions(+), 24 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 283ed41a591..47dd8c14bdd 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -68,6 +68,9 @@ static const WCHAR odbc_error_load_lib_failed[] = {'L','o','a','d',' ','L','i',' static const WCHAR odbc_error_request_failed[] = {'R','e','q','u','e','s','t',' ','F','a','i','l','e','d',0}; static const WCHAR odbc_error_invalid_keyword[] = {'I','n','v','a','l','i','d',' ','k','e','y','w','o','r','d',' ','v','a','l','u','e',0}; +static BOOL (WINAPI *pConfigDSN)(HWND hwnd, WORD request, const char *driver, const char *attr); +static BOOL (WINAPI *pConfigDSNW)(HWND hwnd, WORD request, const WCHAR *driver, const WCHAR *attr); + /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) { @@ -219,30 +222,6 @@ static BOOL SQLInstall_narrow(int mode, LPSTR buffer, LPCWSTR str, WORD str_leng return success; } -BOOL WINAPI SQLConfigDataSourceW(HWND hwndParent, WORD fRequest, - LPCWSTR lpszDriver, LPCWSTR lpszAttributes) -{ - LPCWSTR p; - - clear_errors(); - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_w(lpszDriver), - debugstr_w(lpszAttributes)); - - for (p = lpszAttributes; *p; p += lstrlenW(p) + 1) - FIXME("%s\n", debugstr_w(p)); - - return TRUE; -} - -BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, - LPCSTR lpszDriver, LPCSTR lpszAttributes) -{ - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_a(lpszDriver), - debugstr_a(lpszAttributes)); - clear_errors(); - return TRUE; -} - static HMODULE load_config_driver(const WCHAR *driver) { static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; @@ -359,6 +338,100 @@ fail: return FALSE; } +BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR attributes) +{ + HMODULE mod; + BOOL ret = FALSE; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); + if (TRACE_ON(odbc)) + { + const WCHAR *p; + for (p = attributes; *p; p += lstrlenW(p) + 1) + TRACE("%s\n", debugstr_w(p)); + } + + clear_errors(); + + mod = load_config_driver(driver); + if (!mod) + return FALSE; + + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + if(pConfigDSNW) + ret = pConfigDSNW(hwnd, request, driver, attributes); + else + ERR("Failed to find ConfigDSNW\n"); + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + FreeLibrary(mod); + + return ret; +} + +BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR attributes) +{ + HMODULE mod; + BOOL ret = FALSE; + WCHAR *driverW; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); + + if (TRACE_ON(odbc)) + { + const char *p; + for (p = attributes; *p; p += lstrlenA(p) + 1) + TRACE("%s\n", debugstr_a(p)); + } + + clear_errors(); + + driverW = heap_strdupAtoW(driver); + if (!driverW) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + return FALSE; + } + + mod = load_config_driver(driverW); + if (!mod) + { + heap_free(driverW); + return FALSE; + } + + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); + if (pConfigDSN) + { + TRACE("Calling ConfigDSN\n"); + ret = pConfigDSN(hwnd, request, driver, attributes); + } + else + { + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + if (pConfigDSNW) + { + WCHAR *attr = NULL; + TRACE("Calling ConfigDSNW\n"); + + attr = SQLInstall_strdup_multi(attributes); + if(attr) + ret = pConfigDSNW(hwnd, request, driverW, attr); + heap_free(attr); + } + } + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + heap_free(driverW); + FreeLibrary(mod); + + return ret; +} + BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) { diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index dc65bdf3f9a..140a6488c2d 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -741,6 +741,20 @@ static void test_SQLValidDSNW(void) ok(ret, "got %d\n", ret); } +static void test_SQLConfigDataSource(void) +{ + BOOL ret; + + /* SQL Server driver exports function ConfigDSNW and the MDAC28 installer uses the + * SQLConfigDataSource to register this DSN. + */ + ret = SQLConfigDataSource(0, ODBC_ADD_DSN, "SQL Server", "DSN=WINEMQIS\0Database=MQIS\0\0"); + todo_wine ok(ret == TRUE, "got %d\n", ret); + + ret = SQLConfigDataSource(0, ODBC_REMOVE_DSN, "SQL Server", "DSN=WINEMQIS\0\0"); + todo_wine ok(ret == TRUE, "got %d\n", ret); +} + START_TEST(misc) { test_SQLConfigMode(); @@ -754,4 +768,5 @@ START_TEST(misc) test_SQLGetInstalledDrivers(); test_SQLValidDSN(); test_SQLValidDSNW(); + test_SQLConfigDataSource(); } -- 2.23.0.rc1

2 1

[PATCH] oleaut32: Reduce noise in SAFEARRAY traces.
by Nikolay Sivov 26 Aug '19

26 Aug '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/safearray.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 2c6c11d802..0b769358f6 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -523,8 +523,8 @@ HRESULT WINAPI SafeArrayAllocDescriptorEx(VARTYPE vt, UINT cDims, SAFEARRAY **pp ULONG cbElements; HRESULT hRet; - TRACE("(%d->%s,%d,%p)\n", vt, debugstr_vt(vt), cDims, ppsaOut); - + TRACE("(%s,%u,%p)\n", debugstr_vt(vt), cDims, ppsaOut); + cbElements = SAFEARRAY_GetVTSize(vt); if (!cbElements) WARN("Creating a descriptor with an invalid VARTYPE!\n"); @@ -599,7 +599,7 @@ HRESULT WINAPI SafeArrayAllocData(SAFEARRAY *psa) */ SAFEARRAY* WINAPI SafeArrayCreate(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsabound) { - TRACE("(%d->%s,%d,%p)\n", vt, debugstr_vt(vt), cDims, rgsabound); + TRACE("(%s,%u,%p)\n", debugstr_vt(vt), cDims, rgsabound); if (vt == VT_RECORD) return NULL; @@ -631,7 +631,7 @@ SAFEARRAY* WINAPI SafeArrayCreateEx(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsa IRecordInfo* iRecInfo = pvExtra; SAFEARRAY* psa; - TRACE("(%d->%s,%d,%p,%p)\n", vt, debugstr_vt(vt), cDims, rgsabound, pvExtra); + TRACE("(%s,%u,%p,%p)\n", debugstr_vt(vt), cDims, rgsabound, pvExtra); if (vt == VT_RECORD) { @@ -676,8 +676,8 @@ SAFEARRAY* WINAPI SafeArrayCreateEx(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsa */ SAFEARRAY* WINAPI SafeArrayCreateVector(VARTYPE vt, LONG lLbound, ULONG cElements) { - TRACE("(%d->%s,%d,%d\n", vt, debugstr_vt(vt), lLbound, cElements); - + TRACE("(%s,%d,%u)\n", debugstr_vt(vt), lLbound, cElements); + if (vt == VT_RECORD) return NULL; @@ -708,8 +708,8 @@ SAFEARRAY* WINAPI SafeArrayCreateVectorEx(VARTYPE vt, LONG lLbound, ULONG cEleme IRecordInfo* iRecInfo = pvExtra; SAFEARRAY* psa; - TRACE("(%d->%s,%d,%d,%p\n", vt, debugstr_vt(vt), lLbound, cElements, pvExtra); - + TRACE("(%s,%d,%u,%p)\n", debugstr_vt(vt), lLbound, cElements, pvExtra); + if (vt == VT_RECORD) { if (!iRecInfo) -- 2.23.0.rc1

1 0

[PATCH 7/8] ntdll: Remove no loner needed func argument from setup_raise_exception.
by Jacek Caban 26 Aug '19

26 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)

2 1

[PATCH 3/8] ntdll: Factor out setup_raise_exception.
by Jacek Caban 26 Aug '19

26 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 81 ++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 34 deletions(-)

2 1

[PATCH 6/8] ntdll: Call virtual_handle_fault from signal handler on x86_64.
by Jacek Caban 26 Aug '19

26 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-)

1 0

[PATCH 5/8] ntdll: Handle interrupt exceptions in signal handler on x86_64.
by Jacek Caban 26 Aug '19

26 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)

1 0

[PATCH 4/8] ntdll: Handle single step exception in setup_raise_exception on x86_64.
by Jacek Caban 26 Aug '19

26 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 50 +++++++++++++++----------------------- 1 file changed, 19 insertions(+), 31 deletions(-)

1 0

[PATCH 2/8] ntdll: Move setup_exception implementation.
by Jacek Caban 26 Aug '19

26 Aug '19

To simplify next patches. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 224 ++++++++++++++++++------------------- 1 file changed, 112 insertions(+), 112 deletions(-)

1 0