February 2006 - Wine-Commits

lostwages/wwn wn20050812_287.xml wn20051025_29 ...
by Jeremy Newman Feb. 14, 2006

Feb. 14, 2006

ChangeSet ID: 23057 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/02/14 11:18:12 Modified files: wwn : wn20050812_287.xml wn20051025_296.xml wn20060210_305.xml Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling and typos fixes. Patch: http://cvs.winehq.org/patch.py?id=23057 Old revision New revision Changes Path 1.5 1.6 +1 -1 lostwages/wwn/wn20050812_287.xml 1.7 1.8 +4 -4 lostwages/wwn/wn20051025_296.xml 1.2 1.3 +22 -22 lostwages/wwn/wn20060210_305.xml Index: lostwages/wwn/wn20050812_287.xml diff -u -p lostwages/wwn/wn20050812_287.xml:1.5 lostwages/wwn/wn20050812_287.xml:1.6 --- lostwages/wwn/wn20050812_287.xml:1.5 14 Feb 2006 17:18:12 -0000 +++ lostwages/wwn/wn20050812_287.xml 14 Feb 2006 17:18:12 -0000 @@ -277,7 +277,7 @@ user interface should be.</quote> </section> <section - title="Registering DLL's" + title="Registering DLLs" subject="Delete Dll(Un)RegisterServer in d3dxof.dll?" archive="http://www.winehq.com/hypermail/wine-devel/2005/08/0214.html" posts="3" Index: lostwages/wwn/wn20051025_296.xml diff -u -p lostwages/wwn/wn20051025_296.xml:1.7 lostwages/wwn/wn20051025_296.xml:1.8 --- lostwages/wwn/wn20051025_296.xml:1.7 14 Feb 2006 17:18:12 -0000 +++ lostwages/wwn/wn20051025_296.xml 14 Feb 2006 17:18:12 -0000 @@ -97,10 +97,10 @@ the development mailing list. A huge project that began around the same time as address separation -was DLL separation. Wine's original DLL's weren't separated along the -same lines as Windows. Wine's DLL's should only call exported functions -of other DLL's. In other words, it should be possible to rip out one -of Wine's builtin DLL's and drop in a native Windows one without any +was DLL separation. Wine's original DLLs weren't separated along the +same lines as Windows. Wine's DLLs should only call exported functions +of other DLLs. In other words, it should be possible to rip out one +of Wine's builtin DLLs and drop in a native Windows one without any difference. <a href="http://www.winehq.org/?issue=5#Elfdlls%20are%20coming">If</a> <a href="http://www.winehq.org/?issue=7#ElfDLLs%20(cont'd)">you</a> Index: lostwages/wwn/wn20060210_305.xml diff -u -p lostwages/wwn/wn20060210_305.xml:1.2 lostwages/wwn/wn20060210_305.xml:1.3 --- lostwages/wwn/wn20060210_305.xml:1.2 14 Feb 2006 17:18:12 -0000 +++ lostwages/wwn/wn20060210_305.xml 14 Feb 2006 17:18:12 -0000 @@ -133,7 +133,7 @@ on LinuxElectrons: <quote who="LinuxElectrons"> "Businesses tell us they want to switch to the desktop Linux operating system to reduce total cost of ownership or improve security, but it's the -thought of losing one or two software applications like Quickbooks or +thought of losing one or two software applications like QuickBooks or Microsoft Project that holds them back," said Kevin Carmony, CEO of Linspire, Inc. "CrossOver Office is genius because it removes that hesitation from the equation. Yes, you can still use Quicken or Microsoft software on your @@ -329,8 +329,8 @@ Michael Stefaniuc came up with a new, li winedump has a VC++ symbol demangling function but that is bitrotting as it is a copy of the msvcrt.__unDname . As i wanted to use the newer - msvcrt.__unDname funtion i have written a quick and dirty program that - is basicaly only a wrapper around UnDecorateSymbolName(). Most importent + msvcrt.__unDname function i have written a quick and dirty program that + is basically only a wrapper around UnDecorateSymbolName(). Most important feature is that it runs on the command line. I'm not expecting it to go into Wine but others might find it useful. After applying the patch configure needs to be regenerated. @@ -355,7 +355,7 @@ instead of duplicating code?</quote> <quote who="Eric Pouech"> <ul> -<li> because we don't want winedump to be winelib app</li> +<li> because we don't want winedump to be a winelib app</li> <li> because winedump does a bit more than just demangling (like adding pmt names) which requires an extra level of intelligence that doesn't exist in msvcrt.__undname</li></ul></quote> @@ -402,7 +402,7 @@ WTL on Windows gives me: The goal is to combine WTL/ATL (no COM) with Winelib to create a Linux-application with the same look and -feel and roughly the same qualities: no DLL's, +feel and roughly the same qualities: no DLLs, shared libraries, C++ ABI hassles, etc. Just one binary linked to libc. @@ -570,7 +570,7 @@ Winelib (if that's decided to be a suppo in some natural order. The overall initialization function should be configurable so that programs that need only - a few DLL's (user, gdi, crtdll, kernel, ntdll) + a few DLLs (user, gdi, crtdll, kernel, ntdll) don't need to link everything</li> <li> Infrastructure to allow faking registry calls @@ -584,7 +584,7 @@ Winelib (if that's decided to be a suppo What I specifically don't need/want through Winelib: <ul><li> networking</li> <li> filesystem access</li> -<li> loading of external DLL's or other libraries</li> +<li> loading of external DLLs or other libraries</li> <li> C++ runtime library support</li></ul> Also, if anyone is interested in hosting patches to ATL/WTL @@ -611,10 +611,10 @@ just update the one dynamic library that If the startup speed isn't good enough for you, you can use oprofile (or some other profiling framework) to work out which functions are taking up time. We would welcome any fixes to improve the startup speed. -Optionally, you could comment out functions do things that you don't need. +Optionally, you could comment out functions that do things that you don't need. </quote> -Claus explained a bit more about the application and ho he'd like to +Claus explained a bit more about the application and how he'd like to deploy it: <quote who="Claus Fischer"> @@ -631,18 +631,18 @@ Mountain Rescue Service, has roughly 100 When the first phase was finished, the program would still run under Windows 98 SE upwards. It now depends on the -following DLL's: +following DLLs: - VERSION, - WS2_32, - KERNEL32, - USER32, - GDI32, - COMDLG32, - ADVAPI32, - SHELL32, - OLE32, - WININET, + VERSION, + WS2_32, + KERNEL32, + USER32, + GDI32, + COMDLG32, + ADVAPI32, + SHELL32, + OLE32, + WININET, COMCTL32 On any reasonable PC with internet access (it's a networked @@ -663,7 +663,7 @@ For this reason, having WTL+Winelib for been just too nice to think of :-)</quote> That prompted Dmitry Timoshkov to point out the underlying facilities -to support those DLL's were non-trivial, +to support those DLLs were non-trivial, <quote who="Dmitry Timoshkov"> You seem to underestimate what the dependencies above mean for the running Windows system. You depend on the whole kernel + GUI @@ -697,7 +697,7 @@ Your actual goal is described her dependency hell. A noble goal indeed, but the right way to do this is to investigate things like autopackage, ELF statifier, and so on. And also to accept that a program with no dependencies is perhaps not so useful after -all. For instance, you can probably find GTK+ 2.2 or higher on everybodies +all. For instance, you can probably find GTK+ 2.2 or higher on everybody's system these days.</quote> </section></kc>

