February 2014 - Wine-commits

Henri Verbeet : advapi32: Add a stub for EventProviderEnabled.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: e8f28511aca788e7af61fb83ef5492ce0061e333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f28511aca788e7af61fb83e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 17 11:24:34 2014 +0100 advapi32: Add a stub for EventProviderEnabled. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 10 ++++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-eventing-provider-l1-1-0.spec | 2 +- include/evntprov.h | 1 + 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index da3a42b..46f37fa 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -271,7 +271,7 @@ # @ stub EventAccessRemove # @ stub EventActivityIdControl @ stdcall EventEnabled(int64 ptr) -# @ stub EventProviderEnabled +@ stdcall EventProviderEnabled(int64 long int64) @ stdcall EventRegister(ptr ptr ptr ptr) @ stdcall EventUnregister(int64) @ stdcall EventWrite(int64 ptr long ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 528d81d..a239960 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -872,6 +872,16 @@ BOOLEAN WINAPI EventEnabled( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor ) } /****************************************************************************** + * EventProviderEnabled [ADVAPI32.@] + * + */ +BOOLEAN WINAPI EventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG keyword ) +{ + FIXME("%s, %u, %s: stub\n", wine_dbgstr_longlong(handle), level, wine_dbgstr_longlong(keyword)); + return FALSE; +} + +/****************************************************************************** * EventWrite [ADVAPI32.@] */ ULONG WINAPI EventWrite( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, ULONG count, diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index e7744a7..fd37c8c 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -40,7 +40,7 @@ @ stdcall EqualSid(ptr ptr) advapi32.EqualSid @ stub EventActivityIdControl @ stdcall EventEnabled(int64 ptr) advapi32.EventEnabled -@ stub EventProviderEnabled +@ stdcall EventProviderEnabled(int64 long int64) advapi32.EventProviderEnabled @ stdcall EventRegister(ptr ptr ptr ptr) advapi32.EventRegister @ stdcall EventUnregister(int64) advapi32.EventUnregister @ stdcall EventWrite(int64 ptr long ptr) advapi32.EventWrite diff --git a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec index af6eb12..901f74c 100644 --- a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec +++ b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec @@ -1,6 +1,6 @@ @ stub EventActivityIdControl @ stdcall EventEnabled(int64 ptr) advapi32.EventEnabled -@ stub EventProviderEnabled +@ stdcall EventProviderEnabled(int64 long int64) advapi32.EventProviderEnabled @ stdcall EventRegister(ptr ptr ptr ptr) advapi32.EventRegister @ stub EventSetInformation @ stdcall EventUnregister(int64) advapi32.EventUnregister diff --git a/include/evntprov.h b/include/evntprov.h index f242394..6a3e2f3 100644 --- a/include/evntprov.h +++ b/include/evntprov.h @@ -60,6 +60,7 @@ typedef struct _EVENT_FILTER_DESCRIPTOR typedef VOID (NTAPI *PENABLECALLBACK)(LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,PEVENT_FILTER_DESCRIPTOR,PVOID); BOOLEAN WINAPI EventEnabled(REGHANDLE, PCEVENT_DESCRIPTOR); +BOOLEAN WINAPI EventProviderEnabled(REGHANDLE, UCHAR, ULONGLONG); ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); ULONG WINAPI EventUnregister(REGHANDLE); ULONG WINAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR);

1 0

