March 2007 - Wine-commits - list.winehq.org

Jason Edmeades : xcopy: Add support for /U (target must exist).
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 5f8f5eb5beb69f87c11ee53f9f12dc4cb35647fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f8f5eb5beb69f87c11ee53f9… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 29 22:21:05 2007 +0100 xcopy: Add support for /U (target must exist). --- programs/xcopy/xcopy.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 281f812..2f2e7f9 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -50,6 +50,7 @@ #define OPT_NOCOPY 0x00000080 #define OPT_NOPROMPT 0x00000100 #define OPT_SHORTNAME 0x00000200 +#define OPT_MUSTEXIST 0x00000400 #define MAXSTRING 8192 @@ -153,6 +154,7 @@ int main (int argc, char *argv[]) case 'T': flags |= OPT_NOCOPY | OPT_RECURSIVE; break; case 'Y': flags |= OPT_NOPROMPT; break; case 'N': flags |= OPT_SHORTNAME; break; + case 'U': flags |= OPT_MUSTEXIST; break; case '-': if (toupper(argvW[0][2])=='Y') flags &= ~OPT_NOPROMPT; break; default: @@ -458,6 +460,11 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, } } + /* See if it has to exist! */ + if (destAttribs == INVALID_FILE_ATTRIBUTES && (flags & OPT_MUSTEXIST)) { + skipFile = TRUE; + } + /* Output a status message */ if (!skipFile) { if (flags & OPT_QUIET) {

1 0

Jason Edmeades : xcopy: Prompt when overwriting files, add /Y and / -Y support.
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 70fe414c2a2e81fee3d93aa4a4cdeedf67364c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70fe414c2a2e81fee3d93aa4a… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 29 22:21:01 2007 +0100 xcopy: Prompt when overwriting files, add /Y and /-Y support. --- programs/xcopy/xcopy.c | 60 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 45 insertions(+), 15 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 193fff0..25995f2 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -48,6 +48,7 @@ #define OPT_SIMULATE 0x00000020 #define OPT_PAUSE 0x00000040 #define OPT_NOCOPY 0x00000080 +#define OPT_NOPROMPT 0x00000100 WINE_DEFAULT_DEBUG_CHANNEL(xcopy); @@ -134,6 +135,8 @@ int main (int argc, char *argv[]) case 'L': flags |= OPT_SIMULATE; break; case 'W': flags |= OPT_PAUSE; break; case 'T': flags |= OPT_NOCOPY | OPT_RECURSIVE; break; + case 'Y': flags |= OPT_NOPROMPT; break; + case '-': if (argvW[0][2]=='Y') flags &= ~OPT_NOPROMPT; break; default: WINE_FIXME("Unhandled parameter '%s'\n", wine_dbgstr_w(*argvW)); } @@ -179,7 +182,6 @@ int main (int argc, char *argv[]) destinationstem, destinationspec, flags); - /* Finished - print trailer and exit */ if (flags & OPT_SIMULATE) { printf("%d file(s) would be copied\n", filesCopied); @@ -366,6 +368,8 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, BOOL findres = TRUE; WCHAR *inputpath, *outputpath; BOOL copiedFile = FALSE; + DWORD destAttribs; + BOOL skipFile; /* Allocate some working memory on heap to minimize footprint */ finddata = HeapAlloc(GetProcessHeap(), 0, sizeof(WIN32_FIND_DATA)); @@ -380,6 +384,8 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, h = FindFirstFile(inputpath, finddata); while (h != INVALID_HANDLE_VALUE && findres) { + skipFile = FALSE; + /* Ignore . and .. */ if (lstrcmpW(finddata->cFileName, wchr_dot)==0 || lstrcmpW(finddata->cFileName, wchr_dotdot)==0 || @@ -404,23 +410,47 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, wine_dbgstr_w(copyTo)); if (!copiedFile && !(flags & OPT_SIMULATE)) XCOPY_CreateDirectory(deststem); - /* Output a status message */ - if (flags & OPT_QUIET) { - /* Skip message */ - } else if (flags & OPT_FULL) { - printf("%S -> %S\n", copyFrom, copyTo); - } else { - printf("%S\n", copyFrom); + /* See if file exists */ + destAttribs = GetFileAttributesW(copyTo); + if (destAttribs != INVALID_FILE_ATTRIBUTES && !(flags & OPT_NOPROMPT)) { + DWORD count; + char answer[10]; + BOOL answered = FALSE; + + while (!answered) { + printf("Overwrite %S? (Yes|No|All)\n", copyTo); + ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer), + &count, NULL); + + answered = TRUE; + if (toupper(answer[0]) == 'A') + flags |= OPT_NOPROMPT; + else if (toupper(answer[0]) == 'N') + skipFile = TRUE; + else if (toupper(answer[0]) != 'Y') + answered = FALSE; + } } - copiedFile = TRUE; - if (flags & OPT_SIMULATE || flags & OPT_NOCOPY) { - /* Skip copy */ - } else if (CopyFile(copyFrom, copyTo, TRUE) == 0) { - printf("Copying of '%S' to '%S' failed with r/c %d\n", - copyFrom, copyTo, GetLastError()); + /* Output a status message */ + if (!skipFile) { + if (flags & OPT_QUIET) { + /* Skip message */ + } else if (flags & OPT_FULL) { + printf("%S -> %S\n", copyFrom, copyTo); + } else { + printf("%S\n", copyFrom); + } + + copiedFile = TRUE; + if (flags & OPT_SIMULATE || flags & OPT_NOCOPY) { + /* Skip copy */ + } else if (CopyFile(copyFrom, copyTo, FALSE) == 0) { + printf("Copying of '%S' to '%S' failed with r/c %d\n", + copyFrom, copyTo, GetLastError()); + } + filesCopied++; } - filesCopied++; } /* Find next file */

