November 2020 - Wine-devel - list.winehq.org

[PATCH 2/3] include: Add IRowsetChange interface
by Alistair Leslie-Hughes 11 Nov '20

11 Nov '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledb.idl | 1 + include/rstchg.idl | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 include/rstchg.idl diff --git a/include/oledb.idl b/include/oledb.idl index 5060378b351..256d5fc7917 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -74,6 +74,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "cmdprp.idl" #include "cvttyp.idl" #include "cmdpre.idl" +#include "rstchg.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/rstchg.idl b/include/rstchg.idl new file mode 100644 index 00000000000..973db1aab13 --- /dev/null +++ b/include/rstchg.idl @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 + */ +#if 0 +#pragma makedep install +#endif + +[ + local, + object, + uuid(0c733a05-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowsetChange : IUnknown +{ + HRESULT DeleteRows([in] HCHAPTER reserved, [in] DBCOUNTITEM count, [in, size_is(count)] const HROW rows[], + [out, size_is(count)] DBROWSTATUS status[] ); + + HRESULT SetData([in] HROW row, [in] HACCESSOR accessor, [in] void *data); + + HRESULT InsertRow([in] HCHAPTER reserved, [in] HACCESSOR accessor, [in] void *data, [out] HROW *row); +} -- 2.28.0

1 0

[PATCH 1/3] include: Add ICommandPrepare interface
by Alistair Leslie-Hughes 11 Nov '20

11 Nov '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 24 +++++++++++++++++++++++ include/cmdpre.idl | 41 ++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 3 files changed, 66 insertions(+) create mode 100644 include/cmdpre.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index fa086290061..917395b37bd 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1629,3 +1629,27 @@ HRESULT __RPC_STUB IConvertType_CanConvert_Stub(IConvertType* This, DBTYPE from, FIXME("(%p)->(%d %d 0x%08x %p): stub\n", This, from, to, flags, error); return E_NOTIMPL; } + +HRESULT CALLBACK ICommandPrepare_Prepare_Proxy(ICommandPrepare* This, ULONG runs) +{ + FIXME("(%p)->(%d): stub\n", This, runs); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandPrepare_Prepare_Stub(ICommandPrepare* This, ULONG runs, IErrorInfo **error) +{ + FIXME("(%p)->(%d %p): stub\n", This, runs, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ICommandPrepare_Unprepare_Proxy(ICommandPrepare* This) +{ + FIXME("(%p)->(): stub\n", This); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandPrepare_Unprepare_Stub(ICommandPrepare* This, IErrorInfo **error) +{ + FIXME("(%p)->(%p): stub\n", This, error); + return E_NOTIMPL; +} diff --git a/include/cmdpre.idl b/include/cmdpre.idl new file mode 100644 index 00000000000..695149aae50 --- /dev/null +++ b/include/cmdpre.idl @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a26-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICommandPrepare : IUnknown +{ + [local] + HRESULT Prepare([in] ULONG runs); + + [call_as(Prepare)] + HRESULT RemotePrepare([in] ULONG runs,[out] IErrorInfo **error); + + [local] + HRESULT Unprepare(); + + [call_as(Unprepare)] + HRESULT RemoteUnprepare([out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index c56460262f5..5060378b351 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -73,6 +73,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "cmdstrm.idl" #include "cmdprp.idl" #include "cvttyp.idl" +#include "cmdpre.idl" cpp_quote("#include <accctrl.h>") -- 2.28.0

1 0

[PATCH v2] wininet: Correctly return error status from InternetSetFilePointer() stub.
by Paul Gofman 11 Nov '20

11 Nov '20

