May 2018 - Wine-Commits - list.winehq.org

Zebediah Figura : odbccp32/tests: Add tests for SQLGetInstalledDrivers().
by Alexandre Julliard May 22, 2018

May 22, 2018

Module: wine Branch: master Commit: 3478a81a4cd2bfae173332aff71f679fc4fa2b6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3478a81a4cd2bfae173332af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 22:00:56 2018 -0500 odbccp32/tests: Add tests for SQLGetInstalledDrivers(). 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> --- dlls/odbccp32/tests/misc.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 4a72ad0..c12ff49 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -27,6 +27,15 @@ static const WCHAR abcd_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I','\\','w','i','n','e','o','d','b','c',0}; static const WCHAR abcdini_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I',0 }; +static void check_error_(int line, DWORD expect) +{ + RETCODE ret; + DWORD err; + ret = SQLInstallerError(1, &err, NULL, 0, NULL); + ok_(__FILE__, line)(ret == SQL_SUCCESS_WITH_INFO, "got %d\n", ret); + ok_(__FILE__, line)(err == expect, "expected %u, got %u\n", expect, ret); +} +#define check_error(a) check_error_(__LINE__, a) static void test_SQLConfigMode(void) { @@ -605,6 +614,63 @@ static void test_SQLInstallTranslatorEx(void) } +static void test_SQLGetInstalledDrivers(void) +{ + char buffer[1000], *p; + WORD written, len; + int found = 0; + BOOL ret; + + SQLInstallDriverEx("Wine test\0Driver=test.dll\0\0", NULL, buffer, + sizeof(buffer), &written, ODBC_INSTALL_COMPLETE, NULL); + + ret = SQLGetInstalledDrivers(NULL, sizeof(buffer), &written); + ok(!ret, "got %d\n", ret); + check_error(ODBC_ERROR_INVALID_BUFF_LEN); + + ret = SQLGetInstalledDrivers(buffer, 0, &written); + ok(!ret, "got %d\n", ret); + check_error(ODBC_ERROR_INVALID_BUFF_LEN); + + ret = SQLGetInstalledDrivers(buffer, 10, &written); + ok(ret, "got %d\n", ret); + ok(strlen(buffer) == 8, "got len %u\n", lstrlenA(buffer)); + ok(written == 10, "got written %d\n", written); + ok(!buffer[9], "buffer not doubly null-terminated\n"); + + ret = SQLGetInstalledDrivers(buffer, sizeof(buffer), &written); + ok(ret, "got %d\n", ret); + ok(!buffer[written-1] && !buffer[written-2], "buffer not doubly null-terminated\n"); + len = strlen(buffer); + + for (p = buffer; *p; p += strlen(p) + 1) + { + if (!strcmp(p, "Wine test")) + found = 1; + } + ok(found, "installed driver not found\n"); + + ret = SQLGetInstalledDrivers(buffer, len, &written); + ok(ret, "got %d\n", ret); + ok(strlen(buffer) == len-2, "expected len %d, got %u\n", len-2, lstrlenA(buffer)); + ok(written == len, "expected written %d, got %d\n", len, written); + ok(!buffer[len-1], "buffer not doubly null-terminated\n"); + + ret = SQLGetInstalledDrivers(buffer, len+1, &written); + ok(ret, "got %d\n", ret); + ok(strlen(buffer) == len-1, "expected len %d, got %u\n", len-1, lstrlenA(buffer)); + ok(written == len+1, "expected written %d, got %d\n", len+1, written); + ok(!buffer[len], "buffer not doubly null-terminated\n"); + + ret = SQLGetInstalledDrivers(buffer, len+2, &written); + ok(ret, "got %d\n", ret); + ok(strlen(buffer) == len, "expected len %d, got %u\n", len, lstrlenA(buffer)); + ok(written == len+2, "expected written %d, got %d\n", len+2, written); + ok(!buffer[len+1], "buffer not doubly null-terminated\n"); + + SQLRemoveDriver("Wine test", TRUE, NULL); +} + START_TEST(misc) { test_SQLConfigMode(); @@ -615,4 +681,5 @@ START_TEST(misc) test_SQLGetPrivateProfileStringW(); test_SQLInstallDriverEx(); test_SQLInstallTranslatorEx(); + test_SQLGetInstalledDrivers(); }

1 0

Matej Špindler : kernel32: Check for LOCALE_NOUSEROVERRIDE for neutral locales.
by Alexandre Julliard May 22, 2018

May 22, 2018

