April 2007 - Wine-Commits - list.winehq.org

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 8366dd17030d7621904d21b50d4f9be864c19361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8366dd17030d7621904d21b50… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 2 17:49:18 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/tab.c | 62 ++++++++++++++------------------------------------ 1 files changed, 18 insertions(+), 44 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 0b0712e..d3237c7 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -164,9 +164,9 @@ static const WCHAR themeClass[] = { 'T','a','b',0 }; /****************************************************************************** * Prototypes */ -static void TAB_InvalidateTabArea(TAB_INFO *); +static void TAB_InvalidateTabArea(const TAB_INFO *); static void TAB_EnsureSelectionVisible(TAB_INFO *); -static void TAB_DrawItemInterior(TAB_INFO *, HDC, INT, RECT*); +static void TAB_DrawItemInterior(const TAB_INFO *, HDC, INT, RECT*); static BOOL TAB_SendSimpleNotify (const TAB_INFO *infoPtr, UINT code) @@ -199,7 +199,7 @@ TAB_RelayEvent (HWND hwndTip, HWND hwndMsg, UINT uMsg, } static void -TAB_DumpItemExternalT(TCITEMW *pti, UINT iItem, BOOL isW) +TAB_DumpItemExternalT(const TCITEMW *pti, UINT iItem, BOOL isW) { if (TRACE_ON(tab)) { TRACE("external tab %d, mask=0x%08x, dwState=0x%08x, dwStateMask=0x%08x, cchTextMax=0x%08x\n", @@ -210,7 +210,7 @@ TAB_DumpItemExternalT(TCITEMW *pti, UINT iItem, BOOL isW) } static void -TAB_DumpItemInternal(TAB_INFO *infoPtr, UINT iItem) +TAB_DumpItemInternal(const TAB_INFO *infoPtr, UINT iItem) { if (TRACE_ON(tab)) { TAB_ITEM *ti; @@ -458,7 +458,7 @@ static BOOL TAB_InternalGetItemRect( } static inline BOOL -TAB_GetItemRect(TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +TAB_GetItemRect(const TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { return TAB_InternalGetItemRect(infoPtr, (INT)wParam, (LPRECT)lParam, (LPRECT)NULL); } @@ -535,11 +535,7 @@ static void TAB_FocusChanging(const TAB_INFO *infoPtr) } } -static INT TAB_InternalHitTest ( - TAB_INFO* infoPtr, - POINT pt, - UINT* flags) - +static INT TAB_InternalHitTest (const TAB_INFO *infoPtr, POINT pt, UINT *flags) { RECT rect; INT iCount; @@ -560,7 +556,7 @@ static INT TAB_InternalHitTest ( } static inline LRESULT -TAB_HitTest (TAB_INFO *infoPtr, LPTCHITTESTINFO lptest) +TAB_HitTest (const TAB_INFO *infoPtr, LPTCHITTESTINFO lptest) { return TAB_InternalHitTest (infoPtr, lptest->pt, &lptest->flags); } @@ -578,7 +574,7 @@ TAB_HitTest (TAB_INFO *infoPtr, LPTCHITTESTINFO lptest) * doesn't do it that way. Maybe depends on tab control styles ? */ static inline LRESULT -TAB_NCHitTest (TAB_INFO *infoPtr, LPARAM lParam) +TAB_NCHitTest (const TAB_INFO *infoPtr, LPARAM lParam) { POINT pt; UINT dummyflag; @@ -659,7 +655,7 @@ TAB_RButtonDown (const TAB_INFO *infoPtr) * only calls TAB_DrawItemInterior for the single specified item. */ static void -TAB_DrawLoneItemInterior(TAB_INFO* infoPtr, int iItem) +TAB_DrawLoneItemInterior(const TAB_INFO* infoPtr, int iItem) { HDC hdc = GetDC(infoPtr->hwnd); RECT r, rC; @@ -677,7 +673,7 @@ TAB_DrawLoneItemInterior(TAB_INFO* infoPtr, int iItem) /* update a tab after hottracking - invalidate it or just redraw the interior, * based on whether theming is used or not */ -static inline void hottrack_refresh (TAB_INFO* infoPtr, int tabIndex) +static inline void hottrack_refresh(const TAB_INFO *infoPtr, int tabIndex) { if (tabIndex == -1) return; @@ -862,10 +858,7 @@ TAB_MouseMove (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) * Calculates the tab control's display area given the window rectangle or * the window rectangle given the requested display rectangle. */ -static LRESULT TAB_AdjustRect( - TAB_INFO *infoPtr, - WPARAM fLarger, - LPRECT prc) +static LRESULT TAB_AdjustRect(const TAB_INFO *infoPtr, WPARAM fLarger, LPRECT prc) { DWORD lStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); LONG *iRightBottom, *iLeftTop; @@ -923,11 +916,7 @@ static LRESULT TAB_AdjustRect( * This method will handle the notification from the scroll control and * perform the scrolling operation on the tab control. */ -static LRESULT TAB_OnHScroll( - TAB_INFO *infoPtr, - int nScrollCode, - int nPos, - HWND hwndScroll) +static LRESULT TAB_OnHScroll(TAB_INFO *infoPtr, int nScrollCode, int nPos, HWND hwndScroll) { if(nScrollCode == SB_THUMBPOSITION && nPos != infoPtr->leftmostVisible) { @@ -1439,13 +1428,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) static void -TAB_EraseTabInterior - ( - TAB_INFO* infoPtr, - HDC hdc, - INT iItem, - RECT* drawRect - ) +TAB_EraseTabInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect) { LONG lStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); HBRUSH hbr = CreateSolidBrush (comctl32_color.clrBtnFace); @@ -1507,13 +1490,7 @@ TAB_EraseTabInterior * into the tab control. */ static void -TAB_DrawItemInterior - ( - TAB_INFO* infoPtr, - HDC hdc, - INT iItem, - RECT* drawRect - ) +TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect) { LONG lStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); @@ -1929,10 +1906,7 @@ TAB_DrawItemInterior * * This method is used to draw a single tab into the tab control. */ -static void TAB_DrawItem( - TAB_INFO *infoPtr, - HDC hdc, - INT iItem) +static void TAB_DrawItem(const TAB_INFO *infoPtr, HDC hdc, INT iItem) { LONG lStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); RECT itemRect; @@ -2282,7 +2256,7 @@ static void TAB_DrawItem( * This method is used to draw the raised border around the tab control * "content" area. */ -static void TAB_DrawBorder (TAB_INFO *infoPtr, HDC hdc) +static void TAB_DrawBorder(const TAB_INFO *infoPtr, HDC hdc) { RECT rect; DWORD lStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); @@ -2497,7 +2471,7 @@ static void TAB_EnsureSelectionVisible( * tabs. It is called when the state of the control changes and needs * to be redisplayed */ -static void TAB_InvalidateTabArea(TAB_INFO* infoPtr) +static void TAB_InvalidateTabArea(const TAB_INFO *infoPtr) { RECT clientRect, rInvalidate, rAdjClient; DWORD lStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); @@ -3114,7 +3088,7 @@ TAB_Destroy (TAB_INFO *infoPtr) } /* update theme after a WM_THEMECHANGED message */ -static LRESULT theme_changed (TAB_INFO* infoPtr) +static LRESULT theme_changed(const TAB_INFO *infoPtr) { HTHEME theme = GetWindowTheme (infoPtr->hwnd); CloseThemeData (theme);

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 13cd63af43f82c7d40475f4f5c534415a988ea5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=13cd63af43f82c7d40475f4f5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 2 17:49:44 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/theme_combo.c | 2 +- dlls/comctl32/tooltips.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/theme_combo.c b/dlls/comctl32/theme_combo.c index b4007db..af6eee8 100644 --- a/dlls/comctl32/theme_combo.c +++ b/dlls/comctl32/theme_combo.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(themingcombo); #define EDIT_CONTROL_PADDING 1 /* paint text of combobox, needed for read-only drop downs. */ -static void paint_text (HWND hwnd, HDC hdc, DWORD dwStyle, COMBOBOXINFO* cbi) +static void paint_text (HWND hwnd, HDC hdc, DWORD dwStyle, const COMBOBOXINFO *cbi) { INT id, size = 0; LPWSTR pText = NULL; diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 4825d1b..e9fcbf2 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -435,7 +435,7 @@ TOOLTIPS_GetTipText (HWND hwnd, TOOLTIPS_INFO *infoPtr, INT nTool) static void -TOOLTIPS_CalcTipSize (HWND hwnd, TOOLTIPS_INFO *infoPtr, LPSIZE lpSize) +TOOLTIPS_CalcTipSize (HWND hwnd, const TOOLTIPS_INFO *infoPtr, LPSIZE lpSize) { HDC hdc; HFONT hOldFont; @@ -816,7 +816,7 @@ TOOLTIPS_TrackShow (HWND hwnd, TOOLTIPS_INFO *infoPtr) static void -TOOLTIPS_TrackHide (HWND hwnd, TOOLTIPS_INFO *infoPtr) +TOOLTIPS_TrackHide (HWND hwnd, const TOOLTIPS_INFO *infoPtr) { TTTOOL_INFO *toolPtr; NMHDR hdr; @@ -840,7 +840,7 @@ TOOLTIPS_TrackHide (HWND hwnd, TOOLTIPS_INFO *infoPtr) static INT -TOOLTIPS_GetToolFromInfoA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) +TOOLTIPS_GetToolFromInfoA (const TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpToolInfo) { TTTOOL_INFO *toolPtr; INT nTool; @@ -867,7 +867,7 @@ TOOLTIPS_GetToolFromInfoA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) static INT -TOOLTIPS_GetToolFromInfoW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) +TOOLTIPS_GetToolFromInfoW (const TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) { TTTOOL_INFO *toolPtr; INT nTool; @@ -894,7 +894,7 @@ TOOLTIPS_GetToolFromInfoW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) static INT -TOOLTIPS_GetToolFromPoint (TOOLTIPS_INFO *infoPtr, HWND hwnd, LPPOINT lpPt) +TOOLTIPS_GetToolFromPoint (const TOOLTIPS_INFO *infoPtr, HWND hwnd, const POINT *lpPt) { TTTOOL_INFO *toolPtr; INT nTool;

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: af16b105a71be561d4ba0ebd655d9d2aa3dc46ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=af16b105a71be561d4ba0ebd6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 2 17:49:00 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/syslink.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index fcf253d..1d90b5c 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -472,7 +472,7 @@ CheckParameter: * SYSLINK_RepaintLink * Repaints a link. */ -static VOID SYSLINK_RepaintLink (SYSLINK_INFO *infoPtr, PDOC_ITEM DocItem) +static VOID SYSLINK_RepaintLink (const SYSLINK_INFO *infoPtr, const DOC_ITEM *DocItem) { PDOC_TEXTBLOCK bl; int n; @@ -501,7 +501,7 @@ static VOID SYSLINK_RepaintLink (SYSLINK_INFO *infoPtr, PDOC_ITEM DocItem) * SYSLINK_GetLinkItemByIndex * Retrieves a document link by its index */ -static PDOC_ITEM SYSLINK_GetLinkItemByIndex (SYSLINK_INFO *infoPtr, int iLink) +static PDOC_ITEM SYSLINK_GetLinkItemByIndex (const SYSLINK_INFO *infoPtr, int iLink) { PDOC_ITEM Current = infoPtr->Items; @@ -520,7 +520,7 @@ static PDOC_ITEM SYSLINK_GetLinkItemByIndex (SYSLINK_INFO *infoPtr, int iLink) * SYSLINK_GetFocusLink * Retrieves the link that has the LIS_FOCUSED bit */ -static PDOC_ITEM SYSLINK_GetFocusLink (SYSLINK_INFO *infoPtr, int *LinkId) +static PDOC_ITEM SYSLINK_GetFocusLink (const SYSLINK_INFO *infoPtr, int *LinkId) { PDOC_ITEM Current = infoPtr->Items; int id = 0; @@ -546,7 +546,7 @@ static PDOC_ITEM SYSLINK_GetFocusLink (SYSLINK_INFO *infoPtr, int *LinkId) * SYSLINK_GetNextLink * Gets the next link */ -static PDOC_ITEM SYSLINK_GetNextLink (SYSLINK_INFO *infoPtr, PDOC_ITEM Current) +static PDOC_ITEM SYSLINK_GetNextLink (const SYSLINK_INFO *infoPtr, PDOC_ITEM Current) { for(Current = (Current != NULL ? Current->Next : infoPtr->Items); Current != NULL; @@ -564,7 +564,7 @@ static PDOC_ITEM SYSLINK_GetNextLink (SYSLINK_INFO *infoPtr, PDOC_ITEM Current) * SYSLINK_GetPrevLink * Gets the previous link */ -static PDOC_ITEM SYSLINK_GetPrevLink (SYSLINK_INFO *infoPtr, PDOC_ITEM Current) +static PDOC_ITEM SYSLINK_GetPrevLink (const SYSLINK_INFO *infoPtr, PDOC_ITEM Current) { if(Current == NULL) { @@ -643,7 +643,7 @@ static BOOL SYSLINK_WrapLine (HDC hdc, LPWSTR Text, WCHAR BreakChar, int *LineLe * SYSLINK_Render * Renders the document in memory */ -static VOID SYSLINK_Render (SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) +static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) { RECT rc; PDOC_ITEM Current; @@ -824,7 +824,7 @@ static VOID SYSLINK_Render (SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) * SYSLINK_Draw * Draws the SysLink control. */ -static LRESULT SYSLINK_Draw (SYSLINK_INFO *infoPtr, HDC hdc) +static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) { RECT rc; PDOC_ITEM Current; @@ -894,7 +894,7 @@ static LRESULT SYSLINK_Draw (SYSLINK_INFO *infoPtr, HDC hdc) * SYSLINK_Paint * Handles the WM_PAINT message. */ -static LRESULT SYSLINK_Paint (SYSLINK_INFO *infoPtr, HDC hdcParam) +static LRESULT SYSLINK_Paint (const SYSLINK_INFO *infoPtr, HDC hdcParam) { HDC hdc; PAINTSTRUCT ps; @@ -1005,7 +1005,7 @@ static LRESULT SYSLINK_SetText (SYSLINK_INFO *infoPtr, LPCWSTR Text) * If no document item is specified, the focus bit will be removed from all links. * Returns the previous focused item. */ -static PDOC_ITEM SYSLINK_SetFocusLink (SYSLINK_INFO *infoPtr, PDOC_ITEM DocItem) +static PDOC_ITEM SYSLINK_SetFocusLink (const SYSLINK_INFO *infoPtr, const DOC_ITEM *DocItem) { PDOC_ITEM Current, PrevFocus = NULL; @@ -1036,7 +1036,7 @@ static PDOC_ITEM SYSLINK_SetFocusLink (SYSLINK_INFO *infoPtr, PDOC_ITEM DocItem) * SYSLINK_SetItem * Sets the states and attributes of a link item. */ -static LRESULT SYSLINK_SetItem (SYSLINK_INFO *infoPtr, PLITEM Item) +static LRESULT SYSLINK_SetItem (const SYSLINK_INFO *infoPtr, const LITEM *Item) { PDOC_ITEM di; int nc; @@ -1126,7 +1126,7 @@ static LRESULT SYSLINK_SetItem (SYSLINK_INFO *infoPtr, PLITEM Item) * SYSLINK_GetItem * Retrieves the states and attributes of a link item. */ -static LRESULT SYSLINK_GetItem (SYSLINK_INFO *infoPtr, PLITEM Item) +static LRESULT SYSLINK_GetItem (const SYSLINK_INFO *infoPtr, PLITEM Item) { PDOC_ITEM di; @@ -1184,7 +1184,7 @@ static LRESULT SYSLINK_GetItem (SYSLINK_INFO *infoPtr, PLITEM Item) * SYSLINK_PtInDocItem * Determines if a point is in the region of a document item */ -static BOOL SYSLINK_PtInDocItem (PDOC_ITEM DocItem, POINT pt) +static BOOL SYSLINK_PtInDocItem (const DOC_ITEM *DocItem, POINT pt) { PDOC_TEXTBLOCK bl; int n; @@ -1212,7 +1212,7 @@ static BOOL SYSLINK_PtInDocItem (PDOC_ITEM DocItem, POINT pt) * SYSLINK_HitTest * Determines the link the user clicked on. */ -static LRESULT SYSLINK_HitTest (SYSLINK_INFO *infoPtr, PLHITTESTINFO HitTest) +static LRESULT SYSLINK_HitTest (const SYSLINK_INFO *infoPtr, PLHITTESTINFO HitTest) { PDOC_ITEM Current; int id = 0; @@ -1256,7 +1256,7 @@ static LRESULT SYSLINK_HitTest (SYSLINK_INFO *infoPtr, PLHITTESTINFO HitTest) * SYSLINK_GetIdealHeight * Returns the preferred height of a link at the current control's width. */ -static LRESULT SYSLINK_GetIdealHeight (SYSLINK_INFO *infoPtr) +static LRESULT SYSLINK_GetIdealHeight (const SYSLINK_INFO *infoPtr) { HDC hdc = GetDC(infoPtr->Self); if(hdc != NULL) @@ -1285,7 +1285,7 @@ static LRESULT SYSLINK_GetIdealHeight (SYSLINK_INFO *infoPtr) * SYSLINK_SendParentNotify * Sends a WM_NOTIFY message to the parent window. */ -static LRESULT SYSLINK_SendParentNotify (SYSLINK_INFO *infoPtr, UINT code, PDOC_ITEM Link, int iLink) +static LRESULT SYSLINK_SendParentNotify (const SYSLINK_INFO *infoPtr, UINT code, const DOC_ITEM *Link, int iLink) { NMLINK nml; @@ -1363,7 +1363,7 @@ static LRESULT SYSLINK_KillFocus (SYSLINK_INFO *infoPtr, HWND NewFocusWindow) * SYSLINK_LinkAtPt * Returns a link at the specified position */ -static PDOC_ITEM SYSLINK_LinkAtPt (SYSLINK_INFO *infoPtr, POINT *pt, int *LinkId, BOOL MustBeEnabled) +static PDOC_ITEM SYSLINK_LinkAtPt (const SYSLINK_INFO *infoPtr, const POINT *pt, int *LinkId, BOOL MustBeEnabled) { PDOC_ITEM Current; int id = 0; @@ -1389,7 +1389,7 @@ static PDOC_ITEM SYSLINK_LinkAtPt (SYSLINK_INFO *infoPtr, POINT *pt, int *LinkId * SYSLINK_LButtonDown * Handles mouse clicks */ -static LRESULT SYSLINK_LButtonDown (SYSLINK_INFO *infoPtr, DWORD Buttons, POINT *pt) +static LRESULT SYSLINK_LButtonDown (SYSLINK_INFO *infoPtr, DWORD Buttons, const POINT *pt) { PDOC_ITEM Current, Old; int id; @@ -1415,7 +1415,7 @@ static LRESULT SYSLINK_LButtonDown (SYSLINK_INFO *infoPtr, DWORD Buttons, POINT * SYSLINK_LButtonUp * Handles mouse clicks */ -static LRESULT SYSLINK_LButtonUp (SYSLINK_INFO *infoPtr, DWORD Buttons, POINT *pt) +static LRESULT SYSLINK_LButtonUp (SYSLINK_INFO *infoPtr, DWORD Buttons, const POINT *pt) { if(infoPtr->MouseDownID > -1) { @@ -1438,7 +1438,7 @@ static LRESULT SYSLINK_LButtonUp (SYSLINK_INFO *infoPtr, DWORD Buttons, POINT *p * SYSLINK_OnEnter * Handles ENTER key events */ -static BOOL SYSLINK_OnEnter (SYSLINK_INFO *infoPtr) +static BOOL SYSLINK_OnEnter (const SYSLINK_INFO *infoPtr) { if(infoPtr->HasFocus) { @@ -1459,7 +1459,7 @@ static BOOL SYSLINK_OnEnter (SYSLINK_INFO *infoPtr) * SYSKEY_SelectNextPrevLink * Changes the currently focused link */ -static BOOL SYSKEY_SelectNextPrevLink (SYSLINK_INFO *infoPtr, BOOL Prev) +static BOOL SYSKEY_SelectNextPrevLink (const SYSLINK_INFO *infoPtr, BOOL Prev) { if(infoPtr->HasFocus) { @@ -1497,7 +1497,7 @@ static BOOL SYSKEY_SelectNextPrevLink (SYSLINK_INFO *infoPtr, BOOL Prev) * Determines if there's a next or previous link to decide whether the control * should capture the tab key message */ -static BOOL SYSLINK_NoNextLink (SYSLINK_INFO *infoPtr, BOOL Prev) +static BOOL SYSLINK_NoNextLink (const SYSLINK_INFO *infoPtr, BOOL Prev) { PDOC_ITEM Focus, NewFocus; @@ -1514,7 +1514,7 @@ static BOOL SYSLINK_NoNextLink (SYSLINK_INFO *infoPtr, BOOL Prev) * SYSLINK_GetIdealSize * Calculates the ideal size of a link control at a given maximum width. */ -static VOID SYSLINK_GetIdealSize (SYSLINK_INFO *infoPtr, int cxMaxWidth, LPSIZE lpSize) +static VOID SYSLINK_GetIdealSize (const SYSLINK_INFO *infoPtr, int cxMaxWidth, LPSIZE lpSize) { RECT rc; HDC hdc;

1 0

Alexandre Julliard : kernel32: Added some last error tests for mailslots.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 2a86f347fad221bfbd4d0c71c4ac4f08be2a8999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a86f347fad221bfbd4d0c71c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 20:25:08 2007 +0200 kernel32: Added some last error tests for mailslots. --- dlls/kernel32/tests/mailslot.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index eb50ab1..0c47fde 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -82,8 +82,10 @@ static int mailslot_test(void) memset(buffer, 0, sizeof buffer); ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n"); + ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); ok( !WriteFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot write\n"); + ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); /* now try and openthe client, but with the wrong sharing mode */ hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE, @@ -103,8 +105,10 @@ static int mailslot_test(void) */ ok( !ReadFile( hSlot, buffer, sizeof buffer/2, &count, NULL), "slot read\n"); + ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); ok( !WriteFile( hSlot, buffer, sizeof buffer/2, &count, NULL), "slot write\n"); + ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); /* * we can't read from this client, @@ -112,10 +116,12 @@ static int mailslot_test(void) */ ok( !ReadFile( hWriter, buffer, sizeof buffer/2, &count, NULL), "can read client\n"); + todo_wine ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); ok( WriteFile( hWriter, buffer, sizeof buffer/2, &count, NULL), "can't write client\n"); ok( !ReadFile( hWriter, buffer, sizeof buffer/2, &count, NULL), "can read client\n"); + todo_wine ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); /* * seeing as there's something in the slot, @@ -128,6 +134,7 @@ static int mailslot_test(void) /* but not again */ ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n"); + ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); /* now try open another writer... should fail */ hWriter2 = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE, @@ -183,6 +190,7 @@ static int mailslot_test(void) /* check there's still no data */ ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n"); + ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); /* write two messages */ buffer[0] = 'a'; @@ -275,12 +283,25 @@ static int mailslot_test(void) /* check that reads fail */ ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "3rd slot read succeeded\n"); + ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); /* finally close the mailslot and its client */ ok( CloseHandle( hWriter2 ), "closing 2nd client\n"); ok( CloseHandle( hWriter ), "closing the client\n"); ok( CloseHandle( hSlot ), "closing the mailslot\n"); + /* test timeouts */ + hSlot = CreateMailslot( szmspath, 0, 1000, NULL ); + ok( hSlot != INVALID_HANDLE_VALUE , "valid mailslot failed\n"); + count = 0; + memset(buffer, 0, sizeof buffer); + dwTimeout = GetTickCount(); + ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n"); + ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); + dwTimeout = GetTickCount() - dwTimeout; + todo_wine ok( dwTimeout >= 1000, "timeout too short %u\n", dwTimeout ); + ok( CloseHandle( hSlot ), "closing the mailslot\n"); + return 0; }

1 0

Alexandre Julliard : server: Check file access in register_async before calling the object method.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 02ed704be1ee68625b264fbe24364b1a78ae5cd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ed704be1ee68625b264fbe2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 20:24:55 2007 +0200 server: Check file access in register_async before calling the object method. --- server/fd.c | 31 ++++++++++++++++--------------- server/mailslot.c | 11 ++--------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/server/fd.c b/server/fd.c index ffaf404..e873701 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1728,8 +1728,7 @@ int fd_queue_async_timeout( struct fd *fd, const async_data_t *data, int type, i queue = fd->wait_q; break; default: - set_error( STATUS_INVALID_PARAMETER ); - return 0; + assert(0); } if (!create_async( current, timeout, queue, data )) return 0; @@ -1946,21 +1945,23 @@ DECL_HANDLER(unmount_device) /* create / reschedule an async I/O */ DECL_HANDLER(register_async) { - struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 ); + unsigned int access; + struct fd *fd; - /* - * The queue_async method must do the following: - * - * 1. Get the async_queue for the request of given type. - * 2. Create a new asynchronous request for the selected queue - * 3. Carry out any operations necessary to adjust the object's poll events - * Usually: set_elect_events (obj, obj->ops->get_poll_events()). - * 4. When the async request is triggered, then send back (with a proper APC) - * the trigger (STATUS_ALERTED) to the thread that posted the request. - * See also the implementations in file.c, serial.c, and sock.c. - */ + switch(req->type) + { + case ASYNC_TYPE_READ: + access = FILE_READ_DATA; + break; + case ASYNC_TYPE_WRITE: + access = FILE_WRITE_DATA; + break; + default: + set_error( STATUS_INVALID_PARAMETER ); + return; + } - if (fd) + if ((fd = get_handle_fd_obj( current->process, req->handle, access ))) { fd->fd_ops->queue_async( fd, &req->async, req->type, req->count ); release_object( fd ); diff --git a/server/mailslot.c b/server/mailslot.c index bd637f2..d9716fe 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -236,10 +236,9 @@ static struct fd *mailslot_get_fd( struct object *obj ) static unsigned int mailslot_map_access( struct object *obj, unsigned int access ) { + /* mailslots can only be read */ if (access & GENERIC_READ) access |= FILE_GENERIC_READ; - if (access & GENERIC_WRITE) access |= FILE_GENERIC_WRITE; - if (access & GENERIC_EXECUTE) access |= FILE_GENERIC_EXECUTE; - if (access & GENERIC_ALL) access |= FILE_ALL_ACCESS; + if (access & GENERIC_ALL) access |= FILE_GENERIC_READ; return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } @@ -286,12 +285,6 @@ static void mailslot_queue_async( struct fd *fd, const async_data_t *data, int t assert(mailslot->obj.ops == &mailslot_ops); - if (type != ASYNC_TYPE_READ) - { - set_error(STATUS_INVALID_PARAMETER); - return; - } - if (list_empty( &mailslot->writers ) || !mailslot_message_count( mailslot )) {

1 0

Alexandre Julliard : server: Add a separate function to set the timeout of an async I/O operation.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: 0aae1ca8bff001aa494af751f365c15bcd5ad3b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aae1ca8bff001aa494af751f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 20:41:59 2007 +0200 server: Add a separate function to set the timeout of an async I/O operation. --- server/async.c | 16 +++++++++++----- server/change.c | 4 +++- server/fd.c | 34 +++++++++++++++++++--------------- server/file.h | 8 ++++---- server/mailslot.c | 15 ++++++++++----- server/named_pipe.c | 34 ++++++++++++++++++++-------------- server/serial.c | 15 ++++++++++++--- server/sock.c | 4 +++- 8 files changed, 82 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0aae1ca8bff001aa494af…

1 0

Alexandre Julliard : server: Make async I/O queues into real objects.
by Alexandre Julliard April 3, 2007

April 3, 2007

Module: wine Branch: master Commit: df09ac519499e33e379fde0c180b5ea23c990657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df09ac519499e33e379fde0c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 20:09:29 2007 +0200 server: Make async I/O queues into real objects. --- server/async.c | 77 +++++++++++++++++++++++++++++++++++++----- server/change.c | 4 +- server/fd.c | 92 ++++++++++++++++++-------------------------------- server/file.h | 11 +++--- server/named_pipe.c | 28 +++++++++------- server/serial.c | 2 +- server/sock.c | 43 +++++++++++------------ 7 files changed, 147 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df09ac519499e33e379fd…

1 0

appdb/ ./appview.php ./deletecomment.php ./ind ...
by WineHQ April 2, 2007

April 2, 2007

ChangeSet ID: 31027 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/02 21:08:44 Modified files: . : appview.php deletecomment.php index.php admin : addAppNote.php adminBugs.php adminMaintainers.php adminScreenshots.php deleteAny.php include : application.php bugs.php comment.php distribution.php downloadurl.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use objectMakeLink()/Url() in more places Patch: http://cvs.winehq.org/patch.py?id=31027 Old revision New revision Changes Path 1.98 1.99 +7 -6 appdb/appview.php 1.31 1.32 +2 -1 appdb/deletecomment.php 1.42 1.43 +3 -5 appdb/index.php 1.32 1.33 +4 -3 appdb/admin/addAppNote.php 1.15 1.16 +4 -2 appdb/admin/adminBugs.php 1.29 1.30 +4 -3 appdb/admin/adminMaintainers.php 1.19 1.20 +2 -6 appdb/admin/adminScreenshots.php 1.23 1.24 +4 -1 appdb/admin/deleteAny.php 1.99 1.100 +4 -3 appdb/include/application.php 1.21 1.22 +9 -8 appdb/include/bugs.php 1.33 1.34 +16 -6 appdb/include/comment.php 1.20 1.21 +2 -2 appdb/include/distribution.php 1.10 1.11 +2 -3 appdb/include/downloadurl.php

1 0

appdb/unit_test test_testData.php
by WineHQ April 2, 2007

April 2, 2007

ChangeSet ID: 31026 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/02 19:06:00 Added files: unit_test : test_testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add test for testData::getNewestTestIdFromVersionId() Patch: http://cvs.winehq.org/patch.py?id=31026 Old revision New revision Changes Path Added 1.1 +0 -0 appdb/unit_test/test_testData.php Index: appdb/unit_test/test_testData.php diff -u -p /dev/null appdb/unit_test/test_testData.php:1.1 --- /dev/null 3 Apr 2007 0: 6: 0 -0000 +++ appdb/unit_test/test_testData.php 3 Apr 2007 0: 6: 0 -0000 @@ -0,0 +1,51 @@ +<?php + +require_once("path.php"); +require_once(BASE."include/version.php"); + +function test_testData_getNewestTestidFromVersionId() +{ + test_start(__FUNCTION__); + global $test_email, $test_password; + if(!$oUser = create_and_login_user()) + { + echo "Failed to create and log in user\n"; + return FALSE; + } + + $iVersionId = 65555; + + $oOldTestData = new testData(); + $oOldTestData->iVersionId = $iVersionId; + $oOldTestData->create(); + $oNewTestData = new testData(); + $oNewTestData->iVersionId = $iVersionId; + $oNewTestData->create(); + + $oUser->addPriv("admin"); + $oOldTestData->unQueue(); + + /* Now the oldTestData should be listed as current, because the new one is queued */ + $iExpected = $oOldTestData->iTestingId; + $iReceived = testData::getNewestTestidFromVersionId($iVersionId); + if($iExpected != $iReceived) + { + echo "Got testData id of $iReceived instead of $iExpected!\n"; + $oOldTestData->delete(); + $oNewTestData->delete(); + return FALSE; + } + + $oOldTestData->delete(); + $oNewTestData->delete(); + + return TRUE; +} + +if(!test_testData_getNewestTestidFromVersionId()) +{ + echo "test_testData_getNewestTestidFromVersionId() failed!\n"; + $bTestSuccess = false; +} else + echo "test_testData_getNewestTestidFromVersionId() passed\n"; +?>

1 0

appdb/unit_test run_tests.php
by WineHQ April 2, 2007

April 2, 2007

ChangeSet ID: 31025 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/02 19:05:35 Modified files: unit_test : run_tests.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add test for testData::getNewestTestIdFromVersionId() Patch: http://cvs.winehq.org/patch.py?id=31025 Old revision New revision Changes Path 1.13 1.14 +2 -0 appdb/unit_test/run_tests.php Index: appdb/unit_test/run_tests.php diff -u -p appdb/unit_test/run_tests.php:1.13 appdb/unit_test/run_tests.php:1.14 --- appdb/unit_test/run_tests.php:1.13 3 Apr 2007 0: 5:35 -0000 +++ appdb/unit_test/run_tests.php 3 Apr 2007 0: 5:35 -0000 @@ -31,6 +31,8 @@ echo "\n"; include_once("test_om_objects.php"); echo "\n"; include_once("test_appData.php"); +echo "\n"; +include_once("test_testData.php"); if($bTestSuccess == true) {

1 0