April 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Remove some redundant defines.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: d32d308798badd66a2c8b3f6fbb1fe9452db0169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d32d308798badd66a2c8b3f6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 09:53:29 2009 +0200 wined3d: Remove some redundant defines. --- dlls/wined3d/wined3d_private.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a22c60..9040ac0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -168,9 +168,6 @@ void hash_table_remove(struct hash_table_t *table, void *key); #define MAX_ACTIVE_LIGHTS 8 #define MAX_CLIPPLANES WINED3DMAXUSERCLIPPLANES -#define MAX_CONST_I 16 -#define MAX_CONST_B 16 - /* Used for CreateStateBlock */ #define NUM_SAVEDPIXELSTATES_R 35 #define NUM_SAVEDPIXELSTATES_T 18

1 0

Jörg Höhle : msvfw32/tests: Add mixed-case FOURCC comparisons.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 9296b1e917eeb04c2de7c3361fc574303562236e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9296b1e917eeb04c2de7c3361… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Apr 28 09:02:24 2009 +0200 msvfw32/tests: Add mixed-case FOURCC comparisons. --- dlls/msvfw32/tests/msvfw.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 1082486..b0d8208 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -51,6 +51,16 @@ static void test_OpenCase(void) if (h) { ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); } + h = ICOpen(mmioFOURCC('v','i','d','c'),mmioFOURCC('m','S','v','C'),ICMODE_DECOMPRESS); + ok(0!=h,"ICOpen(vidc.mSvC) failed\n"); + if (h) { + ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); + } + h = ICOpen(mmioFOURCC('v','I','d','C'),mmioFOURCC('m','s','v','c'),ICMODE_DECOMPRESS); + ok(0!=h,"ICOpen(vIdC.msvc) failed\n"); + if (h) { + ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); + } } START_TEST(msvfw)

1 0

Stefan Dösinger : wined3d: Fix a few more direct buffer accesses.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 3dc55010eae371c2ce0d343549b3681411bcf6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc55010eae371c2ce0d34354… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 19 20:42:08 2009 +0200 wined3d: Fix a few more direct buffer accesses. --- dlls/wined3d/device.c | 24 ++---------------------- dlls/wined3d/state.c | 2 +- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 253afa8..17f520e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -220,7 +220,7 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, { WARN("loadBaseVertexIndex is < 0 (%d), not using vbos\n", This->stateBlock->loadBaseVertexIndex); buffer_object = 0; - data = ((struct wined3d_buffer *)This->stateBlock->streamSource[element->input_slot])->resource.allocatedMemory; + data = buffer_get_sysmem((struct wined3d_buffer *)This->stateBlock->streamSource[element->input_slot]); if ((UINT_PTR)data < -This->stateBlock->loadBaseVertexIndex * stride) { FIXME("System memory vertex data load offset is negative!\n"); @@ -4531,27 +4531,7 @@ static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIn ENTER_GL(); if (dest->resource.allocatedMemory == NULL) { - /* This may happen if we do direct locking into a vbo. Unlikely, - * but theoretically possible(ddraw processvertices test) - */ - dest->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), 0, dest->resource.size); - if(!dest->resource.allocatedMemory) { - LEAVE_GL(); - ERR("Out of memory\n"); - return E_OUTOFMEMORY; - } - if (dest->buffer_object) - { - const void *src; - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, dest->buffer_object)); - checkGLcall("glBindBufferARB"); - src = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_ONLY_ARB)); - if(src) { - memcpy(dest->resource.allocatedMemory, src, dest->resource.size); - } - GL_EXTCALL(glUnmapBufferARB(GL_ARRAY_BUFFER_ARB)); - checkGLcall("glUnmapBufferARB"); - } + buffer_get_sysmem(dest); } /* Get a pointer into the destination vbo(create one if none exists) and diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 05e52b0..b1fbadf 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3913,7 +3913,7 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, if (stream_info->elements[i].buffer_object) { vb = (struct wined3d_buffer *)stateblock->streamSource[stream_info->elements[i].stream_idx]; - ptr += (long) vb->resource.allocatedMemory; + ptr += (long) buffer_get_sysmem(vb); } if (context->numbered_array_mask & (1 << i)) unload_numbered_array(stateblock, context, i);

1 0

Stefan Dösinger : wined3d: Activate a thread before mapping a buffer.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 926fe798c50309fecb6f901e1310569d3257ff88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=926fe798c50309fecb6f901e1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 20 14:40:53 2009 +0200 wined3d: Activate a thread before mapping a buffer. This fixes a regression in EverQuest 2. --- dlls/wined3d/buffer.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b68dcf7..d201a53 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -951,12 +951,18 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, { if(count == 1) { + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + if(This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) { IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_INDEXBUFFER); } + + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); This->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_READ_WRITE_ARB)); + LEAVE_GL(); } } else @@ -987,12 +993,19 @@ static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) if(!(This->flags & WINED3D_BUFFER_DOUBLEBUFFER) && This->buffer_object) { + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + if(This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) { IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_INDEXBUFFER); } + + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); GL_EXTCALL(glUnmapBufferARB(This->buffer_type_hint)); + LEAVE_GL(); + This->resource.allocatedMemory = NULL; } else if (This->flags & WINED3D_BUFFER_HASDESC)

1 0

Stefan Dösinger : wined3d: Fix an issue in buffer_get_sysmem.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 1fbc6e560d06e85b09b7e8460ae941cb0ba62062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbc6e560d06e85b09b7e8460… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 22 19:19:41 2009 +0200 wined3d: Fix an issue in buffer_get_sysmem. Checking for the doublebuffer flag can cause confusion if no VBO has been allocated for the buffer. Checking for allocatedMemory is the more direct approach. --- dlls/wined3d/buffer.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d201a53..8f68f5d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -590,7 +590,8 @@ static ULONG STDMETHODCALLTYPE buffer_AddRef(IWineD3DBuffer *iface) const BYTE *buffer_get_sysmem(struct wined3d_buffer *This) { - if(This->flags & WINED3D_BUFFER_DOUBLEBUFFER) return This->resource.allocatedMemory; + /* AllocatedMemory exists if the buffer is double buffered or has no buffer object at all */ + if(This->resource.allocatedMemory) return This->resource.allocatedMemory; This->resource.heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->resource.size + RESOURCE_ALIGNMENT); This->resource.allocatedMemory = (BYTE *)(((ULONG_PTR)This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1));

