Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 12 23:30:00 2008 New Revision: 33489 URL: http://svn.reactos.org/svn/reactos?rev=33489&view=rev Log: fix build, sorry Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Mon May 12 23:30:00 2008 @@ -1501,7 +1501,7 @@ /* remove the message queue from any desktops */ if ((desk = InterlockedExchangePointer((PVOID*)&MessageQueue->Desktop, 0))) { - InterlockedExchangePointer((PVOID*)&desk->ActiveMessageQueue, 0); + (void)InterlockedExchangePointer((PVOID*)&desk->ActiveMessageQueue, 0); IntDereferenceMessageQueue(MessageQueue); }

16 years, 4 months

[tkreuzer] 33488: - fix a pointer to INT cast - use InterlockedExchangePointer instead of InterlockedExchange for a pointer

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 12 23:18:07 2008 New Revision: 33488 URL: http://svn.reactos.org/svn/reactos?rev=33488&view=rev Log: - fix a pointer to INT cast - use InterlockedExchangePointer instead of InterlockedExchange for a pointer Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Mon May 12 23:18:07 2008 @@ -868,7 +868,7 @@ if (Message->HookMessage) { Result = co_HOOK_CallHooks(Message->Msg.message, - (INT) Message->Msg.hwnd, + (INT)(INT_PTR)Message->Msg.hwnd, Message->Msg.wParam, Message->Msg.lParam); } @@ -1499,9 +1499,9 @@ PDESKTOP_OBJECT desk; /* remove the message queue from any desktops */ - if ((desk = (PDESKTOP_OBJECT)InterlockedExchange((LONG*)&MessageQueue->Desktop, 0))) - { - InterlockedExchange((LONG*)&desk->ActiveMessageQueue, 0); + if ((desk = InterlockedExchangePointer((PVOID*)&MessageQueue->Desktop, 0))) + { + InterlockedExchangePointer((PVOID*)&desk->ActiveMessageQueue, 0); IntDereferenceMessageQueue(MessageQueue); }

16 years, 4 months

[cfinck] 33487: Don't strip trailing spaces from the command line This way, stuff like "notepad abc.txt " will correctly pass "abc.txt " as the filename like Windows does. See issue #1818 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon May 12 16:26:38 2008 New Revision: 33487 URL: http://svn.reactos.org/svn/reactos?rev=33487&view=rev Log: Don't strip trailing spaces from the command line This way, stuff like "notepad abc.txt " will correctly pass "abc.txt " as the filename like Windows does. See issue #1818 for more details. Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Mon May 12 16:26:38 2008 @@ -1529,11 +1529,6 @@ *cp = _T('\0'); - /* strip trailing spaces */ - while ((--cp >= commandline) && _istspace (*cp)); - - *(cp + 1) = _T('\0'); - /* JPP 19980807 */ /* Echo batch file line */ if (bEchoThisLine)

16 years, 4 months

[cfinck] 33486: Fix the Release build by marking MmPageArraySize as unreferenced. Changing the ASSERT, so that it doesn't spit out an "unused variable" warning on Release builds doesn't work, because then it expects this variable to exist. (which is not the case for some struct elements passed to ASSERT in some other parts of the kernel)

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon May 12 15:48:48 2008 New Revision: 33486 URL: http://svn.reactos.org/svn/reactos?rev=33486&view=rev Log: Fix the Release build by marking MmPageArraySize as unreferenced. Changing the ASSERT, so that it doesn't spit out an "unused variable" warning on Release builds doesn't work, because then it expects this variable to exist. (which is not the case for some struct elements passed to ASSERT in some other parts of the kernel) Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Mon May 12 15:48:48 2008 @@ -986,6 +986,9 @@ extern PPHYSICAL_PAGE MmPageArray; extern ULONG MmPageArraySize; + /* Mark MmPageArraySize as unreferenced, otherwise it will appear as an unused variable on a Release build */ + UNREFERENCED_PARAMETER(MmPageArraySize); + /* Make sure the PFN number is valid */ ASSERT(Pfn <= MmPageArraySize);

