November 2007 - Wine-commits

Rob Shearman : credui: Add support for saving the credentials input using CredUIPromptForCredentials by calling CredWriteW .
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 678d3965083507dd0e336f651d764c7c0819262a URL: http://source.winehq.org/git/wine.git/?a=commit;h=678d3965083507dd0e336f651… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 17 17:30:19 2007 +0000 credui: Add support for saving the credentials input using CredUIPromptForCredentials by calling CredWriteW. --- dlls/credui/Makefile.in | 2 +- dlls/credui/credui_main.c | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index b4e1197..3e75b17 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = credui.dll IMPORTLIB = libcredui.$(IMPLIBEXT) -IMPORTS = comctl32 user32 kernel32 +IMPORTS = comctl32 user32 advapi32 kernel32 C_SRCS = \ credui_main.c diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index f9e24eb..29fe574 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -41,6 +41,7 @@ struct pending_credentials PWSTR pszTargetName; PWSTR pszUsername; PWSTR pszPassword; + BOOL generic; }; static HINSTANCE hinstCredUI; @@ -87,10 +88,32 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } static DWORD save_credentials(PCWSTR pszTargetName, PCWSTR pszUsername, - PCWSTR pszPassword) + PCWSTR pszPassword, BOOL generic) { - FIXME("save servername %s with username %s\n", debugstr_w(pszTargetName), debugstr_w(pszUsername)); - return ERROR_SUCCESS; + CREDENTIALW cred; + + TRACE("saving servername %s with username %s\n", debugstr_w(pszTargetName), debugstr_w(pszUsername)); + + cred.Flags = 0; + cred.Type = generic ? CRED_TYPE_GENERIC : CRED_TYPE_DOMAIN_PASSWORD; + cred.TargetName = (LPWSTR)pszTargetName; + cred.Comment = NULL; + cred.CredentialBlobSize = strlenW(pszPassword) * sizeof(WCHAR); + cred.CredentialBlob = (LPBYTE)pszPassword; + cred.Persist = CRED_PERSIST_ENTERPRISE; + cred.AttributeCount = 0; + cred.Attributes = NULL; + cred.TargetAlias = NULL; + cred.UserName = (LPWSTR)pszUsername; + + if (CredWriteW(&cred, 0)) + return ERROR_SUCCESS; + else + { + DWORD ret = GetLastError(); + ERR("CredWriteW failed with error %d\n", ret); + return ret; + } } struct cred_dialog_params @@ -312,11 +335,13 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, len = strlenW(params.pszPassword); entry->pszPassword = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); memcpy(entry->pszPassword, params.pszPassword, (len + 1)*sizeof(WCHAR)); + entry->generic = dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS ? TRUE : FALSE; LeaveCriticalSection(&csPendingCredentials); } else - result = save_credentials(pszTargetName, pszUsername, pszPassword); + result = save_credentials(pszTargetName, pszUsername, pszPassword, + dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS ? TRUE : FALSE); } return result; @@ -342,7 +367,8 @@ DWORD WINAPI CredUIConfirmCredentialsW(PCWSTR pszTargetName, BOOL bConfirm) if (!strcmpW(pszTargetName, entry->pszTargetName)) { if (bConfirm) - result = save_credentials(entry->pszTargetName, entry->pszUsername, entry->pszPassword); + result = save_credentials(entry->pszTargetName, entry->pszUsername, + entry->pszPassword, entry->generic); else result = ERROR_SUCCESS;

1 0

