October 2008 - Wine-Commits

Tag wine-1.1.6 : Alexandre Julliard : Release 1.1.6
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: refs/tags/wine-1.1.6 Tag: a8282cbef86fd7ad5d87dfa1317ee82760b194eb URL: http://source.winehq.org/git/wine.git/?a=tag;h=a8282cbef86fd7ad5d87dfa1317e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 10 16:57:22 2008 +0200 Release 1.1.6

1 0

Alexandre Julliard : Release 1.1.6.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: 04f11f20ad436c58b7de50ffe0352dc4250ce63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f11f20ad436c58b7de50ffe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 10 16:57:22 2008 +0200 Release 1.1.6. --- ANNOUNCE | 1650 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 886 insertions(+), 784 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04f11f20ad436c58b7de5…

1 0

Francois Gouget : cryptdlg: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: 7e77ecdf30202abcc213a6d171e56d03aafa13db URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e77ecdf30202abcc213a6d17… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 10 13:45:42 2008 +0200 cryptdlg: Fix compilation on systems that don't support nameless unions. --- dlls/cryptdlg/main.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index d87d480..46fb7ed 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "config.h" #include <stdarg.h> @@ -240,11 +242,11 @@ static CERT_VERIFY_CERTIFICATE_TRUST *CRYPTDLG_GetVerifyData( * called directly: */ if (data->pWintrustData->dwUnionChoice == WTD_CHOICE_BLOB && - data->pWintrustData->pBlob && data->pWintrustData->pBlob->cbMemObject == + data->pWintrustData->u.pBlob && data->pWintrustData->u.pBlob->cbMemObject == sizeof(CERT_VERIFY_CERTIFICATE_TRUST) && - data->pWintrustData->pBlob->pbMemObject) + data->pWintrustData->u.pBlob->pbMemObject) pCert = (CERT_VERIFY_CERTIFICATE_TRUST *) - data->pWintrustData->pBlob->pbMemObject; + data->pWintrustData->u.pBlob->pbMemObject; return pCert; } @@ -432,7 +434,7 @@ BOOL WINAPI CertViewPropertiesW(CERT_VIEWPROPERTIES_STRUCT_W *info) wtd.cbStruct = sizeof(wtd); wtd.dwUIChoice = WTD_UI_NONE; wtd.dwUnionChoice = WTD_CHOICE_BLOB; - wtd.pBlob = &blob; + wtd.u.pBlob = &blob; wtd.dwStateAction = WTD_STATEACTION_VERIFY; err = WinVerifyTrust(NULL, &cert_action_verify, &wtd); if (err == ERROR_SUCCESS) @@ -449,7 +451,7 @@ BOOL WINAPI CertViewPropertiesW(CERT_VIEWPROPERTIES_STRUCT_W *info) uiInfo.pCertContext = info->pCertContext; uiInfo.cPurposes = info->cArrayPurposes; uiInfo.rgszPurposes = (LPCSTR *)info->arrayPurposes; - uiInfo.hWVTStateData = wtd.hWVTStateData; + uiInfo.u.hWVTStateData = wtd.hWVTStateData; uiInfo.fpCryptProviderDataTrustedUsage = TRUE; uiInfo.cPropSheetPages = info->cArrayPropSheetPages; uiInfo.rgPropSheetPages = info->arrayPropSheetPages;

1 0

Francois Gouget : mshtml/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: 516ff4c6eb289966b99df8be5705527621179a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=516ff4c6eb289966b99df8be5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 10 13:44:00 2008 +0200 mshtml/tests: Add a trailing '\n' to an ok() call. --- dlls/mshtml/tests/script.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 3944962..90e5583 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -282,7 +282,7 @@ static HRESULT WINAPI funcDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(rgvarg[1]) = %d\n", V_VT(pdp->rgvarg)); ok(V_BOOL(pdp->rgvarg+1) == VARIANT_TRUE, "V_BOOL(rgvarg[1]) = %x\n", V_BOOL(pdp->rgvarg)); ok(pvarRes != NULL, "pvarRes == NULL\n"); - ok(pei != NULL, "pei == NULL"); + ok(pei != NULL, "pei == NULL\n"); ok(!pspCaller, "pspCaller != NULL\n"); V_VT(pvarRes) = VT_I4;

1 0

