February 2014 - Wine-commits

Ken Thomases : kernel32: Use the Mach host_info(HOST_BASIC_INFO) API to obtain total RAM after trying sysctl(HW_MEMSIZE) and before HW_PHYSMEM.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: f40c5484fc4a1b52e51be267e853f902743cac98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40c5484fc4a1b52e51be267e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 16 20:43:45 2014 -0600 kernel32: Use the Mach host_info(HOST_BASIC_INFO) API to obtain total RAM after trying sysctl(HW_MEMSIZE) and before HW_PHYSMEM. --- dlls/kernel32/heap.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index fb0b07d..cd3a752 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -40,6 +40,9 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#ifdef HAVE_MACH_MACH_H +#include <mach/mach.h> +#endif #ifdef sun /* FIXME: Unfortunately swapctl can't be used with largefile.... */ @@ -1236,6 +1239,25 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) total = val64; #endif +#ifdef HAVE_MACH_MACH_H + if (!total) + { + host_name_port_t host; + mach_msg_type_number_t count; + kern_return_t kr; + host_basic_info_data_t info; + + host = mach_host_self(); + + count = HOST_BASIC_INFO_COUNT; + kr = host_info(host, HOST_BASIC_INFO, (host_info_t)&info, &count); + if (kr == KERN_SUCCESS) + total = info.max_mem; + + mach_port_deallocate(mach_task_self(), host); + } +#endif + if (!total) { mib[1] = HW_PHYSMEM;

1 0

Ken Thomases : kernel32: Prefer the Mach host_statistics64(HOST_VM_INFO64) API over sysctl(HW_USERMEM) to obtain free memory.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: a34e52cc9374c56cce0bc47555c6390defbfe252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34e52cc9374c56cce0bc4755… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 16 20:43:48 2014 -0600 kernel32: Prefer the Mach host_statistics64(HOST_VM_INFO64) API over sysctl(HW_USERMEM) to obtain free memory. --- dlls/kernel32/heap.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index cd3a752..1c38ae5 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1164,6 +1164,14 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) #ifdef VM_SWAPUSAGE struct xsw_usage swap; #endif +#ifdef HAVE_MACH_MACH_H + host_name_port_t host; + mach_msg_type_number_t count; + kern_return_t kr; + host_basic_info_data_t info; + vm_statistics64_data_t vm_stat; + vm_size_t page_size; +#endif #elif defined(sun) unsigned long pagesize,maxpages,freepages,swapspace,swapfree; struct anoninfo swapinf; @@ -1240,22 +1248,22 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) #endif #ifdef HAVE_MACH_MACH_H + host = mach_host_self(); + if (!total) { - host_name_port_t host; - mach_msg_type_number_t count; - kern_return_t kr; - host_basic_info_data_t info; - - host = mach_host_self(); - count = HOST_BASIC_INFO_COUNT; kr = host_info(host, HOST_BASIC_INFO, (host_info_t)&info, &count); if (kr == KERN_SUCCESS) total = info.max_mem; - - mach_port_deallocate(mach_task_self(), host); } + + count = HOST_VM_INFO64_COUNT; + kr = host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_stat, &count); + if (kr == KERN_SUCCESS) + kr = host_page_size(host, &page_size); + + mach_port_deallocate(mach_task_self(), host); #endif if (!total) @@ -1269,11 +1277,22 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) if (total) lpmemex->ullTotalPhys = total; - mib[1] = HW_USERMEM; - size_sys = sizeof(val); - if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val) && val) - lpmemex->ullAvailPhys = val; - else + lpmemex->ullAvailPhys = 0; + +#ifdef HAVE_MACH_MACH_H + if (kr == KERN_SUCCESS) + lpmemex->ullAvailPhys = (vm_stat.free_count + vm_stat.inactive_count) * (DWORDLONG)page_size; +#endif + + if (!lpmemex->ullAvailPhys) + { + mib[1] = HW_USERMEM; + size_sys = sizeof(val); + if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val) && val) + lpmemex->ullAvailPhys = val; + } + + if (!lpmemex->ullAvailPhys) lpmemex->ullAvailPhys = lpmemex->ullTotalPhys; lpmemex->ullTotalPageFile = lpmemex->ullAvailPhys;

1 0

