wine-commits October 2007

wine-commits@winehq.org

4 participants
996 discussions

Gerald Pfeifer : rpcrt4: Initialize variable to avoid compiler warning.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 826a6d09d4e58ff3f18d70b0b24a00f414d318fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=826a6d09d4e58ff3f18d70b0b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Oct 24 14:33:39 2007 +0200 rpcrt4: Initialize variable to avoid compiler warning. --- dlls/rpcrt4/rpc_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index b62954b..b8fc580 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -167,7 +167,7 @@ static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSA RpcServerInterface* sif; RPC_DISPATCH_FUNCTION func; UUID *object_uuid; - RpcPktHdr *response; + RpcPktHdr *response = NULL; void *buf = msg->Buffer; RPC_STATUS status; BOOL exception;

1 0

Rob Shearman : kernel32: Add tests for creating events with different initial security descriptors.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 512239d515ca7ba16b8a47c19a8baee583b33462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=512239d515ca7ba16b8a47c19… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 24 16:07:15 2007 +0100 kernel32: Add tests for creating events with different initial security descriptors. --- dlls/kernel32/tests/sync.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 6031fc5..716e56e 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -245,9 +245,48 @@ static void test_slist(void) ok(((struct item*)entry->Next)->value == 1, "item 1 not at the back of list\n"); } +static void test_event_security(void) +{ + HANDLE handle; + SECURITY_ATTRIBUTES sa; + SECURITY_DESCRIPTOR sd; + ACL acl; + + /* no sd */ + handle = CreateEventA(NULL, FALSE, FALSE, __FILE__ ": Test Event"); + ok(handle != NULL, "CreateEventW with blank sd failed with error %d\n", GetLastError()); + CloseHandle(handle); + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = &sd; + sa.bInheritHandle = FALSE; + + InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION); + + /* blank sd */ + handle = CreateEventA(&sa, FALSE, FALSE, __FILE__ ": Test Event"); + ok(handle != NULL, "CreateEventW with blank sd failed with error %d\n", GetLastError()); + CloseHandle(handle); + + /* sd with NULL dacl */ + SetSecurityDescriptorDacl(&sd, TRUE, NULL, FALSE); + handle = CreateEventA(&sa, FALSE, FALSE, __FILE__ ": Test Event"); + ok(handle != NULL, "CreateEventW with blank sd failed with error %d\n", GetLastError()); + CloseHandle(handle); + + /* sd with empty dacl */ + InitializeAcl(&acl, sizeof(acl), ACL_REVISION); + SetSecurityDescriptorDacl(&sd, TRUE, &acl, FALSE); + handle = CreateEventA(&sa, FALSE, FALSE, __FILE__ ": Test Event"); + todo_wine + ok(handle != NULL, "CreateEventW with blank sd failed with error %d\n", GetLastError()); + CloseHandle(handle); +} + START_TEST(sync) { test_signalandwait(); test_mutex(); test_slist(); + test_event_security(); }

1 0

Rob Shearman : server: Use the security descriptor passed in when creating events.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: dd9e392796d9a1e7ae1f38c74b2e5a77c6786d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd9e392796d9a1e7ae1f38c74… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 24 16:04:42 2007 +0100 server: Use the security descriptor passed in when creating events. --- dlls/ntdll/sync.c | 84 +++++++++++++++++++++++++++++++++++++++- include/wine/server_protocol.h | 13 +++++- server/console.c | 2 +- server/event.c | 25 ++++++++++-- server/named_pipe.c | 4 +- server/object.h | 3 +- server/process.c | 4 +- server/protocol.def | 21 +++++++--- server/security.h | 4 ++ server/token.c | 23 +++++++++++ server/trace.c | 25 ++++++++++- 11 files changed, 184 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd9e392796d9a1e7ae1f3…

1 0

Rob Shearman : advapi32: Print out the unknown value for sid use in the LookupAccountName test, instead of the known value.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 87b15db6172af0497cfea4f1c9baaaec0b94ed1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b15db6172af0497cfea4f1c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 24 16:34:59 2007 +0100 advapi32: Print out the unknown value for sid use in the LookupAccountName test, instead of the known value. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3332d7b..4d62f59 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1510,7 +1510,7 @@ static void test_LookupAccountName(void) ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); ok(domain_size == domain_save - 1, "Expected %d, got %d\n", domain_save - 1, domain_size); ok(lstrlen(domain) == domain_size, "Expected %d\n", lstrlen(domain)); - ok(sid_use == SidTypeUser, "Expected SidTypeUser, got %d\n", SidTypeUser); + ok(sid_use == SidTypeUser, "Expected SidTypeUser, got %d\n", sid_use); } domain_size = domain_save;

1 0