Alexandre Julliard : kernel32/tests: Add some tests for dll import resolution.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: a4c8943c7015fc82b6b083f70fd952e09d88d416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c8943c7015fc82b6b083f70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 16:15:06 2014 +0100 kernel32/tests: Add some tests for dll import resolution. --- dlls/kernel32/tests/loader.c | 114 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 5173e91..9a56794 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION #include <stdarg.h> #include <stdio.h> #include <assert.h> @@ -1207,6 +1208,116 @@ nt4_is_broken: } } +static void test_import_resolution(void) +{ + char temp_path[MAX_PATH]; + char dll_name[MAX_PATH]; + DWORD dummy; + void *expect; + HANDLE hfile; + HMODULE mod, mod2; + struct imports + { + IMAGE_IMPORT_DESCRIPTOR descr[2]; + IMAGE_THUNK_DATA original_thunks[2]; + IMAGE_THUNK_DATA thunks[2]; + char module[16]; + struct { WORD hint; char name[32]; } function; + } data, *ptr; + IMAGE_NT_HEADERS nt; + IMAGE_SECTION_HEADER section; + int test; + + for (test = 0; test < 3; test++) + { +#define DATA_RVA(ptr) (page_size + ((char *)(ptr) - (char *)&data)) + nt = nt_header; + nt.FileHeader.NumberOfSections = 1; + nt.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + nt.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_32BIT_MACHINE | IMAGE_FILE_RELOCS_STRIPPED; + if (test != 2) nt.FileHeader.Characteristics |= IMAGE_FILE_DLL; + nt.OptionalHeader.ImageBase = 0x12340000; + nt.OptionalHeader.SizeOfImage = 2 * page_size; + nt.OptionalHeader.SizeOfHeaders = nt.OptionalHeader.FileAlignment; + nt.OptionalHeader.NumberOfRvaAndSizes = IMAGE_NUMBEROF_DIRECTORY_ENTRIES; + memset( nt.OptionalHeader.DataDirectory, 0, sizeof(nt.OptionalHeader.DataDirectory) ); + nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].Size = sizeof(data.descr); + nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress = DATA_RVA(data.descr); + + memset( &data, 0, sizeof(data) ); + data.descr[0].u.OriginalFirstThunk = DATA_RVA( data.original_thunks ); + data.descr[0].FirstThunk = DATA_RVA( data.thunks ); + data.descr[0].Name = DATA_RVA( data.module ); + strcpy( data.module, "kernel32.dll" ); + strcpy( data.function.name, "CreateEventA" ); + data.original_thunks[0].u1.AddressOfData = DATA_RVA( &data.function ); + data.thunks[0].u1.AddressOfData = 0xdeadbeef; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "ldr", 0, dll_name); + + hfile = CreateFileA(dll_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, 0); + ok( hfile != INVALID_HANDLE_VALUE, "creation failed\n" ); + + memset( &section, 0, sizeof(section) ); + memcpy( section.Name, ".text", sizeof(".text") ); + section.PointerToRawData = nt.OptionalHeader.FileAlignment; + section.VirtualAddress = nt.OptionalHeader.SectionAlignment; + section.Misc.VirtualSize = sizeof(data); + section.SizeOfRawData = sizeof(data); + section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE; + + WriteFile(hfile, &dos_header, sizeof(dos_header), &dummy, NULL); + WriteFile(hfile, &nt, sizeof(nt), &dummy, NULL); + WriteFile(hfile, &section, sizeof(section), &dummy, NULL); + + SetFilePointer( hfile, section.PointerToRawData, NULL, SEEK_SET ); + WriteFile(hfile, &data, sizeof(data), &dummy, NULL); + + CloseHandle( hfile ); + + switch (test) + { + case 0: /* normal load */ + mod = LoadLibraryA( dll_name ); + ok( mod != NULL, "failed to load err %u\n", GetLastError() ); + if (!mod) break; + ptr = (struct imports *)((char *)mod + page_size); + expect = GetProcAddress( GetModuleHandleA( data.module ), data.function.name ); + ok( (void *)ptr->thunks[0].u1.Function == expect, "thunk %p instead of %p for %s.%s\n", + (void *)ptr->thunks[0].u1.Function, expect, data.module, data.function.name ); + FreeLibrary( mod ); + break; + case 1: /* load with DONT_RESOLVE_DLL_REFERENCES doesn't resolve imports */ + mod = LoadLibraryExA( dll_name, 0, DONT_RESOLVE_DLL_REFERENCES ); + ok( mod != NULL, "failed to load err %u\n", GetLastError() ); + if (!mod) break; + ptr = (struct imports *)((char *)mod + page_size); + ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n", + (void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); + mod2 = LoadLibraryA( dll_name ); + ok( mod2 == mod, "loaded twice %p / %p\n", mod, mod2 ); + todo_wine + ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n", + (void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); + FreeLibrary( mod ); + break; + case 2: /* load without IMAGE_FILE_DLL doesn't resolve imports */ + mod = LoadLibraryA( dll_name ); + ok( mod != NULL, "failed to load err %u\n", GetLastError() ); + if (!mod) break; + ptr = (struct imports *)((char *)mod + page_size); + todo_wine + ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n", + (void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); + FreeLibrary( mod ); + break; + } + DeleteFileA( dll_name ); +#undef DATA_RVA + } +} + #define MAX_COUNT 10 static HANDLE attached_thread[MAX_COUNT]; static DWORD attached_thread_count; @@ -2444,7 +2555,7 @@ static void test_ResolveDelayLoadedAPI(void) nt_header.OptionalHeader.FileAlignment = 0x1000; nt_header.OptionalHeader.SizeOfImage = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + 0x2200; nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + 2 * sizeof(IMAGE_SECTION_HEADER); - nt_header.OptionalHeader.NumberOfRvaAndSizes = 15; + nt_header.OptionalHeader.NumberOfRvaAndSizes = IMAGE_NUMBEROF_DIRECTORY_ENTRIES; nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress = 0x1000; nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size = 0x100; @@ -2668,5 +2779,6 @@ START_TEST(loader) test_ResolveDelayLoadedAPI(); test_ImportDescriptors(); test_section_access(); + test_import_resolution(); test_ExitProcess(); }

