Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[cwittich] 28020: Fix bug in IsValidLocale(), GetNumberFormatW(), GetCurrencyFormatW() patch by Zavyalov Alexey (reactos at ilimschool dot ru) See issue #2374 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 29 23:04:03 2007 New Revision: 28020 URL: http://svn.reactos.org/svn/reactos?rev=28020&view=rev Log: Fix bug in IsValidLocale(), GetNumberFormatW(), GetCurrencyFormatW() patch by Zavyalov Alexey (reactos at ilimschool dot ru) See issue #2374 for more details. Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c trunk/reactos/dll/win32/kernel32/misc/lcformat.c Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c Sun Jul 29 23:04:03 2007 @@ -1504,8 +1504,7 @@ } ValueData = (PWSTR)&KeyInfo->Data[0]; - if ((dwFlags & LCID_INSTALLED) && - (KeyInfo->Type == REG_SZ) && + if ((KeyInfo->Type == REG_SZ) && (KeyInfo->DataLength == 2 * sizeof(WCHAR)) && (ValueData[0] == L'1')) { @@ -1849,3 +1848,4 @@ } + Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lcformat.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lcformat.c Sun Jul 29 23:04:03 2007 @@ -90,6 +90,53 @@ 0, 0, 0, 0 }; static RTL_CRITICAL_SECTION NLS_FormatsCS = { &NLS_FormatsCS_debug, -1, 0, 0, 0, 0 }; + +/************************************************************************** + * NLS_isSystemLocale <internal> + * + * Return TRUE, if locale is system-type + */ +BOOL NLS_isSystemLocale(LCID lcid) +{ + if(lcid == LOCALE_SYSTEM_DEFAULT || + lcid == LOCALE_NEUTRAL || + lcid == LOCALE_USER_DEFAULT) + { + return TRUE; + } + return FALSE; +} + +/************************************************************************** + * NLS_isSystemLocale <internal> + * + * Return default system or user locale + */ +LCID NLS_getDefaultLocale(LCID lcid) +{ + LCID lcidTmp; + + DPRINT("Called NLS_getDefaultLocale(0x%04lx)\n", lcid); + + switch(lcid) + { + case LOCALE_SYSTEM_DEFAULT: + NtQueryDefaultLocale(FALSE, &lcidTmp); + return lcidTmp; + break; + + case LOCALE_USER_DEFAULT: + case LOCALE_NEUTRAL: + NtQueryDefaultLocale(TRUE, &lcidTmp); + return lcidTmp; + break; + + default: + DPRINT1("FIXME: unknown system lcid\n"); + } + + return lcid; +} /************************************************************************** * NLS_GetLocaleNumber <internal> @@ -968,8 +1015,17 @@ TRACE("(0x%04lx,0x%08lx,%S,%p,%p,%d)\n", lcid, dwFlags, lpszValue, lpFormat, lpNumberStr, cchOut); + if(NLS_isSystemLocale(lcid)) + { + lcid = NLS_getDefaultLocale(lcid); + } + else if(!IsValidLocale(lcid, 0)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpNumberStr) || - !IsValidLocale(lcid, 0) || (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep))) { GetNumberFormatW_Error: @@ -1334,8 +1390,17 @@ TRACE("(0x%04lx,0x%08lx,%S,%p,%p,%d)\n", lcid, dwFlags, lpszValue, lpFormat, lpCurrencyStr, cchOut); + if(NLS_isSystemLocale(lcid)) + { + lcid = NLS_getDefaultLocale(lcid); + } + else if(!IsValidLocale(lcid, 0)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpCurrencyStr) || - !IsValidLocale(lcid, 0) || (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep || !lpFormat->lpCurrencySymbol || lpFormat->NegativeOrder > 15 || lpFormat->PositiveOrder > 3)))

17 years, 4 months