Rob Shearman : comctl32: Don' t set the focus to the text box when the ComboBoxEx receives a CBN_SELENDCANCEL notification .
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 266a5a9d23f68158c5075ed39c870a34c0a896f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=266a5a9d23f68158c5075ed39… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 24 16:35:39 2007 +0100 comctl32: Don't set the focus to the text box when the ComboBoxEx receives a CBN_SELENDCANCEL notification. --- dlls/comctl32/comboex.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 8370f00..299a997 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1240,6 +1240,7 @@ static LRESULT COMBOEX_Command (COMBOEX_INFO *infoPtr, WPARAM wParam, LPARAM lPa return SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf); case CBN_SELENDOK: + case CBN_SELENDCANCEL: /* * We have to change the handle since we are the control * issuing the message. IE4 depends on this.

1 0

Rob Shearman : credui: Add tests for CredUIPromptForCredentialsW and CredUIConfirmCredentialsW.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: e146591cd6abcf20f7b411ee53e99e07275a0f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e146591cd6abcf20f7b411ee5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 24 16:17:36 2007 +0100 credui: Add tests for CredUIPromptForCredentialsW and CredUIConfirmCredentialsW. --- .gitignore | 5 ++ Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 5 ++ dlls/credui/tests/Makefile.in | 13 ++++ dlls/credui/tests/credui.c | 131 +++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 164 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e146591cd6abcf20f7b41…

1 0

Rob Shearman : credui: Build the import library.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 1d150b8920af9cf8124157c72b45ebb890c14153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d150b8920af9cf8124157c72… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 24 16:16:55 2007 +0100 credui: Build the import library. --- dlls/credui/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index f9ecc75..03b639b 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = credui.dll +IMPORTLIB = libcredui.$(IMPLIBEXT) IMPORTS = user32 kernel32 C_SRCS = \

1 0

Rob Shearman : credui: Verify some of the parameters to CredUIPromptForCredentials, like native does.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 3b219c9638486bc041d708d1932d3f579818880c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b219c9638486bc041d708d19… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 24 16:16:27 2007 +0100 credui: Verify some of the parameters to CredUIPromptForCredentials, like native does. --- dlls/credui/credui_main.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index c313107..8d958c4 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -192,6 +192,15 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, debugstr_w(pszTargetName), Reserved, dwAuthError, debugstr_w(pszUsername), ulUsernameMaxChars, pszPassword, ulPasswordMaxChars, pfSave, dwFlags); + if ((dwFlags & (CREDUI_FLAGS_ALWAYS_SHOW_UI|CREDUI_FLAGS_GENERIC_CREDENTIALS)) == CREDUI_FLAGS_ALWAYS_SHOW_UI) + return ERROR_INVALID_FLAGS; + + if (!pszTargetName) + return ERROR_INVALID_PARAMETER; + + if ((dwFlags & CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX) && !pfSave) + return ERROR_INVALID_PARAMETER; + params.pszTargetName = pszTargetName; if (pUIInfo) {

1 0

Rob Shearman : credui: The pUIInfo parameter is optional to CredUIPromptForCredentials, so check before dereferencing it to get the parent window.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 33d1ad1098a1601f5bba5768b0b252dfd70170b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d1ad1098a1601f5bba5768b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 24 16:16:14 2007 +0100 credui: The pUIInfo parameter is optional to CredUIPromptForCredentials, so check before dereferencing it to get the parent window. --- dlls/credui/credui_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index b9b90d0..c313107 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -212,7 +212,8 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, params.fSave = pfSave ? *pfSave : FALSE; ret = DialogBoxParamW(hinstCredUI, MAKEINTRESOURCEW(IDD_CREDDIALOG), - pUIInfo->hwndParent, CredDialogProc, (LPARAM)&params); + pUIInfo ? pUIInfo->hwndParent : NULL, + CredDialogProc, (LPARAM)&params); if (ret <= 0) return GetLastError();

1 0

