Compare commits

...

13 Commits

Author SHA1 Message Date
Colin Finck
b1dd0f6e53 Remove the non-working apps based on http://www.reactos.org/wiki/index.php/Tests_for_0.3.9
svn path=/branches/ros-branch-0_3_9/; revision=40701
2009-04-25 19:03:37 +00:00
Colin Finck
9d8c2a6fef Merge 40679-40681
svn path=/branches/ros-branch-0_3_9/; revision=40700
2009-04-25 18:29:01 +00:00
Colin Finck
9f2e8093e7 Merge r40688 on request of dgorbachev
svn path=/branches/ros-branch-0_3_9/; revision=40695
2009-04-25 12:11:53 +00:00
Colin Finck
b04cc5101c Merge r40600
svn path=/branches/ros-branch-0_3_9/; revision=40689
2009-04-24 22:21:48 +00:00
Colin Finck
4b89964206 Fix the size passed to MultiByteToWideChar.
This fixes downloading the correct Gecko version for mshtml. (our version from Downloader isn't compatible anymore though)

The patch was already submitted to Wine as well.

svn path=/branches/ros-branch-0_3_9/; revision=40656
2009-04-22 19:42:33 +00:00
Colin Finck
d4365b717b Merge 40594
svn path=/branches/ros-branch-0_3_9/; revision=40595
2009-04-19 21:42:26 +00:00
Aleksey Bragin
267f7e5025 Merge 40590:
- Don't display unformatted partitions twice.

svn path=/branches/ros-branch-0_3_9/; revision=40591
2009-04-19 18:43:56 +00:00
Colin Finck
e88d2a8e91 - Revert r40581, this hack doesn't work anymore
- Add a similar hack to CreateEnvironmentBlock, APPDATA is set properly now

svn path=/branches/ros-branch-0_3_9/; revision=40588
2009-04-19 14:41:41 +00:00
Colin Finck
5f20f4348e Hack: Add the APPDATA variable to the environment when logging in.
Used to be in trunk, but was reverted there, because it's also accessible via CreateEnvironmentBlock under Windows. Need more time for researching the right thing to do here.

svn path=/branches/ros-branch-0_3_9/; revision=40581
2009-04-18 15:08:52 +00:00
Colin Finck
6e56e4315f Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases
svn path=/branches/ros-branch-0_3_9/; revision=40580
2009-04-18 14:57:31 +00:00
Colin Finck
4b8844a53a Hack: Revert the dispatch routine for WM_SETREDRAW to the pre-Wine-1.1.7 version to hackfix mIRC and probably other applications using riched20.
svn path=/branches/ros-branch-0_3_9/; revision=40579
2009-04-18 14:56:16 +00:00
Colin Finck
451b2f6abc Merge 40570-40576
svn path=/branches/ros-branch-0_3_9/; revision=40577
2009-04-18 14:44:22 +00:00
Colin Finck
b4aeab9dc1 - Change the version to 0.3.9
- Set "Angelus_02_ROSWP.bmp" as the default wallpaper
- Add a shortcut to "Download !" to the Desktop

svn path=/branches/ros-branch-0_3_9/; revision=40572
2009-04-18 13:43:38 +00:00
51 changed files with 174 additions and 327 deletions

View File

@@ -1,12 +1,5 @@
<tree Version="1"> <!-- Application version this tree is made for -->
<category name="Internet &amp; Network" icon="1">
<application name="Firefox 1.5">
<regname>Mozilla Firefox (1.5)</regname>
<licence>MPL/GPL/LGPL</licence>
<version>1.5.0.12</version>
<description>The most popular and one of the best free Web Browsers out there.</description>
<location>http://svn.reactos.org/packages/Firefox%20Setup%201.5.0.12.exe</location>
</application>
<application name="Firefox 2.0">
<regname>Mozilla Firefox (2.0.0.20)</regname>
<licence>MPL/GPL/LGPL</licence>
@@ -14,12 +7,12 @@
<description>The most popular and one of the best free Web Browsers out there.</description>
<location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/en-US/Firefox%20Setup%202.0.0.20.exe</location>
</application>
<application name="Opera">
<regname>Opera</regname>
<licence>Freeware</licence>
<version>9.63</version>
<description>The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.</description>
<location>http://ftp.opera.com/pub/opera/win/963/en/Opera_963_classic_Setup.exe</location>
<application name="Firefox 3.0">
<regname>Mozilla Firefox (3.0.9)</regname>
<licence>MPL/GPL/LGPL</licence>
<version>3.0.9</version>
<description>The most popular and one of the best free Web Browsers out there.</description>
<location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/en-US/Firefox%20Setup%203.0.9.exe</location>
</application>
<application name="Thunderbird 2.0">
<regname>Mozilla Thunderbird (2.0.0.19)</regname>
@@ -29,16 +22,10 @@
<location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/win32/en-US/Thunderbird%20Setup%202.0.0.19.exe</location>
</application>
<application name="SeaMonkey">
<regname>SeaMonkey (1.1.14)</regname>
<version>1.1.14</version>
<regname>SeaMonkey (1.1.16)</regname>
<version>1.1.16</version>
<description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.</description>
<location>http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.14/seamonkey-1.1.14.en-US.win32.installer.exe</location>
</application>
<application name="Mozilla ActiveX Control">
<regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname>
<version>1.7.12</version>
<description>Essential Component to get ReactOS Explorer's and other applications' Internet Browsing feature running.</description>
<location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactOS.exe</location>
<location>http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.16/seamonkey-1.1.16.en-US.win32.installer.exe</location>
</application>
<application name="Off By One Browser">
<regname>The Off By One Web Browser</regname>
@@ -56,12 +43,6 @@
<description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description>
<location>http://svn.reactos.org/packages/samba-tng.exe</location>
</application>
<application name="Miranda IM">
<regname>Miranda IM</regname>
<version>0.7.4</version>
<description>Open source multiprotocol instant messaging application - May not work completely.</description>
<location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.7.4-unicode.exe</location>
</application>
<application name="Putty">
<regname>PuTTY version 0.60</regname>
<licence>MIT</licence>
@@ -77,18 +58,6 @@
<description>Word processor.</description>
<location>http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.exe</location>
</application>
<application name="OpenOffice 2.4">
<regname>OpenOffice.org 2.4.2</regname>
<version>2.4.2</version>
<description>THE Open Source Office Suite.</description>
<location>http://ftp.plusline.de/OpenOffice/stable/2.4.2/OOo_2.4.2_Win32Intel_install_wJRE_en-US.exe</location>
</application>
<application name="OpenOffice 3.0">
<regname>OpenOffice.org 3.0.1</regname>
<version>3.0.1</version>
<description>THE Open Source Office Suite.</description>
<location>http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.0.1/OOo_3.0.1_Win32Intel_install_en-US.exe</location>
</application>
</category>
<category name="Graphics" icon="3">
<application name="IrfanView">
@@ -115,77 +84,7 @@
<location>http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe</location>
</application>
</category>
<category name="Libraries" icon="4">
<application name="Microsoft XML 3">
<regname>msxml3</regname>
<version>3.0</version>
<description>MSXML3 is needed for some MSI Installers.</description>
<location>http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi</location>
</application>
<application name="OLE Viewer and Microsoft Foundation Classes version 4">
<regname>mfc40</regname>
<version>4.0</version>
<description>MFC 4 is needed by some applications</description>
<location>http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe</location>
</application>
<application name="Visual Basic 5 Runtime">
<regname>vb5run</regname>
<version>5.0</version>
<description>Visual Basic 5 Runtime</description>
<location>http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm50.exe</location>
</application>
<application name="Visual Basic 6 Runtime">
<regname>vb6run</regname>
<version>6.0</version>
<description>Visual Basic 6 Runtime</description>
<location>http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbrun60.exe</location>
</application>
<application name="Visual Studio 6 Runtime">
<regname>vc6run</regname>
<version>6.0</version>
<description>Visual Studio 6 Runtime</description>
<location>http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6redistsetup_enu.exe</location>
</application>
<application name="Visual Studio 2005 Runtime">
<regname>vc2005run</regname>
<version>7.0</version>
<description>Visual Studio 2005 Runtime</description>
<location>http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-5174867be706/vcredist_x86.exe</location>
</application>
<application name="Visual Studio 2005 Runtime SP1">
<regname>vc2005sp1run</regname>
<version>7.1</version>
<description>Visual Studio 2005 Runtime SP1</description>
<location>http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906ecf088/vcredist_x86.exe</location>
</application>
<application name="Visual Studio 2008 Runtime">
<regname>vc2008run</regname>
<version>8.0</version>
<description>Visual Studio 2008 Runtime</description>
<location>http://download.microsoft.com/download/1/1/1/1116b75a-9ec3-481a-a3c8-1777b5381140/vcredist_x86.exe</location>
</application>
</category>
<category name="Multimedia" icon="4">
</category>
<category name="Development" icon="5">
<application name="ReactOS Build Environment">
<regname>ReactOS Build Environment 1.2</regname>
<version>1.2</version>
<description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description>
<location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.2.exe</location>
</application>
<application name="MinGW">
<regname>MinGW 5.1.3</regname>
<version>5.1.3</version>
<description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description>
<location>http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location>
</application>
<application name="FreeBASIC">
<regname>FreeBASIC 0.18.4b</regname>
<version>0.18.4b</version>
@@ -218,24 +117,12 @@
<description>Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.</description>
<location>http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.6.0-win32.exe</location>
</application>
<application name="LBreakout2">
<regname>LBreakout2 2.4.1</regname>
<version>2.4.1</version>
<description>Breakout Clone using SDL libs.</description>
<location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.exe</location>
</application>
<application name="LGeneral">
<regname>LGeneral 1.1</regname>
<version>1.1</version>
<description>Panzer General Clone using SDL libs.</description>
<location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe</location>
</application>
<application name="LMarbles">
<regname>LMarbles 1.0.6</regname>
<version>1.0.6</version>
<description>Atomix Clone using SDL libs.</description>
<location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location>
</application>
<application name="WinBoard">
<regname>WinBoard 4.2.7b</regname>
<version>4.2.7b</version>
@@ -244,12 +131,6 @@
<location>http://ftp.gnu.org/gnu/winboard/winboard-4_2_7b.exe</location>
</application>
</category>
<category name="Science" icon="11">
</category>
<category name="Edutainment" icon="12">
</category>
<category name="Engineering" icon="13">
</category>
<category name="Tools" icon="7">
<application name="7-Zip">
<regname>7-Zip 4.57</regname>
@@ -263,19 +144,6 @@
<description>Small and fast BitTorrent Client</description>
<location>http://download.utorrent.com/1.8.2/utorrent-1.8.2.upx.exe</location>
</application>
<application name="Audio Grabber">
<regname>Audiograbber 1.83 SE</regname>
<version>1.83 SE</version>
<description>A very good CD Ripper/Audio File Converter.</description>
<location>http://www.audiograbber.de/files/4898276276/agsetup183se.exe</location>
</application>
</category>
<category name="Drivers" icon="8">
<application name="AC97 Driver for VirtualBox">
<version>5.10.00.3610</version>
<description>Unzip in the "ReactOS" folder then restart ReactOS twice.</description>
<location>http://svn.reactos.org/packages/ac97_vbox.exe</location>
</application>
</category>
<category name="Others" icon="8">
<application name="Simple Direct Media Layer (SDL) Runtime">

View File

@@ -198,19 +198,12 @@ ReLoadGeneralPage(PINFO pInfo)
static VOID
GeneralOnInit(HWND hwnd,
PINFO pInfo)
GeneralOnInit(PINFO pInfo)
{
SetWindowLongPtrW(hwnd,
GWLP_USERDATA,
(LONG_PTR)pInfo);
pInfo->hGeneralPage = hwnd;
SetWindowPos(pInfo->hGeneralPage,
NULL,
2,
22,
13,
110,
0,
0,
SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
@@ -256,13 +249,14 @@ GeneralDlgProc(HWND hDlg,
WPARAM wParam,
LPARAM lParam)
{
PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg,
PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg),
GWLP_USERDATA);
switch (message)
{
case WM_INITDIALOG:
GeneralOnInit(hDlg, (PINFO)lParam);
pInfo->hGeneralPage = hDlg;
GeneralOnInit(pInfo);
return TRUE;
case WM_COMMAND:
@@ -746,23 +740,16 @@ ReLoadDisplayPage(PINFO pInfo)
static VOID
DisplayOnInit(HWND hwnd,
PINFO pInfo)
DisplayOnInit(PINFO pInfo)
{
DISPLAY_DEVICEW displayDevice;
DWORD iDevNum = 0;
BOOL GotDev = FALSE;
SetWindowLongPtrW(hwnd,
GWLP_USERDATA,
(LONG_PTR)pInfo);
pInfo->hDisplayPage = hwnd;
SetWindowPos(pInfo->hDisplayPage,
NULL,
2,
22,
13,
110,
0,
0,
SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
@@ -836,13 +823,14 @@ DisplayDlgProc(HWND hDlg,
WPARAM wParam,
LPARAM lParam)
{
PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg,
PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg),
GWLP_USERDATA);
switch (message)
{
case WM_INITDIALOG:
DisplayOnInit(hDlg, (PINFO)lParam);
pInfo->hDisplayPage = hDlg;
DisplayOnInit(pInfo);
return TRUE;
case WM_DRAWITEM:
@@ -986,11 +974,10 @@ OnMainCreate(HWND hwnd,
pInfo->hTab = GetDlgItem(hwnd, IDC_TAB);
if (pInfo->hTab)
{
if (CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_GENERAL),
pInfo->hTab,
GeneralDlgProc,
(LPARAM)pInfo))
if (CreateDialogW(hInst,
MAKEINTRESOURCEW(IDD_GENERAL),
hwnd,
(DLGPROC)GeneralDlgProc))
{
WCHAR str[256];
ZeroMemory(&item, sizeof(TCITEM));
@@ -1001,11 +988,10 @@ OnMainCreate(HWND hwnd,
(void)TabCtrl_InsertItem(pInfo->hTab, 0, &item);
}
if (CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_DISPLAY),
pInfo->hTab,
DisplayDlgProc,
(LPARAM)pInfo))
if (CreateDialogW(hInst,
MAKEINTRESOURCEW(IDD_DISPLAY),
hwnd,
(DLGPROC)DisplayDlgProc))
{
WCHAR str[256];
ZeroMemory(&item, sizeof(TCITEM));

View File

@@ -234,9 +234,6 @@ DWORD PNP_ReportLogOn(
DPRINT("PNP_ReportLogOn(%u, %u) called\n", Admin, ProcessId);
if (hInstallEvent != NULL)
SetEvent(hInstallEvent);
/* Get the users token */
hProcess = OpenProcess(PROCESS_ALL_ACCESS, TRUE, ProcessId);
@@ -259,8 +256,8 @@ DWORD PNP_ReportLogOn(
}
/* Trigger the installer thread */
/*if (hInstallEvent != NULL)
SetEvent(hInstallEvent);*/
if (hInstallEvent)
SetEvent(hInstallEvent);
ReturnValue = CR_SUCCESS;
@@ -1100,10 +1097,10 @@ DWORD PNP_DeviceInstanceAction(
LPWSTR pszDeviceInstance2)
{
CONFIGRET ret = CR_SUCCESS;
NTSTATUS Status;
UNREFERENCED_PARAMETER(hBinding);
UNREFERENCED_PARAMETER(ulMinorAction);
UNREFERENCED_PARAMETER(pszDeviceInstance1);
UNREFERENCED_PARAMETER(pszDeviceInstance2);
DPRINT("PNP_DeviceInstanceAction() called\n");
@@ -1117,10 +1114,15 @@ DWORD PNP_DeviceInstanceAction(
break;
case PNP_DEVINST_ENABLE:
{
PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData;
DPRINT("Enable device instance\n");
/* FIXME */
ret = CR_CALL_NOT_IMPLEMENTED;
RtlInitUnicodeString(&ResetDeviceData.DeviceInstance, pszDeviceInstance1);
Status = NtPlugPlayControl(PlugPlayControlResetDevice, &ResetDeviceData, sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA));
if (!NT_SUCCESS(Status))
ret = NtStatusToCrError(Status);
break;
}
case PNP_DEVINST_REENUMERATE:
DPRINT("Reenumerate device instance\n");

View File

@@ -3,6 +3,7 @@
MUI_LAYOUTS zhCNLayouts[] =
{
{ L"0409", L"00000409" },
{ L"0804", L"00000804" },
{ L"0804", L"E00E0804" },
{ L"0804", L"E0010804" },

View File

@@ -3,6 +3,7 @@
MUI_LAYOUTS zhTWLayouts[] =
{
{ L"0409", L"00000409" },
{ L"0404", L"00000404" },
{ L"0404", L"E0080404" },
{ L"0404", L"E0010404" },

View File

@@ -1373,7 +1373,7 @@ PrintDiskData (PPARTLIST List,
}
/* Print unpartitioned entry */
if (PartEntry->Unpartitioned || PartEntry->New)
if (PartEntry->Unpartitioned)
{
PrintPartitionData (List,
DiskEntry,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

@@ -20,7 +20,7 @@ HKCU,"Control Panel\Desktop","PaintDesktopVersion",0x00010001,"0"
HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000"
HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,""
HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000"
HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,""
HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Angelus_02_ROSWP.bmp"
HKCU,"Control Panel\International",,0x00000012
HKCU,"Control Panel\International","Locale",0x00000000,"0409"
HKCU,"Control Panel\International\Geo","Nation",0x00000000,"1"

View File

@@ -448,6 +448,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0402",0x00000000,"l_intl.n
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0403",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0404",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0804",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0c04",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1004",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1404",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0405",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0406",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0407",0x00000000,"l_intl.nls"

View File

@@ -448,6 +448,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0402",0x00000000,"l_intl.n
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0403",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0404",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0804",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0c04",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1004",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1404",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0405",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0406",0x00000000,"l_intl.nls"
HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0407",0x00000000,"l_intl.nls"

View File

@@ -53,7 +53,7 @@ BEGIN
WS_VISIBLE | WS_BORDER, 7, 7, 232, 120
LTEXT "Farbschema:", IDC_STATIC, 7, 140, 64, 7
COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15
PUSHBUTTON "&Effekte...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15
PUSHBUTTON "Erweitert", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15
END
@@ -98,24 +98,24 @@ END
IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
CAPTION "Effects"
CAPTION "Effekte"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button",
CONTROL "&Verwende folgenden <20>bergangseffekt f<EFBFBD>r Men<EFBFBD>s und Tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button",
BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19
COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP
CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button",
CONTROL "V&erwende folgende Kantengl<67>ttungsmethode f<>r Bildschirmschriften:",IDC_EFFAPPEARANCE_SMOOTHING,"button",
BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19
COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button",
CONTROL "Ve&rwende gro<72>e Icons",IDC_EFFAPPEARANCE_LARGEICONS,"button",
BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19
CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button",
CONTROL "Zeige Men<65>sch&atten",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button",
BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19
CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button",
CONTROL "Zeige &Fensterinhalt beim Verschieben",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button",
BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19
CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button",
BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19
PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14
CONTROL "Ver&stecke Unterstrich der Tastaturnavigation bis zum Druck der Alt-Taste",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button",
BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 250, 19
PUSHBUTTON "Abbrechen", IDCANCEL, 226, 165, 50, 14
DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
END
@@ -178,8 +178,8 @@ END
STRINGTABLE DISCARDABLE
BEGIN
IDS_SLIDEEFFECT "Slide effect"
IDS_FADEEFFECT "Fade effect"
IDS_SLIDEEFFECT "Slide-Effekt"
IDS_FADEEFFECT "Fade-Effekt"
END
STRINGTABLE DISCARDABLE

View File

@@ -55,7 +55,7 @@ BEGIN
WS_VISIBLE | WS_BORDER, 7, 7, 232, 120
LTEXT "Fargevalg", IDC_STATIC, 7, 140, 64, 9
COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15
PUSHBUTTON "&Effekter...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15
PUSHBUTTON "Avansert", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15
END
@@ -100,24 +100,24 @@ END
IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
CAPTION "Effects"
CAPTION "Effekter"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button",
CONTROL "&Bruk f<>lgende overgang effekter for menyer og verkt<6B>ytips:",IDC_EFFAPPEARANCE_ANIMATION,"button",
BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19
COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP
CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button",
CONTROL "B&ruk f<>lgende metode for kantutjevning av skjerm skifter:",IDC_EFFAPPEARANCE_SMOOTHING,"button",
BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19
COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button",
CONTROL "Br&uk store ikoner",IDC_EFFAPPEARANCE_LARGEICONS,"button",
BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19
CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button",
CONTROL "Vis sk&ygger under menyer",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button",
BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19
CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button",
CONTROL "Vis &vindu innholdet ved flytting",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button",
BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19
CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button",
CONTROL "&Skjul visning av understrekning for tastatur hurtigtast til jeg trykker p<> Alt tasten",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button",
BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19
PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14
PUSHBUTTON "Avbryt", IDCANCEL, 226, 165, 50, 14
DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
END
@@ -134,7 +134,7 @@ BEGIN
CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17
LTEXT "Mindre",1815,9,137,21,8,NOT WS_GROUP
LTEXT "Mere",1816,93,137,21,8,NOT WS_GROUP
LTEXT "St<EFBFBD>rre",1816,93,137,21,8,NOT WS_GROUP
LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,157,100,10,NOT WS_GROUP | SS_CENTER
GROUPBOX "&Farger",1817,125,127,115,43
COMBOBOX IDC_SETTINGS_BPP,131,137,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL |
@@ -171,7 +171,7 @@ BEGIN
POPUP ""
BEGIN
MENUITEM "&Attached", ID_MENU_ATTACHED
MENUITEM "&Primary", ID_MENU_PRIMARY
MENUITEM "&Prim<EFBFBD>r", ID_MENU_PRIMARY
MENUITEM SEPARATOR
MENUITEM "&Identify", ID_MENU_IDENTIFY
MENUITEM "E&genskaper", ID_MENU_PROPERTIES
@@ -180,14 +180,14 @@ END
STRINGTABLE DISCARDABLE
BEGIN
IDS_SLIDEEFFECT "Slide effect"
IDS_FADEEFFECT "Fade effect"
IDS_SLIDEEFFECT "Slide effekter"
IDS_FADEEFFECT "Fade effekter"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_STANDARDEFFECT "Standard"
IDS_CLEARTYPEEFFECT "ClearType"
IDS_STANDARDEFFECT "Vanlig"
IDS_CLEARTYPEEFFECT "Klartype"
END
STRINGTABLE
@@ -228,8 +228,8 @@ BEGIN
IDS_INACTWIN "Uaktiv vindu"
IDS_ACTWIN "Aktiv vindu"
IDS_WINTEXT "Vindu tekst"
IDS_MESSBOX "Melding boks"
IDS_MESSTEXT "Melding tekst"
IDS_MESSBOX "Meldingboks"
IDS_MESSTEXT "Meldingtekst"
IDS_BUTTEXT "OK"
END
@@ -244,18 +244,18 @@ BEGIN
IDS_ELEMENT_7 "Valgt enhet"
IDS_ELEMENT_8 "Vindu"
IDS_ELEMENT_9 "Scrollbars"
IDS_ELEMENT_10 "3D objects"
IDS_ELEMENT_10 "3D objekter"
IDS_ELEMENT_11 "Palette title"
IDS_ELEMENT_12 "Symbol title"
IDS_ELEMENT_12 "Tegn tittel"
IDS_ELEMENT_13 "Captionbar"
IDS_ELEMENT_14 "Deactivated menu elements"
IDS_ELEMENT_14 "Deaktivert meny elementer"
IDS_ELEMENT_15 "Dialog"
IDS_ELEMENT_16 "Scrollbar controls"
IDS_ELEMENT_17 "Application background"
IDS_ELEMENT_17 "Program bakgrunn"
IDS_ELEMENT_18 "Small captionbar"
IDS_ELEMENT_19 "Symbol distance (horizontal)"
IDS_ELEMENT_20 "Symbol distance (vertical)"
IDS_ELEMENT_21 "Quickinfo"
IDS_ELEMENT_19 "Tegn avstand (horisontalt)"
IDS_ELEMENT_20 "Tegn avstand (vertikalt)"
IDS_ELEMENT_21 "Rask infomasjon"
IDS_ELEMENT_22 "Symbol"
END

View File

@@ -720,34 +720,12 @@ CreateProcessInternalW(HANDLE hToken,
if (lpCurrentDirectory)
{
LPWSTR FilePart, Buffer = NULL;
Buffer = RtlAllocateHeap(RtlGetProcessHeap(),
0,
(MAX_PATH + 1) * sizeof(WCHAR));
if (!Buffer)
if ((GetFileAttributesW(lpCurrentDirectory) == INVALID_FILE_ATTRIBUTES) ||
!(GetFileAttributesW(lpCurrentDirectory) & FILE_ATTRIBUTE_DIRECTORY))
{
SetLastErrorByStatus(STATUS_NO_MEMORY);
return FALSE;
}
if (GetFullPathNameW(lpCurrentDirectory, MAX_PATH, Buffer, &FilePart) > MAX_PATH)
{
RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer);
SetLastError(ERROR_DIRECTORY);
return FALSE;
}
if ((GetFileAttributesW(Buffer) == INVALID_FILE_ATTRIBUTES) ||
!(GetFileAttributesW(Buffer) & FILE_ATTRIBUTE_DIRECTORY))
{
RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer);
SetLastError(ERROR_DIRECTORY);
return FALSE;
}
RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer);
}
/*

View File

@@ -425,6 +425,7 @@ static LPWSTR get_url(void)
HKEY hkey;
DWORD res, type;
DWORD size = INTERNET_MAX_URL_LENGTH*sizeof(WCHAR);
DWORD returned_size;
LPWSTR url;
static const WCHAR wszGeckoUrl[] = {'G','e','c','k','o','U','r','l',0};
@@ -437,15 +438,16 @@ static LPWSTR get_url(void)
return NULL;
url = heap_alloc(size);
returned_size = size;
res = RegQueryValueExW(hkey, wszGeckoUrl, NULL, &type, (LPBYTE)url, &size);
res = RegQueryValueExW(hkey, wszGeckoUrl, NULL, &type, (LPBYTE)url, &returned_size);
RegCloseKey(hkey);
if(res != ERROR_SUCCESS || type != REG_SZ) {
heap_free(url);
return NULL;
}
if(size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) {
if(returned_size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) {
strcatW(url, v_formatW);
MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, url+strlenW(url), size/sizeof(WCHAR)-strlenW(url));
}

View File

@@ -4162,7 +4162,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
ME_SendRequestResize(editor, TRUE);
return 0;
case WM_SETREDRAW:
goto do_default;
if (wParam)
ME_RewrapRepaint(editor);
return 0;
case WM_SIZE:
{
RECT clientRect;

View File

@@ -4642,21 +4642,18 @@ ResetDevice(
IN PSP_DEVINFO_DATA DeviceInfoData)
{
#ifndef __WINESRC__
PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData;
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved;
NTSTATUS Status;
CONFIGRET cr;
if (((struct DeviceInfoSet *)DeviceInfoSet)->HKLM != HKEY_LOCAL_MACHINE)
cr = CM_Enable_DevNode_Ex(deviceInfo->dnDevInst, 0, set->hMachine);
if (cr != CR_SUCCESS)
{
/* At the moment, I only know how to start local devices */
SetLastError(ERROR_INVALID_COMPUTERNAME);
SetLastError(GetErrorCodeFromCrCode(cr));
return FALSE;
}
RtlInitUnicodeString(&ResetDeviceData.DeviceInstance, deviceInfo->instanceId);
Status = NtPlugPlayControl(PlugPlayControlResetDevice, &ResetDeviceData, sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA));
SetLastError(RtlNtStatusToDosError(Status));
return NT_SUCCESS(Status);
return TRUE;
#else
FIXME("Stub: ResetDevice(%p %p)\n", DeviceInfoSet, DeviceInfoData);
return TRUE;

View File

@@ -1 +1 @@
const char * const SHELL_Authors[] = { "Copyright 1993-2007 WINE team", "Copyright 1998-2007 ReactOS Team", 0 };
const char * const SHELL_Authors[] = { "Copyright 1993-2009 WINE team", "Copyright 1998-2009 ReactOS Team", 0 };

View File

@@ -140,7 +140,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>:", IDC_STATIC, 0, 0, 250, 10

View File

@@ -140,7 +140,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS ha estat construit per:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -142,7 +142,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS je d<>lem:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -140,7 +140,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS havde ikke v<>ret mulig uden hj<68>lp fra disse personer:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -142,7 +142,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS wurde Ihnen zur Verf<72>gung gestellt von:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -140,7 +140,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "<22><> ReactOS <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -140,7 +140,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -140,7 +140,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -143,7 +143,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS est<73> disponible gracias a:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -140,7 +140,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS:n toi Sinulle:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -144,7 +144,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS est une r<>alisation de:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -143,7 +143,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "A ReactOS k<>sz<73>t<EFBFBD>i:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -141,7 +141,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS <20> disponibile grazie a:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -140,7 +140,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 9, "MS UI Gothic"
BEGIN
LTEXT "ReactOS<4F>͎<EFBFBD><CD8E>̕<EFBFBD><CC95>X<EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><E782B3><EFBFBD>܂<EFBFBD><DC82><EFBFBD>:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -140,7 +140,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -140,7 +140,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS is geschreven door:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -140,7 +140,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS ble laget av:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -147,7 +147,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS powsta<74> dzi<7A>ki:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -142,7 +142,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS foi disponibilizado por:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -142,7 +142,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS disponibilizado por:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -141,7 +141,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactOS:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -146,7 +146,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Syst<73>m ReactOS pre V<>m pripravili:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -140,7 +140,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS so ustvarili:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -140,7 +140,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS hade inte varit m<>jligt utan dessa personer:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -140,7 +140,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS'<27> size sunan geli<6C>tiriciler:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -141,7 +141,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactOS:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -129,7 +129,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -141,7 +141,7 @@ BEGIN
END
IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85
STYLE DS_SHELLFONT | WS_CHILD
STYLE DS_SHELLFONT | WS_POPUP
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10

View File

@@ -313,7 +313,7 @@ static BOOL CreateDesktopEnumList(IEnumIDList *list, DWORD dwFlags)
DWORD size;
LONG r;
size = sizeof (iid);
size = sizeof (iid) / sizeof (iid[0]);
r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL);
if (ERROR_SUCCESS == r)
{

View File

@@ -756,6 +756,7 @@ CreateShortcuts(VOID)
/* Create desktop shortcuts */
CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE);
CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\downloader.exe"), IDS_CMT_DOWNLOADER, TRUE);
/* Create program startmenu shortcuts */
CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE);

View File

@@ -201,8 +201,8 @@ STRINGTABLE
BEGIN
IDS_ACCESSORIES "Tilbeh<65>r"
IDS_CMT_CALC "Start Kalkulator"
IDS_CMT_CMD "<22>pne command prompt"
IDS_CMT_EXPLORER "Start Explorer"
IDS_CMT_CMD "<22>pne Kommandolinje"
IDS_CMT_EXPLORER "Start Utforsker"
IDS_CMT_NOTEPAD "Start Tekstredigering"
IDS_CMT_REGEDIT "Start Registerredigering"
IDS_CMT_WORDPAD "Start Dokument redigering"
@@ -210,48 +210,48 @@ BEGIN
IDS_CMT_DEVMGMT "Start Enhetsbehandler"
IDS_CMT_SERVMAN "Start Tjenestebehandler"
IDS_CMT_RDESKTOP "Start Ekstern skrivebord"
IDS_CMT_EVENTVIEW "Launch Event Viewer"
IDS_CMT_MSCONFIG "Launch System Configuration program"
IDS_CMT_EVENTVIEW "Start Hendelseliste"
IDS_CMT_MSCONFIG "Start Systemkonfigurasjon"
END
STRINGTABLE
BEGIN
IDS_GAMES "Spill"
IDS_CMT_SOLITAIRE "Kabal"
IDS_CMT_WINEMINE "Minnesveiper"
IDS_GAMES "Spill"
IDS_CMT_SOLITAIRE "Kabal"
IDS_CMT_WINEMINE "Minnesveiper"
END
STRINGTABLE
BEGIN
IDS_SYS_TOOLS "System verkt<EFBFBD>y"
IDS_CMT_CHARMAP "Tegnkart"
IDS_CMT_KBSWITCH "Endre tastatur valg"
IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program"
IDS_SYS_TOOLS "Systemverkt<6B>y"
IDS_CMT_CHARMAP "Tegnkart"
IDS_CMT_KBSWITCH "Endre tastaturvalg"
IDS_CMT_DXDIAG "Kj<4B>r ReactX-Diagnose program"
END
STRINGTABLE
BEGIN
IDS_SYS_ACCESSIBILITY "Tilgjengelighet"
IDS_CMT_MAGNIFY "Forst<73>rrelse"
IDS_SYS_ACCESSIBILITY "Tilgjengelighet"
IDS_CMT_MAGNIFY "Forst<73>rrelse"
END
STRINGTABLE
BEGIN
IDS_SYS_ENTERTAINMENT "Entertainment"
IDS_CMT_MPLAY32 "Launch Multimedia Player"
IDS_CMT_SNDVOL32 "Launch Volume Control"
IDS_SYS_ENTERTAINMENT "Underholdning"
IDS_CMT_MPLAY32 "Start Multimedia avspiller"
IDS_CMT_SNDVOL32 "Start Volumkontroll"
END
STRINGTABLE
BEGIN
IDS_REACTOS_SETUP "ReactOS installasjon"
IDS_REACTOS_SETUP "ReactOS installasjon"
IDS_UNKNOWN_ERROR "Ukjent feil"
IDS_REGISTERING_COMPONENTS "Registrerer komponenter..."
IDS_LOADLIBRARY_FAILED "LoadLibrary feilet: "
IDS_GETPROCADDR_FAILED "GetProcAddr feilet: "
IDS_LOADLIBRARY_FAILED "LoadLibrary feilet: "
IDS_GETPROCADDR_FAILED "GetProcAddr feilet: "
IDS_REGSVR_FAILED "DllRegisterServer feilet: "
IDS_DLLINSTALL_FAILED "DllInstall feilet: "
IDS_TIMEOUT "Tidsavbrudd under registrering"
IDS_DLLINSTALL_FAILED "DllInstall feilet: "
IDS_TIMEOUT "Tidsavbrudd under registrering"
IDS_REASON_UNKNOWN ""
END
@@ -282,13 +282,13 @@ END
STRINGTABLE
BEGIN
IDS_WZD_NAME "Installasjonen kan ikke fortsette uten ditt navn."
IDS_WZD_SETCOMPUTERNAME "Installasjonen klarte ikke sette datamaskinnavnet."
IDS_WZD_COMPUTERNAME "Installasjonen kan ikke fortsette f<>r du taster inn navn for datamaskinen."
IDS_WZD_PASSWORDEMPTY "Du m<> taste et passord!"
IDS_WZD_PASSWORDMATCH "Passordene du tastet er ikke like. Vennligst tast inn p<> nytt."
IDS_WZD_PASSWORDCHAR "Passordet du tastet inneholder ugyldige tegn. Vennligst tast inn et annet."
IDS_WZD_LOCALTIME "Installasjonen klarte ikke <20> sette lokal tid."
IDS_WZD_NAME "Installasjonen kan ikke fortsette uten ditt navn."
IDS_WZD_SETCOMPUTERNAME "Installasjonen klarte ikke sette datamaskinnavnet."
IDS_WZD_COMPUTERNAME "Installasjonen kan ikke fortsette f<>r du taster inn navn for datamaskinen."
IDS_WZD_PASSWORDEMPTY "Du m<> taste et passord!"
IDS_WZD_PASSWORDMATCH "Passordene du tastet er ikke like. Vennligst tast inn p<> nytt."
IDS_WZD_PASSWORDCHAR "Passordet du tastet inneholder ugyldige tegn. Vennligst tast inn et annet."
IDS_WZD_LOCALTIME "Installasjonen klarte ikke <20> sette lokal tid."
END
STRINGTABLE

View File

@@ -379,6 +379,9 @@ CreateEnvironmentBlock (LPVOID *lpEnvironment,
L"USERPROFILE",
Buffer,
FALSE);
wcscat(Buffer, L"\\Application Data");
SetUserEnvironmentVariable(lpEnvironment, L"APPDATA", Buffer, FALSE);
}
/* FIXME: Set 'USERDOMAIN' variable */

View File

@@ -23,7 +23,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
STRINGTABLE
BEGIN
IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings"
IDS_PROFILEPATH "%SystemDrive%\\Dokumenter og innstillinger"
IDS_APPDATA "Programdata"
IDS_DESKTOP "Skrivebord"
IDS_FAVORITES "Favoritter"
@@ -31,21 +31,21 @@ BEGIN
IDS_PROGRAMS "Start-Meny\\Programmer"
IDS_ADMINTOOLS "Start-Meny\\Programmer\\Administrative verkt<6B>y"
IDS_STARTUP "Start-Meny\\Programmer\\Oppstart"
IDS_MYDOCUMENTS "Mine Dokumenter"
IDS_MYPICTURES "Mine Dokumenter\\Mine Bilder"
IDS_MYMUSIC "Mine Dokumenter\\Min Musikk"
IDS_MYVIDEOS "Mine Dokumenter\\Mine Filmer"
IDS_MYDOCUMENTS "Mine dokumenter"
IDS_MYPICTURES "Mine dokumenter\\Mine bilder"
IDS_MYMUSIC "Mine dokumenter\\Min musikk"
IDS_MYVIDEOS "Mine dokumenter\\Mine filmer"
IDS_TEMPLATES "Templates"
IDS_RECENT "Siste"
IDS_SENDTO "SendTo"
IDS_SENDTO "Send til"
IDS_PRINTHOOD "PrintHood"
IDS_NETHOOD "NetHood"
IDS_LOCALSETTINGS "Lokale innstillinger"
IDS_LOCALAPPDATA "Lokale innstillinger\\Programdata"
IDS_TEMP "Lokale innstillinger\\Temp"
IDS_CACHE "Lokale innstillinger\\Temporary Internet Files"
IDS_TEMP "Lokale innstillinger\\Midlertidig"
IDS_CACHE "Lokale innstillinger\\Midlertidig internett filer"
IDS_HISTORY "Lokale innstillinger\\Logg"
IDS_COOKIES "Cookies"
IDS_COOKIES "Informasjonkapsel"
IDS_PROGRAMFILES "%SystemDrive%\\Programfiler"
IDS_COMMONFILES "Common Files"
END

View File

@@ -18,13 +18,13 @@
#define __VERSION_H
#define KERNEL_VERSION_MAJOR 0
#define KERNEL_VERSION_MINOR 4
#define KERNEL_VERSION_PATCH_LEVEL 0
#define KERNEL_VERSION_MINOR 3
#define KERNEL_VERSION_PATCH_LEVEL 9
#define COPYRIGHT_YEAR "2009"
/* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */
#define KERNEL_VERSION_BUILD_TYPE L"SVN"
#define KERNEL_VERSION_BUILD_TYPE L""
#endif