1 0

lostwages/templates/en sending_patches.template
by Jeremy Newman Feb. 14, 2006

Feb. 14, 2006

ChangeSet ID: 23056 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/02/14 11:17:15 Modified files: templates/en : sending_patches.template Log message: Tom Wickline <twickline(a)gmail.com> add a note about tabs, spaces and indentation Patch: http://cvs.winehq.org/patch.py?id=23056 Old revision New revision Changes Path 1.14 1.15 +2 -0 lostwages/templates/en/sending_patches.template Index: lostwages/templates/en/sending_patches.template diff -u -p lostwages/templates/en/sending_patches.template:1.14 lostwages/templates/en/sending_patches.template:1.15 --- lostwages/templates/en/sending_patches.template:1.14 14 Feb 2006 17:17:15 -0000 +++ lostwages/templates/en/sending_patches.template 14 Feb 2006 17:17:15 -0000 @@ -30,6 +30,8 @@ to make sure it's not spam before they c <li>Avoid unnecessarily changing the formatting of the code. + <li>Don't mix tabs and spaces because it makes the diff output unreadable, use consistent indentation. + <li>Use standard C, avoid C++ comments and inline variable declarations. <li>Read the diff and make sure it contains only what you want in it.

1 0

lostwages/templates/en press.template status_c ...
by Jeremy Newman Feb. 14, 2006

