December 2008 - Wine-commits

Christian Costa : amstream: Implement IDirectDrawMediaStream.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 039c15a60aca2cff966018f87d622515037da038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=039c15a60aca2cff966018f87… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 14 19:06:49 2008 +0100 amstream: Implement IDirectDrawMediaStream. --- dlls/amstream/amstream.c | 6 ++- dlls/amstream/amstream_private.h | 1 + dlls/amstream/mediastream.c | 125 +++++++++++++++++++++++++++++++++++++- 3 files changed, 130 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 692403b..384b342 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -257,7 +257,11 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream FIXME("(%p/%p)->(%p,%p,%x,%p) partial stub!\n", This, iface, pStreamObject, PurposeId, dwFlags, ppNewStream); - hr = MediaStream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); + if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) + hr = DirectDrawMediaStream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); + else + hr = MediaStream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); + if (SUCCEEDED(hr)) { pNewStreams = CoTaskMemAlloc((This->nbStreams+1)*sizeof(IMediaStream*)); diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index cb457f9..d5efa6c 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -36,5 +36,6 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj); HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream); +HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream); #endif /* __AMSTREAM_PRIVATE_INCLUDED__ */ diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 2cb7ce6..01ee926 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -1,7 +1,7 @@ /* * Implementation of IMediaStream Interface * - * Copyright 2005 Christian Costa + * Copyright 2005, 2008 Christian Costa * * This file contains the (internal) driver registration functions, * driver enumeration APIs and DirectDraw creation functions. @@ -31,6 +31,8 @@ #include "amstream_private.h" #include "amstream.h" +#include "ddstream.h" + WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { @@ -41,7 +43,16 @@ typedef struct { STREAM_TYPE StreamType; } IMediaStreamImpl; +typedef struct { + IDirectDrawMediaStream lpVtbl; + LONG ref; + IMultiMediaStream* Parent; + MSPID PurposeId; + STREAM_TYPE StreamType; +} IDirectDrawMediaStreamImpl; + static const struct IMediaStreamVtbl MediaStream_Vtbl; +static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl; HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream) { @@ -177,3 +188,115 @@ static const struct IMediaStreamVtbl MediaStream_Vtbl = IMediaStreamImpl_CreateSharedSample, IMediaStreamImpl_SendEndOfStream }; + +HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream) +{ + IDirectDrawMediaStreamImpl* object; + + TRACE("(%p,%p,%p)\n", Parent, pPurposeId, ppMediaStream); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl)); + + object->lpVtbl.lpVtbl = &DirectDrawMediaStream_Vtbl; + object->ref = 1; + + object->Parent = Parent; + object->PurposeId = *pPurposeId; + object->StreamType = StreamType; + + *ppMediaStream = (IMediaStream*)object; + + return S_OK; +} + +static HRESULT WINAPI IDirectDrawMediaStreamImpl_QueryInterface(IDirectDrawMediaStream* iface, REFIID riid, void** ppvObject) +{ + IMediaStreamImpl *This = (IMediaStreamImpl *)iface; + + TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMediaStream) || + IsEqualGUID(riid, &IID_IDirectDrawMediaStream)) + { + IClassFactory_AddRef(iface); + *ppvObject = This; + return S_OK; + } + + ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); + return E_NOINTERFACE; +} + +static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetFormat(IDirectDrawMediaStream* iface, DDSURFACEDESC *pDDSDCurrent, + IDirectDrawPalette **ppDirectDrawPalette, DDSURFACEDESC *pDDSDDesired, DWORD *pdwFlags) +{ + FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, pDDSDCurrent, ppDirectDrawPalette, pDDSDDesired, pdwFlags); + + return E_NOTIMPL; + +} + +static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetFormat(IDirectDrawMediaStream* iface, const DDSURFACEDESC *pDDSurfaceDesc, + IDirectDrawPalette *pDirectDrawPalette) +{ + FIXME("(%p)->(%p,%p) stub!\n", iface, pDDSurfaceDesc, pDirectDrawPalette); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetDirectDraw(IDirectDrawMediaStream* iface, IDirectDraw **ppDirectDraw) +{ + FIXME("(%p)->(%p) stub!\n", iface, ppDirectDraw); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetDirectDraw(IDirectDrawMediaStream* iface, IDirectDraw *pDirectDraw) +{ + FIXME("(%p)->(%p) stub!\n", iface, pDirectDraw); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirectDrawMediaStreamImpl_CreateSample(IDirectDrawMediaStream* iface, IDirectDrawSurface *pSurface, const RECT *pRect, + DWORD dwFlags, IDirectDrawStreamSample **ppSample) +{ + FIXME("(%p)->(%p,%p,%x,%p) stub!\n", iface, pSurface, pRect, dwFlags, ppSample); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetTimePerFrame(IDirectDrawMediaStream* iface, STREAM_TIME *pFrameTime) +{ + FIXME("(%p)->(%p) stub!\n", iface, pFrameTime); + + return E_NOTIMPL; +} + +/* Note: Hack so we can reuse the old functions without compiler warnings */ +#if !defined(__STRICT_ANSI__) && defined(__GNUC__) +# define XCAST(fun) (typeof(DirectDrawMediaStream_Vtbl.fun)) +#else +# define XCAST(fun) (void*) +#endif + +static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl = +{ + IDirectDrawMediaStreamImpl_QueryInterface, + XCAST(AddRef)IMediaStreamImpl_AddRef, + XCAST(Release)IMediaStreamImpl_Release, + XCAST(GetMultiMediaStream)IMediaStreamImpl_GetMultiMediaStream, + XCAST(GetInformation)IMediaStreamImpl_GetInformation, + XCAST(SetSameFormat)IMediaStreamImpl_SetSameFormat, + XCAST(AllocateSample)IMediaStreamImpl_AllocateSample, + XCAST(CreateSharedSample)IMediaStreamImpl_CreateSharedSample, + XCAST(SendEndOfStream)IMediaStreamImpl_SendEndOfStream, + IDirectDrawMediaStreamImpl_GetFormat, + IDirectDrawMediaStreamImpl_SetFormat, + IDirectDrawMediaStreamImpl_GetDirectDraw, + IDirectDrawMediaStreamImpl_SetDirectDraw, + IDirectDrawMediaStreamImpl_CreateSample, + IDirectDrawMediaStreamImpl_GetTimePerFrame +}; +#undef XCAST

