Ros-diffs

ros-diffs@reactos.org

81390 discussions

[frik85] 29646: Add two new MediaWiki groups to our ReactOS Wiki: * moderator (protect, move) * super moderator (protect, move, delete) More information can be found there: http://de.wikibooks.org/wiki/MediaWiki/_Benutzergruppen_und_Rechte#Default_Group_Permission_Values_from_DefaultSettings.php
by frik85＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: frik85 Date: Wed Oct 17 22:02:40 2007 New Revision: 29646 URL: http://svn.reactos.org/svn/reactos?rev=29646&view=rev Log: Add two new MediaWiki groups to our ReactOS Wiki: * moderator (protect, move) * super moderator (protect, move, delete) More information can be found there: http://de.wikibooks.org/wiki/MediaWiki/_Benutzergruppen_und_Rechte#Default_… Modified: trunk/web/reactos.org/htdocs/wiki/LocalSettings.php Modified: trunk/web/reactos.org/htdocs/wiki/LocalSettings.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/LocalS… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/LocalSettings.php (original) +++ trunk/web/reactos.org/htdocs/wiki/LocalSettings.php Wed Oct 17 22:02:40 2007 @@ -1,15 +1,15 @@ -<?php - -# This file was automatically generated by the MediaWiki installer. -# If you make manual changes, please keep track in case you need to -# recreate them later. +<?php + +# This file was automatically generated by the MediaWiki installer. +# If you make manual changes, please keep track in case you need to +# recreate them later. # # See includes/DefaultSettings.php for all configurable settings # and their default values, but don't forget to make changes in _this_ # file, not there. # If you customize your file layout, set $IP to the directory that contains -# the other MediaWiki files. It will be used as a base to locate files. +# the other MediaWiki files. It will be used as a base to locate files. if( defined( 'MW_INSTALL_PATH' ) ) { $IP = MW_INSTALL_PATH; } else { @@ -17,116 +17,129 @@ } $path = array( $IP, "$IP/includes", "$IP/languages" ); -set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_include_path() ); - -require_once( "includes/DefaultSettings.php" ); - -# If PHP's memory limit is very low, some operations may fail. -# ini_set( 'memory_limit', '20M' ); - -if ( $wgCommandLineMode ) { - if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) { - die( "This script must be run from the command line\n" ); - } -} elseif ( empty( $wgNoOutputBuffer ) ) { - ## Compress output if the browser supports it - if( !ini_get( 'zlib.output_compression' ) ) @ob_start( 'ob_gzhandler' ); -} - -$wgSitename = "ReactOS"; - -$wgScriptPath = "/wiki"; -$wgScript = "$wgScriptPath/index.php"; -$wgRedirectScript = "$wgScriptPath/redirect.php"; - +set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_include_path() ); + +require_once( "includes/DefaultSettings.php" ); + +# If PHP's memory limit is very low, some operations may fail. +# ini_set( 'memory_limit', '20M' ); + +if ( $wgCommandLineMode ) { + if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) { + die( "This script must be run from the command line\n" ); + } +} elseif ( empty( $wgNoOutputBuffer ) ) { + ## Compress output if the browser supports it + if( !ini_get( 'zlib.output_compression' ) ) @ob_start( 'ob_gzhandler' ); +} + +$wgSitename = "ReactOS"; + +$wgScriptPath = "/wiki"; +$wgScript = "$wgScriptPath/index.php"; +$wgRedirectScript = "$wgScriptPath/redirect.php"; + ## For more information on customizing the URLs please see: ## http://meta.wikimedia.org/wiki/Eliminating_index.php_from_the_url -## If using PHP as a CGI module, the ?title= style usually must be used. -$wgArticlePath = "$wgScript/$1"; -# $wgArticlePath = "$wgScript?title=$1"; - -$wgStylePath = "$wgScriptPath/skins"; -$wgStyleDirectory = "$IP/skins"; -$wgLogo = "$wgStylePath/common/images/reactos.png"; - -$wgUploadPath = "$wgScriptPath/images"; -$wgUploadDirectory = "$IP/images"; - -$wgEnableEmail = true; -$wgEnableUserEmail = true; - -$wgEmergencyContact = "ros-web(a)reactos.org"; -$wgPasswordSender = "ros-web(a)reactos.org"; - -## For a detailed description of the following switches see -## http://meta.wikimedia.org/Enotif and http://meta.wikimedia.org/Eauthent -## There are many more options for fine tuning available see -## /includes/DefaultSettings.php -## UPO means: this is also a user preference option -$wgEnotifUserTalk = true; # UPO -$wgEnotifWatchlist = true; # UPO -$wgEmailAuthentication = false; - -require_once("/web/reactos.org/config/wiki-connect.php"); - -# Experimental charset support for MySQL 4.1/5.0. -$wgDBmysql5 = false; - -## Shared memory settings -$wgMainCacheType = CACHE_NONE; -$wgMemCachedServers = array(); - -## To enable image uploads, make sure the 'images' directory -## is writable, then uncomment this: -$wgEnableUploads = true; -$wgUseImageResize = true; -$wgUseImageMagick = true; -$wgImageMagickConvertCommand = "/usr/bin/convert"; - -## If you want to use image uploads under safe mode, -## create the directories images/archive, images/thumb and -## images/temp, and make them all writable. Then uncomment -## this, if it's not already uncommented: -# $wgHashedUploadDirectory = false; - -## If you have the appropriate support software installed -## you can enable inline LaTeX equations: -# $wgUseTeX = true; -$wgMathPath = "{$wgUploadPath}/math"; -$wgMathDirectory = "{$wgUploadDirectory}/math"; -$wgTmpDirectory = "{$wgUploadDirectory}/tmp"; - -$wgLocalInterwiki = $wgSitename; - -$wgLanguageCode = "en"; - -$wgProxyKey = "896f6cbb876cd587e34eb26996a5c234c181b0c8d243a70f20ae7dafd1828e67"; - -## Default skin: you can change the default skin. Use the internal symbolic -## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook': -$wgDefaultSkin = 'roscms'; - -## For attaching licensing metadata to pages, and displaying an -## appropriate copyright notice / icon. GNU Free Documentation -## License and Creative Commons licenses are supported so far. -$wgEnableCreativeCommonsRdf = true; -$wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright -$wgRightsUrl = "http://www.gnu.org/copyleft/fdl.html"; -$wgRightsText = "GNU Free Documentation License 1.2"; -$wgRightsIcon = "${wgStylePath}/common/images/gnu-fdl.png"; -# $wgRightsCode = ""; # Not yet used - -$wgDiff3 = "/usr/bin/diff3"; - +## If using PHP as a CGI module, the ?title= style usually must be used. +$wgArticlePath = "$wgScript/$1"; +# $wgArticlePath = "$wgScript?title=$1"; + +$wgStylePath = "$wgScriptPath/skins"; +$wgStyleDirectory = "$IP/skins"; +$wgLogo = "$wgStylePath/common/images/reactos.png"; + +$wgUploadPath = "$wgScriptPath/images"; +$wgUploadDirectory = "$IP/images"; + +$wgEnableEmail = true; +$wgEnableUserEmail = true; + +$wgEmergencyContact = "ros-web(a)reactos.org"; +$wgPasswordSender = "ros-web(a)reactos.org"; + +## For a detailed description of the following switches see +## http://meta.wikimedia.org/Enotif and http://meta.wikimedia.org/Eauthent +## There are many more options for fine tuning available see +## /includes/DefaultSettings.php +## UPO means: this is also a user preference option +$wgEnotifUserTalk = true; # UPO +$wgEnotifWatchlist = true; # UPO +$wgEmailAuthentication = false; + +require_once("/web/reactos.org/config/wiki-connect.php"); + +# Experimental charset support for MySQL 4.1/5.0. +$wgDBmysql5 = false; + +## Shared memory settings +$wgMainCacheType = CACHE_NONE; +$wgMemCachedServers = array(); + +## To enable image uploads, make sure the 'images' directory +## is writable, then uncomment this: +$wgEnableUploads = true; +$wgUseImageResize = true; +$wgUseImageMagick = true; +$wgImageMagickConvertCommand = "/usr/bin/convert"; + +## If you want to use image uploads under safe mode, +## create the directories images/archive, images/thumb and +## images/temp, and make them all writable. Then uncomment +## this, if it's not already uncommented: +# $wgHashedUploadDirectory = false; + +## If you have the appropriate support software installed +## you can enable inline LaTeX equations: +# $wgUseTeX = true; +$wgMathPath = "{$wgUploadPath}/math"; +$wgMathDirectory = "{$wgUploadDirectory}/math"; +$wgTmpDirectory = "{$wgUploadDirectory}/tmp"; + +$wgLocalInterwiki = $wgSitename; + +$wgLanguageCode = "en"; + +$wgProxyKey = "896f6cbb876cd587e34eb26996a5c234c181b0c8d243a70f20ae7dafd1828e67"; + +## Default skin: you can change the default skin. Use the internal symbolic +## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook': +$wgDefaultSkin = 'roscms'; + +## For attaching licensing metadata to pages, and displaying an +## appropriate copyright notice / icon. GNU Free Documentation +## License and Creative Commons licenses are supported so far. +$wgEnableCreativeCommonsRdf = true; +$wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright +$wgRightsUrl = "http://www.gnu.org/copyleft/fdl.html"; +$wgRightsText = "GNU Free Documentation License 1.2"; +$wgRightsIcon = "${wgStylePath}/common/images/gnu-fdl.png"; +# $wgRightsCode = ""; # Not yet used + +$wgDiff3 = "/usr/bin/diff3"; + # When you make changes to this configuration file, this will make # sure that cached pages are cleared. $configdate = gmdate( 'YmdHis', @filemtime( __FILE__ ) ); -$wgCacheEpoch = max( $wgCacheEpoch, $configdate ); - -# Entirely disable Anonymous Edits -$wgGroupPermissions['*']['edit'] = false; - -# Enable external image embedding -$wgAllowExternalImages = true; - -?> +$wgCacheEpoch = max( $wgCacheEpoch, $configdate ); + +# Entirely disable Anonymous Edits +$wgGroupPermissions['*']['edit'] = false; + +# moderator group +$wgGroupPermissions['mod']['protect'] = true; +$wgGroupPermissions['mod']['move'] = true; + +# super moderator group +$wgGroupPermissions['supermod']['protect'] = true; +$wgGroupPermissions['supermod']['delete'] = true; +$wgGroupPermissions['supermod']['move'] = true; + +# deactivate DB SQL queries +$wgAllowSysopQueries = false; + + +# Enable external image embedding +$wgAllowExternalImages = true; + +?>

