January 2014 - Wine-commits

Henri Verbeet : ddraw: Allow attaching surfaces other than depth buffers in ddraw_surface4_AddAttachedSurface ().
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 7c6ca2077ffef55a69f1605bb819d2595fc802da URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6ca2077ffef55a69f1605bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 10:07:52 2014 +0100 ddraw: Allow attaching surfaces other than depth buffers in ddraw_surface4_AddAttachedSurface(). --- dlls/ddraw/surface.c | 84 +++++++++++++++++++-------------------------- dlls/ddraw/tests/ddraw4.c | 14 ++++---- 2 files changed, 43 insertions(+), 55 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f569ae8..c503992 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1670,106 +1670,94 @@ static HRESULT WINAPI ddraw_surface7_AddAttachedSurface(IDirectDrawSurface7 *ifa static HRESULT WINAPI ddraw_surface4_AddAttachedSurface(IDirectDrawSurface4 *iface, IDirectDrawSurface4 *attachment) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface4(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface4(attachment); HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, attachment); - hr = ddraw_surface7_AddAttachedSurface(&This->IDirectDrawSurface7_iface, - attachment_impl ? &attachment_impl->IDirectDrawSurface7_iface : NULL); - if (FAILED(hr)) - { - return hr; - } - attachment_impl->attached_iface = (IUnknown *)attachment; - IUnknown_AddRef(attachment_impl->attached_iface); - ddraw_surface7_Release(&attachment_impl->IDirectDrawSurface7_iface); - return hr; -} -static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *attachment) -{ - struct ddraw_surface *This = impl_from_IDirectDrawSurface3(iface); - struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface3(attachment); - HRESULT hr; - - TRACE("iface %p, attachment %p.\n", iface, attachment); - /* Tests suggest that * -> offscreen plain surfaces can be attached to other offscreen plain surfaces * -> offscreen plain surfaces can be attached to primaries * -> primaries can be attached to offscreen plain surfaces * -> z buffers can be attached to primaries */ - if (This->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_OFFSCREENPLAIN) + if (surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_OFFSCREENPLAIN) && attachment_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_OFFSCREENPLAIN)) { /* Sizes have to match */ - if (attachment_impl->surface_desc.dwWidth != This->surface_desc.dwWidth - || attachment_impl->surface_desc.dwHeight != This->surface_desc.dwHeight) + if (attachment_impl->surface_desc.dwWidth != surface->surface_desc.dwWidth + || attachment_impl->surface_desc.dwHeight != surface->surface_desc.dwHeight) { WARN("Surface sizes do not match.\n"); return DDERR_CANNOTATTACHSURFACE; } - /* OK */ } - else if (This->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE) - && attachment_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_ZBUFFER)) - { - /* OK */ - } - else + else if (!(surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE)) + || !(attachment_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_ZBUFFER))) { WARN("Invalid attachment combination.\n"); return DDERR_CANNOTATTACHSURFACE; } - hr = ddraw_surface_attach_surface(This, attachment_impl); - if (FAILED(hr)) - { + if (FAILED(hr = ddraw_surface_attach_surface(surface, attachment_impl))) return hr; - } + attachment_impl->attached_iface = (IUnknown *)attachment; IUnknown_AddRef(attachment_impl->attached_iface); return hr; } +static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *attachment) +{ + struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); + struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface3(attachment); + HRESULT hr; + + TRACE("iface %p, attachment %p.\n", iface, attachment); + + if (FAILED(hr = ddraw_surface4_AddAttachedSurface(&surface->IDirectDrawSurface4_iface, + attachment_impl ? &attachment_impl->IDirectDrawSurface4_iface : NULL))) + return hr; + + attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); + ddraw_surface4_Release(&attachment_impl->IDirectDrawSurface4_iface); + return hr; +} + static HRESULT WINAPI ddraw_surface2_AddAttachedSurface(IDirectDrawSurface2 *iface, IDirectDrawSurface2 *attachment) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface2(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface2(attachment); HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, attachment); - hr = ddraw_surface3_AddAttachedSurface(&This->IDirectDrawSurface3_iface, - attachment_impl ? &attachment_impl->IDirectDrawSurface3_iface : NULL); - if (FAILED(hr)) - { + if (FAILED(hr = ddraw_surface4_AddAttachedSurface(&surface->IDirectDrawSurface4_iface, + attachment_impl ? &attachment_impl->IDirectDrawSurface4_iface : NULL))) return hr; - } + attachment_impl->attached_iface = (IUnknown *)attachment; IUnknown_AddRef(attachment_impl->attached_iface); - ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); + ddraw_surface4_Release(&attachment_impl->IDirectDrawSurface4_iface); return hr; } static HRESULT WINAPI ddraw_surface1_AddAttachedSurface(IDirectDrawSurface *iface, IDirectDrawSurface *attachment) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); struct ddraw_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface(attachment); HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, attachment); - hr = ddraw_surface3_AddAttachedSurface(&This->IDirectDrawSurface3_iface, - attachment_impl ? &attachment_impl->IDirectDrawSurface3_iface : NULL); - if (FAILED(hr)) - { + if (FAILED(hr = ddraw_surface4_AddAttachedSurface(&surface->IDirectDrawSurface4_iface, + attachment_impl ? &attachment_impl->IDirectDrawSurface4_iface : NULL))) return hr; - } + attachment_impl->attached_iface = (IUnknown *)attachment; IUnknown_AddRef(attachment_impl->attached_iface); - ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); + ddraw_surface4_Release(&attachment_impl->IDirectDrawSurface4_iface); return hr; } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 939a9b6..04d5049 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6005,25 +6005,25 @@ static void test_surface_attachment(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_AddAttachedSurface(surface1, surface2); - todo_wine ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); /* Try the reverse without detaching first. */ hr = IDirectDrawSurface4_AddAttachedSurface(surface2, surface1); - todo_wine ok(hr == DDERR_SURFACEALREADYATTACHED, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACEALREADYATTACHED, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface2); - todo_wine ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_AddAttachedSurface(surface2, surface1); - todo_wine ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); /* Try to detach reversed. */ hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface2); ok(hr == DDERR_CANNOTDETACHSURFACE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_DeleteAttachedSurface(surface2, 0, surface1); - todo_wine ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_AddAttachedSurface(surface2, surface3); - todo_wine ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to attach surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_DeleteAttachedSurface(surface2, 0, surface3); - todo_wine ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_AddAttachedSurface(surface1, surface4); ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr);

