February 2008 - Wine-commits

Marcus Meissner : wordpad: Remove condition that never triggers.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: fa6937f4a5660a3b942de3f3fc5c62d42eb562b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6937f4a5660a3b942de3f3f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 26 09:32:41 2008 +0100 wordpad: Remove condition that never triggers. --- programs/wordpad/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index 196e7d1..aef152a 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -187,7 +187,7 @@ static void format_filelist_filename(LPWSTR file, LPWSTR out) else if(truncpos1 == truncpos2 || !truncpos2) lstrcatW(out, file); else - truncate_path(file, out, truncpos1, truncpos2 ? truncpos2 : (pos_basename-1)); + truncate_path(file, out, truncpos1, truncpos2); } void registry_read_filelist(HWND hMainWnd)

1 0

Francois Gouget : shell32/tests: Fix a couple of copy/paste errors.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: d491335eb7716d51aab2cfd55daf93b1ace67517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d491335eb7716d51aab2cfd55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Jan 26 03:05:09 2008 +0100 shell32/tests: Fix a couple of copy/paste errors. --- dlls/shell32/tests/shelllink.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 7983aa0..e94dc7d 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -146,7 +146,7 @@ static void test_get_set(void) ok(SUCCEEDED(r), "GetWorkingDirectory failed (0x%08x)\n", r); ok(lstrcmpi(buffer,str)==0, "GetWorkingDirectory returned '%s'\n", buffer); - /* Test Getting / Setting the work directory */ + /* Test Getting / Setting the path */ strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); ok(SUCCEEDED(r), "GetPath failed (0x%08x)\n", r); @@ -283,7 +283,7 @@ static void test_get_set(void) i=0xdeadbeef; r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i); ok(SUCCEEDED(r), "GetIconLocation failed (0x%08x)\n", r); - ok(lstrcmpi(buffer,str)==0, "GetArguments returned '%s'\n", buffer); + ok(lstrcmpi(buffer,str)==0, "GetIconLocation returned '%s'\n", buffer); ok(i==0xbabecafe, "GetIconLocation returned %d'\n", i); /* Test Getting / Setting the hot key */

1 0

Francois Gouget : shell32: Add some SLDF_XXX values, EXP_PROPERTYSTORAGE, and EXP_PROPERTYSTORAGE_SIG.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 3c3c83f17d23f9d7c45bcd80c66e36724f170d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3c83f17d23f9d7c45bcd80c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Jan 26 03:06:04 2008 +0100 shell32: Add some SLDF_XXX values, EXP_PROPERTYSTORAGE, and EXP_PROPERTYSTORAGE_SIG. --- include/shlobj.h | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index f57883a..8dbccb7 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1033,6 +1033,10 @@ typedef enum { SLDF_NO_PIDL_ALIAS = 0x00008000, SLDF_FORCE_UNCNAME = 0x00010000, SLDF_RUN_WITH_SHIMLAYER = 0x00020000, + SLDF_FORCE_NO_LINKTRACK = 0x00040000, + SLDF_ENABLE_TARGET_METADATA = 0x00080000, + SLDF_DISABLE_KNOWNFOLDER_RELATIVE_TRACKING = 0x00200000, + SLDF_VALID = 0x003ff7ff, SLDF_RESERVED = 0x80000000, } SHELL_LINK_DATA_FLAGS; @@ -1062,13 +1066,20 @@ typedef struct { DWORD cbOffset; } EXP_SPECIAL_FOLDER, *LPEXP_SPECIAL_FOLDER; +typedef struct { + DWORD cbSize; + DWORD dwSignature; + BYTE abPropertyStorage[1]; +} EXP_PROPERTYSTORAGE; + #define EXP_SZ_LINK_SIG 0xa0000001 #define NT_CONSOLE_PROPS_SIG 0xa0000002 #define NT_FE_CONSOLE_PROPS_SIG 0xa0000004 #define EXP_SPECIAL_FOLDER_SIG 0xa0000005 #define EXP_DARWIN_ID_SIG 0xa0000006 -#define EXP_LOGO3_ID_SIG 0xa0000007 #define EXP_SZ_ICON_SIG 0xa0000007 +#define EXP_LOGO3_ID_SIG EXP_SZ_ICON_SIG /* Old SDKs only */ +#define EXP_PROPERTYSTORAGE_SIG 0xa0000009 typedef struct _SHChangeDWORDAsIDList { USHORT cb;

