wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

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

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

Henri Verbeet : d3d10core: Implement d3d10_query_GetDevice().
by Alexandre Julliard 17 Feb '14

17 Feb '14

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

Henri Verbeet : d3d10core: Implement d3d10_rasterizer_state_GetDevice().
by Alexandre Julliard 17 Feb '14

17 Feb '14

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_depthstencil_state_GetDevice().
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: c7fb7ba53975d1ec2fc9df736328a9fdb8c0714f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7fb7ba53975d1ec2fc9df736… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 17 11:24:31 2014 +0100 d3d10core: Implement d3d10_depthstencil_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 3cf3293..312ca7b 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -241,9 +241,9 @@ struct d3d10_depthstencil_state ID3D10DepthStencilState ID3D10DepthStencilState_iface; LONG refcount; - struct d3d10_device *device; D3D10_DEPTH_STENCIL_DESC desc; struct wine_rb_entry entry; + ID3D10Device1 *device; }; HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, struct d3d10_device *device, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 376bf0b..53a78ea 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -218,7 +218,9 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_Release(ID3D10DepthStenc if (!refcount) { - wine_rb_remove(&state->device->depthstencil_states, &state->desc); + struct d3d10_device *device = impl_from_ID3D10Device(state->device); + wine_rb_remove(&device->depthstencil_states, &state->desc); + ID3D10Device1_Release(state->device); HeapFree(GetProcessHeap(), 0, state); } @@ -229,7 +231,12 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_Release(ID3D10DepthStenc static void STDMETHODCALLTYPE d3d10_depthstencil_state_GetDevice(ID3D10DepthStencilState *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)state->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_GetPrivateData(ID3D10DepthStencilState *iface, @@ -290,7 +297,6 @@ HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, st { state->ID3D10DepthStencilState_iface.lpVtbl = &d3d10_depthstencil_state_vtbl; state->refcount = 1; - state->device = device; state->desc = *desc; if (wine_rb_put(&device->depthstencil_states, desc, &state->entry) == -1) @@ -299,6 +305,9 @@ HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state, st 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 d23c24d..61154a0 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -727,9 +727,9 @@ static void test_create_blend_state(void) static void test_create_depthstencil_state(void) { ID3D10DepthStencilState *ds_state1, *ds_state2; + ULONG refcount, expected_refcount; D3D10_DEPTH_STENCIL_DESC ds_desc; - ID3D10Device *device; - ULONG refcount; + ID3D10Device *device, *tmp; HRESULT hr; if (!(device = create_device())) @@ -756,11 +756,21 @@ static void test_create_depthstencil_state(void) ds_desc.BackFace.StencilPassOp = D3D10_STENCIL_OP_KEEP; ds_desc.BackFace.StencilFunc = D3D10_COMPARISON_ALWAYS; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateDepthStencilState(device, &ds_desc, &ds_state1); ok(SUCCEEDED(hr), "Failed to create depthstencil state, hr %#x.\n", hr); hr = ID3D10Device_CreateDepthStencilState(device, &ds_desc, &ds_state2); ok(SUCCEEDED(hr), "Failed to create depthstencil state, hr %#x.\n", hr); ok(ds_state1 == ds_state2, "Got different depthstencil 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; + ID3D10DepthStencilState_GetDevice(ds_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 = ID3D10DepthStencilState_Release(ds_state2); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);

1 0

Henri Verbeet : d3d10core: Implement d3d10_blend_state_GetDevice().
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: dbc4bcd69d7ecd97b0da60c9f8d8b2b321e2577b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbc4bcd69d7ecd97b0da60c9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 17 11:24:30 2014 +0100 d3d10core: Implement d3d10_blend_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 4f5abad..3cf3293 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -226,9 +226,9 @@ struct d3d10_blend_state ID3D10BlendState ID3D10BlendState_iface; LONG refcount; - struct d3d10_device *device; D3D10_BLEND_DESC desc; struct wine_rb_entry entry; + ID3D10Device1 *device; }; HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d10_device *device, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 3e4e8ef..376bf0b 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -70,7 +70,9 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface if (!refcount) { - wine_rb_remove(&state->device->blend_states, &state->desc); + struct d3d10_device *device = impl_from_ID3D10Device(state->device); + wine_rb_remove(&device->blend_states, &state->desc); + ID3D10Device1_Release(state->device); HeapFree(GetProcessHeap(), 0, state); } @@ -81,7 +83,12 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)state->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState *iface, @@ -142,7 +149,6 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d10_dev { state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; - state->device = device; state->desc = *desc; if (wine_rb_put(&device->blend_states, desc, &state->entry) == -1) @@ -151,6 +157,9 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d10_dev 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 d0ad0c4..d23c24d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -661,9 +661,9 @@ static void test_create_sampler_state(void) static void test_create_blend_state(void) { ID3D10BlendState *blend_state1, *blend_state2; + ULONG refcount, expected_refcount; D3D10_BLEND_DESC blend_desc; - ID3D10Device *device; - ULONG refcount; + ID3D10Device *device, *tmp; HRESULT hr; if (!(device = create_device())) @@ -699,11 +699,21 @@ static void test_create_blend_state(void) blend_desc.RenderTargetWriteMask[6] = D3D10_COLOR_WRITE_ENABLE_ALL; blend_desc.RenderTargetWriteMask[7] = D3D10_COLOR_WRITE_ENABLE_ALL; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state1); ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state2); ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); ok(blend_state1 == blend_state2, "Got different blend 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; + ID3D10BlendState_GetDevice(blend_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 = ID3D10BlendState_Release(blend_state2); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);

1 0

Henri Verbeet : d3d10core: Implement d3d10_sampler_state_GetDevice().
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 3363d4923675d0f54278065a4923df78f002b77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3363d4923675d0f54278065a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 17 11:24:29 2014 +0100 d3d10core: Implement d3d10_sampler_state_GetDevice(). --- dlls/d3d10core/d3d10core_private.h | 7 ++++++- dlls/d3d10core/device.c | 5 ----- dlls/d3d10core/state.c | 16 +++++++++++++--- dlls/d3d10core/tests/device.c | 14 ++++++++++++-- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 8fdef8a..4f5abad 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -272,10 +272,10 @@ struct d3d10_sampler_state ID3D10SamplerState ID3D10SamplerState_iface; LONG refcount; - struct d3d10_device *device; struct wined3d_sampler *wined3d_sampler; D3D10_SAMPLER_DESC desc; struct wine_rb_entry entry; + ID3D10Device1 *device; }; HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10_device *device, @@ -319,6 +319,11 @@ struct d3d10_device struct d3d10_rasterizer_state *rasterizer_state; }; +static inline struct d3d10_device *impl_from_ID3D10Device(ID3D10Device1 *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_device, ID3D10Device1_iface); +} + HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN; /* Layered device */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 8085e56..0bd9883 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -101,11 +101,6 @@ static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) /* IUnknown methods */ -static inline struct d3d10_device *impl_from_ID3D10Device(ID3D10Device1 *iface) -{ - return CONTAINING_RECORD(iface, struct d3d10_device, ID3D10Device1_iface); -} - static HRESULT STDMETHODCALLTYPE d3d10_device_QueryInterface(ID3D10Device1 *iface, REFIID riid, void **ppv) { diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index f0d162b..3e4e8ef 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -487,8 +487,11 @@ static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *i if (!refcount) { + struct d3d10_device *device = impl_from_ID3D10Device(state->device); + wined3d_sampler_decref(state->wined3d_sampler); - wine_rb_remove(&state->device->sampler_states, &state->desc); + wine_rb_remove(&device->sampler_states, &state->desc); + ID3D10Device1_Release(state->device); HeapFree(GetProcessHeap(), 0, state); } @@ -499,7 +502,12 @@ static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *i static void STDMETHODCALLTYPE d3d10_sampler_state_GetDevice(ID3D10SamplerState *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_sampler_state *state = impl_from_ID3D10SamplerState(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)state->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_GetPrivateData(ID3D10SamplerState *iface, @@ -562,7 +570,6 @@ HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10 state->ID3D10SamplerState_iface.lpVtbl = &d3d10_sampler_state_vtbl; state->refcount = 1; - state->device = device; state->desc = *desc; if (FAILED(hr = wined3d_sampler_create(state, &state->wined3d_sampler))) @@ -578,6 +585,9 @@ HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10 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 7eef19a..d0ad0c4 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -605,9 +605,9 @@ float4 main(const float4 color : COLOR) : SV_TARGET static void test_create_sampler_state(void) { ID3D10SamplerState *sampler_state1, *sampler_state2; + ULONG refcount, expected_refcount; D3D10_SAMPLER_DESC sampler_desc; - ID3D10Device *device; - ULONG refcount; + ID3D10Device *device, *tmp; HRESULT hr; if (!(device = create_device())) @@ -633,11 +633,21 @@ static void test_create_sampler_state(void) sampler_desc.MinLOD = 0.0f; sampler_desc.MaxLOD = 16.0f; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler_state1); ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler_state2); ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); ok(sampler_state1 == sampler_state2, "Got different sampler 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; + ID3D10SamplerState_GetDevice(sampler_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 = ID3D10SamplerState_Release(sampler_state2); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);

1 0

Bruno Jesus : ws2_32: Fix edge case for getaddrinfo in BSD and OSX.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: da16d6b66003f05e39c92897bb973f4b79fce7e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da16d6b66003f05e39c92897b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Feb 14 08:44:21 2014 -0200 ws2_32: Fix edge case for getaddrinfo in BSD and OSX. --- dlls/ws2_32/socket.c | 3 +++ dlls/ws2_32/tests/sock.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7a9440f..a9ac79d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5466,6 +5466,9 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr else node = nodename; + /* servname tweak required by OSX and BSD kernels */ + if (servname && !servname[0]) servname = "0"; + if (hints) { punixhints = &unixhints; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cb67533..e146548 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5402,12 +5402,24 @@ static void test_GetAddrInfoW(void) pFreeAddrInfoW(result); result = NULL; + ret = pGetAddrInfoW(NULL, empty, NULL, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + pFreeAddrInfoW(result); + + result = NULL; ret = pGetAddrInfoW(empty, zero, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); pFreeAddrInfoW(result); result = NULL; + ret = pGetAddrInfoW(empty, empty, NULL, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + pFreeAddrInfoW(result); + + result = NULL; ret = pGetAddrInfoW(localhost, NULL, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result); @@ -5529,12 +5541,24 @@ static void test_getaddrinfo(void) pfreeaddrinfo(result); result = NULL; + ret = pgetaddrinfo(NULL, "", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "getaddrinfo failed\n"); + pfreeaddrinfo(result); + + result = NULL; ret = pgetaddrinfo("", "0", NULL, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); ok(result != NULL, "getaddrinfo failed\n"); pfreeaddrinfo(result); result = NULL; + ret = pgetaddrinfo("", "", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "getaddrinfo failed\n"); + pfreeaddrinfo(result); + + result = NULL; ret = pgetaddrinfo("localhost", NULL, NULL, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); pfreeaddrinfo(result);

1 0

Dmitry Timoshkov : xmllite: Don' t fail the whole parsing process because of unsupported 'xmlns' attribute.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 5425cb341361b1c3bb468edb5b153807be8a8344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5425cb341361b1c3bb468edb5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 14 16:23:10 2014 +0900 xmllite: Don't fail the whole parsing process because of unsupported 'xmlns' attribute. --- dlls/xmllite/reader.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6d20324..fb06200 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2045,10 +2045,7 @@ static HRESULT reader_parse_attribute(xmlreader *reader) } if (strval_eq(reader, &qname, &xmlns)) - { FIXME("default namespace definitions not supported\n"); - return E_NOTIMPL; - } hr = reader_parse_eq(reader); if (FAILED(hr)) return hr;

1 0

Nikolay Sivov : comctl32/tests: Some tests for Button control.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 35e23dde2703a667ceaeeec39fd3da6c590a2635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e23dde2703a667ceaeeec39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 17 13:00:06 2014 +0400 comctl32/tests: Some tests for Button control. --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/button.c | 814 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 815 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35e23dde2703a667ceaee…

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2014