October 2012 - Wine-Commits

Matteo Bruni : wined3d: Add a D3D10-level fallback for Intel GPU recognition.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 4e57dd0cdea497d3e3ec7970fa338c0c87da0a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e57dd0cdea497d3e3ec7970f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 16 16:33:01 2012 +0200 wined3d: Add a D3D10-level fallback for Intel GPU recognition. --- dlls/wined3d/directx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3eb5eb0..686cead 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2164,6 +2164,9 @@ static enum wined3d_pci_device select_card_fallback_amd(const struct wined3d_gl_ static enum wined3d_pci_device select_card_fallback_intel(const struct wined3d_gl_info *gl_info) { + UINT d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 10) + return CARD_INTEL_G45; return CARD_INTEL_915G; }

1 0

Matteo Bruni : wined3d: Recognize AMD Radeon HD 5000 series GPUs on recent binary drivers.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 29c336916c9e6334d69b5f93de8b1a39595916f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c336916c9e6334d69b5f93d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 16 16:33:03 2012 +0200 wined3d: Recognize AMD Radeon HD 5000 series GPUs on recent binary drivers. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4c8d391..b161564 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1729,6 +1729,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in {"HD 5570", CARD_AMD_RADEON_HD5600}, /* Radeon EG REDWOOD PRO mapped to HD5600 series */ {"HD 5550", CARD_AMD_RADEON_HD5600}, /* Radeon EG REDWOOD LE mapped to HD5600 series */ {"HD 5450", CARD_AMD_RADEON_HD5400}, /* Radeon EG CEDAR PRO */ + {"HD 5000", CARD_AMD_RADEON_HD5600}, /* Defaulting to HD 5600 */ /* R700 */ {"HD 4890", CARD_AMD_RADEON_HD4800}, /* Radeon RV790 */ {"HD 4870", CARD_AMD_RADEON_HD4800}, /* Radeon RV770 */

1 0

