March 2012 - Wine-Commits - list.winehq.org

Hans Leidekker : fusion/tests: Add another test for IAssemblyCache:: QueryAssemblyInfo.
by Alexandre Julliard March 30, 2012

March 30, 2012

Module: wine Branch: master Commit: aa53a8f005645234a5bfa9d7a287a3480ddb62e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa53a8f005645234a5bfa9d7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 10:21:42 2012 +0200 fusion/tests: Add another test for IAssemblyCache::QueryAssemblyInfo. --- dlls/fusion/tests/asmcache.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 46c1db9..3910488 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -1485,6 +1485,21 @@ static void test_QueryAssemblyInfo(void) ok(info.cchBuf == lstrlenW(asmpath) + 1, "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); + /* no flags, display name is "wine, Version=1.0.0.0" */ + INIT_ASM_INFO(); + info.pszCurrentAssemblyPathBuf = NULL; + info.cchBuf = 0; + lstrcpyW(name, wine); + lstrcatW(name, commasep); + lstrcatW(name, ver); + hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), + "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), + "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); + ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, + "Expected ASSEMBLYINFO_FLAG_INSTALLED, got %08x\n", info.dwAssemblyFlags); + /* uninstall the assembly from the GAC */ disp = 0xf00dbad; hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp);

1 0

Hans Leidekker : msi: Detect installed side-by-side assemblies.
by Alexandre Julliard March 30, 2012

March 30, 2012

Module: wine Branch: master Commit: 8ea52669155a396d52bc0f2cfd33d850b988d428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea52669155a396d52bc0f2cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 10:22:05 2012 +0200 msi: Detect installed side-by-side assemblies. --- dlls/msi/assembly.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 6ce020e..af23c4a 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -262,13 +262,13 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); - hr = IAssemblyCache_QueryAssemblyInfo( cache, QUERYASMINFO_FLAG_GETSIZE, display_name, &info ); - if (hr != HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) + hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, display_name, &info ); + if (hr == S_OK /* sxs version */ || hr == HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) { - TRACE("QueryAssemblyInfo returned 0x%08x\n", hr); - return FALSE; + return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); } - return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); + TRACE("QueryAssemblyInfo returned 0x%08x\n", hr); + return FALSE; } static const WCHAR clr_version_v10[] = {'v','1','.','0','.','3','7','0','5',0};

1 0

Henri Verbeet : ddraw: Replace a ERR in ddraw_surface7_QueryInterface() with a WARN.
by Alexandre Julliard March 30, 2012

March 30, 2012

Module: wine Branch: master Commit: a6230756121384ead6fca1308a42ae2fcd66ac99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6230756121384ead6fca1308… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 01:08:35 2012 +0200 ddraw: Replace a ERR in ddraw_surface7_QueryInterface() with a WARN. --- dlls/ddraw/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index bf36825..2178064 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -232,7 +232,8 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, return S_OK; } - ERR("No interface\n"); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + return E_NOINTERFACE; }

1 0

Henri Verbeet : ddraw: Get rid of a couple of redundant else-statements.
by Alexandre Julliard March 30, 2012

March 30, 2012

