Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 29756: - use RegLoadMUIString for a translated keys - insert shortcut assitent in front of shellnew list - adjust item id for create shortcut action
by janderwald＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: janderwald Date: Mon Oct 22 01:59:55 2007 New Revision: 29756 URL: http://svn.reactos.org/svn/reactos?rev=29756&view=rev Log: - use RegLoadMUIString for a translated keys - insert shortcut assitent in front of shellnew list - adjust item id for create shortcut action Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Mon Oct 22 01:59:55 2007 @@ -76,6 +76,58 @@ static PSHELLNEW_ITEM s_SnHead = NULL; +static +BOOL +GetKeyDescription(LPWSTR szKeyName, LPWSTR szResult) +{ + HKEY hKey; + DWORD dwDesc, dwError; + WCHAR szDesc[100]; + + static const WCHAR szFriendlyTypeName[] = { '\\','F','r','i','e','n','d','l','y','T','y','p','e','N','a','m','e',0 }; + + TRACE("GetKeyDescription: keyname %s\n", debugstr_w(szKeyName)); + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT,szKeyName,0, KEY_READ | KEY_QUERY_VALUE,&hKey) != ERROR_SUCCESS) + return FALSE; + + if (RegLoadMUIStringW(hKey,szFriendlyTypeName,szResult,MAX_PATH,&dwDesc,0,NULL) == ERROR_SUCCESS) + { + TRACE("result %s\n", debugstr_w(szResult)); + RegCloseKey(hKey); + return TRUE; + } + /* fetch default value */ + dwDesc = sizeof(szDesc); + dwError = RegGetValueW(hKey,NULL,NULL, RRF_RT_REG_SZ,NULL,szDesc,&dwDesc); + if(dwError == ERROR_SUCCESS) + { + if (wcsncmp(szDesc, szKeyName, dwDesc / sizeof(WCHAR))) + { + /* recurse for to a linked key */ + if (!GetKeyDescription(szDesc, szResult)) + { + /* use description */ + wcscpy(szResult, szDesc); + } + } + else + { + /* use default value as description */ + wcscpy(szResult, szDesc); + } + } + else + { + /* registry key w/o default key?? */ + TRACE("RegGetValue failed with %x\n", dwError); + wcscpy(szResult, szKeyName); + } + + RegCloseKey(hKey); + return TRUE; +} + PSHELLNEW_ITEM LoadItem(LPWSTR szKeyName) { @@ -83,9 +135,9 @@ DWORD dwIndex; WCHAR szName[MAX_PATH]; WCHAR szCommand[MAX_PATH]; - WCHAR szDesc[MAX_PATH]; - WCHAR szIcon[MAX_PATH]; - DWORD dwName, dwCommand, dwDesc; + WCHAR szDesc[MAX_PATH] = {0}; + WCHAR szIcon[MAX_PATH] = {0}; + DWORD dwName, dwCommand; LONG result; PSHELLNEW_ITEM pNewItem; @@ -94,40 +146,17 @@ static const WCHAR szData[] = { 'D','a','t','a',0 }; static const WCHAR szFileName[] = { 'F','i','l','e','N','a','m','e', 0 }; static const WCHAR szNullFile[] = { 'N','u','l','l','F','i','l','e', 0 }; - static const WCHAR szDefaultIcon[] ={ '\\','D','e','f','a','u','l','t','I','c','o','n',0 }; - - result = RegOpenKeyExW(HKEY_CLASSES_ROOT,szKeyName,0,KEY_READ,&hKey); - - if (result != ERROR_SUCCESS) - { - return NULL; - } - - dwName = MAX_PATH; - result = RegGetValueW(hKey,NULL,NULL,RRF_RT_REG_SZ,NULL,szName, &dwName); - - RegCloseKey(hKey); - szDesc[0] = L'\0'; - szIcon[0] = L'\0'; - if (result == ERROR_SUCCESS) - { - dwDesc = MAX_PATH; - RegGetValueW(HKEY_CLASSES_ROOT,szName,NULL,RRF_RT_REG_SZ,NULL,szDesc,&dwDesc); - dwDesc = MAX_PATH; - wcscat(szName, szDefaultIcon); - RegGetValueW(HKEY_CLASSES_ROOT,szName,NULL,RRF_RT_REG_SZ,NULL,szIcon,&dwDesc); - } - + wcscpy(szName, szKeyName); + GetKeyDescription(szKeyName, szDesc); wcscat(szName, szShellNew); result = RegOpenKeyExW(HKEY_CLASSES_ROOT,szName,0,KEY_READ,&hKey); - //TRACE("LoadItem keyname %s szName %s szDesc %s szIcon %s\n", debugstr_w(szKeyName), debugstr_w(szName), debugstr_w(szDesc), debugstr_w(szIcon)); - + //TRACE("LoadItem dwName %d keyname %s szName %s szDesc %s szIcon %s\n", dwName, debugstr_w(szKeyName), debugstr_w(szName), debugstr_w(szDesc), debugstr_w(szIcon)); if (result != ERROR_SUCCESS) { - return NULL; + return NULL; } dwIndex = 0; @@ -190,6 +219,7 @@ LONG result; PSHELLNEW_ITEM pNewItem; PSHELLNEW_ITEM pCurItem = NULL; + static WCHAR szLnk[] = { '.','l','n','k',0 }; dwIndex = 0; do @@ -200,14 +230,29 @@ pNewItem = LoadItem(szName); if (pNewItem) { - if (pCurItem) + if (!wcsicmp(pNewItem->szExt, szLnk)) { - pCurItem->Next = pNewItem; - pCurItem = pNewItem; + if (s_SnHead) + { + pNewItem->Next = s_SnHead; + s_SnHead = pNewItem; + } + else + { + s_SnHead = pCurItem = pNewItem; + } } else { - pCurItem = s_SnHead = pNewItem; + if (pCurItem) + { + pCurItem->Next = pNewItem; + pCurItem = pNewItem; + } + else + { + pCurItem = s_SnHead = pNewItem; + } } } } @@ -232,8 +277,26 @@ } + ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); + + This->iIdShellNewFirst = idFirst; + + /* + * FIXME: small hack for new shortcut + */ + + mii.fMask = MIIM_ID; + mii.wID = idFirst; + SetMenuItemInfoW(hMenu, 1, TRUE, &mii); + idFirst++; + + mii.fMask = MIIM_TYPE | MIIM_ID; + mii.fType = MFT_SEPARATOR; + mii.wID = -1; + InsertMenuItemW(hMenu, -1, TRUE, &mii); + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; //MIIM_BITMAP; mii.fType = MFT_STRING; @@ -244,18 +307,19 @@ while(pCurItem) { - mii.dwTypeData = pCurItem->szDesc; - mii.cch = strlenW(mii.dwTypeData); - mii.wID = idFirst + i; - if (InsertMenuItemW(hMenu, idMenu, TRUE, &mii)) + if (i >= 1) { - idMenu++; - i++; + mii.dwTypeData = pCurItem->szDesc; + mii.cch = strlenW(mii.dwTypeData); + mii.wID = idFirst; + InsertMenuItemW(hMenu, idMenu, TRUE, &mii); + idMenu++; + idFirst++; } pCurItem = pCurItem->Next; - } - This->iIdShellNewFirst = idFirst; - This->iIdShellNewLast = idFirst + i; + i++; + } + This->iIdShellNewLast = idFirst; } VOID DoShellNewCmd(BgCmImpl * This, LPCMINVOKECOMMANDINFO lpcmi) @@ -276,7 +340,6 @@ static const WCHAR szNew[] = { 'N','e','w',' ',0 }; //FIXME static const WCHAR szP1[] = { '%', '1', 0 }; static const WCHAR szFormat[] = {'%','s',' ','(','%','d',')','%','s',0 }; - i = This->iIdShellNewFirst; target = LOWORD(lpcmi->lpVerb);