16 years, 4 months

[cfinck] 33485: [FORMATTING] Fix indentation (4 spaces)

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon May 12 15:11:11 2008 New Revision: 33485 URL: http://svn.reactos.org/svn/reactos?rev=33485&view=rev Log: [FORMATTING] Fix indentation (4 spaces) Modified: trunk/reactos/dll/win32/kernel32/string/lstring.c Modified: trunk/reactos/dll/win32/kernel32/string/lstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/string/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/string/lstring.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/string/lstring.c [iso-8859-1] Mon May 12 15:11:11 2008 @@ -15,51 +15,45 @@ */ int STDCALL -lstrcmpA( - LPCSTR lpString1, - LPCSTR lpString2 - ) -{ - int Result; - - if (lpString1 == lpString2) - return 0; - if (lpString1 == NULL) - return -1; - if (lpString2 == NULL) - return 1; - - Result = CompareStringA(GetThreadLocale(), 0, lpString1, -1, lpString2, -1); - if (Result) Result -= 2; - - return Result; -} - - -/* - * @implemented - */ -int -STDCALL -lstrcmpiA( - LPCSTR lpString1, - LPCSTR lpString2 - ) -{ - int Result; - - if (lpString1 == lpString2) - return 0; - if (lpString1 == NULL) - return -1; - if (lpString2 == NULL) - return 1; - - Result = CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpString1, -1, - lpString2, -1); - if (Result) Result -= 2; - - return Result; +lstrcmpA(LPCSTR lpString1, LPCSTR lpString2) +{ + int Result; + + if (lpString1 == lpString2) + return 0; + if (lpString1 == NULL) + return -1; + if (lpString2 == NULL) + return 1; + + Result = CompareStringA(GetThreadLocale(), 0, lpString1, -1, lpString2, -1); + if (Result) Result -= 2; + + return Result; +} + + +/* + * @implemented + */ +int +STDCALL +lstrcmpiA(LPCSTR lpString1, LPCSTR lpString2) +{ + int Result; + + if (lpString1 == lpString2) + return 0; + if (lpString1 == NULL) + return -1; + if (lpString2 == NULL) + return 1; + + Result = CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpString1, -1, lpString2, -1); + if (Result) + Result -= 2; + + return Result; } /* @@ -67,11 +61,7 @@ */ LPSTR STDCALL -lstrcpynA( - LPSTR lpString1, - LPCSTR lpString2, - int iMaxLength - ) +lstrcpynA(LPSTR lpString1, LPCSTR lpString2, int iMaxLength) { LPSTR d = lpString1; LPCSTR s = lpString2; @@ -85,7 +75,9 @@ count--; *d++ = *s++; } - if (count) *d = 0; + + if (count) + *d = 0; Ret = lpString1; } @@ -101,10 +93,7 @@ */ LPSTR STDCALL -lstrcpyA( - LPSTR lpString1, - LPCSTR lpString2 - ) +lstrcpyA(LPSTR lpString1, LPCSTR lpString2) { LPSTR Ret = NULL; @@ -112,7 +101,7 @@ { memmove(lpString1, lpString2, strlen(lpString2) + 1); Ret = lpString1; - } + } _SEH_HANDLE _SEH_END; @@ -125,10 +114,7 @@ */ LPSTR STDCALL -lstrcatA( - LPSTR lpString1, - LPCSTR lpString2 - ) +lstrcatA(LPSTR lpString1, LPCSTR lpString2) { LPSTR Ret = NULL; @@ -140,18 +126,15 @@ _SEH_END; return Ret; - -} - - -/* - * @implemented - */ -int -STDCALL -lstrlenA( - LPCSTR lpString - ) +} + + +/* + * @implemented + */ +int +STDCALL +lstrlenA(LPCSTR lpString) { INT Ret = 0; @@ -171,50 +154,46 @@ */ int STDCALL -lstrcmpW( - LPCWSTR lpString1, - LPCWSTR lpString2 - ) -{ - int Result; - - if (lpString1 == lpString2) - return 0; - if (lpString1 == NULL) - return -1; - if (lpString2 == NULL) - return 1; - - Result = CompareStringW(GetThreadLocale(), 0, lpString1, -1, lpString2, -1); - if (Result) Result -= 2; - - return Result; -} - - -/* - * @implemented - */ -int -STDCALL -lstrcmpiW( - LPCWSTR lpString1, - LPCWSTR lpString2 - ) -{ - int Result; - - if (lpString1 == lpString2) - return 0; - if (lpString1 == NULL) - return -1; - if (lpString2 == NULL) - return 1; - - Result = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpString1, -1, lpString2, -1); - if (Result) Result -= 2; - - return Result; +lstrcmpW(LPCWSTR lpString1, LPCWSTR lpString2) +{ + int Result; + + if (lpString1 == lpString2) + return 0; + if (lpString1 == NULL) + return -1; + if (lpString2 == NULL) + return 1; + + Result = CompareStringW(GetThreadLocale(), 0, lpString1, -1, lpString2, -1); + if (Result) + Result -= 2; + + return Result; +} + + +/* + * @implemented + */ +int +STDCALL +lstrcmpiW(LPCWSTR lpString1, LPCWSTR lpString2) +{ + int Result; + + if (lpString1 == lpString2) + return 0; + if (lpString1 == NULL) + return -1; + if (lpString2 == NULL) + return 1; + + Result = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpString1, -1, lpString2, -1); + if (Result) + Result -= 2; + + return Result; } @@ -223,11 +202,7 @@ */ LPWSTR STDCALL -lstrcpynW( - LPWSTR lpString1, - LPCWSTR lpString2, - int iMaxLength - ) +lstrcpynW(LPWSTR lpString1, LPCWSTR lpString2, int iMaxLength) { LPWSTR d = lpString1; LPCWSTR s = lpString2; @@ -241,7 +216,9 @@ count--; *d++ = *s++; } - if (count) *d = 0; + + if (count) + *d = 0; Ret = lpString1; } @@ -257,10 +234,7 @@ */ LPWSTR STDCALL -lstrcpyW( - LPWSTR lpString1, - LPCWSTR lpString2 - ) +lstrcpyW(LPWSTR lpString1, LPCWSTR lpString2) { LPWSTR Ret = NULL; @@ -280,10 +254,7 @@ */ LPWSTR STDCALL -lstrcatW( - LPWSTR lpString1, - LPCWSTR lpString2 - ) +lstrcatW(LPWSTR lpString1, LPCWSTR lpString2) { LPWSTR Ret = NULL; @@ -303,9 +274,7 @@ */ int STDCALL -lstrlenW( - LPCWSTR lpString - ) +lstrlenW(LPCWSTR lpString) { INT Ret = 0;

