February 2010 - Wine-Commits

Maarten Lankhorst : includes: Fix typo in audiopolicy.idl.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: d326391e1edb865e90591e5db777a9fc6acb7f19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d326391e1edb865e90591e5db… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Jan 30 11:12:54 2010 +0100 includes: Fix typo in audiopolicy.idl. --- include/audiopolicy.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/audiopolicy.idl b/include/audiopolicy.idl index 1221a54..fad17f5 100644 --- a/include/audiopolicy.idl +++ b/include/audiopolicy.idl @@ -222,7 +222,7 @@ interface IAudioSessionEnumerator : IUnknown pointer_default(unique), object ] -interface IAudiosessionManager2 : IAudioSessionManager +interface IAudioSessionManager2 : IAudioSessionManager { HRESULT GetSessionEnumerator( [retval,out] IAudioSessionEnumerator **SessionEnum

1 0

Maarten Lankhorst : includes: Add propkey header.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 7d115f3a9efabde21e52b57d019fba103584eef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d115f3a9efabde21e52b57d0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jan 29 19:09:35 2010 +0100 includes: Add propkey header. --- include/Makefile.in | 1 + include/propkey.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 0c01cfd..b7de752 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -396,6 +396,7 @@ SRCDIR_INCLUDES = \ poppack.h \ powrprof.h \ profinfo.h \ + propkey.h \ propkeydef.h \ propvarutil.h \ prsht.h \ diff --git a/include/propkey.h b/include/propkey.h new file mode 100644 index 0000000..2a940d4 --- /dev/null +++ b/include/propkey.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2010 Maarten Lankhorst for Codeweavers + * + * 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 + */ + +#ifndef _INC_PROPKEY +#define _INC_PROPKEY + +#include <propkeydef.h> + +DEFINE_PROPERTYKEY(PKEY_Audio_ChannelCount, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 7); +DEFINE_PROPERTYKEY(PKEY_Audio_Compression, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 10); +DEFINE_PROPERTYKEY(PKEY_Audio_Format, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 2); +DEFINE_PROPERTYKEY(PKEY_Audio_IsVariableBitRate, 0xe6822fee, 0x8c17, 0x4d62, 0x82, 0x3c, 0x8e, 0x9c, 0xfc, 0xbd, 0x1d, 0x5c, 100); +DEFINE_PROPERTYKEY(PKEY_Audio_PeakValue, 0x2579e5d0, 0x1116, 0x4084, 0xbd, 0x9a, 0x9b, 0x4f, 0x7c, 0xb4, 0xdf, 0x5e, 100); +DEFINE_PROPERTYKEY(PKEY_Audio_SampleRate, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 5); +DEFINE_PROPERTYKEY(PKEY_Audio_SampleSize, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 6); +DEFINE_PROPERTYKEY(PKEY_Audio_StreamName, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 9); +DEFINE_PROPERTYKEY(PKEY_Audio_StreamNumber, 0x64440490, 0x4c8b, 0x11d1, 0x8b, 0x80, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03, 8); + +#endif /*_INC_PROPKEY*/

1 0

Alexandre Julliard : kernel32: Avoid truncating the output buffer length in GetCurrentDirectoryA.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 5f9f260e426cc7de9a7548b38c9a006e1338e6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f9f260e426cc7de9a7548b38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 13:22:41 2010 +0100 kernel32: Avoid truncating the output buffer length in GetCurrentDirectoryA. --- dlls/kernel32/path.c | 2 +- dlls/kernel32/tests/path.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index a304cb2..0a02681 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -76,7 +76,7 @@ static DWORD copy_filename_WtoA( LPCWSTR nameW, LPSTR buffer, DWORD len ) ANSI_STRING str; str.Buffer = buffer; - str.MaximumLength = len; + str.MaximumLength = min( len, UNICODE_STRING_MAX_CHARS ); if (is_ansi) RtlUnicodeStringToAnsiString( &str, &strW, FALSE ); else diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 4c0aac5..e533bd0 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -423,6 +423,7 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) static void test_CurrentDirectoryA(CHAR *origdir, CHAR *newdir) { CHAR tmpstr[MAX_PATH],tmpstr1[MAX_PATH]; + char *buffer; DWORD len,len1; /* Save the original directory, so that we can return to it at the end of the test @@ -437,6 +438,35 @@ static void test_CurrentDirectoryA(CHAR *origdir, CHAR *newdir) ok(len1==len+1, "GetCurrentDirectoryA returned %d instead of %d\n",len1,len+1); ok(lstrcmpiA(tmpstr,"aaaaaaa")==0, "GetCurrentDirectoryA should not have modified the buffer\n"); + + buffer = HeapAlloc( GetProcessHeap(), 0, 2 * 65536 ); + SetLastError( 0xdeadbeef ); + strcpy( buffer, "foo" ); + len = GetCurrentDirectoryA( 32767, buffer ); + ok( len != 0 && len < MAX_PATH, "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); + if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); + SetLastError( 0xdeadbeef ); + strcpy( buffer, "foo" ); + len = GetCurrentDirectoryA( 32768, buffer ); + ok( len != 0 && len < MAX_PATH, "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); + if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); + SetLastError( 0xdeadbeef ); + strcpy( buffer, "foo" ); + len = GetCurrentDirectoryA( 65535, buffer ); + ok( (len != 0 && len < MAX_PATH) || broken(!len), /* nt4, win2k, xp */ "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); + if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); + SetLastError( 0xdeadbeef ); + strcpy( buffer, "foo" ); + len = GetCurrentDirectoryA( 65536, buffer ); + ok( (len != 0 && len < MAX_PATH) || broken(!len), /* nt4 */ "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); + if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); + SetLastError( 0xdeadbeef ); + strcpy( buffer, "foo" ); + len = GetCurrentDirectoryA( 2 * 65536, buffer ); + ok( (len != 0 && len < MAX_PATH) || broken(!len), /* nt4 */ "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); + if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); + HeapFree( GetProcessHeap(), 0, buffer ); + /* SetCurrentDirectoryA shouldn't care whether the string has a trailing '\\' or not */

1 0

Paul Vriens : dxgi/tests: Fix a test failure when no adapters are present.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: a9113f7b3ca3209be08d63a28442394494182831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9113f7b3ca3209be08d63a28… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Feb 1 09:35:30 2010 +0100 dxgi/tests: Fix a test failure when no adapters are present. --- dlls/dxgi/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index d4ca50b..4d2ac14 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -36,7 +36,9 @@ static IDXGIDevice *create_device(HMODULE d3d10core) if (FAILED(hr)) goto cleanup; hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); - ok(SUCCEEDED(hr), "EnumAdapters failed, hr %#x\n", hr); + ok(SUCCEEDED(hr) || + hr == DXGI_ERROR_NOT_FOUND, /* Some VMware and VirtualBox */ + "EnumAdapters failed, hr %#x\n", hr); if (FAILED(hr)) goto cleanup; hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, NULL, (void **)&device);