Module: wine Branch: master Commit: f3d1d4790c139e72b5440602fcf5eb2c7d8cec53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d1d4790c139e72b5440602f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 01:08:34 2012 +0200 ddraw: Get rid of a couple of redundant else-statements. --- dlls/ddraw/surface.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cca17ab..bf36825 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -150,44 +150,50 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, TRACE("(%p) returning IDirectDrawSurface7 interface at %p\n", This, *obj); return S_OK; } - else if (IsEqualGUID(riid, &IID_IDirectDrawSurface4)) + + if (IsEqualGUID(riid, &IID_IDirectDrawSurface4)) { IDirectDrawSurface4_AddRef(&This->IDirectDrawSurface4_iface); *obj = &This->IDirectDrawSurface4_iface; TRACE("(%p) returning IDirectDrawSurface4 interface at %p\n", This, *obj); return S_OK; } - else if (IsEqualGUID(riid, &IID_IDirectDrawSurface3)) + + if (IsEqualGUID(riid, &IID_IDirectDrawSurface3)) { IDirectDrawSurface3_AddRef(&This->IDirectDrawSurface3_iface); *obj = &This->IDirectDrawSurface3_iface; TRACE("(%p) returning IDirectDrawSurface3 interface at %p\n", This, *obj); return S_OK; } - else if (IsEqualGUID(riid, &IID_IDirectDrawSurface2)) + + if (IsEqualGUID(riid, &IID_IDirectDrawSurface2)) { IDirectDrawSurface2_AddRef(&This->IDirectDrawSurface2_iface); *obj = &This->IDirectDrawSurface2_iface; TRACE("(%p) returning IDirectDrawSurface2 interface at %p\n", This, *obj); return S_OK; } - else if (IsEqualGUID(riid, &IID_IDirectDrawSurface)) + + if (IsEqualGUID(riid, &IID_IDirectDrawSurface)) { IDirectDrawSurface_AddRef(&This->IDirectDrawSurface_iface); *obj = &This->IDirectDrawSurface_iface; TRACE("(%p) returning IDirectDrawSurface interface at %p\n", This, *obj); return S_OK; } - else if( IsEqualGUID(riid, &IID_IDirectDrawGammaControl) ) + + if (IsEqualGUID(riid, &IID_IDirectDrawGammaControl)) { IDirectDrawGammaControl_AddRef(&This->IDirectDrawGammaControl_iface); *obj = &This->IDirectDrawGammaControl_iface; TRACE("(%p) returning IDirectDrawGammaControl interface at %p\n", This, *obj); return S_OK; } - else if( IsEqualGUID(riid, &IID_D3DDEVICE_WineD3D) || - IsEqualGUID(riid, &IID_IDirect3DHALDevice)|| - IsEqualGUID(riid, &IID_IDirect3DRGBDevice) ) + + if (IsEqualGUID(riid, &IID_D3DDEVICE_WineD3D) + || IsEqualGUID(riid, &IID_IDirect3DHALDevice) + || IsEqualGUID(riid, &IID_IDirect3DRGBDevice)) { IDirect3DDevice7 *d3d; IDirect3DDeviceImpl *device_impl; @@ -208,8 +214,9 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, WARN("Unable to create a IDirect3DDevice instance, returning E_NOINTERFACE\n"); return E_NOINTERFACE; } - else if (IsEqualGUID( &IID_IDirect3DTexture, riid ) || - IsEqualGUID( &IID_IDirect3DTexture2, riid )) + + if (IsEqualGUID( &IID_IDirect3DTexture2, riid) + || IsEqualGUID(&IID_IDirect3DTexture, riid)) { if (IsEqualGUID( &IID_IDirect3DTexture, riid )) {

1 0

Christian Costa : dmusic: Add some tests for enumerating and creating ports .
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 997be9c4656f07771a7ddb46b4820aaf30a3e1ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=997be9c4656f07771a7ddb46b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 09:09:31 2012 +0200 dmusic: Add some tests for enumerating and creating ports. --- configure | 1 + configure.ac | 1 + dlls/dmusic/tests/Makefile.in | 7 +++ dlls/dmusic/tests/dmusic.c | 104 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 113 insertions(+), 0 deletions(-) diff --git a/configure b/configure index aab6618..2cb3166 100755 --- a/configure +++ b/configure @@ -15021,6 +15021,7 @@ wine_fn_config_dll dmscript enable_dmscript wine_fn_config_dll dmstyle enable_dmstyle wine_fn_config_dll dmsynth enable_dmsynth wine_fn_config_dll dmusic enable_dmusic +wine_fn_config_test dlls/dmusic/tests dmusic_test wine_fn_config_dll dmusic32 enable_dmusic32 implib wine_fn_config_dll dnsapi enable_dnsapi implib wine_fn_config_test dlls/dnsapi/tests dnsapi_test diff --git a/configure.ac b/configure.ac index 805825d..f55b2ff 100644 --- a/configure.ac +++ b/configure.ac @@ -2528,6 +2528,7 @@ WINE_CONFIG_DLL(dmscript) WINE_CONFIG_DLL(dmstyle) WINE_CONFIG_DLL(dmsynth) WINE_CONFIG_DLL(dmusic) +WINE_CONFIG_TEST(dlls/dmusic/tests) WINE_CONFIG_DLL(dmusic32,,[implib]) WINE_CONFIG_DLL(dnsapi,,[implib]) WINE_CONFIG_TEST(dlls/dnsapi/tests) diff --git a/dlls/dmusic/tests/Makefile.in b/dlls/dmusic/tests/Makefile.in new file mode 100644 index 0000000..3a762f2 --- /dev/null +++ b/dlls/dmusic/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = dmusic.dll +IMPORTS = oleaut32 ole32 uuid + +C_SRCS = \ + dmusic.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c new file mode 100644 index 0000000..043dd4d --- /dev/null +++ b/dlls/dmusic/tests/dmusic.c @@ -0,0 +1,104 @@ +/* + * Unit tests for dmusic functions + * + * Copyright (C) 2012 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdio.h> + +#include "wine/test.h" +#include "uuids.h" +#include "ole2.h" +#include "initguid.h" +#include "dmusici.h" + +static inline char* debugstr_guid(CONST GUID *id) +{ + static char string[39]; + sprintf(string, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + id->Data1, id->Data2, id->Data3, + id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], + id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); + return string; +} + +static void test_dmusic(void) +{ + IDirectMusic *dmusic = NULL; + HRESULT hr; + ULONG index = 0; + DMUS_PORTCAPS port_caps; + DMUS_PORTPARAMS port_params; + IDirectMusicPort *port = NULL; + + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); + if (hr != S_OK) + { + skip("Cannot create DirectMusic object (%x)\n", hr); + return; + } + + port_params.dwSize = sizeof(port_params); + port_params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS; + port_params.dwChannelGroups = 1; + port_params.dwAudioChannels = 2; + + /* No port can be created before SetDirectSound is called */ + hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, &port, NULL); + todo_wine ok(hr == DMUS_E_DSOUND_NOT_SET, "IDirectMusic_CreatePort returned: %x\n", hr); + + hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL); + ok(hr == S_OK, "IDirectMusic_SetDirectSound returned: %x\n", hr); + + /* Test creation of default port with GUID_NULL */ + hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, &port, NULL); + todo_wine ok(hr == S_OK, "IDirectMusic_CreatePort returned: %x\n", hr); + + port_caps.dwSize = sizeof(port_caps); + while (IDirectMusic_EnumPort(dmusic, index, &port_caps) == S_OK) + { + ok(port_caps.dwSize == sizeof(port_caps), "DMUS_PORTCAPS dwSize member is wrong (%u)\n", port_caps.dwSize); + trace("Port %u:\n", index); + trace(" dwFlags = %x\n", port_caps.dwFlags); + trace(" guidPort = %s\n", debugstr_guid(&port_caps.guidPort)); + trace(" dwClass = %u\n", port_caps.dwClass); + trace(" dwType = %u\n", port_caps.dwType); + trace(" dwMemorySize = %u\n", port_caps.dwMemorySize); + trace(" dwMaxChannelGroups = %u\n", port_caps.dwMaxChannelGroups); + trace(" dwMaxVoices = %u\n", port_caps.dwMaxVoices); + trace(" dwMaxAudioChannels = %u\n", port_caps.dwMaxAudioChannels); + trace(" dwEffectFlags = %x\n", port_caps.dwEffectFlags); + trace(" wszDescription = %s\n", wine_dbgstr_w(port_caps.wszDescription)); + index++; + } + + if (port) + IDirectMusicPort_Release(port); + if (dmusic) + IDirectMusic_Release(dmusic); +} + +START_TEST(dmusic) +{ + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + test_dmusic(); + + CoUninitialize(); +}

