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

Nikolay Sivov : comctl32/treeview: Always return state from TVM_GETITEM handler.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 1fa1c72d90b69c739a1004b6d0d686548cdcdb22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa1c72d90b69c739a1004b6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 14 15:12:06 2011 +0400 comctl32/treeview: Always return state from TVM_GETITEM handler. --- dlls/comctl32/tests/treeview.c | 112 +++++++++++++++++++++++++++++++++++----- dlls/comctl32/treeview.c | 19 +++---- 2 files changed, 106 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fa1c72d90b69c739a100…

1 0

Vincent Povirk : gdiplus: Set export ordinals to match Windows 7.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 73e50ba60e852831a29b9b5062d6a8578f5bb8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e50ba60e852831a29b9b506… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 14 15:52:56 2011 -0500 gdiplus: Set export ordinals to match Windows 7. --- dlls/gdiplus/gdiplus.spec | 1260 ++++++++++++++++++++++---------------------- 1 files changed, 630 insertions(+), 630 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73e50ba60e852831a29b9…

1 0

Juan Lang : setupapi: Always initialize output parameter to avoid crash in buggy applications.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 53b287530961beaaae89bd063bc0d63ef41036ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b287530961beaaae89bd063… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat May 14 14:55:28 2011 -0700 setupapi: Always initialize output parameter to avoid crash in buggy applications. --- dlls/setupapi/devinst.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5b8fb3c..0a3c3bd 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2821,6 +2821,8 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + /* In case application fails to check return value, clear output */ + memset(DeviceInterfaceData, 0, sizeof(*DeviceInterfaceData)); if (DeviceInfoData) { struct DeviceInfo *devInfo =

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: a006296dcafc92b18a230cdc80c3a0872304e3a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a006296dcafc92b18a230cdc8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 11:27:01 2011 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddrawmodes.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index ae090a2..61f07fe 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -501,7 +501,7 @@ static void enumdisplaymodes(void) modes16bpp_cnt = 0; ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_PITCH; - ddsd.lPitch = 123; + U1(ddsd).lPitch = 123; rc = IDirectDraw_EnumDisplayModes(lpDD, 0, &ddsd, 0, enummodescallback_16bit); ok(rc==DD_OK,"EnumDisplayModes returned: %x\n",rc); @@ -509,7 +509,7 @@ static void enumdisplaymodes(void) modes16bpp_cnt = 0; ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_REFRESHRATE; - ddsd.dwRefreshRate = 1; + U2(ddsd).dwRefreshRate = 1; rc = IDirectDraw_EnumDisplayModes(lpDD, 0, &ddsd, 0, enummodescallback_16bit); ok(rc==DD_OK,"EnumDisplayModes returned: %x\n",rc); @@ -531,7 +531,7 @@ static void enumdisplaymodes(void) { modes16bpp_cnt = 0; ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_REFRESHRATE; - ddsd.dwRefreshRate = refresh_rate; + U2(ddsd).dwRefreshRate = refresh_rate; rc = IDirectDraw_EnumDisplayModes(lpDD, 0, &ddsd, 0, enummodescallback_16bit); ok(rc==DD_OK,"EnumDisplayModes returned: %x\n",rc);

1 0

Francois Gouget : user32: Use MSGBOX_IDICON throughout instead of sometimes using stc1 and sometimes 1088 .
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: dc63061af12462c5f670c68ae6b627112349cde9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc63061af12462c5f670c68ae… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 11:29:38 2011 +0200 user32: Use MSGBOX_IDICON throughout instead of sometimes using stc1 and sometimes 1088. --- dlls/user32/msgbox.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index effe09b..ba18076 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dialog); WINE_DECLARE_DEBUG_CHANNEL(msgbox); -#define MSGBOX_IDICON 1088 +#define MSGBOX_IDICON stc1 #define MSGBOX_IDTEXT 100 #define IDS_ERROR 2 @@ -175,23 +175,23 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* Set the icon */ switch(lpmb->dwStyle & MB_ICONMASK) { case MB_ICONEXCLAMATION: - SendDlgItemMessageW(hwnd, stc1, STM_SETICON, + SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)LoadIconW(0, (LPWSTR)IDI_EXCLAMATION), 0); break; case MB_ICONQUESTION: - SendDlgItemMessageW(hwnd, stc1, STM_SETICON, + SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)LoadIconW(0, (LPWSTR)IDI_QUESTION), 0); break; case MB_ICONASTERISK: - SendDlgItemMessageW(hwnd, stc1, STM_SETICON, + SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)LoadIconW(0, (LPWSTR)IDI_ASTERISK), 0); break; case MB_ICONHAND: - SendDlgItemMessageW(hwnd, stc1, STM_SETICON, + SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)LoadIconW(0, (LPWSTR)IDI_HAND), 0); break; case MB_USERICON: - SendDlgItemMessageW(hwnd, stc1, STM_SETICON, + SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)LoadIconW(lpmb->hInstance, lpmb->lpszIcon), 0); break; default:

1 0

Francois Gouget : usp10/tests: Add a '\n' to an ok() call.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: f73b860bc2c8dd33da981cd6083c8b1026711959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73b860bc2c8dd33da981cd60… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 11:30:44 2011 +0200 usp10/tests: Add a '\n' to an ok() call. --- dlls/usp10/tests/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index f741786..a58d8b8 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -202,7 +202,7 @@ static void test_ScriptItemize( void ) int nItems; usp10 = LoadLibraryA("usp10.dll"); - ok (usp10 != 0,"Unable to LoadLibrary on usp10.dll"); + ok (usp10 != 0,"Unable to LoadLibrary on usp10.dll\n"); pScriptItemizeOpenType = (void*)GetProcAddress(usp10, "ScriptItemizeOpenType"); memset(&Control, 0, sizeof(Control));

1 0

Alexandre Julliard : msvcrt: Add support for __ptr64 attribute in symbol demangling.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 5e1b9c149eb88ba87238e49e079824d89c9bd131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1b9c149eb88ba87238e49e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 14 14:11:50 2011 +0200 msvcrt: Add support for __ptr64 attribute in symbol demangling. --- dlls/msvcrt/tests/cpp.c | 2 + dlls/msvcrt/undname.c | 54 ++++++++++++++++++++++++++++++---------------- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index dfb2cd7..b4eb515 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1051,6 +1051,8 @@ static void test_demangle(void) /* 116 */ {"?vswprintf@@YAHPAGIPBGPAD(a)Z", "int __cdecl vswprintf(unsigned short *,unsigned int,unsigned short const *,char *)"}, /* 117 */ {"?vswprintf@@YAHPA_WIPB_WPAD(a)Z", "int __cdecl vswprintf(wchar_t *,unsigned int,wchar_t const *,char *)"}, /* 118 */ {"?swprintf@@YAHPA_WIPB_WZZ", "int __cdecl swprintf(wchar_t *,unsigned int,wchar_t const *,...)"}, +/* 119 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & __ptr64 __cdecl std::operator*=(class std::complex<float> & __ptr64,class std::complex<float> const & __ptr64)"}, +/* 120 */ {"?_Doraise(a)bad_cast@std@@MEBAXXZ", "protected: virtual void __cdecl std::bad_cast::_Doraise(void)const __ptr64"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 920a763..8ed0757 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -416,11 +416,17 @@ static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_t /****************************************************************** * get_modifier - * Parses the type modifier. Always returns a static string + * Parses the type modifier. Always returns static strings. */ -static BOOL get_modifier(char ch, const char** ret) +static BOOL get_modifier(struct parsed_symbol *sym, const char **ret, const char **ptr_modif) { - switch (ch) + *ptr_modif = NULL; + if (*sym->current == 'E') + { + *ptr_modif = "__ptr64"; + sym->current++; + } + switch (*sym->current++) { case 'A': *ret = NULL; break; case 'B': *ret = "const"; break; @@ -436,20 +442,27 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, { const char* modifier; const char* str_modif; + const char *ptr_modif = ""; + + if (*sym->current == 'E') + { + ptr_modif = " __ptr64"; + sym->current++; + } switch (modif) { - case 'A': str_modif = " &"; break; - case 'B': str_modif = " & volatile"; break; - case 'P': str_modif = " *"; break; - case 'Q': str_modif = " * const"; break; - case 'R': str_modif = " * volatile"; break; - case 'S': str_modif = " * const volatile"; break; + case 'A': str_modif = str_printf(sym, " &%s", ptr_modif); break; + case 'B': str_modif = str_printf(sym, " &%s volatile", ptr_modif); break; + case 'P': str_modif = str_printf(sym, " *%s", ptr_modif); break; + case 'Q': str_modif = str_printf(sym, " *%s const", ptr_modif); break; + case 'R': str_modif = str_printf(sym, " *%s volatile", ptr_modif); break; + case 'S': str_modif = str_printf(sym, " *%s const volatile", ptr_modif); break; case '?': str_modif = ""; break; default: return FALSE; } - if (get_modifier(*sym->current++, &modifier)) + if (get_modifier(sym, &modifier, &ptr_modif)) { unsigned mark = sym->stack.num; struct datatype_t sub_ct; @@ -924,10 +937,10 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case '$': if (*sym->current == 'C') { - const char* ptr; + const char *ptr, *ptr_modif; sym->current++; - if (!get_modifier(*sym->current++, &ptr)) goto done; + if (!get_modifier(sym, &ptr, &ptr_modif)) goto done; if (!demangle_datatype(sym, ct, pmt_ref, in_args)) goto done; ct->left = str_printf(sym, "%s %s", ct->left, ptr); } @@ -960,6 +973,7 @@ static BOOL handle_data(struct parsed_symbol* sym) const char* access = NULL; const char* member_type = NULL; const char* modifier = NULL; + const char* ptr_modif; struct datatype_t ct; char* name = NULL; BOOL ret = FALSE; @@ -1004,14 +1018,16 @@ static BOOL handle_data(struct parsed_symbol* sym) str_array_init(&pmt); if (!demangle_datatype(sym, &ct, &pmt, FALSE)) goto done; - if (!get_modifier(*sym->current++, &modifier)) goto done; + if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; + if (modifier && ptr_modif) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); + else if (!modifier) modifier = ptr_modif; sym->stack.num = mark; } break; case '6' : /* compiler generated static */ case '7' : /* compiler generated static */ ct.left = ct.right = NULL; - if (!get_modifier(*sym->current++, &modifier)) goto done; + if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; if (*sym->current != '@') { char* cls = NULL; @@ -1123,10 +1139,11 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) { if (((accmem - 'A') % 8) != 2 && ((accmem - 'A') % 8) != 3) { + const char *ptr_modif; /* Implicit 'this' pointer */ /* If there is an implicit this pointer, const modifier follows */ - if (!get_modifier(*sym->current, &modifier)) goto done; - sym->current++; + if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; + if (modifier || ptr_modif) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); } } @@ -1164,12 +1181,11 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) /* Note: '()' after 'Z' means 'throws', but we don't care here * Yet!!! FIXME */ - sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s%s%s%s%s", + sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s%s%s%s", access, member_type, ct_ret.left, (ct_ret.left && !ct_ret.right) ? " " : NULL, call_conv, call_conv ? " " : NULL, exported, - name, args_str, modifier, - modifier ? " " : NULL, ct_ret.right); + name, args_str, modifier, ct_ret.right); ret = TRUE; done: return ret;

