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

André Hentschel : d3drm/tests: Initial IDirect3DRMFace tests.
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: 1a2271830b291831b2cccc4c2bf12b72b6731ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a2271830b291831b2cccc4c2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 9 14:44:25 2013 +0200 d3drm/tests: Initial IDirect3DRMFace tests. --- dlls/d3drm/tests/d3drm.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 154 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0f6fc10..db9d623 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -666,6 +666,159 @@ static void test_Mesh(void) IDirect3DRM_Release(d3drm); } +static void test_Face(void) +{ + HRESULT hr; + IDirect3DRM *d3drm; + IDirect3DRM2 *d3drm2; + IDirect3DRM3 *d3drm3; + IDirect3DRMMeshBuilder2 *MeshBuilder2; + IDirect3DRMMeshBuilder3 *MeshBuilder3; + IDirect3DRMFace *face1; + IDirect3DRMFace2 *face2; + IDirect3DRMFaceArray *array1; + DWORD count; + CHAR cname[64] = {0}; + int icount; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateFace(d3drm, &face1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr); + if (FAILED(hr)) + { + skip("Cannot get IDirect3DRMFace interface (hr = %x), skipping tests\n", hr); + IDirect3DRM_Release(d3drm); + return; + } + + hr = IDirect3DRMFace_GetClassName(face1, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMFace_GetClassName(face1, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = 1; + hr = IDirect3DRMFace_GetClassName(face1, &count, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = sizeof(cname); + hr = IDirect3DRMFace_GetClassName(face1, &count, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(count == sizeof("Face"), "wrong size: %u\n", count); + ok(!strcmp(cname, "Face"), "Expected cname to be \"Face\", but got \"%s\"\n", cname); + + icount = IDirect3DRMFace_GetVertexCount(face1); + ok(!icount, "wrong VertexCount: %i\n", icount); + + IDirect3DRMFace_Release(face1); + + if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2))) + { + win_skip("Cannot get IDirect3DRM2 interface (hr = %x), skipping tests\n", hr); + IDirect3DRM_Release(d3drm); + return; + } + + hr = IDirect3DRM2_CreateMeshBuilder(d3drm2, &MeshBuilder2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder2 interface (hr = %x)\n", hr); + + icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2); + ok(!icount, "wrong FaceCount: %i\n", icount); + + array1 = NULL; + hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1); + todo_wine + ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr); + + hr = IDirect3DRMMeshBuilder2_CreateFace(MeshBuilder2, &face1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr); + + icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2); + todo_wine + ok(icount == 1, "wrong FaceCount: %i\n", icount); + + array1 = NULL; + hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &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 == 1, "count = %u\n", count); + hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face); + ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr); + IDirect3DRMFace_Release(face); + IDirect3DRMFaceArray_Release(array1); + } + + icount = IDirect3DRMFace_GetVertexCount(face1); + ok(!icount, "wrong VertexCount: %i\n", icount); + + IDirect3DRMFace_Release(face1); + IDirect3DRMMeshBuilder2_Release(MeshBuilder2); + + if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3))) + { + win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr); + IDirect3DRM_Release(d3drm); + return; + } + + hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &MeshBuilder3); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr); + + icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3); + ok(!icount, "wrong FaceCount: %i\n", icount); + + hr = IDirect3DRMMeshBuilder3_CreateFace(MeshBuilder3, &face2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace2 interface (hr = %x)\n", hr); + + hr = IDirect3DRMFace2_GetClassName(face2, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMFace2_GetClassName(face2, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = 1; + hr = IDirect3DRMFace2_GetClassName(face2, &count, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = sizeof(cname); + hr = IDirect3DRMFace2_GetClassName(face2, &count, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(count == sizeof("Face"), "wrong size: %u\n", count); + ok(!strcmp(cname, "Face"), "Expected cname to be \"Face\", but got \"%s\"\n", cname); + + icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3); + todo_wine + ok(icount == 1, "wrong FaceCount: %i\n", icount); + + 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 == 1, "count = %u\n", count); + hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face); + ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr); + IDirect3DRMFace_Release(face); + IDirect3DRMFaceArray_Release(array1); + } + + icount = IDirect3DRMFace2_GetVertexCount(face2); + ok(!icount, "wrong VertexCount: %i\n", icount); + + IDirect3DRMFace2_Release(face2); + IDirect3DRMMeshBuilder3_Release(MeshBuilder3); + IDirect3DRM3_Release(d3drm3); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm); +} + static void test_Frame(void) { HRESULT hr; @@ -1496,6 +1649,7 @@ START_TEST(d3drm) test_MeshBuilder(); test_MeshBuilder3(); test_Mesh(); + test_Face(); test_Frame(); test_Device(); test_Viewport();

1 0

Marcus Meissner : dsound: Do not test undefined behaviour (Coverity).
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: 81ea726e647bab7ba651c901e0e77a2ec8e96505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ea726e647bab7ba651c901e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu May 9 13:08:45 2013 +0200 dsound: Do not test undefined behaviour (Coverity). --- dlls/dsound/tests/dsound.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index ed17f2a..4291e7a 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1578,12 +1578,6 @@ START_TEST(dsound) ret = FreeLibrary(hDsound); ok( ret, "FreeLibrary(1) returned %d\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = FreeLibrary(hDsound); - ok( ret || - broken(!ret && GetLastError() == ERROR_MOD_NOT_FOUND), /* NT4 */ - "FreeLibrary(2) returned %d\n", GetLastError()); - ok(!FreeLibrary(hDsound), "DirectSound DLL still loaded\n"); } hDsound = LoadLibrary("dsound.dll");

1 0

André Hentschel : d3drm: Add IDirect3DRMFace2 interface.
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: 9dcdbfab49efae2060d2ceb2010ccd8a7d330205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dcdbfab49efae2060d2ceb20… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 9 14:43:39 2013 +0200 d3drm: Add IDirect3DRMFace2 interface. --- dlls/d3drm/d3drm.c | 8 +- dlls/d3drm/d3drm_private.h | 2 +- dlls/d3drm/face.c | 359 ++++++++++++++++++++++++++++++++++++++++++- dlls/d3drm/meshbuilder.c | 6 +- 4 files changed, 358 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9dcdbfab49efae2060d2c…

1 0

Marcus Meissner : dplayx: Remove wrong HeapFree (Coverity).
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: cef28ff30cca633f27bb599c926424f89fb9637e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef28ff30cca633f27bb599c9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu May 9 13:19:50 2013 +0200 dplayx: Remove wrong HeapFree (Coverity). --- dlls/dplayx/dplaysp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 9a70901..899348e 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -384,13 +384,11 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData /* What to do in the case where there is nothing set yet? */ if( dwFlags == DPSET_LOCAL ) { - HeapFree( GetProcessHeap(), 0, lpPlayerData->lpPlayerLocalData ); *lplpData = lpPlayerData->lpPlayerLocalData; *lpdwDataSize = lpPlayerData->dwPlayerLocalDataSize; } else if( dwFlags == DPSET_REMOTE ) { - HeapFree( GetProcessHeap(), 0, lpPlayerData->lpPlayerRemoteData ); *lplpData = lpPlayerData->lpPlayerRemoteData; *lpdwDataSize = lpPlayerData->dwPlayerRemoteDataSize; }

1 0

André Hentschel : d3drm: Add IDirect3DRMFace interface .
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: 9bce3a920bbe651cccb8fe892871f35dfe8570df URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bce3a920bbe651cccb8fe892… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 9 14:43:12 2013 +0200 d3drm: Add IDirect3DRMFace interface. --- dlls/d3drm/Makefile.in | 1 + dlls/d3drm/d3drm.c | 8 +- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/face.c | 419 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/meshbuilder.c | 4 +- 5 files changed, 427 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bce3a920bbe651cccb8f…

1 0

Nikolay Sivov : comctl32: Fix disabled thumb painting, for TBS_BOTH use edged rectangle.
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: 2248cfbb6b24bcbb75369028d838ab1166eda539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2248cfbb6b24bcbb75369028d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 9 14:07:26 2013 +0400 comctl32: Fix disabled thumb painting, for TBS_BOTH use edged rectangle. --- dlls/comctl32/trackbar.c | 72 +++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 99fde1b..f65297c 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -613,18 +613,11 @@ TRACKBAR_DrawTics (const TRACKBAR_INFO *infoPtr, HDC hdc) } static void -TRACKBAR_DrawThumb (const TRACKBAR_INFO *infoPtr, HDC hdc) -{ - HBRUSH oldbr; - HPEN oldpen; - RECT thumb = infoPtr->rcThumb; - int BlackUntil = 3; - int PointCount = 6; - POINT points[6]; - int fillClr; - int PointDepth; +TRACKBAR_DrawThumb (TRACKBAR_INFO *infoPtr, HDC hdc) +{ HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); - + HBRUSH brush; + if (theme) { int partId; @@ -645,32 +638,42 @@ TRACKBAR_DrawThumb (const TRACKBAR_INFO *infoPtr, HDC hdc) else stateId = TUS_NORMAL; - DrawThemeBackground (theme, hdc, partId, stateId, &thumb, 0); + DrawThemeBackground (theme, hdc, partId, stateId, &infoPtr->rcThumb, NULL); return; } - fillClr = infoPtr->flags & TB_DRAG_MODE ? COLOR_BTNHILIGHT : COLOR_BTNFACE; - oldbr = SelectObject (hdc, GetSysColorBrush(fillClr)); - SetPolyFillMode (hdc, WINDING); + if (infoPtr->dwStyle & WS_DISABLED) + { + if (comctl32_color.clr3dHilight == comctl32_color.clrWindow) + brush = COMCTL32_hPattern55AABrush; + else + brush = GetSysColorBrush(COLOR_SCROLLBAR); + + SetTextColor(hdc, comctl32_color.clr3dFace); + SetBkColor(hdc, comctl32_color.clr3dHilight); + } + else + brush = GetSysColorBrush(infoPtr->flags & TB_DRAG_MODE ? COLOR_BTNHILIGHT : COLOR_BTNFACE); if (infoPtr->dwStyle & TBS_BOTH) { - points[0].x=thumb.right; - points[0].y=thumb.top; - points[1].x=thumb.right; - points[1].y=thumb.bottom; - points[2].x=thumb.left; - points[2].y=thumb.bottom; - points[3].x=thumb.left; - points[3].y=thumb.top; - points[4].x=points[0].x; - points[4].y=points[0].y; - PointCount = 5; - BlackUntil = 3; + FillRect(hdc, &infoPtr->rcThumb, brush); + DrawEdge(hdc, &infoPtr->rcThumb, EDGE_RAISED, BF_RECT | BF_SOFT); + return; } else { + HBRUSH oldbr = SelectObject(hdc, brush); + RECT thumb = infoPtr->rcThumb; + int BlackUntil = 3; + int PointCount = 6; + POINT points[6]; + int PointDepth; + HPEN oldpen; + + SetPolyFillMode (hdc, WINDING); + if (infoPtr->dwStyle & TBS_VERT) { PointDepth = (thumb.bottom - thumb.top) / 2; @@ -742,16 +745,15 @@ TRACKBAR_DrawThumb (const TRACKBAR_INFO *infoPtr, HDC hdc) } } + /* Draw the thumb now */ + Polygon (hdc, points, PointCount); + oldpen = SelectObject(hdc, GetStockObject(BLACK_PEN)); + Polyline(hdc,points, BlackUntil); + SelectObject(hdc, GetStockObject(WHITE_PEN)); + Polyline(hdc, &points[BlackUntil-1], PointCount+1-BlackUntil); + SelectObject(hdc, oldpen); + SelectObject(hdc, oldbr); } - - /* Draw the thumb now */ - Polygon (hdc, points, PointCount); - oldpen = SelectObject(hdc, GetStockObject(BLACK_PEN)); - Polyline(hdc,points, BlackUntil); - SelectObject(hdc, GetStockObject(WHITE_PEN)); - Polyline(hdc, &points[BlackUntil-1], PointCount+1-BlackUntil); - SelectObject(hdc, oldpen); - SelectObject(hdc, oldbr); }

