October 2010 - Wine-commits

Alexandre Julliard : user32: Convert the icon cache to a standard Wine list .
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 975bff627b7dd26df5715e080504f4e80933ae7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=975bff627b7dd26df5715e080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 15:06:16 2010 +0200 user32: Convert the icon cache to a standard Wine list. --- dlls/user32/cursoricon.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index cea5552..ec9fd7e 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -38,6 +38,7 @@ #include "wine/server.h" #include "controls.h" #include "user_private.h" +#include "wine/list.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(cursor); @@ -76,15 +77,10 @@ static const WCHAR DISPLAYW[] = {'D','I','S','P','L','A','Y',0}; /********************************************************************** * ICONCACHE for cursors/icons loaded with LR_SHARED. - * - * FIXME: This should not be allocated on the system heap, but on a - * subsystem-global heap (i.e. one for all Win16 processes, - * and one for each Win32 process). */ typedef struct tagICONCACHE { - struct tagICONCACHE *next; - + struct list entry; HMODULE hModule; HRSRC hRsrc; HRSRC hGroupRsrc; @@ -94,7 +90,7 @@ typedef struct tagICONCACHE } ICONCACHE; -static ICONCACHE *IconAnchor = NULL; +static struct list icon_cache = LIST_INIT( icon_cache ); static CRITICAL_SECTION IconCrst; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -413,7 +409,7 @@ static HICON CURSORICON_FindSharedIcon( HMODULE hModule, HRSRC hRsrc ) EnterCriticalSection( &IconCrst ); - for ( ptr = IconAnchor; ptr; ptr = ptr->next ) + LIST_FOR_EACH_ENTRY( ptr, &icon_cache, ICONCACHE, entry ) if ( ptr->hModule == hModule && ptr->hRsrc == hRsrc ) { ptr->count++; @@ -443,16 +439,15 @@ static ICONCACHE* CURSORICON_FindCache(HICON hIcon) { ICONCACHE *ptr; ICONCACHE *pRet=NULL; - BOOL IsFound = FALSE; EnterCriticalSection( &IconCrst ); - for (ptr = IconAnchor; ptr != NULL && !IsFound; ptr = ptr->next) + LIST_FOR_EACH_ENTRY( ptr, &icon_cache, ICONCACHE, entry ) { if ( hIcon == ptr->hIcon ) { - IsFound = TRUE; pRet = ptr; + break; } } @@ -476,8 +471,7 @@ static void CURSORICON_AddSharedIcon( HMODULE hModule, HRSRC hRsrc, HRSRC hGroup ptr->count = 1; EnterCriticalSection( &IconCrst ); - ptr->next = IconAnchor; - IconAnchor = ptr; + list_add_head( &icon_cache, &ptr->entry ); LeaveCriticalSection( &IconCrst ); } @@ -491,7 +485,7 @@ static INT CURSORICON_DelSharedIcon( HICON hIcon ) EnterCriticalSection( &IconCrst ); - for ( ptr = IconAnchor; ptr; ptr = ptr->next ) + LIST_FOR_EACH_ENTRY( ptr, &icon_cache, ICONCACHE, entry ) if ( ptr->hIcon == hIcon ) { if ( ptr->count > 0 ) ptr->count--;

1 0

