January 2012 - Wine-Commits

Marcus Meissner : usp10: Mark two functions as hidden.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 77a3d90abf2cf197c6ccb4635a4db6c4eb3c7899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a3d90abf2cf197c6ccb4635… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 2 21:57:39 2012 +0100 usp10: Mark two functions as hidden. --- dlls/usp10/usp10_internal.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 56de435..38ec49f 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -203,10 +203,10 @@ void SHAPE_ApplyDefaultOpentypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYS HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa) DECLSPEC_HIDDEN; void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp) DECLSPEC_HIDDEN; INT SHAPE_does_GSUB_feature_apply_to_chars(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, const WCHAR *chars, INT write_dir, INT count, const char* feature) DECLSPEC_HIDDEN; -HRESULT SHAPE_GetFontScriptTags( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags); +HRESULT SHAPE_GetFontScriptTags( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) DECLSPEC_HIDDEN; void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR input, int cChars, IndicSyllable **syllables, int *syllable_count, lexical_function lexical_f, reorder_function reorder_f, BOOL modern) DECLSPEC_HIDDEN; -void Indic_ParseSyllables( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR input, const int cChar, IndicSyllable **syllables, int *syllable_count, lexical_function lex, BOOL modern); +void Indic_ParseSyllables( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR input, const int cChar, IndicSyllable **syllables, int *syllable_count, lexical_function lex, BOOL modern) DECLSPEC_HIDDEN; void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT_LOGATTR *la) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : jscript: Mark some function DECLSPEC_HIDDEN.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

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

Jacek Caban : mshtml: Use IUri for IHTMLLocation::get_search implementation .
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

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

Henri Verbeet : d3d10/tests: Add a state groups test.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

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: Recognize some more Intel GPUs.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

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 : wined3d: Recognize i915g as Intel.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

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

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

Jan. 3, 2012

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

Nikolay Sivov : wshom.ocx: Implement IWshShortcut_put_Description().
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 9e7c1bd163cda52eda9627c6e4955ba4c7065f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e7c1bd163cda52eda9627c6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 2 15:10:43 2012 +0300 wshom.ocx: Implement IWshShortcut_put_Description(). --- dlls/wshom.ocx/shell.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 949707d..0ab5080 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -70,6 +70,9 @@ typedef struct { IWshShortcut IWshShortcut_iface; LONG ref; + + IShellLinkW *link; + BSTR path_link; } WshShortcut; static inline WshCollection *impl_from_IWshCollection( IWshCollection *iface ) @@ -315,7 +318,11 @@ static ULONG WINAPI WshShortcut_Release(IWshShortcut *iface) TRACE("(%p) ref = %d\n", This, ref); if (!ref) + { + SysFreeString(This->path_link); + IShellLinkW_Release(This->link); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -406,8 +413,8 @@ static HRESULT WINAPI WshShortcut_get_Description(IWshShortcut *iface, BSTR *Des static HRESULT WINAPI WshShortcut_put_Description(IWshShortcut *iface, BSTR Description) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(Description)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(Description)); + return IShellLinkW_SetDescription(This->link, Description); } static HRESULT WINAPI WshShortcut_get_Hotkey(IWshShortcut *iface, BSTR *Hotkey) @@ -529,9 +536,12 @@ static const IWshShortcutVtbl WshShortcutVtbl = { WshShortcut_Save }; -static HRESULT WshShortcut_Create(IDispatch **shortcut) +static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) { WshShortcut *This; + HRESULT hr; + + *shortcut = NULL; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -539,6 +549,15 @@ static HRESULT WshShortcut_Create(IDispatch **shortcut) This->IWshShortcut_iface.lpVtbl = &WshShortcutVtbl; This->ref = 1; + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (void**)&This->link); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, This); + return hr; + } + + This->path_link = SysAllocString(path); *shortcut = (IDispatch*)&This->IWshShortcut_iface; return S_OK; @@ -654,7 +673,7 @@ static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR Text, VARIANT* Sec static HRESULT WINAPI WshShell3_CreateShortcut(IWshShell3 *iface, BSTR PathLink, IDispatch** Shortcut) { TRACE("(%s %p)\n", debugstr_w(PathLink), Shortcut); - return WshShortcut_Create(Shortcut); + return WshShortcut_Create(PathLink, Shortcut); } static HRESULT WINAPI WshShell3_ExpandEnvironmentStrings(IWshShell3 *iface, BSTR Src, BSTR* out_Dst)

1 0

Nikolay Sivov : wshom.ocx: Implement IWshCollection::Item() for public desktop case.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: aa707ec270b825e7bee24f94ed1c63c6a01f36ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa707ec270b825e7bee24f94e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 31 00:51:30 2011 +0300 wshom.ocx: Implement IWshCollection::Item() for public desktop case. --- dlls/wshom.ocx/shell.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 2bd6a08..bd5cb26 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -170,6 +170,7 @@ static HRESULT WINAPI WshCollection_Invoke(IWshCollection *iface, DISPID dispIdM static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, VARIANT *value) { WshCollection *This = impl_from_IWshCollection(iface); + static const WCHAR allusersdesktopW[] = {'A','l','l','U','s','e','r','s','D','e','s','k','t','o','p',0}; static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; PIDLIST_ABSOLUTE pidl; WCHAR pathW[MAX_PATH]; @@ -188,6 +189,8 @@ static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, folder = V_BSTR(index); if (!strcmpiW(folder, desktopW)) kind = CSIDL_DESKTOP; + else if (!strcmpiW(folder, allusersdesktopW)) + kind = CSIDL_COMMON_DESKTOPDIRECTORY; else { FIXME("folder kind %s not supported\n", debugstr_w(folder));

1 0

Alexandre Julliard : d3d9/tests: Convert a file to utf-8.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 7533f9bead9dd9f636f14d4fb57a3fbb9e1ed917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7533f9bead9dd9f636f14d4fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 10:16:56 2012 +0100 d3d9/tests: Convert a file to utf-8. --- dlls/d3d9/tests/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 80d8199..ac1a287 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -1,6 +1,6 @@ /* * Copyright 2006-2007 Henri Verbeet - * Copyright 2011 Stefan D�singer for CodeWeavers + * Copyright 2011 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0