16 years, 4 months

[cfinck] 33484: The lstr* functions don't reset the last error on an exception. Also they handle more than just access violation exceptions. This makes us passing (at least) one more sub test of a Wine test (user32_winetest text) Behaviour verified under Windows XP SP2.

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon May 12 15:01:48 2008 New Revision: 33484 URL: http://svn.reactos.org/svn/reactos?rev=33484&view=rev Log: The lstr* functions don't reset the last error on an exception. Also they handle more than just access violation exceptions. This makes us passing (at least) one more sub test of a Wine test (user32_winetest text) Behaviour verified under Windows XP SP2. Modified: trunk/reactos/dll/win32/kernel32/string/lstring.c Modified: trunk/reactos/dll/win32/kernel32/string/lstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/string/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/string/lstring.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/string/lstring.c [iso-8859-1] Mon May 12 15:01:48 2008 @@ -10,15 +10,6 @@ #include <k32.h> -static _SEH_FILTER(lstr_page_fault) -{ - if (_SEH_GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) - return _SEH_EXECUTE_HANDLER; - else - return _SEH_CONTINUE_SEARCH; -} - - /* * @implemented */ @@ -98,10 +89,7 @@ Ret = lpString1; } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError( ERROR_INVALID_PARAMETER ); - } + _SEH_HANDLE _SEH_END; return Ret; @@ -125,10 +113,7 @@ memmove(lpString1, lpString2, strlen(lpString2) + 1); Ret = lpString1; } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError(ERROR_INVALID_PARAMETER); - } + _SEH_HANDLE _SEH_END; return Ret; @@ -151,10 +136,7 @@ { Ret = strcat(lpString1, lpString2); } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError(ERROR_INVALID_PARAMETER); - } + _SEH_HANDLE _SEH_END; return Ret; @@ -177,10 +159,7 @@ { Ret = strlen(lpString); } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError(ERROR_INVALID_PARAMETER); - } + _SEH_HANDLE _SEH_END; return Ret; @@ -266,10 +245,7 @@ Ret = lpString1; } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError( ERROR_INVALID_PARAMETER ); - } + _SEH_HANDLE _SEH_END; return Ret; @@ -292,10 +268,7 @@ { Ret = wcscpy(lpString1, lpString2); } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError(ERROR_INVALID_PARAMETER); - } + _SEH_HANDLE _SEH_END; return Ret; @@ -318,10 +291,7 @@ { Ret = wcscat(lpString1, lpString2); } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError(ERROR_INVALID_PARAMETER); - } + _SEH_HANDLE _SEH_END; return Ret; @@ -343,11 +313,8 @@ { Ret = wcslen(lpString); } - _SEH_EXCEPT(lstr_page_fault) - { - SetLastError(ERROR_INVALID_PARAMETER); - } - _SEH_END; - - return Ret; -} + _SEH_HANDLE + _SEH_END; + + return Ret; +}