1 0

Alexandre Julliard : ntdll: Don' t fixup imports when a dll is already loaded.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 7307298ac3a6fbd205841d34cceea4bbf88d7e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7307298ac3a6fbd205841d34c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 16:25:13 2014 +0100 ntdll: Don't fixup imports when a dll is already loaded. --- dlls/kernel32/tests/loader.c | 1 - dlls/ntdll/loader.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 9a56794..55c63ad 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1297,7 +1297,6 @@ static void test_import_resolution(void) (void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); mod2 = LoadLibraryA( dll_name ); ok( mod2 == mod, "loaded twice %p / %p\n", mod, mod2 ); - todo_wine ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n", (void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); FreeLibrary( mod ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e25ba1f..fedade5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2018,8 +2018,6 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ { if ((*pwm)->ldr.LoadCount != -1) (*pwm)->ldr.LoadCount++; - if (!(flags & DONT_RESOLVE_DLL_REFERENCES)) fixup_imports( *pwm, load_path ); - TRACE("Found %s for %s at %p, count=%d\n", debugstr_w((*pwm)->ldr.FullDllName.Buffer), debugstr_w(libname), (*pwm)->ldr.BaseAddress, (*pwm)->ldr.LoadCount);

1 0

Alexandre Julliard : ntdll: Don't fixup imports for executables.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 0f0bf5866311e6aab081232cc85a64449086ec5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0bf5866311e6aab081232cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 16:25:43 2014 +0100 ntdll: Don't fixup imports for executables. --- dlls/kernel32/tests/loader.c | 1 - dlls/ntdll/loader.c | 16 +++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 55c63ad..cd64a34 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1306,7 +1306,6 @@ static void test_import_resolution(void) ok( mod != NULL, "failed to load err %u\n", GetLastError() ); if (!mod) break; ptr = (struct imports *)((char *)mod + page_size); - todo_wine ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n", (void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); FreeLibrary( mod ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index fedade5..7f36ddd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1509,12 +1509,8 @@ static void load_builtin_callback( void *module, const char *filename ) } wm->ldr.Flags |= LDR_WINE_INTERNAL; - if (!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL) && - !NtCurrentTeb()->Peb->ImageBaseAddress) /* if we already have an executable, ignore this one */ - { - NtCurrentTeb()->Peb->ImageBaseAddress = module; - } - else + if ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || + nt->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_NATIVE) { /* fixup imports */ @@ -1591,7 +1587,11 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, /* fixup imports */ - if (!(flags & DONT_RESOLVE_DLL_REFERENCES)) + nt = RtlImageNtHeader( module ); + + if (!(flags & DONT_RESOLVE_DLL_REFERENCES) && + ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || + nt->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_NATIVE)) { if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) { @@ -1612,8 +1612,6 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, /* send DLL load event */ - nt = RtlImageNtHeader( module ); - SERVER_START_REQ( load_dll ) { req->mapping = wine_server_obj_handle( mapping );

1 0

