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

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

May 25, 2011

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 : wiaservc: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 25, 2011

May 25, 2011

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

Nikolay Sivov : comctl32/treeview: TVM_EXPAND with TVE_TOGGLE action shouldn' t always notify as it does on user input.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: bcb98d11ba6702165bf80e0fbc2b3aaef7b43c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb98d11ba6702165bf80e0fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 24 13:25:47 2011 +0400 comctl32/treeview: TVM_EXPAND with TVE_TOGGLE action shouldn't always notify as it does on user input. --- dlls/comctl32/tests/treeview.c | 33 +++++++++++++++++++++++++-------- dlls/comctl32/treeview.c | 10 +++++----- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 0437d65..5fd26a0 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1302,12 +1302,12 @@ static void test_expandnotify(void) item.state = TVIS_EXPANDED; ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); ok((item.state & TVIS_EXPANDED) == 0, "expected collapsed\n"); /* preselect root node here */ ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); g_get_from_expand = TRUE; /* expand */ @@ -1315,7 +1315,7 @@ static void test_expandnotify(void) g_item_expanding.state = 0xdeadbeef; g_item_expanded.state = 0xdeadbeef; ret = SendMessageA(hTree, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); ok(g_item_expanding.state == TVIS_SELECTED, "got state on TVN_ITEMEXPANDING 0x%08x\n", g_item_expanding.state); ok(g_item_expanded.state == (TVIS_SELECTED|TVIS_EXPANDED), "got state on TVN_ITEMEXPANDED 0x%08x\n", @@ -1326,16 +1326,16 @@ static void test_expandnotify(void) /* check that it's expanded */ item.state = TVIS_EXPANDED; ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); ok((item.state & TVIS_EXPANDED) == TVIS_EXPANDED, "expected expanded\n"); /* collapse */ flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = SendMessageA(hTree, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)hRoot); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); item.state = TVIS_EXPANDED; ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); - ok(ret == TRUE, "got %d\n", ret); + expect(TRUE, ret); ok((item.state & TVIS_EXPANDED) == 0, "expected collapsed\n"); /* all next collapse/expand attempts won't produce any notifications, the only way is to reset with all children removed */ @@ -1345,7 +1345,7 @@ static void test_expandnotify(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = SendMessageA(hTree, TVM_EXPAND, TVE_TOGGLE, (LPARAM)hChild); expect(FALSE, ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "toggle node without children", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "toggle node without children", FALSE); DestroyWindow(hTree); @@ -1354,8 +1354,25 @@ static void test_expandnotify(void) fill_tree(hTree); g_get_rect_in_expand = TRUE; ret = TreeView_Select(hTree, hChild, TVGN_CARET); + expect(TRUE, ret); g_get_rect_in_expand = FALSE; - ok(ret, "got %d\n", ret); + + DestroyWindow(hTree); + + /* TVE_TOGGLE acts as any other TVM_EXPAND */ + hTree = create_treeview_control(0); + fill_tree(hTree); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, TVM_EXPAND, TVE_TOGGLE, (LPARAM)hRoot); + expect(TRUE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_seq, "toggle node (expand)", FALSE); + + /* toggle again - no notifications */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, TVM_EXPAND, TVE_TOGGLE, (LPARAM)hRoot); + expect(TRUE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "toggle node (collapse)", FALSE); DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 2388d3c..bd65fca 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3489,14 +3489,14 @@ static void TREEVIEW_SingleExpand(TREEVIEW_INFO *infoPtr, } static BOOL -TREEVIEW_Toggle(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, BOOL bUser) +TREEVIEW_Toggle(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, BOOL user) { - TRACE("\n"); + TRACE("item=%p, user=%d\n", item, user); if (item->state & TVIS_EXPANDED) - return TREEVIEW_Collapse(infoPtr, item, FALSE, bUser); + return TREEVIEW_Collapse(infoPtr, item, FALSE, user); else - return TREEVIEW_Expand(infoPtr, item, FALSE, bUser); + return TREEVIEW_Expand(infoPtr, item, FALSE, user); } static VOID @@ -3538,7 +3538,7 @@ TREEVIEW_ExpandMsg(TREEVIEW_INFO *infoPtr, UINT flag, HTREEITEM item) FALSE); case TVE_TOGGLE: - return TREEVIEW_Toggle(infoPtr, item, TRUE); + return TREEVIEW_Toggle(infoPtr, item, FALSE); default: return 0;