16 years, 4 months

[gbrunmar] 33483: * Synced DIALOG_DlgDirListW() and DIALOG_DlgDirSelect() from Wine to get more user32.dll winetests to pass * Fixed indentation in User32EnumWindows() * Removed internal use of Set/GetLastError() from User32EnumWindows() - makes even more winetests pass

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Mon May 12 14:36:39 2008 New Revision: 33483 URL: http://svn.reactos.org/svn/reactos?rev=33483&view=rev Log: * Synced DIALOG_DlgDirListW() and DIALOG_DlgDirSelect() from Wine to get more user32.dll winetests to pass * Fixed indentation in User32EnumWindows() * Removed internal use of Set/GetLastError() from User32EnumWindows() - makes even more winetests pass Modified: trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Mon May 12 14:36:39 2008 @@ -1196,6 +1196,7 @@ { WCHAR *p, *p2; p = spec; + if ((p2 = strchrW( p, ':' ))) p = p2 + 1; if ((p2 = strrchrW( p, '\\' ))) p = p2; if ((p2 = strrchrW( p, '/' ))) p = p2; if (p != spec) @@ -1215,28 +1216,29 @@ if (idLBox && ((hwnd = GetDlgItem( hDlg, idLBox )) != 0)) { + if (attrib == DDL_DRIVES) attrib |= DDL_EXCLUSIVE; + SENDMSG( combo ? CB_RESETCONTENT : LB_RESETCONTENT, 0, 0 ); if (attrib & DDL_DIRECTORY) { if (!(attrib & DDL_EXCLUSIVE)) { - if (SENDMSG( combo ? CB_DIR : LB_DIR, - attrib & ~(DDL_DIRECTORY | DDL_DRIVES), - (LPARAM)spec ) == LB_ERR) - return FALSE; + SENDMSG( combo ? CB_DIR : LB_DIR, + attrib & ~(DDL_DIRECTORY | DDL_DRIVES), + (LPARAM)spec ); } - if (SENDMSG( combo ? CB_DIR : LB_DIR, - (attrib & (DDL_DIRECTORY | DDL_DRIVES)) | DDL_EXCLUSIVE, - (LPARAM)any ) == LB_ERR) - return FALSE; + SENDMSG( combo ? CB_DIR : LB_DIR, + (attrib & (DDL_DIRECTORY | DDL_DRIVES)) | DDL_EXCLUSIVE, + (LPARAM)any ); } else { - if (SENDMSG( combo ? CB_DIR : LB_DIR, attrib, - (LPARAM)spec ) == LB_ERR) - return FALSE; - } - } + SENDMSG( combo ? CB_DIR : LB_DIR, attrib, (LPARAM)spec ); + } + } + + /* Convert path specification to uppercase */ + if (spec) CharUpperW(spec); if (idStatic && ((hwnd = GetDlgItem( hDlg, idStatic )) != 0)) { @@ -1300,7 +1302,7 @@ size = SendMessageW(listbox, combo ? CB_GETLBTEXTLEN : LB_GETTEXTLEN, 0, 0 ); if (size == LB_ERR) return FALSE; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size+1 ))) return FALSE; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (size+2) * sizeof(WCHAR) ))) return FALSE; SendMessageW( listbox, combo ? CB_GETLBTEXT : LB_GETTEXT, item, (LPARAM)buffer ); @@ -1318,14 +1320,25 @@ ptr = buffer + 1; } } - else ptr = buffer; - - if (unicode) + else + { + /* Filenames without a dot extension must have one tacked at the end */ + if (strchrW(buffer, '.') == NULL) + { + buffer[strlenW(buffer)+1] = '\0'; + buffer[strlenW(buffer)] = '.'; + } + ptr = buffer; + } + + if (!unicode) { if (len > 0 && !WideCharToMultiByte( CP_ACP, 0, ptr, -1, (LPSTR)str, len, 0, 0 )) ((LPSTR)str)[len-1] = 0; } - else lstrcpynW( str, ptr, len ); + else + lstrcpynW( str, ptr, len ); + HeapFree( GetProcessHeap(), 0, buffer ); TRACE("Returning %d '%s'\n", ret, str ); return ret; Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Mon May 12 14:36:39 2008 @@ -548,12 +548,12 @@ static BOOL User32EnumWindows ( - HDESK hDesktop, - HWND hWndparent, - WNDENUMPROC lpfn, - LPARAM lParam, - DWORD dwThreadId, - BOOL bChildren ) + HDESK hDesktop, + HWND hWndparent, + WNDENUMPROC lpfn, + LPARAM lParam, + DWORD dwThreadId, + BOOL bChildren ) { DWORD i, dwCount = 0; HWND* pHwnd = NULL; @@ -569,10 +569,9 @@ sort of persistent buffer and only grow it ( requiring a 2nd call ) when the buffer wasn't already big enough? */ /* first get how many window entries there are */ - SetLastError(0); dwCount = NtUserBuildHwndList ( hDesktop, hWndparent, bChildren, dwThreadId, lParam, NULL, 0 ); - if ( !dwCount || GetLastError() ) + if ( !dwCount ) return FALSE; /* allocate buffer to receive HWND handles */ @@ -587,10 +586,10 @@ /* now call kernel again to fill the buffer this time */ dwCount = NtUserBuildHwndList ( hDesktop, hWndparent, bChildren, dwThreadId, lParam, pHwnd, dwCount ); - if ( !dwCount || GetLastError() ) + if ( !dwCount ) { if ( pHwnd ) - HeapFree ( hHeap, 0, pHwnd ); + HeapFree ( hHeap, 0, pHwnd ); return FALSE; }

