wine-commits August 2008

wine-commits@winehq.org

2 participants
839 discussions

Paul Vriens : crypt32/tests: Use CryptAcquireContextA instead of CryptAcquireContextW.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: dc6fc6ad8c7a8b18b120651d524f7ce120513052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc6fc6ad8c7a8b18b120651d5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jul 30 22:55:34 2008 +0200 crypt32/tests: Use CryptAcquireContextA instead of CryptAcquireContextW. --- dlls/crypt32/tests/cert.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 36f7ea1..2217da7 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -37,8 +37,8 @@ static BOOL (WINAPI *pCryptEncodeObjectEx)(DWORD,LPCSTR,const void*,DWORD,PCRYPT static BOOL (WINAPI * pCryptVerifyCertificateSignatureEx) (HCRYPTPROV, DWORD, DWORD, void *, DWORD, void *, DWORD, void *); -static BOOL (WINAPI * pCryptAcquireContextW) - (HCRYPTPROV *, LPCWSTR, LPCWSTR, DWORD, DWORD); +static BOOL (WINAPI * pCryptAcquireContextA) + (HCRYPTPROV *, LPCSTR, LPCSTR, DWORD, DWORD); static void init_function_pointers(void) { @@ -57,7 +57,7 @@ static void init_function_pointers(void) GET_PROC(hCrypt32, CryptEncodeObjectEx) GET_PROC(hCrypt32, CryptVerifyCertificateSignatureEx) - GET_PROC(hAdvapi32, CryptAcquireContextW) + GET_PROC(hAdvapi32, CryptAcquireContextA) #undef GET_PROC } @@ -346,6 +346,7 @@ static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID, dwSizeWithNull,size); } +static CHAR cspNameA[] = "WineCryptTemp"; static WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e','m','p',0 }; static const BYTE v1CertWithPubKey[] = { 0x30,0x81,0x95,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, @@ -1693,9 +1694,9 @@ static void testCertSigs(void) DWORD sigSize = sizeof(sig); /* Just in case a previous run failed, delete this thing */ - pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - ret = pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_NEWKEYSET); ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); @@ -1704,7 +1705,7 @@ static void testCertSigs(void) CryptDestroyKey(key); CryptReleaseContext(csp, 0); - ret = pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } @@ -1830,9 +1831,9 @@ static void testCreateSelfSignCert(void) */ /* Acquire a CSP */ - pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - ret = pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_NEWKEYSET); ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); @@ -1887,7 +1888,7 @@ static void testCreateSelfSignCert(void) } CryptReleaseContext(csp, 0); - ret = pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); /* do the same test with AT_KEYEXCHANGE and key info*/ @@ -1935,7 +1936,7 @@ static void testCreateSelfSignCert(void) CertFreeCertificateContext(context); } - pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } @@ -2767,7 +2768,7 @@ static void testAcquireCertPrivateKey(void) keyProvInfo.rgProvParam = NULL; keyProvInfo.dwKeySpec = AT_SIGNATURE; - pCryptAcquireContextW(NULL, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + pCryptAcquireContextA(NULL, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); cert = CertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, @@ -2800,7 +2801,7 @@ static void testAcquireCertPrivateKey(void) ok(!ret && GetLastError() == CRYPT_E_NO_KEY_PROPERTY, "Expected CRYPT_E_NO_KEY_PROPERTY, got %08x\n", GetLastError()); - pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_NEWKEYSET); ret = CryptImportKey(csp, privKey, sizeof(privKey), 0, 0, &key); ok(ret, "CryptImportKey failed: %08x\n", GetLastError()); @@ -2922,7 +2923,7 @@ static void testAcquireCertPrivateKey(void) } CryptReleaseContext(csp, 0); - pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); CertFreeCertificateContext(cert);

1 0

Kirill K. Smirnov : winhlp32: Remove outdated comment.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: a7cb435400ccdedb540b6c5162dff1fb46e5aada URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7cb435400ccdedb540b6c516… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Jul 31 18:03:29 2008 +0400 winhlp32: Remove outdated comment. --- programs/winhlp32/winhelp.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index d65a752..d3f4d14 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1572,12 +1572,6 @@ struct index_data /************************************************************************** * WINHELP_IndexDlgProc * - * Index dialog callback function. - * - * nResult passed to EndDialog: - * 1: CANCEL button - * >1: valid offset value +2. - * EndDialog itself can return 0 (error). */ INT_PTR CALLBACK WINHELP_IndexDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {

1 0

Kirill K. Smirnov : winhlp32: Remove superfluous buttons from propsheet dialog templates.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: c7eec675547d7ea34e3033e543a8007ce640571c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7eec675547d7ea34e3033e54… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Jul 31 18:03:09 2008 +0400 winhlp32: Remove superfluous buttons from propsheet dialog templates. --- programs/winhlp32/Da.rc | 2 -- programs/winhlp32/De.rc | 2 -- programs/winhlp32/En.rc | 2 -- programs/winhlp32/Fr.rc | 2 -- programs/winhlp32/Ko.rc | 2 -- programs/winhlp32/Nl.rc | 2 -- programs/winhlp32/No.rc | 2 -- programs/winhlp32/Pl.rc | 2 -- programs/winhlp32/Ru.rc | 2 -- programs/winhlp32/Si.rc | 2 -- 10 files changed, 0 insertions(+), 20 deletions(-) diff --git a/programs/winhlp32/Da.rc b/programs/winhlp32/Da.rc index 886943a..927fc32 100644 --- a/programs/winhlp32/Da.rc +++ b/programs/winhlp32/Da.rc @@ -73,8 +73,6 @@ FONT 8, "MS Shell Dlg" CAPTION "Index" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER - PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 - PUSHBUTTON "&Annuller", IDCANCEL, 120, 170, 50, 12 } /* Strings */ diff --git a/programs/winhlp32/De.rc b/programs/winhlp32/De.rc index 1be4838..49cda6d 100644 --- a/programs/winhlp32/De.rc +++ b/programs/winhlp32/De.rc @@ -72,8 +72,6 @@ FONT 8, "MS Shell Dlg" CAPTION "Index" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER - PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 - PUSHBUTTON "&Abbrechen", IDCANCEL, 120, 170, 50, 12 } /* Strings */ diff --git a/programs/winhlp32/En.rc b/programs/winhlp32/En.rc index 7c46e2b..1276f9c 100644 --- a/programs/winhlp32/En.rc +++ b/programs/winhlp32/En.rc @@ -72,8 +72,6 @@ FONT 8, "MS Shell Dlg" CAPTION "Index" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER - PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 - PUSHBUTTON "&Cancel", IDCANCEL, 120, 170, 50, 12 } IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/programs/winhlp32/Fr.rc b/programs/winhlp32/Fr.rc index 2c6d112..60acba8 100644 --- a/programs/winhlp32/Fr.rc +++ b/programs/winhlp32/Fr.rc @@ -75,8 +75,6 @@ FONT 8, "MS Shell Dlg" CAPTION "Index" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER - PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 - PUSHBUTTON "&Annuler", IDCANCEL, 120, 170, 50, 12 } /* Strings */ diff --git a/programs/winhlp32/Ko.rc b/programs/winhlp32/Ko.rc index 7839bac..3b05974 100644 --- a/programs/winhlp32/Ko.rc +++ b/programs/winhlp32/Ko.rc @@ -73,8 +73,6 @@ FONT 8, "MS Shell Dlg" CAPTION "�ε��" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER - PUSHBUTTON "Ȯ��(&O)", IDOK, 40, 170, 50, 12 - PUSHBUTTON "��(&C)", IDCANCEL, 120, 170, 50, 12 } IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/programs/winhlp32/Nl.rc b/programs/winhlp32/Nl.rc index 78d9a68..6a8747a 100644 --- a/programs/winhlp32/Nl.rc +++ b/programs/winhlp32/Nl.rc @@ -72,8 +72,6 @@ FONT 8, "MS Shell Dlg" CAPTION "Index" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER - PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 - PUSHBUTTON "&Annuleren", IDCANCEL, 120, 170, 50, 12 } IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/programs/winhlp32/No.rc b/programs/winhlp32/No.rc index b31df01..1632da6 100644 --- a/programs/winhlp32/No.rc +++ b/programs/winhlp32/No.rc @@ -71,8 +71,6 @@ FONT 8, "MS Shell Dlg" CAPTION "Innhold" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER - PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 - PUSHBUTTON "&Avbryt", IDCANCEL, 120, 170, 50, 12 } /* Strings */ diff --git a/programs/winhlp32/Pl.rc b/programs/winhlp32/Pl.rc index b823427..17d5d22 100644 --- a/programs/winhlp32/Pl.rc +++ b/programs/winhlp32/Pl.rc @@ -73,8 +73,6 @@ FONT 8, "MS Shell Dlg" CAPTION "Indeks" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER - PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 - PUSHBUTTON "&Anuluj", IDCANCEL, 120, 170, 50, 12 } /* Strings */ diff --git a/programs/winhlp32/Ru.rc b/programs/winhlp32/Ru.rc index 78aa481..af0097b 100644 --- a/programs/winhlp32/Ru.rc +++ b/programs/winhlp32/Ru.rc @@ -71,8 +71,6 @@ FONT 8, "MS Shell Dlg" CAPTION "��" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER - PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 - PUSHBUTTON "&��", IDCANCEL, 120, 170, 50, 12 } /* Strings */ diff --git a/programs/winhlp32/Si.rc b/programs/winhlp32/Si.rc index f28b9f1..f1a213d 100644 --- a/programs/winhlp32/Si.rc +++ b/programs/winhlp32/Si.rc @@ -73,8 +73,6 @@ FONT 8, "MS Shell Dlg" CAPTION "Indeks" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER - PUSHBUTTON "&V redu", IDOK, 40, 170, 50, 12 - PUSHBUTTON "&Prekliči", IDCANCEL, 120, 170, 50, 12 } /* Strings */

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetPenCustom[Start/End]Cap.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: e9bcce6e1dbe813ca47e0a49b6c183fd22e39c1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9bcce6e1dbe813ca47e0a49b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Aug 1 13:39:48 2008 +0400 gdiplus: Implemented GdipGetPenCustom[Start/End]Cap. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/pen.c | 34 ++++++++++++++++++++++++++++- dlls/gdiplus/tests/pen.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 4 files changed, 86 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 48d46a3..5b046a1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -352,8 +352,8 @@ @ stdcall GdipGetPenColor(ptr ptr) @ stub GdipGetPenCompoundArray @ stub GdipGetPenCompoundCount -@ stub GdipGetPenCustomEndCap -@ stub GdipGetPenCustomStartCap +@ stdcall GdipGetPenCustomEndCap(ptr ptr) +@ stdcall GdipGetPenCustomStartCap(ptr ptr) @ stdcall GdipGetPenDashArray(ptr ptr long) @ stdcall GdipGetPenDashCap197819(ptr ptr) @ stdcall GdipGetPenDashCount(ptr ptr) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 829b191..104d9de 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -116,6 +116,8 @@ GpStatus WINGDIPAPI GdipCreatePen2(GpBrush *brush, REAL width, GpUnit unit, gp_pen->miterlimit = 10.0; gp_pen->dash = DashStyleSolid; gp_pen->offset = 0.0; + gp_pen->customstart = NULL; + gp_pen->customend = NULL; if(!((gp_pen->unit == UnitWorld) || (gp_pen->unit == UnitPixel))) { FIXME("UnitWorld, UnitPixel only supported units\n"); @@ -163,6 +165,32 @@ GpStatus WINGDIPAPI GdipGetPenColor(GpPen *pen, ARGB *argb) return GdipGetSolidFillColor(((GpSolidFill*)pen->brush), argb); } +GpStatus WINGDIPAPI GdipGetPenCustomEndCap(GpPen *pen, GpCustomLineCap** customCap) +{ + if(!pen || !customCap) + return InvalidParameter; + + if(!pen->customend){ + *customCap = NULL; + return Ok; + } + + return GdipCloneCustomLineCap(pen->customend, customCap); +} + +GpStatus WINGDIPAPI GdipGetPenCustomStartCap(GpPen *pen, GpCustomLineCap** customCap) +{ + if(!pen || !customCap) + return InvalidParameter; + + if(!pen->customstart){ + *customCap = NULL; + return Ok; + } + + return GdipCloneCustomLineCap(pen->customstart, customCap); +} + GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen *pen, REAL *dash, INT count) { if(!pen || !dash || count > pen->numdashes) @@ -312,7 +340,8 @@ GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen *pen, GpCustomLineCap* customCa GpCustomLineCap * cap; GpStatus ret; - if(!pen || !customCap) return InvalidParameter; + /* native crashes on pen == NULL, customCap != NULL */ + if(!customCap) return InvalidParameter; if((ret = GdipCloneCustomLineCap(customCap, &cap)) == Ok){ GdipDeleteCustomLineCap(pen->customend); @@ -328,7 +357,8 @@ GpStatus WINGDIPAPI GdipSetPenCustomStartCap(GpPen *pen, GpCustomLineCap* custom GpCustomLineCap * cap; GpStatus ret; - if(!pen || !customCap) return InvalidParameter; + /* native crashes on pen == NULL, customCap != NULL */ + if(!customCap) return InvalidParameter; if((ret = GdipCloneCustomLineCap(customCap, &cap)) == Ok){ GdipDeleteCustomLineCap(pen->customstart); diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index ad484ce..d75e510 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -226,6 +226,55 @@ static void test_dasharray(void) GdipDeletePen(pen); } +static void test_customcap(void) +{ + GpPen *pen; + GpStatus status; + GpCustomLineCap *custom; + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + + /* NULL args */ + status = GdipGetPenCustomStartCap(NULL, NULL); + expect(InvalidParameter, status); + status = GdipGetPenCustomStartCap(pen, NULL); + expect(InvalidParameter, status); + status = GdipGetPenCustomStartCap(NULL, &custom); + expect(InvalidParameter, status); + + status = GdipGetPenCustomEndCap(NULL, NULL); + expect(InvalidParameter, status); + status = GdipGetPenCustomEndCap(pen, NULL); + expect(InvalidParameter, status); + status = GdipGetPenCustomEndCap(NULL, &custom); + expect(InvalidParameter, status); + + /* native crashes on pen == NULL, custom != NULL */ + status = GdipSetPenCustomStartCap(NULL, NULL); + expect(InvalidParameter, status); + status = GdipSetPenCustomStartCap(pen, NULL); + expect(InvalidParameter, status); + + status = GdipSetPenCustomEndCap(NULL, NULL); + expect(InvalidParameter, status); + status = GdipSetPenCustomEndCap(pen, NULL); + expect(InvalidParameter, status); + + /* get without setting previously */ + custom = (GpCustomLineCap*)0xdeadbeef; + status = GdipGetPenCustomEndCap(pen, &custom); + expect(Ok, status); + ok(custom == NULL,"Expect CustomCap == NULL\n"); + + custom = (GpCustomLineCap*)0xdeadbeef; + status = GdipGetPenCustomStartCap(pen, &custom); + expect(Ok, status); + ok(custom == NULL,"Expect CustomCap == NULL\n"); + + GdipDeletePen(pen); +} + START_TEST(pen) { struct GdiplusStartupInput gdiplusStartupInput; @@ -244,6 +293,7 @@ START_TEST(pen) test_constructor_destructor2(); test_brushfill(); test_dasharray(); + test_customcap(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 2e0d743..4293f64 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -33,6 +33,8 @@ GpStatus WINGDIPAPI GdipCreatePen2(GpBrush*,REAL,GpUnit,GpPen**); GpStatus WINGDIPAPI GdipDeletePen(GpPen*); GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen*,GpBrush**); GpStatus WINGDIPAPI GdipGetPenColor(GpPen*,ARGB*); +GpStatus WINGDIPAPI GdipGetPenCustomStartCap(GpPen*,GpCustomLineCap**); +GpStatus WINGDIPAPI GdipGetPenCustomEndCap(GpPen*,GpCustomLineCap**); GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen*,REAL*,INT); GpStatus WINGDIPAPI GdipGetPenDashCount(GpPen*,INT*); GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen*,REAL*);

1 0

Ismael Barros : dplayx: Tests for GetCaps.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: 4ff6ba0a4ac43fa5544c90dea60818b6795aed1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff6ba0a4ac43fa5544c90dea… Author: Ismael Barros <razielmine(a)gmail.com> Date: Thu Jul 31 20:17:26 2008 +0300 dplayx: Tests for GetCaps. --- dlls/dplayx/dplay.c | 5 ++ dlls/dplayx/tests/dplayx.c | 120 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 91ba4d6..1ba7d7e 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2380,6 +2380,11 @@ static HRESULT WINAPI DP_IF_GetPlayerCaps TRACE("(%p)->(0x%08x,%p,0x%08x)\n", This, idPlayer, lpDPCaps, dwFlags); + if ( This->dp2->connectionInitialized == NO_PROVIDER ) + { + return DPERR_UNINITIALIZED; + } + /* Query the service provider */ data.idPlayer = idPlayer; data.dwFlags = dwFlags; diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 3a442c9..5dccfe1 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -529,6 +529,56 @@ static LPCSTR dwFlags2str(DWORD dwFlags, DWORD flagType) return flags; } +static void init_TCPIP_provider( LPDIRECTPLAY4 pDP, + LPCSTR strIPAddressString, + WORD port ) +{ + + DPCOMPOUNDADDRESSELEMENT addressElements[3]; + LPVOID pAddress = NULL; + DWORD dwAddressSize = 0; + LPDIRECTPLAYLOBBY3 pDPL; + HRESULT hr; + + CoCreateInstance( &CLSID_DirectPlayLobby, NULL, CLSCTX_ALL, + &IID_IDirectPlayLobby3A, (LPVOID*) &pDPL ); + + /* Service provider */ + addressElements[0].guidDataType = DPAID_ServiceProvider; + addressElements[0].dwDataSize = sizeof(GUID); + addressElements[0].lpData = (LPVOID) &DPSPGUID_TCPIP; + + /* IP address string */ + addressElements[1].guidDataType = DPAID_INet; + addressElements[1].dwDataSize = lstrlen(strIPAddressString) + 1; + addressElements[1].lpData = (LPVOID) strIPAddressString; + + /* Optional Port number */ + if( port > 0 ) + { + addressElements[2].guidDataType = DPAID_INetPort; + addressElements[2].dwDataSize = sizeof(WORD); + addressElements[2].lpData = &port; + } + + + hr = IDirectPlayLobby_CreateCompoundAddress( pDPL, addressElements, 2, + NULL, &dwAddressSize ); + checkHR( DPERR_BUFFERTOOSMALL, hr ); + + if( hr == DPERR_BUFFERTOOSMALL ) + { + pAddress = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwAddressSize ); + hr = IDirectPlayLobby_CreateCompoundAddress( pDPL, addressElements, 2, + pAddress, &dwAddressSize ); + checkHR( DP_OK, hr ); + } + + hr = IDirectPlayX_InitializeConnection( pDP, pAddress, 0 ); + todo_wine checkHR( DP_OK, hr ); + +} + /* DirectPlayCreate */ @@ -753,6 +803,74 @@ static void test_InitializeConnection(void) IDirectPlayX_Release( pDP ); } +/* GetCaps */ + +static void test_GetCaps(void) +{ + + LPDIRECTPLAY4 pDP; + DPCAPS dpcaps; + DWORD dwFlags; + HRESULT hr; + + + CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP ); + ZeroMemory( &dpcaps, sizeof(DPCAPS) ); + + /* Service provider not ininitialized */ + hr = IDirectPlayX_GetCaps( pDP, &dpcaps, 0 ); + checkHR( DPERR_UNINITIALIZED, hr ); + + init_TCPIP_provider( pDP, "127.0.0.1", 0 ); + + /* dpcaps not ininitialized */ + hr = IDirectPlayX_GetCaps( pDP, &dpcaps, 0 ); + todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + + dpcaps.dwSize = sizeof(DPCAPS); + + for (dwFlags=0; + dwFlags<=DPGETCAPS_GUARANTEED; + dwFlags+=DPGETCAPS_GUARANTEED) + { + + hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags ); + todo_wine checkHR( DP_OK, hr ); + + + if ( hr == DP_OK ) + { + check( sizeof(DPCAPS), dpcaps.dwSize ); + check( DPCAPS_ASYNCSUPPORTED | + DPCAPS_GUARANTEEDOPTIMIZED | + DPCAPS_GUARANTEEDSUPPORTED, + dpcaps.dwFlags ); + check( 0, dpcaps.dwMaxQueueSize ); + check( 0, dpcaps.dwHundredBaud ); + check( 500, dpcaps.dwLatency ); + check( 65536, dpcaps.dwMaxLocalPlayers ); + check( 20, dpcaps.dwHeaderLength ); + check( 5000, dpcaps.dwTimeout ); + + switch (dwFlags) + { + case 0: + check( 65479, dpcaps.dwMaxBufferSize ); + check( 65536, dpcaps.dwMaxPlayers ); + break; + case DPGETCAPS_GUARANTEED: + check( 1048547, dpcaps.dwMaxBufferSize ); + check( 64, dpcaps.dwMaxPlayers ); + break; + default: break; + } + } + } + + IDirectPlayX_Release( pDP ); +} + START_TEST(dplayx) { @@ -762,5 +880,7 @@ START_TEST(dplayx) test_EnumConnections(); test_InitializeConnection(); + test_GetCaps(); + CoUninitialize(); }