Module: wine Branch: master Commit: da5112c74313b5236183135204cab38a8b0169ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=da5112c74313b52361831352… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Tue May 22 17:15:01 2018 +0200 kernel32: Check for LOCALE_NOUSEROVERRIDE for neutral locales. Signed-off-by: Matej Špindler <spindler.matej(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/tests/locale.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 5a6ff35..d21a763 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1812,7 +1812,7 @@ INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len) /* special handling for neutral locale names */ if (locale && strlenW(locale) == 2) { - switch (info) + switch (info & ~LOCALE_LOCALEINFOFLAGSMASK) { case LOCALE_SNAME: if (len && len < 3) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 91a8703..791f015 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4499,6 +4499,10 @@ static void test_GetLocaleInfoEx(void) ok(ret == 1, "got %d\n", ret); ok(!bufferW[0], "got %s\n", wine_dbgstr_w(bufferW)); + ret = pGetLocaleInfoEx(enW, LOCALE_SPARENT | LOCALE_NOUSEROVERRIDE, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + ok(ret == 1, "got %d\n", ret); + ok(!bufferW[0], "got %s\n", wine_dbgstr_w(bufferW)); + ret = pGetLocaleInfoEx(enW, LOCALE_SCOUNTRY, bufferW, sizeof(bufferW)/sizeof(WCHAR)); ok(ret == lstrlenW(bufferW)+1, "got %d\n", ret); if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) ||

1 0

Zebediah Figura : vbscript: Add stub IActiveScriptDebug interface.
by Alexandre Julliard May 22, 2018

May 22, 2018

Module: wine Branch: master Commit: 3dde8287c69d4274b5b22bc1859d84a4a02b3613 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dde8287c69d4274b5b22bc1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 21 20:32:40 2018 -0500 vbscript: Add stub IActiveScriptDebug interface. Visual Pinball 9.9.5 expects this interface to be present, and crashes on teardown trying to Release() it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 2 files changed, 66 insertions(+) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index b97cf5a..06a855b 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -29,12 +29,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); #ifdef _WIN64 #define CTXARG_T DWORDLONG +#define IActiveScriptDebugVtbl IActiveScriptDebug64Vtbl #define IActiveScriptParseVtbl IActiveScriptParse64Vtbl #define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_64Vtbl #else #define CTXARG_T DWORD +#define IActiveScriptDebugVtbl IActiveScriptDebug32Vtbl #define IActiveScriptParseVtbl IActiveScriptParse32Vtbl #define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_32Vtbl @@ -42,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); struct VBScript { IActiveScript IActiveScript_iface; + IActiveScriptDebug IActiveScriptDebug_iface; IActiveScriptParse IActiveScriptParse_iface; IActiveScriptParseProcedure2 IActiveScriptParseProcedure2_iface; IObjectSafety IObjectSafety_iface; @@ -267,6 +270,9 @@ static HRESULT WINAPI VBScript_QueryInterface(IActiveScript *iface, REFIID riid, }else if(IsEqualGUID(riid, &IID_IActiveScript)) { TRACE("(%p)->(IID_IActiveScript %p)\n", This, ppv); *ppv = &This->IActiveScript_iface; + }else if(IsEqualGUID(riid, &IID_IActiveScriptDebug)) { + TRACE("(%p)->(IID_IActiveScriptDebug %p)\n", This, ppv); + *ppv = &This->IActiveScriptDebug_iface; }else if(IsEqualGUID(riid, &IID_IActiveScriptParse)) { TRACE("(%p)->(IID_IActiveScriptParse %p)\n", This, ppv); *ppv = &This->IActiveScriptParse_iface; @@ -564,6 +570,64 @@ static const IActiveScriptVtbl VBScriptVtbl = { VBScript_Clone }; +static inline VBScript *impl_from_IActiveScriptDebug(IActiveScriptDebug *iface) +{ + return CONTAINING_RECORD(iface, VBScript, IActiveScriptDebug_iface); +} + +static HRESULT WINAPI VBScriptDebug_QueryInterface(IActiveScriptDebug *iface, REFIID riid, void **ppv) +{ + VBScript *This = impl_from_IActiveScriptDebug(iface); + return IActiveScript_QueryInterface(&This->IActiveScript_iface, riid, ppv); +} + +static ULONG WINAPI VBScriptDebug_AddRef(IActiveScriptDebug *iface) +{ + VBScript *This = impl_from_IActiveScriptDebug(iface); + return IActiveScript_AddRef(&This->IActiveScript_iface); +} + +static ULONG WINAPI VBScriptDebug_Release(IActiveScriptDebug *iface) +{ + VBScript *This = impl_from_IActiveScriptDebug(iface); + return IActiveScript_Release(&This->IActiveScript_iface); +} + +static HRESULT WINAPI VBScriptDebug_GetScriptTextAttributes(IActiveScriptDebug *iface, + LPCOLESTR code, ULONG len, LPCOLESTR delimiter, DWORD flags, SOURCE_TEXT_ATTR *attr) +{ + VBScript *This = impl_from_IActiveScriptDebug(iface); + FIXME("(%p)->(%s %u %s %#x %p)\n", This, debugstr_w(code), len, + debugstr_w(delimiter), flags, attr); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScriptDebug_GetScriptletTextAttributes(IActiveScriptDebug *iface, + LPCOLESTR code, ULONG len, LPCOLESTR delimiter, DWORD flags, SOURCE_TEXT_ATTR *attr) +{ + VBScript *This = impl_from_IActiveScriptDebug(iface); + FIXME("(%p)->(%s %u %s %#x %p)\n", This, debugstr_w(code), len, + debugstr_w(delimiter), flags, attr); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScriptDebug_EnumCodeContextsOfPosition(IActiveScriptDebug *iface, + CTXARG_T source, ULONG offset, ULONG len, IEnumDebugCodeContexts **ret) +{ + VBScript *This = impl_from_IActiveScriptDebug(iface); + FIXME("(%p)->(%s %u %u %p)\n", This, wine_dbgstr_longlong(source), offset, len, ret); + return E_NOTIMPL; +} + +static const IActiveScriptDebugVtbl VBScriptDebugVtbl = { + VBScriptDebug_QueryInterface, + VBScriptDebug_AddRef, + VBScriptDebug_Release, + VBScriptDebug_GetScriptTextAttributes, + VBScriptDebug_GetScriptletTextAttributes, + VBScriptDebug_EnumCodeContextsOfPosition, +}; + static inline VBScript *impl_from_IActiveScriptParse(IActiveScriptParse *iface) { return CONTAINING_RECORD(iface, VBScript, IActiveScriptParse_iface); @@ -806,6 +870,7 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU return E_OUTOFMEMORY; ret->IActiveScript_iface.lpVtbl = &VBScriptVtbl; + ret->IActiveScriptDebug_iface.lpVtbl = &VBScriptDebugVtbl; ret->IActiveScriptParse_iface.lpVtbl = &VBScriptParseVtbl; ret->IActiveScriptParseProcedure2_iface.lpVtbl = &VBScriptParseProcedureVtbl; ret->IObjectSafety_iface.lpVtbl = &VBScriptSafetyVtbl; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5877762..98a5cb1 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -25,6 +25,7 @@ #include "ole2.h" #include "dispex.h" #include "activscp.h" +#include "activdbg.h" #include "vbscript_classes.h"

1 0

Zebediah Figura : msi/tests: Test deferral of DuplicateFiles and RemoveDuplicateFiles.
by Alexandre Julliard May 22, 2018

May 22, 2018

Module: wine Branch: master Commit: 4d9d73e1b95ced3c66beaeab0e337c4b9eec52d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d9d73e1b95ced3c66beaeab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 22:00:53 2018 -0500 msi/tests: Test deferral of DuplicateFiles and RemoveDuplicateFiles. 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> --- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 22 ++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 38 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 70baaa3..966158b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1081,13 +1081,26 @@ static const char rd_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" "RemoveDuplicateFiles\t\t1900\n" + "rd_immediate\tREMOVE\t1901\n" + "rd_deferred\tREMOVE\t1902\n" "InstallFiles\t\t2000\n" "DuplicateFiles\t\t2100\n" + "df_immediate\tNOT REMOVE\t2101\n" + "df_deferred\tNOT REMOVE\t2102\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rd_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "df_immediate\t1\tcustom.dll\trd_absent\n" + "df_deferred\t1025\tcustom.dll\trd_present\n" + "rd_immediate\t1\tcustom.dll\trd_present\n" + "rd_deferred\t1025\tcustom.dll\trd_absent\n"; + static const char rrv_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -1996,6 +2009,7 @@ static const msi_table rd_tables[] = ADD_TABLE(rd_file), ADD_TABLE(rd_duplicate_file), ADD_TABLE(rd_install_exec_seq), + ADD_TABLE(rd_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 08e4bbd..aa4f667 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1274,3 +1274,25 @@ UINT WINAPI sss_stopped(MSIHANDLE hinst) CloseServiceHandle(manager); return ERROR_SUCCESS; } + +UINT WINAPI rd_present(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, pf_exists("msitest\\original2.txt"), "file absent\n"); + ok(hinst, pf_exists("msitest\\duplicate.txt"), "file absent\n"); +} + ok(hinst, !pf_exists("msitest\\original3.txt"), "file present\n"); + ok(hinst, !pf_exists("msitest\\duplicate2.txt"), "file present\n"); + return ERROR_SUCCESS; +} + +UINT WINAPI rd_absent(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, !pf_exists("msitest\\original2.txt"), "file present\n"); + ok(hinst, !pf_exists("msitest\\duplicate.txt"), "file present\n"); +} + ok(hinst, !pf_exists("msitest\\original3.txt"), "file present\n"); + ok(hinst, !pf_exists("msitest\\duplicate2.txt"), "file present\n"); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 01b95e9..10e7e9d 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -7,6 +7,8 @@ @ stdcall cf_absent(long) @ stdcall crs_present(long) @ stdcall crs_absent(long) +@ stdcall rd_present(long) +@ stdcall rd_absent(long) @ stdcall sds_present(long) @ stdcall sds_absent(long) @ stdcall sis_present(long)

