May 2013 - Wine-commits - list.winehq.org

Maarten Lankhorst : devenum: Set FriendlyName and wave*ID for devices.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 604172dd986a6ff1da89cd6682ef9b8ceac639d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604172dd986a6ff1da89cd668… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 10 10:07:09 2013 +0200 devenum: Set FriendlyName and wave*ID for devices. --- dlls/devenum/createdevenum.c | 54 +++++++++++++++++++++++++++++++++++------- dlls/devenum/mediacatenum.c | 1 + 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 625ff62..b7e288b 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -52,6 +52,9 @@ static const WCHAR wszAllowedZero[] = {'A','l','l','o','w','e','d','Z','e','r',' static const WCHAR wszDirection[] = {'D','i','r','e','c','t','i','o','n',0}; static const WCHAR wszIsRendered[] = {'I','s','R','e','n','d','e','r','e','d',0}; static const WCHAR wszTypes[] = {'T','y','p','e','s',0}; +static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; +static const WCHAR wszWaveInID[] = {'W','a','v','e','I','n','I','D',0}; +static const WCHAR wszWaveOutID[] = {'W','a','v','e','O','u','t','I','D',0}; static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface); static HRESULT DEVENUM_CreateSpecialCategories(void); @@ -629,6 +632,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) WAVEINCAPSW wicaps; MIDIOUTCAPSW mocaps; REGPINTYPES * pTypes; + IPropertyBag * pPropBag = NULL; numDevs = waveOutGetNumDevs(); @@ -666,10 +670,24 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) wocaps.szPname, &rf2); - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - if (pMoniker) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_UNION(&var, ulVal) = i; + res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszWaveOutID, &var); + else + pPropBag = NULL; + + V_VT(&var) = VT_LPWSTR; + V_UNION(&var, bstrVal) = wocaps.szPname; + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); + if (pPropBag) + IPropertyBag_Release(pPropBag); IMoniker_Release(pMoniker); pMoniker = NULL; } @@ -725,7 +743,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) rfp2.lpMediaType = pTypes; - res = IFilterMapper2_RegisterFilter(pMapper, + res = IFilterMapper2_RegisterFilter(pMapper, &CLSID_AudioRecord, wicaps.szPname, &pMoniker, @@ -733,10 +751,27 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) wicaps.szPname, &rf2); - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - if (pMoniker) - IMoniker_Release(pMoniker); + if (pMoniker) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_UNION(&var, ulVal) = i; + res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszWaveInID, &var); + else + pPropBag = NULL; + + V_VT(&var) = VT_LPWSTR; + V_UNION(&var, bstrVal) = wicaps.szPname; + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); + + if (pPropBag) + IPropertyBag_Release(pPropBag); + IMoniker_Release(pMoniker); + } CoTaskMemFree(pTypes); } @@ -803,7 +838,6 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) szDeviceVersion, sizeof(szDeviceVersion)/sizeof(WCHAR))) { IMoniker * pMoniker = NULL; - IPropertyBag * pPropBag = NULL; WCHAR dprintf[] = { 'v','i','d','e','o','%','d',0 }; snprintfW(szDevicePath, sizeof(szDevicePath)/sizeof(WCHAR), dprintf, i); /* The above code prevents 1 device with a different ID overwriting another */ @@ -834,8 +868,10 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) V_VT(&var) = VT_I4; V_UNION(&var, ulVal) = i; res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); - if (SUCCEEDED(res)) - res = IPropertyBag_Write(pPropBag, wszVfwIndex, &var); + if (SUCCEEDED(res)) { + res = IPropertyBag_Write(pPropBag, wszVfwIndex, &var); + IPropertyBag_Release(pPropBag); + } IMoniker_Release(pMoniker); } diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 24d236d..60ba110 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -232,6 +232,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write( switch (V_VT(pVar)) { case VT_BSTR: + case VT_LPWSTR: TRACE("writing %s\n", debugstr_w(V_UNION(pVar, bstrVal))); lpData = V_UNION(pVar, bstrVal); dwType = REG_SZ;

1 0

Christian Costa : d3dx9_36: Report D3DFMT_P8 for image with indexed colors in D3DGetImageInfoFromFileInMemory .
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: aa1d24f09bd78ebfc5c15438f3de1602b5dd6f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa1d24f09bd78ebfc5c15438f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 12 23:57:50 2013 +0200 d3dx9_36: Report D3DFMT_P8 for image with indexed colors in D3DGetImageInfoFromFileInMemory. --- dlls/d3dx9_36/surface.c | 6 +++--- dlls/d3dx9_36/tests/surface.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 81bdd78..82ead60 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -37,9 +37,9 @@ static const struct const GUID *wic_guid; D3DFORMAT d3dformat; } wic_pixel_formats[] = { - { &GUID_WICPixelFormat8bppIndexed, D3DFMT_L8 }, - { &GUID_WICPixelFormat1bppIndexed, D3DFMT_L8 }, - { &GUID_WICPixelFormat4bppIndexed, D3DFMT_L8 }, + { &GUID_WICPixelFormat8bppIndexed, D3DFMT_P8 }, + { &GUID_WICPixelFormat1bppIndexed, D3DFMT_P8 }, + { &GUID_WICPixelFormat4bppIndexed, D3DFMT_P8 }, { &GUID_WICPixelFormat16bppBGR555, D3DFMT_X1R5G5B5 }, { &GUID_WICPixelFormat16bppBGR565, D3DFMT_R5G6B5 }, { &GUID_WICPixelFormat24bppBGR, D3DFMT_R8G8B8 }, diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 15707f7..94242d1 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -481,17 +481,17 @@ static void test_D3DXGetImageInfo(void) hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, sizeof(bmp_1bpp), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); - todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); hr = D3DXGetImageInfoFromFileInMemory(bmp_2bpp, sizeof(bmp_2bpp), &info); ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); hr = D3DXGetImageInfoFromFileInMemory(bmp_4bpp, sizeof(bmp_4bpp), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); - todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); hr = D3DXGetImageInfoFromFileInMemory(bmp_8bpp, sizeof(bmp_8bpp), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); - todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); /* test DDS support */ hr = D3DXGetImageInfoFromFileInMemory(dds_24bit, sizeof(dds_24bit), &info); @@ -646,7 +646,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromFile */ if(testbitmap_ok) { hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK); + todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromFileA(NULL, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -683,7 +683,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromFileInMemory */ hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp_1bpp, sizeof(bmp_1bpp), NULL, D3DX_DEFAULT, 0, NULL); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, noimage, sizeof(noimage), NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);

