Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[jmorlan] 34559: - CsrReleaseObject: Fix locking to prevent possibility of closing the same handle twice. - GuiConsolePaint: Clip the paint area to the screen buffer, to stop heap corruption if the window gets oversized. - ConioDeleteConsole: Do decrement the active screen buffer's refcount, but only after calling ConioCleanupConsole to destroy the window. - Remove Win32CsrInsertObject. This function did two unrelated things (initialize lock and create handle), but in the only place it was used

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Wed Jul 16 18:16:40 2008 New Revision: 34559 URL: http://svn.reactos.org/svn/reactos?rev=34559&view=rev Log: - CsrReleaseObject: Fix locking to prevent possibility of closing the same handle twice. - GuiConsolePaint: Clip the paint area to the screen buffer, to stop heap corruption if the window gets oversized. - ConioDeleteConsole: Do decrement the active screen buffer's refcount, but only after calling ConioCleanupConsole to destroy the window. - Remove Win32CsrInsertObject. This function did two unrelated things (initialize lock and create handle), but in the only place it was used (CsrCreateScreenBuffer) the lock had already been initialized in CsrInitConsoleScreenBuffer, so this use was erroneous. - Rename Win32CsrInsertObject2 (creates handle only) to Win32CsrInsertObject. Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] Wed Jul 16 18:16:40 2008 @@ -115,23 +115,23 @@ HANDLE Handle) { ULONG h = (((ULONG)Handle) >> 2) - 1; - NTSTATUS Status; + Object_t *Object; if (ProcessData == NULL) { return STATUS_INVALID_PARAMETER; } - if (!CsrIsConsoleHandle(Handle) || h >= ProcessData->HandleTableSize || ProcessData->HandleTable[h] == NULL) - { + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + if (!CsrIsConsoleHandle(Handle) || h >= ProcessData->HandleTableSize + || (Object = ProcessData->HandleTable[h]) == NULL) + { + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_INVALID_HANDLE; } - - Status = CsrReleaseObjectByPointer(ProcessData->HandleTable[h]); - - RtlEnterCriticalSection(&ProcessData->HandleTableLock); - ProcessData->HandleTable[h] = 0; + ProcessData->HandleTable[h] = NULL; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return Status; + + return CsrReleaseObjectByPointer(Object); } NTSTATUS STDCALL CsrInsertObject( PCSRSS_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object ) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Wed Jul 16 18:16:40 2008 @@ -12,9 +12,6 @@ #define NDEBUG #include <debug.h> - -extern NTSTATUS FASTCALL -Win32CsrInsertObject2(PCSRSS_PROCESS_DATA, PHANDLE, Object_t *); /* GLOBALS *******************************************************************/ @@ -315,9 +312,9 @@ if (NewConsole || !ProcessData->bInheritHandles) { /* Insert the Objects */ - Status = Win32CsrInsertObject2(ProcessData, - &Request->Data.AllocConsoleRequest.InputHandle, - &Console->Header); + Status = Win32CsrInsertObject(ProcessData, + &Request->Data.AllocConsoleRequest.InputHandle, + &Console->Header); if (! NT_SUCCESS(Status)) { DPRINT1("Failed to insert object\n"); @@ -326,9 +323,9 @@ return Request->Status = Status; } - Status = Win32CsrInsertObject2(ProcessData, - &Request->Data.AllocConsoleRequest.OutputHandle, - &Console->ActiveBuffer->Header); + Status = Win32CsrInsertObject(ProcessData, + &Request->Data.AllocConsoleRequest.OutputHandle, + &Console->ActiveBuffer->Header); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to insert object\n"); @@ -984,16 +981,14 @@ HeapFree(Win32CsrApiHeap, 0, Event); } -#if 0 // FIXME + ConioCleanupConsole(Console); if (0 == InterlockedDecrement(&Console->ActiveBuffer->Header.ReferenceCount)) { ConioDeleteScreenBuffer((Object_t *) Console->ActiveBuffer); } -#endif Console->ActiveBuffer = NULL; Console->hActiveBuffer = INVALID_HANDLE_VALUE; - ConioCleanupConsole(Console); CloseHandle(Console->ActiveEvent); DeleteCriticalSection(&Console->Header.Lock); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Wed Jul 16 18:16:40 2008 @@ -95,16 +95,6 @@ NTSTATUS FASTCALL Win32CsrInsertObject(PCSRSS_PROCESS_DATA ProcessData, - PHANDLE Handle, - Object_t *Object) -{ - InitializeCriticalSection(&(Object->Lock)); - - return (CsrExports.CsrInsertObjectProc)(ProcessData, Handle, Object); -} - -NTSTATUS FASTCALL -Win32CsrInsertObject2(PCSRSS_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object) { Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Wed Jul 16 18:16:40 2008 @@ -886,6 +886,9 @@ SetBkColor(hDC, GuiConsoleRGBFromAttribute(GuiData, LastAttribute >> 4)); EnterCriticalSection(&Buff->Header.Lock); + + if (BottomLine >= Buff->MaxY) BottomLine = Buff->MaxY - 1; + if (RightChar >= Buff->MaxX) RightChar = Buff->MaxX - 1; OldFont = SelectObject(hDC, GuiData->Font);

16 years, 2 months

