Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mkupfer] 34005: Vytis Girdzijauskas <cman AT cman DOT us> - Lithuanian translation of explorer-new and shimgvw - See issue #3365 for more details.
by mkupfer＠svn.reactos.org 18 Jun '08

18 Jun '08

Author: mkupfer Date: Wed Jun 18 04:39:10 2008 New Revision: 34005 URL: http://svn.reactos.org/svn/reactos?rev=34005&view=rev Log: Vytis Girdzijauskas <cman AT cman DOT us> - Lithuanian translation of explorer-new and shimgvw - See issue #3365 for more details. Added: trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc (with props) Modified: trunk/reactos/base/shell/explorer-new/explorer.rc trunk/reactos/dll/win32/shimgvw/rsrc.rc Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc [iso-8859-1] Wed Jun 18 04:39:10 2008 @@ -17,6 +17,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/lt-LT.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" Added: trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc (added) +++ trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc [iso-8859-1] Wed Jun 18 04:39:10 2008 @@ -1,0 +1,64 @@ +/* + * + * Translation by Vytis "CMan" Girdþijauskas (cman(a)cman.us) + */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +IDM_TRAYWND MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Uþrakinti uþduoèiø juostà", ID_LOCKTASKBAR + MENUITEM "&Parametrai", ID_SHELL_CMD_PROPERTIES + END +END + +IDM_STARTMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Programos", IDM_PROGRAMS + BEGIN + MENUITEM "(Tuðèia)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Adresynas", IDM_FAVORITES + BEGIN + MENUITEM "(Tuðèia)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Dokumentai", IDM_DOCUMENTS + BEGIN + MENUITEM "(Tuðèia)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Nustatymai", IDM_SETTINGS + BEGIN + MENUITEM "Va&ldymo skydelis", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Saugumas...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "&Tinklo ryðiai", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "Spausdintuvai ir &faxai", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "&Uþduoèiø juosta ir pradþios meniu", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + END + POPUP "Paieð&ka", IDM_SEARCH + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + MENUITEM "Pa&galba ir palaikymas", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "&Vykdyti...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "Sin&chronizuoti", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "At&jungti %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "Nutraukti &ryðá...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "Undock Comput&er", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "&Iðjungti...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_START "ReactOS" + IDS_PROPERTIES "&Parametrai" + IDS_OPEN_ALL_USERS "&Atverti visus vartotojus" + IDS_EXPLORE_ALL_USERS "&Narðyti visus vartotojus" +END Propchange: trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] Wed Jun 18 04:39:10 2008 @@ -2,5 +2,6 @@ #include "resource.h" #include "lang/en-US.rc" +#include "lang/lt-LT.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc"

1 0

[jimtabor] 34004: Implement Get/SetMiterLimit, with proper float containment.
by jimtabor＠svn.reactos.org 17 Jun '08

17 Jun '08