1 0

Alexandre Julliard : kernel: Only start the BIOS timer if there is an actual access to selector 0x40.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 76e5c012095e8f0352c5a645f8fadfac48539e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=76e5c012095e8f0352c5a645f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 12:58:29 2010 +0100 kernel: Only start the BIOS timer if there is an actual access to selector 0x40. --- dlls/krnl386.exe16/dosexe.h | 1 + dlls/krnl386.exe16/dosmem.c | 14 +++++++++++++- dlls/krnl386.exe16/instr.c | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.h b/dlls/krnl386.exe16/dosexe.h index d25a411..fa73207 100644 --- a/dlls/krnl386.exe16/dosexe.h +++ b/dlls/krnl386.exe16/dosexe.h @@ -393,6 +393,7 @@ extern DOSCONF *DOSCONF_GetConfig( void ); /* dosmem.c */ extern BIOSDATA *DOSVM_BiosData( void ); +extern void DOSVM_start_bios_timer(void); /* fpu.c */ extern void WINAPI DOSVM_Int34Handler(CONTEXT86*); diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c index c73faf1..e9acd66 100644 --- a/dlls/krnl386.exe16/dosmem.c +++ b/dlls/krnl386.exe16/dosmem.c @@ -264,6 +264,19 @@ static DWORD CALLBACK timer_thread( void *arg ) } /*********************************************************************** + * DOSVM_start_bios_timer + * + * Start the BIOS ticks timer when the app accesses selector 0x40. + */ +void DOSVM_start_bios_timer(void) +{ + static LONG running; + + if (!InterlockedExchange( &running, 1 )) + CloseHandle( CreateThread( NULL, 0, timer_thread, DOSVM_BiosData(), 0, NULL )); +} + +/*********************************************************************** * DOSMEM_Collapse * * Helper function for internal use only. @@ -335,7 +348,6 @@ BOOL DOSMEM_InitDosMemory(void) DOSMEM_Available()); DOSVM_InitSegments(); - CloseHandle( CreateThread( NULL, 0, timer_thread, DOSVM_BiosData(), 0, NULL )); SetEvent( hRunOnce ); done = 1; diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c index 6ba985c..a1eb68c 100644 --- a/dlls/krnl386.exe16/instr.c +++ b/dlls/krnl386.exe16/instr.c @@ -104,6 +104,7 @@ static BOOL INSTR_ReplaceSelector( CONTEXT86 *context, WORD *sel ) { if (*sel == 0x40) { + DOSVM_start_bios_timer(); *sel = DOSMEM_BiosDataSeg; return TRUE; }

1 0

Paul Vriens : wininet/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 6c136e862b7f538be3420751b6c1229a7f46c97d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c136e862b7f538be3420751b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Feb 1 09:59:16 2010 +0100 wininet/tests: Fix some memory leaks (Valgrind). --- dlls/wininet/tests/internet.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 5885eb0..fa28b0c 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -934,6 +934,7 @@ static void test_Option_PerConnectionOption(void) list.pOptions[1].Value.dwValue); verifyProxyEnable(1); + HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); /* disable the proxy server */ @@ -1060,6 +1061,7 @@ static void test_Option_PerConnectionOptionA(void) "Retrieved flags should've been PROXY_TYPE_PROXY, was: %d\n", list.pOptions[1].Value.dwValue); + HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); /* restore original settings */

