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

[PATCH] notepad: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 22 May '18

22 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/notepad/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 6f567a9951..da39eec062 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -76,7 +76,7 @@ VOID SetFileNameAndEncoding(LPCWSTR szFileName, ENCODING enc) { lstrcpyW(Globals.szFileName, szFileName); Globals.szFileTitle[0] = 0; - GetFileTitleW(szFileName, Globals.szFileTitle, sizeof(Globals.szFileTitle) / sizeof(WCHAR)); + GetFileTitleW(szFileName, Globals.szFileTitle, ARRAY_SIZE(Globals.szFileTitle)); Globals.encFile = enc; } -- 2.14.3

1 0

[PATCH v2] odbccp32: Avoid using RegQueryInfoKey() in SQLGetInstalledDrivers().
by Zebediah Figura 22 May '18

22 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/odbccp32/odbccp32.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 8788330..12796e9 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -510,15 +510,20 @@ BOOL WINAPI SQLGetInstalledDriversW(WCHAR *buf, WORD size, WORD *sizeout) return FALSE; } - RegQueryInfoKeyW(drivers, 0, 0, 0, 0, 0, 0, 0, &valuelen, 0, 0, 0); - value = heap_alloc(++valuelen * sizeof(WCHAR)); + valuelen = 256; + value = heap_alloc(valuelen * sizeof(WCHAR)); size--; while (1) { len = valuelen; - res = RegEnumValueW(drivers, index++, value, &len, NULL, NULL, NULL, NULL); + res = RegEnumValueW(drivers, index, value, &len, NULL, NULL, NULL, NULL); + if (res == ERROR_MORE_DATA) + { + value = heap_realloc(value, ++len * sizeof(WCHAR)); + res = RegEnumValueW(drivers, index, value, &len, NULL, NULL, NULL, NULL); + } if (res == ERROR_SUCCESS) { lstrcpynW(buf + written, value, size - written); @@ -532,6 +537,7 @@ BOOL WINAPI SQLGetInstalledDriversW(WCHAR *buf, WORD size, WORD *sizeout) ret = FALSE; break; } + index++; } buf[written++] = 0; -- 2.7.4

1 0

[PATCH] include: Add IO_REPARSE* definitions.
by Gijs Vermeulen 22 May '18

22 May '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- Another patch for compiling WinFile with winelib. include/winnt.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index ba10be772d..ad7e0f0d82 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2424,6 +2424,28 @@ extern struct _TEB * WINAPI NtCurrentTeb(void); #define TLS_MINIMUM_AVAILABLE 64 +#define MAXIMUM_REPARSE_DATA_BUFFER_SIZE (16 * 1024) + +#define IO_REPARSE_TAG_RESERVED_ZERO (0) +#define IO_REPARSE_TAG_RESERVED_ONE (1) + +#define IO_REPARSE_TAG_RESERVED_RANGE IO_REPARSE_TAG_RESERVED_ONE + +#define IO_REPARSE_TAG_MOUNT_POINT (__MSABI_LONG(0xA0000003)) +#define IO_REPARSE_TAG_HSM (__MSABI_LONG(0xC0000004)) +#define IO_REPARSE_TAG_HSM2 (__MSABI_LONG(0x80000006)) +#define IO_REPARSE_TAG_SIS (__MSABI_LONG(0x80000007)) +#define IO_REPARSE_TAG_WIM (__MSABI_LONG(0x80000008)) +#define IO_REPARSE_TAG_CSV (__MSABI_LONG(0x80000009)) +#define IO_REPARSE_TAG_DFS (__MSABI_LONG(0x8000000A)) +#define IO_REPARSE_TAG_FILTER_MANAGER (__MSABI_LONG(0x8000000B)) +#define IO_REPARSE_TAG_DFSR (__MSABI_LONG(0x80000012)) +#define IO_REPARSE_TAG_SYMLINK (__MSABI_LONG(0xA000000C)) +#define IO_REPARSE_TAG_IIS_CACHE (__MSABI_LONG(0xA0000010)) +#define IO_REPARSE_TAG_DRIVE_EXTENDER (__MSABI_LONG(0x80000005)) +#define IO_REPARSE_TAG_DEDUP (__MSABI_LONG(0x80000013)) +#define IO_REPARSE_TAG_NFS (__MSABI_LONG(0x80000014)) + /* * File formats definitions */ -- 2.13.6