Author: jimtabor Date: Tue Jun 17 15:19:30 2008 New Revision: 34004 URL: http://svn.reactos.org/svn/reactos?rev=34004&view=rev Log: Implement Get/SetMiterLimit, with proper float containment. Modified: trunk/reactos/dll/win32/gdi32/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/dll/win32/gdi32/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/path.c [iso-8859-1] Tue Jun 17 15:19:30 2008 @@ -136,7 +136,13 @@ PFLOAT a2 ) { - return NtGdiSetMiterLimit ( hdc, a1, (PDWORD)a2 ); + BOOL Ret; + gxf_long worker, worker1; + + worker.f = a1; + Ret = NtGdiSetMiterLimit ( hdc, worker.l, a2 ? &worker1.l : NULL ); + if (a2 && Ret) *a2 = worker1.f; + return Ret; } 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] Tue Jun 17 15:19:30 2008 @@ -3442,7 +3442,7 @@ OUT LPRECT prc, IN DWORD f) { - DPRINT1("stub"); + DPRINT1("stub\n"); return DCB_RESET; /* bounding rectangle always empty */ } @@ -3453,7 +3453,7 @@ IN LPRECT prc, IN DWORD f) { - DPRINT1("stub"); + DPRINT1("stub\n"); return DCB_DISABLE; /* bounding rectangle always empty */ } 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] Tue Jun 17 15:19:30 2008 @@ -195,8 +195,39 @@ IN HDC hdc, OUT PDWORD pdwOut) { - UNIMPLEMENTED; - return FALSE; + DC *pDc; + gxf_long worker; + NTSTATUS Status = STATUS_SUCCESS; + + if(!(pDc = DC_LockDc(hdc))) return FALSE; + + worker.f = pDc->DcLevel.laPath.eMiterLimit; + + if (pdwOut) + { + _SEH_TRY + { + ProbeForWrite(pdwOut, + sizeof(DWORD), + 1); + *pdwOut = worker.l; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DC_UnlockDc(pDc); + return FALSE; + } + } + + DC_UnlockDc(pDc); + return TRUE; + } INT @@ -298,8 +329,40 @@ IN DWORD dwNew, IN OUT OPTIONAL PDWORD pdwOut) { - UNIMPLEMENTED; - return FALSE; + DC *pDc; + gxf_long worker, worker1; + NTSTATUS Status = STATUS_SUCCESS; + + if(!(pDc = DC_LockDc(hdc))) return FALSE; + + worker.l = dwNew; + worker1.f = pDc->DcLevel.laPath.eMiterLimit; + pDc->DcLevel.laPath.eMiterLimit = worker.f; + + if (pdwOut) + { + _SEH_TRY + { + ProbeForWrite(pdwOut, + sizeof(DWORD), + 1); + *pdwOut = worker1.l; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DC_UnlockDc(pDc); + return FALSE; + } + } + + DC_UnlockDc(pDc); + return TRUE; } BOOL

1 0

[dchapyshev] 34003: - Comment some languages
by dchapyshev＠svn.reactos.org 17 Jun '08

17 Jun '08