[cfinck] 34558: Commit my test suite I used for verifying the behaviours of wctomb, wcstombs and WideCharToMultiByte and writing the reimplementations for ReactOS on request of Stefan

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jul 16 17:08:58 2008 New Revision: 34558 URL: http://svn.reactos.org/svn/reactos?rev=34558&view=rev Log: Commit my test suite I used for verifying the behaviours of wctomb, wcstombs and WideCharToMultiByte and writing the reimplementations for ReactOS on request of Stefan Added: trunk/rostests/tests/wcstombs-tests/ trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c (with props) trunk/rostests/tests/wcstombs-tests/wcstombs-tests.rbuild (with props) Modified: trunk/rostests/tests/directory.rbuild Modified: trunk/rostests/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/directory.rbuild?re… ============================================================================== --- trunk/rostests/tests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/directory.rbuild [iso-8859-1] Wed Jul 16 17:08:58 2008 @@ -267,6 +267,9 @@ <directory name="wclickat"> <xi:include href="wclickat/wclickat.rbuild" /> </directory> + <directory name="wcstombs-tests"> + <xi:include href="wcstombs-tests/wcstombs-tests.rbuild" /> + </directory> <directory name="winhello"> <xi:include href="winhello/winhello.rbuild" /> </directory> Added: trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/wcstombs-tests/wcst… ============================================================================== --- trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c (added) +++ trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c [iso-8859-1] Wed Jul 16 17:08:58 2008 @@ -1,0 +1,336 @@ +/* + * PROJECT: ReactOS wcstombs Test Suite + * LICENSE: GPL v2 or any later version + * FILE: tests/wcstombs-tests/wcstombs-tests.c + * PURPOSE: Application for testing the CRT API's (wcstombs and wctomb) and the Win32 API WideCharToMultiByte for the Unicode to MultiByte string conversion + * COPYRIGHT: Copyright 2008 Colin Finck <colin(a)reactos.org> + */ + +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> +#include <locale.h> +#include <errno.h> + +/* Macros for simplification */ +#define SETLOCALE(locale) \ + loc = setlocale(LC_ALL, locale); \ + if(!loc) \ + { \ + puts("setlocale failed for " locale ", this locale is probably not installed on your system"); \ + return; \ + } + +#define OK(condition, fail_message, ...) \ + if(!(condition)) \ + printf("%d: " fail_message "\n", __LINE__, ##__VA_ARGS__); + +/* Global variables for easier handling */ +char mbc; +char mbs[5]; +int ret; +wchar_t wc1 = 228; /* Western Windows-1252 character */ +wchar_t wc2 = 1088; /* Russian Windows-1251 character not displayable for Windows-1252 */ +wchar_t wcs[5] = {'T', 'h', 1088, 'i', 0}; /* String with ASCII characters and a Russian character */ +wchar_t dbwcs[3] = {28953, 25152, 0}; /* String with Chinese (codepage 950) characters */ + + +void CRT_Tests() +{ + char* loc; + + puts("CRT-Tests"); + puts("---------"); + + /* Current locale is "C", wcstombs should return the length of the input buffer without the terminating null character */ + ret = wcstombs(NULL, dbwcs, 0); + OK(ret == 2, "ret is %d", ret); + + ret = wcstombs(mbs, dbwcs, ret); + OK(ret == -1, "ret is %d", ret); + OK(mbs[0] == 0, "mbs[0] is %d", mbs[0]); + OK(errno == EILSEQ, "errno is %d", errno); + + ret = wcstombs(NULL, wcs, 0); + OK(ret == 4, "ret is %d", ret); + + ret = wcstombs(mbs, wcs, ret); + OK(ret == -1, "ret is %d", ret); + OK(!strcmp(mbs, "Th"), "mbs is %s", mbs); + OK(errno == EILSEQ, "errno is %d", errno); + + ret = wctomb(&mbc, wcs[0]); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 84, "mbc is %d", mbc); + + mbc = 84; + ret = wcstombs(&mbc, &dbwcs[0], 1); + OK(ret == -1, "ret is %d", ret); + OK(mbc == 84, "mbc is %d", mbc); + + ret = wcstombs(mbs, wcs, 0); + OK(ret == 0, "ret is %d", ret); + + /* The length for the null character (in any locale) is 0, but if you pass a variable, it will be set to 0 and wctomb returns 1 */ + ret = wctomb(NULL, 0); + OK(ret == 0, "ret is %d", ret); + + ret = wctomb(&mbc, 0); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 0, "mbc is %d", mbc); + + /* msvcr80.dll changes mbc in the following call back to 0, msvcrt.dll from WinXP SP2 leaves it untouched */ + mbc = 84; + ret = wctomb(&mbc, dbwcs[0]); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + OK(mbc == 84, "mbc is %d", mbc); + + /* With a real locale, -1 also becomes a possible return value in case of an invalid character */ + SETLOCALE("German"); + ret = wcstombs(NULL, dbwcs, 0); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + + ret = wcstombs(NULL, wcs, 2); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + + /* Test if explicitly setting the locale back to "C" also leads to the same results as above */ + SETLOCALE("C"); + + ret = wcstombs(NULL, dbwcs, 0); + OK(ret == 2, "ret is %d", ret); + + ret = wcstombs(NULL, wcs, 0); + OK(ret == 4, "ret is %d", ret); + + /* Test wctomb() as well */ + SETLOCALE("English"); + + ret = wctomb(&mbc, wc1); + OK(ret == 1, "ret is %d", ret); + OK(mbc == -28, "mbc is %d", mbc); + + ret = wctomb(&mbc, wc2); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + OK(mbc == 63, "mbc is %d", mbc); + + SETLOCALE("Russian"); + + ret = wcstombs(mbs, wcs, sizeof(mbs)); + OK(ret == 4, "ret is %d", ret); + OK(!strcmp(mbs, "Thði"), "mbs is %s", mbs); + + ret = wctomb(&mbc, wc2); + OK(ret == 1, "ret is %d", ret); + OK(mbc == -16, "mbc is %d", mbc); + + ret = wctomb(&mbc, wc1); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 97, "mbc is %d", mbc); + + SETLOCALE("English"); + + ret = wcstombs(&mbc, wcs, 1); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 84, "mbc is %d", mbc); + + ZeroMemory(mbs, sizeof(mbs)); + ret = wcstombs(mbs, wcs, sizeof(mbs)); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + OK(!strcmp(mbs, "Th?i"), "mbs is %s", mbs); + mbs[0] = 0; + + /* wcstombs mustn't add any null character automatically. + So in this case, we should get the same string again, even if we only copied the first three bytes. */ + ret = wcstombs(mbs, wcs, 3); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + OK(!strcmp(mbs, "Th?i"), "mbs is %s", mbs); + ZeroMemory(mbs, 5); + + /* Now this shouldn't be the case like above as we zeroed the complete string buffer. */ + ret = wcstombs(mbs, wcs, 3); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + OK(!strcmp(mbs, "Th?"), "mbs is %s", mbs); + + /* Double-byte tests */ + SETLOCALE("Chinese"); + ret = wcstombs(mbs, dbwcs, sizeof(mbs)); + OK(ret == 4, "ret is %d", ret); + OK(!strcmp(mbs, "µH©Ò"), "mbs is %s", mbs); + ZeroMemory(mbs, 5); + + /* Length-only tests */ + SETLOCALE("English"); + ret = wcstombs(NULL, wcs, 0); + OK(ret == -1, "ret is %d", ret); + OK(errno == EILSEQ, "errno is %d", errno); + + SETLOCALE("Chinese"); + ret = wcstombs(NULL, dbwcs, 0); + OK(ret == 4, "ret is %d", ret); + + /* This call causes an ERROR_INSUFFICIENT_BUFFER in the called WideCharToMultiByte function. + For some reason, wcstombs under Windows doesn't reset the last error to the previous value here, so we can check for ERROR_INSUFFICIENT_BUFFER with GetLastError(). + This could also be seen as an indication that Windows uses WideCharToMultiByte internally for wcstombs. */ + ret = wcstombs(mbs, dbwcs, 1); + OK(ret == 0, "ret is %d", ret); + OK(mbs[0] == 0, "mbs[0] is %d", mbs[0]); + + /* ERROR_INSUFFICIENT_BUFFER is also the result of this call with SBCS characters. WTF?! + Anyway this is a Win32 error not related to the CRT, so we leave out this criteria. */ + ret = wcstombs(mbs, wcs, 1); + OK(ret == 1, "ret is %d", ret); + OK(mbs[0] == 84, "mbs[0] is %d", mbs[0]); + + putchar('\n'); +} + +void Win32_Tests(LPBOOL bUsedDefaultChar) +{ + /*int i;*/ + + SetLastError(0xdeadbeef); + + puts("Win32-Tests"); + puts("-----------"); + + ret = WideCharToMultiByte(1252, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + OK(mbc == -28, "mbc is %d", mbc); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(1252, 0, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 63, "mbc is %d", mbc); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(1251, 0, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + OK(mbc == -16, "mbc is %d", mbc); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(1251, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + OK(mbc == 97, "mbc is %d", mbc); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + /* This call triggers the last Win32 error */ + ret = WideCharToMultiByte(1252, 0, wcs, -1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 0, "ret is %d", ret); + OK(mbc == 84, "mbc is %d", mbc); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() is %lu", GetLastError()); + SetLastError(0xdeadbeef); + + ret = WideCharToMultiByte(1252, 0, wcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 5, "ret is %d", ret); + OK(!strcmp(mbs, "Th?i"), "mbs is %s", mbs); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + mbs[0] = 0; + + /* WideCharToMultiByte mustn't add any null character automatically. + So in this case, we should get the same string again, even if we only copied the first three bytes. */ + ret = WideCharToMultiByte(1252, 0, wcs, 3, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 3, "ret is %d", ret); + OK(!strcmp(mbs, "Th?i"), "mbs is %s", mbs); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + ZeroMemory(mbs, 5); + + /* Now this shouldn't be the case like above as we zeroed the complete string buffer. */ + ret = WideCharToMultiByte(1252, 0, wcs, 3, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 3, "ret is %d", ret); + OK(!strcmp(mbs, "Th?"), "mbs is %s", mbs); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + /* Double-byte tests */ + ret = WideCharToMultiByte(950, 0, dbwcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 5, "ret is %d", ret); + OK(!strcmp(mbs, "µH©Ò"), "mbs is %s", mbs); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(950, 0, dbwcs, 1, &mbc, 1, NULL, bUsedDefaultChar); + OK(ret == 0, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar == FALSE"); + OK(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() is %lu", GetLastError()); + SetLastError(0xdeadbeef); + ZeroMemory(mbs, 5); + + ret = WideCharToMultiByte(950, 0, dbwcs, 1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 2, "ret is %d", ret); + OK(!strcmp(mbs, "µH"), "mbs is %s", mbs); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + /* Length-only tests */ + ret = WideCharToMultiByte(1252, 0, &wc2, 1, NULL, 0, NULL, bUsedDefaultChar); + OK(ret == 1, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(1252, 0, wcs, -1, NULL, 0, NULL, bUsedDefaultChar); + OK(ret == 5, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(950, 0, dbwcs, 1, NULL, 0, NULL, bUsedDefaultChar); + OK(ret == 2, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + ret = WideCharToMultiByte(950, 0, dbwcs, -1, NULL, 0, NULL, bUsedDefaultChar); + OK(ret == 5, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == 0xdeadbeef, "GetLastError() is %lu", GetLastError()); + + /* Abnormal uses of WideCharToMultiByte */ + ret = WideCharToMultiByte(1252, 0, NULL, 5, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 0, "ret is %d", ret); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + OK(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() is %lu", GetLastError()); + SetLastError(0xdeadbeef); + + ret = WideCharToMultiByte(0, 0, dbwcs, 5, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + OK(ret == 5, "ret is %d", ret); + OK(!strcmp(mbs, "??"), "mbs is %s", mbs); + if(bUsedDefaultChar) OK(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d", *bUsedDefaultChar); + + ret = WideCharToMultiByte(1252, 0, wcs, -1, (LPSTR)wcs, 5, NULL, bUsedDefaultChar); + OK(ret == 0, "ret is %d", ret); + OK(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() is %lu", GetLastError()); + SetLastError(0xdeadbeef); + + ret = WideCharToMultiByte(1252, 0, wcs, -1, mbs, -1, NULL, bUsedDefaultChar); + OK(ret == 0, "ret is %d", ret); + OK(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() is %lu", GetLastError()); + SetLastError(0xdeadbeef); + + putchar('\n'); +} + +int main() +{ + BOOL UsedDefaultChar; + + CRT_Tests(); + + /* There are two code pathes in WideCharToMultiByte, one when Flags || DefaultChar || UsedDefaultChar is set and one when it's not. + Test both here. */ + Win32_Tests(NULL); + Win32_Tests(&UsedDefaultChar); + + return 0; +} Propchange: trunk/rostests/tests/wcstombs-tests/wcstombs-tests.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/tests/wcstombs-tests/wcstombs-tests.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/wcstombs-tests/wcst… ============================================================================== --- trunk/rostests/tests/wcstombs-tests/wcstombs-tests.rbuild (added) +++ trunk/rostests/tests/wcstombs-tests/wcstombs-tests.rbuild [iso-8859-1] Wed Jul 16 17:08:58 2008 @@ -1,0 +1,4 @@ +<module name="wcstombs-tests" type="win32cui" installbase="bin" installname="wcstombs-tests.exe"> + <library>kernel32</library> + <file>wcstombs-tests.c</file> +</module> Propchange: trunk/rostests/tests/wcstombs-tests/wcstombs-tests.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 2 months