1 0

Stefan Dösinger : wined3d: Emulate R16G16F and R32G32F if GL_ARB_texture_rg is not supported.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 8513f64a0117ee7a6a15cb174a3c0c76e2f2b071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8513f64a0117ee7a6a15cb174… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 15:05:27 2009 +0200 wined3d: Emulate R16G16F and R32G32F if GL_ARB_texture_rg is not supported. Nvidia doesn't offer it on geforce 7 and earlier cards, but some games need it. This is surprising because the extension was made specifically for compatibility purposes for older cards. --- dlls/wined3d/directx.c | 11 ++--------- dlls/wined3d/surface.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6a15a48..2b4520c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2391,6 +2391,7 @@ static BOOL CheckTextureCapability(struct WineD3DAdapter *adapter, /* Floating point formats */ case WINED3DFMT_R16_FLOAT: + case WINED3DFMT_R16G16_FLOAT: case WINED3DFMT_R16G16B16A16_FLOAT: if(GL_SUPPORT(ARB_TEXTURE_FLOAT) && GL_SUPPORT(ARB_HALF_FLOAT_PIXEL)) { TRACE_(d3d_caps)("[OK]\n"); @@ -2400,6 +2401,7 @@ static BOOL CheckTextureCapability(struct WineD3DAdapter *adapter, return FALSE; case WINED3DFMT_R32_FLOAT: + case WINED3DFMT_R32G32_FLOAT: case WINED3DFMT_R32G32B32A32_FLOAT: if (GL_SUPPORT(ARB_TEXTURE_FLOAT)) { TRACE_(d3d_caps)("[OK]\n"); @@ -2408,15 +2410,6 @@ static BOOL CheckTextureCapability(struct WineD3DAdapter *adapter, TRACE_(d3d_caps)("[FAILED]\n"); return FALSE; - case WINED3DFMT_R16G16_FLOAT: - case WINED3DFMT_R32G32_FLOAT: - if(GL_SUPPORT(ARB_TEXTURE_RG)) { - TRACE_(d3d_caps)("[OK]\n"); - return TRUE; - } - TRACE_(d3d_caps)("[FAILED]\n"); - return FALSE; - /* ATI instancing hack: Although ATI cards do not support Shader Model 3.0, they support * instancing. To query if the card supports instancing CheckDeviceFormat with the special format * MAKEFOURCC('I','N','S','T') is used. Should a (broken) app check for this provide a proper return value. diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 35ba9a4..9e9d55c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1795,6 +1795,22 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *target_bpp = 6; break; + case WINED3DFMT_R16G16_FLOAT: + *convert = CONVERT_R16G16F; + *format = GL_RGB; + *internal = GL_RGB16F_ARB; + *type = GL_HALF_FLOAT_ARB; + *target_bpp = 6; + break; + + case WINED3DFMT_R32G32_FLOAT: + *convert = CONVERT_R32G32F; + *format = GL_RGB; + *internal = GL_RGB32F_ARB; + *type = GL_FLOAT; + *target_bpp = 12; + break; + default: break; } @@ -2123,6 +2139,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } case CONVERT_G16R16: + case CONVERT_R16G16F: { unsigned int x, y; const WORD *Source; @@ -2136,6 +2153,9 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI WORD red = (*Source++); Dest[0] = green; Dest[1] = red; + /* Strictly speaking not correct for R16G16F, but it doesn't matter because the + * shader overwrites it anyway + */ Dest[2] = 0xffff; Dest += 3; } @@ -2143,6 +2163,26 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; } + case CONVERT_R32G32F: + { + unsigned int x, y; + const float *Source; + float *Dest; + for(y = 0; y < height; y++) { + Source = (const float *)(src + y * pitch); + Dest = (float *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) { + float green = (*Source++); + float red = (*Source++); + Dest[0] = green; + Dest[1] = red; + Dest[2] = 1.0; + Dest += 3; + } + } + break; + } + default: ERR("Unsupported conversation type %d\n", convert); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9040ac0..5809cb9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1824,6 +1824,8 @@ typedef enum { CONVERT_V16U16, CONVERT_A4L4, CONVERT_G16R16, + CONVERT_R16G16F, + CONVERT_R32G32F, } CONVERT_TYPES; HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, GLenum *format, GLenum *internal, GLenum *type, CONVERT_TYPES *convert, int *target_bpp, BOOL srgb_mode);