1 0

Christian Costa : d3drm: Partial implementation of IDirec3DRM: Load method + tests.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 756f29641b2762aa4b6fe8a718452223642e87cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=756f29641b2762aa4b6fe8a71… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 22:35:21 2012 +0200 d3drm: Partial implementation of IDirec3DRM:Load method + tests. --- dlls/d3drm/d3drm.c | 233 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d3drm/tests/d3drm.c | 56 +++++++++++ 2 files changed, 283 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=756f29641b2762aa4b6fe…

1 0

Christian Costa : d3drm: Move mesh loading code into a separate function so it can be shared.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: db0ad52b497887eb8860b1cb0895dd306d353a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=db0ad52b497887eb8860b1cb0… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 22:35:12 2012 +0200 d3drm: Move mesh loading code into a separate function so it can be shared. --- dlls/d3drm/d3drm_private.h | 11 ++ dlls/d3drm/meshbuilder.c | 222 ++++++++++++++++++++++++-------------------- 2 files changed, 131 insertions(+), 102 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 452f22f..8a74ee0 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -22,6 +22,7 @@ #define __D3DRM_PRIVATE_INCLUDED__ #include "d3drm.h" +#include "dxfile.h" HRESULT Direct3DRM_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; @@ -29,4 +30,14 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; +HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) DECLSPEC_HIDDEN; + +typedef struct { + WORD major; + WORD minor; + DWORD flags; +} Header; + +extern char templates[]; + #endif /* __D3DRM_PRIVATE_INCLUDED__ */ diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index b386cbf..398ce2c 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -52,13 +52,7 @@ typedef struct { Coords2d* pCoords2d; } IDirect3DRMMeshBuilderImpl; -typedef struct { - WORD major; - WORD minor; - DWORD flags; -} Header; - -static char templates[] = { +char templates[] = { "xof 0302txt 0064" "template Header" "{" @@ -1025,22 +1019,13 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetClassName(IDirect3DRMMeshBu return E_NOTIMPL; } -/*** IDirect3DRMMeshBuilder3 methods ***/ -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* iface, - LPVOID filename, LPVOID name, - D3DRMLOADOPTIONS loadflags, - D3DRMLOADTEXTURE3CALLBACK cb, LPVOID arg) +HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - DXFILELOADOPTIONS load_options; - LPDIRECTXFILE pDXFile = NULL; - LPDIRECTXFILEENUMOBJECT pEnumObject = NULL; - LPDIRECTXFILEDATA pData = NULL; LPDIRECTXFILEOBJECT pObject = NULL; LPDIRECTXFILEDATA pData2 = NULL; const GUID* pGuid; DWORD size; - Header* pHeader; LPBYTE ptr; HRESULT hr; HRESULT ret = D3DRMERR_BADOBJECT; @@ -1053,90 +1038,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* DWORD faces_data_size = 0; DWORD i; - TRACE("(%p)->(%p,%p,%x,%p,%p)\n", This, filename, name, loadflags, cb, arg); - - /* First free allocated buffers of previous mesh data */ - HeapFree(GetProcessHeap(), 0, This->pVertices); - This->pVertices = NULL; - HeapFree(GetProcessHeap(), 0, This->pNormals); - This->pNormals = NULL; - HeapFree(GetProcessHeap(), 0, This->pFaceData); - This->pFaceData = NULL; - HeapFree(GetProcessHeap(), 0, This->pCoords2d); - This->pCoords2d = NULL; - - if (loadflags == D3DRMLOAD_FROMMEMORY) - { - load_options = DXFILELOAD_FROMMEMORY; - } - else - { - FIXME("Load options %d not supported yet\n", loadflags); - return E_NOTIMPL; - } - - hr = DirectXFileCreate(&pDXFile); - if (hr != DXFILE_OK) - goto end; - - hr = IDirectXFile_RegisterTemplates(pDXFile, templates, strlen(templates)); - if (hr != DXFILE_OK) - goto end; - - hr = IDirectXFile_CreateEnumObject(pDXFile, filename, load_options, &pEnumObject); - if (hr != DXFILE_OK) - goto end; - - hr = IDirectXFileEnumObject_GetNextDataObject(pEnumObject, &pData); - if (hr != DXFILE_OK) - goto end; - - hr = IDirectXFileData_GetType(pData, &pGuid); - if (hr != DXFILE_OK) - goto end; - - TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); - - if (!IsEqualGUID(pGuid, &TID_DXFILEHeader)) - { - ret = D3DRMERR_BADFILE; - goto end; - } - - hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&pHeader); - if ((hr != DXFILE_OK) || (size != sizeof(Header))) - goto end; - - TRACE("Version is %d %d %d\n", pHeader->major, pHeader->minor, pHeader->flags); - - /* Version must be 1.0.x */ - if ((pHeader->major != 1) || (pHeader->minor != 0)) - { - ret = D3DRMERR_BADFILE; - goto end; - } - - IDirectXFileData_Release(pData); - pData = NULL; - - hr = IDirectXFileEnumObject_GetNextDataObject(pEnumObject, &pData); - if (hr != DXFILE_OK) - { - ret = D3DRMERR_NOTFOUND; - goto end; - } - - hr = IDirectXFileData_GetType(pData, &pGuid); - if (hr != DXFILE_OK) - goto end; - - TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); - - if (!IsEqualGUID(pGuid, &TID_D3DRMMesh)) - { - ret = D3DRMERR_NOTFOUND; - goto end; - } + TRACE("(%p)->(%p)\n", This, pData); hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); if (hr != DXFILE_OK) @@ -1170,7 +1072,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* if (hr != DXFILE_OK) goto end; - hr = IDirectXFileObject_QueryInterface(pObject, &IID_IDirectXFileData, (void**)&pData2); + hr = IDirectXFileObject_QueryInterface(pObject, &IID_IDirectXFileData, (void**)&pData2); IDirectXFileObject_Release(pObject); if (hr != DXFILE_OK) goto end; @@ -1285,11 +1187,127 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* } } + TRACE("Mesh data loaded successfully\n"); + ret = D3DRM_OK; end: + HeapFree(GetProcessHeap(), 0, faces_normal_idx_data); HeapFree(GetProcessHeap(), 0, faces_vertex_idx_data); + + return ret; +} + +/*** IDirect3DRMMeshBuilder3 methods ***/ +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* iface, + LPVOID filename, LPVOID name, + D3DRMLOADOPTIONS loadflags, + D3DRMLOADTEXTURE3CALLBACK cb, LPVOID arg) +{ + IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); + DXFILELOADOPTIONS load_options; + LPDIRECTXFILE pDXFile = NULL; + LPDIRECTXFILEENUMOBJECT pEnumObject = NULL; + LPDIRECTXFILEDATA pData = NULL; + LPDIRECTXFILEDATA pData2 = NULL; + const GUID* pGuid; + DWORD size; + Header* pHeader; + HRESULT hr; + HRESULT ret = D3DRMERR_BADOBJECT; + + TRACE("(%p)->(%p,%p,%x,%p,%p)\n", This, filename, name, loadflags, cb, arg); + + /* First free allocated buffers of previous mesh data */ + HeapFree(GetProcessHeap(), 0, This->pVertices); + This->pVertices = NULL; + HeapFree(GetProcessHeap(), 0, This->pNormals); + This->pNormals = NULL; + HeapFree(GetProcessHeap(), 0, This->pFaceData); + This->pFaceData = NULL; + HeapFree(GetProcessHeap(), 0, This->pCoords2d); + This->pCoords2d = NULL; + + if (loadflags == D3DRMLOAD_FROMMEMORY) + { + load_options = DXFILELOAD_FROMMEMORY; + } + else + { + FIXME("Load options %d not supported yet\n", loadflags); + return E_NOTIMPL; + } + + hr = DirectXFileCreate(&pDXFile); + if (hr != DXFILE_OK) + goto end; + + hr = IDirectXFile_RegisterTemplates(pDXFile, templates, strlen(templates)); + if (hr != DXFILE_OK) + goto end; + + hr = IDirectXFile_CreateEnumObject(pDXFile, filename, load_options, &pEnumObject); + if (hr != DXFILE_OK) + goto end; + + hr = IDirectXFileEnumObject_GetNextDataObject(pEnumObject, &pData); + if (hr != DXFILE_OK) + goto end; + + hr = IDirectXFileData_GetType(pData, &pGuid); + if (hr != DXFILE_OK) + goto end; + + TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); + + if (!IsEqualGUID(pGuid, &TID_DXFILEHeader)) + { + ret = D3DRMERR_BADFILE; + goto end; + } + + hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&pHeader); + if ((hr != DXFILE_OK) || (size != sizeof(Header))) + goto end; + + TRACE("Version is %d %d %d\n", pHeader->major, pHeader->minor, pHeader->flags); + + /* Version must be 1.0.x */ + if ((pHeader->major != 1) || (pHeader->minor != 0)) + { + ret = D3DRMERR_BADFILE; + goto end; + } + + IDirectXFileData_Release(pData); + pData = NULL; + + hr = IDirectXFileEnumObject_GetNextDataObject(pEnumObject, &pData); + if (hr != DXFILE_OK) + { + ret = D3DRMERR_NOTFOUND; + goto end; + } + + hr = IDirectXFileData_GetType(pData, &pGuid); + if (hr != DXFILE_OK) + goto end; + + TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); + + if (!IsEqualGUID(pGuid, &TID_D3DRMMesh)) + { + ret = D3DRMERR_NOTFOUND; + goto end; + } + + hr = load_mesh_data(iface, pData); + if (hr == S_OK) + ret = D3DRM_OK; + +end: + if (pData2) IDirectXFileData_Release(pData2); if (pData)