1 0

Christian Costa : d3dx9_36: Fix D3DXCheckTextureRequirements to return D3DFMT_A8R8G8B8 when d3d doesn' t support D3DFMT_P8 + tests.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: a131d714ffb0c0dd9415e6b3b382b01818fa41cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a131d714ffb0c0dd9415e6b3b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 12 23:57:58 2013 +0200 d3dx9_36: Fix D3DXCheckTextureRequirements to return D3DFMT_A8R8G8B8 when d3d doesn't support D3DFMT_P8 + tests. --- dlls/d3dx9_36/tests/texture.c | 11 +++++++++++ dlls/d3dx9_36/util.c | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 782864c..fd072c8 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -329,6 +329,17 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(format == expected, "Returned format %u, expected %u\n", format, expected); + if(SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_P8))) + expected = D3DFMT_P8; + else + expected = D3DFMT_A8R8G8B8; + + format = D3DFMT_P8; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == expected, "Returned format %u, expected %u\n", format, expected); + IDirect3D9_Release(d3d); } diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 9ba54e2..376fe89 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -73,6 +73,7 @@ static const struct pixel_format_desc formats[] = {D3DFMT_DXT5, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, {D3DFMT_A16B16G16R16F, {16, 16, 16, 16}, {48, 0, 16, 32}, 8, 1, 1, 8, FORMAT_ARGBF16, NULL, NULL }, {D3DFMT_A32B32G32R32F, {32, 32, 32, 32}, {96, 0, 32, 64}, 16, 1, 1, 16, FORMAT_ARGBF, NULL, NULL }, + {D3DFMT_P8, { 8, 8, 8, 8}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_UNKNOWN, NULL, NULL }, /* marks last element */ {D3DFMT_UNKNOWN, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 0, 1, 1, 0, FORMAT_UNKNOWN, NULL, NULL }, };

1 0

