wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

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

25 May '11

Module: wine Branch: master Commit: 7f5e729453e3ea9fa639bc35a49a042e75e9de5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5e729453e3ea9fa639bc35a… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:20:22 2011 +0200 spoolss: Mark internal symbols with hidden visibility. --- dlls/spoolss/spoolss.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/spoolss/spoolss.h b/dlls/spoolss/spoolss.h index 6868913..67b3891 100644 --- a/dlls/spoolss/spoolss.h +++ b/dlls/spoolss/spoolss.h @@ -21,8 +21,8 @@ /* ################################ */ -BOOL backend_load_all(void); -void backend_unload_all(void); +BOOL backend_load_all(void) DECLSPEC_HIDDEN; +void backend_unload_all(void) DECLSPEC_HIDDEN; /* ## Memory allocation functions ## */

1 0

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

25 May '11

Module: wine Branch: master Commit: f9779bbee26f4d0640ebd44130e41301de3170fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9779bbee26f4d0640ebd4413… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:21:24 2011 +0200 usp10: Mark internal symbols with hidden visibility. --- dlls/usp10/usp10_internal.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index f6df10a..e68e247 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -77,12 +77,12 @@ typedef struct { #define odd(x) ((x) & 1) BOOL BIDI_DetermineLevels( LPCWSTR lpString, INT uCount, const SCRIPT_STATE *s, - const SCRIPT_CONTROL *c, WORD *lpOutLevels ); + const SCRIPT_CONTROL *c, WORD *lpOutLevels ) DECLSPEC_HIDDEN; BOOL BIDI_GetStrengths(LPCWSTR lpString, INT uCount, const SCRIPT_CONTROL *c, - WORD* lpStrength); -INT BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse); -INT BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse); -void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); -void SHAPE_ApplyDefaultOpentypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, INT cChars, WORD *pwLogClust); -HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa); -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); + WORD* lpStrength) DECLSPEC_HIDDEN; +INT BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse) DECLSPEC_HIDDEN; +INT BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse) DECLSPEC_HIDDEN; +void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) DECLSPEC_HIDDEN; +void SHAPE_ApplyDefaultOpentypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, INT cChars, WORD *pwLogClust) DECLSPEC_HIDDEN; +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;

1 0

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

25 May '11

Module: wine Branch: master Commit: 790c1070455ec8768c43d7001339a328fb5eed05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=790c1070455ec8768c43d7001… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:23:06 2011 +0200 uxtheme: Mark internal symbols with hidden visibility. --- dlls/uxtheme/msstyles.h | 60 ++++++++++++++++++++++---------------------- dlls/uxtheme/system.c | 4 +- dlls/uxtheme/uxthemedll.h | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 6cd73ac..0b7e1ab 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -84,35 +84,35 @@ typedef struct _THEME_FILE { typedef struct _UXINI_FILE *PUXINI_FILE; -HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf); -void MSSTYLES_CloseThemeFile(PTHEME_FILE tf); -HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics); -PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList); -HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc); -BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwId); -BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue); -BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId); -PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf); -PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext); -PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId); -PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId); -HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha); - -HRESULT MSSTYLES_GetPropertyBool(PTHEME_PROPERTY tp, BOOL *pfVal); -HRESULT MSSTYLES_GetPropertyColor(PTHEME_PROPERTY tp, COLORREF *pColor); -HRESULT MSSTYLES_GetPropertyFont(PTHEME_PROPERTY tp, HDC hdc, LOGFONTW *pFont); -HRESULT MSSTYLES_GetPropertyInt(PTHEME_PROPERTY tp, int *piVal); -HRESULT MSSTYLES_GetPropertyIntList(PTHEME_PROPERTY tp, INTLIST *pIntList); -HRESULT MSSTYLES_GetPropertyPosition(PTHEME_PROPERTY tp, POINT *pPoint); -HRESULT MSSTYLES_GetPropertyString(PTHEME_PROPERTY tp, LPWSTR pszBuff, int cchMaxBuffChars); -HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect); -HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMargins); - -PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName); -void UXINI_CloseINI(PUXINI_FILE uf); -LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen); -BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName); -LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen); -BOOL UXINI_FindValue(PUXINI_FILE uf, LPCWSTR lpName, LPCWSTR *lpValue, DWORD *dwValueLen); +HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf) DECLSPEC_HIDDEN; +void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics) DECLSPEC_HIDDEN; +PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) DECLSPEC_HIDDEN; +BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwId) DECLSPEC_HIDDEN; +BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue) DECLSPEC_HIDDEN; +BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId) DECLSPEC_HIDDEN; +PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) DECLSPEC_HIDDEN; +PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext) DECLSPEC_HIDDEN; +PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; +PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; +HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha) DECLSPEC_HIDDEN; + +HRESULT MSSTYLES_GetPropertyBool(PTHEME_PROPERTY tp, BOOL *pfVal) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyColor(PTHEME_PROPERTY tp, COLORREF *pColor) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyFont(PTHEME_PROPERTY tp, HDC hdc, LOGFONTW *pFont) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyInt(PTHEME_PROPERTY tp, int *piVal) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyIntList(PTHEME_PROPERTY tp, INTLIST *pIntList) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyPosition(PTHEME_PROPERTY tp, POINT *pPoint) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyString(PTHEME_PROPERTY tp, LPWSTR pszBuff, int cchMaxBuffChars) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMargins) DECLSPEC_HIDDEN; + +PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName) DECLSPEC_HIDDEN; +void UXINI_CloseINI(PUXINI_FILE uf) DECLSPEC_HIDDEN; +LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen) DECLSPEC_HIDDEN; +BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName) DECLSPEC_HIDDEN; +LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen) DECLSPEC_HIDDEN; +BOOL UXINI_FindValue(PUXINI_FILE uf, LPCWSTR lpName, LPCWSTR *lpValue, DWORD *dwValueLen) DECLSPEC_HIDDEN; #endif diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 60e55ee..2d5b41e 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -57,8 +57,8 @@ static const WCHAR szDllName[] = {'D','l','l','N','a','m','e','\0'}; static const WCHAR szIniDocumentation[] = {'d','o','c','u','m','e','n','t','a','t','i','o','n','\0'}; -HINSTANCE hDllInst; -ATOM atDialogThemeEnabled; +DECLSPEC_HIDDEN HINSTANCE hDllInst; +DECLSPEC_HIDDEN ATOM atDialogThemeEnabled; static DWORD dwThemeAppProperties = STAP_ALLOW_NONCLIENT | STAP_ALLOW_CONTROLS; static ATOM atWindowTheme; diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index ed37e72..fee152c 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -76,25 +76,25 @@ typedef struct tagTHEMENAMES } THEMENAMES, *PTHEMENAMES; /* Declarations for undocumented functions for use internally */ -DWORD WINAPI QueryThemeServices(void); +DWORD WINAPI QueryThemeServices(void) DECLSPEC_HIDDEN; HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, LPCWSTR pszColorName, LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile, - DWORD unknown); -HRESULT WINAPI CloseThemeFile(HTHEMEFILE hThemeFile); -HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, char *unknown, HWND hWnd); + DWORD unknown) DECLSPEC_HIDDEN; +HRESULT WINAPI CloseThemeFile(HTHEMEFILE hThemeFile) DECLSPEC_HIDDEN; +HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, char *unknown, HWND hWnd) DECLSPEC_HIDDEN; HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, LPWSTR pszColorName, DWORD dwColorNameLen, LPWSTR pszSizeName, - DWORD dwSizeNameLen); + DWORD dwSizeNameLen) DECLSPEC_HIDDEN; HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, EnumThemeProc callback, - LPVOID lpData); + LPVOID lpData) DECLSPEC_HIDDEN; HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName, LPWSTR pszSizeName, - DWORD dwColorNum, PTHEMENAMES pszColorNames); + DWORD dwColorNum, PTHEMENAMES pszColorNames) DECLSPEC_HIDDEN; HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, LPWSTR pszColorName, - DWORD dwSizeNum, PTHEMENAMES pszColorNames); + DWORD dwSizeNum, PTHEMENAMES pszColorNames) DECLSPEC_HIDDEN; HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, LPWSTR pszUnknown, - ParseThemeIniFileProc callback, LPVOID lpData); + ParseThemeIniFileProc callback, LPVOID lpData) DECLSPEC_HIDDEN; -extern void UXTHEME_InitSystem(HINSTANCE hInst); +extern void UXTHEME_InitSystem(HINSTANCE hInst) DECLSPEC_HIDDEN; /* No alpha blending */ #define ALPHABLEND_NONE 0

