January 2012 - Wine-commits

Jacek Caban : ieframe: Improved test traces.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: ddbda376e82522f00bc244f95820bbe3d218fcf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbda376e82522f00bc244f95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 2 16:46:29 2012 +0100 ieframe: Improved test traces. --- dlls/ieframe/tests/webbrowser.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index cc84f27..8c12d39 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3125,13 +3125,14 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) ok(doc == doc2, "doc != doc2\n"); IDispatch_Release(doc2); + trace("Navigate2 repeated...\n"); test_Navigate2(unk); test_download(DWL_EXPECT_BEFORE_NAVIGATE); test_TranslateAccelerator(unk); doc2 = get_document(unk); ok(doc == doc2, "doc != doc2\n"); IDispatch_Release(doc2); - IDispatch_Release(doc2); + IDispatch_Release(doc); test_dochost_qs(unk); } @@ -3196,6 +3197,7 @@ START_TEST(webbrowser) test_WebBrowser(FALSE, TRUE); trace("Testing WebBrowser...\n"); test_WebBrowser(TRUE, FALSE); + trace("Testing WebBrowser (with close)...\n"); test_WebBrowser(TRUE, TRUE); trace("Testing WebBrowser w/o container-based olecmd...\n"); test_WebBrowser_NoContainerOlecmd();

1 0

