[fireball] 57372: - Compiling fixes. - CMake switch.

Author: fireball
Date: Sun Sep 23 20:35:42 2012
New Revision: 57372

URL: http://svn.reactos.org/svn/reactos?rev=57372&view=rev
Log:
- Compiling fixes.
- CMake switch.

Added:
    branches/arwinss/reactos/subsystems/win32/win32k/CMakeLists.txt   (with props)
    branches/arwinss/reactos/subsystems/win32/win32k/include/napi.h
      - copied, changed from r50633, trunk/reactos/subsystems/win32/win32k/include/napi.h
    branches/arwinss/reactos/subsystems/win32/win32k/win32k.spec
      - copied, changed from r50632,
branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec
Removed:
    branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec
Modified:
    branches/arwinss/reactos/subsystems/win32/win32k/eng/engxform.c
    branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h

Added: branches/arwinss/reactos/subsystems/win32/win32k/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/CMakeLists.txt (added)
+++ branches/arwinss/reactos/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Sun Sep
23 20:35:42 2012
@@ -1,0 +1,146 @@
+spec2def(win32k.sys win32k.spec ADD_IMPORTLIB)
+
+include_directories(
+    .
+    include
+    ${REACTOS_SOURCE_DIR}/win32ss
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/include
+    ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include
+    ${REACTOS_SOURCE_DIR}/include/reactos/subsys
+    ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
+
+add_definitions(
+    -DLANGPACK
+    -D_WIN32K_)
+
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dib)
+
+list(APPEND GENDIB_FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/dib/dib8gen.c
+    ${CMAKE_CURRENT_BINARY_DIR}/dib/dib16gen.c
+    ${CMAKE_CURRENT_BINARY_DIR}/dib/dib32gen.c)
+
+add_custom_command(
+    OUTPUT ${GENDIB_FILES}
+    COMMAND native-gendib ${CMAKE_CURRENT_BINARY_DIR}/dib
+    DEPENDS native-gendib)
+
+list(APPEND SOURCE
+    dib/dib1bpp.c
+    dib/dib4bpp.c
+    dib/dib8bpp.c
+    dib/dib16bpp.c
+    dib/dib24bpp.c
+    dib/dib32bpp.c
+    dib/floodfill.c
+    dib/stretchblt.c
+    eng/device.c
+    eng/driver.c
+    eng/engblt.c
+    eng/engbrush.c
+    eng/engclip.c
+    eng/engdev.c
+    eng/engdrv.c
+    eng/engevent.c
+    eng/engerror.c
+    eng/engfile.c
+    eng/engfloat.c
+    eng/engfont.c
+    eng/engmem.c
+    eng/engmisc.c
+    eng/engpaint.c
+    eng/engpal.c
+    eng/engpath.c
+    eng/engpointer.c
+    eng/engprint.c
+    eng/engquery.c
+    eng/engrtl.c
+    eng/engsem.c
+    eng/engsurf.c
+    eng/engtext.c
+    eng/engwnd.c
+    eng/engxform.c
+    eng/engxlate.c
+    gdi/bitmap.c
+    gdi/dc.c
+    gdi/enum.c
+    gdi/misc.c
+    gre/arc.c
+    gre/bitblt.c
+    gre/brushobj.c
+    gre/clipobj.c
+    gre/drawing.c
+    gre/ellipse.c
+    gre/font.c
+    gre/gdiobj.c
+    gre/lineto.c
+    gre/pen.c
+    gre/polyfill.c
+    gre/rect.c
+    gre/surfobj.c
+    main/csr.c
+    main/err.c
+    main/init.c
+    main/cursor.c
+    main/display.c
+    main/monitor.c
+    main/kbdlayout.c
+    main/keyboard.c
+    swm/winman.c
+    wine/atom.c
+    wine/class.c
+    wine/clipboard.c
+    wine/directory.c
+    wine/handle.c
+    wine/hook.c
+    wine/main.c
+    wine/object.c
+    wine/process.c
+    wine/queue.c
+    wine/region.c
+    wine/stubs.c
+    wine/timeout.c
+    wine/user.c
+    wine/window.c
+    wine/winesup.c
+    wine/winstation.c
+    win32k.rc)
+
+list(APPEND SOURCE
+    dib/dib.c
+    ${GENDIB_FILES})
+
+if(ARCH MATCHES i386)
+list(APPEND SOURCE
+    dib/i386/dib24bpp_hline.s
+    dib/i386/dib32bpp_hline.s
+    dib/i386/dib32bpp_colorfill.s
+    eng/i386/floatobj.S
+    math/i386/cos_asm.s
+    math/i386/sin_asm.s
+    math/i386/atan2_asm.s
+    math/i386/floor_asm.s
+    math/i386/ceil_asm.s)
+else()
+list(APPEND SOURCE
+    dib/dib24bppc.c
+    dib/dib32bppc.c)
+endif()
+
+add_library(win32k SHARED
+    ${CMAKE_CURRENT_BINARY_DIR}/win32k.def
+    ${SOURCE})
+
+set_module_type(win32k kernelmodedriver)
+
+target_link_libraries(win32k
+    ${PSEH_LIB}
+    dxguid
+    libcntpr)
+
+add_importlibs(win32k ntoskrnl hal)
+add_pch(win32k pch.h)
+add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all)
+
+add_library(win32ksys sys-stubs.S)
+set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h)

