[ros-diffs] [pschweitzer] 42576: Other resync. Now branch builds up to cmd.

Author: pschweitzer
Date: Mon Aug 10 00:30:16 2009
New Revision: 42576

URL: http://svn.reactos.org/svn/reactos?rev=42576&view=rev
Log:
Other resync.
Now branch builds up to cmd.

Added:
    branches/pierre-fsd/drivers/base/bootvid/bootvid.spec   (with props)
Removed:
    branches/pierre-fsd/drivers/base/bootvid/bootvid_arm.def
    branches/pierre-fsd/drivers/base/bootvid/bootvid_i386.def
Modified:
    branches/pierre-fsd/drivers/base/bootvid/bootvid.rbuild
    branches/pierre-fsd/drivers/base/bootvid/i386/bootvid.c
    branches/pierre-fsd/drivers/network/afd/afd/main.c
    branches/pierre-fsd/include/ddk/winddi.h

Modified: branches/pierre-fsd/drivers/base/bootvid/bootvid.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/base/bootvid…
==============================================================================
--- branches/pierre-fsd/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] (original)
+++ branches/pierre-fsd/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] Mon Aug 10
00:30:16 2009
@@ -14,7 +14,7 @@
 		</directory>
 	</if>
 	<if property="ARCH" value="arm">
-        <directory name="arm">
+		<directory name="arm">
 			<file>bootvid.c</file>
 			<file>bootdata.c</file>
 		</directory>

Added: branches/pierre-fsd/drivers/base/bootvid/bootvid.spec
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/base/bootvid…
==============================================================================
--- branches/pierre-fsd/drivers/base/bootvid/bootvid.spec (added)
+++ branches/pierre-fsd/drivers/base/bootvid/bootvid.spec [iso-8859-1] Mon Aug 10 00:30:16
2009
@@ -1,0 +1,11 @@
+@ stdcall VidBitBlt(ptr long long)
+@ stdcall VidBufferToScreenBlt(ptr long long long long long)
+@ stdcall VidCleanUp()
+@ stdcall VidDisplayString(str)
+@ stdcall VidDisplayStringXY(str long long long)
+@ stdcall VidInitialize(long)
+@ stdcall VidResetDisplay(long)
+@ stdcall VidScreenToBufferBlt(ptr long long long long long)
+@ stdcall VidSetScrollRegion(long long long long)
+@ stdcall VidSetTextColor(long)
+@ stdcall VidSolidColorFill(long long long long long)

Propchange: branches/pierre-fsd/drivers/base/bootvid/bootvid.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Removed: branches/pierre-fsd/drivers/base/bootvid/bootvid_arm.def
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/base/bootvid…
==============================================================================
--- branches/pierre-fsd/drivers/base/bootvid/bootvid_arm.def [iso-8859-1] (original)
+++ branches/pierre-fsd/drivers/base/bootvid/bootvid_arm.def (removed)
@@ -1,15 +1,0 @@
-LIBRARY BOOTVID.DLL
-
-EXPORTS
-VidBitBlt
-VidBufferToScreenBlt
-VidCleanUp
-VidDisplayString
-VidDisplayStringXY
-VidInitialize
-VidResetDisplay
-VidScreenToBufferBlt
-VidSetScrollRegion
-VidSetTextColor
-VidSolidColorFill
-

Removed: branches/pierre-fsd/drivers/base/bootvid/bootvid_i386.def
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/base/bootvid…
==============================================================================
--- branches/pierre-fsd/drivers/base/bootvid/bootvid_i386.def [iso-8859-1] (original)
+++ branches/pierre-fsd/drivers/base/bootvid/bootvid_i386.def (removed)
@@ -1,15 +1,0 @@
-LIBRARY BOOTVID.DLL
-
-EXPORTS
-VidBitBlt@12
-VidBufferToScreenBlt@24
-VidCleanUp@0
-VidDisplayString@4
-VidDisplayStringXY
-VidInitialize@4
-VidResetDisplay@4
-VidScreenToBufferBlt@24
-VidSetScrollRegion@16
-VidSetTextColor@4
-VidSolidColorFill@20
-