Fixes Freestyle 2: Street Basketball update check failure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - fix test failure on Win2008. dlls/wininet/internet.c | 4 +++- dlls/wininet/tests/http.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index fb02488934d..91bff2ece93 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2096,7 +2096,9 @@ DWORD WINAPI InternetSetFilePointer(HINTERNET hFile, LONG lDistanceToMove, PVOID pReserved, DWORD dwMoveContext, DWORD_PTR dwContext) { FIXME("(%p %d %p %d %lx): stub\n", hFile, lDistanceToMove, pReserved, dwMoveContext, dwContext); - return FALSE; + + SetLastError(ERROR_INTERNET_INVALID_OPERATION); + return INVALID_SET_FILE_POINTER; } /*********************************************************************** diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fc984f6d33d..a5f5215f584 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -590,6 +590,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) DWORD length, length2, index, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; + DWORD contents_length, accepts_ranges; + BOOL not_supported; trace("Starting InternetReadFile test with flags 0x%x on url %s\n",flags,test->url); reset_events(); @@ -816,10 +818,23 @@ static void InternetReadFile_test(int flags, const test_data_t *test) res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,&index); trace("Option HTTP_QUERY_CONTENT_LENGTH -> %i %s (%u)\n",res,buffer,GetLastError()); if(test->flags & TESTF_COMPRESSED) + { ok(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND, got %x (%u)\n", res, GetLastError()); + contents_length = 0; + } + else + { + contents_length = atoi(buffer); + } ok(!res || index == 1, "Index was not incremented although result is %x (index = %u)\n", res, index); + length = 64; + *buffer = 0; + res = HttpQueryInfoA(hor,HTTP_QUERY_ACCEPT_RANGES,&buffer,&length,0x0); + trace("Option HTTP_QUERY_ACCEPT_RANGES -> %i %s (%u)\n",res,buffer,GetLastError()); + accepts_ranges = res && !strcmp(buffer, "bytes"); + length = 100; res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_TYPE,buffer,&length,0x0); buffer[length]=0; @@ -830,6 +845,26 @@ static void InternetReadFile_test(int flags, const test_data_t *test) buffer[length]=0; trace("Option HTTP_QUERY_CONTENT_ENCODING -> %i %s\n",res,buffer); + SetLastError(0xdeadbeef); + length = InternetSetFilePointer(hor, 0, NULL, FILE_END, 0); + not_supported = length == INVALID_SET_FILE_POINTER + && GetLastError() == ERROR_INTERNET_INVALID_OPERATION; + if (accepts_ranges) + todo_wine ok((length == contents_length && (GetLastError() == ERROR_SUCCESS + || broken(GetLastError() == 0xdeadbeef))) || broken(not_supported), + "Got unexpected length %#x, GetLastError() %u, contents_length %u, accepts_ranges %#x.\n", + length, GetLastError(), contents_length, accepts_ranges); + else + ok(not_supported, "Got unexpected length %#x, GetLastError() %u.\n", length, GetLastError()); + + if (length != INVALID_SET_FILE_POINTER) + { + SetLastError(0xdeadbeef); + length = InternetSetFilePointer(hor, 0, NULL, FILE_BEGIN, 0); + ok(!length && (GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef)), + "Got unexpected length %#x, GetLastError() %u.\n", length, GetLastError()); + } + SetLastError(0xdeadbeef); res = InternetReadFile(NULL, buffer, 100, &length); ok(!res, "InternetReadFile should have failed\n"); -- 2.28.0

2 1

[PATCH] wininet: Correctly return error status from InternetSetFilePointer() stub.
by Paul Gofman 11 Nov '20

11 Nov '20

Fixes Freestyle 2: Street Basketball update check failure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wininet/internet.c | 4 +++- dlls/wininet/tests/http.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index fb02488934d..91bff2ece93 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2096,7 +2096,9 @@ DWORD WINAPI InternetSetFilePointer(HINTERNET hFile, LONG lDistanceToMove, PVOID pReserved, DWORD dwMoveContext, DWORD_PTR dwContext) { FIXME("(%p %d %p %d %lx): stub\n", hFile, lDistanceToMove, pReserved, dwMoveContext, dwContext); - return FALSE; + + SetLastError(ERROR_INTERNET_INVALID_OPERATION); + return INVALID_SET_FILE_POINTER; } /*********************************************************************** diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fc984f6d33d..1c872a97345 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -590,6 +590,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) DWORD length, length2, index, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; + DWORD contents_length, accepts_ranges; + BOOL not_supported; trace("Starting InternetReadFile test with flags 0x%x on url %s\n",flags,test->url); reset_events(); @@ -816,10 +818,23 @@ static void InternetReadFile_test(int flags, const test_data_t *test) res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,&index); trace("Option HTTP_QUERY_CONTENT_LENGTH -> %i %s (%u)\n",res,buffer,GetLastError()); if(test->flags & TESTF_COMPRESSED) + { ok(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND, got %x (%u)\n", res, GetLastError()); + contents_length = 0; + } + else + { + contents_length = atoi(buffer); + } ok(!res || index == 1, "Index was not incremented although result is %x (index = %u)\n", res, index); + length = 64; + *buffer = 0; + res = HttpQueryInfoA(hor,HTTP_QUERY_ACCEPT_RANGES,&buffer,&length,0x0); + trace("Option HTTP_QUERY_ACCEPT_RANGES -> %i %s (%u)\n",res,buffer,GetLastError()); + accepts_ranges = res && !strcmp(buffer, "bytes"); + length = 100; res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_TYPE,buffer,&length,0x0); buffer[length]=0; @@ -830,6 +845,26 @@ static void InternetReadFile_test(int flags, const test_data_t *test) buffer[length]=0; trace("Option HTTP_QUERY_CONTENT_ENCODING -> %i %s\n",res,buffer); + SetLastError(0xdeadbeef); + length = InternetSetFilePointer(hor, 0, NULL, FILE_END, 0); + not_supported = length == INVALID_SET_FILE_POINTER + && GetLastError() == ERROR_INTERNET_INVALID_OPERATION; + if (accepts_ranges) + todo_wine ok((length == contents_length && (GetLastError() == ERROR_SUCCESS + || broken(GetLastError() == 0xdeadbeef))) || broken(not_supported), + "Got unexpected length %#x, GetLastError() %u, contents_length %u, accepts_ranges %#x.\n", + length, GetLastError(), contents_length, accepts_ranges); + else + ok(not_supported, "Got unexpected length %#x, GetLastError() %u.\n", length, GetLastError()); + + if (length != INVALID_SET_FILE_POINTER) + { + SetLastError(0xdeadbeef); + length = InternetSetFilePointer(hor, 0, NULL, FILE_BEGIN, 0); + ok(!length && GetLastError() == ERROR_SUCCESS, "Got unexpected length %#x, GetLastError() %u.\n", + length, GetLastError()); + } + SetLastError(0xdeadbeef); res = InternetReadFile(NULL, buffer, 100, &length); ok(!res, "InternetReadFile should have failed\n"); -- 2.28.0

2 1

[PATCH] mscms/tests: Represent expected copyright tag in plain text
by Alex Henrie 11 Nov '20

11 Nov '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- In this case, embedding a few null characters into the middle of a string actually makes it much more understandable. --- dlls/mscms/tests/profile.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 2ef20129e63..43b6ed2caa6 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -237,12 +237,7 @@ static void test_GetColorProfileElement( char *standardprofile ) DWORD size; TAGTYPE tag = 0x63707274; /* 'cprt' */ static char buffer[51]; - static const char expect[] = - { 0x74, 0x65, 0x78, 0x74, 0x00, 0x00, 0x00, 0x00, 0x43, 0x6f, 0x70, - 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 0x29, 0x20, - 0x31, 0x39, 0x39, 0x38, 0x20, 0x48, 0x65, 0x77, 0x6c, 0x65, 0x74, - 0x74, 0x2d, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x72, 0x64, 0x20, 0x43, - 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x00 }; + static const char expect[] = "text\0\0\0\0Copyright (c) 1998 Hewlett-Packard Company"; profile.dwType = PROFILE_FILENAME; profile.pProfileData = standardprofile; -- 2.29.2