1 0

Christian Costa : dmime: Improve IDirectMusicPerformance8Impl_PlaySegment( Ex) stubs.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 7ed6f0a643138ff1253e46dd17725a8fc002470a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ed6f0a643138ff1253e46dd1… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 14 19:00:15 2008 +0100 dmime: Improve IDirectMusicPerformance8Impl_PlaySegment(Ex) stubs. --- dlls/dmime/performance.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 0523cd7..b98652d 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -253,6 +253,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegment (LPDIRECTMUSICPER IDirectMusicPerformance8Impl *This = (IDirectMusicPerformance8Impl *)iface; FIXME("(%p, %p, %d, 0x%s, %p): stub\n", This, pSegment, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState); + if (ppSegmentState) + return DMUSIC_CreateDirectMusicSegmentStateImpl(&IID_IDirectMusicSegmentState, (LPVOID*)ppSegmentState, NULL); return S_OK; } @@ -787,7 +789,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegmentEx (LPDIRECTMUSICP IDirectMusicPerformance8Impl *This = (IDirectMusicPerformance8Impl *)iface; FIXME("(%p, %p, %p, %p, %d, 0x%s, %p, %p, %p): stub\n", This, pSource, pwzSegmentName, pTransition, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState, pFrom, pAudioPath); - return DMUS_E_SEGMENT_INIT_FAILED; + if (ppSegmentState) + return DMUSIC_CreateDirectMusicSegmentStateImpl(&IID_IDirectMusicSegmentState, (LPVOID*)ppSegmentState, NULL); + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_StopEx (LPDIRECTMUSICPERFORMANCE8 iface, IUnknown* pObjectToStop, __int64 i64StopTime, DWORD dwFlags) {

1 0

Christian Costa : dplayx: Fix typo.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 34f6afdf89e7887b9ae7a94c1bb3e052dd1b1d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f6afdf89e7887b9ae7a94c1… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 14 18:58:59 2008 +0100 dplayx: Fix typo. --- dlls/dplayx/dplobby.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 901c375..bd620a4 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -1834,7 +1834,7 @@ static const IDirectPlayLobby2Vtbl directPlayLobby2AVT = /* Note: Hack so we can reuse the old functions without compiler warnings */ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlayLobby2AVT.fun)) +# define XCAST(fun) (typeof(directPlayLobby2WVT.fun)) #else # define XCAST(fun) (void*) #endif