1 0

[PATCH] odbccp32: Avoid using RegQueryInfoKey() in SQLGetInstalledDrivers().
by Zebediah Figura 22 May '18

22 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/odbccp32/odbccp32.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 8788330..515d44c 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -510,8 +510,8 @@ BOOL WINAPI SQLGetInstalledDriversW(WCHAR *buf, WORD size, WORD *sizeout) return FALSE; } - RegQueryInfoKeyW(drivers, 0, 0, 0, 0, 0, 0, 0, &valuelen, 0, 0, 0); - value = heap_alloc(++valuelen * sizeof(WCHAR)); + valuelen = 256; + value = heap_alloc(valuelen * sizeof(WCHAR)); size--; @@ -519,6 +519,11 @@ BOOL WINAPI SQLGetInstalledDriversW(WCHAR *buf, WORD size, WORD *sizeout) { len = valuelen; res = RegEnumValueW(drivers, index++, value, &len, NULL, NULL, NULL, NULL); + if (res == ERROR_MORE_DATA) + { + value = heap_realloc(value, ++len * sizeof(WCHAR)); + res = RegEnumValueW(drivers, index++, value, &len, NULL, NULL, NULL, NULL); + } if (res == ERROR_SUCCESS) { lstrcpynW(buf + written, value, size - written); -- 2.7.4

1 0

[PATCH] kernel32: Check for LOCALE_NOUSEROVERRIDE for neutral locales.
by Matej Špindler 22 May '18

22 May '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=45220 Signed-off-by: Matej Špindler <spindler.matej(a)gmail.com> --- dlls/kernel32/locale.c | 1 + dlls/kernel32/tests/locale.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 5a6ff35b75..02a587f2f3 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1823,6 +1823,7 @@ INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len) if (len) strcpyW(buffer, locale); return 3; case LOCALE_SPARENT: + case LOCALE_SPARENT | LOCALE_NOUSEROVERRIDE: if (len) buffer[0] = 0; return 1; } diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 91a870362c..791f015766 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) || -- 2.17.0

1 0

[PATCH] msi/tests: Avoid calling MsiSetTargetPath("TARGETDIR").
by Zebediah Figura 22 May '18

22 May '18

Fixes test failures on Windows XP. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/custom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 3c79bb5..cf1289e 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -578,18 +578,18 @@ static void test_targetpath(MSIHANDLE hinst) r = MsiSetTargetPathA(hinst, NULL, "C:\\subdir"); ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); - r = MsiSetTargetPathA(hinst, "TARGETDIR", NULL); + r = MsiSetTargetPathA(hinst, "MSITESTDIR", NULL); ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); - r = MsiSetTargetPathA(hinst, "TARGETDIR", "C:\\subdir"); + r = MsiSetTargetPathA(hinst, "MSITESTDIR", "C:\\subdir"); ok(hinst, !r, "got %u\n", r); sz = sizeof(buffer); - r = MsiGetTargetPathA(hinst, "TARGETDIR", buffer, &sz); + r = MsiGetTargetPathA(hinst, "MSITESTDIR", buffer, &sz); ok(hinst, !r, "got %u\n", r); ok(hinst, !strcmp(buffer, "C:\\subdir\\"), "got \"%s\"\n", buffer); - r = MsiSetTargetPathA(hinst, "TARGETDIR", "C:\\"); + r = MsiSetTargetPathA(hinst, "MSITESTDIR", "C:\\"); /* test GetSourcePath() */ -- 2.7.4

3 3

[PATCH 1/6] msi/tests: Test deferral of DuplicateFiles and RemoveDuplicateFiles.
by Zebediah Figura 22 May '18

22 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- 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 9c9966c..9dfabf8 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) -- 2.7.4

4 16

[PATCH 1/2] vbscript: Treat \r as a newline separator.
by Zebediah Figura 22 May '18