1 0

[peterw] 29645: - Added a very simple makefile for the RosBE tools. - Fix a warning in echoh.c.
by peterw＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: peterw Date: Wed Oct 17 21:42:53 2007 New Revision: 29645 URL: http://svn.reactos.org/svn/reactos?rev=29645&view=rev Log: - Added a very simple makefile for the RosBE tools. - Fix a warning in echoh.c. Added: trunk/tools/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE-Windows/Tools/echoh.c Modified: trunk/tools/RosBE-Windows/Tools/echoh.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/echoh.c?… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/echoh.c (original) +++ trunk/tools/RosBE-Windows/Tools/echoh.c Wed Oct 17 21:42:53 2007 @@ -9,6 +9,7 @@ #include <stdio.h> +#include <stdlib.h> int main(int argc, char** argv) { if (argc == 2) Added: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/makefile (added) +++ trunk/tools/RosBE-Windows/Tools/makefile Wed Oct 17 21:42:53 2007 @@ -1,0 +1,26 @@ +# makefile - Simple makefile to build the various RosBE tools. + +CC = gcc +OFLAGS = -Wall -O2 -o + +buildtime: buildtime.c + $(CC) $(HOST_CFLAGS) $(OFLAGS) buildtime buildtime.c + +cpucount: cpucount.c + $(CC) $(HOST_CFLAGS) $(OFLAGS) cpucount cpucount.c + +echoh: echoh.c + $(CC) $(HOST_CFLAGS) $(OFLAGS) echoh echoh.c + +flash: flash.c + $(CC) $(HOST_CFLAGS) -DWINVER=0x0501 -D_WIN32_WINNT=0x0501 $(OFLAGS) flash flash.c + +getdate: getdate.c + $(CC) $(HOST_CFLAGS) $(OFLAGS) getdate getdate.c + +all: buildtime.c cpucount.c echoh.c flash.c getdate.c + $(CC) $(HOST_CFLAGS) $(OFLAGS) buildtime buildtime.c + $(CC) $(HOST_CFLAGS) $(OFLAGS) cpucount cpucount.c + $(CC) $(HOST_CFLAGS) $(OFLAGS) echoh echoh.c + $(CC) $(HOST_CFLAGS) -DWINVER=0x0501 -D_WIN32_WINNT=0x0501 $(OFLAGS) flash flash.c + $(CC) $(HOST_CFLAGS) $(OFLAGS) getdate getdate.c

