February 2014 - Wine-Commits

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

Feb. 17, 2014

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

Alexandre Julliard : ntdll: Move fixup_imports to avoid forward declarations.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

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: Don' t fixup imports when a dll is already loaded.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

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

Henri Verbeet : d3d10core: Implement d3d10_rasterizer_state_GetDevice().
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

Module: wine Branch: master Commit: 569a2e758aa1e96c3727bcb26c76143194588b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=569a2e758aa1e96c3727bcb26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 17 11:24:32 2014 +0100 d3d10core: Implement d3d10_rasterizer_state_GetDevice(). --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/state.c | 15 ++++++++++++--- dlls/d3d10core/tests/device.c | 14 ++++++++++++-- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 312ca7b..f08dc65 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -257,9 +257,9 @@ struct d3d10_rasterizer_state ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount; - struct d3d10_device *device; D3D10_RASTERIZER_DESC desc; struct wine_rb_entry entry; + ID3D10Device1 *device; }; HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d10_device *device, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 53a78ea..c816803 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -366,7 +366,9 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerSt if (!refcount) { - wine_rb_remove(&state->device->rasterizer_states, &state->desc); + struct d3d10_device *device = impl_from_ID3D10Device(state->device); + wine_rb_remove(&device->rasterizer_states, &state->desc); + ID3D10Device1_Release(state->device); HeapFree(GetProcessHeap(), 0, state); } @@ -377,7 +379,12 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerSt static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDevice(ID3D10RasterizerState *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)state->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10RasterizerState *iface, @@ -438,7 +445,6 @@ HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct { state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; - state->device = device; state->desc = *desc; if (wine_rb_put(&device->rasterizer_states, desc, &state->entry) == -1) @@ -447,6 +453,9 @@ HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct return E_FAIL; } + state->device = &device->ID3D10Device1_iface; + ID3D10Device1_AddRef(state->device); + return S_OK; } diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 61154a0..48fc3f6 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -784,9 +784,9 @@ static void test_create_depthstencil_state(void) static void test_create_rasterizer_state(void) { ID3D10RasterizerState *rast_state1, *rast_state2; + ULONG refcount, expected_refcount; D3D10_RASTERIZER_DESC rast_desc; - ID3D10Device *device; - ULONG refcount; + ID3D10Device *device, *tmp; HRESULT hr; if (!(device = create_device())) @@ -809,11 +809,21 @@ static void test_create_rasterizer_state(void) rast_desc.MultisampleEnable = FALSE; rast_desc.AntialiasedLineEnable = FALSE; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateRasterizerState(device, &rast_desc, &rast_state1); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); hr = ID3D10Device_CreateRasterizerState(device, &rast_desc, &rast_state2); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); ok(rast_state1 == rast_state2, "Got different rasterizer state objects.\n"); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10RasterizerState_GetDevice(rast_state1, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); refcount = ID3D10RasterizerState_Release(rast_state2); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);

1 0

Henri Verbeet : d3d10core: Implement d3d10_query_GetDevice().
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

