Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 42721: - Rename pointer to server information structure.
by jimtabor＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: jimtabor Date: Sun Aug 16 00:57:32 2009 New Revision: 42721 URL: http://svn.reactos.org/svn/reactos?rev=42721&view=rev Log: - Rename pointer to server information structure. Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/dll/win32/user32/windows/icon.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Sun Aug 16 00:57:32 2009 @@ -48,7 +48,7 @@ extern PPROCESSINFO g_ppi; extern ULONG_PTR g_ulSharedDelta; -extern PSERVERINFO g_psi; +extern PSERVERINFO gpsi; static __inline PVOID SharedPtrToUser(PVOID Ptr) Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Sun Aug 16 00:57:32 2009 @@ -97,9 +97,9 @@ GetSystemMetrics(int nIndex) { GetConnected(); -// FIXME("Global Sever Data -> %x\n",g_psi); +// FIXME("Global Sever Data -> %x\n",gpsi); if (nIndex < 0 || nIndex >= SM_CMETRICS) return 0; - return g_psi->aiSysMet[nIndex]; + return gpsi->aiSysMet[nIndex]; } Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Sun Aug 16 00:57:32 2009 @@ -11,7 +11,7 @@ PPROCESSINFO g_ppi = NULL; PUSER_HANDLE_TABLE gHandleTable = NULL; PUSER_HANDLE_ENTRY gHandleEntries = NULL; -PSERVERINFO g_psi = NULL; +PSERVERINFO gpsi = NULL; ULONG_PTR g_ulSharedDelta; WCHAR szAppInit[KEY_LENGTH]; @@ -239,7 +239,7 @@ g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! g_ulSharedDelta = UserCon.siClient.ulSharedDelta; - g_psi = SharedPtrToUser(UserCon.siClient.psi); + gpsi = SharedPtrToUser(UserCon.siClient.psi); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); gHandleEntries = SharedPtrToUser(gHandleTable->handles); //ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); @@ -338,7 +338,7 @@ if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) NtUserGetThreadState(THREADSTATE_GETTHREADINFO); - if (g_psi && g_ppi) return; + if (gpsi && g_ppi) return; // FIXME HAX: Due to the "Dll Initialization Bug" we have to call this too. GdiDllInitialize(NULL, DLL_PROCESS_ATTACH, NULL); @@ -348,7 +348,7 @@ g_ppi = GetWin32ClientInfo()->ppi; g_ulSharedDelta = UserCon.siClient.ulSharedDelta; - g_psi = SharedPtrToUser(UserCon.siClient.psi); + gpsi = SharedPtrToUser(UserCon.siClient.psi); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); gHandleEntries = SharedPtrToUser(gHandleTable->handles); Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sun Aug 16 00:57:32 2009 @@ -52,7 +52,7 @@ SysColors table - the pens, brushes and stock objects are not affected as their handles never change. But it'd be faster to map them, too. */ - // Done! g_psi! + // Done! gpsi! } /* @@ -63,7 +63,7 @@ { if(nIndex >= 0 && nIndex < NUM_SYSCOLORS) { - return g_psi->argbSystem[nIndex]; + return gpsi->argbSystem[nIndex]; } SetLastError(ERROR_INVALID_PARAMETER); @@ -78,7 +78,7 @@ { if(nIndex >= 0 && nIndex < NUM_SYSCOLORS) { - return g_psi->ahbrSystem[nIndex]; + return gpsi->ahbrSystem[nIndex]; } SetLastError(ERROR_INVALID_PARAMETER); Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Sun Aug 16 00:57:32 2009 @@ -316,7 +316,7 @@ // "Servers call NotifyWinEvent to announce the event to the system after the // event has occurred; they must never notify the system of an event before // the event has occurred." msdn on NotifyWinEvent. - if (g_psi->dwInstalledEventHooks & GetMaskFromEvent(event)) // Check to see. + if (gpsi->dwInstalledEventHooks & GetMaskFromEvent(event)) // Check to see. NtUserNotifyWinEvent(event, hwnd, idObject, idChild); } @@ -371,7 +371,7 @@ { if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) { - return (g_psi->dwInstalledEventHooks & GetMaskFromEvent(event)) != 0; + return (gpsi->dwInstalledEventHooks & GetMaskFromEvent(event)) != 0; } return FALSE; } Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] Sun Aug 16 00:57:32 2009 @@ -703,7 +703,7 @@ } else { - ColorBits = g_psi->BitsPixel; + ColorBits = gpsi->BitsPixel; } if(bIcon)