1 0

Jason Edmeades : xcopy: Add support for COPYCMD override and fix /-y.
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 30fcdd9f07c4cf9860089e75e87236bc96cfafc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fcdd9f07c4cf9860089e75e… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 29 22:21:03 2007 +0100 xcopy: Add support for COPYCMD override and fix /-y. --- programs/xcopy/xcopy.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 25995f2..0342d39 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -50,6 +50,8 @@ #define OPT_NOCOPY 0x00000080 #define OPT_NOPROMPT 0x00000100 +#define MAXSTRING 8192 + WINE_DEFAULT_DEBUG_CHANNEL(xcopy); /* Prototypes */ @@ -91,8 +93,13 @@ int main (int argc, char *argv[]) WCHAR sourcespec[MAX_PATH] = {0}; /* Filespec of source */ WCHAR destinationstem[MAX_PATH] = {0}; /* Stem of destination */ WCHAR destinationspec[MAX_PATH] = {0}; /* Filespec of destination */ + WCHAR copyCmd[MAXSTRING]; /* COPYCMD env var */ DWORD flags = 0; /* Option flags */ LPWSTR *argvW = NULL; + const WCHAR PROMPTSTR1[] = {'/', 'Y', 0}; + const WCHAR PROMPTSTR2[] = {'/', 'y', 0}; + const WCHAR COPYCMD[] = {'C', 'O', 'P', 'Y', 'C', 'M', 'D', 0}; + /* * Parse the command line */ @@ -106,6 +113,14 @@ int main (int argc, char *argv[]) return RC_INITERROR; } + /* Preinitialize flags based on COPYCMD */ + if (GetEnvironmentVariable(COPYCMD, copyCmd, MAXSTRING)) { + if (wcsstr(copyCmd, PROMPTSTR1) != NULL || + wcsstr(copyCmd, PROMPTSTR2) != NULL) { + flags |= OPT_NOPROMPT; + } + } + /* Skip first arg, which is the program name */ argvW++; @@ -136,7 +151,8 @@ int main (int argc, char *argv[]) case 'W': flags |= OPT_PAUSE; break; case 'T': flags |= OPT_NOCOPY | OPT_RECURSIVE; break; case 'Y': flags |= OPT_NOPROMPT; break; - case '-': if (argvW[0][2]=='Y') flags &= ~OPT_NOPROMPT; break; + case '-': if (toupper(argvW[0][2])=='Y') + flags &= ~OPT_NOPROMPT; break; default: WINE_FIXME("Unhandled parameter '%s'\n", wine_dbgstr_w(*argvW)); }