1 0

[peterw] 29755: - Make sure banner is displayed when rosbe.cmd is called without parameters.
by peterw＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: peterw Date: Mon Oct 22 01:16:17 2007 New Revision: 29755 URL: http://svn.reactos.org/svn/reactos?rev=29755&view=rev Log: - Make sure banner is displayed when rosbe.cmd is called without parameters. Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Oct 22 01:16:17 2007 @@ -49,11 +49,10 @@ cls echo Unknown parameter specified. Exiting. goto :ExitRosBE -) else ( - cls - call :RosBE4 - goto :EndCommandParse ) + +cls +call :RosBE4 :EndCommandParse

1 0

[peterw] 29754: - Small chdefdir cleanup and change _VER to _ROSBE_VERSION.
by peterw＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: peterw Date: Mon Oct 22 01:06:49 2007 New Revision: 29754 URL: http://svn.reactos.org/svn/reactos?rev=29754&view=rev Log: - Small chdefdir cleanup and change _VER to _ROSBE_VERSION. Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Mon Oct 22 01:06:49 2007 @@ -10,25 +10,24 @@ title Change the Default Dir... -if /I "%1"=="" ( - goto :DEF +if /i "%1" == "" ( + goto :INTERACTIVE ) -if /I "%1"=="default" ( +if /i "%1" == "default" ( set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% ) else ( set _ROSBE_ROSSOURCEDIR=%1 ) goto :END -:DEF +:INTERACTIVE +echo Type in a Path to use RosBE in or "default" to revert to Default Dir: +set /p XY= -echo Type in a Path to use RosBE in or "default" to revert to Default Dir: -SET /P XY= - -if /I "%XY%"=="" ( +if /i "%XY%" == "" ( goto :END ) -if /I "%XY%"=="default" ( +if /i "%XY%"=="default" ( set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% ) else ( set _ROSBE_ROSSOURCEDIR=%XY% @@ -36,5 +35,5 @@ goto :END :END -title ReactOS Build Environment %_VER% -cd /D "%_ROSBE_ROSSOURCEDIR%" +title ReactOS Build Environment %_ROSBE_VERSION% +cd /d "%_ROSBE_ROSSOURCEDIR%"