Propchange: branches/arwinss/reactos/subsystems/win32/win32k/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engxform.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/eng/engxform.c [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engxform.c [iso-8859-1] Sun Sep
23 20:35:42 2012
@@ -95,16 +95,16 @@
 ULONG
 HintFromAccel(ULONG flAccel)
 {
-    switch (flAccel & (MX_NOTRANSLATE |  MX_IDENTITYSCALE | MX_SCALE))
-    {
-    case (MX_SCALE | MX_IDENTITYSCALE | MX_NOTRANSLATE):
-        return GX_IDENTITY;
-    case (MX_SCALE | MX_IDENTITYSCALE):
-        return GX_OFFSET;
-    case MX_SCALE:
-        return GX_SCALE;
-    default:
-        return GX_GENERAL;
+    switch (flAccel & (XFORM_SCALE|XFORM_UNITY|XFORM_NO_TRANSLATION))
+    {
+        case (XFORM_SCALE|XFORM_UNITY|XFORM_NO_TRANSLATION):
+            return GX_IDENTITY;
+        case (XFORM_SCALE|XFORM_UNITY):
+            return GX_OFFSET;
+        case XFORM_SCALE:
+            return GX_SCALE;
+        default:
+            return GX_GENERAL;
     }
 }
 
@@ -115,7 +115,7 @@
 XFORMOBJ_UpdateAccel(
     IN XFORMOBJ *pxo)
 {
-    PMATRIX pmx = (PMATRIX)pxo;
+    PMATRIX pmx = (PMATRIX)pxo;//XFORMOBJ_pmx(pxo);
 
     /* Copy Dx and Dy to FIX format */
     pmx->fxDx = FLOATOBJ_GetFix(&pmx->efDx);
@@ -124,27 +124,27 @@
     pmx->flAccel = 0;
 
     if (FLOATOBJ_Equal0(&pmx->efDx) &&
-            FLOATOBJ_Equal0(&pmx->efDy))
-    {
-        pmx->flAccel |= MX_NOTRANSLATE;
+        FLOATOBJ_Equal0(&pmx->efDy))
+    {
+        pmx->flAccel |= XFORM_NO_TRANSLATION;
     }
 
     if (FLOATOBJ_Equal0(&pmx->efM12) &&
-            FLOATOBJ_Equal0(&pmx->efM21))
-    {
-        pmx->flAccel |= MX_SCALE;
+        FLOATOBJ_Equal0(&pmx->efM21))
+    {
+        pmx->flAccel |= XFORM_SCALE;
     }
 
     if (FLOATOBJ_Equal1(&pmx->efM11) &&
-            FLOATOBJ_Equal1(&pmx->efM22))
-    {
-        pmx->flAccel |= MX_IDENTITYSCALE;
+        FLOATOBJ_Equal1(&pmx->efM22))
+    {
+        pmx->flAccel |= XFORM_UNITY;
     }
 
     if (FLOATOBJ_IsLong(&pmx->efM11) &&
FLOATOBJ_IsLong(&pmx->efM12) &&
-            FLOATOBJ_IsLong(&pmx->efM21) &&
FLOATOBJ_IsLong(&pmx->efM22))
-    {
-        pmx->flAccel |= MX_INTEGER;
+        FLOATOBJ_IsLong(&pmx->efM21) &&
FLOATOBJ_IsLong(&pmx->efM22))
+    {
+        pmx->flAccel |= XFORM_INTEGER;
     }
 
     return HintFromAccel(pmx->flAccel);
@@ -296,56 +296,57 @@
     FLOATOBJ fo1, fo2;
     FLONG flAccel;
 
-    pmx = (PMATRIX)pxo;
-    flAccel = pmx->flAccel & (MX_INTEGER|MX_SCALE|MX_IDENTITYSCALE);
-
-    switch (flAccel)
-    {
-    case (MX_SCALE | MX_IDENTITYSCALE):
-    case (MX_SCALE | MX_IDENTITYSCALE | MX_INTEGER):
+    pmx = (PMATRIX)pxo;//XFORMOBJ_pmx(pxo);
+    flAccel = pmx->flAccel;
+
+    if ((flAccel & (XFORM_SCALE|XFORM_UNITY)) == (XFORM_SCALE|XFORM_UNITY))
+    {
         /* Identity transformation, nothing todo */
-        break;
-
-    case (MX_IDENTITYSCALE | MX_INTEGER):
-        /* 1-scale integer transform */
-        i = cPoints - 1;
-        do
-        {
-            LONG x = pptIn[i].x + pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM21);
-            LONG y = pptIn[i].y + pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM12);
-            pptOut[i].y = y;
-            pptOut[i].x = x;
-        }
-        while (--i >= 0);
-        break;
-
-    case (MX_SCALE | MX_INTEGER):
-        /* Diagonal integer transform */
-        i = cPoints - 1;
-        do
-        {
-            pptOut[i].x = pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM11);
-            pptOut[i].y = pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM22);
-        }
-        while (--i >= 0);
-        break;
-
-    case (MX_INTEGER):
-        /* Full integer transform */
-        i = cPoints - 1;
-        do
-        {
-            LONG x;
-            x  = pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM11);
-            x += pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM21);
-            pptOut[i].y  = pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM22);
-            pptOut[i].y += pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM12);
-            pptOut[i].x = x;
-        }
-        while (--i >= 0);
-        break;
-
-    case (MX_IDENTITYSCALE):
+    }
+    else if (flAccel & XFORM_INTEGER)
+    {
+        if (flAccel & XFORM_UNITY)
+        {
+            /* 1-scale integer transform */
+            i = cPoints - 1;
+            do
+            {
+                LONG x = pptIn[i].x + pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM21);
+                LONG y = pptIn[i].y + pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM12);
+                pptOut[i].y = y;
+                pptOut[i].x = x;
+            }
+            while (--i >= 0);
+        }
+        else if (flAccel & XFORM_SCALE)
+        {
+            /* Diagonal integer transform */
+            i = cPoints - 1;
+            do
+            {
+                pptOut[i].x = pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM11);
+                pptOut[i].y = pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM22);
+            }
+            while (--i >= 0);
+        }
+        else
+        {
+            /* Full integer transform */
+            i = cPoints - 1;
+            do
+            {
+                LONG x;
+                x  = pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM11);
+                x += pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM21);
+                pptOut[i].y  = pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM22);
+                pptOut[i].y += pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM12);
+                pptOut[i].x = x;
+            }
+            while (--i >= 0);
+        }
+    }
+    else if (flAccel & XFORM_UNITY)
+    {
         /* 1-scale transform */
         i = cPoints - 1;
         do
@@ -358,9 +359,9 @@
             pptOut[i].y = pptIn[i].y + FLOATOBJ_GetLong(&fo2);
         }
         while (--i >= 0);