[cwittich] 28019: Implement IsValidLanguageGroup, EnumDateFormatsExA, EnumDateFormatsExW patch by Zavyalov Alexey (reactos at ilimschool dot ru) See issue #2368 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 29 22:42:18 2007 New Revision: 28019 URL: http://svn.reactos.org/svn/reactos?rev=28019&view=rev Log: Implement IsValidLanguageGroup, EnumDateFormatsExA, EnumDateFormatsExW patch by Zavyalov Alexey (reactos at ilimschool dot ru) See issue #2368 for more details. Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c Sun Jul 29 22:42:18 2007 @@ -125,8 +125,11 @@ return 0; } -/* - * @unimplemented +/************************************************************************** + * EnumDateFormatsExA (KERNEL32.@) + * + * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle + * LOCALE_NOUSEROVERRIDE here as well? */ BOOL STDCALL @@ -135,13 +138,64 @@ LCID Locale, DWORD dwFlags) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented + CALID cal_id; + char szBuf[256]; + + if (!lpDateFmtEnumProcEx) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!GetLocaleInfoW(Locale, + LOCALE_ICALENDARTYPE|LOCALE_RETURN_NUMBER, + (LPWSTR)&cal_id, + sizeof(cal_id)/sizeof(WCHAR))) + { + return FALSE; + } + + switch (dwFlags & ~LOCALE_USE_CP_ACP) + { + case 0: + case DATE_SHORTDATE: + if (GetLocaleInfoA(Locale, + LOCALE_SSHORTDATE | (dwFlags & LOCALE_USE_CP_ACP), + szBuf, 256)) + { + lpDateFmtEnumProcEx(szBuf, cal_id); + } + break; + + case DATE_LONGDATE: + if (GetLocaleInfoA(Locale, + LOCALE_SLONGDATE | (dwFlags & LOCALE_USE_CP_ACP), + szBuf, 256)) + { + lpDateFmtEnumProcEx(szBuf, cal_id); + } + break; + + case DATE_YEARMONTH: + if (GetLocaleInfoA(Locale, + LOCALE_SYEARMONTH | (dwFlags & LOCALE_USE_CP_ACP), + szBuf, 256)) + { + lpDateFmtEnumProcEx(szBuf, cal_id); + } + break; + + default: + // FIXME: Unknown date format + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return TRUE; +} + + +/************************************************************************** + * EnumDateFormatsExW (KERNEL32.@) */ BOOL STDCALL @@ -150,8 +204,62 @@ LCID Locale, DWORD dwFlags) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + CALID cal_id; + WCHAR wbuf[256]; // FIXME + + if (!lpDateFmtEnumProcEx) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!GetLocaleInfoW(Locale, + LOCALE_ICALENDARTYPE | LOCALE_RETURN_NUMBER, + (LPWSTR)&cal_id, + sizeof(cal_id)/sizeof(WCHAR))) + { + return FALSE; + } + + switch (dwFlags & ~LOCALE_USE_CP_ACP) + { + case 0: + case DATE_SHORTDATE: + if (GetLocaleInfoW(Locale, + LOCALE_SSHORTDATE | (dwFlags & LOCALE_USE_CP_ACP), + wbuf, + 256)) + { + lpDateFmtEnumProcEx(wbuf, cal_id); + } + break; + + case DATE_LONGDATE: + if (GetLocaleInfoW(Locale, + LOCALE_SLONGDATE | (dwFlags & LOCALE_USE_CP_ACP), + wbuf, + 256)) + { + lpDateFmtEnumProcEx(wbuf, cal_id); + } + break; + + case DATE_YEARMONTH: + if (GetLocaleInfoW(Locale, + LOCALE_SYEARMONTH | (dwFlags & LOCALE_USE_CP_ACP), + wbuf, + 256)) + { + lpDateFmtEnumProcEx(wbuf, cal_id); + } + break; + + default: + // FIXME: Unknown date format + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return TRUE; } @@ -1190,8 +1298,20 @@ } -/* - * @unimplemented +/****************************************************************************** + * IsValidLanguageGroup + * + * Determine if a language group is supported and/or installed. + * + * PARAMS + * LanguageGroup [I] Language Group Id (LGRPID_ values from "winnls.h") + * dwFlags [I] LGRPID_SUPPORTED=Supported, LGRPID_INSTALLED=Installed + * + * RETURNS + * TRUE, if lgrpid is supported and/or installed, according to dwFlags. + * FALSE otherwise. + * + * @implemented */ BOOL STDCALL @@ -1199,8 +1319,85 @@ LGRPID LanguageGroup, DWORD dwFlags) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + static const WCHAR szFormat[] = { '%','x','\0' }; + UNICODE_STRING szNlsKeyName = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Nls"); + UNICODE_STRING szLangGroupsKeyName = + RTL_CONSTANT_STRING(L"Language Groups"); + const int MAX_VALUE_NAME = 16; + const int MAX_VALUE_SYMB = 128; + + BOOL bNtQuery; + PKEY_VALUE_PARTIAL_INFORMATION kvpiInfo; + + WCHAR szValueName[MAX_VALUE_NAME]; + UNICODE_STRING ucsValueName; + DWORD dwRetSize; + PWSTR pwszValueData; + + DWORD dwSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + MAX_VALUE_SYMB * sizeof(WCHAR); + + OBJECT_ATTRIBUTES oaAttr; + HANDLE hkey, hRootKey; + BOOL bSupported = FALSE, bInstalled = FALSE; + + DPRINT("IsValidLanguageGroup() called\n"); + + kvpiInfo = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwSize); + + switch (dwFlags) + { + case LGRPID_INSTALLED: + case LGRPID_SUPPORTED: + + InitializeObjectAttributes(&oaAttr, &szNlsKeyName, 0, 0, NULL); + if(NtOpenKey(&hRootKey, KEY_ALL_ACCESS, &oaAttr) != STATUS_SUCCESS) return FALSE; + + InitializeObjectAttributes(&oaAttr, &szLangGroupsKeyName, 0, hRootKey, NULL); + if(NtOpenKey(&hkey, KEY_ALL_ACCESS, &oaAttr) != STATUS_SUCCESS) return FALSE; + + if(hRootKey) NtClose(hRootKey); + + swprintf(szValueName, szFormat, (ULONG)LanguageGroup); + RtlInitUnicodeString(&ucsValueName, szValueName); + + bNtQuery = NtQueryValueKey(hkey, + &ucsValueName, + KeyValuePartialInformation, + kvpiInfo, + dwSize, + &dwRetSize); + if(hkey) NtClose(hkey); + + if(bNtQuery == STATUS_SUCCESS && + kvpiInfo->DataLength == sizeof(DWORD)) + { + pwszValueData = (PWSTR)&kvpiInfo->Data[0]; + bSupported = TRUE; + if(pwszValueData[0] == L'1') bInstalled = TRUE; + } + else + { + DPRINT("NtQueryValueKey() failed (Status %lx)\n", bNtQuery); + RtlFreeHeap(RtlGetProcessHeap(), 0, kvpiInfo); + return FALSE; + } + + break; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, kvpiInfo); + + if((dwFlags == LGRPID_SUPPORTED && bSupported) || + (dwFlags == LGRPID_INSTALLED && bInstalled)) + { + DPRINT("Language group is supported and installed\n"); + return TRUE; + } + + return FALSE; } @@ -1651,3 +1848,4 @@ return GetLocaleInfoW( MAKELCID(wLang, SORT_DEFAULT), LOCALE_SENGLANGUAGE, szLang, nSize ); } +