1 0

Stefan Dösinger : wined3d: Set the max mipmap level in the pbo test.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 25a59fe71b825c22cdc284f1838076efd74d5b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a59fe71b825c22cdc284f18… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 22 19:28:53 2009 +0200 wined3d: Set the max mipmap level in the pbo test. fglrx refuses to use PBOs on not mipmap complete textures. The texture code already takes care of this, do the same in the test. --- dlls/wined3d/directx.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2b4520c..02959e0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3900,6 +3900,8 @@ static void test_pbo_functionality(WineD3D_GL_Info *gl_info) { while(glGetError()); glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_2D, texture); + + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 4, 4, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0); checkGLcall("Specifying the PBO test texture\n");

1 0

Alexandre Julliard : include: Added definitions for IHTMLWindow4 and IHTMLWindow5.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 6d23a22f890bba335ac49d46295801fc1311eac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d23a22f890bba335ac49d462… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 28 12:47:40 2009 +0200 include: Added definitions for IHTMLWindow4 and IHTMLWindow5. --- include/mshtmdid.h | 3 +++ include/mshtml.idl | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 75a7290..6d2633d 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1572,6 +1572,9 @@ #define DISPID_IHTMLWINDOW4_CREATEPOPUP 1180 #define DISPID_IHTMLWINDOW4_FRAMEELEMENT 1181 +/* IHTMLWindow5 */ +#define DISPID_IHTMLWINDOW5_XMLHTTPREQUEST 1190 + /* IHTMLImageElementFactory */ #define DISPID_IHTMLIMAGEELEMENTFACTORY_CREATE DISPID_VALUE diff --git a/include/mshtml.idl b/include/mshtml.idl index 87c3607..23915da 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -13884,6 +13884,43 @@ interface IHTMLWindow3 : IDispatch } /***************************************************************************** + * IHTMLWindow4 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f6cf-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLWindow4 : IDispatch +{ + [id(DISPID_IHTMLWINDOW4_CREATEPOPUP)] + HRESULT createPopup([optional, in] VARIANT* varArgIn, + [retval, out] IDispatch** ppPopup); + + [propget, id(DISPID_IHTMLWINDOW4_FRAMEELEMENT)] + HRESULT frameElement([retval, out] IHTMLFrameBase* * p); +}; + +/***************************************************************************** + * IHTMLWindow5 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051040e-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLWindow5 : IDispatch +{ + [propput, id(DISPID_IHTMLWINDOW5_XMLHTTPREQUEST)] + HRESULT XMLHttpRequest([in] VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW5_XMLHTTPREQUEST)] + HRESULT XMLHttpRequest([retval, out] VARIANT * p); +}; + +/***************************************************************************** * DispHTMLWindow2 dispinterface */ [