1 0

Ismael Barros : dplayx: Tests for InitializeConnection.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: d142447c2696a9a997e5931cd019f04d1d0ea0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d142447c2696a9a997e5931cd… Author: Ismael Barros <razielmine(a)gmail.com> Date: Thu Jul 31 20:17:32 2008 +0300 dplayx: Tests for InitializeConnection. --- dlls/dplayx/dplay.c | 10 +++++++++ dlls/dplayx/tests/dplayx.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 06b6155..91ba4d6 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4227,11 +4227,21 @@ static HRESULT WINAPI DP_IF_InitializeConnection TRACE("(%p)->(%p,0x%08x,%u)\n", This, lpConnection, dwFlags, bAnsi ); + if ( lpConnection == NULL ) + { + return DPERR_INVALIDPARAMS; + } + if( dwFlags != 0 ) { return DPERR_INVALIDFLAGS; } + if( This->dp2->connectionInitialized != NO_PROVIDER ) + { + return DPERR_ALREADYINITIALIZED; + } + /* Find out what the requested SP is and how large this buffer is */ hr = DPL_EnumAddress( DP_GetSpLpGuidFromCompoundAddress, lpConnection, dwAddrSize, &guidSP ); diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 56e0f7e..3a442c9 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -707,6 +707,52 @@ static void test_EnumConnections(void) IDirectPlayX_Release( pDP ); } +/* InitializeConnection */ + +static BOOL CALLBACK EnumConnections_cb2( LPCGUID lpguidSP, + LPVOID lpConnection, + DWORD dwConnectionSize, + LPCDPNAME lpName, + DWORD dwFlags, + LPVOID lpContext ) +{ + LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + HRESULT hr; + + /* Incorrect parameters */ + hr = IDirectPlayX_InitializeConnection( pDP, NULL, 1 ); + checkHR( DPERR_INVALIDPARAMS, hr ); + hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 1 ); + checkHR( DPERR_INVALIDFLAGS, hr ); + + /* Normal operation. + We're only interested in ensuring that the TCP/IP provider works */ + + if( IsEqualGUID(lpguidSP, &DPSPGUID_TCPIP) ) + { + hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 0 ); + todo_wine checkHR( DP_OK, hr ); + hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 0 ); + todo_wine checkHR( DPERR_ALREADYINITIALIZED, hr ); + } + + return TRUE; +} + +static void test_InitializeConnection(void) +{ + + LPDIRECTPLAY4 pDP; + + CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP ); + + IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb2, + (LPVOID) pDP, 0 ); + + IDirectPlayX_Release( pDP ); +} + START_TEST(dplayx) { @@ -714,6 +760,7 @@ START_TEST(dplayx) test_DirectPlayCreate(); test_EnumConnections(); + test_InitializeConnection(); CoUninitialize(); }