1 0

[PATCH] gdi32: Avoid visrect that exceed the actual bitmap size.
by Haoyang Chen 10 Nov '20

10 Nov '20

2 1

[PATCH] icinfo: Use wide-char string literals.
by Michael Stefaniuc 10 Nov '20

10 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/icinfo/icinfo.c | 58 +++++++++++++--------------------------- 1 file changed, 18 insertions(+), 40 deletions(-) diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index cbf7c675b03..25b847b5a36 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -58,40 +58,18 @@ int __cdecl wmain(int argc, WCHAR* argv[]) { int i, n=0,doabout=0,doconfigure=0; - static const WCHAR header[] = {'C','u','r','r','e','n','t','l','y',' ','i','n','s','t','a','l','l','e','d',' ', - 'V','i','d','e','o',' ','C','o','m','p','r','e','s','s','o','r','s',':','\n',0}; - static const WCHAR close_flags[] = {')','\n',0}; - static const WCHAR s_fmt[] = {'%','s',0}; - static const WCHAR sspc_fmt[] = {'%','s',' ',0}; - static const WCHAR fcc_fmt[] = {'%','c','%','c','%','c','%','c','.','%','c','%','c','%','c','%','c',':',' ','%','s','\n',0}; - static const WCHAR desc_fmt[] = {'\t','s','z','D','e','s','c','r','i','p','t','i','o','n',':',' ','%','s','\n',0}; - static const WCHAR flags_fmt[] = {'\t','d','w','F','l','a','g','s',':',' ','0','x','%','0','8','x',' ','(',0}; - static const WCHAR version_fmt[] = {'\t','d','w','V','e','r','s','i','o','n',':',' ','0','x','%','0','8','x','\n',0}; - static const WCHAR versicm_fmt[] = {'\t','d','w','V','e','r','s','i','o','n','I','C','M',':',' ','0','x','%','0','8','x','\n',0}; - static const WCHAR VIDCF_QUALITY_W[] = {'V','I','D','C','F','_','Q','U','A','L','I','T','Y',0}; - static const WCHAR VIDCF_CRUNCH_W[] = {'V','I','D','C','F','_','C','R','U','N','C','H',0}; - static const WCHAR VIDCF_TEMPORAL_W[] = {'V','I','D','C','F','_','T','E','M','P','O','R','A','L',0}; - static const WCHAR VIDCF_COMPRESSFRAMES_W[] = {'V','I','D','C','F','_','C','O','M','P','R','E','S','S','F','R','A','M','E','S',0}; - static const WCHAR VIDCF_DRAW_W[] = {'V','I','D','C','F','_','D','R','A','W',0}; - static const WCHAR VIDCF_FASTTEMPORALC_W[] = {'V','I','D','C','F','_','F','A','S','T','T','E','M','P','O','R','A','L','C',0}; - static const WCHAR VIDCF_FASTTEMPORALD_W[] = {'V','I','D','C','F','_','F','A','S','T','T','E','M','P','O','R','A','L','D',0}; - static const WCHAR VIDCF_QUALITYTIME_W[] = {'V','I','D','C','F','_','Q','U','A','L','I','T','Y','T','I','M','E',0}; - static const WCHAR about[] = {'-','a','b','o','u','t','\0'}; - static const WCHAR configure[] = {'-','c','o','n','f','i','g','u','r','e','\0'}; - static const WCHAR unk_opt_fmt[] = {'U','n','k','n','o','w','n',' ','o','p','t','i','o','n',':',' ','%','s','\n',0}; - for (i = 1; i < argc; i++) { - if (!lstrcmpW(argv[i], about)) + if (!lstrcmpW(argv[i], L"-about")) doabout = 1; - else if (!lstrcmpW(argv[i], configure)) + else if (!lstrcmpW(argv[i], L"-configure")) doconfigure = 1; else { - mywprintf(unk_opt_fmt, argv[i]); + mywprintf(L"Unknown option: %s\n", argv[i]); return -1; } } - mywprintf(s_fmt, header); + mywprintf(L"%s", L"Currently installed Video Compressors:\n"); while (1) { ICINFO ii; HIC hic; @@ -106,25 +84,25 @@ int __cdecl wmain(int argc, WCHAR* argv[]) continue; } - mywprintf(fcc_fmt, + mywprintf(L"%c%c%c%c.%c%c%c%c: %s\n", LOBYTE(ii.fccType),LOBYTE(ii.fccType>>8),LOBYTE(ii.fccType>>16),LOBYTE(ii.fccType>>24), LOBYTE(ii.fccHandler),LOBYTE(ii.fccHandler>>8),LOBYTE(ii.fccHandler>>16),LOBYTE(ii.fccHandler>>24), ii.szName); - mywprintf(flags_fmt,ii.dwFlags); + mywprintf(L"\tdwFlags: 0x%08x (",ii.dwFlags); - if (ii.dwFlags & VIDCF_QUALITY) mywprintf(sspc_fmt, VIDCF_QUALITY_W); - if (ii.dwFlags & VIDCF_CRUNCH) mywprintf(sspc_fmt, VIDCF_CRUNCH_W); - if (ii.dwFlags & VIDCF_TEMPORAL) mywprintf(sspc_fmt, VIDCF_TEMPORAL_W); - if (ii.dwFlags & VIDCF_COMPRESSFRAMES) mywprintf(sspc_fmt, VIDCF_COMPRESSFRAMES_W); - if (ii.dwFlags & VIDCF_DRAW) mywprintf(sspc_fmt, VIDCF_DRAW_W); - if (ii.dwFlags & VIDCF_FASTTEMPORALC) mywprintf(sspc_fmt, VIDCF_FASTTEMPORALC_W); - if (ii.dwFlags & VIDCF_FASTTEMPORALD) mywprintf(sspc_fmt, VIDCF_FASTTEMPORALD_W); - if (ii.dwFlags & VIDCF_QUALITYTIME) mywprintf(sspc_fmt, VIDCF_QUALITYTIME_W); + if (ii.dwFlags & VIDCF_QUALITY) mywprintf(L"%s ", L"VIDCF_QUALITY"); + if (ii.dwFlags & VIDCF_CRUNCH) mywprintf(L"%s ", L"VIDCF_CRUNCH"); + if (ii.dwFlags & VIDCF_TEMPORAL) mywprintf(L"%s ", L"VIDCF_TEMPORAL"); + if (ii.dwFlags & VIDCF_COMPRESSFRAMES) mywprintf(L"%s ", L"VIDCF_COMPRESSFRAMES"); + if (ii.dwFlags & VIDCF_DRAW) mywprintf(L"%s ", L"VIDCF_DRAW"); + if (ii.dwFlags & VIDCF_FASTTEMPORALC) mywprintf(L"%s ", L"VIDCF_FASTTEMPORALC"); + if (ii.dwFlags & VIDCF_FASTTEMPORALD) mywprintf(L"%s ", L"VIDCF_FASTTEMPORALD"); + if (ii.dwFlags & VIDCF_QUALITYTIME) mywprintf(L"%s ", L"VIDCF_QUALITYTIME"); - mywprintf(s_fmt, close_flags); - mywprintf(version_fmt,ii.dwVersion); - mywprintf(versicm_fmt,ii.dwVersionICM); - mywprintf(desc_fmt,ii.szDescription); + mywprintf(L"%s", L")\n"); + mywprintf(L"\tdwVersion: 0x%08x\n", ii.dwVersion); + mywprintf(L"\tdwVersionICM: 0x%08x\n", ii.dwVersionICM); + mywprintf(L"\tszDescription: %s\n", ii.szDescription); if (doabout) ICAbout(hic,0); if (doconfigure && ICQueryConfigure(hic)) ICConfigure(hic,0); -- 2.26.2

1 0

[PATCH] msidb: Use wide-char string literals.
by Michael Stefaniuc 10 Nov '20

10 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/msidb/main.c | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index ceca6df0fe7..2a18f855445 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -229,13 +229,10 @@ static const WCHAR *basenameW( const WCHAR *filename ) static int add_stream( struct msidb_state *state, const WCHAR *stream_filename ) { - static const WCHAR insert_command[] = - {'I','N','S','E','R','T',' ','I','N','T','O',' ','_','S','t','r','e','a','m','s',' ', - '(','N','a','m','e',',',' ','D','a','t','a',')',' ','V','A','L','U','E','S',' ','(','?',',',' ','?',')',0}; MSIHANDLE view = 0, record = 0; UINT ret; - ret = MsiDatabaseOpenViewW( state->database_handle, insert_command, &view ); + ret = MsiDatabaseOpenViewW( state->database_handle, L"INSERT INTO _Streams (Name, Data) VALUES (?, ?)", &view ); if (ret != ERROR_SUCCESS) { ERR( "Failed to open _Streams table.\n" ); @@ -290,13 +287,10 @@ static int add_streams( struct msidb_state *state ) static int kill_stream( struct msidb_state *state, const WCHAR *stream_filename ) { - static const WCHAR delete_command[] = - {'D','E','L','E','T','E',' ','F','R','O','M',' ','_','S','t','r','e','a','m','s',' ', - 'W','H','E','R','E',' ','N','a','m','e',' ','=',' ','?',0}; MSIHANDLE view = 0, record = 0; UINT ret; - ret = MsiDatabaseOpenViewW( state->database_handle, delete_command, &view ); + ret = MsiDatabaseOpenViewW( state->database_handle, L"DELETE FROM _Streams WHERE Name = ?", &view ); if (ret != ERROR_SUCCESS) { ERR( "Failed to open _Streams table.\n" ); @@ -345,9 +339,6 @@ static int kill_streams( struct msidb_state *state ) static int extract_stream( struct msidb_state *state, const WCHAR *stream_filename ) { - static const WCHAR select_command[] = - {'S','E','L','E','C','T',' ','D','a','t','a',' ','F','R','O','M',' ','_','S','t','r','e','a','m','s',' ', - 'W','H','E','R','E',' ','N','a','m','e',' ','=',' ','?',0}; HANDLE file = INVALID_HANDLE_VALUE; MSIHANDLE view = 0, record = 0; DWORD read_size, write_size; @@ -362,7 +353,7 @@ static int extract_stream( struct msidb_state *state, const WCHAR *stream_filena ERR( "Failed to open destination file %s.\n", wine_dbgstr_w(stream_filename) ); goto cleanup; } - ret = MsiDatabaseOpenViewW( state->database_handle, select_command, &view ); + ret = MsiDatabaseOpenViewW( state->database_handle, L"SELECT Data FROM _Streams WHERE Name = ?", &view ); if (ret != ERROR_SUCCESS) { ERR( "Failed to open _Streams table.\n" ); @@ -449,8 +440,6 @@ static int import_table( struct msidb_state *state, const WCHAR *table_path ) static int import_tables( struct msidb_state *state ) { - const WCHAR idt_ext[] = { '.','i','d','t',0 }; - const WCHAR wildcard[] = { '*',0 }; struct msidb_listentry *data; LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) @@ -460,7 +449,7 @@ static int import_tables( struct msidb_state *state ) WCHAR *ext; /* permit specifying tables with wildcards ('Feature*') */ - if (wcsstr( table_name, wildcard ) != NULL) + if (wcsstr( table_name, L"*" ) != NULL) { WIN32_FIND_DATAW f; HANDLE handle; @@ -484,7 +473,7 @@ static int import_tables( struct msidb_state *state ) if (f.cFileName[0] == '.' && f.cFileName[1] == '.' && !f.cFileName[2]) continue; if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; if ((ext = PathFindExtensionW( f.cFileName )) == NULL) continue; - if (lstrcmpW( ext, idt_ext ) != 0) continue; + if (lstrcmpW( ext, L".idt" ) != 0) continue; if (!import_table( state, f.cFileName )) { FindClose( handle ); @@ -495,10 +484,10 @@ static int import_tables( struct msidb_state *state ) continue; } /* permit specifying tables by filename (*.idt) */ - if ((ext = PathFindExtensionW( table_name )) == NULL || lstrcmpW( ext, idt_ext ) != 0) + if ((ext = PathFindExtensionW( table_name )) == NULL || lstrcmpW( ext, L".idt" ) != 0) { - const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ - swprintf( table_path, ARRAY_SIZE(table_path), format, table_name ); + /* truncate to 8 characters */ + swprintf( table_path, ARRAY_SIZE(table_path), L"%.8s.idt", table_name ); table_name = table_path; } if (!import_table( state, table_name )) @@ -509,9 +498,7 @@ static int import_tables( struct msidb_state *state ) static int export_table( struct msidb_state *state, const WCHAR *table_name ) { - const WCHAR format_dos[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ - const WCHAR format_full[] = { '%','s','.','i','d','t',0 }; - const WCHAR *format = (state->short_filenames ? format_dos : format_full); + const WCHAR *format = (state->short_filenames ? L"%.8s.idt" : L"%s.idt"); WCHAR table_path[MAX_PATH]; UINT ret; @@ -527,14 +514,10 @@ static int export_table( struct msidb_state *state, const WCHAR *table_name ) static int export_all_tables( struct msidb_state *state ) { - static const WCHAR summary_information[] = - {'_','S','u','m','m','a','r','y','I','n','f','o','r','m','a','t','i','o','n',0}; - static const WCHAR query_command[] = - {'S','E','L','E','C','T',' ','N','a','m','e',' ','F','R','O','M',' ','_','T','a','b','l','e','s',0}; MSIHANDLE view = 0; UINT ret; - ret = MsiDatabaseOpenViewW( state->database_handle, query_command, &view ); + ret = MsiDatabaseOpenViewW( state->database_handle, L"SELECT Name FROM _Tables", &view ); if (ret != ERROR_SUCCESS) { ERR( "Failed to open _Tables table.\n" ); @@ -581,7 +564,7 @@ static int export_all_tables( struct msidb_state *state ) } ret = ERROR_SUCCESS; /* the _SummaryInformation table is not listed in _Tables */ - if (!export_table( state, summary_information )) + if (!export_table( state, L"_SummaryInformation" )) { ret = ERROR_FUNCTION_FAILED; goto cleanup; @@ -598,12 +581,11 @@ cleanup: static int export_tables( struct msidb_state *state ) { - const WCHAR wildcard[] = { '*',0 }; struct msidb_listentry *data; LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) { - if (lstrcmpW( data->name, wildcard ) == 0) + if (lstrcmpW( data->name, L"*" ) == 0) { if (!export_all_tables( state )) return 0; /* failed, do not commit changes */ -- 2.26.2

1 0

[PATCH v2 2/2] advapi32: Implement LsaGetUserName.
by Dmitry Timoshkov 10 Nov '20

10 Nov '20

v2: Fix a bug with buffer size, thanks Alexandre. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/lsa.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/advapi32/tests/lsa.c | 50 +++++++++++++++++++++++++++++++- 3 files changed, 108 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index fcef859a7c..d5235c6adb 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -463,7 +463,7 @@ # @ stub LsaGetQuotasForAccount # @ stub LsaGetRemoteUserName @ stub LsaGetSystemAccessAccount -# @ stub LsaGetUserName +@ stdcall LsaGetUserName(ptr ptr) @ stub LsaICLookupNames # @ stub LsaICLookupNamesWithCreds @ stub LsaICLookupSids diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index bd3585f8d0..55e42400c6 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -104,6 +104,64 @@ static void* ADVAPI_GetDomainName(unsigned sz, unsigned ofs) return ptr; } +/****************************************************************************** + * LsaGetUserName [ADVAPI32.@] + * + */ +NTSTATUS WINAPI LsaGetUserName(PUNICODE_STRING *user_name, PUNICODE_STRING *domain_name) +{ + UNICODE_STRING *user; + DWORD user_size; + + user_size = 0; + if (GetUserNameW(NULL, &user_size) || GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return STATUS_UNSUCCESSFUL; + + user = heap_alloc(sizeof(*user) + user_size * sizeof(WCHAR)); + if (!user) return STATUS_NO_MEMORY; + + user->Buffer = (WCHAR *)(user + 1); + user->MaximumLength = user_size * sizeof(WCHAR); + user->Length = user->MaximumLength - sizeof(WCHAR); + if (!GetUserNameW(user->Buffer, &user_size)) + { + heap_free(user); + return STATUS_UNSUCCESSFUL; + } + + if (domain_name) + { + UNICODE_STRING *domain; + WCHAR computer[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD domain_size; + + domain_size = ARRAY_SIZE(computer); + if (!GetComputerNameW(computer, &domain_size)) + { + heap_free(user); + return STATUS_UNSUCCESSFUL; + } + + domain = heap_alloc(sizeof(*domain) + (domain_size + 1) * sizeof(WCHAR)); + if (!domain) + { + heap_free(user); + return STATUS_NO_MEMORY; + } + + domain->Buffer = (WCHAR *)(domain + 1); + domain->Length = domain_size * sizeof(WCHAR); + domain->MaximumLength = domain->Length + sizeof(WCHAR); + wcscpy(domain->Buffer, computer); + + *domain_name = domain; + } + + *user_name = user; + + return STATUS_SUCCESS; +} + /****************************************************************************** * LsaAddAccountRights [ADVAPI32.@] * diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 54a8528bc2..f8c822a7de 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -2,6 +2,7 @@ * Unit tests for lsa functions * * Copyright (c) 2006 Robert Reif + * Copyright (c) 2020 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,6 +39,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); +static NTSTATUS (WINAPI *pLsaGetUserName)(PUNICODE_STRING *user, PUNICODE_STRING *domain); static void test_lsa(void) { @@ -463,13 +465,59 @@ static void test_LsaLookupPrivilegeName(void) LsaFreeMemory(name); } +static void test_LsaGetUserName(void) +{ + NTSTATUS status; + BOOL ret; + UNICODE_STRING *lsa_user, *lsa_domain; + WCHAR user[256], computer[256]; + DWORD size; + + if (!pLsaGetUserName) + { + skip("LsaGetUserName is not available on this platform\n"); + return; + } + + size = ARRAY_SIZE(user); + ret = GetUserNameW(user, &size); + ok(ret, "GetUserName error %u\n", GetLastError()); + + size = ARRAY_SIZE(computer); + ret = GetComputerNameW(computer, &size); + ok(ret, "GetComputerName error %u\n", GetLastError()); + + if (0) /* crashes under Windows */ + status = pLsaGetUserName(NULL, NULL); + + if (0) /* crashes under Windows */ + status = pLsaGetUserName(NULL, &lsa_domain); + + status = pLsaGetUserName(&lsa_user, NULL); + ok(!status, "got %#x\n", status); + check_unicode_string(lsa_user, user); + LsaFreeMemory(lsa_user); + + status = pLsaGetUserName(&lsa_user, &lsa_domain); + ok(!status, "got %#x\n", status); + ok(!lstrcmpW(user, lsa_user->Buffer), "%s != %s\n", wine_dbgstr_w(user), wine_dbgstr_wn(lsa_user->Buffer, lsa_user->Length/sizeof(WCHAR))); + check_unicode_string(lsa_user, user); + check_unicode_string(lsa_domain, computer); + LsaFreeMemory(lsa_user); + LsaFreeMemory(lsa_domain); +} + START_TEST(lsa) { - HMODULE hkernel32 = GetModuleHandleA("kernel32"); + HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + pGetSystemPreferredUILanguages = (void*)GetProcAddress(hkernel32, "GetSystemPreferredUILanguages"); + pLsaGetUserName = (void *)GetProcAddress(hadvapi32, "LsaGetUserName"); test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids(); test_LsaLookupPrivilegeName(); + test_LsaGetUserName(); } -- 2.29.2

1 0

[PATCH v2 1/2] advapi32/tests: Fix compilation with PSDK compiler.
by Dmitry Timoshkov 10 Nov '20

10 Nov '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/tests/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index f2e10671a4..54a8528bc2 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -336,7 +336,7 @@ static void test_LsaLookupSids(void) { WCHAR langW[32]; char user_buffer[64]; - LSA_OBJECT_ATTRIBUTES attrs = {.Length = sizeof(attrs)}; + LSA_OBJECT_ATTRIBUTES attrs = {sizeof(attrs)}; TOKEN_USER *user = (TOKEN_USER *)user_buffer; WCHAR computer_name[64], user_name[64]; LSA_REFERENCED_DOMAIN_LIST *list; -- 2.29.2

1 0