November 2007 - Wine-commits

Jacek Caban : include: Added isguids.h.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 7fdcc87def3b77e6e3b7f2cab96427054624e8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fdcc87def3b77e6e3b7f2cab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 17 20:02:28 2007 +0100 include: Added isguids.h. --- dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/isguids.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index e1aeaf4..7fd7c2c 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -69,6 +69,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "urlhist.h" #include "hlguids.h" #include "dimm.h" +#include "isguids.h" /* FIXME: cguids declares GUIDs but does not define their values */ diff --git a/include/Makefile.in b/include/Makefile.in index 3b08d73..e1d53da 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -204,6 +204,7 @@ SRCDIR_INCLUDES = \ ipifcons.h \ iprtrmib.h \ iptypes.h \ + isguids.h \ ks.h \ ksguid.h \ ksmedia.h \ diff --git a/include/isguids.h b/include/isguids.h new file mode 100644 index 0000000..daf5600 --- /dev/null +++ b/include/isguids.h @@ -0,0 +1,28 @@ +/* + * Copyright 2007 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _ISGUIDS_H_ +#define _ISGUIDS_H_ + +DEFINE_GUID(CLSID_InternetShortcut, 0xfbf23b40,0xe3f0,0x101b,0x84,0x88,0x00,0xaa,0x00,0x3e,0x56,0xf8); + +DEFINE_GUID(IID_IUniformResourceLocatorA, 0xfbf23b80,0xe3f0,0x101b,0x84,0x88,0x00,0xaa,0x00,0x3e,0x56,0xf8); +DEFINE_GUID(IID_IUniformResourceLocatorW, 0xcabb0da0,0xda57,0x11cf,0x99,0x74,0x00,0x20,0xaf,0xd7,0x97,0x62); +#define IID_IUniformResourceLocator WINELIB_NAME_AW(IID_IUniformResourceLocator) + +#endif

1 0

Jacek Caban : shdocvw: Register CLSID_InternetShortcut.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: b992b5751cc9d6f949d7e31df8be875e9674bb40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b992b5751cc9d6f949d7e31df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 17 20:02:50 2007 +0100 shdocvw: Register CLSID_InternetShortcut. --- dlls/shdocvw/factory.c | 6 ++++-- dlls/shdocvw/shdocvw.inf | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index e13f2ac..c8bb511 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -24,6 +24,7 @@ #include "shdocvw.h" #include "winreg.h" #include "advpub.h" +#include "isguids.h" #include "wine/debug.h" @@ -206,14 +207,15 @@ static const GUID CLSID_MruLongList = static HRESULT register_server(BOOL doregister) { STRTABLEA strtable; - STRENTRYA pse[13]; - static CLSID const *clsids[13]; + STRENTRYA pse[14]; + static CLSID const *clsids[14]; int i = 0; HRESULT hres; INF_SET_CLSID(CUrlHistory); INF_SET_CLSID(Internet); INF_SET_CLSID(InternetExplorer); + INF_SET_CLSID(InternetShortcut); INF_SET_CLSID(MicrosoftBrowserArchitecture); INF_SET_CLSID(MruLongList); INF_SET_CLSID(SearchAssistantOC); diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index 91de9ee..fd40df3 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -108,6 +108,20 @@ HKCR,"CLSID\%CLSID_WebBrowser_V1%\VersionIndependentProgID",,,"Shell.Explorer" HKCR,"Shell.Explorer.1",,,"" HKCR,"Shell.Explorer.1\CLSID",,,"%CLSID_WebBrowser_V1%" +HKCR,"CLSID\%CLSID_InternetShortcut%",,,"Internet Shortcut" +HKCR,"CLSID\%CLSID_InternetShortcut%\InProcServer32",,,"%MODULE%" +HKCR,"CLSID\%CLSID_InternetShortcut%\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\%CLSID_InternetShortcut%\ProgID",,,"InternetShortcut" +HKCR,"CLSID\%CLSID_InternetShortcut%\shellex\MayChangeDefaultMenu",,, +HKCR,"InternetShortcut",,,"Internet Shortcut" +HKCR,"InternetShortcut","EditFlags",2,"2" +HKCR,"InternetShortcut","IsShortcut",, +HKCR,"InternetShortcut","NeverShowExt",, +HKCR,"InternetShortcut\CLSID",,,"%CLSID_InteretShortcut%" +HKCR,"InternetShortcut\DefaultIcon",,,"url.dll,0" +HKCR,"InternetShortcut\shell\open\command",,,"rundll32.exe shdocvw.dll,OpenURL %l" +HKCR,"InternetShortcut\shell\print\command",,,rundll32.exe mshtml.dll,PrintHTML \"%1\"" +HKCR,"InternetShortcut\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML \"%1\" \"%2\" \"%3\" \"%4\"" [IE.Reg] HKLM,"Software\Microsoft\Internet Explorer","Version",,"6.0.2900.2180"

1 0