1 0

Ismael Barros : dplayx: Tests for EnumConnections.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: 4ab75e121426d8840b6bfb196cef45506091fd25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ab75e121426d8840b6bfb196… Author: Ismael Barros <razielmine(a)gmail.com> Date: Thu Jul 31 20:17:34 2008 +0300 dplayx: Tests for EnumConnections. --- dlls/dplayx/dplay.c | 4 +- dlls/dplayx/tests/dplayx.c | 548 ++++++++++++++++++++++++++++++++++++++++++++ include/dplay.h | 17 ++ 3 files changed, 567 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ab75e121426d8840b6bf…

1 0

Ismael Barros : dplayx: Tests for DirectPlayCreate.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: 42165af840b8cd98d5144df239a475d212e7bf8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=42165af840b8cd98d5144df23… Author: Ismael Barros <razielmine(a)gmail.com> Date: Thu Jul 31 20:17:30 2008 +0300 dplayx: Tests for DirectPlayCreate. --- dlls/dplayx/dplay.c | 6 ++ dlls/dplayx/tests/Makefile.in | 2 +- dlls/dplayx/tests/dplayx.c | 179 +++++++++++++++++++++++++++++------------ 3 files changed, 135 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42165af840b8cd98d5144…

1 0

Ismael Barros : dplayx: Changed debug channel from dplayx to dplay.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: a1b76460a11dca052a09de861fab8b70e7074603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b76460a11dca052a09de861… Author: Ismael Barros <razielmine(a)gmail.com> Date: Thu Jul 31 20:17:28 2008 +0300 dplayx: Changed debug channel from dplayx to dplay. --- dlls/dplayx/regsvr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/regsvr.c b/dlls/dplayx/regsvr.c index cb5a5d2..6bfc812 100644 --- a/dlls/dplayx/regsvr.c +++ b/dlls/dplayx/regsvr.c @@ -32,7 +32,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(dplayx); +WINE_DEFAULT_DEBUG_CHANNEL(dplay); /* * Near the bottom of this file are the exported DllRegisterServer and

1 0

Ismael Barros : dplayx: Fix the definition of DirectPlayCreate.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: 5dc0d4d1ed2de76f21ba4f5298ba9ab251c6fd83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dc0d4d1ed2de76f21ba4f529… Author: Ismael Barros <razielmine(a)gmail.com> Date: Thu Jul 31 20:17:25 2008 +0300 dplayx: Fix the definition of DirectPlayCreate. --- dlls/dplayx/dplay.c | 2 +- include/dplay.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 829a21c..9187040 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -5393,7 +5393,7 @@ static BOOL CALLBACK cbDPCreateEnumConnections( * */ HRESULT WINAPI DirectPlayCreate -( LPGUID lpGUID, LPDIRECTPLAY2 *lplpDP, IUnknown *pUnk) +( LPGUID lpGUID, LPDIRECTPLAY *lplpDP, IUnknown *pUnk ) { HRESULT hr; LPDIRECTPLAY3A lpDP3A; diff --git a/include/dplay.h b/include/dplay.h index 855fc50..e9c8c2e 100644 --- a/include/dplay.h +++ b/include/dplay.h @@ -392,7 +392,7 @@ typedef BOOL (CALLBACK *LPDPENUMSESSIONSCALLBACK)( extern HRESULT WINAPI DirectPlayEnumerateA( LPDPENUMDPCALLBACKA, LPVOID ); extern HRESULT WINAPI DirectPlayEnumerateW( LPDPENUMDPCALLBACKW, LPVOID ); -extern HRESULT WINAPI DirectPlayCreate( LPGUID lpGUID, LPDIRECTPLAY2 *lplpDP, IUnknown *pUnk); +extern HRESULT WINAPI DirectPlayCreate( LPGUID lpGUID, LPDIRECTPLAY *lplpDP, IUnknown *pUnk ); typedef BOOL (CALLBACK *LPDPENUMPLAYERSCALLBACK)( DPID dpId,

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 August 2008