Merge 12735:15568 from xmlbuildsystem branch
authorCasper Hornstrup <chorns@users.sourceforge.net>
Sat, 28 May 2005 15:18:30 +0000 (15:18 +0000)
committerCasper Hornstrup <chorns@users.sourceforge.net>
Sat, 28 May 2005 15:18:30 +0000 (15:18 +0000)
svn path=/trunk/; revision=15583

29 files changed:
1  2  3 
reactos/apps/utils/net/ftp/makefile
reactos/drivers/bus/isapnp/isapnp.xml
reactos/drivers/bus/pci/pci.xml
reactos/drivers/bus/serenum/makefile
reactos/drivers/dd/beep/beep.xml
reactos/drivers/input/i8042prt/makefile
reactos/drivers/input/kbdclass/makefile
reactos/drivers/input/mouclass/mouclass.xml
reactos/drivers/input/sermouse/sermouse.xml
reactos/drivers/net/dd/ne2000/ne2000.xml
reactos/drivers/net/npf/npf.xml
reactos/include/funcs.h
reactos/lib/crt/stdio/sprintf.c
reactos/lib/crt/stdio/swprintf.c
reactos/lib/kernel32/include/kernel32.h
reactos/lib/kernel32/kernel32.def
reactos/lib/msgina/makefile
reactos/lib/pseh/i386/setjmp.asm
reactos/lib/setupapi/makefile
reactos/lib/smlib/makefile
reactos/ntoskrnl/ke/i386/vdm.c
reactos/services/umpnpmgr/makefile
reactos/services/umpnpmgr/umpnpmgr.c
reactos/subsys/system/regedit/security.c
reactos/subsys/system/regedit/security.h
reactos/subsys/win32k/main/dllmain.c
reactos/tools/buildno/buildno.cpp
reactos/tools/cabman/cabinet.cxx
reactos/tools/unicode/Makefile

index ab481c2,0000000,0000000..cf13b01
mode 100644,000000,000000..100644
--- /dev/null
--- /dev/null
@@@@ -1,29 -1,0 -1,0 +1,5 @@@@
-  PATH_TO_TOP = ../../../..
+++# This file is automatically generated.
 ++
-  TARGET_TYPE = program
-  
-  TARGET_APPTYPE = console
-  
-  TARGET_NAME = ftp
-  
-  TARGET_INSTALLDIR = system32
-  
-  TARGET_CFLAGS = -D__USE_W32API
-  
-  TARGET_SDKLIBS = ws2_32.a iphlpapi.a
-  # ntdll.a
-  
-  TARGET_OBJECTS = \
-       cmds.o \
-       cmdtab.o \
-       domacro.o \
-       fake.o \
-       ftp.o \
-       main.o \
-       ruserpass.o
-  
-  TARGET_GCCLIBS = 
-  
-  include $(PATH_TO_TOP)/rules.mak
-  
-  include $(TOOLS_PATH)/helper.mk
+++TOP = ..\..\..\..
+++DEFAULT = ftp
+++include $(TOP)/proxy.mak
index 0000000,3edce41,3edce41..44defa4
mode 000000,100644,100644..100644
--- /dev/null
@@@@ -1,0 -1,7 -1,7 +1,8 @@@@
+  <module name="isapnp" type="kernelmodedriver" installbase="system32/drivers" installname="isapnp.sys">\r
+       <include base="isapnp">.</include>\r
+++     <define name="__USE_W32API" />\r
+       <library>ntoskrnl</library>\r
+       <library>hal</library>\r
+       <file>isapnp.c</file>\r
+       <file>isapnp.rc</file>\r
+  </module>\r
index 0000000,4ae5b95,4ae5b95..c3c8cce
mode 000000,100644,100644..100644
--- /dev/null
@@@@ -1,0 -1,9 -1,9 +1,10 @@@@
+  <module name="pci" type="kernelmodedriver" installbase="system32/drivers" installname="pci.sys" warnings="true">\r
+       <include base="pci">.</include>\r
+++     <define name="__USE_W32API" />\r
+       <library>ntoskrnl</library>\r
+       <library>hal</library>\r
+       <file>fdo.c</file>\r
+       <file>pci.c</file>\r
+       <file>pdo.c</file>\r
+       <file>pci.rc</file>\r
+  </module>\r
index 8c3c924,0000000,0000000..321b09b
mode 100644,000000,000000..100644
--- /dev/null
--- /dev/null
@@@@ -1,20 -1,0 -1,0 +1,5 @@@@
-  # $Id: makefile 12852 2005-01-06 13:58:04Z mf $
+++# This file is automatically generated.
 ++
