[ros-diffs] [hbirr] 15789: Merged 15499:15582 from trunk.

Merged 15499:15582 from trunk.
Modified: branches/cache_manager_rewrite/reactos/bootdata/hivesys.inf
Modified: branches/cache_manager_rewrite/reactos/config
Modified:
branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/isapnp.h
Modified:
branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/makefile
Modified:
branches/cache_manager_rewrite/reactos/drivers/bus/pci/makefile
Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.c
Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pdo.c
Modified:
branches/cache_manager_rewrite/reactos/drivers/dd/beep/makefile
Modified:
branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/keyboard.c
Modified:
branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/mouse.c
Modified:
branches/cache_manager_rewrite/reactos/drivers/input/mouclass/makefile
Modified:
branches/cache_manager_rewrite/reactos/drivers/input/sermouse/makefile
Modified:
branches/cache_manager_rewrite/reactos/drivers/input/sermouse/sermouse.c
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/main.c
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/afd/include/afd.h
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/dd/ne2000/Makefile
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/dd/ne2000/include/ne2
000.h
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/dd/ne2000/ne2000/main
.c
Added:
branches/cache_manager_rewrite/reactos/drivers/net/lan/include/net_lan.h
Added:
branches/cache_manager_rewrite/reactos/drivers/net/lan/include/net_wh.h
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/lan/include/precomp.h
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/lan/lan/lan.c
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/lan/makefile
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/npf/Makefile
Modified: branches/cache_manager_rewrite/reactos/drivers/net/npf/dump.c
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/npf/jitter.c
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/npf/openclos.c
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/npf/packet.c
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/npf/packet.h
Modified: branches/cache_manager_rewrite/reactos/drivers/net/npf/read.c
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/npf/win_bpf.h
Modified: branches/cache_manager_rewrite/reactos/drivers/net/npf/write.c
Deleted: branches/cache_manager_rewrite/reactos/drivers/net/packet/
Modified:
branches/cache_manager_rewrite/reactos/drivers/video/displays/framebuf/s
creen.c
Modified:
branches/cache_manager_rewrite/reactos/drivers/video/miniport/vbe/vbemp.
c
Modified:
branches/cache_manager_rewrite/reactos/drivers/video/miniport/vbe/vbemp.
h
Modified:
branches/cache_manager_rewrite/reactos/hal/halx86/mp/mpconfig.c
Modified: branches/cache_manager_rewrite/reactos/include/debug.h
Deleted: branches/cache_manager_rewrite/reactos/include/ndis.h
Deleted: branches/cache_manager_rewrite/reactos/include/net/
Modified: branches/cache_manager_rewrite/reactos/include/ntdll/ntdll.h
Modified: branches/cache_manager_rewrite/reactos/include/win32k/debug1.h
Modified: branches/cache_manager_rewrite/reactos/include/wine/debug.h
Modified:
branches/cache_manager_rewrite/reactos/include/wine/exception.h
Modified: branches/cache_manager_rewrite/reactos/include/wine/msidefs.h
Modified: branches/cache_manager_rewrite/reactos/lib/cabinet/Makefile.in
Modified: branches/cache_manager_rewrite/reactos/lib/cabinet/cabinet.h
Modified: branches/cache_manager_rewrite/reactos/lib/cabinet/fci.c
Modified:
branches/cache_manager_rewrite/reactos/lib/comctl32/Makefile.in
Modified: branches/cache_manager_rewrite/reactos/lib/comctl32/comboex.c
Modified:
branches/cache_manager_rewrite/reactos/lib/comctl32/comctl32undoc.c
Modified: branches/cache_manager_rewrite/reactos/lib/comctl32/datetime.c
Modified: branches/cache_manager_rewrite/reactos/lib/comctl32/header.c
Modified: branches/cache_manager_rewrite/reactos/lib/comctl32/hotkey.c
Modified:
branches/cache_manager_rewrite/reactos/lib/comctl32/imagelist.c
Modified:
branches/cache_manager_rewrite/reactos/lib/comctl32/ipaddress.c
Modified: branches/cache_manager_rewrite/reactos/lib/comctl32/listview.c
Modified: branches/cache_manager_rewrite/reactos/lib/comctl32/monthcal.c
Modified: branches/cache_manager_rewrite/reactos/lib/comctl32/tab.c
Modified: branches/cache_manager_rewrite/reactos/lib/comctl32/toolbar.c
Modified: branches/cache_manager_rewrite/reactos/lib/comctl32/updown.c
Modified:
branches/cache_manager_rewrite/reactos/lib/comdlg32/Makefile.in
Modified:
branches/cache_manager_rewrite/reactos/lib/comdlg32/commdlg.spec
Modified: branches/cache_manager_rewrite/reactos/lib/comdlg32/filedlg.c
Modified:
branches/cache_manager_rewrite/reactos/lib/comdlg32/filedlgbrowser.c
Modified: branches/cache_manager_rewrite/reactos/lib/comdlg32/fontdlg.c
Deleted: branches/cache_manager_rewrite/reactos/lib/comdlg32/generic.c
Modified: branches/cache_manager_rewrite/reactos/lib/dinput8/Makefile.in
Modified: branches/cache_manager_rewrite/reactos/lib/gdi32/gdi32.def
Modified: branches/cache_manager_rewrite/reactos/lib/gdi32/misc/stubs.c
Modified: branches/cache_manager_rewrite/reactos/lib/icmp/Makefile.in
Modified: branches/cache_manager_rewrite/reactos/lib/mpr/Makefile.in
Modified: branches/cache_manager_rewrite/reactos/lib/msi/Makefile.in
Modified: branches/cache_manager_rewrite/reactos/lib/msi/action.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/action.h
Modified: branches/cache_manager_rewrite/reactos/lib/msi/appsearch.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/cond.tab.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/cond.y
Modified: branches/cache_manager_rewrite/reactos/lib/msi/create.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/custom.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/database.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/dialog.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/insert.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/msi.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/msi.spec
Modified: branches/cache_manager_rewrite/reactos/lib/msi/msi_Fr.rc
Modified: branches/cache_manager_rewrite/reactos/lib/msi/msipriv.h
Modified: branches/cache_manager_rewrite/reactos/lib/msi/msiquery.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/order.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/package.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/query.h
Modified: branches/cache_manager_rewrite/reactos/lib/msi/record.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/registry.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/sql.tab.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/sql.y
Modified: branches/cache_manager_rewrite/reactos/lib/msi/suminfo.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/table.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/tokenize.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/update.c
Modified: branches/cache_manager_rewrite/reactos/lib/msi/version.rc
[truncated at 100 lines; 93 more skipped]
  _____