1 0

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

May 25, 2011

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 May 25, 2011

May 25, 2011

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 : winealsa.drv: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 25, 2011

May 25, 2011

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

Henri Verbeet : wined3d: Mask out writes to unused render targets.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 019f6a8534d49cf92e8c819a4fda33a5ab4c1ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=019f6a8534d49cf92e8c819a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 22:24:12 2011 +0200 wined3d: Mask out writes to unused render targets. Outputs not written by the pixel shader are undefined in GL, but in D3D the render target is unmodified. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/context.c | 30 ++++++++++++++++++++++-------- dlls/wined3d/device.c | 3 +++ dlls/wined3d/shader.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 4 +++- 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 55b31bc..cefb6e5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1118,7 +1118,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction else { if(ctx->cur_ps_args->super.srgb_correction) FIXME("sRGB correction on higher render targets\n"); - if (reg_maps->highest_render_target > 0) + if (reg_maps->rt_mask > 1) { sprintf(register_name, "result.color[%u]", reg->idx); } @@ -3615,7 +3615,7 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, priv_ctx.target_version = ARB; } - if (reg_maps->highest_render_target > 0) + if (reg_maps->rt_mask > 1) { shader_addline(buffer, "OPTION ARB_draw_buffers;\n"); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5def575..f5d237e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1977,9 +1977,9 @@ static struct wined3d_context *FindContext(struct wined3d_device *device, struct } /* Context activation is done by the caller. */ -static void context_apply_draw_buffers(struct wined3d_context *context, UINT rt_count, struct wined3d_surface **rts) +static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt_mask, struct wined3d_surface **rts) { - if (!rt_count) + if (!rt_mask) { ENTER_GL(); glDrawBuffer(GL_NONE); @@ -1999,19 +1999,22 @@ static void context_apply_draw_buffers(struct wined3d_context *context, UINT rt_ if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int i; + unsigned int i = 0; - for (i = 0; i < rt_count; ++i) + while (rt_mask) { - if (rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) + if ((rt_mask & 1) && rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) context->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; else context->draw_buffers[i] = GL_NONE; + + rt_mask >>= 1; + ++i; } if (gl_info->supported[ARB_DRAW_BUFFERS]) { - GL_EXTCALL(glDrawBuffersARB(rt_count, context->draw_buffers)); + GL_EXTCALL(glDrawBuffersARB(i, context->draw_buffers)); checkGLcall("glDrawBuffers()"); } else @@ -2153,6 +2156,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d UINT rt_count, struct wined3d_surface **rts, struct wined3d_surface *depth_stencil) { const struct StateEntry *state_table = device->StateTable; + DWORD rt_mask = 0; UINT i; if (!context_validate_rt_config(rt_count, rts, depth_stencil)) @@ -2170,6 +2174,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d for (i = 0; i < rt_count; ++i) { context->blit_targets[i] = rts[i]; + rt_mask |= (1 << i); } while (i < context->gl_info->limits.buffers) { @@ -2183,12 +2188,17 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d else { context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, SFLAG_INDRAWABLE); + rt_mask = 1; } LEAVE_GL(); } + else + { + rt_mask = 1; + } - context_apply_draw_buffers(context, rt_count, rts); + context_apply_draw_buffers(context, rt_mask, rts); context->draw_buffer_dirty = TRUE; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -2261,7 +2271,11 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de if (context->draw_buffer_dirty) { - context_apply_draw_buffers(context, context->gl_info->limits.buffers, fb->render_targets); + const struct wined3d_shader *ps = device->stateBlock->state.pixel_shader; + DWORD rt_mask = ps ? ps->reg_maps.rt_mask : 1; + + rt_mask &= device->valid_rt_mask; + context_apply_draw_buffers(context, rt_mask, fb->render_targets); context->draw_buffer_dirty = FALSE; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab40d18..8724cdf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1166,6 +1166,9 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, device->updateStateBlock = device->stateBlock; wined3d_stateblock_incref(device->updateStateBlock); + device->valid_rt_mask = 0; + for (i = 0; i < gl_info->limits.buffers; ++i) + device->valid_rt_mask |= (1 << i); device->fb.render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*device->fb.render_targets) * gl_info->limits.buffers); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f5c45f3..79a2759 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -418,7 +418,7 @@ static void shader_record_register_usage(struct wined3d_shader *shader, struct w break; case WINED3DSPR_COLOROUT: - reg_maps->highest_render_target = max(reg_maps->highest_render_target, reg->idx); + reg_maps->rt_mask |= (1 << reg->idx); break; default: @@ -821,6 +821,11 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } reg_maps->loop_depth = max_loop_depth; + /* PS before 2.0 don't have explicit color outputs. Instead the value of + * R0 is written to the render target. */ + if (shader_version.major < 2 && shader_version.type == WINED3D_SHADER_TYPE_PIXEL) + reg_maps->rt_mask |= (1 << 0); + shader->functionLength = ((const char *)ptr - (const char *)byte_code); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 43481ae..5ac7ee4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -560,9 +560,10 @@ struct wined3d_shader_reg_maps WORD usespow : 1; WORD padding : 3; + DWORD rt_mask; /* Used render targets, 32 max. */ + /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth; - unsigned highest_render_target; UINT min_rel_offset, max_rel_offset; }; @@ -1716,6 +1717,7 @@ struct wined3d_device unsigned int highest_dirty_ps_const, highest_dirty_vs_const; /* Render Target Support */ + DWORD valid_rt_mask; struct wined3d_fb_state fb; struct wined3d_surface *onscreen_depth_stencil; struct wined3d_surface *auto_depth_stencil;