1 0

Dmitry Timoshkov : advapi32: Add tests for kernel objects accessed with 0 and ACCESS_SYSTEM_SECURITY.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 9c29e4210322afbeb4cc948083bb0078344e7191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c29e4210322afbeb4cc94808… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 16 18:31:11 2012 +0800 advapi32: Add tests for kernel objects accessed with 0 and ACCESS_SYSTEM_SECURITY. --- dlls/advapi32/tests/security.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7c5303d..0b653ff 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4060,6 +4060,26 @@ todo_wine { ok(status == 1, "expected 1, got %d\n", status); ok(granted == mapping->GenericAll, "expected %#x, got %#x\n", mapping->GenericAll, granted); } + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, 0, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 0 || broken(status == 1) /* NT4 */, "expected 0, got %d\n", status); + ok(granted == 0 || broken(granted == mapping->GenericRead) /* NT4 */, "expected 0, got %#x\n", granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, ACCESS_SYSTEM_SECURITY, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 0, "expected 0, got %d\n", status); + ok(granted == 0, "expected 0, got %#x\n", granted); +} HeapFree(GetProcessHeap(), 0, sd); }

1 0

Francois Gouget : cryptui: Use a single space after a full stop to follow the Windows GUI guidelines.
by Alexandre Julliard March 29, 2012