1 0

Christian Costa : d3drm: Implement partially IDirect3DRMMeshBuilderImpl_Load.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 4296852b8873e2fc13b01259bbffc1dbfeaa3f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4296852b8873e2fc13b01259b… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 1 08:18:48 2010 +0100 d3drm: Implement partially IDirect3DRMMeshBuilderImpl_Load. --- dlls/d3drm/Makefile.in | 2 +- dlls/d3drm/meshbuilder.c | 287 +++++++++++++++++++++++++++++++++++++++++++++- dlls/d3drm/tests/d3drm.c | 4 +- 3 files changed, 288 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in index 4dfd89c..01f28f0 100644 --- a/dlls/d3drm/Makefile.in +++ b/dlls/d3drm/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3drm.dll IMPORTLIB = d3drm -IMPORTS = dxguid uuid kernel32 +IMPORTS = dxguid uuid d3dxof kernel32 C_SRCS = \ d3drm.c \ diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index b2ef539..ecf7d4f 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "wingdi.h" +#include "dxfile.h" #include "d3drm_private.h" #include "d3drm.h" @@ -40,6 +41,229 @@ typedef struct { static const struct IDirect3DRMMeshBuilderVtbl Direct3DRMMeshBuilder_Vtbl; +static const GUID GUID_Mesh = { 0x3D82AB44, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; + +static char templates[] = { +"xof 0302txt 0064" +"template Header" +"{" +"<3D82AB43-62DA-11CF-AB39-0020AF71E433>" +"WORD major;" +"WORD minor;" +"DWORD flags;" +"}" +"template Vector" +"{" +"<3D82AB5E-62DA-11CF-AB39-0020AF71E433>" +"FLOAT x;" +"FLOAT y;" +"FLOAT z;" +"}" +"template Coords2d" +"{" +"<F6F23F44-7686-11CF-8F52-0040333594A3>" +"FLOAT u;" +"FLOAT v;" +"}" +"template Matrix4x4" +"{" +"<F6F23F45-7686-11CF-8F52-0040333594A3>" +"array FLOAT matrix[16];" +"}" +"template ColorRGBA" +"{" +"<35FF44E0-6C7C-11CF-8F52-0040333594A3>" +"FLOAT red;" +"FLOAT green;" +"FLOAT blue;" +"FLOAT alpha;" +"}" +"template ColorRGB" +"{" +"<D3E16E81-7835-11CF-8F52-0040333594A3>" +"FLOAT red;" +"FLOAT green;" +"FLOAT blue;" +"}" +"template IndexedColor" +"{" +"<1630B820-7842-11CF-8F52-0040333594A3>" +"DWORD index;" +"ColorRGBA indexColor;" +"}" +"template Boolean" +"{" +"<537DA6A0-CA37-11D0-941C-0080C80CFA7B>" +"DWORD truefalse;" +"}" +"template Boolean2d" +"{" +"<4885AE63-78E8-11CF-8F52-0040333594A3>" +"Boolean u;" +"Boolean v;" +"}" +"template MaterialWrap" +"{" +"<4885AE60-78E8-11CF-8F52-0040333594A3>" +"Boolean u;" +"Boolean v;" +"}" +"template TextureFilename" +"{" +"<A42790E1-7810-11CF-8F52-0040333594A3>" +"STRING filename;" +"}" +"template Material" +"{" +"<3D82AB4D-62DA-11CF-AB39-0020AF71E433>" +"ColorRGBA faceColor;" +"FLOAT power;" +"ColorRGB specularColor;" +"ColorRGB emissiveColor;" +"[...]" +"}" +"template MeshFace" +"{" +"<3D82AB5F-62DA-11CF-AB39-0020AF71E433>" +"DWORD nFaceVertexIndices;" +"array DWORD faceVertexIndices[nFaceVertexIndices];" +"}" +"template MeshFaceWraps" +"{" +"<ED1EC5C0-C0A8-11D0-941C-0080C80CFA7B>" +"DWORD nFaceWrapValues;" +"array Boolean2d faceWrapValues[nFaceWrapValues];" +"}" +"template MeshTextureCoords" +"{" +"<F6F23F40-7686-11CF-8F52-0040333594A3>" +"DWORD nTextureCoords;" +"array Coords2d textureCoords[nTextureCoords];" +"}" +"template MeshMaterialList" +"{" +"<F6F23F42-7686-11CF-8F52-0040333594A3>" +"DWORD nMaterials;" +"DWORD nFaceIndexes;" +"array DWORD faceIndexes[nFaceIndexes];" +"[Material]" +"}" +"template MeshNormals" +"{" +"<F6F23F43-7686-11CF-8F52-0040333594A3>" +"DWORD nNormals;" +"array Vector normals[nNormals];" +"DWORD nFaceNormals;" +"array MeshFace faceNormals[nFaceNormals];" +"}" +"template MeshVertexColors" +"{" +"<1630B821-7842-11CF-8F52-0040333594A3>" +"DWORD nVertexColors;" +"array IndexedColor vertexColors[nVertexColors];" +"}" +"template Mesh" +"{" +"<3D82AB44-62DA-11CF-AB39-0020AF71E433>" +"DWORD nVertices;" +"array Vector vertices[nVertices];" +"DWORD nFaces;" +"array MeshFace faces[nFaces];" +"[...]" +"}" +"template FrameTransformMatrix" +"{" +"<F6F23F41-7686-11CF-8F52-0040333594A3>" +"Matrix4x4 frameMatrix;" +"}" +"template Frame" +"{" +"<3D82AB46-62DA-11CF-AB39-0020AF71E433>" +"[...]" +"}" +"template FloatKeys" +"{" +"<10DD46A9-775B-11CF-8F52-0040333594A3>" +"DWORD nValues;" +"array FLOAT values[nValues];" +"}" +"template TimedFloatKeys" +"{" +"<F406B180-7B3B-11CF-8F52-0040333594A3>" +"DWORD time;" +"FloatKeys tfkeys;" +"}" +"template AnimationKey" +"{" +"<10DD46A8-775B-11CF-8F52-0040333594A3>" +"DWORD keyType;" +"DWORD nKeys;" +"array TimedFloatKeys keys[nKeys];" +"}" +"template AnimationOptions" +"{" +"<E2BF56C0-840F-11CF-8F52-0040333594A3>" +"DWORD openclosed;" +"DWORD positionquality;" +"}" +"template Animation" +"{" +"<3D82AB4F-62DA-11CF-AB39-0020AF71E433>" +"[...]" +"}" +"template AnimationSet" +"{" +"<3D82AB50-62DA-11CF-AB39-0020AF71E433>" +"[Animation]" +"}" +"template InlineData" +"{" +"<3A23EEA0-94B1-11D0-AB39-0020AF71E433>" +"[BINARY]" +"}" +"template Url" +"{" +"<3A23EEA1-94B1-11D0-AB39-0020AF71E433>" +"DWORD nUrls;" +"array STRING urls[nUrls];" +"}" +"template ProgressiveMesh" +"{" +"<8A63C360-997D-11D0-941C-0080C80CFA7B>" +"[Url,InlineData]" +"}" +"template Guid" +"{" +"<A42790E0-7810-11CF-8F52-0040333594A3>" +"DWORD data1;" +"WORD data2;" +"WORD data3;" +"array UCHAR data4[8];" +"}" +"template StringProperty" +"{" +"<7F0F21E0-BFE1-11D1-82C0-00A0C9697271>" +"STRING key;" +"STRING value;" +"}" +"template PropertyBag" +"{" +"<7F0F21E1-BFE1-11D1-82C0-00A0C9697271>" +"[StringProperty]" +"}" +"template ExternalVisual" +"{" +"<98116AA0-BDBA-11D1-82C0-00A0C9697271>" +"Guid guidExternalVisual;" +"[...]" +"}" +"template RightHanded" +"{" +"<7F5D5EA0-D53A-11D1-82C0-00A0C9697271>" +"DWORD bRightHanded;" +"}" +}; + HRESULT Direct3DRMMeshBuilder_create(LPDIRECT3DRMMESHBUILDER* ppMeshBuilder) { IDirect3DRMMeshBuilderImpl* object; @@ -179,10 +403,69 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_GetClassName(IDirect3DRMMeshBui static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* iface, LPVOID filename, LPVOID name, D3DRMLOADOPTIONS loadflags, D3DRMLOADTEXTURECALLBACK cb, LPVOID pArg) { IDirect3DRMMeshBuilderImpl *This = (IDirect3DRMMeshBuilderImpl *)iface; + DXFILELOADOPTIONS load_options; + LPDIRECTXFILE pDXFile = NULL; + LPDIRECTXFILEENUMOBJECT pEnumObject = NULL; + LPDIRECTXFILEDATA pData = NULL; + const GUID* pGuid; + HRESULT hr; + HRESULT ret = D3DRMERR_BADOBJECT; - FIXME("(%p)->(%p,%p,%x,%p,%p): stub\n", This, filename, name, loadflags, cb, pArg); + FIXME("(%p)->(%p,%p,%x,%p,%p): partial stub\n", This, filename, name, loadflags, cb, pArg); - return E_NOTIMPL; + if (loadflags == D3DRMLOAD_FROMMEMORY) + { + DXFILELOADMEMORY info; + LPD3DRMLOADMEMORY pinfo = (LPD3DRMLOADMEMORY)filename; + info.lpMemory = pinfo->lpMemory; + info.dSize = pinfo->dSize; + 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, sizeof(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, &GUID_Mesh)) + { + ret = D3DRMERR_BADFILE; + goto end; + } + + ret = D3DRM_OK; + +end: + if (pData) + IDirectXFileData_Release(pData); + if (pEnumObject) + IDirectXFileEnumObject_Release(pEnumObject); + if (pDXFile) + IDirectXFile_Release(pDXFile); + + return ret; } static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Save(IDirect3DRMMeshBuilder* iface, const char *filename, D3DRMXOFFORMAT format, D3DRMSAVEOPTIONS save) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0d8e342..9e74c12 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -78,12 +78,12 @@ void Test(void) info.lpMemory = data_bad; info.dSize = sizeof(data_bad); hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); - todo_wine ok(hr == D3DRMERR_BADFILE, "Sould have returned D3DRMERR_BADFILE (hr = %x)\n", hr); + ok(hr == D3DRMERR_BADFILE, "Sould have returned D3DRMERR_BADFILE (hr = %x)\n", hr); info.lpMemory = data_ok; info.dSize = sizeof(data_ok); hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); - todo_wine ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); IDirect3DRMMeshBuilder_Release(pMeshBuilder);

