winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2006
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
651 discussions
Start a n
N
ew thread
Andrew Talbot : quartz: Cast-qual warnings fix.
by Alexandre Julliard
25 Sep '06
25 Sep '06
Module: wine Branch: master Commit: 04423c4f59e9e4a49ff2ef58191d80f1824f36d3 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=04423c4f59e9e4a49ff2ef5…
Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Sep 22 18:50:12 2006 +0100 quartz: Cast-qual warnings fix. --- dlls/quartz/acmwrapper.c | 3 ++- dlls/quartz/avidec.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index a6dda6b..f514f25 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -169,8 +169,9 @@ static HRESULT ACMWrapper_ConnectInput(T TRACE("(%p)->(%p)\n", This, pmt); + /* Check root (GUID w/o FOURCC) */ if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio)) && - (!memcmp(((char*)&pmt->subtype)+4, ((char*)&MEDIATYPE_Audio)+4, sizeof(GUID)-4)) && /* Check root (GUID w/o FOURCC) */ + (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Audio)+4, sizeof(GUID)-4)) && (IsEqualIID(&pmt->formattype, &FORMAT_WaveFormatEx))) { HACMSTREAM drv; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 01cb35d..8e7a6a0 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -157,9 +157,10 @@ static HRESULT AVIDec_ConnectInput(Trans TRACE("(%p)->(%p)\n", This, pmt); AVIDec_Cleanup(pTransformFilter); - + + /* Check root (GUID w/o FOURCC) */ if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) && - (!memcmp(((char*)&pmt->subtype)+4, ((char*)&MEDIATYPE_Video)+4, sizeof(GUID)-4)) && /* Check root (GUID w/o FOURCC) */ + (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Video)+4, sizeof(GUID)-4)) && (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo))) { VIDEOINFOHEADER* format = (VIDEOINFOHEADER*)pmt->pbFormat;
1
0
0
0
Andrew Talbot : oleaut32: Cast-qual warnings fix.
by Alexandre Julliard
25 Sep '06
25 Sep '06
Module: wine Branch: master Commit: 0e9c97eba3709c2ff4493f4ab015c141812e8932 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=0e9c97eba3709c2ff4493f4…
Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 21 21:25:39 2006 +0100 oleaut32: Cast-qual warnings fix. --- dlls/oleaut32/olefont.c | 4 ++-- dlls/oleaut32/typelib.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index ac0bc8f..6f27d21 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -332,10 +332,10 @@ HRESULT WINAPI OleCreateFontIndirect( if (!lpFontDesc) { FONTDESC fd; - static const WCHAR fname[] = { 'S','y','s','t','e','m',0 }; + static WCHAR fname[] = { 'S','y','s','t','e','m',0 }; fd.cbSizeofstruct = sizeof(fd); - fd.lpstrName = (WCHAR*)fname; + fd.lpstrName = fname; fd.cySize.s.Lo = 80000; fd.cySize.s.Hi = 0; fd.sWeight = 0; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 07da88f..ccca8c3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -611,14 +611,14 @@ #undef XX if (RegCreateKeyExW(key, ProxyStubClsidW, 0, NULL, 0, KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) { RegSetValueExW(subKey, NULL, 0, REG_SZ, - (BYTE*)PSOA, sizeof PSOA); + (const BYTE *)PSOA, sizeof PSOA); RegCloseKey(subKey); } if (RegCreateKeyExW(key, ProxyStubClsid32W, 0, NULL, 0, KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) { RegSetValueExW(subKey, NULL, 0, REG_SZ, - (BYTE*)PSOA, sizeof PSOA); + (const BYTE *)PSOA, sizeof PSOA); RegCloseKey(subKey); }
1
0
0
0
Andrey Turkin : msiexec: Should recognize /xpackage syntax.
by Alexandre Julliard
25 Sep '06
25 Sep '06
Module: wine Branch: master Commit: d456e9f49fdfca008cfa3655ff076a0f8eb4e6ba URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=d456e9f49fdfca008cfa365…
Author: Andrey Turkin <pancha(a)mail.nnov.ru> Date: Fri Sep 22 06:16:52 2006 +0400 msiexec: Should recognize /xpackage syntax. --- programs/msiexec/msiexec.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 364d54a..ccb48b2 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -546,14 +546,18 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(msi_option_equal(argvW[i], "x")) + else if(msi_option_prefix(argvW[i], "x")) { FunctionInstall = TRUE; - i++; - if(i >= argc) - ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); - PackageName = argvW[i]; + PackageName = argvW[i]+2; + if (!PackageName[0]) + { + i++; + if (i >= argc) + ShowUsage(1); + PackageName = argvW[i]; + } + WINE_TRACE("PackageName = %s\n", wine_dbgstr_w(PackageName)); StringListAppend(&property_list, RemoveAll); } else if(msi_option_prefix(argvW[i], "j"))
1
0
0
0
Aric Stewart : user: Correct buffer overflows in IME processing code.
by Alexandre Julliard
25 Sep '06
25 Sep '06
Module: wine Branch: master Commit: 5537fbbcfffcf00c590017dd645049b97ca657fc URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=5537fbbcfffcf00c590017d…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 21 09:43:00 2006 -0500 user: Correct buffer overflows in IME processing code. --- dlls/user/edit.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user/edit.c b/dlls/user/edit.c index c4f95e4..116340f 100644 --- a/dlls/user/edit.c +++ b/dlls/user/edit.c @@ -5341,7 +5341,7 @@ static void EDIT_GetCompositionStr(HWND return; } - lpCompStr = HeapAlloc(GetProcessHeap(),0,dwBufLen); + lpCompStr = HeapAlloc(GetProcessHeap(),0,dwBufLen + sizeof(WCHAR)); if (!lpCompStr) { ERR("Unable to allocate IME CompositionString\n"); @@ -5362,7 +5362,7 @@ static void EDIT_GetCompositionStr(HWND if (dwBufLenAttr) { dwBufLenAttr ++; - lpCompStrAttr = HeapAlloc(GetProcessHeap(),0,dwBufLenAttr); + lpCompStrAttr = HeapAlloc(GetProcessHeap(),0,dwBufLenAttr+1); if (!lpCompStrAttr) { ERR("Unable to allocate IME Attribute String\n"); @@ -5417,7 +5417,7 @@ static void EDIT_GetResultStr(HWND hwnd, return; } - lpResultStr = HeapAlloc(GetProcessHeap(),0, dwBufLen); + lpResultStr = HeapAlloc(GetProcessHeap(),0, dwBufLen+sizeof(WCHAR)); if (!lpResultStr) { ERR("Unable to alloc buffer for IME string\n");
1
0
0
0
Marcus Meissner : msi: Support more dialog groups.
by Alexandre Julliard
25 Sep '06
25 Sep '06
Module: wine Branch: master Commit: 966c5b6c0b42812a7fbc0e8a5d5a9589f77d966d URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=966c5b6c0b42812a7fbc0e8…
Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 24 11:54:13 2006 +0200 msi: Support more dialog groups. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 8ebeb09..958d63a 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1078,7 +1078,7 @@ static UINT msi_dialog_edit_control( msi /******************** Masked Edit ********************************************/ -#define MASK_MAX_GROUPS 10 +#define MASK_MAX_GROUPS 20 struct msi_mask_group {
1
0
0
0
Nicolas Delcros : wrc: Fixed typo for the --pedantic argument.
by Alexandre Julliard
25 Sep '06
25 Sep '06
Module: wine Branch: master Commit: a6fe56a8cf5f90e06a0099f1dc2bf2289f21f307 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=a6fe56a8cf5f90e06a0099f…
Author: Nicolas Delcros <nicolas(a)dyalog.com> Date: Mon Sep 25 14:03:43 2006 +0100 wrc: Fixed typo for the --pedantic argument. --- tools/wrc/wrc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 8509feb..e91661c 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -189,7 +189,7 @@ static struct option long_options[] = { { "nostdinc", 0, 0, 1 }, { "output", 1, 0, 'o' }, { "output-format", 1, 0, 'O' }, - { "pendantic", 0, 0, 8 }, + { "pedantic", 0, 0, 8 }, { "preprocessor", 1, 0, 4 }, { "target", 1, 0, 'F' }, { "undefine", 1, 0, 'U' },
1
0
0
0
Paul Vriens : wincrypt.h: A few more defines.
by Alexandre Julliard
25 Sep '06
25 Sep '06
Module: wine Branch: master Commit: a3d8d14e529f34d09422249cc1f360e1eda548e1 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=a3d8d14e529f34d09422249…
Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Sep 25 15:01:02 2006 +0200 wincrypt.h: A few more defines. --- include/wincrypt.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 4e0a11c..bfe9ac2 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -627,6 +627,11 @@ typedef struct _CMSG_SIGNER_INFO { CRYPT_ATTRIBUTES UnauthAttrs; } CMSG_SIGNER_INFO, *PCMSG_SIGNER_INFO; +#define CMSG_VERIFY_SIGNER_PUBKEY 1 +#define CMSG_VERIFY_SIGNER_CERT 2 +#define CMSG_VERIFY_SIGNER_CHAIN 3 +#define CMSG_VERIFY_SIGNER_NULL 4 + typedef struct _CERT_REVOCATION_CRL_INFO { DWORD cbSize; PCCRL_CONTEXT pBaseCrlContext;
1
0
0
0
Roderick Colenbrander : wined3d: glBlend* fixes.
by Alexandre Julliard
25 Sep '06
25 Sep '06
Module: wine Branch: master Commit: 7c86d91bb929bef4c5a6a4a4df458adf6149b9bd URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=7c86d91bb929bef4c5a6a4a…
Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Sep 22 07:58:38 2006 +0200 wined3d: glBlend* fixes. --- dlls/wined3d/device.c | 26 +++++++++++--------------- dlls/wined3d/directx.c | 3 +++ include/wine/wined3d_gl.h | 1 + 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e32b824..c4b9767 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3700,7 +3700,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl FIXME("Unrecognized/Unhandled D3DBLENDOP value %ld\n", Value); } - if(GL_SUPPORT(ARB_IMAGING)) { + if(GL_SUPPORT(EXT_BLEND_MINMAX)) { TRACE("glBlendEquation(%x)\n", glParm); GL_EXTCALL(glBlendEquation(glParm)); checkGLcall("glBlendEquation"); @@ -4509,23 +4509,19 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_BLENDFACTOR : { float col[4]; - if (GL_SUPPORT(ARB_IMAGING)) { - TRACE("Setting BlendFactor to %ld", Value); + TRACE("Setting BlendFactor to %ld\n", Value); - D3DCOLORTOGLFLOAT4(Value, col); - if (0xFFFFFFFF != Value) { - glEnable(GL_BLEND); - checkGLcall("glEnable(GL_BLEND)"); - } - else { - glDisable(GL_BLEND); - checkGLcall("glDisable(GL_BLEND)"); - } - glBlendColor (col[0],col[1],col[2],col[3]); - } else { - WARN("Unsupported in local OpenGL implementation: glBlendColor\n"); + D3DCOLORTOGLFLOAT4(Value, col); + if (0xFFFFFFFF != Value) { + glEnable(GL_BLEND); + checkGLcall("glEnable(GL_BLEND)"); + } + else { + glDisable(GL_BLEND); + checkGLcall("glDisable(GL_BLEND)"); } + glBlendColor (col[0],col[1],col[2],col[3]); break; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 19e3172..793e3c8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -640,6 +640,9 @@ #undef USE_GL_FUNC } else if (strcmp(ThisExtn, "GL_EXT_framebuffer_object") == 0) { TRACE_(d3d_caps)(" FOUND: EXT Frame Buffer Object support\n"); gl_info->supported[EXT_FRAMEBUFFER_OBJECT] = TRUE; + } else if (strcmp(ThisExtn, "GL_EXT_blend_minmax") == 0) { + TRACE_(d3d_caps)(" FOUND: EXT Blend minmax support\n"); + gl_info->supported[EXT_BLEND_MINMAX] = TRUE; } else if (strcmp(ThisExtn, "GL_EXT_paletted_texture") == 0) { /* handle paletted texture extensions */ TRACE_(d3d_caps)(" FOUND: EXT Paletted texture support\n"); gl_info->supported[EXT_PALETTED_TEXTURE] = TRUE; diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 1a589a5..1832287 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1429,6 +1429,7 @@ typedef enum _GL_SupportedExt { ARB_VERTEX_BUFFER_OBJECT, ARB_VERTEX_SHADER, /* EXT */ + EXT_BLEND_MINMAX, EXT_FOG_COORD, EXT_FRAMEBUFFER_OBJECT, EXT_PALETTED_TEXTURE,
1
0
0
0
Jacek Caban : mshtml: Better IDM_PARSECOMPLETE test.
by Alexandre Julliard
25 Sep '06
25 Sep '06
Module: wine Branch: master Commit: 51a6a111203029b1d264632a4b10ec0da873945f URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=51a6a111203029b1d264632…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 21 18:07:48 2006 +0200 mshtml: Better IDM_PARSECOMPLETE test. --- dlls/mshtml/tests/htmldoc.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 227ca42..f557590 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -92,7 +92,7 @@ DEFINE_EXPECT(Exec_ShellDocView_37); DEFINE_EXPECT(Exec_UPDATECOMMANDS); DEFINE_EXPECT(Exec_SETTITLE); DEFINE_EXPECT(Exec_HTTPEQUIV); -DEFINE_EXPECT(Exec_MSHTML_2315); +DEFINE_EXPECT(Exec_MSHTML_PARSECOMPLETE); DEFINE_EXPECT(Invoke_AMBIENT_USERMODE); DEFINE_EXPECT(Invoke_AMBIENT_DLCONTROL); DEFINE_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -1101,9 +1101,10 @@ static HRESULT WINAPI OleCommandTarget_E ok(nCmdexecopt == 0, "nCmdexecopts=%08lx\n", nCmdexecopt); switch(nCmdID) { - case 2315: - CHECK_EXPECT(Exec_MSHTML_2315); - /* TODO */ + case IDM_PARSECOMPLETE: + CHECK_EXPECT(Exec_MSHTML_PARSECOMPLETE); + ok(pvaIn == NULL, "pvaIn != NULL\n"); + ok(pvaOut == NULL, "pvaOut != NULL\n"); return S_OK; default: ok(0, "unexpected command %ld\n", nCmdID); @@ -1454,7 +1455,7 @@ static void test_download(void) SET_EXPECT(Exec_HTTPEQUIV); SET_EXPECT(Exec_SETPROGRESSMAX); SET_EXPECT(Exec_SETPROGRESSPOS); - SET_EXPECT(Exec_MSHTML_2315); + SET_EXPECT(Exec_MSHTML_PARSECOMPLETE); SET_EXPECT(Exec_HTTPEQUIV_DONE); expect_status_text = (LPCOLESTR)0xdeadbeef; /* TODO */ @@ -1472,7 +1473,7 @@ static void test_download(void) CHECK_CALLED(Exec_HTTPEQUIV); CHECK_CALLED(Exec_SETPROGRESSMAX); CHECK_CALLED(Exec_SETPROGRESSPOS); - CHECK_CALLED(Exec_MSHTML_2315); + CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); CHECK_CALLED(Exec_HTTPEQUIV_DONE); load_state = LD_LOADED;
1
0
0
0
Jacek Caban : shdocvw: Added [get|put]_Silent implementation.
by Alexandre Julliard
25 Sep '06
25 Sep '06
Module: wine Branch: master Commit: f86827317b3cb854be580d86c81d1deca378ff27 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=f86827317b3cb854be580d8…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 21 18:07:04 2006 +0200 shdocvw: Added [get|put]_Silent implementation. As we don't have any dialog in WebBrowser implemented yet, all we have to do is to store silent value. --- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/tests/webbrowser.c | 44 +++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/webbrowser.c | 15 ++++++++++--- 3 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index ee4bf8e..a022eb2 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -128,6 +128,7 @@ struct WebBrowser { VARIANT_BOOL address_bar; VARIANT_BOOL status_bar; VARIANT_BOOL tool_bar; + VARIANT_BOOL silent; DocHost doc_host; }; diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 2897857..161f608 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -809,6 +809,49 @@ static void test_ie_funcs(IUnknown *unk) IWebBrowser2_Release(wb); } +static void test_Silent(IUnknown *unk) +{ + IWebBrowser2 *wb; + VARIANT_BOOL b; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); + ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08lx\n", hres); + if(FAILED(hres)) + return; + + b = 100; + hres = IWebBrowser2_get_Silent(wb, &b); + ok(hres == S_OK, "get_Silent failed: %08lx\n", hres); + ok(b == VARIANT_FALSE, "b=%x\n", b); + + hres = IWebBrowser2_put_Silent(wb, VARIANT_TRUE); + ok(hres == S_OK, "set_Silent failed: %08lx\n", hres); + + b = 100; + hres = IWebBrowser2_get_Silent(wb, &b); + ok(hres == S_OK, "get_Silent failed: %08lx\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + hres = IWebBrowser2_put_Silent(wb, 100); + ok(hres == S_OK, "set_Silent failed: %08lx\n", hres); + + b = 100; + hres = IWebBrowser2_get_Silent(wb, &b); + ok(hres == S_OK, "get_Silent failed: %08lx\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + hres = IWebBrowser2_put_Silent(wb, VARIANT_FALSE); + ok(hres == S_OK, "set_Silent failed: %08lx\n", hres); + + b = 100; + hres = IWebBrowser2_get_Silent(wb, &b); + ok(hres == S_OK, "get_Silent failed: %08lx\n", hres); + ok(b == VARIANT_FALSE, "b=%x\n", b); + + IWebBrowser_Release(wb); +} + static void test_GetControlInfo(IUnknown *unk) { IOleControl *control; @@ -911,6 +954,7 @@ static void test_WebBrowser(void) test_ClientSite(unk, NULL); test_ie_funcs(unk); test_GetControlInfo(unk); + test_Silent(unk); ref = IUnknown_Release(unk); ok(ref == 0, "ref=%ld, expected 0\n", ref); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 6d46132..9e56733 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -749,15 +749,21 @@ static HRESULT WINAPI WebBrowser_put_Off static HRESULT WINAPI WebBrowser_get_Silent(IWebBrowser2 *iface, VARIANT_BOOL *pbSilent) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pbSilent); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pbSilent); + + *pbSilent = This->silent; + return S_OK; } static HRESULT WINAPI WebBrowser_put_Silent(IWebBrowser2 *iface, VARIANT_BOOL bSilent) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%x)\n", This, bSilent); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, bSilent); + + This->silent = bSilent ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI WebBrowser_get_RegisterAsBrowser(IWebBrowser2 *iface, @@ -947,6 +953,7 @@ static HRESULT WebBrowser_Create(INT ver ret->address_bar = VARIANT_TRUE; ret->status_bar = VARIANT_TRUE; ret->tool_bar = VARIANT_TRUE; + ret->silent = VARIANT_FALSE; WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret);
1
0
0
0
← Newer
1
...
16
17
18
19
20
21
22
...
66
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
Results per page:
10
25
50
100
200