-        break;
-
-    case (MX_SCALE):
+    }
+    else if (flAccel & XFORM_SCALE)
+    {
         /* Diagonal float transform */
         i = cPoints - 1;
         do
@@ -373,9 +374,9 @@
             pptOut[i].y = FLOATOBJ_GetLong(&fo2);
         }
         while (--i >= 0);
-        break;
-
-    default:
+    }
+    else
+    {
         /* Full float transform */
         i = cPoints - 1;
         do
@@ -386,16 +387,14 @@
             pptOut[i].y = FLOATOBJ_GetLong(&fo2);
         }
         while (--i >= 0);
-        break;
-    }
-
-    if (!(pmx->flAccel & MX_NOTRANSLATE))
+    }
+
+    if (!(pmx->flAccel & XFORM_NO_TRANSLATION))
     {
         /* Translate points */
         i = cPoints - 1;
         do
         {
-//		DPRINT1("Translating Points (%d,%d)->(%d,%d)\n", pptOut[i].x,
pptOut[i].y, pptOut[i].x + pmx->fxDx, pptOut[i].y + pmx->fxDy);
             pptOut[i].x += pmx->fxDx;
             pptOut[i].y += pmx->fxDy;
         }

Copied: branches/arwinss/reactos/subsystems/win32/win32k/include/napi.h (from r50633,
trunk/reactos/subsystems/win32/win32k/include/napi.h)
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/napi.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/include/napi.h [iso-8859-1] Sun Sep
23 20:35:42 2012
@@ -5,7 +5,7 @@
  * PROGRAMMER:      Timo Kreuzer
  */
 
