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

Christian Costa : d3drm: Improve traces of AddRef and Release of IDirect3DRMLight.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 8aba0e2ec3223ae29e470e0c0bf515ae31bd1cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aba0e2ec3223ae29e470e0c0… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 17 10:09:57 2012 +0200 d3drm: Improve traces of AddRef and Release of IDirect3DRMLight. --- dlls/d3drm/light.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 7247763..82ec825 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -67,10 +67,11 @@ static HRESULT WINAPI IDirect3DRMLightImpl_QueryInterface(IDirect3DRMLight* ifac static ULONG WINAPI IDirect3DRMLightImpl_AddRef(IDirect3DRMLight* iface) { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", iface, ref); - return InterlockedIncrement(&This->ref); + return ref; } static ULONG WINAPI IDirect3DRMLightImpl_Release(IDirect3DRMLight* iface) @@ -78,7 +79,7 @@ static ULONG WINAPI IDirect3DRMLightImpl_Release(IDirect3DRMLight* iface) IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(): new ref = %d\n", iface, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This);

1 0

Christian Costa : d3drm: Load transform matrix and aply it to the current frame.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 8b405d5dc93bb764d32627f78e476f7614918390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b405d5dc93bb764d32627f78… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 17 10:09:31 2012 +0200 d3drm: Load transform matrix and aply it to the current frame. --- dlls/d3drm/d3drm.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index ba666dc..a96ff52 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1423,6 +1423,27 @@ HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUI FIXME("Processing material not supported yet\n"); } } + else if (IsEqualGUID(guid, &TID_D3DRMFrameTransformMatrix)) + { + TRACE("Found TID_D3DRMFrameTransformMatrix\n"); + + if (parent_frame) + { + D3DRMMATRIX4D matrix; + DWORD size; + + TRACE("Load Frame Transform Matrix data\n"); + + size = sizeof(matrix); + hr = IDirectXFileData_GetData(data_object, NULL, &size, (void**)matrix); + if ((hr != DXFILE_OK) || (size != sizeof(matrix))) + goto end; + + hr = IDirect3DRMFrame3_AddTransform(parent_frame, D3DRMCOMBINE_REPLACE, matrix); + if (FAILED(hr)) + goto end; + } + } else { FIXME("Found unknown TID %s\n", debugstr_guid(guid));

1 0

Bruno Jesus : regedit: Fix qword entries export.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 0d3807dbc50b60bfbcb259e58bc0fdba1f6e8394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d3807dbc50b60bfbcb259e58… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed May 16 21:39:19 2012 -0300 regedit: Fix qword entries export. --- programs/regedit/regproc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 7065bfd..18b6e98 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -998,7 +998,7 @@ static void REGPROC_export_binary(WCHAR **line_buf, DWORD *line_buf_size, DWORD if (type == REG_BINARY) { hex_prefix = hex; } else { - const WCHAR hex_format[] = {'h','e','x','(','%','u',')',':',0}; + const WCHAR hex_format[] = {'h','e','x','(','%','x',')',':',0}; hex_prefix = hex_buf; sprintfW(hex_buf, hex_format, type); if ((type == REG_SZ || type == REG_EXPAND_SZ || type == REG_MULTI_SZ) && !unicode)

1 0

Nikolay Sivov : comctl32: When created with TCS_VERTICAL, TCS_MULTILINE is set automatically.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 21727c416fa4fafc5a7351e95ef4fe369445b9a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21727c416fa4fafc5a7351e95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 17 10:53:45 2012 +0400 comctl32: When created with TCS_VERTICAL, TCS_MULTILINE is set automatically. --- dlls/comctl32/tab.c | 12 +++++++----- dlls/comctl32/tests/tab.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index f00ecd3..43d8cdf 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -3020,7 +3020,7 @@ static LRESULT TAB_Create (HWND hwnd, LPARAM lParam) TEXTMETRICW fontMetrics; HDC hdc; HFONT hOldFont; - DWORD dwStyle; + DWORD style; infoPtr = Alloc (sizeof(TAB_INFO)); @@ -3054,11 +3054,13 @@ static LRESULT TAB_Create (HWND hwnd, LPARAM lParam) /* The tab control always has the WS_CLIPSIBLINGS style. Even if you don't specify it in CreateWindow. This is necessary in order for paint to work correctly. This follows windows behaviour. */ - dwStyle = GetWindowLongW(hwnd, GWL_STYLE); - SetWindowLongW(hwnd, GWL_STYLE, dwStyle|WS_CLIPSIBLINGS); + style = GetWindowLongW(hwnd, GWL_STYLE); + if (style & TCS_VERTICAL) style |= TCS_MULTILINE; + style |= WS_CLIPSIBLINGS; + SetWindowLongW(hwnd, GWL_STYLE, style); - infoPtr->dwStyle = dwStyle | WS_CLIPSIBLINGS; - infoPtr->exStyle = (dwStyle & TCS_FLATBUTTONS) ? TCS_EX_FLATSEPARATORS : 0; + infoPtr->dwStyle = style; + infoPtr->exStyle = (style & TCS_FLATBUTTONS) ? TCS_EX_FLATSEPARATORS : 0; if (infoPtr->dwStyle & TCS_TOOLTIPS) { /* Create tooltip control */ diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 36179dc..0166778 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -1428,6 +1428,36 @@ static void test_WM_CONTEXTMENU(void) DestroyWindow(hTab); } +struct tabcreate_style { + DWORD style; + DWORD act_style; +}; + +static const struct tabcreate_style create_styles[] = +{ + { WS_CHILD|TCS_BOTTOM|TCS_VERTICAL, WS_CHILD|WS_CLIPSIBLINGS|TCS_BOTTOM|TCS_VERTICAL|TCS_MULTILINE }, + { WS_CHILD|TCS_VERTICAL, WS_CHILD|WS_CLIPSIBLINGS|TCS_VERTICAL|TCS_MULTILINE }, + { 0 } +}; + +static void test_create(void) +{ + const struct tabcreate_style *ptr = create_styles; + DWORD style; + HWND hTab; + + while (ptr->style) + { + hTab = CreateWindowA(WC_TABCONTROLA, "TestTab", ptr->style, + 10, 10, 300, 100, parent_wnd, NULL, NULL, 0); + style = GetWindowLongA(hTab, GWL_STYLE); + ok(style == ptr->act_style, "expected style 0x%08x, got style 0x%08x\n", ptr->act_style, style); + + DestroyWindow(hTab); + ptr++; + } +} + START_TEST(tab) { LOGFONTA logfont; @@ -1465,6 +1495,7 @@ START_TEST(tab) test_TCM_SETITEMEXTRA(); test_TCS_OWNERDRAWFIXED(); test_WM_CONTEXTMENU(); + test_create(); DestroyWindow(parent_wnd); }

1 0

Michael Stefaniuc : ddraw/tests: Actually run a test.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 3525e1dc4645768c67a3a494954778e245254b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3525e1dc4645768c67a3a4949… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 17 00:56:41 2012 +0200 ddraw/tests: Actually run a test. --- dlls/ddraw/tests/dsurface.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 93efba8..ecc54f1 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4606,6 +4606,7 @@ static void set_surface_desc_test(void) hr, DDERR_INVALIDSURFACETYPE); ddsd.dwFlags = DDSD_WIDTH; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(hr == DDERR_INVALIDSURFACETYPE, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDSURFACETYPE);

1 0

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

May 17, 2012

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 May 17, 2012

May 17, 2012

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

Michael Stefaniuc : advapi32/tests: Test the correct error codes.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: c6aee91759f7869f7491b8d6e532f4adb5174a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6aee91759f7869f7491b8d6e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 17 00:55:32 2012 +0200 advapi32/tests: Test the correct error codes. --- dlls/advapi32/tests/cred.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index de03ed7..3aaae4c 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -464,6 +464,7 @@ static void test_CredMarshalCredentialA(void) str = (char *)0xdeadbeef; SetLastError( 0xdeadbeef ); ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); ok( str == (char *)0xdeadbeef, "got %p\n", str ); @@ -472,6 +473,7 @@ static void test_CredMarshalCredentialA(void) str = (char *)0xdeadbeef; SetLastError( 0xdeadbeef ); ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); ok( str == (char *)0xdeadbeef, "got %p\n", str );