1 0

Gerald Pfeifer : d3d9: Fix the type of three loop variables.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 450c634ab8c8ca859e42ef576e1f5d9760c85577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=450c634ab8c8ca859e42ef576… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jan 25 13:26:40 2008 +0100 d3d9: Fix the type of three loop variables. --- dlls/d3d9/tests/visual.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d20d337..e3c22d3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -557,7 +557,7 @@ static void test_mova(IDirect3DDevice9 *device) IDirect3DVertexShader9 *mova_shader = NULL; IDirect3DVertexShader9 *mov_shader = NULL; HRESULT hr; - int i, j; + UINT i, j; hr = IDirect3DDevice9_CreateVertexShader(device, mova_test, &mova_shader); ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); @@ -862,7 +862,8 @@ static void test_cube_wrap(IDirect3DDevice9 *device) IDirect3DSurface9 *surface = NULL; D3DLOCKED_RECT locked_rect; HRESULT hr; - INT x, y, face; + UINT x; + INT y, face; hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (0x%08x)\n", hr);

1 0

Rob Shearman : oleaut32: Fix big memory leak in xCall.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 29c06dff208d77a551ed11c50e507addd6fdf3b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c06dff208d77a551ed11c50… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 25 16:59:19 2008 +0000 oleaut32: Fix big memory leak in xCall. Call IRpcChannelBuffer_FreeBuffer to free the buffer and other resources allocated by IRpcChannelBuffer_GetBuffer and IRpcChannelBuffer_SendReceive. --- dlls/oleaut32/tmarshal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 9649705..52c8e8a 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1468,6 +1468,7 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) hres = remoteresult; exit: + IRpcChannelBuffer_FreeBuffer(chanbuf,&msg); for (i = 0; i < nrofnames; i++) SysFreeString(names[i]); HeapFree(GetProcessHeap(),0,buf.base);

1 0