-#define SVC_(name, argcount) (ULONG_PTR)Nt##name,
+#define SVC_(name, argcount) (ULONG_PTR)name,
 ULONG_PTR Win32kSSDT[] = {
 #include "w32ksvc.h"
 };
@@ -16,7 +16,7 @@
 #include "w32ksvc.h"
 };
 
-#define MIN_SYSCALL_NUMBER    0
+#define MIN_SYSCALL_NUMBER    0x1000
 #define NUMBER_OF_SYSCALLS    (sizeof(Win32kSSPT) / sizeof(Win32kSSPT[0]))
-#define MAX_SYSCALL_NUMBER    (NUMBER_OF_SYSCALLS - 1)
+#define MAX_SYSCALL_NUMBER    0x1000 + (NUMBER_OF_SYSCALLS - 1)
 ULONG Win32kNumberOfSysCalls = NUMBER_OF_SYSCALLS;

Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Sun Sep
23 20:35:42 2012
@@ -46,12 +46,12 @@
 #include <csrss/csrss.h>
 
 /* Public Win32K Headers */
-#include <win32k/callback.h>
-#include <win32k/ntusrtyp.h>
-#include <win32k/ntuser.h>
-#include <win32k/ntgdityp.h>
-#include <win32k/ntgdihdl.h>
-#include <psdk/ntgdi.h>
+#include <include/callback.h>
+#include <include/ntusrtyp.h>
+#include <include/ntuser.h>
+#include <include/ntgdityp.h>
+#include <include/ntgdihdl.h>
+#include <ntgdi.h>
 
 /* Internal  Win32K Header */
 #include <win32kp.h>