Alexandre Julliard : user32: Get rid of the unused icon cache refcount.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: d9ae28926bd56f1c5b34ab7ccf74ccb26e196f5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ae28926bd56f1c5b34ab7cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 15:09:37 2010 +0200 user32: Get rid of the unused icon cache refcount. --- dlls/user32/cursoricon.c | 31 +------------------------------ 1 files changed, 1 insertions(+), 30 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index ec9fd7e..e27365c 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -85,9 +85,6 @@ typedef struct tagICONCACHE HRSRC hRsrc; HRSRC hGroupRsrc; HICON hIcon; - - INT count; - } ICONCACHE; static struct list icon_cache = LIST_INIT( icon_cache ); @@ -412,7 +409,6 @@ static HICON CURSORICON_FindSharedIcon( HMODULE hModule, HRSRC hRsrc ) LIST_FOR_EACH_ENTRY( ptr, &icon_cache, ICONCACHE, entry ) if ( ptr->hModule == hModule && ptr->hRsrc == hRsrc ) { - ptr->count++; hIcon = ptr->hIcon; break; } @@ -468,7 +464,6 @@ static void CURSORICON_AddSharedIcon( HMODULE hModule, HRSRC hRsrc, HRSRC hGroup ptr->hRsrc = hRsrc; ptr->hIcon = hIcon; ptr->hGroupRsrc = hGroupRsrc; - ptr->count = 1; EnterCriticalSection( &IconCrst ); list_add_head( &icon_cache, &ptr->entry ); @@ -476,29 +471,6 @@ static void CURSORICON_AddSharedIcon( HMODULE hModule, HRSRC hRsrc, HRSRC hGroup } /********************************************************************** - * CURSORICON_DelSharedIcon - */ -static INT CURSORICON_DelSharedIcon( HICON hIcon ) -{ - INT count = -1; - ICONCACHE *ptr; - - EnterCriticalSection( &IconCrst ); - - LIST_FOR_EACH_ENTRY( ptr, &icon_cache, ICONCACHE, entry ) - if ( ptr->hIcon == hIcon ) - { - if ( ptr->count > 0 ) ptr->count--; - count = ptr->count; - break; - } - - LeaveCriticalSection( &IconCrst ); - - return count; -} - -/********************************************************************** * get_icon_size */ BOOL get_icon_size( HICON handle, SIZE *size ) @@ -1599,8 +1571,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) { TRACE_(icon)("%p\n", hIcon ); - if (CURSORICON_DelSharedIcon( hIcon ) == -1) - free_icon_handle( hIcon ); + if (!CURSORICON_FindCache( hIcon )) free_icon_handle( hIcon ); return TRUE; }

1 0