1 0

[jimtabor] 42720: - Use the correct flag for hidden popup actions.
by jimtabor＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: jimtabor Date: Sun Aug 16 00:24:26 2009 New Revision: 42720 URL: http://svn.reactos.org/svn/reactos?rev=42720&view=rev Log: - Use the correct flag for hidden popup actions. Modified: trunk/reactos/subsystems/win32/win32k/include/winpos.h trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winpos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winpos.h [iso-8859-1] Sun Aug 16 00:24:26 2009 @@ -4,8 +4,6 @@ /* Undocumented flags. */ #define SWP_NOCLIENTMOVE 0x0800 #define SWP_NOCLIENTSIZE 0x1000 - -#define WIN_NEEDS_SHOW_OWNEDPOPUP (0x00000140) #define IntPtInWindow(WndObject,x,y) \ ((x) >= (WndObject)->Wnd->rcWindow.left && \ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Sun Aug 16 00:24:26 2009 @@ -133,12 +133,12 @@ if (LOWORD(lParam)) { if (wParam) - {// WNDS_HIDDENPOPUP - if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) break; - Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP; + { + if (!(Wnd->state & WNDS_HIDDENPOPUP)) break; + Wnd->state &= ~WNDS_HIDDENPOPUP; } else - Window->Flags |= WIN_NEEDS_SHOW_OWNEDPOPUP; + Wnd->state |= WNDS_HIDDENPOPUP; co_WinPosShowWindow(Window, wParam ? SW_SHOWNOACTIVATE : SW_HIDE); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Aug 16 00:24:26 2009 @@ -4974,7 +4974,7 @@ if (fShow) { - if (pWnd->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP) + if (pWnd->Wnd->state & WNDS_HIDDENPOPUP) { /* In Windows, ShowOwnedPopups(TRUE) generates * WM_SHOWWINDOW messages with SW_PARENTOPENING,

1 0

[mkupfer] 42719: first part of German translation of rapps entries.
by mkupfer＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: mkupfer Date: Sun Aug 16 00:17:30 2009 New Revision: 42719 URL: http://svn.reactos.org/svn/reactos?rev=42719&view=rev Log: first part of German translation of rapps entries. Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/audiograbber.txt trunk/reactos/base/applications/rapps/rapps/diablo2.txt trunk/reactos/base/applications/rapps/rapps/dosbox.txt trunk/reactos/base/applications/rapps/rapps/firefox2.txt trunk/reactos/base/applications/rapps/rapps/firefox3.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] Sun Aug 16 00:17:30 2009 @@ -10,3 +10,8 @@ URLSite = http://www.abiword.org URLDownload = http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.… CDPath = none + +[Section.0407] +Licence = Unbekannt +Description = Textverarbeitung +Size = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] Sun Aug 16 00:17:30 2009 @@ -10,3 +10,11 @@ URLSite = Unknown URLDownload = http://svn.reactos.org/packages/ac97_vbox.exe CDPath = none + + +[Section.0407] +Name = AC97 Treiber fÃ¼r VirtualBox +Licence = Unbekannt +Description = Entpacken in das "ReactOS"-Verzeichnis und ReactOS zweimal neustarten. +Size = Unbekannt +URLSize = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] Sun Aug 16 00:17:30 2009 @@ -10,3 +10,10 @@ URLSite = Unknown URLDownload = http://www.audiograbber.de/files/4898276276/agsetup183se.exe CDPath = none + + +[Section.0407] +Licence = Unbekannt +Description = Ein sehr guter CD-Ripper/Audio-Datei-Konverter. +URLSize = Unbekannt +Size = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] Sun Aug 16 00:17:30 2009 @@ -10,3 +10,10 @@ URLSite = Unknown URLDownload = http://ftp.freenet.de./pub/filepilot/windows/spiele/diabloiidemo.exe CDPath = none + + +[Section.0407] +Licence = Unbekannt +Description = Diablo 2 Shareware. zeckensacks glide wrapper wird zum AusfÃ¼hren benÃ¶tigt. +URLSite = Unbekannt +Size = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] Sun Aug 16 00:17:30 2009 @@ -10,3 +10,10 @@ URLSite = Unknown URLDownload = http://ovh.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.72-win32-installer… CDPath = none + + +[Section.0407] +Licence = Unbekannt +Description = DOSBox ist ein DOS Emulator. +URLSite = Unbekannt +Size = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] Sun Aug 16 00:17:30 2009 @@ -16,3 +16,10 @@ Size = 6.4M URLSite = http://www.mozilla-europe.org/ru/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32… + + +[Section.0407] +Description = Der populÃ¤rste und einer der besten freien Webbrowser. +Size = 5.5M +URLSite = http://www.mozilla-europe.org/de/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32… Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] Sun Aug 16 00:17:30 2009 @@ -16,3 +16,10 @@ Size = 7.4M URLSite = http://www.mozilla-europe.org/ru/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/ru… + + +[Section.0407] +Description = Der populÃ¤rste und einer der besten freien Webbrowser. +Size = 7.0M +URLSite = http://www.mozilla-europe.org/de/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/de… Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] Sun Aug 16 00:17:30 2009 @@ -10,3 +10,9 @@ URLSite = Unknown URLDownload = http://ovh.dl.sourceforge.net/sourceforge/fbc/FreeBASIC-v0.18.4b-win32.exe CDPath = none + + +[Section.0407] +Licence = Unbekannt +Description = Open Source BASIC Compiler. Die BASIC Syntax ist kompatibel zu QBASIC. +Size = Unbekannt

1 0

[gschneider] 42718: Apply changes from r42521 to DefWndProcW as well See issue #4791 for more details.
by gschneider＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: gschneider Date: Sun Aug 16 00:06:09 2009 New Revision: 42718 URL: http://svn.reactos.org/svn/reactos?rev=42718&view=rev Log: Apply changes from r42521 to DefWndProcW as well See issue #4791 for more details. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sun Aug 16 00:06:09 2009 @@ -2037,12 +2037,18 @@ { case WM_NCCREATE: { - LPCREATESTRUCTW cs = (LPCREATESTRUCTW)lParam; - /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) - * may have child window IDs instead of window name */ - - DefSetText(hWnd, cs->lpszName, FALSE); - Result = 1; + if (lParam) + { + LPCREATESTRUCTW cs = (LPCREATESTRUCTW)lParam; + /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) + * may have child window IDs instead of window name */ + + if (HIWORD(cs->lpszName)) + { + DefSetText(hWnd, cs->lpszName, FALSE); + } + Result = 1; + } break; }

1 0

[fireball] 42717: - Get wine/class.c back to using Wine-styled linked list functions/macros for consistency: either all user server code uses NT linked lists or Wine linked lists. This fixes a problem with window's classes list consistency. - Add Win32 process cleanup on its termination: delete the handles table and delete all classes. This fixes a problem of never terminating process, and occasionally fixes "New hardware found" wizard. Leaks--;
by fireball＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: fireball Date: Sat Aug 15 23:53:24 2009 New Revision: 42717 URL: http://svn.reactos.org/svn/reactos?rev=42717&view=rev Log: - Get wine/class.c back to using Wine-styled linked list functions/macros for consistency: either all user server code uses NT linked lists or Wine linked lists. This fixes a problem with window's classes list consistency. - Add Win32 process cleanup on its termination: delete the handles table and delete all classes. This fixes a problem of never terminating process, and occasionally fixes "New hardware found" wizard. Leaks--; Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h branches/arwinss/reactos/subsystems/win32/win32k/main/init.c branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c branches/arwinss/reactos/subsystems/win32/win32k/wine/class.c branches/arwinss/reactos/subsystems/win32/win32k/wine/directory.c branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c branches/arwinss/reactos/subsystems/win32/win32k/wine/object.c branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c branches/arwinss/reactos/subsystems/win32/win32k/wine/region.c branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c branches/arwinss/reactos/subsystems/win32/win32k/wine/user.c branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -16,7 +16,7 @@ { PEPROCESS peProcess; W32HEAP_USER_MAPPING HeapMappings; - LIST_ENTRY Classes; /* window classes owned by the process */ + struct list Classes; /* window classes owned by the process */ struct handle_table *handles; /* handle entries */ struct event *idle_event; /* event for input idle */ struct msg_queue *queue; /* main message queue */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -19,6 +19,9 @@ /* Wine protocol */ #include <wine/server_protocol.h> + +/* Wine list implementation */ +#include <wine/list.h> /* RosGdi syscalls */ #include <ntrosgdi.h> Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -40,6 +40,7 @@ BOOLEAN Create) { PPROCESSINFO Win32Process; + struct handle_table *handles; DPRINT("Enter Win32kProcessCallback\n"); @@ -91,13 +92,25 @@ Win32Process->HeapMappings.UserMapping = UserBase; Win32Process->HeapMappings.Count = 1; - InitializeListHead(&Win32Process->Classes); + list_init(&Win32Process->Classes); Win32Process->handles = alloc_handle_table(Win32Process, 0); connect_process_winstation(Win32Process); } else { DPRINT("Destroying W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); + + UserEnterExclusive(); + + /* Delete its handles table */ + handles = Win32Process->handles; + Win32Process->handles = NULL; + if (handles) release_object(handles); + + /* Destroy its classes */ + destroy_process_classes(Win32Process); + + UserLeave(); } DPRINT("Leave Win32kProcessCallback\n"); Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/atom.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -23,8 +23,6 @@ #include <limits.h> -#undef LIST_FOR_EACH -#undef LIST_FOR_EACH_SAFE #include "object.h" #include "request.h" #include "handle.h" Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/class.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/class.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/class.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -23,8 +23,6 @@ #include <limits.h> -#undef LIST_FOR_EACH -#undef LIST_FOR_EACH_SAFE #include "object.h" #include "request.h" #include "user.h" @@ -32,18 +30,9 @@ #define NDEBUG #include <debug.h> -#undef LIST_FOR_EACH -/* iterate through the list using a list entry. - * elem is set to NULL if the list is run thru without breaking out or if list is empty. - */ -#define LIST_FOR_EACH(elem, list, type, field) \ - for ((elem) = CONTAINING_RECORD((list)->Flink, type, field); \ - &(elem)->field != (list) || (elem == NULL); \ - (elem) = CONTAINING_RECORD((elem)->field.Flink, type, field)) - struct window_class { - LIST_ENTRY entry; /* entry in process list */ + struct list entry; /* entry in process list */ PPROCESSINFO process; /* process owning the class */ int count; /* reference count */ int local; /* local class? */ @@ -70,36 +59,36 @@ /* other fields are initialized by caller */ /* local classes have priority so we put them first in the list */ - if (local) InsertHeadList( &process->Classes, &class->entry ); - else InsertTailList( &process->Classes, &class->entry ); + if (local) list_add_head( &process->Classes, &class->entry ); + else list_add_tail( &process->Classes, &class->entry ); return class; } static void destroy_class( struct window_class *class ) { - RemoveEntryList( &class->entry ); + list_remove( &class->entry ); ObDereferenceObject( class->process->peProcess ); ExFreePool( class ); } void destroy_process_classes( PPROCESSINFO process ) { - PLIST_ENTRY ptr; - - while (( ptr = process->Classes.Flink )) - { - struct window_class *class = CONTAINING_RECORD( ptr, struct window_class, entry ); + struct list *ptr; + + while (( ptr = list_head(&process->Classes) )) + { + struct window_class *class = LIST_ENTRY( ptr, struct window_class, entry ); destroy_class( class ); } } static struct window_class *find_class( PPROCESSINFO process, atom_t atom, mod_handle_t instance ) { - struct window_class *class; - - LIST_FOR_EACH( class, &process->Classes, struct window_class, entry) - { - //struct window_class *class = CONTAINING_RECORD( ptr, struct window_class, entry ); + struct list *ptr; + + LIST_FOR_EACH( ptr, &process->Classes ) + { + struct window_class *class = LIST_ENTRY( ptr, struct window_class, entry ); if (class->atom != atom) continue; if (!instance || !class->local || class->instance == instance) return class; } Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/directory.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/directory.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/directory.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -23,8 +23,6 @@ #include <limits.h> -#undef LIST_FOR_EACH -#undef LIST_FOR_EACH_SAFE #include "object.h" #include "request.h" #include "handle.h" Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -22,8 +22,6 @@ #include <limits.h> -#undef LIST_FOR_EACH -#undef LIST_FOR_EACH_SAFE #include "object.h" #include "request.h" #include "handle.h" Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -21,8 +21,6 @@ #include <win32k.h> -#undef LIST_FOR_EACH -#undef LIST_FOR_EACH_SAFE #include "object.h" #include "request.h" #include "user.h" Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -10,8 +10,6 @@ #include <win32k.h> -#undef LIST_FOR_EACH -#undef LIST_FOR_EACH_SAFE #include "object.h" #define WANT_REQUEST_HANDLERS Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/object.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/object.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/object.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -21,9 +21,6 @@ #include <win32k.h> #include <limits.h> - -#undef LIST_FOR_EACH -#undef LIST_FOR_EACH_SAFE #include "object.h" #define NDEBUG Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -21,9 +21,6 @@ #include <win32k.h> #include <limits.h> - -#undef LIST_FOR_EACH -#undef LIST_FOR_EACH_SAFE #include "object.h" #include "request.h" #include "handle.h" Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/region.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/region.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/region.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -76,8 +76,6 @@ #include <limits.h> -#undef LIST_FOR_EACH -#undef LIST_FOR_EACH_SAFE #include "object.h" #include "request.h" #include "handle.h" Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -10,8 +10,6 @@ #include <win32k.h> -#undef LIST_FOR_EACH -#undef LIST_FOR_EACH_SAFE #include "object.h" #include "request.h" Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/user.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/user.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/user.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -22,8 +22,6 @@ #include <limits.h> -#undef LIST_FOR_EACH -#undef LIST_FOR_EACH_SAFE #include "object.h" #include "request.h" #include "handle.h" Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -22,8 +22,6 @@ #include <limits.h> -#undef LIST_FOR_EACH -#undef LIST_FOR_EACH_SAFE #include "object.h" #include "request.h" #include "handle.h" Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -10,8 +10,6 @@ #include <win32k.h> -#undef LIST_FOR_EACH -#undef LIST_FOR_EACH_SAFE #include "object.h" #define NDEBUG Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] Sat Aug 15 23:53:24 2009 @@ -22,8 +22,6 @@ #include <limits.h> -#undef LIST_FOR_EACH -#undef LIST_FOR_EACH_SAFE #include "object.h" #include "request.h" #include "handle.h"