Author: dchapyshev Date: Tue Jun 17 15:11:22 2008 New Revision: 34003 URL: http://svn.reactos.org/svn/reactos?rev=34003&view=rev Log: - Comment some languages Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Tue Jun 17 15:11:22 2008 @@ -100,31 +100,31 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" [Language] -00000436 = "Afrikaans" +;00000436 = "Afrikaans" 0000041C = "Albanian" 00000401 = "Arabic (Saudi Arabia)" -00000801 = "Arabic (Iraq)" -00000C01 = "Arabic (Egypt)" -00001001 = "Arabic (Libya)" -00001401 = "Arabic (Algeria)" -00001801 = "Arabic (Morocco)" -00001C01 = "Arabic (Tunisia)" -00002001 = "Arabic (Oman)" -00002401 = "Arabic (Yemen)" -00002801 = "Arabic (Syria)" -00002C01 = "Arabic (Jordan)" -00003001 = "Arabic (Lebanon)" -00003401 = "Arabic (Kuwait)" -00003801 = "Arabic (U.A.E.)" -00003C01 = "Arabic (Bahrain)" -00004001 = "Arabic (Qatar)" +;00000801 = "Arabic (Iraq)" +;00000C01 = "Arabic (Egypt)" +;00001001 = "Arabic (Libya)" +;00001401 = "Arabic (Algeria)" +;00001801 = "Arabic (Morocco)" +;00001C01 = "Arabic (Tunisia)" +;00002001 = "Arabic (Oman)" +;00002401 = "Arabic (Yemen)" +;00002801 = "Arabic (Syria)" +;00002C01 = "Arabic (Jordan)" +;00003001 = "Arabic (Lebanon)" +;00003401 = "Arabic (Kuwait)" +;00003801 = "Arabic (U.A.E.)" +;00003C01 = "Arabic (Bahrain)" +;00004001 = "Arabic (Qatar)" 0000042B = "Armenian" 0000082C = "Azeri (Cyrillic)" 0000042C = "Azeri (Latin)" -0000042D = "Basque" +;0000042D = "Basque" 00000423 = "Belarusian" 00000402 = "Bulgarian" -00000455 = "Burmese" +;00000455 = "Burmese" 00000403 = "Catalan" 00000404 = "Chinese (Taiwan)" 00000804 = "Chinese (PRC)" @@ -134,7 +134,7 @@ 0000041A = "Croatian" 00000405 = "Czech" 00000406 = "Danish" -00000465 = "Divehi (Maldives)" +;00000465 = "Divehi (Maldives)" 00000413 = "Dutch (Netherlands)" 00000813 = "Dutch (Belgium)" 00000409 = "English (United States)" @@ -151,8 +151,8 @@ 00003009 = "English (Zimbabwe)" 00003409 = "English (Philippines)" 00000425 = "Estonian" -00000438 = "Faeroese" -00000429 = "Farsi" +;00000438 = "Faeroese" +;00000429 = "Farsi" 0000040B = "Finnish" 00000C0C = "French (Canada)" 0000040C = "French (France)" @@ -161,43 +161,43 @@ 0000140C = "French (Luxembourg)" 0000180C = "French (Monaco)" 00000456 = "Galician (Spain)" -00000437 = "Georgian" +;00000437 = "Georgian" 00000407 = "German (Germany)" 00000807 = "German (Switzerland)" 00000C07 = "German (Austria)" 00001007 = "German (Luxembourg)" 00001407 = "German (Liechtenstein)" 00000408 = "Greek" -00000447 = "Gujarati (India)" -0000040D = "Hebrew" -00000439 = "Hindi" +;00000447 = "Gujarati (India)" +;0000040D = "Hebrew" +;00000439 = "Hindi" 0000040E = "Hungarian" 0000040F = "Icelandic" 00000421 = "Indonesian" 00000410 = "Italian (Italy)" 00000810 = "Italian (Switzerland)" 00000411 = "Japanese" -0000044B = "Kannada (India)" +;0000044B = "Kannada (India)" 0000043F = "Kazakh" -00000457 = "Konkani" +;00000457 = "Konkani" 00000412 = "Korean" 00000440 = "Kyrgyz (Kyrgyzstan)" 00000426 = "Latvian" 00000427 = "Lithuanian" 0000042F = "FYRO Macedonian" -0000083E = "Malay (Brunei Darussalam)" -0000043E = "Malay (Malaysia)" -0000044E = "Marathi" -00000450 = "Mongolian (Mongolia)" -00000414 = "Norwegian (Bokmal)" -00000814 = "Norwegian (Nynorsk)" +;0000083E = "Malay (Brunei Darussalam)" +;0000043E = "Malay (Malaysia)" +;0000044E = "Marathi" +;00000450 = "Mongolian (Mongolia)" +;00000414 = "Norwegian (Bokmal)" +;00000814 = "Norwegian (Nynorsk)" 00000415 = "Polish" 00000816 = "Portuguese (Portugal)" 00000416 = "Portuguese (Brazil)" -00000446 = "Punjabi (India)" +;00000446 = "Punjabi (India)" 00000418 = "Romanian" 00000419 = "Russian" -0000044F = "Sanskrit" +;0000044F = "Sanskrit" 00000C1A = "Serbian (Cyrillic)" 0000081A = "Serbian (Latin)" 0000041B = "Slovak" @@ -222,21 +222,21 @@ 0000480A = "Spanish (Honduras)" 00004C0A = "Spanish (Nicaragua)" 0000500A = "Spanish (Puerto Rico)" -00000441 = "Swahili" +;00000441 = "Swahili" 0000041D = "Swedish" 0000081D = "Swedish (Finland)" -0000045A = "Syriac (Syria)" -00000449 = "Tamil" +;0000045A = "Syriac (Syria)" +;00000449 = "Tamil" 00000444 = "Tatar" -0000044A = "Telugu (India)" +;0000044A = "Telugu (India)" 0000041E = "Thai" 0000041F = "Turkish" 00000422 = "Ukrainian" -00000420 = "Urdu" +;00000420 = "Urdu" 00000443 = "Uzbek (Latin)" 00000843 = "Uzbek (Cyrillic)" -0000042A = "Vietnamese" -00000435 = "Zulu" +;0000042A = "Vietnamese" +;00000435 = "Zulu" [KeyboardLayout]

1 0

[dchapyshev] 34002: - Add correct scrolling by keypress
by dchapyshev＠svn.reactos.org 17 Jun '08

17 Jun '08