1 0

Nikolay Sivov : user32: Fix right and bottom edge sizes.
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: 0325dc6186f17cb214e180ccf6b7350dfb9de8e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0325dc6186f17cb214e180ccf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 8 21:29:44 2013 +0400 user32: Fix right and bottom edge sizes. --- dlls/user32/uitools.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index a21ab7b..4921299 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -539,7 +539,7 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, if(uFlags & BF_BOTTOM) { MoveToEx(hdc, InnerRect.left, InnerRect.bottom-1, NULL); - LineTo(hdc, InnerRect.right-1, InnerRect.bottom-1); + LineTo(hdc, InnerRect.right, InnerRect.bottom-1); } if(uFlags & BF_RIGHT) { @@ -563,12 +563,12 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, if(uFlags & BF_BOTTOM) { MoveToEx(hdc, InnerRect.left+LBpenplus, InnerRect.bottom-2, NULL); - LineTo(hdc, InnerRect.right-1-RBpenplus, InnerRect.bottom-2); + LineTo(hdc, InnerRect.right-RBpenplus, InnerRect.bottom-2); } if(uFlags & BF_RIGHT) { - MoveToEx(hdc, InnerRect.right-2, InnerRect.top+2-RBpenplus, NULL); - LineTo(hdc, InnerRect.right-2, InnerRect.bottom-2+RTpenplus); + MoveToEx(hdc, InnerRect.right-2, InnerRect.top+RTpenplus, NULL); + LineTo(hdc, InnerRect.right-2, InnerRect.bottom-RBpenplus); } if( ((uFlags & BF_MIDDLE) && retval) || (uFlags & BF_ADJUST) )

1 0

Piotr Caban : msvcp60: Fix errors in spec file.
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: d6aa3d969fcdb0418169f472fcb6a01897b628e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6aa3d969fcdb0418169f472f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 9 12:43:59 2013 +0200 msvcp60: Fix errors in spec file. --- dlls/msvcp60/msvcp60.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 4e5a28e..937fae3 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2842,9 +2842,9 @@ @ thiscall -arch=win32 ?do_put@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@G_N(a)Z(ptr ptr long ptr ptr long long) num_put_short_do_put_bool @ cdecl -arch=win64 ?do_put@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@G_N(a)Z(ptr ptr ptr ptr long long) num_put_short_do_put_bool @ thiscall -arch=win32 ?do_put@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@PBUtm@@DD(a)Z(ptr ptr long ptr ptr ptr long long) time_put_char_do_put -@ cdecl -arch=win64 ?do_put@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@DD(a)Z(ptr ptr long ptr ptr ptr long long) time_put_char_do_put +@ cdecl -arch=win64 ?do_put@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@DD(a)Z(ptr ptr ptr ptr ptr long long) time_put_char_do_put @ thiscall -arch=win32 ?do_put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@PBUtm@@DD(a)Z(ptr ptr long ptr ptr ptr long long) time_put_wchar_do_put -@ cdecl -arch=win64 ?do_put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@DD(a)Z(ptr ptr long ptr ptr ptr long long) time_put_wchar_do_put +@ cdecl -arch=win64 ?do_put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@DD(a)Z(ptr ptr ptr ptr ptr long long) time_put_wchar_do_put @ thiscall -arch=win32 ?do_scan_is@?$ctype(a)G@std@@MBEPBGFPBG0(a)Z(ptr long ptr ptr) ctype_wchar_do_scan_is @ cdecl -arch=win64 ?do_scan_is@?$ctype(a)G@std@@MEBAPEBGFPEBG0(a)Z(ptr long ptr ptr) ctype_wchar_do_scan_is @ thiscall -arch=win32 ?do_scan_not@?$ctype(a)G@std@@MBEPBGFPBG0(a)Z(ptr long ptr ptr) ctype_wchar_do_scan_not @@ -3714,9 +3714,9 @@ @ thiscall -arch=win32 ?put@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@PBUtm@@PBD3(a)Z(ptr ptr long ptr ptr ptr ptr ptr) time_put_char_put_format @ cdecl -arch=win64 ?put@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@PEBD3(a)Z(ptr ptr ptr ptr ptr ptr ptr) time_put_char_put_format @ thiscall -arch=win32 ?put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@PBUtm@@DD(a)Z(ptr ptr long ptr ptr ptr long long) time_put_wchar_put -@ cdecl -arch=win64 ?put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@DD(a)Z(ptr ptr long ptr ptr ptr long long) time_put_wchar_put +@ cdecl -arch=win64 ?put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@DD(a)Z(ptr ptr ptr ptr ptr long long) time_put_wchar_put @ thiscall -arch=win32 ?put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@PBUtm@@PBG3(a)Z(ptr ptr long ptr ptr ptr ptr ptr) time_put_wchar_put_format -@ cdecl -arch=win64 ?put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@PEBG3(a)Z(ptr ptr long ptr ptr ptr ptr ptr) time_put_wchar_put_format +@ cdecl -arch=win64 ?put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@PEBG3(a)Z(ptr ptr ptr ptr ptr ptr ptr) time_put_wchar_put_format @ thiscall -arch=win32 ?putback@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)D@Z(ptr long) basic_istream_char_putback @ cdecl -arch=win64 ?putback@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)D@Z(ptr long) basic_istream_char_putback @ thiscall -arch=win32 ?putback@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)G@Z(ptr long) basic_istream_wchar_putback

