December 2010 - Wine-commits

Hwang YunSong : sane.ds: Update Korean resource.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 94ad49dddc3d42e04562ddd0bafaccc0696c6d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ad49dddc3d42e04562ddd0b… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Dec 15 17:04:39 2010 +0900 sane.ds: Update Korean resource. --- dlls/sane.ds/sane_Ko.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/sane_Ko.rc b/dlls/sane.ds/sane_Ko.rc index ab11baf..59f65f6 100644 --- a/dlls/sane.ds/sane_Ko.rc +++ b/dlls/sane.ds/sane_Ko.rc @@ -21,14 +21,16 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND -CAPTION "��ĳ��" +CAPTION "스캐닝중" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "��ĳ��... ��ٸ��ʽÿ�.",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "스캐닝중... 기다리십시오.",IDC_STATIC,5,19,176,8, SS_CENTER END STRINGTABLE

1 0

Alexandre Julliard : ntdll: Ensure alignment of static TLS data and free it at thread exit.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: e272b31b6bdc87307019c00da1be097c23a19e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e272b31b6bdc87307019c00da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 13:16:55 2010 +0100 ntdll: Ensure alignment of static TLS data and free it at thread exit. --- dlls/ntdll/loader.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0724879..19d484a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -97,6 +97,8 @@ static HANDLE main_exe_file; static UINT tls_module_count; /* number of modules with TLS directory */ static UINT tls_total_size; /* total size of TLS storage */ static const IMAGE_TLS_DIRECTORY **tls_dirs; /* array of TLS directories */ +#define TLS_ALIGNMENT (2 * sizeof(void *)) +#define TLS_ALIGN(size) (((size) + TLS_ALIGNMENT - 1) & ~(TLS_ALIGNMENT - 1)) static RTL_CRITICAL_SECTION loader_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = @@ -843,7 +845,7 @@ static NTSTATUS alloc_process_tls(void) continue; size = (dir->EndAddressOfRawData - dir->StartAddressOfRawData) + dir->SizeOfZeroFill; if (!size && !dir->AddressOfCallBacks) continue; - tls_total_size += size; + tls_total_size += TLS_ALIGN(size); tls_module_count++; } if (!tls_module_count) return STATUS_SUCCESS; @@ -878,24 +880,19 @@ static NTSTATUS alloc_thread_tls(void) { void **pointers; char *data; - UINT i; + UINT i, size; if (!tls_module_count) return STATUS_SUCCESS; - if (!(pointers = RtlAllocateHeap( GetProcessHeap(), 0, - tls_module_count * sizeof(*pointers) ))) + size = TLS_ALIGN( tls_module_count * sizeof(*pointers) ); + if (!(pointers = RtlAllocateHeap( GetProcessHeap(), 0, size + tls_total_size ))) return STATUS_NO_MEMORY; - - if (!(data = RtlAllocateHeap( GetProcessHeap(), 0, tls_total_size ))) - { - RtlFreeHeap( GetProcessHeap(), 0, pointers ); - return STATUS_NO_MEMORY; - } + data = (char *)pointers + size; for (i = 0; i < tls_module_count; i++) { const IMAGE_TLS_DIRECTORY *dir = tls_dirs[i]; - ULONG size = dir->EndAddressOfRawData - dir->StartAddressOfRawData; + size = dir->EndAddressOfRawData - dir->StartAddressOfRawData; TRACE( "thread %04x idx %d: %d/%d bytes from %p to %p\n", GetCurrentThreadId(), i, size, dir->SizeOfZeroFill, @@ -903,9 +900,8 @@ static NTSTATUS alloc_thread_tls(void) pointers[i] = data; memcpy( data, (void *)dir->StartAddressOfRawData, size ); - data += size; - memset( data, 0, dir->SizeOfZeroFill ); - data += dir->SizeOfZeroFill; + memset( data + size, 0, dir->SizeOfZeroFill ); + data += TLS_ALIGN( size + dir->SizeOfZeroFill ); } NtCurrentTeb()->ThreadLocalStoragePointer = pointers; return STATUS_SUCCESS;

1 0

