- Wine-Devel - list.winehq.org

[PATCH 1/2] advpack: Don't use sizeof to calculate the length of a WCHAR string
by Michael Stefaniuc Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advpack/install.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index d82de9c3617..24e2c4579a9 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -446,10 +446,6 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, LPCWSTR ptr, path; static const WCHAR backslash[] = {'\\',0}; - static const WCHAR default_install[] = { - 'D','e','f','a','u','l','t','I','n','s','t','a','l','l',0 - }; - if (!(ptr = wcsrchr(inf_filename, '\\'))) ptr = inf_filename; @@ -464,16 +460,16 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, /* FIXME: determine the proper platform to install (NTx86, etc) */ if (!install_sec || !*install_sec) { - len = sizeof(default_install) - 1; - ptr = default_install; + len = ARRAY_SIZE(L"DefaultInstall"); + ptr = L"DefaultInstall"; } else { - len = lstrlenW(install_sec); + len = lstrlenW(install_sec) + 1; ptr = install_sec; } - info->install_sec = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + info->install_sec = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!info->install_sec) return E_OUTOFMEMORY; -- 2.26.2

1 0

[PATCH] winemine: Use wide-char string literals.
by Michael Stefaniuc Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winemine/main.c | 53 +++++++++++++++------------------------- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 255d21714fd..37ce1927047 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -33,19 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winemine); static const DWORD wnd_style = WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX; -static const WCHAR registry_key[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','M','i','n','e',0}; - -static const WCHAR xposW[] = {'X','p','o','s',0}; -static const WCHAR yposW[] = {'Y','p','o','s',0}; -static const WCHAR heightW[] = {'H','e','i','g','h','t',0}; -static const WCHAR widthW[] = {'W','i','d','t','h',0}; -static const WCHAR minesW[] = {'M','i','n','e','s',0}; -static const WCHAR difficultyW[] = {'D','i','f','f','i','c','u','l','t','y',0}; -static const WCHAR markW[] = {'M','a','r','k',0}; -static const WCHAR nameW[] = {'N','a','m','e','%','u',0}; -static const WCHAR timeW[] = {'T','i','m','e','%','u',0}; void CheckLevel( BOARD *p_board ) { @@ -77,38 +64,38 @@ static void LoadBoard( BOARD *p_board ) WCHAR key_name[8]; unsigned i; - RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hkey ); + RegOpenKeyExW( HKEY_CURRENT_USER, L"Software\\Microsoft\\WinMine", 0, KEY_QUERY_VALUE, &hkey ); size = sizeof( p_board->pos.x ); - if( RegQueryValueExW( hkey, xposW, NULL, &type, (BYTE*) &p_board->pos.x, &size ) ) + if( RegQueryValueExW( hkey, L"Xpos", NULL, &type, (BYTE*) &p_board->pos.x, &size ) ) p_board->pos.x = 0; size = sizeof( p_board->pos.y ); - if( RegQueryValueExW( hkey, yposW, NULL, &type, (BYTE*) &p_board->pos.y, &size ) ) + if( RegQueryValueExW( hkey, L"Ypos", NULL, &type, (BYTE*) &p_board->pos.y, &size ) ) p_board->pos.y = 0; size = sizeof( p_board->rows ); - if( RegQueryValueExW( hkey, heightW, NULL, &type, (BYTE*) &p_board->rows, &size ) ) + if( RegQueryValueExW( hkey, L"Height", NULL, &type, (BYTE*) &p_board->rows, &size ) ) p_board->rows = BEGINNER_ROWS; size = sizeof( p_board->cols ); - if( RegQueryValueExW( hkey, widthW, NULL, &type, (BYTE*) &p_board->cols, &size ) ) + if( RegQueryValueExW( hkey, L"Width", NULL, &type, (BYTE*) &p_board->cols, &size ) ) p_board->cols = BEGINNER_COLS; size = sizeof( p_board->mines ); - if( RegQueryValueExW( hkey, minesW, NULL, &type, (BYTE*) &p_board->mines, &size ) ) + if( RegQueryValueExW( hkey, L"Mines", NULL, &type, (BYTE*) &p_board->mines, &size ) ) p_board->mines = BEGINNER_MINES; size = sizeof( p_board->difficulty ); - if( RegQueryValueExW( hkey, difficultyW, NULL, &type, (BYTE*) &p_board->difficulty, &size ) ) + if( RegQueryValueExW( hkey, L"Difficulty", NULL, &type, (BYTE*) &p_board->difficulty, &size ) ) p_board->difficulty = BEGINNER; size = sizeof( p_board->IsMarkQ ); - if( RegQueryValueExW( hkey, markW, NULL, &type, (BYTE*) &p_board->IsMarkQ, &size ) ) + if( RegQueryValueExW( hkey, L"Mark", NULL, &type, (BYTE*) &p_board->IsMarkQ, &size ) ) p_board->IsMarkQ = TRUE; for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, nameW, i+1 ); + wsprintfW( key_name, L"Name%u", i+1 ); size = sizeof( data ); if( RegQueryValueExW( hkey, key_name, NULL, &type, (LPBYTE) data, &size ) == ERROR_SUCCESS ) @@ -118,7 +105,7 @@ static void LoadBoard( BOARD *p_board ) } for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, timeW, i+1 ); + wsprintfW( key_name, L"Time%u", i+1 ); size = sizeof( p_board->best_time[i] ); if( RegQueryValueExW( hkey, key_name, NULL, &type, (BYTE*) &p_board->best_time[i], &size ) ) p_board->best_time[i] = 999; @@ -163,28 +150,28 @@ void SaveBoard( BOARD *p_board ) WCHAR data[MAX_PLAYER_NAME_SIZE+1]; WCHAR key_name[8]; - if( RegCreateKeyExW( HKEY_CURRENT_USER, registry_key, + if( RegCreateKeyExW( HKEY_CURRENT_USER, L"Software\\Microsoft\\WinMine", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL ) != ERROR_SUCCESS) return; - RegSetValueExW( hkey, xposW, 0, REG_DWORD, (LPBYTE) &p_board->pos.x, sizeof(p_board->pos.x) ); - RegSetValueExW( hkey, yposW, 0, REG_DWORD, (LPBYTE) &p_board->pos.y, sizeof(p_board->pos.y) ); - RegSetValueExW( hkey, difficultyW, 0, REG_DWORD, (LPBYTE) &p_board->difficulty, sizeof(p_board->difficulty) ); - RegSetValueExW( hkey, heightW, 0, REG_DWORD, (LPBYTE) &p_board->rows, sizeof(p_board->rows) ); - RegSetValueExW( hkey, widthW, 0, REG_DWORD, (LPBYTE) &p_board->cols, sizeof(p_board->cols) ); - RegSetValueExW( hkey, minesW, 0, REG_DWORD, (LPBYTE) &p_board->mines, sizeof(p_board->mines) ); - RegSetValueExW( hkey, markW, 0, REG_DWORD, (LPBYTE) &p_board->IsMarkQ, sizeof(p_board->IsMarkQ) ); + RegSetValueExW( hkey, L"Xpos", 0, REG_DWORD, (BYTE*) &p_board->pos.x, sizeof(p_board->pos.x) ); + RegSetValueExW( hkey, L"Ypos", 0, REG_DWORD, (BYTE*) &p_board->pos.y, sizeof(p_board->pos.y) ); + RegSetValueExW( hkey, L"Difficulty", 0, REG_DWORD, (BYTE*) &p_board->difficulty, sizeof(p_board->difficulty) ); + RegSetValueExW( hkey, L"Height", 0, REG_DWORD, (BYTE*) &p_board->rows, sizeof(p_board->rows) ); + RegSetValueExW( hkey, L"Width", 0, REG_DWORD, (BYTE*) &p_board->cols, sizeof(p_board->cols) ); + RegSetValueExW( hkey, L"Mines", 0, REG_DWORD, (BYTE*) &p_board->mines, sizeof(p_board->mines) ); + RegSetValueExW( hkey, L"Mark", 0, REG_DWORD, (BYTE*) &p_board->IsMarkQ, sizeof(p_board->IsMarkQ) ); for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, nameW, i+1 ); + wsprintfW( key_name, L"Name%u", i+1 ); lstrcpynW( data, p_board->best_name[i], ARRAY_SIZE(data)); RegSetValueExW( hkey, key_name, 0, REG_SZ, (LPBYTE) data, (lstrlenW(data)+1) * sizeof(WCHAR) ); } for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, timeW, i+1 ); + wsprintfW( key_name, L"Time%u", i+1 ); RegSetValueExW( hkey, key_name, 0, REG_DWORD, (LPBYTE) &p_board->best_time[i], sizeof(p_board->best_time[i]) ); } RegCloseKey( hkey ); -- 2.26.2

1 0

[PATCH] view: Use wide-char string literals.
by Michael Stefaniuc Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/view/view.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index 2664eeb9b1f..ad29734828b 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -24,7 +24,7 @@ static HINSTANCE hInst; static HWND hMainWnd; -static WCHAR szAppName[5] = {'V','i','e','w',0}; +static const WCHAR szAppName[] = L"View"; static WCHAR szTitle[MAX_PATH]; static WCHAR szFileTitle[MAX_PATH]; @@ -52,14 +52,13 @@ typedef struct static BOOL FileOpen(HWND hWnd, WCHAR *fn, int fnsz) { WCHAR filter[120], metafileFilter[100]; - static const WCHAR filterW[] = {'%','s','%','c','*','.','w','m','f',';','*','.','e','m','f','%','c',0}; OPENFILENAMEW ofn = { sizeof(OPENFILENAMEW), 0, 0, NULL, NULL, 0, 0, NULL, fnsz, NULL, 0, NULL, NULL, OFN_SHOWHELP, 0, 0, NULL, 0, NULL }; LoadStringW( hInst, IDS_OPEN_META_STRING, metafileFilter, ARRAY_SIZE(metafileFilter) ); - swprintf( filter, ARRAY_SIZE(filter), filterW, metafileFilter, 0, 0 ); + swprintf( filter, ARRAY_SIZE(filter), L"%s%c*.wmf;*.emf%c", metafileFilter, 0, 0 ); ofn.lpstrFilter = filter; ofn.hwndOwner = hWnd; @@ -217,7 +216,6 @@ static void UpdateWindowCaption(void) { WCHAR szCaption[MAX_PATH]; WCHAR szView[MAX_PATH]; - static const WCHAR hyphenW[] = { ' ','-',' ',0 }; LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); @@ -225,7 +223,7 @@ static void UpdateWindowCaption(void) { lstrcpyW(szCaption, szFileTitle); LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); - lstrcatW(szCaption, hyphenW); + lstrcatW(szCaption, L" - "); lstrcatW(szCaption, szView); } else -- 2.26.2

1 0

[PATCH] taskkill: Use wide-char string literals.
by Michael Stefaniuc Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/taskkill/taskkill.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 600bab14fde..193ed058297 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -102,12 +102,11 @@ static int WINAPIV taskkill_message_printfW(int msg, ...) static int taskkill_message(int msg) { - static const WCHAR formatW[] = {'%','1',0}; WCHAR msg_buffer[8192]; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - return taskkill_printfW(formatW, msg_buffer); + return taskkill_printfW(L"%1", msg_buffer); } /* Post WM_CLOSE to all top-level windows belonging to the process with specified PID. */ @@ -444,12 +443,6 @@ static BOOL add_to_task_list(WCHAR *name) * options are detected as parameters when placed after options that accept one. */ static BOOL process_arguments(int argc, WCHAR *argv[]) { - static const WCHAR opForceTerminate[] = {'f',0}; - static const WCHAR opImage[] = {'i','m',0}; - static const WCHAR opPID[] = {'p','i','d',0}; - static const WCHAR opHelp[] = {'?',0}; - static const WCHAR opTerminateChildren[] = {'t',0}; - if (argc > 1) { int i; @@ -460,7 +453,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) if (argc == 2) { argdata = argv[1]; - if ((*argdata == '/' || *argdata == '-') && !lstrcmpW(opHelp, argdata + 1)) + if ((*argdata == '/' || *argdata == '-') && !lstrcmpW(L"?", argdata + 1)) { taskkill_message(STRING_USAGE); exit(0); @@ -476,14 +469,14 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) goto invalid; argdata++; - if (!wcsicmp(opTerminateChildren, argdata)) + if (!wcsicmp(L"t", argdata)) WINE_FIXME("argument T not supported\n"); - if (!wcsicmp(opForceTerminate, argdata)) + if (!wcsicmp(L"f", argdata)) force_termination = TRUE; /* Options /IM and /PID appear to behave identically, except for * the fact that they cannot be specified at the same time. */ - else if ((got_im = !wcsicmp(opImage, argdata)) || - (got_pid = !wcsicmp(opPID, argdata))) + else if ((got_im = !wcsicmp(L"im", argdata)) || + (got_pid = !wcsicmp(L"pid", argdata))) { if (!argv[i + 1]) { -- 2.26.2

1 0

[PATCH] sc: Use wide-char string literals.
by Michael Stefaniuc Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/sc/sc.c | 123 +++++++++++++++-------------------------------- 1 file changed, 40 insertions(+), 83 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index c9744afee36..a20813b8cd5 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -43,16 +43,6 @@ struct create_params static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_params *cp ) { - static const WCHAR displaynameW[] = {'d','i','s','p','l','a','y','n','a','m','e','=',0}; - static const WCHAR typeW[] = {'t','y','p','e','=',0}; - static const WCHAR startW[] = {'s','t','a','r','t','=',0}; - static const WCHAR errorW[] = {'e','r','r','o','r','=',0}; - static const WCHAR binpathW[] = {'b','i','n','p','a','t','h','=',0}; - static const WCHAR groupW[] = {'g','r','o','u','p','=',0}; - static const WCHAR tagW[] = {'t','a','g','=',0}; - static const WCHAR dependW[] = {'d','e','p','e','n','d','=',0}; - static const WCHAR objW[] = {'o','b','j','=',0}; - static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d','=',0}; unsigned int i; cp->displayname = NULL; @@ -68,63 +58,44 @@ static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_pa for (i = 0; i < argc; i++) { - if (!wcsicmp( argv[i], displaynameW ) && i < argc - 1) cp->displayname = argv[i + 1]; - if (!wcsicmp( argv[i], binpathW ) && i < argc - 1) cp->binpath = argv[i + 1]; - if (!wcsicmp( argv[i], groupW ) && i < argc - 1) cp->group = argv[i + 1]; - if (!wcsicmp( argv[i], dependW ) && i < argc - 1) cp->depend = argv[i + 1]; - if (!wcsicmp( argv[i], objW ) && i < argc - 1) cp->obj = argv[i + 1]; - if (!wcsicmp( argv[i], passwordW ) && i < argc - 1) cp->password = argv[i + 1]; + if (!wcsicmp( argv[i], L"displayname=" ) && i < argc - 1) cp->displayname = argv[i + 1]; + if (!wcsicmp( argv[i], L"binpath=" ) && i < argc - 1) cp->binpath = argv[i + 1]; + if (!wcsicmp( argv[i], L"group=" ) && i < argc - 1) cp->group = argv[i + 1]; + if (!wcsicmp( argv[i], L"depend=" ) && i < argc - 1) cp->depend = argv[i + 1]; + if (!wcsicmp( argv[i], L"obj=" ) && i < argc - 1) cp->obj = argv[i + 1]; + if (!wcsicmp( argv[i], L"password=" ) && i < argc - 1) cp->password = argv[i + 1]; - if (!wcsicmp( argv[i], tagW ) && i < argc - 1) + if (!wcsicmp( argv[i], L"tag=" ) && i < argc - 1) { - static const WCHAR yesW[] = {'y','e','s',0}; - if (!wcsicmp( argv[i], yesW )) + if (!wcsicmp( argv[i], L"yes" )) { WINE_FIXME("tag argument not supported\n"); cp->tag = TRUE; } } - if (!wcsicmp( argv[i], typeW ) && i < argc - 1) + if (!wcsicmp( argv[i], L"type=" ) && i < argc - 1) { - static const WCHAR ownW[] = {'o','w','n',0}; - static const WCHAR shareW[] = {'s','h','a','r','e',0}; - static const WCHAR kernelW[] = {'k','e','r','n','e','l',0}; - static const WCHAR filesysW[] = {'f','i','l','e','s','y','s',0}; - static const WCHAR recW[] = {'r','e','c',0}; - static const WCHAR interactW[] = {'i','n','t','e','r','a','c','t',0}; - - if (!wcsicmp( argv[i + 1], ownW )) cp->type = SERVICE_WIN32_OWN_PROCESS; - if (!wcsicmp( argv[i + 1], shareW )) cp->type = SERVICE_WIN32_SHARE_PROCESS; - if (!wcsicmp( argv[i + 1], kernelW )) cp->type = SERVICE_KERNEL_DRIVER; - if (!wcsicmp( argv[i + 1], filesysW )) cp->type = SERVICE_FILE_SYSTEM_DRIVER; - if (!wcsicmp( argv[i + 1], recW )) cp->type = SERVICE_RECOGNIZER_DRIVER; - if (!wcsicmp( argv[i + 1], interactW )) cp->type |= SERVICE_INTERACTIVE_PROCESS; + if (!wcsicmp( argv[i + 1], L"own" )) cp->type = SERVICE_WIN32_OWN_PROCESS; + if (!wcsicmp( argv[i + 1], L"share" )) cp->type = SERVICE_WIN32_SHARE_PROCESS; + if (!wcsicmp( argv[i + 1], L"kernel" )) cp->type = SERVICE_KERNEL_DRIVER; + if (!wcsicmp( argv[i + 1], L"filesys" )) cp->type = SERVICE_FILE_SYSTEM_DRIVER; + if (!wcsicmp( argv[i + 1], L"rec" )) cp->type = SERVICE_RECOGNIZER_DRIVER; + if (!wcsicmp( argv[i + 1], L"interact" )) cp->type |= SERVICE_INTERACTIVE_PROCESS; } - if (!wcsicmp( argv[i], startW ) && i < argc - 1) + if (!wcsicmp( argv[i], L"start="L"start" ) && i < argc - 1) { - static const WCHAR bootW[] = {'b','o','o','t',0}; - static const WCHAR systemW[] = {'s','y','s','t','e','m',0}; - static const WCHAR autoW[] = {'a','u','t','o',0}; - static const WCHAR demandW[] = {'d','e','m','a','n','d',0}; - static const WCHAR disabledW[] = {'d','i','s','a','b','l','e','d',0}; - - if (!wcsicmp( argv[i + 1], bootW )) cp->start = SERVICE_BOOT_START; - if (!wcsicmp( argv[i + 1], systemW )) cp->start = SERVICE_SYSTEM_START; - if (!wcsicmp( argv[i + 1], autoW )) cp->start = SERVICE_AUTO_START; - if (!wcsicmp( argv[i + 1], demandW )) cp->start = SERVICE_DEMAND_START; - if (!wcsicmp( argv[i + 1], disabledW )) cp->start = SERVICE_DISABLED; + if (!wcsicmp( argv[i + 1], L"boot" )) cp->start = SERVICE_BOOT_START; + if (!wcsicmp( argv[i + 1], L"system" )) cp->start = SERVICE_SYSTEM_START; + if (!wcsicmp( argv[i + 1], L"auto" )) cp->start = SERVICE_AUTO_START; + if (!wcsicmp( argv[i + 1], L"demand" )) cp->start = SERVICE_DEMAND_START; + if (!wcsicmp( argv[i + 1], L"disabled" )) cp->start = SERVICE_DISABLED; } - if (!wcsicmp( argv[i], errorW ) && i < argc - 1) + if (!wcsicmp( argv[i], L"error=" ) && i < argc - 1) { - static const WCHAR normalW[] = {'n','o','r','m','a','l',0}; - static const WCHAR severeW[] = {'s','e','v','e','r','e',0}; - static const WCHAR criticalW[] = {'c','r','i','t','i','c','a','l',0}; - static const WCHAR ignoreW[] = {'i','g','n','o','r','e',0}; - - if (!wcsicmp( argv[i + 1], normalW )) cp->error = SERVICE_ERROR_NORMAL; - if (!wcsicmp( argv[i + 1], severeW )) cp->error = SERVICE_ERROR_SEVERE; - if (!wcsicmp( argv[i + 1], criticalW )) cp->error = SERVICE_ERROR_CRITICAL; - if (!wcsicmp( argv[i + 1], ignoreW )) cp->error = SERVICE_ERROR_IGNORE; + if (!wcsicmp( argv[i + 1], L"normal" )) cp->error = SERVICE_ERROR_NORMAL; + if (!wcsicmp( argv[i + 1], L"severe" )) cp->error = SERVICE_ERROR_SEVERE; + if (!wcsicmp( argv[i + 1], L"critical" )) cp->error = SERVICE_ERROR_CRITICAL; + if (!wcsicmp( argv[i + 1], L"ignore" )) cp->error = SERVICE_ERROR_IGNORE; } } if (!cp->binpath) return FALSE; @@ -133,9 +104,6 @@ static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_pa static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *fa ) { - static const WCHAR runW[] = {'r','u','n',0}; - static const WCHAR restartW[] = {'r','e','s','t','a','r','t',0}; - static const WCHAR rebootW[] = {'r','e','b','o','o','t',0}; unsigned int i, count; WCHAR *actions, *p; @@ -164,9 +132,9 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f p = actions; for (i = 0; i < count; i++) { - if (!wcsicmp( p, runW )) fa->lpsaActions[i].Type = SC_ACTION_RUN_COMMAND; - else if (!wcsicmp( p, restartW )) fa->lpsaActions[i].Type = SC_ACTION_RESTART; - else if (!wcsicmp( p, rebootW )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; + if (!wcsicmp( p, L"run" )) fa->lpsaActions[i].Type = SC_ACTION_RUN_COMMAND; + else if (!wcsicmp( p, L"restart" )) fa->lpsaActions[i].Type = SC_ACTION_RESTART; + else if (!wcsicmp( p, L"reboot="L"reboot" )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; else fa->lpsaActions[i].Type = SC_ACTION_NONE; p += lstrlenW( p ) + 1; @@ -180,10 +148,6 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f static BOOL parse_failure_params( int argc, const WCHAR *argv[], SERVICE_FAILURE_ACTIONSW *fa ) { - static const WCHAR resetW[] = {'r','e','s','e','t','=',0}; - static const WCHAR rebootW[] = {'r','e','b','o','o','t','=',0}; - static const WCHAR commandW[] = {'c','o','m','m','a','n','d','=',0}; - static const WCHAR actionsW[] = {'a','c','t','i','o','n','s','=',0}; unsigned int i; fa->dwResetPeriod = 0; @@ -194,10 +158,10 @@ static BOOL parse_failure_params( int argc, const WCHAR *argv[], SERVICE_FAILURE for (i = 0; i < argc; i++) { - if (!wcsicmp( argv[i], resetW ) && i < argc - 1) fa->dwResetPeriod = wcstol( argv[i + 1], NULL, 10 ); - if (!wcsicmp( argv[i], rebootW ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; - if (!wcsicmp( argv[i], commandW ) && i < argc - 1) fa->lpCommand = (WCHAR *)argv[i + 1]; - if (!wcsicmp( argv[i], actionsW )) + if (!wcsicmp( argv[i], L"reset=" ) && i < argc - 1) fa->dwResetPeriod = wcstol( argv[i + 1], NULL, 10 ); + if (!wcsicmp( argv[i], L"reboot="L"reboot" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; + if (!wcsicmp( argv[i], L"command=" ) && i < argc - 1) fa->lpCommand = (WCHAR *)argv[i + 1]; + if (!wcsicmp( argv[i], L"actions=" )) { if (i == argc - 1) return FALSE; if (!parse_failure_actions( argv[i + 1], fa )) return FALSE; @@ -214,13 +178,6 @@ static void usage( void ) int __cdecl wmain( int argc, const WCHAR *argv[] ) { - static const WCHAR createW[] = {'c','r','e','a','t','e',0}; - static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR failureW[] = {'f','a','i','l','u','r','e',0}; - static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; - static const WCHAR startW[] = {'s','t','a','r','t',0}; - static const WCHAR stopW[] = {'s','t','o','p',0}; - static const WCHAR sdsetW[] = {'s','d','s','e','t',0}; SC_HANDLE manager, service; SERVICE_STATUS status; BOOL ret = FALSE; @@ -240,7 +197,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) return 1; } - if (!wcsicmp( argv[1], createW )) + if (!wcsicmp( argv[1], L"create" )) { struct create_params cp; @@ -265,7 +222,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to create service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], descriptionW )) + else if (!wcsicmp( argv[1], L"description" )) { service = OpenServiceW( manager, argv[2], SERVICE_CHANGE_CONFIG ); if (service) @@ -278,7 +235,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], failureW )) + else if (!wcsicmp( argv[1], L"failure" )) { service = OpenServiceW( manager, argv[2], SERVICE_CHANGE_CONFIG ); if (service) @@ -296,7 +253,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], deleteW )) + else if (!wcsicmp( argv[1], L"delete" )) { service = OpenServiceW( manager, argv[2], DELETE ); if (service) @@ -307,7 +264,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], startW )) + else if (!wcsicmp( argv[1], L"start="L"start" )) { service = OpenServiceW( manager, argv[2], SERVICE_START ); if (service) @@ -318,7 +275,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], stopW )) + else if (!wcsicmp( argv[1], L"stop" )) { service = OpenServiceW( manager, argv[2], SERVICE_STOP ); if (service) @@ -329,7 +286,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], sdsetW )) + else if (!wcsicmp( argv[1], L"sdset" )) { WINE_FIXME("SdSet command not supported, faking success\n"); ret = TRUE; -- 2.26.2

1 0

[PATCH v2] mountmgr: Avoid unnecessary permission prompts on macOS 10.15 and newer.
by Brendan Shanks Oct. 6, 2020

Oct. 6, 2020

On macOS 10.15 and newer, trying to open the device node of a removable drive will trigger an "<app> would like to access files on a removable volume" permission prompt, even if the user doesn't have permissions to access the device node (which is almost always the case). Check the value of access() (recommended by Apple for this purpose) before opening devices. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: Forgot sign-off. dlls/mountmgr.sys/device.c | 7 +++++++ dlls/mountmgr.sys/diskarb.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index ccb0685cedd..53ccd3c5fdc 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include <stdio.h> #include <fcntl.h> +#include <unistd.h> #include <sys/time.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> @@ -1026,6 +1027,12 @@ static BOOL get_volume_device_info( struct volume *volume ) if (!unix_device) return FALSE; + if (access( unix_device, R_OK )) + { + WARN("Unable to open %s, not accessible\n", debugstr_a(unix_device)); + return FALSE; + } + if (!(name = wine_get_dos_file_name( unix_device ))) { ERR("Failed to convert %s to NT, err %u\n", debugstr_a(unix_device), GetLastError()); diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 12da89d7688..25e0745372a 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -25,6 +25,7 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> +#include <unistd.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif @@ -150,7 +151,8 @@ static void appeared_callback( DADiskRef disk, void *context ) else if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, NULL ); - if ((fd = open( device, O_RDONLY )) >= 0) + if (!access( device, R_OK ) && + (fd = open( device, O_RDONLY )) >= 0) { dk_scsi_identify_t dsi; -- 2.26.2

1 0

[PATCH 4/5] conhost: Use better default values in create_screen_buffer.
by Jacek Caban Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 21 +++++++++++++++++++++ programs/conhost/conhost.c | 21 ++++++++++++++++----- 2 files changed, 37 insertions(+), 5 deletions(-)

2 1

[PATCH 3/3] dxgi: Support Alt+Enter for d3d12 swapchains.
by Zhiyi Zhang Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 51 ++++++++++++++++++++++++++++++++++++++---- dlls/dxgi/tests/dxgi.c | 16 ++++++------- 2 files changed, 54 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index aa889bbe236..e74717056cb 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1919,6 +1919,7 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) close_library(vulkan_module); + wined3d_swapchain_state_unregister(swapchain->state); wined3d_swapchain_state_destroy(swapchain->state); } @@ -2289,18 +2290,37 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapCha BOOL *fullscreen, IDXGIOutput **target) { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); + BOOL windowed; + HRESULT hr; TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); - if (fullscreen) + if (fullscreen || target) { wined3d_mutex_lock(); - *fullscreen = !wined3d_swapchain_state_is_windowed(swapchain->state); + windowed = wined3d_swapchain_state_is_windowed(swapchain->state); wined3d_mutex_unlock(); } - if (target && (*target = swapchain->target)) - IDXGIOutput_AddRef(*target); + if (fullscreen) + *fullscreen = !windowed; + + if (target) + { + if (!windowed) + { + if (!swapchain->target && FAILED(hr = IDXGISwapChain4_GetContainingOutput(iface, + &swapchain->target))) + return hr; + + *target = swapchain->target; + IDXGIOutput_AddRef(*target); + } + else + { + *target = NULL; + } + } return S_OK; } @@ -2936,6 +2956,24 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return TRUE; } +static void STDMETHODCALLTYPE d3d12_swapchain_windowed_state_changed(void *parent, BOOL windowed) +{ + struct d3d12_swapchain *swapchain = parent; + + TRACE("parent %p, windowed %d.\n", parent, windowed); + + if (windowed && swapchain->target) + { + IDXGIOutput_Release(swapchain->target); + swapchain->target = NULL; + } +} + +static const struct wined3d_swapchain_state_parent_ops d3d12_swapchain_state_parent_ops = +{ + d3d12_swapchain_windowed_state_changed, +}; + static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGIFactory *factory, ID3D12Device *device, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc) @@ -2944,6 +2982,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI struct wined3d_swapchain_desc wined3d_desc; VkWin32SurfaceCreateInfoKHR surface_desc; VkPhysicalDevice vk_physical_device; + struct dxgi_factory *dxgi_factory; VkFenceCreateInfo fence_desc; uint32_t queue_family_index; VkSurfaceKHR vk_surface; @@ -3025,6 +3064,10 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hr; } + dxgi_factory = unsafe_impl_from_IDXGIFactory((IDXGIFactory *)factory); + wined3d_swapchain_state_register(swapchain->state, dxgi_factory->wined3d, swapchain, + &d3d12_swapchain_state_parent_ops); + if (!fullscreen_desc->Windowed) { hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL); diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 5830426f756..c6ece51f2a8 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2431,7 +2431,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) flush_events(); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(!fullscreen, "Expect swapchain not full screen.\n"); + ok(!fullscreen, "Expect swapchain not full screen.\n"); /* Move the swapchain output window to the second output */ hr = IDXGIOutput_GetDesc(output2, &output_desc2); @@ -2453,7 +2453,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); IDXGIOutput_Release(output); @@ -2465,7 +2465,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); @@ -6148,7 +6148,6 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) UINT flag; BOOL expect_fullscreen; BOOL broken_d3d10; - BOOL todo_on_d3d12; } tests[] = { @@ -6162,15 +6161,15 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) * - Posting them hangs the posting thread. Another thread that keeps * sending input is needed to avoid the hang. The hang is not * because of flush_events(). */ - {0, TRUE, FALSE, TRUE}, + {0, TRUE}, {0, FALSE}, {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, - {DXGI_MWA_NO_ALT_ENTER, FALSE, TRUE}, + {DXGI_MWA_NO_ALT_ENTER}, {DXGI_MWA_NO_ALT_ENTER, FALSE}, - {DXGI_MWA_NO_PRINT_SCREEN, TRUE, FALSE, TRUE}, + {DXGI_MWA_NO_PRINT_SCREEN, TRUE}, {DXGI_MWA_NO_PRINT_SCREEN, FALSE}, - {0, TRUE, FALSE, TRUE}, + {0, TRUE}, {0, FALSE} }; @@ -6272,7 +6271,6 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) output = NULL; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(is_d3d12 && tests[i].todo_on_d3d12) ok(fullscreen == tests[i].expect_fullscreen || broken(tests[i].broken_d3d10 && fullscreen), "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); -- 2.25.1

2 1

[PATCH 2/3] dxgi: Update swapchain containing output after Alt+Enter was used to exit fullscreen.
by Zhiyi Zhang Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 21 ++++++++++++++++++++- dlls/dxgi/tests/dxgi.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++++ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 6 +++++- dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 8 +++++++- 7 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 9d6ec0246ce..aa889bbe236 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -807,6 +807,24 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = d3d11_swapchain_wined3d_object_released, }; +static void STDMETHODCALLTYPE d3d11_swapchain_windowed_state_changed(void *parent, BOOL windowed) +{ + struct d3d11_swapchain *swapchain = parent; + + TRACE("parent %p, windowed %d.\n", parent, windowed); + + if (windowed && swapchain->target) + { + IDXGIOutput_Release(swapchain->target); + swapchain->target = NULL; + } +} + +static const struct wined3d_swapchain_state_parent_ops d3d11_swapchain_state_parent_ops = +{ + d3d11_swapchain_windowed_state_changed, +}; + HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc) { @@ -855,7 +873,8 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi swapchain->state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); wined3d = wined3d_device_get_wined3d(device->wined3d_device); - wined3d_swapchain_state_register(swapchain->state, wined3d); + wined3d_swapchain_state_register(swapchain->state, wined3d, swapchain, + &d3d11_swapchain_state_parent_ops); swapchain->target = NULL; if (fullscreen) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f747e236f31..5830426f756 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2453,7 +2453,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + todo_wine_if(is_d3d12) ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); IDXGIOutput_Release(output); @@ -2465,7 +2465,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + todo_wine_if(is_d3d12) ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2cf36d189cb..a36946cc620 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2171,6 +2171,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st { struct wined3d_display_mode actual_mode; struct wined3d_output_desc output_desc; + BOOL windowed = state->desc.windowed; HRESULT hr; TRACE("state %p, swapchain_desc %p, mode %p.\n", state, swapchain_desc, mode); @@ -2259,6 +2260,9 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st state->desc.output = swapchain_desc->output; state->desc.windowed = swapchain_desc->windowed; + if (state->parent_ops && windowed != state->desc.windowed) + state->parent_ops->windowed_state_changed(state->parent, state->desc.windowed); + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 816108e8b3b..4c42b0854e1 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -292,7 +292,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_is_windowed(ptr) -@ cdecl wined3d_swapchain_state_register(ptr ptr) +@ cdecl wined3d_swapchain_state_register(ptr ptr ptr ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr) @ cdecl wined3d_swapchain_state_unregister(ptr) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index bb3ad7ffa51..09d741ac87f 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -775,7 +775,8 @@ static struct wined3d_window_hook *wined3d_find_hook(DWORD thread_id) } void CDECL wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, - struct wined3d *wined3d) + struct wined3d *wined3d, void *parent, + const struct wined3d_swapchain_state_parent_ops *parent_ops) { struct wined3d_registered_swapchain_state *state_entry; struct wined3d_window_hook *hook; @@ -789,6 +790,9 @@ void CDECL wined3d_swapchain_state_register(struct wined3d_swapchain_state *stat return; } + state->parent = parent; + state->parent_ops = parent_ops; + state_entry = &swapchain_state_table.states[swapchain_state_table.state_count++]; state_entry->state = state; state_entry->wined3d = wined3d; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7c88e04f5e7..0d14f1e2860 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5062,6 +5062,9 @@ struct wined3d_swapchain_state LONG style; LONG exstyle; HWND device_window; + + void *parent; + const struct wined3d_swapchain_state_parent_ops *parent_ops; }; void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3f2361e55a5..9d2d37c4856 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2208,6 +2208,11 @@ struct wined3d_parent_ops void (__stdcall *wined3d_object_destroyed)(void *parent); }; +struct wined3d_swapchain_state_parent_ops +{ + void (__stdcall *windowed_state_changed)(void *parent, BOOL windowed); +}; + struct wined3d; struct wined3d_adapter; struct wined3d_blend_state; @@ -2807,7 +2812,8 @@ HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_de void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); BOOL __cdecl wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state); void __cdecl wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, - struct wined3d *wined3d); + struct wined3d *wined3d, void *context, + const struct wined3d_swapchain_state_parent_ops *parent_ops); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, -- 2.25.1