Modified: branches/pierre-fsd/drivers/base/bootvid/i386/bootvid.c
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/base/bootvid…
==============================================================================
--- branches/pierre-fsd/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] (original)
+++ branches/pierre-fsd/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] Mon Aug 10
00:30:16 2009
@@ -301,10 +301,10 @@
     }
 
     /* Write the registers we read earlier */
-    WRITE_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3CF, VgaReg);
+    WRITE_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3CF, VgaReg2);
     WRITE_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3CE, 8);
-    WRITE_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3CF, VgaReg2);
-    WRITE_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3CE, VgaReg3);
+    WRITE_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3CF, VgaReg3);
+    WRITE_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3CE, VgaReg);
 
     /* Read sequencer address */
     SeqReg = READ_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3C4);

Modified: branches/pierre-fsd/drivers/network/afd/afd/main.c
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/network/afd/…
==============================================================================
--- branches/pierre-fsd/drivers/network/afd/afd/main.c [iso-8859-1] (original)
+++ branches/pierre-fsd/drivers/network/afd/afd/main.c [iso-8859-1] Mon Aug 10 00:30:16
2009
@@ -178,16 +178,19 @@
     InFlightRequest[0] = &FCB->ListenIrp;
     InFlightRequest[1] = &FCB->ReceiveIrp;
     InFlightRequest[2] = &FCB->SendIrp;
+    InFlightRequest[3] = &FCB->ConnectIrp;
 
     /* Return early here because we might be called in the mean time. */
     if( FCB->Critical ||
 	FCB->ListenIrp.InFlightRequest ||
 	FCB->ReceiveIrp.InFlightRequest ||
-	FCB->SendIrp.InFlightRequest ) {
-	AFD_DbgPrint(MIN_TRACE,("Leaving socket alive (%x %x %x)\n",
+	FCB->SendIrp.InFlightRequest ||
+	FCB->ConnectIrp.InFlightRequest ) {
+	AFD_DbgPrint(MIN_TRACE,("Leaving socket alive (%x %x %x %x)\n",
 				FCB->ListenIrp.InFlightRequest,
 				FCB->ReceiveIrp.InFlightRequest,
-				FCB->SendIrp.InFlightRequest));
+				FCB->SendIrp.InFlightRequest,
+				FCB->ConnectIrp.InFlightRequest));
         ReturnEarly = TRUE;
     }
 
@@ -196,7 +199,6 @@
 
     /* Cancel our pending requests */
     for( i = 0; i < IN_FLIGHT_REQUESTS; i++ ) {
-	NTSTATUS Status = STATUS_NO_SUCH_FILE;
 	if( InFlightRequest[i]->InFlightRequest ) {
 	    AFD_DbgPrint(MID_TRACE,("Cancelling in flight irp %d (%x)\n",
 				    i, InFlightRequest[i]->InFlightRequest));

Modified: branches/pierre-fsd/include/ddk/winddi.h
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/winddi.h…
==============================================================================
--- branches/pierre-fsd/include/ddk/winddi.h [iso-8859-1] (original)
+++ branches/pierre-fsd/include/ddk/winddi.h [iso-8859-1] Mon Aug 10 00:30:16 2009
@@ -540,11 +540,15 @@
   FWORD  fwdKern;
 } FD_KERNINGPAIR;
 
+#if defined(_X86_) && !defined(USERMODE_DRIVER)
 typedef struct _FLOATOBJ
 {
   ULONG  ul1;
   ULONG  ul2;
 } FLOATOBJ, *PFLOATOBJ;
+#else
+typedef FLOAT FLOATOBJ, *PFLOATOBJ;
+#endif
 
 typedef struct _FLOATOBJ_XFORM {
   FLOATOBJ  eM11;
@@ -2294,6 +2298,7 @@
   IN DWORD  cbBuf,
   OUT LPDWORD  pcWritten);
 
+#if defined(_X86_) && !defined(USERMODE_DRIVER)
 WIN32KAPI
 VOID
 APIENTRY
@@ -3803,12 +3808,6 @@
   IN POINTL  *pptlBrushOrg,
   IN MIX  mix);
 
-typedef VOID 
-(APIENTRY *PFN_DrvMovePanning)(
-  IN LONG    x,
-  IN LONG    y,
-  IN FLONG   fl);
-
 typedef BOOL
 (APIENTRY *PFN_DrvPlgBlt)(
   IN SURFOBJ  *psoTrg,