Alexandre Julliard : ntdll: Move fixup_imports to avoid forward declarations.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: f5fc925f0e97bd80b244c0efe453b329c7dd7d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5fc925f0e97bd80b244c0efe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 17:32:37 2014 +0100 ntdll: Move fixup_imports to avoid forward declarations. --- dlls/ntdll/loader.c | 102 +++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7f36ddd..8414ec5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -705,57 +705,6 @@ static NTSTATUS create_module_activation_context( LDR_MODULE *module ) } -/**************************************************************** - * fixup_imports - * - * Fixup all imports of a given module. - * The loader_section must be locked while calling this function. - */ -static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) -{ - int i, nb_imports; - const IMAGE_IMPORT_DESCRIPTOR *imports; - WINE_MODREF *prev; - DWORD size; - NTSTATUS status; - ULONG_PTR cookie; - - if (!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) return STATUS_SUCCESS; /* already done */ - wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; - - if (!(imports = RtlImageDirectoryEntryToData( wm->ldr.BaseAddress, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) - return STATUS_SUCCESS; - - nb_imports = 0; - while (imports[nb_imports].Name && imports[nb_imports].FirstThunk) nb_imports++; - - if (!nb_imports) return STATUS_SUCCESS; /* no imports */ - - if (!create_module_activation_context( &wm->ldr )) - RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); - - /* Allocate module dependency list */ - wm->nDeps = nb_imports; - wm->deps = RtlAllocateHeap( GetProcessHeap(), 0, nb_imports*sizeof(WINE_MODREF *) ); - - /* load the imported modules. They are automatically - * added to the modref list of the process. - */ - prev = current_modref; - current_modref = wm; - status = STATUS_SUCCESS; - for (i = 0; i < nb_imports; i++) - { - if (!(wm->deps[i] = import_dll( wm->ldr.BaseAddress, &imports[i], load_path ))) - status = STATUS_DLL_NOT_FOUND; - } - current_modref = prev; - if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); - return status; -} - - /************************************************************************* * is_dll_native_subsystem * @@ -885,6 +834,57 @@ static void free_tls_slot( LDR_MODULE *mod ) } +/**************************************************************** + * fixup_imports + * + * Fixup all imports of a given module. + * The loader_section must be locked while calling this function. + */ +static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) +{ + int i, nb_imports; + const IMAGE_IMPORT_DESCRIPTOR *imports; + WINE_MODREF *prev; + DWORD size; + NTSTATUS status; + ULONG_PTR cookie; + + if (!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) return STATUS_SUCCESS; /* already done */ + wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; + + if (!(imports = RtlImageDirectoryEntryToData( wm->ldr.BaseAddress, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) + return STATUS_SUCCESS; + + nb_imports = 0; + while (imports[nb_imports].Name && imports[nb_imports].FirstThunk) nb_imports++; + + if (!nb_imports) return STATUS_SUCCESS; /* no imports */ + + if (!create_module_activation_context( &wm->ldr )) + RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); + + /* Allocate module dependency list */ + wm->nDeps = nb_imports; + wm->deps = RtlAllocateHeap( GetProcessHeap(), 0, nb_imports*sizeof(WINE_MODREF *) ); + + /* load the imported modules. They are automatically + * added to the modref list of the process. + */ + prev = current_modref; + current_modref = wm; + status = STATUS_SUCCESS; + for (i = 0; i < nb_imports; i++) + { + if (!(wm->deps[i] = import_dll( wm->ldr.BaseAddress, &imports[i], load_path ))) + status = STATUS_DLL_NOT_FOUND; + } + current_modref = prev; + if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); + return status; +} + + /************************************************************************* * alloc_module *

1 0

Alexandre Julliard : ntdll: Only allocate TLS data when resolving imports.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: ff08cd597d1d8b4e806d7ace9f3667ac6022b852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff08cd597d1d8b4e806d7ace9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 17 17:33:30 2014 +0100 ntdll: Only allocate TLS data when resolving imports. --- dlls/kernel32/tests/loader.c | 23 +++++++++++++++++++++++ dlls/ntdll/loader.c | 5 +++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index cd64a34..e749238 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1214,6 +1214,7 @@ static void test_import_resolution(void) char dll_name[MAX_PATH]; DWORD dummy; void *expect; + char *str; HANDLE hfile; HMODULE mod, mod2; struct imports @@ -1223,6 +1224,9 @@ static void test_import_resolution(void) IMAGE_THUNK_DATA thunks[2]; char module[16]; struct { WORD hint; char name[32]; } function; + IMAGE_TLS_DIRECTORY tls; + char tls_data[16]; + SHORT tls_index; } data, *ptr; IMAGE_NT_HEADERS nt; IMAGE_SECTION_HEADER section; @@ -1243,6 +1247,8 @@ static void test_import_resolution(void) memset( nt.OptionalHeader.DataDirectory, 0, sizeof(nt.OptionalHeader.DataDirectory) ); nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].Size = sizeof(data.descr); nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress = DATA_RVA(data.descr); + nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_TLS].Size = sizeof(data.tls); + nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_TLS].VirtualAddress = DATA_RVA(&data.tls); memset( &data, 0, sizeof(data) ); data.descr[0].u.OriginalFirstThunk = DATA_RVA( data.original_thunks ); @@ -1253,6 +1259,12 @@ static void test_import_resolution(void) data.original_thunks[0].u1.AddressOfData = DATA_RVA( &data.function ); data.thunks[0].u1.AddressOfData = 0xdeadbeef; + data.tls.StartAddressOfRawData = nt.OptionalHeader.ImageBase + DATA_RVA( data.tls_data ); + data.tls.EndAddressOfRawData = data.tls.StartAddressOfRawData + sizeof(data.tls_data); + data.tls.AddressOfIndex = nt.OptionalHeader.ImageBase + DATA_RVA( &data.tls_index ); + strcpy( data.tls_data, "hello world" ); + data.tls_index = 9999; + GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "ldr", 0, dll_name); @@ -1286,6 +1298,13 @@ static void test_import_resolution(void) expect = GetProcAddress( GetModuleHandleA( data.module ), data.function.name ); ok( (void *)ptr->thunks[0].u1.Function == expect, "thunk %p instead of %p for %s.%s\n", (void *)ptr->thunks[0].u1.Function, expect, data.module, data.function.name ); + ok( ptr->tls_index < 32 || broken(ptr->tls_index == 9999), /* before vista */ + "wrong tls index %d\n", ptr->tls_index ); + if (ptr->tls_index != 9999) + { + str = ((char **)NtCurrentTeb()->ThreadLocalStoragePointer)[ptr->tls_index]; + ok( !strcmp( str, "hello world" ), "wrong tls data '%s' at %p\n", str, str ); + } FreeLibrary( mod ); break; case 1: /* load with DONT_RESOLVE_DLL_REFERENCES doesn't resolve imports */ @@ -1295,10 +1314,13 @@ static void test_import_resolution(void) ptr = (struct imports *)((char *)mod + page_size); ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n", (void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); + ok( ptr->tls_index == 9999, "wrong tls index %d\n", ptr->tls_index ); + mod2 = LoadLibraryA( dll_name ); ok( mod2 == mod, "loaded twice %p / %p\n", mod, mod2 ); ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n", (void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); + ok( ptr->tls_index == 9999, "wrong tls index %d\n", ptr->tls_index ); FreeLibrary( mod ); break; case 2: /* load without IMAGE_FILE_DLL doesn't resolve imports */ @@ -1308,6 +1330,7 @@ static void test_import_resolution(void) ptr = (struct imports *)((char *)mod + page_size); ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n", (void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); + ok( ptr->tls_index == 9999, "wrong tls index %d\n", ptr->tls_index ); FreeLibrary( mod ); break; } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8414ec5..a8d675a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -852,6 +852,8 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) if (!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) return STATUS_SUCCESS; /* already done */ wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; + wm->ldr.TlsIndex = alloc_tls_slot( &wm->ldr ); + if (!(imports = RtlImageDirectoryEntryToData( wm->ldr.BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) return STATUS_SUCCESS; @@ -907,6 +909,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) wm->ldr.EntryPoint = NULL; wm->ldr.SizeOfImage = nt->OptionalHeader.SizeOfImage; wm->ldr.Flags = LDR_DONT_RESOLVE_REFS; + wm->ldr.TlsIndex = -1; wm->ldr.LoadCount = 1; wm->ldr.SectionHandle = NULL; wm->ldr.CheckSum = 0; @@ -944,8 +947,6 @@ 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;