Rob Shearman : credui: Make sure not to leave the password in memory when no longer in use.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 0ae7eafc038c1586e11f74726a50bac8202ffc35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae7eafc038c1586e11f74726… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 17 17:32:12 2007 +0000 credui: Make sure not to leave the password in memory when no longer in use. --- dlls/credui/credui_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 33292f5..e61eac8 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -79,6 +79,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) HeapFree(GetProcessHeap(), 0, entry->pszTargetName); HeapFree(GetProcessHeap(), 0, entry->pszUsername); + ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, entry->pszPassword); HeapFree(GetProcessHeap(), 0, entry); } @@ -387,6 +388,7 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, { found = TRUE; HeapFree(GetProcessHeap(), 0, entry->pszUsername); + ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, entry->pszPassword); } @@ -447,6 +449,7 @@ DWORD WINAPI CredUIConfirmCredentialsW(PCWSTR pszTargetName, BOOL bConfirm) HeapFree(GetProcessHeap(), 0, entry->pszTargetName); HeapFree(GetProcessHeap(), 0, entry->pszUsername); + ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, entry->pszPassword); HeapFree(GetProcessHeap(), 0, entry);

1 0

Rob Shearman : shell32: Add a stub for LinkWindow_RegisterClass.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 6ae22de432e1fbaf1e290a4a595fdcf102bf6499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae22de432e1fbaf1e290a4a5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 17 17:33:12 2007 +0000 shell32: Add a stub for LinkWindow_RegisterClass. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellord.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 6928538..3c7fa74 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -210,6 +210,7 @@ 250 stdcall -noname PathRemoveExtension(ptr) PathRemoveExtensionAW 251 stdcall -noname PathRemoveArgs(ptr) PathRemoveArgsAW 256 stdcall @(ptr ptr) SHELL32_256 + 258 stdcall -noname LinkWindow_RegisterClass() #299 stub Shl1632_ThunkData32 #300 stub Shl3216_ThunkData32 diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 57d6b82..87f8c02 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1957,3 +1957,12 @@ HRESULT WINAPI SHSetLocalizedName(LPWSTR pszPath, LPCWSTR pszResModule, int idsR return S_OK; } + +/************************************************************************* + * LinkWindow_RegisterClass (SHELL32.258) + */ +BOOL WINAPI LinkWindow_RegisterClass(void) +{ + FIXME("()\n"); + return TRUE; +}

1 0

Rob Shearman : shell32: Add a stub for LinkWindow_UnregisterClass.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: b15186d49c36e1f973f23ef957c2cfc906186f36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15186d49c36e1f973f23ef95… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 17 17:33:44 2007 +0000 shell32: Add a stub for LinkWindow_UnregisterClass. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellord.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 3c7fa74..044f443 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -211,6 +211,7 @@ 251 stdcall -noname PathRemoveArgs(ptr) PathRemoveArgsAW 256 stdcall @(ptr ptr) SHELL32_256 258 stdcall -noname LinkWindow_RegisterClass() + 259 stdcall -noname LinkWindow_UnregisterClass() #299 stub Shl1632_ThunkData32 #300 stub Shl3216_ThunkData32 diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 87f8c02..ed326ea 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1966,3 +1966,12 @@ BOOL WINAPI LinkWindow_RegisterClass(void) FIXME("()\n"); return TRUE; } + +/************************************************************************* + * LinkWindow_UnregisterClass (SHELL32.259) + */ +BOOL WINAPI LinkWindow_UnregisterClass(void) +{ + FIXME("()\n"); + return TRUE; +}

1 0

Michael Stefaniuc : msvcrt/tests: Remove redundant NULL check before free() . Found by Smatch.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: daf1ed48c3911bc41bad99cdfadaad0dfebce82e URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf1ed48c3911bc41bad99cdf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Nov 17 19:15:10 2007 +0100 msvcrt/tests: Remove redundant NULL check before free(). Found by Smatch. --- dlls/msvcrt/tests/heap.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index e2e9a4a..afea53f 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -355,8 +355,7 @@ START_TEST(heap) mem = realloc(NULL, 0); ok(mem != NULL, "memory not (re)allocated for size 0\n"); - if (mem) - free(mem); + free(mem); test_aligned(); }

1 0

