--- trunk/reactos/bootdata/hivecls.inf 2006-01-05 06:24:07 UTC (rev 20569)
+++ trunk/reactos/bootdata/hivecls.inf 2006-01-05 09:22:09 UTC (rev 20570)
@@ -62,6 +62,13 @@
HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\System32\msiexec /f %1"
HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\System32\msiexec /x %1"
+; set MIME type for .html and .htm because Tiny webserver needs it
+HKCR,".htm","",0x00000000,"html"
+HKCR,".htm","Content Type",0x00000000,"text/html"
+
+HKCR,".html","",0x00000000,"html"
+HKCR,".html","Content Type",0x00000000,"text/html"
+
HKCR,"CLSID",,0x00000012
; For Shell32.dll
--- trunk/reactos/lib/advapi32/reg/reg.c 2006-01-05 06:24:07 UTC (rev 20569)
+++ trunk/reactos/lib/advapi32/reg/reg.c 2006-01-05 09:22:09 UTC (rev 20570)
@@ -2507,7 +2507,7 @@
TRACE("MapDefaultKey() failed (Status %lx)\n", Status);
return RtlNtStatusToDosError (Status);
}
-#ifndef __REACTOS__
+#if 0
Status = NtQuerySecurityObject(KeyHandle,
SecurityInformation,
pSecurityDescriptor,
@@ -3185,7 +3185,7 @@
{
*lpcbMaxValueLen = FullInfo->MaxValueDataLen;
}
-#ifndef __REACTOS__
+#if 0
if (lpcbSecurityDescriptor != NULL)
{
Status = NtQuerySecurityObject(KeyHandle,