1 0

Henri Verbeet : d3d10: Add D3D10_DRIVER_TYPE_WARP.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 2d06703dc752e00b05710125d8bc3fb505ca4beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d06703dc752e00b05710125d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 10:07:53 2014 +0100 d3d10: Add D3D10_DRIVER_TYPE_WARP. --- dlls/d3d10/d3d10_main.c | 5 +++++ dlls/d3d10/utils.c | 1 + include/d3d10misc.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 01fefba..6d4d626 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -121,6 +121,11 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver } break; } + + default: + FIXME("Unhandled driver type %#x.\n", driver_type); + IDXGIFactory_Release(factory); + return E_FAIL; } } diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 6bb7d05..9ffff13 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -34,6 +34,7 @@ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_REFERENCE); WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_NULL); WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_SOFTWARE); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_WARP); default: FIXME("Unrecognized D3D10_DRIVER_TYPE %#x\n", driver_type); return "unrecognized"; diff --git a/include/d3d10misc.h b/include/d3d10misc.h index 9f7f8e9..f8f5617 100644 --- a/include/d3d10misc.h +++ b/include/d3d10misc.h @@ -30,6 +30,7 @@ typedef enum D3D10_DRIVER_TYPE { D3D10_DRIVER_TYPE_REFERENCE = 1, D3D10_DRIVER_TYPE_NULL = 2, D3D10_DRIVER_TYPE_SOFTWARE = 3, + D3D10_DRIVER_TYPE_WARP = 5, } D3D10_DRIVER_TYPE; HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,