1 0

Christian Costa : d3dxof: Increase string buffer size.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 0f840ba98bca638336fc0a99819307d842c4aff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f840ba98bca638336fc0a998… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 14 18:57:31 2008 +0100 d3dxof: Increase string buffer size. --- dlls/d3dxof/d3dxof_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 798097f..55acce1 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -40,7 +40,7 @@ #define MAX_TEMPLATES 200 #define MAX_OBJECTS 500 #define MAX_SUBOBJECTS 500 -#define MAX_STRINGS_BUFFER 1000 +#define MAX_STRINGS_BUFFER 10000 typedef struct { DWORD type;

1 0

Christian Costa : d3dxof: Improve error handling.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 044701357262808fc4cd17366e2110e2ddd27f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=044701357262808fc4cd17366… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 14 18:55:10 2008 +0100 d3dxof: Improve error handling. --- dlls/d3dxof/d3dxof.c | 42 +++++++++++++++++++++++++++++++----------- 1 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 4be62bd..25334c2 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -147,7 +147,12 @@ HRESULT IDirectXFileImpl_Create(IUnknown* pUnkOuter, LPVOID* ppObj) TRACE("(%p,%p)\n", pUnkOuter, ppObj); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileImpl)); - + if (!object) + { + ERR("Out of memory\n"); + return DXFILEERR_BADALLOC; + } + object->lpVtbl.lpVtbl = &IDirectXFile_Vtbl; object->ref = 1; @@ -310,7 +315,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV object->buf.buffer = HeapAlloc(GetProcessHeap(), 0, MAX_INPUT_SIZE+1); if (!object->buf.buffer) { - WARN("Out of memory\n"); + ERR("Out of memory\n"); hr = DXFILEERR_BADALLOC; goto error; } @@ -1452,7 +1457,12 @@ static HRESULT IDirectXFileDataImpl_Create(IDirectXFileDataImpl** ppObj) TRACE("(%p)\n", ppObj); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileDataImpl)); - + if (!object) + { + ERR("Out of memory\n"); + return DXFILEERR_BADALLOC; + } + object->lpVtbl.lpVtbl = &IDirectXFileData_Vtbl; object->ref = 1; @@ -1597,8 +1607,8 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface IDirectXFileDataReferenceImpl *object; hr = IDirectXFileDataReferenceImpl_Create(&object); - if (hr != S_OK) - return DXFILEERR_BADVALUE; + if (FAILED(hr)) + return hr; object->ptarget = This->pobj->childs[This->cur_enum_object++]->ptarget; @@ -1609,8 +1619,8 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface IDirectXFileDataImpl *object; hr = IDirectXFileDataImpl_Create(&object); - if (hr != S_OK) - return DXFILEERR_BADVALUE; + if (FAILED(hr)) + return hr; object->pobj = This->pobj->childs[This->cur_enum_object++]; object->cur_enum_object = 0; @@ -1672,6 +1682,11 @@ static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImp TRACE("(%p)\n", ppObj); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileDataReferenceImpl)); + if (!object) + { + ERR("Out of memory\n"); + return DXFILEERR_BADALLOC; + } object->lpVtbl.lpVtbl = &IDirectXFileDataReference_Vtbl; object->ref = 1; @@ -1770,8 +1785,8 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_Resolve(IDirectXFileDataRefe return DXFILEERR_BADVALUE; hr = IDirectXFileDataImpl_Create(&object); - if (hr != S_OK) - return DXFILEERR_BADVALUE; + if (FAILED(hr)) + return hr; object->pobj = This->ptarget; object->cur_enum_object = 0; @@ -1800,6 +1815,11 @@ static HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** pp TRACE("(%p)\n", ppObj); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileEnumObjectImpl)); + if (!object) + { + ERR("Out of memory\n"); + return DXFILEERR_BADALLOC; + } object->lpVtbl.lpVtbl = &IDirectXFileEnumObject_Vtbl; object->ref = 1; @@ -2192,7 +2212,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE pdata = HeapAlloc(GetProcessHeap(), 0, MAX_DATA_SIZE); if (!pdata) { - WARN("Out of memory\n"); + ERR("Out of memory\n"); return DXFILEERR_BADALLOC; } This->buf.cur_pdata = This->buf.pdata = pdata; @@ -2200,7 +2220,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE pstrings = HeapAlloc(GetProcessHeap(), 0, MAX_STRINGS_BUFFER); if (!pstrings) { - WARN("Out of memory\n"); + ERR("Out of memory\n"); HeapFree(GetProcessHeap(), 0, This->buf.pxo->pdata); return DXFILEERR_BADALLOC; }

