December 2013 - Wine-commits

Zhenbo Li : kernel32/tests: Add some tests for DeleteFileA.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: f39c64a85ce3617bd1008f98d1e555114da378cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39c64a85ce3617bd1008f98d… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Dec 20 21:25:10 2013 +0800 kernel32/tests: Add some tests for DeleteFileA. --- dlls/kernel32/tests/file.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index daf8851..3ac4be8 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1632,6 +1632,9 @@ static void test_DeleteFileA( void ) GetLastError() == ERROR_INVALID_FUNCTION), "DeleteFileA(\"nul\") returned ret=%d error=%d\n",ret,GetLastError()); + ret = DeleteFileA("nonexist.txt"); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "DeleteFileA(\"nonexist.txt\") returned ret=%d error=%d\n",ret,GetLastError()); + GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "tst", 0, temp_file); @@ -1650,6 +1653,15 @@ todo_wine ret = DeleteFileA(temp_file); todo_wine ok(!ret, "DeleteFile should fail\n"); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryA("testdir", NULL); + ok(ret, "CreateDirectory failed, got err %d\n", GetLastError()); + ret = DeleteFileA("testdir"); + ok(!ret && GetLastError() == ERROR_ACCESS_DENIED, + "Expected ERROR_ACCESS_DENIED, got error %d\n", GetLastError()); + ret = RemoveDirectoryA("testdir"); + ok(ret, "Remove a directory failed, got error %d\n", GetLastError()); } static void test_DeleteFileW( void )

1 0

Alexandre Julliard : ntdll: Allocate a separate pointer for each TLS slot.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 384d698a9e4af8084b469b5f42619493ef83434d URL: http://source.winehq.org/git/wine.git/?a=commit;h=384d698a9e4af8084b469b5f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 23 12:27:39 2013 +0100 ntdll: Allocate a separate pointer for each TLS slot. --- dlls/ntdll/loader.c | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5eb8755..817cf8a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -96,10 +96,7 @@ static struct builtin_load_info *builtin_load_info = &default_load_info; 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 = @@ -887,12 +884,11 @@ static NTSTATUS alloc_process_tls(void) continue; size = (dir->EndAddressOfRawData - dir->StartAddressOfRawData) + dir->SizeOfZeroFill; if (!size && !dir->AddressOfCallBacks) continue; - tls_total_size += TLS_ALIGN(size); tls_module_count++; } if (!tls_module_count) return STATUS_SUCCESS; - TRACE( "count %u size %u\n", tls_module_count, tls_total_size ); + TRACE( "count %u\n", tls_module_count ); tls_dirs = RtlAllocateHeap( GetProcessHeap(), 0, tls_module_count * sizeof(*tls_dirs) ); if (!tls_dirs) return STATUS_NO_MEMORY; @@ -921,29 +917,34 @@ static NTSTATUS alloc_process_tls(void) static NTSTATUS alloc_thread_tls(void) { void **pointers; - char *data; UINT i, size; if (!tls_module_count) return STATUS_SUCCESS; - size = TLS_ALIGN( tls_module_count * sizeof(*pointers) ); - if (!(pointers = RtlAllocateHeap( GetProcessHeap(), 0, size + tls_total_size ))) + if (!(pointers = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, + tls_module_count * sizeof(*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]; + + if (!dir) continue; size = dir->EndAddressOfRawData - dir->StartAddressOfRawData; + if (!size && !dir->SizeOfZeroFill) continue; + + if (!(pointers[i] = RtlAllocateHeap( GetProcessHeap(), 0, size + dir->SizeOfZeroFill ))) + { + while (i) RtlFreeHeap( GetProcessHeap(), 0, pointers[--i] ); + RtlFreeHeap( GetProcessHeap(), 0, pointers ); + return STATUS_NO_MEMORY; + } + memcpy( pointers[i], (void *)dir->StartAddressOfRawData, size ); + memset( (char *)pointers[i] + size, 0, dir->SizeOfZeroFill ); TRACE( "thread %04x idx %d: %d/%d bytes from %p to %p\n", GetCurrentThreadId(), i, size, dir->SizeOfZeroFill, - (void *)dir->StartAddressOfRawData, data ); - - pointers[i] = data; - memcpy( data, (void *)dir->StartAddressOfRawData, size ); - memset( data + size, 0, dir->SizeOfZeroFill ); - data += TLS_ALIGN( size + dir->SizeOfZeroFill ); + (void *)dir->StartAddressOfRawData, pointers[i] ); } NtCurrentTeb()->ThreadLocalStoragePointer = pointers; return STATUS_SUCCESS; @@ -2482,6 +2483,8 @@ void WINAPI LdrShutdownThread(void) { PLIST_ENTRY mark, entry; PLDR_MODULE mod; + UINT i; + void **pointers; TRACE("()\n"); @@ -2504,8 +2507,12 @@ void WINAPI LdrShutdownThread(void) DLL_THREAD_DETACH, NULL ); } + if ((pointers = NtCurrentTeb()->ThreadLocalStoragePointer)) + { + for (i = 0; i < tls_module_count; i++) RtlFreeHeap( GetProcessHeap(), 0, pointers[i] ); + RtlFreeHeap( GetProcessHeap(), 0, pointers ); + } RtlLeaveCriticalSection( &loader_section ); - RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->ThreadLocalStoragePointer ); }