1 0

[cfinck] 29753: Shell32 resource file cleanup - Part 1/2 for today - Move all language-dependent resource files to a "lang" subdirectory and rename them appropriately - Rename "shres.rc" to "shell32.rc" - Make all translations consistent, if some elements were missing I copied the english ones. Also use a consistent indentation. All resource files from "bg-BG.rc" to "fi-FI.rc" (alphabetically) should be consistent now, I'll do the rest later. - Fix some mistakes in the german translation
by cfinck＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: cfinck Date: Mon Oct 22 01:04:36 2007 New Revision: 29753 URL: http://svn.reactos.org/svn/reactos?rev=29753&view=rev Log: Shell32 resource file cleanup - Part 1/2 for today - Move all language-dependent resource files to a "lang" subdirectory and rename them appropriately - Rename "shres.rc" to "shell32.rc" - Make all translations consistent, if some elements were missing I copied the english ones. Also use a consistent indentation. All resource files from "bg-BG.rc" to "fi-FI.rc" (alphabetically) should be consistent now, I'll do the rest later. - Fix some mistakes in the german translation Added: trunk/reactos/dll/win32/shell32/lang/ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_Bg.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_Ca.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_Cs.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_Da.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_En.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_Eo.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_Es.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shell32_Fi.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Fr.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Hu.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_It.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Ja.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Ko.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_No.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Nl.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Pl.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Pt.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Ru.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Sk.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Si.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Sv.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Tr.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Uk.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Wa.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Cn.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc - copied unchanged from r29729, trunk/reactos/dll/win32/shell32/shell32_Zh.rc trunk/reactos/dll/win32/shell32/shell32.rc - copied, changed from r29729, trunk/reactos/dll/win32/shell32/shres.rc Removed: trunk/reactos/dll/win32/shell32/shell32_Bg.rc trunk/reactos/dll/win32/shell32/shell32_Ca.rc trunk/reactos/dll/win32/shell32/shell32_Cn.rc trunk/reactos/dll/win32/shell32/shell32_Cs.rc trunk/reactos/dll/win32/shell32/shell32_Da.rc trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/shell32_En.rc trunk/reactos/dll/win32/shell32/shell32_Eo.rc trunk/reactos/dll/win32/shell32/shell32_Es.rc trunk/reactos/dll/win32/shell32/shell32_Fi.rc trunk/reactos/dll/win32/shell32/shell32_Fr.rc trunk/reactos/dll/win32/shell32/shell32_Hu.rc trunk/reactos/dll/win32/shell32/shell32_It.rc trunk/reactos/dll/win32/shell32/shell32_Ja.rc trunk/reactos/dll/win32/shell32/shell32_Ko.rc trunk/reactos/dll/win32/shell32/shell32_Nl.rc trunk/reactos/dll/win32/shell32/shell32_No.rc trunk/reactos/dll/win32/shell32/shell32_Pl.rc trunk/reactos/dll/win32/shell32/shell32_Pt.rc trunk/reactos/dll/win32/shell32/shell32_Ru.rc trunk/reactos/dll/win32/shell32/shell32_Si.rc trunk/reactos/dll/win32/shell32/shell32_Sk.rc trunk/reactos/dll/win32/shell32/shell32_Sv.rc trunk/reactos/dll/win32/shell32/shell32_Tr.rc trunk/reactos/dll/win32/shell32/shell32_Uk.rc trunk/reactos/dll/win32/shell32/shell32_Wa.rc trunk/reactos/dll/win32/shell32/shell32_Zh.rc trunk/reactos/dll/win32/shell32/shell32_xx.rc trunk/reactos/dll/win32/shell32/shres.rc Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Copied: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_Bg.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Copied: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_Ca.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Copied: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_Cs.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Copied: trunk/reactos/dll/win32/shell32/lang/da-DK.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_Da.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Copied: trunk/reactos/dll/win32/shell32/lang/de-DE.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_De.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Copied: trunk/reactos/dll/win32/shell32/lang/en-US.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_En.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Copied: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_Eo.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… Copied: trunk/reactos/dll/win32/shell32/lang/es-ES.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_Es.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Copied: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc (from r29729, trunk/reactos/dll/win32/shell32/shell32_Fi.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Copied: trunk/reactos/dll/win32/shell32/shell32.rc (from r29729, trunk/reactos/dll/win32/shell32/shres.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Removed: trunk/reactos/dll/win32/shell32/shell32_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Ca.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Wa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shell32_xx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shres.rc…

