Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 35006: - Fix my broken indentation
by sginsberg＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: sginsberg Date: Fri Aug 1 09:18:52 2008 New Revision: 35006 URL: http://svn.reactos.org/svn/reactos?rev=35006&view=rev Log: - Fix my broken indentation Modified: trunk/reactos/dll/win32/kernel32/synch/event.c Modified: trunk/reactos/dll/win32/kernel32/synch/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/e… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/synch/event.c [iso-8859-1] Fri Aug 1 09:18:52 2008 @@ -80,7 +80,7 @@ return NULL; } - /* Set initial state and event type */ + /* Set initial state and event type */ InitialState = (dwFlags & CREATE_EVENT_INITIAL_SET) ? TRUE : FALSE; EventType = (dwFlags & CREATE_EVENT_MANUAL_RESET) ? NotificationEvent : SynchronizationEvent; @@ -130,11 +130,11 @@ { DWORD dwFlags = 0; - /* Set new flags */ + /* Set new flags */ if (bManualReset) dwFlags |= CREATE_EVENT_MANUAL_RESET; if (bInitialState) dwFlags |= CREATE_EVENT_INITIAL_SET; - /* Call the newer API */ + /* Call the newer API */ return CreateEventExA(lpEventAttributes, lpName, dwFlags,

1 0

[sginsberg] 35005: - Minor coding style improvement
by sginsberg＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: sginsberg Date: Fri Aug 1 09:12:32 2008 New Revision: 35005 URL: http://svn.reactos.org/svn/reactos?rev=35005&view=rev Log: - Minor coding style improvement Modified: trunk/reactos/dll/win32/kernel32/synch/event.c Modified: trunk/reactos/dll/win32/kernel32/synch/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/e… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/synch/event.c [iso-8859-1] Fri Aug 1 09:12:32 2008 @@ -9,7 +9,6 @@ /* INCLUDES *****************************************************************/ #include <k32.h> - #define NDEBUG #include <debug.h> @@ -73,13 +72,16 @@ /* Now check if we got a name */ if (lpName) RtlInitUnicodeString(&ObjectName, lpName); + /* Check for invalid flags */ if (dwFlags & ~(CREATE_EVENT_INITIAL_SET | CREATE_EVENT_MANUAL_RESET)) { + /* Fail */ SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - InitialState = (dwFlags & CREATE_EVENT_INITIAL_SET) != 0; + /* Set initial state and event type */ + InitialState = (dwFlags & CREATE_EVENT_INITIAL_SET) ? TRUE : FALSE; EventType = (dwFlags & CREATE_EVENT_MANUAL_RESET) ? NotificationEvent : SynchronizationEvent; /* Now convert the object attributes */ @@ -128,12 +130,11 @@ { DWORD dwFlags = 0; - if (bManualReset) - dwFlags |= CREATE_EVENT_MANUAL_RESET; - - if (bInitialState) - dwFlags |= CREATE_EVENT_INITIAL_SET; - + /* Set new flags */ + if (bManualReset) dwFlags |= CREATE_EVENT_MANUAL_RESET; + if (bInitialState) dwFlags |= CREATE_EVENT_INITIAL_SET; + + /* Call the newer API */ return CreateEventExA(lpEventAttributes, lpName, dwFlags, @@ -149,12 +150,11 @@ { DWORD dwFlags = 0; - if (bManualReset) - dwFlags |= CREATE_EVENT_MANUAL_RESET; - - if (bInitialState) - dwFlags |= CREATE_EVENT_INITIAL_SET; - + /* Set new flags */ + if (bManualReset) dwFlags |= CREATE_EVENT_MANUAL_RESET; + if (bInitialState) dwFlags |= CREATE_EVENT_INITIAL_SET; + + /* Call the newer API */ return CreateEventExW(lpEventAttributes, lpName, dwFlags,

1 0

[dreimer] 35004: Rename the Norwegian RC Files to no-NO.rc, which is correct according to MSDN. Bug 3516: Translate source archive by Lars Martin (lars_martin4@hotmail.com)
by dreimer＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: dreimer Date: Fri Aug 1 08:08:15 2008 New Revision: 35004 URL: http://svn.reactos.org/svn/reactos?rev=35004&view=rev Log: Rename the Norwegian RC Files to no-NO.rc, which is correct according to MSDN. Bug 3516: Translate source archive by Lars Martin (lars_martin4(a)hotmail.com) Added: trunk/reactos/base/applications/cacls/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/cacls/lang/nb-NO.rc trunk/reactos/base/applications/calc/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/calc/lang/nb-NO.rc trunk/reactos/base/applications/charmap/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/charmap/lang/nb-NO.rc trunk/reactos/base/applications/cmdutils/find/lang/no-NO.rc (with props) trunk/reactos/base/applications/cmdutils/more/lang/no-NO.rc (with props) trunk/reactos/base/applications/dxdiag/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/dxdiag/lang/nb-NO.rc trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc (contents, props changed) - copied, changed from r34979, trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc trunk/reactos/base/applications/games/winemine/lang/no-NO.rc (contents, props changed) - copied, changed from r34979, trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc trunk/reactos/base/applications/kbswitch/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/kbswitch/lang/nb-NO.rc trunk/reactos/base/applications/logoff/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/logoff/lang/nb-NO.rc trunk/reactos/base/applications/mmc/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/mmc/lang/nb_NO.rc trunk/reactos/base/applications/msconfig/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/msconfig/lang/nb-NO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/mscutils/devmgmt/lang/nb-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/mscutils/eventvwr/lang/nb-NO.rc trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/mscutils/servman/lang/nb-NO.rc trunk/reactos/base/applications/mstsc/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/mstsc/lang/nb-NO.rc trunk/reactos/base/applications/network/ipconfig/lang/no-NO.rc (with props) trunk/reactos/base/applications/notepad/lang/no-NO.rc (contents, props changed) - copied, changed from r34979, trunk/reactos/base/applications/notepad/lang/nb-NO.rc trunk/reactos/base/applications/regedit/clb/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/regedit/clb/lang/nb-NO.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/regedit/lang/nb-NO.rc trunk/reactos/base/applications/shutdown/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/shutdown/lang/nb-NO.rc trunk/reactos/base/applications/sndvol32/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/sndvol32/lang/nb-NO.rc trunk/reactos/base/applications/taskmgr/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/taskmgr/lang/nb-NO.rc trunk/reactos/base/applications/winhlp32/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc trunk/reactos/base/setup/reactos/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/setup/reactos/lang/nb-NO.rc trunk/reactos/base/setup/vmwinst/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc trunk/reactos/base/setup/welcome/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/setup/welcome/lang/nb-NO.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/shell/cmd/lang/nb-NO.rc trunk/reactos/base/shell/explorer-new/lang/no-NO.rc (with props) trunk/reactos/base/system/expand/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/system/expand/lang/nb-NO.rc trunk/reactos/base/system/format/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/system/format/lang/nb-NO.rc trunk/reactos/base/system/regsvr32/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/system/regsvr32/lang/nb-NO.rc trunk/reactos/base/system/rundll32/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/system/rundll32/lang/nb-NO.rc trunk/reactos/base/system/userinit/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/system/userinit/lang/nb-NO.rc trunk/reactos/base/system/winlogon/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/base/system/winlogon/lang/nb-NO.rc trunk/reactos/boot/freeldr/fdebug/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/boot/freeldr/fdebug/lang/nb-NO.rc trunk/reactos/dll/cpl/access/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/appwiz-new/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/console/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/desk/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/input/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/intl/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/joy/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/liccpa/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/main/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/ncpa/lang/no-NO.rc (contents, props changed) - copied, changed from r34979, trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc trunk/reactos/dll/cpl/powercfg/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/timedate/lang/no-NO.rc (with props) trunk/reactos/dll/win32/devmgr/lang/no-NO.rc (with props) trunk/reactos/dll/win32/msgina/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/dll/win32/msgina/lang/nb-NO.rc trunk/reactos/dll/win32/netid/lang/no-NO.rc (with props) trunk/reactos/dll/win32/newdev/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/dll/win32/newdev/lang/nb-NO.rc trunk/reactos/dll/win32/setupapi/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/dll/win32/setupapi/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc (contents, props changed) - copied, changed from r34979, trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shimgvw/lang/de-DE.rc (with props) trunk/reactos/dll/win32/shimgvw/lang/no-NO.rc (with props) trunk/reactos/dll/win32/syssetup/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc trunk/reactos/dll/win32/user32/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/dll/win32/user32/lang/nb-NO.rc trunk/reactos/dll/win32/userenv/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/dll/win32/userenv/lang/nb-NO.rc trunk/reactos/subsystems/ntvdm/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/reactos/subsystems/ntvdm/lang/nb-NO.rc Removed: trunk/reactos/base/applications/cacls/lang/nb-NO.rc trunk/reactos/base/applications/calc/lang/nb-NO.rc trunk/reactos/base/applications/charmap/lang/nb-NO.rc trunk/reactos/base/applications/dxdiag/lang/nb-NO.rc trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc trunk/reactos/base/applications/kbswitch/lang/nb-NO.rc trunk/reactos/base/applications/logoff/lang/nb-NO.rc trunk/reactos/base/applications/mmc/lang/nb_NO.rc trunk/reactos/base/applications/msconfig/lang/nb-NO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/nb-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/nb-NO.rc trunk/reactos/base/applications/mscutils/servman/lang/nb-NO.rc trunk/reactos/base/applications/mstsc/lang/nb-NO.rc trunk/reactos/base/applications/notepad/lang/nb-NO.rc trunk/reactos/base/applications/regedit/clb/lang/nb-NO.rc trunk/reactos/base/applications/regedit/lang/nb-NO.rc trunk/reactos/base/applications/shutdown/lang/nb-NO.rc trunk/reactos/base/applications/sndvol32/lang/nb-NO.rc trunk/reactos/base/applications/taskmgr/lang/nb-NO.rc trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc trunk/reactos/base/setup/reactos/lang/nb-NO.rc trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc trunk/reactos/base/setup/welcome/lang/nb-NO.rc trunk/reactos/base/shell/cmd/lang/nb-NO.rc trunk/reactos/base/system/expand/lang/nb-NO.rc trunk/reactos/base/system/format/lang/nb-NO.rc trunk/reactos/base/system/regsvr32/lang/nb-NO.rc trunk/reactos/base/system/rundll32/lang/nb-NO.rc trunk/reactos/base/system/userinit/lang/nb-NO.rc trunk/reactos/base/system/winlogon/lang/nb-NO.rc trunk/reactos/boot/freeldr/fdebug/lang/nb-NO.rc trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc trunk/reactos/dll/win32/msgina/lang/nb-NO.rc trunk/reactos/dll/win32/newdev/lang/nb-NO.rc trunk/reactos/dll/win32/setupapi/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc trunk/reactos/dll/win32/user32/lang/nb-NO.rc trunk/reactos/dll/win32/userenv/lang/nb-NO.rc trunk/reactos/subsystems/ntvdm/lang/nb-NO.rc Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/cmdutils/find/rsrc.rc trunk/reactos/base/applications/cmdutils/more/rsrc.rc trunk/reactos/base/applications/dxdiag/rsrc.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/applications/kbswitch/rsrc.rc trunk/reactos/base/applications/logoff/rsrc.rc trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/base/applications/network/ipconfig/ipconfig.rc trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/regedit/clb/rsrc.rc trunk/reactos/base/applications/regedit/rsrc.rc trunk/reactos/base/applications/shutdown/rsrc.rc trunk/reactos/base/applications/sndvol32/rsrc.rc trunk/reactos/base/applications/taskmgr/rsrc.rc trunk/reactos/base/applications/winhlp32/rsrc.rc trunk/reactos/base/setup/reactos/rsrc.rc trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/base/setup/welcome/rsrc.rc trunk/reactos/base/shell/cmd/cmd.rc trunk/reactos/base/shell/explorer-new/explorer.rc trunk/reactos/base/system/expand/rsrc.rc trunk/reactos/base/system/format/rsrc.rc trunk/reactos/base/system/regsvr32/rsrc.rc trunk/reactos/base/system/rundll32/rsrc.rc trunk/reactos/base/system/userinit/rsrc.rc trunk/reactos/base/system/winlogon/rsrc.rc trunk/reactos/boot/freeldr/fdebug/fdebug.rc trunk/reactos/dll/cpl/access/rsrc.rc trunk/reactos/dll/cpl/appwiz-new/rsrc.rc trunk/reactos/dll/cpl/appwiz/rsrc.rc trunk/reactos/dll/cpl/console/rsrc.rc trunk/reactos/dll/cpl/desk/rsrc.rc trunk/reactos/dll/cpl/hdwwiz/rsrc.rc trunk/reactos/dll/cpl/input/rsrc.rc trunk/reactos/dll/cpl/intl/rsrc.rc trunk/reactos/dll/cpl/joy/rsrc.rc trunk/reactos/dll/cpl/liccpa/rsrc.rc trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/mmsys/rsrc.rc trunk/reactos/dll/cpl/ncpa/rsrc.rc trunk/reactos/dll/cpl/powercfg/rsrc.rc trunk/reactos/dll/cpl/sysdm/rsrc.rc trunk/reactos/dll/cpl/timedate/rsrc.rc trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/netid/rsrc.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/setupapi/setupapi.rc trunk/reactos/dll/win32/shell32/shell32.rc trunk/reactos/dll/win32/shimgvw/rsrc.rc trunk/reactos/dll/win32/syssetup/syssetup.rc trunk/reactos/dll/win32/user32/user32.rc trunk/reactos/dll/win32/userenv/userenv.rc trunk/reactos/subsystems/ntvdm/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/base/applications/cacls/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… Removed: trunk/reactos/base/applications/calc/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… Removed: trunk/reactos/base/applications/charmap/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Added: trunk/reactos/base/applications/cmdutils/find/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/more/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/dxdiag/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… Removed: trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Copied: trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc (from r34979, trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Removed: trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Copied: trunk/reactos/base/applications/games/winemine/lang/no-NO.rc (from r34979, trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Removed: trunk/reactos/base/applications/kbswitch/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Removed: trunk/reactos/base/applications/logoff/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… Modified: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… Removed: trunk/reactos/base/applications/mmc/lang/nb_NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… Removed: trunk/reactos/base/applications/msconfig/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Removed: trunk/reactos/base/applications/mscutils/devmgmt/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/eventvwr/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/servman/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mstsc/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Added: trunk/reactos/base/applications/network/ipconfig/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Removed: trunk/reactos/base/applications/notepad/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Copied: trunk/reactos/base/applications/notepad/lang/no-NO.rc (from r34979, trunk/reactos/base/applications/notepad/lang/nb-NO.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Removed: trunk/reactos/base/applications/regedit/clb/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Removed: trunk/reactos/base/applications/regedit/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Removed: trunk/reactos/base/applications/shutdown/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Removed: trunk/reactos/base/applications/sndvol32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Removed: trunk/reactos/base/applications/taskmgr/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Removed: trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Removed: trunk/reactos/base/setup/reactos/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/nb… Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… Removed: trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/nb… Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… Removed: trunk/reactos/base/setup/welcome/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/nb… Modified: trunk/reactos/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/rsrc.rc… Modified: trunk/reactos/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rc?rev=… Removed: trunk/reactos/base/shell/cmd/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/nb-NO.… Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… Added: trunk/reactos/base/shell/explorer-new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Removed: trunk/reactos/base/system/expand/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/lang/nb… Modified: trunk/reactos/base/system/expand/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/rsrc.rc… Removed: trunk/reactos/base/system/format/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/nb… Modified: trunk/reactos/base/system/format/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/rsrc.rc… Removed: trunk/reactos/base/system/regsvr32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/rsrc.… Removed: trunk/reactos/base/system/rundll32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rsrc.… Removed: trunk/reactos/base/system/userinit/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/rsrc.… Removed: trunk/reactos/base/system/winlogon/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rsrc.… Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… Removed: trunk/reactos/boot/freeldr/fdebug/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/n… Added: trunk/reactos/dll/cpl/access/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/no-NO.… Modified: trunk/reactos/dll/cpl/access/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/rsrc.rc?rev… Added: trunk/reactos/dll/cpl/appwiz-new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/no… Modified: trunk/reactos/dll/cpl/appwiz-new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/rsrc.rc… Added: trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/no-NO.… Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… Added: trunk/reactos/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/no-NO… Modified: trunk/reactos/dll/cpl/console/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/rsrc.rc?re… Added: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… Modified: trunk/reactos/dll/cpl/desk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/rsrc.rc?rev=3… Added: trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.… Modified: trunk/reactos/dll/cpl/hdwwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/rsrc.rc?rev… Added: trunk/reactos/dll/cpl/input/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/no-NO.r… Modified: trunk/reactos/dll/cpl/input/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/rsrc.rc?rev=… Added: trunk/reactos/dll/cpl/intl/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/no-NO.rc… Modified: trunk/reactos/dll/cpl/intl/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/rsrc.rc?rev=3… Added: trunk/reactos/dll/cpl/joy/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/no-NO.rc?… Modified: trunk/reactos/dll/cpl/joy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/rsrc.rc?rev=35… Added: trunk/reactos/dll/cpl/liccpa/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/no-NO.… Modified: trunk/reactos/dll/cpl/liccpa/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/rsrc.rc?rev… Added: trunk/reactos/dll/cpl/main/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/no-NO.rc… Modified: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=3… Added: trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/no-NO.r… Modified: trunk/reactos/dll/cpl/mmsys/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/rsrc.rc?rev=… Removed: trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc… Copied: trunk/reactos/dll/cpl/ncpa/lang/no-NO.rc (from r34979, trunk/reactos/dll/cpl/ncpa/lang/nb-NO.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/no-NO.rc… Modified: trunk/reactos/dll/cpl/ncpa/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/rsrc.rc?rev=3… Added: trunk/reactos/dll/cpl/powercfg/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/no-N… Modified: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc.rc?r… Added: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… Modified: trunk/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/rsrc.rc?rev=… Added: trunk/reactos/dll/cpl/timedate/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/no-N… Modified: trunk/reactos/dll/cpl/timedate/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/rsrc.rc?r… Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… Added: trunk/reactos/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/no-N… Removed: trunk/reactos/dll/win32/msgina/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/nb-N… Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… Added: trunk/reactos/dll/win32/netid/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/no-NO… Modified: trunk/reactos/dll/win32/netid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/rsrc.rc?re… Removed: trunk/reactos/dll/win32/newdev/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/nb-N… Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… Removed: trunk/reactos/dll/win32/setupapi/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/nb… Modified: trunk/reactos/dll/win32/setupapi/setupapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Removed: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… Copied: trunk/reactos/dll/win32/shell32/lang/no-NO.rc (from r34979, trunk/reactos/dll/win32/shell32/lang/nb-NO.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Added: trunk/reactos/dll/win32/shimgvw/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/de-… Added: trunk/reactos/dll/win32/shimgvw/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/no-… Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… Removed: trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nb… Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… Removed: trunk/reactos/dll/win32/user32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/nb-N… Modified: trunk/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rc… Removed: trunk/reactos/dll/win32/userenv/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/nb-… Modified: trunk/reactos/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… Removed: trunk/reactos/subsystems/ntvdm/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/nb-N… Modified: trunk/reactos/subsystems/ntvdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/rsrc.rc?r…

