wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Michael Stefaniuc : riched20/tests: Remove duplicated ok() call.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: 306b3510a904f5a919e98569ea414ad47c806b53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=306b3510a904f5a919e98569e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 17 00:53:31 2012 +0200 riched20/tests: Remove duplicated ok() call. --- dlls/riched20/tests/editor.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 9347ed7..f6db413 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5889,7 +5889,6 @@ static void test_undo_coalescing(void) ok (result == 0, "expected '%s' but got '%s'\n", "one two three", buffer); result = SendMessage(hwnd, EM_UNDO, 0, 0); ok (result == TRUE, "Failed to undo typed characters.\n"); - ok (result == TRUE, "Failed to undo typed characters.\n"); SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); result = strcmp(buffer, ""); ok (result == 0, "expected '%s' but got '%s'\n", "", buffer);

1 0

Michael Stefaniuc : msi/tests: Test the correct return values.
by Alexandre Julliard 17 May '12

17 May '12

Module: wine Branch: master Commit: 49add077951543eaa880b6e348149d52f684c27a URL: http://source.winehq.org/git/wine.git/?a=commit;h=49add077951543eaa880b6e34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 17 00:50:38 2012 +0200 msi/tests: Test the correct return values. --- dlls/msi/tests/db.c | 2 +- dlls/msi/tests/suminfo.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 4c91bd8..7a2fd7c 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1490,7 +1490,7 @@ static void test_longstrings(void) HeapFree(GetProcessHeap(), 0, str); - MsiDatabaseCommit(hdb); + r = MsiDatabaseCommit(hdb); ok(r == ERROR_SUCCESS, "MsiDatabaseCommit failed\n"); MsiCloseHandle(hdb); diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index 76dac57..0ae2a3a 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -254,7 +254,7 @@ static void test_suminfo(void) ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); /* filename, non-zero update count */ - MsiGetSummaryInformation(0, msifile, 1, &hsuminfo); + r = MsiGetSummaryInformation(0, msifile, 1, &hsuminfo); ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed\n"); r = MsiSummaryInfoSetProperty(hsuminfo, PID_AUTHOR, VT_LPSTR, 1, &ft, "Mike"); @@ -267,7 +267,7 @@ static void test_suminfo(void) ok(r == ERROR_SUCCESS, "MsiCloseHandle failed %u\n", r); /* filename, zero update count */ - MsiGetSummaryInformation(0, msifile, 0, &hsuminfo); + r = MsiGetSummaryInformation(0, msifile, 0, &hsuminfo); ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed %u\n", r); r = MsiSummaryInfoSetProperty(hsuminfo, PID_AUTHOR, VT_LPSTR, 1, &ft, "Mike");

1 0

Vincent Povirk : winemono: Add script for Wine Mono download.
by Alexandre Julliard 17 May '12

17 May '12

Module: tools Branch: master Commit: 6a3cb99bcbbaf812b9d75fafbb85feaee3250959 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6a3cb99bcbbaf812b9d75faf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 17 08:41:36 2012 -0500 winemono: Add script for Wine Mono download. --- winemono.php | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/winemono.php b/winemono.php new file mode 100644 index 0000000..86cd977 --- /dev/null +++ b/winemono.php @@ -0,0 +1,45 @@ +<?php +/** + * Redirects to a URL for the Wine Mono installer + */ + +// Default version if none given +$sVersion = '0.0.4'; + +// Suffix appended to base name of file +$sFileSuffix = ''; + +// Folder which contains files +$sFolder = 'Wine%20Mono'; + +// Check if a specific version was passed +if(isset($_GET['v'])) { + $sVersion = $_GET['v']; +} + +if(!$sFileSuffix) + $sFileSuffix = $sVersion; + +$sExt = 'msi'; + +// Name of the file +$sFileName = sprintf('%s/%s/wine-mono-%s.%s', $sFolder, $sVersion, $sFileSuffix, $sExt); + +// Size array +$aFileSizes = array( + '0.0.4'=>44408320 +); + +// Exact size of the file: +$iFileSize = $aFileSizes[$sFileSuffix]; +if(!$iFileSize) { + header("HTTP/1.0 404 Not Found"); + exit; +} + +// List of additional locations (commonly used locations are already in download.inc.php) +$aList = array(); + +// Common code for Wine downloader scripts +require("download.inc.php"); +?>

1 0