1 0

Francois Gouget : atl100/tests: Skip the test_regcat() tests if we don' t have elevated privileges.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 9eaf355130df56d2d47948c64b87bc6e2f637650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eaf355130df56d2d47948c64… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 17 17:13:02 2014 +0100 atl100/tests: Skip the test_regcat() tests if we don't have elevated privileges. --- dlls/atl100/tests/atl.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 383dbe4..96abf57 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -43,6 +43,32 @@ static const GUID CATID_CatTest2 = {0x178fc163,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x46}}; #define CATID_CATTEST2_STR "178fc163-0000-0000-0000-000000000246" +static BOOL is_process_limited(void) +{ + static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; + HANDLE token; + + if (!pOpenProcessToken) + { + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + pOpenProcessToken = (void*)GetProcAddress(hadvapi32, "OpenProcessToken"); + if (!pOpenProcessToken) + return FALSE; + } + + if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) + { + BOOL ret; + TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; + DWORD size; + + ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + CloseHandle(token); + return (ret && type == TokenElevationTypeLimited); + } + return FALSE; +} + static void test_winmodule(void) { _AtlCreateWndData create_data[3]; @@ -148,6 +174,12 @@ static void test_regcat(void) {_ATL_CATMAP_ENTRY_END} }; + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + hres = AtlRegisterClassCategoriesHelper(&CLSID_Test, catmap, TRUE); ok(hres == S_OK, "AtlRegisterClassCategoriesHelper failed: %08x\n", hres);

