August 2006 - Wine-commits - list.winehq.org

Francois Gouget : msxml3: DOMFreeThreadedDocument's thread model is Both, not Free.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: b28f6e52e1c9756246e6851f3ea2f4df0f2c8c1a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b28f6e52e1c9756246e6851… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 9 19:21:26 2006 +0200 msxml3: DOMFreeThreadedDocument's thread model is Both, not Free. --- dlls/msxml3/regsvr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index 570a3e8..efdbd7d 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -533,7 +533,7 @@ static struct regsvr_coclass const cocla "Free threaded XML DOM Document", NULL, "msxml3.dll", - "Free", + "Both", "Microsoft.FreeThreadedXMLDOM", "1.0" },

1 0

Francois Gouget : mlang: Give the CLSIDs their proper names.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: a050bebd808cb31c5d70aa88008aa748196438ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a050bebd808cb31c5d70aa8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 9 19:02:01 2006 +0200 mlang: Give the CLSIDs their proper names. Move CLSID_CMultiLanguage and CLSID_CMLangConvertCharset to mlang.idl. Leave CLSID_CMLangString in regsvr.c as MSDN claims it is not supported anymore. --- dlls/mlang/regsvr.c | 14 +++++++------- include/mlang.idl | 9 +++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/mlang/regsvr.c b/dlls/mlang/regsvr.c index ea83b1d..35a80a9 100644 --- a/dlls/mlang/regsvr.c +++ b/dlls/mlang/regsvr.c @@ -30,15 +30,15 @@ #include "winreg.h" #include "winerror.h" #include "objbase.h" -#include "initguid.h" +#include "mlang.h" #include "wine/debug.h" +#include "initguid.h" WINE_DEFAULT_DEBUG_CHANNEL(mlang); -DEFINE_GUID( CLSID_MLANGSupport, 0x275c23e2,0x3747,0x11d0,0x9f,0xea,0x00,0xaa,0x00,0x3f,0x86,0x46 ); -DEFINE_GUID( CLSID_MLANGString, 0xc04d65cf, 0xb70d, 0x11d0, 0xb1,0x88, 0x00,0xaa,0x00,0x38,0xc9,0x69); -DEFINE_GUID( CLSID_MLANGCharSet, 0xd66d6f99,0xcdaa,0x11d0,0xb8,0x22,0x00,0xC0,0x4f,0xc9,0xb3,0x1f ); +/* This one should probably be defined in mlang.idl but MSDN claims it is no longer supported */ +DEFINE_GUID(CLSID_CMLangString, 0xc04d65cf, 0xb70d, 0x11d0, 0xb1,0x88, 0x00,0xaa,0x00,0x38,0xc9,0x69); /* * Near the bottom of this file are the exported DllRegisterServer and @@ -509,21 +509,21 @@ static LONG recursive_delete_keyW(HKEY b */ static struct regsvr_coclass const coclass_list[] = { { - &CLSID_MLANGSupport, + &CLSID_CMultiLanguage, "Multi Language Support", NULL, "mlang.dll", "Both" }, { - &CLSID_MLANGString, + &CLSID_CMLangString, "Multi Language String", NULL, "mlang.dll", "Both" }, { - &CLSID_MLANGCharSet, + &CLSID_CMLangConvertCharset, "Multi Language ConvertCharset", NULL, "mlang.dll", diff --git a/include/mlang.idl b/include/mlang.idl index 11bfa2e..0aaea87 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -235,6 +235,7 @@ interface IEnumCodePage : IUnknown [ object, + uuid(d66d6f98-cdaa-11d0-b822-00c04fc9b31f), pointer_default(unique) ] interface IMLangConvertCharset : IUnknown @@ -273,6 +274,14 @@ interface IMLangConvertCharset : IUnknow } [ + uuid(d66d6f99-cdaa-11d0-b822-00c04fc9b31f) +] +coclass CMLangConvertCharset +{ + [default] interface IMLangConvertCharset; +}; + +[ object, uuid(3dc39d1d-c030-11d0-b81b-00c04fc9b31f), pointer_default(unique)