1 0

Zebediah Figura : msi/tests: Test deferral of InstallFiles and RemoveFiles.
by Alexandre Julliard May 22, 2018

May 22, 2018

Module: wine Branch: master Commit: 99562a56170f51002c817cd353fa62325c056ab3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99562a56170f51002c817cd3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 22:00:54 2018 -0500 msi/tests: Test deferral of InstallFiles and RemoveFiles. 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> --- dlls/msi/tests/action.c | 8 ++++++++ dlls/msi/tests/custom.c | 18 ++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 28 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 966158b..d2fad6c 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -643,6 +643,8 @@ static const char cf_install_exec_seq_dat[] = "CostInitialize\t\t800\n" "FileCost\t\t900\n" "RemoveFiles\t\t3500\n" + "rfi_immediate\tREMOVE\t3501\n" + "rfi_deferred\tREMOVE\t3502\n" "CreateFolders\t\t3700\n" "cf_immediate\tNOT REMOVE\t3701\n" "cf_deferred\tNOT REMOVE\t3702\n" @@ -650,6 +652,8 @@ static const char cf_install_exec_seq_dat[] = "rf_immediate\tREMOVE\t3801\n" "rf_deferred\tREMOVE\t3802\n" "InstallFiles\t\t4000\n" + "ifi_immediate\tNOT REMOVE\t4001\n" + "ifi_deferred\tNOT REMOVE\t4002\n" "RegisterUser\t\t6000\n" "RegisterProduct\t\t6100\n" "PublishFeatures\t\t6300\n" @@ -665,6 +669,10 @@ static const char cf_custom_action_dat[] = "Action\tType\tSource\tTarget\n" "s72\ti2\tS64\tS0\n" "CustomAction\tAction\n" + "ifi_immediate\t1\tcustom.dll\tfile_absent\n" + "ifi_deferred\t1025\tcustom.dll\tfile_present\n" + "rfi_immediate\t1\tcustom.dll\tfile_present\n" + "rfi_deferred\t1025\tcustom.dll\tfile_absent\n" "cf_immediate\t1\tcustom.dll\tcf_absent\n" "cf_deferred\t1025\tcustom.dll\tcf_present\n" "rf_immediate\t1\tcustom.dll\tcf_present\n" diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index aa4f667..4e3e2dc 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1180,6 +1180,24 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { return ERROR_SUCCESS; } +UINT WINAPI file_present(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, pf_exists("msitest\\first\\one.txt"), "file absent\n"); + ok(hinst, pf_exists("msitest\\second\\two.txt"), "file absent\n"); +} + return ERROR_SUCCESS; +} + +UINT WINAPI file_absent(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, !pf_exists("msitest\\first\\one.txt"), "file present\n"); + ok(hinst, !pf_exists("msitest\\second\\two.txt"), "file present\n"); +} + return ERROR_SUCCESS; +} + UINT WINAPI crs_present(MSIHANDLE hinst) { todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 10e7e9d..1b15ca9 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -7,6 +7,8 @@ @ stdcall cf_absent(long) @ stdcall crs_present(long) @ stdcall crs_absent(long) +@ stdcall file_present(long) +@ stdcall file_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

1 0

Nikolay Sivov : dwrite/tests: Use ARRAY_SIZE() macro in tests.
by Alexandre Julliard May 22, 2018

May 22, 2018

Module: wine Branch: master Commit: 63bdcf97a7332b2f413a8b2c06d3d22dbbd7f922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63bdcf97a7332b2f413a8b2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 22 11:50:42 2018 +0300 dwrite/tests: Use ARRAY_SIZE() macro in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 20 ++++++----- dlls/dwrite/tests/font.c | 60 ++++++++++++++++--------------- dlls/dwrite/tests/layout.c | 86 ++++++++++++++++++++++---------------------- 3 files changed, 86 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63bdcf97a7332b2f413a…

1 0

Alexandre Julliard : user32: Don' t send cross-process message for GetWindowTextLength().
by Alexandre Julliard May 22, 2018

May 22, 2018

Module: wine Branch: master Commit: 51e8d579bb643859385edcf53b263eeeb13dd9ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=51e8d579bb643859385edcf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 22 13:00:34 2018 +0200 user32: Don't send cross-process message for GetWindowTextLength(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 28 +++++++++++++++++++++------- include/wine/server_protocol.h | 4 +++- server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 3 ++- server/window.c | 5 ++--- 6 files changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 850f0ba..7c12825 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -461,18 +461,23 @@ static void update_window_state( HWND hwnd ) * * Retrieve the window text from the server. */ -static void get_server_window_text( HWND hwnd, LPWSTR text, INT count ) +static data_size_t get_server_window_text( HWND hwnd, WCHAR *text, data_size_t count ) { - size_t len = 0; + data_size_t len = 0, needed = 0; SERVER_START_REQ( get_window_text ) { req->handle = wine_server_user_handle( hwnd ); - wine_server_set_reply( req, text, (count - 1) * sizeof(WCHAR) ); - if (!wine_server_call_err( req )) len = wine_server_reply_size(reply); + if (count) wine_server_set_reply( req, text, (count - 1) * sizeof(WCHAR) ); + if (!wine_server_call_err( req )) + { + needed = reply->length; + len = wine_server_reply_size(reply); + } } SERVER_END_REQ; - text[len / sizeof(WCHAR)] = 0; + if (text) text[len / sizeof(WCHAR)] = 0; + return needed; } @@ -2875,7 +2880,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetWindowTextW( HWND hwnd, LPCWSTR lpString ) */ INT WINAPI GetWindowTextLengthA( HWND hwnd ) { - return SendMessageA( hwnd, WM_GETTEXTLENGTH, 0, 0 ); + CPINFO info; + + if (WIN_IsCurrentProcess( hwnd )) return SendMessageA( hwnd, WM_GETTEXTLENGTH, 0, 0 ); + + /* when window belongs to other process, don't send a message */ + GetCPInfo( CP_ACP, &info ); + return get_server_window_text( hwnd, NULL, 0 ) * info.MaxCharSize; } /******************************************************************* @@ -2883,7 +2894,10 @@ INT WINAPI GetWindowTextLengthA( HWND hwnd ) */ INT WINAPI GetWindowTextLengthW( HWND hwnd ) { - return SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ); + if (WIN_IsCurrentProcess( hwnd )) return SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ); + + /* when window belongs to other process, don't send a message */ + return get_server_window_text( hwnd, NULL, 0 ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 6aee918..564ae92 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3703,7 +3703,9 @@ struct get_window_text_request struct get_window_text_reply { struct reply_header __header; + data_size_t length; /* VARARG(text,unicode_str); */ + char __pad_12[4]; }; @@ -6509,6 +6511,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 551 +#define SERVER_PROTOCOL_VERSION 552 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 1673ae3..9fb155b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2659,6 +2659,7 @@ enum coords_relative @REQ(get_window_text) user_handle_t handle; /* handle to the window */ @REPLY + data_size_t length; /* total length in WCHARs */ VARARG(text,unicode_str); /* window text */ @END diff --git a/server/request.h b/server/request.h index f69ff16..3e6183b 100644 --- a/server/request.h +++ b/server/request.h @@ -1772,7 +1772,8 @@ C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, client) == 40 ); C_ASSERT( sizeof(struct get_window_rectangles_reply) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_window_text_request, handle) == 12 ); C_ASSERT( sizeof(struct get_window_text_request) == 16 ); -C_ASSERT( sizeof(struct get_window_text_reply) == 8 ); +C_ASSERT( FIELD_OFFSET(struct get_window_text_reply, length) == 8 ); +C_ASSERT( sizeof(struct get_window_text_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_window_text_request, handle) == 12 ); C_ASSERT( sizeof(struct set_window_text_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_windows_offset_request, from) == 12 ); diff --git a/server/trace.c b/server/trace.c index ac15ba9..44004ad 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3233,7 +3233,8 @@ static void dump_get_window_text_request( const struct get_window_text_request * static void dump_get_window_text_reply( const struct get_window_text_reply *req ) { - dump_varargs_unicode_str( " text=", cur_size ); + fprintf( stderr, " length=%u", req->length ); + dump_varargs_unicode_str( ", text=", cur_size ); } static void dump_set_window_text_request( const struct set_window_text_request *req ) diff --git a/server/window.c b/server/window.c index 9560f93..4a1a278 100644 --- a/server/window.c +++ b/server/window.c @@ -2398,9 +2398,8 @@ DECL_HANDLER(get_window_text) if (win && win->text) { - data_size_t len = strlenW( win->text ) * sizeof(WCHAR); - if (len > get_reply_max_size()) len = get_reply_max_size(); - set_reply_data( win->text, len ); + reply->length = strlenW( win->text ); + set_reply_data( win->text, min( reply->length * sizeof(WCHAR), get_reply_max_size() )); } }

1 0

Jacek Caban : itss: Support COM aggregation in its protocol handler.
by Alexandre Julliard May 22, 2018

May 22, 2018

Module: wine Branch: master Commit: cd5570d9efd0cea19e5863fb334da3d40dd9658d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd5570d9efd0cea19e5863fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 22 11:31:59 2018 +0200 itss: Support COM aggregation in its protocol handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itss/itss.c | 29 ++++++++++++------ dlls/itss/protocol.c | 76 ++++++++++++++++++++++++++++++++-------------- dlls/itss/tests/protocol.c | 64 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+), 31 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index f47a0e9..1d236a5 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -105,20 +105,31 @@ static ULONG WINAPI ITSSCF_Release(LPCLASSFACTORY iface) } -static HRESULT WINAPI ITSSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, - REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI ITSSCF_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **ppv) { IClassFactoryImpl *This = impl_from_IClassFactory(iface); + IUnknown *unk; HRESULT hres; - LPUNKNOWN punk; - TRACE("(%p)->(%p,%s,%p)\n", This, pOuter, debugstr_guid(riid), ppobj); + TRACE("(%p)->(%p %s %p)\n", This, outer, debugstr_guid(riid), ppv); - *ppobj = NULL; - hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); - if (SUCCEEDED(hres)) { - hres = IUnknown_QueryInterface(punk, riid, ppobj); - IUnknown_Release(punk); + if(outer && !IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + hres = This->pfnCreateInstance(outer, (void**)&unk); + if(FAILED(hres)) { + *ppv = NULL; + return hres; + } + + if(!IsEqualGUID(riid, &IID_IUnknown)) { + hres = IUnknown_QueryInterface(unk, riid, ppv); + IUnknown_Release(unk); + }else { + *ppv = unk; } return hres; } diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 1463518..1cdb365 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -36,16 +36,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(itss); typedef struct { + IUnknown IUnknown_inner; IInternetProtocol IInternetProtocol_iface; IInternetProtocolInfo IInternetProtocolInfo_iface; LONG ref; + IUnknown *outer; ULONG offset; struct chmFile *chm_file; struct chmUnitInfo chm_object; } ITSProtocol; +static inline ITSProtocol *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, ITSProtocol, IUnknown_inner); +} + static inline ITSProtocol *impl_from_IInternetProtocol(IInternetProtocol *iface) { return CONTAINING_RECORD(iface, ITSProtocol, IInternetProtocol_iface); @@ -65,14 +72,13 @@ static void release_chm(ITSProtocol *This) This->offset = 0; } -static HRESULT WINAPI ITSProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +static HRESULT WINAPI ITSProtocol_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - ITSProtocol *This = impl_from_IInternetProtocol(iface); + ITSProtocol *This = impl_from_IUnknown(iface); - *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IInternetProtocol_iface; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocol_iface; @@ -82,28 +88,27 @@ static HRESULT WINAPI ITSProtocol_QueryInterface(IInternetProtocol *iface, REFII }else if(IsEqualGUID(&IID_IInternetProtocolInfo, riid)) { TRACE("(%p)->(IID_IInternetProtocolInfo %p)\n", This, ppv); *ppv = &This->IInternetProtocolInfo_iface; + }else { + *ppv = NULL; + WARN("not supported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IInternetProtocol_AddRef(iface); - return S_OK; - } - - WARN("not supported interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static ULONG WINAPI ITSProtocol_AddRef(IInternetProtocol *iface) +static ULONG WINAPI ITSProtocol_AddRef(IUnknown *iface) { - ITSProtocol *This = impl_from_IInternetProtocol(iface); + ITSProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; } -static ULONG WINAPI ITSProtocol_Release(IInternetProtocol *iface) +static ULONG WINAPI ITSProtocol_Release(IUnknown *iface) { - ITSProtocol *This = impl_from_IInternetProtocol(iface); + ITSProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -118,6 +123,30 @@ static ULONG WINAPI ITSProtocol_Release(IInternetProtocol *iface) return ref; } +static const IUnknownVtbl ITSProtocolUnkVtbl = { + ITSProtocol_QueryInterface, + ITSProtocol_AddRef, + ITSProtocol_Release +}; + +static HRESULT WINAPI ITSInternetProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +{ + ITSProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI ITSInternetProtocol_AddRef(IInternetProtocol *iface) +{ + ITSProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI ITSInternetProtocol_Release(IInternetProtocol *iface) +{ + ITSProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_Release(This->outer); +} + static LPCWSTR skip_schema(LPCWSTR url) { static const WCHAR its_schema[] = {'i','t','s',':'}; @@ -387,9 +416,9 @@ static HRESULT WINAPI ITSProtocol_UnlockRequest(IInternetProtocol *iface) } static const IInternetProtocolVtbl ITSProtocolVtbl = { - ITSProtocol_QueryInterface, - ITSProtocol_AddRef, - ITSProtocol_Release, + ITSInternetProtocol_QueryInterface, + ITSInternetProtocol_AddRef, + ITSInternetProtocol_Release, ITSProtocol_Start, ITSProtocol_Continue, ITSProtocol_Abort, @@ -520,21 +549,24 @@ static const IInternetProtocolInfoVtbl ITSProtocolInfoVtbl = { ITSProtocolInfo_QueryInfo }; -HRESULT ITSProtocol_create(IUnknown *pUnkOuter, LPVOID *ppobj) +HRESULT ITSProtocol_create(IUnknown *outer, void **ppv) { ITSProtocol *ret; - TRACE("(%p %p)\n", pUnkOuter, ppobj); + TRACE("(%p %p)\n", outer, ppv); ITSS_LockModule(); ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ITSProtocol)); + if(!ret) + return E_OUTOFMEMORY; + ret->IUnknown_inner.lpVtbl = &ITSProtocolUnkVtbl; ret->IInternetProtocol_iface.lpVtbl = &ITSProtocolVtbl; ret->IInternetProtocolInfo_iface.lpVtbl = &ITSProtocolInfoVtbl; ret->ref = 1; + ret->outer = outer ? outer : &ret->IUnknown_inner; - *ppobj = &ret->IInternetProtocol_iface; - + *ppv = &ret->IUnknown_inner; return S_OK; } diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 663411f..3028da4 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -60,6 +60,7 @@ DEFINE_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); DEFINE_EXPECT(ReportProgress_DIRECTBIND); DEFINE_EXPECT(ReportData); DEFINE_EXPECT(ReportResult); +DEFINE_EXPECT(outer_QI_test); static HRESULT expect_hrResult; static IInternetProtocol *read_protocol = NULL; @@ -660,6 +661,68 @@ static void delete_chm(void) ok(ret, "DeleteFileA failed: %d\n", GetLastError()); } +static const IID outer_test_iid = {0xabcabc00,0,0,{0,0,0,0,0,0,0,0x66}}; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &outer_test_iid)) { + CHECK_EXPECT(outer_QI_test); + *ppv = (IUnknown*)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl outer_vtbl = { + outer_QueryInterface, + outer_AddRef, + outer_Release +}; + +static void test_com_aggregation(const CLSID *clsid) +{ + IUnknown outer = { &outer_vtbl }; + IClassFactory *class_factory; + IUnknown *unk, *unk2, *unk3; + HRESULT hres; + + hres = CoGetClassObject(clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&class_factory); + ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + + hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CreateInstance returned: %08x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&unk2); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); + + SET_EXPECT(outer_QI_test); + hres = IUnknown_QueryInterface(unk2, &outer_test_iid, (void**)&unk3); + CHECK_CALLED(outer_QI_test); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); + ok(unk3 == (IUnknown*)0xdeadbeef, "unexpected unk2\n"); + + IUnknown_Release(unk2); + IUnknown_Release(unk); + + unk = (void*)0xdeadbeef; + hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IInternetProtocol, (void**)&unk); + ok(hres == CLASS_E_NOAGGREGATION, "CreateInstance returned: %08x\n", hres); + ok(!unk, "unk = %p\n", unk); + + IClassFactory_Release(class_factory); +} + START_TEST(protocol) { OleInitialize(NULL); @@ -669,6 +732,7 @@ START_TEST(protocol) test_its_protocol(); test_mk_protocol(); + test_com_aggregation(&CLSID_ITSProtocol); delete_chm(); OleUninitialize();

1 0

Zebediah Figura : msi/tests: Test deferral of InstallODBC and RemoveODBC.
by Alexandre Julliard May 22, 2018

May 22, 2018

Module: wine Branch: master Commit: 7305e5fd8c1262e369c2807e83adfb9aaf4f2e7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7305e5fd8c1262e369c2807e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 22:00:58 2018 -0500 msi/tests: Test deferral of InstallODBC and RemoveODBC. 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> --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/action.c | 14 +++++++++++++ dlls/msi/tests/custom.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 43a5657..18a6457 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = msi.dll IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version odbccp32 -custom_IMPORTS = uuid msi ole32 shell32 advapi32 +custom_IMPORTS = uuid msi ole32 shell32 advapi32 odbccp32 SOURCES = \ action.c \ diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index e33decc..943c939 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -870,7 +870,11 @@ static const char odbc_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" "InstallODBC\t\t3000\n" + "io_immediate\tNOT REMOVE\t3001\n" + "io_deferred\tNOT REMOVE\t3002\n" "RemoveODBC\t\t3100\n" + "ro_immediate\tREMOVE\t3101\n" + "ro_deferred\tREMOVE\t3102\n" "RemoveFiles\t\t3900\n" "InstallFiles\t\t4000\n" "RegisterProduct\t\t5000\n" @@ -878,6 +882,15 @@ static const char odbc_install_exec_seq_dat[] = "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char odbc_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "io_immediate\t1\tcustom.dll\todbc_absent\n" + "io_deferred\t1025\tcustom.dll\todbc_present\n" + "ro_immediate\t1\tcustom.dll\todbc_present\n" + "ro_deferred\t1025\tcustom.dll\todbc_absent\n"; + static const char odbc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "i2\ti4\tL64\tS255\tS32\tS72\n" @@ -1969,6 +1982,7 @@ static const msi_table odbc_tables[] = ADD_TABLE(odbc_translator), ADD_TABLE(odbc_datasource), ADD_TABLE(odbc_install_exec_seq), + ADD_TABLE(odbc_custom_action), ADD_TABLE(odbc_media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 4e3e2dc..0f34eb0 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -24,6 +24,7 @@ #include <windef.h> #include <winbase.h> #include <winsvc.h> +#include <odbcinst.h> #define COBJMACROS #include <shlobj.h> #include <msxml.h> @@ -1314,3 +1315,51 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !pf_exists("msitest\\duplicate2.txt"), "file present\n"); return ERROR_SUCCESS; } + +UINT WINAPI odbc_present(MSIHANDLE hinst) +{ + int gotdriver = 0, gotdriver2 = 0; + char buffer[1000], *p; + WORD len; + BOOL r; + + r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len); + ok(hinst, len < sizeof(buffer), "buffer too small\n"); + ok(hinst, r, "SQLGetInstalledDrivers failed\n"); + for (p = buffer; *p; p += strlen(p) + 1) + { + if (!strcmp(p, "ODBC test driver")) + gotdriver = 1; + if (!strcmp(p, "ODBC test driver2")) + gotdriver2 = 1; + } +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, gotdriver, "driver absent\n"); + ok(hinst, gotdriver2, "driver 2 absent\n"); +} + return ERROR_SUCCESS; +} + +UINT WINAPI odbc_absent(MSIHANDLE hinst) +{ + int gotdriver = 0, gotdriver2 = 0; + char buffer[1000], *p; + WORD len; + BOOL r; + + r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len); + ok(hinst, len < sizeof(buffer), "buffer too small\n"); + ok(hinst, r, "SQLGetInstalledDrivers failed\n"); + for (p = buffer; *p; p += strlen(p) + 1) + { + if (!strcmp(p, "ODBC test driver")) + gotdriver = 1; + if (!strcmp(p, "ODBC test driver2")) + gotdriver2 = 1; + } +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, !gotdriver, "driver present\n"); + ok(hinst, !gotdriver2, "driver 2 present\n"); +} + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 1b15ca9..52feffa 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -9,6 +9,8 @@ @ stdcall crs_absent(long) @ stdcall file_present(long) @ stdcall file_absent(long) +@ stdcall odbc_present(long) +@ stdcall odbc_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

1 0

Alistair Leslie-Hughes : include: Add MmGetSystemRoutineAddress definition.
by Alexandre Julliard May 22, 2018

May 22, 2018

Module: wine Branch: master Commit: 0b6337f0957cf1dd0940596015266516bab3185a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b6337f0957cf1dd09405960… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 22 04:27:17 2018 +0000 include: Add MmGetSystemRoutineAddress definition. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index cab9828..d6b808f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1421,6 +1421,7 @@ PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); +void * WINAPI MmGetSystemRoutineAddress(UNICODE_STRING*); PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDL,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,ULONG); MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); void WINAPI MmProbeAndLockPages(PMDLX, KPROCESSOR_MODE, LOCK_OPERATION);

1 0