1 0

[janderwald] 29644: - fix a bug - fix identation - only register hotkeys when not being in setup See issue #2684 for more details.
by janderwald＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: janderwald Date: Wed Oct 17 21:37:02 2007 New Revision: 29644 URL: http://svn.reactos.org/svn/reactos?rev=29644&view=rev Log: - fix a bug - fix identation - only register hotkeys when not being in setup See issue #2684 for more details. Modified: trunk/reactos/base/system/winlogon/sas.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Wed Oct 17 21:37:02 2007 @@ -267,9 +267,9 @@ RemoveStatusMessage(Session); if (!ret) { - Session->UserToken = NULL; - CloseHandle(Session->UserToken); - } + CloseHandle(Session->UserToken); + Session->UserToken = NULL; + } return ret; } @@ -869,8 +869,10 @@ /* Save the Session pointer */ SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)Session); - - return RegisterHotKeys(Session, hwndDlg); + if (!GetSetupType()) + { + return RegisterHotKeys(Session, hwndDlg); + } } case WM_DESTROY: {

1 0

[dreimer] 29643: Bug 2749: Small fixes to eventvwr (marc.piulachs@codexchange.net)
by dreimer＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: dreimer Date: Wed Oct 17 18:38:52 2007 New Revision: 29643 URL: http://svn.reactos.org/svn/reactos?rev=29643&view=rev Log: Bug 2749: Small fixes to eventvwr (marc.piulachs(a)codexchange.net) Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Wed Oct 17 18:38:52 2007 @@ -41,6 +41,7 @@ static const TCHAR szWindowClass[] = _T("EVENTVWR"); // the main window class name //MessageFile message buffer size +#define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 #define EVENT_MESSAGE_FILE_BUFFER 1024*10 #define EVENT_DLL_SEPARATOR ";" #define EVENT_MESSAGE_FILE "EventMessageFile" @@ -381,27 +382,31 @@ return FALSE; } -char* GetEventType (WORD dwEventType) +VOID +GetEventType (WORD dwEventType, OUT LPSTR eventTypeText) { switch(dwEventType) { case EVENTLOG_ERROR_TYPE: - return "Error"; + LoadString(hInst, IDC_EVENTLOG_ERROR_TYPE, eventTypeText, MAX_LOADSTRING); break; case EVENTLOG_WARNING_TYPE: - return "Warning"; + LoadString(hInst, IDC_EVENTLOG_WARNING_TYPE, eventTypeText, MAX_LOADSTRING); break; case EVENTLOG_INFORMATION_TYPE: - return "Information"; + LoadString(hInst, IDC_EVENTLOG_INFORMATION_TYPE, eventTypeText, MAX_LOADSTRING); break; case EVENTLOG_AUDIT_SUCCESS: - return "Audit Success"; + LoadString(hInst, IDC_EVENTLOG_AUDIT_SUCCESS, eventTypeText, MAX_LOADSTRING); break; case EVENTLOG_AUDIT_FAILURE: - return "Audit Failure"; + LoadString(hInst, IDC_EVENTLOG_AUDIT_FAILURE, eventTypeText, MAX_LOADSTRING); + break; + case EVENTLOG_SUCCESS: + LoadString(hInst, IDC_EVENTLOG_SUCCESS, eventTypeText, MAX_LOADSTRING); break; default: - return "Unknown Event"; + LoadString(hInst, IDC_EVENTLOG_UNKNOWN_TYPE, eventTypeText, MAX_LOADSTRING); break; } } @@ -489,6 +494,7 @@ char szLocalDate[MAX_PATH]; char szLocalTime[MAX_PATH]; char szEventID[MAX_PATH]; + char szEventTypeText[MAX_PATH]; char szCategoryID[MAX_PATH]; char szUsername[MAX_PATH]; char szEventText[EVENT_MESSAGE_FILE_BUFFER]; @@ -596,9 +602,9 @@ GetDateFormat( LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, MAX_PATH ); GetTimeFormat( LOCALE_USER_DEFAULT, TIME_NOSECONDS, &time, NULL, szLocalTime, MAX_PATH ); - + + GetEventType (pevlr->EventType , szEventTypeText); GetEventCategory (lpLogName , lpSourceName , pevlr , szCategory); - //GetEventMessage (lpLogName , lpSourceName , pevlr , szEventText); wsprintf (szEventID, "%u", (DWORD)(pevlr->EventID & 0xFFFF)); wsprintf (szCategoryID, "%u", (DWORD)(pevlr->EventCategory)); @@ -607,31 +613,26 @@ lviEventItem.iItem = 0; lviEventItem.iSubItem = 0; lviEventItem.lParam = (LPARAM)pevlr; + lviEventItem.pszText = szEventTypeText; switch(pevlr->EventType) { case EVENTLOG_ERROR_TYPE: - lviEventItem.pszText = "Error"; lviEventItem.iImage = 2; break; case EVENTLOG_AUDIT_FAILURE: - lviEventItem.pszText = "Audit Failure"; lviEventItem.iImage = 2; break; case EVENTLOG_WARNING_TYPE: - lviEventItem.pszText = "Warning"; lviEventItem.iImage = 1; break; case EVENTLOG_INFORMATION_TYPE: - lviEventItem.pszText = "Information"; lviEventItem.iImage = 0; break; case EVENTLOG_AUDIT_SUCCESS: - lviEventItem.pszText = "Audit Success"; lviEventItem.iImage = 0; break; case EVENTLOG_SUCCESS: - lviEventItem.pszText = "Success"; lviEventItem.iImage = 0; break; } @@ -999,7 +1000,7 @@ char szSource[MAX_PATH]; char szCategory[MAX_PATH]; char szEventID[MAX_PATH]; - char szEventText[MAX_PATH*10]; + char szEventText[EVENT_MESSAGE_EVENTTEXT_BUFFER]; char szEventData[MAX_PATH]; BOOL bEventData = FALSE; LVITEM li; @@ -1012,7 +1013,7 @@ li.iItem = iIndex; li.iSubItem = 0; - ListView_GetItem(hwndListView, &li); + (void)ListView_GetItem(hwndListView, &li); pevlr = (EVENTLOGRECORD*)li.lParam; Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc Wed Oct 17 18:38:52 2007 @@ -86,4 +86,11 @@ BEGIN IDS_APP_TITLE "Ereignisanzeige" IDC_EVENTSTRINGIDNOTFOUND "Die Bezeichnung für die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es könnte sein, dass der Lokale Computer die notwendigen Registry Einträge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt." + IDC_EVENTLOG_ERROR_TYPE "Fehler" + IDC_EVENTLOG_WARNING_TYPE "Warnung" + IDC_EVENTLOG_INFORMATION_TYPE "Informationen" + IDC_EVENTLOG_AUDIT_SUCCESS "Audit Erfolgreich" + IDC_EVENTLOG_AUDIT_FAILURE "Audit Fehlgeschlagen" + IDC_EVENTLOG_SUCCESS "Erfolgreich" + IDC_EVENTLOG_UNKNOWN_TYPE "Unbekanntes Ereignis" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc Wed Oct 17 18:38:52 2007 @@ -86,4 +86,11 @@ BEGIN IDS_APP_TITLE "Event Viewer" IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." + IDC_EVENTLOG_ERROR_TYPE "Error" + IDC_EVENTLOG_WARNING_TYPE "Warning" + IDC_EVENTLOG_INFORMATION_TYPE "Information" + IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" + IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDC_EVENTLOG_SUCCESS "Success" + IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc Wed Oct 17 18:38:52 2007 @@ -86,4 +86,11 @@ BEGIN IDS_APP_TITLE "Visionneuse d'événements" IDC_EVENTSTRINGIDNOTFOUND "La description pour l'événement d'ID ( %lu ) dans la source ( %s ) ne peut être trouvée. L'ordinateur local pourrait ne pas avoir les informations registres nécéssaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant." + IDC_EVENTLOG_ERROR_TYPE "Error" + IDC_EVENTLOG_WARNING_TYPE "Warning" + IDC_EVENTLOG_INFORMATION_TYPE "Information" + IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" + IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDC_EVENTLOG_SUCCESS "Success" + IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc Wed Oct 17 18:38:52 2007 @@ -86,4 +86,11 @@ BEGIN IDS_APP_TITLE "Ïðîñìîòð ñîáûòèé" IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." + IDC_EVENTLOG_ERROR_TYPE "Error" + IDC_EVENTLOG_WARNING_TYPE "Warning" + IDC_EVENTLOG_INFORMATION_TYPE "Information" + IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" + IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDC_EVENTLOG_SUCCESS "Success" + IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/resource.h (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/resource.h Wed Oct 17 18:38:52 2007 @@ -15,7 +15,14 @@ #define IDI_SMALL 108 #define IDC_EVENTVWR 109 #define IDC_EVENTSTRINGIDNOTFOUND 209 -#define IDC_PROCESSPROGRESS 250 +#define IDC_PROCESSPROGRESS 250 +#define IDC_EVENTLOG_ERROR_TYPE 251 +#define IDC_EVENTLOG_WARNING_TYPE 252 +#define IDC_EVENTLOG_INFORMATION_TYPE 253 +#define IDC_EVENTLOG_AUDIT_SUCCESS 254 +#define IDC_EVENTLOG_AUDIT_FAILURE 255 +#define IDC_EVENTLOG_SUCCESS 256 +#define IDC_EVENTLOG_UNKNOWN_TYPE 257 #define IDR_MAINFRAME 128 #define IDI_WARNINGICON 129 #define IDI_INFORMATIONICON 130