1 0

Francois Gouget : msi: Change the CLSID_IMsiServer ProgId to IMsiServer to match Windows.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: b7a2699b62b0ebea60a425286ef07a0e321271ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7a2699b62b0ebea60a4252… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 9 19:11:48 2006 +0200 msi: Change the CLSID_IMsiServer ProgId to IMsiServer to match Windows. --- dlls/msi/regsvr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/regsvr.c b/dlls/msi/regsvr.c index 242e795..65c00a2 100644 --- a/dlls/msi/regsvr.c +++ b/dlls/msi/regsvr.c @@ -526,7 +526,7 @@ static struct regsvr_coclass const cocla NULL, "msi.dll", "Apartment", - "WindowsInstaller.Installer", + "IMsiServer", NULL }, {

1 0

Francois Gouget : shdocvw: Register CLSID_CUrlHistory and CLSID_Internet.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 0387821a77c8faed9e4924c1753bff4733dbe027 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0387821a77c8faed9e4924c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 9 18:50:38 2006 +0200 shdocvw: Register CLSID_CUrlHistory and CLSID_Internet. --- dlls/shdocvw/regsvr.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/regsvr.c b/dlls/shdocvw/regsvr.c index 786262b..307fc51 100644 --- a/dlls/shdocvw/regsvr.c +++ b/dlls/shdocvw/regsvr.c @@ -602,6 +602,24 @@ static struct regsvr_coclass const cocla NULL, NULL }, + { + &CLSID_CUrlHistory, + "Microsoft Url History Service", + NULL, + "shdocvw.dll", + "Apartment", + NULL, + NULL + }, + { + &CLSID_Internet, + "Internet Explorer", + NULL, + "shdocvw.dll", + "Apartment", + NULL, + NULL + }, { NULL } /* list terminator */ };

1 0

Francois Gouget : shell32: Register CLSID_NetworkPlaces, CLSID_ShellFSFolder and CLSID_ShellFolderViewOC.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: ebd9c84ea0779889b053728d7fc3f525e4c9f528 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ebd9c84ea0779889b053728… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 9 18:57:44 2006 +0200 shell32: Register CLSID_NetworkPlaces, CLSID_ShellFSFolder and CLSID_ShellFolderViewOC. --- dlls/shell32/regsvr.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index 9586342..1ce7096 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -29,6 +29,7 @@ #include "winreg.h" #include "winerror.h" #include "ole2.h" +#include "shldisp.h" #include "shlguid.h" #include "shell32_main.h" #include "shresdef.h" @@ -625,6 +626,13 @@ static struct regsvr_coclass const cocla "shell32.dll", "Apartment" }, + { &CLSID_NetworkPlaces, + "My Network Places", + 0, + NULL, + "shell32.dll", + "Apartment" + }, { &CLSID_Shortcut, "Shortcut", 0, @@ -691,6 +699,20 @@ static struct regsvr_coclass const cocla NULL, IDI_SHELL_FULL_RECYCLE_BIN }, + { &CLSID_ShellFSFolder, + "Shell File System Folder", + 0, + NULL, + "shell32.dll", + "Apartment" + }, + { &CLSID_ShellFolderViewOC, + "Microsoft Shell Folder View Router", + 0, + NULL, + "shell32.dll", + "Apartment" + }, { NULL } /* list terminator */ };

1 0