2 1

[PATCH] mmdevapi: Implement ActivateAudioInterfaceAsync
by Andrew Eikum Oct. 6, 2020

Oct. 6, 2020

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/mmdevapi/main.c | 165 +++++++++++++++++++++++++++ dlls/mmdevapi/mmdevapi.spec | 2 + dlls/mmdevapi/tests/mmdevenum.c | 190 ++++++++++++++++++++++++++++++++ include/mmdeviceapi.idl | 36 ++++++ 4 files changed, 393 insertions(+) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 7680b451381..8e9127a7507 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -319,3 +319,168 @@ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources( instance ); } + +struct activate_async_op { + IActivateAudioInterfaceAsyncOperation IActivateAudioInterfaceAsyncOperation_iface; + LONG ref; + + IActivateAudioInterfaceCompletionHandler *callback; + HRESULT result_hr; + IUnknown *result_iface; +}; + +static struct activate_async_op *impl_from_IActivateAudioInterfaceAsyncOperation(IActivateAudioInterfaceAsyncOperation *iface) +{ + return CONTAINING_RECORD(iface, struct activate_async_op, IActivateAudioInterfaceAsyncOperation_iface); +} + +static HRESULT WINAPI activate_async_op_QueryInterface(IActivateAudioInterfaceAsyncOperation *iface, + REFIID riid, void **ppv) +{ + struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IActivateAudioInterfaceAsyncOperation)) { + *ppv = &This->IActivateAudioInterfaceAsyncOperation_iface; + } else { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI activate_async_op_AddRef(IActivateAudioInterfaceAsyncOperation *iface) +{ + struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) refcount now %i\n", This, ref); + return ref; +} + +static ULONG WINAPI activate_async_op_Release(IActivateAudioInterfaceAsyncOperation *iface) +{ + struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); + LONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) refcount now %i\n", This, ref); + if (!ref) { + if(This->result_iface) + IUnknown_Release(This->result_iface); + IActivateAudioInterfaceCompletionHandler_Release(This->callback); + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI activate_async_op_GetActivateResult(IActivateAudioInterfaceAsyncOperation *iface, + HRESULT *result_hr, IUnknown **result_iface) +{ + struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); + + TRACE("(%p)->(%p, %p)\n", This, result_hr, result_iface); + + *result_hr = This->result_hr; + + if(This->result_hr == S_OK){ + *result_iface = This->result_iface; + IUnknown_AddRef(*result_iface); + } + + return S_OK; +} + +static IActivateAudioInterfaceAsyncOperationVtbl IActivateAudioInterfaceAsyncOperation_vtbl = { + activate_async_op_QueryInterface, + activate_async_op_AddRef, + activate_async_op_Release, + activate_async_op_GetActivateResult, +}; + +static DWORD WINAPI activate_async_threadproc(void *user) +{ + struct activate_async_op *op = user; + + IActivateAudioInterfaceCompletionHandler_ActivateCompleted(op->callback, &op->IActivateAudioInterfaceAsyncOperation_iface); + + IActivateAudioInterfaceAsyncOperation_Release(&op->IActivateAudioInterfaceAsyncOperation_iface); + + return 0; +} + +static HRESULT get_mmdevice_by_activatepath(const WCHAR *path, IMMDevice **mmdev) +{ + IMMDeviceEnumerator *devenum; + HRESULT hr; + + static const WCHAR DEVINTERFACE_AUDIO_RENDER_WSTR[] = L"{E6327CAD-DCEC-4949-AE8A-991E976A79D2}"; + static const WCHAR DEVINTERFACE_AUDIO_CAPTURE_WSTR[] = L"{2EEF81BE-33FA-4800-9670-1CD474972C3F}"; + + hr = MMDevEnum_Create(&IID_IMMDeviceEnumerator, (void**)&devenum); + if (FAILED(hr)) { + WARN("Failed to create MMDeviceEnumerator: %08x\n", hr); + return hr; + } + + if (!lstrcmpiW(path, DEVINTERFACE_AUDIO_RENDER_WSTR)){ + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eRender, eMultimedia, mmdev); + } else if (!lstrcmpiW(path, DEVINTERFACE_AUDIO_CAPTURE_WSTR)){ + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eCapture, eMultimedia, mmdev); + } else { + FIXME("How to map path to device id? %s\n", debugstr_w(path)); + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + if (FAILED(hr)) { + WARN("Failed to get requested device (%s): %08x\n", debugstr_w(path), hr); + *mmdev = NULL; + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + IMMDeviceEnumerator_Release(devenum); + + return hr; +} + +/*********************************************************************** + * ActivateAudioInterfaceAsync (MMDEVAPI.17) + */ +HRESULT WINAPI ActivateAudioInterfaceAsync(const WCHAR *path, REFIID riid, + PROPVARIANT *params, IActivateAudioInterfaceCompletionHandler *done_handler, + IActivateAudioInterfaceAsyncOperation **op_out) +{ + struct activate_async_op *op; + HANDLE ht; + IMMDevice *mmdev; + + TRACE("(%s, %s, %p, %p, %p)\n", debugstr_w(path), debugstr_guid(riid), + params, done_handler, op_out); + + op = HeapAlloc(GetProcessHeap(), 0, sizeof(*op)); + if (!op) + return E_OUTOFMEMORY; + + op->ref = 2; /* returned ref and threadproc ref */ + op->IActivateAudioInterfaceAsyncOperation_iface.lpVtbl = &IActivateAudioInterfaceAsyncOperation_vtbl; + op->callback = done_handler; + IActivateAudioInterfaceCompletionHandler_AddRef(done_handler); + + op->result_hr = get_mmdevice_by_activatepath(path, &mmdev); + if (SUCCEEDED(op->result_hr)) { + op->result_hr = IMMDevice_Activate(mmdev, riid, CLSCTX_INPROC_SERVER, params, (void**)&op->result_iface); + IMMDevice_Release(mmdev); + }else + op->result_iface = NULL; + + ht = CreateThread(NULL, 0, &activate_async_threadproc, op, 0, NULL); + CloseHandle(ht); + + *op_out = &op->IActivateAudioInterfaceAsyncOperation_iface; + + return S_OK; +} diff --git a/dlls/mmdevapi/mmdevapi.spec b/dlls/mmdevapi/mmdevapi.spec index 88aaf7c30c9..90ecaf569bc 100644 --- a/dlls/mmdevapi/mmdevapi.spec +++ b/dlls/mmdevapi/mmdevapi.spec @@ -12,6 +12,8 @@ 13 stub @ 14 stub @ 15 stub @ +16 stub @ +17 stdcall ActivateAudioInterfaceAsync( wstr ptr ptr ptr ptr ) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject( ptr ptr ptr ) diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 4f8c848380d..11df1f0229b 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -31,6 +31,9 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static UINT g_num_mmdevs; +static WCHAR g_device_path[MAX_PATH]; + /* Some of the QueryInterface tests are really just to check if I got the IIDs right :) */ /* IMMDeviceCollection appears to have no QueryInterface method and instead forwards to mme */ @@ -85,6 +88,8 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) ok(hr == E_INVALIDARG, "Asking for too high device returned 0x%08x\n", hr); ok(dev == NULL, "Returned non-null device\n"); + g_num_mmdevs = numdev; + if (numdev) { hr = IMMDeviceCollection_Item(col, 0, NULL); @@ -101,6 +106,7 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) { IMMDevice *dev2; + lstrcpyW(g_device_path, id); temp[sizeof(temp)-1] = 0; WideCharToMultiByte(CP_ACP, 0, id, -1, temp, sizeof(temp)-1, NULL, NULL); trace("Device found: %s\n", temp); @@ -119,6 +125,188 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) IMMDeviceCollection_Release(col); } +static struct { + LONG ref; + HANDLE evt; + CRITICAL_SECTION lock; + IActivateAudioInterfaceAsyncOperation *op; + DWORD main_tid; + char msg_pfx[128]; + IUnknown *result_iface; + HRESULT result_hr; +} async_activate_test; + +static HRESULT WINAPI async_activate_QueryInterface( + IActivateAudioInterfaceCompletionHandler *iface, + REFIID riid, + void **ppvObject) +{ + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IAgileObject) || + IsEqualIID(riid, &IID_IActivateAudioInterfaceCompletionHandler)){ + *ppvObject = iface; + IUnknown_AddRef((IUnknown*)*ppvObject); + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI async_activate_AddRef( + IActivateAudioInterfaceCompletionHandler *iface) +{ + return InterlockedIncrement(&async_activate_test.ref); +} + +static ULONG WINAPI async_activate_Release( + IActivateAudioInterfaceCompletionHandler *iface) +{ + ULONG ref = InterlockedDecrement(&async_activate_test.ref); + if(ref == 1) + SetEvent(async_activate_test.evt); + return ref; +} + +static HRESULT WINAPI async_activate_ActivateCompleted( + IActivateAudioInterfaceCompletionHandler *iface, + IActivateAudioInterfaceAsyncOperation *op) +{ + HRESULT hr; + + EnterCriticalSection(&async_activate_test.lock); + ok(op == async_activate_test.op, + "%s: Got different completion operation\n", + async_activate_test.msg_pfx); + LeaveCriticalSection(&async_activate_test.lock); + + ok(GetCurrentThreadId() != async_activate_test.main_tid, + "%s: Expected callback on worker thread\n", + async_activate_test.msg_pfx); + + hr = IActivateAudioInterfaceAsyncOperation_GetActivateResult(op, + &async_activate_test.result_hr, &async_activate_test.result_iface); + ok(hr == S_OK, + "%s: GetActivateResult failed: %08x\n", + async_activate_test.msg_pfx, hr); + + return S_OK; +} + +static IActivateAudioInterfaceCompletionHandlerVtbl async_activate_vtbl = { + async_activate_QueryInterface, + async_activate_AddRef, + async_activate_Release, + async_activate_ActivateCompleted, +}; + +static IActivateAudioInterfaceCompletionHandler async_activate_done = { + &async_activate_vtbl +}; + +static void test_ActivateAudioInterfaceAsync(void) +{ + HRESULT (* WINAPI pActivateAudioInterfaceAsync)(const WCHAR *path, + REFIID riid, PROPVARIANT *params, + IActivateAudioInterfaceCompletionHandler *done_handler, + IActivateAudioInterfaceAsyncOperation **op); + HANDLE h_mmdev; + HRESULT hr; + LPOLESTR path; + DWORD dr; + IAudioClient3 *ac3; + + h_mmdev = LoadLibraryA("mmdevapi.dll"); + + /* some applications look this up by ordinal */ + pActivateAudioInterfaceAsync = (void*)GetProcAddress(h_mmdev, (char *)17); + ok(pActivateAudioInterfaceAsync != NULL, "mmdevapi.ActivateAudioInterfaceAsync missing!\n"); + + async_activate_test.ref = 1; + async_activate_test.evt = CreateEventW(NULL, FALSE, FALSE, NULL); + InitializeCriticalSection(&async_activate_test.lock); + async_activate_test.op = NULL; + async_activate_test.main_tid = GetCurrentThreadId(); + async_activate_test.result_iface = NULL; + async_activate_test.result_hr = 0; + + + /* try invalid device path */ + strcpy(async_activate_test.msg_pfx, "invalid_path"); + + EnterCriticalSection(&async_activate_test.lock); + hr = pActivateAudioInterfaceAsync(L"winetest_bogus", &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + LeaveCriticalSection(&async_activate_test.lock); + + IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); + + dr = WaitForSingleObject(async_activate_test.evt, 1000); /* wait for all refs other than our own to be released */ + ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); + ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref: %u\n", async_activate_test.ref); + ok(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + ok(async_activate_test.result_iface == NULL, "Got non-NULL iface pointer: %p\n", async_activate_test.result_iface); + + + /* device id from IMMDevice does not work */ + if(g_num_mmdevs > 0){ + strcpy(async_activate_test.msg_pfx, "mmdevice_id"); + + EnterCriticalSection(&async_activate_test.lock); + hr = pActivateAudioInterfaceAsync(g_device_path, &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + LeaveCriticalSection(&async_activate_test.lock); + + IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); + + dr = WaitForSingleObject(async_activate_test.evt, 1000); + ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); + ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref: %u\n", async_activate_test.ref); + ok(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + ok(async_activate_test.result_iface == NULL, "Got non-NULL iface pointer: %p\n", async_activate_test.result_iface); + } + + + /* try DEVINTERFACE_AUDIO_RENDER */ + strcpy(async_activate_test.msg_pfx, "audio_render"); + StringFromIID(&DEVINTERFACE_AUDIO_RENDER, &path); + + EnterCriticalSection(&async_activate_test.lock); + hr = pActivateAudioInterfaceAsync(path, &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + LeaveCriticalSection(&async_activate_test.lock); + + IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); + + dr = WaitForSingleObject(async_activate_test.evt, 1000); + ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); + ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref\n"); + ok(async_activate_test.result_hr == S_OK || + (g_num_mmdevs == 0 && async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || /* no devices */ + broken(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), /* win8 doesn't support DEVINTERFACE_AUDIO_RENDER */ + "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + + if(async_activate_test.result_hr == S_OK){ + ok(async_activate_test.result_iface != NULL, "Got NULL iface pointer on success?\n"); + + /* returned iface should be the IID we requested */ + hr = IUnknown_QueryInterface(async_activate_test.result_iface, &IID_IAudioClient3, (void**)&ac3); + ok(hr == S_OK, "Failed to query IAudioClient3: %08x\n", hr); + ok(async_activate_test.result_iface == (IUnknown*)ac3, + "Activated interface other than IAudioClient3!\n"); + IAudioClient3_Release(ac3); + + IUnknown_Release(async_activate_test.result_iface); + } + + CoTaskMemFree(path); + + CloseHandle(async_activate_test.evt); + DeleteCriticalSection(&async_activate_test.lock); +} + static HRESULT WINAPI notif_QueryInterface(IMMNotificationClient *iface, const GUID *riid, void **obj) { @@ -285,4 +473,6 @@ START_TEST(mmdevenum) ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); IMMDeviceEnumerator_Release(mme); + + test_ActivateAudioInterfaceAsync(); } diff --git a/include/mmdeviceapi.idl b/include/mmdeviceapi.idl index d1fb6ae74ff..1c2bb18c33c 100644 --- a/include/mmdeviceapi.idl +++ b/include/mmdeviceapi.idl @@ -26,6 +26,8 @@ cpp_quote("#ifndef E_UNSUPPORTED_TYPE") cpp_quote("#define E_UNSUPPORTED_TYPE HRESULT_FROM_WIN32(ERROR_UNSUPPORTED_TYPE)") cpp_quote("#endif") +cpp_quote("DEFINE_GUID(DEVINTERFACE_AUDIO_RENDER, 0xe6327cad,0xdcec,0x4949,0xae,0x8a,0x99,0x1e,0x97,0x6a,0x79,0xd2);") +cpp_quote("DEFINE_GUID(DEVINTERFACE_AUDIO_CAPTURE, 0x2eef81be,0x33fa,0x4800,0x96,0x70,0x1c,0xd4,0x74,0x97,0x2c,0x3f);") cpp_quote("#define DEVICE_STATE_ACTIVE 0x1") cpp_quote("#define DEVICE_STATE_DISABLED 0x2") @@ -237,6 +239,40 @@ typedef struct _AudioExtensionParams IMMDevice *pPnpDevnode; } AudioExtensionParams; +[ + object, + local, + uuid(72a22d78-cde4-431d-b8cc-843a71199b6d), + nonextensible, + pointer_default(unique) +] +interface IActivateAudioInterfaceAsyncOperation : IUnknown +{ + HRESULT GetActivateResult( + [out] HRESULT *result, + [out] IUnknown **iface + ); +} + +[ + object, + local, + uuid(41d949ab-9862-444a-80f6-c261334da5eb), + nonextensible, + pointer_default(unique) +] +interface IActivateAudioInterfaceCompletionHandler : IUnknown +{ + HRESULT ActivateCompleted( + [in] IActivateAudioInterfaceAsyncOperation *op + ); +} + +cpp_quote("HRESULT WINAPI ActivateAudioInterfaceAsync(") +cpp_quote(" const WCHAR *path, REFIID riid, PROPVARIANT *params,") +cpp_quote(" IActivateAudioInterfaceCompletionHandler *done_handler,") +cpp_quote(" IActivateAudioInterfaceAsyncOperation **op);") + [ uuid(2fdaafa3-7523-4f66-9957-9d5e7fe698f6), version(1.0) -- 2.28.0

2 1