1 0

[weiden] 29752: Load libraries as data files in RegLoadMUIString
by weiden＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: weiden Date: Sun Oct 21 23:14:19 2007 New Revision: 29752 URL: http://svn.reactos.org/svn/reactos?rev=29752&view=rev Log: Load libraries as data files in RegLoadMUIString Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c Sun Oct 21 23:14:19 2007 @@ -4967,7 +4967,7 @@ uiStringId = _wtoi(pComma+2); *pComma = L'\0'; - hModule = LoadLibraryW(pwszExpandedBuffer + 1); + hModule = LoadLibraryExW(pwszExpandedBuffer + 1, NULL, LOAD_LIBRARY_AS_DATAFILE); if (!hModule || !load_string(hModule, uiStringId, pszOutBuf, cbOutBuf / sizeof(WCHAR))) result = ERROR_BADKEY; FreeLibrary(hModule);

1 0

[greatlrd] 29751: fix compilng forget implement stub for DxEngIncDispUniq
by greatlrd＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: greatlrd Date: Sun Oct 21 22:52:42 2007 New Revision: 29751 URL: http://svn.reactos.org/svn/reactos?rev=29751&view=rev Log: fix compilng forget implement stub for DxEngIncDispUniq Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Sun Oct 21 22:52:42 2007 @@ -115,6 +115,7 @@ DWORD DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngGetRedirectionBitmap(DWORD x1); DWORD DxEngLoadImage(DWORD x1,DWORD x2); +DWORD DxEngIncDispUniq(); Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Sun Oct 21 22:52:42 2007 @@ -483,4 +483,13 @@ return FALSE; } - +/************************************************************************/ +/* DxEngIncDispUniq */ +/************************************************************************/ +DWORD DxEngIncDispUniq() +{ + UNIMPLEMENTED; + return FALSE; +} + +