1 0

Jason Edmeades : xcopy: Add support for /T (no copy).
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 59bf2dc341430d1b07fcdbed8fc1f8db5f335773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59bf2dc341430d1b07fcdbed8… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 29 22:21:00 2007 +0100 xcopy: Add support for /T (no copy). --- programs/xcopy/xcopy.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 848fe0d..193fff0 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -47,6 +47,7 @@ #define OPT_FULL 0x00000010 #define OPT_SIMULATE 0x00000020 #define OPT_PAUSE 0x00000040 +#define OPT_NOCOPY 0x00000080 WINE_DEFAULT_DEBUG_CHANNEL(xcopy); @@ -132,6 +133,7 @@ int main (int argc, char *argv[]) case 'F': flags |= OPT_FULL; break; case 'L': flags |= OPT_SIMULATE; break; case 'W': flags |= OPT_PAUSE; break; + case 'T': flags |= OPT_NOCOPY | OPT_RECURSIVE; break; default: WINE_FIXME("Unhandled parameter '%s'\n", wine_dbgstr_w(*argvW)); } @@ -181,7 +183,7 @@ int main (int argc, char *argv[]) /* Finished - print trailer and exit */ if (flags & OPT_SIMULATE) { printf("%d file(s) would be copied\n", filesCopied); - } else { + } else if (!(flags & OPT_NOCOPY)) { printf("%d file(s) copied\n", filesCopied); } if (rc == RC_OK && filesCopied == 0) rc = RC_NOFILES; @@ -412,8 +414,8 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, } copiedFile = TRUE; - if (flags & OPT_SIMULATE) { - /* Skip copy as just simulating */ + if (flags & OPT_SIMULATE || flags & OPT_NOCOPY) { + /* Skip copy */ } else if (CopyFile(copyFrom, copyTo, TRUE) == 0) { printf("Copying of '%S' to '%S' failed with r/c %d\n", copyFrom, copyTo, GetLastError());

1 0