Feb. 14, 2006

ChangeSet ID: 23055 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/02/14 11:16:24 Modified files: templates/en : press.template status_changelog.template status_dlls.template status_multimedia.template status_todo.template status_wine.template Log message: Tom Wickline <twickline(a)gmail.com> Status page updates Patch: http://cvs.winehq.org/patch.py?id=23055 Old revision New revision Changes Path 1.36 1.37 +1 -0 lostwages/templates/en/press.template 1.43 1.44 +24 -2 lostwages/templates/en/status_changelog.template 1.37 1.38 +16 -24 lostwages/templates/en/status_dlls.template 1.17 1.18 +8 -8 lostwages/templates/en/status_multimedia.template 1.17 1.18 +1 -99 lostwages/templates/en/status_todo.template 1.26 1.27 +4 -12 lostwages/templates/en/status_wine.template

1 0

Phil Krylov : riched20: Support RTF text in WM_SETTEXT.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 9761b457ce631bb092c1ac6a6387951e83c5a529 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9761b457ce631bb092c1ac6… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Tue Feb 14 17:38:57 2006 +0100 riched20: Support RTF text in WM_SETTEXT. --- dlls/riched20/editor.c | 54 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0eca070..336bf84 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -697,6 +697,40 @@ static LRESULT ME_StreamIn(ME_TextEditor } +typedef struct tagME_RTFStringStreamStruct +{ + char *string; + int pos; + int length; +} ME_RTFStringStreamStruct; + +static DWORD CALLBACK ME_ReadFromRTFString(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG cb, LONG *pcb) +{ + ME_RTFStringStreamStruct *pStruct = (ME_RTFStringStreamStruct *)dwCookie; + int count; + + count = min(cb, pStruct->length - pStruct->pos); + memmove(lpBuff, pStruct->string + pStruct->pos, count); + pStruct->pos += count; + *pcb = count; + return 0; +} + +static void +ME_StreamInRTFString(ME_TextEditor *editor, BOOL selection, char *string) +{ + EDITSTREAM es; + ME_RTFStringStreamStruct data; + + data.string = string; + data.length = strlen(string); + data.pos = 0; + es.dwCookie = (DWORD)&data; + es.pfnCallback = ME_ReadFromRTFString; + ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es); +} + + ME_DisplayItem * ME_FindItemAtOffset(ME_TextEditor *editor, ME_DIType nItemType, int nOffset, int *nItemOffset) { @@ -1591,15 +1625,23 @@ LRESULT WINAPI RichEditANSIWndProc(HWND ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor)); if (lParam) { - LPWSTR wszText = ME_ToUnicode(hWnd, (void *)lParam); TRACE("WM_SETTEXT lParam==%lx\n",lParam); - TRACE("WM_SETTEXT - %s\n", debugstr_w(wszText)); /* debugstr_w() */ - if (lstrlenW(wszText) > 0) + if (!IsWindowUnicode(hWnd) && !strncmp((char *)lParam, "{\\rtf1", 6)) + { + /* Undocumented: WM_SETTEXT supports RTF text */ + ME_StreamInRTFString(editor, 0, (char *)lParam); + } + else { - /* uses default style! */ - ME_InsertTextFromCursor(editor, 0, wszText, -1, editor->pBuffer->pDefaultStyle); + LPWSTR wszText = ME_ToUnicode(hWnd, (void *)lParam); + TRACE("WM_SETTEXT - %s\n", debugstr_w(wszText)); /* debugstr_w() */ + if (lstrlenW(wszText) > 0) + { + /* uses default style! */ + ME_InsertTextFromCursor(editor, 0, wszText, -1, editor->pBuffer->pDefaultStyle); + } + ME_EndToUnicode(hWnd, wszText); } - ME_EndToUnicode(hWnd, wszText); } else TRACE("WM_SETTEXT - NULL\n");

1 0