Rob Shearman : credui: Split CredDialogProc out into separate functions.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: bb529a493848a6fa0b98ca7fca4900d732c418f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb529a493848a6fa0b98ca7fc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 17 17:30:39 2007 +0000 credui: Split CredDialogProc out into separate functions. --- dlls/credui/credui_main.c | 160 ++++++++++++++++++++++++--------------------- 1 files changed, 85 insertions(+), 75 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 29fe574..03550ba 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -130,6 +130,89 @@ struct cred_dialog_params DWORD dwFlags; }; +static BOOL CredDialogInit(HWND hwndDlg, struct cred_dialog_params *params) +{ + SetWindowLongPtrW(hwndDlg, DWLP_USER, (LONG_PTR)params); + if (params->pszMessageText) + SetDlgItemTextW(hwndDlg, IDC_MESSAGE, params->pszMessageText); + else + { + WCHAR format[256]; + WCHAR message[256]; + LoadStringW(hinstCredUI, IDS_MESSAGEFORMAT, format, sizeof(format)/sizeof(format[0])); + snprintfW(message, sizeof(message)/sizeof(message[0]), format, params->pszTargetName); + SetDlgItemTextW(hwndDlg, IDC_MESSAGE, message); + } + SetDlgItemTextW(hwndDlg, IDC_USERNAME, params->pszUsername); + SetDlgItemTextW(hwndDlg, IDC_PASSWORD, params->pszPassword); + + if (params->pszUsername[0]) + SetFocus(GetDlgItem(hwndDlg, IDC_PASSWORD)); + else + SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME)); + + if (params->pszCaptionText) + SetWindowTextW(hwndDlg, params->pszCaptionText); + else + { + WCHAR format[256]; + WCHAR title[256]; + LoadStringW(hinstCredUI, IDS_TITLEFORMAT, format, sizeof(format)/sizeof(format[0])); + snprintfW(title, sizeof(title)/sizeof(title[0]), format, params->pszTargetName); + SetWindowTextW(hwndDlg, title); + } + + if (params->dwFlags & (CREDUI_FLAGS_DO_NOT_PERSIST|CREDUI_FLAGS_PERSIST)) + ShowWindow(GetDlgItem(hwndDlg, IDC_SAVE), SW_HIDE); + else if (params->fSave) + CheckDlgButton(hwndDlg, IDC_SAVE, BST_CHECKED); + + return FALSE; +} + +static void CredDialogCommandOk(HWND hwndDlg, struct cred_dialog_params *params) +{ + HWND hwndUsername = GetDlgItem(hwndDlg, IDC_USERNAME); + LPWSTR user; + INT len; + INT len2; + + len = GetWindowTextLengthW(hwndUsername); + user = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + GetWindowTextW(hwndUsername, user, len + 1); + + if (!user[0]) + { + HeapFree(GetProcessHeap(), 0, user); + return; + } + + if (!strchrW(user, '\\') && !strchrW(user, '@')) + { + INT len_target = strlenW(params->pszTargetName); + memcpy(params->pszUsername, params->pszTargetName, + min(len_target, params->ulUsernameMaxChars) * sizeof(WCHAR)); + if (len_target + 1 < params->ulUsernameMaxChars) + params->pszUsername[len_target] = '\\'; + if (len_target + 2 < params->ulUsernameMaxChars) + params->pszUsername[len_target + 1] = '\0'; + } + else if (params->ulUsernameMaxChars > 0) + params->pszUsername[0] = '\0'; + + len2 = strlenW(params->pszUsername); + memcpy(params->pszUsername + len2, user, min(len, params->ulUsernameMaxChars - len2) * sizeof(WCHAR)); + if (params->ulUsernameMaxChars) + params->pszUsername[len2 + min(len, params->ulUsernameMaxChars - len2 - 1)] = '\0'; + + HeapFree(GetProcessHeap(), 0, user); + + GetDlgItemTextW(hwndDlg, IDC_PASSWORD, params->pszPassword, + params->ulPasswordMaxChars); + + EndDialog(hwndDlg, IDOK); +} + static INT_PTR CALLBACK CredDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -139,42 +222,7 @@ static INT_PTR CALLBACK CredDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, { struct cred_dialog_params *params = (struct cred_dialog_params *)lParam; - SetWindowLongPtrW(hwndDlg, DWLP_USER, (LONG_PTR)params); - if (params->pszMessageText) - SetDlgItemTextW(hwndDlg, IDC_MESSAGE, params->pszMessageText); - else - { - WCHAR format[256]; - WCHAR message[256]; - LoadStringW(hinstCredUI, IDS_MESSAGEFORMAT, format, sizeof(format)/sizeof(format[0])); - snprintfW(message, sizeof(message)/sizeof(message[0]), format, params->pszTargetName); - SetDlgItemTextW(hwndDlg, IDC_MESSAGE, message); - } - SetDlgItemTextW(hwndDlg, IDC_USERNAME, params->pszUsername); - SetDlgItemTextW(hwndDlg, IDC_PASSWORD, params->pszPassword); - - if (params->pszUsername[0]) - SetFocus(GetDlgItem(hwndDlg, IDC_PASSWORD)); - else - SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME)); - - if (params->pszCaptionText) - SetWindowTextW(hwndDlg, params->pszCaptionText); - else - { - WCHAR format[256]; - WCHAR title[256]; - LoadStringW(hinstCredUI, IDS_TITLEFORMAT, format, sizeof(format)/sizeof(format[0])); - snprintfW(title, sizeof(title)/sizeof(title[0]), format, params->pszTargetName); - SetWindowTextW(hwndDlg, title); - } - - if (params->dwFlags & (CREDUI_FLAGS_DO_NOT_PERSIST|CREDUI_FLAGS_PERSIST)) - ShowWindow(GetDlgItem(hwndDlg, IDC_SAVE), SW_HIDE); - else if (params->fSave) - CheckDlgButton(hwndDlg, IDC_SAVE, BST_CHECKED); - - return FALSE; + return CredDialogInit(hwndDlg, params); } case WM_COMMAND: switch (wParam) @@ -183,45 +231,7 @@ static INT_PTR CALLBACK CredDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, { struct cred_dialog_params *params = (struct cred_dialog_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); - HWND hwndUsername = GetDlgItem(hwndDlg, IDC_USERNAME); - LPWSTR user; - INT len; - INT len2; - - len = GetWindowTextLengthW(hwndUsername); - user = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); - GetWindowTextW(hwndUsername, user, len + 1); - - if (!user[0]) - { - HeapFree(GetProcessHeap(), 0, user); - return TRUE; - } - - if (!strchrW(user, '\\') && !strchrW(user, '@')) - { - INT len_target = strlenW(params->pszTargetName); - memcpy(params->pszUsername, params->pszTargetName, - min(len_target, params->ulUsernameMaxChars) * sizeof(WCHAR)); - if (len_target + 1 < params->ulUsernameMaxChars) - params->pszUsername[len_target] = '\\'; - if (len_target + 2 < params->ulUsernameMaxChars) - params->pszUsername[len_target + 1] = '\0'; - } - else if (params->ulUsernameMaxChars > 0) - params->pszUsername[0] = '\0'; - - len2 = strlenW(params->pszUsername); - memcpy(params->pszUsername + len2, user, min(len, params->ulUsernameMaxChars - len2) * sizeof(WCHAR)); - if (params->ulUsernameMaxChars) - params->pszUsername[len2 + min(len, params->ulUsernameMaxChars - len2 - 1)] = '\0'; - - HeapFree(GetProcessHeap(), 0, user); - - GetDlgItemTextW(hwndDlg, IDC_PASSWORD, params->pszPassword, - params->ulPasswordMaxChars); - - EndDialog(hwndDlg, IDOK); + CredDialogCommandOk(hwndDlg, params); return TRUE; } case MAKELONG(IDCANCEL, BN_CLICKED):

