Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 13775: German translation fixes by Rouven Wessling
by weiden＠svn.reactos.com 28 Feb '05

28 Feb '05

German translation fixes by Rouven Wessling Modified: trunk/reactos/lib/cpl/desk/de.rc Added: trunk/reactos/subsys/system/sndvol32/De.rc Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc Modified: trunk/reactos/subsys/system/taskmgr/De.rc Modified: trunk/reactos/subsys/system/vmwinst/De.rc Modified: trunk/reactos/subsys/system/winlogon/De.rc _____ Modified: trunk/reactos/lib/cpl/desk/de.rc --- trunk/reactos/lib/cpl/desk/de.rc 2005-02-28 04:43:30 UTC (rev 13774) +++ trunk/reactos/lib/cpl/desk/de.rc 2005-02-28 14:38:02 UTC (rev 13775) @@ -1,5 +1,46 @@ LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Optionen" + BEGIN + MENUITEM "&Eigenschaften", IDC_PROPERTIES + MENUITEM "Erweiterte Ein&stellungen", IDC_ADVANCED_CONTROLS + MENUITEM SEPARATOR + MENUITEM "&Beenden", IDC_EXIT + END + POPUP "&?" + BEGIN + MENUITEM "&Hilfethemen", IDC_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&Info", IDC_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SNDVOL32 "Lautstõrke Einstellungen" + IDS_NOMIXERDEVICES "Es sind keine aktivien Mixer vorhanden! Die Anwendung wird jetzt beendet." +END + +IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Eigenschaften" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Mixer:", -1, 7,8,48,9 + COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP + GROUPBOX "Lautstõrke regeln f³r:", -1, 7,25,211,77 + PUSHBUTTON "Wie&dergabe", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Aufnahme", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "A&ndere:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED + COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + + PUSHBUTTON "OK", IDOK, 114,226,50,14 + PUSHBUTTON "Abbrechen", IDCANCEL, 168,226,50,14 +END +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Desktop" _____ Added: trunk/reactos/subsys/system/sndvol32/De.rc --- trunk/reactos/subsys/system/sndvol32/De.rc 2005-02-28 04:43:30 UTC (rev 13774) +++ trunk/reactos/subsys/system/sndvol32/De.rc 2005-02-28 14:38:02 UTC (rev 13775) @@ -0,0 +1,41 @@ +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Optionen" + BEGIN + MENUITEM "&Eigenschaften", IDC_PROPERTIES + MENUITEM "Erweiterte Ein&stellungen", IDC_ADVANCED_CONTROLS + MENUITEM SEPARATOR + MENUITEM "&Beenden", IDC_EXIT + END + POPUP "&?" + BEGIN + MENUITEM "&Hilfethemen", IDC_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&Info", IDC_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SNDVOL32 "Lautstõrke Einstellungen" + IDS_NOMIXERDEVICES "Es sind keine aktivien Mixer vorhanden! Die Anwendung wird jetzt beendet." +END + +IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Eigenschaften" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Mixer:", -1, 7,8,48,9 + COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP + GROUPBOX "Lautstõrke regeln f³r:", -1, 7,25,211,77 + PUSHBUTTON "Wie&dergabe", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Aufnahme", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "A&ndere:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED + COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + + PUSHBUTTON "OK", IDOK, 114,226,50,14 + PUSHBUTTON "Abbrechen", IDCANCEL, 168,226,50,14 +END Property changes on: trunk/reactos/subsys/system/sndvol32/De.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc --- trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-02-28 04:43:30 UTC (rev 13774) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-02-28 14:38:02 UTC (rev 13775) @@ -15,4 +15,4 @@ IDI_MAINAPP ICON DISCARDABLE resources/sndvol32.ico #include "En.rc" - +#include "DE.rc" _____ Modified: trunk/reactos/subsys/system/taskmgr/De.rc --- trunk/reactos/subsys/system/taskmgr/De.rc 2005-02-28 04:43:30 UTC (rev 13774) +++ trunk/reactos/subsys/system/taskmgr/De.rc 2005-02-28 14:38:02 UTC (rev 13775) @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////// ///// -// Deutsch (Austria) +// Deutsch (Austria) // resources by Klemens Friedl frik85 at hotmail dot com http://www.reactos.net.tc #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) @@ -166,7 +166,7 @@ CAPTION "Info ³ber Task-Manager" FONT 8, "Tahoma" BEGIN - CONTROL "Task Manager v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp(a)reactos.org)", + CONTROL "Task Manager v1.0\nCopyright (C) 1999 - 2001\nvon Brian Palmer (brianp(a)reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, 122,26 DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP @@ -183,7 +183,7 @@ MENU IDR_TASKMANAGER FONT 8, "Tahoma" BEGIN - CONTROL + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END @@ -192,7 +192,7 @@ FONT 8, "Tahoma" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | - LVS_SHOWSELALWAYS | WS_BORDER | + LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Neuer Task...",IDC_NEWTASK,187,189,53,14 PUSHBUTTON "&Wechseln zu",IDC_SWITCHTO,131,189,53,14,WS_DISABLED @@ -203,7 +203,7 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "Tahoma" BEGIN - CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT + CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -246,7 +246,7 @@ LTEXT "Systemcache",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 //46 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | @@ -278,7 +278,7 @@ FONT 8, "Tahoma" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING,7,7,233,177 PUSHBUTTON "Schlie?en",IDOK,171,189,69,14 @@ -369,7 +369,7 @@ LTEXT "Wõhlen Sie die Spalten aus, die auf der Registerkarte Prozesse angezeigt werden sollen.", IDC_STATIC,7,7,221,17 //181 CONTROL "&Name",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,7,28,56,10 + WS_DISABLED | WS_TABSTOP,7,28,56,10 CONTROL "&PID (Prozess-ID)",IDC_PID,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 CONTROL "&CPU-Auslastung",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | @@ -557,12 +557,12 @@ BLOCK "040904b0" BEGIN VALUE "CompanyName", "Brian Palmer\0" - VALUE "FileDescription", "Task Manager by Brian Palmer\0" + VALUE "FileDescription", "Task Manager von Brian Palmer\0" VALUE "FileVersion", "1.0.0.1\0" VALUE "InternalName", "taskmgr\0" VALUE "LegalCopyright", "Copyright ® Brian Palmer 2000\0" VALUE "OriginalFilename", "taskmgr.exe\0" - VALUE "ProductName", "Task Manager by Brian Palmer\0" + VALUE "ProductName", "Task Manager von Brian Palmer\0" VALUE "ProductVersion", "1.0.0.1\0" END END @@ -649,5 +649,5 @@ IDS_LICENSE "Dieses Programm ist kostenlos; Sie k÷nnen es frei verteilen mit od. ohne ?nderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation ver÷ffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spõtere Version (ihrer Wahl).\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." END -#endif // Deutsch (Austria) resources by Klemens Friedl +#endif // Deutsch (Austria) resources by Klemens Friedl //////////////////////////////////////////////////////////////////////// ///// _____ Modified: trunk/reactos/subsys/system/vmwinst/De.rc --- trunk/reactos/subsys/system/vmwinst/De.rc 2005-02-28 04:43:30 UTC (rev 13774) +++ trunk/reactos/subsys/system/vmwinst/De.rc 2005-02-28 14:38:02 UTC (rev 13775) @@ -11,7 +11,7 @@ IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Video Treiber Installation" +CAPTION "Grafikreiberinstallation" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "ReactOS wird nicht mit dem VMware(r) SVGA Treiber ausgeliefert.\n\nGehen Sie bitte zu 'VM' in der Men³leiste von VMware(r) Workstation und wõhlen Sie 'VMware Tools installieren...'\n\n\nKlicken Sie auf 'Weiter' um fortzufahren, ansonsten auf 'Abbrechen'",-1,25,25,225,85 @@ -19,7 +19,7 @@ IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Video Driver Installation" +CAPTION "Grafikreiberinstallation" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 _____ Modified: trunk/reactos/subsys/system/winlogon/De.rc --- trunk/reactos/subsys/system/winlogon/De.rc 2005-02-28 04:43:30 UTC (rev 13774) +++ trunk/reactos/subsys/system/winlogon/De.rc 2005-02-28 14:38:02 UTC (rev 13775) @@ -14,7 +14,7 @@ IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "User Interface Fehler" +CAPTION "Benutzer Interface Fehler" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Die Logon Benutzer Schnittstelle DLL %s konnte nicht geladen werden.", IDC_GINALOADFAILED, 39, 16, 156, 24 @@ -22,7 +22,7 @@ DEFPUSHBUTTON "Neusta&rt", 1, 80, 91, 68, 14 END -STRINGTABLE +STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Netzwerkverbindungen vorbereiten..." IDS_APPLYINGCOMPUTERSETTINGS "Computereinstellungen laden..." @@ -40,8 +40,7 @@ IDS_REACTOSISSTARTINGUP "ReactOS startet..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_FAILEDACTIVATEUSERSHELL "Winlogon konnte die Benutzershell nicht aktivieren!" END -

1 0

[ion] 13774: Finally a bootable version
by ion＠svn.reactos.com 28 Feb '05

28 Feb '05

Finally a bootable version Added: branches/alex_devel_branch/reactos/ _____ Copied: branches/alex_devel_branch/reactos (from rev 13773, trunk/reactos)

1 0

[arty] 13773: First shot at some primitives for powerpc. Untested yet.
by arty＠svn.reactos.com 28 Feb '05

28 Feb '05

First shot at some primitives for powerpc. Untested yet. Added: trunk/reactos/ntoskrnl/include/internal/powerpc/ Added: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h _____ Added: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h --- trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h 2005-02-27 22:55:54 UTC (rev 13772) +++ trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h 2005-02-28 00:26:28 UTC (rev 13773) @@ -0,0 +1,140 @@ +/* + * ReactOS kernel + * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#ifndef __NTOSKRNL_INCLUDE_INTERNAL_POWERPC_KE_H +#define __NTOSKRNL_INCLUDE_INTERNAL_POWERPC_KE_H + +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +/* Possible values for KTHREAD's NpxState */ +#define NPX_STATE_INVALID 0x01 +#define NPX_STATE_VALID 0x02 +#define NPX_STATE_DIRTY 0x04 + +#ifndef __ASM__ + +typedef struct _KTRAP_FRAME +{ +} KTRAP_FRAME, *PKTRAP_FRAME; + +typedef struct _KIRQ_TRAPFRAME +{ +} KIRQ_TRAPFRAME, *PKIRQ_TRAPFRAME; + +extern ULONG KePPCCacheAlignment; + +struct _KPCR; +VOID +KiInitializeGdt(struct _KPCR* Pcr); +VOID +KiPPCApplicationProcessorInitializeTSS(VOID); +VOID +KiPPCBootInitializeTSS(VOID); +VOID +KiGdtPrepareForApplicationProcessorInit(ULONG Id); +VOID +KiPPCInitializeLdt(VOID); +VOID +KiPPCSetProcessorFeatures(VOID); +ULONG KeAllocateGdtSelector(ULONG Desc[2]); +VOID KeFreeGdtSelector(ULONG Entry); +VOID +NtEarlyInitVdm(VOID); + +#ifdef CONFIG_SMP +#define LOCK "isync ; " +#else +#define LOCK "" +#endif + + +static inline LONG KePPCTestAndClearBit(ULONG BitPos, volatile PULONG Addr) +{ + ULONG OldValue, NewValue; + + __asm__ __volatile__ ("lwarx %0,0,%1" + : "=r" (OldValue), "=r" (*Addr) + : + : "memory"); + + NewValue = OldValue & ~(1<<BitPos); + + __asm__ __volatile__ ("stwcx. %0,0,%3\n\t" + "beq success\n\t" + "add %2,0,%1\n" + "success:\n\t" + "isync\n\t" + : "=r" (NewValue), "=r" (OldValue) + : "=w" (NewValue), "=w" (*Addr) + : "memory"); + + return NewValue & (1 << BitPos); +} + +static inline LONG KePPCTestAndSetBit(ULONG BitPos, volatile PULONG Addr) +{ + ULONG OldValue, NewValue; + + __asm__ __volatile__ ("lwarx %0,0,%1" + : "=r" (OldValue), "=r" (*Addr) + : + : "memory"); + + NewValue = OldValue | (1<<BitPos); + + __asm__ __volatile__ ("stwcx. %0,0,%3\n\t" + "beq success\n\t" + "add %2,0,%1\n" + "success:\n\t" + "isync\n\t" + : "=r" (NewValue), "=r" (OldValue) + : "=w" (NewValue), "=w" (*Addr) + : "memory"); + + return NewValue & (1 << BitPos); +} + +#define KePPCRdmsr(msr,val1,val2) __asm__ __volatile__("mfmsr 2") + +#define KePPCWrmsr(msr,val1,val2) __asm__ __volatile__("mtmsr 3") + + +#define KePPCDisableInterrupts() \ +__asm__ __volatile__("mfmsr 0\n\t" \ + "li 8,0x7fff\n\t" \ + "and 0,8,0\n\t" \ + "mtmsr 0\n\t") + +#define KePPCEnableInterrupts() \ + __asm__ __volatile__("mfmsr 0\n\t" \ + "li 8,0x8000\n\t" \ + "or 0,8,0\n\t" \ + "mtmsr 0\n\t") + +#define KePPCHaltProcessor() ; + +#endif /* __ASM__ */ + +#define KeArchEraseFlags() +#define KeArchDisableInterrupts() KePPCDisableInterrupts() + +#endif /* __NTOSKRNL_INCLUDE_INTERNAL_POWERPC_KE_H */ + +/* EOF */

1 0

[sedwards] 13772: merge in Winehq changes to reduce noise
by sedwards＠svn.reactos.com 27 Feb '05

27 Feb '05

merge in Winehq changes to reduce noise Modified: trunk/reactos/tools/widl/ChangeLog Deleted: trunk/reactos/tools/widl/client.h Modified: trunk/reactos/tools/widl/parser.y Deleted: trunk/reactos/tools/widl/proxy.h Modified: trunk/reactos/tools/widl/server.c Deleted: trunk/reactos/tools/widl/server.h Modified: trunk/reactos/tools/widl/typelib.c Modified: trunk/reactos/tools/widl/widl.c Modified: trunk/reactos/tools/widl/widl.h Modified: trunk/reactos/tools/widl/y.tab.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-02-27 21:40:32 UTC (rev 13771) +++ trunk/reactos/tools/widl/ChangeLog 2005-02-27 22:55:54 UTC (rev 13772) @@ -1,5 +1,21 @@ ChangeLog +2005-02-27 sedwards + tools/widl/y.tab.c + tools/widl/parser.y + tools/widl/widl.c + tools/widl/widl.h + tools/widl/server.c + tools/widl/typelib.c + +Merge in Winehq changes to reduce noise. + + tools/widl/server.h + tools/widl/client.h + tools/widl/proxy.h + +Deleted unneeded headers. + 2005-02-26 ekohl tools/widl/server.c _____ Deleted: trunk/reactos/tools/widl/client.h --- trunk/reactos/tools/widl/client.h 2005-02-27 21:40:32 UTC (rev 13771) +++ trunk/reactos/tools/widl/client.h 2005-02-27 22:55:54 UTC (rev 13772) @@ -1,26 +0,0 @@ -/* - * IDL Compiler - * - * Copyright 2005 Eric Kohl - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WIDL_CLIENT_H -#define __WIDL_CLIENT_H - -extern void write_client(ifref_t *ifaces); - -#endif _____ Modified: trunk/reactos/tools/widl/parser.y --- trunk/reactos/tools/widl/parser.y 2005-02-27 21:40:32 UTC (rev 13771) +++ trunk/reactos/tools/widl/parser.y 2005-02-27 22:55:54 UTC (rev 13772) @@ -35,10 +35,7 @@ #include "utils.h" #include "parser.h" #include "header.h" -#include "proxy.h" #include "typelib.h" -#include "client.h" -#include "server.h" #if defined(YYBYACC) /* Berkeley yacc (byacc) doesn't seem to know about these */ _____ Deleted: trunk/reactos/tools/widl/proxy.h --- trunk/reactos/tools/widl/proxy.h 2005-02-27 21:40:32 UTC (rev 13771) +++ trunk/reactos/tools/widl/proxy.h 2005-02-27 22:55:54 UTC (rev 13772) @@ -1,26 +0,0 @@ -/* - * IDL Compiler - * - * Copyright 2002 Ove Kaaven - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WIDL_PROXY_H -#define __WIDL_PROXY_H - -extern void write_proxies(ifref_t *ifaces); - -#endif _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-02-27 21:40:32 UTC (rev 13771) +++ trunk/reactos/tools/widl/server.c 2005-02-27 22:55:54 UTC (rev 13772) @@ -255,6 +255,7 @@ default: error("Unknown/unsupported type: %s\n", type->name); + return 0; } } _____ Deleted: trunk/reactos/tools/widl/server.h --- trunk/reactos/tools/widl/server.h 2005-02-27 21:40:32 UTC (rev 13771) +++ trunk/reactos/tools/widl/server.h 2005-02-27 22:55:54 UTC (rev 13772) @@ -1,26 +0,0 @@ -/* - * IDL Compiler - * - * Copyright 2005 Eric Kohl - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WIDL_SERVER_H -#define __WIDL_SERVER_H - -extern void write_server(ifref_t *ifaces); - -#endif _____ Modified: trunk/reactos/tools/widl/typelib.c --- trunk/reactos/tools/widl/typelib.c 2005-02-27 21:40:32 UTC (rev 13771) +++ trunk/reactos/tools/widl/typelib.c 2005-02-27 22:55:54 UTC (rev 13772) @@ -144,7 +144,8 @@ if(match(t->name, "IDispatch")) return VT_DISPATCH; return VT_USERDEFINED; - + + case RPC_FC_ENUM16: case RPC_FC_STRUCT: case RPC_FC_PSTRUCT: return VT_USERDEFINED; _____ Modified: trunk/reactos/tools/widl/widl.c --- trunk/reactos/tools/widl/widl.c 2005-02-27 21:40:32 UTC (rev 13771) +++ trunk/reactos/tools/widl/widl.c 2005-02-27 22:55:54 UTC (rev 13772) @@ -36,7 +36,6 @@ #include "widl.h" #include "utils.h" #include "parser.h" -#include "proxy.h" #include "wine/wpp.h" /* future options to reserve characters for: */ _____ Modified: trunk/reactos/tools/widl/widl.h --- trunk/reactos/tools/widl/widl.h 2005-02-27 21:40:32 UTC (rev 13771) +++ trunk/reactos/tools/widl/widl.h 2005-02-27 22:55:54 UTC (rev 13772) @@ -60,4 +60,8 @@ extern FILE* header; +extern void write_proxies(ifref_t *ifaces); +extern void write_client(ifref_t *ifaces); +extern void write_server(ifref_t *ifaces); + #endif _____ Modified: trunk/reactos/tools/widl/y.tab.c --- trunk/reactos/tools/widl/y.tab.c 2005-02-27 21:40:32 UTC (rev 13771) +++ trunk/reactos/tools/widl/y.tab.c 2005-02-27 22:55:54 UTC (rev 13772) @@ -164,10 +164,7 @@ #include "utils.h" #include "parser.h" #include "header.h" -#include "proxy.h" #include "typelib.h" -#include "client.h" -#include "server.h" #if defined(YYBYACC) /* Berkeley yacc (byacc) doesn't seem to know about these */

1 0

[frik85] 13771: Add support for explorer to load the desk.cpl when right clicking on background.
by frik85＠svn.reactos.com 27 Feb '05

27 Feb '05

Add support for explorer to load the desk.cpl when right clicking on background. Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp Modified: trunk/reactos/subsys/system/explorer/explorer_intres.h Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc _____ Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp --- trunk/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-02-27 21:31:07 UTC (rev 13770) +++ trunk/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-02-27 21:40:32 UTC (rev 13771) @@ -612,6 +612,7 @@ hr = pcm->QueryContextMenu(hmenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST-1, CMF_NORMAL|CMF_EXPLORE); if (SUCCEEDED(hr)) { + AppendMenu(hmenu, 0, FCIDM_SHVIEWLAST-3, ResString(IDS_PROPERTIES_EXPLORER)); AppendMenu(hmenu, MF_SEPARATOR, 0, NULL); AppendMenu(hmenu, 0, FCIDM_SHVIEWLAST-1, ResString(IDS_ABOUT_EXPLORER)); @@ -619,6 +620,24 @@ _cm_ifs.reset(); + if (idCmd == FCIDM_SHVIEWLAST-3) { + ShellExecute (_hwnd, _T("open"), _T("c:\\reactos\\system32\\rundll32.exe shell32.dll,Control_RunDLL desk.cpl,,0"), NULL, NULL, SW_SHOWNORMAL); + + + //explorer_about(_hwnd); + //system("c:\\reactos\\system32\\cmd.exe"); + + //ShellExecute (_hwnd, _T("open"), _T("%SystemRoot%\\system32\\cmd.exe"), NULL, NULL, SW_SHOWNORMAL); + + //ShellExecute(NULL,"open","c:\\windows\\system32\\cmd.exe",NULL,NULL,SW _SHOWNORMAL); + //WCHAR* pFile="%SystemRoot%\system32\cmd.exe"; + //int rcode; + //TCHAR pFile[256]; + //strcopy("%SystemRoot%\\system32\\cmd.exe",pFile); + //ShellExecute(NULL, NULL, pFile, NULL, "C:\\", SW_SHOW); + //HINSTANCE rcode=ShellExecute(NULL, "open", pFile, NULL, "C:\\", SW_SHOW); + //ShellExecute(hwnd, __TEXT("open"), __TEXT("%SystemRoot%\system32\cmd.exe"), __TEXT("c:\"), SH_SHOW); + } if (idCmd == FCIDM_SHVIEWLAST-1) { explorer_about(_hwnd); } else if (idCmd) { _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.h --- trunk/reactos/subsys/system/explorer/explorer_intres.h 2005-02-27 21:31:07 UTC (rev 13770) +++ trunk/reactos/subsys/system/explorer/explorer_intres.h 2005-02-27 21:40:32 UTC (rev 13771) @@ -46,6 +46,7 @@ #define IDS_NOTIFY_AUTOHIDE 42 #define IDS_SHOW_HIDDEN_ICONS 43 #define IDS_HIDE_ICONS 44 +#define IDS_PROPERTIES_EXPLORER 45 #define IDI_REACTOS 100 #define IDI_EXPLORER 101 #define IDI_STARTMENU 102 _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-02-27 21:31:07 UTC (rev 13770) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-02-27 21:40:32 UTC (rev 13771) @@ -1103,6 +1103,7 @@ IDS_ALL_USERS "All Users\\" IDS_SEARCH "Search" IDS_ABOUT_EXPLORER "&About Explorer..." + IDS_PROPERTIES_EXPLORER "&Properties" IDS_LAUNCH_MANY_PROGRAMS "You have selected more than one program.\nAre you sure you want to launch all of them?" IDS_DESKTOPBAR_SETTINGS "Desktop Settings"

1 0

[frik85] 13770: update files (rundll32 moved)
by frik85＠svn.reactos.com 27 Feb '05

27 Feb '05

update files (rundll32 moved) Modified: trunk/reactos/Makefile Modified: trunk/reactos/apps/utils/Makefile Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-02-27 21:22:04 UTC (rev 13769) +++ trunk/reactos/Makefile 2005-02-27 21:31:07 UTC (rev 13770) @@ -104,7 +104,7 @@ # System applications # autochk cmd format services setup usetup welcome winlogon msiexec SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec regedt32 regsvr32 \ - reporterror services setup taskmgr userinit usetup welcome vmwinst \ + reporterror services setup taskmgr userinit usetup welcome vmwinst rundll32 \ winlogon regedit winefile notepad reactos lsass # System services _____ Modified: trunk/reactos/apps/utils/Makefile --- trunk/reactos/apps/utils/Makefile 2005-02-27 21:22:04 UTC (rev 13769) +++ trunk/reactos/apps/utils/Makefile 2005-02-27 21:31:07 UTC (rev 13770) @@ -9,7 +9,7 @@ # Console system utilities # cabman cat net objdir partinfo pice ps sc stats -UTIL_APPS = cat objdir partinfo pnpdump sc shutdown stats tickcount consw rundll32 ps +UTIL_APPS = cat objdir partinfo pnpdump sc shutdown stats tickcount consw ps UTIL_NET_APPS = arp finger ftp ipconfig netstat ping route telnet whois _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-02-27 21:22:04 UTC (rev 13769) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-02-27 21:31:07 UTC (rev 13770) @@ -152,6 +152,7 @@ subsys\system\regedt32\regedt32.exe 1 subsys\system\regsvr32\regsvr32.exe 1 subsys\system\reporterror\reporterror.exe 1 +subsys\system\rundll32\rundll32.exe 1 subsys\system\services\services.exe 1 subsys\system\setup\setup.exe 1 subsys\system\taskmgr\taskmgr.exe 1

1 0

[frik85] 13769: move rundll32
by frik85＠svn.reactos.com 27 Feb '05

27 Feb '05

move rundll32 Deleted: trunk/reactos/apps/utils/rundll32/ Added: trunk/reactos/subsys/system/rundll32/ _____ Copied: trunk/reactos/subsys/system/rundll32 (from rev 13767, trunk/reactos/apps/utils/rundll32)

1 0

[jimtabor] 13768: Check for removable media and Partition length is 0, for DiskClassCheckReadWrite.
by jimtabor＠svn.reactos.com 27 Feb '05

27 Feb '05

Check for removable media and Partition length is 0, for DiskClassCheckReadWrite. Modified: trunk/reactos/drivers/storage/disk/disk.c _____ Modified: trunk/reactos/drivers/storage/disk/disk.c --- trunk/reactos/drivers/storage/disk/disk.c 2005-02-27 20:38:36 UTC (rev 13767) +++ trunk/reactos/drivers/storage/disk/disk.c 2005-02-27 21:17:24 UTC (rev 13768) @@ -406,10 +406,26 @@ return(STATUS_INVALID_PARAMETER); } + + IrpStack = IoGetCurrentIrpStackLocation(Irp); EndingOffset.QuadPart = IrpStack->Parameters.Read.ByteOffset.QuadPart + IrpStack->Parameters.Read.Length; + + DPRINT("Ending %I64d, and RealEnding %I64d! PartSize %I64d\n",EndingOffset.QuadPart, + DeviceExtension->PartitionLength.QuadPart, + DeviceExtension->PartitionLength.QuadPart / + DeviceExtension->DiskGeometry->BytesPerSector); + + if ((DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) && + (DeviceExtension->DiskGeometry->MediaType == RemovableMedia)) + { +/* Assume if removable media and if Partition length is 0, Partition not built yet! */ + if (DeviceExtension->PartitionLength.QuadPart == 0) + return(STATUS_SUCCESS); + } + if (EndingOffset.QuadPart > DeviceExtension->PartitionLength.QuadPart) { Irp->IoStatus.Status = STATUS_INVALID_PARAMETER;

1 0

[hbirr] 13767: Do only signal the other side of the pipe if the pipe is connected.
by hbirr＠svn.reactos.com 27 Feb '05

27 Feb '05

Do only signal the other side of the pipe if the pipe is connected. Modified: trunk/reactos/drivers/fs/np/rw.c _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2005-02-27 17:03:00 UTC (rev 13766) +++ trunk/reactos/drivers/fs/np/rw.c 2005-02-27 20:38:36 UTC (rev 13767) @@ -102,7 +102,10 @@ if (Fcb->ReadDataAvailable == 0) { KeResetEvent(&Fcb->Event); - KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); + if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE) + { + KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); + } KeReleaseSpinLock(&Fcb->DataListLock, OldIrql); if (Information > 0) { @@ -190,7 +193,10 @@ if (Information > 0) { - KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); + if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE) + { + KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); + } break; } }

1 0

[royce] 13766: small efficiency fix
by royce＠svn.reactos.com 27 Feb '05

27 Feb '05

small efficiency fix Modified: trunk/reactos/lib/user32/windows/defwnd.c _____ Modified: trunk/reactos/lib/user32/windows/defwnd.c --- trunk/reactos/lib/user32/windows/defwnd.c 2005-02-27 15:46:46 UTC (rev 13765) +++ trunk/reactos/lib/user32/windows/defwnd.c 2005-02-27 17:03:00 UTC (rev 13766) @@ -487,7 +487,7 @@ WinPosGetMinMaxInfo(hwnd, NULL, NULL, &minTrack, &maxTrack); GetWindowRect(hwnd, &sizingRect); - GetWindowRect(hwnd, &unmodRect); + unmodRect = sizingRect; if (Style & WS_CHILD) { MapWindowPoints( 0, hWndParent, (LPPOINT)&sizingRect, 2 );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs