Merge 14981:15268 from trunk
authorCasper Hornstrup <chorns@users.sourceforge.net>
Sat, 14 May 2005 12:37:12 +0000 (12:37 +0000)
committerCasper Hornstrup <chorns@users.sourceforge.net>
Sat, 14 May 2005 12:37:12 +0000 (12:37 +0000)
svn path=/branches/xmlbuildsystem/; revision=15273

44 files changed:
1  2 
reactos/apps/utils/net/finger/finger.c
reactos/apps/utils/net/finger/net.c
reactos/apps/utils/net/ping/ping.c
reactos/apps/utils/net/route/route.c
reactos/apps/utils/net/whois/whois.c
reactos/drivers/dd/sndblst/portio.c
reactos/drivers/dd/sndblst/sndblst.c
reactos/drivers/dd/sound/dsp.c
reactos/drivers/dd/sound/mixer.c
reactos/drivers/dd/sound/sound.c
reactos/drivers/dd/sound/wave.c
reactos/drivers/net/tcpip/tcpip/main.c
reactos/drivers/video/displays/vga/objects/copybits.c
reactos/include/funcs.h
reactos/lib/crt/ctype/isctype.c
reactos/lib/crt/stdio/vsprintf.c
reactos/lib/kernel32/misc/dllmain.c
reactos/lib/ntdll/rtl/intrlck.c
reactos/lib/ole32/ole32.xml
reactos/lib/pseh/i386/setjmp.asm
reactos/lib/riched20/riched20.xml
reactos/lib/rtl/rtl.xml
reactos/lib/shell32/document.ico
reactos/lib/shell32/drive.ico
reactos/lib/shell32/folder.ico
reactos/lib/shell32/folder_open.ico
reactos/lib/shell32/mycomputer.ico
reactos/lib/shell32/printer.ico
reactos/lib/userenv/desktop.c
reactos/lib/userenv/setup.c
reactos/ntoskrnl/kd/wrappers/gdbstub.c
reactos/ntoskrnl/ntoskrnl.xml
reactos/services/umpnpmgr/umpnpmgr.c
reactos/subsys/system/regedit/edit.c
reactos/subsys/system/regedit/hexedit.c
reactos/subsys/system/regedit/listview.c
reactos/subsys/system/regedit/main.c
reactos/subsys/system/regedit/regproc.c
reactos/subsys/system/regedit/security.c
reactos/subsys/system/regedit/security.h
reactos/subsys/system/reporterror/reporterror.c
reactos/subsys/system/setup/setup.xml
reactos/subsys/system/winefile/winefile.xml
reactos/subsys/win32k/main/dllmain.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -4,15 -4,15 +4,15 @@@
   * FILE:             drivers/dd/sound/dsp.c
   * PURPOSE:          Digital Signal Processing ?
   * PROGRAMMER:       Snatched from ?
-  * 
-  * UPDATE HISTORY: 
+  *
+  * UPDATE HISTORY:
   *              ??/??/??: Created
   *            10/23/02: Steven Edwards (Steven_Ed4153@yahoo.com)
-  *                      Minor build fix            
+  *                      Minor build fix
   */
  
 -#include "dsp.h"
  #include "sb16.h"
 +#include "dsp.h"
  
  /************************************
   * unsigned char read_dsp(void)
@@@ -4,15 -4,15 +4,15 @@@
   * FILE:             drivers/dd/sound/mixer.c
   * PURPOSE:          Wave Mixer?
   * PROGRAMMER:       ?
-  *     
-  * UPDATE HISTORY: 
+  *
+  * UPDATE HISTORY:
   *              ??/??/??: Created
   *            10/23/02: Steven Edwards (Steven_Ed4153@yahoo.com)
-  *                      Minor build fixes             
+  *                      Minor build fixes
   */
  
 -#include "dsp.h"
  #include "sb16.h"
 +#include "dsp.h"
  #include "mixer.h"
  
  unsigned char read_mixer(unsigned short base,unsigned char reg)
