March 2008 - Wine-commits - list.winehq.org

Rob Shearman : rpcrt4: Fix the pointer level being passed into call_unmarshaller in client_do_args_old_format for base return parameters .
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 0e7b25349d9c711d6d99d51ebaef826986674193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7b25349d9c711d6d99d51eb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 10 17:24:49 2008 +0000 rpcrt4: Fix the pointer level being passed into call_unmarshaller in client_do_args_old_format for base return parameters. NdrBaseTypeUnmarshall expects a pointer to a pointer to a base type. pRetVal contains a pointer to a base type, so we need to pass the address of pRetVal into call_unmarshaller here. --- dlls/rpcrt4/ndr_stubless.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 69347b2..347db48 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -493,7 +493,7 @@ static void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) { if (pParam->param_direction & RPC_FC_RETURN_PARAM) - call_unmarshaller(pStubMsg, (unsigned char **)pRetVal, pTypeFormat, 0); + call_unmarshaller(pStubMsg, &pRetVal, pTypeFormat, 0); else call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); }

1 0

Rob Shearman : rpcrt4: Fix -Oi interpreter for base types.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 259ccc573c1e8f03e6a46321f9b5cf76edf540d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=259ccc573c1e8f03e6a46321f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 10 17:05:59 2008 +0000 rpcrt4: Fix -Oi interpreter for base types. Don't call memory sizing rountines to compute the size of a type, since memory sizing routines have side effects like checking there is enough space in the buffer for the type and incrementing the buffer pointer. Instead, create a function which returns the necessary size of the limited set of types we can encounter and remove call_memory_sizer which is no longer needed. --- dlls/rpcrt4/ndr_stubless.c | 61 ++++++++++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 85c63d2..69347b2 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -91,29 +91,6 @@ static inline void call_freer(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemor if (m) m(pStubMsg, pMemory, pFormat); } -static inline unsigned long call_memory_sizer(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) -{ - NDR_MEMORYSIZE m = NdrMemorySizer[pFormat[0] & NDR_TABLE_MASK]; - if (m) - { - unsigned char *saved_buffer = pStubMsg->Buffer; - unsigned long ret; - int saved_ignore_embedded_pointers = pStubMsg->IgnoreEmbeddedPointers; - pStubMsg->MemorySize = 0; - pStubMsg->IgnoreEmbeddedPointers = 1; - ret = m(pStubMsg, pFormat); - pStubMsg->IgnoreEmbeddedPointers = saved_ignore_embedded_pointers; - pStubMsg->Buffer = saved_buffer; - return ret; - } - else - { - FIXME("format type 0x%x not implemented\n", pFormat[0]); - RpcRaiseException(RPC_X_BAD_STUB_DATA); - return 0; - } -} - #define STUBLESS_UNMARSHAL 1 #define STUBLESS_INITOUT 2 #define STUBLESS_CALLSERVER 3 @@ -426,6 +403,40 @@ static void client_do_args(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, } } +static unsigned int type_stack_size(unsigned char fc) +{ + switch (fc) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + return sizeof(char); + case RPC_FC_WCHAR: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + return sizeof(short); + case RPC_FC_LONG: + case RPC_FC_ULONG: + case RPC_FC_ENUM16: + case RPC_FC_ENUM32: + return sizeof(int); + case RPC_FC_FLOAT: + return sizeof(float); + case RPC_FC_DOUBLE: + return sizeof(double); + case RPC_FC_HYPER: + return sizeof(ULONGLONG); + case RPC_FC_ERROR_STATUS_T: + return sizeof(error_status_t); + case RPC_FC_IGNORE: + return sizeof(void *); + default: + ERR("invalid base type 0x%x\n", fc); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + } +} + static void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, int phase, unsigned short stack_size, unsigned char *pRetVal, BOOL object_proc) @@ -491,7 +502,7 @@ static void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, RpcRaiseException(RPC_S_INTERNAL_ERROR); } - current_stack_offset += call_memory_sizer(pStubMsg, pTypeFormat); + current_stack_offset += type_stack_size(*pTypeFormat); current_offset += sizeof(NDR_PARAM_OI_BASETYPE); } else @@ -1160,7 +1171,7 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, RpcRaiseException(RPC_S_INTERNAL_ERROR); } - current_stack_offset += call_memory_sizer(pStubMsg, pTypeFormat); + current_stack_offset += type_stack_size(*pTypeFormat); current_offset += sizeof(NDR_PARAM_OI_BASETYPE); } else