1 0

[hpoussin] 29642: Add Lithuanian keyboard layout option in 1st stage Patch by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us See issue #2750 for more details.
by hpoussin＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: hpoussin Date: Wed Oct 17 17:50:55 2007 New Revision: 29642 URL: http://svn.reactos.org/svn/reactos?rev=29642&view=rev Log: Add Lithuanian keyboard layout option in 1st stage Patch by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us See issue #2750 for more details. Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Wed Oct 17 17:50:55 2007 @@ -111,6 +111,7 @@ 0000040E = "Hungarian" 00000410 = "Italian" 00000411 = "Japanese" +00000427 = "Lithuanian" 00000414 = "Norwegian" 00000415 = "Polish (programmer's)" 00000816 = "Portuguese (Portugal)" @@ -138,6 +139,7 @@ 0000040E = kbdhu.dll 00000410 = kbdit.dll 00000411 = kbdja.dll +00000427 = kbdlt.dll 00000414 = kbdno.dll 00000415 = kbdpl1.dll 00000816 = kbdpo.dll

1 0

[hpoussin] 29641: Fix typo
by hpoussin＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: hpoussin Date: Wed Oct 17 17:50:07 2007 New Revision: 29641 URL: http://svn.reactos.org/svn/reactos?rev=29641&view=rev Log: Fix typo Modified: trunk/reactos/dll/win32/setupapi/install.c Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c (original) +++ trunk/reactos/dll/win32/setupapi/install.c Wed Oct 17 17:50:07 2007 @@ -1083,12 +1083,12 @@ TRUE)) { if (FullLinkName[wcslen(FullLinkName) - 1] != '\\') - wcscat(FullLinkName, BaskSlash); + wcscat(FullLinkName, BackSlash); if (LinkSubDir) { wcscat(FullLinkName, LinkSubDir); if (FullLinkName[wcslen(FullLinkName) - 1] != '\\') - wcscat(FullLinkName, BaskSlash); + wcscat(FullLinkName, BackSlash); } wcscat(FullLinkName, LinkName); hr = IPersistFile_Save(ppf, FullLinkName, TRUE);