1 0

Rob Shearman : credui: Increase the dropped-down size of the username combo box.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 96714cf52e2f1a16940206112805c445715770af URL: http://source.winehq.org/git/wine.git/?a=commit;h=96714cf52e2f1a16940206112… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 17 17:30:50 2007 +0000 credui: Increase the dropped-down size of the username combo box. --- dlls/credui/credui_De.rc | 2 +- dlls/credui/credui_En.rc | 2 +- dlls/credui/credui_Ko.rc | 2 +- dlls/credui/credui_No.rc | 2 +- dlls/credui/credui_Pl.rc | 2 +- dlls/credui/credui_Sv.rc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/credui/credui_De.rc b/dlls/credui/credui_De.rc index 52227ec..3c9fcd2 100644 --- a/dlls/credui/credui_De.rc +++ b/dlls/credui/credui_De.rc @@ -30,7 +30,7 @@ BEGIN LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP LTEXT "&Benutzername:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,12 + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 LTEXT "&Passwort:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL CONTROL "&Remember my password",IDC_SAVE,"Button", diff --git a/dlls/credui/credui_En.rc b/dlls/credui/credui_En.rc index cdbe98e..e049cc8 100644 --- a/dlls/credui/credui_En.rc +++ b/dlls/credui/credui_En.rc @@ -30,7 +30,7 @@ BEGIN LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP LTEXT "&User name:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,12 + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 LTEXT "&Password:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL CONTROL "&Remember my password",IDC_SAVE,"Button", diff --git a/dlls/credui/credui_Ko.rc b/dlls/credui/credui_Ko.rc index 3208af1..0e94469 100644 --- a/dlls/credui/credui_Ko.rc +++ b/dlls/credui/credui_Ko.rc @@ -31,7 +31,7 @@ BEGIN LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP LTEXT "�� ̸�(&U):",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,12 + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 LTEXT "��ȣ(&P):",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL CONTROL "�� ȣ ��(&R)",IDC_SAVE,"Button", diff --git a/dlls/credui/credui_No.rc b/dlls/credui/credui_No.rc index 4f1ddb7..8e7be89 100644 --- a/dlls/credui/credui_No.rc +++ b/dlls/credui/credui_No.rc @@ -30,7 +30,7 @@ BEGIN LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP LTEXT "Br&ukernavn:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,12 + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 LTEXT "&Passord:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL CONTROL "&Remember my password",IDC_SAVE,"Button", diff --git a/dlls/credui/credui_Pl.rc b/dlls/credui/credui_Pl.rc index 0063e52..87d2d1a 100644 --- a/dlls/credui/credui_Pl.rc +++ b/dlls/credui/credui_Pl.rc @@ -31,7 +31,7 @@ BEGIN LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP LTEXT "&U�ytkownik:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,12 + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 LTEXT "&Has�o:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL CONTROL "&Remember my password",IDC_SAVE,"Button", diff --git a/dlls/credui/credui_Sv.rc b/dlls/credui/credui_Sv.rc index 7c57306..a3c850b 100644 --- a/dlls/credui/credui_Sv.rc +++ b/dlls/credui/credui_Sv.rc @@ -30,7 +30,7 @@ BEGIN LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP LTEXT "A&nv�ndarnamn:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | - CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,12 + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 LTEXT "&L�senord:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL CONTROL "&Remember my password",IDC_SAVE,"Button",

