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

Jason Green : wined3d: Replaced USING_GLSL define with a new wined3d_settings option based on the registry .
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: d204540d1fffcb7041fda083e511f31932356024 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d204540d1fffcb7041fda08… Author: Jason Green <jave27(a)gmail.com> Date: Tue May 23 18:22:59 2006 -0400 wined3d: Replaced USING_GLSL define with a new wined3d_settings option based on the registry. --- dlls/wined3d/baseshader.c | 7 ++++--- dlls/wined3d/directx.c | 26 ++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 15 ++++++++------- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 360c507..4e30421 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -583,7 +583,7 @@ void generate_base_shader( */ /* Pre-declare registers */ - if (USING_GLSL) { + if (wined3d_settings.shader_mode == SHADER_GLSL) { generate_glsl_declarations(iface, &reg_maps, buffer); shader_addline(buffer, "void main() {\n"); } else { @@ -612,7 +612,8 @@ void generate_base_shader( /* Read opcode */ opcode_token = *pToken++; curOpcode = shader_get_opcode(iface, opcode_token); - hw_fct = USING_GLSL ? curOpcode->hw_glsl_fct : curOpcode->hw_fct; + hw_fct = (wined3d_settings.shader_mode == + SHADER_GLSL ? curOpcode->hw_glsl_fct : curOpcode->hw_fct); /* Unknown opcode and its parameters */ if (NULL == curOpcode) { @@ -692,7 +693,7 @@ void print_glsl_info_log( { infoLog = (char *)HeapAlloc(GetProcessHeap(), 0, infologLength); GL_EXTCALL(glGetInfoLogARB(obj, infologLength, NULL, infoLog)); - FIXME("Error received from GLSL shader #%i: %s", obj, debugstr_a(infoLog)); + FIXME("Error received from GLSL shader #%u: %s", obj, debugstr_a(infoLog)); HeapFree(GetProcessHeap(), 0, infoLog); } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7290d95..62af4a6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1693,11 +1693,13 @@ #endif *pCaps->MaxStreams = MAX_STREAMS; *pCaps->MaxStreamStride = 1024; - if (wined3d_settings.vs_mode == VS_HW && GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && - wined3d_settings.glslRequested && DeviceType != WINED3DDEVTYPE_REF) { + if (wined3d_settings.vs_mode == VS_HW && wined3d_settings.shader_mode == SHADER_GLSL + && DeviceType != WINED3DDEVTYPE_REF) { *pCaps->VertexShaderVersion = D3DVS_VERSION(3,0); TRACE_(d3d_caps)("Hardware vertex shader versions 2.0+ enabled\n"); - } else if (wined3d_settings.vs_mode == VS_HW && GL_SUPPORT(ARB_VERTEX_PROGRAM) && DeviceType != WINED3DDEVTYPE_REF) { + } else if (wined3d_settings.vs_mode == VS_HW + && wined3d_settings.shader_mode == SHADER_ARB + && DeviceType != WINED3DDEVTYPE_REF) { *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled\n"); } else if (wined3d_settings.vs_mode == VS_SW || DeviceType == WINED3DDEVTYPE_REF) { @@ -1715,13 +1717,15 @@ #endif *pCaps->MaxVertexShaderConst = WINED3D_VSHADER_MAX_CONSTANTS; } - if (wined3d_settings.ps_mode == PS_HW && GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && - wined3d_settings.glslRequested && DeviceType != WINED3DDEVTYPE_REF) { + if (wined3d_settings.ps_mode == PS_HW && wined3d_settings.shader_mode == SHADER_GLSL + && DeviceType != WINED3DDEVTYPE_REF) { *pCaps->PixelShaderVersion = D3DPS_VERSION(3,0); /* FIXME: The following line is card dependant. -1.0 to 1.0 is a safe default clamp range for now */ *pCaps->PixelShader1xMaxValue = 1.0; TRACE_(d3d_caps)("Hardware pixel shader versions 2.0+ enabled\n"); - } else if (wined3d_settings.ps_mode == PS_HW && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && DeviceType != WINED3DDEVTYPE_REF) { + } else if (wined3d_settings.ps_mode == PS_HW + && wined3d_settings.shader_mode == SHADER_ARB + && DeviceType != WINED3DDEVTYPE_REF) { *pCaps->PixelShaderVersion = D3DPS_VERSION(1,4); *pCaps->PixelShader1xMaxValue = 1.0; TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled\n"); @@ -1839,6 +1843,16 @@ HRESULT WINAPI IWineD3DImpl_CreateDevi IWineD3DImpl_FillGLCaps(&This->gl_info, IWineD3DImpl_GetAdapterDisplay(iface, Adapter)); LEAVE_GL(); + /* Determine shader mode to use based on GL caps */ + if (GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && wined3d_settings.glslRequested + && (wined3d_settings.vs_mode == VS_HW || wined3d_settings.ps_mode == PS_HW)) + wined3d_settings.shader_mode = SHADER_GLSL; + else if ((GL_SUPPORT(ARB_VERTEX_PROGRAM) && wined3d_settings.vs_mode == VS_HW) || + (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && wined3d_settings.ps_mode == PS_HW)) + wined3d_settings.shader_mode = SHADER_ARB; + else + wined3d_settings.shader_mode = SHADER_SW; + /* set the state of the device to valid */ object->state = WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 61892b2..7f8df4c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -132,12 +132,20 @@ #define VBO_HW 1 #define NP2_NONE 0 #define NP2_REPACK 1 +#define SHADER_SW 0 +#define SHADER_ARB 1 +#define SHADER_GLSL 2 + typedef struct wined3d_settings_s { /* vertex and pixel shader modes */ int vs_mode; int ps_mode; int vbo_mode; +/* Ideally, we don't want the user to have to request GLSL. If the hardware supports GLSL, + we should use it. However, until it's fully implemented, we'll leave it as a registry + setting for developers. */ BOOL glslRequested; + int shader_mode; /* nonpower 2 function */ int nonpower2_mode; } wined3d_settings_t; @@ -1273,13 +1281,6 @@ struct SHADER_OPCODE_ARG; typedef void (*shader_fct_t)(); typedef void (*SHADER_HANDLER) (struct SHADER_OPCODE_ARG*); - -/* This must be 0 in the main branch until GLSL is at least mostly implemented. - Also, think about making it a winecfg option to use GLSL (if the card supports it) - or ARB_vertex_program. Ideally, we want to use GLSL if it's available, but until - everything is implemented, we'll probably have better luck with the ARB generation */ -#define USING_GLSL 0 - #define SHADER_PGMSIZE 65535 typedef struct SHADER_BUFFER { char* buffer;

1 0

Jason Green : wined3d: Add function to print the infolog of a GLSL shader on errors.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: a67488a26ea3ad4001cf947f12b3779a92ee2631 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a67488a26ea3ad4001cf947… Author: Jason Green <jave27(a)gmail.com> Date: Tue May 23 18:22:13 2006 -0400 wined3d: Add function to print the infolog of a GLSL shader on errors. With assistance from H. Verbeet. --- dlls/wined3d/baseshader.c | 21 +++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 4cc89ea..360c507 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -29,6 +29,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define GLNAME_REQUIRE_GLSL ((const char *)1) +#define GLINFO_LOCATION (*gl_info) typedef struct shader_reg_maps { DWORD texcoord; @@ -675,6 +676,26 @@ void generate_base_shader( } } +/** Prints the GLSL info log which will contain error messages if they exist */ +void print_glsl_info_log( + WineD3D_GL_Info *gl_info, + GLhandleARB obj) +{ + int infologLength = 0; + char *infoLog; + + GL_EXTCALL(glGetObjectParameterivARB(obj, + GL_OBJECT_INFO_LOG_LENGTH_ARB, + &infologLength)); + + if (infologLength > 0) + { + infoLog = (char *)HeapAlloc(GetProcessHeap(), 0, infologLength); + GL_EXTCALL(glGetInfoLogARB(obj, infologLength, NULL, infoLog)); + FIXME("Error received from GLSL shader #%i: %s", obj, debugstr_a(infoLog)); + HeapFree(GetProcessHeap(), 0, infoLog); + } +} void shader_dump_ins_modifiers(const DWORD output) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d73fb4f..61892b2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1388,6 +1388,10 @@ extern int shader_skip_unrecognized( IWineD3DBaseShader* iface, const DWORD* pToken); +extern void print_glsl_info_log( + WineD3D_GL_Info *gl_info, + GLhandleARB obj); + inline static int shader_get_regtype(const DWORD param) { return (((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT) | ((param & D3DSP_REGTYPE_MASK2) >> D3DSP_REGTYPE_SHIFT2));

1 0

Jason Green : wined3d: Added some GLSL defines and function prototypes.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: 8cfb84362f840e1bf7bcb06ea3e499cc8690dbe9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8cfb84362f840e1bf7bcb06… Author: Jason Green <jave27(a)gmail.com> Date: Tue May 23 18:21:24 2006 -0400 wined3d: Added some GLSL defines and function prototypes. --- include/wine/wined3d_gl.h | 116 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8cfb84362f840e1bf7b…

1 0

Jonathan Ernst : Uniformization of French main menu accelerators.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: ce7e2e16ab533f75282456b5107f108c6cbce9a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce7e2e16ab533f75282456b… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Tue May 23 12:39:05 2006 +0200 Uniformization of French main menu accelerators. --- dlls/comctl32/comctl_Fr.rc | 4 ++-- dlls/comdlg32/cdlg_Fr.rc | 16 ++++++++-------- dlls/msacm32/msacm_Fr.rc | 2 +- programs/cmdlgtst/Fr.rc | 2 +- programs/notepad/Fr.rc | 6 +++--- programs/progman/Fr.rc | 16 ++++++++-------- programs/regedit/Fr.rc | 6 +++--- programs/taskmgr/Fr.rc | 2 +- programs/winefile/Fr.rc | 4 ++-- programs/winhelp/Fr.rc | 4 ++-- programs/wordpad/Fr.rc | 28 ++++++++++++++-------------- 11 files changed, 45 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ce7e2e16ab533f75282…

1 0

Andrew Talbot : comdlg32: Write-strings warning fix.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: 0d4afab70454bb17a87d7259bdfac36a00ca7be2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0d4afab70454bb17a87d725… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 23 20:05:53 2006 +0100 comdlg32: Write-strings warning fix. --- dlls/comdlg32/printdlg.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index f42054a..be6e7e5 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -325,8 +325,9 @@ static BOOL PRINTDLG_UpdatePrintDlgA(HWN lppd->Flags &= ~PD_PAGENUMS; if (IsDlgButtonChecked(hDlg, chx1) == BST_CHECKED) {/* Print to file */ + static char file[] = "FILE:"; lppd->Flags |= PD_PRINTTOFILE; - pi->pPortName = "FILE:"; + pi->pPortName = file; } if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED) { /* Collate */

1 0

Hans Leidekker : uninstaller: Add Dutch resources.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: b643ffbc234501606442622db5fcdaea482ab8ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b643ffbc234501606442622… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue May 23 22:26:01 2006 +0200 uninstaller: Add Dutch resources. --- programs/uninstaller/Nl.rc | 44 ++++++++++++++++++++++++++++++++++++++++++ programs/uninstaller/rsrc.rc | 1 + 2 files changed, 45 insertions(+), 0 deletions(-) create mode 100644 programs/uninstaller/Nl.rc diff --git a/programs/uninstaller/Nl.rc b/programs/uninstaller/Nl.rc new file mode 100644 index 0000000..ca3679f --- /dev/null +++ b/programs/uninstaller/Nl.rc @@ -0,0 +1,44 @@ +/* + * Uninstaller (Dutch Resources) + * + * Copyright 2006 Hans Leidekker + * + * 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 + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Programma verwijderen" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Kies het programma dat u wenst te verwijderen:",IDC_PLEASESELECT,10,10,250,14 + EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL + LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | + LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Verwijderen",IDC_UNINSTALL,270,48,50,14 + PUSHBUTTON "&Info",IDC_ABOUT,270,65,50,14 + PUSHBUTTON "&Afsluiten",IDC_EXIT,270,81,50,14 +END + + +STRINGTABLE DISCARDABLE { + IDS_APPNAME, "Programma verwijderen" + IDS_ABOUT, "Programma verwijderen (C) 2005 by Andreas Mohr, Hannu Valtonen and Jonathan Ernst." + IDS_ABOUTTITLE, "Info" + IDS_REGISTRYKEYNOTAVAILABLE, "Verwijdersleutel in de registry is (nog) niet beschikbaar, niets te doen!" + IDS_UNINSTALLFAILED, "Het uitvoeren van de verwijderopdracht '%s' is mislukt, wellicht vanwege een ontbrekend bestand.\r\nWilt u de verwijdersleutel verwijderen uit de registry?" +} diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc index 235e013..5b19d5b 100644 --- a/programs/uninstaller/rsrc.rc +++ b/programs/uninstaller/rsrc.rc @@ -34,6 +34,7 @@ #include "Fi.rc" #include "Fr.rc" #include "It.rc" #include "Ko.rc" +#include "Nl.rc" #include "No.rc" #include "Pt.rc" #include "Tr.rc"

1 0

Marcus Meissner : x11drv: GdiAlphaBlend fix for X errors if width or height is 0.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: ff8306882085eab17daf61b7e89d406cd99e6afb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff8306882085eab17daf61b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed May 24 08:35:12 2006 +0200 x11drv: GdiAlphaBlend fix for X errors if width or height is 0. --- dlls/x11drv/xrender.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/x11drv/xrender.c b/dlls/x11drv/xrender.c index 44dbe62..de12029 100644 --- a/dlls/x11drv/xrender.c +++ b/dlls/x11drv/xrender.c @@ -1526,6 +1526,7 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *d ySrc = pts[0].y; widthSrc = pts[1].x - pts[0].x; heightSrc = pts[1].y - pts[0].y; + if (!widthDst || !heightDst || !widthSrc || !heightSrc) return TRUE; #ifndef HAVE_XRENDERSETPICTURETRANSFORM if(widthDst != widthSrc || heightDst != heightSrc)

1 0

Stefan Dösinger : wined3d: Remove a double cap flag.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: 29a8dd47a80e6cfa943770b060379796e86ea172 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29a8dd47a80e6cfa943770b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 23 23:46:42 2006 +0200 wined3d: Remove a double cap flag. --- dlls/wined3d/directx.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9ae8408..7290d95 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1501,7 +1501,6 @@ HRESULT WINAPI IWineD3DImpl_GetDeviceCap WINED3DPRASTERCAPS_FOGVERTEX | WINED3DPRASTERCAPS_FOGTABLE | WINED3DPRASTERCAPS_FOGRANGE | - WINED3DPRASTERCAPS_FOGRANGE | WINED3DPRASTERCAPS_STIPPLE | WINED3DPRASTERCAPS_SUBPIXEL | WINED3DPRASTERCAPS_ZTEST;

1 0

Juan Lang : crypt32: Test and fix a couple CertAddCertificateContextToStore corner cases.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: e1afe33ac7a1d4fef7728d67cd971dc41a6c2093 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e1afe33ac7a1d4fef7728d6… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue May 23 21:56:00 2006 -0700 crypt32: Test and fix a couple CertAddCertificateContextToStore corner cases. --- dlls/crypt32/store.c | 13 +++++++++++-- dlls/crypt32/tests/store.c | 22 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index c150229..160cfdd 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -2044,6 +2044,12 @@ BOOL WINAPI CertAddCertificateContextToS TRACE("(%p, %p, %08lx, %p)\n", hCertStore, pCertContext, dwAddDisposition, ppStoreContext); + /* Weird case to pass a test */ + if (dwAddDisposition == 0) + { + SetLastError(STATUS_ACCESS_VIOLATION); + return FALSE; + } if (dwAddDisposition != CERT_STORE_ADD_ALWAYS) { BYTE hashToAdd[20]; @@ -2095,8 +2101,11 @@ BOOL WINAPI CertAddCertificateContextToS if (toAdd) { - ret = store->certs.addContext(store, (void *)toAdd, (void *)existing, - (const void **)ppStoreContext); + if (store) + ret = store->certs.addContext(store, (void *)toAdd, + (void *)existing, (const void **)ppStoreContext); + else if (ppStoreContext) + *ppStoreContext = CertDuplicateCertificateContext(toAdd); CertFreeCertificateContext(toAdd); } CertFreeCertificateContext(existing); diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index a3624f1..3d487ac 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -152,6 +152,28 @@ static void testAddCert(void) PCCERT_CONTEXT context; BOOL ret; + /* Weird--bad add disposition leads to an access violation in Windows. + */ + ret = CertAddEncodedCertificateToStore(0, X509_ASN_ENCODING, bigCert, + sizeof(bigCert), 0, NULL); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + bigCert, sizeof(bigCert), 0, NULL); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + + /* Weird--can add a cert to the NULL store (does this have special + * meaning?) + */ + context = NULL; + ret = CertAddEncodedCertificateToStore(0, X509_ASN_ENCODING, bigCert, + sizeof(bigCert), CERT_STORE_ADD_ALWAYS, &context); + ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", + GetLastError()); + if (context) + CertFreeCertificateContext(context); + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, NULL); ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n",

1 0

Jacek Caban : mshtml: Added stub implementation of IPersistStreamInit.
by Alexandre Julliard 24 May '06

24 May '06

Module: wine Branch: refs/heads/master Commit: 78b7286eba563466438ff37975f17d8733ed47e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78b7286eba563466438ff37… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 23 22:16:26 2006 +0200 mshtml: Added stub implementation of IPersistStreamInit. --- dlls/mshtml/htmldoc.c | 3 ++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/persist.c | 79 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f14eb25..d028d83 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -110,6 +110,9 @@ static HRESULT WINAPI HTMLDocument_Query }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppvObject); *ppvObject = CONPTCONT(This); + }else if(IsEqualGUID(&IID_IPersistStreamInit, riid)) { + TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppvObject); + *ppvObject = PERSTRINIT(This); } if(*ppvObject) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index aaf2f4f..3d7ed03 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -64,6 +64,7 @@ typedef struct { const IOleControlVtbl *lpOleControlVtbl; const IHlinkTargetVtbl *lpHlinkTargetVtbl; const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; + const IPersistStreamInitVtbl *lpPersistStreamInitVtbl; LONG ref; @@ -177,6 +178,7 @@ #define CONTROL(x) ((IOleControl*) #define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) #define HLNKTARGET(x) ((IHlinkTarget*) &(x)->lpHlinkTargetVtbl) #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) +#define PERSTRINIT(x) ((IPersistStreamInit*) &(x)->lpPersistStreamInitVtbl) #define NSWBCHROME(x) ((nsIWebBrowserChrome*) &(x)->lpWebBrowserChromeVtbl) #define NSCML(x) ((nsIContextMenuListener*) &(x)->lpContextMenuListenerVtbl) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 0c0b71f..be12106 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -643,11 +643,90 @@ static const IPersistFileVtbl PersistFil PersistFile_GetCurFile }; +#define PERSTRINIT_THIS(iface) DEFINE_THIS(HTMLDocument, PersistStreamInit, iface); + +static HRESULT WINAPI PersistStreamInit_QueryInterface(IPersistStreamInit *iface, + REFIID riid, void **ppv) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppv); +} + +static ULONG WINAPI PersistStreamInit_AddRef(IPersistStreamInit *iface) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI PersistStreamInit_Release(IPersistStreamInit *iface) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static HRESULT WINAPI PersistStreamInit_GetClassID(IPersistStreamInit *iface, CLSID *pClassID) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + return IPersist_GetClassID(PERSIST(This), pClassID); +} + +static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM pStm) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + FIXME("(%p)->(%p)\n", This, pStm); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM pStm, + BOOL fClearDirty) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + FIXME("(%p)->(%p %x)\n", This, pStm, fClearDirty); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_GetSizeMax(IPersistStreamInit *iface, + ULARGE_INTEGER *pcbSize) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + FIXME("(%p)->(%p)\n", This, pcbSize); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +#undef PERSTRINIT_THIS + +static const IPersistStreamInitVtbl PersistStreamInitVtbl = { + PersistStreamInit_QueryInterface, + PersistStreamInit_AddRef, + PersistStreamInit_Release, + PersistStreamInit_GetClassID, + PersistStreamInit_IsDirty, + PersistStreamInit_Load, + PersistStreamInit_Save, + PersistStreamInit_GetSizeMax, + PersistStreamInit_InitNew +}; + void HTMLDocument_Persist_Init(HTMLDocument *This) { This->lpPersistMonikerVtbl = &PersistMonikerVtbl; This->lpPersistFileVtbl = &PersistFileVtbl; This->lpMonikerPropVtbl = &MonikerPropVtbl; + This->lpPersistStreamInitVtbl = &PersistStreamInitVtbl; This->status_callback = NULL; }

1 0