1 0

Alexandre Julliard : ntdll: Allocate TLS slots dynamically on module load.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 1a4eca6f16af0eabbeee6fcdebfa90abc0cec8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a4eca6f16af0eabbeee6fcde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 23 12:54:26 2013 +0100 ntdll: Allocate TLS slots dynamically on module load. --- dlls/ntdll/loader.c | 110 ++++++++++++++++++++++++++++---------------------- 1 files changed, 62 insertions(+), 48 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 817cf8a..b8a9c66 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -792,6 +792,65 @@ static BOOL is_dll_native_subsystem( HMODULE module, const IMAGE_NT_HEADERS *nt, return TRUE; } +/************************************************************************* + * alloc_tls_slot + * + * Allocate a TLS slot for a newly-loaded module. + * The loader_section must be locked while calling this function. + */ +static SHORT alloc_tls_slot( LDR_MODULE *mod ) +{ + const IMAGE_TLS_DIRECTORY *dir; + ULONG i, size; + void *new_ptr; + + if (!(dir = RtlImageDirectoryEntryToData( mod->BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_TLS, &size ))) + return -1; + + size = dir->EndAddressOfRawData - dir->StartAddressOfRawData; + if (!size && !dir->SizeOfZeroFill && !dir->AddressOfCallBacks) return -1; + + for (i = 0; i < tls_module_count; i++) if (!tls_dirs[i]) break; + + TRACE( "module %p data %p-%p zerofill %u index %p callback %p flags %x -> slot %u\n", mod->BaseAddress, + (void *)dir->StartAddressOfRawData, (void *)dir->EndAddressOfRawData, dir->SizeOfZeroFill, + (void *)dir->AddressOfIndex, (void *)dir->AddressOfCallBacks, dir->Characteristics, i ); + + if (i == tls_module_count) + { + UINT new_count = max( 32, tls_module_count * 2 ); + + if (!tls_dirs) + new_ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(*tls_dirs) ); + else + new_ptr = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, tls_dirs, + new_count * sizeof(*tls_dirs) ); + if (!new_ptr) return -1; + tls_dirs = new_ptr; + tls_module_count = new_count; + } + + *(DWORD *)dir->AddressOfIndex = i; + tls_dirs[i] = dir; + return i; +} + + +/************************************************************************* + * free_tls_slot + * + * Free the module TLS slot on unload. + * The loader_section must be locked while calling this function. + */ +static void free_tls_slot( LDR_MODULE *mod ) +{ + ULONG i = (USHORT)mod->TlsIndex; + + if (mod->TlsIndex == -1) return; + assert( i < tls_module_count ); + tls_dirs[i] = NULL; +} + /************************************************************************* * alloc_module @@ -816,7 +875,6 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) wm->ldr.SizeOfImage = nt->OptionalHeader.SizeOfImage; wm->ldr.Flags = LDR_DONT_RESOLVE_REFS; wm->ldr.LoadCount = 1; - wm->ldr.TlsIndex = -1; wm->ldr.SectionHandle = NULL; wm->ldr.CheckSum = 0; wm->ldr.TimeDateStamp = 0; @@ -853,6 +911,8 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) wm->ldr.InInitializationOrderModuleList.Flink = NULL; wm->ldr.InInitializationOrderModuleList.Blink = NULL; + wm->ldr.TlsIndex = alloc_tls_slot( &wm->ldr ); + if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT)) { ULONG flags = MEM_EXECUTE_OPTION_ENABLE; @@ -864,52 +924,6 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) /************************************************************************* - * alloc_process_tls - * - * Allocate the process-wide structure for module TLS storage. - */ -static NTSTATUS alloc_process_tls(void) -{ - PLIST_ENTRY mark, entry; - PLDR_MODULE mod; - const IMAGE_TLS_DIRECTORY *dir; - ULONG size, i; - - mark = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; - for (entry = mark->Flink; entry != mark; entry = entry->Flink) - { - mod = CONTAINING_RECORD(entry, LDR_MODULE, InMemoryOrderModuleList); - if (!(dir = RtlImageDirectoryEntryToData( mod->BaseAddress, TRUE, - IMAGE_DIRECTORY_ENTRY_TLS, &size ))) - continue; - size = (dir->EndAddressOfRawData - dir->StartAddressOfRawData) + dir->SizeOfZeroFill; - if (!size && !dir->AddressOfCallBacks) continue; - tls_module_count++; - } - if (!tls_module_count) return STATUS_SUCCESS; - - TRACE( "count %u\n", tls_module_count ); - - tls_dirs = RtlAllocateHeap( GetProcessHeap(), 0, tls_module_count * sizeof(*tls_dirs) ); - if (!tls_dirs) return STATUS_NO_MEMORY; - - for (i = 0, entry = mark->Flink; entry != mark; entry = entry->Flink) - { - mod = CONTAINING_RECORD(entry, LDR_MODULE, InMemoryOrderModuleList); - if (!(dir = RtlImageDirectoryEntryToData( mod->BaseAddress, TRUE, - IMAGE_DIRECTORY_ENTRY_TLS, &size ))) - continue; - tls_dirs[i] = dir; - *(DWORD *)dir->AddressOfIndex = i; - mod->TlsIndex = i; - mod->LoadCount = -1; /* can't unload it */ - i++; - } - return STATUS_SUCCESS; -} - - -/************************************************************************* * alloc_thread_tls * * Allocate the per-thread structure for module TLS storage. @@ -2540,6 +2554,7 @@ static void free_modref( WINE_MODREF *wm ) } SERVER_END_REQ; + free_tls_slot( &wm->ldr ); RtlReleaseActivationContext( wm->ldr.ActivationContext ); NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); if (wm->ldr.Flags & LDR_WINE_INTERNAL) wine_dll_unload( wm->ldr.SectionHandle ); @@ -2813,7 +2828,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, actctx_init(); load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; - if ((status = alloc_process_tls()) != STATUS_SUCCESS) goto error; if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto error; heap_set_debug_flags( GetProcessHeap() );

1 0

Alexandre Julliard : ntdll: Allocate TLS data in all running threads on module load.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: e54503f7085a5b62dfc373aaa6b98116bde784d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54503f7085a5b62dfc373aaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 23 18:16:51 2013 +0100 ntdll: Allocate TLS data in all running threads on module load. --- dlls/ntdll/loader.c | 49 +++++++++++++++++++++++++++++++++++++++++++--- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/thread.c | 11 ---------- 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b8a9c66..e0907e7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -97,6 +97,7 @@ static struct builtin_load_info *builtin_load_info = &default_load_info; static HANDLE main_exe_file; static UINT tls_module_count; /* number of modules with TLS directory */ static const IMAGE_TLS_DIRECTORY **tls_dirs; /* array of TLS directories */ +LIST_ENTRY tls_links = { &tls_links, &tls_links }; static RTL_CRITICAL_SECTION loader_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = @@ -803,6 +804,7 @@ static SHORT alloc_tls_slot( LDR_MODULE *mod ) const IMAGE_TLS_DIRECTORY *dir; ULONG i, size; void *new_ptr; + LIST_ENTRY *entry; if (!(dir = RtlImageDirectoryEntryToData( mod->BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_TLS, &size ))) return -1; @@ -826,10 +828,41 @@ static SHORT alloc_tls_slot( LDR_MODULE *mod ) new_ptr = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, tls_dirs, new_count * sizeof(*tls_dirs) ); if (!new_ptr) return -1; + + /* resize the pointer block in all running threads */ + for (entry = tls_links.Flink; entry != &tls_links; entry = entry->Flink) + { + TEB *teb = CONTAINING_RECORD( entry, TEB, TlsLinks ); + void **old = teb->ThreadLocalStoragePointer; + void **new = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(*new)); + + if (!new) return -1; + if (old) memcpy( new, old, tls_module_count * sizeof(*new) ); + teb->ThreadLocalStoragePointer = new; + TRACE( "thread %04lx tls block %p -> %p\n", (ULONG_PTR)teb->ClientId.UniqueThread, old, new ); + /* FIXME: can't free old block here, should be freed at thread exit */ + } + tls_dirs = new_ptr; tls_module_count = new_count; } + /* allocate the data block in all running threads */ + for (entry = tls_links.Flink; entry != &tls_links; entry = entry->Flink) + { + TEB *teb = CONTAINING_RECORD( entry, TEB, TlsLinks ); + + if (!(new_ptr = RtlAllocateHeap( GetProcessHeap(), 0, size + dir->SizeOfZeroFill ))) return -1; + memcpy( new_ptr, (void *)dir->StartAddressOfRawData, size ); + memset( (char *)new_ptr + size, 0, dir->SizeOfZeroFill ); + + TRACE( "thread %04lx slot %u: %u/%u bytes at %p\n", + (ULONG_PTR)teb->ClientId.UniqueThread, i, size, dir->SizeOfZeroFill, new_ptr ); + + RtlFreeHeap( GetProcessHeap(), 0, + interlocked_xchg_ptr( (void **)teb->ThreadLocalStoragePointer + i, new_ptr )); + } + *(DWORD *)dir->AddressOfIndex = i; tls_dirs[i] = dir; return i; @@ -956,9 +989,8 @@ static NTSTATUS alloc_thread_tls(void) memcpy( pointers[i], (void *)dir->StartAddressOfRawData, size ); memset( (char *)pointers[i] + size, 0, dir->SizeOfZeroFill ); - TRACE( "thread %04x idx %d: %d/%d bytes from %p to %p\n", - GetCurrentThreadId(), i, size, dir->SizeOfZeroFill, - (void *)dir->StartAddressOfRawData, pointers[i] ); + TRACE( "thread %04x slot %u: %u/%u bytes at %p\n", + GetCurrentThreadId(), i, size, dir->SizeOfZeroFill, pointers[i] ); } NtCurrentTeb()->ThreadLocalStoragePointer = pointers; return STATUS_SUCCESS; @@ -1229,6 +1261,10 @@ NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ) RtlEnterCriticalSection( &loader_section ); + RtlAcquirePebLock(); + InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); + RtlReleasePebLock(); + if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto done; mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList; @@ -2521,11 +2557,17 @@ void WINAPI LdrShutdownThread(void) DLL_THREAD_DETACH, NULL ); } + RtlAcquirePebLock(); + RemoveEntryList( &NtCurrentTeb()->TlsLinks ); + RtlReleasePebLock(); + if ((pointers = NtCurrentTeb()->ThreadLocalStoragePointer)) { for (i = 0; i < tls_module_count; i++) RtlFreeHeap( GetProcessHeap(), 0, pointers[i] ); RtlFreeHeap( GetProcessHeap(), 0, pointers ); } + RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->FlsSlots ); + RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->TlsExpansionSlots ); RtlLeaveCriticalSection( &loader_section ); } @@ -2828,7 +2870,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, actctx_init(); load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; - if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto error; heap_set_debug_flags( GetProcessHeap() ); status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index a45e6b0..4370084 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -103,6 +103,7 @@ NTSTATUS NTDLL_create_struct_sd(PSECURITY_DESCRIPTOR nt_sd, struct security_desc void NTDLL_free_struct_sd(struct security_descriptor *server_sd) DECLSPEC_HIDDEN; /* module handling */ +extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; extern NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ) DECLSPEC_HIDDEN; extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 8a63725..9f0dfc0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -67,7 +67,6 @@ static WCHAR current_dir[MAX_NT_PATH_LENGTH]; static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; static RTL_BITMAP fls_bitmap; -static LIST_ENTRY tls_links; static int nb_threads = 1; /*********************************************************************** @@ -261,7 +260,6 @@ HANDLE thread_init(void) InitializeListHead( &ldr.InLoadOrderModuleList ); InitializeListHead( &ldr.InMemoryOrderModuleList ); InitializeListHead( &ldr.InInitializationOrderModuleList ); - InitializeListHead( &tls_links ); #ifdef __APPLE__ peb->Reserved[0] = get_dyld_image_info_addr(); #endif @@ -376,11 +374,6 @@ void exit_thread( int status ) } LdrShutdownThread(); - RtlAcquirePebLock(); - RemoveEntryList( &NtCurrentTeb()->TlsLinks ); - RtlReleasePebLock(); - RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->FlsSlots ); - RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->TlsExpansionSlots ); pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); @@ -425,10 +418,6 @@ static void start_thread( struct startup_info *info ) server_init_thread( func ); pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); - RtlAcquirePebLock(); - InsertHeadList( &tls_links, &teb->TlsLinks ); - RtlReleasePebLock(); - MODULE_DllThreadAttach( NULL ); if (TRACE_ON(relay))

1 0

Alexandre Julliard : msvcp90: Avoid mismatched parentheses inside ifdefs.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: b6e5496da44a46971f45ec38eb979239a5bb58cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6e5496da44a46971f45ec38e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 20 20:35:05 2013 +0100 msvcp90: Avoid mismatched parentheses inside ifdefs. --- dlls/msvcp90/locale.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f2edf04..5fdf890 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9536,11 +9536,12 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_char__Do_widen_s) VTABLE_ADD_FUNC(ctype_char_do_narrow) VTABLE_ADD_FUNC(ctype_char_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_char__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_char__Do_narrow_s) #else VTABLE_ADD_FUNC(ctype_char_do_narrow) - VTABLE_ADD_FUNC(ctype_char_do_narrow_ch)); + VTABLE_ADD_FUNC(ctype_char_do_narrow_ch) #endif + ); __ASM_VTABLE(ctype_wchar, VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) @@ -9557,11 +9558,12 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s) VTABLE_ADD_FUNC(ctype_wchar_do_narrow) VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s) #else VTABLE_ADD_FUNC(ctype_wchar_do_narrow) - VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); + VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) #endif + ); __ASM_VTABLE(ctype_short, VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) @@ -9578,11 +9580,12 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s) VTABLE_ADD_FUNC(ctype_wchar_do_narrow) VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s) #else VTABLE_ADD_FUNC(ctype_wchar_do_narrow) - VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); + VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) #endif + ); __ASM_VTABLE(codecvt_base, VTABLE_ADD_FUNC(codecvt_base_vector_dtor) VTABLE_ADD_FUNC(codecvt_base_do_always_noconv)

1 0

Alexandre Julliard : msvcp90: Work around Mingw duplicate encode/ decode_pointer definition.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 6e47b1691b9d5b0d118d0f98a8c71f2487948725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e47b1691b9d5b0d118d0f98a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 21 12:43:03 2013 +0100 msvcp90: Work around Mingw duplicate encode/decode_pointer definition. --- dlls/msvcp90/msvcp_main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 496efa9..848d5bb 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -122,3 +122,8 @@ __int64 * __cdecl std_Fpz_func(void) { return &std_Fpz; } + +#if defined(__MINGW32__) && _MSVCP_VER >= 80 && _MSVCP_VER <= 90 +/* Hack: prevent Mingw from importing mingw_helpers.o which conflicts with encode/decode_pointer */ +int mingw_app_type = 0; +#endif