1 0

Alexandre Julliard : include: Added definition of the DispHTMLWindowProxy interface.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: bb3eb738a4a047508e791a8d82e8a9c8d34431a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3eb738a4a047508e791a8d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 28 12:49:15 2009 +0200 include: Added definition of the DispHTMLWindowProxy interface. --- include/mshtml.idl | 291 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 291 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 23915da..bd4c98e 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -14206,6 +14206,297 @@ methods: } /***************************************************************************** + * DispHTMLWindowProxy dispinterface + */ +[ + hidden, + uuid(3050f55e-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLWindowProxy +{ +properties: +methods: + [id(DISPID_IHTMLFRAMESCOLLECTION2_ITEM)] + VARIANT item([in] VARIANT* pvarIndex); + + [propget, id(DISPID_IHTMLFRAMESCOLLECTION2_LENGTH)] + LONG length(); + + [propget, id(DISPID_IHTMLWINDOW2_FRAMES)] + IHTMLFramesCollection2* frames(); + + [propput, id(DISPID_IHTMLWINDOW2_DEFAULTSTATUS)] + void defaultStatus(BSTR v); + + [propget, id(DISPID_IHTMLWINDOW2_DEFAULTSTATUS)] + BSTR defaultStatus(); + + [propput, id(DISPID_IHTMLWINDOW2_STATUS)] + void status(BSTR v); + + [propget, id(DISPID_IHTMLWINDOW2_STATUS)] + BSTR status(); + + [id(DISPID_IHTMLWINDOW2_CLEARTIMEOUT)] + void clearTimeout([in] LONG timerID); + + [id(DISPID_IHTMLWINDOW2_ALERT)] + void alert([defaultvalue(""), in] BSTR message); + + [id(DISPID_IHTMLWINDOW2_CONFIRM)] + VARIANT_BOOL confirm([defaultvalue(""), in] BSTR message); + + [id(DISPID_IHTMLWINDOW2_PROMPT)] + VARIANT prompt([defaultvalue(""), in] BSTR message, + [defaultvalue("undefined"), in] BSTR defstr); + + [propget, id(DISPID_IHTMLWINDOW2_IMAGE)] + IHTMLImageElementFactory* Image(); + + [propget, id(DISPID_IHTMLWINDOW2_LOCATION)] + IHTMLLocation* location(); + + [propget, id(DISPID_IHTMLWINDOW2_HISTORY)] + IOmHistory* history(); + + [id(DISPID_IHTMLWINDOW2_CLOSE)] + void close(); + + [propput, id(DISPID_IHTMLWINDOW2_OPENER)] + void opener(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_OPENER)] + VARIANT opener(); + + [propget, id(DISPID_IHTMLWINDOW2_NAVIGATOR)] + IOmNavigator* navigator(); + + [propput, id(DISPID_IHTMLWINDOW2_NAME)] + void name(BSTR v); + + [propget, id(DISPID_IHTMLWINDOW2_NAME)] + BSTR name(); + + [propget, id(DISPID_IHTMLWINDOW2_PARENT)] + IHTMLWindow2* parent(); + + [id(DISPID_IHTMLWINDOW2_OPEN)] + IHTMLWindow2* open([defaultvalue(""), in] BSTR url, + [defaultvalue(""), in] BSTR name, + [defaultvalue(""), in] BSTR features, + [defaultvalue(0), in] VARIANT_BOOL replace); + + [propget, id(DISPID_IHTMLWINDOW2_SELF)] + IHTMLWindow2* self(); + + [propget, id(DISPID_IHTMLWINDOW2_TOP)] + IHTMLWindow2* top(); + + [propget, id(DISPID_IHTMLWINDOW2_WINDOW)] + IHTMLWindow2* window(); + + [id(DISPID_IHTMLWINDOW2_NAVIGATE)] + void navigate([in] BSTR url); + + [propput, id(DISPID_IHTMLWINDOW2_ONFOCUS), displaybind, bindable] + void onfocus(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONFOCUS), displaybind, bindable] + VARIANT onfocus(); + + [propput, id(DISPID_IHTMLWINDOW2_ONBLUR), displaybind, bindable] + void onblur(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONBLUR), displaybind, bindable] + VARIANT onblur(); + + [propput, id(DISPID_IHTMLWINDOW2_ONLOAD), displaybind, bindable] + void onload(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONLOAD), displaybind, bindable] + VARIANT onload(); + + [propput, id(DISPID_IHTMLWINDOW2_ONBEFOREUNLOAD), displaybind, bindable] + void onbeforeunload(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONBEFOREUNLOAD), displaybind, bindable] + VARIANT onbeforeunload(); + + [propput, id(DISPID_IHTMLWINDOW2_ONUNLOAD), displaybind, bindable] + void onunload(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONUNLOAD), displaybind, bindable] + VARIANT onunload(); + + [propput, id(DISPID_IHTMLWINDOW2_ONHELP), displaybind, bindable] + void onhelp(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONHELP), displaybind, bindable] + VARIANT onhelp(); + + [propput, id(DISPID_IHTMLWINDOW2_ONERROR), displaybind, bindable] + void onerror(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONERROR), displaybind, bindable] + VARIANT onerror(); + + [propput, id(DISPID_IHTMLWINDOW2_ONRESIZE), displaybind, bindable] + void onresize(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONRESIZE), displaybind, bindable] + VARIANT onresize(); + + [propput, id(DISPID_IHTMLWINDOW2_ONSCROLL), displaybind, bindable] + void onscroll(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONSCROLL), displaybind, bindable] + VARIANT onscroll(); + + [propget, id(DISPID_IHTMLWINDOW2_DOCUMENT), source] + IHTMLDocument2* document(); + + [propget, id(DISPID_IHTMLWINDOW2_EVENT)] + IHTMLEventObj* event(); + + [propget, id(DISPID_IHTMLWINDOW2__NEWENUM), hidden, restricted] + IUnknown* _newEnum(); + + [id(DISPID_IHTMLWINDOW2_SHOWMODALDIALOG)] + VARIANT showModalDialog([in] BSTR dialog, + [optional, in] VARIANT* varArgIn, + [optional, in] VARIANT* varOptions); + + [id(DISPID_IHTMLWINDOW2_SHOWHELP)] + void showHelp([in] BSTR helpURL, + [optional, in] VARIANT helpArg, + [defaultvalue(""), in] BSTR features); + + [propget, id(DISPID_IHTMLWINDOW2_SCREEN)] + IHTMLScreen* screen(); + + [propget, id(DISPID_IHTMLWINDOW2_OPTION)] + IHTMLOptionElementFactory* Option(); + + [id(DISPID_IHTMLWINDOW2_FOCUS)] + void focus(); + + [propget, id(DISPID_IHTMLWINDOW2_CLOSED)] + VARIANT_BOOL closed(); + + [id(DISPID_IHTMLWINDOW2_BLUR)] + void blur(); + + [id(DISPID_IHTMLWINDOW2_SCROLL)] + void scroll([in] LONG x, + [in] LONG y); + + [propget, id(DISPID_IHTMLWINDOW2_CLIENTINFORMATION)] + IOmNavigator* clientInformation(); + + [id(DISPID_IHTMLWINDOW2_CLEARINTERVAL)] + void clearInterval([in] LONG timerID); + + [propput, id(DISPID_IHTMLWINDOW2_OFFSCREENBUFFERING)] + void offscreenBuffering(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_OFFSCREENBUFFERING)] + VARIANT offscreenBuffering(); + + [id(DISPID_IHTMLWINDOW2_EXECSCRIPT)] + VARIANT execScript([in] BSTR code, + [defaultvalue("JScript"), in] BSTR language); + + [id(DISPID_IHTMLWINDOW2_TOSTRING)] + BSTR toString(); + + [id(DISPID_IHTMLWINDOW2_SCROLLBY)] + void scrollBy([in] LONG x, + [in] LONG y); + + [id(DISPID_IHTMLWINDOW2_SCROLLTO)] + void scrollTo([in] LONG x, + [in] LONG y); + + [id(DISPID_IHTMLWINDOW2_MOVETO)] + void moveTo([in] LONG x, + [in] LONG y); + + [id(DISPID_IHTMLWINDOW2_MOVEBY)] + void moveBy([in] LONG x, + [in] LONG y); + + [id(DISPID_IHTMLWINDOW2_RESIZETO)] + void resizeTo([in] LONG x, + [in] LONG y); + + [id(DISPID_IHTMLWINDOW2_RESIZEBY)] + void resizeBy([in] LONG x, + [in] LONG y); + + [propget, id(DISPID_IHTMLWINDOW2_EXTERNAL)] + IDispatch* external(); + + [propget, id(DISPID_IHTMLWINDOW3_SCREENLEFT)] + LONG screenLeft(); + + [propget, id(DISPID_IHTMLWINDOW3_SCREENTOP)] + LONG screenTop(); + + [id(DISPID_IHTMLWINDOW3_ATTACHEVENT)] + VARIANT_BOOL attachEvent([in] BSTR event, + [in] IDispatch* pDisp); + + [id(DISPID_IHTMLWINDOW3_DETACHEVENT)] + void detachEvent([in] BSTR event, + [in] IDispatch* pDisp); + + [id(DISPID_IHTMLWINDOW3_SETTIMEOUT)] + LONG setTimeout([in] VARIANT* expression, + [in] LONG msec, + [optional, in] VARIANT* language); + + [id(DISPID_IHTMLWINDOW3_SETINTERVAL)] + LONG setInterval([in] VARIANT* expression, + [in] LONG msec, + [optional, in] VARIANT* language); + + [id(DISPID_IHTMLWINDOW3_PRINT)] + void print(); + + [propput, id(DISPID_IHTMLWINDOW3_ONBEFOREPRINT), displaybind, bindable] + void onbeforeprint(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW3_ONBEFOREPRINT), displaybind, bindable] + VARIANT onbeforeprint(); + + [propput, id(DISPID_IHTMLWINDOW3_ONAFTERPRINT), displaybind, bindable] + void onafterprint(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW3_ONAFTERPRINT), displaybind, bindable] + VARIANT onafterprint(); + + [propget, id(DISPID_IHTMLWINDOW3_CLIPBOARDDATA)] + IHTMLDataTransfer* clipboardData(); + + [id(DISPID_IHTMLWINDOW3_SHOWMODELESSDIALOG)] + IHTMLWindow2* showModelessDialog([defaultvalue(""), in] BSTR url, + [optional, in] VARIANT* varArgIn, + [optional, in] VARIANT* options); + + [id(DISPID_IHTMLWINDOW4_CREATEPOPUP)] + IDispatch* createPopup([optional, in] VARIANT* varArgIn); + + [propget, id(DISPID_IHTMLWINDOW4_FRAMEELEMENT)] + IHTMLFrameBase* frameElement(); + + [propput, id(DISPID_IHTMLWINDOW5_XMLHTTPREQUEST)] + void XMLHttpRequest(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW5_XMLHTTPREQUEST)] + VARIANT XMLHttpRequest(); +}; + +/***************************************************************************** * HTMLDocumentEvents2 interface */ [

1 0

Alexandre Julliard : include: Added definitions for HTMLWindowEvents and HTMLWindowEvents2.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 4857e1997e8725666563b4864e37233d6ca46f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4857e1997e8725666563b4864… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 28 12:50:06 2009 +0200 include: Added definitions for HTMLWindowEvents and HTMLWindowEvents2. --- dlls/mshtml/main.c | 1 - include/mshtmdid.h | 26 ++++++++++++ include/mshtml.idl | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index b1c8756..aed4d76 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -284,7 +284,6 @@ DEFINE_GUID(CLSID_HTMLPluginDocument, 0x25336921, 0x03F9, 0x11CF, 0x8F,0xD0, 0x0 DEFINE_GUID(CLSID_HTMLPopup, 0x3050F667, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_HTMLPopupDoc, 0x3050F67D, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_HTMLServerDoc, 0x3050F4E7, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); -DEFINE_GUID(CLSID_HTMLWindowProxy, 0x3050F391, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_IImageDecodeFilter, 0x607FD4E8, 0x0A03, 0x11D1, 0xAB,0x1D, 0x00,0xC0,0x4F,0xC9,0xB3,0x04); DEFINE_GUID(CLSID_IImgCtx, 0x3050F3D6, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_IntDitherer, 0x05F6FE1A, 0xECEF, 0x11D0, 0xAA,0xE7, 0x00,0xC0,0x4F,0xC9,0xB3,0x04); diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 6d2633d..8f882f8 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1499,6 +1499,32 @@ #define DISPID_IHTMLBOOKMARKCOLLECTION__NEWENUM DISPID_NEWENUM #define DISPID_IHTMLBOOKMARKCOLLECTION_ITEM DISPID_VALUE +/* HTMLWindowEvents */ +#define DISPID_HTMLWINDOWEVENTS_ONLOAD DISPID_EVMETH_ONLOAD +#define DISPID_HTMLWINDOWEVENTS_ONUNLOAD DISPID_EVMETH_ONUNLOAD +#define DISPID_HTMLWINDOWEVENTS_ONHELP DISPID_EVMETH_ONHELP +#define DISPID_HTMLWINDOWEVENTS_ONFOCUS DISPID_EVMETH_ONFOCUS +#define DISPID_HTMLWINDOWEVENTS_ONBLUR DISPID_EVMETH_ONBLUR +#define DISPID_HTMLWINDOWEVENTS_ONERROR DISPID_EVMETH_ONERROR +#define DISPID_HTMLWINDOWEVENTS_ONRESIZE DISPID_EVMETH_ONRESIZE +#define DISPID_HTMLWINDOWEVENTS_ONSCROLL DISPID_EVMETH_ONSCROLL +#define DISPID_HTMLWINDOWEVENTS_ONBEFOREUNLOAD DISPID_EVMETH_ONBEFOREUNLOAD +#define DISPID_HTMLWINDOWEVENTS_ONBEFOREPRINT DISPID_EVMETH_ONBEFOREPRINT +#define DISPID_HTMLWINDOWEVENTS_ONAFTERPRINT DISPID_EVMETH_ONAFTERPRINT + +/* HTMLWindowEvents2 */ +#define DISPID_HTMLWINDOWEVENTS2_ONLOAD DISPID_EVMETH_ONLOAD +#define DISPID_HTMLWINDOWEVENTS2_ONUNLOAD DISPID_EVMETH_ONUNLOAD +#define DISPID_HTMLWINDOWEVENTS2_ONHELP DISPID_EVMETH_ONHELP +#define DISPID_HTMLWINDOWEVENTS2_ONFOCUS DISPID_EVMETH_ONFOCUS +#define DISPID_HTMLWINDOWEVENTS2_ONBLUR DISPID_EVMETH_ONBLUR +#define DISPID_HTMLWINDOWEVENTS2_ONERROR DISPID_EVMETH_ONERROR +#define DISPID_HTMLWINDOWEVENTS2_ONRESIZE DISPID_EVMETH_ONRESIZE +#define DISPID_HTMLWINDOWEVENTS2_ONSCROLL DISPID_EVMETH_ONSCROLL +#define DISPID_HTMLWINDOWEVENTS2_ONBEFOREUNLOAD DISPID_EVMETH_ONBEFOREUNLOAD +#define DISPID_HTMLWINDOWEVENTS2_ONBEFOREPRINT DISPID_EVMETH_ONBEFOREPRINT +#define DISPID_HTMLWINDOWEVENTS2_ONAFTERPRINT DISPID_EVMETH_ONAFTERPRINT + /* IHTMLWindow2 */ #define DISPID_IHTMLWINDOW2_HISTORY 2 #define DISPID_IHTMLWINDOW2_CLOSE 3 diff --git a/include/mshtml.idl b/include/mshtml.idl index bd4c98e..c8537fc 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -14497,6 +14497,117 @@ methods: }; /***************************************************************************** + * HTMLWindowEvents interface + */ +[ + hidden, + uuid(96A0A4E0-D062-11cf-94B6-00AA0060275C) +] +dispinterface HTMLWindowEvents +{ +properties: +methods: + [id(DISPID_HTMLWINDOWEVENTS_ONLOAD)] + void onload(); + + [id(DISPID_HTMLWINDOWEVENTS_ONUNLOAD)] + void onunload(); + + [id(DISPID_HTMLWINDOWEVENTS_ONHELP)] + VARIANT_BOOL onhelp(); + + [id(DISPID_HTMLWINDOWEVENTS_ONFOCUS)] + void onfocus(); + + [id(DISPID_HTMLWINDOWEVENTS_ONBLUR)] + void onblur(); + + [id(DISPID_HTMLWINDOWEVENTS_ONERROR)] + void onerror([in] BSTR description, + [in] BSTR url, + [in] LONG line); + + [id(DISPID_HTMLWINDOWEVENTS_ONRESIZE)] + void onresize(); + + [id(DISPID_HTMLWINDOWEVENTS_ONSCROLL)] + void onscroll(); + + [id(DISPID_HTMLWINDOWEVENTS_ONBEFOREUNLOAD)] + void onbeforeunload(); + + [id(DISPID_HTMLWINDOWEVENTS_ONBEFOREPRINT)] + void onbeforeprint(); + + [id(DISPID_HTMLWINDOWEVENTS_ONAFTERPRINT)] + void onafterprint(); +}; + +/***************************************************************************** + * HTMLWindowEvents2 interface + */ +[ + hidden, + uuid(3050f625-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface HTMLWindowEvents2 +{ +properties: +methods: + [id(DISPID_HTMLWINDOWEVENTS2_ONLOAD)] + void onload([in] IHTMLEventObj* pEvtObj); + + [id(DISPID_HTMLWINDOWEVENTS2_ONUNLOAD)] + void onunload([in] IHTMLEventObj* pEvtObj); + + [id(DISPID_HTMLWINDOWEVENTS2_ONHELP)] + VARIANT_BOOL onhelp([in] IHTMLEventObj* pEvtObj); + + [id(DISPID_HTMLWINDOWEVENTS2_ONFOCUS)] + void onfocus([in] IHTMLEventObj* pEvtObj); + + [id(DISPID_HTMLWINDOWEVENTS2_ONBLUR)] + void onblur([in] IHTMLEventObj* pEvtObj); + + [id(DISPID_HTMLWINDOWEVENTS2_ONERROR)] + void onerror([in] BSTR description, + [in] BSTR url, + [in] LONG line); + + [id(DISPID_HTMLWINDOWEVENTS2_ONRESIZE)] + void onresize([in] IHTMLEventObj* pEvtObj); + + [id(DISPID_HTMLWINDOWEVENTS2_ONSCROLL)] + void onscroll([in] IHTMLEventObj* pEvtObj); + + [id(DISPID_HTMLWINDOWEVENTS2_ONBEFOREUNLOAD)] + void onbeforeunload([in] IHTMLEventObj* pEvtObj); + + [id(DISPID_HTMLWINDOWEVENTS2_ONBEFOREPRINT)] + void onbeforeprint([in] IHTMLEventObj* pEvtObj); + + [id(DISPID_HTMLWINDOWEVENTS2_ONAFTERPRINT)] + void onafterprint([in] IHTMLEventObj* pEvtObj); +}; + +/***************************************************************************** + * HTMLWindowProxy class + */ +[ + uuid(3050f391-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLWindowProxy +{ + [default] dispinterface DispHTMLWindowProxy; + [source, default] dispinterface HTMLWindowEvents; + [source] dispinterface HTMLWindowEvents2; + interface IHTMLWindow2; + interface IHTMLWindow3; + interface IHTMLWindow4; + interface IHTMLWindow5; +}; + +/***************************************************************************** * HTMLDocumentEvents2 interface */ [

1 0