1 0

[hpoussin] 29639: Implement ProfileItems support in .inf files See issue #2738 for more details.
by hpoussin＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: hpoussin Date: Wed Oct 17 17:43:40 2007 New Revision: 29639 URL: http://svn.reactos.org/svn/reactos?rev=29639&view=rev Log: Implement ProfileItems support in .inf files See issue #2738 for more details. Modified: trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c (original) +++ trunk/reactos/dll/win32/setupapi/install.c Wed Oct 17 17:43:40 2007 @@ -40,6 +40,16 @@ static const WCHAR ServiceTypeKey[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; static const WCHAR StartTypeKey[] = {'S','t','a','r','t','T','y','p','e',0}; +static const WCHAR Name[] = {'N','a','m','e',0}; +static const WCHAR CmdLine[] = {'C','m','d','L','i','n','e',0}; +static const WCHAR SubDir[] = {'S','u','b','D','i','r',0}; +static const WCHAR WorkingDir[] = {'W','o','r','k','i','n','g','D','i','r',0}; +static const WCHAR IconPath[] = {'I','c','o','n','P','a','t','h',0}; +static const WCHAR IconIndex[] = {'I','c','o','n','I','n','d','e','x',0}; +static const WCHAR HotKey[] = {'H','o','t','K','e','y',0}; +static const WCHAR InfoTip[] = {'I','n','f','o','T','i','p',0}; +static const WCHAR DisplayResource[] = {'D','i','s','p','l','a','y','R','e','s','o','u','r','c','e',0}; + /* info passed to callback functions dealing with files */ struct files_callback_info { @@ -83,6 +93,10 @@ }; typedef BOOL (*iterate_fields_func)( HINF hinf, PCWSTR field, void *arg ); +static BOOL GetLineText( HINF hinf, PCWSTR section_name, PCWSTR key_name, PWSTR *value); +typedef HRESULT WINAPI (*COINITIALIZE)(IN LPVOID pvReserved); +typedef HRESULT WINAPI (*COCREATEINSTANCE)(IN REFCLSID rclsid, IN LPUNKNOWN pUnkOuter, IN DWORD dwClsContext, IN REFIID riid, OUT LPVOID *ppv); +typedef HRESULT WINAPI (*COUNINITIALIZE)(VOID); /* Unicode constants */ static const WCHAR AddService[] = {'A','d','d','S','e','r','v','i','c','e',0}; @@ -816,10 +830,306 @@ return TRUE; } -static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) -{ - FIXME( "should do profile items %s\n", debugstr_w(field) ); +static BOOL Concatenate(int DirId, LPCWSTR SubDirPart, LPCWSTR NamePart, LPWSTR *pFullName) +{ + DWORD dwRequired = 0; + LPCWSTR Dir; + LPWSTR FullName; + + *pFullName = NULL; + + Dir = DIRID_get_string(DirId); + if (Dir) + dwRequired += wcslen(Dir) + 1; + if (SubDirPart) + dwRequired += wcslen(SubDirPart) + 1; + if (NamePart) + dwRequired += wcslen(NamePart); + dwRequired = dwRequired * sizeof(WCHAR) + sizeof(UNICODE_NULL); + + FullName = MyMalloc(dwRequired); + if (!FullName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + FullName[0] = UNICODE_NULL; + + if (Dir) + { + wcscat(FullName, Dir); + if (FullName[wcslen(FullName) - 1] != '\\') + wcscat(FullName, BackSlash); + } + if (SubDirPart) + { + wcscat(FullName, SubDirPart); + if (FullName[wcslen(FullName) - 1] != '\\') + wcscat(FullName, BackSlash); + } + if (NamePart) + wcscat(FullName, NamePart); + + *pFullName = FullName; return TRUE; +} + +/*********************************************************************** + * profile_items_callback + * + * Called once for each ProfileItems entry in a given section. + */ +static BOOL +profile_items_callback( + IN HINF hInf, + IN PCWSTR SectionName, + IN PVOID Arg) +{ + INFCONTEXT Context; + LPWSTR LinkSubDir = NULL, LinkName = NULL; + INT LinkAttributes = 0; + INT FileDirId = 0; + LPWSTR FileSubDir = NULL; + INT DirId = 0; + LPWSTR SubDirPart = NULL, NamePart = NULL; + LPWSTR FullLinkName = NULL, FullFileName = NULL, FullWorkingDir = NULL, FullIconName = NULL; + INT IconIdx = 0; + LPWSTR lpHotKey = NULL, lpInfoTip = NULL; + LPWSTR DisplayName = NULL; + INT DisplayResId = 0; + BOOL ret = FALSE; + DWORD Index, Required; + + IShellLinkW *psl; + IPersistFile *ppf; + HMODULE hOle32 = NULL; + COINITIALIZE pCoInitialize; + COCREATEINSTANCE pCoCreateInstance; + COUNINITIALIZE pCoUninitialize; + HRESULT hr; + + TRACE("hInf %p, SectionName %s, Arg %p\n", + hInf, debugstr_w(SectionName), Arg); + + /* Read 'Name' entry */ + if (!SetupFindFirstLineW(hInf, SectionName, Name, &Context)) + goto cleanup; + if (!GetStringField(&Context, 1, &LinkName)) + goto cleanup; + if (SetupGetFieldCount(&Context) >= 2) + { + if (!SetupGetIntField(&Context, 2, &LinkAttributes)) + goto cleanup; + } + + /* Read 'CmdLine' entry */ + if (!SetupFindFirstLineW(hInf, SectionName, CmdLine, &Context)) + goto cleanup; + Index = 1; + if (!SetupGetIntField(&Context, Index++, &FileDirId)) + goto cleanup; + if (SetupGetFieldCount(&Context) >= 3) + { + if (!GetStringField(&Context, Index++, &FileSubDir)) + goto cleanup; + } + if (!GetStringField(&Context, Index++, &NamePart)) + goto cleanup; + if (!Concatenate(FileDirId, FileSubDir, NamePart, &FullFileName)) + goto cleanup; + MyFree(NamePart); + NamePart = NULL; + + /* Read 'SubDir' entry */ + if ((LinkAttributes & FLG_PROFITEM_GROUP) == 0 && SetupFindFirstLineW(hInf, SectionName, SubDir, &Context)) + { + if (!GetStringField(&Context, 1, &LinkSubDir)) + goto cleanup; + } + + /* Read 'WorkingDir' entry */ + if (SetupFindFirstLineW(hInf, SectionName, WorkingDir, &Context)) + { + if (!SetupGetIntField(&Context, 1, &DirId)) + goto cleanup; + if (SetupGetFieldCount(&Context) >= 2) + { + if (!GetStringField(&Context, 2, &SubDirPart)) + goto cleanup; + } + if (!Concatenate(DirId, SubDirPart, NULL, &FullWorkingDir)) + goto cleanup; + MyFree(SubDirPart); + SubDirPart = NULL; + } + else + { + if (!Concatenate(FileDirId, FileSubDir, NULL, &FullWorkingDir)) + goto cleanup; + } + + /* Read 'IconPath' entry */ + if (SetupFindFirstLineW(hInf, SectionName, IconPath, &Context)) + { + Index = 1; + if (!SetupGetIntField(&Context, Index++, &DirId)) + goto cleanup; + if (SetupGetFieldCount(&Context) >= 3) + { + if (!GetStringField(&Context, Index++, &SubDirPart)) + goto cleanup; + } + if (!GetStringField(&Context, Index, &NamePart)) + goto cleanup; + if (!Concatenate(DirId, SubDirPart, NamePart, &FullIconName)) + goto cleanup; + MyFree(SubDirPart); + MyFree(NamePart); + SubDirPart = NamePart = NULL; + } + else + { + FullIconName = DuplicateString(FullFileName); + if (!FullIconName) + goto cleanup; + } + + /* Read 'IconIndex' entry */ + if (SetupFindFirstLineW(hInf, SectionName, IconIndex, &Context)) + { + if (!SetupGetIntField(&Context, 1, &IconIdx)) + goto cleanup; + } + + /* Read 'HotKey' and 'InfoTip' entries */ + GetLineText(hInf, SectionName, HotKey, &lpHotKey); + GetLineText(hInf, SectionName, InfoTip, &lpInfoTip); + + /* Read 'DisplayResource' entry */ + if (SetupFindFirstLineW(hInf, SectionName, DisplayResource, &Context)) + { + if (!GetStringField(&Context, 1, &DisplayName)) + goto cleanup; + if (!SetupGetIntField(&Context, 2, &DisplayResId)) + goto cleanup; + } + + /* Some debug */ + TRACE("Link is %s\\%s, attributes 0x%x\n", debugstr_w(LinkSubDir), debugstr_w(LinkName), LinkAttributes); + TRACE("File is %s\n", debugstr_w(FullFileName)); + TRACE("Working dir %s\n", debugstr_w(FullWorkingDir)); + TRACE("Icon is %s, %d\n", debugstr_w(FullIconName), IconIdx); + TRACE("Hotkey %s\n", debugstr_w(lpHotKey)); + TRACE("InfoTip %s\n", debugstr_w(lpInfoTip)); + TRACE("Display %s, %d\n", DisplayName, DisplayResId); + + /* Load ole32.dll */ + hOle32 = LoadLibraryA("ole32.dll"); + if (!hOle32) + goto cleanup; + pCoInitialize = (COINITIALIZE)GetProcAddress(hOle32, "CoInitialize"); + if (!pCoInitialize) + goto cleanup; + pCoCreateInstance = (COCREATEINSTANCE)GetProcAddress(hOle32, "CoCreateInstance"); + if (!pCoCreateInstance) + goto cleanup; + pCoUninitialize = (COUNINITIALIZE)GetProcAddress(hOle32, "CoUninitialize"); + if (!pCoUninitialize) + goto cleanup; + + /* Create shortcut */ + hr = pCoInitialize(NULL); + if (!SUCCEEDED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + SetLastError(HRESULT_CODE(hr)); + else + SetLastError(E_FAIL); + goto cleanup; + } + hr = pCoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&psl); + if (SUCCEEDED(hr)) + { + /* Fill link properties */ + if (SUCCEEDED(hr)) + hr = IShellLinkW_SetPath(psl, FullFileName); + if (SUCCEEDED(hr)) + hr = IShellLinkW_SetWorkingDirectory(psl, FullWorkingDir); + if (SUCCEEDED(hr)) + hr = IShellLinkW_SetIconLocation(psl, FullIconName, IconIdx); + if (SUCCEEDED(hr) && lpHotKey) + FIXME("Need to store hotkey %s in shell link\n", debugstr_w(lpHotKey)); + if (SUCCEEDED(hr) && lpInfoTip) + hr = IShellLinkW_SetDescription(psl, lpInfoTip); + if (SUCCEEDED(hr) && DisplayName) + FIXME("Need to store display name %s, %d in shell link\n", debugstr_w(DisplayName), DisplayResId); + if (SUCCEEDED(hr)) + { + hr = IShellLinkW_QueryInterface(psl, &IID_IPersistFile, (LPVOID*)&ppf); + if (SUCCEEDED(hr)) + { + Required = (MAX_PATH + wcslen(LinkSubDir) + 1 + wcslen(LinkName)) * sizeof(WCHAR); + FullLinkName = MyMalloc(Required); + if (!FullLinkName) + hr = E_OUTOFMEMORY; + else + { + if (LinkAttributes & (FLG_PROFITEM_DELETE | FLG_PROFITEM_GROUP)) + FIXME("Need to handle FLG_PROFITEM_DELETE and FLG_PROFITEM_GROUP\n"); + if (SHGetSpecialFolderPathW( + NULL, + FullLinkName, + LinkAttributes & FLG_PROFITEM_CURRENTUSER ? CSIDL_PROGRAMS : CSIDL_COMMON_PROGRAMS, + TRUE)) + { + if (FullLinkName[wcslen(FullLinkName) - 1] != '\\') + wcscat(FullLinkName, BaskSlash); + if (LinkSubDir) + { + wcscat(FullLinkName, LinkSubDir); + if (FullLinkName[wcslen(FullLinkName) - 1] != '\\') + wcscat(FullLinkName, BaskSlash); + } + wcscat(FullLinkName, LinkName); + hr = IPersistFile_Save(ppf, FullLinkName, TRUE); + } + else + hr = HRESULT_FROM_WIN32(GetLastError()); + } + IPersistFile_Release(ppf); + } + } + IShellLinkW_Release(psl); + } + pCoUninitialize(); + if (SUCCEEDED(hr)) + ret = TRUE; + else + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + SetLastError(HRESULT_CODE(hr)); + else + SetLastError(E_FAIL); + } + +cleanup: + MyFree(LinkSubDir); + MyFree(LinkName); + MyFree(FileSubDir); + MyFree(SubDirPart); + MyFree(NamePart); + MyFree(FullFileName); + MyFree(FullWorkingDir); + MyFree(FullIconName); + MyFree(FullLinkName); + MyFree(lpHotKey); + MyFree(lpInfoTip); + MyFree(DisplayName); + if (hOle32) + FreeLibrary(hOle32); + + TRACE("Returning %d\n", ret); + return ret; } static BOOL copy_inf_callback( HINF hinf, PCWSTR field, void *arg ) Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Wed Oct 17 17:43:40 2007 @@ -28,6 +28,7 @@ #include <wchar.h> #define WIN32_NO_STATUS +#define COBJMACROS #include <windows.h> #include <aclapi.h> #include <cfgmgr32.h>