1 0

Marcus Meissner : wbemprox: Mark one internal function with hidden visibility.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 2ef583f584241c0947533465b5bd1997588c76f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef583f584241c0947533465b… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:24:41 2011 +0200 wbemprox: Mark one internal function with hidden visibility. --- dlls/wbemprox/wbemprox_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index cf4301d..ba9c8ad 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -16,4 +16,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT WbemLocator_create(IUnknown *, LPVOID *); +HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;

1 0

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

25 May '11

Module: wine Branch: master Commit: bce961e98f328a979d643ed08324a21c54a38bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce961e98f328a979d643ed08… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:25:26 2011 +0200 wiaservc: Mark internal symbols with hidden visibility. --- dlls/wiaservc/wiaservc_private.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wiaservc/wiaservc_private.h b/dlls/wiaservc/wiaservc_private.h index 97b9770..5125937 100644 --- a/dlls/wiaservc/wiaservc_private.h +++ b/dlls/wiaservc/wiaservc_private.h @@ -26,7 +26,7 @@ typedef struct IClassFactory IClassFactory_iface; } ClassFactoryImpl; -extern ClassFactoryImpl WIASERVC_ClassFactory; +extern ClassFactoryImpl WIASERVC_ClassFactory DECLSPEC_HIDDEN; typedef struct { @@ -34,7 +34,7 @@ typedef struct LONG ref; } wiadevmgr; -HRESULT wiadevmgr_Constructor(IUnknown *pUnkOuter, LPVOID *ppObj); +HRESULT wiadevmgr_Constructor(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; /* Little helper functions */ static inline char *

1 0

Marcus Meissner : winealsa.drv: Mark internal symbols with hidden visibility.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 5078d07e6f61394917e3c9b34804f8124cddba6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5078d07e6f61394917e3c9b34… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:26:37 2011 +0200 winealsa.drv: Mark internal symbols with hidden visibility. --- dlls/winealsa.drv/alsa.h | 56 +++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/winealsa.drv/alsa.h b/dlls/winealsa.drv/alsa.h index ff97861..bc21fbc 100644 --- a/dlls/winealsa.drv/alsa.h +++ b/dlls/winealsa.drv/alsa.h @@ -155,43 +155,43 @@ typedef struct { #define WAVEDEV_ALLOC_EXTENT_SIZE 10 /* wavein.c */ -extern WINE_WAVEDEV *WInDev; -extern DWORD ALSA_WidNumMallocedDevs; -extern DWORD ALSA_WidNumDevs; +extern WINE_WAVEDEV *WInDev DECLSPEC_HIDDEN; +extern DWORD ALSA_WidNumMallocedDevs DECLSPEC_HIDDEN; +extern DWORD ALSA_WidNumDevs DECLSPEC_HIDDEN; /* waveout.c */ -extern WINE_WAVEDEV *WOutDev; -extern DWORD ALSA_WodNumMallocedDevs; -extern DWORD ALSA_WodNumDevs; +extern WINE_WAVEDEV *WOutDev DECLSPEC_HIDDEN; +extern DWORD ALSA_WodNumMallocedDevs DECLSPEC_HIDDEN; +extern DWORD ALSA_WodNumDevs DECLSPEC_HIDDEN; /* alsa.c */ -int ALSA_InitRingMessage(ALSA_MSG_RING* omr); -int ALSA_DestroyRingMessage(ALSA_MSG_RING* omr); -void ALSA_ResetRingMessage(ALSA_MSG_RING* omr); -void ALSA_WaitRingMessage(ALSA_MSG_RING* omr, DWORD sleep); -int ALSA_AddRingMessage(ALSA_MSG_RING* omr, enum win_wm_message msg, DWORD_PTR param, BOOL wait); -int ALSA_RetrieveRingMessage(ALSA_MSG_RING* omr, enum win_wm_message *msg, DWORD_PTR *param, HANDLE *hEvent); -int ALSA_CheckSetVolume(snd_hctl_t *hctl, int *out_left, int *out_right, int *out_min, int *out_max, int *out_step, int *new_left, int *new_right); - -const char * ALSA_getCmdString(enum win_wm_message msg); -const char * ALSA_getMessage(UINT msg); -const char * ALSA_getFormat(WORD wFormatTag); -BOOL ALSA_NearMatch(int rate1, int rate2); -DWORD ALSA_bytes_to_mmtime(LPMMTIME lpTime, DWORD position, WAVEFORMATPCMEX* format); -void ALSA_TraceParameters(snd_pcm_hw_params_t * hw_params, snd_pcm_sw_params_t * sw, int full); -int wine_snd_pcm_recover(snd_pcm_t *pcm, int err, int silent); -void ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2); -BOOL ALSA_supportedFormat(LPWAVEFORMATEX wf); +int ALSA_InitRingMessage(ALSA_MSG_RING* omr) DECLSPEC_HIDDEN; +int ALSA_DestroyRingMessage(ALSA_MSG_RING* omr) DECLSPEC_HIDDEN; +void ALSA_ResetRingMessage(ALSA_MSG_RING* omr) DECLSPEC_HIDDEN; +void ALSA_WaitRingMessage(ALSA_MSG_RING* omr, DWORD sleep) DECLSPEC_HIDDEN; +int ALSA_AddRingMessage(ALSA_MSG_RING* omr, enum win_wm_message msg, DWORD_PTR param, BOOL wait) DECLSPEC_HIDDEN; +int ALSA_RetrieveRingMessage(ALSA_MSG_RING* omr, enum win_wm_message *msg, DWORD_PTR *param, HANDLE *hEvent) DECLSPEC_HIDDEN; +int ALSA_CheckSetVolume(snd_hctl_t *hctl, int *out_left, int *out_right, int *out_min, int *out_max, int *out_step, int *new_left, int *new_right) DECLSPEC_HIDDEN; + +const char * ALSA_getCmdString(enum win_wm_message msg) DECLSPEC_HIDDEN; +const char * ALSA_getMessage(UINT msg) DECLSPEC_HIDDEN; +const char * ALSA_getFormat(WORD wFormatTag) DECLSPEC_HIDDEN; +BOOL ALSA_NearMatch(int rate1, int rate2) DECLSPEC_HIDDEN; +DWORD ALSA_bytes_to_mmtime(LPMMTIME lpTime, DWORD position, WAVEFORMATPCMEX* format) DECLSPEC_HIDDEN; +void ALSA_TraceParameters(snd_pcm_hw_params_t * hw_params, snd_pcm_sw_params_t * sw, int full) DECLSPEC_HIDDEN; +int wine_snd_pcm_recover(snd_pcm_t *pcm, int err, int silent) DECLSPEC_HIDDEN; +void ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) DECLSPEC_HIDDEN; +BOOL ALSA_supportedFormat(LPWAVEFORMATEX wf) DECLSPEC_HIDDEN; /* dscapture.c */ -DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv); -DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc); +DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv) DECLSPEC_HIDDEN; +DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc) DECLSPEC_HIDDEN; /* dsoutput.c */ -DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv); -DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc); +DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv) DECLSPEC_HIDDEN; +DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) DECLSPEC_HIDDEN; /* waveinit.c */ -extern void ALSA_WaveInit(void); +extern void ALSA_WaveInit(void) DECLSPEC_HIDDEN; #endif /* __ALSA_H */

1 0

Marcus Meissner : wineps.drv: Mark internal symbols with hidden visibility.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 451a656f2f1563dfb311f6c4d6c6029825490254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451a656f2f1563dfb311f6c4d… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:41:29 2011 +0200 wineps.drv: Mark internal symbols with hidden visibility. --- dlls/wineps.drv/afm.c | 2 +- dlls/wineps.drv/data/agl.h | 70 +++++++++--------- dlls/wineps.drv/mkagl.c | 2 +- dlls/wineps.drv/psdrv.h | 180 ++++++++++++++++++++++---------------------- 4 files changed, 127 insertions(+), 127 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=451a656f2f1563dfb311f…

1 0

Marcus Meissner : winex11.drv: Mark internal symbols with hidden visibility .
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 5a9b623212e160d315290770f5f1c4f2afa5c901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9b623212e160d315290770f… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:52:35 2011 +0200 winex11.drv: Mark internal symbols with hidden visibility. --- dlls/winex11.drv/x11drv.h | 415 ++++++++++++++++++++-------------------- dlls/winex11.drv/x11drv_main.c | 2 +- dlls/winex11.drv/x11font.h | 6 +- dlls/winex11.drv/xcomposite.h | 2 +- dlls/winex11.drv/xrandr.h | 2 +- dlls/winex11.drv/xvidmode.h | 4 +- 6 files changed, 217 insertions(+), 214 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a9b623212e160d315290…

1 0

Henri Verbeet : wined3d: Get rid of an unintentional variable.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: b396886e5d28fcaa348487c7bcb232c0a3fc42da URL: http://source.winehq.org/git/wine.git/?a=commit;h=b396886e5d28fcaa348487c7b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 22:04:25 2011 +0200 wined3d: Get rid of an unintentional variable. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5ac7ee4..aaf1423 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1274,7 +1274,7 @@ struct wined3d_pixel_format BOOL doubleBuffer; int auxBuffers; int numSamples; -} wined3d_pixel_format; +}; /* The driver names reflect the lowest GPU supported * by a certain driver, so DRIVER_AMD_R300 supports

1 0

Henri Verbeet : d3d9/tests: Add a test for unwritten pixel shader outputs.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: ea34d7aaba0512e0812e2cb3c3c4de0ef0ab45f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea34d7aaba0512e0812e2cb3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 21:18:54 2011 +0200 d3d9/tests: Add a test for unwritten pixel shader outputs. --- dlls/d3d9/tests/visual.c | 52 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 45 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e90bcaf..6b30f3e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8619,7 +8619,14 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ 0x0000ffff /* end */ }; - static const DWORD pshader_code[] = + static const DWORD pshader_code1[] = + { + 0xffff0300, /* ps_3_0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, /* def c0, 0.0, 1.0, 0.0, 0.0 */ + 0x02000001, 0x800f0800, 0xa0e40000, /* mov oC0, c0 */ + 0x0000ffff /* end */ + }; + static const DWORD pshader_code2[] = { 0xffff0300, /* ps_3_0 */ 0x05000051, 0xa00f0000, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, /* def c0, 0.0, 1.0, 0.0, 0.0 */ @@ -8631,11 +8638,12 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) HRESULT hr; IDirect3DVertexShader9 *vs; - IDirect3DPixelShader9 *ps; + IDirect3DPixelShader9 *ps1, *ps2; IDirect3DTexture9 *tex1, *tex2; IDirect3DSurface9 *surf1, *surf2, *backbuf, *readback; D3DCAPS9 caps; DWORD color; + UINT i, j; float quad[] = { -1.0, -1.0, 0.1, 1.0, -1.0, 0.1, @@ -8677,8 +8685,10 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed, hr=%08x\n", hr); hr = IDirect3DDevice9_CreateVertexShader(device, vshader_code, &vs); ok(SUCCEEDED(hr), "CreateVertexShader failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_CreatePixelShader(device, pshader_code, &ps); - ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, pshader_code1, &ps1); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, pshader_code2, &ps2); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); hr = IDirect3DDevice9_GetRenderTarget(device, 0, &backbuf); ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderTarget failed, hr=%08x\n", hr); @@ -8689,8 +8699,6 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetVertexShader(device, vs); ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, ps); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, surf1); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 1, surf2); @@ -8711,6 +8719,32 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff), 0), "Expected color 0x000000ff, got 0x%08x.\n", color); + /* Render targets not written by the pixel shader should be unmodified. */ + hr = IDirect3DDevice9_SetPixelShader(device, ps1); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTargetData(device, surf1, readback); + ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 8, 8); + ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00), 0), + "Expected color 0xff00ff00, got 0x%08x.\n", color); + hr = IDirect3DDevice9_GetRenderTargetData(device, surf2, readback); + ok(SUCCEEDED(hr), "GetRenderTargetData failed, hr %#x.\n", hr); + for (i = 6; i < 10; ++i) + { + for (j = 6; j < 10; ++j) + { + color = getPixelColorFromSurface(readback, j, i); + ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff), 0), + "Expected color 0xff0000ff, got 0x%08x at %u, %u.\n", color, j, i); + } + } + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); ok(SUCCEEDED(hr), "Clear failed, hr %#x,\n", hr); hr = IDirect3DDevice9_GetRenderTargetData(device, surf1, readback); @@ -8724,6 +8758,9 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) ok(color_match(color, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00), 0), "Expected color 0x0000ff00, got 0x%08x.\n", color); + hr = IDirect3DDevice9_SetPixelShader(device, ps2); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed, hr=%08x\n", hr); if(SUCCEEDED(hr)) { @@ -8764,7 +8801,8 @@ static void multiple_rendertargets_test(IDirect3DDevice9 *device) ok(color == 0x000000ff, "Texture 2(output color 2) has color 0x%08x, expected 0x000000ff\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - IDirect3DPixelShader9_Release(ps); + IDirect3DPixelShader9_Release(ps2); + IDirect3DPixelShader9_Release(ps1); IDirect3DVertexShader9_Release(vs); IDirect3DTexture9_Release(tex1); IDirect3DTexture9_Release(tex2);

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2011