17 years, 4 months

[greatlrd] 28018: remove the title name hack some did comment why popup menu does not working in cmd, it seam we never getting the process name, why ??

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 29 22:39:32 2007 New Revision: 28018 URL: http://svn.reactos.org/svn/reactos?rev=28018&view=rev Log: remove the title name hack some did comment why popup menu does not working in cmd, it seam we never getting the process name, why ?? Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Sun Jul 29 22:39:32 2007 @@ -282,8 +282,11 @@ return FALSE; } + /* FIXME we do not getting the process name so no menu will be loading, why ?*/ fLength = GetProcessImageFileNameW(hProcess, szProcessName, sizeof(GuiData->szProcessName) / sizeof(WCHAR)); CloseHandle(hProcess); + + //DPRINT1("szProcessName3 : %S\n",szProcessName); if (!fLength) { @@ -1917,8 +1920,7 @@ Title = L""; } - /* FIXME: deadlock */ - //SendMessageW(Console->hWindow, WM_SETTEXT, 0, (LPARAM) Title); + SendMessageW(Console->hWindow, WM_SETTEXT, 0, (LPARAM) Title); if (NULL != Buffer) { @@ -2008,26 +2010,26 @@ GuiData = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(GUI_CONSOLE_DATA)); if (!GuiData) - { + { DPRINT1("Win32Csr: Failed to create GUI_CONSOLE_DATA\n"); return STATUS_UNSUCCESSFUL; } Console->PrivateData = (PVOID) GuiData; /* - * we need to wait untill the GUI has been fully initialized - * to retrieve custom settings i.e. WindowSize etc.. - * Ideally we could use SendNotifyMessage for this but its not - * yet implemented. - * - */ + * we need to wait untill the GUI has been fully initialized + * to retrieve custom settings i.e. WindowSize etc.. + * Ideally we could use SendNotifyMessage for this but its not + * yet implemented. + * + */ GuiData->hGuiInitEvent = CreateEventW(NULL, FALSE, FALSE, NULL); /* create console */ PostMessageW(NotifyWnd, PM_CREATE_CONSOLE, 0, (LPARAM) Console); /* wait untill initialization has finished */ WaitForSingleObject(GuiData->hGuiInitEvent, INFINITE); - DPRINT1("received event Console %p GuiData %p X %d Y %d\n", Console, Console->PrivateData, Console->Size.X, Console->Size.Y); + DPRINT1("received event Console %p GuiData %p X %d Y %d\n", Console, Console->PrivateData, Console->Size.X, Console->Size.Y); CloseHandle(GuiData->hGuiInitEvent); GuiData->hGuiInitEvent = NULL;

17 years, 4 months