Daniel Jelinski : regedit: Disallow editing root key names.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 003622c015298d2c4fcbdf63ccc62ca036acd0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=003622c015298d2c4fcbdf63c… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Tue Oct 16 20:14:52 2012 +0200 regedit: Disallow editing root key names. --- programs/regedit/childwnd.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 1ff7a90..6dc7d0c 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -405,6 +405,12 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); break; } + case TVN_BEGINLABELEDITW: { + HKEY hRootKey; + LPWSTR path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + if (!path || !*path) return 1; + return 0; + } case TVN_ENDLABELEDITW: { HKEY hRootKey; LPNMTVDISPINFOW dispInfo = (LPNMTVDISPINFOW)lParam;

1 0

Francois Gouget : shell32/tests: Fix a test_argify() check that fails on NT4 and Windows 2000.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 47d4041dc18aa536fbf3d0f49c159b87c4e2a2f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d4041dc18aa536fbf3d0f49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 16 16:07:08 2012 +0200 shell32/tests: Fix a test_argify() check that fails on NT4 and Windows 2000. --- dlls/shell32/tests/shlexec.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index e3d5676..3c630ef 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -704,7 +704,7 @@ static int StrCmpPath(const char* s1, const char* s2) return 0; } -static void _okChildString(const char* file, int line, const char* key, const char* expected) +static void _okChildString(const char* file, int line, const char* key, const char* expected, const char* bad) { char* result; result=getChildString("Arguments", key); @@ -713,7 +713,8 @@ static void _okChildString(const char* file, int line, const char* key, const ch ok_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); return; } - ok_(file, line)(lstrcmpiA(result, expected) == 0, + ok_(file, line)(lstrcmpiA(result, expected) == 0 || + broken(lstrcmpiA(result, bad) == 0), "%s expected '%s', got '%s'\n", key, expected, result); } @@ -738,7 +739,8 @@ static void _okChildInt(const char* file, int line, const char* key, int expecte "%s expected %d, but got %d\n", key, expected, result); } -#define okChildString(key, expected) _okChildString(__FILE__, __LINE__, (key), (expected)) +#define okChildString(key, expected) _okChildString(__FILE__, __LINE__, (key), (expected), (expected)) +#define okChildStringBroken(key, expected, broken) _okChildString(__FILE__, __LINE__, (key), (expected), (broken)) #define okChildPath(key, expected) _okChildPath(__FILE__, __LINE__, (key), (expected)) #define okChildInt(key, expected) _okChildInt(__FILE__, __LINE__, (key), (expected)) @@ -1219,6 +1221,7 @@ typedef struct const char* params; int todo; cmdline_tests_t cmd; + cmdline_tests_t broken; } argify_tests_t; static const argify_tests_t argify_tests[] = @@ -1324,7 +1327,9 @@ static const argify_tests_t argify_tests[] = /* An unclosed quoted string gets lost! */ {"Params23456", "p2 \"p3\" \"p4 is lost", 0x1c3, {" \"p2\" \"p3\" \"\" \"\" \"\"", - {"", "p2", "p3", "", "", "", NULL}, 0}}, + {"", "p2", "p3", "", "", "", NULL}, 0}, + {" \"p2\" \"p3\" \"p3\" \"\" \"\"", + {"", "p2", "p3", "p3", "", "", NULL}, 0}}, /* Backslashes have no special meaning even when preceding quotes. All * they do is start an unquoted string. @@ -1376,6 +1381,7 @@ static void test_argify(void) char fileA[MAX_PATH], params[2*MAX_PATH+12]; INT_PTR rc; const argify_tests_t* test; + const cmdline_tests_t *bad; const char* cmd; unsigned i, count; @@ -1392,6 +1398,8 @@ static void test_argify(void) test = argify_tests; while (test->params) { + bad = test->broken.cmd ? &test->broken : &test->cmd; + /* trace("***** verb='%s' params='%s'\n", test->verb, test->params); */ rc = shell_execute_ex(SEE_MASK_DOENVSUBST, test->verb, fileA, test->params, NULL, NULL); ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); @@ -1415,18 +1423,20 @@ static void test_argify(void) if (cmd) cmd += strlen(test->verb); if (!cmd) cmd = "(null)"; if ((test->todo & 0x2) == 0) - ok(!strcmp(cmd, test->cmd.cmd), "%s: the cmdline is '%s' instead of '%s'\n", shell_call, cmd, test->cmd.cmd); + ok(!strcmp(cmd, test->cmd.cmd) || broken(!strcmp(cmd, bad->cmd)), + "%s: the cmdline is '%s' instead of '%s'\n", shell_call, cmd, test->cmd.cmd); else todo_wine - ok(!strcmp(cmd, test->cmd.cmd), "%s: the cmdline is '%s' instead of '%s'\n", shell_call, cmd, test->cmd.cmd); + ok(!strcmp(cmd, test->cmd.cmd) || broken(!strcmp(cmd, bad->cmd)), + "%s: the cmdline is '%s' instead of '%s'\n", shell_call, cmd, test->cmd.cmd); for (i = 0; i < count - 1; i++) { char argname[18]; sprintf(argname, "argvA%d", 4 + i); if ((test->todo & (1 << (i+4))) == 0) - okChildString(argname, test->cmd.args[i+1]); + okChildStringBroken(argname, test->cmd.args[i+1], bad->args[i+1]); else todo_wine - okChildString(argname, test->cmd.args[i+1]); + okChildStringBroken(argname, test->cmd.args[i+1], bad->args[i+1]); } if (has_cl2a)

1 0

Daniel Lehman : msvcp90: Fix num_get<>::_Getffld.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 82c1fb41aa4abb14ff6c86ff984c811f9f4bddab URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c1fb41aa4abb14ff6c86ff9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 2 11:30:40 2012 -0700 msvcp90: Fix num_get<>::_Getffld. --- dlls/msvcp90/locale.c | 288 ++++++++++++++++++++++----------------------- dlls/msvcp90/tests/ios.c | 160 +++++++++++++++++++++++++ 2 files changed, 301 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82c1fb41aa4abb14ff6c8…

1 0

Piotr Caban : msvcrt: Fixed tmpfile implementation.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: c00702cd6e5110202a02434a69efbacf6152ffdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c00702cd6e5110202a02434a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 16 17:23:04 2012 +0200 msvcrt: Fixed tmpfile implementation. --- dlls/msvcrt/file.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 59b7eb8..d9ce987 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3754,16 +3754,20 @@ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) MSVCRT_FILE* file = NULL; LOCK_FILES(); - fd = MSVCRT__open(filename, MSVCRT__O_CREAT | MSVCRT__O_BINARY | MSVCRT__O_RDWR | MSVCRT__O_TEMPORARY); + fd = MSVCRT__open(filename, MSVCRT__O_CREAT | MSVCRT__O_BINARY | MSVCRT__O_RDWR | MSVCRT__O_TEMPORARY, + MSVCRT__S_IREAD | MSVCRT__S_IWRITE); if (fd != -1 && (file = msvcrt_alloc_fp())) { - if (msvcrt_init_fp(file, fd, MSVCRT__O_RDWR) == -1) + if (msvcrt_init_fp(file, fd, MSVCRT__IORW) == -1) { file->_flag = 0; file = NULL; } else file->_tmpfname = MSVCRT__strdup(filename); } + + if(fd != -1 && !file) + MSVCRT__close(fd); UNLOCK_FILES(); return file; }