Frédéric Delanoy : cmd: Improve WCMD_parameter documentation.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 0f032203f58f8b41d3cc5d3a66244deb9c54fde0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f032203f58f8b41d3cc5d3a6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue May 15 15:03:35 2012 +0200 cmd: Improve WCMD_parameter documentation. --- programs/cmd/batch.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 05314f4..7a735cf 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -114,26 +114,23 @@ void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HA * * PARAMS * s [I] input string, non NULL - * n [I] # of the (possibly double quotes-delimited) parameter to return - * Starts at 0 - * start [O] if non NULL, pointer to the start of the nth parameter in s, - * potentially a " character - * end [O] if non NULL, pointer to the last char of - * the nth parameter in s, potentially a " character + * n [I] # of the parameter to return, counted from 0 + * start [O] Optional. Pointer to the first char of param n in s + * end [O] Optional. Pointer to the last char of param n in s * * RETURNS - * Success: Returns the nth delimited parameter found in s. - * *start points to the start of the param, possibly a starting - * double quotes character - * Failure: Returns an empty string if the param is not found. - * *start is set to NULL + * Success: The nth delimited parameter found in s, with any surrounding quotes removed + * if start != NULL, *start points to the start of the param + * if end != NULL, *end points to the end of the param + * Failure: An empty string if the param is not found. + * *start == *end == NULL * * NOTES - * Return value is stored in static storage, hence is overwritten - * after each call. - * Doesn't include any potentially delimiting double quotes + * Return value is stored in static storage (i.e. overwritten after each call). + * Specify 'start' and/or 'end' to include delimiting double quotes as well, if any. */ -WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end) { +WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end) +{ int curParamNb = 0; static WCHAR param[MAX_PATH]; WCHAR *p = s, *q;

1 0

Christian Costa : d3drm: Free visual and light resources when releasing frame.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 20bf183726ae09160f22952a61acb37d4b056f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=20bf183726ae09160f22952a6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 15 08:08:56 2012 +0200 d3drm: Free visual and light resources when releasing frame. --- dlls/d3drm/frame.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index d02cba8..fc15339 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -140,6 +140,12 @@ static ULONG WINAPI IDirect3DRMFrame2Impl_Release(IDirect3DRMFrame2* iface) for (i = 0; i < This->nb_children; i++) IDirect3DRMFrame3_Release(This->children[i]); HeapFree(GetProcessHeap(), 0, This->children); + for (i = 0; i < This->nb_visuals; i++) + IDirect3DRMVisual_Release(This->visuals[i]); + HeapFree(GetProcessHeap(), 0, This->visuals); + for (i = 0; i < This->nb_lights; i++) + IDirect3DRMLight_Release(This->lights[i]); + HeapFree(GetProcessHeap(), 0, This->lights); HeapFree(GetProcessHeap(), 0, This); }

1 0