[dreimer] 28017: - Simplified Build-Shared a bit. - Updated ChangeLog.txt. - Some Code modifications in sSVN for eye candy and future updates. - Updated cutz workaround for supporting sSVN.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Jul 29 22:18:33 2007 New Revision: 28017 URL: http://svn.reactos.org/svn/reactos?rev=28017&view=rev Log: - Simplified Build-Shared a bit. - Updated ChangeLog.txt. - Some Code modifications in sSVN for eye candy and future updates. - Updated cutz workaround for supporting sSVN. Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE-Windows/Root/test.cmd trunk/tools/RosBE-Windows/Tools/cutz.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Sun Jul 29 22:18:33 2007 @@ -9,8 +9,6 @@ :: :: @echo off - -title Building... :: :: Take over the 2nd parameter of Build.cmd, which enables/disables stripping @@ -75,23 +73,21 @@ :: :: Now use mingw32-make to build ReactOS, passing along options, if any. :: +title Started: %TIMERAW%, Building... + if %ROSBE_SHOWTIME% == 1 ( if %ROSBE_WRITELOG% == 1 ( - title Started: %TIMERAW%, Building... call buildtime "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) if %ROSBE_WRITELOG% == 0 ( - title Started: %TIMERAW%, Building... call buildtime "%MAKE_COMMAND%" 2>&1 ) ) if %ROSBE_SHOWTIME% == 0 ( if %ROSBE_WRITELOG% == 1 ( - title Started: %TIMERAW%, Building... call "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) if %ROSBE_WRITELOG% == 0 ( - title Started: %TIMERAW%, Building... call "%MAKE_COMMAND%" 2>&1 ) ) @@ -101,7 +97,5 @@ :: call flash -goto :EOB - :EOB title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Sun Jul 29 22:18:33 2007 @@ -1,11 +1,16 @@ *** Oct XXth, 2007 - RosBE 0.3.8 Released -- Added DrFred's Config Tool. +- Added DrFred's Config Tool. (Daniel Reimer) + +*** Aug XXst, 2007 - RosBE 0.3.7.2 Released + +- Fixed the double \\ Bug introduced in 0.3.7. (Daniel Reimer) +- Added Build Begin Time into Topic. (Daniel Reimer) *** July 26th, 2007 - RosBE 0.3.7.1 Released -- Fixed: "No SVN Tree found" message in Vista. -- All commands use the current dir now. SO you can use several SVN Source Trees now. +- Fixed: "No SVN Tree found" message in Vista. (Daniel Reimer) +- All commands use the current dir now. SO you can use several SVN Source Trees now. (Daniel Reimer) *** July 22nd, 2007 - RosBE 0.3.7 Released Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Sun Jul 29 22:18:33 2007 @@ -50,14 +50,25 @@ if "%1" == "status" ( title Status call svn info "%CD%" > "%ROSBEBASEDIR%\x.tmp" - echo Recent Offline Revision: - call grep Revision: "%ROSBEBASEDIR%\x.tmp"|cut -d " " -f 2 + call grep Revision: "%ROSBEBASEDIR%\x.tmp"|cutz svn > "%ROSBEBASEDIR%\offsvn.tmp" + set /P OFFSVN=< "%ROSBEBASEDIR%\offsvn.tmp" + call svn info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\y.tmp" + call grep Revision: "%ROSBEBASEDIR%\y.tmp"|cutz svn > "%ROSBEBASEDIR%\onsvn.tmp" + set /P ONSVN=< "%ROSBEBASEDIR%\onsvn.tmp" + echo Recent Offline Revision: %OFFSVN% + echo Online HEAD Revision: %ONSVN% + del "%ROSBEBASEDIR%\offsvn.tmp" + del "%ROSBEBASEDIR%\onsvn.tmp" del "%ROSBEBASEDIR%\x.tmp" - - call svn info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\x.tmp" - echo Online HEAD Revision: - call grep Revision: "%ROSBEBASEDIR%\x.tmp"|cut -d " " -f 2 - del "%ROSBEBASEDIR%\x.tmp" + del "%ROSBEBASEDIR%\y.tmp" + echo. + if %OFFSVN% LSS %ONSVN% ( + echo Your Tree is not Up to date. Do you want to update it? + goto :UP + ) + if %OFFSVN% EQU %ONSVN% ( + echo Your Tree is Up to date. + ) goto :ExitSVN ) @@ -66,5 +77,11 @@ goto :ExitSVN ) +:UP +SET /P XY=(yes), (no) + +if /I "%XY%"=="yes" call %ROSBEBASEDIR%\ssvn update +if /I "%XY%"=="no" goto :ExitSVN + :ExitSVN title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/Root/test.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/test.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/test.cmd (original) +++ trunk/tools/RosBE-Windows/Root/test.cmd Sun Jul 29 22:18:33 2007 @@ -24,9 +24,9 @@ goto :RUN :RUN -grep \"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz > "%ROSBEBASEDIR%\aaa.tmp" +grep \"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir > "%ROSBEBASEDIR%\aaa.tmp" set /P dir=< "%ROSBEBASEDIR%\aaa.tmp" del "%ROSBEBASEDIR%\aaa.tmp" -cd %dir% +cd /D %dir% title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/Tools/cutz.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cutz.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/cutz.cmd (original) +++ trunk/tools/RosBE-Windows/Tools/cutz.cmd Sun Jul 29 22:18:33 2007 @@ -7,4 +7,9 @@ :: :: @echo off -cut -d "\"" -f 4 +if "%1" == "dir" ( + cut -d "\"" -f 4 +) +if "%1" == "svn" ( + cut -d " " -f 2 +)

17 years, 4 months