1 0

Alexandre Julliard : msvcp100: Implement _Locinfo::_Getname.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 91356c3bedccc379c6457a83a7895050f1ce5b1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=91356c3bedccc379c6457a83a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 21 17:57:46 2013 +0100 msvcp100: Implement _Locinfo::_Getname. --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp90/locale.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 92c99d7..12463af 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -908,8 +908,8 @@ @ cdecl -arch=win64 ?_Getlconv(a)_Locinfo@std@@QEBAPEBUlconv@@XZ(ptr) _Locinfo__Getlconv @ thiscall -arch=win32 ?_Getmonths(a)_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getmonths @ cdecl -arch=win64 ?_Getmonths(a)_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getmonths -@ stub -arch=win32 ?_Getname(a)_Locinfo@std@@QBEPBDXZ -@ stub -arch=win64 ?_Getname(a)_Locinfo@std@@QEBAPEBDXZ +@ thiscall -arch=win32 ?_Getname(a)_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getname +@ cdecl -arch=win64 ?_Getname(a)_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getname @ cdecl -arch=arm ?_Getpfirst(a)_Container_base12@std@@QBAPAPAU_Iterator_base12(a)2@XZ(ptr) _Container_base12__Getpfirst @ thiscall -arch=i386 ?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ(ptr) _Container_base12__Getpfirst @ cdecl -arch=win64 ?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ(ptr) _Container_base12__Getpfirst diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 3d9871c..d31f301 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1331,8 +1331,8 @@ @ thiscall -arch=i386 ?_Getmonths(a)_Locinfo@std@@QBEPBDXZ(ptr) msvcp90.?_Getmonths(a)_Locinfo@std@@QBEPBDXZ @ cdecl -arch=win64 ?_Getmonths(a)_Locinfo@std@@QEBAPEBDXZ(ptr) msvcp90.?_Getmonths(a)_Locinfo@std@@QEBAPEBDXZ @ stub -arch=arm ?_Getname(a)_Locinfo@std@@QBAPBDXZ -@ stub -arch=i386 ?_Getname(a)_Locinfo@std@@QBEPBDXZ -@ stub -arch=win64 ?_Getname(a)_Locinfo@std@@QEBAPEBDXZ +@ thiscall -arch=win32 ?_Getname(a)_Locinfo@std@@QBEPBDXZ(ptr) msvcp100.?_Getname(a)_Locinfo@std@@QBEPBDXZ +@ cdecl -arch=win64 ?_Getname(a)_Locinfo@std@@QEBAPEBDXZ(ptr) msvcp100.?_Getname(a)_Locinfo@std@@QEBAPEBDXZ @ cdecl -arch=arm ?_Getpfirst(a)_Container_base12@std@@QBAPAPAU_Iterator_base12(a)2@XZ(ptr) msvcp100.?_Getpfirst(a)_Container_base12@std@@QBAPAPAU_Iterator_base12(a)2@XZ @ thiscall -arch=i386 ?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ(ptr) msvcp100.?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ @ cdecl -arch=win64 ?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ(ptr) msvcp100.?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5fdf890..08cc893 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9454,6 +9454,16 @@ basic_string_char* __thiscall locale_name(const locale *this, basic_string_char return ret; } +#else + +/* ?_Getname(a)_Locinfo@std@@QBEPBDXZ */ +/* ?_Getname(a)_Locinfo@std@@QEBAPEBDXZ */ +DEFINE_THISCALL_WRAPPER(_Locinfo__Getname, 4) +const char * __thiscall _Locinfo__Getname( const _Locinfo *this ) +{ + return locale_string_char_c_str( &this->newlocname ); +} + #endif /* _MSVCP_VER < 100 */ /* wctrans */

