Merge r44552

svn path=/branches/ros-branch-0_3_11/; revision=44553
Here comes ReactOS "FOR WORKGROUPS" 0.3.11! :-)
2025-10-06 16:32:42 +02:00 · 2009-12-12 17:15:19 +00:00 · 2009-12-10 23:19:12 +00:00 · 2009-12-02 20:02:07 +00:00 · 2009-12-01 21:36:23 +00:00 · 2009-11-30 21:52:07 +00:00
18 changed files with 84 additions and 99 deletions
--- a/reactos/base/applications/mstsc/connectdialog.c
+++ b/reactos/base/applications/mstsc/connectdialog.c
@@ -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));
--- a/reactos/base/setup/usetup/bootsup.c
+++ b/reactos/base/setup/usetup/bootsup.c
@@ -415,13 +415,13 @@ CreateFreeLoaderIniForReactos(PWCHAR IniPath,
    /* ReactOS */
    CreateFreeLoaderEntry(IniCache, IniSection,
        L"ReactOS", L"\"ReactOS\"",
-        L"Windows2003", ArcPath,
+        L"ReactOS", ArcPath,
        L"");

    /* ReactOS_Debug */
    CreateFreeLoaderEntry(IniCache, IniSection,
        L"ReactOS_Debug", L"\"ReactOS (Debug)\"",
-        L"Windows2003", ArcPath,
+        L"ReactOS", ArcPath,
        L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS");

 #if DBG
@@ -444,18 +444,6 @@ CreateFreeLoaderIniForReactos(PWCHAR IniPath,
        L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256");
 #endif

-    /* ReactOS_old */
-    CreateFreeLoaderEntry(IniCache, IniSection,
-        L"ReactOS_old", L"\"ReactOS (old boot method)\"",
-        L"ReactOS", ArcPath,
-        L"");
-
-    /* ReactOS_Debug_old */
-    CreateFreeLoaderEntry(IniCache, IniSection,
-        L"ReactOS_Debug_old", L"\"ReactOS (Debug, old boot method)\"",
-        L"ReactOS", ArcPath,
-        L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS");
-
  /* Save the ini file */
  IniCacheSave(IniCache, IniPath);
  IniCacheDestroy(IniCache);
--- a/reactos/base/setup/usetup/muifonts.h
+++ b/reactos/base/setup/usetup/muifonts.h
@@ -59,18 +59,18 @@ MUI_SUBFONT HebrewFonts[] =
    { NULL, NULL }
 };

-MUI_SUBFONT JapaneseFonts[] =
+MUI_SUBFONT CJKFonts[] =
 {
    { L"Arial",           L"Liberation Sans" },
    { L"Courier",         L"FreeMono" },
    { L"Courier New",     L"FreeMono" },
    { L"Times New Roman", L"Liberation Serif" },
-    { L"Tahoma",          L"Systema" },
+    { L"Tahoma",          L"Droid Sans Fallback" },
    { L"MS Sans Serif",   L"Tahoma" },
-    { L"MS Shell Dlg",    L"Systema" },
-    { L"MS Shell Dlg 2",  L"Systema" },
-    { L"MS UI Gothic",    L"Systema" },
-    { L"MS UI Gothic 2",  L"Systema" },
+    { L"MS Shell Dlg",    L"Droid Sans Fallback" },
+    { L"MS Shell Dlg 2",  L"Droid Sans Fallback" },
+    { L"MS UI Gothic",    L"Droid Sans Fallback" },
+    { L"MS UI Gothic 2",  L"Droid Sans Fallback" },
    { L"Helv",            L"Tahoma" },
    { NULL, NULL }
 };
--- a/reactos/base/setup/usetup/muilanguages.h
+++ b/reactos/base/setup/usetup/muilanguages.h
@@ -165,11 +165,11 @@ const MUI_LANGUAGE LanguageList[] =
  {L"00000402", L"1251", L"866", L"10007", L"Bulgarian",                    L"359", bgBGPages, bgBGErrorEntries, bgBGStrings, CyrillicFonts, bgBGLayouts },
  {L"00000455", L"0",    L"1",   L"2",     L"Burmese",                      L"1",   enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,  myMMLayouts },
  {L"00000403", L"1252", L"850", L"10000", L"Catalan",                      L"1",   enUSPages, enUSErrorEntries, enUSStrings, LatinFonts,    caESLayouts },
-  {L"00000404", L"950",  L"950", L"10008", L"Chinese (Taiwan)",             L"886", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,  zhTWLayouts },
-  {L"00000804", L"936",  L"936", L"10008", L"Chinese (PRC)",                L"86",  enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,  zhCNLayouts },
-  {L"00000C04", L"950",  L"950", L"10008", L"Chinese (Hong Kong S.A.R.)",   L"1",   enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,  zhHKLayouts },
-  {L"00001004", L"936",  L"936", L"10008", L"Chinese (Singapore)",          L"1",   enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,  zhSGLayouts },
-  {L"00001404", L"950",  L"950", L"10002", L"Chinese (Macau S.A.R.)",       L"1",   enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,  zhMOLayouts },
+  {L"00000404", L"950",  L"950", L"10008", L"Chinese (Taiwan)",             L"886", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts,      zhTWLayouts },
+  {L"00000804", L"936",  L"936", L"10008", L"Chinese (PRC)",                L"86",  enUSPages, enUSErrorEntries, enUSStrings, CJKFonts,      zhCNLayouts },
+  {L"00000C04", L"950",  L"950", L"10008", L"Chinese (Hong Kong S.A.R.)",   L"1",   enUSPages, enUSErrorEntries, enUSStrings, CJKFonts,      zhHKLayouts },
+  {L"00001004", L"936",  L"936", L"10008", L"Chinese (Singapore)",          L"1",   enUSPages, enUSErrorEntries, enUSStrings, CJKFonts,      zhSGLayouts },
+  {L"00001404", L"950",  L"950", L"10002", L"Chinese (Macau S.A.R.)",       L"1",   enUSPages, enUSErrorEntries, enUSStrings, CJKFonts,      zhMOLayouts },
  {L"0000041A", L"1250", L"852", L"10029", L"Croatian",                     L"385", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts,    hrHRLayouts },
  {L"00000405", L"1250", L"852", L"10029", L"Czech",                        L"420", csCZPages, csCZErrorEntries, csCZStrings, LatinFonts,    csCZLayouts },
  {L"00000406", L"1252", L"850", L"10000", L"Danish",                       L"45",  enUSPages, enUSErrorEntries, enUSStrings, LatinFonts,    daDKLayouts },
@@ -216,11 +216,11 @@ const MUI_LANGUAGE LanguageList[] =
  {L"00000421", L"1252", L"850", L"10079", L"Indonesian",                   L"62",  enUSPages, enUSErrorEntries, enUSStrings, LatinFonts,    idIDLayouts },
  {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)",              L"39",  itITPages, itITErrorEntries, itITStrings, LatinFonts,    itITLayouts },
  {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)",        L"41",  itITPages, itITErrorEntries, itITStrings, LatinFonts,    itCHLayouts },
-  {L"00000411", L"932",  L"932", L"10001", L"Japanese",                     L"81",  jaJPPages, jaJPErrorEntries, jaJPStrings, JapaneseFonts, jaJPLayouts },
+  {L"00000411", L"932",  L"932", L"10001", L"Japanese",                     L"81",  jaJPPages, jaJPErrorEntries, jaJPStrings, CJKFonts,      jaJPLayouts },
  {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)",              L"91",  enUSPages, enUSErrorEntries, enUSStrings, LatinFonts,    knINLayouts },
  {L"0000043F", L"1251", L"866", L"10007", L"Kazakh",                       L"705", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kkKZLayouts },
  {L"00000457", L"0",    L"437", L"2",     L"Konkani",                      L"1",   enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,  kokINLayouts},
-  {L"00000412", L"949",  L"949", L"10003", L"Korean",                       L"1",   enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,  koKRLayouts },
+  {L"00000412", L"949",  L"949", L"10003", L"Korean",                       L"1",   enUSPages, enUSErrorEntries, enUSStrings, CJKFonts,      koKRLayouts },
  {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)",          L"1",   enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kyKGLayouts },
  {L"00000426", L"1257", L"775", L"10029", L"Latvian",                      L"371", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts,    lvLVLayouts },
  {L"00000427", L"1257", L"775", L"10029", L"Lithuanian",                   L"370", ltLTPages, ltLTErrorEntries, ltLTStrings, LatinFonts,    ltLTLayouts },
--- a/reactos/base/shell/explorer/res/logov.bmp
+++ b/reactos/base/shell/explorer/res/logov.bmp
--- a/reactos/boot/bootdata/bootcd.ini
+++ b/reactos/boot/bootdata/bootcd.ini
@@ -1,6 +1,6 @@
 [FREELOADER]
 DefaultOS=Setup
-Timeout=1
+Timeout=0

 [Display]
 TitleText=ReactOS Setup
@@ -21,10 +21,6 @@ SelectedColor=Gray

 [Operating Systems]
 Setup="Setup"
-Setup_old="Setup (old boot method)"

 [Setup]
-BootType=ReactOSSetup2
-
-[Setup_old]
 BootType=ReactOSSetup
--- a/reactos/boot/bootdata/hivedef_i386.inf
+++ b/reactos/boot/bootdata/hivedef_i386.inf
@@ -96,7 +96,7 @@ HKCU,"Control Panel\Desktop","ScreenSaveActive",2,"1"
 HKCU,"Control Panel\Desktop","ScreenSaverIsSecure",2,"1"
 HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600"
 HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000"
-HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,""
+HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Angelus_02_ROSWP.bmp"
 HKCU,"Control Panel\Desktop","FontSmoothing",2,"0"
 HKCU,"Control Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001
 HKCU,"Control Panel\Desktop","FontSmoothingType",0x00010003,0x00000001
--- a/reactos/boot/bootdata/livecd.ini
+++ b/reactos/boot/bootdata/livecd.ini
@@ -1,6 +1,6 @@
 [FREELOADER]
 DefaultOS=ReactOS
-Timeout=1
+Timeout=0

 [Display]
 TitleText=ReactOS Boot Manager
@@ -21,14 +21,8 @@ SelectedColor=Gray

 [Operating Systems]
 ReactOS="ReactOS"
-Reactos_old="ReactOS (old boot method)"

 [ReactOS]
-BootType=Windows2003
-SystemPath=LiveCD\reactos
-Options=/DEBUGPORT=COM1 /SOS /MININT
-
-[Reactos_old]
 BootType=ReactOS
 SystemPath=LiveCD\reactos
 Options=/DEBUGPORT=COM1 /SOS
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -667,6 +667,8 @@ subsystems\ntvdm\ntvdm.exe                          1
 subsystems\win32\win32k\win32k.sys                  1

 ; Optional/proprietary files
+modules\optional\DroidSansFallback.ttf              3  optional
+modules\optional\NOTICE_for_Droid_Font.txt          4  optional
 modules\optional\netkvm2k.inf                       6  optional
 modules\optional\netkvm2k.cat                       6  optional
 modules\optional\netkvm.sys                         2  optional
@@ -681,7 +683,6 @@ modules\optional\msvbvm60.dll                       1  optional
 modules\optional\msvcirt.dll                        1  optional
 modules\optional\msvcp71.dll                        1  optional
 modules\optional\msvcr71.dll                        1  optional
-modules\optional\Systema.ttf                        3  optional
 modules\optional\vmx_fb.dll                         1  optional
 modules\optional\vmx_mode.dll                       1  optional
 modules\optional\vmx_svga.inf                       6  optional
--- a/reactos/dll/win32/syssetup/install.c
+++ b/reactos/dll/win32/syssetup/install.c
@@ -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\\rapps.exe"), IDS_CMT_DOWNLOADER, TRUE);

    /* Create program startmenu shortcuts */
    CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE);
--- a/reactos/dll/win32/userenv/environment.c
+++ b/reactos/dll/win32/userenv/environment.c
@@ -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 */
--- a/reactos/drivers/storage/ide/uniata/id_ata.cpp
+++ b/reactos/drivers/storage/ide/uniata/id_ata.cpp
@@ -493,10 +493,10 @@ WaitOnBusy(
 {
    ULONG i;
    UCHAR Status;
-    for (i=0; i<200; i++) {
+    for (i=0; i<20000; i++) {
        GetStatus(chan, Status);
        if (Status & IDE_STATUS_BUSY) {
-            AtapiStallExecution(10);
+            AtapiStallExecution(150);
            continue;
        } else {
            break;
@@ -537,10 +537,10 @@ WaitOnBaseBusy(
 {
    ULONG i;
    UCHAR Status;
-    for (i=0; i<200; i++) {
+    for (i=0; i<20000; i++) {
        GetBaseStatus(chan, Status);
        if (Status & IDE_STATUS_BUSY) {
-            AtapiStallExecution(10);
+            AtapiStallExecution(150);
            continue;
        } else {
            break;
@@ -640,11 +640,11 @@ WaitForDrq(
    for (i=0; i<1000; i++) {
        GetStatus(chan, Status);
        if (Status & IDE_STATUS_BUSY) {
-            AtapiStallExecution(10);
+            AtapiStallExecution(100);
        } else if (Status & IDE_STATUS_DRQ) {
            break;
        } else {
-            AtapiStallExecution(10);
+            AtapiStallExecution(200);
        }
    }
    return Status;
@@ -661,11 +661,11 @@ WaitShortForDrq(
    for (i=0; i<2; i++) {
        GetStatus(chan, Status);
        if (Status & IDE_STATUS_BUSY) {
-            AtapiStallExecution(10);
+            AtapiStallExecution(100);
        } else if (Status & IDE_STATUS_DRQ) {
            break;
        } else {
-            AtapiStallExecution(10);
+            AtapiStallExecution(100);
        }
    }
    return Status;
@@ -679,7 +679,7 @@ AtapiSoftReset(
    )
 {
    //ULONG c = chan->lChannel;
-    ULONG i = 1000 * 1000;
+    ULONG i = 30 * 1000;
    UCHAR dma_status = 0;
    KdPrint2((PRINT_PREFIX "AtapiSoftReset:\n"));
    UCHAR statusByte2;
--- a/reactos/include/reactos/version.h
+++ b/reactos/include/reactos/version.h
@@ -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  11

 #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
--- a/reactos/media/inf/font.inf
+++ b/reactos/media/inf/font.inf
@@ -67,6 +67,19 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Sans"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"DejaVu Sans"

+[Font.CJK.Reg]
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"Liberation Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier",0x00000000,"FreeMono"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"FreeMono"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"Liberation Serif"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"Droid Sans Fallback"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"Tahoma"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"Droid Sans Fallback"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"Droid Sans Fallback"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS UI Gothic",0x00000000,"Droid Sans Fallback"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS UI Gothic 2",0x00000000,"Droid Sans Fallback"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"Tahoma"
+
 [Font.Unicode.Reg]
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"DejaVu Sans"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier",0x00000000,"DejaVu Sans Mono"
@@ -234,38 +247,38 @@ AddReg = Font.Unicode.Reg
 ; cp932/cp932 Japanese
 [Font.CP932.96]
 AddReg = Font.Reg.96
-AddReg = Font.Unicode.Reg
+AddReg = Font.CJK.Reg

 [Font.CP932.120]
 AddReg = Font.Reg.120
-AddReg = Font.Unicode.Reg
+AddReg = Font.CJK.Reg

 ; cp936/cp936 Simplified Chinese
 [Font.CP936.96]
 AddReg = Font.Reg.96
-AddReg = Font.Unicode.Reg
+AddReg = Font.CJK.Reg

 [Font.CP936.120]
 AddReg = Font.Reg.120
-AddReg = Font.Unicode.Reg
+AddReg = Font.CJK.Reg

 ; cp949/cp949 Korean
 [Font.CP949.96]
 AddReg = Font.Reg.96
-AddReg = Font.Unicode.Reg
+AddReg = Font.CJK.Reg

 [Font.CP949.120]
 AddReg = Font.Reg.120
-AddReg = Font.Unicode.Reg
+AddReg = Font.CJK.Reg

 ; cp950/cp950 Traditional Chinese
 [Font.CP950.96]
 AddReg = Font.Reg.96
-AddReg = Font.Unicode.Reg
+AddReg = Font.CJK.Reg

 [Font.CP950.120]
 AddReg = Font.Reg.120
-AddReg = Font.Unicode.Reg
+AddReg = Font.CJK.Reg

 [Font Sizes]
 Small Fonts = 96
--- a/reactos/ntoskrnl/cc/fs.c
+++ b/reactos/ntoskrnl/cc/fs.c
@@ -166,7 +166,8 @@ CcSetFileSizes (IN PFILE_OBJECT FileObject,
     {
 	current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry);
 	current_entry = current_entry->Flink;
-	if (current->FileOffset > FileSizes->AllocationSize.QuadPart)
+	if (current->FileOffset > FileSizes->AllocationSize.QuadPart ||
+	    (current->FileOffset == 0 && FileSizes->AllocationSize.QuadPart == 0))
 	{
           if (current->ReferenceCount == 0 || (current->ReferenceCount == 1 && current->Dirty))
 	   {
--- a/reactos/ntoskrnl/inbv/logo/5.bmp
+++ b/reactos/ntoskrnl/inbv/logo/5.bmp
--- a/reactos/ntoskrnl/inbv/logo/5.psd
+++ b/reactos/ntoskrnl/inbv/logo/5.psd
--- a/reactos/ntoskrnl/se/semgr.c
+++ b/reactos/ntoskrnl/se/semgr.c
@@ -608,10 +608,12 @@ SepAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
    }
    else
    {
-        DPRINT1("Denying access for caller: granted 0x%lx, desired 0x%lx (generic mapping %p)\n",
+        DPRINT1("HACK: Should deny access for caller: granted 0x%lx, desired 0x%lx (generic mapping %p).\n",
                *GrantedAccess, DesiredAccess, GenericMapping);
-        *AccessStatus = STATUS_ACCESS_DENIED;
-        return FALSE;
+        //*AccessStatus = STATUS_ACCESS_DENIED;
+        //return FALSE;
+        *AccessStatus = STATUS_SUCCESS;
+        return TRUE;
    }
 }
Author	SHA1	Message	Date
Colin Finck	ed469a00af	Merge r44552 svn path=/branches/ros-branch-0_3_11/; revision=44553	2009-12-12 17:15:19 +00:00
Colin Finck	f2c93ea2b8	Here comes ReactOS "FOR WORKGROUPS" 0.3.11! :-) svn path=/branches/ros-branch-0_3_11/; revision=44531	2009-12-10 23:19:12 +00:00
Colin Finck	1b51adc031	Revert to the old boot method for the release on request of Aleksey svn path=/branches/ros-branch-0_3_11/; revision=44367	2009-12-02 20:02:07 +00:00
Aleksey Bragin	5911400ccc	- Merge 44348 and 44349 to 0.3.11 branch. svn path=/branches/ros-branch-0_3_11/; revision=44350	2009-12-01 21:36:23 +00:00
Aleksey Bragin	68d04648a4	- Merge 44301 (network revert). svn path=/branches/ros-branch-0_3_11/; revision=44336	2009-11-30 21:52:07 +00:00
Colin Finck	0b321cfcbf	Revert 43921 on demand of Aleksey svn path=/branches/ros-branch-0_3_11/; revision=44316	2009-11-28 22:54:47 +00:00
Colin Finck	0127705606	Dmitry Gorbachev: - Replace our Japanese "Systema" font added for releases by "Droid Sans Fallback" from the Android project. This font is licensed under Apache 2.0 license (notice included) and also offers us Chinese and Korean characters. You have to copy "DroidSansFallback.ttf" from http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts to "modules/optional". svn path=/branches/ros-branch-0_3_11/; revision=44305	2009-11-28 15:04:15 +00:00
Colin Finck	79c56c5d7b	Hack: Add the APPDATA variable to the environment created by userenv as it was done for previous releases. svn path=/branches/ros-branch-0_3_11/; revision=44300	2009-11-28 00:29:52 +00:00
Colin Finck	9123974a75	Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases svn path=/branches/ros-branch-0_3_11/; revision=44299	2009-11-28 00:17:11 +00:00
Colin Finck	583c59f82e	- Change the version to 0.3.11 - Set "Angelus_02_ROSWP.bmp" as the default wallpaper - Add a shortcut to RApps to the Desktop svn path=/branches/ros-branch-0_3_11/; revision=44298	2009-11-28 00:14:56 +00:00