[cwittich] 28016: Load correct screensaver's name patch by piulachs (marc dot piulachs at codexchange dot net) See issue #2500 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 29 22:09:42 2007 New Revision: 28016 URL: http://svn.reactos.org/svn/reactos?rev=28016&view=rev Log: Load correct screensaver's name patch by piulachs (marc dot piulachs at codexchange dot net) See issue #2500 for more details. Modified: trunk/reactos/dll/cpl/desk/screensaver.c Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c Sun Jul 29 22:09:42 2007 @@ -381,7 +381,7 @@ hModule = LoadLibraryEx(filename, NULL, - DONT_RESOLVE_DLL_REFERENCES); + DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); if (hModule) { LoadString(hModule, @@ -392,7 +392,7 @@ } else { - _tcscpy(ScreenSaverItem->szDisplayName, _T("err")); + _tcscpy(ScreenSaverItem->szDisplayName, _T("Unknown")); } _tcscpy(ScreenSaverItem->szFilename, filename);

17 years, 4 months

[cwittich] 28015: remove ZeroMemory - not needed anymore since GetLogicalDriveStrings is fixed

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 29 22:03:41 2007 New Revision: 28015 URL: http://svn.reactos.org/svn/reactos?rev=28015&view=rev Log: remove ZeroMemory - not needed anymore since GetLogicalDriveStrings is fixed Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c Sun Jul 29 22:03:41 2007 @@ -98,7 +98,6 @@ INT DriveLen; INT PgCnt = 0; - ZeroMemory(szDrives, sizeof(szDrives)); DriveLen = GetLogicalDriveStrings(1023, szDrives);

17 years, 4 months

[cwittich] 28014: fix GetLogicalDriveStringsA/W

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 29 22:02:31 2007 New Revision: 28014 URL: http://svn.reactos.org/svn/reactos?rev=28014&view=rev Log: fix GetLogicalDriveStringsA/W Modified: trunk/reactos/dll/win32/kernel32/file/volume.c Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/volume.c (original) +++ trunk/reactos/dll/win32/kernel32/file/volume.c Sun Jul 29 22:02:31 2007 @@ -99,7 +99,7 @@ } - if (count * 4 * sizeof(char) <= nBufferLength) + if (count * 4 <= nBufferLength) { LPSTR p = lpBuffer; @@ -113,7 +113,7 @@ } *p = '\0'; } - return (count * 4 * sizeof(char)); + return (count * 4); } @@ -136,7 +136,7 @@ count++; } - if (count * 4 * sizeof(WCHAR) <= nBufferLength) + if (count * 4 <= nBufferLength) { LPWSTR p = lpBuffer; for (drive = 0; drive < MAX_DOS_DRIVES; drive++) @@ -149,7 +149,7 @@ } *p = (WCHAR)'\0'; } - return (count * 4 * sizeof(WCHAR)); + return (count * 4); }

17 years, 4 months