Author: dchapyshev Date: Tue Jun 17 15:10:07 2008 New Revision: 34002 URL: http://svn.reactos.org/svn/reactos?rev=34002&view=rev Log: - Add correct scrolling by keypress Modified: trunk/reactos/base/setup/usetup/genlist.c Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Tue Jun 17 15:10:07 2008 @@ -538,42 +538,59 @@ GenericListKeyPress (PGENERIC_LIST GenericList, CHAR AsciChar) { PGENERIC_LIST_ENTRY ListEntry; - PLIST_ENTRY Entry; - - Entry = &GenericList->CurrentEntry->Entry; - ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - -Reset: - - if (tolower(ListEntry->Text[0]) != AsciChar) - Entry = GenericList->ListHead.Flink; - - while (Entry != &GenericList->ListHead) - { - ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - + PGENERIC_LIST_ENTRY OldListEntry; + BOOLEAN Flag = FALSE; + + ListEntry = GenericList->CurrentEntry; + OldListEntry = GenericList->CurrentEntry; + + GenericList->Redraw = FALSE; + + if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciChar) && + (GenericList->CurrentEntry->Entry.Flink != &GenericList->ListHead)) + { + ScrollDownGenericList(GenericList); + ListEntry = GenericList->CurrentEntry; + + if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciChar)) + goto End; + } + + while (GenericList->CurrentEntry->Entry.Blink != &GenericList->ListHead) + ScrollUpGenericList(GenericList); + + ListEntry = GenericList->CurrentEntry; + + for (;;) + { if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciChar)) { - if (CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry) == GenericList->CurrentEntry) - { - Entry = Entry->Flink; - if (Entry == &GenericList->ListHead) - goto Reset; - - ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - if ((strlen(ListEntry->Text) < 1) || (tolower(ListEntry->Text[0]) != AsciChar)) - goto Reset; - } - - GenericList->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + Flag = TRUE; break; } - Entry = Entry->Flink; - } - - if (Entry) - DrawListEntries(GenericList); + if (GenericList->CurrentEntry->Entry.Flink == &GenericList->ListHead) + break; + + ScrollDownGenericList(GenericList); + ListEntry = GenericList->CurrentEntry; + } + + if (!Flag) + { + while (GenericList->CurrentEntry->Entry.Blink != &GenericList->ListHead) + { + if (GenericList->CurrentEntry != OldListEntry) + ScrollUpGenericList(GenericList); + else + break; + } + } +End: + DrawListEntries(GenericList); + DrawScrollBarGenericList(GenericList); + + GenericList->Redraw = TRUE; }

1 0

[fireball] 34001: Mikhail Zvyozdochkink <mzvyozd@narod.ru> - Limit inputable max partition size to 999999 Mbs. See issue #3356 for more details.
by fireball＠svn.reactos.org 17 Jun '08

17 Jun '08

Author: fireball Date: Tue Jun 17 13:42:20 2008 New Revision: 34001 URL: http://svn.reactos.org/svn/reactos?rev=34001&view=rev Log: Mikhail Zvyozdochkink <mzvyozd(a)narod.ru> - Limit inputable max partition size to 999999 Mbs. See issue #3356 for more details. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue Jun 17 13:42:20 2008 @@ -1494,6 +1494,8 @@ #define PARTITION_SIZE_INPUT_FIELD_LENGTH 6 +/* Restriction for MaxSize: pow(10, PARTITION_SIZE_INPUT_FIELD_LENGTH)-1 */ +#define PARTITION_MAXSIZE 999999 static VOID ShowPartitionSizeInputBox(SHORT Left, @@ -1692,6 +1694,9 @@ while (TRUE) { MaxSize = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; /* in MBytes (rounded) */ + + if (MaxSize > PARTITION_MAXSIZE) MaxSize = PARTITION_MAXSIZE; + ShowPartitionSizeInputBox (12, 14, xScreen - 12, 17, /* left, top, right, bottom */ MaxSize, InputBuffer, &Quit, &Cancel);

1 0

[fireball] 34000: Daniel Zimmerman <netzimme@aim.com> - Cosmetic fix: initialize pushlocks using a special macro, not by assigning 0 to its value. See issue #3352 for more details.
by fireball＠svn.reactos.org 17 Jun '08

17 Jun '08