Paul Vriens : winerror.h: Add some error codes.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: aa45d8aeb3de54d6e2f129e32f2bf0971abc1bdc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aa45d8aeb3de54d6e2f129e… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Aug 9 18:47:10 2006 +0200 winerror.h: Add some error codes. --- include/winerror.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index 21925a1..eaad982 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2256,7 +2256,14 @@ #define CRYPT_E_ASN1_NYI #define CRYPT_E_ASN1_EXTENDED _HRESULT_TYPEDEF_(0x80093201L) #define CRYPT_E_ASN1_NOEOD _HRESULT_TYPEDEF_(0x80093202L) +#define TRUST_E_SYSTEM_ERROR _HRESULT_TYPEDEF_(0x80096001L) +#define TRUST_E_NO_SIGNER_CERT _HRESULT_TYPEDEF_(0x80096002L) +#define TRUST_E_COUNTER_SIGNER _HRESULT_TYPEDEF_(0x80096003L) #define TRUST_E_CERT_SIGNATURE _HRESULT_TYPEDEF_(0x80096004L) +#define TRUST_E_TIME_STAMP _HRESULT_TYPEDEF_(0x80096005L) +#define TRUST_E_BAD_DIGEST _HRESULT_TYPEDEF_(0x80096010L) +#define TRUST_E_BASIC_CONSTRAINTS _HRESULT_TYPEDEF_(0x80096019L) +#define TRUST_E_FINANCIAL_CRITERIA _HRESULT_TYPEDEF_(0x8009601EL) #define TRUST_E_PROVIDER_UNKNOWN _HRESULT_TYPEDEF_(0x800B0001L) #define TRUST_E_ACTION_UNKNOWN _HRESULT_TYPEDEF_(0x800B0002L) #define TRUST_E_SUBJECT_FORM_UNKNOWN _HRESULT_TYPEDEF_(0x800B0003L)

1 0

