wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

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

15 Dec '10

Module: wine Branch: master Commit: 24ad5cb68f1813af9254d2fd72fb59c074cda358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ad5cb68f1813af9254d2fd7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 15 10:55:20 2010 +0100 msi: Use an iface instead of a vtbl pointer in msi_remote_database_impl. --- dlls/msi/database.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 886a955..598d7a8 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -2038,14 +2038,14 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle ) } typedef struct _msi_remote_database_impl { - const IWineMsiRemoteDatabaseVtbl *lpVtbl; + IWineMsiRemoteDatabase IWineMsiRemoteDatabase_iface; MSIHANDLE database; LONG refs; } msi_remote_database_impl; -static inline msi_remote_database_impl* mrd_from_IWineMsiRemoteDatabase( IWineMsiRemoteDatabase* iface ) +static inline msi_remote_database_impl *impl_from_IWineMsiRemoteDatabase( IWineMsiRemoteDatabase *iface ) { - return (msi_remote_database_impl *)iface; + return CONTAINING_RECORD(iface, msi_remote_database_impl, IWineMsiRemoteDatabase_iface); } static HRESULT WINAPI mrd_QueryInterface( IWineMsiRemoteDatabase *iface, @@ -2064,14 +2064,14 @@ static HRESULT WINAPI mrd_QueryInterface( IWineMsiRemoteDatabase *iface, static ULONG WINAPI mrd_AddRef( IWineMsiRemoteDatabase *iface ) { - msi_remote_database_impl* This = mrd_from_IWineMsiRemoteDatabase( iface ); + msi_remote_database_impl* This = impl_from_IWineMsiRemoteDatabase( iface ); return InterlockedIncrement( &This->refs ); } static ULONG WINAPI mrd_Release( IWineMsiRemoteDatabase *iface ) { - msi_remote_database_impl* This = mrd_from_IWineMsiRemoteDatabase( iface ); + msi_remote_database_impl* This = impl_from_IWineMsiRemoteDatabase( iface ); ULONG r; r = InterlockedDecrement( &This->refs ); @@ -2086,7 +2086,7 @@ static ULONG WINAPI mrd_Release( IWineMsiRemoteDatabase *iface ) static HRESULT WINAPI mrd_IsTablePersistent( IWineMsiRemoteDatabase *iface, LPCWSTR table, MSICONDITION *persistent ) { - msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); + msi_remote_database_impl *This = impl_from_IWineMsiRemoteDatabase( iface ); *persistent = MsiDatabaseIsTablePersistentW(This->database, table); return S_OK; } @@ -2094,7 +2094,7 @@ static HRESULT WINAPI mrd_IsTablePersistent( IWineMsiRemoteDatabase *iface, static HRESULT WINAPI mrd_GetPrimaryKeys( IWineMsiRemoteDatabase *iface, LPCWSTR table, MSIHANDLE *keys ) { - msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); + msi_remote_database_impl *This = impl_from_IWineMsiRemoteDatabase( iface ); UINT r = MsiDatabaseGetPrimaryKeysW(This->database, table, keys); return HRESULT_FROM_WIN32(r); } @@ -2102,7 +2102,7 @@ static HRESULT WINAPI mrd_GetPrimaryKeys( IWineMsiRemoteDatabase *iface, static HRESULT WINAPI mrd_GetSummaryInformation( IWineMsiRemoteDatabase *iface, UINT updatecount, MSIHANDLE *suminfo ) { - msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); + msi_remote_database_impl *This = impl_from_IWineMsiRemoteDatabase( iface ); UINT r = MsiGetSummaryInformationW(This->database, NULL, updatecount, suminfo); return HRESULT_FROM_WIN32(r); } @@ -2110,14 +2110,14 @@ static HRESULT WINAPI mrd_GetSummaryInformation( IWineMsiRemoteDatabase *iface, static HRESULT WINAPI mrd_OpenView( IWineMsiRemoteDatabase *iface, LPCWSTR query, MSIHANDLE *view ) { - msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); + msi_remote_database_impl *This = impl_from_IWineMsiRemoteDatabase( iface ); UINT r = MsiDatabaseOpenViewW(This->database, query, view); return HRESULT_FROM_WIN32(r); } static HRESULT WINAPI mrd_SetMsiHandle( IWineMsiRemoteDatabase *iface, MSIHANDLE handle ) { - msi_remote_database_impl* This = mrd_from_IWineMsiRemoteDatabase( iface ); + msi_remote_database_impl* This = impl_from_IWineMsiRemoteDatabase( iface ); This->database = handle; return S_OK; } @@ -2142,7 +2142,7 @@ HRESULT create_msi_remote_database( IUnknown *pOuter, LPVOID *ppObj ) if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &msi_remote_database_vtbl; + This->IWineMsiRemoteDatabase_iface.lpVtbl = &msi_remote_database_vtbl; This->database = 0; This->refs = 1;

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

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 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

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

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

Huw Davies : fonts: Fix the metrics of the extended integral and brace glyphs.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 156f611ba8b24ed03c17c7c860d3accea1b31e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=156f611ba8b24ed03c17c7c86… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 15 10:21:50 2010 +0000 fonts: Fix the metrics of the extended integral and brace glyphs. --- fonts/symbol.sfd | 216 +++++++++++++++++++++++++++--------------------------- fonts/symbol.ttf | Bin 26040 -> 26040 bytes 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/fonts/symbol.sfd b/fonts/symbol.sfd index 0010a65..bf34606 100644 --- a/fonts/symbol.sfd +++ b/fonts/symbol.sfd @@ -83,7 +83,7 @@ BeginChars: 257 192 StartChar: .notdef Encoding: 255 711 0 -AltUni2: 000001.ffffffff.0 000002.ffffffff.0 000003.ffffffff.0 000004.ffffffff.0 000005.ffffffff.0 000006.ffffffff.0 000007.ffffffff.0 00000a.ffffffff.0 00000b.ffffffff.0 00000c.ffffffff.0 00000e.ffffffff.0 00000f.ffffffff.0 000010.ffffffff.0 000011.ffffffff.0 000012.ffffffff.0 000013.ffffffff.0 000014.ffffffff.0 000015.ffffffff.0 000016.ffffffff.0 000017.ffffffff.0 000018.ffffffff.0 000019.ffffffff.0 00001a.ffffffff.0 00001b.ffffffff.0 00001c.ffffffff.0 00001e.ffffffff.0 00001f.ffffffff.0 00007f.ffffffff.0 0000c4.ffffffff.0 0000c5.ffffffff.0 0000c7.ffffffff.0 0000c9.ffffffff.0 0000d1.ffffffff.0 0000d6.ffffffff.0 0000dc.ffffffff.0 0000e1.ffffffff.0 0000e0.ffffffff.0 0000e2.ffffffff.0 0000e4.ffffffff.0 0000e3.ffffffff.0 0000e5.ffffffff.0 0000e7.ffffffff.0 0000e9.ffffffff.0 0000e8.ffffffff.0 0000ea.ffffffff.0 0000eb.ffffffff.0 0000ed.ffffffff.0 0000ec.ffffffff.0 0000ee.ffffffff.0 0000ef.ffffffff.0 0000f1.ffffffff.0 0000f3.ffffffff.0 0000f2.ffffffff.0 0000f4.ffffffff.0 0000f6.ffffffff.0 0000f5.ffffffff.0 0000fa.ffffffff.0 0000f9.ffffffff.0 0000fb.ffffffff.0 0000fc.ffffffff.0 002020.ffffffff.0 +AltUni2: 002020.ffffffff.0 0000fc.ffffffff.0 0000fb.ffffffff.0 0000f9.ffffffff.0 0000fa.ffffffff.0 0000f5.ffffffff.0 0000f6.ffffffff.0 0000f4.ffffffff.0 0000f2.ffffffff.0 0000f3.ffffffff.0 0000f1.ffffffff.0 0000ef.ffffffff.0 0000ee.ffffffff.0 0000ec.ffffffff.0 0000ed.ffffffff.0 0000eb.ffffffff.0 0000ea.ffffffff.0 0000e8.ffffffff.0 0000e9.ffffffff.0 0000e7.ffffffff.0 0000e5.ffffffff.0 0000e3.ffffffff.0 0000e4.ffffffff.0 0000e2.ffffffff.0 0000e0.ffffffff.0 0000e1.ffffffff.0 0000dc.ffffffff.0 0000d6.ffffffff.0 0000d1.ffffffff.0 0000c9.ffffffff.0 0000c7.ffffffff.0 0000c5.ffffffff.0 0000c4.ffffffff.0 00007f.ffffffff.0 00001f.ffffffff.0 00001e.ffffffff.0 00001c.ffffffff.0 00001b.ffffffff.0 00001a.ffffffff.0 000019.ffffffff.0 000018.ffffffff.0 000017.ffffffff.0 000016.ffffffff.0 000015.ffffffff.0 000014.ffffffff.0 000013.ffffffff.0 000012.ffffffff.0 000011.ffffffff.0 000010.ffffffff.0 00000f.ffffffff.0 00000e.ffffffff.0 00000c.ffffffff.0 00000b.ffffffff.0 00000a.ffffffff.0 000007.ffffffff.0 000006.ffffffff.0 000005.ffffffff.0 000004.ffffffff.0 000003.ffffffff.0 000002.ffffffff.0 000001.ffffffff.0 Width: 1229 Flags: W LayerCount: 2 @@ -104,7 +104,7 @@ EndChar StartChar: uni001D Encoding: 29 29 1 -AltUni2: 000000.ffffffff.0 000008.ffffffff.0 00000d.ffffffff.0 +AltUni2: 00000d.ffffffff.0 000008.ffffffff.0 000000.ffffffff.0 Width: 0 Flags: W LayerCount: 2 @@ -5564,78 +5564,78 @@ EndChar StartChar: bracelefttp Encoding: 236 207 173 -Width: 2048 -Flags: W +Width: 1012 +Flags: HW LayerCount: 2 Fore SplineSet -637 -162 m 1,0,-1 - 532 -162 l 1,1,-1 - 532 1290 l 1,2,3 - 549 1883 549 1883 984 1884 c 1,4,-1 - 1038 1836 l 1,5,6 - 621 1835 621 1835 637 1302 c 1,7,-1 - 637 -162 l 1,0,-1 +525 -162 m 1,0,-1 + 420 -162 l 1,1,-1 + 420 1290 l 1,2,3 + 437 1883 437 1883 872 1884 c 1,4,-1 + 926 1836 l 1,5,6 + 509 1835 509 1835 525 1302 c 1,7,-1 + 525 -162 l 1,0,-1 EndSplineSet EndChar StartChar: braceleftmid Encoding: 237 204 174 Width: 1012 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -469 1444 m 1,0,1 - 460 1265 460 1265 420 1159.5 c 128,-1,2 - 380 1054 380 1054 313 989 c 128,-1,3 - 246 924 246 924 44 858 c 1,4,5 - 246 768 246 768 312 693.5 c 128,-1,6 - 378 619 378 619 423.5 506.5 c 128,-1,7 - 469 394 469 394 469 268 c 2,8,-1 - 469 -162 l 1,9,-1 - 364 -162 l 1,10,-1 - 364 250 l 1,11,12 - 366 463 366 463 286.5 596 c 128,-1,13 - 207 729 207 729 0 827 c 1,14,-1 - 0 899 l 1,15,16 - 206 949 206 949 288 1080.5 c 128,-1,17 - 370 1212 370 1212 364 1476 c 1,18,-1 - 364 1885 l 1,19,-1 - 469 1885 l 1,20,-1 - 469 1444 l 1,0,1 +525 1444 m 1,0,1 + 516 1265 516 1265 476 1159.5 c 128,-1,2 + 436 1054 436 1054 369 989 c 128,-1,3 + 302 924 302 924 100 858 c 1,4,5 + 302 768 302 768 368 693.5 c 128,-1,6 + 434 619 434 619 479.5 506.5 c 128,-1,7 + 525 394 525 394 525 268 c 2,8,-1 + 525 -162 l 1,9,-1 + 420 -162 l 1,10,-1 + 420 250 l 1,11,12 + 422 463 422 463 342.5 596 c 128,-1,13 + 263 729 263 729 56 827 c 1,14,-1 + 56 899 l 1,15,16 + 262 949 262 949 344 1080.5 c 128,-1,17 + 426 1212 426 1212 420 1476 c 1,18,-1 + 420 1885 l 1,19,-1 + 525 1885 l 1,20,-1 + 525 1444 l 1,0,1 EndSplineSet EndChar StartChar: braceleftbt Encoding: 238 211 175 -Width: 2048 -Flags: W +Width: 1012 +Flags: HW LayerCount: 2 Fore SplineSet -637 420 m 1,0,1 - 621 -113 621 -113 1038 -113 c 1,2,-1 - 984 -162 l 1,3,4 - 549 -160 549 -160 532 432 c 1,5,-1 - 532 1884 l 1,6,-1 - 637 1884 l 1,7,-1 - 637 420 l 1,0,1 +525 420 m 1,0,1 + 509 -113 509 -113 926 -113 c 1,2,-1 + 872 -162 l 1,3,4 + 437 -160 437 -160 420 432 c 1,5,-1 + 420 1884 l 1,6,-1 + 525 1884 l 1,7,-1 + 525 420 l 1,0,1 EndSplineSet EndChar StartChar: braceex Encoding: 239 212 176 -Width: 2048 -Flags: W +Width: 1012 +Flags: HW LayerCount: 2 Fore SplineSet -101 1899 m 1,0,-1 - 101 -161 l 1,1,-1 - 2 -161 l 1,2,-1 - 2 1899 l 1,3,-1 - 101 1899 l 1,0,-1 +519 1899 m 1,0,-1 + 519 -161 l 1,1,-1 + 420 -161 l 1,2,-1 + 420 1899 l 1,3,-1 + 519 1899 l 1,0,-1 EndSplineSet EndChar @@ -5733,44 +5733,44 @@ EndChar StartChar: integraltp Encoding: 243 219 180 Width: 1405 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -672 1804 m 1,0,1 - 584 1844 584 1844 502 1794 c 1,2,3 - 357 1725 357 1725 261.5 1503 c 128,-1,4 - 166 1281 166 1281 140 850 c 1,5,-1 - 140 -162 l 1,6,-1 - 0 -162 l 1,7,-1 - 0 679 l 1,8,9 - 13 1158 13 1158 110 1411.5 c 128,-1,10 - 207 1665 207 1665 341 1777 c 128,-1,11 - 475 1889 475 1889 602 1884 c 1,12,13 - 676 1885 676 1885 729 1830 c 128,-1,14 - 782 1775 782 1775 782 1692 c 1,15,16 - 783 1680 783 1680 781 1669 c 0,17,18 - 774 1619 774 1619 733 1588 c 1,19,20 - 693 1556 693 1556 642.5 1562 c 128,-1,21 - 592 1568 592 1568 562 1608 c 1,22,23 - 531 1647 531 1647 538 1697 c 128,-1,24 - 545 1747 545 1747 586 1779 c 0,25,26 - 624 1809 624 1809 672 1804 c 1,0,1 +1383 1804 m 1,0,1 + 1295 1844 1295 1844 1213 1794 c 1,2,3 + 1068 1725 1068 1725 972.5 1503 c 128,-1,4 + 877 1281 877 1281 851 850 c 1,5,-1 + 851 -162 l 1,6,-1 + 711 -162 l 1,7,-1 + 711 679 l 1,8,9 + 724 1158 724 1158 821 1411.5 c 128,-1,10 + 918 1665 918 1665 1052 1777 c 128,-1,11 + 1186 1889 1186 1889 1313 1884 c 1,12,13 + 1387 1885 1387 1885 1440 1830 c 128,-1,14 + 1493 1775 1493 1775 1493 1692 c 1,15,16 + 1494 1680 1494 1680 1492 1669 c 0,17,18 + 1485 1619 1485 1619 1444 1588 c 1,19,20 + 1404 1556 1404 1556 1353.5 1562 c 128,-1,21 + 1303 1568 1303 1568 1273 1608 c 1,22,23 + 1242 1647 1242 1647 1249 1697 c 128,-1,24 + 1256 1747 1256 1747 1297 1779 c 0,25,26 + 1335 1809 1335 1809 1383 1804 c 1,0,1 EndSplineSet EndChar StartChar: integralex Encoding: 244 217 181 Width: 1405 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -140 1885 m 1,0,-1 - 140 -162 l 1,1,-1 - 0 -162 l 1,2,-1 - 0 1886 l 1,3,-1 - 140 1885 l 1,0,-1 +851 1885 m 1,0,-1 + 851 -162 l 1,1,-1 + 711 -162 l 1,2,-1 + 711 1886 l 1,3,-1 + 851 1885 l 1,0,-1 EndSplineSet EndChar @@ -5784,7 +5784,7 @@ SplineSet 178 -82 m 1,0,1 266 -122 266 -122 348 -73 c 1,2,3 494 -3 494 -3 589.5 219 c 128,-1,4 - 685 441 685 441 711 872 c 1,5,-1 + 685 441 685 441 711 872 c 5,5,-1 711 1884 l 1,6,-1 851 1884 l 1,7,-1 851 1043 l 1,8,9 @@ -5904,62 +5904,62 @@ EndChar StartChar: bracerighttp Encoding: 252 184 189 Width: 1012 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -427 1302 m 1,0,1 - 443 1835 443 1835 26 1836 c 1,2,-1 - 80 1884 l 1,3,4 - 515 1883 515 1883 532 1290 c 1,5,-1 - 532 -162 l 1,6,-1 - 427 -162 l 1,7,-1 - 427 1302 l 1,0,1 +420 1302 m 1,0,1 + 436 1835 436 1835 19 1836 c 1,2,-1 + 73 1884 l 1,3,4 + 508 1883 508 1883 525 1290 c 1,5,-1 + 525 -162 l 1,6,-1 + 420 -162 l 1,7,-1 + 420 1302 l 1,0,1 EndSplineSet EndChar StartChar: bracerightmid Encoding: 253 733 190 Width: 1012 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -427 1884 m 1,0,-1 - 532 1884 l 1,1,-1 - 532 1475 l 1,2,3 - 527 1211 527 1211 608.5 1079.5 c 128,-1,4 - 690 948 690 948 896 898 c 1,5,-1 - 896 826 l 1,6,7 - 690 728 690 728 610 595 c 128,-1,8 - 530 462 530 462 532 249 c 1,9,-1 - 532 -163 l 1,10,-1 - 427 -163 l 1,11,-1 - 427 267 l 2,12,13 - 427 393 427 393 473 505.5 c 128,-1,14 - 519 618 519 618 584.5 692.5 c 128,-1,15 - 650 767 650 767 852 857 c 1,16,17 - 650 923 650 923 583.5 988 c 128,-1,18 - 517 1053 517 1053 476.5 1158.5 c 128,-1,19 - 436 1264 436 1264 427 1443 c 1,20,-1 - 427 1884 l 1,0,-1 +420 1884 m 1,0,-1 + 525 1884 l 1,1,-1 + 525 1475 l 1,2,3 + 520 1211 520 1211 601.5 1079.5 c 128,-1,4 + 683 948 683 948 889 898 c 1,5,-1 + 889 826 l 1,6,7 + 683 728 683 728 603 595 c 128,-1,8 + 523 462 523 462 525 249 c 1,9,-1 + 525 -163 l 1,10,-1 + 420 -163 l 1,11,-1 + 420 267 l 2,12,13 + 420 393 420 393 466 505.5 c 128,-1,14 + 512 618 512 618 577.5 692.5 c 128,-1,15 + 643 767 643 767 845 857 c 1,16,17 + 643 923 643 923 576.5 988 c 128,-1,18 + 510 1053 510 1053 469.5 1158.5 c 128,-1,19 + 429 1264 429 1264 420 1443 c 1,20,-1 + 420 1884 l 1,0,-1 EndSplineSet EndChar StartChar: bracerightbt Encoding: 254 731 191 Width: 1012 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -427 1884 m 1,0,-1 - 532 1884 l 1,1,-1 - 532 432 l 1,2,3 - 515 -160 515 -160 80 -162 c 1,4,-1 - 26 -113 l 1,5,6 - 443 -113 443 -113 427 420 c 1,7,-1 - 427 1884 l 1,0,-1 +420 1884 m 1,0,-1 + 525 1884 l 1,1,-1 + 525 432 l 1,2,3 + 508 -160 508 -160 73 -162 c 1,4,-1 + 19 -113 l 1,5,6 + 436 -113 436 -113 420 420 c 1,7,-1 + 420 1884 l 1,0,-1 EndSplineSet EndChar EndChars diff --git a/fonts/symbol.ttf b/fonts/symbol.ttf index f331787..b0a3fc1 100644 Binary files a/fonts/symbol.ttf and b/fonts/symbol.ttf differ

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

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

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

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 December 2010