x64 compat (amdf#6)

* ignore

* small header

* remove crashes

* fix launch process x64

* hint

* debug hw tree

* workflow

Author: amdf

.gitignore

@@ -4,6 +4,7 @@ objfre_wxp_x86
 objfre_win7_amd64
 *.err
 *.wrn
+*.cmd
 
 
 # Matti

file.c

@@ -82,12 +82,11 @@ NTSTATUS RtlCliSetCurrentDirectory(PCHAR Directory)
         return STATUS_SUCCESS;
     }
 
-    GetFullPath(Directory, buf, TRUE);
-    RtlInitUnicodeString(&us, buf);
-    RtlSetCurrentDirectory_U(&us);
-    RtlFreeUnicodeString(&us);
+  GetFullPath(Directory, buf, TRUE);
+  RtlInitUnicodeString(&us, buf);
+  RtlSetCurrentDirectory_U(&us);
 
-    return STATUS_SUCCESS;
+  return STATUS_SUCCESS;
 }
 
 /*++

hardware.c

@@ -234,10 +234,15 @@ RtlCliListHardwareTree(VOID)
     // Get the root node's child
     //
     Status = RtlCliGetChildOrSibling(ROOT_NAME, Buffer, PNP_GET_CHILD_DEVICE);
-
+    if (!NT_SUCCESS(Status)) {
+        RtlCliDisplayString("NtPlugPlayControl get root node failed.\n");
+    }
     //
     // Now get the entire tree
     //
     Status = RtlCliListSubNodes(ROOT_NAME, NULL, Buffer);
+    if (!NT_SUCCESS(Status)) {
+        RtlCliDisplayString("NtPlugPlayControl get child nodes failed.\n");
+    }
     return Status;
 }

main.c

@@ -35,13 +35,13 @@ HANDLE hKey;
 
 #define __APP_VER__ "0.13.2"
 #if defined(_M_AMD64)
-#define __NCLI_VER__ __APP_VER__ " (x64)"
+#define __NCLI_VER__ __APP_VER__ " x64"
 #elif defined(_M_IX86)
-#define __NCLI_VER__ __APP_VER__ " (x86)"
+#define __NCLI_VER__ __APP_VER__ " x86"
 #elif defined(_M_ARM)
-#define __NCLI_VER__ __APP_VER__ " (ARM)"
+#define __NCLI_VER__ __APP_VER__ " ARM"
 #elif defined(_M_ARM64)
-#define __NCLI_VER__ __APP_VER__ " (ARM64)"
+#define __NCLI_VER__ __APP_VER__ " ARM64"
 #endif
 
 WCHAR *helpstr[] =
@@ -337,36 +337,33 @@ VOID RtlClipProcessMessage(PCHAR Command)
         //
 
         WCHAR filename[MAX_PATH];
-        HANDLE hProcess;
+        HANDLE hProcess = NULL;
 
         GetFullPath(IN xargv[1], OUT filename, FALSE);
 
         if (FileExists(filename))
         {
            ANSI_STRING as;
            UNICODE_STRING us;
+          RtlInitAnsiString(&as, Command);
+          RtlAnsiStringToUnicodeString(&us, &as, TRUE);
+                             
+          NtClose(hKeyboard);
 
            RtlInitAnsiString(&as, Command);
            RtlAnsiStringToUnicodeString(&us, &as, TRUE);
 
-           NtClose(hKeyboard);
-           //RtlCliDisplayString("Keyboard is closed\n");
+          RtlFreeUnicodeString(&us);
 
-           CreateNativeProcess(filename, us.Buffer, &hProcess);
-
-           RtlFreeAnsiString(&as);
-           RtlFreeUnicodeString(&us);
-
-           //RtlCliDisplayString("Waiting for process terminations\n");
-           NtWaitForSingleObject(hProcess, FALSE, NULL);
-
-           RtlCliOpenInputDevice(&hKeyboard, KeyboardType);
-           //RtlCliDisplayString("Keyboard restored\n");
-        }
-        else
+          NtWaitForSingleObject(hProcess, FALSE, NULL); // Matti: how can this possibly ever do anything but return STATUS_INVALID_HANDLE? hProcess isn't initialized
+                    
+          RtlCliOpenInputDevice(&hKeyboard, KeyboardType);
+        } else
         {
-           RtlCliDisplayString("%s not recognized\n", Command);
-        }
+          RtlCliDisplayString("%s not recognized\n"
+              "Add .exe if you want to lauch executable file."
+              "\nType \"help\" for the list of commands.\n", Command);
+        }        
     }
 }
 
@@ -442,10 +439,7 @@ NTSTATUS NTAPI NtProcessStartup(PPEB Context)
 
     //
     // Show banner
-    RtlCliDisplayString("Native Shell [Version " __NCLI_VER__ "] (" __DATE__ " " __TIME__ ")\n");
-    RtlCliDisplayString("(C) Copyright 2010-2025 amdf, 2021-2025 Matti\n");
-    RtlCliDisplayString("(C) Copyright 2006 TinyKRNL Project\n\n");
-    RtlCliDisplayString("Type \"help\".\n\n");
+    RtlCliDisplayString("Native Shell v" __NCLI_VER__ " (" __DATE__ " " __TIME__ ")\n\n");
 
     while (!hKeyboard || !NT_SUCCESS(Status))
     {

ndk/mmtypes.h

@@ -349,34 +349,36 @@ typedef struct _SECTION_IMAGE_INFORMATION
         };
         ULONG SubSystemVersion;
     };
-    ULONG GpValue;
+    union
+    {
+        struct
+        {
+            USHORT MajorOperatingSystemVersion;
+            USHORT MinorOperatingSystemVersion;
+        };
+        ULONG OperatingSystemVersion;
+    };
     USHORT ImageCharacteristics;
     USHORT DllCharacteristics;
     USHORT Machine;
     BOOLEAN ImageContainsCode;
-#if (NTDDI_VERSION >= NTDDI_LONGHORN)
     union
     {
+        UCHAR ImageFlags;
         struct
         {
-            UCHAR ComPlusNativeReady:1;
-            UCHAR ComPlusILOnly:1;
-            UCHAR ImageDynamicallyRelocated:1;
-            UCHAR ImageMappedFlat:1;
-            UCHAR Reserved:4;
+            UCHAR ComPlusNativeReady : 1;
+            UCHAR ComPlusILOnly : 1;
+            UCHAR ImageDynamicallyRelocated : 1;
+            UCHAR ImageMappedFlat : 1;
+            UCHAR BaseBelow4gb : 1;
+            UCHAR ComPlusPrefer32bit : 1;
+            UCHAR Reserved : 2;
         };
-        UCHAR ImageFlags;
     };
-#else
-    BOOLEAN Spare1;
-#endif
     ULONG LoaderFlags;
     ULONG ImageFileSize;
-#if (NTDDI_VERSION >= NTDDI_LONGHORN)
     ULONG CheckSum;
-#else
-    ULONG Reserved[1];
-#endif
 } SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION;
 
 #ifndef NTOS_MODE_USER

ntfile.c

@@ -312,9 +312,8 @@ BOOLEAN NtFileDeleteFile(PWSTR filename)
 
     status = NtDeleteFile(&oa);
 
-    RtlFreeUnicodeString(&us);
 
-    return NT_SUCCESS(status);
+  return NT_SUCCESS(status);
 }
 
 BOOLEAN NtFileCreateDirectory(PWSTR dirname)
@@ -346,12 +345,11 @@ BOOLEAN NtFileCreateDirectory(PWSTR dirname)
         0
     );
 
-    if (NT_SUCCESS(status))
-    {
-        NtClose(hFile);
-        RtlFreeUnicodeString(&us);
-        return TRUE;
-    }
+  if (NT_SUCCESS(status))
+  {
+    NtClose(hFile);
+    return TRUE;
+  }
 
     /* if it already exists then return success */
     if (status == STATUS_OBJECT_NAME_COLLISION)