Nikolay Sivov : comctl32: Fix tics rectangle width/height.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: eaad1cdea8f4d265ae1d8e99e68feb9b3709356a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaad1cdea8f4d265ae1d8e99e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 12 17:27:47 2013 +0400 comctl32: Fix tics rectangle width/height. --- dlls/comctl32/trackbar.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index da11843..50c44d5 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -499,12 +499,12 @@ TRACKBAR_DrawOneTic (const TRACKBAR_INFO *infoPtr, HDC hdc, LONG ticPos, int fla offsetthumb = (infoPtr->rcThumb.bottom - infoPtr->rcThumb.top)/2; rcTics.left = infoPtr->rcThumb.left - 2; rcTics.right = infoPtr->rcThumb.right + 2; - rcTics.top = infoPtr->rcChannel.top + offsetthumb + 1; - rcTics.bottom = infoPtr->rcChannel.bottom - offsetthumb; + rcTics.top = infoPtr->rcChannel.top + offsetthumb; + rcTics.bottom = infoPtr->rcChannel.bottom - offsetthumb - 1; } else { offsetthumb = (infoPtr->rcThumb.right - infoPtr->rcThumb.left)/2; - rcTics.left = infoPtr->rcChannel.left + offsetthumb + 1; - rcTics.right = infoPtr->rcChannel.right - offsetthumb; + rcTics.left = infoPtr->rcChannel.left + offsetthumb; + rcTics.right = infoPtr->rcChannel.right - offsetthumb - 1; rcTics.top = infoPtr->rcThumb.top - 2; rcTics.bottom = infoPtr->rcThumb.bottom + 2; }

1 0

Nikolay Sivov : comctl32: Remove unused defines.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 2e0ff5b780c9ff3bb3e62581003e66921bb829eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0ff5b780c9ff3bb3e625810… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 12 22:28:36 2013 +0400 comctl32: Remove unused defines. --- dlls/comctl32/comctl32.h | 20 -------------------- dlls/comctl32/rebar.c | 3 +++ 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 129ab0c..b9b0574 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -38,9 +38,6 @@ extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN; extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; -/* has a value of: 0, CCS_TOP, CCS_NOMOVEY, CCS_BOTTOM */ -#define CCS_LAYOUT_MASK 0x3 - /* Property sheet / Wizard */ #define IDD_PROPSHEET 1006 #define IDD_WIZARD 1020 @@ -76,23 +73,6 @@ extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; #define IDB_HIST_SMALL 130 #define IDB_HIST_LARGE 131 - -/* Month calendar month menu popup */ -#define IDD_MCMONTHMENU 300 - -#define IDM_JAN 301 -#define IDM_FEB 302 -#define IDM_MAR 303 -#define IDM_APR 304 -#define IDM_MAY 305 -#define IDM_JUN 306 -#define IDM_JUL 307 -#define IDM_AUG 308 -#define IDM_SEP 309 -#define IDM_OCT 310 -#define IDM_NOV 311 -#define IDM_DEC 312 - #define IDM_TODAY 4163 #define IDM_GOTODAY 4164 diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 4e26c33..fa21baa 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -138,6 +138,9 @@ typedef struct HWND hwndPrevParent; } REBAR_BAND; +/* has a value of: 0, CCS_TOP, CCS_NOMOVEY, CCS_BOTTOM */ +#define CCS_LAYOUT_MASK 0x3 + /* fStatus flags */ #define HAS_GRIPPER 0x00000001 #define HAS_IMAGE 0x00000002

1 0

Dmitry Timoshkov : server: Set appropriate status for a terminated thread.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: fd76b695b911ec0be12ba2a67c85f0d97174c56f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd76b695b911ec0be12ba2a67… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 13 16:43:58 2013 +0900 server: Set appropriate status for a terminated thread. --- server/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/thread.c b/server/thread.c index 18c1e08..5f9738d 100644 --- a/server/thread.c +++ b/server/thread.c @@ -481,7 +481,7 @@ static void set_thread_info( struct thread *thread, if ((req->affinity & thread->process->affinity) != req->affinity) set_error( STATUS_INVALID_PARAMETER ); else if (thread->state == TERMINATED) - set_error( STATUS_ACCESS_DENIED ); + set_error( STATUS_THREAD_IS_TERMINATING ); else if (set_thread_affinity( thread, req->affinity )) file_set_error(); }

1 0