1 0

Hans Leidekker : msi: Set the PrimaryVolumePath and PrimaryVolumeSpaceAvailable properties.
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: 10975967dfcca8956f4e9aead47f7562d731010b URL: http://source.winehq.org/git/wine.git/?a=commit;h=10975967dfcca8956f4e9aead… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 9 09:49:10 2013 +0200 msi: Set the PrimaryVolumePath and PrimaryVolumeSpaceAvailable properties. --- dlls/msi/action.c | 48 ++++++++++++++++++---- dlls/msi/tests/install.c | 101 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 140 insertions(+), 9 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index cf03fa2..f519f4b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2365,14 +2365,21 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa static UINT ACTION_CostFinalize(MSIPACKAGE *package) { - static const WCHAR query[] = { - 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','C','o','n','d','i','t','i','o','n','`',0}; - static const WCHAR szOutOfDiskSpace[] = { - 'O','u','t','O','f','D','i','s','k','S','p','a','c','e',0}; + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','C','o','n','d','i','t','i','o','n','`',0}; + static const WCHAR szOutOfDiskSpace[] = + {'O','u','t','O','f','D','i','s','k','S','p','a','c','e',0}; + static const WCHAR szPrimaryFolder[] = + {'P','R','I','M','A','R','Y','F','O','L','D','E','R',0}; + static const WCHAR szPrimaryVolumePath[] = + {'P','r','i','m','a','r','y','V','o','l','u','m','e','P','a','t','h',0}; + static const WCHAR szPrimaryVolumeSpaceAvailable[] = + {'P','r','i','m','a','r','y','V','o','l','u','m','e','S','p','a','c','e', + 'A','v','a','i','l','a','b','l','e',0}; MSICOMPONENT *comp; MSIQUERY *view; - LPWSTR level; + WCHAR *level, *primary_key, *primary_folder; UINT rc; TRACE("Building directory properties\n"); @@ -2415,10 +2422,35 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) msi_set_property( package->db, szCostingComplete, szOne, -1 ); /* set default run level if not set */ level = msi_dup_property( package->db, szInstallLevel ); - if (!level) - msi_set_property( package->db, szInstallLevel, szOne, -1 ); + if (!level) msi_set_property( package->db, szInstallLevel, szOne, -1 ); msi_free(level); + if ((primary_key = msi_dup_property( package->db, szPrimaryFolder ))) + { + if ((primary_folder = msi_dup_property( package->db, primary_key ))) + { + if (((primary_folder[0] >= 'A' && primary_folder[0] <= 'Z') || + (primary_folder[0] >= 'a' && primary_folder[0] <= 'z')) && primary_folder[1] == ':') + { + ULARGE_INTEGER free; + + primary_folder[2] = 0; + if (GetDiskFreeSpaceExW( primary_folder, &free, NULL, NULL )) + { + static const WCHAR fmtW[] = {'%','l','u',0}; + WCHAR buf[21]; + + sprintfW( buf, fmtW, free.QuadPart / 512 ); + msi_set_property( package->db, szPrimaryVolumeSpaceAvailable, buf, -1 ); + } + toupperW( primary_folder[0] ); + msi_set_property( package->db, szPrimaryVolumePath, primary_folder, 2 ); + } + msi_free( primary_folder ); + } + msi_free( primary_key ); + } + /* FIXME: check volume disk space */ msi_set_property( package->db, szOutOfDiskSpace, szZero, -1 ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index f343c02..e910fa0 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -158,6 +158,7 @@ static const CHAR property_dat[] = "Property\tValue\n" "InstallMode\tTypical\n" "Manufacturer\tWine\n" "PIDTemplate\t12345<###-%%%%%%%>@@@@@\n" + "PRIMARYFOLDER\tTARGETDIR\n" "ProductCode\t{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}\n" "ProductID\tnone\n" "ProductLanguage\t1033\n" @@ -1288,6 +1289,65 @@ static const char mixed_install_exec_seq_dat[] = "PublishProduct\t\t1300\n" "InstallFinalize\t\t1400\n"; +static const char vp_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "volumeprop\tcomp\tvolumeprop.txt\t1000\t\t\t8192\t1\n"; + +static const char vp_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "feature\t\t\t\t1\t2\tMSITESTDIR\t0\n"; + +static const char vp_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature\tcomp\n"; + +static const char vp_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "comp\t{24364AE7-5B7F-496C-AF5A-54893639C567}\tMSITESTDIR\t0\t\tvolumeprop\n"; + +static const char vp_custom_action_dat[] = + "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "TestPrimaryVolumePath0\t19\t\tPrimaryVolumePath set before CostFinalize\t\n" + "TestPrimaryVolumeSpaceAvailable0\t19\t\tPrimaryVolumeSpaceAvailable set before CostFinalize\t\n" + "TestPrimaryVolumePath1\t19\t\tPrimaryVolumePath set before InstallValidate\t\n" + "TestPrimaryVolumeSpaceAvailable1\t19\t\tPrimaryVolumeSpaceAvailable not set before InstallValidate\t\n" + "TestPrimaryVolumePath2\t19\t\tPrimaryVolumePath not set after InstallValidate\t\n" + "TestPrimaryVolumeSpaceAvailable2\t19\t\tPrimaryVolumeSpaceAvailable not set after InstallValidate\t\n"; + +static const char vp_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t200\n" + "FileCost\t\t300\n" + "TestPrimaryVolumePath0\tPrimaryVolumePath AND NOT REMOVE\t400\n" + "TestPrimaryVolumeSpaceAvailable0\tPrimaryVolumeSpaceAvailable AND NOT REMOVE\t500\n" + "CostFinalize\t\t600\n" + "TestPrimaryVolumePath1\tPrimaryVolumePath AND NOT REMOVE\t600\n" + "TestPrimaryVolumeSpaceAvailable1\tNOT PrimaryVolumeSpaceAvailable AND NOT REMOVE\t800\n" + "InstallValidate\t\t900\n" + "TestPrimaryVolumePath2\tNOT PrimaryVolumePath AND NOT REMOVE\t1000\n" + "TestPrimaryVolumeSpaceAvailable2\tNOT PrimaryVolumeSpaceAvailable AND NOT REMOVE\t1100\n" + "InstallInitialize\t\t1200\n" + "ProcessComponents\t\t1300\n" + "RemoveFiles\t\t1400\n" + "InstallFiles\t\t1500\n" + "RegisterProduct\t\t1600\n" + "PublishFeatures\t\t1700\n" + "PublishProduct\t\t1800\n" + "InstallFinalize\t\t1900\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1991,6 +2051,19 @@ static const msi_table mixed_tables[] = ADD_TABLE(property) }; +static const msi_table vp_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(vp_file), + ADD_TABLE(vp_component), + ADD_TABLE(vp_feature), + ADD_TABLE(vp_feature_comp), + ADD_TABLE(vp_custom_action), + ADD_TABLE(vp_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -6293,7 +6366,32 @@ static void test_mixed_package(void) error: DeleteFileA( msifile ); - return; +} + +static void test_volume_props(void) +{ + UINT r; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + CreateDirectoryA("msitest", NULL); + create_file("msitest\\volumeprop.txt", 1000); + create_database(msifile, vp_tables, sizeof(vp_tables)/sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + DeleteFileA("msitest\\volumeprop.txt"); + RemoveDirectoryA("msitest"); + DeleteFile(msifile); } START_TEST(install) @@ -6384,6 +6482,7 @@ START_TEST(install) test_command_line_parsing(); test_upgrade_code(); test_mixed_package(); + test_volume_props(); DeleteFileA(log_file);

