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

Henri Verbeet : d3d8: Get rid of IDirect3DSwapChain8Impl.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 584053d0ee0a9c888ec8594758f2fba003f48833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=584053d0ee0a9c888ec859475… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 22 18:01:08 2012 +0200 d3d8: Get rid of IDirect3DSwapChain8Impl. --- dlls/d3d8/d3d8_private.h | 17 ++------ dlls/d3d8/device.c | 4 +- dlls/d3d8/swapchain.c | 93 +++++++++++++++++++++++----------------------- 3 files changed, 52 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=584053d0ee0a9c888ec85…

1 0

Andrew Eikum : msgsm32: Downgrade ERR to WARN.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 99661c7ddf594cbce6740b527f3b201c7101f0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=99661c7ddf594cbce6740b527… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 22 13:01:23 2012 -0500 msgsm32: Downgrade ERR to WARN. --- dlls/msgsm32.acm/msgsm32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 2543e0b..8b0885f 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -618,7 +618,7 @@ LRESULT CALLBACK GSM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case ACMDM_STREAM_CONVERT: return GSM_StreamConvert((PACMDRVSTREAMINSTANCE)dwParam1, (PACMDRVSTREAMHEADER)dwParam2); #else - case ACMDM_STREAM_OPEN: ERR("libgsm support not compiled in!\n"); + case ACMDM_STREAM_OPEN: WARN("libgsm support not compiled in!\n"); case ACMDM_STREAM_CLOSE: case ACMDM_STREAM_SIZE: case ACMDM_STREAM_CONVERT:

1 0