Louis Lenders : usp10: Added stub for ScriptGetCMap.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 9acfd6beb6abfeb5b8b68180e5e80dfbb743ac92 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9acfd6beb6abfeb5b8b6818… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Feb 14 17:38:47 2006 +0100 usp10: Added stub for ScriptGetCMap. --- dlls/usp10/usp10.c | 11 +++++++++++ dlls/usp10/usp10.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f871ddc..6fe2f6c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -212,3 +212,14 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRI return E_NOTIMPL; } + +/*********************************************************************** + * ScriptGetCMap (USP10.@) + * + */ +HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars, + int cChars, DWORD dwFlags, WORD *pwOutGlyphs) +{ + FIXME("(%p,%p,%s,%d,0x%lx,%p): stub\n", hdc, psc, debugstr_w(pwcInChars), cChars, dwFlags, pwOutGlyphs); + return E_NOTIMPL; +} diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index ea1f2d5..ffc2e95 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -5,7 +5,7 @@ @ stub ScriptCPtoX @ stub ScriptCacheGetHeight @ stdcall ScriptFreeCache(ptr) -@ stub ScriptGetCMap +@ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) @ stdcall ScriptGetFontProperties(long ptr ptr) @ stub ScriptGetGlyphABCWidth @ stub ScriptGetLogicalWidths

1 0

Jeff Latimer : usp10: Added some tests.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 29ff53c119ff8f2421f1ff40f257632692810db9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29ff53c119ff8f2421f1ff4… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Feb 14 17:38:20 2006 +0100 usp10: Added some tests. --- configure | 3 - configure.ac | 1 dlls/usp10/Makefile.in | 2 dlls/usp10/tests/.gitignore | 3 + dlls/usp10/tests/Makefile.in | 13 +++ dlls/usp10/tests/usp10.c | 195 ++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 31 +++++++ dlls/usp10/usp10.spec | 4 - 8 files changed, 249 insertions(+), 3 deletions(-) create mode 100644 dlls/usp10/tests/.gitignore create mode 100644 dlls/usp10/tests/Makefile.in create mode 100644 dlls/usp10/tests/usp10.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=29ff53c119ff8f2421f…

1 0