1 0

Hans Leidekker : shell32: Implement ASSOCSTR_SHELLEXTENSION.
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: 661bbbd06892dac3991d894ef4ffbbc8aeb3e58c URL: http://source.winehq.org/git/wine.git/?a=commit;h=661bbbd06892dac3991d894ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 9 16:42:07 2013 +0200 shell32: Implement ASSOCSTR_SHELLEXTENSION. --- dlls/shell32/assoc.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index e565591..6681a63 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -429,7 +429,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( HRESULT hr; WCHAR path[MAX_PATH]; - TRACE("(%p,0x%8x,0x%8x,%s,%p,%p)\n", This, cfFlags, str, + TRACE("(%p,0x%08x,%u,%s,%p,%p)\n", This, cfFlags, str, debugstr_w(pszExtra), pszOut, pcchOut); if (cfFlags & cfUnimplemented) @@ -616,6 +616,30 @@ get_friendly_name_fail: HeapFree(GetProcessHeap(), 0, pszFileType); return hr; } + case ASSOCSTR_SHELLEXTENSION: + { + static const WCHAR shellexW[] = {'S','h','e','l','l','E','x','\\',0}; + WCHAR keypath[sizeof(shellexW) / sizeof(shellexW[0]) + 39], guid[39]; + CLSID clsid; + HKEY hkey; + DWORD size; + LONG ret; + + hr = CLSIDFromString(pszExtra, &clsid); + if (FAILED(hr)) return hr; + + strcpyW(keypath, shellexW); + strcatW(keypath, pszExtra); + ret = RegOpenKeyExW(This->hkeySource, keypath, 0, KEY_READ, &hkey); + if (ret) return HRESULT_FROM_WIN32(ret); + + size = sizeof(guid); + ret = RegGetValueW(hkey, NULL, NULL, RRF_RT_REG_SZ, NULL, guid, &size); + RegCloseKey(hkey); + if (ret) return HRESULT_FROM_WIN32(ret); + + return ASSOC_ReturnString(pszOut, pcchOut, guid, size / sizeof(WCHAR)); + } default: FIXME("assocstr %d unimplemented!\n", str);

1 0