1 0

[dreimer] 35003: Rename the Norwegian RC Files to no-NO.rc, which is correct according to MSDN.
by dreimer＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: dreimer Date: Fri Aug 1 07:48:34 2008 New Revision: 35003 URL: http://svn.reactos.org/svn/reactos?rev=35003&view=rev Log: Rename the Norwegian RC Files to no-NO.rc, which is correct according to MSDN. Added: trunk/rosapps/applications/imagesoft/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/rosapps/applications/imagesoft/lang/nb-NO.rc trunk/rosapps/applications/winfile/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/rosapps/applications/winfile/lang/nb-NO.rc trunk/rosapps/applications/write/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/rosapps/applications/write/lang/nb-NO.rc trunk/rosapps/templates/old_wordpad/lang/no-NO.rc (props changed) - copied unchanged from r34979, trunk/rosapps/templates/old_wordpad/lang/nb-NO.rc Removed: trunk/rosapps/applications/imagesoft/lang/nb-NO.rc trunk/rosapps/applications/winfile/lang/nb-NO.rc trunk/rosapps/applications/write/lang/nb-NO.rc trunk/rosapps/templates/old_wordpad/lang/nb-NO.rc Modified: trunk/rosapps/applications/imagesoft/rsrc.rc trunk/rosapps/applications/winfile/rsrc.rc trunk/rosapps/applications/write/rsrc.rc trunk/rosapps/templates/old_wordpad/rsrc.rc Removed: trunk/rosapps/applications/imagesoft/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… ============================================================================== --- trunk/rosapps/applications/imagesoft/lang/nb-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/imagesoft/lang/nb-NO.rc (removed) @@ -1,223 +1,0 @@ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "ImageSoft" - IDS_VERSION "v0.1" -END - -IDR_MAINMENU MENU -BEGIN - POPUP "&Fil" - BEGIN - MENUITEM "&Ny...", ID_NEW - MENUITEM "&Åpne...", ID_OPEN - MENUITEM SEPARATOR - MENUITEM "&Lukk\tCtrl+F4", ID_CLOSE, GRAYED - MENUITEM "L&ukk alt", ID_CLOSEALL, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Lagre", ID_SAVE, GRAYED - MENUITEM "Lagre &som...", ID_SAVEAS, GRAYED - MENUITEM SEPARATOR - MENUITEM "Utskrift &Forhåndsvisning", ID_PRINTPRE, GRAYED - MENUITEM "&Utskrift...", ID_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "E&genskaper...", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "A&vslutt\tAlt+F4", ID_EXIT - END - POPUP "&Rediger" - BEGIN - MENUITEM "&Angre", ID_UNDO, GRAYED - MENUITEM "&Gjenta", ID_REDO, GRAYED - MENUITEM SEPARATOR - MENUITEM "Klipp &ut", ID_CUT, GRAYED - MENUITEM "&Kopier", ID_COPY, GRAYED - MENUITEM "&Lim inn", ID_PASTE, GRAYED - MENUITEM "lim inn som ny &bilde", ID_PASTENEWIMAGE, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Velg Alt", ID_SELALL, GRAYED - END - POPUP "&Vis" - BEGIN - MENUITEM "&Vertøy", ID_TOOLS, CHECKED - MENUITEM "&Farger", ID_COLOR, CHECKED - MENUITEM "&Historie", ID_HISTORY, CHECKED - MENUITEM "&Statuslinje", ID_STATUSBAR, CHECKED - END - POPUP "&Bilde" - BEGIN - MENUITEM "&Crop...", -1, GRAYED - MENUITEM "&Endre størrelse ...", -1, GRAYED - MENUITEM "R&oter ...", -1, GRAYED - MENUITEM "&Flip...", -1, GRAYED - MENUITEM "&Strekk...", -1, GRAYED - MENUITEM "S&kew...", -1, GRAYED - MENUITEM "&Inverter Farger", -1, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Attributter...", -1, GRAYED - END - POPUP "&Farger" - BEGIN - MENUITEM "&Rediger farger...", ID_EDITCOLOURS - END - POPUP "&vindu" - BEGIN - MENUITEM "&Cascade", ID_WINDOW_CASCADE - MENUITEM "Sorter &horisontalt", ID_WINDOW_TILE_HORZ - MENUITEM "Sorter &vertikalt", ID_WINDOW_TILE_VERT - MENUITEM "&Ordne Ikoner", ID_WINDOW_ARRANGE - MENUITEM SEPARATOR - MENUITEM "Nes&te\tCtrl+F6", ID_WINDOW_NEXT - END - POPUP "&Hjelp" - BEGIN - MENUITEM "&Om...", ID_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - - MENUITEM SEPARATOR - - END -END - -IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 -CAPTION "Brightness" -FONT 8,"MS Shell Dlg", 0, 0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN - LTEXT "Color form:", IDC_STATIC, 135, 5, 36, 9 - GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 - CONTROL "Full (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 - CONTROL "Red", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 - CONTROL "Green", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 - CONTROL "Blue", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 - EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 - CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 - PUSHBUTTON "OK", IDOK, 142, 88, 48, 13 - PUSHBUTTON "Cancel", IDCANCEL, 142, 105, 48, 13 -END - -IDD_ABOUTBOX DIALOGEX 22,16,210,182 -CAPTION "Om ImageSoft" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -//EXSTYLE WS_EX_LAYERED -BEGIN - LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 - PUSHBUTTON "Lukk", IDOK, 75, 162, 44, 15 - ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - - -IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 -CAPTION "Bilde egenskaper" -FONT 8,"MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Navn:", IDC_STATIC, 12, 5, 38, 9 - EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "maleri egenskaper", IDC_STATIC, 4, 22, 148, 98 - LTEXT "bilde type:", IDC_STATIC, 12, 36, 42, 9 - CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 - LTEXT "Lengde:", IDC_STATIC, 12, 51, 42, 9 - EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 - LTEXT "Høyde:", IDC_STATIC, 12, 68, 42, 9 - EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 - LTEXT "Oppløsning:", IDC_STATIC, 12, 84, 42, 9 - EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER - LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 - LTEXT "Enhet:", IDC_STATIC, 12, 99, 42, 9 - CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 - LTEXT "bilde størrelse:", IDC_STATIC, 12, 125, 42, 9 - LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 - PUSHBUTTON "OK", IDOK, 50, 144, 48, 13 - PUSHBUTTON "Avbryt", IDCANCEL, 102, 144, 48, 13 -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_LICENSE "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.\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., 675 Mass Ave, Cambridge, MA 02139, USA." - IDS_READY " Klart." - IDS_TOOLBAR_STANDARD "Standard" - IDS_TOOLBAR_TEST "Test" - IDS_IMAGE_NAME "Bilde %1!u!" - IDS_FLT_TOOLS "Verktøy" - IDS_FLT_COLORS "Farger" - IDS_FLT_HISTORY "Historie" -END - -/* imageprop.c */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_IMAGE_MONOCHROME "Monokromt (1 bit)" - IDS_IMAGE_GREYSCALE "Gråverdiskala (8 bit)" - IDS_IMAGE_PALETTE "Palett eller 256 farger (8 bit)" - IDS_IMAGE_TRUECOLOR "Nøyaktig farger (24 bit)" - - IDS_UNIT_PIXELS "pikseler" - IDS_UNIT_CM "Cm" - IDS_UNIT_INCHES "tommer" - IDS_UNIT_DOTSCM "Tommer / Cm" - IDS_UNIT_DPI "DPI" - IDS_UNIT_KB "%d KB" - IDS_UNIT_MB "%d MB" -END - -/* Tooltips */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_NEW "Ny" - IDS_TOOLTIP_OPEN "Åpne" - IDS_TOOLTIP_SAVE "Lagre" - IDS_TOOLTIP_PRINTPRE "Utskrift &Forhåndsvisning" - IDS_TOOLTIP_PRINT "Utskrift" - IDS_TOOLTIP_CUT "Klipp ut" - IDS_TOOLTIP_COPY "Kopier" - IDS_TOOLTIP_PASTE "Lim inn" - IDS_TOOLTIP_UNDO "Angre" - IDS_TOOLTIP_REDO "Gjenta" -END - - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_NEW " Åpne et nytt dokument." - IDS_HINT_OPEN " Åpene en eksisterende dokument." - IDS_HINT_CLOSE " Lukk dette vinduet." - IDS_HINT_CLOSEALL " Lukk alle vinduer." - IDS_HINT_SAVE " Lagre aktive dokument." - IDS_HINT_SAVEAS " Lagre aktive dokument med nytt navn." - IDS_HINT_PRINTPRE " Forhåndsvis utskrift." - IDS_HINT_PRINT " Skriv ut aktive dokument." - IDS_HINT_PROP " Vis egenskaper for aktive bilde." - IDS_HINT_EXIT " Avslutt denne applikasjonen." - - IDS_HINT_TOOLS " Vis eller skjul verktøy floating vindu." - IDS_HINT_COLORS " Vis eller skjul fargene floating vindu." - IDS_HINT_HISTORY " Vis eller skjul historie floating vindu." - IDS_HINT_STATUS " Vis eller skjul statuslinje." - - IDS_HINT_CASCADE " Ordne vinduer så de overlapper." - IDS_HINT_TILE_HORZ " Ordne vinduer så ingen-overlapper tittelen." - IDS_HINT_TILE_VERT " Ordne vinduer så ingen-overlapper tittelen." - IDS_HINT_ARRANGE " Ordne ikoner ved knappen av vinduet." - IDS_HINT_NEXT " Aktivere neste vinduet." - - IDS_HINT_SYS_RESTORE " Endre vinduet til normal størrelse." - IDS_HINT_SYS_MOVE " Flytt vinduet." - IDS_HINT_SYS_SIZE " Endre størrelse på dette vinduet." - IDS_HINT_SYS_MINIMIZE " Minimer vinduet til en ikon." - IDS_HINT_SYS_MAXIMIZE " Expands dette vindu for å fylle skjermen." -END Propchange: trunk/rosapps/applications/imagesoft/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rosapps/applications/imagesoft/lang/no-NO.rc ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/rosapps/applications/imagesoft/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/rsr… ============================================================================== --- trunk/rosapps/applications/imagesoft/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/imagesoft/rsrc.rc [iso-8859-1] Fri Aug 1 07:48:34 2008 @@ -13,7 +13,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/nb-NO.rc" +#include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" Removed: trunk/rosapps/applications/winfile/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/nb-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/nb-NO.rc (removed) @@ -1,258 +1,0 @@ -/* - * WineFile - * Norwegian Bokmål Language Support - * - * Copyright 2005-2006 Alexander N. Sørnes <alex(a)thehandofagony.com> - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL - -/* Menu */ - -IDM_WINEFILE MENU FIXED IMPURE -{ - POPUP "&Fil" { - MENUITEM "&Åpne\tEnter", ID_ACTIVATE - MENUITEM "&Flytt...\tF7", ID_FILE_MOVE - MENUITEM "&Kopier...\tF8", ID_FILE_COPY - MENUITEM "&I utklippstavlen...\tF9", 118 - MENUITEM "&Slett\tDel", ID_FILE_DELETE - MENUITEM "Gi &nytt navn...", 109 - MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "K&omprimer...", 119 - MENUITEM "De&komprimer...", 120 - MENUITEM SEPARATOR - MENUITEM "Kjø&r...", ID_EXECUTE - MENUITEM "Skriv &ut...", 102 - MENUITEM "Tilknytt...", 103 - MENUITEM SEPARATOR - MENUITEM "Oppr&et katalog...", 111 - MENUITEM "S&øk...", 104 - MENUITEM "&Velg filer...", 116 - MENUITEM SEPARATOR -#ifndef _NO_EXTENSIONS - MENUITEM "&Avslutt\tAlt+X", ID_FILE_EXIT -#else - MENUITEM "&Avslutt", ID_FILE_EXIT -#endif - } - - POPUP "&Stasjon" { - MENUITEM "&Kopier stasjon...", 201 - MENUITEM "Gi vol&umnavn...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formater stasjon...", ID_FORMAT_DISK -#ifdef _WIN95 - MENUITEM "Opprett syste&mdisk...", -1 /*TODO*/ -#endif - MENUITEM SEPARATOR - MENUITEM "Koble til &nettverksstasjon", ID_CONNECT_NETWORK_DRIVE - MENUITEM "Koble &fra nettverksstasjon", ID_DISCONNECT_NETWORK_DRIVE - MENUITEM SEPARATOR - MENUITEM "Del som...", 254 - MENUITEM "Fje&rn delt ressurs...", 255 - MENUITEM SEPARATOR - MENUITEM "Velg &stasjon...", 251 - } - - POPUP "Kataloge&r" { - MENUITEM "&Neste nivå\t+", 301 - MENUITEM "Utvid t&re\t*", 302 - MENUITEM "Utvid &alle\tStrg+*", 303 - MENUITEM "Slå sammen &tre\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Marker underelementer", 505 - } - - POPUP "&Vis" { - MENUITEM "T&re og katalog", 413 - MENUITEM "Kun tr&e", 411 - MENUITEM "Kun katal&og", 412 - MENUITEM SEPARATOR - MENUITEM "De&l opp visning", ID_VIEW_SPLIT - MENUITEM SEPARATOR - MENUITEM "&Navn", ID_VIEW_NAME - MENUITEM "&Alle fildetaljer", ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "Del&vise detaljer...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Sorter etter navn", ID_VIEW_SORT_NAME - MENUITEM "Sorter etter &type", ID_VIEW_SORT_TYPE - MENUITEM "Sorter etter st&ørrelse", ID_VIEW_SORT_SIZE - MENUITEM "Sorter etter &dato", ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "Filtrer med '&'...", ID_VIEW_FILTER - } - - POPUP "&Innstillinger" { - MENUITEM "&Bekreftelse...", 501 - MENUITEM "Skri&ft...", ID_SELECT_FONT - MENUITEM "Tilpass &verktøylinjen...", 512 - MENUITEM SEPARATOR - MENUITEM "Verk&tøylinje", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "Stas&jonslinje", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Statuslinje", ID_VIEW_STATUSBAR, CHECKED -#ifndef _NO_EXTENSIONS - MENUITEM "F&ullskjerm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN -#endif - MENUITEM SEPARATOR - MENUITEM "&Minimer ved oppstart", 504 - MENUITEM "Lagre inn&stillinger ved avslutting", 511 - } - - - POPUP "&Sikkerhet" { - MENUITEM "Tilg&ang...", 605 - MENUITEM "&Loggføring...", 606 - MENUITEM "&Eier...", 607 - } - - POPUP "Vind&u" { - MENUITEM "Nytt &vindu", ID_WINDOW_NEW - MENUITEM "Kortstokk\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Still &vannrett", ID_WINDOW_TILE_HORZ - MENUITEM "Still &loddrett\tCtrl+F4", ID_WINDOW_TILE_VERT -#ifndef _NO_EXTENSIONS - MENUITEM "Ordne automatisk", ID_WINDOW_AUTOSORT -#endif - MENUITEM "Ordne &symboler", ID_WINDOW_ARRANGE - MENUITEM "Oppdate&r\tF5", ID_REFRESH - } - - POPUP "&Hjelp" { - MENUITEM "Emner i &hjelp\tF1", ID_HELP - MENUITEM "&Søk i hjelp...\tF1", ID_HELP - MENUITEM "Br&uk av hjelp\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "&Informasjon om Filbehandling...", ID_ABOUT - } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Kjør" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Kommando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "&Som symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Avbryt", 2, 158, 23, 47, 14 - PUSHBUTTON "&Hjelp", 254, 158, 43, 47, 14 -} - -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Velg plasserings" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Sti:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Avbryt", 2, 158, 23, 47, 14 - PUSHBUTTON "&Bla", 254, 158, 43, 47, 14 -} - -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Etter filtype" -FONT 8, "MS Sans Serif" -BEGIN - LTEXT "&Navn:",-1,7,8,22,10 - EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL - GROUPBOX "Filtype",-1,7,23,87,56 - CONTROL "&Kataloger",IDC_VIEW_TYPE_DIRECTORIES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 - CONTROL "&Programmer",IDC_VIEW_TYPE_PROGRAMS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 - CONTROL "Doku&menter",IDC_VIEW_TYPE_DOCUMENTS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 - CONTROL "&Andre filer",IDC_VIEW_TYPE_OTHERS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 - CONTROL "Vi&s skjulte/systemfiler",IDC_VIEW_TYPE_HIDDEN, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 - DEFPUSHBUTTON "OK",IDOK,104,7,50,14 - PUSHBUTTON "Avbryt",IDCANCEL,104,24,50,14 -END - -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Egenskaper for %s" -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "OK",IDOK,191,7,50,14 - PUSHBUTTON "Avbryt",IDCANCEL,191,29,50,14 - LTEXT "&Filnavn:",-1,7,7,59,9 - EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "&Full sti:",-1,7,18,59,9 - EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Sist endret:",-1,7,29,59,9 - EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Versjon:",-1,7,40,59,9 - EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "&Kopirett:",-1,7,51,59,9 - EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Størrelse:",-1,7,62,59,9 - EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - GROUPBOX "Attributter",-1,7,79,158,46 - CONTROL "Sk&rivebeskyttet",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 - CONTROL "Sk&jult",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 - CONTROL "&Arkiv",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 - CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 - CONTROL "Kompr&imert",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 - GROUPBOX "&Versjoninformasjon",-1,7,129,234,79 - LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - - -STRINGTABLE -{ - IDS_FONT_SEL_DLG_NAME "Aktiverer skriftinnstillinger" - IDS_FONT_SEL_ERROR "Feil ved valg av ny skrift." -} - -STRINGTABLE -{ - IDS_WINEFILE "Filbehandling" - IDS_ERROR "Feil" - IDS_ROOT_FS "Rotfilsystem" - IDS_UNIXFS "Unix-filsystem" - IDS_DESKTOP "Skrivebord" - IDS_SHELL "Skall" - IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "Ikke implementert ennå" - IDS_WINE_FILE "Filbehandling" -} - -STRINGTABLE -{ - IDS_COL_NAME "Navn" - IDS_COL_SIZE "Størrelse" - IDS_COL_CDATE "C-dato" - IDS_COL_ADATE "A-dato" - IDS_COL_MDATE "M-dato" - IDS_COL_IDX "Indeks/Inode" - IDS_COL_LINKS "Koblinger" - IDS_COL_ATTR "Attributter" - IDS_COL_SEC "Sikkerhet" - - IDS_FREE_SPACE_FMT "%s av %s ledig" -} Propchange: trunk/rosapps/applications/winfile/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rosapps/applications/winfile/lang/no-NO.rc ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/rosapps/applications/winfile/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/rsrc.… ============================================================================== --- trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] Fri Aug 1 07:48:34 2008 @@ -64,7 +64,7 @@ #include "lang/hu-HU.rc" #include "lang/it-IT.rc" #include "lang/ko-KR.rc" -#include "lang/nb-NO.rc" +#include "lang/no-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" Removed: trunk/rosapps/applications/write/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/lang/nb… ============================================================================== --- trunk/rosapps/applications/write/lang/nb-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/write/lang/nb-NO.rc (removed) @@ -1,26 +1,0 @@ -/* - * Norwegian Bokmål language support - * - * Copyright (C) 2007 Alexander N. Sørnes <alex(a)thehandofagony.com> - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL - -STRINGTABLE -{ - IDS_FAILED, "Klarte ikke starte Wordpad" -} Propchange: trunk/rosapps/applications/write/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rosapps/applications/write/lang/no-NO.rc ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/rosapps/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/rsrc.rc… ============================================================================== --- trunk/rosapps/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/write/rsrc.rc [iso-8859-1] Fri Aug 1 07:48:34 2008 @@ -28,7 +28,7 @@ #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/ko-KR.rc" -#include "lang/nb-NO.rc" +#include "lang/no-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc" Removed: trunk/rosapps/templates/old_wordpad/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/old_wordpad/lang… ============================================================================== --- trunk/rosapps/templates/old_wordpad/lang/nb-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/templates/old_wordpad/lang/nb-NO.rc (removed) @@ -1,170 +1,0 @@ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL - -IDR_MAINMENU MENU -BEGIN - POPUP "&Fil" - BEGIN - MENUITEM "&Ny...", ID_NEW - MENUITEM "&Åpne...", ID_OPEN - MENUITEM SEPARATOR - MENUITEM "&Lukk\tCtrl+F4", ID_CLOSE, GRAYED - MENUITEM "L&ukk alt", ID_CLOSEALL, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Lagre", ID_SAVE, GRAYED - MENUITEM "Lagre &som...", ID_SAVEAS, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Forhåndsvisning", ID_PRINTPRE, GRAYED - MENUITEM "&Skriv ut...", ID_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Utskrift &format...", ID_PAGESETUP, GRAYED - MENUITEM SEPARATOR - MENUITEM "A&vslutt\tAlt+F4", ID_EXIT - END - POPUP "&Rediger" - BEGIN - MENUITEM "&Angre", ID_UNDO, GRAYED - MENUITEM "&Gjenta", ID_REDO, GRAYED - MENUITEM SEPARATOR - MENUITEM "Klipp &ut", ID_CUT, GRAYED - MENUITEM "&Kopier", ID_COPY, GRAYED - MENUITEM "&Lim inn", ID_PASTE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Rens", -1, GRAYED - MENUITEM "Merk &alt", ID_SELALL, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Finn...\tCtrl+F",-1, GRAYED - MENUITEM "Finn neste", -1, GRAYED - MENUITEM "Erstatt\tCtrl+H", -1, GRAYED - MENUITEM SEPARATOR - MENUITEM "Objektegenskaper",-1, GRAYED - MENUITEM "Objekt", -1, GRAYED - END - POPUP "&Vis" - BEGIN - MENUITEM "&Verktøylinje", -1, CHECKED - MENUITEM "&Formatlinje", -1, CHECKED - MENUITEM "&Linjal", -1, CHECKED - MENUITEM "&Statuslinje", ID_STATUSBAR, CHECKED - END - POPUP "&Sett inn" - BEGIN - MENUITEM "&Dato og tid...",-1, GRAYED - MENUITEM "&Objekt...", -1, GRAYED - END - POPUP "&Format" - BEGIN - MENUITEM "&Skrift...", -1 GRAYED - MENUITEM "Punktmerking", -1, GRAYED - MENUITEM "Avsnitt...", -1, GRAYED - MENUITEM "Tabulatorer...", -1, GRAYED - END - POPUP "&Vindu" - BEGIN - MENUITEM "&Cascade", ID_WINDOW_CASCADE - MENUITEM "Hele &Horisontalt", ID_WINDOW_TILE_HORZ - MENUITEM "Hele &Vertikalt", ID_WINDOW_TILE_VERT - MENUITEM "&Ordne Ikoner", ID_WINDOW_ARRANGE - MENUITEM SEPARATOR - MENUITEM "Nes&te\tCtrl+F6", ID_WINDOW_NEXT - END - POPUP "&Hjelp" - BEGIN - MENUITEM "&Om...", ID_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - - MENUITEM SEPARATOR - - END -END - - -IDD_NEWDOCSEL DIALOGEX 6,6,159,67 -CAPTION "Ny" -FONT 8, "MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME -BEGIN - LTEXT "Ny dokument Type:", IDC_STATIC, 4, 3, 72, 9 - LISTBOX IDC_LIST, 4, 16, 104, 46, WS_TABSTOP - PUSHBUTTON "&OK", IDOK, 112, 16, 44, 13 - PUSHBUTTON "&Avbryt", IDCANCEL, 112, 33, 44, 13 -END - - -IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "Om WordPad" -FONT 8, "MS Shell Dlg",0,0 -STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "WordPad II v0.1\nCopyright (C) 2006\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 - PUSHBUTTON "Lukk", IDOK, 65, 162, 44, 15 - ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 40, 174, 110, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - - -STRINGTABLE DISCARDABLE -BEGIN - IDS_LICENSE "Denne programet er gratis programvare; 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.\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., 675 Mass Ave, Cambridge, MA 02139, USA." - IDS_DEFAULT_NAME "Dokument %1!u!" - IDS_READY " Klar." -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DOC_TYPE_RICH_TEXT "Rik Tekst Dokument" - IDS_DOC_TYPE_UNICODE_TEXT "Tekst Dokument" - IDS_DOC_TYPE_TEXT "Unicode Tekst Dokument" -END - - - -/* Tooltips */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_NEW "Ny" - IDS_TOOLTIP_OPEN "Åpen" - IDS_TOOLTIP_SAVE "Lagre" - IDS_TOOLTIP_PRINTPRE "Forhåndsvisning" - IDS_TOOLTIP_PRINT "Skriv ut" - IDS_TOOLTIP_CUT "Klipp ut" - IDS_TOOLTIP_COPY "Kopiere" - IDS_TOOLTIP_PASTE "Paste" - IDS_TOOLTIP_UNDO "Angre" - IDS_TOOLTIP_REDO "Gjenta" -END - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_NEW " Opprette et nytt dokument." - IDS_HINT_OPEN " Åpene en eksisterende dokument." - IDS_HINT_CLOSE " Lukk dette vinduet." - IDS_HINT_CLOSEALL " Lukk alle vinduer." - IDS_HINT_SAVE " Lagre aktive dokument." - IDS_HINT_SAVEAS " Lagre aktive dokument med nytt navn." - IDS_HINT_PRINT " Skriv ut aktive dokument." - IDS_HINT_PRINTPRE " Forhåndsvis utskrevet dokument." - IDS_HINT_PAGESETUP " Endre side utsende instillinger." - IDS_HINT_EXIT " Avslutt denne applikasjonen." - - IDS_HINT_CASCADE " Ordne vinduer så de ikke overlapper." - IDS_HINT_TILE_HORZ " Ordne vinduer som de ikke overlapper tittelen." - IDS_HINT_TILE_VERT " Ordne vinduer som de ikke overlapper tittelen." - IDS_HINT_ARRANGE " Ordne ikoner ved knappen av vinduet." - IDS_HINT_NEXT " Aktivere neste vindu." - - IDS_HINT_SYS_RESTORE " Endre vinduet til normal størrelse." - IDS_HINT_SYS_MOVE " Flytt vinduet." - IDS_HINT_SYS_SIZE " Endre vinduet størrelse." - IDS_HINT_SYS_MINIMIZE " Endre vinduet til en ikon." - IDS_HINT_SYS_MAXIMIZE " Endre vinduet til å fylle skjermen." -END - - Propchange: trunk/rosapps/templates/old_wordpad/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rosapps/templates/old_wordpad/lang/no-NO.rc ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/rosapps/templates/old_wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/old_wordpad/rsrc… ============================================================================== --- trunk/rosapps/templates/old_wordpad/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/templates/old_wordpad/rsrc.rc [iso-8859-1] Fri Aug 1 07:48:34 2008 @@ -8,7 +8,7 @@ #include "lang/fi-FI.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" -#include "lang/nb-NO.rc" +#include "lang/no-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc"