1 0

Christian Costa : d3dxof: Add a test to dump an X object data ( enabled when objects.txt and templates.txt are present).
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 32ab7d298ffac98b687d369e8b9fe87f79b76be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32ab7d298ffac98b687d369e8… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 14 18:53:15 2008 +0100 d3dxof: Add a test to dump an X object data (enabled when objects.txt and templates.txt are present). --- dlls/d3dxof/tests/d3dxof.c | 181 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 181 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index bdc1431..4bd52ca 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -20,9 +20,19 @@ #define COBJMACROS #include <assert.h> +#include <stdio.h> #include "wine/test.h" +#include "initguid.h" #include "dxfile.h" +static inline void debugstr_guid( char* buf, CONST GUID *id ) +{ + sprintf(buf, "{%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] ); +} + static HMODULE hd3dxof; static HRESULT (WINAPI *pDirectXFileCreate)(LPDIRECTXFILE*); @@ -86,11 +96,182 @@ static void test_d3dxof(void) ok(ref == 0, "Got refcount %ld, expected 1\n", ref); } +/* Set it to 1 to expand the string when dumping the object. This is usefull when there is + * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ +#define EXPAND_STRING 0 + +static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) +{ + HRESULT hr; + char name[100]; + GUID clsid; + CONST GUID* clsid_type = NULL; + char str_clsid[40]; + char str_clsid_type[40]; + DWORD len= 100; + LPDIRECTXFILEOBJECT pChildObj; + int i,k; + int j = 0; + LPBYTE pData; + DWORD size; + + hr = IDirectXFileData_GetId(lpDirectXFileData, &clsid); + ok(hr == DXFILE_OK, "IDirectXFileData_GetId: %x\n", hr); + hr = IDirectXFileData_GetName(lpDirectXFileData, name, &len); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + hr = IDirectXFileData_GetType(lpDirectXFileData, &clsid_type); + ok(hr == DXFILE_OK, "IDirectXFileData_GetType: %x\n", hr); + hr = IDirectXFileData_GetData(lpDirectXFileData, NULL, &size, (void**)&pData); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + for (i = 0; i < *plevel; i++) + printf(" "); + debugstr_guid(str_clsid, &clsid); + debugstr_guid(str_clsid_type, clsid_type); + printf("Found object '%s' - %s - %s - %d\n", name, str_clsid, str_clsid_type, size); + + if (EXPAND_STRING && size == 4) + { + char * str = *(char**)pData; + printf("string %s\n", str); + } + else if (size) + { + for (k = 0; k < size; k++) + { + if (k && !(k%16)) + printf("\n"); + printf("%02x ", pData[k]); + } + printf("\n"); + } + (*plevel)++; + while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(lpDirectXFileData, &pChildObj))) + { + LPDIRECTXFILEDATA p1; + LPDIRECTXFILEDATAREFERENCE p2; + LPDIRECTXFILEBINARY p3; + j++; + + hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileData, (void **) &p1); + if (SUCCEEDED(hr)) + { + for (i = 0; i < *plevel; i++) + printf(" "); + printf("Found Data (%d)\n", j); + process_data(p1, plevel); + IDirectXFileData_Release(p1); + } + hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileDataReference, (void **) &p2); + if (SUCCEEDED(hr)) + { + LPDIRECTXFILEDATA pfdo; + for (i = 0; i < *plevel; i++) + printf(" "); + printf("Found Data Reference (%d)\n", j); +#if 0 + hr = IDirectXFileDataReference_GetId(lpDirectXFileData, &clsid); + ok(hr == DXFILE_OK, "IDirectXFileData_GetId: %x\n", hr); + hr = IDirectXFileDataReference_GetName(lpDirectXFileData, name, &len); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); +#endif + IDirectXFileDataReference_Resolve(p2, &pfdo); + process_data(pfdo, plevel); + IDirectXFileData_Release(pfdo); + IDirectXFileDataReference_Release(p2); + } + hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileBinary, (void **) &p3); + if (SUCCEEDED(hr)) + { + for (i = 0; i < *plevel; i++) + printf(" "); + printf("Found Binary (%d)\n", j); + IDirectXFileBinary_Release(p3); + } + } + (*plevel)--; + ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileData_GetNextObject: %x\n", hr); +} + +static void test_dump(void) +{ + HRESULT hr; + unsigned long ref; + LPDIRECTXFILE lpDirectXFile = NULL; + LPDIRECTXFILEENUMOBJECT lpDirectXFileEnumObject = NULL; + LPDIRECTXFILEDATA lpDirectXFileData = NULL; + HANDLE hFile; + LPVOID pvData = NULL; + DWORD cbSize; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + goto exit; + } + + /* Dump data only if there is an object and a template */ + hFile = CreateFileA("objects.txt", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + if (hFile == INVALID_HANDLE_VALUE) + return; + CloseHandle(hFile); + + hFile = CreateFileA("templates.txt", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + if (hFile == INVALID_HANDLE_VALUE) + return; + + pvData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 10000); + + if (!ReadFile(hFile, pvData, 10000, &cbSize, NULL)) + { + skip("Template file is too big\n"); + goto exit; + } + + printf("Load %d (%d) bytes\n", cbSize, strlen(pvData)); + + hr = pDirectXFileCreate(&lpDirectXFile); + ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + if(!lpDirectXFile) + { + skip("Couldn't create DirectXFile interface\n"); + goto exit; + } + + hr = IDirectXFile_RegisterTemplates(lpDirectXFile, pvData, strlen(pvData)); + ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, (LPVOID)"objects.txt", DXFILELOAD_FROMFILE, &lpDirectXFileEnumObject); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + + while (SUCCEEDED(hr = IDirectXFileEnumObject_GetNextDataObject(lpDirectXFileEnumObject, &lpDirectXFileData))) + { + int level = 0; + printf("\n"); + process_data(lpDirectXFileData, &level); + IDirectXFileData_Release(lpDirectXFileData); + } + ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + + ref = IDirectXFile_Release(lpDirectXFileEnumObject); + ok(ref == 0, "Got refcount %ld, expected 0\n", ref); + + ref = IDirectXFile_Release(lpDirectXFile); + ok(ref == 0, "Got refcount %ld, expected 0\n", ref); + + CloseHandle(hFile); + +exit: + + if (pvData) + HeapFree(GetProcessHeap(), 0, pvData); +} + START_TEST(d3dxof) { init_function_pointers(); test_d3dxof(); + test_dump(); FreeLibrary(hd3dxof); }