1 0

[jimtabor] 42716: - Fix define types.
by jimtabor＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: jimtabor Date: Sat Aug 15 23:28:02 2009 New Revision: 42716 URL: http://svn.reactos.org/svn/reactos?rev=42716&view=rev Log: - Fix define types. Modified: trunk/reactos/include/reactos/win32k/ntuser.h 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] Sat Aug 15 23:28:02 2009 @@ -350,8 +350,8 @@ #define WS_EX_UISTATEFOCUSRECTHIDDEN 0X80000000 /* Non SDK Styles */ -#define WS_MAXIMIZED 0X01000000 -#define WS_MINIMIZED 0X20000000 +#define WS_MAXIMIZED WS_MAXIMIZE +#define WS_MINIMIZED WS_MINIMIZE /* ExStyles2 */ #define WS_EX2_CLIPBOARDLISTENER 0X00000001

1 0

[hpoussin] 42715: Try to fix build after r42706
by hpoussin＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: hpoussin Date: Sat Aug 15 22:47:58 2009 New Revision: 42715 URL: http://svn.reactos.org/svn/reactos?rev=42715&view=rev Log: Try to fix build after r42706 Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Aug 15 22:47:58 2009 @@ -394,15 +394,7 @@ /* UpDown */ #define UPDOWN_CLASSA "msctls_updown32" -#if defined(__GNUC__) -# define UPDOWN_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ - 'u','p','d','o','w','n','3','2',0 } -#elif defined(_MSC_VER) # define UPDOWN_CLASSW L"msctls_updown32" -#else -static const WCHAR UPDOWN_CLASSW[] = { 'm','s','c','t','l','s','_', - 'u','p','d','o','w','n','3','2',0 }; -#endif #define UPDOWN_CLASS WINELIB_NAME_AW(UPDOWN_CLASS) typedef struct _UDACCEL @@ -463,15 +455,7 @@ /* Progress Bar */ #define PROGRESS_CLASSA "msctls_progress32" -#if defined(__GNUC__) -# define PROGRESS_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ - 'p','r','o','g','r','e','s','s','3','2',0 } -#elif defined(_MSC_VER) # define PROGRESS_CLASSW L"msctls_progress32" -#else -static const WCHAR PROGRESS_CLASSW[] = { 'm','s','c','t','l','s','_', - 'p','r','o','g','r','e','s','s','3','2',0 }; -#endif #define PROGRESS_CLASS WINELIB_NAME_AW(PROGRESS_CLASS) #define PBM_SETRANGE (WM_USER+1) @@ -720,13 +704,7 @@ /* Header control */ #define WC_HEADERA "SysHeader32" -#if defined(__GNUC__) -# define WC_HEADERW (const WCHAR []){ 'S','y','s','H','e','a','d','e','r','3','2',0 } -#elif defined(_MSC_VER) # define WC_HEADERW L"SysHeader32" -#else -static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2',0 }; -#endif #define WC_HEADER WINELIB_NAME_AW(WC_HEADER) #define HDS_HORZ 0x0000 @@ -1035,13 +1013,7 @@ /* Win32 5.1 Button Theme */ #define WC_BUTTONA "Button" -#if defined(__GNUC__) -# define WC_BUTTONW (const WCHAR []){ 'B','u','t','t','o','n',0 } -#elif defined(_MSC_VER) # define WC_BUTTONW L"Button" -#else -static const WCHAR WC_BUTTONW[] = { 'B','u','t','t','o','n',0 }; -#endif #define WC_BUTTON WINELIB_NAME_AW(WC_BUTTON) #define BCN_FIRST (0U-1250U) @@ -1060,15 +1032,8 @@ /* Toolbar */ #define TOOLBARCLASSNAMEA "ToolbarWindow32" -#if defined(__GNUC__) -# define TOOLBARCLASSNAMEW (const WCHAR []){ 'T','o','o','l','b','a','r', \ - 'W','i','n','d','o','w','3','2',0 } -#elif defined(_MSC_VER) # define TOOLBARCLASSNAMEW L"ToolbarWindow32" -#else -static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r', - 'W','i','n','d','o','w','3','2',0 }; -#endif + #define TOOLBARCLASSNAME WINELIB_NAME_AW(TOOLBARCLASSNAME) #define CMB_MASKED 0x02 @@ -1627,16 +1592,27 @@ /* Tool tips */ #define TOOLTIPS_CLASSA "tooltips_class32" -#if defined(__GNUC__) -# define TOOLTIPS_CLASSW (const WCHAR []){ 't','o','o','l','t','i','p','s','_', \ - 'c','l','a','s','s','3','2',0 } -#elif defined(_MSC_VER) # define TOOLTIPS_CLASSW L"tooltips_class32" -#else -static const WCHAR TOOLTIPS_CLASSW[] = { 't','o','o','l','t','i','p','s','_', - 'c','l','a','s','s','3','2',0 }; -#endif #define TOOLTIPS_CLASS WINELIB_NAME_AW(TOOLTIPS_CLASS) + +#if (_WIN32_WINNT >= 0x501) +#define BUTTON_IMAGELIST_ALIGN_LEFT 0 +#define BUTTON_IMAGELIST_ALIGN_RIGHT 1 +#define BUTTON_IMAGELIST_ALIGN_TOP 2 +#define BUTTON_IMAGELIST_ALIGN_BOTTOM 3 +#define BUTTON_IMAGELIST_ALIGN_CENTER 4 + +typedef struct +{ + HIMAGELIST himl; + RECT margin; + UINT uAlign; +} BUTTON_IMAGELIST, *PBUTTON_IMAGELIST; + +#define BCM_FIRST 0x1600 +#define BCM_GETIDEALSIZE (BCM_FIRST + 1) +#define BCM_SETIMAGELIST (BCM_FIRST + 2) +#endif /* _WIN32_WINNT */ #define INFOTIPSIZE 1024

