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

Christian Costa : d3drm: Move mesh loading code into a separate function so it can be shared.
by Alexandre Julliard 29 Mar '12

29 Mar '12

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

Christian Costa : d3drm: Partial implementation of IDirec3DRM: Load method + tests.
by Alexandre Julliard 29 Mar '12

29 Mar '12

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 : dmusic: Add some tests for enumerating and creating ports .
by Alexandre Julliard 29 Mar '12

29 Mar '12

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

Piotr Caban : msvcp90: Added this parameter to cdecl functions defined inside class.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: d04c15cc2318b257312bc5e62ef9ea0616ed4510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04c15cc2318b257312bc5e62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 29 16:11:45 2012 +0200 msvcp90: Added this parameter to cdecl functions defined inside class. --- dlls/msvcp90/locale.c | 12 ++++++------ dlls/msvcp90/msvcp90.spec | 36 ++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d04c15cc2318b257312bc…

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 1aeb4dcd41efc84eb2ffeb67fdc020d63896a3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aeb4dcd41efc84eb2ffeb67f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 29 16:12:01 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 630 +++++++++++++++++++------------------- dlls/msvcp60/msvcp60.spec | 378 ++++++++++++------------ dlls/msvcp70/msvcp70.spec | 622 +++++++++++++++++++------------------- dlls/msvcp71/msvcp71.spec | 662 ++++++++++++++++++++-------------------- dlls/msvcp80/msvcp80.spec | 704 +++++++++++++++++++++--------------------- 5 files changed, 1498 insertions(+), 1498 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1aeb4dcd41efc84eb2ffe…

1 0

Piotr Caban : msvcp90: Added support for exception reraising in ios_base:: clear.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 2f87a5d4590b5f601f63dd81146b6d07c6441deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f87a5d4590b5f601f63dd811… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 29 16:13:13 2012 +0200 msvcp90: Added support for exception reraising in ios_base::clear. --- dlls/msvcp90/exception.c | 2 ++ dlls/msvcp90/ios.c | 10 +++++----- dlls/msvcp90/msvcp90.h | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 2c635ed..0965716 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -684,6 +684,8 @@ void throw_exception(exception_type et, const char *str) const char *addr = str; switch(et) { + case EXCEPTION_RERAISE: + _CxxThrowException(NULL, NULL); case EXCEPTION: { exception e; MSVCP_exception_ctor(&e, &addr); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9a582eb..27703a0 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1942,13 +1942,13 @@ void __thiscall ios_base_clear_reraise(ios_base *this, IOSB_iostate state, MSVCP { TRACE("(%p %x %x)\n", this, state, reraise); - if(reraise) { - FIXME("reraise is not supported\n"); + this->state = state & IOSTATE_mask; + if(!(this->state & this->except)) return; - } - this->state = state & IOSTATE_mask; - if(this->state & this->except & IOSTATE_eofbit) + if(reraise) + throw_exception(EXCEPTION_RERAISE, NULL); + else if(this->state & this->except & IOSTATE_eofbit) throw_exception(EXCEPTION_FAILURE, "eofbit is set"); else if(this->state & this->except & IOSTATE_failbit) throw_exception(EXCEPTION_FAILURE, "failbit is set"); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 8c3ceb5..c774e98 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -157,6 +157,7 @@ typedef struct __exception /* Internal: throws selected exception */ typedef enum __exception_type { + EXCEPTION_RERAISE, EXCEPTION, EXCEPTION_BAD_ALLOC, EXCEPTION_LOGIC_ERROR,

1 0

Christian Costa : strmbase: Display dll in which we are searching a class to instanciate.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 67d429f0f35a10413e962bd7496938df3074ae8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d429f0f35a10413e962bd74… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 09:00:39 2012 +0200 strmbase: Display dll in which we are searching a class to instanciate. --- dlls/strmbase/dllfunc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 34e03e6..5c9b8ab 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -362,7 +362,10 @@ HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * if (i == g_cTemplates) { - ERR("%s: no class found.\n", debugstr_guid(rclsid)); + char dllname[MAX_PATH]; + if (!GetModuleFileNameA(g_hInst, dllname, sizeof(dllname))) + strcpy(dllname, "???"); + ERR("%s: no class found in %s.\n", debugstr_guid(rclsid), dllname); return CLASS_E_CLASSNOTAVAILABLE; } else if (!pList->m_lpfnNew)

1 0

André Hentschel : view: Also show the filename in the window title when loading it from command line .
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 189800e04c43c623f8a9d4d1228e514b95b3efff URL: http://source.winehq.org/git/wine.git/?a=commit;h=189800e04c43c623f8a9d4d12… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 28 21:06:05 2012 +0200 view: Also show the filename in the window title when loading it from command line. --- programs/view/view.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index ebd48aa..d32a10b 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -386,7 +386,10 @@ static void HandleCommandLine(LPWSTR cmdline) cmdline++; cmdline[lstrlenW(cmdline) - 1] = 0; } + szFileTitle[0] = 0; + GetFileTitleW(cmdline, szFileTitle, sizeof(szFileTitle)); DoOpenFile(cmdline); + UpdateWindowCaption(); } }

1 0

Aric Stewart : strmbase: Implement BaseControlWindow.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 73efbff484fbd6bc6df53df48fb235a85e44f9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=73efbff484fbd6bc6df53df48… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 28 14:53:14 2012 -0500 strmbase: Implement BaseControlWindow. --- dlls/strmbase/window.c | 575 +++++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 66 ++++++ 2 files changed, 641 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73efbff484fbd6bc6df53…

1 0

Aric Stewart : strmbase: Implement BaseControlVideo.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 4ae6f928aaec7b6863a2584ca6843498a61e7659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae6f928aaec7b6863a2584ca… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 28 14:53:24 2012 -0500 strmbase: Implement BaseControlVideo. --- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/video.c | 480 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 79 ++++++++ 3 files changed, 560 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ae6f928aaec7b6863a25…

1 0