1 0

Henri Verbeet : d3d10core/tests: Use D3D10CreateDevice() to create a device.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 80ce3b319a0b62016e91abc438d577b866154f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ce3b319a0b62016e91abc43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 10:07:55 2014 +0100 d3d10core/tests: Use D3D10CreateDevice() to create a device. --- dlls/d3d10core/tests/Makefile.in | 2 +- dlls/d3d10core/tests/device.c | 55 ++++++-------------------------------- 2 files changed, 9 insertions(+), 48 deletions(-) diff --git a/dlls/d3d10core/tests/Makefile.in b/dlls/d3d10core/tests/Makefile.in index 0dfec79..ca96a25 100644 --- a/dlls/d3d10core/tests/Makefile.in +++ b/dlls/d3d10core/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3d10core.dll -IMPORTS = d3d10core dxgi +IMPORTS = d3d10 C_SRCS = \ device.c diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 63b65bc..8278afc 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -21,57 +21,18 @@ #include "d3d10.h" #include "wine/test.h" -HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, void *unknown0, ID3D10Device **device); - static ID3D10Device *create_device(void) { - IDXGIFactory *factory = NULL; - IDXGIAdapter *adapter = NULL; - ID3D10Device *device = NULL; - HRESULT hr; - - hr = CreateDXGIFactory(&IID_IDXGIFactory, (void *)&factory); - if (FAILED(hr)) goto cleanup; - - hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); - ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_FOUND, /* Some VMware and VirtualBox */ - "EnumAdapters failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device); - } - - if (FAILED(hr)) - { - HMODULE d3d10ref; - - trace("Failed to create a HW device, trying REF\n"); - if (adapter) IDXGIAdapter_Release(adapter); - adapter = NULL; - - d3d10ref = LoadLibraryA("d3d10ref.dll"); - if (!d3d10ref) - { - trace("d3d10ref.dll not available, unable to create a REF device\n"); - goto cleanup; - } - - hr = IDXGIFactory_CreateSoftwareAdapter(factory, d3d10ref, &adapter); - FreeLibrary(d3d10ref); - ok(SUCCEEDED(hr), "CreateSoftwareAdapter failed, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; - - hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device); - ok(SUCCEEDED(hr), "Failed to create a REF device, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; - } + ID3D10Device *device; -cleanup: - if (adapter) IDXGIAdapter_Release(adapter); - if (factory) IDXGIFactory_Release(factory); + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; - return device; + return NULL; } static void test_device_interfaces(void)

1 0