André Hentschel : d3drm: Implement IDirect3DRMMeshBuilder3_GetNormalCount.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: edacd0772e6c57f637477def8d3bd6800b752991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edacd0772e6c57f637477def8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 12 23:53:40 2013 +0200 d3drm: Implement IDirect3DRMMeshBuilder3_GetNormalCount. --- dlls/d3drm/meshbuilder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 07dc3fd..549a5dd 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2392,9 +2392,9 @@ static int WINAPI IDirect3DRMMeshBuilder3Impl_GetNormalCount(IDirect3DRMMeshBuil { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)->()\n", This); - return E_NOTIMPL; + return This->nb_normals; } static const struct IDirect3DRMMeshBuilder3Vtbl Direct3DRMMeshBuilder3_Vtbl =

1 0

André Hentschel : d3drm: Implement IDirect3DRMMeshBuilder3_GetNormals.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 60aaed781c0c7dc5ce39aaf846bc1c3bb7d5e8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60aaed781c0c7dc5ce39aaf84… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 12 23:54:04 2013 +0200 d3drm: Implement IDirect3DRMMeshBuilder3_GetNormals. --- dlls/d3drm/meshbuilder.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 549a5dd..eecf629 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2379,13 +2379,19 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetNormals(IDirect3DRMMeshBuil } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetNormals(IDirect3DRMMeshBuilder3 *iface, - DWORD IndexFirst, DWORD *count, D3DVECTOR *vector) + DWORD IndexFirst, DWORD *ncount, D3DVECTOR *normals) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); + DWORD count = This->nb_normals - IndexFirst; - FIXME("(%p)->(%u,%p,%p): stub\n", This, IndexFirst, count, vector); + TRACE("(%p)->(%u,%p,%p)\n", This, IndexFirst, ncount, normals); - return E_NOTIMPL; + if (ncount) + *ncount = count; + if (normals && This->nb_normals) + memcpy(normals, This->pNormals + IndexFirst, count * sizeof(D3DVECTOR)); + + return D3DRM_OK; } static int WINAPI IDirect3DRMMeshBuilder3Impl_GetNormalCount(IDirect3DRMMeshBuilder3* iface)

1 0