1 0

Alexandre Julliard : winebuild: Fix path separator for Cygwin.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: c2d0907923ccbe1611f630fdefdf1f8a18840b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d0907923ccbe1611f630fde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 21 20:49:16 2013 +0100 winebuild: Fix path separator for Cygwin. --- tools/winebuild/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index f665e31..566911f 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -39,7 +39,7 @@ #include "build.h" -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__CYGWIN__) # define PATH_SEPARATOR ';' #else # define PATH_SEPARATOR ':'

1 0

Frédéric Delanoy : comcat/tests: Constify some character strings.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 4ef6d4a6add74d231ea3a9fe35fb96a5991cabeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef6d4a6add74d231ea3a9fe3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 21 14:32:20 2013 +0100 comcat/tests: Constify some character strings. --- dlls/comcat/tests/comcat.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c index f78e234..ff5b51a 100644 --- a/dlls/comcat/tests/comcat.c +++ b/dlls/comcat/tests/comcat.c @@ -65,15 +65,15 @@ static void do_enum(void) GUID the_cat[1]; GUID wanted_guid; ULONG fetched = -1; - - static WCHAR szCatID[] = { + + static const WCHAR szCatID[] = { '{', 'd','e','a','d','c','a','f','e', '-','0','0','0','0','-','0','0','0','0', '-','0','0','0','0', '-','0','0','0','0','0','0','0','0','0','0','0','0', '}',0}; - static WCHAR szGuid[] = { + static const WCHAR szGuid[] = { '{', 'd','e','a','d','c','a','f','e','-', 'b','e','e','d','-',

1 0

Frédéric Delanoy : crypt32/tests: Constify some character strings.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 90d1e9471bcada654b6c19393da749305675f62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d1e9471bcada654b6c19393… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 21 14:32:21 2013 +0100 crypt32/tests: Constify some character strings. --- dlls/crypt32/tests/cert.c | 2 +- dlls/crypt32/tests/encode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index a117332..bd67c18 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -351,7 +351,7 @@ static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID, dwSizeWithNull,size); } -static CHAR cspNameA[] = "WineCryptTemp"; +static const CHAR cspNameA[] = "WineCryptTemp"; static WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e','m','p',0 }; static const BYTE v1CertWithPubKey[] = { 0x30,0x81,0x95,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 61d5c72..ad38fd5 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -6911,7 +6911,7 @@ static void test_decodeCMSSignerInfo(DWORD dwEncoding) LPBYTE buf = NULL; DWORD size = 0; CMSG_CMS_SIGNER_INFO *info; - static char oid1[] = "1.2.3", oid2[] = "1.5.6"; + static const char oid1[] = "1.2.3", oid2[] = "1.5.6"; /* A CMS signer can't be decoded without a serial number. */ SetLastError(0xdeadbeef);

1 0