Michael Stefaniuc : dmusic: Use the defines for the FOURCC codes.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 2973dbb856c142812e0679c09a7bb786965cdaa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2973dbb856c142812e0679c09… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 27 14:48:31 2014 +0100 dmusic: Use the defines for the FOURCC codes. --- dlls/dmusic/collection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 20380fe..90a7918 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -289,7 +289,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(chunk.fccID)); StreamSize = chunk.dwSize - sizeof(FOURCC); - if (chunk.fccID != mmioFOURCC('D','L','S',' ')) { + if (chunk.fccID != FOURCC_DLS) { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); liMove.QuadPart = StreamSize; IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ @@ -339,7 +339,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip ListCount[0] = 0; switch (chunk.fccID) { /* pure INFO list, such can be found in dls collections */ - case mmioFOURCC('I','N','F','O'): + case DMUS_FOURCC_INFO_LIST: TRACE_(dmfile)(": INFO list\n"); do { hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD)); @@ -558,7 +558,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST ListSize[0] = chunk.dwSize - sizeof(FOURCC); ListCount[0] = 0; switch (chunk.fccID) { - case mmioFOURCC('I','N','F','O'): { + case DMUS_FOURCC_INFO_LIST: { TRACE_(dmfile)(": INFO list\n"); do { IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL);

1 0

Stefan Dösinger : wined3d: Set buffer-> map_ptr to NULL on unmap.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 9f72f784310320ec219401fde54815ab05564aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f72f784310320ec219401fde… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 27 14:41:47 2014 +0100 wined3d: Set buffer->map_ptr to NULL on unmap. --- dlls/wined3d/buffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b857119..c53021b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1117,6 +1117,7 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) context_release(context); buffer_clear_dirty_areas(buffer); + buffer->map_ptr = NULL; } else if (buffer->flags & WINED3D_BUFFER_HASDESC) {

1 0

Stefan Dösinger : include: Fix IDirect3DSwapChain8_Present argument count.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: f9f52edbf77a616609e19e4f7c973dc4e934335d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f52edbf77a616609e19e4f7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 22 17:50:32 2014 +0100 include: Fix IDirect3DSwapChain8_Present argument count. --- include/d3d8.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d8.h b/include/d3d8.h index dcc25f1..d56e67f 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -265,7 +265,7 @@ DECLARE_INTERFACE_(IDirect3DSwapChain8,IUnknown) #define IDirect3DSwapChain8_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DSwapChain8_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DSwapChain8 methods ***/ -#define IDirect3DSwapChain8_Present(p,a,b,c) (p)->lpVtbl->Present(p,a,b,c) +#define IDirect3DSwapChain8_Present(p,a,b,c,d) (p)->lpVtbl->Present(p,a,b,c,d) #define IDirect3DSwapChain8_GetBackBuffer(p,a,b,c) (p)->lpVtbl->GetBackBuffer(p,a,b,c) #else /*** IUnknown methods ***/ @@ -273,7 +273,7 @@ DECLARE_INTERFACE_(IDirect3DSwapChain8,IUnknown) #define IDirect3DSwapChain8_AddRef(p) (p)->AddRef() #define IDirect3DSwapChain8_Release(p) (p)->Release() /*** IDirect3DSwapChain8 methods ***/ -#define IDirect3DSwapChain8_Present(p,a,b,c) (p)->Present(a,b,c) +#define IDirect3DSwapChain8_Present(p,a,b,c,d) (p)->Present(a,b,c,d) #define IDirect3DSwapChain8_GetBackBuffer(p,a,b,c) (p)->GetBackBuffer(a,b,c) #endif

1 0

Nikolay Sivov : oleaut32: Use CoTaskMem* when dealing with CUSTDATA.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 1abafbffda7a1db8ba76a73a31569413c14c6440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1abafbffda7a1db8ba76a73a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 27 00:12:11 2014 +0400 oleaut32: Use CoTaskMem* when dealing with CUSTDATA. --- dlls/oleaut32/typelib.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 812612a..d94abe7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5343,7 +5343,7 @@ static HRESULT TLB_copy_all_custdata(struct list *custdata_list, CUSTDATA *pCust ct = list_count(custdata_list); - pCustData->prgCustData = heap_alloc_zero(ct * sizeof(CUSTDATAITEM)); + pCustData->prgCustData = CoTaskMemAlloc(ct * sizeof(CUSTDATAITEM)); if(!pCustData->prgCustData) return E_OUTOFMEMORY; @@ -11230,8 +11230,7 @@ void WINAPI ClearCustData(CUSTDATA *lpCust) for (i = 0; i < lpCust->cCustData; i++) VariantClear(&lpCust->prgCustData[i].varValue); - /* FIXME - Should be using a per-thread IMalloc */ - heap_free(lpCust->prgCustData); + CoTaskMemFree(lpCust->prgCustData); lpCust->prgCustData = NULL; } lpCust->cCustData = 0;

1 0

Andrew Eikum : oleaut32: Improve ITypeLib::FindName.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 57895e5a8ca237c105d543eef1bf6ffbcc0314b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57895e5a8ca237c105d543eef… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 20 08:38:31 2014 -0600 oleaut32: Improve ITypeLib::FindName. --- dlls/oleaut32/tests/typelib.c | 99 +++++++++++++++++++++++++++++++++++++++-- dlls/oleaut32/typelib.c | 20 +++++---- 2 files changed, 107 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 20e53fb..d3980f8 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1554,8 +1554,10 @@ static void test_CreateTypeLib(SYSKIND sys) { ICreateTypeInfo2 *createti2; ITypeLib *tl, *stdole; ITypeInfo *interface1, *interface2, *dual, *unknown, *dispatch, *ti; + ITypeInfo *tinfos[2]; ITypeInfo2 *ti2; ITypeComp *tcomp; + MEMBERID memids[2]; FUNCDESC funcdesc, *pfuncdesc; ELEMDESC elemdesc[5], *edesc; PARAMDESCEX paramdescex; @@ -1567,6 +1569,7 @@ static void test_CreateTypeLib(SYSKIND sys) { DWORD helpcontext, ptr_size, alignment; int impltypeflags; unsigned int cnames; + USHORT found; VARIANT cust_data; HRESULT hres; TYPEKIND kind; @@ -2665,6 +2668,46 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(libattr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "wLibFlags = %d\n", libattr->wLibFlags); ITypeLib_ReleaseTLibAttr(tl, libattr); + found = 2; + memset(tinfos, 0, sizeof(tinfos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + hres = ITypeLib_FindName(tl, param1W, 0, tinfos, memids, &found); + ok(hres == S_OK, "got: %08x\n", hres); + ok(found == 0, "got wrong count: %u\n", found); + ok(tinfos[0] == NULL, "got invalid typeinfo[0]\n"); + ok(tinfos[1] == NULL, "got invalid typeinfo[1]\n"); + ok(memids[0] == 0xdeadbeef, "got invalid memid[0]\n"); + ok(memids[1] == 0xdeadbeef, "got invalid memid[1]\n"); + + found = 2; + memset(tinfos, 0, sizeof(tinfos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + hres = ITypeLib_FindName(tl, func1W, 0, tinfos, memids, &found); + ok(hres == S_OK, "got: %08x\n", hres); + ok(found == 1, "got wrong count: %u\n", found); + ok(tinfos[0] != NULL, "got invalid typeinfo[0]\n"); + ok(tinfos[1] == NULL, "got invalid typeinfo[1]\n"); + ok(memids[0] == 0, "got invalid memid[0]\n"); + ok(memids[1] == 0xdeadbeef, "got invalid memid[1]\n"); + if(tinfos[0]) + ITypeInfo_Release(tinfos[0]); + + found = 2; + memset(tinfos, 0, sizeof(tinfos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + hres = ITypeLib_FindName(tl, interface1W, 0, tinfos, memids, &found); + ok(hres == S_OK, "got: %08x\n", hres); + ok(found == 1, "got wrong count: %u\n", found); + ok(tinfos[0] != NULL, "got invalid typeinfo[0]\n"); + ok(tinfos[1] == NULL, "got invalid typeinfo[1]\n"); + ok(memids[0] == MEMBERID_NIL, "got invalid memid[0]: %x\n", memids[0]); + ok(memids[1] == 0xdeadbeef, "got invalid memid[1]\n"); + if(tinfos[0]) + ITypeInfo_Release(tinfos[0]); + hres = ITypeLib_GetDocumentation(tl, -1, &name, &docstring, &helpcontext, &helpfile); ok(hres == S_OK, "got %08x\n", hres); ok(memcmp(typelibW, name, sizeof(typelibW)) == 0, "got wrong typelib name: %s\n", @@ -4272,6 +4315,7 @@ static void test_SetVarHelpContext(void) static void test_SetFuncAndParamNames(void) { static OLECHAR nameW[] = {'n','a','m','e',0}; + static OLECHAR name2W[] = {'n','a','m','e','2',0}; static OLECHAR prop[] = {'p','r','o','p',0}; static OLECHAR *propW[] = {prop}; static OLECHAR func[] = {'f','u','n','c',0}; @@ -4280,9 +4324,13 @@ static void test_SetFuncAndParamNames(void) WCHAR filenameW[MAX_PATH]; ICreateTypeLib2 *ctl; ICreateTypeInfo *cti; + ITypeLib *tl; + ITypeInfo *infos[3]; + MEMBERID memids[3]; FUNCDESC funcdesc; ELEMDESC edesc; HRESULT hr; + USHORT found; GetTempFileNameA(".", "tlb", 0, filenameA); MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filenameW, MAX_PATH); @@ -4352,6 +4400,50 @@ static void test_SetFuncAndParamNames(void) ok(hr == S_OK, "got 0x%08x\n", hr); ICreateTypeInfo_Release(cti); + + hr = ICreateTypeLib2_CreateTypeInfo(ctl, name2W, TKIND_INTERFACE, &cti); + ok(hr == S_OK, "got %08x\n", hr); + + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_FUNC; + funcdesc.cParams = 0; + funcdesc.lprgelemdescParam = NULL; + hr = ICreateTypeInfo_AddFuncDesc(cti, 0, &funcdesc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 0, funcW, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ICreateTypeInfo_Release(cti); + + hr = ICreateTypeLib2_QueryInterface(ctl, &IID_ITypeLib, (void**)&tl); + ok(hr == S_OK, "got %08x\n", hr); + + found = 1; + memset(infos, 0, sizeof(infos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + memids[2] = 0xdeadbeef; + hr = ITypeLib_FindName(tl, func, 0, infos, memids, &found); + ok(hr == S_OK, "got %08x\n", hr); + ok(found == 1, "got wrong count: %u\n", found); + ok(infos[0] && !infos[1] && !infos[2], "got wrong typeinfo\n"); + ok(memids[0] == 0, "got wrong memid[0]\n"); + ok(memids[1] == 0xdeadbeef && memids[2] == 0xdeadbeef, "got wrong memids\n"); + + found = 3; + memset(infos, 0, sizeof(infos)); + memids[0] = 0xdeadbeef; + memids[1] = 0xdeadbeef; + memids[2] = 0xdeadbeef; + hr = ITypeLib_FindName(tl, func, 0, infos, memids, &found); + ok(hr == S_OK, "got %08x\n", hr); + ok(found == 2, "got wrong count: %u\n", found); + ok(infos[0] && infos[1] && infos[0] != infos[1], "got same typeinfo\n"); + ok(memids[0] == 0, "got wrong memid[0]\n"); + ok(memids[1] == 0, "got wrong memid[1]\n"); + + ITypeLib_Release(tl); ICreateTypeLib2_Release(ctl); DeleteFileA(filenameA); } @@ -4543,8 +4635,7 @@ static void test_FindName(void) ti = (void*)0xdeadbeef; hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine - ok(memid == -1, "got %d\n", memid); + ok(memid == MEMBERID_NIL, "got %d\n", memid); ok(!lstrcmpW(buffW, wszGUID), "got %s\n", wine_dbgstr_w(buffW)); ok(c == 1, "got %d\n", c); ITypeInfo_Release(ti); @@ -4556,7 +4647,7 @@ todo_wine hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine { - ok(memid == -1, "got %d\n", memid); + ok(memid == MEMBERID_NIL, "got %d\n", memid); ok(!lstrcmpW(buffW, wszGUID), "got %s\n", wine_dbgstr_w(buffW)); ok(c == 1, "got %d\n", c); } @@ -4569,7 +4660,7 @@ todo_wine { ti = (void*)0xdeadbeef; hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(memid == -1, "got %d\n", memid); + ok(memid == MEMBERID_NIL, "got %d\n", memid); ok(!lstrcmpW(buffW, invalidW), "got %s\n", wine_dbgstr_w(buffW)); ok(c == 0, "got %d\n", c); ok(ti == (void*)0xdeadbeef, "got %p\n", ti); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d94abe7..e5a99e8 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5176,26 +5176,30 @@ static HRESULT WINAPI ITypeLib2_fnFindName( return E_INVALIDARG; len = (lstrlenW(name) + 1)*sizeof(WCHAR); - for(tic = 0; tic < This->TypeInfoCount; ++tic) { + for(tic = 0; count < *found && tic < This->TypeInfoCount; ++tic) { ITypeInfoImpl *pTInfo = This->typeinfos[tic]; TLBVarDesc *var; UINT fdc; - if(!TLB_str_memcmp(name, pTInfo->Name, len)) goto ITypeLib2_fnFindName_exit; + if(!TLB_str_memcmp(name, pTInfo->Name, len)) { + memid[count] = MEMBERID_NIL; + goto ITypeLib2_fnFindName_exit; + } + for(fdc = 0; fdc < pTInfo->cFuncs; ++fdc) { TLBFuncDesc *func = &pTInfo->funcdescs[fdc]; - int pc; - if(!TLB_str_memcmp(name, func->Name, len)) goto ITypeLib2_fnFindName_exit; - for(pc = 0; pc < func->funcdesc.cParams; pc++) { - if(!TLB_str_memcmp(name, func->pParamDesc[pc].Name, len)) - goto ITypeLib2_fnFindName_exit; + if(!TLB_str_memcmp(name, func->Name, len)) { + memid[count] = func->funcdesc.memid; + goto ITypeLib2_fnFindName_exit; } } var = TLB_get_vardesc_by_name(pTInfo->vardescs, pTInfo->cVars, name); - if (var) + if (var) { + memid[count] = var->vardesc.memid; goto ITypeLib2_fnFindName_exit; + } continue; ITypeLib2_fnFindName_exit:

1 0

Dmitry Timoshkov : kernel32/tests: Don' t forget to delete temporary manifest files.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 9703bee560152cf82ff4f44c63a02feb7a077031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9703bee560152cf82ff4f44c6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 21 17:50:58 2014 +0900 kernel32/tests: Don't forget to delete temporary manifest files. --- dlls/kernel32/tests/actctx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 5795e18..46b6a44 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2133,8 +2133,9 @@ todo_wine { } if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx(handle); - delete_manifest_file("main.manifest"); + delete_manifest_file("main_wndcls.manifest"); delete_manifest_file("testdep1.manifest"); + delete_manifest_file("testdep2.manifest"); /* ACTCTX_FLAG_HMODULE_VALID but hModule is not set */ memset(&actctx, 0, sizeof(ACTCTXA));

1 0

Dmitry Timoshkov : kernel32/tests: Don' t forget to delete a temporary file.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 294adeec4fff290ee67df3861ce39e59e4600774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=294adeec4fff290ee67df3861… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 21 17:51:27 2014 +0900 kernel32/tests: Don't forget to delete a temporary file. --- dlls/kernel32/tests/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4a6828b..f89e5af 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3843,6 +3843,7 @@ static void test_SetFileValidData(void) { win_skip("cannot enable SE_MANAGE_VOLUME_NAME privilege\n"); CloseHandle(token); + DeleteFileA(filename); return; } handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -3906,7 +3907,9 @@ static void test_SetFileValidData(void) privs.Privileges[0].Attributes = 0; AdjustTokenPrivileges(token, FALSE, &privs, sizeof(privs), NULL, NULL); + CloseHandle(token); + CloseHandle(handle); DeleteFileA(filename); }

1 0