Alexandre Julliard : krnl386: Fetch version from the PEB to avoid potentially using GetVersionEx before it 's initialized.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 5ce81a9dc2f727dfb8d3fb5db5ea8d0c79459faf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce81a9dc2f727dfb8d3fb5db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 13:17:41 2010 +0100 krnl386: Fetch version from the PEB to avoid potentially using GetVersionEx before it's initialized. --- dlls/krnl386.exe16/ne_module.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index b6334fe..5d7cf86 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -917,7 +917,6 @@ static HMODULE16 NE_DoLoadBuiltinModule( const IMAGE_DOS_HEADER *mz_header, cons NE_MODULE *pModule; HMODULE16 hModule; HINSTANCE16 hInstance; - OSVERSIONINFOW versionInfo; SIZE_T mapping_size = ~0UL; /* assume builtins don't contain invalid offsets... */ hModule = build_module( mz_header, mapping_size, file_name ); @@ -927,9 +926,8 @@ static HMODULE16 NE_DoLoadBuiltinModule( const IMAGE_DOS_HEADER *mz_header, cons pModule->owner32 = owner32; /* fake the expected version the module should have according to the current Windows version */ - versionInfo.dwOSVersionInfoSize = sizeof(versionInfo); - if (GetVersionExW( &versionInfo )) - pModule->ne_expver = MAKEWORD( versionInfo.dwMinorVersion, versionInfo.dwMajorVersion ); + pModule->ne_expver = MAKEWORD( NtCurrentTeb()->Peb->OSMajorVersion, + NtCurrentTeb()->Peb->OSMinorVersion ); hInstance = NE_DoLoadModule( pModule ); if (hInstance < 32) NE_FreeModule( hModule, 0 );

1 0

Michael Stefaniuc : msi: Use an iface instead of an vtbl pointer in IClassFactoryImpl.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 09019ba78aad054f439a2809091a236d65a695ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=09019ba78aad054f439a28090… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 15 00:35:27 2010 +0100 msi: Use an iface instead of an vtbl pointer in IClassFactoryImpl. --- dlls/msi/msi_main.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 27df1a5..1b0ac9a 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -118,14 +118,19 @@ ITypeLib *get_msi_typelib( LPWSTR *path ) } typedef struct tagIClassFactoryImpl { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; HRESULT (*create_object)( IUnknown*, LPVOID* ); } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + static HRESULT WINAPI MsiCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("%p %s %p\n",This,debugstr_guid(riid),ppobj); @@ -154,7 +159,7 @@ static ULONG WINAPI MsiCF_Release(LPCLASSFACTORY iface) static HRESULT WINAPI MsiCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); IUnknown *unk = NULL; HRESULT r; @@ -190,9 +195,9 @@ static const IClassFactoryVtbl MsiCF_Vtbl = MsiCF_LockServer }; -static IClassFactoryImpl MsiServer_CF = { &MsiCF_Vtbl, create_msiserver }; -static IClassFactoryImpl WineMsiCustomRemote_CF = { &MsiCF_Vtbl, create_msi_custom_remote }; -static IClassFactoryImpl WineMsiRemotePackage_CF = { &MsiCF_Vtbl, create_msi_remote_package }; +static IClassFactoryImpl MsiServer_CF = { { &MsiCF_Vtbl }, create_msiserver }; +static IClassFactoryImpl WineMsiCustomRemote_CF = { { &MsiCF_Vtbl }, create_msi_custom_remote }; +static IClassFactoryImpl WineMsiRemotePackage_CF = { { &MsiCF_Vtbl }, create_msi_remote_package }; /****************************************************************** * DllGetClassObject [MSI.@]

1 0

Michael Stefaniuc : msi: Use an iface instead of a vtbl pointer in msi_custom_remote_impl.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: cb58010118bd8ee32c8e95948d4530ac58f9b0d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb58010118bd8ee32c8e95948… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 15 10:55:12 2010 +0100 msi: Use an iface instead of a vtbl pointer in msi_custom_remote_impl. --- dlls/msi/custom.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 6fa1038..f875571 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1456,13 +1456,13 @@ void ACTION_FinishCustomActions(const MSIPACKAGE* package) } typedef struct _msi_custom_remote_impl { - const IWineMsiRemoteCustomActionVtbl *lpVtbl; + IWineMsiRemoteCustomAction IWineMsiRemoteCustomAction_iface; LONG refs; } msi_custom_remote_impl; -static inline msi_custom_remote_impl* mcr_from_IWineMsiRemoteCustomAction( IWineMsiRemoteCustomAction* iface ) +static inline msi_custom_remote_impl *impl_from_IWineMsiRemoteCustomAction( IWineMsiRemoteCustomAction *iface ) { - return (msi_custom_remote_impl*) iface; + return CONTAINING_RECORD(iface, msi_custom_remote_impl, IWineMsiRemoteCustomAction_iface); } static HRESULT WINAPI mcr_QueryInterface( IWineMsiRemoteCustomAction *iface, @@ -1481,14 +1481,14 @@ static HRESULT WINAPI mcr_QueryInterface( IWineMsiRemoteCustomAction *iface, static ULONG WINAPI mcr_AddRef( IWineMsiRemoteCustomAction *iface ) { - msi_custom_remote_impl* This = mcr_from_IWineMsiRemoteCustomAction( iface ); + msi_custom_remote_impl* This = impl_from_IWineMsiRemoteCustomAction( iface ); return InterlockedIncrement( &This->refs ); } static ULONG WINAPI mcr_Release( IWineMsiRemoteCustomAction *iface ) { - msi_custom_remote_impl* This = mcr_from_IWineMsiRemoteCustomAction( iface ); + msi_custom_remote_impl* This = impl_from_IWineMsiRemoteCustomAction( iface ); ULONG r; r = InterlockedDecrement( &This->refs ); @@ -1531,7 +1531,7 @@ HRESULT create_msi_custom_remote( IUnknown *pOuter, LPVOID *ppObj ) if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &msi_custom_remote_vtbl; + This->IWineMsiRemoteCustomAction_iface.lpVtbl = &msi_custom_remote_vtbl; This->refs = 1; *ppObj = This;

1 0

Michael Stefaniuc : msi: Use an iface instead of a vtbl pointer in msi_remote_package_impl.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: b36f401011314827ddbb14332381e7308cc94770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36f401011314827ddbb14332… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 15 10:56:07 2010 +0100 msi: Use an iface instead of a vtbl pointer in msi_remote_package_impl. --- dlls/msi/package.c | 54 ++++++++++++++++++++++++++-------------------------- 1 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b36f401011314827ddbb1…

1 0

Hans Leidekker : rpcrt4: Add a stub implementation of RpcMgmtSetAuthorizationFn.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 215b69e36bf36fd98c436190b3d5a4ee0f77d1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=215b69e36bf36fd98c436190b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 15 09:08:42 2010 +0100 rpcrt4: Add a stub implementation of RpcMgmtSetAuthorizationFn. --- dlls/rpcrt4/rpc_server.c | 9 +++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- include/rpcdce.h | 4 ++++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 8e7fe0e..9fd4cf6 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1622,6 +1622,15 @@ RPC_STATUS WINAPI RpcMgmtIsServerListening(RPC_BINDING_HANDLE Binding) } /*********************************************************************** + * RpcMgmtSetAuthorizationFn (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcMgmtSetAuthorizationFn(RPC_MGMT_AUTHORIZATION_FN fn) +{ + FIXME("(%p): stub\n", fn); + return RPC_S_OK; +} + +/*********************************************************************** * RpcMgmtSetServerStackSize (RPCRT4.@) */ RPC_STATUS WINAPI RpcMgmtSetServerStackSize(ULONG ThreadStackSize) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index e0c6c11..aa6fef9 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -402,7 +402,7 @@ @ stub RpcMgmtInqServerPrincNameW @ stdcall RpcMgmtInqStats(ptr ptr) @ stdcall RpcMgmtIsServerListening(ptr) -@ stub RpcMgmtSetAuthorizationFn +@ stdcall RpcMgmtSetAuthorizationFn(ptr) @ stdcall RpcMgmtSetCancelTimeout(long) @ stdcall RpcMgmtSetComTimeout(ptr long) @ stdcall RpcMgmtSetServerStackSize(long) diff --git a/include/rpcdce.h b/include/rpcdce.h index dc2c8de..9507a82 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -393,6 +393,10 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtEnableIdleCleanup( void ); +typedef int (__RPC_API *RPC_MGMT_AUTHORIZATION_FN)( RPC_BINDING_HANDLE, ULONG, RPC_STATUS * ); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtSetAuthorizationFn( RPC_MGMT_AUTHORIZATION_FN ); + RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtSetCancelTimeout(LONG); RPCRTAPI RPC_STATUS RPC_ENTRY