1 0

[hpoussin] 29638: Commit again changes of r25834, which were reverted in r29507. See issue #1918 for more details.
by hpoussin＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: hpoussin Date: Wed Oct 17 17:42:53 2007 New Revision: 29638 URL: http://svn.reactos.org/svn/reactos?rev=29638&view=rev Log: Commit again changes of r25834, which were reverted in r29507. See issue #1918 for more details. Modified: trunk/reactos/dll/win32/shell32/control.c Modified: trunk/reactos/dll/win32/shell32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.c (original) +++ trunk/reactos/dll/win32/shell32/control.c Wed Oct 17 17:42:53 2007 @@ -352,6 +352,7 @@ unsigned sp = 0; LPWSTR extraPmts = NULL; int quoted = 0; + BOOL spSet = FALSE; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); if (!buffer) return; @@ -366,8 +367,10 @@ if (beg) { if (*beg == '@') { sp = atoiW(beg + 1); + spSet = TRUE; } else if (*beg == '\0') { sp = 0; + spSet = TRUE; } else { extraPmts = beg; } @@ -381,6 +384,9 @@ while ((ptr = StrChrW(buffer, '"'))) memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + while ((ptr = StrChrW(extraPmts, '"'))) + memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + TRACE("cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); Control_LoadApplet(hWnd, buffer, panel); @@ -393,6 +399,13 @@ WARN("Out of bounds (%u >= %u), setting to 0\n", sp, applet->count); sp = 0; } + + if ((extraPmts)&&(!spSet)) + { + while ((lstrcmpiW(extraPmts, applet->info[sp].szName)) && (sp < applet->count)) + sp++; + } + if (applet->info[sp].dwSize) { if (!applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts)) applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData);