16 years, 4 months

[cfinck] 33482: Sync CharLowerA/W and CharUpperA/W with Wine (after replacing Wine's SEH with PSEH). This way, we pass all user32 wsprintf Wine tests. Verified under Windows XP SP2.

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon May 12 13:35:21 2008 New Revision: 33482 URL: http://svn.reactos.org/svn/reactos?rev=33482&view=rev Log: Sync CharLowerA/W and CharUpperA/W with Wine (after replacing Wine's SEH with PSEH). This way, we pass all user32 wsprintf Wine tests. Verified under Windows XP SP2. Modified: trunk/reactos/dll/win32/user32/windows/text.c Modified: trunk/reactos/dll/win32/user32/windows/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/t… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/text.c [iso-8859-1] Mon May 12 13:35:21 2008 @@ -52,28 +52,27 @@ */ LPSTR WINAPI -CharLowerA(LPSTR x) -{ - if (!HIWORD(x)) return (LPSTR)tolower((char)(int)x); - CharLowerBuffA(x, strlen(x)); -/* - __TRY - { - LPSTR s = x; - while (*s) - { - *s=tolower(*s); - s++; - } - } - __EXCEPT(page_fault) +CharLowerA(LPSTR str) +{ + if (!HIWORD(str)) + { + char ch = LOWORD(str); + CharLowerBuffA( &ch, 1 ); + return (LPSTR)(UINT_PTR)(BYTE)ch; + } + + _SEH_TRY + { + CharLowerBuffA( str, strlen(str) ); + } + _SEH_HANDLE { SetLastError( ERROR_INVALID_PARAMETER ); return NULL; } - __ENDTRY - */ - return x; + _SEH_END; + + return str; } /* @@ -119,11 +118,8 @@ WINAPI CharLowerW(LPWSTR x) { - if (HIWORD(x)) { - return _wcslwr(x); - } else { - return (LPWSTR)(INT)towlower((WORD)(((DWORD)(x)) & 0xFFFF)); - } + if (HIWORD(x)) return strlwrW(x); + else return (LPWSTR)((UINT_PTR)tolowerW(LOWORD(x))); } /* @@ -256,11 +252,27 @@ /* * @implemented */ -LPSTR WINAPI CharUpperA(LPSTR x) -{ - if (!HIWORD(x)) return (LPSTR)toupper((char)(int)x); - CharUpperBuffA(x, strlen(x)); - return x; +LPSTR WINAPI CharUpperA(LPSTR str) +{ + if (!HIWORD(str)) + { + char ch = LOWORD(str); + CharUpperBuffA( &ch, 1 ); + return (LPSTR)(UINT_PTR)(BYTE)ch; + } + + _SEH_TRY + { + CharUpperBuffA( str, strlen(str) ); + } + _SEH_HANDLE + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + _SEH_END; + + return str; } /* @@ -306,8 +318,8 @@ WINAPI CharUpperW(LPWSTR x) { - if (HIWORD(x)) return _wcsupr(x); - else return (LPWSTR)(UINT)towlower((WORD)(((DWORD)(x)) & 0xFFFF)); + if (HIWORD(x)) return struprW(x); + else return (LPWSTR)((UINT_PTR)toupperW(LOWORD(x))); } /*

16 years, 4 months

[jimtabor] 33481: Misc patch, for later Icm support, update CreateCompatibleDC.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon May 12 13:16:48 2008 New Revision: 33481 URL: http://svn.reactos.org/svn/reactos?rev=33481&view=rev Log: Misc patch, for later Icm support, update CreateCompatibleDC. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Mon May 12 13:16:48 2008 @@ -86,8 +86,20 @@ STDCALL CreateCompatibleDC ( HDC hdc) { - /* FIXME need sharememory if it metadc */ - return NtGdiCreateCompatibleDC(hdc); + HDC rhDC; +// PDC_ATTR Dc_Attr; + + rhDC = NtGdiCreateCompatibleDC(hdc); +#if 0 + if ( hdc && rhDC) + { + if (GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) + { + if ( Dc_Attr->pvLIcm ) IcmCompatibleDC(rhDC, hdc, Dc_Attr); + } + } +#endif + return rhDC; } /*

16 years, 4 months

[pschweitzer] 33480: This branch is not needed any more. It served us well.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon May 12 12:42:46 2008 New Revision: 33480 URL: http://svn.reactos.org/svn/reactos?rev=33480&view=rev Log: This branch is not needed any more. It served us well. Removed: branches/ext2/

16 years, 4 months

← Newer
1
...
28
29
30
31
32
33
34
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008