Henri Verbeet : wined3d: Allow multiple shader instruction destination arguments.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 7c7205d90aaf0528819b62aabbbed6c1008fa70b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7205d90aaf0528819b62aab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 8 13:12:14 2010 +0200 wined3d: Allow multiple shader instruction destination arguments. --- dlls/wined3d/shader.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 854c4ad..ac3e911 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -641,7 +641,7 @@ static HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct * Relative addressing tokens are ignored, but that's * okay, since we'll catch any address registers when * they are initialized (required by spec). */ - if (ins.dst_count) + for (i = 0; i < ins.dst_count; ++i) { struct wined3d_shader_src_param dst_rel_addr; struct wined3d_shader_dst_param dst_param; @@ -1164,11 +1164,11 @@ void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffe IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)shader->baseShader.device; const struct wined3d_shader_frontend *fe = shader->baseShader.frontend; void *fe_data = shader->baseShader.frontend_data; + struct wined3d_shader_src_param dst_rel_addr[2]; struct wined3d_shader_src_param src_rel_addr[4]; + struct wined3d_shader_dst_param dst_param[2]; struct wined3d_shader_src_param src_param[4]; struct wined3d_shader_version shader_version; - struct wined3d_shader_src_param dst_rel_addr; - struct wined3d_shader_dst_param dst_param; struct wined3d_shader_instruction ins; struct wined3d_shader_context ctx; const DWORD *ptr = byte_code; @@ -1182,7 +1182,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffe ctx.backend_data = backend_ctx; ins.ctx = &ctx; - ins.dst = &dst_param; + ins.dst = dst_param; ins.src = src_param; shader->baseShader.parse_state.current_row = 0; @@ -1221,8 +1221,11 @@ void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffe continue; } - /* Destination token */ - if (ins.dst_count) fe->shader_read_dst_param(fe_data, &ptr, &dst_param, &dst_rel_addr); + /* Destination tokens */ + for (i = 0; i < ins.dst_count; ++i) + { + fe->shader_read_dst_param(fe_data, &ptr, &dst_param[i], &dst_rel_addr[i]); + } /* Predication token */ if (ins.predicate) @@ -1393,13 +1396,14 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe } else { - struct wined3d_shader_src_param dst_rel_addr, src_rel_addr; - struct wined3d_shader_dst_param dst_param; + struct wined3d_shader_src_param dst_rel_addr[2]; + struct wined3d_shader_src_param src_rel_addr; + struct wined3d_shader_dst_param dst_param[2]; struct wined3d_shader_src_param src_param; - if (ins.dst_count) + for (i = 0; i < ins.dst_count; ++i) { - fe->shader_read_dst_param(fe_data, &ptr, &dst_param, &dst_rel_addr); + fe->shader_read_dst_param(fe_data, &ptr, &dst_param[i], &dst_rel_addr[i]); } /* Print out predication source token first - it follows @@ -1438,12 +1442,12 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe TRACE("p"); } - /* We already read the destination token, print it. */ - if (ins.dst_count) + /* We already read the destination tokens, print them. */ + for (i = 0; i < ins.dst_count; ++i) { - shader_dump_ins_modifiers(&dst_param); - TRACE(" "); - shader_dump_dst_param(&dst_param, &shader_version); + shader_dump_ins_modifiers(&dst_param[i]); + TRACE(!i ? " " : ", "); + shader_dump_dst_param(&dst_param[i], &shader_version); } /* Other source tokens */

1 0

Henri Verbeet : wined3d: Recognize the SM4 NULL register type.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 0677a67c7b1cf4b8439b206ec5e8634ae22a854a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0677a67c7b1cf4b8439b206ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 8 13:12:15 2010 +0200 wined3d: Recognize the SM4 NULL register type. --- dlls/wined3d/shader.c | 10 ++++++++-- dlls/wined3d/shader_sm4.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ac3e911..682188e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1018,6 +1018,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, TRACE("cb"); break; + case WINED3DSPR_NULL: + TRACE("null"); + break; + default: TRACE("unhandled_rtype(%#x)", reg->type); break; @@ -1044,7 +1048,9 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, } TRACE(")"); } - else if (reg->type != WINED3DSPR_RASTOUT && reg->type != WINED3DSPR_MISCTYPE) + else if (reg->type != WINED3DSPR_RASTOUT + && reg->type != WINED3DSPR_MISCTYPE + && reg->type != WINED3DSPR_NULL) { if (reg->array_idx != ~0U) { @@ -1077,7 +1083,7 @@ void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, shader_dump_register(&param->reg, shader_version); - if (write_mask != WINED3DSP_WRITEMASK_ALL) + if (write_mask && write_mask != WINED3DSP_WRITEMASK_ALL) { static const char *write_mask_chars = "xyzw"; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 0b9d6fd..7ab6c1a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -84,6 +84,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_OUTPUT = 0x2, WINED3D_SM4_RT_IMMCONST = 0x4, WINED3D_SM4_RT_CONSTBUFFER = 0x8, + WINED3D_SM4_RT_NULL = 0xd, }; enum wined3d_sm4_immconst_type @@ -156,6 +157,11 @@ static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = /* UNKNOWN */ 0, /* UNKNOWN */ 0, /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, }; static const struct sysval_map sysval_map[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 36b7337..bb719ca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -308,6 +308,7 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE WINED3DSPR_PREDICATE = 19, WINED3DSPR_IMMCONST, WINED3DSPR_CONSTBUFFER, + WINED3DSPR_NULL, } WINED3DSHADER_PARAM_REGISTER_TYPE; enum wined3d_immconst_type

1 0

Henri Verbeet : wined3d: Recognize the SM4 imul opcode.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: d369136a9664900d7bea3b47a7fb835e158a35b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d369136a9664900d7bea3b47a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 8 13:12:16 2010 +0200 wined3d: Recognize the SM4 imul opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7c10407..c053e7f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4966,6 +4966,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_IGE */ NULL, + /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LIT */ shader_hw_map2gl, /* WINED3DSIH_LOG */ shader_hw_log_pow, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d24260d..8e9795e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5024,6 +5024,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ NULL, + /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOG */ shader_glsl_log, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 682188e..075c204 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -70,6 +70,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IF */ "if", /* WINED3DSIH_IFC */ "ifc", /* WINED3DSIH_IGE */ "ige", + /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LIT */ "lit", /* WINED3DSIH_LOG */ "log", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 7ab6c1a..ea845dc 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -63,6 +63,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IADD = 0x1e, WINED3D_SM4_OP_IF = 0x1f, WINED3D_SM4_OP_IGE = 0x21, + WINED3D_SM4_OP_IMUL = 0x26, WINED3D_SM4_OP_LOG = 0x2f, WINED3D_SM4_OP_LOOP = 0x30, WINED3D_SM4_OP_LT = 0x31, @@ -132,6 +133,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IADD, WINED3DSIH_IADD, 1, 2}, {WINED3D_SM4_OP_IF, WINED3DSIH_IF, 0, 1}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, 1, 2}, + {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, 2, 2}, {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, 1, 1}, {WINED3D_SM4_OP_LOOP, WINED3DSIH_LOOP, 0, 0}, {WINED3D_SM4_OP_LT, WINED3DSIH_LT, 1, 2}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb719ca..467eb28 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -438,6 +438,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IF, WINED3DSIH_IFC, WINED3DSIH_IGE, + WINED3DSIH_IMUL, WINED3DSIH_LABEL, WINED3DSIH_LIT, WINED3DSIH_LOG,