1 0

[greatlrd] 29750: forget remove a smaller hack i the drv functions list that being pass to dxg.sys
by greatlrd＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: greatlrd Date: Sun Oct 21 22:47:16 2007 New Revision: 29750 URL: http://svn.reactos.org/svn/reactos?rev=29750&view=rev Log: forget remove a smaller hack i the drv functions list that being pass to dxg.sys Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Sun Oct 21 22:47:16 2007 @@ -18,81 +18,47 @@ { {0, (PFN) NULL}, {DXENG_INDEX_DxEngNUIsTermSrv, (PFN)DxEngNUIsTermSrv}, -// {DXENG_INDEX_DxEngScreenAccessCheck, (PFN)DxEngScreenAccessCheck}, - {0, (PFN) NULL}, // hack for now + {DXENG_INDEX_DxEngScreenAccessCheck, (PFN)DxEngScreenAccessCheck}, {DXENG_INDEX_DxEngRedrawDesktop, (PFN)DxEngRedrawDesktop}, {DXENG_INDEX_DxEngDispUniq, (PFN)DxEngDispUniq}, -// {DXENG_INDEX_DxEngIncDispUniq, (PFN)DxEngIncDispUniq}, - {0, (PFN) NULL}, // hack for now + {DXENG_INDEX_DxEngIncDispUniq, (PFN)DxEngIncDispUniq}, {DXENG_INDEX_DxEngVisRgnUniq, (PFN)DxEngVisRgnUniq}, -// {DXENG_INDEX_DxEngLockShareSem, (PFN)DxEngLockShareSem}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngUnlockShareSem, (PFN)DxEngUnlockShareSem}, - {0, (PFN) NULL}, // hack for now + {DXENG_INDEX_DxEngLockShareSem, (PFN)DxEngLockShareSem}, + {DXENG_INDEX_DxEngUnlockShareSem, (PFN)DxEngUnlockShareSem}, {DXENG_INDEX_DxEngEnumerateHdev, (PFN)DxEngEnumerateHdev}, -// {DXENG_INDEX_DxEngLockHdev, (PFN)DxEngLockHdev}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngUnlockHdev, (PFN)DxEngUnlockHdev}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngIsHdevLockedByCurrentThread, (PFN)DxEngIsHdevLockedByCurrentThread}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngReferenceHdev, (PFN)DxEngReferenceHdev}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngUnreferenceHdev, (PFN)DxEngUnreferenceHdev}, - {0, (PFN) NULL}, // hack for now + {DXENG_INDEX_DxEngLockHdev, (PFN)DxEngLockHdev}, + {DXENG_INDEX_DxEngUnlockHdev, (PFN)DxEngUnlockHdev}, + {DXENG_INDEX_DxEngIsHdevLockedByCurrentThread, (PFN)DxEngIsHdevLockedByCurrentThread}, + {DXENG_INDEX_DxEngReferenceHdev, (PFN)DxEngReferenceHdev}, + {DXENG_INDEX_DxEngUnreferenceHdev, (PFN)DxEngUnreferenceHdev}, {DXENG_INDEX_DxEngGetDeviceGammaRamp, (PFN)DxEngGetDeviceGammaRamp}, -// {DXENG_INDEX_DxEngSetDeviceGammaRamp, (PFN)DxEngSetDeviceGammaRamp}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSpTearDownSprites, (PFN)DxEngSpTearDownSprites}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSpUnTearDownSprites, (PFN)DxEngSpUnTearDownSprites}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSpSpritesVisible, (PFN)DxEngSpSpritesVisible}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngGetHdevData, (PFN)DxEngGetHdevData}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSetHdevData, (PFN)DxEngSetHdevData}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngCreateMemoryDC, (PFN)DxEngCreateMemoryDC}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngGetDesktopDC, (PFN)DxEngGetDesktopDC}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngDeleteDC, (PFN)DxEngDeleteDC}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngCleanDC, (PFN)DxEngCleanDC}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSetDCOwner, (PFN)DxEngSetDCOwner}, - {0, (PFN) NULL}, // hack for now + {DXENG_INDEX_DxEngSetDeviceGammaRamp, (PFN)DxEngSetDeviceGammaRamp}, + {DXENG_INDEX_DxEngSpTearDownSprites, (PFN)DxEngSpTearDownSprites}, + {DXENG_INDEX_DxEngSpUnTearDownSprites, (PFN)DxEngSpUnTearDownSprites}, + {DXENG_INDEX_DxEngSpSpritesVisible, (PFN)DxEngSpSpritesVisible}, + {DXENG_INDEX_DxEngGetHdevData, (PFN)DxEngGetHdevData}, + {DXENG_INDEX_DxEngSetHdevData, (PFN)DxEngSetHdevData}, + {DXENG_INDEX_DxEngCreateMemoryDC, (PFN)DxEngCreateMemoryDC}, + {DXENG_INDEX_DxEngGetDesktopDC, (PFN)DxEngGetDesktopDC}, + {DXENG_INDEX_DxEngDeleteDC, (PFN)DxEngDeleteDC}, + {DXENG_INDEX_DxEngCleanDC, (PFN)DxEngCleanDC}, + {DXENG_INDEX_DxEngSetDCOwner, (PFN)DxEngSetDCOwner}, {DXENG_INDEX_DxEngLockDC, (PFN)DxEngLockDC}, {DXENG_INDEX_DxEngUnlockDC, (PFN)DxEngUnlockDC}, -// {DXENG_INDEX_DxEngSetDCState, (PFN)DxEngGetDCState}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngGetDCState, (PFN)DxEngGetDCState}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSelectBitmap, (PFN)DxEngSelectBitmap}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSetBitmapOwner, (PFN)DxEngSetBitmapOwner}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngDeleteSurface, (PFN)DxEngDeleteSurface}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngGetSurfaceData, (PFN)DxEngGetSurfaceData}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngAltLockSurface, (PFN)DxEngAltLockSurface}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngUploadPaletteEntryToSurface, (PFN)DxEngUploadPaletteEntryToSurface}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngMarkSurfaceAsDirectDraw, (PFN)DxEngMarkSurfaceAsDirectDraw}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSelectPaletteToSurface, (PFN)DxEngSelectPaletteToSurface}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSyncPaletteTableWithDevice, (PFN)DxEngSyncPaletteTableWithDevice}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSetPaletteState, (PFN)DxEngSetPaletteState}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngGetRedirectionBitmap, (PFN)DxEngGetRedirectionBitmap}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngLoadImage, (PFN)DxEngLoadImage} - {0, (PFN) NULL} // hack for now + {DXENG_INDEX_DxEngSetDCState, (PFN)DxEngGetDCState}, + {DXENG_INDEX_DxEngGetDCState, (PFN)DxEngGetDCState}, + {DXENG_INDEX_DxEngSelectBitmap, (PFN)DxEngSelectBitmap}, + {DXENG_INDEX_DxEngSetBitmapOwner, (PFN)DxEngSetBitmapOwner}, + {DXENG_INDEX_DxEngDeleteSurface, (PFN)DxEngDeleteSurface}, + {DXENG_INDEX_DxEngGetSurfaceData, (PFN)DxEngGetSurfaceData}, + {DXENG_INDEX_DxEngAltLockSurface, (PFN)DxEngAltLockSurface}, + {DXENG_INDEX_DxEngUploadPaletteEntryToSurface, (PFN)DxEngUploadPaletteEntryToSurface}, + {DXENG_INDEX_DxEngMarkSurfaceAsDirectDraw, (PFN)DxEngMarkSurfaceAsDirectDraw}, + {DXENG_INDEX_DxEngSelectPaletteToSurface, (PFN)DxEngSelectPaletteToSurface}, + {DXENG_INDEX_DxEngSyncPaletteTableWithDevice, (PFN)DxEngSyncPaletteTableWithDevice}, + {DXENG_INDEX_DxEngSetPaletteState, (PFN)DxEngSetPaletteState}, + {DXENG_INDEX_DxEngGetRedirectionBitmap, (PFN)DxEngGetRedirectionBitmap}, + {DXENG_INDEX_DxEngLoadImage, (PFN)DxEngLoadImage} }; /************************************************************************/