1 0

[pschweitzer] 35002: Update forgotten fields
by pschweitzer＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: pschweitzer Date: Fri Aug 1 07:34:42 2008 New Revision: 35002 URL: http://svn.reactos.org/svn/reactos?rev=35002&view=rev Log: Update forgotten fields Modified: trunk/rosapps/applications/downloader/downloader.xml Modified: trunk/rosapps/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/downloader/do… ============================================================================== --- trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] Fri Aug 1 07:34:42 2008 @@ -29,9 +29,9 @@ <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-1.5…</location> </application> <application name="Thunderbird 2.0"> - <regname>Mozilla Thunderbird (2.0.0.14)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>2.0.0.14</version> + <regname>Mozilla Thunderbird (2.0.0.16)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>2.0.0.16</version> <description>The most popular and one of the best free Mail Clients out there.</description> <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-2.0…</location> </application>

1 0

[cgutman] 35001: * Fix many memory leaks by unmapping MDL pages when UnlockAndMaybeComplete and LostSocket are called with Status != STATUS_PENDING This change should probably be merged to trunk before 0.3.6
by cgutman＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: cgutman Date: Fri Aug 1 07:19:18 2008 New Revision: 35001 URL: http://svn.reactos.org/svn/reactos?rev=35001&view=rev Log: * Fix many memory leaks by unmapping MDL pages when UnlockAndMaybeComplete and LostSocket are called with Status != STATUS_PENDING This change should probably be merged to trunk before 0.3.6 Modified: branches/aicom-network-fixes/drivers/network/afd/afd/bind.c branches/aicom-network-fixes/drivers/network/afd/afd/connect.c branches/aicom-network-fixes/drivers/network/afd/afd/context.c branches/aicom-network-fixes/drivers/network/afd/afd/info.c branches/aicom-network-fixes/drivers/network/afd/afd/listen.c branches/aicom-network-fixes/drivers/network/afd/afd/lock.c branches/aicom-network-fixes/drivers/network/afd/afd/main.c branches/aicom-network-fixes/drivers/network/afd/afd/read.c branches/aicom-network-fixes/drivers/network/afd/afd/select.c branches/aicom-network-fixes/drivers/network/afd/afd/write.c branches/aicom-network-fixes/drivers/network/afd/include/afd.h Modified: branches/aicom-network-fixes/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/bind.c [iso-8859-1] Fri Aug 1 07:19:18 2008 @@ -48,10 +48,10 @@ AFD_DbgPrint(MID_TRACE,("Called\n")); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); if( !(BindReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, - Irp, 0, NULL, FALSE ); + Irp, 0, NULL ); FCB->LocalAddress = TaCopyTransportAddress( &BindReq->Address ); @@ -61,7 +61,7 @@ if( NT_SUCCESS(Status) ) FCB->State = SOCKET_STATE_BOUND; - else return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL, FALSE ); + else return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); AFD_DbgPrint(MID_TRACE,("FCB->Flags %x\n", FCB->Flags)); @@ -87,6 +87,6 @@ if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; } - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL, TRUE ); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] Fri Aug 1 07:19:18 2008 @@ -71,7 +71,7 @@ /* I was wrong about this before as we can have pending writes to a not * yet connected socket */ - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); AFD_DbgPrint(MID_TRACE,("Irp->IoStatus.Status = %x\n", Irp->IoStatus.Status)); @@ -137,10 +137,10 @@ PAFD_CONNECT_INFO ConnectReq; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); if( !(ConnectReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, - 0, NULL, FALSE ); + 0, NULL ); AFD_DbgPrint(MID_TRACE,("Connect request:\n")); #if 0 @@ -177,11 +177,10 @@ if( NT_SUCCESS(Status) ) FCB->State = SOCKET_STATE_BOUND; else - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL, - TRUE ); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } else return UnlockAndMaybeComplete - ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL, TRUE ); + ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); } /* Drop through to SOCKET_STATE_BOUND */ case SOCKET_STATE_BOUND: @@ -228,5 +227,5 @@ break; } - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL, TRUE ); -} + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); +} Modified: branches/aicom-network-fixes/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/context.c [iso-8859-1] Fri Aug 1 07:19:18 2008 @@ -20,7 +20,7 @@ PAFD_FCB FCB = FileObject->FsContext; UINT ContextSize = IrpSp->Parameters.DeviceIoControl.OutputBufferLength; - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); if( FCB->ContextSize < ContextSize ) ContextSize = FCB->ContextSize; @@ -33,7 +33,7 @@ AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL, FALSE ); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } NTSTATUS STDCALL @@ -43,7 +43,7 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); if( FCB->ContextSize < IrpSp->Parameters.DeviceIoControl.InputBufferLength ) { @@ -64,5 +64,5 @@ AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL, FALSE ); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Fri Aug 1 07:19:18 2008 @@ -26,7 +26,7 @@ _SEH_TRY { if( !SocketAcquireStateLock( FCB ) ) { - Status = LostSocket( Irp, FALSE ); + Status = LostSocket( Irp ); _SEH_YIELD(return Status); } @@ -69,7 +69,7 @@ AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL, FALSE ); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } NTSTATUS STDCALL @@ -84,11 +84,11 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); if( FCB->AddressFile.Object == NULL) { return UnlockAndMaybeComplete( FCB, STATUS_UNSUCCESSFUL, Irp, 0, - NULL, FALSE ); + NULL ); } Mdl = IoAllocateMdl @@ -159,5 +159,5 @@ AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL, FALSE ); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Fri Aug 1 07:19:18 2008 @@ -157,16 +157,16 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); if( !(ListenReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, - 0, NULL, FALSE ); + 0, NULL ); if( FCB->State != SOCKET_STATE_BOUND ) { Status = STATUS_UNSUCCESSFUL; AFD_DbgPrint(MID_TRACE,("Could not listen an unbound socket\n")); - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL, TRUE ); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } FCB->DelayedAccept = ListenReq->UseDelayedAcceptance; @@ -198,7 +198,7 @@ Status = STATUS_SUCCESS; AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL, TRUE ); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } NTSTATUS AfdWaitForListen( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -209,7 +209,7 @@ AFD_DbgPrint(MID_TRACE,("Called\n")); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); if( !IsListEmpty( &FCB->PendingConnections ) ) { PLIST_ENTRY PendingConn = FCB->PendingConnections.Flink; @@ -246,7 +246,7 @@ AFD_DbgPrint(MID_TRACE,("Called\n")); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); FCB->EventsFired &= ~AFD_EVENT_ACCEPT; Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Fri Aug 1 07:19:18 2008 @@ -235,8 +235,7 @@ NTSTATUS NTAPI UnlockAndMaybeComplete ( PAFD_FCB FCB, NTSTATUS Status, PIRP Irp, UINT Information, - PIO_COMPLETION_ROUTINE Completion, - BOOL ShouldUnlock ) { + PIO_COMPLETION_ROUTINE Completion ) { if( Status == STATUS_PENDING ) { /* We should firstly mark this IRP as pending, because @@ -244,29 +243,25 @@ before we return from SocketStateUnlock(). */ IoMarkIrpPending( Irp ); SocketStateUnlock( FCB ); - if( ShouldUnlock ) - UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); } else { + if ( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); SocketStateUnlock( FCB ); Irp->IoStatus.Status = Status; Irp->IoStatus.Information = Information; if( Completion ) Completion( FCB->DeviceExt->DeviceObject, Irp, FCB ); - if( ShouldUnlock ) - UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); } return Status; } -NTSTATUS LostSocket( PIRP Irp, BOOL ShouldUnlockIrp ) { +NTSTATUS LostSocket( PIRP Irp ) { NTSTATUS Status = STATUS_INVALID_PARAMETER; AFD_DbgPrint(MIN_TRACE,("Called.\n")); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; - if( ShouldUnlockIrp ) - UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); + if ( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); IoCompleteRequest( Irp, IO_NO_INCREMENT ); return Status; } @@ -274,7 +269,7 @@ NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ) { InsertTailList( &FCB->PendingIrpList[Function], &Irp->Tail.Overlay.ListEntry ); - return UnlockAndMaybeComplete( FCB, STATUS_PENDING, Irp, 0, NULL, FALSE ); + return UnlockAndMaybeComplete( FCB, STATUS_PENDING, Irp, 0, NULL ); } VOID SocketCalloutEnter( PAFD_FCB FCB ) { Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Fri Aug 1 07:19:18 2008 @@ -257,11 +257,11 @@ NTSTATUS Status; USHORT Flags = 0; - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); if( !(DisReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, - Irp, 0, NULL, FALSE ); + Irp, 0, NULL ); if (NULL == FCB->RemoteAddress) { @@ -274,7 +274,7 @@ if( !NT_SUCCESS(Status) || !ConnInfo ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, - Irp, 0, NULL, TRUE ); + Irp, 0, NULL ); } if( DisReq->DisconnectType & AFD_DISCONNECT_SEND ) @@ -294,7 +294,7 @@ if (ConnInfo) ExFreePool( ConnInfo ); - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL, TRUE ); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } static NTSTATUS STDCALL Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] Fri Aug 1 07:19:18 2008 @@ -273,21 +273,21 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); if( FCB->State != SOCKET_STATE_CONNECTED && FCB->State != SOCKET_STATE_CONNECTING ) { AFD_DbgPrint(MID_TRACE,("Called recv on wrong kind of socket (s%x)\n", FCB->State)); return UnlockAndMaybeComplete( FCB, STATUS_UNSUCCESSFUL, - Irp, 0, NULL, FALSE ); + Irp, 0, NULL ); } if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { AFD_DbgPrint(MID_TRACE,("Receive on connection-less sockets not implemented\n")); return UnlockAndMaybeComplete( FCB, STATUS_NOT_IMPLEMENTED, - Irp, 0, NULL, FALSE ); + Irp, 0, NULL ); } FCB->EventsFired &= ~AFD_EVENT_RECEIVE; @@ -295,7 +295,7 @@ if( !(RecvReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, - Irp, 0, NULL, FALSE ); + Irp, 0, NULL ); AFD_DbgPrint(MID_TRACE,("Recv flags %x\n", RecvReq->AfdFlags)); @@ -306,7 +306,7 @@ if( !RecvReq->BufferArray ) { return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, - Irp, 0, NULL, TRUE ); + Irp, 0, NULL ); } Irp->IoStatus.Status = STATUS_PENDING; @@ -326,7 +326,7 @@ RemoveEntryList( &Irp->Tail.Overlay.ListEntry ); UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, FALSE ); return UnlockAndMaybeComplete( FCB, Status, Irp, - TotalBytesCopied, NULL, TRUE ); + TotalBytesCopied, NULL ); } else if( Status == STATUS_PENDING ) { AFD_DbgPrint(MID_TRACE,("Leaving read irp\n")); IoMarkIrpPending( Irp ); @@ -501,6 +501,7 @@ Status = NextIrp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; NextIrp->IoStatus.Information = DatagramRecv->Len; UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); + if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } else { AFD_DbgPrint(MID_TRACE,("Satisfying\n")); @@ -509,6 +510,7 @@ (PUINT)&NextIrp->IoStatus.Information ); AFD_DbgPrint(MID_TRACE,("Unlocking\n")); UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); + if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); AFD_DbgPrint(MID_TRACE,("Completing\n")); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } @@ -557,17 +559,17 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); FCB->EventsFired &= ~AFD_EVENT_RECEIVE; /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) return UnlockAndMaybeComplete - ( FCB, STATUS_UNSUCCESSFUL, Irp, 0, NULL, FALSE ); + ( FCB, STATUS_UNSUCCESSFUL, Irp, 0, NULL ); if( !(RecvReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete - ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL, FALSE ); + ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); AFD_DbgPrint(MID_TRACE,("Recv flags %x\n", RecvReq->AfdFlags)); @@ -579,7 +581,7 @@ if( !RecvReq->BufferArray ) { /* access violation in userspace */ return UnlockAndMaybeComplete - ( FCB, STATUS_ACCESS_VIOLATION, Irp, 0, NULL, FALSE ); + ( FCB, STATUS_ACCESS_VIOLATION, Irp, 0, NULL ); } if( !IsListEmpty( &FCB->DatagramList ) ) { @@ -601,7 +603,7 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); return UnlockAndMaybeComplete - ( FCB, Status, Irp, RecvReq->BufferArray[0].len, NULL, TRUE ); + ( FCB, Status, Irp, RecvReq->BufferArray[0].len, NULL ); } else { Status = SatisfyPacketRecvRequest ( FCB, Irp, DatagramRecv, @@ -615,13 +617,13 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); return UnlockAndMaybeComplete - ( FCB, Status, Irp, Irp->IoStatus.Information, NULL, TRUE ); + ( FCB, Status, Irp, Irp->IoStatus.Information, NULL ); } } else if( RecvReq->AfdFlags & AFD_IMMEDIATE ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); Status = STATUS_CANT_WAIT; PollReeval( FCB->DeviceExt, FCB->FileObject ); - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL, TRUE ); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } else { PollReeval( FCB->DeviceExt, FCB->FileObject ); return LeaveIrpUntilLater( FCB, Irp, FUNCTION_RECV ); Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] Fri Aug 1 07:19:18 2008 @@ -276,14 +276,14 @@ if ( !EventSelectInfo ) { return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, - 0, NULL, FALSE ); + 0, NULL ); } AFD_DbgPrint(MID_TRACE,("Called (Event %x Triggers %x)\n", EventSelectInfo->EventObject, EventSelectInfo->Events)); if( !SocketAcquireStateLock( FCB ) ) { - return LostSocket( Irp, TRUE ); + return LostSocket( Irp ); } FCB->EventSelectTriggers = FCB->EventsFired = 0; @@ -309,7 +309,7 @@ AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); return UnlockAndMaybeComplete( FCB, STATUS_SUCCESS, Irp, - 0, NULL, TRUE ); + 0, NULL ); } NTSTATUS STDCALL @@ -324,18 +324,18 @@ if ( !EnumReq ) { return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, - 0, NULL, FALSE ); + 0, NULL ); } if( !SocketAcquireStateLock( FCB ) ) { - return LostSocket( Irp, TRUE ); + return LostSocket( Irp ); } EnumReq->PollEvents = FCB->PollState; RtlZeroMemory( EnumReq->EventStatus, sizeof(EnumReq->EventStatus) ); return UnlockAndMaybeComplete( FCB, STATUS_SUCCESS, Irp, - 0, NULL, TRUE ); + 0, NULL ); } /* * * NOTE ALWAYS CALLED AT DISPATCH_LEVEL * * */ Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] Fri Aug 1 07:19:18 2008 @@ -74,6 +74,8 @@ NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = 0; + if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } @@ -151,7 +153,7 @@ AFD_DbgPrint(MID_TRACE,("Dismissing request: %x\n", Status)); return UnlockAndMaybeComplete( FCB, Status, NextIrp, TotalBytesCopied, - NULL, TRUE ); + NULL ); } else if( NextIrp ) { AFD_DbgPrint(MID_TRACE,("Could not do any more with Irp %x\n", NextIrp)); @@ -211,7 +213,7 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); FCB->EventsFired &= ~AFD_EVENT_SEND; @@ -223,11 +225,11 @@ /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) return UnlockAndMaybeComplete( FCB, STATUS_UNSUCCESSFUL, Irp, - 0, NULL, FALSE ); + 0, NULL ); if( !(SendReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, - NULL, FALSE ); + NULL ); /* Must lock buffers before handing off user data */ SendReq->BufferArray = LockBuffers( SendReq->BufferArray, @@ -259,12 +261,12 @@ return UnlockAndMaybeComplete( FCB, Status, Irp, SendReq->BufferArray[0].len, - NULL, TRUE ); + NULL ); } if( !(SendReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete - ( FCB, STATUS_NO_MEMORY, Irp, TotalBytesCopied, NULL, FALSE ); + ( FCB, STATUS_NO_MEMORY, Irp, TotalBytesCopied, NULL ); AFD_DbgPrint(MID_TRACE,("Socket state %d\n", FCB->State)); @@ -272,7 +274,7 @@ if( SendReq->AfdFlags & AFD_IMMEDIATE ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); return UnlockAndMaybeComplete - ( FCB, STATUS_CANT_WAIT, Irp, 0, NULL, TRUE ); + ( FCB, STATUS_CANT_WAIT, Irp, 0, NULL ); } else { AFD_DbgPrint(MID_TRACE,("Queuing request\n")); return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND ); @@ -323,7 +325,7 @@ AFD_DbgPrint(MID_TRACE,("Empty send\n")); return UnlockAndMaybeComplete - ( FCB, Status, Irp, TotalBytesCopied, NULL, TRUE ); + ( FCB, Status, Irp, TotalBytesCopied, NULL ); } AFD_DbgPrint(MID_TRACE,("Completed %d bytes\n", TotalBytesCopied)); @@ -353,14 +355,14 @@ Status, TotalBytesCopied)); return UnlockAndMaybeComplete - ( FCB, Status, Irp, TotalBytesCopied, NULL, TRUE ); + ( FCB, Status, Irp, TotalBytesCopied, NULL ); } } if( SendReq->AfdFlags & AFD_IMMEDIATE ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); return UnlockAndMaybeComplete - ( FCB, STATUS_CANT_WAIT, Irp, 0, NULL, TRUE ); + ( FCB, STATUS_CANT_WAIT, Irp, 0, NULL ); } else { AFD_DbgPrint(MID_TRACE,("Queuing request\n")); return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND ); @@ -378,7 +380,7 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); FCB->EventsFired &= ~AFD_EVENT_SEND; FCB->PollState &= ~AFD_EVENT_SEND; @@ -386,10 +388,10 @@ /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) return UnlockAndMaybeComplete - ( FCB, STATUS_UNSUCCESSFUL, Irp, 0, NULL, FALSE ); + ( FCB, STATUS_UNSUCCESSFUL, Irp, 0, NULL ); if( !(SendReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete - ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL, FALSE ); + ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); AFD_DbgPrint (MID_TRACE,("RemoteAddress #%d Type %d\n", @@ -426,6 +428,6 @@ AFD_DbgPrint(MID_TRACE,("Dismissing request: %x\n", Status)); return UnlockAndMaybeComplete - ( FCB, Status, Irp, SendReq->BufferArray[0].len, NULL, TRUE ); + ( FCB, Status, Irp, SendReq->BufferArray[0].len, NULL ); } Modified: branches/aicom-network-fixes/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/include/afd.h [iso-8859-1] Fri Aug 1 07:19:18 2008 @@ -206,10 +206,9 @@ NTSTATUS NTAPI UnlockAndMaybeComplete ( PAFD_FCB FCB, NTSTATUS Status, PIRP Irp, UINT Information, - PIO_COMPLETION_ROUTINE Completion, - BOOL ShouldUnlockIrp ); + PIO_COMPLETION_ROUTINE Completion ); VOID SocketStateUnlock( PAFD_FCB FCB ); -NTSTATUS LostSocket( PIRP Irp, BOOL ShouldUnlockIrp ); +NTSTATUS LostSocket( PIRP Irp ); PAFD_HANDLE LockHandles( PAFD_HANDLE HandleArray, UINT HandleCount ); VOID UnlockHandles( PAFD_HANDLE HandleArray, UINT HandleCount ); PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp );

1 0

[fireball] 35000: - Update some apps in Downloader.
by fireball＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: fireball Date: Fri Aug 1 07:15:51 2008 New Revision: 35000 URL: http://svn.reactos.org/svn/reactos?rev=35000&view=rev Log: - Update some apps in Downloader. Modified: trunk/rosapps/applications/downloader/downloader.xml Modified: trunk/rosapps/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/downloader/do… ============================================================================== --- trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] Fri Aug 1 07:15:51 2008 @@ -8,11 +8,11 @@ <location>http://svn.reactos.org/packages/Firefox%20Setup%201.5.0.12.exe</location> </application> <application name="Firefox 2.0"> - <regname>Mozilla Firefox (2.0.0.14)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>2.0.0.14</version> + <regname>Mozilla Firefox (2.0.0.16)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>2.0.0.16</version> <description>The most popular and one of the best free Web Browsers out there.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-2.0/win…</location> + <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-2.0/win…</location> </application> <application name="Opera"> <regname>Opera</regname> @@ -33,7 +33,7 @@ <licence>MPL/GPL/LGPL</licence> <version>2.0.0.14</version> <description>The most popular and one of the best free Mail Clients out there.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.14/w…</location> + <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-2.0…</location> </application> <application name="SeaMonkey"> <regname>SeaMonkey (1.1.9)</regname> @@ -55,9 +55,9 @@ <application name="mIRC"> <regname>mIRC</regname> <licence>Shareware</licence> - <version>6.31</version> + <version>6.33</version> <description>The most popular client for the Internet Relay Chat (IRC).</description> - <location>http://mirc.bigchief.dk/mirc631.exe</location> + <location>http://mirc.bigchief.dk/mirc633.exe</location> </application> <application name="Samba TNG"> <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description> @@ -79,10 +79,10 @@ </category> <category name="Office" icon="2"> <application name="Abiword"> - <regname>"AbiWord 2.6.2 (remove only)"</regname> - <version>2.6.2</version> + <regname>"AbiWord 2.6.4 (remove only)"</regname> + <version>2.6.4</version> <description>Word processor.</description> - <location>http://www.abiword.org/downloads/abiword/2.6.2/Windows/abiword-setup-2.6.2.…</location> + <location>http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.…</location> </application> <application name="OpenOffice"> <regname>OpenOffice.org 2.4</regname>