Rob Shearman : credui: Implement CredUIConfirmCredentialsW.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: af069ad758791655bd46bfdf77c84949fe9dd789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af069ad758791655bd46bfdf7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 24 16:16:02 2007 +0100 credui: Implement CredUIConfirmCredentialsW. --- dlls/credui/credui_main.c | 139 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 127 insertions(+), 12 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index dfaa06e..b9b90d0 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -30,24 +30,65 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(credui); +struct pending_credentials +{ + struct list entry; + PWSTR pszTargetName; + PWSTR pszUsername; + PWSTR pszPassword; +}; + static HINSTANCE hinstCredUI; +struct list pending_credentials_list = LIST_INIT(pending_credentials_list); + +static CRITICAL_SECTION csPendingCredentials; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &csPendingCredentials, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": csPendingCredentials") } +}; +static CRITICAL_SECTION csPendingCredentials = { &critsect_debug, -1, 0, 0, 0, 0 }; + + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ + + if (fdwReason == DLL_PROCESS_ATTACH) + { + DisableThreadLibraryCalls(hinstDLL); + hinstCredUI = hinstDLL; + } + else if (fdwReason == DLL_PROCESS_DETACH) + { + struct pending_credentials *entry, *cursor2; + LIST_FOR_EACH_ENTRY_SAFE(entry, cursor2, &pending_credentials_list, struct pending_credentials, entry) + { + list_remove(&entry->entry); - if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ + HeapFree(GetProcessHeap(), 0, entry->pszTargetName); + HeapFree(GetProcessHeap(), 0, entry->pszUsername); + HeapFree(GetProcessHeap(), 0, entry->pszPassword); + HeapFree(GetProcessHeap(), 0, entry); + } + } - if (fdwReason == DLL_PROCESS_ATTACH) - { - DisableThreadLibraryCalls(hinstDLL); - hinstCredUI = hinstDLL; - } + return TRUE; +} - return TRUE; +static DWORD save_credentials(PCWSTR pszTargetName, PCWSTR pszUsername, + PCWSTR pszPassword) +{ + FIXME("save servername %s with username %s\n", debugstr_w(pszTargetName), debugstr_w(pszUsername)); + return ERROR_SUCCESS; } struct cred_dialog_params @@ -145,6 +186,7 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, { INT_PTR ret; struct cred_dialog_params params; + DWORD result = ERROR_SUCCESS; TRACE("(%p, %s, %p, %d, %s, %d, %p, %d, %p, 0x%08x)\n", pUIInfo, debugstr_w(pszTargetName), Reserved, dwAuthError, debugstr_w(pszUsername), @@ -183,7 +225,50 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, if (pfSave) *pfSave = params.fSave; - return ERROR_SUCCESS; + if (params.fSave) + { + if (dwFlags & CREDUI_FLAGS_EXPECT_CONFIRMATION) + { + BOOL found = FALSE; + struct pending_credentials *entry; + int len; + + EnterCriticalSection(&csPendingCredentials); + + /* find existing pending credentials for the same target and overwrite */ + /* FIXME: is this correct? */ + LIST_FOR_EACH_ENTRY(entry, &pending_credentials_list, struct pending_credentials, entry) + if (!strcmpW(pszTargetName, entry->pszTargetName)) + { + found = TRUE; + HeapFree(GetProcessHeap(), 0, entry->pszUsername); + HeapFree(GetProcessHeap(), 0, entry->pszPassword); + } + + if (!found) + { + entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); + list_init(&entry->entry); + len = strlenW(pszTargetName); + entry->pszTargetName = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); + memcpy(entry->pszTargetName, pszTargetName, (len + 1)*sizeof(WCHAR)); + list_add_tail(&entry->entry, &pending_credentials_list); + } + + len = strlenW(params.pszUsername); + entry->pszUsername = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); + memcpy(entry->pszUsername, params.pszUsername, (len + 1)*sizeof(WCHAR)); + len = strlenW(params.pszPassword); + entry->pszPassword = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); + memcpy(entry->pszPassword, params.pszPassword, (len + 1)*sizeof(WCHAR)); + + LeaveCriticalSection(&csPendingCredentials); + } + else + result = save_credentials(pszTargetName, pszUsername, pszPassword); + } + + return result; } /****************************************************************************** @@ -191,9 +276,39 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, */ DWORD WINAPI CredUIConfirmCredentialsW(PCWSTR pszTargetName, BOOL bConfirm) { - FIXME("(%s, %s): stub\n", debugstr_w(pszTargetName), - bConfirm ? "TRUE" : "FALSE"); - return ERROR_SUCCESS; + struct pending_credentials *entry; + DWORD result = ERROR_NOT_FOUND; + + TRACE("(%s, %s)\n", debugstr_w(pszTargetName), bConfirm ? "TRUE" : "FALSE"); + + if (!pszTargetName) + return ERROR_INVALID_PARAMETER; + + EnterCriticalSection(&csPendingCredentials); + + LIST_FOR_EACH_ENTRY(entry, &pending_credentials_list, struct pending_credentials, entry) + { + if (!strcmpW(pszTargetName, entry->pszTargetName)) + { + if (bConfirm) + result = save_credentials(entry->pszTargetName, entry->pszUsername, entry->pszPassword); + else + result = ERROR_SUCCESS; + + list_remove(&entry->entry); + + HeapFree(GetProcessHeap(), 0, entry->pszTargetName); + HeapFree(GetProcessHeap(), 0, entry->pszUsername); + HeapFree(GetProcessHeap(), 0, entry->pszPassword); + HeapFree(GetProcessHeap(), 0, entry); + + break; + } + } + + LeaveCriticalSection(&csPendingCredentials); + + return result; } /******************************************************************************

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2007