1 0

Henri Verbeet : wined3d: The SM4 sincos opcode has two destination arguments.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 3e45fe7488f72e4247aaeb72829b227e6cabf188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e45fe7488f72e4247aaeb728… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 8 13:12:17 2010 +0200 wined3d: The SM4 sincos opcode has two destination arguments. --- dlls/wined3d/shader_sm4.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ea845dc..ecd1ec3 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -145,7 +145,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, 0, 0}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, 1, 1}, - {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 1, 2}, + {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, }; static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] =

1 0

Nikolay Sivov : msxml: Register XMLHTTP objects.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 25dc6c7c9e3459336a8ffc102c3d2f16e2e01cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=25dc6c7c9e3459336a8ffc102… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 02:25:46 2010 +0400 msxml: Register XMLHTTP objects. --- dlls/msxml3/httprequest.c | 4 ---- dlls/msxml3/regsvr.c | 26 ++++++++++++++++++++++++++ dlls/msxml4/regsvr.c | 13 +++++++++++++ dlls/msxml6/regsvr.c | 13 +++++++++++++ 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 3a3e0d6..6ff0f96 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -317,8 +317,6 @@ static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback * return E_NOTIMPL; } -#undef STATUSCLB_THIS - static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { BindStatusCallback_QueryInterface, BindStatusCallback_AddRef, @@ -402,8 +400,6 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c return S_OK; } -#undef HTTPNEG2_THIS - static const IHttpNegotiateVtbl BSCHttpNegotiateVtbl = { BSCHttpNegotiate_QueryInterface, BSCHttpNegotiate_AddRef, diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index c528ec4..ca1cc12 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -540,6 +540,22 @@ static struct regsvr_coclass const coclass_list[] = { "Microsoft.XMLHTTP", "1.0" }, + { &CLSID_XMLHTTP26, + "XML HTTP 2.6", + NULL, + "msxml3.dll", + "Apartment", + "Msxml2.XMLHTTP.2.6", + "2.6" + }, + { &CLSID_XMLHTTP30, + "XML HTTP 3.0", + NULL, + "msxml3.dll", + "Apartment", + "Msxml2.XMLHTTP.3.0", + "3.0" + }, { &CLSID_XMLDSOControl, "XML Data Source Object", NULL, @@ -701,6 +717,16 @@ static struct progid const progid_list[] = { &CLSID_XMLHTTPRequest, NULL }, + { "Msxml2.XMLHTTP.2.6", + "XML HTTP 2.6", + &CLSID_XMLHTTP26, + NULL + }, + { "Msxml2.XMLHTTP.3.0", + "XML HTTP 3.0", + &CLSID_XMLHTTP30, + NULL + }, { "Microsoft.XMLDSO", "XML Data Source Object", &CLSID_XMLDSOControl, diff --git a/dlls/msxml4/regsvr.c b/dlls/msxml4/regsvr.c index e4b1a0d..a89683f 100644 --- a/dlls/msxml4/regsvr.c +++ b/dlls/msxml4/regsvr.c @@ -385,6 +385,14 @@ static struct regsvr_coclass const coclass_list[] = { "Microsoft.FreeThreadedDOMDocument4.0", "4.0" }, + { &CLSID_XMLHTTP40, + "XML HTTP 4.0", + NULL, + "msxml4.dll", + "Apartment", + "Msxml2.XMLHTTP.4.0", + "4.0" + }, { NULL } /* list terminator */ }; @@ -397,6 +405,11 @@ static struct progid const progid_list[] = { &CLSID_DOMDocument40, NULL }, + { "Msxml2.XMLHTTP.4.0", + "XML HTTP 4.0", + &CLSID_XMLHTTP40, + NULL + }, { "Msxml2.SAXXMLReader.4.0", "SAX XML Reader 4.0", &CLSID_SAXXMLReader40, diff --git a/dlls/msxml6/regsvr.c b/dlls/msxml6/regsvr.c index 872015d..70a6fc4 100644 --- a/dlls/msxml6/regsvr.c +++ b/dlls/msxml6/regsvr.c @@ -346,6 +346,14 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.DOMDocument", "6.0" }, + { &CLSID_XMLHTTP60, + "XML HTTP 6.0", + NULL, + "msxml6.dll", + "Apartment", + "Msxml2.XMLHTTP.6.0", + "6.0" + }, { &CLSID_XMLSchemaCache60, "XML Schema Cache 6.0", NULL, @@ -390,6 +398,11 @@ static struct progid const progid_list[] = { &CLSID_DOMDocument60, NULL }, + { "Msxml2.XMLHTTP.6.0", + "XML XMLHTTP 6.0", + &CLSID_XMLHTTP60, + NULL + }, { "Msxml2.XMLSchemaCache.6.0", "XML Schema Cache 6.0", &CLSID_XMLSchemaCache60,