-  PATH_TO_TOP = ../../..
-  
-  TARGET_TYPE = driver
-  
-  TARGET_NAME = serenum
-  
-  TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
-  
-  TARGET_OBJECTS = \
-       detect.o      \
-       fdo.o         \
-       misc.o        \
-       pdo.o         \
-       serenum.o
-  
-  include $(PATH_TO_TOP)/rules.mak
-  
-  include $(TOOLS_PATH)/helper.mk
+++TOP = ..\..\..
+++DEFAULT = serenum
+++include $(TOP)/proxy.mak
index 0000000,c6b503f,c6b503f..aa0d0fe
mode 000000,100644,100644..100644
--- /dev/null
@@@@ -1,0 -1,6 -1,6 +1,7 @@@@
+  <module name="beep" type="kernelmodedriver" installbase="system32/drivers" installname="beep.sys">\r
+++     <define name="__USE_W32API" />\r
+       <library>ntoskrnl</library>\r
+       <library>hal</library>\r
+       <file>beep.c</file>\r
+       <file>beep.rc</file>\r
+  </module>\r
index e9a809c,0000000,0000000..e2f3d64
mode 100644,000000,000000..100644
--- /dev/null
--- /dev/null
@@@@ -1,17 -1,0 -1,0 +1,5 @@@@
-  # $Id$
+++# This file is automatically generated.
 ++
-  PATH_TO_TOP = ../../..
-  
-  TARGET_BOOTSTRAP = yes
-  
-  TARGET_TYPE = driver
-  
-  TARGET_NAME = i8042prt
-  
-  TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
-  
-  TARGET_OBJECTS = $(TARGET_NAME).o keyboard.o registry.o mouse.o ps2pp.o
-  
-  include $(PATH_TO_TOP)/rules.mak
-  
-  include $(TOOLS_PATH)/helper.mk
+++TOP = ..\..\..
+++DEFAULT = i8042prt
+++include $(TOP)/proxy.mak
index d87c4e0,0000000,0000000..4886fc6
mode 100644,000000,000000..100644
--- /dev/null
--- /dev/null
@@@@ -1,17 -1,0 -1,0 +1,5 @@@@
-  # $Id$
+++# This file is automatically generated.
 ++