Konstantin Kondratyuk : fonts: Add afii61352 into tahomabd.sfd.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: b426a0b5ce784e83b7eece41f961d2e4f45a6c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b426a0b5ce784e83b7eece41f… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Fri Oct 10 10:37:00 2008 +0400 fonts: Add afii61352 into tahomabd.sfd. --- fonts/tahomabd.sfd | 62 +++++++++++++++++++++++++++++++++++++++++++++------ fonts/tahomabd.ttf | Bin 75364 -> 75600 bytes 2 files changed, 54 insertions(+), 8 deletions(-) diff --git a/fonts/tahomabd.sfd b/fonts/tahomabd.sfd index 0f39a66..d1e1cc6 100644 --- a/fonts/tahomabd.sfd +++ b/fonts/tahomabd.sfd @@ -12,13 +12,13 @@ UnderlinePosition: -170 UnderlineWidth: 130 Ascent: 1638 Descent: 410 -XUID: [1021 135 1692684408 7873690] +XUID: [1021 135 1692684408 7873691] FSType: 0 OS2Version: 2 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1169210120 -ModificationTime: 1210760415 +ModificationTime: 1223550623 PfmFamily: 33 TTFWeight: 700 TTFWidth: 5 @@ -107,7 +107,7 @@ SnapStemV 9 [184 203] ExpansionFactor 4 0.06 EndPrivate TeXData: 1 0 0 327680 163840 109226 571904 -1048576 109226 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65537 410 +BeginChars: 65537 411 StartChar: .notdef Encoding: 0 0 0 Width: 2048 @@ -8352,8 +8352,44 @@ Encoding: 160 160 409 Width: 600 Flags: W EndChar +StartChar: afii61352 +Encoding: 8470 8470 410 +Width: 1578 +Flags: W +TeX: 0 0 0 0 +HStem: 0 21G<152 337 688 910> 1105 70<1020 1210> 1210 62.5<1074.62 1146.38> 1422.5 67.5<1074.62 1146.38> +VStem: 152 185<0 1284> 725 185<310 1489> 1010 50.5<1293.68 1401.32> 1160.5 49.5<1293.68 1401.32> +Fore +1160.5 1347.5 m 0 + 1160.5 1388.9 1138.1 1422.5 1110.5 1422.5 c 0 + 1082.9 1422.5 1060.5 1388.9 1060.5 1347.5 c 0 + 1060.5 1306.1 1082.9 1272.5 1110.5 1272.5 c 0 + 1138.1 1272.5 1160.5 1306.1 1160.5 1347.5 c 0 +1010 1350 m 0 + 1010 1427.28 1054.8 1490 1110 1490 c 0 + 1165.2 1490 1210 1427.28 1210 1350 c 0 + 1210 1272.72 1165.2 1210 1110 1210 c 0 + 1054.8 1210 1010 1272.72 1010 1350 c 0 +1020 1175 m 1 + 1210 1175 l 1 + 1210 1105 l 1 + 1020 1105 l 1 + 1020 1175 l 1 +152 0 m 1 + 152 1489 l 1 + 433 1489 l 1 + 725 310 l 1 + 725 1489 l 1 + 910 1489 l 1 + 910 0 l 1 + 688 0 l 1 + 337 1284 l 1 + 337 0 l 1 + 152 0 l 1 +EndSplineSet +EndChar EndChars -BitmapFont: 11 410 9 2 1 FontForge +BitmapFont: 11 411 9 2 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--11-80-96-96-P-62-ISO10646-1" FONTBOUNDINGBOX 1 "15 11 0 -2" @@ -9209,8 +9245,10 @@ BDFChar: 408 1031 5 0 3 0 9 n,Vrc?smAM(a).4-r BDFChar: 409 160 3 0 0 0 0 z +BDFChar: 410 8470 8 0 7 0 7 +c0alrr7p)O EndBitmapFont -BitmapFont: 12 410 10 2 1 FontForge +BitmapFont: 12 411 10 2 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--12-90-96-96-P-70-ISO10646-1" FONTBOUNDINGBOX 1 "16 12 0 -2" @@ -9864,8 +9902,10 @@ BDFChar: 408 1031 5 0 4 0 10 fDtDK?smAM?srI( BDFChar: 409 160 4 0 0 0 0 z +BDFChar: 410 8470 9 0 8 0 8 +c%,23li@!7quHWpg]6+0bQ%VC EndBitmapFont -BitmapFont: 13 410 10 3 1 FontForge +BitmapFont: 13 411 10 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--13-100-96-96-P-73-ISO10646-1" FONTBOUNDINGBOX 1 "15 13 0 -3" @@ -10515,8 +10555,10 @@ BDFChar: 408 1031 4 0 2 0 10 TE*n85X7S"5X=6- BDFChar: 409 160 4 0 0 0 0 z +BDFChar: 410 8470 8 0 7 0 8 +Mp'2BW484NL]@DT EndBitmapFont -BitmapFont: 15 410 12 3 1 FontForge +BitmapFont: 15 411 12 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--15-110-96-96-P-85-ISO10646-1" FONTBOUNDINGBOX 1 "19 15 0 -3" @@ -11166,8 +11208,10 @@ BDFChar: 408 1031 6 1 3 0 12 TE*n85X7S"5X7S"huE`W BDFChar: 409 160 4 0 0 0 0 z +BDFChar: 410 8470 10 0 9 0 10 +`k^`PjoG+jp&NqLh>kh$c2c,i`W,u= EndBitmapFont -BitmapFont: 16 410 13 3 1 FontForge +BitmapFont: 16 411 13 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--16-120-96-96-P-93-ISO10646-1" FONTBOUNDINGBOX 1 "21 16 0 -3" @@ -11817,5 +11861,7 @@ BDFChar: 408 1031 6 0 4 0 14 Lkl%M+<VdL+<VdL+<YV' BDFChar: 409 160 5 0 0 0 0 z +BDFChar: 410 8470 11 0 10 0 11 +`o-!Pk2>q5p>GWEh>lC4c2c,ic2bia EndBitmapFont EndSplineFont diff --git a/fonts/tahomabd.ttf b/fonts/tahomabd.ttf index 6651ea0..86a62d2 100644 Binary files a/fonts/tahomabd.ttf and b/fonts/tahomabd.ttf differ

1 0

Konstantin Kondratyuk : fonts: Add afii61352 into tahoma.sfd.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: 9d4993f683d44322183ed9d5e519b58b4c0c20ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4993f683d44322183ed9d5e… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Fri Oct 10 10:26:44 2008 +0400 fonts: Add afii61352 into tahoma.sfd. --- fonts/tahoma.sfd | 70 +++++++++++++++++++++++++++++++++++++++++++++-------- fonts/tahoma.ttf | Bin 85192 -> 85444 bytes 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/fonts/tahoma.sfd b/fonts/tahoma.sfd index 4b0c54d..5b0a8b0 100644 --- a/fonts/tahoma.sfd +++ b/fonts/tahoma.sfd @@ -12,13 +12,13 @@ UnderlinePosition: -170 UnderlineWidth: 130 Ascent: 1638 Descent: 410 -XUID: [1021 135 1692684408 1110822] +XUID: [1021 135 1692684408 1110823] FSType: 0 OS2Version: 2 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1169210120 -ModificationTime: 1208293008 +ModificationTime: 1223550020 PfmFamily: 33 TTFWeight: 400 TTFWidth: 5 @@ -108,7 +108,7 @@ SnapStemV 9 [184 203] ExpansionFactor 4 0.06 EndPrivate TeXData: 1 0 0 327680 163840 109226 571904 -1048576 109226 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65537 431 +BeginChars: 65537 432 StartChar: .notdef Encoding: 0 0 0 Width: 2048 @@ -9238,8 +9238,44 @@ Encoding: 160 160 430 Width: 639 Flags: W EndChar +StartChar: afii61352 +Encoding: 8470 8470 431 +Width: 1366 +Flags: W +TeX: 0 0 0 0 +HStem: 0 21G<152 337 678 900> 950 95<970 1220> 1090 75<1051.18 1158.82> 1405 85<1051.18 1158.82> +VStem: 152 185<0 1284> 715 185<310 1489> 965 65<1198.89 1371.11> 1180 45<1198.89 1371.11> +Fore +970 1045 m 5 + 1220 1045 l 5 + 1220 950 l 5 + 970 950 l 5 + 970 1045 l 5 +1180 1285 m 0 + 1180 1351.24 1146.4 1405 1105 1405 c 0 + 1063.6 1405 1030 1351.24 1030 1285 c 0 + 1030 1218.76 1063.6 1165 1105 1165 c 0 + 1146.4 1165 1180 1218.76 1180 1285 c 0 +965 1290 m 0 + 965 1400.4 1023.24 1490 1095 1490 c 0 + 1166.76 1490 1225 1400.4 1225 1290 c 0 + 1225 1179.6 1166.76 1090 1095 1090 c 0 + 1023.24 1090 965 1179.6 965 1290 c 0 +152 0 m 1 + 152 1489 l 1 + 433 1489 l 1 + 715 310 l 1 + 715 1489 l 1 + 900 1489 l 1 + 900 0 l 1 + 678 0 l 1 + 337 1284 l 1 + 337 0 l 1 + 152 0 l 1 +EndSplineSet +EndChar EndChars -BitmapFont: 9 431 7 2 1 +BitmapFont: 9 432 7 2 1 BDFChar: 0 0 9 1 7 0 6 rdo`RJqEt% BDFChar: 1 32 3 0 0 0 0 @@ -10102,8 +10138,10 @@ BDFChar: 429 539 3 0 1 -2 5 JA?\cJ3X*b BDFChar: 430 160 3 0 0 0 0 z +BDFChar: 431 8470 7 0 6 0 6 +QIaFVYcs2h EndBitmapFont -BitmapFont: 11 431 9 2 1 FontForge +BitmapFont: 11 432 9 2 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--11-80-96-96-P-62-ISO10646-1" FONTBOUNDINGBOX 1 "15 11 0 -2" @@ -11001,8 +11039,10 @@ BDFChar: 429 539 4 0 2 -3 7 J:QR.J:N/X!'l&7 BDFChar: 430 160 3 0 0 0 0 z +BDFChar: 431 8470 7 0 6 0 7 +QIaF6Yct?n EndBitmapFont -BitmapFont: 12 431 10 2 1 FontForge +BitmapFont: 12 432 10 2 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--12-90-96-96-P-70-ISO10646-1" FONTBOUNDINGBOX 1 "16 12 0 -2" @@ -11696,8 +11736,10 @@ BDFChar: 429 539 4 0 3 -3 8 5X=g(5X7S"0E<4\ BDFChar: 430 160 4 0 0 0 0 z +BDFChar: 431 8470 8 0 7 0 8 +Mp'2BW2Q)NL]@DT EndBitmapFont -BitmapFont: 13 431 10 3 1 FontForge +BitmapFont: 13 432 10 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--13-100-96-96-P-73-ISO10646-1" FONTBOUNDINGBOX 1 "15 13 0 -3" @@ -12391,8 +12433,10 @@ BDFChar: 429 539 4 0 3 -3 8 5X=g(5X7S"0E<4\ BDFChar: 430 160 4 0 0 0 0 z +BDFChar: 431 8470 8 0 7 0 8 +Mp'2BW2Q)NL]@DT EndBitmapFont -BitmapFont: 15 431 12 3 1 FontForge +BitmapFont: 15 432 12 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--15-110-96-96-P-85-ISO10646-1" FONTBOUNDINGBOX 1 "19 15 0 -3" @@ -13086,8 +13130,10 @@ BDFChar: 429 539 5 0 4 -3 9 5X>*05X7S"5WA`T0E;(Q BDFChar: 430 160 5 0 0 0 0 z +BDFChar: 431 8470 10 0 8 0 10 +Kn.-m_uQWaU]@b%PQ6pJMu\e:KE(uP EndBitmapFont -BitmapFont: 16 431 13 3 1 FontForge +BitmapFont: 16 432 13 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--16-120-96-96-P-93-ISO10646-1" FONTBOUNDINGBOX 1 "21 16 0 -3" @@ -13767,8 +13813,8 @@ BDFChar: 422 370 10 0 9 -3 11 J3\WMJ3\WMJ3\WMJ3\WMJ3\WM5_)'!!WW?'!rr<$ BDFChar: 423 371 9 0 7 -3 8 JUrB'JUrA>4TY`g -BDFChar: 424 175 9 0 8 13 14 -!!*%L +BDFChar: 424 175 9 0 8 13 13 +s*t(L BDFChar: 425 806 9 2 4 -4 -2 ?pK5B BDFChar: 426 536 9 0 7 -3 11 @@ -13781,5 +13827,7 @@ BDFChar: 429 539 5 0 4 -3 11 5X7U05X7S"5X7Ro!"^ga BDFChar: 430 160 0 0 0 0 0 z +BDFChar: 431 8470 11 0 9 0 11 +KE0!,`B^98U]@7,PQ6pJPQ6XBMu\M2 EndBitmapFont EndSplineFont diff --git a/fonts/tahoma.ttf b/fonts/tahoma.ttf index 2069753..b8bdfa6 100644 Binary files a/fonts/tahoma.ttf and b/fonts/tahoma.ttf differ

1 0

Roderick Colenbrander : opengl32: Add a test case for WGL_ARB_create_context/opengl3.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: a3dff8af94deea9cf72fe0dcf50a6cb6e1b4ead6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3dff8af94deea9cf72fe0dcf… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Oct 9 20:54:50 2008 +0000 opengl32: Add a test case for WGL_ARB_create_context/opengl3. --- dlls/opengl32/tests/opengl.c | 122 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 121 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 65c47c6..b931999 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1,7 +1,7 @@ /* * Some tests for OpenGL functions * - * Copyright (C) 2007 Roderick Colenbrander + * Copyright (C) 2007-2008 Roderick Colenbrander * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +30,18 @@ const unsigned char * WINAPI glGetString(unsigned int); #define MAX_FORMATS 256 typedef void* HPBUFFERARB; +/* WGL_ARB_create_context */ +HGLRC (WINAPI *pwglCreateContextAttribsARB)(HDC hDC, HGLRC hShareContext, const int *attribList); +/* GetLastError */ +#define ERROR_INVALID_VERSION_ARB 0x2095 +#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 +#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 +#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 +#define WGL_CONTEXT_FLAGS_ARB 0x2094 +/* Flags for WGL_CONTEXT_FLAGS_ARB */ +#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 +#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 + /* WGL_ARB_extensions_string */ static const char* (WINAPI *pwglGetExtensionsStringARB)(HDC); static int (WINAPI *pwglReleasePbufferDCARB)(HPBUFFERARB, HDC); @@ -64,6 +76,9 @@ static void init_functions(void) if(!p ## func) \ trace("wglGetProcAddress(%s) failed\n", #func); + /* WGL_ARB_create_context */ + GET_PROC(wglCreateContextAttribsARB); + /* WGL_ARB_extensions_string */ GET_PROC(wglGetExtensionsStringARB) @@ -400,6 +415,108 @@ static void test_dc(HWND hwnd, HDC hdc) } } +static void test_opengl3(HDC hdc) +{ + /* Try to create a context using an invalid OpenGL version namely 0.x */ + { + HGLRC gl3Ctx; + int attribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB, 0, 0}; + + gl3Ctx = pwglCreateContextAttribsARB(hdc, 0, attribs); + ok(gl3Ctx == 0, "wglCreateContextAttribs with major version=0 should fail!\n"); + + if(gl3Ctx) + wglDeleteContext(gl3Ctx); + } + + /* Try to create a context compatible with OpenGL 1.x; 1.0-2.1 is allowed */ + { + HGLRC gl3Ctx; + int attribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB, 1, 0}; + + gl3Ctx = pwglCreateContextAttribsARB(hdc, 0, attribs); + ok(gl3Ctx != 0, "pwglCreateContextAttribsARB for a 1.x context failed!\n"); + wglDeleteContext(gl3Ctx); + } + + /* Try to pass an invalid HDC */ + { + HGLRC gl3Ctx; + DWORD error; + gl3Ctx = pwglCreateContextAttribsARB((HDC)0xdeadbeef, 0, 0); + ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid HDC passed\n"); + error = GetLastError(); + ok(error == ERROR_DC_NOT_FOUND, "Expected ERROR_DC_NOT_FOUND, got error=%x\n", error); + wglDeleteContext(gl3Ctx); + } + + /* Try to pass an invalid shareList */ + { + HGLRC gl3Ctx; + DWORD error; + gl3Ctx = pwglCreateContextAttribsARB(hdc, (HGLRC)0xdeadbeef, 0); + ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid shareList passed\n"); + error = GetLastError(); + ok(error == ERROR_INVALID_OPERATION, "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); + wglDeleteContext(gl3Ctx); + } + + /* Try to create an OpenGL 3.0 context */ + { + int attribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB, 3, WGL_CONTEXT_MINOR_VERSION_ARB, 0, 0}; + HGLRC gl3Ctx = pwglCreateContextAttribsARB(hdc, 0, attribs); + + if(gl3Ctx == NULL) + { + skip("Skipping the rest of the WGL_ARB_create_context test due to lack of OpenGL 3.0\n"); + return; + } + + wglDeleteContext(gl3Ctx); + } + + /* Test matching an OpenGL 3.0 context with an older one, OpenGL 3.0 should allow it until the new object model is introduced in a future revision */ + { + HGLRC glCtx = wglCreateContext(hdc); + + int attribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB, 3, WGL_CONTEXT_MINOR_VERSION_ARB, 0, 0}; + int attribs_future[] = {WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB, WGL_CONTEXT_MAJOR_VERSION_ARB, 3, WGL_CONTEXT_MINOR_VERSION_ARB, 0, 0}; + + HGLRC gl3Ctx = pwglCreateContextAttribsARB(hdc, glCtx, attribs); + ok(gl3Ctx != NULL, "Sharing of a display list between OpenGL 3.0 and OpenGL 1.x/2.x failed!\n"); + if(gl3Ctx) + wglDeleteContext(gl3Ctx); + + gl3Ctx = pwglCreateContextAttribsARB(hdc, glCtx, attribs_future); + ok(gl3Ctx != NULL, "Sharing of a display list between a forward compatible OpenGL 3.0 context and OpenGL 1.x/2.x failed!\n"); + if(gl3Ctx) + wglDeleteContext(gl3Ctx); + + if(glCtx) + wglDeleteContext(glCtx); + } + + /* Try to create an OpenGL 3.0 context and test windowless rendering */ + { + HGLRC gl3Ctx; + int attribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB, 3, WGL_CONTEXT_MINOR_VERSION_ARB, 0, 0}; + BOOL res; + + gl3Ctx = pwglCreateContextAttribsARB(hdc, 0, attribs); + ok(gl3Ctx != 0, "pwglCreateContextAttribsARB for a 3.0 context failed!\n"); + + /* OpenGL 3.0 allows offscreen rendering WITHOUT a drawable */ + /* NOTE: Nvidia's 177.89 beta drivers don't allow this yet */ + res = wglMakeCurrent(0, gl3Ctx); + ok(res == TRUE, "OpenGL 3.0 should allow windowless rendering, but the test failed!\n"); + if(res) + wglMakeCurrent(0, 0); + + if(gl3Ctx) + wglDeleteContext(gl3Ctx); + } +} + START_TEST(opengl) { HWND hwnd; @@ -477,6 +594,9 @@ START_TEST(opengl) wgl_extensions = pwglGetExtensionsStringARB(hdc); if(wgl_extensions == NULL) skip("Skipping opengl32 tests because this OpenGL implementation doesn't support WGL extensions!\n"); + if(strstr(wgl_extensions, "WGL_ARB_create_context")) + test_opengl3(hdc); + if(strstr(wgl_extensions, "WGL_ARB_make_current_read")) test_make_current_read(hdc); else

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: 0f38a60dd367facb91199bdf11c0da530df82777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f38a60dd367facb91199bdf1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 10 13:44:43 2008 +0200 Assorted spelling fixes. --- dlls/d3d9/tests/visual.c | 2 +- dlls/d3dxof/d3dxof.c | 4 ++-- dlls/wined3d/swapchain_base.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3211076..c49d5b6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9687,7 +9687,7 @@ static void zwriteenable_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); if(SUCCEEDED(hr)) { /* The Z buffer is filled with 1.0. Draw a red quad with z = 0.1, zenable = D3DZB_FALSE, zwriteenable = TRUE. - * The red color is written because the z test is disabled. The question is wether the z = 0.1 values + * The red color is written because the z test is disabled. The question is whether the z = 0.1 values * are written into the Z buffer. After the draw, set zenable = TRUE and draw a green quad at z = 0.9. * If the values are written, the z test will fail(0.9 > 0.1) and the red color remains. If the values * are not written, the z test succeeds(0.9 < 1.0) and the green color is written. It turns out that diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 0bd5947..5fae6d5 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1300,7 +1300,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_QueryInterface(IDirectXFileData* ifac return S_OK; } - /* Do not print an error for interfaces that can be queried to retreive the type of the object */ + /* Do not print an error for interfaces that can be queried to retrieve the type of the object */ if (!IsEqualGUID(riid, &IID_IDirectXFileBinary) && !IsEqualGUID(riid, &IID_IDirectXFileDataReference)) ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); @@ -1520,7 +1520,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_QueryInterface(IDirectXFileD return S_OK; } - /* Do not print an error for interfaces that can be queried to retreive the type of the object */ + /* Do not print an error for interfaces that can be queried to retrieve the type of the object */ if (!IsEqualGUID(riid, &IID_IDirectXFileData) && !IsEqualGUID(riid, &IID_IDirectXFileBinary)) ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); diff --git a/dlls/wined3d/swapchain_base.c b/dlls/wined3d/swapchain_base.c index 75adf77..4088190 100644 --- a/dlls/wined3d/swapchain_base.c +++ b/dlls/wined3d/swapchain_base.c @@ -95,15 +95,15 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetBackBuffer(IWineD3DSwapChain *iface, if (iBackBuffer > This->presentParms.BackBufferCount - 1) { TRACE("Back buffer count out of range\n"); - /* Native d3d9 doesn't set NULL here, just as wine's d3d9. But set it here - * in wined3d to avoid problems in other libs - */ + /* Native d3d9 doesn't set NULL here, just as wine's d3d9. But set it + * here in wined3d to avoid problems in other libs + */ *ppBackBuffer = NULL; return WINED3DERR_INVALIDCALL; } - /* Return invalid if there is no backbufferarray, otherwise it will crash when ddraw is - * used (there This->backBuffer is allways NULL). We need this because this function have + /* Return invalid if there is no backbuffer array, otherwise it will crash when ddraw is + * used (there This->backBuffer is always NULL). We need this because this function has * to be called from IWineD3DStateBlockImpl_InitStartupStateBlock to get the default * scissorrect dimensions. */ if( !This->backBuffer ) {

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle put/get borderWidth.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: abd7056bd051bd9bf4ecc89041884b2454fc4238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd7056bd051bd9bf4ecc8904… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 10 21:00:53 2008 +1100 mshtml: Implement IHTMLStyle put/get borderWidth. --- dlls/mshtml/htmlstyle.c | 11 +++++++---- dlls/mshtml/htmlstyle.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 48ae2fe..8d6564d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -44,6 +44,8 @@ static const WCHAR attrBorder[] = {'b','o','r','d','e','r',0}; static const WCHAR attrBorderLeft[] = {'b','o','r','d','e','r','-','l','e','f','t',0}; +static const WCHAR attrBorderWidth[] = + {'b','o','r','d','e','r','-','w','i','d','t','h',0}; static const WCHAR attrColor[] = {'c','o','l','o','r',0}; static const WCHAR attrCursor[] = @@ -98,6 +100,7 @@ static const struct{ {attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE}, {attrBorder, DISPID_IHTMLSTYLE_BORDER}, {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, + {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, {attrDisplay, DISPID_IHTMLSTYLE_DISPLAY}, @@ -1240,15 +1243,15 @@ static HRESULT WINAPI HTMLStyle_get_borderLeftColor(IHTMLStyle *iface, VARIANT * static HRESULT WINAPI HTMLStyle_put_borderWidth(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_attr(This, STYLEID_BORDER_WIDTH, v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_borderWidth(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_attr(This, STYLEID_BORDER_WIDTH, p); } static HRESULT WINAPI HTMLStyle_put_borderTopWidth(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 5c1dfe3..a6cc5e8 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -36,6 +36,7 @@ typedef enum { STYLEID_BACKGROUND_IMAGE, STYLEID_BORDER, STYLEID_BORDER_LEFT, + STYLEID_BORDER_WIDTH, STYLEID_COLOR, STYLEID_CURSOR, STYLEID_DISPLAY,

1 0

Jacek Caban : mshtml: Moved events declaration to separated file.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: 2b0013128f065e466d1e373afdb3fac75ae36ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0013128f065e466d1e373af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:36:01 2008 -0500 mshtml: Moved events declaration to separated file. --- dlls/mshtml/htmlelem.c | 1 + dlls/mshtml/htmlevent.c | 15 ++++++++++++--- dlls/mshtml/htmlevent.h | 31 +++++++++++++++++++++++++++++++ dlls/mshtml/htmlnode.c | 1 + dlls/mshtml/htmlselect.c | 1 + dlls/mshtml/mshtml_private.h | 16 +--------------- dlls/mshtml/nsembed.c | 1 + dlls/mshtml/nsevents.c | 1 + 8 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1216838..60fd574 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -32,6 +32,7 @@ #include "wine/unicode.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3c56e87..d72b936 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -26,6 +26,7 @@ #include "ole2.h" #include "mshtml_private.h" +#include "htmlevent.h" #include "wine/debug.h" @@ -435,9 +436,17 @@ static HRESULT set_node_event_disp(HTMLDOMNode *node, eventid_t eid, IDispatch * IDispatch_AddRef(disp); node->event_target->event_table[eid] = disp; - if((event_info[eid].flags & EVENT_DEFAULTLISTENER) && !node->doc->nscontainer->event_vector[eid]) { - node->doc->nscontainer->event_vector[eid] = TRUE; - add_nsevent_listener(node->doc->nscontainer, event_info[eid].name); + if(event_info[eid].flags & EVENT_DEFAULTLISTENER) { + if(!node->doc->nscontainer->event_vector) { + node->doc->nscontainer->event_vector = heap_alloc_zero(EVENTID_LAST*sizeof(BOOL)); + if(!node->doc->nscontainer->event_vector) + return E_OUTOFMEMORY; + } + + if(!node->doc->nscontainer->event_vector[eid]) { + node->doc->nscontainer->event_vector[eid] = TRUE; + add_nsevent_listener(node->doc->nscontainer, event_info[eid].name); + } } return S_OK; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h new file mode 100644 index 0000000..adc7692 --- /dev/null +++ b/dlls/mshtml/htmlevent.h @@ -0,0 +1,31 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +typedef enum { + EVENTID_CHANGE, + EVENTID_CLICK, + EVENTID_KEYUP, + EVENTID_LOAD, + EVENTID_LAST +} eventid_t; + +eventid_t str_to_eid(LPCWSTR); +void check_event_attr(HTMLDocument*,nsIDOMElement*); +void release_event_target(event_target_t*); +void fire_event(HTMLDocument*,eventid_t,nsIDOMNode*); +HRESULT set_node_event(HTMLDOMNode*,eventid_t,VARIANT*); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index e923795..a3eaaaf 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -28,6 +28,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index ca24954..3a414cf 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -28,6 +28,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cfbe8f2..a58cfef 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -116,14 +116,6 @@ typedef enum { LAST_tid } tid_t; -typedef enum { - EVENTID_CHANGE, - EVENTID_CLICK, - EVENTID_KEYUP, - EVENTID_LOAD, - EVENTID_LAST -} eventid_t; - typedef struct dispex_data_t dispex_data_t; typedef struct dispex_dynamic_data_t dispex_dynamic_data_t; @@ -340,7 +332,7 @@ struct NSContainer { nsChannelBSC *bscallback; /* hack */ HWND reset_focus; /* hack */ - BOOL event_vector[EVENTID_LAST]; + BOOL *event_vector; }; typedef struct { @@ -537,12 +529,6 @@ void add_nsevent_listener(NSContainer*,LPCWSTR); nsresult get_nsinterface(nsISupports*,REFIID,void**); void update_nsdocument(HTMLDocument*); -void check_event_attr(HTMLDocument*,nsIDOMElement*); -void release_event_target(event_target_t*); -void fire_event(HTMLDocument*,eventid_t,nsIDOMNode*); -HRESULT set_node_event(HTMLDOMNode*,eventid_t,VARIANT*); -eventid_t str_to_eid(LPCWSTR); - void set_document_bscallback(HTMLDocument*,nsChannelBSC*); void set_current_mon(HTMLDocument*,IMoniker*); HRESULT start_binding(HTMLDocument*,BSCallback*,IBindCtx*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 94707c2..45386be 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -984,6 +984,7 @@ static nsrefcnt NSAPI nsWebBrowserChrome_Release(nsIWebBrowserChrome *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + heap_free(This->event_vector); if(This->parent) nsIWebBrowserChrome_Release(NSWBCHROME(This->parent)); heap_free(This); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index b6cc0f8..dc54322 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -31,6 +31,7 @@ #include "wine/unicode.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml);

1 0