@@@ -77,20 -77,19 +77,20 @@@ NTSTATUS ModuleEntry(PDRIVER_OBJECT Dri
   * RETURNS: Success or failure
   */
  {
 +#if 0
        PDEVICE_OBJECT DeviceObject;
        NTSTATUS ret;
-    
        DPRINT1("SoundBlaster 16 Driver 0.0.1\n");
        if(sb16_getenvironment()!=SB_TRUE)
        {
                DPRINT1("Soundblaster 16 not found\n");
                return 0;
        }
--      ret = IoCreateDevice(DriverObject,0,"\\Device\\WaveOut",FILE_DEVICE_WAVE_OUT,0,FALSE,&DeviceObject);
++      ret = IoCreateDevice(DriverObject,0,L"\\Device\\WaveOut",FILE_DEVICE_WAVE_OUT,0,FALSE,&DeviceObject);
        if (ret!=STATUS_SUCCESS)
                return(ret);
-               
        DeviceObject->Flags=0;
        DriverObject->MajorFunction[IRP_MJ_CLOSE] = Dispatch;
        DriverObject->MajorFunction[IRP_MJ_CREATE] =Dispatch;
@@@ -42,8 -42,8 +42,8 @@@ void sb16_play(WAVE_HDR* wave
        KIRQL Dirql;
        KAFFINITY Affinity;
        PKINTERRUPT IrqObject;
 -      unsigned int mask,newmask;
 +      unsigned int newmask;
-       
        unsigned int i;
        unsigned int tmp[255];
        i=0;
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -116,13 -116,14 +116,14 @@@ InterlockedExchange(LPLONG target, LON
   * RETURNS
   *    Prior value of value pointed to by Destination
   */
 -PVOID
 +LONG
  STDCALL
- InterlockedCompareExchange(PLONG Destination,
+ InterlockedCompareExchange(
 -          PVOID *Destination,
 -          PVOID Exchange,
 -            PVOID Comperand     )
++      PLONG Destination,
 +      LONG Exchange,
 +      LONG Comperand)
- {     
+ {
 -      PVOID ret;
 +      LONG ret;
        __asm__ ( /* lock for SMP systems */
                    "lock\n\t"
                    "cmpxchgl %2,(%1)"
index 6cddd5c,0000000..54e1d2f
mode 100644,000000..100644
--- /dev/null
@@@ -1,52 -1,0 +1,54 @@@
 +<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" warnings="true">\r
 +      <importlibrary definition="ole32.spec.def" />\r
 +      <include base="ole32">.</include>\r
 +      <include base="ReactOS">include/wine</include>\r
 +      <define name="UNICODE" />\r
 +      <define name="_UNICODE" />\r
 +      <define name="__REACTOS__" />\r
 +      <define name="__USE_W32API" />\r
 +      <define name="_WIN32_IE">0x600</define>\r
 +      <define name="_WIN32_WINNT">0x501</define>\r
 +      <define name="WINVER">0x501</define>\r
++      <define name="_STDDEF_H" />\r
 +      <library>wine</library>\r
 +      <library>uuid</library>\r
 +      <library>ntdll</library>\r
 +      <library>kernel32</library>\r
 +      <library>advapi32</library>\r
 +      <library>gdi32</library>\r
 +      <library>user32</library>\r
 +      <library>rpcrt4</library>\r
 +      <file>antimoniker.c</file>\r
 +      <file>bindctx.c</file>\r
 +      <file>clipboard.c</file>\r
 +      <file>compobj.c</file>\r
 +      <file>compositemoniker.c</file>\r
 +      <file>datacache.c</file>\r
++      <file>dictionary.c</file>\r
 +      <file>defaulthandler.c</file>\r
 +      <file>errorinfo.c</file>\r
 +      <file>filemoniker.c</file>\r
 +      <file>ftmarshal.c</file>\r
 +      <file>git.c</file>\r
 +      <file>hglobalstream.c</file>\r
 +      <file>ifs.c</file>\r
 +      <file>itemmoniker.c</file>\r
 +      <file>marshal.c</file>\r
 +      <file>memlockbytes.c</file>\r
 +      <file>moniker.c</file>\r
 +      <file>ole2.c</file>\r
 +      <file>ole2stubs.c</file>\r
 +      <file>ole2impl.c</file>\r
 +      <file>ole32_main.c</file>\r
 +      <file>oleobj.c</file>\r
 +      <file>oleproxy.c</file>\r
 +      <file>regsvr.c</file>\r
 +      <file>rpc.c</file>\r
 +      <file>stg_bigblockfile.c</file>\r
 +      <file>stg_prop.c</file>\r
 +      <file>stg_stream.c</file>\r
 +      <file>storage32.c</file>\r
 +      <file>stubmanager.c</file>\r
 +      <file>ole32res.rc</file>\r
 +      <file>ole32.spec</file>\r
 +</module>\r
Simple merge
index e3e97fc,0000000..e677622
mode 100644,000000..100644
--- /dev/null
@@@ -1,33 -1,0 +1,34 @@@
 +<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" warnings="true">
 +      <importlibrary definition="riched20.spec.def" />
 +      <include base="riched20">.</include>
 +      <include base="ReactOS">include/wine</include>
 +      <define name="UNICODE" />
 +      <define name="_UNICODE" />
 +      <define name="__REACTOS__" />
 +      <define name="__USE_W32API" />
 +      <define name="_WIN32_IE">0x600</define>
 +      <define name="_WIN32_WINNT">0x501</define>
 +      <define name="WINVER">0x501</define>
 +      <library>uuid</library>
 +      <library>wine</library>
 +      <library>ntdll</library>
 +      <library>kernel32</library>
 +      <library>user32</library>
 +      <library>gdi32</library>
 +      <file>caret.c</file>
 +      <file>context.c</file>
 +      <file>editor.c</file>
 +      <file>list.c</file>
 +      <file>paint.c</file>
 +      <file>para.c</file>
 +      <file>reader.c</file>
 +      <file>richole.c</file>
 +      <file>row.c</file>
 +      <file>run.c</file>
 +      <file>string.c</file>
 +      <file>style.c</file>
 +      <file>undo.c</file>
 +      <file>wrap.c</file>
++      <file>writer.c</file>
 +      <file>riched20.spec</file>
 +</module>
index 189d288,0000000..0e0082f
mode 100644,000000..100644
--- /dev/null
@@@ -1,48 -1,0 +1,49 @@@
 +<module name="rtl" type="staticlibrary">\r
++      <include base="rtl">.</include>\r
 +      <directory name="i386">\r
 +              <file>allshl.s</file>\r
 +              <file>aulldiv.s</file>\r
 +              <file>aullrem.s</file>\r
 +              <file>allshr.s</file>\r
 +              <file>allmul.s</file>\r
 +              <file>aullshr.s</file>\r
 +              <file>alldiv.s</file>\r
 +              <file>allrem.s</file>\r
 +              <file>chkstk.s</file>\r
 +              <file>except.s</file>\r
 +              <file>exception.c</file>\r
 +      </directory>\r
 +      <file>access.c</file>\r
 +      <file>acl.c</file>\r
 +      <file>bit.c</file>\r
 +      <file>bitmap.c</file>\r
 +      <file>bootdata.c</file>\r
 +      <file>compress.c</file>\r
 +      <file>dos8dot3.c</file>\r
 +      <file>encode.c</file>\r
 +      <file>env.c</file>\r
 +      <file>error.c</file>\r
 +      <file>exception.c</file>\r
 +      <file>generictable.c</file>\r
 +      <file>heap.c</file>\r
 +      <file>image.c</file>\r
 +      <file>largeint.c</file>\r
 +      <file>luid.c</file>\r
 +      <file>mem.c</file>\r
 +      <file>network.c</file>\r
 +      <file>nls.c</file>\r
 +      <file>ppb.c</file>\r
 +      <file>process.c</file>\r
 +      <file>random.c</file>\r
 +      <file>registry.c</file>\r
 +      <file>sd.c</file>\r
 +      <file>security.c</file>\r
 +      <file>sid.c</file>\r
 +      <file>splaytree.c</file>\r
 +      <file>thread.c</file>\r
 +      <file>time.c</file>\r
 +      <file>timezone.c</file>\r
 +      <file>unicode.c</file>\r
 +      <file>unicodeprefix.c</file>\r
 +      <file>version.c</file>\r
 +</module>\r
index 8e2824e,0000000..2173cbc
mode 100644,000000..100644
Binary files differ
index 6274330,0000000..48faa32
mode 100644,000000..100644
Binary files differ
index 4a1e77f,0000000..11ac83d
mode 100644,000000..100644
Binary files differ
index 9aa4fba,0000000..59fea02
mode 100644,000000..100644
Binary files differ
index 68e81e4,0000000..2fa7be3
mode 100644,000000..100644
Binary files differ
index 0000000,0000000..5d2e999
new file mode 100644 (file)
Binary files differ
Simple merge
Simple merge
@@@ -165,18 -165,67 +165,18 @@@ static CPU_REGISTER GspRegisters[NUMREG
    { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Fs), FIELD_OFFSET (CONTEXT, SegFs), TRUE },
    { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Gs), FIELD_OFFSET (CONTEXT, SegGs), TRUE }
  };
-                                                                                 
  static PCHAR GspThreadStates[DeferredReady+1] =
- { "Initialized", 
-   "Ready", 
+ { "Initialized",
+   "Ready",
    "Running",
-   "Standby", 
-   "Terminated", 
+   "Standby",
+   "Terminated",
    "Waiting",
-   "Transition", 
-   "DeferredReady" 
+   "Transition",
+   "DeferredReady"
  };
  
 -char *
 -strtok(char *s, const char *delim)
 -{
 -  const char *spanp;
 -  int c, sc;
 -  char *tok;
 -  static char *last;
 -
 -
 -  if (s == NULL && (s = last) == NULL)
 -    return (NULL);
 -
 -  /*
 -   * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
 -   */
 - cont:
 -  c = *s++;
 -  for (spanp = delim; (sc = *spanp++) != 0;) {
 -    if (c == sc)
 -      goto cont;
 -  }
 -
 -  if (c == 0) {                       /* no non-delimiter characters */
 -    last = NULL;
 -    return (NULL);
 -  }
 -  tok = s - 1;
 -
 -  /*
 -   * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
 -   * Note that delim must have one NUL; we stop if we see that, too.
 -   */
 -  for (;;) {
 -    c = *s++;
 -    spanp = delim;
 -    do {
 -      if ((sc = *spanp++) == c) {
 -      if (c == 0)
 -        s = NULL;
 -      else
 -        s[-1] = 0;
 -      last = s;
 -      return (tok);
 -      }
 -    } while (sc != 0);
 -  }
 -  /* NOTREACHED */
 -}
 -
  
  LONG
  HexValue (CHAR ch)
index 50a97cb,0000000..b200bdf
mode 100644,000000..100644
--- /dev/null
@@@ -1,348 -1,0 +1,348 @@@
-               <file>dbcsname.c</file>\r
 +<module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe">\r
 +      <bootstrap base="reactos" />\r
 +      <importlibrary definition="ntoskrnl.def" />\r
 +      <define name="_SEH_NO_NATIVE_NLG" />\r
 +      <define name="_DISABLE_TIDENTS" />\r
 +      <define name="__NTOSKRNL__" />\r
 +      <define name="__3GB__" />\r
 +      <include base="kjs">include</include>\r
 +      <include base="ntoskrnl">include</include>\r
 +      <library>csq</library>\r
 +      <library>hal</library>\r
 +      <library>kjs</library>\r
 +      <library>pseh</library>\r
 +      <library>rtl</library>\r
 +      <library>rosrtl</library>\r
 +      <library>string</library>\r
 +      <library>rossym</library>\r
 +      <directory name="include">\r
 +              <pch>ntoskrnl.h</pch>\r
 +      </directory>\r
 +      <directory name="ke">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
 +                              <file first="true">main.S</file>\r
 +                              <file>bios.c</file>\r
 +                              <file>brkpoint.c</file>\r
 +                              <file>ctxswitch.S</file>\r
 +                              <file>exp.c</file>\r
 +                              <file>fpu.c</file>\r
 +                              <file>gdt.c</file>\r
 +                              <file>idt.c</file>\r
 +                              <file>irq.c</file>\r
 +                              <file>irqhand.s</file>\r
 +                              <file>kernel.c</file>\r
 +                              <file>ldt.c</file>\r
 +                              <file>stkswitch.S</file>\r
 +                              <file>syscall.S</file>\r
 +                              <file>thread.c</file>\r
 +                              <file>tlbflush.S</file>\r
 +                              <file>trap.s</file>\r
 +                              <file>tss.c</file>\r
 +                              <file>usercall.S</file>\r
 +                              <file>usertrap.c</file>\r
 +                              <file>v86m.c</file>\r
 +                              <file>v86m_sup.S</file>\r
 +                              <file>vdm.c</file>\r
 +                      </directory>\r
 +              </if>\r
 +              <file>apc.c</file>\r
 +              <file>bug.c</file>\r
 +              <file>catch.c</file>\r
 +              <file>clock.c</file>\r
 +              <file>device.c</file>\r
 +              <file>dpc.c</file>\r
 +              <file>event.c</file>\r
 +              <file>gate.c</file>\r
 +              <file>gmutex.c</file>\r
 +              <file>ipi.c</file>\r
 +              <file>kqueue.c</file>\r
 +              <file>kthread.c</file>\r
 +              <file>main.c</file>\r
 +              <file>mutex.c</file>\r
 +              <file>process.c</file>\r
 +              <file>profile.c</file>\r
 +              <file>queue.c</file>\r
 +              <file>sem.c</file>\r
 +              <file>spinlock.c</file>\r
 +              <file>timer.c</file>\r
 +              <file>usercall.c</file>\r
 +              <file>wait.c</file>\r
 +      </directory>\r
 +      <directory name="cc">\r
 +              <file>cacheman.c</file>\r
 +              <file>copy.c</file>\r
 +              <file>fs.c</file>\r
 +              <file>mdl.c</file>\r
 +              <file>pin.c</file>\r
 +              <file>view.c</file>\r
 +      </directory>\r
 +      <directory name="cm">\r
 +              <file>import.c</file>\r
 +              <file>ntfunc.c</file>\r
 +              <file>regfile.c</file>\r
 +              <file>registry.c</file>\r
 +              <file>regobj.c</file>\r
 +      </directory>\r
 +      <directory name="kdbg">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
 +                              <if property="KDBG" value="1">\r
 +                                      <group>\r
 +                                              <file>i386-dis.c</file>\r
 +                                              <file>kdb_help.S</file>\r
 +                                              <file>longjmp.S</file>\r
 +                                              <file>setjmp.S</file>\r
 +                                      </group>\r
 +                              </if>\r
 +                      </directory>\r
 +              </if>\r
 +              <if property="KDBG" value="1">\r
 +                      <file>kdb.c</file>\r
 +                      <file>kdb_cli.c</file>\r
 +                      <file>kdb_expr.c</file>\r
 +                      <file>kdb_keyboard.c</file>\r
 +                      <file>kdb_serial.c</file>\r
 +                      <file>kdb_string.c</file>\r
 +              </if>\r
 +              <if property="DBG_OR_KDBG" value="true">\r
 +                      <file>kdb_symbols.c</file>\r
 +              </if>\r
 +      </directory>\r
 +      <directory name="dbgk">\r
 +              <file>dbgkutil.c</file>\r
 +              <file>debug.c</file>\r
 +      </directory>\r
 +      <directory name="ex">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
 +                              <file>interlck.c</file>\r
 +                      </directory>\r
 +              </if>\r
 +              <file>callback.c</file>\r
 +              <file>dbgctrl.c</file>\r
 +              <file>error.c</file>\r
 +              <file>event.c</file>\r
 +              <file>evtpair.c</file>\r
 +              <file>fmutex.c</file>\r
 +              <file>handle.c</file>\r
 +              <file>init.c</file>\r
 +              <file>interlck.c</file>\r
 +              <file>list.c</file>\r
 +              <file>lookas.c</file>\r
 +              <file>mutant.c</file>\r
 +              <file>power.c</file>\r
 +              <file>profile.c</file>\r
 +              <file>resource.c</file>\r
 +              <file>rundown.c</file>\r
 +              <file>sem.c</file>\r
 +              <file>synch.c</file>\r
 +              <file>sysinfo.c</file>\r
 +              <file>time.c</file>\r
 +              <file>timer.c</file>\r
 +              <file>util.c</file>\r
 +              <file>uuid.c</file>\r
 +              <file>win32k.c</file>\r
 +              <file>work.c</file>\r
 +              <file>zone.c</file>\r
 +              <file>zw.S</file>\r
 +      </directory>\r
 +      <directory name="fs">\r
-               <file>mdl.c</file>\r
++              <file>context.c</file>\r
++              <file>fastio.c</file>\r
 +              <file>filelock.c</file>\r
 +              <file>mcb.c</file>\r
 +              <file>name.c</file>\r
 +              <file>notify.c</file>\r
 +              <file>oplock.c</file>\r
 +              <file>pool.c</file>\r
 +              <file>tunnel.c</file>\r
 +              <file>unc.c</file>\r
 +              <file>util.c</file>\r
 +      </directory>\r
 +      <directory name="inbv">\r
 +              <file>inbv.c</file>\r
 +      </directory>\r
 +      <directory name="io">\r
 +              <file>adapter.c</file>\r
 +              <file>arcname.c</file>\r
 +              <file>bootlog.c</file>\r
 +              <file>controller.c</file>\r
 +              <file>device.c</file>\r
 +              <file>deviface.c</file>\r
 +              <file>disk.c</file>\r
 +              <file>driver.c</file>\r
 +              <file>efi.c</file>\r
 +              <file>error.c</file>\r
 +              <file>event.c</file>\r
 +              <file>file.c</file>\r
 +              <file>fs.c</file>\r
 +              <file>iocomp.c</file>\r
 +              <file>iomgr.c</file>\r
 +              <file>iowork.c</file>\r
 +              <file>irp.c</file>\r
 +              <file>irq.c</file>\r
 +              <file>mdl.c</file>\r
 +              <file>plugplay.c</file>\r
 +              <file>pnpdma.c</file>\r
 +              <file>pnpmgr.c</file>\r
 +              <file>pnpnotify.c</file>\r
 +              <file>pnpreport.c</file>\r
 +              <file>pnproot.c</file>\r
 +              <file>rawfs.c</file>\r
 +              <file>remlock.c</file>\r
 +              <file>resource.c</file>\r
 +              <file>share.c</file>\r
 +              <file>symlink.c</file>\r
 +              <file>timer.c</file>\r
 +              <file>vpb.c</file>\r
 +              <file>wmi.c</file>\r
 +      </directory>\r
 +      <directory name="kd">\r
 +              <directory name="wrappers">\r
 +                      <file>bochs.c</file>\r
 +                      <file>gdbstub.c</file>\r
 +              </directory>\r
 +              <file>kdinit.c</file>\r
 +              <file>kdio.c</file>\r
 +              <file>kdmain.c</file>\r
 +      </directory>\r
 +      <directory name="ldr">\r
 +              <file>init.c</file>\r
 +              <file>loader.c</file>\r
 +              <file>resource.c</file>\r
 +              <file>rtl.c</file>\r
 +              <file>sysdll.c</file>\r
 +              <file>userldr.c</file>\r
 +      </directory>\r
 +      <directory name="lpc">\r
 +              <file>close.c</file>\r
 +              <file>complete.c</file>\r
 +              <file>connect.c</file>\r
 +              <file>create.c</file>\r
 +              <file>listen.c</file>\r
 +              <file>port.c</file>\r
 +              <file>query.c</file>\r
 +              <file>queue.c</file>\r
 +              <file>receive.c</file>\r
 +              <file>reply.c</file>\r
 +              <file>send.c</file>\r
 +      </directory>\r
 +      <directory name="mm">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
 +                              <file>memsafe.s</file>\r
 +                              <file>page.c</file>\r
 +                              <file>pfault.c</file>\r
 +                      </directory>\r
 +              </if>\r
 +              <file>anonmem.c</file>\r
 +              <file>aspace.c</file>\r
 +              <file>balance.c</file>\r
 +              <file>cont.c</file>\r
 +              <file>drvlck.c</file>\r
 +              <file>elf32.c</file>\r
 +              <file>elf64.c</file>\r
 +              <file>freelist.c</file>\r
 +              <file>iospace.c</file>\r
 +              <file>kmap.c</file>\r
 +              <file>marea.c</file>\r
 +              <file>mdl.c</file>\r
 +              <file>mm.c</file>\r
 +              <file>process.c</file>\r
 +              <file>mminit.c</file>\r
 +              <file>mpw.c</file>\r
 +              <file>ncache.c</file>\r
 +              <file>npool.c</file>\r
 +              <file>pagefile.c</file>\r
 +              <file>pageop.c</file>\r
 +              <file>pager.c</file>\r
 +              <file>pagfault.c</file>\r
 +              <file>paging.c</file>\r
 +              <file>pe.c</file>\r
 +              <file>physical.c</file>\r
 +              <file>pool.c</file>\r
 +              <file>ppool.c</file>\r
 +              <file>region.c</file>\r
 +              <file>rmap.c</file>\r
 +              <file>section.c</file>\r
 +              <file>verifier.c</file>\r
 +              <file>virtual.c</file>\r
 +              <file>wset.c</file>\r
 +      </directory>\r
 +      <directory name="ob">\r
 +              <file>dirobj.c</file>\r
 +              <file>handle.c</file>\r
 +              <file>namespc.c</file>\r
 +              <file>ntobj.c</file>\r
 +              <file>object.c</file>\r
 +              <file>sdcache.c</file>\r
 +              <file>security.c</file>\r
 +              <file>symlink.c</file>\r
 +              <file>wait.c</file>\r
 +      </directory>\r
 +      <directory name="po">\r
 +              <file>power.c</file>\r
 +      </directory>\r
 +      <directory name="ps">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
 +                              <file>continue.c</file>\r
 +                      </directory>\r
 +              </if>\r
 +              <file>cid.c</file>\r
 +              <file>debug.c</file>\r
 +              <file>idle.c</file>\r
 +              <file>job.c</file>\r
 +              <file>kill.c</file>\r
 +              <file>locale.c</file>\r
 +              <file>notify.c</file>\r
 +              <file>process.c</file>\r
 +              <file>psmgr.c</file>\r
 +              <file>query.c</file>\r
 +              <file>quota.c</file>\r
 +              <file>security.c</file>\r
 +              <file>suspend.c</file>\r
 +              <file>thread.c</file>\r
 +              <file>win32.c</file>\r
 +      </directory>\r
 +      <directory name="rtl">\r
 +              <if property="ARCH" value="i386">\r
 +                      <directory name="i386">\r
 +                              <file>exception.c</file>\r
 +                              <file>seh.s</file>\r
 +                      </directory>\r
 +              </if>\r
 +              <file>atom.c</file>\r
 +              <file>capture.c</file>\r
 +              <file>ctype.c</file>\r
 +              <file>debug.c</file>\r
 +              <file>handle.c</file>\r
 +              <file>libsupp.c</file>\r
 +              <file>message.c</file>\r
 +              <file>misc.c</file>\r
 +              <file>nls.c</file>\r
 +              <file>purecall.c</file>\r
 +              <file>rangelist.c</file>\r
 +              <file>regio.c</file>\r
 +              <file>sprintf.c</file>\r
 +              <file>stdlib.c</file>\r
 +              <file>string.c</file>\r
 +              <file>strtok.c</file>\r
 +              <file>swprintf.c</file>\r
 +              <file>wstring.c</file>\r
 +      </directory>\r
 +      <directory name="se">\r
 +              <file>access.c</file>\r
 +              <file>acl.c</file>\r
 +              <file>audit.c</file>\r
 +              <file>lsa.c</file>\r
 +              <file>luid.c</file>\r
 +              <file>priv.c</file>\r
 +              <file>sd.c</file>\r
 +              <file>semgr.c</file>\r
 +              <file>sid.c</file>\r
 +              <file>token.c</file>\r
 +      </directory>\r
 +      <file>ntoskrnl.rc</file>\r
 +</module>\r
Simple merge
Simple merge
@@@ -21,8 -21,7 +21,8 @@@
  #define WIN32_LEAN_AND_MEAN     /* Exclude rarely-used stuff from Windows headers */
  #include <windows.h>
  #include <commctrl.h>
- #include <stdio.h>
 +#include <stdlib.h>
+ #include <stdio.h>
  #include <tchar.h>
  
  #include "hexedit.h"
@@@ -224,16 -223,16 +224,16 @@@ HEXEDIT_PaintLines(PHEXEDIT_DATA hed, H
      while(First <= Last && current < end)
      {
        DWORD dh;
-       
        dx = hed->LeftMargin;
-       
        /* draw address */
 -      _stprintf(addr, _T("%04X"), linestart);
 +      _stprintf(addr, _T("%04lX"), linestart);
        TextOut(hDC, dx, dy, addr, 4);
-       
        dx += ((4 + hed->AddressSpacing) * hed->CharWidth);
        dh = (3 * hed->CharWidth);
-       
        rct.left = dx;
        rct.top = dy;
        rct.right = rct.left + dh;
  static DWORD
  HEXEDIT_HitRegionTest(PHEXEDIT_DATA hed, POINTS pt)
  {
 -  WINDOWINFO wi;
    int d;
-   
    if(pt.x <= hed->LeftMargin)
    {
      return HEHT_LEFTMARGIN;
Simple merge
  /******************************************************************************
     Implementation of the CRegKeySecurity interface
   ******************************************************************************/
-  
 + 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},
index 6d854af,0000000..988dd7a
mode 100644,000000..100644
--- /dev/null
@@@ -1,8 -1,0 +1,9 @@@
 +<module name="setup" type="win32gui">\r
 +      <include base="setup">.</include>\r
 +      <define name="__USE_W32API" />\r
 +      <define name="_WIN32_IE">0x0400</define>\r
 +      <library>kernel32</library>\r
++      <library>userenv</library>\r
 +      <file>setup.c</file>\r
 +      <file>setup.rc</file>\r
 +</module>\r
index e2809e6,0000000..7a987c8
mode 100644,000000..100644
--- /dev/null
@@@ -1,21 -1,0 +1,22 @@@
 +<module name="winefile" type="win32gui"  installbase="system32" installname="winefile.exe" warnings="true">\r
 +      <include base="winefile">.</include>\r
 +      <define name="UNICODE" />\r
 +      <define name="__USE_W32API" />\r
 +      <define name="_WIN32_IE">0x0501</define>\r
 +      <define name="_WIN32_WINNT">0x0501</define>\r
 +      <define name="_ROS_" />\r
 +      <library>uuid</library>\r
 +      <library>ntdll</library>\r
 +      <library>kernel32</library>\r
 +      <library>gdi32</library>\r
 +      <library>user32</library>\r
 +      <library>comctl32</library>\r
 +      <library>comdlg32</library>\r
 +      <library>shell32</library>\r
 +      <library>ole32</library>\r
 +      <library>oleaut32</library>\r
++      <library>mpr</library>\r
 +      <file>license.c</file>\r
 +      <file>winefile.c</file>\r
 +      <file>winefile.rc</file>\r
 +</module>\r
@@@ -388,7 -392,9 +388,7 @@@ DriverEntry 
       used by win32 applications */
    CreateStockObjects();
    CreateSysColorObjects();
-   
 -  PREPARE_TESTS
 -
    return STATUS_SUCCESS;
  }