Removed: branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec (removed)
@@ -1,229 +1,0 @@
-#include "include/reactos/msvctarget.h"
-#undef i386
-
-@ stdcall FLOATOBJ_AddFloatObj(ptr ptr)
-@ stdcall FLOATOBJ_DivFloatObj(ptr ptr)
-@ stdcall FLOATOBJ_MulFloatObj(ptr ptr)
-@ stdcall FLOATOBJ_SubFloatObj(ptr ptr)
-@ stdcall BRUSHOBJ_hGetColorTransform(ptr)
-@ stdcall BRUSHOBJ_pvAllocRbrush(ptr long)
-@ stdcall BRUSHOBJ_pvGetRbrush(ptr)
-@ stdcall BRUSHOBJ_ulGetBrushColor(ptr)
-@ stdcall CLIPOBJ_bEnum(ptr long ptr)
-@ stdcall CLIPOBJ_cEnumStart(ptr long long long long)
-@ stdcall CLIPOBJ_ppoGetPath(ptr)
-@ stdcall EngAcquireSemaphore(ptr)
-@ stdcall EngAllocMem(long long long)
-@ stdcall EngAllocPrivateUserMem(ptr ptr long)
-@ stdcall EngAllocSectionMem(ptr long ptr long)
-@ stdcall EngAllocUserMem(ptr long)
-@ stdcall EngAlphaBlend(ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall EngAssociateSurface(ptr ptr long)
-@ stdcall EngBitBlt(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long)
-@ stdcall EngBugCheckEx(long ptr ptr ptr ptr) NTOSKRNL.KeBugCheckEx
-@ stdcall EngCheckAbort(ptr)
-@ stdcall EngClearEvent(ptr)
-@ stdcall EngComputeGlyphSet(long long long)
-@ stdcall EngControlSprites(ptr long)
-@ stdcall EngCopyBits(ptr ptr ptr ptr ptr ptr)
-@ stdcall EngCreateBitmap(long long long long long ptr)
-@ stdcall EngCreateClip()
-@ stdcall EngCreateDeviceBitmap(ptr long long long)
-@ stdcall EngCreateDeviceSurface(ptr long long long)
-@ stdcall EngCreateDriverObj(ptr ptr ptr)
-@ stdcall EngCreateEvent(ptr)
-@ stdcall EngCreatePalette(long long long long long long)
-@ stdcall EngCreatePath()
-@ stdcall EngCreateSemaphore()
-@ stdcall EngCreateWnd(ptr ptr ptr long long)
-@ stdcall EngDebugBreak() NTOSKRNL.DbgBreakPoint
-@ stdcall EngDebugPrint(ptr ptr ptr)
-@ stdcall EngDeleteClip(ptr)
-@ stdcall EngDeleteDriverObj(ptr long long)
-@ stdcall EngDeleteEvent(ptr)
-@ stdcall EngDeleteFile(ptr)
-@ stdcall EngDeletePalette(ptr)
-@ stdcall EngDeletePath(ptr)
-@ stdcall EngDeleteSafeSemaphore(ptr)
-@ stdcall EngDeleteSemaphore(ptr)
-@ stdcall EngDeleteSurface(ptr)
-@ stdcall EngDeleteWnd(ptr)
-@ stdcall EngDeviceIoControl(ptr long ptr long ptr long ptr)
-@ stdcall EngDitherColor(ptr long long long)
-@ stdcall EngDxIoctl(long ptr long)
-@ stdcall EngEnumForms(ptr long ptr long ptr ptr)
-@ stdcall EngEraseSurface(ptr ptr long)
-@ stdcall EngFileIoControl(ptr long ptr ptr ptr ptr ptr)
-@ stdcall EngFileWrite(ptr ptr ptr ptr)
-@ stdcall EngFillPath(ptr ptr ptr ptr ptr long long)
-@ stdcall EngFindImageProcAddress(ptr ptr)
-@ stdcall EngFindResource(ptr long long ptr)
-@ stdcall EngFntCacheAlloc(long long)
-@ stdcall EngFntCacheFault(long long)
-@ stdcall EngFntCacheLookUp(long ptr)
-@ stdcall EngFreeMem(ptr)
-@ stdcall EngFreeModule(ptr)
-@ stdcall EngFreePrivateUserMem(ptr ptr)
-@ stdcall EngFreeSectionMem(ptr ptr)
-@ stdcall EngFreeUserMem(ptr)
-@ stdcall EngGetCurrentCodePage(ptr ptr)
-@ stdcall EngGetCurrentProcessId() NTOSKRNL.PsGetCurrentProcessId
-@ stdcall EngGetCurrentThreadId() NTOSKRNL.PsGetCurrentThreadId
-@ stdcall EngGetDriverName(ptr)
-@ stdcall EngGetFileChangeTime(ptr ptr)
-@ stdcall EngGetFilePath(ptr ptr)
-@ stdcall EngGetForm(ptr ptr long ptr long ptr)
-@ stdcall EngGetLastError()
-@ stdcall EngGetPrinter(ptr long ptr long ptr)
-@ stdcall EngGetPrinterData(ptr ptr ptr ptr long ptr)
-@ stdcall EngGetPrinterDataFileName(ptr)
-@ stdcall EngGetPrinterDriver(ptr ptr long ptr long ptr)
-@ stdcall EngGetProcessHandle()
-@ stdcall EngGetTickCount()
-@ stdcall EngGetType1FontList(ptr ptr long ptr ptr ptr)
-@ stdcall EngGradientFill(ptr ptr ptr ptr long ptr long ptr ptr long)
-@ stdcall EngHangNotification(ptr ptr)
-@ stdcall EngInitializeSafeSemaphore(ptr)
-@ stdcall EngIsSemaphoreOwned(ptr)
-@ stdcall EngIsSemaphoreOwnedByCurrentThread(ptr)
-@ stdcall EngLineTo(ptr ptr ptr long long long long ptr long)
-@ stdcall EngLoadImage(ptr)
-@ stdcall EngLoadModule(ptr)
-@ stdcall EngLoadModuleForWrite(ptr long)
-@ stdcall EngLockDirectDrawSurface(ptr)
-@ stdcall EngLockDriverObj(ptr)
-@ stdcall EngLockSurface(ptr)
-@ stdcall EngLpkInstalled()
-@ stdcall EngMapEvent(ptr ptr ptr ptr ptr)
-@ stdcall EngMapFile(ptr long ptr)
-@ stdcall EngMapFontFile(ptr ptr ptr)
-@ stdcall EngMapFontFileFD(ptr ptr ptr)
-@ stdcall EngMapModule(ptr ptr)
-@ stdcall EngMapSection(ptr long ptr ptr)
-@ stdcall EngMarkBandingSurface(ptr)
-@ stdcall EngModifySurface(ptr ptr long long ptr ptr long ptr)
-@ stdcall EngMovePointer(ptr long long ptr)
-@ stdcall EngMulDiv(long long long)
-@ stdcall EngMultiByteToUnicodeN(ptr long ptr ptr long) NTOSKRNL.RtlMultiByteToUnicodeN
-@ stdcall EngMultiByteToWideChar(long ptr long ptr long)
-@ stdcall EngNineGrid(ptr ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stdcall EngPaint(ptr ptr ptr ptr long)
-@ stdcall EngPlgBlt(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long)
-@ stdcall EngProbeForRead(ptr long long) NTOSKRNL.ProbeForRead
-@ stdcall EngProbeForReadAndWrite(ptr long long) NTOSKRNL.ProbeForWrite
-@ stdcall EngQueryDeviceAttribute(ptr long ptr long ptr long)
-@ stdcall EngQueryFileTimeStamp(ptr)
-@ stdcall EngQueryLocalTime(ptr)
-@ stdcall EngQueryPalette(ptr ptr long ptr)
-@ stdcall EngQueryPerformanceCounter(ptr)
-@ stdcall EngQueryPerformanceFrequency(ptr)
-@ stdcall EngQuerySystemAttribute(long ptr)
-@ stdcall EngReadStateEvent(ptr)
-@ stdcall EngReleaseSemaphore(ptr)
-@ stdcall EngRestoreFloatingPointState(ptr)
-@ stdcall EngSaveFloatingPointState(ptr long)
-@ stdcall EngSecureMem(ptr long)
-@ stdcall EngSetEvent(ptr)
-@ stdcall EngSetLastError(long)
-@ stdcall EngSetPointerShape(ptr ptr ptr ptr long long long long ptr long)
-@ stdcall EngSetPointerTag(ptr ptr ptr ptr long)
-@ stdcall EngSetPrinterData(ptr ptr long ptr long)
-@ stdcall EngSort(ptr long long ptr)
-@ stdcall EngStretchBlt(ptr ptr ptr ptr ptr long long ptr ptr ptr long)
-@ stdcall EngStretchBltROP(ptr ptr ptr ptr ptr long long ptr ptr ptr long ptr long)
-@ stdcall EngStrokeAndFillPath(ptr ptr ptr ptr ptr ptr ptr ptr long long)
-@ stdcall EngStrokePath(ptr ptr ptr ptr ptr ptr ptr long)
-@ stdcall EngTextOut(ptr ptr ptr ptr ptr ptr ptr ptr ptr long)
-@ stdcall EngTransparentBlt(ptr ptr ptr ptr ptr ptr long long)
-@ stdcall EngUnicodeToMultiByteN(ptr long ptr ptr long) NTOSKRNL.RtlUnicodeToMultiByteN
-@ stdcall EngUnloadImage(ptr)
-@ stdcall EngUnlockDirectDrawSurface(ptr)
-@ stdcall EngUnlockDriverObj(ptr)
-@ stdcall EngUnlockSurface(ptr)
-@ stdcall EngUnmapEvent(ptr)
-@ stdcall EngUnmapFile(ptr)
-@ stdcall EngUnmapFontFile(ptr)
-@ stdcall EngUnmapFontFileFD(ptr)
-@ stdcall EngUnsecureMem(ptr)
-@ stdcall EngWaitForSingleObject(ptr ptr)
-@ stdcall EngWideCharToMultiByte(long ptr long ptr long)
-@ stdcall EngWritePrinter(ptr ptr long ptr)
-@ stdcall -arch=i386 FLOATOBJ_Add(ptr ptr)
-@ stdcall -arch=i386 FLOATOBJ_AddFloat(ptr long)
-@ stdcall -arch=i386 FLOATOBJ_AddLong(ptr long)
-@ stdcall -arch=i386 FLOATOBJ_Div(ptr ptr)
-@ stdcall -arch=i386 FLOATOBJ_DivFloat(ptr long)
-@ stdcall -arch=i386 FLOATOBJ_DivLong(ptr long)
-@ stdcall -arch=i386 FLOATOBJ_Equal(ptr ptr)
-@ stdcall -arch=i386 FLOATOBJ_EqualLong(ptr long)
-@ stdcall -arch=i386 FLOATOBJ_GetFloat(ptr)
-@ stdcall -arch=i386 FLOATOBJ_GetLong(ptr)
-@ stdcall -arch=i386 FLOATOBJ_GreaterThan(ptr ptr)
-@ stdcall -arch=i386 FLOATOBJ_GreaterThanLong(ptr long)
-@ stdcall -arch=i386 FLOATOBJ_LessThan(ptr ptr)
-@ stdcall -arch=i386 FLOATOBJ_LessThanLong(ptr long)
-@ stdcall -arch=i386 FLOATOBJ_Mul(ptr ptr)
-@ stdcall -arch=i386 FLOATOBJ_MulFloat(ptr long)
-@ stdcall -arch=i386 FLOATOBJ_MulLong(ptr long)
-@ stdcall -arch=i386 FLOATOBJ_Neg(ptr)
-@ stdcall -arch=i386 FLOATOBJ_SetFloat(ptr long)
-@ stdcall -arch=i386 FLOATOBJ_SetLong(ptr long)
-@ stdcall -arch=i386 FLOATOBJ_Sub(ptr ptr)
-@ stdcall -arch=i386 FLOATOBJ_SubFloat(ptr long)
-@ stdcall -arch=i386 FLOATOBJ_SubLong(ptr long)
-@ stdcall FONTOBJ_cGetAllGlyphHandles(ptr ptr)
-@ stdcall FONTOBJ_cGetGlyphs(ptr long long ptr ptr)
-@ stdcall FONTOBJ_pQueryGlyphAttrs(ptr long)
-@ stdcall FONTOBJ_pfdg(ptr)
-@ stdcall FONTOBJ_pifi(ptr)
-@ stdcall FONTOBJ_pjOpenTypeTablePointer(ptr long ptr)
-@ stdcall FONTOBJ_pvTrueTypeFontFile(ptr ptr)
-@ stdcall FONTOBJ_pwszFontFilePaths(ptr ptr)
-@ stdcall FONTOBJ_pxoGetXform(ptr)
-@ stdcall FONTOBJ_vGetInfo(ptr long ptr)
-@ stdcall HT_ComputeRGBGammaTable(long long long long long ptr)
-@ stdcall HT_Get8BPPFormatPalette(ptr long long long)
-@ stdcall HT_Get8BPPMaskPalette(ptr long long long long long)
-@ stdcall HeapVidMemAllocAligned(ptr long long ptr ptr)
-@ stdcall PALOBJ_cGetColors(ptr long long ptr)
-@ stdcall PATHOBJ_bCloseFigure(ptr)
-@ stdcall PATHOBJ_bEnum(ptr ptr)
-@ stdcall PATHOBJ_bEnumClipLines(ptr long ptr)
-@ stdcall PATHOBJ_bMoveTo(ptr long long)
-@ stdcall PATHOBJ_bPolyBezierTo(ptr ptr long)
-@ stdcall PATHOBJ_bPolyLineTo(ptr ptr long)
-@ stdcall PATHOBJ_vEnumStart(ptr)
-@ stdcall PATHOBJ_vEnumStartClipLines(ptr ptr ptr ptr)
-@ stdcall PATHOBJ_vGetBounds(ptr ptr)
-@ stdcall RtlAnsiCharToUnicodeChar(ptr) NTOSKRNL.RtlAnsiCharToUnicodeChar
-@ stdcall RtlMultiByteToUnicodeN(ptr long ptr ptr long) NTOSKRNL.RtlMultiByteToUnicodeN
-@ stdcall RtlRaiseException(ptr) NTOSKRNL.RtlRaiseException
-@ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) NTOSKRNL.RtlUnicodeToMultiByteN
-@ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) NTOSKRNL.RtlUnicodeToMultiByteSize
-@ stdcall RtlUnwind(ptr ptr ptr ptr) NTOSKRNL.RtlUnwind
-@ stdcall RtlUpcaseUnicodeChar(long) NTOSKRNL.RtlUpcaseUnicodeChar
-@ stdcall RtlUpcaseUnicodeToMultiByteN(ptr long ptr ptr long)
NTOSKRNL.RtlUpcaseUnicodeToMultiByteN
-@ stdcall STROBJ_bEnum(ptr ptr ptr)
-@ stdcall STROBJ_bEnumPositionsOnly(ptr ptr ptr)
-@ stdcall STROBJ_bGetAdvanceWidths(ptr long long ptr)
-@ stdcall STROBJ_dwGetCodePage(ptr)
-@ stdcall STROBJ_fxBreakExtra(ptr)
-@ stdcall STROBJ_fxCharacterExtra(ptr)
-@ stdcall STROBJ_vEnumStart(ptr)
-@ stdcall VidMemFree(ptr ptr)
-@ stdcall WNDOBJ_bEnum(ptr long ptr)
-@ stdcall WNDOBJ_cEnumStart(ptr long long long)
-@ stdcall WNDOBJ_vSetConsumer(ptr ptr)
-@ stdcall XFORMOBJ_bApplyXform(ptr long long ptr ptr)
-@ stdcall XFORMOBJ_iGetFloatObjXform(ptr ptr)
-@ stdcall XFORMOBJ_iGetXform(ptr ptr)
-@ stdcall XLATEOBJ_cGetPalette(ptr long long ptr)
-@ stdcall XLATEOBJ_hGetColorTransform(ptr)
-@ stdcall XLATEOBJ_iXlate(ptr long)
-@ stdcall XLATEOBJ_piVector(ptr)
-@ cdecl _abnormal_termination() NTOSKRNL._abnormal_termination
-@ cdecl _except_handler2() NTOSKRNL._except_handler2
-@ cdecl _global_unwind2() NTOSKRNL._global_unwind2
-@ cdecl _itoa() NTOSKRNL._itoa
-@ cdecl _itow() NTOSKRNL._itow
-@ cdecl _local_unwind2() NTOSKRNL._local_unwind2

Copied: branches/arwinss/reactos/subsystems/win32/win32k/win32k.spec (from r50632,
branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec)
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.spec [iso-8859-1] Sun Sep 23
20:35:42 2012
@@ -1,10 +1,7 @@
-#include "include/reactos/msvctarget.h"
-#undef i386
-
-@ stdcall FLOATOBJ_AddFloatObj(ptr ptr)
-@ stdcall FLOATOBJ_DivFloatObj(ptr ptr)
-@ stdcall FLOATOBJ_MulFloatObj(ptr ptr)
-@ stdcall FLOATOBJ_SubFloatObj(ptr ptr)
+@ stdcall -arch=i386 FLOATOBJ_AddFloatObj(ptr ptr)
+@ stdcall -arch=i386 FLOATOBJ_DivFloatObj(ptr ptr)
+@ stdcall -arch=i386 FLOATOBJ_MulFloatObj(ptr ptr)
+@ stdcall -arch=i386 FLOATOBJ_SubFloatObj(ptr ptr)
 @ stdcall BRUSHOBJ_hGetColorTransform(ptr)
 @ stdcall BRUSHOBJ_pvAllocRbrush(ptr long)
 @ stdcall BRUSHOBJ_pvGetRbrush(ptr)