1 0

[sginsberg] 42714: - Attempt to fix user32 build after 42706 -- user32 needs those undocumented TB_* too
by sginsberg＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: sginsberg Date: Sat Aug 15 22:11:04 2009 New Revision: 42714 URL: http://svn.reactos.org/svn/reactos?rev=42714&view=rev Log: - Attempt to fix user32 build after 42706 -- user32 needs those undocumented TB_* too Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Aug 15 22:11:04 2009 @@ -1231,14 +1231,14 @@ #define TB_GETSTRING WINELIB_NAME_AW(TB_GETSTRING) /* undocumented messages in Toolbar */ -#ifdef __WINESRC__ +/* #ifdef __WINESRC__ */ #define TB_UNKWN45D (WM_USER+93) #define TB_SETHOTITEM2 (WM_USER+94) #define TB_SETLISTGAP (WM_USER+96) #define TB_GETIMAGELISTCOUNT (WM_USER+98) #define TB_GETIDEALSIZE (WM_USER+99) #define TB_UNKWN464 (WM_USER+100) -#endif +/* #endif */ #define TB_GETMETRICS (WM_USER+101) #define TB_SETMETRICS (WM_USER+102)

1 0

[mkupfer] 42713: German translation of ReactOS Applications Manager
by mkupfer＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: mkupfer Date: Sat Aug 15 21:42:57 2009 New Revision: 42713 URL: http://svn.reactos.org/svn/reactos?rev=42713&view=rev Log: German translation of ReactOS Applications Manager Added: trunk/reactos/base/applications/rapps/lang/de-DE.rc (with props) Modified: trunk/reactos/base/applications/rapps/rsrc.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Added: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Sat Aug 15 21:42:57 2009 @@ -1,0 +1,167 @@ +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN + +IDR_MAINMENU MENU +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Einstellungen", ID_SETTINGS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Beenden", ID_EXIT + END + POPUP "&Programme" + BEGIN + MENUITEM "&Installieren", ID_INSTALL + MENUITEM "&Deinstallieren",ID_UNINSTALL + MENUITEM "&Ändern", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Aktualisieren", ID_REFRESH + END + POPUP "Hilfe" + BEGIN + MENUITEM "Hilfe", ID_HELP, GRAYED + MENUITEM "Über", ID_ABOUT + END +END + +IDR_LINKMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Öffne den Link in einem Browser", ID_OPEN_LINK + MENUITEM "&Kopiere den Link in die Zwischenablage", ID_COPY_LINK + END +END + +IDR_APPLICATIONMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Installieren", ID_INSTALL + MENUITEM "&Deinstallieren", ID_UNINSTALL + MENUITEM "&Ändern", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Aktualisieren", ID_REFRESH + END +END + +IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 320, 212, 60, 14 +END + +IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Herunterladen und installieren" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 320, 212, 60, 14 +END + +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "Herunterladen..." +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 + LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Abbrechen", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "Über" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + PUSHBUTTON "Schließen", IDOK, 133, 46, 50, 14 + ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_INSTALL "Installieren" + IDS_TOOLTIP_UNINSTALL "Deinstallieren" + IDS_TOOLTIP_MODIFY "Ändern" + IDS_TOOLTIP_SETTINGS "Einstellungen" + IDS_TOOLTIP_REFRESH "Aktualisieren" + IDS_TOOLTIP_EXIT "Beenden" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_NAME "Name" + IDS_APP_INST_VERSION "Version" + IDS_APP_DESCRIPTION "Beschreibung" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INFO_VERSION "\nVersion: " + IDS_INFO_DESCRIPTION "\nBeschreibung: " + IDS_INFO_PUBLISHER "\nPublisher: " + IDS_INFO_HELPLINK "\nHilfe-Link: " + IDS_INFO_HELPPHONE "\nHilfe-Telefonnr.: " + IDS_INFO_README "\nReadme: " + IDS_INFO_REGOWNER "\nregistrierter Eigentümer: " + IDS_INFO_PRODUCTID "\nProdukt-ID: " + IDS_INFO_CONTACT "\nKontaktt: " + IDS_INFO_UPDATEINFO "\nUpdate Information: " + IDS_INFO_INFOABOUT "\nInformation über: " + IDS_INFO_COMMENTS "\nKommentare: " + IDS_INFO_INSTLOCATION "\nInstallationsort: " + IDS_INFO_INSTALLSRC "\nInstallationsquelle: " + IDS_INFO_UNINSTALLSTR "\nDeinstallationsstring: " + IDS_INFO_MODIFYPATH "\nÄnderungspfad: " + IDS_INFO_INSTALLDATE "\nInstallationsdatum: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_AINFO_VERSION "\nVersion: " + IDS_AINFO_DESCRIPTION "\nBeschreibung: " + IDS_AINFO_SIZE "\nGröße: " + IDS_AINFO_URLSITE "\nHomepage: " + IDS_AINFO_LICENCE "\nLizenz: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAT_AUDIO "Audio" + IDS_CAT_DEVEL "Entwicklung" + IDS_CAT_DRIVERS "Treiber" + IDS_CAT_EDU "Edutainment" + IDS_CAT_ENGINEER "Technische Anwendungen" + IDS_CAT_FINANCE "Finanzen" + IDS_CAT_GAMES "Spiele & Spaß" + IDS_CAT_GRAPHICS "Grafik" + IDS_CAT_INTERNET "Internet & Netzwerk" + IDS_CAT_LIBS "Bibliotheken" + IDS_CAT_OFFICE "Büro" + IDS_CAT_OTHER "Sonstiges" + IDS_CAT_SCIENCE "Wissenschaft" + IDS_CAT_TOOLS "Werkzeuge" + IDS_CAT_VIDEO "Video" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS Anwendungsmanager" + IDS_SEARCH_TEXT "Suche..." + IDS_INSTALL "Installieren" + IDS_UNINSTALL "Deinstallieren" + IDS_MODIFY "Ändern" + IDS_APPS_COUNT "Anzahl der Anwendungen: %d" + IDS_WELCOME_TITLE "Willkommen zum ReactOS Anwendungsmanager!\n\n" + IDS_WELCOME_TEXT "Wählen Sie links eine Kategorie und dann eine Anwendung um sie zu installieren oder zu deinstallieren.\nReactOS Webseite: " + IDS_WELCOME_URL "http://www.reactos.org" + IDS_INSTALLED "Installiert" + IDS_AVAILABLEFORINST "Zur Installation verfügbar" + IDS_UPDATES "Updates" + IDS_APPLICATIONS "Anwendungen" + IDS_DOWNLOAD_FOLDER "Downloads" +END Propchange: trunk/reactos/base/applications/rapps/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… ============================================================================== --- trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] Sat Aug 15 21:42:57 2009 @@ -1,4 +1,5 @@ #include "lang/en-US.rc" +#include "lang/de-DE.rc" #include "lang/no-NO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Sat Aug 15 21:42:57 2009 @@ -262,7 +262,7 @@ BEGIN IDS_SHORT_CMD "Eingabeaufforderung.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" - IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Anwendungsmanager.lnk" IDS_SHORT_SERVICE "Dienste-Manager.lnk" IDS_SHORT_DEVICE "Geräte-Manager.lnk" IDS_SHORT_MPLAY32 "Multimedia Player.lnk"