-  PATH_TO_TOP = ../../..
-  
-  TARGET_BOOTSTRAP = yes
-  
-  TARGET_TYPE = driver
-  
-  TARGET_NAME = kbdclass
-  
-  TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
-  
-  TARGET_OBJECTS = $(TARGET_NAME).o
-  
-  include $(PATH_TO_TOP)/rules.mak
-  
-  include $(TOOLS_PATH)/helper.mk
+++TOP = ..\..\..
+++DEFAULT = kbdclass
+++include $(TOP)/proxy.mak
index 0000000,134b377,134b377..71418e4
mode 000000,100644,100644..100644
--- /dev/null
@@@@ -1,0 -1,7 -1,7 +1,8 @@@@
+  <module name="mouclass" type="kernelmodedriver" installbase="system32/drivers" installname="mouclass.sys">\r
+       <include base="mouclass">.</include>\r
+++     <define name="__USE_W32API" />\r
+       <library>ntoskrnl</library>\r
+       <library>hal</library>\r
+       <file>mouclass.c</file>\r
+       <file>mouclass.rc</file>\r
+  </module>\r
index 0000000,1e65098,1e65098..648dade
mode 000000,100644,100644..100644
--- /dev/null
@@@@ -1,0 -1,7 -1,7 +1,8 @@@@
+  <module name="sermouse" type="kernelmodedriver" installbase="system32/drivers" installname="sermouse.sys">\r
+       <include base="sermouse">.</include>\r
+++     <define name="__USE_W32API" />\r
+       <library>ntoskrnl</library>\r
+       <library>hal</library>\r
+       <file>sermouse.c</file>\r
+       <file>sermouse.rc</file>\r
+  </module>\r
index 0000000,6c76190,6c76190..376aae4
mode 000000,100644,100644..100644
--- /dev/null
@@@@ -1,0 -1,11 -1,11 +1,12 @@@@
+  <module name="ne2000" type="kernelmodedriver" installbase="system32/drivers" installname="ne2000.sys">\r
+       <include base="ne2000">include</include>\r
+++     <define name="__USE_W32API" />\r
+       <library>ndis</library>\r
+       <library>ntoskrnl</library>\r
+       <library>hal</library>\r
+       <directory name="ne2000">\r
+               <file>8390.c</file>\r
+               <file>main.c</file>\r
+       </directory>\r
+       <file>ne2000.rc</file>\r
+  </module>\r
index 0000000,f67793f,f67793f..0a5119f
mode 000000,100644,100644..100644
--- /dev/null
@@@@ -1,0 -1,28 -1,28 +1,30 @@@@
+  <module name="npf" type="kernelmodedriver" installbase="system32/drivers" installname="npf.sys">\r
+       <include base="npf">include</include>\r
+       <include base="ntoskrnl">include</include>\r
+++     <define name="__USE_W32API" />\r
+++     <define name="_TIMEVAL_DEFINED" />\r
+       <define name="WIN_NT_DRIVER" />\r
+       <define name="KQPC_TS" />\r
+       <define name="USE_KLOCKS" />\r
+       <define name="BINARY_COMPATIBLE" />\r
+       <library>ndis</library>\r
+       <library>ntoskrnl</library>\r
+       <library>hal</library>\r
+       <file>bucket_lookup.c</file>\r
+       <file>count_packets.c</file>\r
+       <file>dump.c</file>\r
+       <file>functions.c</file>\r
+       <file>jitter.c</file>\r
+       <file>memory_t.c</file>\r
+       <file>normal_lookup.c</file>\r
+       <file>openclos.c</file>\r
+       <file>packet.c</file>\r
+       <file>read.c</file>\r
+       <file>tcp_session.c</file>\r
+       <file>time_calls.c</file>\r
+       <file>tme.c</file>\r
+       <file>win_bpf_filter.c</file>\r
+       <file>win_bpf_filter_init.c</file>\r
+       <file>write.c</file>\r
+       <file>npf.rc</file>\r
+  </module>\r
Simple merge
@@@@ -28,11 -28,8 -28,8 +28,11 @@@@ Cambridge, MA 02139, USA.  *
   #undef sprintf
   #undef wsprintf
   
 ++/*
 ++ * @implemented
 ++ */
   int
-  _stprintf(_TCHAR *str, const _TCHAR *fmt, ...)
+  crt_sprintf(_TCHAR *str, const _TCHAR *fmt, ...)
   {
     va_list arg;
     int done;
@@@@ -1,4 -1,62 -1,62 +1,60 @@@@
+  /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */\r
+  \r
+  /* Copyright (C) 1991, 1995 Free Software Foundation, Inc.\r
+  This file is part of the GNU C Library.\r
+  \r
+  The GNU C Library is free software; you can redistribute it and/or\r
+  modify it under the terms of the GNU Library General Public License as\r
+  published by the Free Software Foundation; either version 2 of the\r
+  License, or (at your option) any later version.\r
+  \r
+  The GNU C Library is distributed in the hope that it will be useful,\r
+  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
+  Library General Public License for more details.\r
+  \r
+  You should have received a copy of the GNU Library General Public\r
+  License along with the GNU C Library; see the file COPYING.LIB.  If\r
+  not, write to the Free Software Foundation, Inc., 675 Mass Ave,\r
+  Cambridge, MA 02139, USA.  */\r
+  \r
   #define UNICODE\r
   #define _UNICODE\r
+  #include <stdarg.h>\r
+  #include <stdio.h>\r
+  #include <wchar.h>\r
+  #include <limits.h>\r
+  #include <internal/file.h>\r
+  #include <tchar.h>\r
+  \r
+  #undef sprintf\r
+  #undef wsprintf\r
+  \r
+  int\r
+  crt_swprintf(_TCHAR *str, const _TCHAR *fmt, ...)\r
+  {\r
+    va_list arg;\r
+    int done;\r
+  \r
+    va_start (arg, fmt);\r
+    done = _vstprintf (str, fmt, arg);\r
+    va_end (arg);\r
+    return done;\r
+  }\r
+  \r
+  \r
+  /* Write formatted output into S, according to the format\r
+     string FORMAT, writing no more than MAXLEN characters.  */\r
+  /* VARARGS3 */\r
+  int\r
+  crt__snwprintf (_TCHAR *s, size_t maxlen,const _TCHAR *format, ...)\r
+  {\r
+    va_list arg;\r
+    int done;\r
+  \r
+    va_start (arg, format);\r
+    done = _vsntprintf(s, maxlen, format, arg);\r
+    va_end (arg);\r
   \r
-  #include "sprintf.c"\r
+    return done;\r
+  }\r
 --\r
 --\r
@@@@ -60,7 -60,7 -60,7 +60,6 @@@@ HANDLE STDCALL OpenConsoleW (LPWSTR wsN
   
   PTEB GetTeb(VOID);
   
---
   PWCHAR FilenameA2W(LPCSTR NameA, BOOL alloc);
   
   DWORD FilenameW2A_FitOrFail(LPSTR  DestA, INT destLen, LPCWSTR SourceW, INT sourceLen);
Simple merge
index 0477de1,0000000,0000000..0f0ed0a
mode 100644,000000,000000..100644
--- /dev/null
--- /dev/null
@@@@ -1,46 -1,0 -1,0 +1,5 @@@@
-  # $Id$
+++# This file is automatically generated.
 ++
-  PATH_TO_TOP = ../..
-  
-  TARGET_TYPE = dynlink
-  
-  TARGET_NAME = msgina
-  
-  TARGET_INSTALLDIR = system32
-  
-  TARGET_BASE = $(TARGET_BASE_LIB_MSGINA)
-  
-  TARGET_CFLAGS = \
-   -I./include \
-   -DUNICODE \
-   -D_UNICODE \
-   -D__USE_W32API \
-   -D__REACTOS__ \
-   -Wall \
-   -Werror \
-   -fno-builtin
-  
-  TARGET_LFLAGS = -nostartfiles -nostdlib
-  
-  TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a user32.a
-  
-  TARGET_GCCLIBS = gcc
-  
-  TARGET_PCH = 
-  
-  TARGET_CLEAN = 
-  
-  TARGET_OBJECTS = msgina.o stubs.o
-  
-  DEP_OBJECTS = $(TARGET_OBJECTS)
-  
-  include $(PATH_TO_TOP)/rules.mak
-  
-  include $(TOOLS_PATH)/helper.mk
-  
-  include $(TOOLS_PATH)/depend.mk
-  
-  %/TAGS:
-       etags -o $(@D)/TAGS $(@D)/\*.c
-  
-  etags: ./TAGS
+++TOP = ..\..
+++DEFAULT = msgina
+++include $(TOP)/proxy.mak
@@@@ -65,10 -65,10 -65,10 +65,9 @@@@ __SEHLongJmp@8
    mov edi, [ecx+20]
    jmp edx
   
---
-  global SEHLongJmp_KeepEsp
+  global _SEHLongJmp_KeepEsp
   global __SEHLongJmp_KeepEsp@8
-  SEHLongJmp_KeepEsp:
+  _SEHLongJmp_KeepEsp:
   __SEHLongJmp_KeepEsp@8:
    ; return value
    mov eax, [esp+8]
index d1665d6,0000000,0000000..efeec22
mode 100644,000000,000000..100644
--- /dev/null
--- /dev/null
@@@@ -1,18 -1,0 -1,0 +1,5 @@@@
-  # $Id: makefile 12852 2005-01-06 13:58:04Z mf $
+++# This file is automatically generated.
 ++
-  PATH_TO_TOP = ../..
-  
-  TARGET_TYPE = winedll
-  
-  TARGET_CLEAN = pnp_c.c pnp.h
-  
-  include $(PATH_TO_TOP)/rules.mak
-  
-  include $(TOOLS_PATH)/helper.mk
-  
-  WIDL_FLAGS = -o \
-               -D _X86_ -D MIDL_PASS \
-               -I $(PATH_TO_TOP)/w32api/include
-  
-  pnp_c.c pnp.h: $(PATH_TO_TOP)/include/idl/pnp.idl
-       $(WIDL) $(WIDL_FLAGS) -h -H pnp.h -c -C pnp_c.c $(PATH_TO_TOP)/include/idl/pnp.idl
+++TOP = ..\..
+++DEFAULT = setupapi
+++include $(TOP)/proxy.mak
index 9ec7cc1,0000000,0000000..d368593
mode 100644,000000,000000..100644
--- /dev/null
--- /dev/null
@@@@ -1,35 -1,0 -1,0 +1,5 @@@@
-  \r
-  PATH_TO_TOP = ../..\r
-  \r
-  TARGET_TYPE = library\r
-  \r
-  TARGET_NAME = smlib\r
-  \r
-  include $(PATH_TO_TOP)/config\r
-  \r
-  TARGET_CFLAGS = -Wall -Werror -ffreestanding\r
-  \r
-  # require os code to explicitly request A/W version of structs/functions\r
-  TARGET_CFLAGS += -D_DISABLE_TIDENTS\r
-  \r
-  ifneq ($(DBG), 0)\r
-  TARGET_CFLAGS += -DDBG\r
-  endif\r
-  \r
-  TARGET_OBJECTS = \\r
-       connect.o \\r
-       execpgm.o \\r
-       compses.o\r
-  \r
-  \r
-  include $(PATH_TO_TOP)/rules.mak\r
-  \r
-  include $(TOOLS_PATH)/helper.mk\r
-  \r
-  DEP_OBJECTS := $(TARGET_OBJECTS)\r
-  \r
-  TARGET_CLEAN = $(DEP_FILES)\r
-  \r
-  include $(PATH_TO_TOP)/tools/depend.mk\r
-  \r
-  # EOF\r
+++# This file is automatically generated.
+++
+++TOP = ..\..
+++DEFAULT = smlib
+++include $(TOP)/proxy.mak
@@@@ -1,4 -1,4 -1,4 +1,4 @@@@
---/* $Id:$
+++/* $Id$
    *
    * COPYRIGHT:       See COPYING in the top level directory
    * PROJECT:         ReactOS kernel
index d935174,0000000,0000000..5484fb5
mode 100644,000000,000000..100644
--- /dev/null
--- /dev/null
@@@@ -1,36 -1,0 -1,0 +1,5 @@@@
-  # $Id$\r
-  \r
-  PATH_TO_TOP = ../..\r
-  \r
-  TARGET_TYPE = program\r
-  \r
-  TARGET_APPTYPE = console\r
-  \r
-  TARGET_NAME = umpnpmgr\r
-  \r
-  TARGET_INSTALLDIR = system32\r
-  \r
-  TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a rpcrt4.a\r
-  \r
-  TARGET_OBJECTS = pnp_s.o umpnpmgr.o\r
-  \r
-  TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -DUNICODE -D_UNICODE\r
-  \r
-  TARGET_CLEAN = pnp_s.c pnp.h\r
-  \r
-  DEP_OBJECTS = $(TARGET_OBJECTS)\r
-  \r
-  include $(PATH_TO_TOP)/rules.mak\r
-  \r
-  include $(TOOLS_PATH)/helper.mk\r
-  \r
-  include $(TOOLS_PATH)/depend.mk\r
-  \r
-  WIDL_FLAGS = \\r
-               -D _X86_ -D MIDL_PASS \\r
-               -I $(PATH_TO_TOP)/w32api/include\r
-  \r
-  pnp_s.c pnp.h: $(PATH_TO_TOP)/include/idl/pnp.idl\r
-       $(WIDL) $(WIDL_FLAGS) -h -H pnp.h -s -S pnp_s.c $(PATH_TO_TOP)/include/idl/pnp.idl\r
-  \r
-  # EOF\r
+++# This file is automatically generated.
+++
+++TOP = ..\..
+++DEFAULT = umpnpmgr
+++include $(TOP)/proxy.mak
   #include <rpc.h>\r
   #include <rpcdce.h>\r
   \r
-  #include "pnp.h"\r
 --#include "pnp_s.h"\r
+++#include "pnp_c.h"\r
   \r
 ++#define DBG\r
   #define NDEBUG\r
   #include <debug.h>\r
   \r
      Implementation of the CRegKeySecurity interface
    ******************************************************************************/
   
 -- static ifaceCRegKeySecurityVbtl efvt =
+++static ifaceCRegKeySecurityVbtl efvt =
+  {
+    /* IUnknown methods */
+    CRegKeySecurity_fnQueryInterface,
+    CRegKeySecurity_fnAddRef,
+    CRegKeySecurity_fnRelease,
 --  
+++
+    /* CRegKeySecurity methods */
+    CRegKeySecurity_fnGetObjectInformation,
+    CRegKeySecurity_fnGetSecurity,
+    CRegKeySecurity_fnSetSecurity,
+    CRegKeySecurity_fnGetAccessRights,
+    CRegKeySecurity_fnMapGeneric,
+    CRegKeySecurity_fnGetInheritTypes,
+    CRegKeySecurity_fnPropertySheetPageCallback
+  };
+  
   SI_ACCESS RegAccess[] = {
     {&GUID_NULL, KEY_ALL_ACCESS,         (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_FULLCONTROL),      SI_ACCESS_GENERAL | SI_ACCESS_SPECIFIC},
     {&GUID_NULL, KEY_READ,               (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_READ),             SI_ACCESS_GENERAL},
@@@@ -1,6 -1,6 -1,6 +1,12 @@@@
   #ifndef _REGEXP_SECURITY_H
   #define _REGEXP_SECURITY_H
   
+++BOOL
+++InitializeAclUiDll(VOID);
+++
+++VOID
+++UnloadAclUiDll(VOID);
+++
   /* FIXME - remove the definition */
   DWORD STDCALL
   GetSecurityInfo(HANDLE handle,
@@@@ -244,12 -244,8 -244,8 +244,11 @@@@ Win32kInitWin32Thread(PETHREAD Thread
   }
   
   
-  // BOOL STDCALL DllMain(VOID)
 ++/*
 ++ * This definition doesn't work
 ++ */
   NTSTATUS STDCALL
-  DllMain (
+  DriverEntry (
     IN PDRIVER_OBJECT  DriverObject,
     IN PUNICODE_STRING RegistryPath)
   {
@@@@ -61,7 -59,6 -59,6 +59,7 @@@@ write_h (int build, char *buildstr
     FILE       *h = NULL;
     char* s;
     char* s1;
-    unsigned length;
+++  unsigned int length;
     int dllversion = KERNEL_VERSION_MAJOR + 42;
   
     s1 = s = (char *) malloc(256 * 1024);
     s = s + sprintf (s, "-%S\"\n", KERNEL_VERSION_BUILD_TYPE);
     s = s + sprintf (s, "#endif\n/* EOF */\n");
   
-    h = fopen (BUILDNO_INCLUDE_FILE, "rb");
+++  h = fopen (filename, "wb");
 ++  if (h != NULL)
 ++    {
 ++      fseek(h, 0, SEEK_END);
 ++      length = ftell(h);
 ++      if (length == strlen(s1))
 ++     {
 ++       char* orig;
 ++       
 ++       orig = (char *) malloc(length);
 ++       fseek(h, 0, SEEK_SET);
 ++       fread(orig, 1, length, h);
 ++       if (memcmp(s1, orig, length) == 0)
 ++         {
 ++           fclose(h);
 ++           return;
 ++         }
 ++     }
 ++      fclose(h);
 ++    }
 ++
-    h = fopen (BUILDNO_INCLUDE_FILE, "wb");
+    h = fopen (filename, "wb");
     if (!h) 
       {
         fprintf (stderr,
@@@@ -532,8 -538,8 -538,8 +538,7 @@@@ bool CCabinet::SetCabinetReservedFile(c
           return false;
       }
   #else /* !WIN32 */
-      
-      FileHandle = fopen(ConvertPath(FileName, true), "rb"); 
 --
+      FileHandle = fopen(ConvertPath(FileName, true), "rb");
       if (FileHandle == NULL) {
           DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n"));
           return false;
diff --cc reactos/tools/unicode/Makefile
index c561c3b,c45366a,c45366a..0000000
deleted file mode 100644,100644,100644
+++ /dev/null
@@@@ -1,87 -1,3 -1,3 +1,0 @@@@
-  PATH_TO_TOP = ../..
-  
-  include $(PATH_TO_TOP)/config
-  
-  TARGET_TYPE = host_library
-  
-  TARGET_NAME = unicode
-  
-  TARGET_CFLAGS = -D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \
-                  -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \
-                  -I$(PATH_TO_TOP)/include/wine -Wall -Werror
-  
-  CODEPAGES = \
-       037 \
-       424 \
-       437 \
-       500 \
-       737 \
-       775 \
-       850 \
-       852 \
-       855 \
-       856 \
-       857 \
-       860 \
-       861 \
-       862 \
-       863 \
-       864 \
-       865 \
-       866 \
-       869 \
-       874 \
-       875 \
-       878 \
-       932 \
-       936 \
-       949 \
-       950 \
-       1006 \
-       1026 \
-       1250 \
-       1251 \
-       1252 \
-       1253 \
-       1254 \
-       1255 \
-       1256 \
-       1257 \
-       1258 \
-       10000 \
-       10006 \
-       10007 \
-       10029 \
-       10079 \
-       10081 \
-       20866 \
-       20932 \
-       21866 \
-       28591 \
-       28592 \
-       28593 \
-       28594 \
-       28595 \
-       28596 \
-       28597 \
-       28598 \
-       28599 \
-       28600 \
-       28603 \
-       28604 \
-       28605 \
-       28606
-  
-  TARGET_OBJECTS = \
-       casemap.o \
-       compose.o \
-       cptable.o \
-       mbtowc.o \
-       string.o \
-       wctomb.o \
-       wctype.o \
-       $(CODEPAGES:%=c_%.o)
-  
-  include $(PATH_TO_TOP)/rules.mak
-  
-  include $(TOOLS_PATH)/helper.mk
 --TOP = ../..\r
 --DEFAULT = unicode\r
 --include $(TOP)/proxy.mak