Andrew Eikum : wineoss.drv: Resolve some diff between winealsa and wineoss.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: e5551393bd086dbdba1c15ad7e95e4154d1726df URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5551393bd086dbdba1c15ad7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 22 13:11:09 2012 -0500 wineoss.drv: Resolve some diff between winealsa and wineoss. --- dlls/wineoss.drv/mmdevdrv.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c8b12a3..62ae7ca 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1571,12 +1571,12 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) if(This->dataflow == eRender){ This->written_frames = 0; + This->last_pos_frames = 0; }else{ This->written_frames += This->held_frames; } - This->lcl_offs_frames = 0; This->held_frames = 0; - This->last_pos_frames = 0; + This->lcl_offs_frames = 0; LeaveCriticalSection(&This->lock); @@ -1752,8 +1752,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { ACImpl *This = impl_from_IAudioRenderClient(iface); - UINT32 pad, write_pos; - HRESULT hr; + UINT32 write_pos; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -1774,13 +1773,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return S_OK; } - hr = IAudioClient_GetCurrentPadding(&This->IAudioClient_iface, &pad); - if(FAILED(hr)){ - LeaveCriticalSection(&This->lock); - return hr; - } - - if(pad + frames > This->bufsize_frames){ + if(This->held_frames + frames > This->bufsize_frames){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_TOO_LARGE; } @@ -2029,7 +2022,16 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( TRACE("(%p)->(%p)\n", This, frames); - return AudioClient_GetCurrentPadding(&This->IAudioClient_iface, frames); + if(!frames) + return E_POINTER; + + EnterCriticalSection(&This->lock); + + *frames = This->held_frames < This->period_frames ? 0 : This->period_frames; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =

1 0

Henri Verbeet : d3d8: Get rid of IDirect3DVertexBuffer8Impl.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 1993727ee73ebec02e01858166ccbea0b1ea5711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1993727ee73ebec02e0185816… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 22 18:01:07 2012 +0200 d3d8: Get rid of IDirect3DVertexBuffer8Impl. --- dlls/d3d8/buffer.c | 72 +++++++++++++++++++++++----------------------- dlls/d3d8/d3d8_private.h | 20 ++++--------- dlls/d3d8/device.c | 12 ++++---- 3 files changed, 48 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1993727ee73ebec02e018…

1 0

Henri Verbeet : wined3d: Get rid of the conv_mat macro.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 481514eab21c9340ad14aacb373e32c9ff61fa42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481514eab21c9340ad14aacb3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 22 18:01:05 2012 +0200 wined3d: Get rid of the conv_mat macro. --- dlls/wined3d/device.c | 13 +++++-------- dlls/wined3d/wined3d_private.h | 13 ------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a575eec..e1e28d1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1801,6 +1801,10 @@ HRESULT CDECL wined3d_device_set_transform(struct wined3d_device *device, { TRACE("device %p, state %s, matrix %p.\n", device, debug_d3dtstype(d3dts), matrix); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->u.s._11, matrix->u.s._12, matrix->u.s._13, matrix->u.s._14); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->u.s._21, matrix->u.s._22, matrix->u.s._23, matrix->u.s._24); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->u.s._31, matrix->u.s._32, matrix->u.s._33, matrix->u.s._34); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->u.s._41, matrix->u.s._42, matrix->u.s._43, matrix->u.s._44); /* Handle recording of state blocks. */ if (device->isRecordingState) @@ -1823,14 +1827,7 @@ HRESULT CDECL wined3d_device_set_transform(struct wined3d_device *device, return WINED3D_OK; } - conv_mat(matrix, &device->stateBlock->state.transforms[d3dts].u.m[0][0]); - - /* ScreenCoord = ProjectionMat * ViewMat * WorldMat * ObjectCoord - * where ViewMat = Camera space, WorldMat = world space. - * - * In OpenGL, camera and world space is combined into GL_MODELVIEW - * matrix. The Projection matrix stay projection matrix. */ - + device->stateBlock->state.transforms[d3dts] = *matrix; if (d3dts == WINED3D_TS_VIEW) device->view_ident = !memcmp(matrix, &identity, sizeof(identity)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0525471..6e6aecb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -840,19 +840,6 @@ do { \ #define checkGLcall(A) do {} while(0) #endif -/* Trace routines / diagnostics */ -/* ---------------------------- */ - -/* Dump out a matrix and copy it */ -#define conv_mat(mat,gl_mat) \ -do { \ - TRACE("%f %f %f %f\n", (mat)->u.s._11, (mat)->u.s._12, (mat)->u.s._13, (mat)->u.s._14); \ - TRACE("%f %f %f %f\n", (mat)->u.s._21, (mat)->u.s._22, (mat)->u.s._23, (mat)->u.s._24); \ - TRACE("%f %f %f %f\n", (mat)->u.s._31, (mat)->u.s._32, (mat)->u.s._33, (mat)->u.s._34); \ - TRACE("%f %f %f %f\n", (mat)->u.s._41, (mat)->u.s._42, (mat)->u.s._43, (mat)->u.s._44); \ - memcpy(gl_mat, (mat), 16 * sizeof(float)); \ -} while (0) - /* Trace vector and strided data information */ #define TRACE_STRIDED(si, name) do { if (si->use_map & (1 << name)) \ TRACE( #name " = (data {%#x:%p}, stride %d, format %s, stream %u)\n", \

1 0

Huw Davies : winspool: Pass unicode names to set_reg_DWORD.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 263df24406dd85634611a75a67b97688cb5bdd6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=263df24406dd85634611a75a6… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 22 16:36:25 2012 +0100 winspool: Pass unicode names to set_reg_DWORD. --- dlls/winspool.drv/info.c | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index afba8a1..f12522b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -184,12 +184,15 @@ static const WCHAR Version3_RegPathW[] = {'\\','V','e','r','s','i','o','n','-',' static const WCHAR Version3_SubdirW[] = {'\\','3',0}; static const WCHAR spooldriversW[] = {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\',0}; + +static const WCHAR AttributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; static const WCHAR backslashW[] = {'\\',0}; static const WCHAR Configuration_FileW[] = {'C','o','n','f','i','g','u','r','a','t', 'i','o','n',' ','F','i','l','e',0}; static const WCHAR DatatypeW[] = {'D','a','t','a','t','y','p','e',0}; static const WCHAR Data_FileW[] = {'D','a','t','a',' ','F','i','l','e',0}; static const WCHAR Default_DevModeW[] = {'D','e','f','a','u','l','t',' ','D','e','v','M','o','d','e',0}; +static const WCHAR Default_PriorityW[] = {'D','e','f','a','u','l','t',' ','P','r','i','o','r','i','t','y',0}; static const WCHAR Dependent_FilesW[] = {'D','e','p','e','n','d','e','n','t',' ','F','i','l','e','s',0}; static const WCHAR DescriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR DriverW[] = {'D','r','i','v','e','r',0}; @@ -209,9 +212,13 @@ static const WCHAR Print_ProcessorW[] = {'P','r','i','n','t',' ','P','r','o','c' static const WCHAR Printer_DriverW[] = {'P','r','i','n','t','e','r',' ','D','r','i','v','e','r',0}; static const WCHAR PrinterDriverDataW[] = {'P','r','i','n','t','e','r','D','r','i','v','e','r','D','a','t','a',0}; static const WCHAR PrinterPortsW[] = {'P','r','i','n','t','e','r','P','o','r','t','s',0}; +static const WCHAR PriorityW[] = {'P','r','i','o','r','i','t','y',0}; static const WCHAR ProviderW[] = {'P','r','o','v','i','d','e','r',0}; static const WCHAR Separator_FileW[] = {'S','e','p','a','r','a','t','o','r',' ','F','i','l','e',0}; static const WCHAR Share_NameW[] = {'S','h','a','r','e',' ','N','a','m','e',0}; +static const WCHAR StartTimeW[] = {'S','t','a','r','t','T','i','m','e',0}; +static const WCHAR StatusW[] = {'S','t','a','t','u','s',0}; +static const WCHAR UntilTimeW[] = {'U','n','t','i','l','T','i','m','e',0}; static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; static WCHAR WinPrintW[] = {'W','i','n','P','r','i','n','t',0}; static const WCHAR deviceW[] = {'d','e','v','i','c','e',0}; @@ -748,9 +755,9 @@ PRINTCAP_LoadPrinters(void) { return hadprinter; } -static inline DWORD set_reg_DWORD(HKEY hkey, LPCSTR keyname, const DWORD value) +static inline DWORD set_reg_DWORD(HKEY hkey, const WCHAR *keyname, const DWORD value) { - return RegSetValueExA(hkey, keyname, 0, REG_DWORD, (const BYTE*)&value, sizeof(value)); + return RegSetValueExW(hkey, keyname, 0, REG_DWORD, (const BYTE*)&value, sizeof(value)); } static inline DWORD set_reg_szW(HKEY hkey, const WCHAR *keyname, const WCHAR *value) @@ -2602,12 +2609,6 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) HANDLE retval; HKEY hkeyPrinter, hkeyPrinters, hkeyDriver, hkeyDrivers; LONG size; - static const WCHAR attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}, - default_devmodeW[] = {'D','e','f','a','u','l','t',' ','D','e','v','M','o','d','e',0}, - priorityW[] = {'P','r','i','o','r','i','t','y',0}, - start_timeW[] = {'S','t','a','r','t','T','i','m','e',0}, - statusW[] = {'S','t','a','t','u','s',0}, - until_timeW[] = {'U','n','t','i','l','T','i','m','e',0}; TRACE("(%s,%d,%p)\n", debugstr_w(pName), Level, pPrinter); @@ -2631,7 +2632,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) return 0; } if(!RegOpenKeyW(hkeyPrinters, pi->pPrinterName, &hkeyPrinter)) { - if (!RegQueryValueW(hkeyPrinter, attributesW, NULL, NULL)) { + if (!RegQueryValueW(hkeyPrinter, AttributesW, NULL, NULL)) { SetLastError(ERROR_PRINTER_ALREADY_EXISTS); RegCloseKey(hkeyPrinter); RegCloseKey(hkeyPrinters); @@ -2672,7 +2673,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) } set_devices_and_printerports(pi); - RegSetValueExW(hkeyPrinter, attributesW, 0, REG_DWORD, + RegSetValueExW(hkeyPrinter, AttributesW, 0, REG_DWORD, (LPBYTE)&pi->Attributes, sizeof(DWORD)); set_reg_szW(hkeyPrinter, DatatypeW, pi->pDatatype); @@ -2708,7 +2709,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) } } - set_reg_devmode( hkeyPrinter, default_devmodeW, dm ); + set_reg_devmode( hkeyPrinter, Default_DevModeW, dm ); if (!pi->pDevMode) HeapFree( GetProcessHeap(), 0, dm ); set_reg_szW(hkeyPrinter, DescriptionW, pi->pComment); @@ -2719,15 +2720,15 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) set_reg_szW(hkeyPrinter, PortW, pi->pPortName); set_reg_szW(hkeyPrinter, Print_ProcessorW, pi->pPrintProcessor); set_reg_szW(hkeyPrinter, Printer_DriverW, pi->pDriverName); - RegSetValueExW(hkeyPrinter, priorityW, 0, REG_DWORD, + RegSetValueExW(hkeyPrinter, PriorityW, 0, REG_DWORD, (LPBYTE)&pi->Priority, sizeof(DWORD)); set_reg_szW(hkeyPrinter, Separator_FileW, pi->pSepFile); set_reg_szW(hkeyPrinter, Share_NameW, pi->pShareName); - RegSetValueExW(hkeyPrinter, start_timeW, 0, REG_DWORD, + RegSetValueExW(hkeyPrinter, StartTimeW, 0, REG_DWORD, (LPBYTE)&pi->StartTime, sizeof(DWORD)); - RegSetValueExW(hkeyPrinter, statusW, 0, REG_DWORD, + RegSetValueExW(hkeyPrinter, StatusW, 0, REG_DWORD, (LPBYTE)&pi->Status, sizeof(DWORD)); - RegSetValueExW(hkeyPrinter, until_timeW, 0, REG_DWORD, + RegSetValueExW(hkeyPrinter, UntilTimeW, 0, REG_DWORD, (LPBYTE)&pi->UntilTime, sizeof(DWORD)); RegCloseKey(hkeyPrinter); @@ -2916,11 +2917,11 @@ static void set_printer_2( HKEY key, const PRINTER_INFO_2W *pi ) set_reg_szW( key, DatatypeW, pi->pDatatype ); set_reg_szW( key, ParametersW, pi->pParameters ); - set_reg_DWORD( key, "Attributes", pi->Attributes ); - set_reg_DWORD( key, "Priority", pi->Priority ); - set_reg_DWORD( key, "Default Priority", pi->DefaultPriority ); - set_reg_DWORD( key, "StartTime", pi->StartTime ); - set_reg_DWORD( key, "UntilTime", pi->UntilTime ); + set_reg_DWORD( key, AttributesW, pi->Attributes ); + set_reg_DWORD( key, PriorityW, pi->Priority ); + set_reg_DWORD( key, Default_PriorityW, pi->DefaultPriority ); + set_reg_DWORD( key, StartTimeW, pi->StartTime ); + set_reg_DWORD( key, UntilTimeW, pi->UntilTime ); } static BOOL set_printer_9( HKEY key, const PRINTER_INFO_9W *pi )

1 0

Michael Stefaniuc : mshtml/tests: Remove leftover code from c3d8d052.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 2addfb73e3d783eb8fc3c3a5abc4c13f9f94c198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2addfb73e3d783eb8fc3c3a5a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 22 11:24:55 2012 +0200 mshtml/tests: Remove leftover code from c3d8d052. --- dlls/mshtml/tests/dom.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 14d91cc..4dc55db 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3541,9 +3541,6 @@ static void test_elem_col_item(IHTMLElementCollection *col, const char *n, test_elem_collection((IUnknown*)disp, elem_types, len); IDispatch_Release(disp); - ok(hres == S_OK, "Could not get IHTMLElementCollection interface: %08x\n", hres); - if(hres != S_OK) - goto cleanup; V_VT(&index) = VT_I4; @@ -3573,7 +3570,6 @@ static void test_elem_col_item(IHTMLElementCollection *col, const char *n, ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); ok(disp == NULL, "disp != NULL\n"); -cleanup: SysFreeString(V_BSTR(&name)); }

1 0

Piotr Caban : user32/tests: Added SetWindowPos test that incorrectly sets focus.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 42eb57dfa7310dc6b70f771c8014d8a02485d554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42eb57dfa7310dc6b70f771c8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 18 15:52:50 2012 +0200 user32/tests: Added SetWindowPos test that incorrectly sets focus. --- dlls/user32/tests/win.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 4f343da..dd5069b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2157,6 +2157,14 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) DestroyWindow(hwnd_grandchild); DestroyWindow(hwnd_child); DestroyWindow(hwnd_child2); + + hwnd_child = create_tool_window(WS_CHILD|WS_POPUP|WS_SYSMENU, hwnd2); + ok(!!hwnd_child, "Failed to create child window (%d)\n", GetLastError()); + ret = SetWindowPos(hwnd_child, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_SHOWWINDOW); + ok(ret, "Got %d\n", ret); + flush_events( TRUE ); + todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + DestroyWindow(hwnd_child); } static void test_SetMenu(HWND parent)

1 0

Christian Costa : d3drm: Implement IDirect3DRMMesh_GetGroup.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: f0d3f207aba7a84d57235219d71b7048aed1c38b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d3f207aba7a84d57235219d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 22 08:57:21 2012 +0200 d3drm: Implement IDirect3DRMMesh_GetGroup. --- dlls/d3drm/meshbuilder.c | 22 ++++++++++++++++++---- dlls/d3drm/tests/d3drm.c | 10 ++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4333516..77b68e4 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2514,14 +2514,28 @@ static DWORD WINAPI IDirect3DRMMeshImpl_GetGroupCount(IDirect3DRMMesh* iface) } static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroup(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, unsigned *vCount, unsigned *fCount, unsigned *vPerFace, - DWORD *fDataSize, unsigned *fData) + D3DRMGROUPINDEX id, unsigned *vertex_count, unsigned *face_count, unsigned *vertex_per_face, + DWORD *face_data_size, unsigned *face_data) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%p,%p,%p,%p,%p): stub\n", This, id, vCount, fCount, vPerFace, fDataSize, fData); + TRACE("(%p)->(%u,%p,%p,%p,%p,%p)\n", This, id, vertex_count, face_count, vertex_per_face, face_data_size, face_data); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + if (vertex_count) + *vertex_count = This->groups[id].nb_vertices; + if (face_count) + *face_count = This->groups[id].nb_faces; + if (vertex_per_face) + *vertex_per_face = This->groups[id].vertex_per_face; + if (face_data_size) + *face_data_size = This->groups[id].face_data_size; + if (face_data) + memcpy(face_data, This->groups[id].face_data, This->groups[id].face_data_size); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshImpl_GetVertices(IDirect3DRMMesh* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index ffe571a..4f7eed6 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -344,9 +344,19 @@ static void test_MeshBuilder(void) if (hr == D3DRM_OK) { DWORD nb_groups; + unsigned nb_vertices, nb_faces, nb_face_vertices; + DWORD data_size; nb_groups = IDirect3DRMMesh_GetGroupCount(mesh); ok(nb_groups == 1, "GetCroupCount returned %u\n", nb_groups); + hr = IDirect3DRMMesh_GetGroup(mesh, 1, &nb_vertices, &nb_faces, &nb_face_vertices, &data_size, NULL); + ok(hr == D3DRMERR_BADVALUE, "GetCroup returned hr = %x\n", hr); + hr = IDirect3DRMMesh_GetGroup(mesh, 0, &nb_vertices, &nb_faces, &nb_face_vertices, &data_size, NULL); + ok(hr == D3DRM_OK, "GetCroup failed returning hr = %x\n", hr); + ok(nb_vertices == 3, "Wrong number of vertices %u (must be 3)\n", nb_vertices); + ok(nb_faces == 1, "Wrong number of faces %u (must be 1)\n", nb_faces); + todo_wine ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices); + todo_wine ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size); IDirect3DRMMesh_Release(mesh); }