Nikolay Sivov : oleaut32/tests: Some tests for record-based safearray copy.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: f285b46098b7de35f5d31871856014ec207798be URL: http://source.winehq.org/git/wine.git/?a=commit;h=f285b46098b7de35f5d318718… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 17 12:30:09 2014 +0400 oleaut32/tests: Some tests for record-based safearray copy. --- dlls/oleaut32/tests/safearray.c | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 8a98782..2ab9ad3 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -79,8 +79,9 @@ typedef struct IRecordInfoImpl { IRecordInfo IRecordInfo_iface; LONG ref; - DWORD sizeCalled; - DWORD clearCalled; + unsigned int sizeCalled; + unsigned int clearCalled; + unsigned int recordcopy; } IRecordInfoImpl; static inline IRecordInfoImpl *impl_from_IRecordInfo(IRecordInfo *iface) @@ -137,8 +138,9 @@ static HRESULT WINAPI RecordInfo_RecordClear(IRecordInfo *iface, PVOID pvExistin static HRESULT WINAPI RecordInfo_RecordCopy(IRecordInfo *iface, PVOID pvExisting, PVOID pvNew) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); + This->recordcopy++; + return S_OK; } static HRESULT WINAPI RecordInfo_GetGuid(IRecordInfo *iface, GUID *pguid) @@ -1590,7 +1592,7 @@ static void test_SafeArrayCreateEx(void) /* Win32 doesn't care if GetSize fails */ fail_GetSize = TRUE; - sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, iRec); + sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, &iRec->IRecordInfo_iface); ok(sa != NULL, "CreateEx (Fail Size) failed\n"); ok(iRec->ref == START_REF_COUNT + 1, "Wrong iRec refcount %d\n", iRec->ref); ok(iRec->sizeCalled == 1, "GetSize called %d times\n", iRec->sizeCalled); @@ -1609,7 +1611,7 @@ static void test_SafeArrayCreateEx(void) iRec->ref = START_REF_COUNT; iRec->sizeCalled = 0; iRec->clearCalled = 0; - sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, iRec); + sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, &iRec->IRecordInfo_iface); ok(sa != NULL, "CreateEx (Rec) failed\n"); ok(iRec->ref == START_REF_COUNT + 1, "Wrong iRec refcount %d\n", iRec->ref); ok(iRec->sizeCalled == 1, "GetSize called %d times\n", iRec->sizeCalled); @@ -1617,19 +1619,35 @@ static void test_SafeArrayCreateEx(void) if (sa && pSafeArrayGetRecordInfo) { IRecordInfo* saRec = NULL; - hres = pSafeArrayGetRecordInfo(sa, &saRec); + SAFEARRAY *sacopy; + hres = pSafeArrayGetRecordInfo(sa, &saRec); ok(hres == S_OK,"GRI failed\n"); ok(saRec == &iRec->IRecordInfo_iface, "Different saRec\n"); ok(iRec->ref == START_REF_COUNT + 2, "Didn't AddRef %d\n", iRec->ref); - if (iRec->ref == START_REF_COUNT + 2) - IRecordInfo_Release(saRec); + IRecordInfo_Release(saRec); ok(sa->cbElements == RECORD_SIZE,"Elemsize is %d\n", sa->cbElements); + /* try to copy record based arrays */ + sacopy = pSafeArrayCreateEx(VT_RECORD, 1, sab, &iRec->IRecordInfo_iface); + iRec->recordcopy = 0; + iRec->clearCalled = 0; + /* array copy code doesn't explicitely clear a record */ + hres = SafeArrayCopyData(sa, sacopy); + ok(hres == S_OK, "got 0x%08x\n", hres); +todo_wine { + ok(iRec->recordcopy == sab[0].cElements, "got %d\n", iRec->recordcopy); + ok(iRec->clearCalled == 0, "got %d\n", iRec->clearCalled); +} + hres = SafeArrayDestroy(sacopy); + ok(hres == S_OK, "got 0x%08x\n", hres); + + iRec->clearCalled = 0; + iRec->sizeCalled = 0; hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); - ok(iRec->sizeCalled == 1, "Destroy->GetSize called %d times\n", iRec->sizeCalled); + ok(iRec->sizeCalled == 0, "Destroy->GetSize called %d times\n", iRec->sizeCalled); ok(iRec->clearCalled == sab[0].cElements, "Destroy->Clear called %d times\n", iRec->clearCalled); ok(iRec->ref == START_REF_COUNT, "Wrong iRec refcount %d\n", iRec->ref); }

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

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

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

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

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

André Hentschel : Add WWN 363
by Jeremy Newman 14 Feb '14

14 Feb '14

Module: website Branch: master Commit: 85b5b572ee938a70173ced101e53d5aaa2b07579 URL: http://source.winehq.org/git/website.git/?a=commit;h=85b5b572ee938a70173ced… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 14 22:51:52 2014 +0100 Add WWN 363 --- wwn/en/wn20140214_363.xml | 1063 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1063 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=85b5b572ee938a7017…

1 0

Jeremy Newman : WWN Issue 363
by Jeremy Newman 14 Feb '14

14 Feb '14

Module: website Branch: master Commit: 3ae85ca89822a141cafd149176b2355572b5086c URL: http://source.winehq.org/git/website.git/?a=commit;h=3ae85ca89822a141cafd14… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 14 17:36:57 2014 -0600 WWN Issue 363 --- news/en/2014021401.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2014021401.xml b/news/en/2014021401.xml new file mode 100644 index 0000000..cb6633b --- /dev/null +++ b/news/en/2014021401.xml @@ -0,0 +1,13 @@ +<news> + <date>February 14, 2014</date> + <title>World Wine News Issue 363</title> + <body> +<a href="{$root}/wwn/363">WWN Issue 363</a> was released today. +<ul> +<li><a href="{$root}/wwn/363#WWN revived?">WWN revived?</a></li> +<li><a href="{$root}/wwn/363#Wine at LinuxTag in Berlin">Wine at LinuxTag in Berlin</a></li> +<li><a href="{$root}/wwn/363#FOSDEM 2014">FOSDEM 2014</a></li> +<li><a href="{$root}/wwn/363#AppDB/BugZilla Status Changes">AppDB/BugZilla Status Changes</a></li> +</ul> + </body> +</news>

1 0