1 0

Jacek Caban : wmp.idl: Added some missing interfaces.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 0473a790fec925d59cdeb3664bdc332a02bbf14e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0473a790fec925d59cdeb3664… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 17 17:36:28 2014 +0100 wmp.idl: Added some missing interfaces. --- include/wmp.idl | 921 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 920 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0473a790fec925d59cdeb…

1 0

Jacek Caban : jscript: Skip tests if we can't register ActiveX object.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: cd22e8c223bc3cd55ff86aa4da03c3d8b6fb3e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd22e8c223bc3cd55ff86aa4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 17 18:55:55 2014 +0100 jscript: Skip tests if we can't register ActiveX object. --- dlls/jscript/tests/activex.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index 1153409..636dd81 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -1143,11 +1143,12 @@ START_TEST(activex) CoInitialize(NULL); if(check_jscript()) { - register_activex(); - - test_ActiveXObject(); - - init_registry(FALSE); + if(register_activex()) { + test_ActiveXObject(); + init_registry(FALSE); + }else { + skip("Could not register ActiveX object\n"); + } }else { win_skip("Broken engine, probably too old\n"); }

1 0

Matteo Bruni : d3dx9: Add some TRACEs and FIXMEs to D3DXCreateTextureFromFileInMemoryEx.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: dda9da793f709622a3c72fe704f811c16aeb7041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda9da793f709622a3c72fe70… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 14 15:53:09 2014 +0100 d3dx9: Add some TRACEs and FIXMEs to D3DXCreateTextureFromFileInMemoryEx. --- dlls/d3dx9_36/texture.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 8e62059..f96536a 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -534,9 +534,9 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi return D3DERR_INVALIDCALL; hr = D3DXGetImageInfoFromFileInMemory(srcdata, srcdatasize, &imginfo); - if (FAILED(hr)) { + FIXME("Unrecognized file format, returning failure.\n"); *texture = NULL; return hr; } @@ -583,9 +583,9 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi /* fix texture creation parameters */ hr = D3DXCheckTextureRequirements(device, &width, &height, &miplevels, usage, &format, pool); - if (FAILED(hr)) { + FIXME("Couldn't find suitable texture parameters.\n"); *texture = NULL; return hr; } @@ -622,11 +622,12 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi if (FAILED(hr)) { + FIXME("Texture creation failed.\n"); *texture = NULL; return hr; } - /* Load the file */ + TRACE("Texture created correctly. Now loading the texture data into it.\n"); if (imginfo.ImageFileFormat != D3DXIFF_DDS) { IDirect3DTexture9_GetSurfaceLevel(*texptr, 0, &surface); @@ -640,6 +641,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi if (FAILED(hr)) { + FIXME("Texture loading failed.\n"); IDirect3DTexture9_Release(*texptr); *texture = NULL; return hr; @@ -647,9 +649,9 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi loaded_miplevels = min(IDirect3DTexture9_GetLevelCount(*texptr), imginfo.MipLevels); hr = D3DXFilterTexture((IDirect3DBaseTexture9*) *texptr, palette, loaded_miplevels - 1, mipfilter); - if (FAILED(hr)) { + FIXME("Texture filtering failed.\n"); IDirect3DTexture9_Release(*texptr); *texture = NULL; return hr;

1 0