1 0

Thomas Weidenmueller : comctl32: Fix handling of CB_RESETCONTENT in ComboBoxEx.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 05a9678d20c86c50035e7f5ca3faf5bc011ed0ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a9678d20c86c50035e7f5ca… Author: Thomas Weidenmueller <thomas(a)reactsoft.com> Date: Fri Nov 16 13:49:38 2007 -0700 comctl32: Fix handling of CB_RESETCONTENT in ComboBoxEx. --- dlls/comctl32/comboex.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 299a997..006b8a6 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1578,6 +1578,27 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *di } +static void COMBOEX_ResetContent (COMBOEX_INFO *infoPtr) +{ + if (infoPtr->items) + { + CBE_ITEMDATA *item, *next; + + item = infoPtr->items; + while (item) { + next = item->next; + COMBOEX_FreeText (item); + Free (item); + item = next; + } + infoPtr->items = 0; + } + + infoPtr->selected = -1; + infoPtr->nb_items = 0; +} + + static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) { if (infoPtr->hwndCombo) @@ -1586,18 +1607,7 @@ static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) Free (infoPtr->edit); infoPtr->edit = 0; - if (infoPtr->items) { - CBE_ITEMDATA *item, *next; - - item = infoPtr->items; - while (item) { - next = item->next; - COMBOEX_FreeText (item); - Free (item); - item = next; - } - infoPtr->items = 0; - } + COMBOEX_ResetContent (infoPtr); if (infoPtr->defaultFont) DeleteObject (infoPtr->defaultFont); @@ -2234,12 +2244,15 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case CB_GETLBTEXTLEN: return COMBOEX_GetListboxText(infoPtr, wParam, NULL); + case CB_RESETCONTENT: + COMBOEX_ResetContent(infoPtr); + /* fall through */ + /* Combo messages we are not sure if we need to process or just forward */ case CB_GETDROPPEDCONTROLRECT: case CB_GETITEMHEIGHT: case CB_GETEXTENDEDUI: case CB_LIMITTEXT: - case CB_RESETCONTENT: case CB_SELECTSTRING: /* Combo messages OK to just forward to the regular COMBO */

1 0