1 0

Matteo Bruni : wined3d: Provide a better fallback for D3D10 AMD GPUs.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 6a9df3e75765919afdfedd7c842bbbfa0e14faa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9df3e75765919afdfedd7c8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 16 16:33:02 2012 +0200 wined3d: Provide a better fallback for D3D10 AMD GPUs. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 686cead..4c8d391 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2152,7 +2152,7 @@ static enum wined3d_pci_device select_card_fallback_amd(const struct wined3d_gl_ { UINT d3d_level = d3d_level_from_gl_info(gl_info); if (d3d_level >= 10) - return CARD_AMD_RADEON_HD2600; + return CARD_AMD_RADEON_HD2900; if (d3d_level >= 9) return CARD_AMD_RADEON_9500; if (d3d_level >= 8)

1 0

Jacek Caban : mshtml: Added support for IHTMLScriptElement:: put_src calls during parser callback.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: ccbee09f7ea340d3b2185cd2c4e6a470f8dab656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccbee09f7ea340d3b2185cd2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:08:25 2012 +0200 mshtml: Added support for IHTMLScriptElement::put_src calls during parser callback. --- dlls/mshtml/htmlscript.c | 13 +++++++++++-- dlls/mshtml/htmlscript.h | 5 +++++ dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 14 ++++++++++++++ dlls/mshtml/script.c | 12 ++++++++++++ 6 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index a256663..75e65f1 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -123,8 +123,17 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR } if(window->parser_callback_cnt) { - FIXME("execution inside parser not supported\n"); - return E_NOTIMPL; + script_queue_entry_t *queue; + + queue = heap_alloc(sizeof(*queue)); + if(!queue) + return E_OUTOFMEMORY; + + IHTMLScriptElement_AddRef(&This->IHTMLScriptElement_iface); + queue->script = This; + + list_add_tail(&window->script_queue, &queue->entry); + return S_OK; } nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index d6031bd..4540d4c 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -25,6 +25,11 @@ typedef struct { BOOL parsed; } HTMLScriptElement; +typedef struct { + struct list entry; + HTMLScriptElement *script; +} script_queue_entry_t; + HRESULT script_elem_from_nsscript(HTMLDocumentNode*,nsIDOMHTMLScriptElement*,HTMLScriptElement**) DECLSPEC_HIDDEN; void bind_event_scripts(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 740ac55..92659cf 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2720,6 +2720,7 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, list_init(&window->script_hosts); list_init(&window->bindings); + list_init(&window->script_queue); window->base.outer_window = outer_window; window->base.inner_window = window; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d5f4ce3..737731f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -400,6 +400,7 @@ struct HTMLInnerWindow { IHTMLStorage *session_storage; unsigned parser_callback_cnt; + struct list script_queue; global_prop_t *global_props; DWORD global_prop_cnt; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 3ab7a07..5e54158 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -298,6 +298,7 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa nsIDOMHTMLScriptElement *nsscript; HTMLScriptElement *script_elem; nsIParser *nsparser = NULL; + script_queue_entry_t *iter; HTMLInnerWindow *window; nsresult nsres; HRESULT hres; @@ -332,8 +333,20 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa window->parser_callback_cnt++; } + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + doc_insert_script(window, script_elem); + while(!list_empty(&window->script_queue)) { + iter = LIST_ENTRY(list_head(&window->script_queue), script_queue_entry_t, entry); + list_remove(&iter->entry); + doc_insert_script(window, iter->script); + IHTMLScriptElement_Release(&iter->script->IHTMLScriptElement_iface); + heap_free(iter); + } + + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + if(nsparser) { window->parser_callback_cnt--; nsIParser_EndEvaluatingParserInsertedScript(nsparser); @@ -341,6 +354,7 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa } IHTMLScriptElement_Release(&script_elem->IHTMLScriptElement_iface); + return NS_OK; } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 730881b..d99269a 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -915,6 +915,9 @@ void doc_insert_script(HTMLInnerWindow *window, HTMLScriptElement *script_elem) { ScriptHost *script_host; + if(script_elem->parsed) + return; + script_host = get_elem_script_host(window, script_elem); if(!script_host) return; @@ -1309,8 +1312,17 @@ void set_script_mode(HTMLOuterWindow *window, SCRIPTMODE mode) void release_script_hosts(HTMLInnerWindow *window) { + script_queue_entry_t *queue_iter; ScriptHost *iter; + while(!list_empty(&window->script_queue)) { + queue_iter = LIST_ENTRY(list_head(&window->script_queue), script_queue_entry_t, entry); + + list_remove(&queue_iter->entry); + IHTMLScriptElement_Release(&queue_iter->script->IHTMLScriptElement_iface); + heap_free(queue_iter); + } + while(!list_empty(&window->script_hosts)) { iter = LIST_ENTRY(list_head(&window->script_hosts), ScriptHost, entry);

1 0

Jacek Caban : mshtml: Added beginning IHTMLScriptElement:: put_src implementation.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 680aca56efab0610ab5b4c698da481a82acaf5c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=680aca56efab0610ab5b4c698… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:07:48 2012 +0200 mshtml: Added beginning IHTMLScriptElement::put_src implementation. --- dlls/mshtml/htmlscript.c | 41 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/mutation.c | 12 ++++++++++-- 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index d5ae39d..a256663 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -95,8 +95,47 @@ static HRESULT WINAPI HTMLScriptElement_Invoke(IHTMLScriptElement *iface, DISPID static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR v) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); + HTMLInnerWindow *window; + nsIDOMNode *parent; + nsAString src_str; + nsresult nsres; + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + if(!This->element.node.doc || !This->element.node.doc->window) { + WARN("no windoow\n"); + return E_UNEXPECTED; + } + + window = This->element.node.doc->window; + + nsAString_InitDepend(&src_str, v); + nsres = nsIDOMHTMLScriptElement_SetSrc(This->nsscript, &src_str); + nsAString_Finish(&src_str); + if(NS_FAILED(nsres)) { + ERR("SetSrc failed: %08x\n", nsres); + return E_FAIL; + } + + if(This->parsed) { + WARN("already parsed\n"); + return S_OK; + } + + if(window->parser_callback_cnt) { + FIXME("execution inside parser not supported\n"); + return E_NOTIMPL; + } + + nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); + if(NS_FAILED(nsres) || !parent) { + FIXME("No parent, not supported detached elements\n"); + return E_NOTIMPL; + } + + nsIDOMNode_Release(parent); + doc_insert_script(window, This); + return S_OK; } static HRESULT WINAPI HTMLScriptElement_get_src(IHTMLScriptElement *iface, BSTR *p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d78e6ab..d5f4ce3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -399,6 +399,8 @@ struct HTMLInnerWindow { IOmHistory *history; IHTMLStorage *session_storage; + unsigned parser_callback_cnt; + global_prop_t *global_props; DWORD global_prop_cnt; DWORD global_prop_size; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 8c45621..da691de 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -298,11 +298,16 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa nsIDOMHTMLScriptElement *nsscript; HTMLScriptElement *script_elem; nsIParser *nsparser = NULL; + HTMLInnerWindow *window; nsresult nsres; HRESULT hres; TRACE("(%p)->(%p)\n", doc, script_iface); + window = doc->window; + if(!window) + return NS_OK; + nsres = nsISupports_QueryInterface(script_iface, &IID_nsIDOMHTMLScriptElement, (void**)&nsscript); if(NS_FAILED(nsres)) { ERR("Could not get nsIDOMHTMLScriptElement: %08x\n", nsres); @@ -322,12 +327,15 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa if(FAILED(hres)) return NS_ERROR_FAILURE; - if(nsparser) + if(nsparser) { nsIParser_BeginEvaluatingParserInsertedScript(nsparser); + window->parser_callback_cnt++; + } - doc_insert_script(doc->window, script_elem); + doc_insert_script(window, script_elem); if(nsparser) { + window->parser_callback_cnt--; nsIParser_EndEvaluatingParserInsertedScript(nsparser); nsIParser_Release(nsparser); }

1 0

Matteo Bruni : wined3d: Add new Radeon HD 6670 GL renderer string.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 3c11d8f331f3838dbcb59ba60df76b12fcd24245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c11d8f331f3838dbcb59ba60… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 16 16:33:04 2012 +0200 wined3d: Add new Radeon HD 6670 GL renderer string. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b161564..7213d05 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1710,6 +1710,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in {"HD 6770M",CARD_AMD_RADEON_HD6600M}, {"HD 6750M",CARD_AMD_RADEON_HD6600M}, {"HD 6700", CARD_AMD_RADEON_HD6700}, + {"HD 6670", CARD_AMD_RADEON_HD6600}, {"HD 6630M",CARD_AMD_RADEON_HD6600M}, {"HD 6600M",CARD_AMD_RADEON_HD6600M}, {"HD 6600", CARD_AMD_RADEON_HD6600},

1 0