Chris Robinson : quartz: Add filters using their names.
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 60f325d967a8160931e2f641fe1a06ed128f1731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f325d967a8160931e2f641f… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Mar 30 00:01:23 2007 -0700 quartz: Add filters using their names. --- dlls/quartz/filtergraph.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 5e1061e..5964502 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -774,7 +774,7 @@ static HRESULT WINAPI GraphBuilder_Connect(IGraphBuilder *iface, goto error; } - hr = IGraphBuilder_AddFilter(iface, pfilter, NULL); + hr = IGraphBuilder_AddFilter(iface, pfilter, V_UNION(&var, bstrVal)); if (FAILED(hr)) { ERR("Unable to add filter (%x)\n", hr); IBaseFilter_Release(pfilter); @@ -923,7 +923,7 @@ static HRESULT WINAPI GraphBuilder_Render(IGraphBuilder *iface, goto error; } - hr = IGraphBuilder_AddFilter(iface, pfilter, NULL); + hr = IGraphBuilder_AddFilter(iface, pfilter, V_UNION(&var, bstrVal)); if (FAILED(hr)) { ERR("Unable to add filter (%x)\n", hr); IBaseFilter_Release(pfilter); @@ -1056,7 +1056,7 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, continue; } - hr = IGraphBuilder_AddFilter(iface, psplitter, NULL); + hr = IGraphBuilder_AddFilter(iface, psplitter, V_UNION(&var, bstrVal)); if (FAILED(hr)) { ERR("Unable add filter (%x)\n", hr); IBaseFilter_Release(psplitter);

1 0

Jason Edmeades : xcopy: Add support for /W (pause).
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: cf872445a3c4f8d9112851b3999bfc134923f160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf872445a3c4f8d9112851b39… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 29 22:20:59 2007 +0100 xcopy: Add support for /W (pause). --- programs/xcopy/xcopy.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 718923e..848fe0d 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -46,6 +46,7 @@ #define OPT_QUIET 0x00000008 #define OPT_FULL 0x00000010 #define OPT_SIMULATE 0x00000020 +#define OPT_PAUSE 0x00000040 WINE_DEFAULT_DEBUG_CHANNEL(xcopy); @@ -130,6 +131,7 @@ int main (int argc, char *argv[]) case 'Q': flags |= OPT_QUIET; break; case 'F': flags |= OPT_FULL; break; case 'L': flags |= OPT_SIMULATE; break; + case 'W': flags |= OPT_PAUSE; break; default: WINE_FIXME("Unhandled parameter '%s'\n", wine_dbgstr_w(*argvW)); } @@ -160,6 +162,16 @@ int main (int argc, char *argv[]) WINE_TRACE("Dest Stem : '%s'\n", wine_dbgstr_w(destinationstem)); WINE_TRACE("Dest Spec : '%s'\n", wine_dbgstr_w(destinationspec)); + /* Pause if necessary */ + if (flags & OPT_PAUSE) { + DWORD count; + char pausestr[10]; + + printf("Press <enter> to begin copying\n"); + ReadFile (GetStdHandle(STD_INPUT_HANDLE), pausestr, sizeof(pausestr), + &count, NULL); + } + /* Now do the hard work... */ rc = XCOPY_DoCopy(sourcestem, sourcespec, destinationstem, destinationspec,

1 0

Andrew Talbot : comctl32: Cast-qual warnings fix.
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 3017a48e482a6e200517f51a5bbb98e8ac2b0d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3017a48e482a6e200517f51a5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Mar 29 23:12:35 2007 +0100 comctl32: Cast-qual warnings fix. --- dlls/comctl32/listview.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 21b8866..68a1ddb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -420,7 +420,7 @@ static INT LISTVIEW_GetLabelWidth(const LISTVIEW_INFO *, INT); static void LISTVIEW_GetOrigin(const LISTVIEW_INFO *, LPPOINT); static BOOL LISTVIEW_GetViewRect(const LISTVIEW_INFO *, LPRECT); static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *, INT); -static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *, const LVITEMW *, BOOL); +static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *, LVITEMW *, BOOL); static void LISTVIEW_UpdateScroll(const LISTVIEW_INFO *); static void LISTVIEW_SetSelection(LISTVIEW_INFO *, INT); static void LISTVIEW_UpdateSize(LISTVIEW_INFO *); @@ -3590,7 +3590,7 @@ static BOOL set_sub_item(const LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, * SUCCESS : TRUE * FAILURE : FALSE */ -static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL isW) +static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *infoPtr, LVITEMW *lpLVItem, BOOL isW) { UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; HWND hwndSelf = infoPtr->hwndSelf; @@ -3606,7 +3606,7 @@ static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, B if ((lpLVItem->mask & LVIF_TEXT) && is_textW(lpLVItem->pszText)) { pszText = lpLVItem->pszText; - ((LVITEMW *)lpLVItem)->pszText = textdupTtoW(lpLVItem->pszText, isW); + lpLVItem->pszText = textdupTtoW(lpLVItem->pszText, isW); } /* actually set the fields */ @@ -3634,7 +3634,7 @@ static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, B if (pszText) { textfreeT(lpLVItem->pszText, isW); - ((LVITEMW *)lpLVItem)->pszText = pszText; + lpLVItem->pszText = pszText; } return bResult; @@ -3723,7 +3723,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS { UINT uFormat, uView = infoPtr->dwStyle & LVS_TYPEMASK; WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' }; - static const WCHAR szCallback[] = { '(', 'c', 'a', 'l', 'l', 'b', 'a', 'c', 'k', ')', 0 }; + static WCHAR szCallback[] = { '(', 'c', 'a', 'l', 'l', 'b', 'a', 'c', 'k', ')', 0 }; DWORD cdsubitemmode = CDRF_DODEFAULT; LPRECT lprcFocus; RECT rcSelect, rcBox, rcIcon, rcLabel, rcStateIcon; @@ -3748,7 +3748,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return FALSE; if (nSubItem > 0 && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) lvItem.state = LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED); - if (lvItem.pszText == LPSTR_TEXTCALLBACKW) lvItem.pszText = (LPWSTR)szCallback; + if (lvItem.pszText == LPSTR_TEXTCALLBACKW) lvItem.pszText = szCallback; TRACE(" lvItem=%s\n", debuglvitem_t(&lvItem, TRUE)); /* now check if we need to update the focus rectangle */

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: a8a469c7c0bf6f6dd0edbd9a4fa4c69ccd2c4178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a469c7c0bf6f6dd0edbd9a4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Mar 29 22:09:32 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/monthcal.c | 48 +++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 9f25689..6fe6283 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -189,7 +189,7 @@ static int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year) /* From a given point, calculate the row (weekpos), column(daypos) and day in the calendar. day== 0 mean the last day of tha last month */ -static int MONTHCAL_CalcDayFromPos(MONTHCAL_INFO *infoPtr, int x, int y, +static int MONTHCAL_CalcDayFromPos(const MONTHCAL_INFO *infoPtr, int x, int y, int *daypos,int *weekpos) { int retval, firstDay; @@ -214,7 +214,7 @@ static int MONTHCAL_CalcDayFromPos(MONTHCAL_INFO *infoPtr, int x, int y, /* day is the day of the month, 1 == 1st day of the month */ /* sets x and y to be the position of the day */ /* x == day, y == week where(0,0) == firstDay, 1st week */ -static void MONTHCAL_CalcDayXY(MONTHCAL_INFO *infoPtr, int day, int month, +static void MONTHCAL_CalcDayXY(const MONTHCAL_INFO *infoPtr, int day, int month, int *x, int *y) { int firstDay, prevMonth; @@ -243,7 +243,7 @@ static void MONTHCAL_CalcDayXY(MONTHCAL_INFO *infoPtr, int day, int month, /* x: column(day), y: row(week) */ -static void MONTHCAL_CalcDayRect(MONTHCAL_INFO *infoPtr, RECT *r, int x, int y) +static void MONTHCAL_CalcDayRect(const MONTHCAL_INFO *infoPtr, RECT *r, int x, int y) { r->left = infoPtr->days.left + x * infoPtr->width_increment; r->right = r->left + infoPtr->width_increment; @@ -255,7 +255,7 @@ static void MONTHCAL_CalcDayRect(MONTHCAL_INFO *infoPtr, RECT *r, int x, int y) /* sets the RECT struct r to the rectangle around the day and month */ /* day is the day value of the month(1 == 1st), month is the month */ /* value(january == 1, december == 12) */ -static inline void MONTHCAL_CalcPosFromDay(MONTHCAL_INFO *infoPtr, +static inline void MONTHCAL_CalcPosFromDay(const MONTHCAL_INFO *infoPtr, int day, int month, RECT *r) { int x, y; @@ -267,7 +267,7 @@ static inline void MONTHCAL_CalcPosFromDay(MONTHCAL_INFO *infoPtr, /* day is the day in the month(1 == 1st of the month) */ /* month is the month value(1 == january, 12 == december) */ -static void MONTHCAL_CircleDay(MONTHCAL_INFO *infoPtr, HDC hdc, int day, int month) +static void MONTHCAL_CircleDay(const MONTHCAL_INFO *infoPtr, HDC hdc, int day, int month) { HPEN hRedPen = CreatePen(PS_SOLID, 2, RGB(255, 0, 0)); HPEN hOldPen2 = SelectObject(hdc, hRedPen); @@ -318,7 +318,7 @@ static void MONTHCAL_CircleDay(MONTHCAL_INFO *infoPtr, HDC hdc, int day, int mon } -static void MONTHCAL_DrawDay(MONTHCAL_INFO *infoPtr, HDC hdc, int day, int month, +static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, int day, int month, int x, int y, int bold) { static const WCHAR fmtW[] = { '%','d',0 }; @@ -387,7 +387,7 @@ static void MONTHCAL_DrawDay(MONTHCAL_INFO *infoPtr, HDC hdc, int day, int month } -static void paint_button (MONTHCAL_INFO *infoPtr, HDC hdc, BOOL btnNext, +static void paint_button (const MONTHCAL_INFO *infoPtr, HDC hdc, BOOL btnNext, BOOL pressed, RECT* r) { HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); @@ -426,7 +426,7 @@ static void paint_button (MONTHCAL_INFO *infoPtr, HDC hdc, BOOL btnNext, } -static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, PAINTSTRUCT* ps) +static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) { static const WCHAR todayW[] = { 'T','o','d','a','y',':',0 }; static const WCHAR fmt1W[] = { '%','s',' ','%','l','d',0 }; @@ -773,7 +773,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, PAINTSTRUCT* ps) static LRESULT -MONTHCAL_GetMinReqRect(MONTHCAL_INFO *infoPtr, LPARAM lParam) +MONTHCAL_GetMinReqRect(const MONTHCAL_INFO *infoPtr, LPARAM lParam) { LPRECT lpRect = (LPRECT) lParam; @@ -796,7 +796,7 @@ MONTHCAL_GetMinReqRect(MONTHCAL_INFO *infoPtr, LPARAM lParam) static LRESULT -MONTHCAL_GetColor(MONTHCAL_INFO *infoPtr, WPARAM wParam) +MONTHCAL_GetColor(const MONTHCAL_INFO *infoPtr, WPARAM wParam) { TRACE("\n"); @@ -859,7 +859,7 @@ MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam) static LRESULT -MONTHCAL_GetMonthDelta(MONTHCAL_INFO *infoPtr) +MONTHCAL_GetMonthDelta(const MONTHCAL_INFO *infoPtr) { TRACE("\n"); @@ -883,7 +883,7 @@ MONTHCAL_SetMonthDelta(MONTHCAL_INFO *infoPtr, WPARAM wParam) static LRESULT -MONTHCAL_GetFirstDayOfWeek(MONTHCAL_INFO *infoPtr) +MONTHCAL_GetFirstDayOfWeek(const MONTHCAL_INFO *infoPtr) { return infoPtr->firstDay; } @@ -919,7 +919,7 @@ MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, LPARAM lParam) static LRESULT -MONTHCAL_GetMonthRange(MONTHCAL_INFO *infoPtr) +MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr) { TRACE("\n"); @@ -928,7 +928,7 @@ MONTHCAL_GetMonthRange(MONTHCAL_INFO *infoPtr) static LRESULT -MONTHCAL_GetMaxTodayWidth(MONTHCAL_INFO *infoPtr) +MONTHCAL_GetMaxTodayWidth(const MONTHCAL_INFO *infoPtr) { return(infoPtr->todayrect.right - infoPtr->todayrect.left); } @@ -1003,7 +1003,7 @@ MONTHCAL_GetRange(HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -MONTHCAL_SetDayState(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +MONTHCAL_SetDayState(const MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { int i, iMonths = (int)wParam; @@ -1018,7 +1018,7 @@ MONTHCAL_SetDayState(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam) } static LRESULT -MONTHCAL_GetCurSel(MONTHCAL_INFO *infoPtr, LPARAM lParam) +MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, LPARAM lParam) { SYSTEMTIME *lpSel = (SYSTEMTIME *) lParam; @@ -1057,7 +1057,7 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, LPARAM lParam) static LRESULT -MONTHCAL_GetMaxSelCount(MONTHCAL_INFO *infoPtr) +MONTHCAL_GetMaxSelCount(const MONTHCAL_INFO *infoPtr) { return infoPtr->maxSelCount; } @@ -1077,7 +1077,7 @@ MONTHCAL_SetMaxSelCount(MONTHCAL_INFO *infoPtr, WPARAM wParam) static LRESULT -MONTHCAL_GetSelRange(MONTHCAL_INFO *infoPtr, LPARAM lParam) +MONTHCAL_GetSelRange(const MONTHCAL_INFO *infoPtr, LPARAM lParam) { SYSTEMTIME *lprgSysTimeArray = (SYSTEMTIME *) lParam; @@ -1123,7 +1123,7 @@ MONTHCAL_SetSelRange(MONTHCAL_INFO *infoPtr, LPARAM lParam) static LRESULT -MONTHCAL_GetToday(MONTHCAL_INFO *infoPtr, LPARAM lParam) +MONTHCAL_GetToday(const MONTHCAL_INFO *infoPtr, LPARAM lParam) { SYSTEMTIME *lpToday = (SYSTEMTIME *) lParam; @@ -1154,7 +1154,7 @@ MONTHCAL_SetToday(MONTHCAL_INFO *infoPtr, LPARAM lParam) static LRESULT -MONTHCAL_HitTest(MONTHCAL_INFO *infoPtr, LPARAM lParam) +MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, LPARAM lParam) { PMCHITTESTINFO lpht = (PMCHITTESTINFO)lParam; UINT x,y; @@ -1693,7 +1693,7 @@ MONTHCAL_Paint(MONTHCAL_INFO *infoPtr, WPARAM wParam) static LRESULT -MONTHCAL_KillFocus(MONTHCAL_INFO *infoPtr) +MONTHCAL_KillFocus(const MONTHCAL_INFO *infoPtr) { TRACE("\n"); @@ -1704,7 +1704,7 @@ MONTHCAL_KillFocus(MONTHCAL_INFO *infoPtr) static LRESULT -MONTHCAL_SetFocus(MONTHCAL_INFO *infoPtr) +MONTHCAL_SetFocus(const MONTHCAL_INFO *infoPtr) { TRACE("\n"); @@ -1821,7 +1821,7 @@ static LRESULT MONTHCAL_Size(MONTHCAL_INFO *infoPtr, int Width, int Height) return 0; } -static LRESULT MONTHCAL_GetFont(MONTHCAL_INFO *infoPtr) +static LRESULT MONTHCAL_GetFont(const MONTHCAL_INFO *infoPtr) { return (LRESULT)infoPtr->hFont; } @@ -1847,7 +1847,7 @@ static LRESULT MONTHCAL_SetFont(MONTHCAL_INFO *infoPtr, HFONT hFont, BOOL redraw } /* update theme after a WM_THEMECHANGED message */ -static LRESULT theme_changed (MONTHCAL_INFO* infoPtr) +static LRESULT theme_changed (const MONTHCAL_INFO* infoPtr) { HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); CloseThemeData (theme);

1 0

Paul Vriens : advapi32/tests: Add check to see if SetEntriesInAclW is implemented.
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 81a95ff6eec9393d8497dd4615ae44e37d3d1112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81a95ff6eec9393d8497dd461… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Mar 29 21:33:11 2007 +0200 advapi32/tests: Add check to see if SetEntriesInAclW is implemented. --- dlls/advapi32/tests/security.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 88c0d96..9aba94b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1709,7 +1709,12 @@ static void test_SetEntriesInAcl(void) DWORD res; res = SetEntriesInAclW(0, NULL, NULL, &acl); - ok(res == ERROR_SUCCESS, "SetEntriesInAcl failed: %u\n", res); + if(res == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("SetEntriesInAclW is not implemented\n"); + return; + } + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); ok(acl == NULL, "acl=%p, expected NULL\n", acl); }

1 0

Paul Vriens : advapi32/tests: Add check to see if ImpersonateSelf is implemented.
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 33b8ec1cb5e222f9b8078d2e5d580cdf368a66fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=33b8ec1cb5e222f9b8078d2e5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Mar 29 21:19:32 2007 +0200 advapi32/tests: Add check to see if ImpersonateSelf is implemented. --- dlls/advapi32/tests/security.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index cdf8084..88c0d96 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1608,10 +1608,16 @@ static void test_impersonation_level(void) pDuplicateTokenEx = (fnDuplicateTokenEx) GetProcAddress(hmod, "DuplicateTokenEx"); if( !pDuplicateTokenEx ) { - skip("DuplicateTokenEx\n"); + skip("DuplicateTokenEx is not available\n"); return; } + SetLastError(0xdeadbeef); ret = ImpersonateSelf(SecurityAnonymous); + if(!ret && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + skip("ImpersonateSelf is not implemented\n"); + return; + } ok(ret, "ImpersonateSelf(SecurityAnonymous) failed with error %d\n", GetLastError()); ret = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY_SOURCE | TOKEN_IMPERSONATE | TOKEN_ADJUST_DEFAULT, TRUE, &Token); ok(!ret, "OpenThreadToken should have failed\n");

1 0