Rob Shearman : secur32: Move the detection of NULL credentials from AcquireCredentialsHandle to InitializeSecurityContext .
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 72ffc3fad96478ee7565cd03aebfe5ebf6b93064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ffc3fad96478ee7565cd03a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 25 14:05:31 2008 +0000 secur32: Move the detection of NULL credentials from AcquireCredentialsHandle to InitializeSecurityContext. Only use cached credentials if the credentials were NULL. Don't pass a domain into ntlm_auth when using cached credentials as ntlm_auth/winbindd should be able to figure that out. --- dlls/secur32/ntlm.c | 131 ++++++++++++++++++++++++-------------------------- 1 files changed, 63 insertions(+), 68 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 3dbdd83..7cb83ec 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -133,50 +133,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( static const char domain_arg[] = "--domain="; int unixcp_size; - if(pAuthData == NULL) - { - LPWKSTA_USER_INFO_1 ui = NULL; - NET_API_STATUS status; - - status = NetWkstaUserGetInfo(NULL, 1, (LPBYTE *)&ui); - if (status != NERR_Success || ui == NULL) - { - ret = SEC_E_NO_CREDENTIALS; - phCredential = NULL; - break; - } - - username = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(ui->wkui1_username)+1) * - sizeof(SEC_WCHAR)); - lstrcpyW(username, ui->wkui1_username); - - /* same for the domain */ - domain = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(ui->wkui1_logon_domain)+1) * - sizeof(SEC_WCHAR)); - lstrcpyW(domain, ui->wkui1_logon_domain); - NetApiBufferFree(ui); - } - else - { - PSEC_WINNT_AUTH_IDENTITY_W auth_data = - (PSEC_WINNT_AUTH_IDENTITY_W)pAuthData; - - /* Get username and domain from pAuthData */ - username = HeapAlloc(GetProcessHeap(), 0, - (auth_data->UserLength + 1) * sizeof(SEC_WCHAR)); - memcpy(username, auth_data->User, - auth_data->UserLength * sizeof(SEC_WCHAR)); - username[auth_data->UserLength] = '\0'; - - domain = HeapAlloc(GetProcessHeap(), 0, - (auth_data->DomainLength + 1) * sizeof(SEC_WCHAR)); - memcpy(domain, auth_data->Domain, - auth_data->DomainLength * sizeof(SEC_WCHAR)); - domain[auth_data->DomainLength] = '\0'; - } - ntlm_cred = HeapAlloc(GetProcessHeap(), 0, sizeof(*ntlm_cred)); if (!ntlm_cred) { @@ -184,31 +140,37 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( break; } ntlm_cred->mode = NTLM_CLIENT; + ntlm_cred->username_arg = NULL; + ntlm_cred->domain_arg = NULL; ntlm_cred->password = NULL; ntlm_cred->pwlen = 0; - TRACE("Username is %s\n", debugstr_w(username)); - unixcp_size = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, - username, -1, NULL, 0, NULL, NULL) + sizeof(username_arg); - ntlm_cred->username_arg = HeapAlloc(GetProcessHeap(), 0, unixcp_size); - memcpy(ntlm_cred->username_arg, username_arg, sizeof(username_arg) - 1); - WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, username, -1, - ntlm_cred->username_arg + sizeof(username_arg) - 1, - unixcp_size - sizeof(username_arg) + 1, NULL, NULL); - - TRACE("Domain name is %s\n", debugstr_w(domain)); - unixcp_size = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, - domain, -1, NULL, 0, NULL, NULL) + sizeof(domain_arg); - ntlm_cred->domain_arg = HeapAlloc(GetProcessHeap(), 0, unixcp_size); - memcpy(ntlm_cred->domain_arg, domain_arg, sizeof(domain_arg) - 1); - WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, domain, - -1, ntlm_cred->domain_arg + sizeof(domain_arg) - 1, - unixcp_size - sizeof(domain) + 1, NULL, NULL); - if(pAuthData != NULL) { PSEC_WINNT_AUTH_IDENTITY_W auth_data = - (PSEC_WINNT_AUTH_IDENTITY_W)pAuthData; + (PSEC_WINNT_AUTH_IDENTITY_W)pAuthData; + + TRACE("Username is %s\n", debugstr_wn(auth_data->User, auth_data->UserLength)); + TRACE("Domain name is %s\n", debugstr_wn(auth_data->Domain, auth_data->DomainLength)); + + /* Get username and domain from pAuthData */ + unixcp_size = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, + auth_data->User, auth_data->UserLength, NULL, 0, NULL, NULL) + sizeof(username_arg); + ntlm_cred->username_arg = HeapAlloc(GetProcessHeap(), 0, unixcp_size); + memcpy(ntlm_cred->username_arg, username_arg, sizeof(username_arg) - 1); + WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, auth_data->User, auth_data->UserLength, + ntlm_cred->username_arg + sizeof(username_arg) - 1, + unixcp_size - sizeof(username_arg) + 1, NULL, NULL); + ntlm_cred->username_arg[unixcp_size - 1] = '\0'; + + unixcp_size = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, + auth_data->Domain, auth_data->DomainLength, NULL, 0, NULL, NULL) + sizeof(domain_arg); + ntlm_cred->domain_arg = HeapAlloc(GetProcessHeap(), 0, unixcp_size); + memcpy(ntlm_cred->domain_arg, domain_arg, sizeof(domain_arg) - 1); + WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, auth_data->Domain, + auth_data->DomainLength, ntlm_cred->domain_arg + sizeof(domain_arg) - 1, + unixcp_size - sizeof(domain) + 1, NULL, NULL); + ntlm_cred->domain_arg[unixcp_size - 1] = '\0'; if(auth_data->PasswordLength != 0) { @@ -417,6 +379,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( PBYTE bin; int buffer_len, bin_len, max_len = NTLM_MAX_BUF; int token_idx; + SEC_CHAR *username = NULL; TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, @@ -452,7 +415,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( { static char helper_protocol[] = "--helper-protocol=ntlmssp-client-1"; static CHAR credentials_argv[] = "--use-cached-creds"; - SEC_CHAR *client_argv[6]; + SEC_CHAR *client_argv[5]; TRACE("First time in ISC()\n"); @@ -475,10 +438,41 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( client_argv[0] = ntlm_auth; client_argv[1] = helper_protocol; - client_argv[2] = ntlm_cred->username_arg; - client_argv[3] = ntlm_cred->domain_arg; - client_argv[4] = credentials_argv; - client_argv[5] = NULL; + if (!ntlm_cred->username_arg && !ntlm_cred->domain_arg) + { + LPWKSTA_USER_INFO_1 ui = NULL; + NET_API_STATUS status; + int unixcp_size; + static const char username_arg[] = "--username="; + + status = NetWkstaUserGetInfo(NULL, 1, (LPBYTE *)&ui); + if (status != NERR_Success || ui == NULL) + { + ret = SEC_E_NO_CREDENTIALS; + goto isc_end; + } + + unixcp_size = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, + ui->wkui1_username, -1, NULL, 0, NULL, NULL) + sizeof(username_arg); + username = HeapAlloc(GetProcessHeap(), 0, unixcp_size); + memcpy(username, username_arg, sizeof(username_arg) - 1); + WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, ui->wkui1_username, -1, + username + sizeof(username_arg) - 1, + unixcp_size - sizeof(username_arg) + 1, NULL, NULL); + username[unixcp_size - 1] = '\0'; + + TRACE("using cached credentials\n"); + + client_argv[2] = username; + client_argv[3] = credentials_argv; + client_argv[4] = NULL; + } + else + { + client_argv[2] = ntlm_cred->username_arg; + client_argv[3] = ntlm_cred->domain_arg; + client_argv[4] = NULL; + } if((ret = fork_helper(&helper, ntlm_auth, client_argv)) != SEC_E_OK) goto isc_end; @@ -840,6 +834,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( } isc_end: + HeapFree(GetProcessHeap(), 0, username); HeapFree(GetProcessHeap(), 0, want_flags); HeapFree(GetProcessHeap(), 0, buffer); HeapFree(GetProcessHeap(), 0, bin);