[cfinck] 34557: - Remove 2 wrong versions of wctomb and 2 wrong versions of wcstombs - Implement new versions of wctomb and wcstombs, which consider the language set by setlocale() and work according to all behaviours I could find when testing under WinXP SP2. This was tested with an own test suite (which I can commit as well if anyone is interested) - Do a real conversion to MultiByte characters using wctomb in fputwc and vfwprintf. (verified under WinXP SP2) - Set 'MSVCRT___lc_codepage' and 'M

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jul 16 16:40:09 2008 New Revision: 34557 URL: http://svn.reactos.org/svn/reactos?rev=34557&view=rev Log: - Remove 2 wrong versions of wctomb and 2 wrong versions of wcstombs - Implement new versions of wctomb and wcstombs, which consider the language set by setlocale() and work according to all behaviours I could find when testing under WinXP SP2. This was tested with an own test suite (which I can commit as well if anyone is interested) - Do a real conversion to MultiByte characters using wctomb in fputwc and vfwprintf. (verified under WinXP SP2) - Set 'MSVCRT___lc_codepage' and 'MSVCRT___lc_collate_cp' to 1252 by default ("C" locale) and not the current active codepage (which might not work with i.e. Eastern codepages) - Add a new check for 'MultiByteCount < 0' to WideCharToMultiByte (also verified under WinXP SP2) - Change MB_LEN_MAX back to 2, the value 5 only applies to newer CRT's (msvcrt only handles single-byte and double-byte characters) - Don't compile the Wine-imported 'wcscpy_s', it isn't available in msvcrt Removed: trunk/reactos/lib/sdk/crt/string/wcstom.c trunk/reactos/lib/sdk/crt/string/wcstomb.c trunk/reactos/lib/sdk/crt/string/wcstombs.c trunk/reactos/lib/sdk/crt/string/wctomb.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c trunk/reactos/include/crt/limits.h trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/include/internal/mbstring.h trunk/reactos/lib/sdk/crt/locale/locale.c trunk/reactos/lib/sdk/crt/stdio/file.c trunk/reactos/lib/sdk/crt/string/wcs.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] Wed Jul 16 16:40:09 2008 @@ -1295,7 +1295,8 @@ /* Check the parameters. */ if (WideCharString == NULL || (MultiByteString == NULL && MultiByteCount > 0) || - (PVOID)WideCharString == (PVOID)MultiByteString) + (PVOID)WideCharString == (PVOID)MultiByteString || + MultiByteCount < 0) { SetLastError(ERROR_INVALID_PARAMETER); return 0; Modified: trunk/reactos/include/crt/limits.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/limits.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/limits.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/limits.h [iso-8859-1] Wed Jul 16 16:40:09 2008 @@ -34,7 +34,7 @@ * Characteristics of the char data type. */ #define CHAR_BIT 8 -#define MB_LEN_MAX 5 +#define MB_LEN_MAX 2 #define SCHAR_MIN (-128) #define SCHAR_MAX 127 Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Wed Jul 16 16:40:09 2008 @@ -355,9 +355,7 @@ <file>strxfrm.c</file> <file>wcs.c</file> <file>wcstol.c</file> - <file>wcstombs.c</file> <file>wcstoul.c</file> - <file>wctomb.c</file> <file>wsplitp.c</file> <file>wtoi.c</file> <file>wtoi64.c</file> Modified: trunk/reactos/lib/sdk/crt/include/internal/mbstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/mbstring.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/mbstring.h [iso-8859-1] Wed Jul 16 16:40:09 2008 @@ -37,7 +37,10 @@ #define LT (_MLEAD | _MTRAIL) #define PT (_MPUNCT | _MTRAIL) +#define MAX_LOCALE_LENGTH 256 extern unsigned char _mbctype[257]; +extern int MSVCRT___lc_codepage; +extern char MSVCRT_current_lc_all[MAX_LOCALE_LENGTH]; #if defined (_MSC_VER) Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.… ============================================================================== --- trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Wed Jul 16 16:40:09 2008 @@ -26,7 +26,6 @@ * string to produce lc_all. */ #define MAX_ELEM_LEN 64 /* Max length of country/language/CP string */ -#define MAX_LOCALE_LENGTH 256 unsigned char MSVCRT_mbctype[257]; static int g_mbcp_is_multibyte = 0; @@ -388,8 +387,8 @@ { MSVCRT_current_lc_all[0] = 'C'; MSVCRT_current_lc_all[1] = '\0'; - MSVCRT___lc_codepage = GetACP(); - MSVCRT___lc_collate_cp = GetACP(); + MSVCRT___lc_codepage = 1252; + MSVCRT___lc_collate_cp = 1252; switch (category) { case MSVCRT_LC_ALL: Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Wed Jul 16 16:40:09 2008 @@ -2475,23 +2475,28 @@ */ wint_t CDECL fputwc(wint_t wc, FILE* file) { - if (file->_flag & _IOBINARY) - { - wchar_t mwc = wc; - - if (fwrite( &mwc, sizeof(mwc), 1, file) != 1) - return WEOF; - } - else - { - /* Convert the character to ANSI */ - char c = (unsigned char)wc; - - if (fwrite( &c, sizeof(c), 1, file) != 1) - return WEOF; - } - - return wc; + if (file->_flag & _IOBINARY) + { + if (fwrite(&wc, sizeof(wc), 1, file) != 1) + return WEOF; + } + else + { + /* Convert to multibyte in text mode */ + char mbc[MB_LEN_MAX]; + int mb_return; + + mb_return = wctomb(mbc, wc); + + if(mb_return == -1) + return WEOF; + + /* Output all characters */ + if (fwrite(mbc, mb_return, 1, file) != 1) + return WEOF; + } + + return wc; } /********************************************************************* @@ -3121,7 +3126,6 @@ int CDECL vfwprintf(FILE* file, const wchar_t *format, va_list valist) { wchar_t buf[2048], *mem = buf; - char mbbuf[2048], *mbmem = mbbuf; int written, resize = sizeof(buf) / sizeof(wchar_t), retval; /* See vfprintf comments */ while ((written = _vsnwprintf(mem, resize, format, valist)) == -1 || @@ -3137,17 +3141,22 @@ /* Check if outputting to a text-file */ if (fdesc[file->_file].wxflag & WX_TEXT) { - /* Convert to multibyte then */ - written = wcstombs(NULL, mem, 0); - - if (written >= sizeof(mbbuf) && (written != (int)-1)) - mbmem = malloc(written + 1); - - wcstombs(mbmem, mem, written); - retval = fwrite(mbmem, 1, written, file); - - if (mbmem != mbbuf) - free(mbmem); + /* Convert each character and stop at the first invalid character. Behavior verified by tests under WinXP SP2 */ + char chMultiByte[MB_LEN_MAX]; + int nReturn; + + retval = 0; + + while(*mem) + { + nReturn = wctomb(chMultiByte, *mem); + + if(nReturn == -1) + break; + + retval += fwrite(chMultiByte, 1, nReturn, file); + mem++; + } } else { Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Wed Jul 16 16:40:09 2008 @@ -40,12 +40,6 @@ //WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -// HACK for LIBCNT -#ifndef debugstr_w -#define debugstr_w -#endif - - #undef sprintf #undef wsprintf #undef snprintf @@ -77,6 +71,7 @@ return strcmpiW( str1, str2 ); } #endif + /********************************************************************* * _wcsnset (MSVCRT.@) */ @@ -102,6 +97,7 @@ } return ret; } + #ifndef _LIBCNT_ /********************************************************************* * _wcsset (MSVCRT.@) @@ -854,6 +850,7 @@ return _vsnwprintf( str, INT_MAX, format, args ); } #endif + /********************************************************************* * wcscoll (MSVCRT.@) */ @@ -876,6 +873,7 @@ } return NULL; } + #ifndef _LIBCNT_ /********************************************************************* * wcstok (MSVCRT.@) @@ -896,17 +894,131 @@ data->wcstok_next = str; return ret; } + +/********************************************************************* + * wctomb (MSVCRT.@) + */ +INT CDECL wctomb(char *mbchar, wchar_t wchar) +{ + BOOL bUsedDefaultChar; + char chMultiByte[MB_LEN_MAX]; + int nBytes; + + /* At least one parameter needs to be given, the length of a null character cannot be queried (verified by tests under WinXP SP2) */ + if(!mbchar && !wchar) + return 0; + + /* Use WideCharToMultiByte for doing the conversion using the codepage currently set with setlocale() */ + nBytes = WideCharToMultiByte(MSVCRT___lc_codepage, 0, &wchar, 1, chMultiByte, MB_LEN_MAX, NULL, &bUsedDefaultChar); + + /* Only copy the character if an 'mbchar' pointer was given. + + The "C" locale is emulated with codepage 1252 here. This codepage has a default character "?", but the "C" locale doesn't have one. + Therefore don't copy the character in this case. */ + if(mbchar && !(MSVCRT_current_lc_all[0] == 'C' && !MSVCRT_current_lc_all[1] && bUsedDefaultChar)) + memcpy(mbchar, chMultiByte, nBytes); + + /* If the default character was used, set errno to EILSEQ and return -1. */ + if(bUsedDefaultChar) + { + __set_errno(EILSEQ); + return -1; + } + + /* Otherwise return the number of bytes this character occupies. */ + return nBytes; +} + +size_t CDECL wcstombs(char *mbstr, const wchar_t *wcstr, size_t count) +{ + BOOL bUsedDefaultChar; + char* p = mbstr; + int nResult; + + /* Does the caller query for output buffer size? */ + if(!mbstr) + { + int nLength; + + /* If we currently use the "C" locale, the length of the input string is returned (verified by tests under WinXP SP2) */ + if(MSVCRT_current_lc_all[0] == 'C' && !MSVCRT_current_lc_all[1]) + return wcslen(wcstr); + + /* Otherwise check the length each character needs and build a final return value out of this */ + count = wcslen(wcstr); + nLength = 0; + + while((int)(--count) >= 0 && *wcstr) + { + /* Get the length of this character */ + nResult = wctomb(NULL, *wcstr++); + + /* If this character is not convertible in the current locale, the end result will be -1 */ + if(nResult == -1) + return -1; + + nLength += nResult; + } + + /* Return the final length */ + return nLength; + } + + /* Convert the string then */ + bUsedDefaultChar = FALSE; + + for(;;) + { + char chMultiByte[MB_LEN_MAX]; + UINT uLength; + + /* Are we at the terminating null character? */ + if(!*wcstr) + { + /* Set the null character, but don't increment the pointer as the returned length never includes the terminating null character */ + *p = 0; + break; + } + + /* Convert this character into the temporary chMultiByte variable */ + ZeroMemory(chMultiByte, MB_LEN_MAX); + nResult = wctomb(chMultiByte, *wcstr++); + + /* Check if this was an invalid character */ + if(nResult == -1) + bUsedDefaultChar = TRUE; + + /* If we got no character, stop the conversion process here */ + if(!chMultiByte[0]) + break; + + /* Determine whether this is a double-byte or a single-byte character */ + if(chMultiByte[1]) + uLength = 2; + else + uLength = 1; + + /* Decrease 'count' by the character length and check if the buffer can still hold the full character */ + count -= uLength; + + if((int)count < 0) + break; + + /* It can, so copy it and move the pointer forward */ + memcpy(p, chMultiByte, uLength); + p += uLength; + } + + if(bUsedDefaultChar) + return -1; + + /* Return the length in bytes of the copied characters (without the terminating null character) */ + return p - mbstr; +} #endif + #ifndef __REACTOS__ /********************************************************************* - * wctomb (MSVCRT.@) - */ -INT CDECL wctomb( char *dst, wchar_t ch ) -{ - return WideCharToMultiByte( CP_ACP, 0, &ch, 1, dst, 6, NULL, NULL ); -} - -/********************************************************************* * iswalnum (MSVCRT.@) */ INT CDECL iswalnum( wchar_t wc ) @@ -993,8 +1105,7 @@ { return isxdigitW( wc ); } -#endif -#ifndef _LIBCNT_ + /********************************************************************* * wcscpy_s (MSVCRT.@) */ Removed: trunk/reactos/lib/sdk/crt/string/wcstom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstom.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcstom.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcstom.c (removed) @@ -1,39 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/msvcrt/mbstring/wcstom.c - * PURPOSE: - * PROGRAMER: - * UPDATE HISTORY: - * 05/30/08: Samuel Serapion adapted from PROJECT C Library - * - */ - -#include <precomp.h> -#include <mbctype.h> - -/* - * @implemented - */ -size_t wcstombs (char *string, const wchar_t *widechar, size_t count) -{ - int n, bytes; - int cnt = 0; - - for (n = 0; n < count; n++) { - - if ((bytes = wctomb (string, *widechar)) < 0) - return -1; - - if (*string == 0) - return cnt; - - widechar++; - string += bytes; - cnt += bytes; - } - - return cnt; -} - - Removed: trunk/reactos/lib/sdk/crt/string/wcstomb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstomb… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcstomb.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcstomb.c (removed) @@ -1,114 +1,0 @@ -/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <precomp.h> -#include <wchar.h> - -#ifndef EILSEQ -#define EILSEQ EINVAL -#endif - -static const wchar_t encoding_mask[] = -{ - (wchar_t)~0x7ff, (wchar_t)~0xffff, (wchar_t)~0x1fffff, (wchar_t)~0x3ffffff -}; - -static const unsigned char encoding_byte[] = -{ - 0xc0, 0xe0, 0xf0, 0xf8, 0xfc -}; - -/* The state is for this UTF8 encoding not used. */ -//static mbstate_t internal; - - -//extern mbstate_t __no_r_state; /* Defined in mbtowc.c. */ - -size_t -__wcrtomb (char *s, wchar_t wc); - -/* - * Convert WCHAR into its multibyte character representation, - * putting this in S and returning its length. - * - * Attention: this function should NEVER be intentionally used. - * The interface is completely stupid. The state is shared between - * all conversion functions. You should use instead the restartable - * version `wcrtomb'. - * - * @implemented - */ -int -wctomb (char *s, wchar_t wchar) -{ - /* If S is NULL the function has to return null or not null - depending on the encoding having a state depending encoding or - not. This is nonsense because any multibyte encoding has a - state. The ISO C amendment 1 corrects this while introducing the - restartable functions. We simply say here all encodings have a - state. */ - if (s == NULL) - return 1; - - return __wcrtomb (s, wchar); -} - - -size_t -__wcrtomb (char *s, wchar_t wc) -{ - char fake[1]; - size_t written = 0; - - - - if (s == NULL) - { - s = fake; - wc = L'\0'; - } - - if (wc < 0x80) - { - /* It's a one byte sequence. */ - if (s != NULL) - *s = (char) wc; - return 1; - } - - for (written = 2; written < 6; ++written) - if ((wc & encoding_mask[written - 2]) == 0) - break; - - if (s != NULL) - { - size_t cnt = written; - s[0] = encoding_byte[cnt - 2]; - - --cnt; - do - { - s[cnt] = 0x80 | (wc & 0x3f); - wc >>= 6; - } - while (--cnt > 0); - s[0] |= wc; - } - - return written; -} Removed: trunk/reactos/lib/sdk/crt/string/wcstombs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstomb… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcstombs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcstombs.c (removed) @@ -1,157 +1,0 @@ -/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <precomp.h> -#include <wchar.h> - -#ifndef EILSEQ -#define EILSEQ EINVAL -#endif - - -static const wchar_t encoding_mask[] = -{ - (~0x7ff&WCHAR_MAX), (~0xffff&WCHAR_MAX), (~0x1fffff&WCHAR_MAX), (~0x3ffffff&WCHAR_MAX) -}; - -static const unsigned char encoding_byte[] = -{ - 0xc0, 0xe0, 0xf0, 0xf8, 0xfc -}; - -/* We don't need the state really because we don't have shift states - to maintain between calls to this function. */ - -static mbstate_t mbstate_internal; - - -mbstate_t __no_r_state; /* Now defined in wcstombs.c. */ -//extern mbstate_t __no_r_state; /* Defined in mbtowc.c. */ - -size_t -__wcsrtombs (char *dst, const wchar_t **src, size_t len, mbstate_t *ps); - -/* - * Convert the `wchar_t' string in PWCS to a multibyte character string - * in S, writing no more than N characters. Return the number of bytes - * written, or (size_t) -1 if an invalid `wchar_t' was found. - * - * Attention: this function should NEVER be intentionally used. - * The interface is completely stupid. The state is shared between - * all conversion functions. You should use instead the restartable - * version `wcsrtombs'. - * - * @implemented - */ -size_t -wcstombs (char *s, const wchar_t *pwcs, size_t n) -{ - mbstate_t save_shift = __no_r_state; - size_t written; - - written = __wcsrtombs (s, &pwcs, n, &__no_r_state); - - /* Restore the old shift state. */ - __no_r_state = save_shift; - - /* Return how many we wrote (or maybe an error). */ - return written; -} - -size_t -__wcsrtombs (char *dst, const wchar_t **src, size_t len, mbstate_t *ps) -{ - size_t written = 0; - const wchar_t *run = *src; - - if (ps == NULL) - ps = &mbstate_internal; - - if (dst == NULL) - /* The LEN parameter has to be ignored if we don't actually write - anything. */ - len = ~0; - - while (written < len) - { - wchar_t wc = *run++; - -#if 0 - if (wc < 0 || wc > WCHAR_MAX) - { - /* This is no correct ISO 10646 character. */ - __set_errno (EILSEQ); - return (size_t) -1; - } -#endif - - if (wc == L'\0') - { - /* Found the end. */ - if (dst != NULL) - *dst = '\0'; - *src = NULL; - return written; - } - else if (wc < 0x80) - { - /* It's an one byte sequence. */ - if (dst != NULL) - *dst++ = (char) wc; - ++written; - } - else - { - size_t step; - - for (step = 2; step < 6; ++step) - if ((wc & encoding_mask[step - 2]) == 0) - break; - - if (written + step >= len) - /* Too long. */ - break; - - if (dst != NULL) - { - size_t cnt = step; - - dst[0] = encoding_byte[cnt - 2]; - - --cnt; - do - { - dst[cnt] = 0x80 | (wc & 0x3f); - wc >>= 6; - } - while (--cnt > 0); - dst[0] |= wc; - - dst += step; - } - - written += step; - } - } - - /* Store position of first unprocessed word. */ - *src = run; - - return written; -} -//weak_alias (__wcsrtombs, wcsrtombs) Removed: trunk/reactos/lib/sdk/crt/string/wctomb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wctomb.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wctomb.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wctomb.c (removed) @@ -1,47 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/sdk/crt/mbstring/wctomb.c - * PURPOSE: - * PROGRAMER: - * UPDATE HISTORY: - * 05/30/08: Samuel Serapion adapted from PROJECT C Library - * - */ - -#include <precomp.h> -#include <mbstring.h> - -/* - * @implemented - */ -int wctomb (char *string, wchar_t widechar) -{ - int c1, c2; - - if (string == 0) - return 0; - - if (widechar & 0xff00) { - - c1 = (widechar >> 8) & 0xff; - c2 = (widechar & 0xff); - - if (_ismbblead (c1) == 0 || _ismbbtrail (c2) == 0) - return -1; - - *string++ = (char) c1; - *string = (char) c2; - - return 2; - - } - else { - - *string = (char) widechar & 0xff; - - return 1; - - } -} -