Christian Costa : d3drm: Attach mesh to the parent frame if any.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 3447f172301b0a709272eae1ae5ffd90613d65f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3447f172301b0a709272eae1a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 15 08:08:48 2012 +0200 d3drm: Attach mesh to the parent frame if any. --- dlls/d3drm/d3drm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index b014369..ba666dc 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1298,7 +1298,7 @@ HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUI { LPDIRECT3DRMMESHBUILDER3 meshbuilder; - FIXME("Load mesh data and notify application\n"); + TRACE("Load mesh data and notify application\n"); hr = IDirect3DRM3_CreateMeshBuilder(iface, &meshbuilder); if (SUCCEEDED(hr)) @@ -1312,7 +1312,9 @@ HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUI if (SUCCEEDED(hr)) { /* Only top level objects are notified */ - if (!parent_frame) + if (parent_frame) + IDirect3DRMFrame3_AddVisual(parent_frame, (IUnknown*)meshbuilder); + else LoadProc(object, GUIDs[i], ArgLP); } IDirect3DRMObject_Release(object);

1 0

Christian Costa : d3drm: Load all sub-objects when a frame is found.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 6d47694bdf1383553b17e8cfc78a36022be14e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d47694bdf1383553b17e8cfc… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 15 08:08:40 2012 +0200 d3drm: Load all sub-objects when a frame is found. --- dlls/d3drm/d3drm.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 7ea0b2a..b014369 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1,7 +1,7 @@ /* * Implementation of IDirect3DRM Interface * - * Copyright 2010 Christian Costa + * Copyright 2010, 2012 Christian Costa * Copyright 2011 André Hentschel * * This library is free software; you can redistribute it and/or @@ -1310,7 +1310,11 @@ HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUI { hr = load_mesh_data(meshbuilder, data_object); if (SUCCEEDED(hr)) - LoadProc(object, GUIDs[i], ArgLP); + { + /* Only top level objects are notified */ + if (!parent_frame) + LoadProc(object, GUIDs[i], ArgLP); + } IDirect3DRMObject_Release(object); } IDirect3DRMMeshBuilder3_Release(meshbuilder); @@ -1337,9 +1341,9 @@ HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUI { LPDIRECT3DRMFRAME3 frame; - FIXME("Fake frame data and notify application\n"); + TRACE("Load frame data and notify application\n"); - hr = IDirect3DRM3_CreateFrame(iface, NULL, &frame); + hr = IDirect3DRM3_CreateFrame(iface, parent_frame, &frame); if (SUCCEEDED(hr)) { LPDIRECT3DRMOBJECT object; @@ -1347,7 +1351,53 @@ HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUI hr = IDirect3DRMFrame3_QueryInterface(frame, GUIDs[i], (void**)&object); if (SUCCEEDED(hr)) { - LoadProc(object, GUIDs[i], ArgLP); + LPDIRECTXFILEOBJECT child; + + while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(data_object, &child))) + { + LPDIRECTXFILEDATA data; + LPDIRECTXFILEDATAREFERENCE reference; + LPDIRECTXFILEBINARY binary; + + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileBinary, (void **)&binary); + if (SUCCEEDED(hr)) + { + FIXME("Binary Object not supported yet\n"); + IDirectXFileBinary_Release(binary); + continue; + } + + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); + if (SUCCEEDED(hr)) + { + TRACE("Found Data Object\n"); + hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); + IDirectXFileData_Release(data); + continue; + } + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileDataReference, (void **)&reference); + if (SUCCEEDED(hr)) + { + TRACE("Found Data Object Reference\n"); + IDirectXFileDataReference_Resolve(reference, &data); + hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); + IDirectXFileData_Release(data); + IDirectXFileDataReference_Release(reference); + continue; + } + } + + if (hr != DXFILEERR_NOMOREOBJECTS) + { + IDirect3DRMObject_Release(object); + IDirect3DRMFrame3_Release(frame); + goto end; + } + hr = S_OK; + + /* Only top level objects are notified */ + if (!parent_frame) + LoadProc(object, GUIDs[i], ArgLP); IDirect3DRMObject_Release(object); } IDirect3DRMFrame3_Release(frame);

1 0

