January 2010 - Wine-Commits

Henri Verbeet : wined3d: Just use the GL 1.1 texture format constants.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: 08c2a23599fc13e8a2c9e9f6e15110129bd82d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c2a23599fc13e8a2c9e9f6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 20:19:38 2010 +0100 wined3d: Just use the GL 1.1 texture format constants. We assume GL 1.1 is available everywhere else. --- dlls/wined3d/utils.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7b3341e..4038833 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -387,7 +387,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R16G16_UNORM, GL_RGB16_EXT, GL_RGB16_EXT, GL_RGBA16_EXT, + {WINED3DFMT_R16G16_UNORM, GL_RGB16, GL_RGB16, GL_RGBA16, GL_RGB, GL_UNSIGNED_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, @@ -395,7 +395,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { GL_BGRA, GL_UNSIGNED_INT_2_10_10_10_REV, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R16G16B16A16_UNORM, GL_RGBA16_EXT, GL_RGBA16_EXT, 0, + {WINED3DFMT_R16G16B16A16_UNORM, GL_RGBA16, GL_RGBA16, 0, GL_RGBA, GL_UNSIGNED_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE}, @@ -445,7 +445,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { GL_RGBA, GL_BYTE, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, NV_TEXTURE_SHADER}, - {WINED3DFMT_R16G16_SNORM, GL_RGB16_EXT, GL_RGB16_EXT, 0, + {WINED3DFMT_R16G16_SNORM, GL_RGB16, GL_RGB16, 0, GL_BGR, GL_UNSIGNED_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, @@ -506,7 +506,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH, ARB_DEPTH_TEXTURE}, - {WINED3DFMT_L16_UNORM, GL_LUMINANCE16_EXT, GL_LUMINANCE16_EXT, 0, + {WINED3DFMT_L16_UNORM, GL_LUMINANCE16, GL_LUMINANCE16, 0, GL_LUMINANCE, GL_UNSIGNED_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE},

1 0

Henri Verbeet : wined3d: Trace the GLSL version string.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: b2e511f3918a83211eb577fa3c15bff931522d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e511f3918a83211eb577fa3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 20:19:39 2010 +0100 wined3d: Trace the GLSL version string. At some point we'll use the GLSL version to check if certain features are available. For now just print the version. --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6183c4c..c2694eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -72,6 +72,7 @@ static const struct { {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX, 0 }, {"GL_ARB_shader_objects", ARB_SHADER_OBJECTS, 0 }, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD, 0 }, + {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100, 0 }, {"GL_ARB_sync", ARB_SYNC, 0 }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP, 0 }, {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION, 0 }, @@ -2007,6 +2008,11 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str gl_info->limits.glsl_varyings = gl_max; TRACE_(d3d_caps)("Max GLSL varyings: %u (%u 4 component varyings).\n", gl_max, gl_max / 4); } + if (gl_info->supported[ARB_SHADING_LANGUAGE_100]) + { + const char *str = (const char *)glGetString(GL_SHADING_LANGUAGE_VERSION_ARB); + TRACE_(d3d_caps)("GLSL version string: %s.\n", debugstr_a(str)); + } if (gl_info->supported[NV_LIGHT_MAX_EXPONENT]) { glGetFloatv(GL_MAX_SHININESS_NV, &gl_info->limits.shininess); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 306de2a..f0367ce 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1752,6 +1752,7 @@ typedef enum wined3d_gl_extension ARB_PROVOKING_VERTEX, ARB_SHADER_OBJECTS, ARB_SHADER_TEXTURE_LOD, + ARB_SHADING_LANGUAGE_100, ARB_SYNC, ARB_TEXTURE_BORDER_CLAMP, ARB_TEXTURE_COMPRESSION,

1 0

Marcus Meissner : winhttp: On NULL request, skip the other tests (Coverity) .
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: a01d39215345711c217f2cd02504212c3468c1c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01d39215345711c217f2cd02… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 27 20:59:03 2010 +0100 winhttp: On NULL request, skip the other tests (Coverity). --- dlls/winhttp/tests/winhttp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 4a4e7f4..f0b46b6 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -283,6 +283,7 @@ static void test_SendRequest (void) goto done; } ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); + if (!request) goto done; context = 0xdeadbeef; ret = WinHttpSetOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(context));

1 0

Jacek Caban : mshtml.idl: Added DispHTMLScriptElement declaration.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: 19240cb87d8c6b0d54e91109d69daf696d87323d URL: http://source.winehq.org/git/wine.git/?a=commit;h=19240cb87d8c6b0d54e91109d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 28 02:09:34 2010 +0100 mshtml.idl: Added DispHTMLScriptElement declaration. --- include/mshtmdid.h | 3 ++ include/mshtml.idl | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 6798b58..e3683e9 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2492,6 +2492,9 @@ /* IHTMLScriptElement2 */ #define DISPID_IHTMLSCRIPTELEMENT2_CHARSET DISPID_SCRIPT+10 +/* IHTMLScriptElement3 */ +#define DISPID_IHTMLSCRIPTELEMENT3_IE8_SRC DISPID_IE8_SCRIPT + /* IHTMLFrameBase */ #define DISPID_IHTMLFRAMEBASE_SRC DISPID_FRAMESITE+0 #define DISPID_IHTMLFRAMEBASE_NAME STDPROPID_XOBJ_NAME diff --git a/include/mshtml.idl b/include/mshtml.idl index a851b8f..a931688 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -14627,6 +14627,74 @@ interface IHTMLScriptElement2 : IDispatch } /***************************************************************************** + * DispHTMLScriptElement dispinterface + */ +[ + hidden, + uuid(3050f530-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLScriptElement +{ +properties: +methods: + WINE_HTMLELEMENT_DISPINTERFACE_DECL; + + [propput, id(DISPID_IHTMLSCRIPTELEMENT_SRC), displaybind, bindable] + void src(BSTR v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_SRC), displaybind, bindable] + BSTR src(); + + [propput, id(DISPID_IHTMLSCRIPTELEMENT_HTMLFOR), displaybind, bindable] + void htmlFor(BSTR v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_HTMLFOR), displaybind, bindable] + BSTR htmlFor(); + + [propput, id(DISPID_IHTMLSCRIPTELEMENT_EVENT), displaybind, bindable] + void event(BSTR v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_EVENT), displaybind, bindable] + BSTR event(); + + [propput, id(DISPID_IHTMLSCRIPTELEMENT_TEXT), displaybind, bindable] + void text(BSTR v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_TEXT), displaybind, bindable] + BSTR text(); + + [propput, id(DISPID_IHTMLSCRIPTELEMENT_DEFER), displaybind, bindable] + void defer(VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_DEFER), displaybind, bindable] + VARIANT_BOOL defer(); + + [propput, id(DISPID_IHTMLSCRIPTELEMENT_ONERROR), displaybind, bindable] + void onerror(VARIANT v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_ONERROR), displaybind, bindable] + VARIANT onerror(); + + [propput, id(DISPID_IHTMLSCRIPTELEMENT_TYPE), displaybind, bindable] + void type(BSTR v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT_TYPE), displaybind, bindable] + BSTR type(); + + [propput, id(DISPID_IHTMLSCRIPTELEMENT2_CHARSET), displaybind, bindable] + void charset(BSTR v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT2_CHARSET), displaybind, bindable] + BSTR charset(); + + [propput, id(DISPID_IHTMLSCRIPTELEMENT3_IE8_SRC)] + void ie8_src(BSTR v); + + [propget, id(DISPID_IHTMLSCRIPTELEMENT3_IE8_SRC)] + BSTR ie8_src(); +} + +/***************************************************************************** * IHTMLFrameBase interface */ [

1 0

André Hentschel : oleaut32/tests: Add tests for backrolled time.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: 0e1bc3ef2b28eb5ac7e5d9f361a9c02c9a5dbe75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e1bc3ef2b28eb5ac7e5d9f36… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 27 20:04:26 2010 +0100 oleaut32/tests: Add tests for backrolled time. --- dlls/oleaut32/tests/vartest.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 16c08be..8d7cf11 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1653,6 +1653,9 @@ static void test_VarDateFromUdate(void) todo_wine UD2T(0,1,1980,42,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled hours */ todo_wine UD2T(1,1,1980,17,61,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled minutes */ todo_wine UD2T(1,1,1980,18,0,76,0,2,1,0,S_OK,29221.75087962963); /* Test rolled seconds */ + todo_wine UD2T(2,1,1980,-6,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled hours */ + todo_wine UD2T(1,1,1980,19,-59,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled minutes */ + todo_wine UD2T(1,1,1980,18,2,-44,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled seconds */ UD2T(0,1,1980,0,0,0,0,2,1,0,S_OK,29220.0); /* Rolls back to 31 Dec 1899 */ UD2T(1,13,1980,0,0,0,0,2,1,0,S_OK,29587.0); /* Rolls fwd to 1/1/1981 */

1 0

Jacek Caban : mshtml: Moved common element tids to macro.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: b00bd14e77ee11852686d3578f6065d54cc6c841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b00bd14e77ee11852686d3578… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 28 02:09:02 2010 +0100 mshtml: Moved common element tids to macro. --- dlls/mshtml/htmlanchor.c | 7 +------ dlls/mshtml/htmlbody.c | 7 +------ dlls/mshtml/htmlcomment.c | 6 +----- dlls/mshtml/htmlelem.c | 6 +----- dlls/mshtml/htmlform.c | 6 +----- dlls/mshtml/htmlframe.c | 6 +----- dlls/mshtml/htmlgeneric.c | 6 +----- dlls/mshtml/htmliframe.c | 6 +----- dlls/mshtml/htmlimg.c | 6 +----- dlls/mshtml/htmlinput.c | 6 +----- dlls/mshtml/htmloption.c | 6 +----- dlls/mshtml/htmlselect.c | 6 +----- dlls/mshtml/htmltable.c | 6 +----- dlls/mshtml/htmltablerow.c | 6 +----- dlls/mshtml/mshtml_private.h | 8 ++++++++ 15 files changed, 22 insertions(+), 72 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 6bbaf26..ae269ee 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -520,12 +520,7 @@ static const NodeImplVtbl HTMLAnchorElementImplVtbl = { static const tid_t HTMLAnchorElement_iface_tids[] = { IHTMLAnchorElement_tid, - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, - IHTMLElement4_tid, + HTMLELEMENT_TIDS, IHTMLTextContainer_tid, IHTMLUniqueName_tid, 0 diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 7f22a4e..5c0f7ca 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -799,12 +799,7 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = { static const tid_t HTMLBodyElement_iface_tids[] = { IHTMLBodyElement_tid, IHTMLBodyElement2_tid, - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, - IHTMLElement4_tid, + HTMLELEMENT_TIDS, IHTMLTextContainer_tid, IHTMLUniqueName_tid, 0 diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index e38432c..85fd4e1 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -171,11 +171,7 @@ static const NodeImplVtbl HTMLCommentElementImplVtbl = { }; static const tid_t HTMLCommentElement_iface_tids[] = { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, + HTMLELEMENT_TIDS, IHTMLCommentElement_tid, 0 }; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index a65ed20..e98243d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1572,11 +1572,7 @@ static const NodeImplVtbl HTMLElementImplVtbl = { }; static const tid_t HTMLElement_iface_tids[] = { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, + HTMLELEMENT_TIDS, 0 }; diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 1db965a..75dcf90 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -483,11 +483,7 @@ static const NodeImplVtbl HTMLFormElementImplVtbl = { }; static const tid_t HTMLFormElement_iface_tids[] = { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, + HTMLELEMENT_TIDS, IHTMLFormElement_tid, 0 }; diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 99b3f0b..8d458f7 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -270,11 +270,7 @@ static const NodeImplVtbl HTMLFrameElementImplVtbl = { }; static const tid_t HTMLFrameElement_iface_tids[] = { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, + HTMLELEMENT_TIDS, IHTMLFrameBase_tid, IHTMLFrameBase2_tid, IHTMLFrameElement3_tid, diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 8b75316..82075b8 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -153,11 +153,7 @@ static const NodeImplVtbl HTMLGenericElementImplVtbl = { }; static const tid_t HTMLGenericElement_iface_tids[] = { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, + HTMLELEMENT_TIDS, IHTMLGenericElement_tid, 0 }; diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index b776077..12cd427 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -255,11 +255,7 @@ static const NodeImplVtbl HTMLIFrameImplVtbl = { }; static const tid_t HTMLIFrame_iface_tids[] = { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, + HTMLELEMENT_TIDS, IHTMLFrameBase_tid, IHTMLFrameBase2_tid, IHTMLIFrameElement_tid, diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 87fe498..4ba6d36 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -609,11 +609,7 @@ static const NodeImplVtbl HTMLImgElementImplVtbl = { }; static const tid_t HTMLImgElement_iface_tids[] = { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, + HTMLELEMENT_TIDS, IHTMLImgElement_tid, 0 }; diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index ae7994a..a72a9f2 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1173,11 +1173,7 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = { }; static const tid_t HTMLInputElement_iface_tids[] = { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, + HTMLELEMENT_TIDS, IHTMLInputElement_tid, 0 }; diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 4701c57..ea205ea 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -324,11 +324,7 @@ static const NodeImplVtbl HTMLOptionElementImplVtbl = { }; static const tid_t HTMLOptionElement_iface_tids[] = { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, + HTMLELEMENT_TIDS, IHTMLOptionElement_tid, 0 }; diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index fccc912..bb45a5e 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -505,11 +505,7 @@ static const NodeImplVtbl HTMLSelectElementImplVtbl = { }; static const tid_t HTMLSelectElement_tids[] = { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, + HTMLELEMENT_TIDS, IHTMLSelectElement_tid, 0 }; diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 6357f77..1286952 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -558,11 +558,7 @@ static const NodeImplVtbl HTMLTableImplVtbl = { }; static const tid_t HTMLTable_iface_tids[] = { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, + HTMLELEMENT_TIDS, IHTMLTable_tid, 0 }; diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 862ed75..950535a 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -301,11 +301,7 @@ static const NodeImplVtbl HTMLTableRowImplVtbl = { }; static const tid_t HTMLTableRow_iface_tids[] = { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLElement3_tid, + HTMLELEMENT_TIDS, IHTMLTableRow_tid, 0 }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0f7930e..30b47e8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -490,6 +490,14 @@ typedef struct { nsIDOMHTMLElement *nselem; } HTMLElement; +#define HTMLELEMENT_TIDS \ + IHTMLDOMNode_tid, \ + IHTMLDOMNode2_tid, \ + IHTMLElement_tid, \ + IHTMLElement2_tid, \ + IHTMLElement3_tid, \ + IHTMLElement4_tid + typedef struct { HTMLElement element;

1 0

Michael Stefaniuc : comdlg32: Use IS_INTRESOURCE instead of HIWORD to check a resource.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: 5b389bacc5b3fc8342852334ca555150164b1a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b389bacc5b3fc8342852334c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 27 12:07:28 2010 +0100 comdlg32: Use IS_INTRESOURCE instead of HIWORD to check a resource. --- dlls/comdlg32/colordlg.c | 2 +- dlls/comdlg32/filedlg31.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 2a61706..ed806ac 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -1366,7 +1366,7 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol ) lpcc->lCustData = lpChCol->lCustData; lpcc->lpfnHook = lpChCol->lpfnHook; if ((lpcc->Flags & CC_ENABLETEMPLATE) && (lpChCol->lpTemplateName)) { - if (HIWORD(lpChCol->lpTemplateName)) { + if (!IS_INTRESOURCE(lpChCol->lpTemplateName)) { INT len = MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, NULL, 0); template_name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, template_name, len ); diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index afe5f31..29c6310 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -778,7 +778,7 @@ void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, BOOL op ofnW->lpstrDefExt = FD31_DupToW(ofnA->lpstrDefExt, 3); if ((ofnA->Flags & OFN_ENABLETEMPLATE) && (ofnA->lpTemplateName)) { - if (HIWORD(ofnA->lpTemplateName)) + if (!IS_INTRESOURCE(ofnA->lpTemplateName)) { RtlCreateUnicodeStringFromAsciiz (&usBuffer,ofnA->lpTemplateName); ofnW->lpTemplateName = usBuffer.Buffer; @@ -801,7 +801,7 @@ void FD31_FreeOfnW(OPENFILENAMEW *ofnW) HeapFree(GetProcessHeap(), 0, ofnW->lpstrFileTitle); HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrInitialDir); HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrTitle); - if (HIWORD(ofnW->lpTemplateName)) + if (!IS_INTRESOURCE(ofnW->lpTemplateName)) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpTemplateName); }

1 0

Nikolay Sivov : xmllite/tests: Fix node type names array, indices are sparse.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: 6b912966a96932e9315347f668232c6154d070af URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b912966a96932e9315347f66… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jan 27 13:49:18 2010 +0300 xmllite/tests: Fix node type names array, indices are sparse. --- dlls/xmllite/tests/reader.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index ed43bb5..9bf18ac 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -193,11 +193,16 @@ static const char *type_to_str(XmlNodeType type) "XmlNodeType_Attribute", "XmlNodeType_Text", "XmlNodeType_CDATA", + "", "", "XmlNodeType_ProcessingInstruction", "XmlNodeType_Comment", + "", "XmlNodeType_DocumentType", + "", "", "XmlNodeType_Whitespace", + "", "XmlNodeType_EndElement", + "", "XmlNodeType_XmlDeclaration" };

1 0

Hans Leidekker : msi: Don' t evaluate the condition table when there are overrides.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: 0d770c96fe3172a7db64d7efb7819a70a6352370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d770c96fe3172a7db64d7efb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 27 11:18:02 2010 +0100 msi: Don't evaluate the condition table when there are overrides. --- dlls/msi/action.c | 110 +++++++++++++++++++++++---------------------- dlls/msi/tests/install.c | 31 ++++++++++++- 2 files changed, 85 insertions(+), 56 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index fef8eae..3280e82 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1585,55 +1585,57 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, return TRUE; } -UINT MSI_SetFeatureStates(MSIPACKAGE *package) +static BOOL process_overrides( MSIPACKAGE *package, int level ) { - int level; - static const WCHAR szlevel[] = - {'I','N','S','T','A','L','L','L','E','V','E','L',0}; static const WCHAR szAddLocal[] = {'A','D','D','L','O','C','A','L',0}; static const WCHAR szAddSource[] = {'A','D','D','S','O','U','R','C','E',0}; static const WCHAR szAdvertise[] = {'A','D','V','E','R','T','I','S','E',0}; - BOOL override = FALSE; - MSICOMPONENT* component; - MSIFEATURE *feature; + BOOL ret = FALSE; + + /* all these activation/deactivation things happen in order and things + * later on the list override things earlier on the list. + * + * 0 INSTALLLEVEL processing + * 1 ADDLOCAL + * 2 REMOVE + * 3 ADDSOURCE + * 4 ADDDEFAULT + * 5 REINSTALL + * 6 ADVERTISE + * 7 COMPADDLOCAL + * 8 COMPADDSOURCE + * 9 FILEADDLOCAL + * 10 FILEADDSOURCE + * 11 FILEADDDEFAULT + */ + ret |= process_state_property( package, level, szAddLocal, INSTALLSTATE_LOCAL ); + ret |= process_state_property( package, level, szRemove, INSTALLSTATE_ABSENT ); + ret |= process_state_property( package, level, szAddSource, INSTALLSTATE_SOURCE ); + ret |= process_state_property( package, level, szReinstall, INSTALLSTATE_UNKNOWN ); + ret |= process_state_property( package, level, szAdvertise, INSTALLSTATE_ADVERTISED ); + if (ret) + MSI_SetPropertyW( package, szPreselected, szOne ); - /* I do not know if this is where it should happen.. but */ + return ret; +} + +UINT MSI_SetFeatureStates(MSIPACKAGE *package) +{ + int level; + static const WCHAR szlevel[] = + {'I','N','S','T','A','L','L','L','E','V','E','L',0}; + MSICOMPONENT* component; + MSIFEATURE *feature; TRACE("Checking Install Level\n"); level = msi_get_property_int(package, szlevel, 1); - /* ok here is the _real_ rub - * all these activation/deactivation things happen in order and things - * later on the list override things earlier on the list. - * 0) INSTALLLEVEL processing - * 1) ADDLOCAL - * 2) REMOVE - * 3) ADDSOURCE - * 4) ADDDEFAULT - * 5) REINSTALL - * 6) ADVERTISE - * 7) COMPADDLOCAL - * 8) COMPADDSOURCE - * 9) FILEADDLOCAL - * 10) FILEADDSOURCE - * 11) FILEADDDEFAULT - * - * I am still ignoring a lot of these. But that is ok for now, ADDLOCAL and - * REMOVE are the big ones, since we don't handle administrative installs - * yet anyway. - */ - override |= process_state_property(package, level, szAddLocal, INSTALLSTATE_LOCAL); - override |= process_state_property(package, level, szRemove, INSTALLSTATE_ABSENT); - override |= process_state_property(package, level, szAddSource, INSTALLSTATE_SOURCE); - override |= process_state_property(package, level, szReinstall, INSTALLSTATE_UNKNOWN); - override |= process_state_property(package, level, szAdvertise, INSTALLSTATE_ADVERTISED); - - if (!override) + if (!msi_get_property_int( package, szPreselected, 0 )) { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { @@ -1663,8 +1665,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) msi_feature_set_state(package, fl->feature, INSTALLSTATE_UNKNOWN); } } - else - MSI_SetPropertyW(package, szPreselected, szOne); /* * now we want to enable or disable components base on feature @@ -1963,7 +1963,7 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) static const WCHAR szOutOfDiskSpace[] = {'O','u','t','O','f','D','i','s','k','S','p','a','c','e',0}; MSICOMPONENT *comp; - UINT rc; + UINT rc = ERROR_SUCCESS; MSIQUERY * view; LPWSTR level; @@ -1984,26 +1984,28 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) TRACE("File calculations\n"); msi_check_file_install_states( package ); - TRACE("Evaluating Condition Table\n"); - - rc = MSI_DatabaseOpenViewW(package->db, ConditionQuery, &view); - if (rc == ERROR_SUCCESS) + if (!process_overrides( package, msi_get_property_int( package, szlevel, 1 ) )) { - rc = MSI_IterateRecords(view, NULL, ITERATE_CostFinalizeConditions, - package); - msiobj_release(&view->hdr); - } + TRACE("Evaluating Condition Table\n"); - TRACE("Enabling or Disabling Components\n"); - LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) - { - if (MSI_EvaluateConditionW(package, comp->Condition) == MSICONDITION_FALSE) + rc = MSI_DatabaseOpenViewW( package->db, ConditionQuery, &view ); + if (rc == ERROR_SUCCESS) { - TRACE("Disabling component %s\n", debugstr_w(comp->Component)); - comp->Enabled = FALSE; + rc = MSI_IterateRecords( view, NULL, ITERATE_CostFinalizeConditions, package ); + msiobj_release( &view->hdr ); + } + + TRACE("Enabling or Disabling Components\n"); + LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) + { + if (MSI_EvaluateConditionW( package, comp->Condition ) == MSICONDITION_FALSE) + { + TRACE("Disabling component %s\n", debugstr_w(comp->Component)); + comp->Enabled = FALSE; + } + else + comp->Enabled = TRUE; } - else - comp->Enabled = TRUE; } MSI_SetPropertyW(package,szCosting,szOne); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 701192b..a3bffe7 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6885,9 +6885,9 @@ static void test_preselected(void) ok(!delete_pf("msitest\\first\\two.txt", TRUE), "File installed\n"); ok(!delete_pf("msitest\\first", FALSE), "File installed\n"); ok(!delete_pf("msitest\\filename", TRUE), "File installed\n"); - todo_wine ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(!delete_pf("msitest\\service.exe", TRUE), "File installed\n"); - todo_wine ok(delete_pf("msitest", FALSE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -7310,6 +7310,32 @@ static void test_MsiSetExternalUI(void) ok(!error, "MsiSetExternalUIRecord failed %u\n", error); } +static void test_feature_override(void) +{ + UINT r; + + create_test_files(); + create_database(msifile, tables, sizeof(tables) / sizeof(msi_table)); + + r = MsiInstallProductA(msifile, "ADDLOCAL=One"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout\\new", FALSE), "File installed\n"); + ok(!delete_pf("msitest\\cabout\\four.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout", FALSE), "File installed\n"); + ok(!delete_pf("msitest\\changed\\three.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\changed", FALSE), "File installed\n"); + ok(!delete_pf("msitest\\first\\two.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\first", FALSE), "File installed\n"); + ok(!delete_pf("msitest\\filename", TRUE), "File installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\service.exe", TRUE), "File installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -7400,6 +7426,7 @@ START_TEST(install) test_file_in_use_cab(); test_MsiSetExternalUI(); test_allusers_prop(); + test_feature_override(); DeleteFileA(log_file);

1 0

Erich Hoover : hhctrl.ocx: Add a ListView for the Index tab.
by Alexandre Julliard Jan. 27, 2010

Jan. 27, 2010

Module: wine Branch: master Commit: d3bd40d6274f73db083c7cc5b3b062083971f02a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3bd40d6274f73db083c7cc5b… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jan 27 01:11:56 2010 -0700 hhctrl.ocx: Add a ListView for the Index tab. --- dlls/hhctrl.ocx/help.c | 73 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 092e97e..20305f1 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -320,8 +320,10 @@ static LRESULT Child_OnPaint(HWND hWnd) return 0; } -static void ResizeTabChild(HHInfo *info, HWND hwnd) +static void ResizeTabChild(HHInfo *info, int tab) { + HWND hwnd = info->tabs[tab].hwnd; + INT width, height; RECT rect, tabrc; DWORD cnt; @@ -333,9 +335,28 @@ static void ResizeTabChild(HHInfo *info, HWND hwnd) rect.top = TAB_TOP_PADDING + cnt*(tabrc.bottom-tabrc.top) + TAB_MARGIN; rect.right -= TAB_RIGHT_PADDING + TAB_MARGIN; rect.bottom -= TAB_MARGIN; + width = rect.right-rect.left; + height = rect.bottom-rect.top; - SetWindowPos(hwnd, NULL, rect.left, rect.top, rect.right-rect.left, - rect.bottom-rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + SetWindowPos(hwnd, NULL, rect.left, rect.top, width, height, + SWP_NOZORDER | SWP_NOACTIVATE); + + /* Resize the tab widget column to perfectly fit the tab window and + * leave sufficient space for the scroll widget. + */ + switch (tab) + { + case TAB_INDEX: { + int scroll_width = GetSystemMetrics(SM_CXVSCROLL); + int border_width = GetSystemMetrics(SM_CXBORDER); + int edge_width = GetSystemMetrics(SM_CXEDGE); + + SendMessageW(info->tabs[TAB_INDEX].hwnd, LVM_SETCOLUMNWIDTH, 0, + width-scroll_width-2*border_width-2*edge_width); + + break; + } + } } static LRESULT Child_OnSize(HWND hwnd) @@ -351,7 +372,8 @@ static LRESULT Child_OnSize(HWND hwnd) rect.right - TAB_RIGHT_PADDING, rect.bottom - TAB_TOP_PADDING, SWP_NOMOVE); - ResizeTabChild(info, info->tabs[TAB_CONTENTS].hwnd); + ResizeTabChild(info, TAB_CONTENTS); + ResizeTabChild(info, TAB_INDEX); return 0; } @@ -729,6 +751,8 @@ static BOOL HH_AddHTMLPane(HHInfo *pHHInfo) static BOOL AddContentTab(HHInfo *info) { + if(info->tabs[TAB_CONTENTS].id == -1) + return TRUE; /* No "Contents" tab */ info->tabs[TAB_CONTENTS].hwnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, szEmpty, WS_CHILD | WS_BORDER | 0x25, 50, 50, 100, 100, info->WinType.hwndNavigation, NULL, hhctrl_hinstance, NULL); @@ -737,12 +761,41 @@ static BOOL AddContentTab(HHInfo *info) return FALSE; } - ResizeTabChild(info, info->tabs[TAB_CONTENTS].hwnd); + ResizeTabChild(info, TAB_CONTENTS); ShowWindow(info->tabs[TAB_CONTENTS].hwnd, SW_SHOW); return TRUE; } +static BOOL AddIndexTab(HHInfo *info) +{ + char hidden_column[] = "Column"; + LVCOLUMNA lvc; + + if(info->tabs[TAB_INDEX].id == -1) + return TRUE; /* No "Index" tab */ + info->tabs[TAB_INDEX].hwnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEWW, + szEmpty, WS_CHILD | WS_BORDER | LVS_SINGLESEL | LVS_REPORT | LVS_NOCOLUMNHEADER, 50, 50, 100, 100, + info->WinType.hwndNavigation, NULL, hhctrl_hinstance, NULL); + if(!info->tabs[TAB_INDEX].hwnd) { + ERR("Could not create ListView control\n"); + return FALSE; + } + memset(&lvc, 0, sizeof(lvc)); + lvc.mask = LVCF_TEXT; + lvc.pszText = hidden_column; + if(SendMessageW(info->tabs[TAB_INDEX].hwnd, LVM_INSERTCOLUMNA, 0, (LPARAM) &lvc) == -1) + { + ERR("Could not create ListView column\n"); + return FALSE; + } + + ResizeTabChild(info, TAB_INDEX); + ShowWindow(info->tabs[TAB_INDEX].hwnd, SW_HIDE); + + return TRUE; +} + /* Viewer Window */ static LRESULT Help_OnSize(HWND hWnd) @@ -918,6 +971,9 @@ static BOOL CreateViewer(HHInfo *pHHInfo) if (!AddContentTab(pHHInfo)) return FALSE; + if (!AddIndexTab(pHHInfo)) + return FALSE; + InitContent(pHHInfo); return TRUE; @@ -958,6 +1014,13 @@ void ReleaseHelpViewer(HHInfo *info) HHInfo *CreateHelpViewer(LPCWSTR filename) { HHInfo *info = heap_alloc_zero(sizeof(HHInfo)); + int i; + + /* Set the invalid tab ID (-1) as the default value for all + * of the tabs, this matches a failed TCM_INSERTITEM call. + */ + for(i=0;i<sizeof(info->tabs)/sizeof(HHTab);i++) + info->tabs[i].id = -1; OleInitialize(NULL);

1 0