1 0

[janderwald] 29749: - fix a few bugs
by janderwald＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: janderwald Date: Sun Oct 21 22:42:01 2007 New Revision: 29749 URL: http://svn.reactos.org/svn/reactos?rev=29749&view=rev Log: - fix a few bugs Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Sun Oct 21 22:42:01 2007 @@ -34,6 +34,8 @@ #include "shell32_main.h" #include "shellfolder.h" #include "undocshell.h" +#include "shlwapi.h" +#include "stdio.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -269,11 +271,11 @@ PROCESS_INFORMATION pi; UINT i, target; HANDLE hFile; - DWORD dwWritten; + DWORD dwWritten, dwError; static const WCHAR szNew[] = { 'N','e','w',' ',0 }; //FIXME static const WCHAR szP1[] = { '%', '1', 0 }; - static const WCHAR szFormat[] = {'%','s',' ','(','%','u',')','%','s',0 }; + static const WCHAR szFormat[] = {'%','s',' ','(','%','d',')','%','s',0 }; i = This->iIdShellNewFirst; @@ -317,7 +319,7 @@ ERR("IShellFolder_GetDisplayNameOf failed\n"); return; } - StrRetToBufW(strTemp, pidl, szPath, MAX_PATH); + StrRetToBufW(&strTemp, pidl, szPath, MAX_PATH); } switch(pCurItem->Type) { @@ -336,7 +338,7 @@ if (ptr) { ptr[1] = 's'; - swprintf(szTemp, szBuffer, szPath); + sprintfW(szTemp, szBuffer, szPath); ptr = szTemp; } else @@ -370,25 +372,35 @@ wcscat(szBuffer, pCurItem->szExt); do { - TRACE("FileName %s szBuffer %s i %d \n", debugstr_w(szBuffer), debugstr_w(szPath), i); hFile = CreateFileW(szBuffer, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - swprintf(szBuffer, szFormat, szPath, i, pCurItem->szExt); + if (hFile != INVALID_HANDLE_VALUE) + break; + dwError = GetLastError(); + + TRACE("FileName %s szBuffer %s i %u error %x\n", debugstr_w(szBuffer), debugstr_w(szPath), i, dwError); + sprintfW(szBuffer, szFormat, szPath, i, pCurItem->szExt); i++; - }while(hFile == INVALID_HANDLE_VALUE); + }while(hFile == INVALID_HANDLE_VALUE && dwError == ERROR_FILE_EXISTS); + + if (hFile == INVALID_HANDLE_VALUE) + return; if (pCurItem->Type == SHELLNEW_TYPE_DATA) { - i = WideCharToMultiByte(CP_ACP, 0, pCurItem->szTarget, -1, (LPSTR)szBuffer, MAX_PATH*2, NULL, NULL); + i = WideCharToMultiByte(CP_ACP, 0, pCurItem->szTarget, -1, (LPSTR)szTemp, MAX_PATH*2, NULL, NULL); if (i) { - WriteFile(hFile, (LPCVOID)szBuffer, i, &dwWritten, NULL); + WriteFile(hFile, (LPCVOID)szTemp, i, &dwWritten, NULL); } } CloseHandle(hFile); if (pCurItem->Type == SHELLNEW_TYPE_FILENAME) { - CopyFileW(pCurItem->szTarget, szPath, FALSE); + if (!CopyFileW(pCurItem->szTarget, szBuffer, FALSE)) + break; } + TRACE("Notifying fs %s\n", debugstr_w(szBuffer)); + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, (LPCVOID)szBuffer, NULL); break; } }