1 0

Henri Verbeet : wined3d: Check for unhandled resource usage flags.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: d5ee9a4014de9202bbd06c2a874fac810fa087d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ee9a4014de9202bbd06c2a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 21:18:52 2011 +0200 wined3d: Check for unhandled resource usage flags. --- dlls/wined3d/resource.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 5771b5b..4060bc6 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -65,6 +65,19 @@ static DWORD resource_access_from_pool(WINED3DPOOL pool) } } +static void resource_check_usage(DWORD usage) +{ + static const DWORD handled = WINED3DUSAGE_RENDERTARGET + | WINED3DUSAGE_DEPTHSTENCIL + | WINED3DUSAGE_DYNAMIC + | WINED3DUSAGE_AUTOGENMIPMAP + | WINED3DUSAGE_STATICDECL + | WINED3DUSAGE_OVERLAY; + + if (usage & ~handled) + FIXME("Unhandled usage flags %#x.\n", usage & ~handled); +} + HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, WINED3DRESOURCETYPE resource_type, const struct wined3d_format *format, WINED3DMULTISAMPLE_TYPE multisample_type, UINT multisample_quality, @@ -93,6 +106,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->resource_ops = resource_ops; list_init(&resource->privateData); + resource_check_usage(usage); + if (size) { resource->heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + RESOURCE_ALIGNMENT);

1 0

Henri Verbeet : wined3d: Rename IWineD3DDeviceImpl_FindTexUnitMap() to device_update_tex_unit_map().
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 6d3103903454cc9470204d71b081d8ba8abf6bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3103903454cc9470204d71b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 21:18:51 2011 +0200 wined3d: Rename IWineD3DDeviceImpl_FindTexUnitMap() to device_update_tex_unit_map(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 20bb6d6..5def575 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2234,7 +2234,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de /* Preload resources before FBO setup. Texture preload in particular may * result in changes to the current FBO, due to using e.g. FBO blits for * updating a resource location. */ - IWineD3DDeviceImpl_FindTexUnitMap(device); + device_update_tex_unit_map(device); device_preload_textures(device); if (isStateDirty(context, STATE_VDECL)) device_update_stream_info(device, context->gl_info); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 12f1023..ab40d18 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2980,7 +2980,7 @@ static void device_map_vsamplers(struct wined3d_device *device, BOOL ps, const s } } -void IWineD3DDeviceImpl_FindTexUnitMap(struct wined3d_device *device) +void device_update_tex_unit_map(struct wined3d_device *device) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_state *state = &device->stateBlock->state; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b31239b..43481ae 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1790,7 +1790,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_context *context, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; void device_update_stream_info(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -void IWineD3DDeviceImpl_FindTexUnitMap(struct wined3d_device *device) DECLSPEC_HIDDEN; +void device_update_tex_unit_map(struct wined3d_device *device) DECLSPEC_HIDDEN; void IWineD3DDeviceImpl_MarkStateDirty(struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; static inline BOOL isStateDirty(struct wined3d_context *context, DWORD state)

1 0

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

May 25, 2011

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