1 0

Christian Costa : d3drm: Implement IDirect3DRMMesh_GetVertices.
by Alexandre Julliard May 22, 2012

May 22, 2012

Module: wine Branch: master Commit: 24817de04eba73bd31c4c0b6969b045333c64653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24817de04eba73bd31c4c0b69… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 22 08:57:37 2012 +0200 d3drm: Implement IDirect3DRMMesh_GetVertices. --- dlls/d3drm/meshbuilder.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 357e285..9b5e2cc 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2550,13 +2550,24 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroup(IDirect3DRMMesh* iface, } static HRESULT WINAPI IDirect3DRMMeshImpl_GetVertices(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, DWORD index, DWORD count, D3DRMVERTEX *returnPtr) + D3DRMGROUPINDEX id, DWORD index, DWORD count, D3DRMVERTEX *return_ptr) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%u,%u,%p): stub\n", This, id, index, count, returnPtr); + TRACE("(%p)->(%u,%u,%u,%p)\n", This, id, index, count, return_ptr); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + if ((index + count - 1) >= This->groups[id].nb_vertices) + return D3DRMERR_BADVALUE; + + if (!return_ptr) + return E_POINTER; + + memcpy(return_ptr, This->groups[id].vertices + index, count * sizeof(D3DRMVERTEX)); + + return D3DRM_OK; } static D3DCOLOR WINAPI IDirect3DRMMeshImpl_GetGroupColor(IDirect3DRMMesh* iface, D3DRMGROUPINDEX id)

1 0