Jacek Caban : mshtml: Use IUri for IHTMLLocation::get_search implementation .
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 4d4955f248e1e1cf23d1fba96ef1c0dc9ec3cec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d4955f248e1e1cf23d1fba96… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 2 17:04:09 2012 +0100 mshtml: Use IUri for IHTMLLocation::get_search implementation. --- dlls/mshtml/htmllocation.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index e386d17..ffe72a0 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -478,31 +478,29 @@ static HRESULT WINAPI HTMLLocation_put_search(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_search(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + BSTR query; HRESULT hres; - const WCHAR hash[] = {'#',0}; TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - url.dwExtraInfoLength = 1; - hres = get_url_components(This, &url); - if(FAILED(hres)) - return hres; + if(!This->window || !This->window->uri) { + FIXME("No current URI\n"); + return E_NOTIMPL; + } - if(!url.dwExtraInfoLength){ + hres = IUri_GetQuery(This->window->uri, &query); + if(hres == S_OK) { + *p = query; + }else if(hres == S_FALSE) { + SysFreeString(query); *p = NULL; - return S_OK; + }else { + return hres; } - url.dwExtraInfoLength = strcspnW(url.lpszExtraInfo, hash); - - *p = SysAllocStringLen(url.lpszExtraInfo, url.dwExtraInfoLength); - - if(!*p) - return E_OUTOFMEMORY; return S_OK; }

1 0

Eric Pouech : winedbg: In x86_64 backend, now recognize 'rep ret' as a valid function return instruction.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: c047d6ddbd550d8e73e6289a11a2d89c72ab1ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c047d6ddbd550d8e73e6289a1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 2 20:58:23 2012 +0100 winedbg: In x86_64 backend, now recognize 'rep ret' as a valid function return instruction. --- programs/winedbg/be_x86_64.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 253b4ac..7dbd301 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -300,7 +300,15 @@ static unsigned be_x86_64_is_step_over_insn(const void* insn) static unsigned be_x86_64_is_function_return(const void* insn) { BYTE c; - return dbg_read_memory(insn, &c, sizeof(c)) && ((c == 0xC2) || (c == 0xC3)); + + /* sigh... amd64 for prefetch optimization requires 'rep ret' in some cases */ + if (!dbg_read_memory(insn, &c, sizeof(c))) return FALSE; + if (c == 0xF3) /* REP */ + { + insn = (const char*)insn + 1; + if (!dbg_read_memory(insn, &c, sizeof(c))) return FALSE; + } + return c == 0xC2 /* ret */ || c == 0xC3 /* ret NN */; } static unsigned be_x86_64_is_break_insn(const void* insn)

1 0

Eric Pouech : dbghelp: Correctly return flags in SYMBOL_INFO structure for local variables stored in a register .
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 28bb6f954a1207f669f37b327cff69821c635ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28bb6f954a1207f669f37b327… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 2 21:28:04 2012 +0100 dbghelp: Correctly return flags in SYMBOL_INFO structure for local variables stored in a register. --- dlls/dbghelp/symbol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index add3a1a..d9227ea 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -690,6 +690,7 @@ static void symt_fill_sym_info(struct module_pair* pair, sym_info->Flags |= SYMFLAG_PARAMETER; /* fall through */ case DataIsLocal: + sym_info->Flags |= SYMFLAG_LOCAL; { struct location loc = data->u.var; @@ -712,7 +713,6 @@ static void symt_fill_sym_info(struct module_pair* pair, { case loc_error: /* for now we report error cases as a negative register number */ - sym_info->Flags |= SYMFLAG_LOCAL; /* fall through */ case loc_register: sym_info->Flags |= SYMFLAG_REGISTER; @@ -720,7 +720,7 @@ static void symt_fill_sym_info(struct module_pair* pair, sym_info->Address = 0; break; case loc_regrel: - sym_info->Flags |= SYMFLAG_LOCAL | SYMFLAG_REGREL; + sym_info->Flags |= SYMFLAG_REGREL; sym_info->Register = loc.reg; if (loc.reg == CV_REG_NONE || (int)loc.reg < 0 /* error */) FIXME("suspicious register value %x\n", loc.reg);

1 0

Henri Verbeet : wined3d: Recognize i915g as Intel.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 1a3aabf6f2122bcfadb8e87178b3f2e204337da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3aabf6f2122bcfadb8e8717… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 2 21:45:26 2012 +0100 wined3d: Recognize i915g as Intel. --- 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 10c3647..4c8a7ad 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1440,6 +1440,7 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s if (strstr(gl_vendor_string, "Intel(R)") /* Intel switched from Intel(R) to Intel® recently, so just match Intel. */ || strstr(gl_renderer, "Intel") + || strstr(gl_renderer, "i915") || strstr(gl_vendor_string, "Intel Inc.")) return HW_VENDOR_INTEL;

1 0

Henri Verbeet : wined3d: Recognize some more Intel GPUs.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 51d54a909c43bfbd0d8509b27865e6f89a227994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d54a909c43bfbd0d8509b27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 2 21:45:27 2012 +0100 wined3d: Recognize some more Intel GPUs. --- dlls/wined3d/directx.c | 113 ++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 39 +++++++++++--- 2 files changed, 123 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51d54a909c43bfbd0d850…

1 0

Henri Verbeet : d3d10/tests: Add a state groups test.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 49d811d8720710b9d3a197617d6a85990e258628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d811d8720710b9d3a197617… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 2 21:45:28 2012 +0100 d3d10/tests: Add a state groups test. --- dlls/d3d10/tests/effect.c | 399 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 399 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49d811d8720710b9d3a19…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSHADEMODE typedef.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 16e9d728f4f2b40dbed4a5c332da1931ccf6eb94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16e9d728f4f2b40dbed4a5c33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 2 21:45:29 2012 +0100 wined3d: Get rid of the WINED3DSHADEMODE typedef. --- dlls/wined3d/state.c | 10 +++++----- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d.h | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4c64261..034fd34 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -155,19 +155,19 @@ static void state_shademode(struct wined3d_context *context, const struct wined3 { switch (state->render_states[WINED3D_RS_SHADEMODE]) { - case WINED3DSHADE_FLAT: + case WINED3D_SHADE_FLAT: glShadeModel(GL_FLAT); checkGLcall("glShadeModel(GL_FLAT)"); break; - case WINED3DSHADE_GOURAUD: + case WINED3D_SHADE_GOURAUD: glShadeModel(GL_SMOOTH); checkGLcall("glShadeModel(GL_SMOOTH)"); break; - case WINED3DSHADE_PHONG: - FIXME("WINED3DSHADE_PHONG isn't supported\n"); + case WINED3D_SHADE_PHONG: + FIXME("WINED3D_SHADE_PHONG isn't supported.\n"); break; default: - FIXME("Unrecognized/Unhandled WINED3DSHADEMODE value %#x.\n", + FIXME("Unrecognized shade mode %#x.\n", state->render_states[WINED3D_RS_SHADEMODE]); } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8a6bad8..4399446 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1124,7 +1124,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) else state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_FALSE; state->render_states[WINED3D_RS_FILLMODE] = WINED3DFILL_SOLID; - state->render_states[WINED3D_RS_SHADEMODE] = WINED3DSHADE_GOURAUD; + state->render_states[WINED3D_RS_SHADEMODE] = WINED3D_SHADE_GOURAUD; lp.lp.repeat_factor = 0; lp.lp.line_pattern = 0; state->render_states[WINED3D_RS_LINEPATTERN] = lp.d; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 312f978..9ff53784 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -448,13 +448,12 @@ enum wined3d_fog_mode WINED3D_FOG_LINEAR = 3, }; -typedef enum _WINED3DSHADEMODE +enum wined3d_shade_mode { - WINED3DSHADE_FLAT = 1, - WINED3DSHADE_GOURAUD = 2, - WINED3DSHADE_PHONG = 3, - WINED3DSHADE_FORCE_DWORD = 0x7fffffff -} WINED3DSHADEMODE; + WINED3D_SHADE_FLAT = 1, + WINED3D_SHADE_GOURAUD = 2, + WINED3D_SHADE_PHONG = 3, +}; typedef enum _WINED3DFILLMODE {

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DFILLMODE typedef.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: a03eeb5cac77fdbfd893889ccec9fca568823b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a03eeb5cac77fdbfd893889cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 2 21:45:30 2012 +0100 wined3d: Get rid of the WINED3DFILLMODE typedef. --- dlls/wined3d/state.c | 10 +++++----- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d.h | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 034fd34..a392f1f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -49,24 +49,24 @@ static void state_nop(struct wined3d_context *context, const struct wined3d_stat static void state_fillmode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - WINED3DFILLMODE mode = state->render_states[WINED3D_RS_FILLMODE]; + enum wined3d_fill_mode mode = state->render_states[WINED3D_RS_FILLMODE]; switch (mode) { - case WINED3DFILL_POINT: + case WINED3D_FILL_POINT: glPolygonMode(GL_FRONT_AND_BACK, GL_POINT); checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_POINT)"); break; - case WINED3DFILL_WIREFRAME: + case WINED3D_FILL_WIREFRAME: glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_LINE)"); break; - case WINED3DFILL_SOLID: + case WINED3D_FILL_SOLID: glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_FILL)"); break; default: - FIXME("Unrecognized WINED3D_RS_FILLMODE %d.\n", mode); + FIXME("Unrecognized fill mode %#x.\n", mode); } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4399446..feabe3d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1123,7 +1123,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_TRUE; else state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_FALSE; - state->render_states[WINED3D_RS_FILLMODE] = WINED3DFILL_SOLID; + state->render_states[WINED3D_RS_FILLMODE] = WINED3D_FILL_SOLID; state->render_states[WINED3D_RS_SHADEMODE] = WINED3D_SHADE_GOURAUD; lp.lp.repeat_factor = 0; lp.lp.line_pattern = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9ff53784..312b63c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -455,13 +455,12 @@ enum wined3d_shade_mode WINED3D_SHADE_PHONG = 3, }; -typedef enum _WINED3DFILLMODE +enum wined3d_fill_mode { - WINED3DFILL_POINT = 1, - WINED3DFILL_WIREFRAME = 2, - WINED3DFILL_SOLID = 3, - WINED3DFILL_FORCE_DWORD = 0x7fffffff -} WINED3DFILLMODE; + WINED3D_FILL_POINT = 1, + WINED3D_FILL_WIREFRAME = 2, + WINED3D_FILL_SOLID = 3, +}; typedef enum _WINED3DCULL {

1 0

Marcus Meissner : jscript: Mark some function DECLSPEC_HIDDEN.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 0648a567a898475d241afe0965acae283c9c2ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0648a567a898475d241afe096… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 2 21:57:10 2012 +0100 jscript: Mark some function DECLSPEC_HIDDEN. --- dlls/jscript/jscript.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index d67bdac..5a8d7f4 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -189,8 +189,8 @@ static inline IDispatch *to_disp(jsdisp_t *jsdisp) return (IDispatch*)&jsdisp->IDispatchEx_iface; } -jsdisp_t *as_jsdisp(IDispatch*); -jsdisp_t *to_jsdisp(IDispatch*); +jsdisp_t *as_jsdisp(IDispatch*) DECLSPEC_HIDDEN; +jsdisp_t *to_jsdisp(IDispatch*) DECLSPEC_HIDDEN; static inline void jsdisp_addref(jsdisp_t *jsdisp) {

1 0