1 0

[hpoussin] 29748: [FORMATTING] General cleanup (indentation, headers...). No code change
by hpoussin＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: hpoussin Date: Sun Oct 21 22:35:19 2007 New Revision: 29748 URL: http://svn.reactos.org/svn/reactos?rev=29748&view=rev Log: [FORMATTING] General cleanup (indentation, headers...). No code change Modified: trunk/reactos/drivers/video/displays/vga/main/enable.c trunk/reactos/drivers/video/displays/vga/objects/bitblt.c trunk/reactos/drivers/video/displays/vga/objects/copybits.c trunk/reactos/drivers/video/displays/vga/objects/lineto.c trunk/reactos/drivers/video/displays/vga/objects/offscreen.c trunk/reactos/drivers/video/displays/vga/objects/paint.c trunk/reactos/drivers/video/displays/vga/objects/pointer.c trunk/reactos/drivers/video/displays/vga/objects/screen.c trunk/reactos/drivers/video/displays/vga/objects/transblt.c trunk/reactos/drivers/video/displays/vga/vgaddi.def trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/video/displays/vga/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/offscreen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/transblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga…

1 0

[dreimer] 29747: Fix missing "" n build.cmd Make helpfile entries dependant on the installed optional files.
by dreimer＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: dreimer Date: Sun Oct 21 22:29:52 2007 New Revision: 29747 URL: http://svn.reactos.org/svn/reactos?rev=29747&view=rev Log: Fix missing "" n build.cmd Make helpfile entries dependant on the installed optional files. Modified: trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/Help.cmd Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Sun Oct 21 22:29:52 2007 @@ -16,8 +16,8 @@ :: Check if the user has used the options utility and :: if so, load their options. :: -if exist %_ROSBE_BASEDIR%\rosbe-options.cmd ( - call %_ROSBE_BASEDIR%\rosbe-options.cmd +if exist "%_ROSBE_BASEDIR%\rosbe-options.cmd" ( + call "%_ROSBE_BASEDIR%\rosbe-options.cmd" ) :: @@ -29,7 +29,7 @@ if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** - echo *** aborting build. Please update your config.rbuild *** + echo *** aborting build. Please update your config.rbuild *** echo *** by typeing "config update". *** echo. goto :EOB Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Sun Oct 21 22:29:52 2007 @@ -17,32 +17,58 @@ if "%1" == "" ( echo. echo Available Commands: - echo make [OPTIONS] - Without options it does a standard build of - echo ReactOS. OPTIONS are the standard ReactOS build - echo options ie. "bootcd" - echo makex [OPTIONS] - Same as 'make' but automatically determines the - echo number of CPU Cores in the system and uses -j - echo with the appropriate number. + + if exist "%_ROSBE_BASEDIR%\build.cmd" ( + echo make [OPTIONS] - Without options it does a standard build of + echo ReactOS. OPTIONS are the standard ReactOS build + echo options ie. "bootcd" + echo makex [OPTIONS] - Same as 'make' but automatically determines the + echo number of CPU Cores in the system and uses -j + echo with the appropriate number. + ) + echo basedir - Switch back to the ReactOS source directory. echo. - echo scut - Define, Remove, Switch and Default to Shortcutted - echo Source-Directories. - echo chdefdir [OPTIONS] - Reconfigures the Default Source Folder for one - echo Session. + + if exist "%_ROSBE_BASEDIR%\scut.cmd" ( + echo scut - Define, Remove, Switch and Default to Shortcutted + echo Source-Directories. + ) + + if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( + echo chdefdir [OPTIONS] - Reconfigures the Default Source Folder for one + echo Session. + ) + + if exist "%_ROSBE_BASEDIR%\config.cmd" ( echo config [OPTIONS] - Configures the way, ReactOS will be built. echo. + ) + + if exist "%_ROSBE_BASEDIR%\clean.cmd" ( echo clean [logs] - Fully clean the ReactOS source directory and/or echo the RosBE build logs. + ) + echo help [COMMAND] - Display the available commands or help on a echo specific command. + + if exist "%_ROSBE_BASEDIR%\options.cmd" ( echo options - Starts options.exe and reboots to make the echo changes effective at the end. + ) + + if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( echo raddr2line [OPTIONS] - Translates program addresses into file names and echo line numbers to assist Developers to find echo specific Bugs in ReactOS. + ) + + if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( echo ssvn [OPTIONS] - Create, Update or Clean-up your ReactOS Source echo Tree or show the Revision Number of the Offline echo Tree and Online HEAD Revision. + ) goto :EOF )

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