1 0

[pschweitzer] 34999: Applied same fix to FSD branch (and to missed file) You can go cgutman ; )
by pschweitzer＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: pschweitzer Date: Fri Aug 1 07:14:36 2008 New Revision: 34999 URL: http://svn.reactos.org/svn/reactos?rev=34999&view=rev Log: Applied same fix to FSD branch (and to missed file) You can go cgutman ;) Modified: branches/pierre-fsd/drivers/filesystems/fastfat/rw.c Modified: branches/pierre-fsd/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/rw.c [iso-8859-1] Fri Aug 1 07:14:36 2008 @@ -671,7 +671,6 @@ CHECKPOINT; if (IrpContext->FileObject->PrivateCacheMap == NULL) { - /* FIXME: Guard by SEH. */ CcInitializeCacheMap(IrpContext->FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, @@ -965,7 +964,6 @@ if (IrpContext->FileObject->PrivateCacheMap == NULL) { - /* FIXME: Guard by SEH. */ CcInitializeCacheMap(IrpContext->FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE,

1 0

[pschweitzer] 34998: Removed wrong FIXME: CcInitializeCacheMap doesn't raise exceptions. See issue #3315 for more details.
by pschweitzer＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: pschweitzer Date: Fri Aug 1 07:08:01 2008 New Revision: 34998 URL: http://svn.reactos.org/svn/reactos?rev=34998&view=rev Log: Removed wrong FIXME: CcInitializeCacheMap doesn't raise exceptions. See issue #3315 for more details. Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Fri Aug 1 07:08:01 2008 @@ -332,7 +332,6 @@ fcb->FileObject = fileObject; fcb->RefCount++; - /* FIXME: Guard by SEH. */ CcInitializeCacheMap(fileObject, (PCC_FILE_SIZES)(&fcb->RFCB.AllocationSize), FALSE, Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Fri Aug 1 07:08:01 2008 @@ -537,7 +537,6 @@ Fcb->RFCB.ValidDataLength = Fcb->RFCB.FileSize; Fcb->RFCB.AllocationSize = Fcb->RFCB.FileSize; - /* FIXME: Guard by SEH. */ CcInitializeCacheMap(DeviceExt->FATFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Fri Aug 1 07:08:01 2008 @@ -671,7 +671,6 @@ CHECKPOINT; if (IrpContext->FileObject->PrivateCacheMap == NULL) { - /* FIXME: Guard by SEH. */ CcInitializeCacheMap(IrpContext->FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, @@ -965,7 +964,6 @@ if (IrpContext->FileObject->PrivateCacheMap == NULL) { - /* FIXME: Guard by SEH. */ CcInitializeCacheMap(IrpContext->FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE,