Author: fireball Date: Tue Jun 17 13:21:41 2008 New Revision: 34000 URL: http://svn.reactos.org/svn/reactos?rev=34000&view=rev Log: Daniel Zimmerman <netzimme(a)aim.com> - Cosmetic fix: initialize pushlocks using a special macro, not by assigning 0 to its value. See issue #3352 for more details. Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Tue Jun 17 13:21:41 2008 @@ -405,10 +405,14 @@ HandleTable->Flags = 0; /* Loop all the handle table locks */ - for (i = 0; i < 4; i++) HandleTable->HandleTableLock[i].Value = 0; + for (i = 0; i < 4; i++) + { + /* Initialize the handle table lock */ + ExInitializePushLock((PULONG_PTR)&HandleTable->HandleTableLock[i]); + } /* Initialize the contention event lock and return the lock */ - HandleTable->HandleContentionEvent.Value = 0; + ExInitializePushLock((PULONG_PTR)&HandleTable->HandleContentionEvent); return HandleTable; }

1 0

[jimtabor] 33999: Fix build
by jimtabor＠svn.reactos.org 17 Jun '08

17 Jun '08

Author: jimtabor Date: Tue Jun 17 00:33:46 2008 New Revision: 33999 URL: http://svn.reactos.org/svn/reactos?rev=33999&view=rev Log: Fix build Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Tue Jun 17 00:33:46 2008 @@ -39,6 +39,8 @@ PSECTION_OBJECT GlobalUserHeapSection = NULL; PSERVERINFO gpsi = NULL; // Global User Server Information. + +HSEMAPHORE hsemDriverMgmt = NULL; extern ULONG_PTR Win32kSSDT[]; extern UCHAR Win32kSSPT[]; @@ -410,6 +412,8 @@ /* Initialize a list of loaded drivers in Win32 subsystem */ InitializeListHead(&GlobalDriverListHead); + if(!hsemDriverMgmt) hsemDriverMgmt = EngCreateSemaphore(); + Status = InitUserImpl(); if (!NT_SUCCESS(Status)) {

1 0

[jimtabor] 33998: Update changes to Clip regions andregions. New support for Rao and Vis.
by jimtabor＠svn.reactos.org 17 Jun '08

17 Jun '08