Modified: branches/cache_manager_rewrite/reactos/bootdata/hivesys.inf
--- branches/cache_manager_rewrite/reactos/bootdata/hivesys.inf
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/bootdata/hivesys.inf
2005-06-04 19:50:39 UTC (rev 15789)
@@ -532,7 +532,7 @@
HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ErrorControl",0x00010
001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Group",0x00000000,"De
bug"
HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ImagePath",0x00020000
,"system32\drivers\debugout.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Start",0x00010001,0x
00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Start",0x00010001,0x
00000004
HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Type",0x00010001,0x00
000001
 ; Disk class driver
@@ -678,7 +678,7 @@
HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","ErrorControl",0x0001000
1,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","Group",0x00000000,"NDIS
"
HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","ImagePath",0x00020000,"
system32\drivers\ne2000.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","Start",0x00010001,0x00
000004
+HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","Start",0x00010001,0x00
000003
HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","Type",0x00010001,0x0000
0001
HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","Route",0x00000000,"Ne20
001"
@@ -690,8 +690,8 @@
HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08
002BE10318}\0001\Linkage","Export",0x00000000,"\Device\Ne20001"
HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08
002BE10318}\0001\Linkage","RootDevice",0x00000000,"Ne20001"
HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08
002BE10318}\0001\Linkage","UpperBind",0x00000000,"Tcpip"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0
8002BE10318}\0001","Port",0x00000000,"280"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0
8002BE10318}\0001","Irq",0x00000000,"9"
+HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0
8002BE10318}\0001","Port",0x00000000,"c100"
+HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0
8002BE10318}\0001","Irq",0x00000000,"B"
HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08
002BE10318}\0001","NetworkAddress",0x00000000,"001122334455"
HKLM,"SYSTEM\CurrentControlSet\Services\Ne20001\Parameters\Tcpip","Defau
ltGateway",0x00010000,"0.0.0.0"
HKLM,"SYSTEM\CurrentControlSet\Services\Ne20001\Parameters\Tcpip","IPAdd
ress",0x00010000,"0.0.0.0"
@@ -892,7 +892,7 @@
HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath"
,0x00010000,"DataBasePath"
HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Domain",0x000
10000,""
HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Hostname",0x0
0010000,"ROSHost"
-HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","NameServer",
0x00010000,"10.0.0.1"
+HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","NameServer",
0x00010000,"0.0.0.0"
HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","ForwardBroadc
asts",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","IPEnableRoute
r",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","SearchList",0
x00010000,""
  _____
Modified: branches/cache_manager_rewrite/reactos/config
--- branches/cache_manager_rewrite/reactos/config       2005-06-04
19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/config       2005-06-04
19:50:39 UTC (rev 15789)
@@ -14,7 +14,7 @@
 # be optimized for.
 #
-OARCH := i486
+OARCH := i486
 #
 # Whether to compile in the kernel debugger
@@ -25,7 +25,7 @@
 # Whether to compile for debugging
 # Enabling this enables ASSERTS, GDB and Special Debug Routines
 #
-DBG := 0
+DBG := 1
 #
 # Whether to compile a multiprocessor or single processor version
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/isapnp.h
--- branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/isapnp.h
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/isapnp.h
2005-06-04 19:50:39 UTC (rev 15789)
@@ -5,6 +5,8 @@
 extern "C" {
 #endif
+#define IO_RESOURCE_REQUIRED  0x00  //ROS Extension
+
 #define ISAPNP_ADDRESS_PORT   0x0279    // ADDRESS (W)
 #define ISAPNP_WRITE_PORT     0x0A79    // WRITE_DATA (W)
 #define ISAPNP_MIN_READ_PORT  0x0203    // READ_DATA (R)
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/makefile
--- branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/makefile
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/makefile
2005-06-04 19:50:39 UTC (rev 15789)
@@ -8,7 +8,7 @@
 TARGET_OBJECTS = isapnp.o
-TARGET_CFLAGS = -Werror -Wall
+TARGET_CFLAGS = -D__USE_W32API -Werror -Wall
 include $(PATH_TO_TOP)/rules.mak
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/bus/pci/makefile
--- branches/cache_manager_rewrite/reactos/drivers/bus/pci/makefile
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/bus/pci/makefile
2005-06-04 19:50:39 UTC (rev 15789)
@@ -6,7 +6,7 @@
 TARGET_NAME = pci
-TARGET_CFLAGS = -Wall -Werror
+TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
 TARGET_OBJECTS = fdo.o pci.o pdo.o
  _____
Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.c
--- branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.c
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -9,6 +9,7 @@
  */
 #include <ddk/ntddk.h>
+#include <stdio.h>
 #include "pcidef.h"
 #include "pci.h"
  _____
Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pdo.c
--- branches/cache_manager_rewrite/reactos/drivers/bus/pci/pdo.c
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/bus/pci/pdo.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -9,15 +9,14 @@
  */
 #include <ddk/ntddk.h>
-
+#include <initguid.h>
+#include <ddk/wdmguid.h>
 #include "pcidef.h"
 #include "pci.h"
 #define NDEBUG
 #include <debug.h>
-DEFINE_GUID(GUID_BUS_TYPE_PCI, 0xc8ebdfb0L, 0xb510, 0x11d0, 0x80, 0xe5,
0x00, 0xa0, 0xc9, 0x25, 0x42, 0xe3);
-
 /*** PRIVATE
*****************************************************************/
 static NTSTATUS
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/dd/beep/makefile
--- branches/cache_manager_rewrite/reactos/drivers/dd/beep/makefile
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/dd/beep/makefile
2005-06-04 19:50:39 UTC (rev 15789)
@@ -8,7 +8,7 @@
 TARGET_OBJECTS = beep.o
-TARGET_CFLAGS = -Wall -Werror
+TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
 include $(PATH_TO_TOP)/rules.mak
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/keyboard.c
---
branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/keyboard.c
2005-06-04 19:44:50 UTC (rev 15788)
+++
branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/keyboard.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -113,7 +113,7 @@
        } while (Iterations < DevExt->Settings.PollStatusIterations);
        if (STATUS_SUCCESS != Status) {
-               DPRINT1("Spurious I8042 interrupt\n");
+               DPRINT("Spurious I8042 interrupt\n");
                return FALSE;
        }
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/mouse.c
---
branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/mouse.c
2005-06-04 19:44:50 UTC (rev 15788)
+++
branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/mouse.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -334,7 +334,7 @@
        case ExpectingFinalResolutionACK:
                I8042IsrWritePortMouse(DevExt,
                                       DevExt->Settings.MouseResolution
& 0xff);
-               DPRINT1("%x\n", DevExt->Settings.MouseResolution);
+               DPRINT("%x\n", DevExt->Settings.MouseResolution);
                DevExt->MouseResetState =