1 0

[cgutman] 34997: * Properly handle STATUS_TIMEOUT * Don't crash if STATUS_END_OF_FILE and a NULL ReturnedBytes are passed * Handle STATUS_INVALID_CONNECTION
by cgutman＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: cgutman Date: Fri Aug 1 07:06:19 2008 New Revision: 34997 URL: http://svn.reactos.org/svn/reactos?rev=34997&view=rev Log: * Properly handle STATUS_TIMEOUT * Don't crash if STATUS_END_OF_FILE and a NULL ReturnedBytes are passed * Handle STATUS_INVALID_CONNECTION Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/dll/win32/m… ============================================================================== --- branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Fri Aug 1 07:06:19 2008 @@ -279,17 +279,17 @@ if( Errno ) { switch (Status) { case STATUS_CANT_WAIT: *Errno = WSAEWOULDBLOCK; break; - case STATUS_TIMEOUT: + case STATUS_TIMEOUT: *Errno = WSAETIMEDOUT; break; case STATUS_SUCCESS: /* Return Number of bytes Read */ if( ReturnedBytes ) *ReturnedBytes = Received; break; - case STATUS_END_OF_FILE: *Errno = WSAESHUTDOWN; *ReturnedBytes = 0; break; + case STATUS_END_OF_FILE: *Errno = WSAESHUTDOWN; break; case STATUS_PENDING: *Errno = WSA_IO_PENDING; break; case STATUS_BUFFER_OVERFLOW: *Errno = WSAEMSGSIZE; break; - default: { + case STATUS_INVALID_CONNECTION: *Errno = WSAEAFNOSUPPORT; break; + default: DbgPrint("MSAFD: Error %x is unknown\n", Status); *Errno = WSAEINVAL; break; - } break; } }

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