Christian Costa : d3drm: Implement IDirect3DRMFrame2Impl_GetVisuals and IDirect3DRMVisualArray interface .
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 37c427f54ad8829e1a135611622d4da51b10624e URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c427f54ad8829e1a1356116… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 15 08:08:31 2012 +0200 d3drm: Implement IDirect3DRMFrame2Impl_GetVisuals and IDirect3DRMVisualArray interface. --- dlls/d3drm/frame.c | 155 +++++++++++++++++++++++++++++++++++++++++++++- dlls/d3drm/tests/d3drm.c | 2 +- 2 files changed, 154 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 60e8966..d02cba8 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2,6 +2,7 @@ * Implementation of IDirect3DRMFrame Interface * * Copyright 2011, 2012 André Hentschel + * Copyright 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 @@ -63,7 +64,15 @@ typedef struct { LPDIRECT3DRMFRAME* frames; } IDirect3DRMFrameArrayImpl; +typedef struct { + IDirect3DRMVisualArray IDirect3DRMVisualArray_iface; + LONG ref; + ULONG size; + LPDIRECT3DRMVISUAL* visuals; +} IDirect3DRMVisualArrayImpl; + HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj); +HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface); static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) { @@ -460,10 +469,36 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetVisuals(IDirect3DRMFrame2* iface, LPDIRECT3DRMVISUALARRAY *visuals) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); + IDirect3DRMVisualArrayImpl* obj; + HRESULT hr; - FIXME("(%p/%p)->(%p): stub\n", iface, This, visuals); + TRACE("(%p/%p)->(%p)\n", iface, This, visuals); - return E_NOTIMPL; + if (!visuals) + return D3DRMERR_BADVALUE; + + hr = Direct3DRMVisualArray_create(visuals); + + if (hr != D3DRM_OK) + return hr; + + obj = (IDirect3DRMVisualArrayImpl*)*visuals; + + obj->size = This->nb_visuals; + if (This->nb_visuals) + { + ULONG i; + obj->visuals = HeapAlloc(GetProcessHeap(), 0, This->nb_visuals * sizeof(LPDIRECT3DRMVISUAL)); + if (!obj->visuals) + return E_OUTOFMEMORY; + for (i = 0; i < This->nb_visuals; i++) + { + obj->visuals[i] = This->visuals[i]; + IDirect3DRMVisual_AddRef(This->visuals[i]); + } + } + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame2Impl_GetTextureTopology(IDirect3DRMFrame2* iface, @@ -2360,3 +2395,119 @@ HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj) return S_OK; } + +/*** IUnknown methods ***/ +static HRESULT WINAPI IDirect3DRMVisualArrayImpl_QueryInterface(IDirect3DRMVisualArray* iface, + REFIID riid, void** ret_iface) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDirect3DRMFrameArray)) + { + *ret_iface = iface; + IDirect3DRMVisualArray_AddRef(iface); + return S_OK; + } + + *ret_iface = NULL; + + WARN("Interface %s not implemented\n", debugstr_guid(riid)); + + return E_NOINTERFACE; +} + +static ULONG WINAPI IDirect3DRMVisualArrayImpl_AddRef(IDirect3DRMVisualArray* iface) +{ + IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI IDirect3DRMVisualArrayImpl_Release(IDirect3DRMVisualArray* iface) +{ + IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + if (!ref) + { + for (i = 0; i < This->size; i++) + IDirect3DRMVisual_Release(This->visuals[i]); + HeapFree(GetProcessHeap(), 0, This->visuals); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +/*** IDirect3DRMArray methods ***/ +static DWORD WINAPI IDirect3DRMVisualArrayImpl_GetSize(IDirect3DRMVisualArray* iface) +{ + IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + + TRACE("(%p)->() = %d\n", iface, This->size); + + return This->size; +} + +/*** IDirect3DRMVisualArray methods ***/ +static HRESULT WINAPI IDirect3DRMVisualArrayImpl_GetElement(IDirect3DRMVisualArray* iface, DWORD index, LPDIRECT3DRMVISUAL* visual) +{ + IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface; + + TRACE("(%p)->(%u, %p)\n", iface, index, visual); + + if (!visual) + return D3DRMERR_BADVALUE; + + *visual = NULL; + + if (index >= This->size) + return D3DRMERR_BADVALUE; + + IDirect3DRMVisual_AddRef(This->visuals[index]); + *visual = This->visuals[index]; + + return D3DRM_OK; +} + +static const struct IDirect3DRMVisualArrayVtbl Direct3DRMVisualArray_Vtbl = +{ + /*** IUnknown methods ***/ + IDirect3DRMVisualArrayImpl_QueryInterface, + IDirect3DRMVisualArrayImpl_AddRef, + IDirect3DRMVisualArrayImpl_Release, + /*** IDirect3DRMArray methods ***/ + IDirect3DRMVisualArrayImpl_GetSize, + /*** IDirect3DRMVisualArray methods ***/ + IDirect3DRMVisualArrayImpl_GetElement +}; + +HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface) +{ + IDirect3DRMVisualArrayImpl* object; + + TRACE("(%p)\n", ret_iface); + + *ret_iface = NULL; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMVisualArrayImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IDirect3DRMVisualArray_iface.lpVtbl = &Direct3DRMVisualArray_Vtbl; + object->ref = 1; + + *ret_iface = &object->IDirect3DRMVisualArray_iface; + + return S_OK; +} diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8a8968e..3126fbd 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -662,7 +662,7 @@ static void test_Frame(void) pVisualArray = NULL; hr = IDirect3DRMFrame_GetVisuals(pFrameP1, &pVisualArray); - todo_wine ok(hr == D3DRM_OK, "Cannot get visuals (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot get visuals (hr = %x)\n", hr); if (pVisualArray) { count = IDirect3DRMVisualArray_GetSize(pVisualArray);

1 0

Christian Costa : d3drm: Move loading code from IDirect3DRM3Impl_Load to a separate function so it can be called recursively .
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 0013fc1ca7ec22ff4b89e4d62ccc6a1f13db345d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0013fc1ca7ec22ff4b89e4d62… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 15 08:08:22 2012 +0200 d3drm: Move loading code from IDirect3DRM3Impl_Load to a separate function so it can be called recursively. --- dlls/d3drm/d3drm.c | 226 +++++++++++++++++++++++++++------------------------- 1 files changed, 119 insertions(+), 107 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 401cccd..7ea0b2a 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1266,6 +1266,123 @@ static HRESULT WINAPI IDirect3DRM3Impl_EnumerateObjects(IDirect3DRM3* iface, D3D return E_NOTIMPL; } +HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUIDs, DWORD nb_GUIDs, D3DRMLOADCALLBACK LoadProc, + LPVOID ArgLP, D3DRMLOADTEXTURECALLBACK LoadTextureProc, LPVOID ArgLTP, LPDIRECT3DRMFRAME3 parent_frame) +{ + HRESULT ret = D3DRMERR_BADOBJECT; + HRESULT hr; + const GUID* guid; + DWORD i; + BOOL requested = FALSE; + + hr = IDirectXFileData_GetType(data_object, &guid); + if (hr != DXFILE_OK) + goto end; + + TRACE("Found object type whose GUID = %s\n", debugstr_guid(guid)); + + if (IsEqualGUID(guid, &TID_D3DRMMesh)) + { + TRACE("Found TID_D3DRMMesh\n"); + + for (i = 0; i < nb_GUIDs; i++) + if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder) || + IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder2) || + IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder3)) + { + requested = TRUE; + break; + } + + if (requested) + { + LPDIRECT3DRMMESHBUILDER3 meshbuilder; + + FIXME("Load mesh data and notify application\n"); + + hr = IDirect3DRM3_CreateMeshBuilder(iface, &meshbuilder); + if (SUCCEEDED(hr)) + { + LPDIRECT3DRMOBJECT object = NULL; + + hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder, GUIDs[i], (void**)&object); + if (SUCCEEDED(hr)) + { + hr = load_mesh_data(meshbuilder, data_object); + if (SUCCEEDED(hr)) + LoadProc(object, GUIDs[i], ArgLP); + IDirect3DRMObject_Release(object); + } + IDirect3DRMMeshBuilder3_Release(meshbuilder); + } + + if (FAILED(hr)) + ERR("Cannot process mesh\n"); + } + } + else if (IsEqualGUID(guid, &TID_D3DRMFrame)) + { + TRACE("Found TID_D3DRMFrame\n"); + + for (i = 0; i < nb_GUIDs; i++) + if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame) || + IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame2) || + IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame3)) + { + requested = TRUE; + break; + } + + if (requested) + { + LPDIRECT3DRMFRAME3 frame; + + FIXME("Fake frame data and notify application\n"); + + hr = IDirect3DRM3_CreateFrame(iface, NULL, &frame); + if (SUCCEEDED(hr)) + { + LPDIRECT3DRMOBJECT object; + + hr = IDirect3DRMFrame3_QueryInterface(frame, GUIDs[i], (void**)&object); + if (SUCCEEDED(hr)) + { + LoadProc(object, GUIDs[i], ArgLP); + IDirect3DRMObject_Release(object); + } + IDirect3DRMFrame3_Release(frame); + } + + if (FAILED(hr)) + ERR("Cannot process frame\n"); + } + } + else if (IsEqualGUID(guid, &TID_D3DRMMaterial)) + { + TRACE("Found TID_D3DRMMaterial\n"); + + for (i = 0; i < nb_GUIDs; i++) + if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMaterial) || + IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMaterial2)) + requested = TRUE; + + if (requested) + { + FIXME("Processing material not supported yet\n"); + } + } + else + { + FIXME("Found unknown TID %s\n", debugstr_guid(guid)); + } + + ret = D3DRM_OK; + +end: + + return ret; +} + static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSource, LPVOID ObjID, LPIID* GUIDs, DWORD nb_GUIDs, D3DRMLOADOPTIONS LOFlags, D3DRMLOADCALLBACK LoadProc, LPVOID ArgLP, @@ -1364,115 +1481,10 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc goto end; } - hr = IDirectXFileData_GetType(pData, &pGuid); - if (hr != DXFILE_OK) + ret = load_data(iface, pData, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, ParentFrame); + if (ret != D3DRM_OK) goto end; - TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); - - if (IsEqualGUID(pGuid, &TID_D3DRMMesh)) - { - BOOL requested = FALSE; - HRESULT hr; - - TRACE("Found TID_D3DRMMesh\n"); - - for (i = 0; i < nb_GUIDs; i++) - if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder) || - IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder2) || - IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder3)) - { - requested = TRUE; - break; - } - - if (requested) - { - LPDIRECT3DRMMESHBUILDER3 meshbuilder; - - FIXME("Load mesh data and notify application\n"); - - hr = IDirect3DRM3_CreateMeshBuilder(iface, &meshbuilder); - if (SUCCEEDED(hr)) - { - LPDIRECT3DRMOBJECT object = NULL; - - hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder, GUIDs[i], (void**)&object); - if (SUCCEEDED(hr)) - { - hr = load_mesh_data(meshbuilder, pData); - if (SUCCEEDED(hr)) - LoadProc(object, GUIDs[i], ArgLP); - IDirect3DRMObject_Release(object); - } - IDirect3DRMMeshBuilder3_Release(meshbuilder); - } - - if (FAILED(hr)) - ERR("Cannot process mesh\n"); - } - } - else if (IsEqualGUID(pGuid, &TID_D3DRMFrame)) - { - BOOL requested = FALSE; - HRESULT hr; - - TRACE("Found TID_D3DRMFrame\n"); - - for (i = 0; i < nb_GUIDs; i++) - if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame) || - IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame2) || - IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame3)) - { - requested = TRUE; - break; - } - - if (requested) - { - LPDIRECT3DRMFRAME3 frame; - - FIXME("Fake frame data and notify application\n"); - - hr = IDirect3DRM3_CreateFrame(iface, NULL, &frame); - if (SUCCEEDED(hr)) - { - LPDIRECT3DRMOBJECT object; - - hr = IDirect3DRMFrame3_QueryInterface(frame, GUIDs[i], (void**)&object); - if (SUCCEEDED(hr)) - { - LoadProc(object, GUIDs[i], ArgLP); - IDirect3DRMObject_Release(object); - } - IDirect3DRMFrame3_Release(frame); - } - - if (FAILED(hr)) - ERR("Cannot process frame\n"); - - } - } - else if (IsEqualGUID(pGuid, &TID_D3DRMMaterial)) - { - BOOL requested = FALSE; - - TRACE("Found TID_D3DRMMaterial\n"); - - for (i = 0; i < nb_GUIDs; i++) - if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMaterial) || - IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMaterial2)) - requested = TRUE; - - if (requested) - { - FIXME("Processing material not supported yet\n"); - } - } - else - { - FIXME("Found unknown TID %s\n", debugstr_guid(pGuid)); - } IDirectXFileData_Release(pData); pData = NULL; }

1 0

Piotr Caban : user32/tests: Added more GetMenuBarInfo tests.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 1a74d210901dfb561f05f4457dc58ba403c08ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a74d210901dfb561f05f4457… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 16 13:37:06 2012 +0200 user32/tests: Added more GetMenuBarInfo tests. --- dlls/user32/tests/menu.c | 190 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 189 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index ea7b5b0..07cf437 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -38,6 +38,7 @@ static ATOM atomMenuCheckClass; static BOOL (WINAPI *pGetMenuInfo)(HMENU,LPCMENUINFO); +static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static UINT (WINAPI *pSendInput)(UINT, INPUT*, size_t); static BOOL (WINAPI *pSetMenuInfo)(HMENU,LPCMENUINFO); static BOOL (WINAPI *pEndMenu) (void); @@ -52,6 +53,7 @@ static void init_function_pointers(void) trace("GetProcAddress(%s) failed\n", #func); GET_PROC(GetMenuInfo) + GET_PROC(GetMenuBarInfo) GET_PROC(SendInput) GET_PROC(SetMenuInfo) GET_PROC(EndMenu) @@ -116,6 +118,7 @@ typedef struct /* globals to communicate between test and wndproc */ static BOOL bMenuVisible; +static INT popmenu; static BOOL got_input; static HMENU hMenus[4]; @@ -267,6 +270,134 @@ static void register_menu_check_class(void) atomMenuCheckClass = RegisterClass(&wc); } +static void test_getmenubarinfo(void) +{ + BOOL ret; + HMENU hmenu; + MENUBARINFO mbi; + RECT rcw, rci; + HWND hwnd; + INT err; + + if (!pGetMenuBarInfo) { + win_skip("GetMenuBarInfo is not available\n"); + return; + } + + mbi.cbSize = sizeof(MENUBARINFO); + + hwnd = CreateWindowEx(0, MAKEINTATOM(atomMenuCheckClass), NULL, + WS_SYSMENU | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); + + /* no menu: getmenubarinfo should fail */ + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should not have been successful\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + /* create menubar, no items yet */ + hmenu = CreateMenu(); + ok(hmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + + ret = SetMenu(hwnd, hmenu); + ok(ret, "SetMenu failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(NULL, OBJID_CLIENT, 0, &mbi); + err = GetLastError(); + ok(!ret, "GetMenuBarInfo succeeded\n"); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_CLIENT, 0, &mbi); + err = GetLastError(); + ok(!ret, "GetMenuBarInfo succeeded\n"); + ok(err==ERROR_INVALID_MENU_HANDLE || broken(err==0xdeadbeef) /* NT, W2K, XP */, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, -1, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + mbi.cbSize = 1000; + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == ERROR_INVALID_PARAMETER, "err = %d\n", err); + mbi.cbSize = sizeof(MENUBARINFO); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, 123, 0, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + ok(ret, "GetMenuBarInfo failed with error %d\n", GetLastError()); + + ok(mbi.rcBar.left == 0 && mbi.rcBar.top == 0 && + mbi.rcBar.bottom == 0 && mbi.rcBar.right == 0, + "rcBar: Expected 0,0-0,0, got: %d,%d-%d,%d\n", + mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom); + ok(mbi.hMenu == hmenu, "hMenu: Got %p instead of %p\n", + mbi.hMenu, hmenu); + ok(mbi.fBarFocused == 0, "fBarFocused: Got %d instead of 0.\n", mbi.fBarFocused); + ok(mbi.fFocused == 0, "fFocused: Got %d instead of 0.\n", mbi.fFocused); + + /* add some items */ + ret = AppendMenu(hmenu, MF_STRING , 100, "item 1"); + ok(ret, "AppendMenu failed.\n"); + ret = AppendMenu(hmenu, MF_STRING , 101, "item 2"); + ok(ret, "AppendMenu failed.\n"); + ret = SetMenu(hwnd, hmenu); + ok(ret, "SetMenu failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 200, &mbi); + err = GetLastError(); + ok(ret == FALSE, "GetMenuBarInfo should have failed\n"); + ok(err == 0xdeadbeef, "err = %d\n", err); + + /* get info for the whole menu */ + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi); + ok(ret, "GetMenuBarInfo failed with error %d\n", GetLastError()); + + /* calculate menu rectangle, from window rectangle and the position of the first item */ + ret = GetWindowRect(hwnd, &rcw); + ok(ret, "GetWindowRect failed.\n"); + ret = GetMenuItemRect(hwnd, hmenu, 0, &rci); + ok(ret, "GetMenuItemRect failed.\n"); + todo_wine ok(mbi.rcBar.left == rci.left && mbi.rcBar.top == rci.top && + mbi.rcBar.bottom == rci.bottom && mbi.rcBar.right == rcw.right - rci.left + rcw.left, + "rcBar: Got %d,%d-%d,%d instead of %d,%d-%d,%d\n", + mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom, + rci.left, rci.top, rcw.right - rci.left + rcw.left, rci.bottom); + ok(mbi.hMenu == hmenu, "hMenu: Got %p instead of %p\n", mbi.hMenu, hmenu); + ok(mbi.fBarFocused == 0, "fBarFocused: got %d instead of 0\n", mbi.fBarFocused); + ok(mbi.fFocused == 0, "fFocused: got %d instead of 0\n", mbi.fFocused); + + /* get info for item nr.2 */ + ret = pGetMenuBarInfo(hwnd, OBJID_MENU, 2, &mbi); + ok(ret, "GetMenuBarInfo failed with error %d\n", GetLastError()); + ret = GetMenuItemRect(hwnd, hmenu, 1, &rci); + ok(ret, "GetMenuItemRect failed.\n"); + ok(mbi.rcBar.left == rci.left && mbi.rcBar.top == rci.top && + mbi.rcBar.bottom == rci.bottom && mbi.rcBar.right == rci.right, + "rcBar: Got %d,%d-%d,%d instead of %d,%d-%d,%d\n", + mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom, + rci.left, rci.top, rci.right, rci.bottom); + ok(mbi.hMenu == hmenu, "hMenu: Got %p instead of %p\n", mbi.hMenu, hmenu); + ok(mbi.fBarFocused == 0, "fBarFocused: got %d instead of 0\n", mbi.fBarFocused); + ok(mbi.fFocused == 0, "fFocused: got %d instead of 0\n", mbi.fFocused); + + DestroyWindow(hwnd); +} + /* demonstrates that windows locks the menu object so that it is still valid * even after a client calls DestroyMenu on it */ static void test_menu_locked_by_window(void) @@ -2030,9 +2161,12 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_ENTERMENULOOP: bMenuVisible = TRUE; break; + case WM_INITMENUPOPUP: + case WM_UNINITMENUPOPUP: case WM_EXITMENULOOP: - bMenuVisible = FALSE; + case WM_MENUSELECT: break; + case WM_KEYDOWN: case WM_SYSKEYDOWN: case WM_MOUSEMOVE: @@ -2046,6 +2180,59 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, default: return( DefWindowProcA( hWnd, msg, wParam, lParam ) ); } + + if(pGetMenuBarInfo) + { + MENUBARINFO mbi; + HMENU hmenu; + UINT state; + BOOL br; + + mbi.cbSize = sizeof(MENUBARINFO); + + /* get info for the menu */ + br = pGetMenuBarInfo(hWnd, OBJID_MENU, 0, &mbi); + ok(br, "msg %x: GetMenuBarInfo failed\n", msg); + hmenu = GetMenu(hWnd); + ok(!mbi.hwndMenu, "msg %x: GetMenuBarInfo.hwndMenu wrong: %p expected NULL\n", + msg, mbi.hwndMenu); + ok(mbi.hMenu == hmenu, "msg %x: GetMenuBarInfo got wrong menu: %p expected %p\n", + msg, mbi.hMenu, hmenu); + ok(!bMenuVisible == !mbi.fBarFocused, "msg %x: GetMenuBarInfo.fBarFocused (%d) is wrong\n", + msg, mbi.fBarFocused != 0); + ok(!bMenuVisible == !mbi.fFocused, "msg %x: GetMenuBarInfo.fFocused (%d) is wrong\n", + msg, mbi.fFocused != 0); + + /* get info for the menu's first item */ + br = pGetMenuBarInfo(hWnd, OBJID_MENU, 1, &mbi); + ok(br, "msg %x: GetMenuBarInfo failed\n", msg); + state = GetMenuState(hmenu, 0, MF_BYPOSITION); + if (pGetMenuInfo) /* Skip on NT */ + { + /* Native returns handle to destroyed window */ + if (msg==WM_UNINITMENUPOPUP && popmenu==1) + todo_wine ok(!mbi.hwndMenu == !popmenu, + "msg %x: GetMenuBarInfo.hwndMenu wrong: %p expected %sNULL\n", + msg, mbi.hwndMenu, popmenu ? "not " : ""); + else + ok(!mbi.hwndMenu == !popmenu, + "msg %x: GetMenuBarInfo.hwndMenu wrong: %p expected %sNULL\n", + msg, mbi.hwndMenu, popmenu ? "not " : ""); + } + ok(mbi.hMenu == hmenu, "msg %x: GetMenuBarInfo got wrong menu: %p expected %p\n", + msg, mbi.hMenu, hmenu); + ok(!bMenuVisible == !mbi.fBarFocused, "nsg %x: GetMenuBarInfo.fBarFocused (%d) is wrong\n", + msg, mbi.fBarFocused != 0); + ok(!(bMenuVisible && (state & MF_HILITE)) == !mbi.fFocused, + "msg %x: GetMenuBarInfo.fFocused (%d) is wrong\n", msg, mbi.fFocused != 0); + } + + if (msg == WM_EXITMENULOOP) + bMenuVisible = FALSE; + else if (msg == WM_INITMENUPOPUP) + popmenu++; + else if (msg == WM_UNINITMENUPOPUP) + popmenu--; return 0; } @@ -3317,6 +3504,7 @@ START_TEST(menu) test_menu_locked_by_window(); test_subpopup_locked_by_menu(); test_menu_ownerdraw(); + test_getmenubarinfo(); test_menu_bmp_and_string(); test_menu_getmenuinfo(); test_menu_setmenuinfo();

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2012