Author: greatlrd
Date: Mon Jul 9 00:43:09 2007
New Revision: 27520
URL:
http://svn.reactos.org/svn/reactos?rev=27520&view=rev
Log:
paralles are not nice, they give out wrong .def file I do not think they are using thuse
def file internal if u do
the dumaic link will not work in windows.
fixed build for ddrawex as well
Modified:
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.def
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.def
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.def
Modified:
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.def
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine…
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.def
(original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.def Mon
Jul 9 00:43:09 2007
@@ -1,24 +1,26 @@
LIBRARY "ddraw.dll"
EXPORTS
- AcquireDDThreadLock @1
- CheckFullscreen @2
- CompleteCreateSysmemSurface @3
- D3DParseUnknownCommand @4
- DDGetAttachedSurfaceLcl @5
- DDInternalLock @6
- DDInternalUnlock @7
- DSoundHelp @8
- DirectDrawCreate @9
- DirectDrawCreateClipper @10
- DirectDrawCreateEx @11
- DirectDrawEnumerateA @12
- DirectDrawEnumerateExA @13
- DirectDrawEnumerateExW @14
- DirectDrawEnumerateW @15
- DllCanUnloadNow @16 PRIVATE
- DllGetClassObject @17 PRIVATE
- GetDDSurfaceLocal @18
-; GetOLEThunkData @19
- GetSurfaceFromDC @20
-; RegisterSpecialCase @21
- ReleaseDDThreadLock @22
+ AcquireDDThreadLock @0
+ ReleaseDDThreadLock @0
+ GetSurfaceFromDC@12
+ GetDDSurfaceLocal@12
+ D3DParseUnknownCommand@8
+ DDGetAttachedSurfaceLcl@12
+ DDInternalLock@8
+ DDInternalUnlock@4
+ DSoundHelp@12
+ DirectDrawCreate@12
+ DirectDrawCreateClipper@12
+ DirectDrawCreateEx@16
+ DirectDrawEnumerateA@8
+ DirectDrawEnumerateW@8
+ DirectDrawEnumerateExA@12
+ DirectDrawEnumerateExW@12
+ DllCanUnloadNow PRIVATE
+ DllGetClassObject PRIVATE
+
+; fixme ??
+ CheckFullscreen
+ CompleteCreateSysmemSurface
+;GetOLEThunkData
+;RegisterSpecialCase
Modified:
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.def
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine…
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.def
(original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.def
Mon Jul 9 00:43:09 2007
@@ -1,6 +1,6 @@
LIBRARY "ddrawex.dll"
EXPORTS
- DllCanUnloadNow @1 PRIVATE
- DllGetClassObject @2 PRIVATE
- DllRegisterServer @3 PRIVATE
- DllUnregisterServer @4 PRIVATE
+ DllCanUnloadNow PRIVATE
+ DllGetClassObject PRIVATE
+ DllRegisterServer PRIVATE
+ DllUnregisterServer PRIVATE
Modified:
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine…
==============================================================================
---
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild
(original)
+++
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddrawex/ddrawex.rbuild
Mon Jul 9 00:43:09 2007
@@ -1,8 +1,9 @@
-<module name="ddrawex" type="win32dll" entrypoint="0"
installbase="system32" installname="ddrawex.dll">
+<module name="ddrawex" type="win32dll" entrypoint="0"
installbase="system32" installname="ddrawex.dll" allowwarnings
="true">
<importlibrary definition="ddrawex.def" />
<include base="ddrawex">.</include>
<include base="ReactOS">include/reactos/wine-paralles</include>
<include base="ReactOS">include/reactos/wine</include>
+
<define name="UNICODE" />
<define name="_UNICODE" />
<define name="__REACTOS__" />
@@ -10,16 +11,24 @@
<define name="_WIN32_IE">0x600</define>
<define name="_WIN32_WINNT">0x501</define>
<define name="WINVER">0x501</define>
- <define name="WINE_NATIVEWIN32" />
+ <define name="__WINESRC__" />
+
<library>wine</library>
<library>uuid</library>
<library>ntdll</library>
<library>kernel32</library>
<library>user32</library>
+ <library>gdi32</library>
+ <library>winspool</library>
+ <library>comdlg32</library>
+ <library>shell32</library>
+ <library>ole32</library>
+ <library>oleaut32</library>
+ <library>oleaut32</library>
+ <library>dxguid</library>
+ <library>msvcrt</library>
<library>advapi32</library>
- <library>ole32</library>
- <library>winmm</library>
- <library>dxguid</library>
+ <library>ddraw</library>
<file>main.c</file>
<file>regsvr.c</file>
Modified:
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.def
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine…
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.def
(original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/wined3d/wined3d.def
Mon Jul 9 00:43:09 2007
@@ -1,3 +1,3 @@
LIBRARY "wined3d.dll"
EXPORTS
- WineDirect3DCreate @1
+ WineDirect3DCreate @12