Rob Shearman : credui: Enumerate saved credentials and use these to populate the combo box.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: cdb6e9ed8232fe085662610c9e8e1614fa054a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb6e9ed8232fe085662610c9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 17 17:31:02 2007 +0000 credui: Enumerate saved credentials and use these to populate the combo box. --- dlls/credui/credui_main.c | 46 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 03550ba..83fb183 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -130,8 +130,44 @@ struct cred_dialog_params DWORD dwFlags; }; +static void CredDialogFillUsernameCombo(HWND hwndUsername, struct cred_dialog_params *params) +{ + DWORD count; + DWORD i; + PCREDENTIALW *credentials; + + if (!CredEnumerateW(NULL, 0, &count, &credentials)) + return; + + for (i = 0; i < count; i++) + { + COMBOBOXEXITEMW comboitem; + + if (params->dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS) + { + if ((credentials[i]->Type != CRED_TYPE_GENERIC) || !credentials[i]->UserName) + continue; + } + else + { + if (credentials[i]->Type == CRED_TYPE_GENERIC) + continue; + } + + comboitem.mask = CBEIF_TEXT; + comboitem.iItem = -1; + comboitem.pszText = credentials[i]->UserName; + SendMessageW(hwndUsername, CBEM_INSERTITEMW, 0, (LPARAM)&comboitem); + } + + CredFree(credentials); +} + static BOOL CredDialogInit(HWND hwndDlg, struct cred_dialog_params *params) { + HWND hwndUsername = GetDlgItem(hwndDlg, IDC_USERNAME); + HWND hwndPassword = GetDlgItem(hwndDlg, IDC_PASSWORD); + SetWindowLongPtrW(hwndDlg, DWLP_USER, (LONG_PTR)params); if (params->pszMessageText) SetDlgItemTextW(hwndDlg, IDC_MESSAGE, params->pszMessageText); @@ -143,13 +179,15 @@ static BOOL CredDialogInit(HWND hwndDlg, struct cred_dialog_params *params) 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); + SetWindowTextW(hwndUsername, params->pszUsername); + SetWindowTextW(hwndPassword, params->pszPassword); + + CredDialogFillUsernameCombo(hwndUsername, params); if (params->pszUsername[0]) - SetFocus(GetDlgItem(hwndDlg, IDC_PASSWORD)); + SetFocus(hwndPassword); else - SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME)); + SetFocus(hwndUsername); if (params->pszCaptionText) SetWindowTextW(hwndDlg, params->pszCaptionText);

1 0

Rob Shearman : credui: Check for and don' t add duplicates when filling the username combo box.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 4002964259e9d461f9e917b09da85498c3305d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4002964259e9d461f9e917b09… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 17 17:31:16 2007 +0000 credui: Check for and don't add duplicates when filling the username combo box. --- dlls/credui/credui_main.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 83fb183..e7960d4 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -142,6 +142,8 @@ static void CredDialogFillUsernameCombo(HWND hwndUsername, struct cred_dialog_pa for (i = 0; i < count; i++) { COMBOBOXEXITEMW comboitem; + DWORD j; + BOOL duplicate = FALSE; if (params->dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS) { @@ -154,6 +156,17 @@ static void CredDialogFillUsernameCombo(HWND hwndUsername, struct cred_dialog_pa continue; } + /* don't add another item with the same name if we've already added it */ + for (j = 0; j < i; j++) + if (!strcmpW(credentials[i]->UserName, credentials[j]->UserName)) + { + duplicate = TRUE; + break; + } + + if (duplicate) + continue; + comboitem.mask = CBEIF_TEXT; comboitem.iItem = -1; comboitem.pszText = credentials[i]->UserName;

1 0

Rob Shearman : credui: Ensure that the foreground window doesn' t get changed while the user is typing in their password.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 28fb2f01ef23ccaf7ea67698f02fdfd176683a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=28fb2f01ef23ccaf7ea67698f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 17 17:31:43 2007 +0000 credui: Ensure that the foreground window doesn't get changed while the user is typing in their password. This doesn't currently work on Wine as LockSetForegroundWindow isn't implemented, but when it does it should work nicely. --- dlls/credui/credui_main.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index e7960d4..33292f5 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -288,6 +288,16 @@ static INT_PTR CALLBACK CredDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, case MAKELONG(IDCANCEL, BN_CLICKED): EndDialog(hwndDlg, IDCANCEL); return TRUE; + case MAKELONG(IDC_PASSWORD, EN_SETFOCUS): + /* don't allow another window to steal focus while the + * user is typing their password */ + LockSetForegroundWindow(LSFW_LOCK); + return TRUE; + case MAKELONG(IDC_PASSWORD, EN_KILLFOCUS): + /* the user is no longer typing their password, so allow + * other windows to become foreground ones */ + LockSetForegroundWindow(LSFW_UNLOCK); + return TRUE; } /* fall through */ default:

1 0

Rob Shearman : include: Add definitions used for AllowSetForegroundWindow and LockSetForegroundWindow .
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 3c8663b7e96a4e31644a1e60212bf83142fc5e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c8663b7e96a4e31644a1e602… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 17 17:31:57 2007 +0000 include: Add definitions used for AllowSetForegroundWindow and LockSetForegroundWindow. --- include/winuser.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index f3af607..ddd81c5 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4220,6 +4220,13 @@ typedef struct #define STATE_SYSTEM_PROTECTED 0x20000000 #define STATE_SYSTEM_VALID 0x3FFFFFFF +/* Lock codes for LockSetForegroundWindow */ +#define LSFW_LOCK 1 +#define LSFW_UNLOCK 2 + +/* Values for AllowSetForegroundWindow */ +#define ASFW_ANY ((DWORD)-1) + #define EnumTaskWindows(handle,proc,lparam) \ EnumThreadWindows(handle,proc,lparam) #define OemToAnsiA OemToCharA

1 0