[cwittich] 28013: Norwegian translation for regedit patch by Frode Lillerud (frode at enkelt dot no) See issue #2502 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 29 21:36:08 2007 New Revision: 28013 URL: http://svn.reactos.org/svn/reactos?rev=28013&view=rev Log: Norwegian translation for regedit patch by Frode Lillerud (frode at enkelt dot no) See issue #2502 for more details. Added: trunk/reactos/base/applications/regedit/lang/nb-NO.rc Modified: trunk/reactos/base/applications/regedit/rsrc.rc Added: trunk/reactos/base/applications/regedit/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nb-NO.rc (added) +++ trunk/reactos/base/applications/regedit/lang/nb-NO.rc Sun Jul 29 21:36:08 2007 @@ -1,0 +1,453 @@ +/* + * Regedit (Norwegian resources) + * + * Translated 29.07.2007 by Frode Lillerud + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +ID_ACCEL ACCELERATORS +{ + VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT + "^F", ID_EDIT_FIND + VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT +} + +/* + * Menu + */ + +IDC_REGEDIT MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Avslutt", ID_REGISTRY_EXIT + END + POPUP "&Hjelp" + BEGIN + MENUITEM "&Om ...", ID_HELP_ABOUT + END +END + +IDR_REGEDIT_MENU MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Import ...", ID_REGISTRY_IMPORTREGISTRYFILE + + MENUITEM "&Eksport...", ID_REGISTRY_EXPORTREGISTRYFILE + + MENUITEM SEPARATOR + MENUITEM "Last inn struktur...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Fjern struktur...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Koble til nettverksregister...", + ID_REGISTRY_CONNECTNETWORKREGISTRY + + MENUITEM "Koble fra nettverksregister......", + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + , GRAYED + MENUITEM SEPARATOR + MENUITEM "&Skriv ut...\tCtrl+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Avslutt", ID_REGISTRY_EXIT + END + POPUP "&Rediger" + BEGIN + MENUITEM "&Endre", ID_EDIT_MODIFY + MENUITEM SEPARATOR + POPUP "&Ny" + BEGIN + MENUITEM "&Nøkkel", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binær verdi", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multistreng verdi", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "&Utvidbar strengverdi", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + END + MENUITEM SEPARATOR + MENUITEM "&Rettigheter...", ID_EDIT_PERMISSIONS + MENUITEM SEPARATOR + MENUITEM "&Slett\tDel", ID_EDIT_DELETE + MENUITEM "&Gi nytt navn", ID_EDIT_RENAME + MENUITEM SEPARATOR + MENUITEM "&Kopier nøkkelnavn", ID_EDIT_COPYKEYNAME + MENUITEM SEPARATOR + MENUITEM "&Søk etter...\tCtrl+F", ID_EDIT_FIND + MENUITEM "Søk neste\tF3", ID_EDIT_FINDNEXT + END + POPUP "&Vis" + BEGIN + MENUITEM "Statuslinje", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "Del", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Oppdater\tF5", ID_VIEW_REFRESH + END + POPUP "&Favoritter" + BEGIN + MENUITEM "&Legg til i Favoritter", ID_FAVOURITES_ADDTOFAVOURITES + , GRAYED + MENUITEM "&Fjern favoritt", ID_FAVOURITES_REMOVEFAVOURITE + , GRAYED + END + POPUP "&Hjelp" + BEGIN + MENUITEM "&Emner i Hjelp\tF1", ID_HELP_HELPTOPICS + MENUITEM SEPARATOR + MENUITEM "&Om Registerredigering", ID_HELP_ABOUT + END +END + +IDR_POPUP_MENUS MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Endre", ID_EDIT_MODIFY + MENUITEM "Endre binære data", ID_EDIT_MODIFY_BIN + MENUITEM SEPARATOR + MENUITEM "&Slett\tDel", ID_EDIT_DELETE + MENUITEM "&Gi nytt navn", ID_EDIT_RENAME + END + POPUP "" + BEGIN + POPUP "&Ny" + BEGIN + MENUITEM "&Nøkkel", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binær verdi", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multistrengverdi", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "&Utvidbar strengverdi", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + END + END + POPUP "" + BEGIN + MENUITEM "Utvid/Minimer", ID_TREE_EXPANDBRANCH + POPUP "&Ny" + BEGIN + MENUITEM "&Nøkkel", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binær verdi", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multistrengverdi", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "&Utvidbar strengverdi", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + END + MENUITEM "&Søk...", ID_EDIT_FIND + MENUITEM SEPARATOR + MENUITEM "&Slett", ID_TREE_DELETE + MENUITEM "&Gi nytt navn", ID_TREE_RENAME + MENUITEM SEPARATOR + MENUITEM "&Eksport", ID_TREE_EXPORT + MENUITEM "&Rettigheter...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Kopier nøkkelnavn", ID_EDIT_COPYKEYNAME + END +END + + +/* + * Dialog + */ + +IDD_EDIT_STRING DIALOG 32, 24, 252, 84 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Rediger streng" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Verdi&navn:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Verdidata:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,142,64,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,196,64,50,14 +END + +IDD_EDIT_MULTI_STRING DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Rediger multistreng" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Verdi&navn:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Verdidata:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,196,154,50,14 +END + +IDD_EDIT_BIN_DATA DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Rediger binær verdi" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Verdi&navn:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Verdidata:",IDC_STATIC,6,35,161,8 + CONTROL "",IDC_VALUE_DATA,"HexEdit32",WS_VSCROLL | WS_BORDER | WS_TABSTOP,6,46,240,102 + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,196,154,50,14 +END + + +IDD_EDIT_DWORD DIALOG 32, 24, 252, 104 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Rediger DWORD-verdi" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Verdi&navn:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Verdidata:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,116,12,ES_AUTOHSCROLL + GROUPBOX "Grunnlag",IDC_STATIC,130,35,116,39 + AUTORADIOBUTTON "&Heksadesimal",IDC_FORMAT_HEX,141,46,60,10,WS_GROUP + AUTORADIOBUTTON "&Desimal",IDC_FORMAT_DEC,141,59,60,10 + DEFPUSHBUTTON "OK",IDOK,142,82,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,196,82,50,14 +END + +/* + * String Table + */ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LIST_COLUMN_NAME "Navn" + IDS_LIST_COLUMN_TYPE "Type" + IDS_LIST_COLUMN_DATA "Data" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Registerredigering" + IDC_REGEDIT "REGEDIT" + IDC_REGEDIT_FRAME "REGEDIT_FRAME" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_MENU "Inneholder kommandoer for å arbeide med hele registret" + ID_EDIT_MENU "Inneholder kommandoer for redigering av nøkler eller verdier." + ID_VIEW_MENU "Inneholder kommandoer for å tilpasse registervinduet." + ID_FAVOURITES_MENU "Inneholder kommandoer fo å få tilgang til registernøkler som brukes mye." + ID_HELP_MENU "Inneholder kommandoer for å vise Hjelp og for å få informasjon om Registerredigering." + ID_EDIT_NEW_MENU "Inneholder kommandoer for å opprette nye nøkler eller verdier" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_EDIT_MODIFY "Endrer verdiens data" + ID_EDIT_NEW_KEY "Legger til en ny nøkkel" + ID_EDIT_NEW_STRINGVALUE "Legger til en ny strengverdi" + ID_EDIT_NEW_BINARYVALUE "Legger til en ny binær verdi" + ID_EDIT_NEW_DWORDVALUE "Legger til en ny DWORD-verdi" + ID_REGISTRY_IMPORTREGISTRYFILE "Importerer en tekstfil inn i Registret" + ID_REGISTRY_EXPORTREGISTRYFILE + "Eksporterer hele eller deler av Registret til en tekstfil" + ID_REGISTRY_CONNECTNETWORKREGISTRY + "Kobler til Registret på en annen datamaskin" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + "Kobler fra Registret på en annen datamaskin" + ID_REGISTRY_PRINT "Skriver ut hele eller deler av Registret" +/* ID_HELP_HELPTOPICS "Opens registry editor help" */ + ID_HELP_ABOUT "Viser informasjon om program, version og opphavsrett" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_EXIT "Avslutter Registerredigering" + ID_FAVOURITES_ADDTOFAVOURITES "Legger til nøkler i Favoritt-listen" + ID_FAVOURITES_REMOVEFAVOURITE "Fjerner nøkler fra Favoritt-listen" + ID_VIEW_STATUSBAR "Viser eller skjuler statuslinjen" + ID_VIEW_SPLIT "Endrer delingen mellom to vinduer" + ID_VIEW_REFRESH "Oppdaterer vinduet" + ID_EDIT_DELETE "Sletter de merkede elementene" + ID_EDIT_RENAME "Gi nytt navn til merket element" + ID_EDIT_COPYKEYNAME "Kopierer navnet på den merkede nøkkelen til utklippstavlen" + ID_EDIT_FIND "Søker etter en tekststreng i en nøkkel, verdi eller data" + ID_EDIT_FINDNEXT "Søker etter neste forekomst av den forige søkestrengen" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ERROR "Feil" + IDS_WARNING "Advarsel" + IDS_BAD_KEY "Kan ikke lese nøkkel '%s'" + IDS_BAD_VALUE "Kan ikke lese verdi '%s'" + IDS_UNSUPPORTED_TYPE "Kan ikke endre nøkkel av type (%ld)" + IDS_TOO_BIG_VALUE "Verdien er for stor (%ld)" + IDS_MULTI_SZ_EMPTY_STRING "Data av type REG_MULTI_SZ kan ikke inneholde tomme linjer.\nDe tomme linjene har blitt fjernet fra listen." + IDS_QUERY_DELETE_KEY_ONE "Er du sikker på at du vil slette denne nøkkelen?" + IDS_QUERY_DELETE_KEY_MORE "Er du sikker på at du vil slette disse nøklene?" + IDS_QUERY_DELETE_KEY_CONFIRM "Bekreft sletting av nøkkel" + IDS_QUERY_DELETE_ONE "Er du sikker på at du vil slette denne verdien?" + IDS_QUERY_DELETE_MORE "Er du sikker på at du vil slette disse verdiene?" + IDS_QUERY_DELETE_CONFIRM "Bekreft sletting av verdi" + IDS_ERR_DELVAL_CAPTION "Feil ved sletting av verdi" + IDS_ERR_DELETEVALUE "Kunne ikke slette alle angitte verdier!" + IDS_ERR_RENVAL_CAPTION "Feil ved endring av navn" + IDS_ERR_RENVAL_TOEMPTY "Kan ikke gi nytt navn til %s. Den angitte verdien er tom. Prøv et annet navn, og forsøk på nytt." + IDS_NEW_KEY "Ny nøkkel #%d" + IDS_NEW_VALUE "Ny verdi #%d" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BINARY_EMPTY "(binær nullverdi)" + IDS_DEFAULT_VALUE_NAME "(Standard)" + IDS_VALUE_NOT_SET "(verdi ikke angitt)" + IDS_UNKNOWN_TYPE "Ukjent type: (0x%lx)" + IDS_MY_COMPUTER "Min datamaskin" + IDS_IMPORT_REG_FILE "Importer registerfil" + IDS_EXPORT_REG_FILE "Eksporter registerfil" + IDS_INVALID_DWORD "(ugyldig DWORD-verdi)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FLT_REGFILES "Registerfiler" + IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registerfiler (REGEDIT4)" + IDS_FLT_REGEDIT4_FLT "*.reg" + IDS_FLT_ALLFILES "Alle Filer (*.*)" + IDS_FLT_ALLFILES_FLT "*.*" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ACCESS_FULLCONTROL "Full tilgang" + IDS_ACCESS_READ "Les" + IDS_ACCESS_QUERYVALUE "Les verdi" + IDS_ACCESS_SETVALUE "Endre verdi" + IDS_ACCESS_CREATESUBKEY "Opprette undernøkkel" + IDS_ACCESS_ENUMERATESUBKEYS "Liste opp undernøkler" + IDS_ACCESS_NOTIFY "Angi informasjon" + IDS_ACCESS_CREATELINK "Opprette link" + IDS_ACCESS_DELETE "Slett" + IDS_ACCESS_WRITEDAC "Skrive DAC" + IDS_ACCESS_WRITEOWNER "Skrive eier" + IDS_ACCESS_READCONTROL "Lesetilgang" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INHERIT_THISKEYONLY "Kun denne nøkkelen" + IDS_INHERIT_THISKEYANDSUBKEYS "Denne nøkkelen og undernøkler" + IDS_INHERIT_SUBKEYSONLY "Kun undernøkler" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXPAND "&Utvid" + IDS_COLLAPSE "&Minimer" + IDS_GOTO_SUGGESTED_KEY "&Gå til '%s'" + IDS_FINISHEDFIND "Søket i registret er fullført." +END + +/*****************************************************************/ + + +/* + * Dialog + */ + +IDD_EXPORTRANGE DIALOG DISCARDABLE 50, 50, 370, 50 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Eksporter område",IDC_STATIC,2,0,366,48 + CONTROL "&Alt",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 + CONTROL "M&erket gren",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 + EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 +END + +IDD_ADDFAVORITES DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Legg til i Favoritter" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,129,7,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,129,24,50,14 + LTEXT "&Favorittnavn:",IDC_STATIC,7,7,70,10 + EDITTEXT IDC_FAVORITENAME,7,26,110,13,ES_AUTOHSCROLL +END + +IDD_REMOVEFAVORITES DIALOG DISCARDABLE 0, 0, 164, 135 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Fjern favoritter" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,107,114,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,7,114,50,14 + CONTROL "List1",IDC_FAVORITESLIST,"SysListView32",LVS_LIST | + WS_BORDER | WS_TABSTOP,7,20,150,90 + LTEXT "Velg favoritt(er):",IDC_STATIC,7,7,99,12 +END + +IDD_FIND DIALOG DISCARDABLE 0, 0, 254, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Søk" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Søk neste",IDOK,197,7,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,197,24,50,14 + GROUPBOX "Se på",IDC_STATIC,7,25,63,51 + LTEXT "&Søk etter:",IDC_STATIC,7,8,37,10 + EDITTEXT IDC_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL + CONTROL "&Nøkler",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,36,35,8 + CONTROL "&Verdier",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,48,36,8 + CONTROL "&Data",IDC_LOOKAT_DATA,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,60,42,8 + CONTROL "S&øk etter hele strenger",IDC_MATCHSTRING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,83,32,94,13 + CONTROL "Sk&ill mellom store og små bokstaver",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,83,48,130,12 +END + +IDD_FINDING DIALOGEX 0, 0, 145, 50 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | + WS_CAPTION | WS_SYSMENU +CAPTION "Søk" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + ICON IDI_REGEDIT,IDC_STATIC,7,7,20,20 + PUSHBUTTON "&Avbryt",IDCANCEL,93,29,45,14 + LTEXT "Søker i registret...",IDC_STATIC,33,12,83,8 +END + +/* + * TEXTINCLUDE + */ + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +/*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/rsrc.rc (original) +++ trunk/reactos/base/applications/regedit/rsrc.rc Sun Jul 29 21:36:08 2007 @@ -39,6 +39,7 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc"