1 0

Rob Shearman : wininet: Retrieve the maximum token length from the SSP and use a buffer of that length in calls to InitializeSecurityContextW .
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 0be05ab6aac571865358eea6e1256ff3f19b274c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be05ab6aac571865358eea6e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 10 16:41:44 2008 +0000 wininet: Retrieve the maximum token length from the SSP and use a buffer of that length in calls to InitializeSecurityContextW. Otherwise, InitializeSecurityContextW could run out of space with our small, fixed buffer and fail. --- dlls/wininet/http.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c246001..638e520 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -98,6 +98,7 @@ struct HttpAuthInfo CtxtHandle ctx; TimeStamp exp; ULONG attr; + ULONG max_token; void *auth_data; unsigned int auth_data_len; BOOL finished; /* finished authenticating */ @@ -476,6 +477,16 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue, pAuthData, NULL, NULL, &pAuthInfo->cred, &exp); + if (sec_status == SEC_E_OK) + { + PSecPkgInfoW sec_pkg_info; + sec_status = QuerySecurityPackageInfoW(pAuthInfo->scheme, &sec_pkg_info); + if (sec_status == SEC_E_OK) + { + pAuthInfo->max_token = sec_pkg_info->cbMaxToken; + FreeContextBuffer(sec_pkg_info); + } + } if (sec_status != SEC_E_OK) { WARN("AcquireCredentialsHandleW for scheme %s failed with error 0x%08x\n", @@ -554,10 +565,10 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue, HTTP_DecodeBase64(pszAuthData, in.pvBuffer); } - buffer = HeapAlloc(GetProcessHeap(), 0, 0x100); + buffer = HeapAlloc(GetProcessHeap(), 0, pAuthInfo->max_token); out.BufferType = SECBUFFER_TOKEN; - out.cbBuffer = 0x100; + out.cbBuffer = pAuthInfo->max_token; out.pvBuffer = buffer; out_desc.ulVersion = 0;

1 0

Rob Shearman : secur32: Fix ntlm_GetCachedCredential to not call strlenW on a NULL pointer.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 088ae3b81c7387f98c217260484207cbf175e2d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=088ae3b81c7387f98c2172604… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 10 16:41:55 2008 +0000 secur32: Fix ntlm_GetCachedCredential to not call strlenW on a NULL pointer. pszHost should just be set to pszTargetName if pszTargetName doesn't contain any other information. --- dlls/secur32/ntlm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 5b95d92..f971fc1 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -405,7 +405,10 @@ static BOOL ntlm_GetCachedCredential(const SEC_WCHAR *pszTargetName, PCREDENTIAL p = pszHost + strlenW(pszHost); } else /* otherwise not an SPN, just a host */ + { + pszHost = pszTargetName; p = pszHost + strlenW(pszHost); + } pszHostOnly = HeapAlloc(GetProcessHeap(), 0, (p - pszHost + 1) * sizeof(WCHAR)); if (!pszHostOnly)

1 0

Rob Shearman : makefiles: Simplify the use of the MODULE variable in static import libraries.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 4500836635aa9264881b41d33bc6313fd8a95632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4500836635aa9264881b41d33… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 10 16:35:33 2008 +0000 makefiles: Simplify the use of the MODULE variable in static import libraries. Don't include platform-specific information when declaring the name of the static import libary to build. Instead, add this information in Makeimplib.rules.in. --- dlls/Makeimplib.rules.in | 10 +++++----- dlls/adsiid/Makefile.in | 2 +- dlls/dxerr8/Makefile.in | 2 +- dlls/dxerr9/Makefile.in | 2 +- dlls/dxguid/Makefile.in | 2 +- dlls/strmiids/Makefile.in | 2 +- dlls/uuid/Makefile.in | 2 +- dlls/winecrt0/Makefile.in | 2 +- tools/make_makefiles | 8 ++++---- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index 88814fc..b21d59a 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -12,23 +12,23 @@ INSTALLDIRS = $(DESTDIR)$(dlldir) @MAKE_RULES@ -all: $(MODULE) +all: $(MODULE:%=lib%.a) # Rules for .a library -$(MODULE): $(OBJS) Makefile.in +$(MODULE:%=lib%.a): $(OBJS) Makefile.in $(RM) $@ $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ # Rules for installation -install install-dev:: $(MODULE) $(DESTDIR)$(dlldir) - $(INSTALL_DATA) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE) +install install-dev:: $(MODULE:%=lib%.a) $(DESTDIR)$(dlldir) + $(INSTALL_DATA) $(MODULE:%=lib%.a) $(DESTDIR)$(dlldir)/$(MODULE:%=lib%.a) install-lib:: uninstall:: - $(RM) $(DESTDIR)$(dlldir)/$(MODULE) + $(RM) $(DESTDIR)$(dlldir)/$(MODULE:%=lib%.a) # End of global library rules diff --git a/dlls/adsiid/Makefile.in b/dlls/adsiid/Makefile.in index 099b811..69e5a08 100644 --- a/dlls/adsiid/Makefile.in +++ b/dlls/adsiid/Makefile.in @@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = libadsiid.a +MODULE = adsiid C_SRCS = \ adsiid.c diff --git a/dlls/dxerr8/Makefile.in b/dlls/dxerr8/Makefile.in index 54cb982..c5e6d52 100644 --- a/dlls/dxerr8/Makefile.in +++ b/dlls/dxerr8/Makefile.in @@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = libdxerr8.a +MODULE = dxerr8 C_SRCS = \ dxerr8.c diff --git a/dlls/dxerr9/Makefile.in b/dlls/dxerr9/Makefile.in index eb4e114..460ff7f 100644 --- a/dlls/dxerr9/Makefile.in +++ b/dlls/dxerr9/Makefile.in @@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = libdxerr9.a +MODULE = dxerr9 C_SRCS = \ dxerr9.c diff --git a/dlls/dxguid/Makefile.in b/dlls/dxguid/Makefile.in index dc733ea..8659ba1 100644 --- a/dlls/dxguid/Makefile.in +++ b/dlls/dxguid/Makefile.in @@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = libdxguid.a +MODULE = dxguid C_SRCS = \ dx8guid.c \ diff --git a/dlls/strmiids/Makefile.in b/dlls/strmiids/Makefile.in index c6dc7d8..fb9d996 100644 --- a/dlls/strmiids/Makefile.in +++ b/dlls/strmiids/Makefile.in @@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = libstrmiids.a +MODULE = strmiids C_SRCS = \ strmiids.c diff --git a/dlls/uuid/Makefile.in b/dlls/uuid/Makefile.in index a0de5f3..7bd993c 100644 --- a/dlls/uuid/Makefile.in +++ b/dlls/uuid/Makefile.in @@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = libuuid.a +MODULE = uuid C_SRCS = \ uuid.c diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 571291c..e135f9d 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = libwinecrt0.a +MODULE = winecrt0 C_SRCS = \ delay_load.c \ diff --git a/tools/make_makefiles b/tools/make_makefiles index edcade7..041875f 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -390,10 +390,10 @@ sub update_dlls(@) my $module = $makefile{"MODULE"}; (my $dir = $makefile{"=dir"}) =~ s/^dlls\/(.*)\//$1/; - if ($module =~ /^lib.*\.a$/) + if ($makefile{"=rules"} eq $makerules{"MAKE_IMPLIB_RULES"}) { $staticlib_dirs{$module} = $dir; - die "invalid module $module in dir $staticlib_dirs{$module}\n" if "lib$staticlib_dirs{$module}.a" ne $module; + die "invalid module $module in dir $staticlib_dirs{$module}\n" if "$staticlib_dirs{$module}" ne $module; } else { @@ -522,7 +522,7 @@ sub update_dlls(@) $text .= "\n\nIMPORT_LIBS = \\\n\t\$(IMPORT_SYMLINKS)"; foreach my $mod (sort keys %staticlib_dirs) { - $text .= sprintf " \\\n\t%s/%s", $staticlib_dirs{$mod}, $mod; + $text .= sprintf " \\\n\t%s/lib%s.a", $staticlib_dirs{$mod}, $mod; } foreach my $mod (sort keys %importlibs) { @@ -563,7 +563,7 @@ sub update_dlls(@) foreach my $mod (sort keys %staticlib_dirs) { - $text .= sprintf "%s/%s: %s\n", $staticlib_dirs{$mod}, $mod, $staticlib_dirs{$mod}; + $text .= sprintf "%s/lib%s.a: %s\n", $staticlib_dirs{$mod}, $mod, $staticlib_dirs{$mod}; } $text .= "\n# Misc rules\n";

1 0

Rob Shearman : rpcrt4: Check that the input to RPCRT4_strndupW was not NULL before assuming that the string couldn 't be allocated due to lack of memory.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: a5599028ea35884bf4ee40d7437ee6c8bd6698e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5599028ea35884bf4ee40d74… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 10 16:42:06 2008 +0000 rpcrt4: Check that the input to RPCRT4_strndupW was not NULL before assuming that the string couldn't be allocated due to lack of memory. --- dlls/rpcrt4/rpc_binding.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 19272af..d86add3 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -982,9 +982,9 @@ static RPC_STATUS RpcAuthInfo_Create(ULONG AuthnLevel, ULONG AuthnSvc, AuthInfo->nt_identity->Password = RPCRT4_strndupAtoW((const char *)nt_identity->Password, nt_identity->PasswordLength); AuthInfo->nt_identity->PasswordLength = nt_identity->PasswordLength; - if (!AuthInfo->nt_identity->User || - !AuthInfo->nt_identity->Domain || - !AuthInfo->nt_identity->Password) + if ((nt_identity->User && !AuthInfo->nt_identity->User) || + (nt_identity->Domain && !AuthInfo->nt_identity->Domain) || + (nt_identity->Password && !AuthInfo->nt_identity->Password)) { HeapFree(GetProcessHeap(), 0, AuthInfo->nt_identity->User); HeapFree(GetProcessHeap(), 0, AuthInfo->nt_identity->Domain); @@ -1572,7 +1572,7 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, if (r == RPC_S_OK) { new_auth_info->server_principal_name = RPCRT4_strdupW(ServerPrincName); - if (new_auth_info->server_principal_name) + if (!ServerPrincName || new_auth_info->server_principal_name) { if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); bind->AuthInfo = new_auth_info;

1 0

Rob Shearman : wininet: Allow HTTP_DoAuthorization to accept a NULL username/ domain in the non-Basic case.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 7631bdf0c103f1dec24a347fafa935913d8b1593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7631bdf0c103f1dec24a347fa… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 10 16:40:23 2008 +0000 wininet: Allow HTTP_DoAuthorization to accept a NULL username/domain in the non-Basic case. When using SSPI, pass in a NULL identity in this case so that the SSP can try to use cached credentials. --- dlls/wininet/http.c | 56 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index aba4bba..c246001 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -404,8 +404,6 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue, TRACE("%s\n", debugstr_w(pszAuthValue)); - if (!domain_and_username) return FALSE; - if (!pAuthInfo) { TimeStamp exp; @@ -435,9 +433,8 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue, } else { + PVOID pAuthData; SEC_WINNT_AUTH_IDENTITY_W nt_auth_identity; - WCHAR *user = strchrW(domain_and_username, '\\'); - WCHAR *domain = domain_and_username; pAuthInfo->scheme = WININET_strdupW(pszAuthValue); if (!pAuthInfo->scheme) @@ -446,25 +443,37 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue, return FALSE; } - if (user) user++; - else + if (domain_and_username) { - user = domain_and_username; - domain = NULL; - } - nt_auth_identity.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; - nt_auth_identity.User = user; - nt_auth_identity.UserLength = strlenW(nt_auth_identity.User); - nt_auth_identity.Domain = domain; - nt_auth_identity.DomainLength = domain ? user - domain - 1 : 0; - nt_auth_identity.Password = password; - nt_auth_identity.PasswordLength = strlenW(nt_auth_identity.Password); + WCHAR *user = strchrW(domain_and_username, '\\'); + WCHAR *domain = domain_and_username; + + /* FIXME: make sure scheme accepts SEC_WINNT_AUTH_IDENTITY before calling AcquireCredentialsHandle */ + + pAuthData = &nt_auth_identity; + + if (user) user++; + else + { + user = domain_and_username; + domain = NULL; + } - /* FIXME: make sure scheme accepts SEC_WINNT_AUTH_IDENTITY before calling AcquireCredentialsHandle */ + nt_auth_identity.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + nt_auth_identity.User = user; + nt_auth_identity.UserLength = strlenW(nt_auth_identity.User); + nt_auth_identity.Domain = domain; + nt_auth_identity.DomainLength = domain ? user - domain - 1 : 0; + nt_auth_identity.Password = password; + nt_auth_identity.PasswordLength = strlenW(nt_auth_identity.Password); + } + else + /* use default credentials */ + pAuthData = NULL; sec_status = AcquireCredentialsHandleW(NULL, pAuthInfo->scheme, SECPKG_CRED_OUTBOUND, NULL, - &nt_auth_identity, NULL, + pAuthData, NULL, NULL, &pAuthInfo->cred, &exp); if (sec_status != SEC_E_OK) @@ -491,12 +500,19 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue, if (is_basic_auth_value(pszAuthValue)) { - int userlen = WideCharToMultiByte(CP_UTF8, 0, domain_and_username, lstrlenW(domain_and_username), NULL, 0, NULL, NULL); - int passlen = WideCharToMultiByte(CP_UTF8, 0, password, lstrlenW(password), NULL, 0, NULL, NULL); + int userlen; + int passlen; char *auth_data; TRACE("basic authentication\n"); + /* we don't cache credentials for basic authentication, so we can't + * retrieve them if the application didn't pass us any credentials */ + if (!domain_and_username) return FALSE; + + userlen = WideCharToMultiByte(CP_UTF8, 0, domain_and_username, lstrlenW(domain_and_username), NULL, 0, NULL, NULL); + passlen = WideCharToMultiByte(CP_UTF8, 0, password, lstrlenW(password), NULL, 0, NULL, NULL); + /* length includes a nul terminator, which will be re-used for the ':' */ auth_data = HeapAlloc(GetProcessHeap(), 0, userlen + 1 + passlen); if (!auth_data)

1 0

Francois Gouget : d3d9/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 8ffad443974fabf6c35dab341a7c17d2823b5710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ffad443974fabf6c35dab341… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 10 14:14:53 2008 +0100 d3d9/tests: Fix compilation on systems that don't support nameless unions. --- dlls/d3d9/tests/visual.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 67ec739..77aaf5d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7053,15 +7053,15 @@ static void pointsize_test(IDirect3DDevice9 *device) }; /* Transforms the coordinate system [-1.0;1.0]x[-1.0;1.0] to [0.0;0.0]x[640.0;480.0]. Z is untouched */ - matrix.m[0][0] = 2.0/640.0; matrix.m[1][0] = 0.0; matrix.m[2][0] = 0.0; matrix.m[3][0] =-1.0; - matrix.m[0][1] = 0.0; matrix.m[1][1] =-2.0/480.0; matrix.m[2][1] = 0.0; matrix.m[3][1] = 1.0; - matrix.m[0][2] = 0.0; matrix.m[1][2] = 0.0; matrix.m[2][2] = 1.0; matrix.m[3][2] = 0.0; - matrix.m[0][3] = 0.0; matrix.m[1][3] = 0.0; matrix.m[2][3] = 0.0; matrix.m[3][3] = 1.0; - - identity.m[0][0] = 1.0; identity.m[1][0] = 0.0; identity.m[2][0] = 0.0; identity.m[3][0] = 0.0; - identity.m[0][1] = 0.0; identity.m[1][1] = 1.0; identity.m[2][1] = 0.0; identity.m[3][1] = 0.0; - identity.m[0][2] = 0.0; identity.m[1][2] = 0.0; identity.m[2][2] = 1.0; identity.m[3][2] = 0.0; - identity.m[0][3] = 0.0; identity.m[1][3] = 0.0; identity.m[2][3] = 0.0; identity.m[3][3] = 1.0; + U(matrix).m[0][0] = 2.0/640.0; U(matrix).m[1][0] = 0.0; U(matrix).m[2][0] = 0.0; U(matrix).m[3][0] =-1.0; + U(matrix).m[0][1] = 0.0; U(matrix).m[1][1] =-2.0/480.0; U(matrix).m[2][1] = 0.0; U(matrix).m[3][1] = 1.0; + U(matrix).m[0][2] = 0.0; U(matrix).m[1][2] = 0.0; U(matrix).m[2][2] = 1.0; U(matrix).m[3][2] = 0.0; + U(matrix).m[0][3] = 0.0; U(matrix).m[1][3] = 0.0; U(matrix).m[2][3] = 0.0; U(matrix).m[3][3] = 1.0; + + U(identity).m[0][0] = 1.0; U(identity).m[1][0] = 0.0; U(identity).m[2][0] = 0.0; U(identity).m[3][0] = 0.0; + U(identity).m[0][1] = 0.0; U(identity).m[1][1] = 1.0; U(identity).m[2][1] = 0.0; U(identity).m[3][1] = 0.0; + U(identity).m[0][2] = 0.0; U(identity).m[1][2] = 0.0; U(identity).m[2][2] = 1.0; U(identity).m[3][2] = 0.0; + U(identity).m[0][3] = 0.0; U(identity).m[1][3] = 0.0; U(identity).m[2][3] = 0.0; U(identity).m[3][3] = 1.0; memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps);

1 0

Rob Shearman : wininet: Make the reference count of WININETHANDLEHEADER thread-safe by using InterlockedIncrement /InterlockedDecrement.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: bdc81d9963d739655f147190b604b77a71dae5cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc81d9963d739655f147190b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 10 16:39:15 2008 +0000 wininet: Make the reference count of WININETHANDLEHEADER thread-safe by using InterlockedIncrement/InterlockedDecrement. --- dlls/wininet/ftp.c | 6 +++--- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.c | 12 ++++++------ dlls/wininet/internet.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index d26aff2..b9d305e 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1296,7 +1296,7 @@ HINTERNET FTP_FtpOpenFileW(LPWININETFTPSESSIONW lpwfs, lpwh->hdr.vtbl = &FTPFILEVtbl; lpwh->hdr.dwFlags = dwFlags; lpwh->hdr.dwContext = dwContext; - lpwh->hdr.dwRefCount = 1; + lpwh->hdr.refs = 1; lpwh->hdr.lpfnStatusCB = lpwfs->hdr.lpfnStatusCB; lpwh->nDataSocket = nDataSocket; lpwh->session_deleted = FALSE; @@ -2242,7 +2242,7 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, lpwfs->hdr.dwFlags = dwFlags; lpwfs->hdr.dwContext = dwContext; lpwfs->hdr.dwInternalFlags = dwInternalFlags; - lpwfs->hdr.dwRefCount = 1; + lpwfs->hdr.refs = 1; lpwfs->hdr.lpfnStatusCB = hIC->hdr.lpfnStatusCB; lpwfs->download_in_progress = NULL; lpwfs->sndSocket = -1; @@ -3293,7 +3293,7 @@ static HINTERNET FTP_ReceiveFileList(LPWININETFTPSESSIONW lpwfs, INT nSocket, LP lpwfn->hdr.htype = WH_HFTPFINDNEXT; lpwfn->hdr.vtbl = &FTPFINDNEXTVtbl; lpwfn->hdr.dwContext = dwContext; - lpwfn->hdr.dwRefCount = 1; + lpwfn->hdr.refs = 1; lpwfn->hdr.lpfnStatusCB = lpwfs->hdr.lpfnStatusCB; lpwfn->index = 1; /* Next index is 1 since we return index 0 */ lpwfn->size = dwSize; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e88ef95..085cab2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1606,7 +1606,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, lpwhr->hdr.vtbl = &HTTPREQVtbl; lpwhr->hdr.dwFlags = dwFlags; lpwhr->hdr.dwContext = dwContext; - lpwhr->hdr.dwRefCount = 1; + lpwhr->hdr.refs = 1; lpwhr->hdr.lpfnStatusCB = lpwhs->hdr.lpfnStatusCB; lpwhr->hdr.dwInternalFlags = lpwhs->hdr.dwInternalFlags & INET_CALLBACKW; @@ -3159,7 +3159,7 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, lpwhs->hdr.dwFlags = dwFlags; lpwhs->hdr.dwContext = dwContext; lpwhs->hdr.dwInternalFlags = dwInternalFlags | (hIC->hdr.dwInternalFlags & INET_CALLBACKW); - lpwhs->hdr.dwRefCount = 1; + lpwhs->hdr.refs = 1; lpwhs->hdr.lpfnStatusCB = hIC->hdr.lpfnStatusCB; WININET_AddRef( &hIC->hdr ); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 184e7ed..5d8d46c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -145,8 +145,8 @@ end: LPWININETHANDLEHEADER WININET_AddRef( LPWININETHANDLEHEADER info ) { - info->dwRefCount++; - TRACE("%p -> refcount = %d\n", info, info->dwRefCount ); + ULONG refs = InterlockedIncrement(&info->refs); + TRACE("%p -> refcount = %d\n", info, refs ); return info; } @@ -170,9 +170,9 @@ LPWININETHANDLEHEADER WININET_GetObject( HINTERNET hinternet ) BOOL WININET_Release( LPWININETHANDLEHEADER info ) { - info->dwRefCount--; - TRACE( "object %p refcount = %d\n", info, info->dwRefCount ); - if( !info->dwRefCount ) + ULONG refs = InterlockedDecrement(&info->refs); + TRACE( "object %p refcount = %d\n", info, refs ); + if( !refs ) { if ( info->vtbl->CloseConnection ) { @@ -537,7 +537,7 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType, lpwai->hdr.htype = WH_HINIT; lpwai->hdr.vtbl = &APPINFOVtbl; lpwai->hdr.dwFlags = dwFlags; - lpwai->hdr.dwRefCount = 1; + lpwai->hdr.refs = 1; lpwai->dwAccessType = dwAccessType; lpwai->lpszProxyUsername = NULL; lpwai->lpszProxyPassword = NULL; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 7f13fef..106b054 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -156,7 +156,7 @@ struct _WININETHANDLEHEADER DWORD_PTR dwContext; DWORD dwError; DWORD dwInternalFlags; - DWORD dwRefCount; + LONG refs; INTERNET_STATUS_CALLBACK lpfnStatusCB; struct list entry; struct list children;

1 0

Rob Shearman : wininet: Don' t call DeleteSecurityContext and FreeCredentialsHandle on invalid handles.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 8c6ac00820e93e6bc4570a9526d3a951061ca043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6ac00820e93e6bc4570a952… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 10 16:39:40 2008 +0000 wininet: Don't call DeleteSecurityContext and FreeCredentialsHandle on invalid handles. --- dlls/wininet/http.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 085cab2..aba4bba 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1341,8 +1341,10 @@ static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr) if (lpwhr->pAuthInfo) { - DeleteSecurityContext(&lpwhr->pAuthInfo->ctx); - FreeCredentialsHandle(&lpwhr->pAuthInfo->cred); + if (SecIsValidHandle(&lpwhr->pAuthInfo->ctx)) + DeleteSecurityContext(&lpwhr->pAuthInfo->ctx); + if (SecIsValidHandle(&lpwhr->pAuthInfo->cred)) + FreeCredentialsHandle(&lpwhr->pAuthInfo->cred); HeapFree(GetProcessHeap(), 0, lpwhr->pAuthInfo->auth_data); HeapFree(GetProcessHeap(), 0, lpwhr->pAuthInfo->scheme); @@ -1351,8 +1353,10 @@ static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr) } if (lpwhr->pProxyAuthInfo) { - DeleteSecurityContext(&lpwhr->pProxyAuthInfo->ctx); - FreeCredentialsHandle(&lpwhr->pProxyAuthInfo->cred); + if (SecIsValidHandle(&lpwhr->pProxyAuthInfo->ctx)) + DeleteSecurityContext(&lpwhr->pProxyAuthInfo->ctx); + if (SecIsValidHandle(&lpwhr->pProxyAuthInfo->cred)) + FreeCredentialsHandle(&lpwhr->pProxyAuthInfo->cred); HeapFree(GetProcessHeap(), 0, lpwhr->pProxyAuthInfo->auth_data); HeapFree(GetProcessHeap(), 0, lpwhr->pProxyAuthInfo->scheme);

1 0