1 0

Christian Costa : d3drm: Implement IDirect3DRMFrameX_AddTransform.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 9e44f89d6b847b6bcb31942e9bad9832101ba65f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e44f89d6b847b6bcb31942e9… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 17 10:09:40 2012 +0200 d3drm: Implement IDirect3DRMFrameX_AddTransform. --- dlls/d3drm/frame.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index fc15339..e530dcd 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -275,9 +275,9 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddTransform(IDirect3DRMFrame2* ifac { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%u,%p): stub\n", iface, This, type, matrix); + TRACE("(%p/%p)->(%u,%p)\n", iface, This, type, matrix); - return E_NOTIMPL; + return IDirect3DRMFrame3_AddTransform(&This->IDirect3DRMFrame3_iface, type, matrix); } static HRESULT WINAPI IDirect3DRMFrame2Impl_AddTranslation(IDirect3DRMFrame2* iface, @@ -1253,9 +1253,28 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddTransform(IDirect3DRMFrame3* ifac { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - FIXME("(%p/%p)->(%u,%p): stub\n", iface, This, type, matrix); + TRACE("(%p/%p)->(%u,%p)\n", iface, This, type, matrix); - return E_NOTIMPL; + switch (type) + { + case D3DRMCOMBINE_REPLACE: + memcpy(&This->transform[0][0], &matrix[0][0], sizeof(D3DRMMATRIX4D)); + break; + + case D3DRMCOMBINE_BEFORE: + FIXME("D3DRMCOMBINE_BEFORE not supported yed\n"); + break; + + case D3DRMCOMBINE_AFTER: + FIXME("D3DRMCOMBINE_AFTER not supported yed\n"); + break; + + default: + WARN("Unknown Combine Type %u\n", type); + return D3DRMERR_BADVALUE; + } + + return S_OK; } static HRESULT WINAPI IDirect3DRMFrame3Impl_AddTranslation(IDirect3DRMFrame3* iface,

1 0

Nikolay Sivov : comctl32: Properly disable redraw on tab control.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: ace41e9264ffd4f115f69e805b074585f0431754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace41e9264ffd4f115f69e805… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 17 09:37:03 2012 +0400 comctl32: Properly disable redraw on tab control. --- dlls/comctl32/propsheet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 6f620c6..3c0f3d3 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1173,7 +1173,7 @@ static BOOL PROPSHEET_CreateTabControl(HWND hwndParent, SendMessageW(hwndTabCtrl, TCM_SETIMAGELIST, 0, (LPARAM)psInfo->hImageList); } - SendMessageW(GetDlgItem(hwndTabCtrl, IDC_TABCONTROL), WM_SETREDRAW, 0, 0); + SendMessageW(hwndTabCtrl, WM_SETREDRAW, 0, 0); for (i = 0; i < nTabs; i++) { if ( psInfo->proppage[i].hasIcon ) @@ -1189,7 +1189,7 @@ static BOOL PROPSHEET_CreateTabControl(HWND hwndParent, item.pszText = (LPWSTR) psInfo->proppage[i].pszText; SendMessageW(hwndTabCtrl, TCM_INSERTITEMW, i, (LPARAM)&item); } - SendMessageW(GetDlgItem(hwndTabCtrl, IDC_TABCONTROL), WM_SETREDRAW, 1, 0); + SendMessageW(hwndTabCtrl, WM_SETREDRAW, 1, 0); return TRUE; }

1 0