James Hawkins : msi: Don't check for a cabinet's existence if it' s embedded in the package.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 78eead93fd874634fdffd7c93e015bca4da0d755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78eead93fd874634fdffd7c93… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Nov 16 17:29:18 2007 -0600 msi: Don't check for a cabinet's existence if it's embedded in the package. --- dlls/msi/files.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 8dbc765..94510c5 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -637,7 +637,8 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m } } - if (file->IsCompressed && mi->cabinet && + if (file->IsCompressed && + mi->cabinet && mi->cabinet[0] != '#' && GetFileAttributesW(mi->cabinet) == INVALID_FILE_ATTRIBUTES) { ERR("Cabinet not found: %s\n", debugstr_w(mi->cabinet));

1 0

Juan Lang : shell32: Constify some parameters.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 75ba71193296425e037798c2218b83c380f2dfcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ba71193296425e037798c22… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 16 12:41:43 2007 -0800 shell32: Constify some parameters. --- dlls/shell32/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index b5000e2..623edab 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -909,7 +909,7 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec /************************************************************************* * execute_from_key [Internal] */ -static UINT_PTR execute_from_key(LPWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWSTR szCommandline, +static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWSTR szCommandline, LPCWSTR executable_name, SHELL_ExecuteW32 execfunc, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) @@ -1368,7 +1368,7 @@ static BOOL SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameter return appKnownSingular; } -static UINT_PTR SHELL_quote_and_execute( LPCWSTR wcmd, LPCWSTR wszParameters, LPWSTR lpstrProtocol, LPCWSTR wszApplicationName, LPWSTR env, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc ) +static UINT_PTR SHELL_quote_and_execute( LPCWSTR wcmd, LPCWSTR wszParameters, LPCWSTR lpstrProtocol, LPCWSTR wszApplicationName, LPWSTR env, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc ) { static const WCHAR wQuote[] = {'"',0}; static const WCHAR wSpace[] = {' ',0};

1 0

Juan Lang : shell32: Dynamically allocate buffer for command.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: f2748c7af364f416d607065f27515b20e2c39f61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2748c7af364f416d607065f2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 16 12:42:06 2007 -0800 shell32: Dynamically allocate buffer for command. --- dlls/shell32/shlexec.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 623edab..a6f0031 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1417,11 +1417,12 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI | SEE_MASK_UNICODE | SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR; - WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH]; - WCHAR *wszApplicationName, *wszParameters, *wszDir; + WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024]; + WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd; DWORD dwApplicationNameLen = MAX_PATH+2; DWORD parametersLen = sizeof(parametersBuffer) / sizeof(WCHAR); DWORD dirLen = sizeof(dirBuffer) / sizeof(WCHAR); + DWORD wcmdLen = sizeof(wcmdBuffer) / sizeof(WCHAR); DWORD len; SHELLEXECUTEINFOW sei_tmp; /* modifiable copy of SHELLEXECUTEINFO struct */ WCHAR wfileName[MAX_PATH]; @@ -1429,7 +1430,6 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) WCHAR lpstrProtocol[256]; LPCWSTR lpFile; UINT_PTR retval = SE_ERR_NOASSOC; - WCHAR wcmd[1024]; BOOL appKnownSingular = FALSE; /* make a local copy of the LPSHELLEXECUTEINFO structure and work with this from now on */ @@ -1681,6 +1681,15 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) lpFile = wfileName; + wcmd = wcmdBuffer; + len = lstrlenW(wszApplicationName) + 1; + if (sei_tmp.lpParameters[0]) + len += 1 + lstrlenW(wszParameters); + if (len > wcmdLen) + { + wcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + wcmdLen = len; + } strcpyW(wcmd, wszApplicationName); if (sei_tmp.lpParameters[0]) { strcatW(wcmd, wSpace); @@ -1694,12 +1703,14 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) HeapFree(GetProcessHeap(), 0, wszParameters); if (wszDir != dirBuffer) HeapFree(GetProcessHeap(), 0, wszDir); + if (wcmd != wcmdBuffer) + HeapFree(GetProcessHeap(), 0, wcmd); return TRUE; } /* Else, try to find the executable */ wcmd[0] = '\0'; - retval = SHELL_FindExecutable(sei_tmp.lpDirectory, lpFile, sei_tmp.lpVerb, wcmd, 1024, lpstrProtocol, &env, sei_tmp.lpIDList, sei_tmp.lpParameters); + retval = SHELL_FindExecutable(sei_tmp.lpDirectory, lpFile, sei_tmp.lpVerb, wcmd, wcmdLen, lpstrProtocol, &env, sei_tmp.lpIDList, sei_tmp.lpParameters); if (retval > 32) /* Found */ { retval = SHELL_quote_and_execute( wcmd, wszParameters, lpstrProtocol, @@ -1754,6 +1765,8 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) HeapFree(GetProcessHeap(), 0, wszParameters); if (wszDir != dirBuffer) HeapFree(GetProcessHeap(), 0, wszDir); + if (wcmd != wcmdBuffer) + HeapFree(GetProcessHeap(), 0, wcmd); sei->hInstApp = (HINSTANCE)(retval > 32 ? 33 : retval); return retval > 32;

1 0

Juan Lang : shell32: Use helper function to execute a URL.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 9d055348226956aac56584df4b95cb6c1031bcff URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d055348226956aac56584df4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 16 12:43:03 2007 -0800 shell32: Use helper function to execute a URL. --- dlls/shell32/shlexec.c | 61 ++++++++++++++++++++++++++--------------------- 1 files changed, 34 insertions(+), 27 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index a6f0031..1b891b3 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1403,6 +1403,39 @@ static UINT_PTR SHELL_quote_and_execute( LPCWSTR wcmd, LPCWSTR wszParameters, LP return retval; } +static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc ) +{ + static const WCHAR wShell[] = {'\\','s','h','e','l','l','\\',0}; + static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0}; + WCHAR lpstrProtocol[256]; + LPCWSTR lpstrRes; + INT iSize; + + lpstrRes = strchrW(lpFile, ':'); + if (lpstrRes) + iSize = lpstrRes - lpFile; + else + iSize = strlenW(lpFile); + + TRACE("Got URL: %s\n", debugstr_w(lpFile)); + /* Looking for ...protocol\shell\lpOperation\command */ + memcpy(lpstrProtocol, lpFile, iSize*sizeof(WCHAR)); + lpstrProtocol[iSize] = '\0'; + strcatW(lpstrProtocol, wShell); + strcatW(lpstrProtocol, psei->lpVerb? psei->lpVerb: wszOpen); + strcatW(lpstrProtocol, wCommand); + + /* Remove File Protocol from lpFile */ + /* In the case file://path/file */ + if (!strncmpiW(lpFile, wFile, iSize)) + { + lpFile += iSize; + while (*lpFile == ':') lpFile++; + } + return execute_from_key(lpstrProtocol, lpFile, NULL, psei->lpParameters, + wcmd, execfunc, psei, psei_out); +} + /************************************************************************* * SHELL_execute [Internal] */ @@ -1720,33 +1753,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) } else if (PathIsURLW(lpFile)) /* File not found, check for URL */ { - static const WCHAR wShell[] = {'\\','s','h','e','l','l','\\',0}; - static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0}; - LPWSTR lpstrRes; - INT iSize; - - lpstrRes = strchrW(lpFile, ':'); - if (lpstrRes) - iSize = lpstrRes - lpFile; - else - iSize = strlenW(lpFile); - - TRACE("Got URL: %s\n", debugstr_w(lpFile)); - /* Looking for ...protocol\shell\lpOperation\command */ - memcpy(lpstrProtocol, lpFile, iSize*sizeof(WCHAR)); - lpstrProtocol[iSize] = '\0'; - strcatW(lpstrProtocol, wShell); - strcatW(lpstrProtocol, sei_tmp.lpVerb? sei_tmp.lpVerb: wszOpen); - strcatW(lpstrProtocol, wCommand); - - /* Remove File Protocol from lpFile */ - /* In the case file://path/file */ - if (!strncmpiW(lpFile, wFile, iSize)) - { - lpFile += iSize; - while (*lpFile == ':') lpFile++; - } - retval = execute_from_key(lpstrProtocol, lpFile, NULL, sei_tmp.lpParameters, wcmd, execfunc, &sei_tmp, sei); + retval = SHELL_execute_url( lpFile, wFile, wcmd, &sei_tmp, sei, execfunc ); } /* Check if file specified is in the form www.??????.*** */ else if (!strncmpiW(lpFile, wWww, 3))