Module: wine Branch: master Commit: f38b36ee33c693cfa3dec3d0ec70d0a6f14105f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38b36ee33c693cfa3dec3d0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 17 11:24:33 2014 +0100 d3d10core: Implement d3d10_query_GetDevice(). --- dlls/d3d10core/async.c | 12 ++++++++++-- dlls/d3d10core/d3d10core_private.h | 3 ++- dlls/d3d10core/device.c | 9 +++++---- dlls/d3d10core/tests/device.c | 14 ++++++++++++-- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c index d5de9a9..6d3442b 100644 --- a/dlls/d3d10core/async.c +++ b/dlls/d3d10core/async.c @@ -73,6 +73,7 @@ static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) if (!refcount) { + ID3D10Device1_Release(This->device); HeapFree(GetProcessHeap(), 0, This); } @@ -83,7 +84,12 @@ static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_query *query = impl_from_ID3D10Query(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)query->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, @@ -165,11 +171,13 @@ static const struct ID3D10QueryVtbl d3d10_query_vtbl = d3d10_query_GetDesc, }; -HRESULT d3d10_query_init(struct d3d10_query *query, BOOL predicate) +HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d10_device *device, BOOL predicate) { query->ID3D10Query_iface.lpVtbl = &d3d10_query_vtbl; query->refcount = 1; query->predicate = predicate; + query->device = &device->ID3D10Device1_iface; + ID3D10Device1_AddRef(query->device); return S_OK; } diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index f08dc65..9241312 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -289,9 +289,10 @@ struct d3d10_query LONG refcount; BOOL predicate; + ID3D10Device1 *device; }; -HRESULT d3d10_query_init(struct d3d10_query *query, BOOL predicate) DECLSPEC_HIDDEN; +HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d10_device *device, BOOL predicate) DECLSPEC_HIDDEN; /* IDirect3D10Device1 */ struct d3d10_device diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0bd9883..1aa5e8b 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1527,16 +1527,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device1 * static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface, const D3D10_QUERY_DESC *desc, ID3D10Query **query) { + struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_query *object; HRESULT hr; TRACE("iface %p, desc %p, query %p.\n", iface, desc, query); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_query_init(object, FALSE))) + if (FAILED(hr = d3d10_query_init(object, device, FALSE))) { WARN("Failed to initialize query, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -1552,6 +1552,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface, static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *iface, const D3D10_QUERY_DESC *desc, ID3D10Predicate **predicate) { + struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_query *object; HRESULT hr; @@ -1569,7 +1570,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *ifa if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_query_init(object, TRUE))) + if (FAILED(hr = d3d10_query_init(object, device, TRUE))) { WARN("Failed to initialize predicate, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 48fc3f6..8fb62a0 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -836,10 +836,10 @@ static void test_create_rasterizer_state(void) static void test_create_predicate(void) { + ULONG refcount, expected_refcount; D3D10_QUERY_DESC query_desc; ID3D10Predicate *predicate; - ID3D10Device *device; - ULONG refcount; + ID3D10Device *device, *tmp; HRESULT hr; if (!(device = create_device())) @@ -857,8 +857,18 @@ static void test_create_predicate(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); query_desc.Query = D3D10_QUERY_OCCLUSION_PREDICATE; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate); ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10Predicate_GetDevice(predicate, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); ID3D10Predicate_Release(predicate); query_desc.Query = D3D10_QUERY_SO_OVERFLOW_PREDICATE;

1 0

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

Feb. 17, 2014

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: Only allocate TLS data when resolving imports.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

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

Jacek Caban : wmp.idl: Added some missing interfaces.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

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

Matteo Bruni : d3dx9: Enforce minimum texture dimensions for block-based pixel formats.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

Module: wine Branch: master Commit: 190877422e644eb1eb7f43c2e817a7d163853175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=190877422e644eb1eb7f43c2e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 14 15:53:10 2014 +0100 d3dx9: Enforce minimum texture dimensions for block-based pixel formats. --- dlls/d3dx9_36/tests/texture.c | 11 +++ dlls/d3dx9_36/texture.c | 149 +++++++++++++++++++++-------------------- 2 files changed, 89 insertions(+), 71 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index afc7144..4a93ac6 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -340,6 +340,17 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(format == expected, "Returned format %u, expected %u\n", format, expected); + /* Block-based texture formats and size < block size. */ + format = D3DFMT_DXT1; + width = 2; height = 2; + mipmaps = 1; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 4, "Returned width %d, expected %d\n", width, 4); + ok(height == 4, "Returned height %d, expected %d\n", height, 4); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + ok(format == D3DFMT_DXT1, "Returned format %u, expected %u\n", format, D3DFMT_DXT1); + IDirect3D9_Release(d3d); } diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index f96536a..be86347 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -195,6 +195,7 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN D3DDISPLAYMODE mode; HRESULT hr; D3DFORMAT usedformat = D3DFMT_UNKNOWN; + const struct pixel_format_desc *fmt; TRACE("(%p, %p, %p, %p, %u, %p, %u)\n", device, width, height, miplevels, usage, format, pool); @@ -211,73 +212,6 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN if ((pool != D3DPOOL_DEFAULT) && (pool != D3DPOOL_MANAGED) && (pool != D3DPOOL_SYSTEMMEM) && (pool != D3DPOOL_SCRATCH)) return D3DERR_INVALIDCALL; - /* width and height */ - if (FAILED(IDirect3DDevice9_GetDeviceCaps(device, &caps))) - return D3DERR_INVALIDCALL; - - /* 256 x 256 default width/height */ - if ((w == D3DX_DEFAULT) && (h == D3DX_DEFAULT)) - w = h = 256; - else if (w == D3DX_DEFAULT) - w = (height ? h : 256); - else if (h == D3DX_DEFAULT) - h = (width ? w : 256); - - /* ensure width/height is power of 2 */ - if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(w))) - w = make_pow2(w); - - if (w > caps.MaxTextureWidth) - w = caps.MaxTextureWidth; - - if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(h))) - h = make_pow2(h); - - if (h > caps.MaxTextureHeight) - h = caps.MaxTextureHeight; - - /* texture must be square? */ - if (caps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY) - { - if (w > h) - h = w; - else - w = h; - } - - if (width) - *width = w; - - if (height) - *height = h; - - /* miplevels */ - if (miplevels && (usage & D3DUSAGE_AUTOGENMIPMAP)) - { - if (*miplevels > 1) - *miplevels = 0; - } - else if (miplevels) - { - UINT max_mipmaps = 1; - - if (!width && !height) - max_mipmaps = 9; /* number of mipmaps in a 256x256 texture */ - else - { - UINT max_dimen = max(w, h); - - while (max_dimen > 1) - { - max_dimen >>= 1; - max_mipmaps++; - } - } - - if (*miplevels == 0 || *miplevels > max_mipmaps) - *miplevels = max_mipmaps; - } - /* format */ if (format) { @@ -303,17 +237,18 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN if ((usedformat == D3DFMT_UNKNOWN) || (usedformat == D3DX_DEFAULT)) usedformat = D3DFMT_A8R8G8B8; + fmt = get_format_info(usedformat); + hr = IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, mode.Format, usage, D3DRTYPE_TEXTURE, usedformat); - if (FAILED(hr)) { - /* Heuristic to choose the fallback format */ - const struct pixel_format_desc *fmt = get_format_info(usedformat); BOOL allow_24bits; int bestscore = INT_MIN, i = 0, j; unsigned int channels; - const struct pixel_format_desc *curfmt; + const struct pixel_format_desc *curfmt, *bestfmt = NULL; + + TRACE("Requested format not supported, looking for a fallback.\n"); if (!fmt) { @@ -358,11 +293,83 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN { bestscore = score; usedformat = curfmt->format; + bestfmt = curfmt; } } + fmt = bestfmt; hr = D3D_OK; } + if (FAILED(IDirect3DDevice9_GetDeviceCaps(device, &caps))) + return D3DERR_INVALIDCALL; + + if ((w == D3DX_DEFAULT) && (h == D3DX_DEFAULT)) + w = h = 256; + else if (w == D3DX_DEFAULT) + w = (height ? h : 256); + else if (h == D3DX_DEFAULT) + h = (width ? w : 256); + + if (fmt->block_width != 1 || fmt->block_height != 1) + { + if (w < fmt->block_width) + w = fmt->block_width; + if (h < fmt->block_height) + h = fmt->block_height; + } + + if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(w))) + w = make_pow2(w); + + if (w > caps.MaxTextureWidth) + w = caps.MaxTextureWidth; + + if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(h))) + h = make_pow2(h); + + if (h > caps.MaxTextureHeight) + h = caps.MaxTextureHeight; + + if (caps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY) + { + if (w > h) + h = w; + else + w = h; + } + + if (width) + *width = w; + + if (height) + *height = h; + + if (miplevels && (usage & D3DUSAGE_AUTOGENMIPMAP)) + { + if (*miplevels > 1) + *miplevels = 0; + } + else if (miplevels) + { + UINT max_mipmaps = 1; + + if (!width && !height) + max_mipmaps = 9; /* number of mipmaps in a 256x256 texture */ + else + { + UINT max_dimen = max(w, h); + + while (max_dimen > 1) + { + max_dimen >>= 1; + max_mipmaps++; + } + } + + if (*miplevels == 0 || *miplevels > max_mipmaps) + *miplevels = max_mipmaps; + } + cleanup: if (d3d)

1 0

Matteo Bruni : d3dx9: Handle pixel formats larger than 32 bits in surface loading / filtering functions.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

Module: wine Branch: master Commit: 950c40b1170598d0c7fd6b7545a7e8308e158a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=950c40b1170598d0c7fd6b754… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 14 17:36:38 2014 +0100 d3dx9: Handle pixel formats larger than 32 bits in surface loading / filtering functions. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/math.c | 2 +- dlls/d3dx9_36/surface.c | 196 +++++++++++++++++++------------------- 3 files changed, 101 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=950c40b1170598d0c7fd6…

1 0