16 years, 2 months

[mkupfer] 34556: add new Slovak keyboard layout to first stage setup list

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Wed Jul 16 16:21:21 2008 New Revision: 34556 URL: http://svn.reactos.org/svn/reactos?rev=34556&view=rev Log: add new Slovak keyboard layout to first stage setup list Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Wed Jul 16 16:21:21 2008 @@ -10,6 +10,7 @@ MUI_LAYOUTS skSKLayouts[] = { { L"041B", L"0000041B" }, + { L"041B", L"0001041B" }, { L"0409", L"00000409" }, { NULL, NULL } };

16 years, 2 months

[tkreuzer] 34555: FLOATOBJ is a structure only on x86 in kernelmode, for usermode drivers and other architectures it's a FLOAT. Update winddi.h accordingly.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 16 16:12:27 2008 New Revision: 34555 URL: http://svn.reactos.org/svn/reactos?rev=34555&view=rev Log: FLOATOBJ is a structure only on x86 in kernelmode, for usermode drivers and other architectures it's a FLOAT. Update winddi.h accordingly. Modified: trunk/reactos/include/ddk/winddi.h Modified: trunk/reactos/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddi.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddi.h [iso-8859-1] Wed Jul 16 16:12:27 2008 @@ -544,11 +544,15 @@ FWORD fwdKern; } FD_KERNINGPAIR; +#if defined(_X86_) && !defined(USERMODE_DRIVER) typedef struct _FLOATOBJ { ULONG ul1; ULONG ul2; } FLOATOBJ, *PFLOATOBJ; +#else +typedef FLOAT FLOATOBJ, *PFLOATOBJ; +#endif typedef struct _FLOATOBJ_XFORM { FLOATOBJ eM11; @@ -2287,6 +2291,7 @@ IN DWORD cbBuf, OUT LPDWORD pcWritten); +#if defined(_X86_) && !defined(USERMODE_DRIVER) WIN32KAPI VOID APIENTRY @@ -2444,6 +2449,34 @@ FLOATOBJ_SubLong( IN OUT PFLOATOBJ pf, IN LONG l); + +#else + +#define FLOATOBJ_SetFloat(pf, f) {*(pf) = (f);} +#define FLOATOBJ_SetLong(pf, l) {*(pf) = (FLOAT)(l);} +#define FLOATOBJ_GetFloat(pf) (*(PULONG)(pf)) +#define FLOATOBJ_GetLong(pf) ((LONG)*(pf)) +#define FLOATOBJ_Add(pf, pf1) {*(pf) += *(pf1);} +#define FLOATOBJ_AddFloat(pf, f) {*(pf) += (f);} +#define FLOATOBJ_AddLong(pf, l) {*(pf) += (l);} +#define FLOATOBJ_Sub(pf, pf1) {*(pf) -= *(pf1);} +#define FLOATOBJ_SubFloat(pf, f) {*(pf) -= (f);} +#define FLOATOBJ_SubLong(pf, l) {*(pf) -= (l);} +#define FLOATOBJ_Mul(pf, pf1) {*(pf) *= *(pf1);} +#define FLOATOBJ_MulFloat(pf, f) {*(pf) *= (f);} +#define FLOATOBJ_MulLong(pf, l) {*(pf) *= (l);} +#define FLOATOBJ_Div(pf, pf1) {*(pf) /= *(pf1);} +#define FLOATOBJ_DivFloat(pf, f) {*(pf) /= (f);} +#define FLOATOBJ_DivLong(pf, l) {*(pf) /= (l);} +#define FLOATOBJ_Neg(pf) {*(pf) = -(*(pf));} +#define FLOATOBJ_Equal(pf, pf1) (*(pf) == *(pf1)) +#define FLOATOBJ_GreaterThan(pf, pf1) (*(pf) > *(pf1)) +#define FLOATOBJ_LessThan(pf, pf1) (*(pf) < *(pf1)) +#define FLOATOBJ_EqualLong(pf, 1) (*(pf) == (FLOAT)(1)) +#define FLOATOBJ_GreaterThanLong(pf, 1) (*(pf) > (FLOAT)(1)) +#define FLOATOBJ_LessThanLong(pf, 1) (*(pf) < (FLOAT)(1)) + +#endif WIN32KAPI ULONG

