wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Stefan Dösinger : wined3d: Raise MaxPrimitiveCount and MaxVertexIndex.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 62f7ba2555c475a65ad6bf143780b24fbb3d0664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62f7ba2555c475a65ad6bf143… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 28 21:03:46 2014 +0100 wined3d: Raise MaxPrimitiveCount and MaxVertexIndex. --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ef81278..86d0fcc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4473,8 +4473,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxAnisotropy = gl_info->limits.anisotropy; caps->MaxPointSize = gl_info->limits.pointsize_max; - caps->MaxPrimitiveCount = 0xfffff; /* For now set 2^20-1 which is used by most >=Geforce3/Radeon8500 cards */ - caps->MaxVertexIndex = 0xfffff; + caps->MaxPrimitiveCount = 0x555555; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ + caps->MaxVertexIndex = 0xffffff; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ caps->MaxStreams = MAX_STREAMS; caps->MaxStreamStride = 1024;

1 0

Jacek Caban : ieframe: Fixed some tests on IE11.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 1d67d66efc5278852dbafa4919443f27900016c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d67d66efc5278852dbafa491… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 31 15:28:28 2014 +0200 ieframe: Fixed some tests on IE11. --- dlls/ieframe/tests/webbrowser.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index ce96edf..4bf7949 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -419,10 +419,12 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID CHECK_EXPECT(Exec_IDM_STOP); return OLECMDERR_E_NOTSUPPORTED; case OLECMDID_UPDATETRAVELENTRY_DATARECOVERY: + case OLECMDID_PAGEAVAILABLE: /* TODO (IE11) */ + return E_NOTIMPL; case 6058: /* TODO */ return E_NOTIMPL; default: - ok(0, "unexpected nsCmdID %d\n", nCmdID); + ok(0, "unexpected nCmdID %d\n", nCmdID); } }else if(IsEqualGUID(&CGID_Explorer, pguidCmdGroup)) { switch(nCmdID) { @@ -437,6 +439,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 101: /* TODO (IE8) */ case 109: /* TODO (IE9) */ case 113: /* TODO (IE10) */ + case 119: /* IE11 */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID); @@ -444,11 +447,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID }else if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { switch(nCmdID) { case 105: /* TODO */ + case 133: /* IE11 */ case 134: /* TODO (IE10) */ + case 135: /* IE11 */ case 136: /* TODO (IE10) */ case 138: /* TODO */ case 140: /* TODO (Win7) */ case 144: /* TODO */ + case 178: /* IE11 */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID);

1 0

Jacek Caban : docobj.idl: Added some new OLECMDID values.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: db08d9ad16b3533f0bb6c80c53f2d4525178f205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db08d9ad16b3533f0bb6c80c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 31 15:28:19 2014 +0200 docobj.idl: Added some new OLECMDID values. --- include/docobj.idl | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/docobj.idl b/include/docobj.idl index c77e546..119d4ea 100644 --- a/include/docobj.idl +++ b/include/docobj.idl @@ -275,7 +275,18 @@ interface IOleCommandTarget : IUnknown OLECMDID_OPTICAL_GETZOOMRANGE = 64, OLECMDID_WINDOWSTATECHANGED = 65, OLECMDID_ACTIVEXINSTALLSCOPE = 66, - OLECMDID_UPDATETRAVELENTRY_DATARECOVERY = 67 + OLECMDID_UPDATETRAVELENTRY_DATARECOVERY = 67, + OLECMDID_SHOWTASKDLG = 68, + OLECMDID_POPSTATEEVENT = 69, + OLECMDID_VIEWPORT_MODE = 70, + OLECMDID_LAYOUT_VIEWPORT_WIDTH = 71, + OLECMDID_VISUAL_VIEWPORT_EXCLUDE_BOTTOM = 72, + OLECMDID_USER_OPTICAL_ZOOM = 73, + OLECMDID_PAGEAVAILABLE = 74, + OLECMDID_GETUSERSCALABLE = 75, + OLECMDID_UPDATE_CARET = 76, + OLECMDID_ENABLE_VISIBILITY = 77, + OLECMDID_MEDIA_PLAYBACK = 78 } OLECMDID; HRESULT QueryStatus(

1 0

Huw Davies : riched20: Keep track of fractions of WHEEL_DELTA when scrolling.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: fa50baf31f8849b4bfbc0db99455b77eb221e23a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa50baf31f8849b4bfbc0db99… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 31 14:09:42 2014 +0100 riched20: Keep track of fractions of WHEEL_DELTA when scrolling. --- dlls/riched20/editor.c | 38 +++++++++++++++++++++++++++++--------- dlls/riched20/editstr.h | 1 + 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9262baf..1235a16 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2858,6 +2858,8 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->horz_si.nPage = 0; ed->horz_si.nPos = 0; + ed->wheel_remain = 0; + OleInitialize(NULL); return ed; @@ -2936,6 +2938,13 @@ static inline int get_default_line_height( ME_TextEditor *editor ) return height; } +static inline int calc_wheel_change( int *remain, int amount_per_click ) +{ + int change = amount_per_click * (float)*remain / WHEEL_DELTA; + *remain -= WHEEL_DELTA * change / amount_per_click; + return change; +} + static const char * const edit_messages[] = { "EM_GETSEL", "EM_SETSEL", @@ -4145,6 +4154,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_KILLFOCUS: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ editor->bHaveFocus = FALSE; + editor->wheel_remain = 0; ME_HideCaret(editor); ME_SendOldNotify(editor, EN_KILLFOCUS); return 0; @@ -4273,8 +4283,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_MOUSEWHEEL: { - int gcWheelDelta; - UINT pulScrollLines; + int delta; BOOL ctrl_is_down; if ((editor->nEventMask & ENM_MOUSEEVENTS) && @@ -4283,9 +4292,16 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; - gcWheelDelta = GET_WHEEL_DELTA_WPARAM(wParam); + delta = GET_WHEEL_DELTA_WPARAM(wParam); + + /* if scrolling changes direction, ignore left overs */ + if ((delta < 0 && editor->wheel_remain < 0) || + (delta > 0 && editor->wheel_remain > 0)) + editor->wheel_remain += delta; + else + editor->wheel_remain = delta; - if (abs(gcWheelDelta) >= WHEEL_DELTA) + if (editor->wheel_remain) { if (ctrl_is_down) { int numerator; @@ -4295,14 +4311,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } else { numerator = editor->nZoomNumerator * 100 / editor->nZoomDenominator; } - numerator = numerator + (gcWheelDelta / WHEEL_DELTA) * 10; + numerator += calc_wheel_change( &editor->wheel_remain, 10 ); if (numerator >= 10 && numerator <= 500) ME_SetZoom(editor, numerator, 100); } else { - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); - /* FIXME follow the original */ - if (pulScrollLines) - ME_ScrollDown(editor,pulScrollLines * (-gcWheelDelta / WHEEL_DELTA) * 8); + UINT max_lines = 3; + int lines = 0; + + SystemParametersInfoW( SPI_GETWHEELSCROLLLINES, 0, &max_lines, 0 ); + if (max_lines) + lines = calc_wheel_change( &editor->wheel_remain, (int)max_lines ); + if (lines) + ME_ScrollDown( editor, -lines * get_default_line_height( editor ) ); } } break; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 8ce56c3..f139c29 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -443,6 +443,7 @@ typedef struct tagME_TextEditor SCROLLINFO vert_si, horz_si; BOOL bMouseCaptured; + int wheel_remain; } ME_TextEditor; typedef struct tagME_Context