Vijay Kiran Kamuju : secur32: Add InitializeSecurityContext stub for schannel.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 517e3102820fd269328b40ff05194126ae7c64c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=517e3102820fd269328b40f… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Feb 14 17:37:36 2006 +0100 secur32: Add InitializeSecurityContext stub for schannel. --- dlls/secur32/schannel.c | 53 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index c6f80bb..4d2b2c8 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -156,6 +156,55 @@ static SECURITY_STATUS SEC_ENTRY schan_A ptsExpiry); } +/*********************************************************************** + * InitializeSecurityContextA + */ +static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextA( + PCredHandle phCredential, PCtxtHandle phContext, SEC_CHAR *pszTargetName, + ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, + PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, + PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) +{ + SECURITY_STATUS ret; + + TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, + debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, + Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); + if(phCredential){ + ret = SEC_E_UNSUPPORTED_FUNCTION; + } + else + { + ret = SEC_E_INVALID_HANDLE; + } + return ret; +} + +/*********************************************************************** + * InitializeSecurityContextW + */ +static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( + PCredHandle phCredential, PCtxtHandle phContext, SEC_WCHAR *pszTargetName, + ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, + PSecBufferDesc pInput,ULONG Reserved2, PCtxtHandle phNewContext, + PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) +{ + SECURITY_STATUS ret; + + TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, + debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, + Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); + if (phCredential) + { + ret = SEC_E_UNSUPPORTED_FUNCTION; + } + else + { + ret = SEC_E_INVALID_HANDLE; + } + return ret; +} + static SecurityFunctionTableA schanTableA = { 1, NULL, /* EnumerateSecurityPackagesA */ @@ -163,7 +212,7 @@ static SecurityFunctionTableA schanTable schan_AcquireCredentialsHandleA, NULL, /* FreeCredentialsHandle */ NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextA */ + schan_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ @@ -194,7 +243,7 @@ static SecurityFunctionTableW schanTable schan_AcquireCredentialsHandleW, NULL, /* FreeCredentialsHandle */ NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextW */ + schan_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */

1 0

Roderick Colenbrander : d3d8: Move d3d8 surface over to wined3d ( based on the work of Oliver Stieber).
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 4e4fc936454da857281ce4188131ed8845404350 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e4fc936454da857281ce41… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Feb 14 17:13:19 2006 +0100 d3d8: Move d3d8 surface over to wined3d (based on the work of Oliver Stieber). --- dlls/d3d8/cubetexture.c | 18 +- dlls/d3d8/d3d8_private.h | 113 ++++++++-- dlls/d3d8/device.c | 363 +++++++++++--------------------- dlls/d3d8/resource.c | 6 - dlls/d3d8/surface.c | 521 ++++++++++++++++++---------------------------- dlls/d3d8/texture.c | 16 + 6 files changed, 440 insertions(+), 597 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4e4fc936454da857281…

1 0

Vitaliy Margolen : comctl32: Fix invalid date/time check in MCM_SETRANGE: ignore time and fail on bad date.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: bc2b9e3febf447870a20adf77f59ad4df0f8f79d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc2b9e3febf447870a20adf… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Feb 14 17:12:45 2006 +0100 comctl32: Fix invalid date/time check in MCM_SETRANGE: ignore time and fail on bad date. --- dlls/comctl32/monthcal.c | 42 ++++++++++++++++------------------------ dlls/comctl32/tests/monthcal.c | 21 +++++++++++++++++++- 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 340b681..1de342f 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -160,14 +160,10 @@ int MONTHCAL_MonthLength(int month, int /* make sure that time is valid */ static int MONTHCAL_ValidateTime(SYSTEMTIME time) { - if(time.wMonth > 12) return FALSE; + if(time.wMonth < 1 || time.wMonth > 12 ) return FALSE; if(time.wDayOfWeek > 6) return FALSE; if(time.wDay > MONTHCAL_MonthLength(time.wMonth, time.wYear)) return FALSE; - if(time.wHour > 23) return FALSE; - if(time.wMinute > 59) return FALSE; - if(time.wSecond > 59) return FALSE; - if(time.wMilliseconds > 999) return FALSE; return TRUE; } @@ -943,29 +939,25 @@ MONTHCAL_GetMaxTodayWidth(MONTHCAL_INFO static LRESULT MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *)lParam; - int prev; + SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *)lParam; + int prev; - TRACE("%x %lx\n", wParam, lParam); + TRACE("%x %lx\n", wParam, lParam); + + if ((wParam & GDTR_MIN && !MONTHCAL_ValidateTime(lprgSysTimeArray[0])) || + (wParam & GDTR_MAX && !MONTHCAL_ValidateTime(lprgSysTimeArray[1]))) + return FALSE; - if(wParam & GDTR_MAX) { - if(MONTHCAL_ValidateTime(lprgSysTimeArray[1])){ - MONTHCAL_CopyTime(&lprgSysTimeArray[1], &infoPtr->maxDate); - infoPtr->rangeValid|=GDTR_MAX; - } else { - GetSystemTime(&infoPtr->todaysDate); - MONTHCAL_CopyTime(&infoPtr->todaysDate, &infoPtr->maxDate); - } - } - if(wParam & GDTR_MIN) { - if(MONTHCAL_ValidateTime(lprgSysTimeArray[0])) { - MONTHCAL_CopyTime(&lprgSysTimeArray[0], &infoPtr->minDate); - infoPtr->rangeValid|=GDTR_MIN; - } else { - GetSystemTime(&infoPtr->todaysDate); - MONTHCAL_CopyTime(&infoPtr->todaysDate, &infoPtr->minDate); + if (wParam & GDTR_MIN) + { + MONTHCAL_CopyTime(&lprgSysTimeArray[0], &infoPtr->minDate); + infoPtr->rangeValid |= GDTR_MIN; + } + if (wParam & GDTR_MAX) + { + MONTHCAL_CopyTime(&lprgSysTimeArray[1], &infoPtr->maxDate); + infoPtr->rangeValid |= GDTR_MAX; } - } prev = infoPtr->monthRange; infoPtr->monthRange = infoPtr->maxDate.wMonth - infoPtr->minDate.wMonth; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 82b41b3..b04f137 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -31,7 +31,7 @@ void test_monthcal(void) { HWND hwnd; - SYSTEMTIME st[2]; + SYSTEMTIME st[2], st1[2]; INITCOMMONCONTROLSEX ic = {sizeof(INITCOMMONCONTROLSEX), ICC_DATE_CLASSES}; InitCommonControlsEx(&ic); @@ -39,6 +39,25 @@ void test_monthcal(void) 0, 300, 300, 0, 0, NULL, NULL); ok(hwnd != NULL, "Failed to create MonthCal\n"); GetSystemTime(&st[0]); + st[1] = st[0]; + + /* Invalid date/time */ + st[0].wYear = 2000; + /* Time should not matter */ + st[1].wHour = st[1].wMinute = st[1].wSecond = 70; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set MAX limit\n"); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "No limits should be set\n"); + ok(st1[0].wYear != 2000, "Lover limit changed\n"); + + st[1].wMonth = 0; + ok(!SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Should have failed to set limits\n"); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "No limits should be set\n"); + ok(st1[0].wYear != 2000, "Lover limit changed\n"); + ok(!SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Should have failed to set MAX limit\n"); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "No limits should be set\n"); + ok(st1[0].wYear != 2000, "Lover limit changed\n"); + + GetSystemTime(&st[0]); st[0].wMonth = 5; st[1] = st[0];

1 0

Saulius Krasuckas : mscms: Move 4 test macros into a single one.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 8aee2f2951e7f4c54a2fc98e1f7b988f2c445414 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8aee2f2951e7f4c54a2fc98… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Tue Feb 14 17:12:32 2006 +0100 mscms: Move 4 test macros into a single one. --- dlls/mscms/tests/profile.c | 90 ++++++++++++++++---------------------------- 1 files changed, 32 insertions(+), 58 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 5881891..da34caa 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -550,25 +550,15 @@ static void check_registry(void) RegCloseKey( hkIcmKey ); } -#define fail_GSCSPA(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK) \ -do { \ - size = dwSz; \ - SetLastError(0xfaceabad); \ - ret = pGetStandardColorSpaceProfileA(pMachName, dwProfID, pProfName, pdwSz);\ - GLE = GetLastError(); \ - ok( !ret && GLE_OK, \ - "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); \ -} while (0) - -#define test_GSCSPA(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK) \ -do { \ - size = dwSz; \ - SetLastError(0xfaceabad); \ - ret = pGetStandardColorSpaceProfileA(pMachName, dwProfID, pProfName, pdwSz);\ - GLE = GetLastError(); \ - ok( (!ret && GLE_OK) || \ - (ret && !lstrcmpiA( pProfName, "" ) && GLE == 0xfaceabad), \ - "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); \ +#define fail_GSCSP(AW, pMachName, dwProfID, pProfName, pdwSz, dwSz, bCanSucceed, GLE_MATCHES)\ +do { \ + size = dwSz; \ + SetLastError(0xfaceabad); \ + ret = pGetStandardColorSpaceProfile##AW(pMachName, dwProfID, pProfName, pdwSz); \ + GLE = GetLastError(); \ + ok( (!ret && GLE_MATCHES) || \ + (bCanSucceed && ret && !lstrcmpi##AW( pProfName, empty##AW ) && GLE == 0xfaceabad), \ + "GetStandardColorSpaceProfile%s() returns %d (GLE=%ld)\n", #AW, ret, GLE ); \ } while (0) static void test_GetStandardColorSpaceProfileA(void) @@ -577,30 +567,33 @@ static void test_GetStandardColorSpacePr DWORD size, sizeP, GLE; CHAR oldprofile[MAX_PATH]; CHAR newprofile[MAX_PATH]; + CHAR emptyA[] = ""; sizeP = sizeof(newprofile); /* Parameter checks */ +#define A /* Single invalid parameter checks */ - fail_GSCSPA(machine, SPACE_RGB, newprofile, &size, sizeP, (GLE == ERROR_NOT_SUPPORTED)); + fail_GSCSP(A, machine, SPACE_RGB, newprofile, &size, sizeP, FALSE, (GLE == ERROR_NOT_SUPPORTED)); todo_wine - fail_GSCSPA(NULL, (DWORD)-1, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); + fail_GSCSP(A, NULL, (DWORD)-1, newprofile, &size, sizeP, FALSE, (GLE == ERROR_FILE_NOT_FOUND)); todo_wine - fail_GSCSPA(NULL, SPACE_RGB, NULL, &size, sizeP, (GLE == ERROR_INSUFFICIENT_BUFFER)); + fail_GSCSP(A, NULL, SPACE_RGB, newprofile, NULL, sizeP, FALSE, (GLE == ERROR_INVALID_PARAMETER)); todo_wine - fail_GSCSPA(NULL, SPACE_RGB, newprofile, NULL, sizeP, (GLE == ERROR_INVALID_PARAMETER)); + fail_GSCSP(A, NULL, SPACE_RGB, NULL, &size, sizeP, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER)); todo_wine - fail_GSCSPA(NULL, SPACE_RGB, newprofile, &size, 0, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER)); + fail_GSCSP(A, NULL, SPACE_RGB, newprofile, &size, 0, FALSE, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER)); /* Several invalid parameter checks */ - fail_GSCSPA(machine, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); + fail_GSCSP(A, machine, 0, newprofile, &size, 0, FALSE, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); todo_wine - fail_GSCSPA(NULL, 0, newprofile, NULL, 0, (GLE == ERROR_INVALID_PARAMETER)); + fail_GSCSP(A, NULL, 0, newprofile, NULL, 0, FALSE, (GLE == ERROR_INVALID_PARAMETER)); todo_wine - fail_GSCSPA(NULL, 0, NULL, &size, 0, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND)); + fail_GSCSP(A, NULL, 0, NULL, &size, 0, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND)); todo_wine - test_GSCSPA(NULL, 0, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); + fail_GSCSP(A, NULL, 0, newprofile, &size, sizeP, TRUE, (GLE == ERROR_FILE_NOT_FOUND)); + #undef A /* Functional checks */ @@ -626,27 +619,6 @@ static void test_GetStandardColorSpacePr } } -#define fail_GSCSPW(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK) \ -do { \ - size = dwSz; \ - SetLastError(0xfaceabad); \ - ret = pGetStandardColorSpaceProfileW(pMachName, dwProfID, pProfName, pdwSz);\ - GLE = GetLastError(); \ - ok( !ret && GLE_OK, \ - "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE ); \ -} while (0) - -#define test_GSCSPW(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK) \ -do { \ - size = dwSz; \ - SetLastError(0xfaceabad); \ - ret = pGetStandardColorSpaceProfileW(pMachName, dwProfID, pProfName, pdwSz);\ - GLE = GetLastError(); \ - ok( (!ret && GLE_OK) || \ - (ret && !lstrcmpiW( pProfName, emptyW ) && GLE == 0xfaceabad), \ - "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); \ -} while (0) - static void test_GetStandardColorSpaceProfileW(void) { BOOL ret; @@ -659,25 +631,27 @@ static void test_GetStandardColorSpacePr /* Parameter checks */ +#define W /* Single invalid parameter checks */ - fail_GSCSPW(machineW, SPACE_RGB, newprofile, &size, sizeP, (GLE == ERROR_NOT_SUPPORTED)); + fail_GSCSP(W, machineW, SPACE_RGB, newprofile, &size, sizeP, FALSE, (GLE == ERROR_NOT_SUPPORTED)); todo_wine - fail_GSCSPW(NULL, (DWORD)-1, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); + fail_GSCSP(W, NULL, (DWORD)-1, newprofile, &size, sizeP, FALSE, (GLE == ERROR_FILE_NOT_FOUND)); todo_wine - fail_GSCSPW(NULL, SPACE_RGB, NULL, &size, sizeP, (GLE == ERROR_INSUFFICIENT_BUFFER)); + fail_GSCSP(W, NULL, SPACE_RGB, NULL, &size, sizeP, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER)); todo_wine - fail_GSCSPW(NULL, SPACE_RGB, newprofile, NULL, sizeP, (GLE == ERROR_INVALID_PARAMETER)); + fail_GSCSP(W, NULL, SPACE_RGB, newprofile, NULL, sizeP, FALSE, (GLE == ERROR_INVALID_PARAMETER)); todo_wine - fail_GSCSPW(NULL, SPACE_RGB, newprofile, &size, 0, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER)); + fail_GSCSP(W, NULL, SPACE_RGB, newprofile, &size, 0, FALSE, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER)); /* Several invalid parameter checks */ - fail_GSCSPW(machineW, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); + fail_GSCSP(W, machineW, 0, newprofile, &size, 0, FALSE, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); todo_wine - fail_GSCSPW(NULL, 0, newprofile, NULL, 0, (GLE == ERROR_INVALID_PARAMETER)); + fail_GSCSP(W, NULL, 0, newprofile, NULL, 0, FALSE, (GLE == ERROR_INVALID_PARAMETER)); todo_wine - fail_GSCSPW(NULL, 0, NULL, &size, 0, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND)); + fail_GSCSP(W, NULL, 0, NULL, &size, 0, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND)); todo_wine - test_GSCSPW(NULL, 0, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); + fail_GSCSP(W, NULL, 0, newprofile, &size, sizeP, TRUE, (GLE == ERROR_FILE_NOT_FOUND)); + #undef W /* Functional checks */

1 0