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

Sergey Khodych : shdocvw: Handle local paths in navigate_url.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: f3b10bc8fdfe5511db3525dcb3e8969646eebf3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b10bc8fdfe5511db3525dcb… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun May 15 01:38:36 2011 +0300 shdocvw: Handle local paths in navigate_url. --- dlls/shdocvw/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 211aee5..6b78870 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -854,7 +854,7 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, size = sizeof(new_url)/sizeof(WCHAR); hres = UrlApplySchemeW(url, new_url, &size, - URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT); + URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE | URL_APPLY_DEFAULT); if(FAILED(hres)) { WARN("UrlApplyScheme failed: %08x\n", hres); new_url[0] = 0;

1 0

Rico Schüller : d3dx9: Remove some checks for defines argument in D3DXCreateEffect* functions.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: b7b9db00e336ce2b945c7049c672f54d70948a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b9db00e336ce2b945c7049c… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue May 17 10:15:52 2011 +0200 d3dx9: Remove some checks for defines argument in D3DXCreateEffect* functions. --- dlls/d3dx9_36/effect.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4332386..f0c44e1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4554,7 +4554,7 @@ HRESULT WINAPI D3DXCreateEffectFromFileExW(LPDIRECT3DDEVICE9 device, LPCWSTR src TRACE("(%s): relay\n", debugstr_w(srcfile)); - if (!device || !srcfile || !defines) + if (!device || !srcfile) return D3DERR_INVALIDCALL; ret = map_view_of_file(srcfile, &buffer, &size); @@ -4578,7 +4578,7 @@ HRESULT WINAPI D3DXCreateEffectFromFileExA(LPDIRECT3DDEVICE9 device, LPCSTR srcf TRACE("(void): relay\n"); - if (!srcfile || !defines) + if (!srcfile) return D3DERR_INVALIDCALL; len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); @@ -4615,7 +4615,7 @@ HRESULT WINAPI D3DXCreateEffectFromResourceExW(LPDIRECT3DDEVICE9 device, HMODULE TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(srcresource)); - if (!device || !defines) + if (!device) return D3DERR_INVALIDCALL; resinfo = FindResourceW(srcmodule, srcresource, (LPCWSTR) RT_RCDATA); @@ -4645,7 +4645,7 @@ HRESULT WINAPI D3DXCreateEffectFromResourceExA(LPDIRECT3DDEVICE9 device, HMODULE TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(srcresource)); - if (!device || !defines) + if (!device) return D3DERR_INVALIDCALL; resinfo = FindResourceA(srcmodule, srcresource, (LPCSTR) RT_RCDATA); @@ -4692,7 +4692,7 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(LPCWSTR srcfile, const D3DXMACR TRACE("(%s): relay\n", debugstr_w(srcfile)); - if (!srcfile || !defines) + if (!srcfile) return D3DERR_INVALIDCALL; ret = map_view_of_file(srcfile, &buffer, &size); @@ -4715,7 +4715,7 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, const D3DXMACRO TRACE("(void): relay\n"); - if (!srcfile || !defines) + if (!srcfile) return D3DERR_INVALIDCALL; len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0);

1 0

Sergey Khodych : shdocvw: Use UrlApplyScheme with URL_APPLY_GUESSFILE for local paths in create_moniker .
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: 1c6af1f337ebc4dd8ed5419fcb2e439a1a6266b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c6af1f337ebc4dd8ed5419fc… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun May 15 01:34:03 2011 +0300 shdocvw: Use UrlApplyScheme with URL_APPLY_GUESSFILE for local paths in create_moniker. --- dlls/shdocvw/navigate.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 09135a8..211aee5 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -578,21 +578,12 @@ static HRESULT create_moniker(LPCWSTR url, IMoniker **mon) if(PathIsURLW(url)) return CreateURLMoniker(NULL, url, mon); - if(url[1] == ':') { - size = sizeof(new_url); - hres = UrlCreateFromPathW(url, new_url, &size, 0); - if(FAILED(hres)) { - WARN("UrlCreateFromPathW failed: %08x\n", hres); - return hres; - } - }else { - size = sizeof(new_url)/sizeof(WCHAR); - hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME); - TRACE("got %s\n", debugstr_w(new_url)); - if(FAILED(hres)) { - WARN("UrlApplyScheme failed: %08x\n", hres); - return hres; - } + size = sizeof(new_url)/sizeof(WCHAR); + hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE); + TRACE("was %s got %s\n", debugstr_w(url), debugstr_w(new_url)); + if(FAILED(hres)) { + WARN("UrlApplyScheme failed: %08x\n", hres); + return hres; } return CreateURLMoniker(NULL, new_url, mon);

1 0

Sergey Khodych : shdocvw: Don' t use separate call of UrlApplySchemeW for default scheme.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: 2034439d664d1bdfa032c3bd6daf8e43f5740c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2034439d664d1bdfa032c3bd6… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun May 15 00:18:10 2011 +0300 shdocvw: Don't use separate call of UrlApplySchemeW for default scheme. --- dlls/shdocvw/shdocvw_main.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index a0070b4..4386ddc 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -333,14 +333,8 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L if (!PathIsURLW(ptr)) { len = sizeof(buffer_in) / sizeof(buffer_in[0]); buffer_in[0] = 0; - hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME); + hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT); TRACE("got 0x%x with %s\n", hr, debugstr_w(buffer_in)); - if (hr != S_OK) { - /* when we can't guess the scheme, use the default scheme */ - len = sizeof(buffer_in) / sizeof(buffer_in[0]); - hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_DEFAULT); - } - if (hr == S_OK) { /* we parsed the url to buffer_in */ ptr = buffer_in;

1 0

Sergey Khodych : shlwapi: Don't copy valid scheme in UrlApplySchemeW.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: 2e1bec528f983a8ec9cd1d4df79bc2aa0866f856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1bec528f983a8ec9cd1d4df… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun May 15 00:48:57 2011 +0300 shlwapi: Don't copy valid scheme in UrlApplySchemeW. --- dlls/shlwapi/tests/url.c | 4 ++++ dlls/shlwapi/url.c | 14 -------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 5a035ac..d116c16 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -85,6 +85,10 @@ static const TEST_URL_APPLY TEST_APPLY[] = { {"winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, 17, "http://winehq.org"}, {"winehq.org", URL_APPLY_GUESSSCHEME, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, {"winehq.org", URL_APPLY_DEFAULT, S_OK, 17, "http://winehq.org"}, + {"http://www.winehq.org", URL_APPLY_GUESSSCHEME , S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, + {"http://www.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_FORCEAPPLY, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, + {"http://www.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_FORCEAPPLY | URL_APPLY_DEFAULT, S_OK, 28, "http://http://www.winehq.org"}, + {"http://www.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, {"", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, 7, "http://"}, {"", URL_APPLY_GUESSSCHEME, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, {"", URL_APPLY_DEFAULT, S_OK, 7, "http://"} diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index b8c51a4..7fc37a9 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1764,20 +1764,6 @@ HRESULT WINAPI UrlApplySchemeW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, DW return ret; } } - else { - /* we have a scheme, see if valid (known scheme) */ - if (in_scheme.nScheme) { - /* have valid scheme, so just copy and exit */ - if (strlenW(pszIn) + 1 > *pcchOut) { - *pcchOut = strlenW(pszIn) + 1; - return E_POINTER; - } - strcpyW(pszOut, pszIn); - *pcchOut = strlenW(pszOut); - TRACE("valid scheme, returning copy\n"); - return S_OK; - } - } /* If we are here, then either invalid scheme, * or no scheme and can't/failed guess.

1 0

Owen Rudge : user32: Add separate sysmenu for MDI child windows.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: c55ff281c7d8e0dad295dc2104dba7b9316e09f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c55ff281c7d8e0dad295dc210… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon May 16 17:15:02 2011 +0100 user32: Add separate sysmenu for MDI child windows. --- dlls/user32/menu.c | 14 ++++++++++---- dlls/user32/user32.rc | 13 +++++++++++++ po/ar.po | 35 ++++++++++++++++++++++------------- po/bg.po | 35 ++++++++++++++++++++++------------- po/ca.po | 35 ++++++++++++++++++++++------------- po/cs.po | 35 ++++++++++++++++++++++------------- po/da.po | 35 ++++++++++++++++++++++------------- po/de.po | 35 ++++++++++++++++++++++------------- po/el.po | 34 +++++++++++++++++++++------------- po/en.po | 34 +++++++++++++++++++++------------- po/en_US.po | 34 +++++++++++++++++++++------------- po/eo.po | 35 ++++++++++++++++++++++------------- po/es.po | 35 ++++++++++++++++++++++------------- po/fa.po | 35 ++++++++++++++++++++++------------- po/fi.po | 35 ++++++++++++++++++++++------------- po/fr.po | 35 ++++++++++++++++++++++------------- po/he.po | 35 ++++++++++++++++++++++------------- po/hi.po | 34 +++++++++++++++++++++------------- po/hu.po | 35 ++++++++++++++++++++++------------- po/it.po | 35 ++++++++++++++++++++++------------- po/ja.po | 35 ++++++++++++++++++++++------------- po/ko.po | 35 ++++++++++++++++++++++------------- po/lt.po | 35 ++++++++++++++++++++++------------- po/ml.po | 34 +++++++++++++++++++++------------- po/nb_NO.po | 35 ++++++++++++++++++++++------------- po/nl.po | 35 ++++++++++++++++++++++------------- po/or.po | 34 +++++++++++++++++++++------------- po/pa.po | 34 +++++++++++++++++++++------------- po/pl.po | 35 ++++++++++++++++++++++------------- po/pt_BR.po | 35 ++++++++++++++++++++++------------- po/pt_PT.po | 35 ++++++++++++++++++++++------------- po/rm.po | 34 +++++++++++++++++++++------------- po/ro.po | 35 ++++++++++++++++++++++------------- po/ru.po | 35 ++++++++++++++++++++++------------- po/sk.po | 35 ++++++++++++++++++++++------------- po/sl.po | 35 ++++++++++++++++++++++------------- po/sr_RS(a)cyrillic.po | 35 ++++++++++++++++++++++------------- po/sr_RS(a)latin.po | 35 ++++++++++++++++++++++------------- po/sv.po | 35 ++++++++++++++++++++++------------- po/te.po | 34 +++++++++++++++++++++------------- po/th.po | 35 ++++++++++++++++++++++------------- po/tr.po | 35 ++++++++++++++++++++++------------- po/uk.po | 35 ++++++++++++++++++++++------------- po/wa.po | 35 ++++++++++++++++++++++------------- po/wine.pot | 34 +++++++++++++++++++++------------- po/zh_CN.po | 35 ++++++++++++++++++++++------------- po/zh_TW.po | 35 ++++++++++++++++++++++------------- 47 files changed, 1003 insertions(+), 589 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c55ff281c7d8e0dad295d…

1 0

Sergey Khodych : shlwapi: Implement URL_APPLY_GUESSFILE in UrlApplyScheme.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: 26541471ab5f3fa1cfa2a1e2e25b3a4bcb0c8895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26541471ab5f3fa1cfa2a1e2e… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun May 15 01:30:09 2011 +0300 shlwapi: Implement URL_APPLY_GUESSFILE in UrlApplyScheme. --- dlls/shlwapi/tests/url.c | 8 ++++- dlls/shlwapi/url.c | 80 +++++++++++++++++++++++++++------------------ 2 files changed, 55 insertions(+), 33 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index d116c16..1ef2aab 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -91,7 +91,12 @@ static const TEST_URL_APPLY TEST_APPLY[] = { {"http://www.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, {"", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, 7, "http://"}, {"", URL_APPLY_GUESSSCHEME, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, - {"", URL_APPLY_DEFAULT, S_OK, 7, "http://"} + {"", URL_APPLY_DEFAULT, S_OK, 7, "http://"}, + {"u:\\windows", URL_APPLY_GUESSFILE | URL_APPLY_DEFAULT, S_OK, 18, "file:///u:/windows"}, + {"u:\\windows", URL_APPLY_GUESSFILE, S_OK, 18, "file:///u:/windows"}, + {"u:\\windows", URL_APPLY_DEFAULT, S_OK, 17, "http://u:\\windows"}, + {"file:///c:/windows", URL_APPLY_GUESSFILE , S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, + {"aa:\\windows", URL_APPLY_GUESSFILE , S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, }; /* ################ */ @@ -379,6 +384,7 @@ static const struct { {"c:foo\\bar", "file:///c:foo/bar", S_OK}, {"c:\\foo/b a%r", "file:///c:/foo/b%20a%25r", S_OK}, {"c:\\foo\\foo bar", "file:///c:/foo/foo%20bar", S_OK}, + {"file:///c:/foo/bar", "file:///c:/foo/bar", S_FALSE}, #if 0 /* The following test fails on native shlwapi as distributed with Win95/98. * Wine matches the behaviour of later versions. diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 7fc37a9..0c68529 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1700,6 +1700,39 @@ static HRESULT URL_GuessScheme(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut) return E_FAIL; } +static HRESULT URL_CreateFromPath(LPCWSTR pszPath, LPWSTR pszUrl, LPDWORD pcchUrl) +{ + DWORD needed; + HRESULT ret = S_OK; + WCHAR *pszNewUrl; + WCHAR file_colonW[] = {'f','i','l','e',':',0}; + WCHAR three_slashesW[] = {'/','/','/',0}; + PARSEDURLW parsed_url; + + parsed_url.cbSize = sizeof(parsed_url); + if(ParseURLW(pszPath, &parsed_url) == S_OK) { + if(parsed_url.nScheme != URL_SCHEME_INVALID && parsed_url.cchProtocol > 1) { + needed = strlenW(pszPath); + if (needed >= *pcchUrl) { + *pcchUrl = needed + 1; + return E_POINTER; + } else { + *pcchUrl = needed; + return S_FALSE; + } + } + } + + pszNewUrl = HeapAlloc(GetProcessHeap(), 0, (strlenW(pszPath) + 9) * sizeof(WCHAR)); /* "file:///" + pszPath_len + 1 */ + strcpyW(pszNewUrl, file_colonW); + if(isalphaW(pszPath[0]) && pszPath[1] == ':') + strcatW(pszNewUrl, three_slashesW); + strcatW(pszNewUrl, pszPath); + ret = UrlEscapeW(pszNewUrl, pszUrl, pcchUrl, URL_ESCAPE_PERCENT); + HeapFree(GetProcessHeap(), 0, pszNewUrl); + return ret; +} + static HRESULT URL_ApplyDefault(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut) { HKEY newkey; @@ -1747,11 +1780,18 @@ HRESULT WINAPI UrlApplySchemeW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, DW if (!pszIn || !pszOut || !pcchOut) return E_INVALIDARG; if (dwFlags & URL_APPLY_GUESSFILE) { - FIXME("(%s %p %p(%d) 0x%08x): stub URL_APPLY_GUESSFILE not implemented\n", - debugstr_w(pszIn), pszOut, pcchOut, *pcchOut, dwFlags); - strcpyW(pszOut, pszIn); - *pcchOut = strlenW(pszOut); - return S_FALSE; + if (*pcchOut > 1 && ':' == pszIn[1]) { + res1 = *pcchOut; + ret = URL_CreateFromPath(pszIn, pszOut, &res1); + if (ret == S_OK || ret == E_POINTER){ + *pcchOut = res1; + return ret; + } + else if (ret == S_FALSE) + { + return ret; + } + } } in_scheme.cbSize = sizeof(in_scheme); @@ -2408,12 +2448,7 @@ HRESULT WINAPI UrlCreateFromPathA(LPCSTR pszPath, LPSTR pszUrl, LPDWORD pcchUrl, */ HRESULT WINAPI UrlCreateFromPathW(LPCWSTR pszPath, LPWSTR pszUrl, LPDWORD pcchUrl, DWORD dwReserved) { - DWORD needed; HRESULT ret; - WCHAR *pszNewUrl; - WCHAR file_colonW[] = {'f','i','l','e',':',0}; - WCHAR three_slashesW[] = {'/','/','/',0}; - PARSEDURLW parsed_url; TRACE("(%s, %p, %p, 0x%08x)\n", debugstr_w(pszPath), pszUrl, pcchUrl, dwReserved); @@ -2423,30 +2458,11 @@ HRESULT WINAPI UrlCreateFromPathW(LPCWSTR pszPath, LPWSTR pszUrl, LPDWORD pcchUr if (!pszUrl || !pcchUrl) return E_INVALIDARG; + ret = URL_CreateFromPath(pszPath, pszUrl, pcchUrl); - parsed_url.cbSize = sizeof(parsed_url); - if(ParseURLW(pszPath, &parsed_url) == S_OK) { - if(parsed_url.nScheme != URL_SCHEME_INVALID && parsed_url.cchProtocol > 1) { - needed = strlenW(pszPath); - if (needed >= *pcchUrl) { - *pcchUrl = needed + 1; - return E_POINTER; - } else { - *pcchUrl = needed; - strcpyW(pszUrl, pszPath); - return S_FALSE; - } - } - } - - pszNewUrl = HeapAlloc(GetProcessHeap(), 0, (strlenW(pszPath) + 9) * sizeof(WCHAR)); /* "file:///" + pszPath_len + 1 */ - strcpyW(pszNewUrl, file_colonW); - if(isalphaW(pszPath[0]) && pszPath[1] == ':') - strcatW(pszNewUrl, three_slashesW); - strcatW(pszNewUrl, pszPath); - ret = UrlEscapeW(pszNewUrl, pszUrl, pcchUrl, URL_ESCAPE_PERCENT); + if (S_FALSE == ret) + strcpyW(pszUrl, pszPath); - HeapFree(GetProcessHeap(), 0, pszNewUrl); return ret; }

1 0

Marcus Meissner : dmime: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: ba8455d5f157cd89d29253cb66974995fa05dec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba8455d5f157cd89d29253cb6… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:56:07 2011 +0200 dmime: Mark internal symbols with hidden visibility. --- dlls/dmime/dmime_private.h | 32 ++++++++++++++++---------------- dlls/dmime/dmutils.h | 12 ++++++------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index d3ad0e5..15889fb 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -65,21 +65,21 @@ typedef struct IDirectMusicWaveTrack IDirectMusicWaveTrack; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicPerformanceImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentStateImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicGraphImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicAudioPathImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); - -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLyricsTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicMarkerTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicParamControlTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSegTriggerTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSeqTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSysExTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicTempoTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicTimeSigTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicWaveTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicPerformanceImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentStateImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicGraphImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicAudioPathImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; + +extern HRESULT WINAPI DMUSIC_CreateDirectMusicLyricsTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicMarkerTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicParamControlTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicSegTriggerTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicSeqTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicSysExTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicTempoTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicTimeSigTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicWaveTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /***************************************************************************** @@ -366,7 +366,7 @@ struct IDirectMusicWaveTrack { /********************************************************************** * Dll lifetime tracking declaration for dmime.dll */ -extern LONG DMIME_refCount; +extern LONG DMIME_refCount DECLSPEC_HIDDEN; static inline void DMIME_LockModule(void) { InterlockedIncrement( &DMIME_refCount ); } static inline void DMIME_UnlockModule(void) { InterlockedDecrement( &DMIME_refCount ); } diff --git a/dlls/dmime/dmutils.h b/dlls/dmime/dmutils.h index 8a2b6e6..9f2f98e 100644 --- a/dlls/dmime/dmutils.h +++ b/dlls/dmime/dmutils.h @@ -32,9 +32,9 @@ typedef struct _DMUS_PRIVATE_CHUNK { /** * Parsing utilities */ -extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc); -extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc); -extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject); +extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) DECLSPEC_HIDDEN; /** * Debug utilities @@ -61,11 +61,11 @@ typedef struct { #define GE(x) { &x, #x } /* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc); +extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id); +extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; /* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc); +extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; #endif /* __WINE_DMUTILS_H */

1 0

Marcus Meissner : dmstyle: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: 10371fcc501e390746d329454ae4089a7d63ebfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=10371fcc501e390746d329454… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:59:26 2011 +0200 dmstyle: Mark internal symbols with hidden visibility. --- dlls/dmstyle/dmstyle_private.h | 26 +++++++++++++------------- dlls/dmstyle/dmutils.h | 12 ++++++------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index cfbe7b5..4b450db 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -58,7 +58,7 @@ typedef struct IDirectMusicStyleTrack IDirectMusicStyleTrack; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicStyleImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicStyleImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /***************************************************************************** * Auxiliary definitions @@ -92,13 +92,13 @@ typedef struct _DMUS_PRIVATE_STYLE_ITEM { IDirectMusicStyle8* pObject; } DMUS_PRIVATE_STYLE_ITEM, *LPDMUS_PRIVATE_STYLE_ITEM; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicAuditionTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicChordTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicCommandTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicMelodyFormulationTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicMotifTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicMuteTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicStyleTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicAuditionTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicChordTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicCommandTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicMelodyFormulationTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicMotifTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicMuteTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicStyleTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicStyle8Impl implementation structure @@ -186,12 +186,12 @@ struct IDirectMusicMelodyFormulationTrack { }; /* IUnknown: */ -extern HRESULT WINAPI IDirectMusicMelodyFormulationTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj); -extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IUnknown_AddRef (LPUNKNOWN iface); +extern HRESULT WINAPI IDirectMusicMelodyFormulationTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IUnknown_AddRef (LPUNKNOWN iface) DECLSPEC_HIDDEN; /* IDirectMusicTrack(8): */ -extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface); +extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface) DECLSPEC_HIDDEN; /* IPersistStream: */ -extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface); +extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicMotifTrack implementation structure @@ -240,7 +240,7 @@ struct IDirectMusicStyleTrack { /********************************************************************** * Dll lifetime tracking declaration for dmstyle.dll */ -extern LONG DMSTYLE_refCount; +extern LONG DMSTYLE_refCount DECLSPEC_HIDDEN; static inline void DMSTYLE_LockModule(void) { InterlockedIncrement( &DMSTYLE_refCount ); } static inline void DMSTYLE_UnlockModule(void) { InterlockedDecrement( &DMSTYLE_refCount ); } diff --git a/dlls/dmstyle/dmutils.h b/dlls/dmstyle/dmutils.h index 8a2b6e6..9f2f98e 100644 --- a/dlls/dmstyle/dmutils.h +++ b/dlls/dmstyle/dmutils.h @@ -32,9 +32,9 @@ typedef struct _DMUS_PRIVATE_CHUNK { /** * Parsing utilities */ -extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc); -extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc); -extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject); +extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) DECLSPEC_HIDDEN; /** * Debug utilities @@ -61,11 +61,11 @@ typedef struct { #define GE(x) { &x, #x } /* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc); +extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id); +extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; /* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc); +extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; #endif /* __WINE_DMUTILS_H */

1 0

Ken Thomases : gdi32: Fix leak of FullName of replaced font face.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: e6d6fbf6e94282f7063ab3d50bdc8b90a4b88a0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d6fbf6e94282f7063ab3d50… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 16 18:20:09 2011 -0500 gdi32: Fix leak of FullName of replaced font face. --- dlls/gdi32/freetype.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d6271db..3b12422 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -262,7 +262,7 @@ struct enum_data typedef struct tagFace { struct list entry; WCHAR *StyleName; - const WCHAR *FullName; + WCHAR *FullName; char *file; void *font_data_ptr; DWORD font_data_size; @@ -1454,6 +1454,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ list_remove(&face->entry); HeapFree(GetProcessHeap(), 0, face->file); HeapFree(GetProcessHeap(), 0, face->StyleName); + HeapFree(GetProcessHeap(), 0, face->FullName); HeapFree(GetProcessHeap(), 0, face); break; }

1 0