1 0

Huw Davies : riched20: Add a helper to return the default line height and use that in EM_LINESCROLL.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 2f07df59f955606af1047e4ba6f612bd669eadf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f07df59f955606af1047e4ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 31 14:09:41 2014 +0100 riched20: Add a helper to return the default line height and use that in EM_LINESCROLL. --- dlls/riched20/editor.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1d17ef0..9262baf 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2925,6 +2925,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +static inline int get_default_line_height( ME_TextEditor *editor ) +{ + int height = 0; + + if (editor->pBuffer && editor->pBuffer->pDefaultStyle) + height = editor->pBuffer->pDefaultStyle->tm.tmHeight; + if (height <= 0) height = 24; + + return height; +} static const char * const edit_messages[] = { "EM_GETSEL", @@ -3548,7 +3558,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { if (!(editor->styleFlags & ES_MULTILINE)) return FALSE; - ME_ScrollDown(editor, lParam * 8); /* FIXME follow the original */ + ME_ScrollDown( editor, lParam * get_default_line_height( editor ) ); return TRUE; } case WM_CLEAR: @@ -4221,14 +4231,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_VSCROLL: { int origNPos; - int lineHeight; + int lineHeight = get_default_line_height( editor ); origNPos = editor->vert_si.nPos; - lineHeight = 24; - - if (editor->pBuffer && editor->pBuffer->pDefaultStyle) - lineHeight = editor->pBuffer->pDefaultStyle->tm.tmHeight; - if (lineHeight <= 0) lineHeight = 24; switch(LOWORD(wParam)) {

1 0

Jacek Caban : kernel32: Skip reserved TLS tests on WinXP SP1.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: e168cd28db6dbd149cddb1a2d3f1eef90a32209d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e168cd28db6dbd149cddb1a2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 31 14:31:01 2014 +0200 kernel32: Skip reserved TLS tests on WinXP SP1. --- dlls/kernel32/tests/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 36414ec..1ea5fb3 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1644,8 +1644,8 @@ static void test_reserved_tls(void) DWORD tls; BOOL ret; - /* This seems to be a WinXP+ feature. */ - if(!pCreateActCtxW) { + /* This seems to be a WinXP SP2+ feature. */ + if(!pIsWow64Process) { win_skip("Skipping reserved TLS slot on too old Windows.\n"); return; }

1 0

Francois Gouget : user32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: ebd99188302b27351cdf72d5296fde8ff82922ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd99188302b27351cdf72d52… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 31 12:30:43 2014 +0200 user32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/user32/tests/win.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5206642..0966bad 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7548,13 +7548,13 @@ START_TEST(win) memset(input, 0, sizeof(input)); input[0].type = INPUT_MOUSE; - input[0].mi.dx = 101; - input[0].mi.dy = 101; - input[0].mi.dwFlags = MOUSEEVENTF_LEFTDOWN; + U(input[0]).mi.dx = 101; + U(input[0]).mi.dy = 101; + U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTDOWN; input[0].type = INPUT_MOUSE; - input[0].mi.dx = 101; - input[0].mi.dy = 101; - input[0].mi.dwFlags = MOUSEEVENTF_LEFTUP; + U(input[0]).mi.dx = 101; + U(input[0]).mi.dy = 101; + U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTUP; events_no = SendInput(2, input, sizeof(input[0])); ok(events_no == 2, "SendInput returned %d\n", events_no); ok(SetForegroundWindow(hwndMain), "SetForegroundWindow failed\n");

1 0

Thomas Faber : advapi32: Fix uneven length handling in CredUnmarshalCredential.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 6754c35589709c033d30ca593de90fa55f25b4e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6754c35589709c033d30ca593… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Mar 28 10:21:06 2014 +0100 advapi32: Fix uneven length handling in CredUnmarshalCredential. --- dlls/advapi32/cred.c | 2 +- dlls/advapi32/tests/cred.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 9ecfaee..fdd5645 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -2100,7 +2100,7 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO DWORD size; if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || - !size || size % sizeof(WCHAR) || size > INT_MAX) + size % sizeof(WCHAR) || len - 6 != (size * 4 + 2) / 3) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index de05e30..0ee08ef 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -566,6 +566,8 @@ static void test_CredUnmarshalCredentialA(void) static const UCHAR cert_empty[CERT_HASH_LENGTH] = {0}; static const UCHAR cert_wine[CERT_HASH_LENGTH] = {'W','i','n','e',0}; static const WCHAR tW[] = {'t',0}; + static const WCHAR teW[] = {'t','e',0}; + static const WCHAR tesW[] = {'t','e','s',0}; static const WCHAR testW[] = {'t','e','s','t',0}; void *p; CERT_CREDENTIAL_INFO *cert; @@ -593,6 +595,8 @@ static void test_CredUnmarshalCredentialA(void) { "@@-", 63, NULL }, { "@@B", CertCredential, NULL }, { "@@BA", CertCredential, NULL }, + { "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, NULL }, + { "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, NULL }, { "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_empty }, { "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_wine }, { "@@C", UsernameTargetCredential, NULL }, @@ -601,6 +605,20 @@ static void test_CredUnmarshalCredentialA(void) { "@@CAAAAAA0B", UsernameTargetCredential, NULL }, { "@@CAAAAAA0BA", UsernameTargetCredential, NULL }, { "@@CCAAAAA0BA", UsernameTargetCredential, tW }, + { "@@CEAAAAA0BA", UsernameTargetCredential, NULL }, + { "@@CEAAAAA0BAd", UsernameTargetCredential, NULL }, + { "@@CEAAAAA0BAdA", UsernameTargetCredential, NULL }, + { "@@CEAAAAA0BQZAA", UsernameTargetCredential, teW }, + { "@@CEAAAAA0BQZAQ", UsernameTargetCredential, teW }, + { "@@CEAAAAA0BQZAg", UsernameTargetCredential, teW }, + { "@@CEAAAAA0BQZAw", UsernameTargetCredential, teW }, + { "@@CEAAAAA0BQZAAA", UsernameTargetCredential, NULL }, + { "@@CGAAAAA0BQZAMH", UsernameTargetCredential, NULL }, + { "@@CGAAAAA0BQZAMHA", UsernameTargetCredential, tesW }, + { "@@CGAAAAA0BQZAMHAA", UsernameTargetCredential, NULL }, + { "@@CCAAAAA0BAA", UsernameTargetCredential, NULL }, + { "@@CBAAAAA0BAA", UsernameTargetCredential, NULL }, + { "@@CAgAAAA0BAA", UsernameTargetCredential, NULL }, { "@@CIAAAAA0BQZAMHA0BA", UsernameTargetCredential, testW }, { "@@CA-----0BQZAMHA0BA", UsernameTargetCredential, NULL }, };

1 0

Thomas Faber : advapi32: Set output type earlier in CredUnmarshalCredential.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 309b5366e88a5451a7e4c583ecd445ece760f7c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=309b5366e88a5451a7e4c583e… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Mar 29 10:18:22 2014 +0100 advapi32: Set output type earlier in CredUnmarshalCredential. --- dlls/advapi32/cred.c | 11 ++++++----- dlls/advapi32/tests/cred.c | 26 +++++++++++++++++--------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 2d98ecc..9ecfaee 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -2068,13 +2068,15 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO TRACE("%s, %p, %p\n", debugstr_w(cred), type, out); - if (!cred || cred[0] != '@' || cred[1] != '@' || !cred[2] || !cred[3]) + if (!cred || cred[0] != '@' || cred[1] != '@' || + char_decode( cred[2] ) > 63) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } len = strlenW( cred + 3 ); - switch (cred[2] - 'A') + *type = char_decode( cred[2] ); + switch (*type) { case CertCredential: { @@ -2089,7 +2091,6 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO if (!(cert = HeapAlloc( GetProcessHeap(), 0, sizeof(*cert) ))) return FALSE; memcpy( cert->rgbHashOfCert, hash, sizeof(cert->rgbHashOfCert) ); cert->cbSize = sizeof(*cert); - *type = CertCredential; *out = cert; break; } @@ -2113,7 +2114,6 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO } target->UserName = (WCHAR *)(target + 1); target->UserName[size / sizeof(WCHAR)] = 0; - *type = UsernameTargetCredential; *out = target; break; } @@ -2121,7 +2121,8 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO FIXME("BinaryBlobCredential not implemented\n"); return FALSE; default: - WARN("unhandled type %u\n", cred[2] - 'A'); + WARN("unhandled type %u\n", *type); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } return TRUE; diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index e65a605..de05e30 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -580,9 +580,25 @@ static void test_CredUnmarshalCredentialA(void) CRED_MARSHAL_TYPE type; const void *unmarshaled; } tests[] = { + { "", 0, NULL }, + { "@", 0, NULL }, + { "@@", 0, NULL }, + { "@@@", 0, NULL }, + { "@@A", 0, NULL }, + { "@@E", 4, NULL }, + { "@@Z", 25, NULL }, + { "@@a", 26, NULL }, + { "@@0", 52, NULL }, + { "@@#", 62, NULL }, + { "@@-", 63, NULL }, + { "@@B", CertCredential, NULL }, + { "@@BA", CertCredential, NULL }, { "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_empty }, { "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_wine }, + { "@@C", UsernameTargetCredential, NULL }, + { "@@CA", UsernameTargetCredential, NULL }, { "@@CAAAAAA", UsernameTargetCredential, NULL }, + { "@@CAAAAAA0B", UsernameTargetCredential, NULL }, { "@@CAAAAAA0BA", UsernameTargetCredential, NULL }, { "@@CCAAAAA0BA", UsernameTargetCredential, tW }, { "@@CIAAAAA0BQZAMHA0BA", UsernameTargetCredential, testW }, @@ -610,14 +626,6 @@ static void test_CredUnmarshalCredentialA(void) ok( !ret, "unexpected success\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); - type = 0; - cert = NULL; - SetLastError( 0xdeadbeef ); - ret = pCredUnmarshalCredentialA( "", &type, (void **)&cert ); - error = GetLastError(); - ok( !ret, "unexpected success\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); - if (0) { /* crash */ SetLastError( 0xdeadbeef ); ret = pCredUnmarshalCredentialA( "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", &type, NULL ); @@ -665,7 +673,7 @@ static void test_CredUnmarshalCredentialA(void) { ok(!ret, "[%u] unexpected success\n", i); ok(error == ERROR_INVALID_PARAMETER, "[%u] got %u\n", i, error); - todo_wine ok(type == tests[i].type, "[%u] got %u\n", i, type); + ok(type == tests[i].type, "[%u] got %u\n", i, type); ok(p == NULL, "[%u] returned pointer is not NULL\n", i); }

1 0

Thomas Faber : advapi32/tests: Use a loop for CredUnmarshalCredential test cases.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 27c8e9013f3148d34401de66c90d64a5dcdf8a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c8e9013f3148d34401de66c… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Dec 19 00:20:27 2013 +0100 advapi32/tests: Use a loop for CredUnmarshalCredential test cases. --- dlls/advapi32/tests/cred.c | 120 +++++++++++++++++++++----------------------- 1 file changed, 57 insertions(+), 63 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 59d4bbb..e65a605 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -563,14 +563,31 @@ static void test_CredMarshalCredentialA(void) static void test_CredUnmarshalCredentialA(void) { + static const UCHAR cert_empty[CERT_HASH_LENGTH] = {0}; + static const UCHAR cert_wine[CERT_HASH_LENGTH] = {'W','i','n','e',0}; static const WCHAR tW[] = {'t',0}; static const WCHAR testW[] = {'t','e','s','t',0}; + void *p; CERT_CREDENTIAL_INFO *cert; + const UCHAR *hash; USERNAME_TARGET_CREDENTIAL_INFO *username; CRED_MARSHAL_TYPE type; - unsigned int i; + unsigned int i, j; DWORD error; BOOL ret; + const struct { + const char *cred; + CRED_MARSHAL_TYPE type; + const void *unmarshaled; + } tests[] = { + { "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_empty }, + { "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", CertCredential, cert_wine }, + { "@@CAAAAAA", UsernameTargetCredential, NULL }, + { "@@CAAAAAA0BA", UsernameTargetCredential, NULL }, + { "@@CCAAAAA0BA", UsernameTargetCredential, tW }, + { "@@CIAAAAA0BQZAMHA0BA", UsernameTargetCredential, testW }, + { "@@CA-----0BQZAMHA0BA", UsernameTargetCredential, NULL }, + }; SetLastError( 0xdeadbeef ); ret = pCredUnmarshalCredentialA( NULL, NULL, NULL ); @@ -615,69 +632,46 @@ static void test_CredUnmarshalCredentialA(void) ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); } - type = 0; - cert = NULL; - ret = pCredUnmarshalCredentialA( "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", &type, (void **)&cert ); - ok( ret, "unexpected failure %u\n", GetLastError() ); - ok( type == CertCredential, "got %u\n", type ); - ok( cert != NULL, "cert is NULL\n" ); - ok( cert->cbSize == sizeof(*cert), "wrong size %u\n", cert->cbSize ); - for (i = 0; i < sizeof(cert->rgbHashOfCert); i++) ok( !cert->rgbHashOfCert[i], "wrong data\n" ); - pCredFree( cert ); - - type = 0; - cert = NULL; - ret = pCredUnmarshalCredentialA( "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", &type, (void **)&cert ); - ok( ret, "unexpected failure %u\n", GetLastError() ); - ok( type == CertCredential, "got %u\n", type ); - ok( cert != NULL, "cert is NULL\n" ); - ok( cert->cbSize == sizeof(*cert), "wrong size %u\n", cert->cbSize ); - ok( cert->rgbHashOfCert[0] == 'W', "wrong data)\n" ); - ok( cert->rgbHashOfCert[1] == 'i', "wrong data\n" ); - ok( cert->rgbHashOfCert[2] == 'n', "wrong data\n" ); - ok( cert->rgbHashOfCert[3] == 'e', "wrong data\n" ); - for (i = 4; i < sizeof(cert->rgbHashOfCert); i++) ok( !cert->rgbHashOfCert[i], "wrong data\n" ); - pCredFree( cert ); - - SetLastError( 0xdeadbeef ); - ret = pCredUnmarshalCredentialA( "@@CAAAAAA", &type, (void **)&username ); - error = GetLastError(); - ok( !ret, "unexpected success\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); - - SetLastError( 0xdeadbeef ); - ret = pCredUnmarshalCredentialA( "@@CAAAAAA0BA", &type, (void **)&username ); - error = GetLastError(); - ok( !ret, "unexpected success\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); - - type = 0; - username = NULL; - ret = pCredUnmarshalCredentialA( "@@CCAAAAA0BA", &type, (void **)&username ); - ok( ret, "unexpected failure %u\n", GetLastError() ); - ok( type == UsernameTargetCredential, "got %u\n", type ); - ok( username != NULL, "username is NULL\n" ); - ok( username->UserName != NULL, "UserName is NULL\n" ); - ok( !lstrcmpW( username->UserName, tW ), "got %s\n", wine_dbgstr_w(username->UserName) ); - pCredFree( username ); - - type = 0; - username = NULL; - ret = pCredUnmarshalCredentialA( "@@CIAAAAA0BQZAMHA0BA", &type, (void **)&username ); - ok( ret, "unexpected failure %u\n", GetLastError() ); - ok( type == UsernameTargetCredential, "got %u\n", type ); - ok( username != NULL, "username is NULL\n" ); - ok( username->UserName != NULL, "UserName is NULL\n" ); - ok( !lstrcmpW( username->UserName, testW ), "got %s\n", wine_dbgstr_w(username->UserName) ); - pCredFree( username ); + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + SetLastError(0xdeadbeef); + type = 0; + p = NULL; + ret = pCredUnmarshalCredentialA(tests[i].cred, &type, &p); + error = GetLastError(); + if (tests[i].unmarshaled) + { + ok(ret, "[%u] unexpected failure %u\n", i, error); + ok(type == tests[i].type, "[%u] got %u\n", i, type); + ok(p != NULL, "[%u] returned pointer is NULL\n", i); + if (tests[i].type == CertCredential) + { + cert = p; + hash = tests[i].unmarshaled; + ok(cert->cbSize == sizeof(*cert), + "[%u] wrong size %u\n", i, cert->cbSize); + for (j = 0; j < sizeof(cert->rgbHashOfCert); j++) + ok(cert->rgbHashOfCert[j] == hash[j], "[%u] wrong data\n", i); + } + else if (tests[i].type == UsernameTargetCredential) + { + username = p; + ok(username->UserName != NULL, "[%u] UserName is NULL\n", i); + ok(!lstrcmpW(username->UserName, tests[i].unmarshaled), + "[%u] got %s\n", i, wine_dbgstr_w(username->UserName)); + } + } + else + { + ok(!ret, "[%u] unexpected success\n", i); + ok(error == ERROR_INVALID_PARAMETER, "[%u] got %u\n", i, error); + todo_wine ok(type == tests[i].type, "[%u] got %u\n", i, type); + ok(p == NULL, "[%u] returned pointer is not NULL\n", i); + } - type = 0; - username = NULL; - SetLastError( 0xdeadbeef ); - ret = pCredUnmarshalCredentialA( "@@CA-----0BQZAMHA0BA", &type, (void **)&username ); - error = GetLastError(); - ok( !ret, "unexpected success\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + if (ret) + pCredFree(p); + } } static void test_CredIsMarshaledCredentialA(void)

1 0

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 March 2014