1 0

Christian Costa : d3drm: Add some tests.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: aaf2ef418e92021114c97fa36cbeae9f452d93fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf2ef418e92021114c97fa36… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 1 08:18:42 2010 +0100 d3drm: Add some tests. --- dlls/d3drm/tests/Makefile.in | 4 +- dlls/d3drm/tests/d3drm.c | 101 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in index 1c94038..f234119 100644 --- a/dlls/d3drm/tests/Makefile.in +++ b/dlls/d3drm/tests/Makefile.in @@ -5,7 +5,9 @@ VPATH = @srcdir@ TESTDLL = d3drm.dll IMPORTS = kernel32 -CTESTS = vector.c +CTESTS = \ + d3drm.c \ + vector.c @MAKE_TEST_RULES@ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c new file mode 100644 index 0000000..0d8e342 --- /dev/null +++ b/dlls/d3drm/tests/d3drm.c @@ -0,0 +1,101 @@ +/* + * Copyright 2010 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 + */ + +#include "d3drm.h" + +#include "wine/test.h" + +static HMODULE d3drm_handle = 0; + +static HRESULT (WINAPI * pDirect3DRMCreate)(LPDIRECT3DRM* ppDirect3DRM); + +#define D3DRM_GET_PROC(func) \ + p ## func = (void*)GetProcAddress(d3drm_handle, #func); \ + if(!p ## func) { \ + trace("GetProcAddress(%s) failed\n", #func); \ + FreeLibrary(d3drm_handle); \ + return FALSE; \ + } + +static BOOL InitFunctionPtrs(void) +{ + d3drm_handle = LoadLibraryA("d3drm.dll"); + + if(!d3drm_handle) + { + skip("Could not load d3drm.dll\n"); + return FALSE; + } + + D3DRM_GET_PROC(Direct3DRMCreate) + + return TRUE; +} + +char data_ok[] = +"xof 0302txt 0064\n" +"Mesh Object\n" +"{\n" +"0;\n" +"0;\n" +"}\n"; + +char data_bad[] = +"xof 0302txt 0064\n" +"Header Object\n" +"{\n" +"1; 2; 3;\n" +"}\n"; + +void Test(void) +{ + HRESULT hr; + LPDIRECT3DRM pD3DRM; + LPDIRECT3DRMMESHBUILDER pMeshBuilder; + D3DRMLOADMEMORY info; + + hr = pDirect3DRMCreate(&pD3DRM); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateMeshBuilder(pD3DRM, &pMeshBuilder); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); + + info.lpMemory = data_bad; + info.dSize = sizeof(data_bad); + hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + todo_wine ok(hr == D3DRMERR_BADFILE, "Sould have returned D3DRMERR_BADFILE (hr = %x)\n", hr); + + info.lpMemory = data_ok; + info.dSize = sizeof(data_ok); + hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + todo_wine ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + + IDirect3DRMMeshBuilder_Release(pMeshBuilder); + + IDirect3DRM_Release(pD3DRM); +} + +START_TEST(d3drm) +{ + if (!InitFunctionPtrs()) + return; + + Test(); + + FreeLibrary(d3drm_handle); +}