@@ -360,8 +358,7 @@ BOOLEAN NtFileCreateDirectory(PWSTR dirname)
         return TRUE;
     }
 
-    RtlFreeUnicodeString(&us);
-    return FALSE;
+  return FALSE;
 }
 
 /*
@@ -446,10 +443,14 @@ BOOLEAN NtFileMoveFile(IN PWSTR lpExistingFileName, IN PWSTR lpNewFileName, BOOL
       FileRenameInfo,
       sizeof(FILE_RENAME_INFORMATION)+FileNameSize,
       FileRenameInformation );
+    if (!NT_SUCCESS(Status))
+    {
+        RtlCliDisplayString("NtSetInformationFile(FileRenameInformation) failed (Status %lx)\n", Status);
+    }
 
     RtlFreeHeap(RtlGetProcessHeap(), 0, FileRenameInfo);
 
     NtClose(FileHandle);
 
-    return TRUE;
+    return NT_SUCCESS(Status);
 }

precomp.h

@@ -230,7 +230,7 @@ NTSTATUS RegReadValue(HANDLE hKey, PWCHAR key_name, OUT PULONG type, OUT PVOID d
 
 // Misc
 
-void FillUnicodeStringWithAnsi(OUT PUNICODE_STRING us, IN PCHAR as);
+// void FillUnicodeStringWithAnsi(OUT PUNICODE_STRING us, IN PCHAR as);
 
 //===========================================================
 //

process.c

@@ -35,24 +35,25 @@ NTSTATUS CreateNativeProcess(IN PWSTR file_name, IN PWSTR cmd_line, OUT PHANDLE
 
     status = RtlCreateProcessParameters(&processparameters, &imgname, &dllpath, &dllpath, &cmdline, Env, 0, 0, 0, 0);
 
-    if (processinformation.ImageInformation.SubSystemType != IMAGE_SUBSYSTEM_NATIVE)
-    {
-      RtlCliDisplayString("\nThe %S application cannot be run in native mode.\n", file_name);
-      return STATUS_UNSUCCESSFUL;
-    }
-
-    if (!NT_SUCCESS(status))
-    {
-      RtlCliDisplayString("RtlCreateProcessParameters failed\n");
-      return status;
-    }
-
-    status = NtResumeThread(processinformation.ThreadHandle, NULL);
-    if (!NT_SUCCESS(status))
-    {
-        RtlCliDisplayString("NtResumeThread failed\n");
-        return status;
-    }
+ if (!NT_SUCCESS(status))
+ {
+   RtlCliDisplayString("RtlCreateProcessParameters failed\n");
+   return status;
+ }
+ 
+ if (processinformation.ImageInformation.SubSystemType != IMAGE_SUBSYSTEM_NATIVE)
+ {
+   RtlCliDisplayString("\nThe %S application cannot be run in native mode.\n"
+   "Subsystem: %d\n"
+   "Subsystem version: %d\n"
+   "Machine: %d\n",
+        file_name, 
+        processinformation.ImageInformation.SubSystemType,
+        processinformation.ImageInformation.SubSystemVersion,
+        processinformation.ImageInformation.Machine
+    );
+   return STATUS_UNSUCCESSFUL;
+ }
 
     Printf("Launching Process: %ls, DllPath = %ls, CmdLine = %ls\n", imgname.Buffer, dllpath.Buffer, cmdline.Buffer);
 

shell.c

@@ -68,7 +68,6 @@ BOOL GetFullPath(IN PSTR filename, OUT PWSTR out, IN BOOL add_slash)
         }
 
         RtlFreeUnicodeString(&us);
-        RtlFreeAnsiString(&as);
     }
     else
     {
@@ -90,10 +89,10 @@ BOOL GetFullPath(IN PSTR filename, OUT PWSTR out, IN BOOL add_slash)
         }
 
         RtlFreeUnicodeString(&us);
-        RtlFreeAnsiString(&as);
     }
 
-    return TRUE;
+    RtlFreeUnicodeString(&us);
+  return TRUE;
 }
 
 // Argument processing functions:
@@ -217,7 +216,6 @@ BOOL FolderExists(PWSTR foldername)
 
     RtlInitUnicodeString(&u_filename, foldername);
     RtlDosPathNameToNtPathName_U(u_filename.Buffer, &nt_filename, NULL, NULL);
-    RtlFreeUnicodeString(&u_filename);
 
     InitializeObjectAttributes(&oa, &nt_filename, OBJ_CASE_INSENSITIVE, 0, 0);
     st = NtQueryAttributesFile(&oa, &fbi);
@@ -256,8 +254,6 @@ BOOL FileExists(PWSTR filename)
 
     st = NtQueryAttributesFile(&oa, &fbi);
 
-    RtlFreeUnicodeString(&nt_filename);
-
     return NT_SUCCESS(st);
 }
 
@@ -357,17 +353,18 @@ ULONG GetStringLength(WCHAR* pszInput)
 }
 
 // Note: This function allocates memory for "us" variable.
-VOID FillUnicodeStringWithAnsi(OUT PUNICODE_STRING us, IN PCHAR as)
-{
-    ANSI_STRING ansi_string;
+// void FillUnicodeStringWithAnsi(OUT PUNICODE_STRING us, IN PCHAR as)
+// {  
+//   ANSI_STRING ansi_string;
 
-    RtlInitAnsiString(&ansi_string, as);
+//   RtlInitAnsiString(&ansi_string, as);
 
-    if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(us, &ansi_string, TRUE)))
-    {
-        RtlCliDisplayString("RtlAnsiStringToUnicodeString() failed\n");
-        return;
-    }
+//   if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(us, &ansi_string, TRUE)))
+//   {
+//     RtlCliDisplayString("RtlAnsiStringToUnicodeString() failed\n");
+//     return;
+//   }
 
-    RtlFreeAnsiString(&ansi_string);
-}
+//   RtlFreeAnsiString(&ansi_string);
+//   return;
+// }

sysinfo.c

@@ -468,13 +468,19 @@ RtlCliDumpSysInfo(VOID)
     //
     // Display FileSystem Cache Information
     //
-    RtlCliDisplayString("[CACHE] Size: %ldKB. Peak: %ldKB. "
-                        "Min WS: %ldKB. Max WS: %ldKB\n",
-                        (ULONG)CacheInfo.CurrentSize / 1024,
-                        (ULONG)CacheInfo.PeakSize / 1024,
-                        (ULONG)CacheInfo.MinimumWorkingSet,
-                        (ULONG)CacheInfo.MaximumWorkingSet);
-
+    Status = NtQuerySystemInformation(SystemFileCacheInformation,
+                                      &CacheInfo,
+                                      sizeof(CacheInfo),
+                                      NULL);
+    if (NT_SUCCESS(Status)) {
+        RtlCliDisplayString("[CACHE] Size: %lluKB. Peak: %lluKB. "
+                            "Min WS: %lluKB. Max WS: %lluKB\n",
+                            CacheInfo.CurrentSize / 1024,
+                            CacheInfo.PeakSize / 1024,
+                            CacheInfo.MinimumWorkingSet,
+                            CacheInfo.MaximumWorkingSet);
+    }
+    
     //
     // Return success
     //