Author: jimtabor Date: Tue Jun 17 00:19:08 2008 New Revision: 33998 URL: http://svn.reactos.org/svn/reactos?rev=33998&view=rev Log: Update changes to Clip regions andregions. New support for Rao and Vis. Modified: trunk/reactos/subsystems/win32/win32k/include/cliprgn.h trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/include/cliprgn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cliprgn.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cliprgn.h [iso-8859-1] Tue Jun 17 00:19:08 2008 @@ -5,7 +5,6 @@ #include <include/region.h> INT FASTCALL IntGdiGetClipBox(PDC, LPRECT rc); -INT FASTCALL IntGdiSelectVisRgn(PDC, PROSRGNDATA); INT FASTCALL IntGdiExtSelectClipRgn (PDC, PROSRGNDATA, int); INT FASTCALL GdiGetClipBox(HDC hDC, LPRECT rc); Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] Tue Jun 17 00:19:08 2008 @@ -6,6 +6,7 @@ /* Brush functions */ extern HDC hSystemBM; +extern HSEMAPHORE hsemDriverMgmt; XLATEOBJ* FASTCALL IntGdiCreateBrushXlate(PDC Dc, GDIBRUSHOBJ *BrushObj, BOOLEAN *Failed); Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] Tue Jun 17 00:19:08 2008 @@ -34,6 +34,13 @@ VOID FASTCALL REGION_SetRectRgn(PROSRGNDATA pRgn, INT LeftRect, INT TopRect, INT RightRect, INT BottomRect); BOOL INTERNAL_CALL REGION_Cleanup(PVOID ObjectBody); +extern PROSRGNDATA prgnDefault; +extern HRGN hrgnDefault; + +VOID FASTCALL REGION_Delete(PROSRGNDATA); +VOID FASTCALL IntGdiReleaseRaoRgn(PDC); +VOID FASTCALL IntGdiReleaseVisRgn(PDC); + INT STDCALL IntGdiGetRgnBox(HRGN, LPRECT); BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN ); HRGN FASTCALL GdiCreatePolyPolygonRgn(CONST PPOINT, CONST PINT, INT, INT ); Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Tue Jun 17 00:19:08 2008 @@ -442,29 +442,22 @@ RGN_AND); if ( Ret ) { - TempRgn = GDIOBJ_ShareLockObj(TempRgn->BaseObject.hHmgr, - GDI_OBJECT_TYPE_REGION); - GDIOBJ_ShareUnlockObjByPtr(pDC->DcLevel.prgnMeta); if (!((PROSRGNDATA)pDC->DcLevel.prgnMeta)->BaseObject.ulShareCount) - REGION_FreeRgn(pDC->DcLevel.prgnMeta); + REGION_Delete(pDC->DcLevel.prgnMeta); pDC->DcLevel.prgnMeta = TempRgn; GDIOBJ_ShareUnlockObjByPtr(pDC->DcLevel.prgnClip); if (!((PROSRGNDATA)pDC->DcLevel.prgnClip)->BaseObject.ulShareCount) - REGION_FreeRgn(pDC->DcLevel.prgnClip); + REGION_Delete(pDC->DcLevel.prgnClip); pDC->DcLevel.prgnClip = NULL; - pDC->DC_Flags |= DC_FLAG_DIRTY_RAO; - pDC->erclClip.left = 0; - pDC->erclClip.top = 0; - pDC->erclClip.right = 0; - pDC->erclClip.bottom = 0; + IntGdiReleaseRaoRgn(pDC); } else - REGION_FreeRgn(TempRgn); + REGION_Delete(TempRgn); } } else @@ -510,16 +503,14 @@ if (pDC->prgnAPI) { - REGION_FreeRgn(pDC->prgnAPI); - pDC->prgnAPI = REGION_AllocRgnWithHandle(1); - REGION_SetRectRgn(pDC->prgnAPI, 0, 0, 0, 0); + REGION_Delete(pDC->prgnAPI); + pDC->prgnAPI = IntGdiCreateRectRgn(0,0,0,0); } if (pDC->prgnRao) { - REGION_FreeRgn(pDC->prgnRao); - pDC->prgnRao = REGION_AllocRgnWithHandle(1); - REGION_SetRectRgn(pDC->prgnRao, 0, 0, 0, 0); + REGION_Delete(pDC->prgnRao); + pDC->prgnRao = IntGdiCreateRectRgn(0,0,0,0); } if (pDC->DcLevel.prgnMeta && pDC->DcLevel.prgnClip) 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] Tue Jun 17 00:19:08 2008 @@ -2785,7 +2785,6 @@ return &PrimarySurface; } -HSEMAPHORE hsemDriverMgmt = NULL; // Hax, should be in dllmain.c and global. VOID FASTCALL IntGdiReferencePdev(PGDIDEVICE pPDev) Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Tue Jun 17 00:19:08 2008 @@ -117,6 +117,9 @@ #define NDEBUG #include <debug.h> + +PROSRGNDATA prgnDefault = NULL; +HRGN hrgnDefault = NULL; // Internal Functions @@ -488,6 +491,7 @@ FASTCALL REGION_Complexity( PROSRGNDATA obj ) { + if (!obj) return NULLREGION; switch(obj->rdh.nCount) { DPRINT("Region Complexity -> %d",obj->rdh.nCount); @@ -2074,6 +2078,73 @@ if (pRgn->Buffer && pRgn->Buffer != &pRgn->rdh.rcBound) ExFreePool(pRgn->Buffer); return TRUE; +} + +VOID FASTCALL +REGION_Delete(PROSRGNDATA pRgn) +{ + if ( pRgn == prgnDefault) return; + return REGION_FreeRgn(pRgn); +} + + +VOID FASTCALL +IntGdiReleaseRaoRgn(PDC pDC) +{ + INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + pDC->DC_Flags |= DC_FLAG_DIRTY_RAO; + Entry->Flags |= GDI_ENTRY_FLAG_NEED_UPDATE; + IntGdiSetEmptyRect((PRECT)&pDC->erclClip); +} + + +VOID FASTCALL +IntGdiReleaseVisRgn(PDC pDC) +{ + INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + pDC->DC_Flags |= DC_FLAG_DIRTY_RAO; + Entry->Flags |= GDI_ENTRY_FLAG_NEED_UPDATE; + IntGdiSetEmptyRect((PRECT)&pDC->erclClip); + REGION_Delete(pDC->prgnVis); + pDC->prgnVis = prgnDefault; +} + +VOID FASTCALL +IntUpdateVisRectRgn(PDC pDC, PROSRGNDATA pRgn) +{ + INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + PDC_ATTR pDc_Attr; + RECTL rcl; + + if (Entry->Flags & GDI_ENTRY_FLAG_NEED_UPDATE) + { + pDc_Attr = pDC->pDc_Attr; + if ( !pDc_Attr ) pDc_Attr = &pDC->Dc_Attr; + + pDc_Attr->VisRectRegion.Flags = REGION_Complexity(pRgn); + + if (pRgn && pDc_Attr->VisRectRegion.Flags != NULLREGION) + { + rcl.left = pRgn->rdh.rcBound.left; + rcl.top = pRgn->rdh.rcBound.top; + rcl.right = pRgn->rdh.rcBound.right; + rcl.bottom = pRgn->rdh.rcBound.bottom; + + rcl.left -= pDC->erclWindow.left; + rcl.top -= pDC->erclWindow.top; + rcl.right -= pDC->erclWindow.left; + rcl.bottom -= pDC->erclWindow.top; + } + else + IntGdiSetEmptyRect((PRECT)&rcl); + + pDc_Attr->VisRectRegion.Rect = rcl; + + Entry->Flags &= ~GDI_ENTRY_FLAG_NEED_UPDATE; + } } INT @@ -2221,6 +2292,8 @@ REGION_SetRectRgn(pRgn, LeftRect, TopRect, RightRect, BottomRect); REGION_UnlockRgn(pRgn); + // Return pointer with Share locks. + pRgn = GDIOBJ_ShareLockObj(pRgn->BaseObject.hHmgr, GDI_OBJECT_TYPE_REGION); return pRgn; }