1 0

Rob Shearman : secur32: If using cached credentials failed in InitializeSecurityContext then fail with SEC_E_NO_CREDENTIALS instead of carrying on with a blank password .
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 506ba701bb37f980793a55aacbfd9393cc010533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=506ba701bb37f980793a55aac… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 25 14:05:34 2008 +0000 secur32: If using cached credentials failed in InitializeSecurityContext then fail with SEC_E_NO_CREDENTIALS instead of carrying on with a blank password. --- dlls/secur32/ntlm.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 7cb83ec..423a167 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -571,8 +571,9 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( /* If the helper replied with "PW", using cached credentials failed */ if(!strncmp(buffer, "PW", 2)) { - TRACE("Using cached credentials failed. Using empty password.\n"); - lstrcpynA(buffer, "PW AA==", max_len-1); + TRACE("Using cached credentials failed.\n"); + ret = SEC_E_NO_CREDENTIALS; + goto isc_end; } else /* Just do a noop on the next run */ lstrcpynA(buffer, "OK", max_len-1);

1 0

Rob Shearman : secur32: Try to retrive credentials by using the credential manager to retrieve credentials saved for the target server in InitializeContextHandleW , if possible.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 8a2125f9322bbee301c6cc1637f0a2a08a2fa143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a2125f9322bbee301c6cc163… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 25 14:05:38 2008 +0000 secur32: Try to retrive credentials by using the credential manager to retrieve credentials saved for the target server in InitializeContextHandleW, if possible. --- dlls/secur32/ntlm.c | 197 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 144 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a2125f9322bbee301c6c…

1 0

Rob Shearman : secur32: Initialise more pointers in helper to NULL.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 0d2a62315030ee17a50c78f83cfe7d84f3ffe573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2a62315030ee17a50c78f83… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 25 14:05:44 2008 +0000 secur32: Initialise more pointers in helper to NULL. This is to avoid calling HeapFree on random pointers when DeleteSecurityContext is called on a context that hasn't had a second InitializeSecurityContext called on it, which would otherwise intialise those pointers. --- dlls/secur32/dispatcher.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 226de79..4003346 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -116,6 +116,13 @@ SECURITY_STATUS fork_helper(PNegoHelper *new_helper, const char *prog, helper->com_buf_offset = 0; helper->session_key = NULL; helper->neg_flags = 0; + helper->crypt.ntlm.a4i = NULL; + helper->crypt.ntlm2.send_a4i = NULL; + helper->crypt.ntlm2.recv_a4i = NULL; + helper->crypt.ntlm2.send_sign_key = NULL; + helper->crypt.ntlm2.send_seal_key = NULL; + helper->crypt.ntlm2.recv_sign_key = NULL; + helper->crypt.ntlm2.recv_seal_key = NULL; helper->pipe_in = pipe_in[0]; fcntl( pipe_in[0], F_SETFD, 1 ); close(pipe_in[1]);

1 0