- Wine-Devel - list.winehq.org

[PATCH v2] wintab32: Use wide-char string literals.
by Michael Stefaniuc Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Fix commit message dlls/wintab32/wintab32.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 98ce2bc1739..d56706b4223 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintab32); HWND hwndDefault = NULL; -static const WCHAR - WC_TABLETCLASSNAME[] = {'W','i','n','e','T','a','b','l','e','t','C','l','a','s','s',0}; static CRITICAL_SECTION_DEBUG csTablet_debug = { 0, 0, &csTablet, @@ -62,34 +60,26 @@ static VOID TABLET_Register(void) wndClass.cbWndExtra = 0; wndClass.hCursor = NULL; wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1); - wndClass.lpszClassName = WC_TABLETCLASSNAME; + wndClass.lpszClassName = L"WineTabletClass"; RegisterClassW(&wndClass); } static VOID TABLET_Unregister(void) { - UnregisterClassW(WC_TABLETCLASSNAME, NULL); + UnregisterClassW(L"WineTabletClass", NULL); } static HMODULE load_graphics_driver(void) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; - static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + static const WCHAR key_pathW[] = L"System\\CurrentControlSet\\Control\\Video\\{"; + static const WCHAR displayW[] = L"}\\0000"; HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), L"__wine_display_device_guid" )); if (!guid_atom) return 0; memcpy( key, key_pathW, sizeof(key_pathW) ); @@ -97,7 +87,7 @@ static HMODULE load_graphics_driver(void) lstrcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); - if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); + if (!RegQueryValueExW( hkey, L"GraphicsDriver", NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); RegCloseKey( hkey ); TRACE( "%s %p\n", debugstr_w(path), ret ); return ret; @@ -105,8 +95,6 @@ static HMODULE load_graphics_driver(void) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { - static const WCHAR name[] = {'T','a','b','l','e','t',0}; - TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) { @@ -114,7 +102,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) TRACE("Initialization\n"); DisableThreadLibraryCalls(hInstDLL); TABLET_Register(); - hwndDefault = CreateWindowW(WC_TABLETCLASSNAME, name, + hwndDefault = CreateWindowW(L"WineTabletClass", L"Tablet", WS_POPUPWINDOW,0,0,0,0,0,0,hInstDLL,0); if (hwndDefault) { -- 2.26.2

1 0

[PATCH v2] start: Use wide-char string literals.
by Michael Stefaniuc Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Fix commit message programs/start/start.c | 107 +++++++++++++---------------------------- 1 file changed, 34 insertions(+), 73 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index fd952083acd..e3071a3a09a 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -75,11 +75,9 @@ static void fatal_error(const WCHAR *msg, DWORD error_code, const WCHAR *filenam DWORD_PTR args[1]; LPVOID lpMsgBuf; int status; - static const WCHAR colonsW[] = { ':', ' ', 0 }; - static const WCHAR newlineW[] = { '\n', 0 }; output(msg); - output(colonsW); + output(L": "); args[0] = (DWORD_PTR)filename; status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, NULL, error_code, 0, (LPWSTR)&lpMsgBuf, 0, (__ms_va_list *)args ); @@ -90,7 +88,7 @@ static void fatal_error(const WCHAR *msg, DWORD error_code, const WCHAR *filenam { output(lpMsgBuf); LocalFree((HLOCAL) lpMsgBuf); - output(newlineW); + output(L"\n"); } ExitProcess(1); } @@ -125,8 +123,6 @@ static WCHAR *build_args( int argc, WCHAR **argvW ) { int i, wlen = 1; WCHAR *ret, *p; - static const WCHAR FormatQuotesW[] = { ' ', '\"', '%', 's', '\"', 0 }; - static const WCHAR FormatW[] = { ' ', '%', 's', 0 }; for (i = 0; i < argc; i++ ) { @@ -140,9 +136,9 @@ static WCHAR *build_args( int argc, WCHAR **argvW ) for (i = 0, p = ret; i < argc; i++ ) { if (wcschr(argvW[i], ' ')) - p += swprintf(p, wlen - (p - ret), FormatQuotesW, argvW[i]); + p += swprintf(p, wlen - (p - ret), L" \"%s\"", argvW[i]); else - p += swprintf(p, wlen - (p - ret), FormatW, argvW[i]); + p += swprintf(p, wlen - (p - ret), L" %s", argvW[i]); } return ret; } @@ -196,14 +192,6 @@ static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) /* Copied from WCMD_run_program() in programs/cmd/wcmdmain.c */ #define MAXSTRING 8192 - static const WCHAR slashW[] = {'\\','\0',}; - static const WCHAR envPath[] = {'P','A','T','H','\0'}; - static const WCHAR envPathExt[] = {'P','A','T','H','E','X','T','\0'}; - static const WCHAR dfltPathExt[] = {'.','b','a','t',';', - '.','c','o','m',';', - '.','c','m','d',';', - '.','e','x','e','\0'}; - static const WCHAR delims[] = {'/','\\',':','\0'}; WCHAR temp[MAX_PATH]; WCHAR pathtosearch[MAXSTRING]; @@ -216,13 +204,11 @@ static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) DWORD len; /* Calculate the search path and stem to search for */ - if (wcspbrk (firstParam, delims) == NULL) { /* No explicit path given, search path */ - static const WCHAR curDir[] = {'.',';','\0'}; - lstrcpyW(pathtosearch, curDir); - len = GetEnvironmentVariableW(envPath, &pathtosearch[2], ARRAY_SIZE(pathtosearch)-2); + if (wcspbrk (firstParam, L"/\\:") == NULL) { /* No explicit path given, search path */ + lstrcpyW(pathtosearch, L".;"); + len = GetEnvironmentVariableW(L"PATH", &pathtosearch[2], ARRAY_SIZE(pathtosearch)-2); if ((len == 0) || (len >= ARRAY_SIZE(pathtosearch) - 2)) { - static const WCHAR curDir[] = {'.','\0'}; - lstrcpyW (pathtosearch, curDir); + lstrcpyW (pathtosearch, L"."); } if (wcschr(firstParam, '.') != NULL) extensionsupplied = TRUE; if (lstrlenW(firstParam) >= MAX_PATH) { @@ -245,9 +231,9 @@ static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) } /* Now extract PATHEXT */ - len = GetEnvironmentVariableW(envPathExt, pathext, ARRAY_SIZE(pathext)); + len = GetEnvironmentVariableW(L"PATHEXT", pathext, ARRAY_SIZE(pathext)); if ((len == 0) || (len >= ARRAY_SIZE(pathext))) { - lstrcpyW (pathext, dfltPathExt); + lstrcpyW (pathext, L".bat;.com;.cmd;.exe"); } /* Loop through the search path, dir by dir */ @@ -294,7 +280,7 @@ static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); /* 1. If extension supplied, see if that file exists */ - lstrcatW(thisDir, slashW); + lstrcatW(thisDir, L"\\"); lstrcatW(thisDir, stemofsearch); pos = &thisDir[lstrlenW(thisDir)]; /* Pos = end of name */ @@ -309,9 +295,8 @@ static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) if (!found) { HANDLE h; WIN32_FIND_DATAW finddata; - static const WCHAR allFiles[] = {'.','*','\0'}; - lstrcatW(thisDir,allFiles); + lstrcatW(thisDir, L".*"); h = FindFirstFileW(thisDir, &finddata); FindClose(h); if (h != INVALID_HANDLE_VALUE) { @@ -365,31 +350,9 @@ int __cdecl wmain (int argc, WCHAR *argv[]) WCHAR *parent_directory = NULL; DWORD binary_type; - static const WCHAR bW[] = { '/', 'b', 0 }; - static const WCHAR minW[] = { '/', 'm', 'i', 'n', 0 }; - static const WCHAR maxW[] = { '/', 'm', 'a', 'x', 0 }; - static const WCHAR lowW[] = { '/', 'l', 'o', 'w', 0 }; - static const WCHAR normalW[] = { '/', 'n', 'o', 'r', 'm', 'a', 'l', 0 }; - static const WCHAR highW[] = { '/', 'h', 'i', 'g', 'h', 0 }; - static const WCHAR realtimeW[] = { '/', 'r', 'e', 'a', 'l', 't', 'i', 'm', 'e', 0 }; - static const WCHAR abovenormalW[] = { '/', 'a', 'b', 'o', 'v', 'e', 'n', 'o', 'r', 'm', 'a', 'l', 0 }; - static const WCHAR belownormalW[] = { '/', 'b', 'e', 'l', 'o', 'w', 'n', 'o', 'r', 'm', 'a', 'l', 0 }; - static const WCHAR separateW[] = { '/', 's', 'e', 'p', 'a', 'r', 'a', 't', 'e', 0 }; - static const WCHAR sharedW[] = { '/', 's', 'h', 'a', 'r', 'e', 'd', 0 }; - static const WCHAR nodeW[] = { '/', 'n', 'o', 'd', 'e', 0 }; - static const WCHAR affinityW[] = { '/', 'a', 'f', 'f', 'i', 'n', 'i', 't', 'y', 0 }; - static const WCHAR wW[] = { '/', 'w', 0 }; - static const WCHAR waitW[] = { '/', 'w', 'a', 'i', 't', 0 }; - static const WCHAR helpW[] = { '/', '?', 0 }; - static const WCHAR unixW[] = { '/', 'u', 'n', 'i', 'x', 0 }; - static const WCHAR progIDOpenW[] = - { '/', 'p', 'r', 'o', 'g', 'I', 'D', 'O', 'p', 'e', 'n', 0}; - static const WCHAR openW[] = { 'o', 'p', 'e', 'n', 0 }; - static const WCHAR cmdW[] = { 'c', 'm', 'd', '.', 'e', 'x', 'e', 0 }; - memset(&sei, 0, sizeof(sei)); sei.cbSize = sizeof(sei); - sei.lpVerb = openW; + sei.lpVerb = L"open"; sei.nShow = SW_SHOWNORMAL; /* Dunno what these mean, but it looks like winMe's start uses them */ sei.fMask = SEE_MASK_FLAG_DDEWAIT| @@ -431,43 +394,43 @@ int __cdecl wmain (int argc, WCHAR *argv[]) } else sei.lpDirectory = argv[++i]; } - else if (is_option(argv[i], bW)) { + else if (is_option(argv[i], L"/b")) { creation_flags &= ~CREATE_NEW_CONSOLE; } else if (argv[i][0] == '/' && (argv[i][1] == 'i' || argv[i][1] == 'I')) { TRACE("/i is ignored\n"); /* FIXME */ } - else if (is_option(argv[i], minW)) { + else if (is_option(argv[i], L"/min")) { sei.nShow = SW_SHOWMINIMIZED; } - else if (is_option(argv[i], maxW)) { + else if (is_option(argv[i], L"/max")) { sei.nShow = SW_SHOWMAXIMIZED; } - else if (is_option(argv[i], lowW)) { + else if (is_option(argv[i], L"/low")) { creation_flags |= IDLE_PRIORITY_CLASS; } - else if (is_option(argv[i], normalW)) { + else if (is_option(argv[i], L"/normal")) { creation_flags |= NORMAL_PRIORITY_CLASS; } - else if (is_option(argv[i], highW)) { + else if (is_option(argv[i], L"/high")) { creation_flags |= HIGH_PRIORITY_CLASS; } - else if (is_option(argv[i], realtimeW)) { + else if (is_option(argv[i], L"/realtime")) { creation_flags |= REALTIME_PRIORITY_CLASS; } - else if (is_option(argv[i], abovenormalW)) { + else if (is_option(argv[i], L"/abovenormal")) { creation_flags |= ABOVE_NORMAL_PRIORITY_CLASS; } - else if (is_option(argv[i], belownormalW)) { + else if (is_option(argv[i], L"/belownormal")) { creation_flags |= BELOW_NORMAL_PRIORITY_CLASS; } - else if (is_option(argv[i], separateW)) { + else if (is_option(argv[i], L"/separate")) { TRACE("/separate is ignored\n"); /* FIXME */ } - else if (is_option(argv[i], sharedW)) { + else if (is_option(argv[i], L"/shared")) { TRACE("/shared is ignored\n"); /* FIXME */ } - else if (is_option(argv[i], nodeW)) { + else if (is_option(argv[i], L"/node")) { if (i+1 == argc) { WINE_ERR("you must specify a numa node for the /node option\n"); usage(); @@ -477,7 +440,7 @@ int __cdecl wmain (int argc, WCHAR *argv[]) i++; } } - else if (is_option(argv[i], affinityW)) + else if (is_option(argv[i], L"/affinity")) { if (i+1 == argc) { WINE_ERR("you must specify a numa node for the /node option\n"); @@ -488,19 +451,19 @@ int __cdecl wmain (int argc, WCHAR *argv[]) i++; } } - else if (is_option(argv[i], wW) || is_option(argv[i], waitW)) { + else if (is_option(argv[i], L"/w") || is_option(argv[i], L"/wait")) { sei.fMask |= SEE_MASK_NOCLOSEPROCESS; } - else if (is_option(argv[i], helpW)) { + else if (is_option(argv[i], L"/?")) { usage(); } /* Wine extensions */ - else if (is_option(argv[i], unixW)) { + else if (is_option(argv[i], L"/unix")) { unix_mode = TRUE; } - else if (is_option(argv[i], progIDOpenW)) { + else if (is_option(argv[i], L"/progIDOpen")) { progid_open = TRUE; } else @@ -520,7 +483,7 @@ int __cdecl wmain (int argc, WCHAR *argv[]) if (i == argc) { if (progid_open || unix_mode) usage(); - file = cmdW; + file = L"cmd.exe"; } else file = argv[i++]; @@ -570,13 +533,12 @@ int __cdecl wmain (int argc, WCHAR *argv[]) WCHAR *commandline; STARTUPINFOW startup_info; PROCESS_INFORMATION process_information; - static const WCHAR commandlineformat[] = {'"','%','s','"','%','s',0}; /* explorer on windows always quotes the filename when running a binary on windows (see bug 5224) so we have to use CreateProcessW in this case */ commandline = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(sei.lpFile)+3+lstrlenW(sei.lpParameters))*sizeof(WCHAR)); swprintf(commandline, lstrlenW(sei.lpFile) + 3 + lstrlenW(sei.lpParameters), - commandlineformat, sei.lpFile, sei.lpParameters); + L"\"%s\"%s", sei.lpFile, sei.lpParameters); ZeroMemory(&startup_info, sizeof(startup_info)); startup_info.cb = sizeof(startup_info); @@ -604,12 +566,11 @@ int __cdecl wmain (int argc, WCHAR *argv[]) if (!ShellExecuteExW(&sei)) { - static const WCHAR pathextW[] = {'P','A','T','H','E','X','T',0}; const WCHAR *filename = sei.lpFile; DWORD size, filename_len; WCHAR *name, *env; - size = GetEnvironmentVariableW(pathextW, NULL, 0); + size = GetEnvironmentVariableW(L"PATHEXT", NULL, 0); if (size) { WCHAR *start, *ptr; @@ -617,7 +578,7 @@ int __cdecl wmain (int argc, WCHAR *argv[]) env = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); if (!env) fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, sei.lpFile); - GetEnvironmentVariableW(pathextW, env, size); + GetEnvironmentVariableW(L"PATHEXT", env, size); filename_len = lstrlenW(filename); name = HeapAlloc(GetProcessHeap(), 0, (filename_len + size) * sizeof(WCHAR)); -- 2.26.2

1 0

[PATCH] wintab32: Use zero terminated wide-char strings.
by Michael Stefaniuc Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wintab32/wintab32.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 98ce2bc1739..d56706b4223 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintab32); HWND hwndDefault = NULL; -static const WCHAR - WC_TABLETCLASSNAME[] = {'W','i','n','e','T','a','b','l','e','t','C','l','a','s','s',0}; static CRITICAL_SECTION_DEBUG csTablet_debug = { 0, 0, &csTablet, @@ -62,34 +60,26 @@ static VOID TABLET_Register(void) wndClass.cbWndExtra = 0; wndClass.hCursor = NULL; wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1); - wndClass.lpszClassName = WC_TABLETCLASSNAME; + wndClass.lpszClassName = L"WineTabletClass"; RegisterClassW(&wndClass); } static VOID TABLET_Unregister(void) { - UnregisterClassW(WC_TABLETCLASSNAME, NULL); + UnregisterClassW(L"WineTabletClass", NULL); } static HMODULE load_graphics_driver(void) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; - static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + static const WCHAR key_pathW[] = L"System\\CurrentControlSet\\Control\\Video\\{"; + static const WCHAR displayW[] = L"}\\0000"; HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), L"__wine_display_device_guid" )); if (!guid_atom) return 0; memcpy( key, key_pathW, sizeof(key_pathW) ); @@ -97,7 +87,7 @@ static HMODULE load_graphics_driver(void) lstrcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); - if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); + if (!RegQueryValueExW( hkey, L"GraphicsDriver", NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); RegCloseKey( hkey ); TRACE( "%s %p\n", debugstr_w(path), ret ); return ret; @@ -105,8 +95,6 @@ static HMODULE load_graphics_driver(void) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { - static const WCHAR name[] = {'T','a','b','l','e','t',0}; - TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) { @@ -114,7 +102,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) TRACE("Initialization\n"); DisableThreadLibraryCalls(hInstDLL); TABLET_Register(); - hwndDefault = CreateWindowW(WC_TABLETCLASSNAME, name, + hwndDefault = CreateWindowW(L"WineTabletClass", L"Tablet", WS_POPUPWINDOW,0,0,0,0,0,0,hInstDLL,0); if (hwndDefault) { -- 2.26.2

1 0

[PATCH] start: Use zero terminated wide-char strings.
by Michael Stefaniuc Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/start/start.c | 107 +++++++++++++---------------------------- 1 file changed, 34 insertions(+), 73 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index fd952083acd..e3071a3a09a 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -75,11 +75,9 @@ static void fatal_error(const WCHAR *msg, DWORD error_code, const WCHAR *filenam DWORD_PTR args[1]; LPVOID lpMsgBuf; int status; - static const WCHAR colonsW[] = { ':', ' ', 0 }; - static const WCHAR newlineW[] = { '\n', 0 }; output(msg); - output(colonsW); + output(L": "); args[0] = (DWORD_PTR)filename; status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, NULL, error_code, 0, (LPWSTR)&lpMsgBuf, 0, (__ms_va_list *)args ); @@ -90,7 +88,7 @@ static void fatal_error(const WCHAR *msg, DWORD error_code, const WCHAR *filenam { output(lpMsgBuf); LocalFree((HLOCAL) lpMsgBuf); - output(newlineW); + output(L"\n"); } ExitProcess(1); } @@ -125,8 +123,6 @@ static WCHAR *build_args( int argc, WCHAR **argvW ) { int i, wlen = 1; WCHAR *ret, *p; - static const WCHAR FormatQuotesW[] = { ' ', '\"', '%', 's', '\"', 0 }; - static const WCHAR FormatW[] = { ' ', '%', 's', 0 }; for (i = 0; i < argc; i++ ) { @@ -140,9 +136,9 @@ static WCHAR *build_args( int argc, WCHAR **argvW ) for (i = 0, p = ret; i < argc; i++ ) { if (wcschr(argvW[i], ' ')) - p += swprintf(p, wlen - (p - ret), FormatQuotesW, argvW[i]); + p += swprintf(p, wlen - (p - ret), L" \"%s\"", argvW[i]); else - p += swprintf(p, wlen - (p - ret), FormatW, argvW[i]); + p += swprintf(p, wlen - (p - ret), L" %s", argvW[i]); } return ret; } @@ -196,14 +192,6 @@ static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) /* Copied from WCMD_run_program() in programs/cmd/wcmdmain.c */ #define MAXSTRING 8192 - static const WCHAR slashW[] = {'\\','\0',}; - static const WCHAR envPath[] = {'P','A','T','H','\0'}; - static const WCHAR envPathExt[] = {'P','A','T','H','E','X','T','\0'}; - static const WCHAR dfltPathExt[] = {'.','b','a','t',';', - '.','c','o','m',';', - '.','c','m','d',';', - '.','e','x','e','\0'}; - static const WCHAR delims[] = {'/','\\',':','\0'}; WCHAR temp[MAX_PATH]; WCHAR pathtosearch[MAXSTRING]; @@ -216,13 +204,11 @@ static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) DWORD len; /* Calculate the search path and stem to search for */ - if (wcspbrk (firstParam, delims) == NULL) { /* No explicit path given, search path */ - static const WCHAR curDir[] = {'.',';','\0'}; - lstrcpyW(pathtosearch, curDir); - len = GetEnvironmentVariableW(envPath, &pathtosearch[2], ARRAY_SIZE(pathtosearch)-2); + if (wcspbrk (firstParam, L"/\\:") == NULL) { /* No explicit path given, search path */ + lstrcpyW(pathtosearch, L".;"); + len = GetEnvironmentVariableW(L"PATH", &pathtosearch[2], ARRAY_SIZE(pathtosearch)-2); if ((len == 0) || (len >= ARRAY_SIZE(pathtosearch) - 2)) { - static const WCHAR curDir[] = {'.','\0'}; - lstrcpyW (pathtosearch, curDir); + lstrcpyW (pathtosearch, L"."); } if (wcschr(firstParam, '.') != NULL) extensionsupplied = TRUE; if (lstrlenW(firstParam) >= MAX_PATH) { @@ -245,9 +231,9 @@ static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) } /* Now extract PATHEXT */ - len = GetEnvironmentVariableW(envPathExt, pathext, ARRAY_SIZE(pathext)); + len = GetEnvironmentVariableW(L"PATHEXT", pathext, ARRAY_SIZE(pathext)); if ((len == 0) || (len >= ARRAY_SIZE(pathext))) { - lstrcpyW (pathext, dfltPathExt); + lstrcpyW (pathext, L".bat;.com;.cmd;.exe"); } /* Loop through the search path, dir by dir */ @@ -294,7 +280,7 @@ static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); /* 1. If extension supplied, see if that file exists */ - lstrcatW(thisDir, slashW); + lstrcatW(thisDir, L"\\"); lstrcatW(thisDir, stemofsearch); pos = &thisDir[lstrlenW(thisDir)]; /* Pos = end of name */ @@ -309,9 +295,8 @@ static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) if (!found) { HANDLE h; WIN32_FIND_DATAW finddata; - static const WCHAR allFiles[] = {'.','*','\0'}; - lstrcatW(thisDir,allFiles); + lstrcatW(thisDir, L".*"); h = FindFirstFileW(thisDir, &finddata); FindClose(h); if (h != INVALID_HANDLE_VALUE) { @@ -365,31 +350,9 @@ int __cdecl wmain (int argc, WCHAR *argv[]) WCHAR *parent_directory = NULL; DWORD binary_type; - static const WCHAR bW[] = { '/', 'b', 0 }; - static const WCHAR minW[] = { '/', 'm', 'i', 'n', 0 }; - static const WCHAR maxW[] = { '/', 'm', 'a', 'x', 0 }; - static const WCHAR lowW[] = { '/', 'l', 'o', 'w', 0 }; - static const WCHAR normalW[] = { '/', 'n', 'o', 'r', 'm', 'a', 'l', 0 }; - static const WCHAR highW[] = { '/', 'h', 'i', 'g', 'h', 0 }; - static const WCHAR realtimeW[] = { '/', 'r', 'e', 'a', 'l', 't', 'i', 'm', 'e', 0 }; - static const WCHAR abovenormalW[] = { '/', 'a', 'b', 'o', 'v', 'e', 'n', 'o', 'r', 'm', 'a', 'l', 0 }; - static const WCHAR belownormalW[] = { '/', 'b', 'e', 'l', 'o', 'w', 'n', 'o', 'r', 'm', 'a', 'l', 0 }; - static const WCHAR separateW[] = { '/', 's', 'e', 'p', 'a', 'r', 'a', 't', 'e', 0 }; - static const WCHAR sharedW[] = { '/', 's', 'h', 'a', 'r', 'e', 'd', 0 }; - static const WCHAR nodeW[] = { '/', 'n', 'o', 'd', 'e', 0 }; - static const WCHAR affinityW[] = { '/', 'a', 'f', 'f', 'i', 'n', 'i', 't', 'y', 0 }; - static const WCHAR wW[] = { '/', 'w', 0 }; - static const WCHAR waitW[] = { '/', 'w', 'a', 'i', 't', 0 }; - static const WCHAR helpW[] = { '/', '?', 0 }; - static const WCHAR unixW[] = { '/', 'u', 'n', 'i', 'x', 0 }; - static const WCHAR progIDOpenW[] = - { '/', 'p', 'r', 'o', 'g', 'I', 'D', 'O', 'p', 'e', 'n', 0}; - static const WCHAR openW[] = { 'o', 'p', 'e', 'n', 0 }; - static const WCHAR cmdW[] = { 'c', 'm', 'd', '.', 'e', 'x', 'e', 0 }; - memset(&sei, 0, sizeof(sei)); sei.cbSize = sizeof(sei); - sei.lpVerb = openW; + sei.lpVerb = L"open"; sei.nShow = SW_SHOWNORMAL; /* Dunno what these mean, but it looks like winMe's start uses them */ sei.fMask = SEE_MASK_FLAG_DDEWAIT| @@ -431,43 +394,43 @@ int __cdecl wmain (int argc, WCHAR *argv[]) } else sei.lpDirectory = argv[++i]; } - else if (is_option(argv[i], bW)) { + else if (is_option(argv[i], L"/b")) { creation_flags &= ~CREATE_NEW_CONSOLE; } else if (argv[i][0] == '/' && (argv[i][1] == 'i' || argv[i][1] == 'I')) { TRACE("/i is ignored\n"); /* FIXME */ } - else if (is_option(argv[i], minW)) { + else if (is_option(argv[i], L"/min")) { sei.nShow = SW_SHOWMINIMIZED; } - else if (is_option(argv[i], maxW)) { + else if (is_option(argv[i], L"/max")) { sei.nShow = SW_SHOWMAXIMIZED; } - else if (is_option(argv[i], lowW)) { + else if (is_option(argv[i], L"/low")) { creation_flags |= IDLE_PRIORITY_CLASS; } - else if (is_option(argv[i], normalW)) { + else if (is_option(argv[i], L"/normal")) { creation_flags |= NORMAL_PRIORITY_CLASS; } - else if (is_option(argv[i], highW)) { + else if (is_option(argv[i], L"/high")) { creation_flags |= HIGH_PRIORITY_CLASS; } - else if (is_option(argv[i], realtimeW)) { + else if (is_option(argv[i], L"/realtime")) { creation_flags |= REALTIME_PRIORITY_CLASS; } - else if (is_option(argv[i], abovenormalW)) { + else if (is_option(argv[i], L"/abovenormal")) { creation_flags |= ABOVE_NORMAL_PRIORITY_CLASS; } - else if (is_option(argv[i], belownormalW)) { + else if (is_option(argv[i], L"/belownormal")) { creation_flags |= BELOW_NORMAL_PRIORITY_CLASS; } - else if (is_option(argv[i], separateW)) { + else if (is_option(argv[i], L"/separate")) { TRACE("/separate is ignored\n"); /* FIXME */ } - else if (is_option(argv[i], sharedW)) { + else if (is_option(argv[i], L"/shared")) { TRACE("/shared is ignored\n"); /* FIXME */ } - else if (is_option(argv[i], nodeW)) { + else if (is_option(argv[i], L"/node")) { if (i+1 == argc) { WINE_ERR("you must specify a numa node for the /node option\n"); usage(); @@ -477,7 +440,7 @@ int __cdecl wmain (int argc, WCHAR *argv[]) i++; } } - else if (is_option(argv[i], affinityW)) + else if (is_option(argv[i], L"/affinity")) { if (i+1 == argc) { WINE_ERR("you must specify a numa node for the /node option\n"); @@ -488,19 +451,19 @@ int __cdecl wmain (int argc, WCHAR *argv[]) i++; } } - else if (is_option(argv[i], wW) || is_option(argv[i], waitW)) { + else if (is_option(argv[i], L"/w") || is_option(argv[i], L"/wait")) { sei.fMask |= SEE_MASK_NOCLOSEPROCESS; } - else if (is_option(argv[i], helpW)) { + else if (is_option(argv[i], L"/?")) { usage(); } /* Wine extensions */ - else if (is_option(argv[i], unixW)) { + else if (is_option(argv[i], L"/unix")) { unix_mode = TRUE; } - else if (is_option(argv[i], progIDOpenW)) { + else if (is_option(argv[i], L"/progIDOpen")) { progid_open = TRUE; } else @@ -520,7 +483,7 @@ int __cdecl wmain (int argc, WCHAR *argv[]) if (i == argc) { if (progid_open || unix_mode) usage(); - file = cmdW; + file = L"cmd.exe"; } else file = argv[i++]; @@ -570,13 +533,12 @@ int __cdecl wmain (int argc, WCHAR *argv[]) WCHAR *commandline; STARTUPINFOW startup_info; PROCESS_INFORMATION process_information; - static const WCHAR commandlineformat[] = {'"','%','s','"','%','s',0}; /* explorer on windows always quotes the filename when running a binary on windows (see bug 5224) so we have to use CreateProcessW in this case */ commandline = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(sei.lpFile)+3+lstrlenW(sei.lpParameters))*sizeof(WCHAR)); swprintf(commandline, lstrlenW(sei.lpFile) + 3 + lstrlenW(sei.lpParameters), - commandlineformat, sei.lpFile, sei.lpParameters); + L"\"%s\"%s", sei.lpFile, sei.lpParameters); ZeroMemory(&startup_info, sizeof(startup_info)); startup_info.cb = sizeof(startup_info); @@ -604,12 +566,11 @@ int __cdecl wmain (int argc, WCHAR *argv[]) if (!ShellExecuteExW(&sei)) { - static const WCHAR pathextW[] = {'P','A','T','H','E','X','T',0}; const WCHAR *filename = sei.lpFile; DWORD size, filename_len; WCHAR *name, *env; - size = GetEnvironmentVariableW(pathextW, NULL, 0); + size = GetEnvironmentVariableW(L"PATHEXT", NULL, 0); if (size) { WCHAR *start, *ptr; @@ -617,7 +578,7 @@ int __cdecl wmain (int argc, WCHAR *argv[]) env = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); if (!env) fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, sei.lpFile); - GetEnvironmentVariableW(pathextW, env, size); + GetEnvironmentVariableW(L"PATHEXT", env, size); filename_len = lstrlenW(filename); name = HeapAlloc(GetProcessHeap(), 0, (filename_len + size) * sizeof(WCHAR)); -- 2.26.2

1 0

[PATCH 4/4] conhost: Use console debug channel.
by Jacek Caban Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 2 +- programs/conhost/window.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 3/4] conhost/tests: Initialize whole OVERLAPPED struct in fetch_console_output.
by Jacek Caban Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/tests/tty.c | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH 1/4] server: Allow named pipes creation with device file as root directory.
by Paul Gofman Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 34 ++++++++++++++++++++++++++++++++-- server/named_pipe.c | 25 ++++++++++++++++++------- 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 9e8b623d75b..bfc8dc0b3be 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -65,6 +65,7 @@ typedef struct { #endif static NTSTATUS (WINAPI *pNtFsControlFile) (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, PIO_STATUS_BLOCK io, ULONG code, PVOID in_buffer, ULONG in_size, PVOID out_buffer, ULONG out_size); +static NTSTATUS (WINAPI *pNtCreateDirectoryObject)(HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *); static NTSTATUS (WINAPI *pNtCreateNamedPipeFile) (PHANDLE handle, ULONG access, POBJECT_ATTRIBUTES attr, PIO_STATUS_BLOCK iosb, ULONG sharing, ULONG dispo, ULONG options, @@ -73,6 +74,7 @@ static NTSTATUS (WINAPI *pNtCreateNamedPipeFile) (PHANDLE handle, ULONG access, ULONG inbound_quota, ULONG outbound_quota, PLARGE_INTEGER timeout); static NTSTATUS (WINAPI *pNtQueryInformationFile) (IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID FileInformation, IN ULONG Length, IN FILE_INFORMATION_CLASS FileInformationClass); +static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, void *, ULONG, ULONG *); static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)(HANDLE handle, PIO_STATUS_BLOCK io, void *buffer, ULONG length, FS_INFORMATION_CLASS info_class); static NTSTATUS (WINAPI *pNtSetInformationFile) (HANDLE handle, PIO_STATUS_BLOCK io, PVOID ptr, ULONG len, FILE_INFORMATION_CLASS class); static NTSTATUS (WINAPI *pNtCancelIoFile) (HANDLE hFile, PIO_STATUS_BLOCK io_status); @@ -94,8 +96,10 @@ static BOOL init_func_ptrs(void) } loadfunc(NtFsControlFile) + loadfunc(NtCreateDirectoryObject) loadfunc(NtCreateNamedPipeFile) loadfunc(NtQueryInformationFile) + loadfunc(NtQueryObject) loadfunc(NtQueryVolumeInformationFile) loadfunc(NtSetInformationFile) loadfunc(NtCancelIoFile) @@ -2405,14 +2409,20 @@ static void test_security_info(void) static void test_empty_name(void) { HANDLE hdirectory, hpipe, hwrite, handle; + OBJECT_TYPE_INFORMATION *type_info; + OBJECT_NAME_INFORMATION *name_info; OBJECT_ATTRIBUTES attr; LARGE_INTEGER timeout; UNICODE_STRING name; IO_STATUS_BLOCK io; DWORD data, length; + char buffer[1024]; NTSTATUS status; BOOL ret; + type_info = (OBJECT_TYPE_INFORMATION *)buffer; + name_info = (OBJECT_NAME_INFORMATION *)buffer; + hpipe = hwrite = NULL; attr.Length = sizeof(attr); @@ -2438,13 +2448,17 @@ static void test_empty_name(void) &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, 0, 0, 0, 3, 4096, 4096, &timeout); todo_wine ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#x.\n", status); - + if (!status) + CloseHandle(hpipe); CloseHandle(hdirectory); pRtlInitUnicodeString(&name, L"\\Device\\NamedPipe\\"); attr.RootDirectory = 0; attr.ObjectName = &name; + status = pNtCreateDirectoryObject(&hdirectory, GENERIC_READ | SYNCHRONIZE, &attr); + todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status); + status = NtCreateFile(&hdirectory, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); ok(!status, "Got unexpected status %#x.\n", status); @@ -2454,10 +2468,18 @@ static void test_empty_name(void) name.MaximumLength = 0; attr.RootDirectory = hdirectory; + hpipe = NULL; status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, 0, 0, 0, 3, 4096, 4096, &timeout); - todo_wine ok(!status, "Got unexpected status %#x.\n", status); + ok(!status, "Got unexpected status %#x.\n", status); + type_info->TypeName.Buffer = NULL; + status = pNtQueryObject(hpipe, ObjectTypeInformation, type_info, sizeof(buffer), NULL); + ok(!status, "Got unexpected status %#x.\n", status); + ok(type_info->TypeName.Buffer && !wcscmp(type_info->TypeName.Buffer, L"File"), + "Got unexpected type %s.\n", debugstr_w(type_info->TypeName.Buffer)); + status = pNtQueryObject(hpipe, ObjectNameInformation, name_info, sizeof(buffer), NULL); + todo_wine ok(status == STATUS_OBJECT_PATH_INVALID, "Got unexpected status %#x.\n", status); status = pNtCreateNamedPipeFile(&handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, @@ -2469,6 +2491,14 @@ static void test_empty_name(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); todo_wine ok(!status, "Got unexpected status %#x.\n", status); + type_info->TypeName.Buffer = NULL; + status = pNtQueryObject(hwrite, ObjectTypeInformation, type_info, sizeof(buffer), NULL); + todo_wine ok(!status, "Got unexpected status %#x.\n", status); + todo_wine ok(type_info->TypeName.Buffer && !wcscmp(type_info->TypeName.Buffer, L"File"), + "Got unexpected type %s.\n", debugstr_w(type_info->TypeName.Buffer)); + status = pNtQueryObject(hwrite, ObjectNameInformation, name_info, sizeof(buffer), NULL); + todo_wine ok(status == STATUS_OBJECT_PATH_INVALID, "Got unexpected status %#x.\n", status); + attr.RootDirectory = hpipe; status = NtCreateFile(&handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, diff --git a/server/named_pipe.c b/server/named_pipe.c index 60bd059d93d..ebf13c04a50 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1350,28 +1350,39 @@ DECL_HANDLER(create_named_pipe) struct named_pipe *pipe; struct pipe_server *server; struct unicode_str name; - struct object *root; + struct object *root = NULL; const struct security_descriptor *sd; - const struct object_attributes *objattr = get_req_object_attributes( &sd, &name, &root ); + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name, NULL ); if (!objattr) return; if (!req->sharing || (req->sharing & ~(FILE_SHARE_READ | FILE_SHARE_WRITE)) || (!(req->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) && (req->flags & NAMED_PIPE_MESSAGE_STREAM_READ))) { - if (root) release_object( root ); set_error( STATUS_INVALID_PARAMETER ); return; } - if (!name.len) /* pipes need a root directory even without a name */ + if (objattr->rootdir) { - if (!objattr->rootdir) + struct object *obj; + + if ((obj = get_handle_obj( current->process, objattr->rootdir, 0, &named_pipe_device_file_ops ))) + { + root = grab_object( &((struct named_pipe_device_file *)obj)->device->obj ); + release_object( obj ); + } + else { - set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); return; } - if (!(root = get_directory_obj( current->process, objattr->rootdir ))) return; + } + + if (!name.len && !root) /* pipes need a root directory even without a name */ + { + if (!objattr->rootdir) + set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); + return; } pipe = create_named_object( root, &named_pipe_ops, &name, objattr->attributes | OBJ_OPENIF, NULL ); -- 2.28.0

2 7

[PATCH 2/4] kernel32: Allow non-console handles in CloseConsoleHandle.
by Jacek Caban Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 7 +------ dlls/kernel32/kernel_private.h | 8 -------- dlls/kernel32/tests/console.c | 2 -- 3 files changed, 1 insertion(+), 16 deletions(-)

2 1

[PATCH 1/4] kernel32: Allow non-console handles in DuplicateConsoleHandle.
by Jacek Caban Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 10 +++------- dlls/kernel32/tests/console.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 7 deletions(-)

2 1

[PATCH 1/2] crypt32: Add support for CMSG_SIGNER_AUTH_ATTR_PARAM for a being decoded signed message.
by Dmitry Timoshkov Nov. 11, 2020

Nov. 11, 2020

Based on CMSG_SIGNER_UNAUTH_ATTR_PARAM implementation. This is a resend, previous patches felt out of the list. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/msg.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index b71c52bb0f..13d7e06eb8 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2995,6 +2995,34 @@ static BOOL CDecodeEnvelopedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, return ret; } +static BOOL CRYPT_CopyAuthAttr(void *pvData, DWORD *pcbData, const CMSG_CMS_SIGNER_INFO *in) +{ + DWORD size; + BOOL ret; + + TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); + + size = CRYPT_SizeOfAttributes(&in->AuthAttrs); + if (!pvData) + { + *pcbData = size; + ret = TRUE; + } + else if (*pcbData < size) + { + *pcbData = size; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + CRYPT_ConstructAttributes(pvData, &in->AuthAttrs); + ret = TRUE; + } + TRACE("returning %d\n", ret); + return ret; +} + static BOOL CRYPT_CopyUnauthAttr(void *pvData, DWORD *pcbData, const CMSG_CMS_SIGNER_INFO *in) { @@ -3199,6 +3227,20 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + + case CMSG_SIGNER_AUTH_ATTR_PARAM: + if (msg->u.signed_data.info) + { + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyAuthAttr(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex]); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_SIGNER_UNAUTH_ATTR_PARAM: if (msg->u.signed_data.info) { -- 2.29.2

2 1