1 0

[jimtabor] 33997: Update NtUserSetSysColors.
by jimtabor＠svn.reactos.org 17 Jun '08

17 Jun '08

Author: jimtabor Date: Mon Jun 16 21:42:40 2008 New Revision: 33997 URL: http://svn.reactos.org/svn/reactos?rev=33997&view=rev Log: Update NtUserSetSysColors. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Jun 16 21:42:40 2008 @@ -2243,7 +2243,7 @@ int cElements, IN CONST INT *lpaElements, IN CONST COLORREF *lpaRgbValues, - DWORD Unknown3); + FLONG Flags); BOOL NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Mon Jun 16 21:42:40 2008 @@ -527,7 +527,7 @@ int cElements, IN CONST INT *lpaElements, IN CONST COLORREF *lpaRgbValues, - DWORD Unknown3) + FLONG Flags) { DWORD Ret = FALSE; NTSTATUS Status = STATUS_SUCCESS;

1 0

[tkreuzer] 33996: IntEngGradientFill: fix cleanup when calling the driver
by tkreuzer＠svn.reactos.org 16 Jun '08

16 Jun '08

Author: tkreuzer Date: Mon Jun 16 13:56:52 2008 New Revision: 33996 URL: http://svn.reactos.org/svn/reactos?rev=33996&view=rev Log: IntEngGradientFill: fix cleanup when calling the driver Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] Mon Jun 16 13:56:52 2008 @@ -571,11 +571,12 @@ Ret = GDIDEVFUNCS(psoDest).GradientFill( psoDest, pco, pxlo, pVertex, nVertex, pMesh, nMesh, prclExtents, pptlDitherOrg, ulMode); - MouseSafetyOnDrawEnd(psoDest); - return Ret; - } - Ret = EngGradientFill(psoDest, pco, pxlo, pVertex, nVertex, pMesh, nMesh, prclExtents, - pptlDitherOrg, ulMode); + } + else + { + Ret = EngGradientFill(psoDest, pco, pxlo, pVertex, nVertex, pMesh, nMesh, prclExtents, + pptlDitherOrg, ulMode); + } MouseSafetyOnDrawEnd(psoDest); BITMAPOBJ_UnlockBitmapBits(pboDest);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs