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

Hans Leidekker : Revert "msi: Avoid loading cabinet streams more than once. ".
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: c5ab1c37bf0d21bf46ffb0ab9446d0507fe33ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5ab1c37bf0d21bf46ffb0ab9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 11:09:28 2011 +0200 Revert "msi: Avoid loading cabinet streams more than once.". This reverts commit 395479f0d194b7b7e1cf6b766825f492faafde5d. --- dlls/msi/action.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4a56485..42c9274 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2123,8 +2123,6 @@ static UINT load_all_media( MSIPACKAGE *package ) MSIQUERY *view; UINT r; - if (!list_empty( &package->cabinet_streams )) return ERROR_SUCCESS; - r = MSI_DatabaseOpenViewW( package->db, query, &view ); if (r != ERROR_SUCCESS) return ERROR_SUCCESS;

1 0

Hans Leidekker : msi: Make sure that the target root directory has a trailing backslash.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 01433f0f300f18945e68358ea73db3ad47cda1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01433f0f300f18945e68358ea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 11:09:43 2011 +0200 msi: Make sure that the target root directory has a trailing backslash. --- dlls/msi/action.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 42c9274..f41c921 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2990,6 +2990,25 @@ void msi_clean_path( WCHAR *p ) } } +static WCHAR *get_target_dir_property( MSIDATABASE *db ) +{ + int len; + WCHAR *path, *target_dir = msi_dup_property( db, szTargetDir ); + + if (!target_dir) return NULL; + + len = strlenW( target_dir ); + if (target_dir[len - 1] == '\\') return target_dir; + if ((path = msi_alloc( (len + 2) * sizeof(WCHAR) ))) + { + strcpyW( path, target_dir ); + path[len] = '\\'; + path[len + 1] = 0; + } + msi_free( target_dir ); + return path; +} + void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL load_prop ) { FolderList *fl; @@ -3002,7 +3021,7 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa if (!strcmpW( folder->Directory, szTargetDir )) /* special resolving for target root dir */ { - if (!load_prop || !(path = msi_dup_property( package->db, szTargetDir ))) + if (!load_prop || !(path = get_target_dir_property( package->db ))) { path = msi_dup_property( package->db, szRootDrive ); }

1 0

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

17 May '11

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 : shdocvw: Don' t use separate call of UrlApplySchemeW for default scheme.
by Alexandre Julliard 17 May '11

17 May '11

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 17 May '11

17 May '11

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

Sergey Khodych : shlwapi: Implement URL_APPLY_GUESSFILE in UrlApplyScheme.
by Alexandre Julliard 17 May '11

17 May '11

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

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

17 May '11

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

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

17 May '11

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 : dmloader: Mark internal symbols with hidden visibility.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 8d1a9bb5355d765c5841d4c682787c306c274f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d1a9bb5355d765c5841d4c68… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:57:22 2011 +0200 dmloader: Mark internal symbols with hidden visibility. --- dlls/dmloader/debug.h | 20 ++++++++++---------- dlls/dmloader/dmloader_private.h | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/dmloader/debug.h b/dlls/dmloader/debug.h index 56cfb72..546d643 100644 --- a/dlls/dmloader/debug.h +++ b/dlls/dmloader/debug.h @@ -42,23 +42,23 @@ typedef struct { #define GE(x) { &x, #x } /* check whether chunkID is valid dmobject form chunk */ -extern BOOL IS_VALID_DMFORM (FOURCC chunkID); +extern BOOL IS_VALID_DMFORM (FOURCC chunkID) DECLSPEC_HIDDEN; /* translate STREAM_SEEK flag to string */ -extern const char *resolve_STREAM_SEEK (DWORD flag); +extern const char *resolve_STREAM_SEEK (DWORD flag) DECLSPEC_HIDDEN; /* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc); +extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* DMUS_VERSION struct to string conversion for debug messages */ -extern const char *debugstr_dmversion (const DMUS_VERSION *version); +extern const char *debugstr_dmversion (const DMUS_VERSION *version) DECLSPEC_HIDDEN; /* FILETIME struct to string conversion for debug messages */ -extern const char *debugstr_filetime (const FILETIME *time); +extern const char *debugstr_filetime (const FILETIME *time) 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; /* returns name of given error code */ -extern const char *debugstr_dmreturn (DWORD code); +extern const char *debugstr_dmreturn (DWORD code) DECLSPEC_HIDDEN; /* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc); -extern const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader); -extern const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader); +extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +extern const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) DECLSPEC_HIDDEN; +extern const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader) DECLSPEC_HIDDEN; #endif /* __WINE_DMLOADER_DEBUG_H */ diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index 3b09972..4008806 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -45,8 +45,8 @@ #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) /* dmloader.dll global (for DllCanUnloadNow) */ -extern LONG dwDirectMusicLoader; /* number of DirectMusicLoader(CF) instances */ -extern LONG dwDirectMusicContainer; /* number of DirectMusicContainer(CF) instances */ +extern LONG dwDirectMusicLoader DECLSPEC_HIDDEN; /* number of DirectMusicLoader(CF) instances */ +extern LONG dwDirectMusicContainer DECLSPEC_HIDDEN; /* number of DirectMusicContainer(CF) instances */ /***************************************************************************** * Interfaces @@ -64,14 +64,14 @@ typedef struct IDirectMusicLoaderGenericStream IDirectMusicLoaderGenericStream; /***************************************************************************** * Creation helpers */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderCF (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicContainerCF (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderCF (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicContainerCF (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicContainerImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID *ppobj); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID *ppobj); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID *ppobj); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicContainerImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID *ppobj) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicLoaderCF implementation structure @@ -170,7 +170,7 @@ struct IDirectMusicLoaderFileStream { }; /* Custom: */ -extern HRESULT WINAPI IDirectMusicLoaderFileStream_Attach (LPSTREAM iface, LPCWSTR wzFile, LPDIRECTMUSICLOADER8 pLoader); +extern HRESULT WINAPI IDirectMusicLoaderFileStream_Attach (LPSTREAM iface, LPCWSTR wzFile, LPDIRECTMUSICLOADER8 pLoader) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicLoaderResourceStream implementation structure @@ -191,7 +191,7 @@ struct IDirectMusicLoaderResourceStream { }; /* Custom: */ -extern HRESULT WINAPI IDirectMusicLoaderResourceStream_Attach (LPSTREAM iface, LPBYTE pbMemData, LONGLONG llMemLength, LONGLONG llPos, LPDIRECTMUSICLOADER8 pLoader); +extern HRESULT WINAPI IDirectMusicLoaderResourceStream_Attach (LPSTREAM iface, LPBYTE pbMemData, LONGLONG llMemLength, LONGLONG llPos, LPDIRECTMUSICLOADER8 pLoader) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicLoaderGenericStream implementation structure @@ -209,7 +209,7 @@ struct IDirectMusicLoaderGenericStream { }; /* Custom: */ -extern HRESULT WINAPI IDirectMusicLoaderGenericStream_Attach (LPSTREAM iface, LPSTREAM pStream, LPDIRECTMUSICLOADER8 pLoader); +extern HRESULT WINAPI IDirectMusicLoaderGenericStream_Attach (LPSTREAM iface, LPSTREAM pStream, LPDIRECTMUSICLOADER8 pLoader) DECLSPEC_HIDDEN; /***************************************************************************** * Misc.

1 0

Marcus Meissner : dmscript: Mark internal symbols with hidden visibility.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: f301596ce357287b178ffbf88534d795adc330f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f301596ce357287b178ffbf88… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:58:10 2011 +0200 dmscript: Mark internal symbols with hidden visibility. --- dlls/dmscript/dmscript_private.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index c152ecc..c31164f 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -52,9 +52,9 @@ typedef struct IDirectMusicScriptTrack IDirectMusicScriptTrack; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicScriptImpl implementation structure @@ -93,7 +93,7 @@ struct IDirectMusicScriptTrack { /********************************************************************** * Dll lifetime tracking declaration for dmscript.dll */ -extern LONG DMSCRIPT_refCount; +extern LONG DMSCRIPT_refCount DECLSPEC_HIDDEN; static inline void DMSCRIPT_LockModule(void) { InterlockedIncrement( &DMSCRIPT_refCount ); } static inline void DMSCRIPT_UnlockModule(void) { InterlockedDecrement( &DMSCRIPT_refCount ); } @@ -130,10 +130,10 @@ typedef struct { #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) /* 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_DMSCRIPT_PRIVATE_H */

1 0