Michael Kaufmann : user: Fix the keyboard navigation and some graphical glitches for multi-column menus .
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 21750e2717ec8ae4cff1b0efcc52f5431f5f369c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=21750e2717ec8ae4cff1b0e… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Wed Aug 9 19:30:17 2006 +0200 user: Fix the keyboard navigation and some graphical glitches for multi-column menus. --- dlls/user/menu.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index 3e2b745..eb8632a 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -524,7 +524,7 @@ static UINT MENU_GetStartOfNextColumn( return i; for( ; i < menu->nItems; ++i ) { - if (menu->items[i].fType & MF_MENUBARBREAK) + if (menu->items[i].fType & (MF_MENUBREAK | MF_MENUBARBREAK)) return i; } @@ -554,14 +554,14 @@ static UINT MENU_GetStartOfPrevColumn( /* Find the start of the column */ for(i = menu->FocusedItem; i != 0 && - !(menu->items[i].fType & MF_MENUBARBREAK); + !(menu->items[i].fType & (MF_MENUBREAK | MF_MENUBARBREAK)); --i); /* empty */ if(i == 0) return NO_SELECTED_ITEM; for(--i; i != 0; --i) { - if (menu->items[i].fType & MF_MENUBARBREAK) + if (menu->items[i].fType & (MF_MENUBREAK | MF_MENUBARBREAK)) break; } @@ -1131,7 +1131,7 @@ static void MENU_PopupMenuCalcSize( LPPO { lpitem = &lppop->items[start]; orgX = maxX; - if( lpitem->fType & MF_MENUBREAK) + if( lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK)) orgX += MENU_COL_SPACE; orgY = MENU_TOP_MARGIN; @@ -1143,8 +1143,6 @@ static void MENU_PopupMenuCalcSize( LPPO (lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK))) break; MENU_CalcItemSize( hdc, lpitem, hwndOwner, orgX, orgY, FALSE, lppop ); - - if (lpitem->fType & MF_MENUBARBREAK) orgX++; maxX = max( maxX, lpitem->rect.right ); orgY = lpitem->rect.bottom; if (IS_STRING_ITEM(lpitem->fType) && lpitem->xTab) @@ -1457,6 +1455,7 @@ static void MENU_DrawMenuItem( HWND hwnd HPEN oldPen; RECT rc = rect; + rc.left -= MENU_COL_SPACE / 2 + 1; rc.top = 3; rc.bottom = height - 3; if (flat_menu)

1 0

Frank Richter : shell32: Tweak and update German translation.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 7216363e862f0aa724335f7ceef35bd7ab678c84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7216363e862f0aa724335f7… Author: Frank Richter <frank.richter(a)gmail.com> Date: Wed Aug 9 18:24:23 2006 +0200 shell32: Tweak and update German translation. --- dlls/shell32/shell32_De.rc | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index 436e365..b1017fc 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -92,7 +92,7 @@ END SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK -CAPTION "Nach Verzeichnis durchsuchen" +CAPTION "Verzeichnis ausw�hlen" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP @@ -124,8 +124,8 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Den Namen eines Programmes, eines Ordners, eines Dokumentes oder einer Internet Ressource eingeben, und Wine wird es f�r Sie �ffnen", 12289, 36, 11, 182, 18 - LTEXT "&�ffnen:", 12305, 7, 39, 24, 10 + LTEXT "Geben sie den Namen eines Programmes, eines Ordners, eines Dokumentes oder einer Internet-Ressource ein, dei ge�ffnet werden soll", 12289, 36, 11, 182, 18 + LTEXT "�&ffnen:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP @@ -146,10 +146,13 @@ STRINGTABLE DISCARDABLE IDS_SHV_COLUMN9 "Kommentar" IDS_SHV_COLUMN10 "Besitzer" IDS_SHV_COLUMN11 "Gruppe" + IDS_SHV_COLUMN_DELFROM "Ursprung" + IDS_SHV_COLUMN_DELDATE "Gel�scht am" /* special folders */ IDS_DESKTOP "Desktop" IDS_MYCOMPUTER "Arbeitsplatz" + IDS_RECYCLEBIN_FOLDER_NAME "M�ll" /* context menus */ IDS_VIEW_LARGE "&Gro�e Symbole" @@ -161,10 +164,15 @@ STRINGTABLE DISCARDABLE IDS_CREATEFOLDER_DENIED "Es konnte kein neues Verzeichnis erstellt werden: Zugriff verweigert." IDS_CREATEFOLDER_CAPTION "Es trat ein Fehler beim Erstellen eines neuen Verzeichnisses auf" - IDS_DELETEITEM_CAPTION "Best�tigung: Datei l�schen" + IDS_DELETEITEM_CAPTION "Best�tigung: Objekt l�schen" IDS_DELETEFOLDER_CAPTION "Best�tigung: Verzeichnis l�schen" - IDS_DELETEITEM_TEXT "Sind Sie sich sicher, dass Sie die Datei '%1' l�schen m�chten ?" - IDS_DELETEMULTIPLE_TEXT "Sind Sie sich sicher, dass Sie diese %1 Dateien l�schen m�chten ?" + IDS_DELETEITEM_TEXT "Sind Sie sich sicher, dass Sie '%1' l�schen m�chten?" + IDS_DELETEMULTIPLE_TEXT "Sind Sie sich sicher, dass Sie diese %1 Objekte l�schen m�chten?" + IDS_DELETESELECTED_TEXT "Sind Sie sich sicher, dass Sie die ausgew�hlten Objekte l�schen m�chten?" + IDS_TRASHITEM_TEXT "Sind Sie sich sicher, dass Sie '%1' in M�ll verschieben m�chten?" + IDS_TRASHFOLDER_TEXT "Sind Sie sich sicher, dass Sie '%1' und seinen Inhalt in den M�ll verschieben m�chten?" + IDS_TRASHMULTIPLE_TEXT "Sind Sie sich sicher, dass Sie diese %1 Dateien in den M�ll verschieben m�chten?" + IDS_CANTTRASH_TEXT "Das Objekt '%1' kann nicht in den M�ll verschoben werden. M�chten Sie es stattdessen l�schen?" IDS_OVERWRITEFILE_TEXT "M�chten Sie, dass die Datei '%1' �berschrieben wird ?" IDS_OVERWRITEFILE_CAPTION "Best�tigung: Datei �berschreiben"

1 0

Roderick Colenbrander : wined3d: Fix GLSL regression / draw buffers support .
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: c2b6cc9dc4dbe30c058cc59c521c6e5989e6a8e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c2b6cc9dc4dbe30c058cc59… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 9 18:24:08 2006 +0200 wined3d: Fix GLSL regression / draw buffers support. --- dlls/wined3d/directx.c | 25 +++++++++++++------------ dlls/wined3d/pixelshader.c | 9 +++++++-- include/wine/wined3d_gl.h | 26 ++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7720723..26751b3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -512,6 +512,7 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *i * with Default values */ memset(&gl_info->supported, 0, sizeof(gl_info->supported)); + gl_info->max_buffers = 1; gl_info->max_textures = 1; gl_info->max_texture_stages = 1; gl_info->max_samplers = 1; @@ -573,7 +574,12 @@ #undef USE_GL_FUNC /** * ARB */ - if (strcmp(ThisExtn, "GL_ARB_fragment_program") == 0) { + if (strcmp(ThisExtn, "GL_ARB_draw_buffers") == 0) { + glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &gl_max); + TRACE_(d3d_caps)(" FOUND: ARB_draw_buffers support - max buffers=%u\n", gl_max); + gl_info->supported[ARB_DRAW_BUFFERS] = TRUE; + gl_info->max_buffers = gl_max; + } else if (strcmp(ThisExtn, "GL_ARB_fragment_program") == 0) { gl_info->ps_arb_version = PS_VERSION_11; TRACE_(d3d_caps)(" FOUND: ARB Pixel Shader support - version=%02x\n", gl_info->ps_arb_version); gl_info->supported[ARB_FRAGMENT_PROGRAM] = TRUE; @@ -2106,7 +2112,6 @@ #endif The following fields apply to d3d9 only ------------------------------------------------ */ if (This->dxVersion > 8) { - GLint max_buffers = 1; FIXME("Caps support for directx9 is nonexistent at the moment!\n"); *pCaps->DevCaps2 = 0; /* TODO: D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES and VS3.0 needs atleast D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET */ @@ -2130,17 +2135,13 @@ #endif } else *pCaps->DeclTypes = 0; -#if 0 /*FIXME: Simultaneous render targets*/ - GL_MAX_DRAW_BUFFERS_ATI 0x00008824 - if (GL_SUPPORT(GL_MAX_DRAW_BUFFERS_ATI)) { - ENTER_GL(); - glEnable(GL_MAX_DRAW_BUFFERS_ATI); - glGetIntegerv(GL_MAX_DRAW_BUFFERS_ATI, &max_buffers); - glDisable(GL_MAX_DRAW_BUFFERS_ATI); - LEAVE_GL(); - } +#if 0 /* We don't properly support multiple render targets yet, so disable this for now */ + if (GL_SUPPORT(ARB_DRAWBUFFERS)) { + *pCaps->NumSimultaneousRTs = GL_LIMITS(buffers); + } else #endif - *pCaps->NumSimultaneousRTs = max_buffers; + *pCaps->NumSimultaneousRTs = 1; + *pCaps->StretchRectFilterCaps = 0; *pCaps->VertexTextureFilterCaps = 0; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 9a8227f..f5d6462 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -849,8 +849,13 @@ #endif shader_generate_main( (IWineD3DBaseShader*) This, &buffer, reg_maps, pFunction); /* Pixel shaders < 2.0 place the resulting color in R0 implicitly */ - if (This->baseShader.hex_version < D3DPS_VERSION(2,0)) - shader_addline(&buffer, "gl_FragData[0] = R0;\n"); + if (This->baseShader.hex_version < D3DPS_VERSION(2,0)) { + /* Some older cards like GeforceFX ones don't support multiple buffers, so also not gl_FragData */ + if(GL_SUPPORT(ARB_DRAW_BUFFERS)) + shader_addline(&buffer, "gl_FragData[0] = R0;\n"); + else + shader_addline(&buffer, "gl_FragColor = R0;\n"); + } shader_addline(&buffer, "}\n\0"); TRACE("Compiling shader object %u\n", shader_obj); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 71e3b01..6cbdea2 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -51,6 +51,28 @@ #define APIENTRY * #defines and functions pointer ****************************************************/ +/* GL_ARB_draw_buffers */ +#ifndef GL_ARB_draw_buffers +#define GL_MAX_DRAW_BUFFERS_ARB 0x8824 +#define GL_DRAW_BUFFER0_ARB 0x8825 +#define GL_DRAW_BUFFER1_ARB 0x8826 +#define GL_DRAW_BUFFER2_ARB 0x8827 +#define GL_DRAW_BUFFER3_ARB 0x8828 +#define GL_DRAW_BUFFER4_ARB 0x8829 +#define GL_DRAW_BUFFER5_ARB 0x882A +#define GL_DRAW_BUFFER6_ARB 0x882B +#define GL_DRAW_BUFFER7_ARB 0x882C +#define GL_DRAW_BUFFER8_ARB 0x882D +#define GL_DRAW_BUFFER9_ARB 0x882E +#define GL_DRAW_BUFFER10_ARB 0x882F +#define GL_DRAW_BUFFER11_ARB 0x8830 +#define GL_DRAW_BUFFER12_ARB 0x8831 +#define GL_DRAW_BUFFER13_ARB 0x8832 +#define GL_DRAW_BUFFER14_ARB 0x8833 +#define GL_DRAW_BUFFER15_ARB 0x8834 +#endif +typedef void (APIENTRY *PGLFNDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs); + /* GL_ARB_imaging */ #ifndef GL_ARB_imaging #define GL_CONSTANT_COLOR 0x8001 @@ -1358,6 +1380,7 @@ #define MAKEDWORD_VERSION(maj, min) ((m /* OpenGL Supported Extensions (ARB and EXT) */ typedef enum _GL_SupportedExt { /* ARB */ + ARB_DRAW_BUFFERS, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, ARB_IMAGING, @@ -1423,6 +1446,8 @@ typedef enum _GL_SupportedExt { ****************************************************/ #define GL_EXT_FUNCS_GEN \ /** ARB Extensions **/ \ + /* GL_ARB_draw_buffers */ \ + USE_GL_FUNC(PGLFNDRAWBUFFERSARBPROC, glDrawBuffersARB); \ /* GL_ARB_imaging */ \ USE_GL_FUNC(PGLFNBLENDCOLORPROC, glBlendColor); \ USE_GL_FUNC(PGLFNBLENDEQUATIONPROC, glBlendEquation); \ @@ -1697,6 +1722,7 @@ typedef struct _WineD3D_GL_Info { /** * CAPS Constants */ + UINT max_buffers; UINT max_lights; UINT max_textures; UINT max_texture_stages;

1 0

Stefan Dösinger : wined3d: Watch out for negative results when validating the shader constant range.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: bfbcfd22342c2469b54d64514471f5dfa0bdb02e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bfbcfd22342c2469b54d645… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 9 18:02:28 2006 +0200 wined3d: Watch out for negative results when validating the shader constant range. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e508699..9ac8cf9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4833,7 +4833,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl TRACE("(iface %p, dstData %p, start %d, count %d)\n", iface, dstData, start, count); - if (dstData == NULL || cnt < 0) + if (dstData == NULL || ((signed int) MAX_CONST_I - (signed int) start) <= (signed int) 0) return WINED3DERR_INVALIDCALL; memcpy(dstData, &This->stateBlock->vertexShaderConstantI[start * 4], cnt * sizeof(int) * 4); @@ -4852,7 +4852,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl TRACE("(iface %p, srcData %p, start %d, count %d)\n", iface, srcData, start, count); - if (srcData == NULL || cnt < 0) + if (srcData == NULL || ((signed int) GL_LIMITS(vshader_constantsF) - (signed int) start) <= (signed int) 0) return WINED3DERR_INVALIDCALL; memcpy(&This->updateStateBlock->vertexShaderConstantF[start * 4], srcData, cnt * sizeof(float) * 4);

1 0