16 years, 2 months

[tkreuzer] 34554: Patch by Stefan Ginsberg: - remove XFORM members from DC structure and use MATRIX instead. Use MatrixS2XForm and XForm2MatrixS for intermediate conversion. - this is a temporary solution (still using fpu) until I'm finished with FLOATOBJ rewrite + XFOROMOBJ api (soon)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 16 15:16:30 2008 New Revision: 34554 URL: http://svn.reactos.org/svn/reactos?rev=34554&view=rev Log: Patch by Stefan Ginsberg: - remove XFORM members from DC structure and use MATRIX instead. Use MatrixS2XForm and XForm2MatrixS for intermediate conversion. - this is a temporary solution (still using fpu) until I'm finished with FLOATOBJ rewrite + XFOROMOBJ api (soon) Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/gdifloat.h trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Wed Jul 16 15:16:30 2008 @@ -32,10 +32,7 @@ typedef struct _WIN_DC_INFO { HRGN hClipRgn; /* Clip region (may be 0) */ - HRGN hrgnMeta; /* Meta region (may be 0) */ - HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */ HRGN hVisRgn; /* Should me to DC. Visible region (must never be 0) */ - HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ HBITMAP hBitmap; @@ -80,18 +77,9 @@ BOOL ufiSet; FLONG fl; FLONG flBrush; - union{ MATRIX_S mxWorldToDevice; - XFORM xformWorld2Vport; /* World-to-viewport transformation */ - }; - union{ MATRIX_S mxDeviceToWorld; - XFORM xformVport2World; /* Inverse of the above transformation */ - }; - union{ MATRIX_S mxWorldToPage; - XFORM xformWorld2Wnd; /* World-to-window transformation */ - }; EFLOAT_S efM11PtoD; EFLOAT_S efM22PtoD; EFLOAT_S efDxPtoD; @@ -102,7 +90,7 @@ EFLOAT_S efPr22; PBITMAPOBJ pSurface; // SURFACE* SIZE sizl; -} DCLEVEL, PDCLEVEL; +} DCLEVEL, *PDCLEVEL; /* The DC object structure */ typedef struct _DC @@ -150,8 +138,6 @@ /* Reactos specific members */ WIN_DC_INFO w; - HRGN hprgnAPI; // should use prgnAPI - HRGN hprgnVis; // should use prgnVis CLIPOBJ *CombinedClip; XLATEOBJ *XlateBrush; XLATEOBJ *XlatePen; Modified: trunk/reactos/subsystems/win32/win32k/include/gdifloat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdifloat.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdifloat.h [iso-8859-1] Wed Jul 16 15:16:30 2008 @@ -23,22 +23,29 @@ return (int)floor(val + 0.5); } + +VOID FASTCALL XForm2MatrixS( MATRIX_S *, PXFORM); +VOID FASTCALL MatrixS2XForm( PXFORM, MATRIX_S *); /* Performs a world-to-viewport transformation on the specified point (which * is in floating point format). */ static __inline void INTERNAL_LPTODP_FLOAT(DC *dc, FLOAT_POINT *point) { FLOAT x, y; + XFORM xformWorld2Vport; + + MatrixS2XForm(&xformWorld2Vport, &dc->DcLevel.mxWorldToDevice); /* Perform the transformation */ x = point->x; y = point->y; - point->x = x * dc->DcLevel.xformWorld2Vport.eM11 + - y * dc->DcLevel.xformWorld2Vport.eM21 + - dc->DcLevel.xformWorld2Vport.eDx; - point->y = x * dc->DcLevel.xformWorld2Vport.eM12 + - y * dc->DcLevel.xformWorld2Vport.eM22 + - dc->DcLevel.xformWorld2Vport.eDy; + point->x = x * xformWorld2Vport.eM11 + + y * xformWorld2Vport.eM21 + + xformWorld2Vport.eDx; + + point->y = x * xformWorld2Vport.eM12 + + y * xformWorld2Vport.eM22 + + xformWorld2Vport.eDy; } /* Performs a viewport-to-world transformation on the specified point (which @@ -103,8 +110,6 @@ #define YLSTODS(Dc_Attr,ty) \ MulDiv((ty), (Dc_Attr)->szlViewportExt.cy, (Dc_Attr)->szlWindowExt.cy) -VOID FASTCALL XForm2MatrixS( MATRIX_S *, PXFORM); -VOID FASTCALL MatrixS2XForm( PXFORM, MATRIX_S *); - #endif + Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Wed Jul 16 15:16:30 2008 @@ -122,10 +122,14 @@ FLOAT x, y; x = (FLOAT)Point->x; y = (FLOAT)Point->y; - Point->x = x * Dc->DcLevel.xformVport2World.eM11 + - y * Dc->DcLevel.xformVport2World.eM21 + Dc->DcLevel.xformVport2World.eDx; - Point->y = x * Dc->DcLevel.xformVport2World.eM12 + - y * Dc->DcLevel.xformVport2World.eM22 + Dc->DcLevel.xformVport2World.eDy; + XFORM xformVport2World; + + MatrixS2XForm(&xformVport2World, &Dc->DcLevel.mxDeviceToWorld); + + Point->x = x * xformVport2World.eM11 + + y * xformVport2World.eM21 + xformVport2World.eDx; + Point->y = x * xformVport2World.eM12 + + y * xformVport2World.eM22 + xformVport2World.eDy; } VOID @@ -158,28 +162,34 @@ DWORD Mode) { ASSERT(pDc); + XFORM xformWorld2Wnd; switch(Mode) { case MWT_IDENTITY: - pDc->DcLevel.xformWorld2Wnd.eM11 = 1.0f; - pDc->DcLevel.xformWorld2Wnd.eM12 = 0.0f; - pDc->DcLevel.xformWorld2Wnd.eM21 = 0.0f; - pDc->DcLevel.xformWorld2Wnd.eM22 = 1.0f; - pDc->DcLevel.xformWorld2Wnd.eDx = 0.0f; - pDc->DcLevel.xformWorld2Wnd.eDy = 0.0f; + xformWorld2Wnd.eM11 = 1.0f; + xformWorld2Wnd.eM12 = 0.0f; + xformWorld2Wnd.eM21 = 0.0f; + xformWorld2Wnd.eM22 = 1.0f; + xformWorld2Wnd.eDx = 0.0f; + xformWorld2Wnd.eDy = 0.0f; + XForm2MatrixS(&pDc->DcLevel.mxWorldToPage, &xformWorld2Wnd); break; case MWT_LEFTMULTIPLY: - IntGdiCombineTransform(&pDc->DcLevel.xformWorld2Wnd, lpXForm, &pDc->DcLevel.xformWorld2Wnd ); + MatrixS2XForm(&xformWorld2Wnd, &pDc->DcLevel.mxWorldToPage); + IntGdiCombineTransform(&xformWorld2Wnd, lpXForm, &xformWorld2Wnd); + XForm2MatrixS(&pDc->DcLevel.mxWorldToPage, &xformWorld2Wnd); break; case MWT_RIGHTMULTIPLY: - IntGdiCombineTransform(&pDc->DcLevel.xformWorld2Wnd, &pDc->DcLevel.xformWorld2Wnd, lpXForm); + MatrixS2XForm(&xformWorld2Wnd, &pDc->DcLevel.mxWorldToPage); + IntGdiCombineTransform(&xformWorld2Wnd, &xformWorld2Wnd, lpXForm); + XForm2MatrixS(&pDc->DcLevel.mxWorldToPage, &xformWorld2Wnd); break; case MWT_MAX+1: // Must be MWT_SET???? - pDc->DcLevel.xformWorld2Wnd = *lpXForm; // Do it like Wine. + XForm2MatrixS(&pDc->DcLevel.mxWorldToPage, lpXForm); // Do it like Wine. break; default: @@ -219,7 +229,7 @@ switch(iXform) { case GdiWorldSpaceToPageSpace: - *XForm = dc->DcLevel.xformWorld2Wnd; + MatrixS2XForm(XForm, &dc->DcLevel.mxWorldToPage); break; default: break; @@ -240,16 +250,20 @@ CoordLPtoDP ( PDC Dc, LPPOINT Point ) { FLOAT x, y; - - ASSERT ( Dc ); - ASSERT ( Point ); + XFORM xformWorld2Vport; + + ASSERT(Dc); + ASSERT(Point); x = (FLOAT)Point->x; y = (FLOAT)Point->y; - Point->x = x * Dc->DcLevel.xformWorld2Vport.eM11 + - y * Dc->DcLevel.xformWorld2Vport.eM21 + Dc->DcLevel.xformWorld2Vport.eDx; - Point->y = x * Dc->DcLevel.xformWorld2Vport.eM12 + - y * Dc->DcLevel.xformWorld2Vport.eM22 + Dc->DcLevel.xformWorld2Vport.eDy; + + MatrixS2XForm(&xformWorld2Vport, &Dc->DcLevel.mxWorldToDevice); + + Point->x = x * xformWorld2Vport.eM11 + + y * xformWorld2Vport.eM21 + xformWorld2Vport.eDx; + Point->y = x * xformWorld2Vport.eM12 + + y * xformWorld2Vport.eM22 + xformWorld2Vport.eDy; } VOID Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Wed Jul 16 15:16:30 2008 @@ -1359,9 +1359,9 @@ #endif nDc_Attr->ptlCurrent = Dc_Attr->ptlCurrent; nDc_Attr->ptfxCurrent = Dc_Attr->ptfxCurrent; - newdc->DcLevel.xformWorld2Wnd = dc->DcLevel.xformWorld2Wnd; - newdc->DcLevel.xformWorld2Vport = dc->DcLevel.xformWorld2Vport; - newdc->DcLevel.xformVport2World = dc->DcLevel.xformVport2World; + newdc->DcLevel.mxWorldToDevice = dc->DcLevel.mxWorldToDevice; + newdc->DcLevel.mxDeviceToWorld = dc->DcLevel.mxDeviceToWorld; + newdc->DcLevel.mxWorldToPage = dc->DcLevel.mxWorldToPage; nDc_Attr->flXform = Dc_Attr->flXform; nDc_Attr->ptlWindowOrg = Dc_Attr->ptlWindowOrg; nDc_Attr->szlWindowExt = Dc_Attr->szlWindowExt; @@ -1425,9 +1425,9 @@ #endif Dc_Attr->ptlCurrent = sDc_Attr->ptlCurrent; Dc_Attr->ptfxCurrent = sDc_Attr->ptfxCurrent; - dc->DcLevel.xformWorld2Wnd = dcs->DcLevel.xformWorld2Wnd; - dc->DcLevel.xformWorld2Vport = dcs->DcLevel.xformWorld2Vport; - dc->DcLevel.xformVport2World = dcs->DcLevel.xformVport2World; + dc->DcLevel.mxWorldToDevice = dcs->DcLevel.mxWorldToDevice; + dc->DcLevel.mxDeviceToWorld = dcs->DcLevel.mxDeviceToWorld; + dc->DcLevel.mxWorldToPage = dcs->DcLevel.mxWorldToPage; Dc_Attr->flXform = sDc_Attr->flXform; Dc_Attr->ptlWindowOrg = sDc_Attr->ptlWindowOrg; Dc_Attr->szlWindowExt = sDc_Attr->szlWindowExt; @@ -2435,6 +2435,7 @@ PDC_ATTR Dc_Attr; HDC hDC; PWSTR Buf = NULL; + XFORM xformTemplate; if (Driver != NULL) { @@ -2471,14 +2472,17 @@ if(!Dc_Attr) Dc_Attr = &NewDC->Dc_Attr; NewDC->BaseObject.hHmgr = (HGDIOBJ) hDC; // Save the handle for this DC object. - NewDC->DcLevel.xformWorld2Wnd.eM11 = 1.0f; - NewDC->DcLevel.xformWorld2Wnd.eM12 = 0.0f; - NewDC->DcLevel.xformWorld2Wnd.eM21 = 0.0f; - NewDC->DcLevel.xformWorld2Wnd.eM22 = 1.0f; - NewDC->DcLevel.xformWorld2Wnd.eDx = 0.0f; - NewDC->DcLevel.xformWorld2Wnd.eDy = 0.0f; - NewDC->DcLevel.xformWorld2Vport = NewDC->DcLevel.xformWorld2Wnd; - NewDC->DcLevel.xformVport2World = NewDC->DcLevel.xformWorld2Wnd; + + xformTemplate.eM11 = 1.0f; + xformTemplate.eM12 = 0.0f; + xformTemplate.eM21 = 0.0f; + xformTemplate.eM22 = 1.0f; + xformTemplate.eDx = 0.0f; + xformTemplate.eDy = 0.0f; + XForm2MatrixS(&NewDC->DcLevel.mxWorldToDevice, &xformTemplate); + XForm2MatrixS(&NewDC->DcLevel.mxDeviceToWorld, &xformTemplate); + XForm2MatrixS(&NewDC->DcLevel.mxWorldToPage, &xformTemplate); + // Setup syncing bits for the dcattr data packets. Dc_Attr->flXform = DEVICE_TO_PAGE_INVALID; @@ -2663,6 +2667,7 @@ FLOAT scaleX, scaleY; PDC_ATTR Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + XFORM xformWorld2Vport, xformWorld2Wnd, xformVport2World; /* Construct a transformation to do the window-to-viewport conversion */ scaleX = (Dc_Attr->szlWindowExt.cx ? (FLOAT)Dc_Attr->szlViewportExt.cx / (FLOAT)Dc_Attr->szlWindowExt.cx : 0.0f); @@ -2675,13 +2680,23 @@ xformWnd2Vport.eDy = (FLOAT)Dc_Attr->ptlViewportOrg.y - scaleY * (FLOAT)Dc_Attr->ptlWindowOrg.y; /* Combine with the world transformation */ - IntGdiCombineTransform(&dc->DcLevel.xformWorld2Vport, &dc->DcLevel.xformWorld2Wnd, &xformWnd2Vport); + MatrixS2XForm(&xformWorld2Vport, &dc->DcLevel.mxWorldToDevice); + MatrixS2XForm(&xformWorld2Wnd, &dc->DcLevel.mxWorldToPage); + IntGdiCombineTransform(&xformWorld2Vport, &xformWorld2Wnd, &xformWnd2Vport); /* Create inverse of world-to-viewport transformation */ - if (DC_InvertXform(&dc->DcLevel.xformWorld2Vport, &dc->DcLevel.xformVport2World)) - Dc_Attr->flXform &= ~DEVICE_TO_WORLD_INVALID; + MatrixS2XForm(&xformVport2World, &dc->DcLevel.mxDeviceToWorld); + if (DC_InvertXform(&xformWorld2Vport, &xformVport2World)) + { + Dc_Attr->flXform &= ~DEVICE_TO_WORLD_INVALID; + } else - Dc_Attr->flXform |= DEVICE_TO_WORLD_INVALID; + { + Dc_Attr->flXform |= DEVICE_TO_WORLD_INVALID; + } + + XForm2MatrixS(&dc->DcLevel.mxWorldToDevice, &xformWorld2Vport); + } BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] Wed Jul 16 15:16:30 2008 @@ -113,9 +113,10 @@ CopytoUserDcAttr(PDC dc, PDC_ATTR Dc_Attr) { NTSTATUS Status = STATUS_SUCCESS; - XForm2MatrixS( &dc->Dc_Attr.mxWorldToDevice, &dc->DcLevel.xformWorld2Vport); - XForm2MatrixS( &dc->Dc_Attr.mxDevicetoWorld, &dc->DcLevel.xformVport2World); - XForm2MatrixS( &dc->Dc_Attr.mxWorldToPage, &dc->DcLevel.xformWorld2Wnd); + dc->Dc_Attr.mxWorldToDevice = dc->DcLevel.mxWorldToDevice; + dc->Dc_Attr.mxDevicetoWorld = dc->DcLevel.mxDeviceToWorld; + dc->Dc_Attr.mxWorldToPage = dc->DcLevel.mxWorldToPage; + _SEH_TRY { ProbeForWrite( Dc_Attr, Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Wed Jul 16 15:16:30 2008 @@ -540,8 +540,7 @@ if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; /* Do we rotate or shear? */ -// if (!(dc->DcLevel.mxWorldToDevice.flAccel & MXACC_DIAGONAL)) - if (dc->DcLevel.xformWorld2Vport.eM12 != 0. || dc->DcLevel.xformWorld2Vport.eM21 != 0.) + if (!(dc->DcLevel.mxWorldToDevice.flAccel & MX_SCALE)) { POINTL DestCoords[4]; DestCoords[0].x = DestCoords[3].x = LeftRect; Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Wed Jul 16 15:16:30 2008 @@ -120,7 +120,7 @@ * tests show that resetting the graphics mode to GM_COMPATIBLE does * not reset the world transform. */ - xform = dc->DcLevel.xformWorld2Wnd; + MatrixS2XForm(&xform, &dc->DcLevel.mxWorldToPage); /* Set MM_TEXT */ // IntGdiSetMapMode( dc, MM_TEXT ); @@ -1337,7 +1337,8 @@ IntGetViewportOrgEx(dc, &ptViewportOrg); IntGetWindowExtEx(dc, &szWindowExt); IntGetWindowOrgEx(dc, &ptWindowOrg); - xform = dc->DcLevel.xformWorld2Wnd; + + MatrixS2XForm(&xform, &dc->DcLevel.mxWorldToPage); /* Set MM_TEXT */ Dc_Attr->iMapMode = MM_TEXT; @@ -1464,7 +1465,7 @@ Dc_Attr->ptlViewportOrg.y = ptViewportOrg.y; /* Restore the world transform */ - dc->DcLevel.xformWorld2Wnd = xform; + XForm2MatrixS(&dc->DcLevel.mxWorldToPage, &xform); /* If we've moved the current point then get its new position which will be in device (MM_TEXT) co-ords, convert it to Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Wed Jul 16 15:16:30 2008 @@ -2611,6 +2611,7 @@ PVOID pvBuf = NULL; int n = 0; FT_CharMap found = 0, charmap; + XFORM xForm; DPRINT("%p, %d, %08x, %p, %08lx, %p, %p\n", hdc, wch, iFormat, pgm, cjBuf, UnsafeBuf, pmat2); @@ -2623,7 +2624,10 @@ } Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - eM11 = dc->DcLevel.xformWorld2Vport.eM11; + + MatrixS2XForm(&xForm, &dc->DcLevel.mxWorldToDevice); + eM11 = xForm.eM11; + hFont = Dc_Attr->hlfntNew; TextObj = TEXTOBJ_LockText(hFont); DC_UnlockDc(dc);

16 years, 2 months

[tkreuzer] 34553: DC_AllocDc: - Set DC's iGraphicsMode to GM_COMPATIBLE when creating a DC NtGdiRectangle: - only exclude bottom/right pixels if dc is GM_COMPATIBLE - fix indentation

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 16 14:48:19 2008 New Revision: 34553 URL: http://svn.reactos.org/svn/reactos?rev=34553&view=rev Log: DC_AllocDc: - Set DC's iGraphicsMode to GM_COMPATIBLE when creating a DC NtGdiRectangle: - only exclude bottom/right pixels if dc is GM_COMPATIBLE - fix indentation Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Wed Jul 16 14:48:19 2008 @@ -2485,6 +2485,7 @@ Dc_Attr->ulDirty_ = 0; // Server side Dc_Attr->iMapMode = MM_TEXT; + Dc_Attr->iGraphicsMode = GM_COMPATIBLE; Dc_Attr->szlWindowExt.cx = 1; // Float to Int,,, WRONG! Dc_Attr->szlWindowExt.cy = 1; Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Wed Jul 16 14:48:19 2008 @@ -556,91 +556,95 @@ return PATH_Rectangle ( dc, LeftRect, TopRect, RightRect, BottomRect ); } - { - DestRect.left = LeftRect; - DestRect.right = RightRect; - DestRect.top = TopRect; - DestRect.bottom = BottomRect; - - IntLPtoDP(dc, (LPPOINT)&DestRect, 2); - - DestRect.left += dc->ptlDCOrig.x; - DestRect.right += dc->ptlDCOrig.x - 1; - DestRect.top += dc->ptlDCOrig.y; - DestRect.bottom += dc->ptlDCOrig.y - 1; - - /* Special locking order to avoid lock-ups! */ - FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); - PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); - if (!PenBrushObj) - { - ret = FALSE; - goto cleanup; - } - BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - if (!BitmapObj) - { - ret = FALSE; - goto cleanup; - } - - if ( FillBrushObj ) - { - if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) - { - IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); - ret = IntEngBitBlt(&BitmapObj->SurfObj, - NULL, - NULL, - dc->CombinedClip, - NULL, - &DestRect, - NULL, - NULL, - &FillBrushInst.BrushObject, - NULL, - ROP3_TO_ROP4(PATCOPY)); - } - } - - IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); - - // Draw the rectangle with the current pen - - ret = TRUE; // change default to success - - if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) - { - Mix = ROP2_TO_MIX(Dc_Attr->jROP2); - ret = ret && IntEngLineTo(&BitmapObj->SurfObj, - dc->CombinedClip, - &PenBrushInst.BrushObject, - DestRect.left, DestRect.top, DestRect.right, DestRect.top, - &DestRect, // Bounding rectangle - Mix); - - ret = ret && IntEngLineTo(&BitmapObj->SurfObj, - dc->CombinedClip, - &PenBrushInst.BrushObject, - DestRect.right, DestRect.top, DestRect.right, DestRect.bottom, - &DestRect, // Bounding rectangle - Mix); - - ret = ret && IntEngLineTo(&BitmapObj->SurfObj, - dc->CombinedClip, - &PenBrushInst.BrushObject, - DestRect.right, DestRect.bottom, DestRect.left, DestRect.bottom, - &DestRect, // Bounding rectangle - Mix); - - ret = ret && IntEngLineTo(&BitmapObj->SurfObj, - dc->CombinedClip, - &PenBrushInst.BrushObject, - DestRect.left, DestRect.bottom, DestRect.left, DestRect.top, - &DestRect, // Bounding rectangle - Mix); - } - + DestRect.left = LeftRect; + DestRect.right = RightRect; + DestRect.top = TopRect; + DestRect.bottom = BottomRect; + + IntLPtoDP(dc, (LPPOINT)&DestRect, 2); + + DestRect.left += dc->ptlDCOrig.x; + DestRect.right += dc->ptlDCOrig.x; + DestRect.top += dc->ptlDCOrig.y; + DestRect.bottom += dc->ptlDCOrig.y; + + /* In GM_COMPATIBLE, don't include bottom and right edges */ + if (IntGetGraphicsMode(dc) == GM_COMPATIBLE) + { + DestRect.right--; + DestRect.bottom--; + } + + /* Special locking order to avoid lock-ups! */ + FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); + PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); + if (!PenBrushObj) + { + ret = FALSE; + goto cleanup; + } + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + if (!BitmapObj) + { + ret = FALSE; + goto cleanup; + } + + if ( FillBrushObj ) + { + if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) + { + IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); + ret = IntEngBitBlt(&BitmapObj->SurfObj, + NULL, + NULL, + dc->CombinedClip, + NULL, + &DestRect, + NULL, + NULL, + &FillBrushInst.BrushObject, + NULL, + ROP3_TO_ROP4(PATCOPY)); + } + } + + IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); + + // Draw the rectangle with the current pen + + ret = TRUE; // change default to success + + if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) + { + Mix = ROP2_TO_MIX(Dc_Attr->jROP2); + ret = ret && IntEngLineTo(&BitmapObj->SurfObj, + dc->CombinedClip, + &PenBrushInst.BrushObject, + DestRect.left, DestRect.top, DestRect.right, DestRect.top, + &DestRect, // Bounding rectangle + Mix); + + ret = ret && IntEngLineTo(&BitmapObj->SurfObj, + dc->CombinedClip, + &PenBrushInst.BrushObject, + DestRect.right, DestRect.top, DestRect.right, DestRect.bottom, + &DestRect, // Bounding rectangle + Mix); + + ret = ret && IntEngLineTo(&BitmapObj->SurfObj, + dc->CombinedClip, + &PenBrushInst.BrushObject, + DestRect.right, DestRect.bottom, DestRect.left, DestRect.bottom, + &DestRect, // Bounding rectangle + Mix); + + ret = ret && IntEngLineTo(&BitmapObj->SurfObj, + dc->CombinedClip, + &PenBrushInst.BrushObject, + DestRect.left, DestRect.bottom, DestRect.left, DestRect.top, + &DestRect, // Bounding rectangle + Mix); } cleanup:

16 years, 2 months

[tkreuzer] 34552: Add MATRIX accelerator flag MX_SCALE and set it in XForm2MatrixS, when off-diagonal elements are zero.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 16 13:57:23 2008 New Revision: 34552 URL: http://svn.reactos.org/svn/reactos?rev=34552&view=rev Log: Add MATRIX accelerator flag MX_SCALE and set it in XForm2MatrixS, when off-diagonal elements are zero. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/subsystems/win32/win32k/eng/float.c Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Wed Jul 16 13:57:23 2008 @@ -96,6 +96,12 @@ GdiDpToLp, GdiLpToDp, } TRANSFORMTYPE, *PTRANSFORMTYPE; + +/* MATRIX flAccel flags */ +enum +{ + MX_SCALE = 1, +}; typedef enum GDIObjType { @@ -335,7 +341,7 @@ LONG lMant; LONG lExp; } EFLOAT_S; - + /* XFORM Structures */ typedef struct _MATRIX_S { Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/float.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/float.c [iso-8859-1] Wed Jul 16 13:57:23 2008 @@ -219,6 +219,11 @@ FtoEF( &Matrix->efDx, f.l); f.f = XForm->eDy; FtoEF( &Matrix->efDy, f.l); + Matrix->flAccel = 0; + if (XForm->eM12 == 0. && XForm->eM21 == 0.) + { + Matrix->flAccel |= MX_SCALE; + } } VOID FASTCALL

16 years, 2 months

[dreimer] 34551: Revert The last changes for removing makefile*.auto.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 16 11:46:53 2008 New Revision: 34551 URL: http://svn.reactos.org/svn/reactos?rev=34551&view=rev Log: Revert The last changes for removing makefile*.auto. Modified: trunk/tools/RosBE/RosBE-Unix/scripts/clean.sh trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Unix/scripts/clean.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/clean.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/clean.sh [iso-8859-1] Wed Jul 16 11:46:53 2008 @@ -14,7 +14,7 @@ rm -rf "obj-i386" rm -rf "output-i386" rm -rf "reactos." - rm -f "makefile*.auto" + rm -f "makefile.auto" echo "Done cleaning ReactOS source directory." else Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Wed Jul 16 11:46:53 2008 @@ -64,8 +64,8 @@ if exist "reactos\." ( rd /s /q "reactos" 1> NUL 2> NUL ) - if exist "makefile*.auto" ( - del "makefile*.auto" 1> NUL 2> NUL + if exist "makefile.auto" ( + del "makefile.auto" 1> NUL 2> NUL ) echo Done cleaning ReactOS source directory. ) else (

16 years, 2 months

[jimtabor] 34550: - Fix CurrentWnd when it has a NULL, see Bug 3527.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jul 16 11:12:44 2008 New Revision: 34550 URL: http://svn.reactos.org/svn/reactos?rev=34550&view=rev Log: - Fix CurrentWnd when it has a NULL, see Bug 3527. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] Wed Jul 16 11:12:44 2008 @@ -69,7 +69,7 @@ while (CurrentWindow) { CurrentWnd = CurrentWindow->Wnd; - if (!(CurrentWnd->Style & WS_VISIBLE)) + if (!(CurrentWnd) || !(CurrentWnd->Style & WS_VISIBLE)) { NtGdiDeleteObject(VisRgn); return NULL;

16 years, 2 months

← Newer
1
...
41
42
43
44
45
46
47
...
77
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 July 2008