ExpectingFinalResolutionValueACK;
                return TRUE;
        case ExpectingFinalResolutionValueACK:
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/input/mouclass/makefile
---
branches/cache_manager_rewrite/reactos/drivers/input/mouclass/makefile
2005-06-04 19:44:50 UTC (rev 15788)
+++
branches/cache_manager_rewrite/reactos/drivers/input/mouclass/makefile
2005-06-04 19:50:39 UTC (rev 15789)
@@ -6,7 +6,7 @@
 TARGET_NAME = mouclass
-TARGET_CFLAGS = -Wall -Werror
+TARGET_CFLAGS = -D__USE_32API -Wall -Werror
 TARGET_OBJECTS = $(TARGET_NAME).o
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/input/sermouse/makefile
---
branches/cache_manager_rewrite/reactos/drivers/input/sermouse/makefile
2005-06-04 19:44:50 UTC (rev 15788)
+++
branches/cache_manager_rewrite/reactos/drivers/input/sermouse/makefile
2005-06-04 19:50:39 UTC (rev 15789)
@@ -9,7 +9,7 @@
 TARGET_OBJECTS = \
   sermouse.o
-TARGET_CFLAGS = -Wall -Werror
+TARGET_CFLAGS = -D__USE_W32API -Wall -Werror
 #mouse.o - Old Serial mouse driver
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/input/sermouse/sermouse.c
---
branches/cache_manager_rewrite/reactos/drivers/input/sermouse/sermouse.c
2005-06-04 19:44:50 UTC (rev 15788)
+++
branches/cache_manager_rewrite/reactos/drivers/input/sermouse/sermouse.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -10,6 +10,7 @@
 /* INCLUDES
*****************************************************************/
+#include <stdio.h>
 #include <ddk/ntddk.h>
 #include <ddk/ntddmou.h>
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/main.c
--- branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/main.c
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/main.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -488,7 +488,7 @@
 DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
 {
     PDEVICE_OBJECT DeviceObject;
-    UNICODE_STRING wstrDeviceName;
+    UNICODE_STRING wstrDeviceName =
RTL_CONSTANT_STRING(L"\\Device\\Afd");
     PAFD_DEVICE_EXTENSION DeviceExt;
     NTSTATUS Status;
@@ -500,9 +500,6 @@
     DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = AfdDispatch;
     DriverObject->DriverUnload = AfdUnload;
-    /* create afd device */
-    RtlRosInitUnicodeStringFromLiteral(&wstrDeviceName,
L"\\Device\\Afd");
-
     Status = IoCreateDevice
        ( DriverObject,
          sizeof(AFD_DEVICE_EXTENSION),
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/afd/include/afd.h
--- branches/cache_manager_rewrite/reactos/drivers/net/afd/include/afd.h
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/net/afd/include/afd.h
2005-06-04 19:50:39 UTC (rev 15789)
@@ -17,22 +17,9 @@
 #include <tdikrnl.h>
 #include <tdiinfo.h>
 #include <string.h>
-#include <ndis.h>
+#include <winsock2.h>
 #include <shared.h>
-#ifndef _MSC_VER
-#include <roscfg.h>
-#include <rosrtl/string.h>
-#include <winsock2.h>
-#include <ddk/tdi.h>
-#include <ddk/ndis.h>
-#include <tcpmisc.h>
-#include <tcpioctl.h>
-#else
-#include <ntdef.h>
-#define STDCALL
-#endif
-
 #ifndef MIN
 #define MIN(x,y) (((x)<(y))?(x):(y))
 #endif
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/dd/ne2000/Makefile
---
branches/cache_manager_rewrite/reactos/drivers/net/dd/ne2000/Makefile
2005-06-04 19:44:50 UTC (rev 15788)
+++
branches/cache_manager_rewrite/reactos/drivers/net/dd/ne2000/Makefile
2005-06-04 19:50:39 UTC (rev 15789)
@@ -6,7 +6,7 @@
 TARGET_NAME = ne2000
-TARGET_CFLAGS = -I./include -Werror -Wall
+TARGET_CFLAGS = -I./include -D__USE_W32API -Werror -Wall
 TARGET_OBJECTS = \
   ne2000/8390.o \
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/dd/ne2000/include/ne2
000.h
---
branches/cache_manager_rewrite/reactos/drivers/net/dd/ne2000/include/ne2
000.h   2005-06-04 19:44:50 UTC (rev 15788)
+++
branches/cache_manager_rewrite/reactos/drivers/net/dd/ne2000/include/ne2
000.h   2005-06-04 19:50:39 UTC (rev 15789)
@@ -7,16 +7,7 @@
 #ifndef __NE2000_H
 #define __NE2000_H
-#ifdef _MSC_VER
-
-#ifndef ULONG_PTR
-#define ULONG ULONG_PTR
-#endif
-
-#include <ndis.h>
-#else
-#include <net/ndis.h>
-#endif
+#include <ddk/ndis.h>
 #include <8390.h>
 #include <debug.h>
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/dd/ne2000/ne2000/main
.c
---
branches/cache_manager_rewrite/reactos/drivers/net/dd/ne2000/ne2000/main
.c      2005-06-04 19:44:50 UTC (rev 15788)
+++
branches/cache_manager_rewrite/reactos/drivers/net/dd/ne2000/ne2000/main
.c      2005-06-04 19:50:39 UTC (rev 15789)
@@ -844,9 +844,9 @@
     Miniport.QueryInformationHandler    = MiniportQueryInformation;
     Miniport.ReconfigureHandler         = MiniportReconfigure;
     Miniport.ResetHandler               = MiniportReset;
-    Miniport.u1.SendHandler             = MiniportSend;
+    Miniport.SendHandler                = MiniportSend;
     Miniport.SetInformationHandler      = MiniportSetInformation;
-    Miniport.u2.TransferDataHandler     = MiniportTransferData;
+    Miniport.TransferDataHandler        = MiniportTransferData;
     NdisMInitializeWrapper(&NdisWrapperHandle,
                            DriverObject,
  _____
Copied:
branches/cache_manager_rewrite/reactos/drivers/net/lan/include/net_lan.h
(from rev 15582, trunk/reactos/drivers/net/lan/include/net_lan.h)
Property changes on:
branches/cache_manager_rewrite/reactos/drivers/net/lan/include/net_lan.h
___________________________________________________________________
Name: svn:keywords   + author date id revision Name: svn:eol-style   +
native
  _____
Copied:
branches/cache_manager_rewrite/reactos/drivers/net/lan/include/net_wh.h
(from rev 15582, trunk/reactos/drivers/net/lan/include/net_wh.h)
Property changes on:
branches/cache_manager_rewrite/reactos/drivers/net/lan/include/net_wh.h
___________________________________________________________________
Name: svn:keywords   + author date id revision Name: svn:eol-style   +
native
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/lan/include/precomp.h
---
branches/cache_manager_rewrite/reactos/drivers/net/lan/include/precomp.h
2005-06-04 19:44:50 UTC (rev 15788)
+++
branches/cache_manager_rewrite/reactos/drivers/net/lan/include/precomp.h
2005-06-04 19:50:39 UTC (rev 15789)
@@ -8,7 +8,7 @@
 #include <roscfg.h>
 #include <debug.h>
 #include <pseh.h>
-#include "net/lan.h"
+#include "net_lan.h"
 #include "lan.h"
 #endif/*_LAN_PRECOMP_H*/
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/lan/lan/lan.c
--- branches/cache_manager_rewrite/reactos/drivers/net/lan/lan/lan.c
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/net/lan/lan/lan.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -1208,7 +1208,6 @@
 {
     PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);
     NTSTATUS Status = STATUS_SUCCESS;
-    PFILE_OBJECT FileObject = IrpSp->FileObject;
     LA_DbgPrint(MID_TRACE,("LanDispatch: %d\n", IrpSp->MajorFunction));
     if( IrpSp->MajorFunction != IRP_MJ_CREATE) {
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/lan/makefile
--- branches/cache_manager_rewrite/reactos/drivers/net/lan/makefile
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/net/lan/makefile
2005-06-04 19:50:39 UTC (rev 15789)
@@ -13,6 +13,7 @@
 # -DMEMTRACK
 TARGET_CFLAGS = \
        -D__USE_W32API \
+       -D_SEH_NO_NATIVE_NLG \
        -DNDIS40 \
        -DMEMTRACK \
        -Wall -Werror \
@@ -20,9 +21,11 @@
        -I$(PATH_TO_TOP)/w32api/include \
        -I$(PATH_TO_TOP)/include
-TARGET_DDKLIBS = ndis.a \
-       $(PATH_TO_TOP)/dk/w32/lib/pseh.a
+TARGET_DDKLIBS = ndis.a
+TARGET_LIBS = \
+       $(PATH_TO_TOP)/dk/w32/lib/libpseh.a
+
 TARGET_CLEAN = \
        lan/*.o
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/npf/Makefile
--- branches/cache_manager_rewrite/reactos/drivers/net/npf/Makefile
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/net/npf/Makefile
2005-06-04 19:50:39 UTC (rev 15789)
@@ -7,9 +7,9 @@
 TARGET_NAME = npf
-#TARGET_CFLAGS = -DDBG -DWIN_NT_DRIVER -DKQPC_TS
-I$(PATH_TO_TOP)/ntoskrnl/include
+#TARGET_CFLAGS = -D__USE_W32API -D_TIMEVAL_DEFINED -DDBG
-DWIN_NT_DRIVER -DKQPC_TS -I$(PATH_TO_TOP)/ntoskrnl/include
-TARGET_CFLAGS = -DDBG -DWIN_NT_DRIVER -DKQPC_TS -DUSE_KLOCKS
-I$(PATH_TO_TOP)/ntoskrnl/include -Wall -Werror
+TARGET_CFLAGS = -D__USE_W32API -D_TIMEVAL_DEFINED -DDBG -DWIN_NT_DRIVER
-DKQPC_TS -DUSE_KLOCKS -I$(PATH_TO_TOP)/ntoskrnl/include -Wall -Werror
 TARGET_DDKLIBS = ndis.a
  _____
Modified: branches/cache_manager_rewrite/reactos/drivers/net/npf/dump.c
--- branches/cache_manager_rewrite/reactos/drivers/net/npf/dump.c
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/net/npf/dump.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -26,7 +26,7 @@
 #include "ndis.h"
 #else
 #include <ddk/ntddk.h>
-#include <net/ndis.h>
+#include <ddk/ndis.h>
 //#define PsGetCurrentProcess() IoGetCurrentProcess()
 #ifndef PsGetCurrentThread
 #define PsGetCurrentThread() ((PETHREAD) (KeGetCurrentThread()))
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/npf/jitter.c
--- branches/cache_manager_rewrite/reactos/drivers/net/npf/jitter.c
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/net/npf/jitter.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -26,7 +26,7 @@
 #include "ndis.h"
 #else
 #include <ddk/ntddk.h>
-#include <net/ndis.h>
+#include <ddk/ndis.h>
 #endif
 #include "packet.h"
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/npf/openclos.c
--- branches/cache_manager_rewrite/reactos/drivers/net/npf/openclos.c
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/net/npf/openclos.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -25,7 +25,7 @@
 #include "ndis.h"
 #else
 #include <ddk/ntddk.h>
-#include <net/ndis.h>
+#include <ddk/ndis.h>
 #endif
 #include "debug.h"
 #include "packet.h"
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/npf/packet.c
--- branches/cache_manager_rewrite/reactos/drivers/net/npf/packet.c
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/net/npf/packet.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -26,7 +26,7 @@
 #include "ndis.h"
 #else
 #include <ddk/ntddk.h>
-#include <net/ndis.h>
+#include <ddk/ndis.h>
 #endif
 #include "ntddpack.h"
@@ -114,27 +114,14 @@
     ProtocolChar.MajorNdisVersion            = 3;
 #endif
     ProtocolChar.MinorNdisVersion            = 0;
-#ifndef __GNUC__
     ProtocolChar.Reserved                    = 0;
-#else
-    ProtocolChar.u1.Reserved                 = 0;
-#endif
     ProtocolChar.OpenAdapterCompleteHandler  = NPF_OpenAdapterComplete;
     ProtocolChar.CloseAdapterCompleteHandler =
NPF_CloseAdapterComplete;
-#ifndef __GNUC__
     ProtocolChar.SendCompleteHandler         = NPF_SendComplete;
     ProtocolChar.TransferDataCompleteHandler =
NPF_TransferDataComplete;
-#else
-    ProtocolChar.u2.SendCompleteHandler         = NPF_SendComplete;
-    ProtocolChar.u3.TransferDataCompleteHandler =
NPF_TransferDataComplete;
-#endif
     ProtocolChar.ResetCompleteHandler        = NPF_ResetComplete;
     ProtocolChar.RequestCompleteHandler      = NPF_RequestComplete;
-#ifndef __GNUC__
     ProtocolChar.ReceiveHandler              = NPF_tap;
-#else
-    ProtocolChar.u4.ReceiveHandler           = NPF_tap;
-#endif
     ProtocolChar.ReceiveCompleteHandler      = NPF_ReceiveComplete;
     ProtocolChar.StatusHandler               = NPF_Status;
     ProtocolChar.StatusCompleteHandler       = NPF_StatusComplete;
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/npf/packet.h
--- branches/cache_manager_rewrite/reactos/drivers/net/npf/packet.h
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/net/npf/packet.h
2005-06-04 19:50:39 UTC (rev 15789)
@@ -32,13 +32,9 @@
 #define NTKERNEL    ///< Forces the compilation of the jitter with
kernel calls
-#ifdef __GNUC__
+struct bpf_insn;
 #undef EXIT_SUCCESS
 #undef EXIT_FAILURE
-#define UNICODE_NULL ((WCHAR)0) // winnt
-#include "win_bpf.h"
-#include <internal/ps.h>
-#endif
 #include "jitter.h"
 #include "tme.h"
  _____
Modified: branches/cache_manager_rewrite/reactos/drivers/net/npf/read.c
--- branches/cache_manager_rewrite/reactos/drivers/net/npf/read.c
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/net/npf/read.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -26,10 +26,8 @@
 #include <ndis.h>
 #else
 #include <ddk/ntddk.h>
-#include <net/ndis.h>
+#include <ddk/ndis.h>
-#define NdisMoveMappedMemory(Destination,Source,Length)
RtlCopyMemory(Destination,Source,Length)
-#define NdisZeroMappedMemory(Destination,Length)
RtlZeroMemory(Destination,Length)
 #define NdisReinitializePacket(Packet)
\
 {
\
        (Packet)->Private.Head = (PNDIS_BUFFER)NULL;
\
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/net/npf/win_bpf.h
--- branches/cache_manager_rewrite/reactos/drivers/net/npf/win_bpf.h
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/net/npf/win_bpf.h
2005-06-04 19:50:39 UTC (rev 15789)
@@ -47,7 +47,7 @@
 typedef UCHAR u_char;
 typedef USHORT u_short;
-typedef ULONG u_int;
+typedef UINT u_int;
 typedef LONG bpf_int32;
 typedef ULONG bpf_u_int32;
 typedef ULONG u_int32;
  _____
Modified: branches/cache_manager_rewrite/reactos/drivers/net/npf/write.c
--- branches/cache_manager_rewrite/reactos/drivers/net/npf/write.c
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/drivers/net/npf/write.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -26,7 +26,7 @@
 #include "ndis.h"
 #else
 #include <ddk/ntddk.h>
-#include <net/ndis.h>
+#include <ddk/ndis.h>
 #define NdisReinitializePacket(Packet)
\
 {
\
        (Packet)->Private.Head = (PNDIS_BUFFER)NULL;
\
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/video/displays/framebuf/s
creen.c
---
branches/cache_manager_rewrite/reactos/drivers/video/displays/framebuf/s
creen.c 2005-06-04 19:44:50 UTC (rev 15788)
+++
branches/cache_manager_rewrite/reactos/drivers/video/displays/framebuf/s
creen.c 2005-06-04 19:50:39 UTC (rev 15789)
@@ -158,7 +158,6 @@
       ModeInfoPtr = ModeInfo;
       while (ModeCount-- > 0)
       {
-
          if (ModeInfoPtr->Length > 0 &&
             pDevMode->dmPelsWidth == ModeInfoPtr->VisScreenWidth &&
              pDevMode->dmPelsHeight == ModeInfoPtr->VisScreenHeight &&
@@ -170,7 +169,8 @@
             break;
          }
-         ModeInfoPtr++;
+         ModeInfoPtr = (PVIDEO_MODE_INFORMATION)
+            (((PUCHAR)ModeInfoPtr) + ModeInfoSize);
       }
    }
@@ -383,6 +383,7 @@
    {
       if (ModeInfoPtr->Length == 0)
       {
+         ModeInfoPtr =
(PVIDEO_MODE_INFORMATION)(((ULONG_PTR)ModeInfoPtr) + ModeInfoSize);
          continue;
       }
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/video/miniport/vbe/vbemp.
c
---
branches/cache_manager_rewrite/reactos/drivers/video/miniport/vbe/vbemp.
c       2005-06-04 19:44:50 UTC (rev 15788)
+++
branches/cache_manager_rewrite/reactos/drivers/video/miniport/vbe/vbemp.
c       2005-06-04 19:50:39 UTC (rev 15789)
@@ -885,6 +885,14 @@
    VideoMode->YMillimeter = 0; /* FIXME */
    if (VBEMode->BitsPerPixel > 8)
    {
+      /*
+       * Always report 16bpp modes and not 15bpp mode...
+       */
+      if (VBEMode->BitsPerPixel == 15 && VBEMode->NumberOfPlanes == 1)
+      {
+         VideoMode->BitsPerPlane = 16;
+      }
+
       if (DeviceExtension->VbeInfo.Version < 0x300)
       {
          VideoMode->NumberRedBits = VBEMode->RedMaskSize;
  _____
Modified:
branches/cache_manager_rewrite/reactos/drivers/video/miniport/vbe/vbemp.
h
---
branches/cache_manager_rewrite/reactos/drivers/video/miniport/vbe/vbemp.
h       2005-06-04 19:44:50 UTC (rev 15788)
+++
branches/cache_manager_rewrite/reactos/drivers/video/miniport/vbe/vbemp.
h       2005-06-04 19:50:39 UTC (rev 15789)
@@ -32,7 +32,7 @@
 #include <ddk/ntapi.h>
 #ifdef DBG
-#define DPRINT(arg) DbgPrint arg;
+#define DPRINT(arg) DbgPrint(arg)
 #else
 #define DPRINT(arg)
 #endif
  _____
Modified:
branches/cache_manager_rewrite/reactos/hal/halx86/mp/mpconfig.c
--- branches/cache_manager_rewrite/reactos/hal/halx86/mp/mpconfig.c
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/hal/halx86/mp/mpconfig.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -16,7 +16,7 @@
 #include <apic.h>
 #include <ioapic.h>
-//#define NDEBUG
+#define NDEBUG
 #include <internal/debug.h>
 /* GLOBALS
******************************************************************/
@@ -58,7 +58,7 @@
   IRQCount++;
 }
-static PCHAR
+PCHAR
 HaliMPFamily(ULONG Family,
             ULONG Model)
 {
@@ -275,9 +275,9 @@
      {
        PUCHAR pc = (PUCHAR)&Table->Signature;
-       DPRINT1("Bad MP configuration block signature: %c%c%c%c\n",
+       DPRINT1("Bad MP configuration block signature: %c%c%c%c\n",
                pc[0], pc[1], pc[2], pc[3]);
-       KEBUGCHECK(0);
+       KEBUGCHECKEX(0, pc[0], pc[1], pc[2], pc[3]);
        return FALSE;
      }
  _____
Modified: branches/cache_manager_rewrite/reactos/include/debug.h
--- branches/cache_manager_rewrite/reactos/include/debug.h
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/include/debug.h
2005-06-04 19:50:39 UTC (rev 15789)
@@ -48,12 +48,20 @@
 #endif
 #endif
-
 /* TODO: Make the output of file/line and the debug message atomic */
+#ifdef DBG
 #define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint
 #define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); }
while(0);
+#else
+#ifdef __GNUC__
+#define DPRINT1(args...)
+#define CHECKPOINT1
+#else
+#define DPRINT1
+#define CHECKPOINT1
+#endif /* __GNUC__ */
+#endif
-
 #ifndef NDEBUG
 #define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__);
DbgPrint(args); } while(0);
 #define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); }
while(0);
  _____
Deleted: branches/cache_manager_rewrite/reactos/include/ndis.h
--- branches/cache_manager_rewrite/reactos/include/ndis.h
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/include/ndis.h
2005-06-04 19:50:39 UTC (rev 15789)
@@ -1 +0,0 @@
-#include "net/ndis.h"
  _____
Modified: branches/cache_manager_rewrite/reactos/include/ntdll/ntdll.h
--- branches/cache_manager_rewrite/reactos/include/ntdll/ntdll.h
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/include/ntdll/ntdll.h
2005-06-04 19:50:39 UTC (rev 15789)
@@ -29,12 +29,17 @@
 #define CHECKPOINT do { DbgPrint("(NTDLL:%s:%d)
Checkpoint\n",__FILE__,__LINE__); } while(0)
 #endif
+#ifdef DBG
 #if defined(__GNUC__)
 #define DPRINT1(args...) do { DbgPrint("(NTDLL:%s:%d)
",__FILE__,__LINE__); DbgPrint(args); } while(0)
 #else
 #define DPRINT1              DbgPrint("(NTDLL:%s:%d)
",__FILE__,__LINE__); DbgPrint
 #endif
 #define CHECKPOINT1 do { DbgPrint("(NTDLL:%s:%d)
Checkpoint\n",__FILE__,__LINE__); } while(0)
+#else
+#define DPRINT1(args...)
+#define CHECKPOINT1(args...)
+#endif
 #define ROUNDUP(a,b)   ((((a)+(b)-1)/(b))*(b))
 #define ROUNDDOWN(a,b) (((a)/(b))*(b))
  _____
Modified: branches/cache_manager_rewrite/reactos/include/win32k/debug1.h
--- branches/cache_manager_rewrite/reactos/include/win32k/debug1.h
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/include/win32k/debug1.h
2005-06-04 19:50:39 UTC (rev 15789)
@@ -39,10 +39,14 @@
 #endif
 #endif
+#ifdef DBG
 #define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint
 #define CHECKPOINT1 DbgPrint("%s:%d\n",__FILE__,__LINE__);
+#else
+#define DPRINT1(args...)
+#define CHECKPOINT1(args...)
+#endif
-
 #ifdef __NTOSKRNL__
 #define DPRINT_CHECKS
 #else
  _____
Modified: branches/cache_manager_rewrite/reactos/include/wine/debug.h
--- branches/cache_manager_rewrite/reactos/include/wine/debug.h
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/include/wine/debug.h
2005-06-04 19:50:39 UTC (rev 15789)
@@ -12,7 +12,11 @@
 unsigned long DbgPrint(char *Format,...);
+#ifdef DBG
 #define DPRINT1 DbgPrint("(%s:%d:%s) ",__FILE__,__LINE__,__FUNCTION__),
DbgPrint
+#else
+#define DPRINT1(args...)
+#endif
 #if !defined(DBG) || !defined(YDEBUG)
 #ifdef __GNUC__
  _____
Modified:
branches/cache_manager_rewrite/reactos/include/wine/exception.h
--- branches/cache_manager_rewrite/reactos/include/wine/exception.h
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/include/wine/exception.h
2005-06-04 19:50:39 UTC (rev 15789)
@@ -24,6 +24,7 @@
 #include <setjmp.h>
 #include <windef.h>
 #include <excpt.h>
+#include <wine/port.h>
 /* The following definitions allow using exceptions in Wine and Winelib
code
  *
@@ -75,6 +76,10 @@
 #else  /* USE_COMPILER_EXCEPTIONS */
+#ifndef __GNUC__
+#define __attribute__(x) /* nothing */
+#endif
+
 #define __TRY \
     do { __WINE_FRAME __f; \
          int __first = 1; \
@@ -91,7 +96,7 @@
              __f.u.filter = (func); \
              __wine_push_frame( &__f.frame ); \
              if (sigsetjmp( __f.jmp, 1 )) { \
-                 const __WINE_FRAME * const __eptr WINE_UNUSED = &__f;
\
+                 const __WINE_FRAME * const __eptr
__attribute__((unused)) = &__f; \
                  do {
 #define __ENDTRY \
@@ -125,10 +130,7 @@
 #define GetExceptionInformation() (__eptr)
 #define GetExceptionCode()
(__eptr->ExceptionRecord->ExceptionCode)
-#if defined(AbnormalTermination) && defined(__REACTOS__)
 #undef AbnormalTermination
-#endif
-
 #define AbnormalTermination()     (!__normal)
 typedef struct __tagWINE_FRAME
@@ -175,8 +177,6 @@
 {
 #if defined(__GNUC__) && defined(__i386__)
     __asm__ __volatile__(".byte 0x64\n\tmovl %0,(0)"
-                         //: : "r" (frame->Prev) : "memory" );
-    //return frame->Prev;
                          : : "r" (frame->prev) : "memory" );
     return frame->prev;
  _____
Modified: branches/cache_manager_rewrite/reactos/include/wine/msidefs.h
--- branches/cache_manager_rewrite/reactos/include/wine/msidefs.h
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/include/wine/msidefs.h
2005-06-04 19:50:39 UTC (rev 15789)
@@ -23,6 +23,17 @@
 extern "C" {
 #endif
+enum msidbFileAttributes {
+    msidbFileAttributesReadOnly = 0x00000001,
+    msidbFileAttributesHidden = 0x00000002,
+    msidbFileAttributesSystem = 0x00000004,
+    msidbFileAttributesVital = 0x00000200,
+    msidbFileAttributesChecksum = 0x00000400,
+    msidbFileAttributesPatchAdded = 0x00001000,
+    msidbFileAttributesNoncompressed = 0x00002000,
+    msidbFileAttributesCompressed = 0x00004000
+};
+
 enum msidbDialogAttributes {
     msidbDialogAttributesVisible = 0x00000001,
     msidbDialogAttributesModal = 0x00000002,
@@ -103,6 +114,22 @@
     msidbComponentAttributes64bit = 0x00000100
 };
+enum msidbRegistryRoot
+{
+    msidbRegistryRootClassesRoot = 0,
+    msidbRegistryRootCurrentUser = 1,
+    msidbRegistryRootLocalMachine = 2,
+    msidbRegistryRootUsers = 3,
+};
+
+enum msidbLocatorType
+{
+    msidbLocatorTypeDirectory = 0x000,
+    msidbLocatorTypeFileName = 0x001,
+    msidbLocatorTypeRawValue = 0x002,
+    msidbLocatorType64bit = 0x010,
+};
+
 /*
  * Windows SDK braindamage alert
  *
  _____
Modified: branches/cache_manager_rewrite/reactos/lib/cabinet/Makefile.in
--- branches/cache_manager_rewrite/reactos/lib/cabinet/Makefile.in
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/lib/cabinet/Makefile.in
2005-06-04 19:50:39 UTC (rev 15789)
@@ -3,6 +3,7 @@
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cabinet.dll
+IMPORTLIB = libcabinet.$(IMPLIBEXT)
 IMPORTS   = kernel32
 C_SRCS = \
  _____
Modified: branches/cache_manager_rewrite/reactos/lib/cabinet/cabinet.h
--- branches/cache_manager_rewrite/reactos/lib/cabinet/cabinet.h
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/lib/cabinet/cabinet.h
2005-06-04 19:50:39 UTC (rev 15789)
@@ -2,6 +2,7 @@
  * cabinet.h
  *
  * Copyright 2002 Greg Turner
+ * Copyright 2005 Gerold Jens Wucherpfennig
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -292,6 +293,19 @@
 typedef struct {
   unsigned int     FCI_Intmagic;
+  PERF perf;
+  PFNFCIFILEPLACED   pfnfiledest;
+  PFNFCIALLOC        pfnalloc;
+  PFNFCIFREE         pfnfree;
+  PFNFCIOPEN         pfnopen;
+  PFNFCIREAD         pfnread;
+  PFNFCIWRITE        pfnwrite;
+  PFNFCICLOSE        pfnclose;
+  PFNFCISEEK         pfnseek;
+  PFNFCIDELETE       pfndelete;
+  PFNFCIGETTEMPFILE  pfnfcigtf;
+  PCCAB              pccab;
+  void *pv;
 } FCI_Int, *PFCI_Int;
 typedef struct {
@@ -307,7 +321,7 @@
 } FDI_Int, *PFDI_Int;
 /* cast an HFCI into a PFCI_Int */
-#define PFCI_INT(hfci) ((PFDI_Int)(hfci))
+#define PFCI_INT(hfci) ((PFCI_Int)(hfci))
 /* cast an HFDI into a PFDI_Int */
 #define PFDI_INT(hfdi) ((PFDI_Int)(hfdi))
  _____
Modified: branches/cache_manager_rewrite/reactos/lib/cabinet/fci.c
--- branches/cache_manager_rewrite/reactos/lib/cabinet/fci.c
2005-06-04 19:44:50 UTC (rev 15788)
+++ branches/cache_manager_rewrite/reactos/lib/cabinet/fci.c
2005-06-04 19:50:39 UTC (rev 15789)
@@ -2,6 +2,7 @@
  * File Compression Interface
  *
  * Copyright 2002 Patrik Stridvall
+ * Copyright 2005 Gerold Jens Wucherpfennig
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -26,6 +27,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "fci.h"
+#include "cabinet.h"
 #include "wine/debug.h"
@@ -33,12 +35,55 @@
/***********************************************************************
  *             FCICreate (CABINET.10)
+ *
+ * Provided with several callbacks,
+ * returns a handle which can be used to perform operations
+ * on cabinet files.
+ *
+ * PARAMS
+ *   perf       [IO]  A pointer to an ERF structure.  When FCICreate
+ *                    returns an error condition, error information may
+ *                    be found here as well as from GetLastError.
+ *   pfnfiledest [I]  A pointer to a function which is called when a
file
+ *                    is placed. Only useful for subsequent cabinet
files.
+ *   pfnalloc    [I]  A pointer to a function which allocates ram.
Uses
+ *                    the same interface as malloc.
+ *   pfnfree     [I]  A pointer to a function which frees ram.  Uses
the
+ *                    same interface as free.
+ *   pfnopen     [I]  A pointer to a function which opens a file.  Uses
+ *                    the same interface as _open.
+ *   pfnread     [I]  A pointer to a function which reads from a file
into
+ *                    a caller-provided buffer.  Uses the same
interface
+ *                    as _read
+ *   pfnwrite    [I]  A pointer to a function which writes to a file
from
+ *                    a caller-provided buffer.  Uses the same
interface
+ *                    as _write.
+ *   pfnclose    [I]  A pointer to a function which closes a file
handle.
+ *                    Uses the same interface as _close.
+ *   pfnseek     [I]  A pointer to a function which seeks in a file.
+ *                    Uses the same interface as _lseek.
+ *   pfndelete   [I]  A pointer to a function which deletes a file.
+ *   pfnfcigtf   [I]  A pointer to a function which gets the name of a
+ *                    temporary file; ignored in wine
+ *   pccab       [I]  A pointer to an initialized CCAB structure
+ *   pv          [I]  A pointer to an application-defined notification
+ *                    function which will be passed to other FCI
functions
+ *                    as a parameter.
+ *
+ * RETURNS
+ *   On success, returns an FCI handle of type HFCI.
+ *   On failure, the NULL file handle is returned. Error
+ *   info can be retrieved from perf.
+ *
+ * INCLUDES
+ *   fci.h
+ *
  */
 HFCI __cdecl FCICreate(
        PERF perf,
-       PFNFCIFILEPLACED   pfnfcifp,
-       PFNFCIALLOC        pfna,
-       PFNFCIFREE         pfnf,
+       PFNFCIFILEPLACED   pfnfiledest,
+       PFNFCIALLOC        pfnalloc,
+       PFNFCIFREE         pfnfree,
        PFNFCIOPEN         pfnopen,
        PFNFCIREAD         pfnread,
        PFNFCIWRITE        pfnwrite,
@@ -49,17 +94,57 @@
        PCCAB              pccab,
        void *pv)
 {
-    FIXME("(%p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p):
stub\n",
-         perf, pfnfcifp, pfna, pfnf, pfnopen, pfnread, pfnwrite,
pfnclose,
-         pfnseek, pfndelete, pfnfcigtf, pccab, pv);
+  HFCI rv;
+  if ((!pfnalloc) || (!pfnfree)) {
     perf->erfOper = FCIERR_NONE;
-    perf->erfType = 0;
+    perf->erfType = ERROR_BAD_ARGUMENTS;
     perf->fError = TRUE;
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    SetLastError(ERROR_BAD_ARGUMENTS);
+    return NULL;
+  }
+  if (!(rv = (HFCI) (*pfnalloc)(sizeof(FCI_Int)))) {
+    perf->erfOper = FCIERR_ALLOC_FAIL;
+    perf->erfType = ERROR_NOT_ENOUGH_MEMORY;
+    perf->fError = TRUE;
+
+    SetLastError(ERROR_NOT_ENOUGH_MEMORY);
     return NULL;
+  }
+
+  PFCI_INT(rv)->FCI_Intmagic = FCI_INT_MAGIC;
+  PFCI_INT(rv)->perf = perf;
+  PFCI_INT(rv)->pfnfiledest = pfnfiledest;
+  PFCI_INT(rv)->pfnalloc = pfnalloc;
+  PFCI_INT(rv)->pfnfree = pfnfree;
+  PFCI_INT(rv)->pfnopen = pfnopen;
+  PFCI_INT(rv)->pfnread = pfnread;
+  PFCI_INT(rv)->pfnwrite = pfnwrite;
+  PFCI_INT(rv)->pfnclose = pfnclose;
+  PFCI_INT(rv)->pfnseek = pfnseek;
+  PFCI_INT(rv)->pfndelete = pfndelete;
+  PFCI_INT(rv)->pfnfcigtf = pfnfcigtf;
+  PFCI_INT(rv)->pccab = pccab;
+  PFCI_INT(rv)->pv = pv;
+
+  /* Still mark as incomplete, because of other missing FCI* APIs */
+
[truncated at 1000 lines; 25106 more skipped]