March 29, 2012

1 0

Józef Kucia : wpp: Fix a few memory leaks in the wpp_parse() function.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 2c8a3c31b732b048a05fcb3e9756b76f9a57e973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8a3c31b732b048a05fcb3e9… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Mar 25 15:53:31 2012 +0200 wpp: Fix a few memory leaks in the wpp_parse() function. --- libs/wpp/wpp.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 0c9c808..66eb026 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -49,6 +49,16 @@ static void add_cmdline_defines(void) } } +static void del_cmdline_defines(void) +{ + struct define *def; + + for (def = cmdline_defines; def; def = def->next) + { + if (def->value) pp_del_define( def->name ); + } +} + static void add_special_defines(void) { time_t now = time(NULL); @@ -70,6 +80,14 @@ static void add_special_defines(void) ppp->type = def_special; } +static void del_special_defines(void) +{ + pp_del_define( "__DATE__" ); + pp_del_define( "__TIME__" ); + pp_del_define( "__FILE__" ); + pp_del_define( "__LINE__" ); +} + /* add a define to the preprocessor list */ int wpp_add_define( const char *name, const char *value ) @@ -182,6 +200,8 @@ int wpp_parse( const char *input, FILE *output ) else if (!(pp_status.file = wpp_callbacks->open(input, 1))) { ppy_error("Could not open %s\n", input); + del_special_defines(); + del_cmdline_defines(); pp_pop_define_state(); return 2; } @@ -198,6 +218,8 @@ int wpp_parse( const char *input, FILE *output ) if (input) wpp_callbacks->close(pp_status.file); /* Clean if_stack, it could remain dirty on errors */ while (pp_get_if_depth()) pp_pop_if(); + del_special_defines(); + del_cmdline_defines(); pp_pop_define_state(); return ret; }

1 0