1 0

Francois Gouget : devenum: Explicitly identify the translation as being for SUBLANG_PORTUGUESE_BRAZILIAN .
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: e9ab244d7752d10f7e4566d2efcd8b40bb8adb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ab244d7752d10f7e4566d2e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 14 02:09:13 2008 +0100 devenum: Explicitly identify the translation as being for SUBLANG_PORTUGUESE_BRAZILIAN. --- dlls/devenum/devenum.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index 4178c37..9313984 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -72,7 +72,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL } STRINGTABLE DISCARDABLE -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN { 7 "DirectSound padrão" 8 "DirectSound: %s"

1 0

Maarten Lankhorst : includes: Fix packing for commdlg in Win64.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 424caea9674ede78cd7a9adcbed7b154bd358015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=424caea9674ede78cd7a9adcb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Dec 13 23:06:48 2008 +0100 includes: Fix packing for commdlg in Win64. --- include/commdlg.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/commdlg.h b/include/commdlg.h index 914e4c8..34e6b22 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -26,7 +26,9 @@ extern "C" { #endif #include <prsht.h> +#ifndef _WIN64 #include <pshpack1.h> +#endif #ifndef SNDMSG #ifdef __cplusplus @@ -770,7 +772,9 @@ BOOL WINAPI ChooseFontW(LPCHOOSEFONTW); void COMDLG32_SetCommDlgExtendedError(DWORD err); +#ifndef _WIN64 #include <poppack.h> +#endif #ifdef __cplusplus }

1 0

Christian Costa : setupx: Add stub for DiInstallClass.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: e6abe0e83ecffe2a2e41b65220c464d32e6280d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6abe0e83ecffe2a2e41b6522… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 14 18:49:45 2008 +0100 setupx: Add stub for DiInstallClass. --- dlls/setupapi/setupx.spec | 2 +- dlls/setupapi/setupx_main.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupx.spec b/dlls/setupapi/setupx.spec index 7243a97..590355f 100644 --- a/dlls/setupapi/setupx.spec +++ b/dlls/setupapi/setupx.spec @@ -154,7 +154,7 @@ 318 pascal -ret16 DiCreateDevRegKey (ptr ptr word str word) DiCreateDevRegKey16 319 pascal -ret16 DiOpenDevRegKey (ptr ptr word) DiOpenDevRegKey16 320 stub DiInstallDrvSection #(str str str str long) -321 stub DiInstallClass #(str long) +321 pascal -ret16 DiInstallClass (str long) DiInstallClass16 322 stub DiOpenClassRegKey #(ptr str) 323 stub Display_SetFontSize #(str) 324 stub Display_OpenFontSizeKey #(ptr) diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c index 82593f3..0690333 100644 --- a/dlls/setupapi/setupx_main.c +++ b/dlls/setupapi/setupx_main.c @@ -587,6 +587,17 @@ RETERR16 WINAPI CtlGetLddPath16(LOGDISKID16 ldid, LPSTR szPath) } /*********************************************************************** + * DiInstallClass (SETUPX.321) + * + * Install Class from an INF file (in [ClassInstall] section) + */ +RETERR16 WINAPI DiInstallClass16(LPCSTR lpszInfFileName, DWORD dwFlags) +{ + FIXME("(%s, %u), stub.\n", lpszInfFileName, dwFlags); + return 0; +} + +/*********************************************************************** * CtlSetLddPath (SETUPX.508) * * Sets the path of an LDD.

1 0

Francois Gouget : msi/tests: Make enum_stream_names() and package_RegDeleteTreeW() static.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 0d7cb11fdfa88a0d0ffa3e29d37a7716b2acbaf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7cb11fdfa88a0d0ffa3e29d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:05:56 2008 +0100 msi/tests: Make enum_stream_names() and package_RegDeleteTreeW() static. --- dlls/msi/tests/db.c | 2 +- dlls/msi/tests/package.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 6f92a21..475b10b 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4694,7 +4694,7 @@ static const struct { {_StringPool, data14, sizeof data14}, }; -void enum_stream_names(IStorage *stg) +static void enum_stream_names(IStorage *stg) { IEnumSTATSTG *stgenum = NULL; IStream *stm; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e3565ef..5ad1d38 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -54,7 +54,7 @@ static void get_user_sid(LPSTR *usersid) } /* RegDeleteTreeW from dlls/advapi32/registry.c */ -LSTATUS WINAPI package_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) +static LSTATUS package_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) { LONG ret; DWORD dwMaxSubkeyLen, dwMaxValueLen;

1 0