1 0

Juan Lang : shell32: Dynamically allocate memory for executing an URL.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 08ab605e374ac7dc7f6d97fe9544f11246c8b947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08ab605e374ac7dc7f6d97fe9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 16 12:43:35 2007 -0800 shell32: Dynamically allocate memory for executing an URL. --- dlls/shell32/shlexec.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 1b891b3..c95d599 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1407,9 +1407,11 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, { static const WCHAR wShell[] = {'\\','s','h','e','l','l','\\',0}; static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0}; - WCHAR lpstrProtocol[256]; + UINT_PTR retval; + WCHAR *lpstrProtocol; LPCWSTR lpstrRes; INT iSize; + DWORD len; lpstrRes = strchrW(lpFile, ':'); if (lpstrRes) @@ -1419,6 +1421,12 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, TRACE("Got URL: %s\n", debugstr_w(lpFile)); /* Looking for ...protocol\shell\lpOperation\command */ + len = iSize + lstrlenW(wShell) + lstrlenW(wCommand) + 1; + if (psei->lpVerb) + len += lstrlenW(psei->lpVerb); + else + len += lstrlenW(wszOpen); + lpstrProtocol = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); memcpy(lpstrProtocol, lpFile, iSize*sizeof(WCHAR)); lpstrProtocol[iSize] = '\0'; strcatW(lpstrProtocol, wShell); @@ -1432,8 +1440,10 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, lpFile += iSize; while (*lpFile == ':') lpFile++; } - return execute_from_key(lpstrProtocol, lpFile, NULL, psei->lpParameters, - wcmd, execfunc, psei, psei_out); + retval = execute_from_key(lpstrProtocol, lpFile, NULL, psei->lpParameters, + wcmd, execfunc, psei, psei_out); + HeapFree(GetProcessHeap(), 0, lpstrProtocol); + return retval; } /*************************************************************************

1 0

Juan Lang : shell32: Use more restricted registry rights when quering values.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: e580a91f39938985984b41fd51d87e88dec033eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e580a91f39938985984b41fd5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 16 14:08:11 2007 -0800 shell32: Use more restricted registry rights when quering values. --- dlls/shell32/classes.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index db4ce80..d17a31c 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -65,7 +65,7 @@ BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL lstrcpynW(szTemp + (bPrependDot?1:0), szExtension, MAX_EXTENSION_LENGTH); - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szTemp, 0, 0x02000000, &hkey)) + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szTemp, 0, KEY_READ, &hkey)) { return FALSE; } @@ -99,7 +99,7 @@ BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bP lstrcpynA(szTemp + (bPrependDot?1:0), szExtension, MAX_EXTENSION_LENGTH); - if (RegOpenKeyExA(HKEY_CLASSES_ROOT, szTemp, 0, 0x02000000, &hkey)) + if (RegOpenKeyExA(HKEY_CLASSES_ROOT, szTemp, 0, KEY_READ, &hkey)) { return FALSE; } @@ -182,7 +182,7 @@ BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LP TRACE("%p %s %s %p\n", hkeyClass, debugstr_w(szClass), debugstr_w(szVerb), szDest); if (szClass) - RegOpenKeyExW(HKEY_CLASSES_ROOT, szClass, 0, 0x02000000, &hkeyClass); + RegOpenKeyExW(HKEY_CLASSES_ROOT, szClass, 0, KEY_READ, &hkeyClass); if (!hkeyClass) return FALSE; ret = FALSE; @@ -280,7 +280,7 @@ BOOL HCR_GetDefaultIconW(LPCWSTR szClass, LPWSTR szDest, DWORD len, int* picon_i lstrcpynW(sTemp, szClass, MAX_PATH); lstrcatW(sTemp, swDefaultIcon); - if (!RegOpenKeyExW(HKEY_CLASSES_ROOT, sTemp, 0, 0x02000000, &hkey)) + if (!RegOpenKeyExW(HKEY_CLASSES_ROOT, sTemp, 0, KEY_READ, &hkey)) { ret = HCR_RegGetDefaultIconW(hkey, szDest, len, picon_idx); RegCloseKey(hkey); @@ -304,7 +304,7 @@ BOOL HCR_GetDefaultIconA(LPCSTR szClass, LPSTR szDest, DWORD len, int* picon_idx sprintf(sTemp, "%s\\DefaultIcon",szClass); - if (!RegOpenKeyExA(HKEY_CLASSES_ROOT, sTemp, 0, 0x02000000, &hkey)) + if (!RegOpenKeyExA(HKEY_CLASSES_ROOT, sTemp, 0, KEY_READ, &hkey)) { ret = HCR_RegGetDefaultIconA(hkey, szDest, len, picon_idx); RegCloseKey(hkey);

1 0