1 0

Hans Leidekker : wineboot: Set the USERDOMAIN environment variable.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 86a7b45a7a43c8357f5d70f3429899d00b54e0a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a7b45a7a43c8357f5d70f34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 15 09:09:10 2010 +0100 wineboot: Set the USERDOMAIN environment variable. Microsoft Robotics Developer Studio installer needs this. --- programs/wineboot/wineboot.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 43cdf3b..804528f 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -318,6 +318,7 @@ static void create_volatile_environment_registry_key(void) static const WCHAR LogonServerW[] = {'L','O','G','O','N','S','E','R','V','E','R',0}; static const WCHAR SessionNameW[] = {'S','E','S','S','I','O','N','N','A','M','E',0}; static const WCHAR UserNameW[] = {'U','S','E','R','N','A','M','E',0}; + static const WCHAR UserDomainW[] = {'U','S','E','R','D','O','M','A','I','N',0}; static const WCHAR UserProfileW[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; static const WCHAR ConsoleW[] = {'C','o','n','s','o','l','e',0}; static const WCHAR EmptyW[] = {0}; @@ -359,6 +360,7 @@ static void create_volatile_environment_registry_key(void) size = (sizeof(computername)/sizeof(WCHAR)) - 2; if (GetComputerNameW(&computername[2], &size)) { + set_reg_value( hkey, UserDomainW, &computername[2] ); computername[0] = computername[1] = '\\'; set_reg_value( hkey, LogonServerW, computername ); }

1 0

Austin English : urlmon: Add stubs for ordinals 410 and 423.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 967657de352d040c535e9b84c3e6f9d12418de14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=967657de352d040c535e9b84c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 14 19:23:09 2010 +0000 urlmon: Add stubs for ordinals 410 and 423. --- dlls/urlmon/urlmon.spec | 3 +++ dlls/urlmon/urlmon_main.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 9d3de3a..1db915e 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -89,3 +89,6 @@ @ stdcall UrlMkSetSessionOption(long ptr long long) @ stub WriteHitLogging @ stub ZonesReInit + +410 stdcall @(long long) URLMON_410 +423 stdcall @(long long long long) URLMON_423 diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 6ecd1de..03bb597 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -862,3 +862,23 @@ BOOL WINAPI IsLoggingEnabledW(LPCWSTR url) FIXME("(%s)\n", debugstr_w(url)); return FALSE; } + +/*********************************************************************** + * URLMON_410 (URLMON.410) + * Undocumented, added in IE8 + */ +BOOL WINAPI URLMON_410(DWORD unknown1, DWORD unknown2) +{ + FIXME("stub: %d %d\n", unknown1, unknown2); + return FALSE; +} + +/*********************************************************************** + * URLMON_423 (URLMON.423) + * Undocumented, added in IE8 + */ +BOOL WINAPI URLMON_423(DWORD unknown1, DWORD unknown2, DWORD unknown3, DWORD unknown4) +{ + FIXME("stub: %d %d %d %d\n", unknown1, unknown2, unknown3, unknown4); + return FALSE; +}

1 0

André Hentschel : include: Add winhttp secure protocol flags.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 94c99df25d0b603739b6cb5c5c77710f017cea96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c99df25d0b603739b6cb5c5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 14 19:05:22 2010 +0100 include: Add winhttp secure protocol flags. --- include/winhttp.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/winhttp.h b/include/winhttp.h index 17fc38a..68bec0a 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -429,6 +429,11 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_CALLBACK_STATUS_FLAG_CERT_WRONG_USAGE 0x00000040 #define WINHTTP_CALLBACK_STATUS_FLAG_SECURITY_CHANNEL_ERROR 0x80000000 +#define WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 0x00000008 +#define WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 0x00000020 +#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 0x00000080 +#define WINHTTP_FLAG_SECURE_PROTOCOL_ALL (WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 | WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1) + #define WINHTTP_AUTH_SCHEME_BASIC 0x00000001 #define WINHTTP_AUTH_SCHEME_NTLM 0x00000002 #define WINHTTP_AUTH_SCHEME_PASSPORT 0x00000004

1 0