February 2014 - Wine-Commits

Matteo Bruni : d3dx9: Trace DDS pixel format.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

Module: wine Branch: master Commit: ac5664c8790c72ecc7c38126ddd0b227d9d9d47b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5664c8790c72ecc7c38126d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 14 15:53:11 2014 +0100 d3dx9: Trace DDS pixel format. --- dlls/d3dx9_36/surface.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index fbfff0f..48d129e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -259,6 +259,11 @@ static D3DFORMAT dds_bump_to_d3dformat(const struct dds_pixel_format *pixel_form static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pixel_format) { + TRACE("pixel_format: size %u, flags %#x, fourcc %#x, bpp %u.\n", pixel_format->size, + pixel_format->flags, pixel_format->fourcc, pixel_format->bpp); + TRACE("rmask %#x, gmask %#x, bmask %#x, amask %#x.\n", pixel_format->rmask, pixel_format->gmask, + pixel_format->bmask, pixel_format->amask); + if (pixel_format->flags & DDS_PF_FOURCC) return dds_fourcc_to_d3dformat(pixel_format->fourcc); if (pixel_format->flags & DDS_PF_RGB)

1 0

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

Feb. 17, 2014

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

1 0

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

Feb. 17, 2014

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

1 0

Henri Verbeet : advapi32: Add a stub for EventProviderEnabled.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

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

Feb. 17, 2014

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 Feb. 17, 2014

Feb. 17, 2014

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

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

Feb. 17, 2014

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 Feb. 17, 2014

Feb. 17, 2014

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

Ken Thomases : kernel32: Prefer HW_MEMSIZE sysctl variable over HW_PHYSMEM , if available, since it's 64 bits.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

Module: wine Branch: master Commit: 95df19efed1c6b31beedf556adb18cea63bd92ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=95df19efed1c6b31beedf556a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 16 20:43:38 2014 -0600 kernel32: Prefer HW_MEMSIZE sysctl variable over HW_PHYSMEM, if available, since it's 64 bits. --- dlls/kernel32/heap.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index c88d31c..646890a 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1147,6 +1147,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) #ifdef linux FILE *f; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) + DWORDLONG total; #ifdef __APPLE__ unsigned int val; #else @@ -1154,6 +1155,9 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) #endif int mib[2]; size_t size_sys; +#ifdef HW_MEMSIZE + uint64_t val64; +#endif #elif defined(sun) unsigned long pagesize,maxpages,freepages,swapspace,swapfree; struct anoninfo swapinf; @@ -1219,11 +1223,27 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) fclose( f ); } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) + total = 0; + mib[0] = CTL_HW; - mib[1] = HW_PHYSMEM; - size_sys = sizeof(val); - if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val) && val) - lpmemex->ullTotalPhys = val; +#ifdef HW_MEMSIZE + mib[1] = HW_MEMSIZE; + size_sys = sizeof(val64); + if (!sysctl(mib, 2, &val64, &size_sys, NULL, 0) && size_sys == sizeof(val64) && val64) + total = val64; +#endif + + if (!total) + { + mib[1] = HW_PHYSMEM; + size_sys = sizeof(val); + if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val) && val) + total = val; + } + + 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)

1 0

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

Feb. 17, 2014

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