André Hentschel : d3drm/tests: Add more face tests.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 0867e377681de28fd52e3a7b70f97da44669c98b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0867e377681de28fd52e3a7b7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 12 23:55:47 2013 +0200 d3drm/tests: Add more face tests. --- dlls/d3drm/tests/d3drm.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index db9d623..f82af5f 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -677,6 +677,8 @@ static void test_Face(void) IDirect3DRMFace *face1; IDirect3DRMFace2 *face2; IDirect3DRMFaceArray *array1; + D3DRMLOADMEMORY info; + D3DVECTOR v1[4], n1[4], v2[4], n2[4]; DWORD count; CHAR cname[64] = {0}; int icount; @@ -812,6 +814,88 @@ static void test_Face(void) icount = IDirect3DRMFace2_GetVertexCount(face2); ok(!icount, "wrong VertexCount: %i\n", icount); + info.lpMemory = data_ok; + info.dSize = strlen(data_ok); + hr = IDirect3DRMMeshBuilder3_Load(MeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + + icount = IDirect3DRMMeshBuilder3_GetVertexCount(MeshBuilder3); + ok(icount == 4, "Wrong number of vertices %d (must be 4)\n", icount); + + icount = IDirect3DRMMeshBuilder3_GetNormalCount(MeshBuilder3); + ok(icount == 4, "Wrong number of normals %d (must be 4)\n", icount); + + icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3); + todo_wine + ok(icount == 4, "Wrong number of faces %d (must be 4)\n", icount); + + count = 4; + hr = IDirect3DRMMeshBuilder3_GetVertices(MeshBuilder3, 0, &count, v1); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(count == 4, "Wrong number of vertices %d (must be 4)\n", count); + + hr = IDirect3DRMMeshBuilder3_GetNormals(MeshBuilder3, 0, &count, n1); + ok(hr == D3DRM_OK, "Cannot get normals information (hr = %x)\n", hr); + ok(count == 4, "Wrong number of normals %d (must be 4)\n", count); + + array1 = NULL; + hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1); + todo_wine + ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr); + todo_wine + ok(array1 != NULL, "pArray = %p\n", array1); + if (array1) + { + IDirect3DRMFace *face; + count = IDirect3DRMFaceArray_GetSize(array1); + ok(count == 4, "count = %u\n", count); + hr = IDirect3DRMFaceArray_GetElement(array1, 1, &face); + ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr); + IDirect3DRMFace_GetVertices(face, &count, v2, n2); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(count == 3, "Wrong number of vertices %d (must be 3)\n", count); + ok(U1(v2[0]).x == U1(v1[0]).x, "Wrong component v2[0].x = %f (expected %f)\n", + U1(v2[0]).x, U1(v1[0]).x); + ok(U1(v2[0]).y == U1(v1[0]).y, "Wrong component v2[0].y = %f (expected %f)\n", + U1(v2[0]).y, U1(v1[0]).y); + ok(U1(v2[0]).z == U1(v1[0]).z, "Wrong component v2[0].z = %f (expected %f)\n", + U1(v2[0]).z, U1(v1[0]).z); + ok(U1(v2[1]).x == U1(v1[1]).x, "Wrong component v2[1].x = %f (expected %f)\n", + U1(v2[1]).x, U1(v1[1]).x); + ok(U1(v2[1]).y == U1(v1[1]).y, "Wrong component v2[1].y = %f (expected %f)\n", + U1(v2[1]).y, U1(v1[1]).y); + ok(U1(v2[1]).z == U1(v1[1]).z, "Wrong component v2[1].z = %f (expected %f)\n", + U1(v2[1]).z, U1(v1[1]).z); + ok(U1(v2[2]).x == U1(v1[2]).x, "Wrong component v2[2].x = %f (expected %f)\n", + U1(v2[2]).x, U1(v1[2]).x); + ok(U1(v2[2]).y == U1(v1[2]).y, "Wrong component v2[2].y = %f (expected %f)\n", + U1(v2[2]).y, U1(v1[2]).y); + ok(U1(v2[2]).z == U1(v1[2]).z, "Wrong component v2[2].z = %f (expected %f)\n", + U1(v2[2]).z, U1(v1[2]).z); + + ok(U1(n2[0]).x == U1(n1[0]).x, "Wrong component n2[0].x = %f (expected %f)\n", + U1(n2[0]).x, U1(n1[0]).x); + ok(U1(n2[0]).y == U1(n1[0]).y, "Wrong component n2[0].y = %f (expected %f)\n", + U1(n2[0]).y, U1(n1[0]).y); + ok(U1(n2[0]).z == U1(n1[0]).z, "Wrong component n2[0].z = %f (expected %f)\n", + U1(n2[0]).z, U1(n1[0]).z); + ok(U1(n2[1]).x == U1(n1[1]).x, "Wrong component n2[1].x = %f (expected %f)\n", + U1(n2[1]).x, U1(n1[1]).x); + ok(U1(n2[1]).y == U1(n1[1]).y, "Wrong component n2[1].y = %f (expected %f)\n", + U1(n2[1]).y, U1(n1[1]).y); + ok(U1(n2[1]).z == U1(n1[1]).z, "Wrong component n2[1].z = %f (expected %f)\n", + U1(n2[1]).z, U1(n1[1]).z); + ok(U1(n2[2]).x == U1(n1[2]).x, "Wrong component n2[2].x = %f (expected %f)\n", + U1(n2[2]).x, U1(n1[2]).x); + ok(U1(n2[2]).y == U1(n1[2]).y, "Wrong component n2[2].y = %f (expected %f)\n", + U1(n2[2]).y, U1(n1[2]).y); + ok(U1(n2[2]).z == U1(n1[2]).z, "Wrong component n2[2].z = %f (expected %f)\n", + U1(n2[2]).z, U1(n1[2]).z); + + IDirect3DRMFace_Release(face); + IDirect3DRMFaceArray_Release(array1); + } + IDirect3DRMFace2_Release(face2); IDirect3DRMMeshBuilder3_Release(MeshBuilder3); IDirect3DRM3_Release(d3drm3);

1 0

Nikolay Sivov : comdlg32: Add controls codes defines for color choosing dialog.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: adbb96fb5cc95bc87602d99ae90440521ceeb7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adbb96fb5cc95bc87602d99ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 08:24:29 2013 +0400 comdlg32: Add controls codes defines for color choosing dialog. --- dlls/comdlg32/cdlg.h | 22 +++++++ dlls/comdlg32/colordlg.c | 143 ++++++++++++++++++++++----------------------- dlls/comdlg32/comdlg32.rc | 40 ++++++------ 3 files changed, 112 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adbb96fb5cc95bc87602d…

1 0