1 0

[gedmurphy] 29637: silence stray debug message
by gedmurphy＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: gedmurphy Date: Wed Oct 17 14:33:12 2007 New Revision: 29637 URL: http://svn.reactos.org/svn/reactos?rev=29637&view=rev Log: silence stray debug message Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Wed Oct 17 14:33:12 2007 @@ -587,7 +587,7 @@ { DestPalette = PALETTE_LockPalette(hDestPalette); /* FIXME - DestPalette can be NULL!!!! Don't assert here!!! */ - DPRINT1("DestPalette : %p\n", DestPalette); + DPRINT("DestPalette : %p\n", DestPalette); ASSERT(DestPalette); DestPaletteType = DestPalette->Mode; }

1 0

[fireball] 29636: - LdrpAttachToProcess() should be called only once per process, so added the check. This fixes a crash when trying to start any app using MFC42.DLL, including 1C. See issue #2730 for more details.
by fireball＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: fireball Date: Wed Oct 17 14:01:03 2007 New Revision: 29636 URL: http://svn.reactos.org/svn/reactos?rev=29636&view=rev Log: - LdrpAttachToProcess() should be called only once per process, so added the check. This fixes a crash when trying to start any app using MFC42.DLL, including 1C. See issue #2730 for more details. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c Wed Oct 17 14:01:03 2007 @@ -748,9 +748,12 @@ if (NT_SUCCESS(Status) && (!LoadFlags || 0 == (*LoadFlags & LOAD_LIBRARY_AS_DATAFILE))) { - RtlEnterCriticalSection(Peb->LoaderLock); - Status = LdrpAttachProcess(); - RtlLeaveCriticalSection(Peb->LoaderLock); + if (!(Module->Flags & LDRP_PROCESS_ATTACH_CALLED)) + { + RtlEnterCriticalSection(Peb->LoaderLock); + Status = LdrpAttachProcess(); + RtlLeaveCriticalSection(Peb->LoaderLock); + } } if ((!Module) && (NT_SUCCESS(Status)))

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