22 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/vbscript/lex.c | 3 ++- dlls/vbscript/tests/run.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 98b4cbb..21fe2e4 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -383,7 +383,7 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) static void skip_spaces(parser_ctx_t *ctx) { - while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\r') + while(*ctx->ptr == ' ' || *ctx->ptr == '\t') ctx->ptr++; } @@ -421,6 +421,7 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) switch(c) { case '\n': + case '\r': ctx->ptr++; return tNL; case '\'': diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 6b57540..2f50377 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2394,6 +2394,13 @@ static void run_tests(void) ok(FAILED(hres), "script didn't fail\n"); todo_wine CHECK_CALLED(OnScriptError); + parse_script_a("Sub testsub(arg)\r" + "If arg = 1 Then\r\r" + "arg = 2\n\n" + "End If\r\n" + "End Sub\n\r" + "Call testsub(1)"); + run_from_res("lang.vbs"); run_from_res("api.vbs"); run_from_res("regexp.vbs"); -- 2.7.4

2 4

[PATCH] include/wmsdkidl.idl : add IWMCodecInfo interfaces
by Louis Lenders 22 May '18

22 May '18

I would like to add some tests for these to wmvcore later and need these Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- include/wmsdkidl.idl | 92 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 60d8b2ca27..5bc85465e1 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -509,6 +509,98 @@ interface IWMProfileManager2 : IWMProfileManager cpp_quote("HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**);") +[ + object, + uuid(a970f41e-34de-4a98-b3ba-e4b3ca7528f0), + pointer_default(unique), + local +] +interface IWMCodecInfo : IUnknown +{ + HRESULT GetCodecInfoCount( + [in] REFGUID guid, + [out] DWORD *count); + + HRESULT GetCodecFormatCount( + [in] REFGUID guid, + [in] DWORD codecindex, + [out] DWORD *formatcount); + + HRESULT GetCodecFormat( + [in] REFGUID guid, + [in] DWORD codecindex, + [in] DWORD formatindex, + [out] IWMStreamConfig **streamconfig); +} + +[ + object, + uuid(aa65e273-b686-4056-91ec-dd768d4df710), + pointer_default(unique), + local +] +interface IWMCodecInfo2 : IWMCodecInfo +{ + HRESULT GetCodecName( + [in] REFGUID guid, + [in] DWORD codecindex, + [out, size_is(*namesize)] WCHAR *name, + [in, out] DWORD *namesize); + + HRESULT GetCodecFormatDesc( + [in] REFGUID guid, + [in] DWORD codecindex, + [in] DWORD formatindex, + [out] IWMStreamConfig **streamconfig, + [out, size_is(*descrsize)] WCHAR *description, + [in, out] DWORD *descrsize); +} + +[ + object, + uuid(7e51f487-4d93-4f98-8ab4-27d0565adc51), + pointer_default(unique), + local +] +interface IWMCodecInfo3 : IWMCodecInfo2 +{ + HRESULT GetCodecFormatProp( + [in] REFGUID guid, + [in] DWORD codecindex, + [in] DWORD formatindex, + [in] const WCHAR *name, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is(*size)] BYTE *value, + [in, out] DWORD *size); + + HRESULT GetCodecProp( + [in] REFGUID guid, + [in] DWORD codecindex, + [in] const WCHAR *name, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is(*size)] BYTE *value, + [in, out] DWORD *size); + + HRESULT SetCodecEnumerationSetting( + [in] REFGUID guid, + [in] DWORD codecindex, + [in] const WCHAR *name, + [in] WMT_ATTR_DATATYPE type, + [in, size_is(size)] const BYTE *value, + [in] DWORD size); + + HRESULT GetCodecEnumerationSetting( + [in] REFGUID guid, + [in] DWORD codecindex, + [in] const WCHAR *name, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is(*size)] BYTE *value, + [in, out] DWORD *size); +} + +cpp_quote("static const WCHAR g_wszNumPasses[] = {'_','P','A','S','S','E','S','U','S','E','D',0};") +cpp_quote("static const WCHAR g_wszVBREnabled[] = {'_','V','B','R','E','N','A','B','L','E','D',0};") + [ object, uuid(96406bce-2b2b-11d3-b36b-00c04f6108ff), -- 2.17.0

1 0

[PATCH] wmvcore: add a fixme in WMProfileManager_QueryInterface if interface not found
by Louis Lenders 22 May '18

22 May '18

Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/wmvcore/wmvcore_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 1b452884f1..690885e861 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -2133,6 +2133,7 @@ static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, TRACE("(%p)->(IID_IWMProfileManager %p)\n", This, ppv); *ppv = &This->IWMProfileManager_iface; }else { + FIXME("Unsupported iface %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } -- 2.17.0

1 0