1 0

Alexandre Julliard : msvcrt: Add support for template operators in symbol demangling.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 5d12e970ff640a2c92a0fb31324ccc565e97f306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d12e970ff640a2c92a0fb313… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 14 16:19:33 2011 +0200 msvcrt: Add support for template operators in symbol demangling. --- dlls/msvcrt/tests/cpp.c | 3 +++ dlls/msvcrt/undname.c | 19 ++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index b4eb515..8d0dbd4 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1053,6 +1053,9 @@ static void test_demangle(void) /* 118 */ {"?swprintf@@YAHPA_WIPB_WZZ", "int __cdecl swprintf(wchar_t *,unsigned int,wchar_t const *,...)"}, /* 119 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & __ptr64 __cdecl std::operator*=(class std::complex<float> & __ptr64,class std::complex<float> const & __ptr64)"}, /* 120 */ {"?_Doraise(a)bad_cast@std@@MEBAXXZ", "protected: virtual void __cdecl std::bad_cast::_Doraise(void)const __ptr64"}, +/* 121 */ {"??$?DM(a)std@@YA?AV?$complex(a)M@0(a)ABMABV10@@Z", + "class std::complex<float> __cdecl std::operator*<float>(float const &,class std::complex<float> const &)", + "??$?DM(a)std@@YA?AV?$complex(a)M@0(a)ABMABV10@@Z"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 8ed0757..9c24f4a 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1238,10 +1238,16 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) sym->current++; /* Then function name or operator code */ - if (*sym->current == '?' && sym->current[1] != '$') + if (*sym->current == '?' && (sym->current[1] != '$' || sym->current[2] == '?')) { const char* function_name = NULL; + if (sym->current[1] == '$') + { + do_after = 6; + sym->current += 2; + } + /* C++ operator code (one character, or two if the first is '_') */ switch (*++sym->current) { @@ -1374,6 +1380,17 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) sym->result = (char*)function_name; ret = TRUE; goto done; + case 6: + { + char *args; + struct array array_pmt; + + str_array_init(&array_pmt); + args = get_args(sym, &array_pmt, FALSE, '<', '>'); + if (args != NULL) function_name = str_printf(sym, "%s%s", function_name, args); + sym->names.num = 0; + } + /* fall through */ default: if (!str_array_push(sym, function_name, -1, &sym->stack)) return FALSE;

1 0

Alexandre Julliard : msvcrt: Add support for function namespaces in symbol demangling.
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: 0c45c8b58e48fdd7b710b9c37cdfde529332525d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c45c8b58e48fdd7b710b9c37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 15 19:55:56 2011 +0200 msvcrt: Add support for function namespaces in symbol demangling. --- dlls/msvcrt/tests/cpp.c | 3 +++ dlls/msvcrt/undname.c | 29 +++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 8d0dbd4..bb6ba16 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1056,6 +1056,9 @@ static void test_demangle(void) /* 121 */ {"??$?DM(a)std@@YA?AV?$complex(a)M@0(a)ABMABV10@@Z", "class std::complex<float> __cdecl std::operator*<float>(float const &,class std::complex<float> const &)", "??$?DM(a)std@@YA?AV?$complex(a)M@0(a)ABMABV10@@Z"}, +/* 122 */ {"?_R2@?BN@???$_Fabs(a)N@std@@YANAEBV?$complex(a)N@1(a)PEAH@Z(a)4NB", + "double const `double __cdecl std::_Fabs<double>(class std::complex<double> const & __ptr64,int * __ptr64)'::`29'::_R2", + "?_R2@?BN@???$_Fabs(a)N@std@@YANAEBV?$complex(a)N@1(a)PEAH@Z(a)4NB"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 9c24f4a..7d296e1 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -106,6 +106,8 @@ struct datatype_t const char* right; }; +static BOOL symbol_demangle(struct parsed_symbol* sym); + /****************************************************************** * und_alloc * @@ -597,12 +599,31 @@ static BOOL get_class(struct parsed_symbol* sym) name = str_array_get_ref(&sym->names, *sym->current++ - '0'); break; case '?': - if (*++sym->current == '$') + switch (*++sym->current) { + case '$': sym->current++; if ((name = get_template_name(sym)) && !str_array_push(sym, name, -1, &sym->names)) return FALSE; + break; + case '?': + { + struct array stack = sym->stack; + unsigned int start = sym->names.start; + unsigned int num = sym->names.num; + + str_array_init( &sym->stack ); + if (symbol_demangle( sym )) name = str_printf( sym, "`%s'", sym->result ); + sym->names.start = start; + sym->names.num = num; + sym->stack = stack; + } + break; + default: + if (!(name = get_number( sym ))) return FALSE; + name = str_printf( sym, "`%s'", name ); + break; } break; default: @@ -1233,8 +1254,6 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) /* MS mangled names always begin with '?' */ if (*sym->current != '?') return FALSE; - str_array_init(&sym->names); - str_array_init(&sym->stack); sym->current++; /* Then function name or operator code */ @@ -1436,7 +1455,7 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) sym->flags &= ~UNDNAME_NO_FUNCTION_RETURNS; break; case 5: - sym->names.start = 1; + sym->names.start++; break; } @@ -1497,6 +1516,8 @@ char* CDECL __unDNameEx(char* buffer, const char* mangled, int buflen, sym.mem_alloc_ptr = memget; sym.mem_free_ptr = memfree; sym.current = mangled; + str_array_init( &sym.names ); + str_array_init( &sym.stack ); result = symbol_demangle(&sym) ? sym.result : mangled; if (buffer && buflen)

1 0

Jacek Caban : mshtml: Move document binding to the new document binding list in on_start_nsrequest .
by Alexandre Julliard 16 May '11

16 May '11

Module: wine Branch: master Commit: d7a2da5730f63513e0355f3755aecbb75e312575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a2da5730f63513e0355f375… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:17:59 2011 +0200 mshtml: Move document binding to the new document binding list in on_start_nsrequest. --- dlls/mshtml/navigate.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index eb2ba8f..bdb95a7 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -973,9 +973,12 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This) } if(This->window) { + list_remove(&This->bsc.entry); + list_init(&This->bsc.entry); update_window_doc(This->window); if(This->window->doc != This->bsc.doc) This->bsc.doc = This->window->doc; + list_add_head(&This->bsc.doc->bindings, &This->bsc.entry); if(This->window->readystate != READYSTATE_LOADING) set_ready_state(This->window, READYSTATE_LOADING); }

1 0