17 years, 4 months

[cwittich] 28012: fix bug introduced in r27994

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 29 21:30:21 2007 New Revision: 28012 URL: http://svn.reactos.org/svn/reactos?rev=28012&view=rev Log: fix bug introduced in r27994 Modified: trunk/reactos/base/applications/regedit/childwnd.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Sun Jul 29 21:30:21 2007 @@ -513,12 +513,15 @@ HKEY hKey = NULL; LPNMTVDISPINFO ptvdi; LONG lResult; + TCHAR szBuffer[MAX_PATH]; ptvdi = (LPNMTVDISPINFO) lParam; if (ptvdi->item.pszText) { + keyPath = GetItemPath(pChildWnd->hTreeWnd, TreeView_GetParent(pChildWnd->hTreeWnd, ptvdi->item.hItem), &hRootKey); + _sntprintf(szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]), _T("%s\\%s"), keyPath, ptvdi->item.pszText); keyPath = GetItemPath(pChildWnd->hTreeWnd, ptvdi->item.hItem, &hRootKey); - if (RegOpenKeyEx(hRootKey, keyPath, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyEx(hRootKey, szBuffer, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { lResult = REG_OPENED_EXISTING_KEY; RegCloseKey(hKey);

17 years, 4 months

[greatlrd] 28011: NtGdiGetCurrentObject 1. add OBJ_EXTPEN, it is same as OBJ_PEN, now some smaller graphice glitch are fixed.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 29 20:54:00 2007 New Revision: 28011 URL: http://svn.reactos.org/svn/reactos?rev=28011&view=rev Log: NtGdiGetCurrentObject 1. add OBJ_EXTPEN, it is same as OBJ_PEN, now some smaller graphice glitch are fixed. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sun Jul 29 20:54:00 2007 @@ -1121,6 +1121,7 @@ switch(ObjectType) { case OBJ_PEN: + case OBJ_EXTPEN: SelObject = dc->w.hPen; break; case OBJ_BRUSH:

17 years, 4 months

← Newer
1
2
3
4
5
6
7
8
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007