1 0

Nikolay Sivov : msxml3: Implement ::abort().
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: e1ca5965b8341aa9f459a3e75d14523f443b63b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ca5965b8341aa9f459a3e75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 11:41:08 2010 +0400 msxml3: Implement ::abort(). --- dlls/msxml3/httprequest.c | 9 +++++++-- dlls/msxml3/tests/domdoc.c | 19 +++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 6ff0f96..e347096 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -731,9 +731,14 @@ static HRESULT WINAPI httprequest_abort(IXMLHTTPRequest *iface) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); - FIXME("stub (%p)\n", This); + TRACE("(%p)\n", This); - return E_NOTIMPL; + BindStatusCallback_Detach(This->bsc); + This->bsc = NULL; + + httprequest_setreadystate(This, READYSTATE_UNINITIALIZED); + + return S_OK; } static HRESULT WINAPI httprequest_get_status(IXMLHTTPRequest *iface, LONG *status) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6035d2b..62c59b7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3225,6 +3225,9 @@ if (0) ok(hr == S_OK, "got 0x%08x\n", hr); } + hr = IXMLHttpRequest_abort(pXMLHttpRequest); + ok(hr == S_OK, "got 0x%08x\n", hr); + /* send before open */ hr = IXMLHttpRequest_send(pXMLHttpRequest, dummy); ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); @@ -3266,7 +3269,7 @@ if (0) state = -1; hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, &state); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(state == 0, "got %d, expected 0\n", state); + ok(state == READYSTATE_UNINITIALIZED, "got %d, expected READYSTATE_UNINITIALIZED\n", state); event = create_dispevent(); ref = IDispatch_AddRef(event); @@ -3297,7 +3300,19 @@ if (0) state = -1; hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, &state); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(state == 1, "got %d, expected 1\n", state); + ok(state == READYSTATE_LOADING, "got %d, expected READYSTATE_LOADING\n", state); + + hr = IXMLHttpRequest_abort(pXMLHttpRequest); + ok(hr == S_OK, "got 0x%08x\n", hr); + + state = -1; + hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == READYSTATE_UNINITIALIZED || broken(state == READYSTATE_LOADING) /* win98, win2k */, + "got %d, expected READYSTATE_UNINITIALIZED\n", state); + + hr = IXMLHttpRequest_open(pXMLHttpRequest, method, url, async, dummy, dummy); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, _bstr_("header1"), _bstr_("value1")); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : msxml3: Callback only if state really changed.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 8630368afb5db6c85f8f65ae1960c1f0f0cdb1ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8630368afb5db6c85f8f65ae1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 11:41:48 2010 +0400 msxml3: Callback only if state really changed. --- dlls/msxml3/httprequest.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index e347096..c09f31e 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -90,9 +90,11 @@ static inline httprequest *impl_from_IXMLHTTPRequest( IXMLHTTPRequest *iface ) static void httprequest_setreadystate(httprequest *This, READYSTATE state) { + READYSTATE last = This->state; + This->state = state; - if (This->sink) + if (This->sink && last != state) { DISPPARAMS params;

1 0

Nikolay Sivov : msxml3: Implement ::get_responseBody().
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: f0546a1961c60b801781ccb78697f4b015eb22ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0546a1961c60b801781ccb78… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 11:42:36 2010 +0400 msxml3: Implement ::get_responseBody(). --- dlls/msxml3/httprequest.c | 48 +++++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 24 +++++++++++++++++++++- 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index c09f31e..3c2c049 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -824,13 +824,55 @@ static HRESULT WINAPI httprequest_get_responseText(IXMLHTTPRequest *iface, BSTR return hr; } -static HRESULT WINAPI httprequest_get_responseBody(IXMLHTTPRequest *iface, VARIANT *pvarBody) +static HRESULT WINAPI httprequest_get_responseBody(IXMLHTTPRequest *iface, VARIANT *body) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); + HGLOBAL hglobal; + HRESULT hr; - FIXME("stub %p %p\n", This, pvarBody); + TRACE("(%p)->(%p)\n", This, body); - return E_NOTIMPL; + if (!body) return E_INVALIDARG; + if (This->state != READYSTATE_COMPLETE) return E_FAIL; + + hr = GetHGlobalFromStream(This->bsc->stream, &hglobal); + if (hr == S_OK) + { + void *ptr = GlobalLock(hglobal); + DWORD size = GlobalSize(hglobal); + + SAFEARRAYBOUND bound; + SAFEARRAY *array; + + bound.lLbound = 0; + bound.cElements = size; + array = SafeArrayCreate(VT_UI1, 1, &bound); + + if (array) + { + void *dest; + + V_VT(body) = VT_ARRAY | VT_UI1; + V_ARRAY(body) = array; + + hr = SafeArrayAccessData(array, &dest); + if (hr == S_OK) + { + memcpy(dest, ptr, size); + SafeArrayUnaccessData(array); + } + else + { + VariantClear(body); + } + } + else + hr = E_FAIL; + + GlobalUnlock(hglobal); + } + + return hr; } static HRESULT WINAPI httprequest_get_responseStream(IXMLHTTPRequest *iface, VARIANT *pvarBody) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 62c59b7..d85bda9 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3195,7 +3195,8 @@ static void test_XMLHTTP(void) VARIANT dummy; VARIANT async; VARIANT varbody; - LONG state, status, ref; + LONG state, status, ref, bound; + void *ptr; IDispatch *event; HRESULT hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLHttpRequest, @@ -3388,6 +3389,27 @@ todo_wine { SysFreeString(bstrResponse); } + hr = IXMLHttpRequest_get_responseBody(pXMLHttpRequest, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + V_VT(&varbody) = VT_EMPTY; + hr = IXMLHttpRequest_get_responseBody(pXMLHttpRequest, &varbody); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&varbody) == (VT_ARRAY|VT_UI1), "got type %d, expected %d\n", V_VT(&varbody), VT_ARRAY|VT_UI1); + ok(SafeArrayGetDim(V_ARRAY(&varbody)) == 1, "got %d, expected one dimension\n", SafeArrayGetDim(V_ARRAY(&varbody))); + + bound = -1; + hr = SafeArrayGetLBound(V_ARRAY(&varbody), 1, &bound); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bound == 0, "got %d, expected zero bound\n", bound); + + hr = SafeArrayAccessData(V_ARRAY(&varbody), &ptr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(memcmp(ptr, xmltestbodyA, sizeof(xmltestbodyA)-1) == 0, "got wrond body data\n"); + SafeArrayUnaccessData(V_ARRAY(&varbody)); + + VariantClear(&varbody); + SysFreeString(url); IDispatch_Release(event);

1 0