1 0

Paul Vriens : d3d10core/tests: Fix a test failure when no adapters are present.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 7cc429312eef0aa6d33fc1e204c6903cd6b63f9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc429312eef0aa6d33fc1e20… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Feb 1 09:35:22 2010 +0100 d3d10core/tests: Fix a test failure when no adapters are present. --- dlls/d3d10core/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 122a154..7ad8bb6 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -35,7 +35,9 @@ static ID3D10Device *create_device(void) if (FAILED(hr)) goto cleanup; hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); - ok(SUCCEEDED(hr), "EnumAdapters failed, hr %#x\n", hr); + ok(SUCCEEDED(hr) || + hr == DXGI_ERROR_NOT_FOUND, /* Some VMware and VirtualBox */ + "EnumAdapters failed, hr %#x\n", hr); if (FAILED(hr)) goto cleanup; hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device);

1 0

Christian Costa : d3dxof: Do not expect a separator when there is no element.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 4d79c2630676a461b447bb4993ed03212555f9c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d79c2630676a461b447bb499… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 1 08:18:30 2010 +0100 d3dxof: Do not expect a separator when there is no element. --- dlls/d3dxof/parsing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index ac3d4bd..c2ffdff 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1161,7 +1161,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) } } - if (buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE)) + if (nb_elems && buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE)) { token = get_TOKEN(buf); if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA))

1 0