1 0

[fireball] 42712: - Implement GetSystemPaletteEntries.
by fireball＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: fireball Date: Sat Aug 15 20:25:13 2009 New Revision: 42712 URL: http://svn.reactos.org/svn/reactos?rev=42712&view=rev Log: - Implement GetSystemPaletteEntries. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/enum.c branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Sat Aug 15 20:25:13 2009 @@ -363,10 +363,9 @@ } UINT CDECL RosDrv_GetSystemPaletteEntries( NTDRV_PDEVICE *physDev, UINT start, UINT count, - LPPALETTEENTRY entries ) -{ - UNIMPLEMENTED; - return 0; + LPPALETTEENTRY entries ) +{ + return RosGdiGetSystemPaletteEntries(physDev->hKernelDC, start, count, entries); } BOOL CDECL RosDrv_GetTextExtentExPoint( NTDRV_PDEVICE *physDev, LPCWSTR str, INT count, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/enum.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/enum.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/enum.c [iso-8859-1] Sat Aug 15 20:25:13 2009 @@ -86,11 +86,25 @@ return 0; } -UINT APIENTRY RosGdiGetSystemPaletteEntries( HDC physDev, UINT start, UINT count, - LPPALETTEENTRY entries ) +UINT APIENTRY RosGdiGetSystemPaletteEntries( HDC hDC, UINT uStart, UINT uCount, + LPPALETTEENTRY lpEntries ) { - UNIMPLEMENTED; - return 0; + UINT uRes = 0; + NTSTATUS Status = STATUS_SUCCESS; + + /* Call GRE function fully wrapped into SEH */ + _SEH2_TRY + { + uRes = GreGetSystemPaletteEntries(hDC, uStart, uCount, lpEntries); + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) return 0; + + return uRes; } BOOL APIENTRY RosGdiGetTextExtentExPoint( HDC physDev, LPCWSTR str, INT count, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c [iso-8859-1] Sat Aug 15 20:25:13 2009 @@ -231,11 +231,7 @@ UINT EntriesSize = 0; UINT Ret = 0; - if (Entries == 0) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } + if (!Entries) return 0; if (pe != NULL) { @@ -243,16 +239,12 @@ if (Entries != EntriesSize / sizeof(pe[0])) { /* Integer overflow! */ - SetLastWin32Error(ERROR_INVALID_PARAMETER); return 0; } } if (!(dc = DC_Lock(hDC))) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; - } palGDI = PALETTE_LockPalette(dc->hPalette); if (palGDI != NULL)

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