Add ctl3d, ctl3dv2 and ctl3d32 API implementations.
diff -u cvs/hq/wine/configure wine/configure
--- cvs/hq/wine/configure Sat Dec 28 12:44:55 2002
+++ wine/configure Wed Jan 1 20:23:25 2003
@@ -15231,7 +15231,7 @@
MAKE_PROG_RULES=programs/Makeprog.rules
- !
!
!
+ !
!
!
cat >confcache <<\_ACEOF
@@ -15777,6 +15777,7 @@
"dlls/commdlg/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/commdlg/Makefile" ;;
"dlls/crtdll/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/crtdll/Makefile" ;;
"dlls/crypt32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/crypt32/Makefile" ;;
+ "dlls/ctl3d/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/ctl3d/Makefile" ;;
"dlls/d3d8/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/d3d8/Makefile" ;;
"dlls/d3dx8/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/d3dx8/Makefile" ;;
"dlls/dciman32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/dciman32/Makefile" ;;
diff -u cvs/hq/wine/configure.ac wine/configure.ac
--- cvs/hq/wine/configure.ac Sat Dec 28 12:44:55 2002
+++ wine/configure.ac Wed Jan 1 20:23:25 2003
@@ -1370,6 +1370,7 @@
dlls/commdlg/Makefile
dlls/crtdll/Makefile
dlls/crypt32/Makefile
+dlls/ctl3d/Makefile
dlls/d3d8/Makefile
dlls/d3dx8/Makefile
dlls/dciman32/Makefile
diff -u cvs/hq/wine/dlls/Makefile.in wine/dlls/Makefile.in
--- cvs/hq/wine/dlls/Makefile.in Sat Dec 28 12:44:55 2002
+++ wine/dlls/Makefile.in Wed Jan 1 20:23:25 2003
@@ -24,6 +24,7 @@
commdlg \
crtdll \
crypt32 \
+ ctl3d \
dciman32 \
devenum \
dinput \
@@ -132,6 +133,8 @@
comm.dll$(DLLEXT) \
commdlg.dll$(DLLEXT) \
compobj.dll$(DLLEXT) \
+ ctl3d.dll$(DLLEXT) \
+ ctl3dv2.dll$(DLLEXT) \
ddeml.dll$(DLLEXT) \
dispdib.dll$(DLLEXT) \
display.dll$(DLLEXT) \
@@ -187,6 +190,7 @@
comdlg32.dll$(DLLEXT) \
crtdll.dll$(DLLEXT) \
crypt32.dll$(DLLEXT) \
+ ctl3d32.dll$(DLLEXT) \
dciman32.dll$(DLLEXT) \
devenum.dll$(DLLEXT) \
dinput.dll$(DLLEXT) \
@@ -302,6 +306,9 @@
crypt32.dll$(DLLEXT): crypt32/crypt32.dll$(DLLEXT)
$(RM) $@ && $(LN_S) crypt32/crypt32.dll$(DLLEXT) $@
+ctl3d32.dll$(DLLEXT) ctl3d.dll$(DLLEXT) ctl3dv2.dll$(DLLEXT): ctl3d/ctl3d32.dll$(DLLEXT)
+ $(RM) $@ && $(LN_S) ctl3d/ctl3d32.dll$(DLLEXT) $@
+
d3d8.dll$(DLLEXT): d3d8/d3d8.dll$(DLLEXT)
$(RM) $@ && $(LN_S) d3d8/d3d8.dll$(DLLEXT) $@
@@ -594,6 +601,7 @@
libcomdlg32 \
libcrtdll \
libcrypt32 \
+ libctl3d32 \
libd3d8 \
libd3dx8 \
libdciman32 \
@@ -712,6 +720,11 @@
libcrypt32.a: crypt32/crypt32.spec.def
$(DLLTOOL) -k -l $@ -d crypt32/crypt32.spec.def
+libctl3d32.def: ctl3d/ctl3d32.spec.def
+ $(RM) $@ && $(LN_S) ctl3d/ctl3d32.spec.def $@
+libctl3d32.a: ctl3d/ctl3d32.spec.def
+ $(DLLTOOL) -k -l $@ -d ctl3d/ctl3d32.spec.def
+
libd3d8.def: d3d8/d3d8.spec.def
$(RM) $@ && $(LN_S) d3d8/d3d8.spec.def $@
libd3d8.a: d3d8/d3d8.spec.def
@@ -1081,6 +1094,7 @@
commdlg/comdlg32.spec.def: $(WINEBUILD)
crtdll/crtdll.spec.def: $(WINEBUILD)
crypt32/crypt32.spec.def: $(WINEBUILD)
+ctl3d/ctl3d32.spec.def: $(WINEBUILD)
d3d8/d3d8.spec.def: $(WINEBUILD)
d3dx8/d3dx8.spec.def: $(WINEBUILD)
dciman32/dciman32.spec.def: $(WINEBUILD)
@@ -1168,6 +1182,7 @@
commdlg/comdlg32.dll$(DLLEXT): commdlg
crtdll/crtdll.dll$(DLLEXT): crtdll
crypt32/crypt32.dll$(DLLEXT): crypt32
+ctl3d/ctl3d32.dll$(DLLEXT): ctl3d
d3d8/d3d8.dll$(DLLEXT): d3d8
d3dx8/d3dx8.dll$(DLLEXT): d3dx8
dciman32/dciman32.dll$(DLLEXT): dciman32
@@ -1271,6 +1286,7 @@
commdlg/__install__: comdlg32.dll$(DLLEXT)
crtdll/__install__: crtdll.dll$(DLLEXT)
crypt32/__install__: crypt32.dll$(DLLEXT)
+ctl3d/__install__: ctl3d32.dll$(DLLEXT)
d3d8/__install__: d3d8.dll$(DLLEXT)
d3dx8/__install__: d3dx8.dll$(DLLEXT)
dciman32/__install__: dciman32.dll$(DLLEXT)
diff -u /dev/null wine/dlls/ctl3d/.cvsignore
--- /dev/null Wed May 6 05:32:27 1998
+++ wine/dlls/ctl3d/.cvsignore Wed Jan 1 20:23:25 2003
@@ -0,0 +1,6 @@
+Makefile
+ctl3d.spec.c
+ctl3d32.dll.dbg.c
+ctl3d32.spec.c
+ctl3d32.spec.def
+ctl3dv2.spec.c
diff -u /dev/null wine/dlls/ctl3d/Makefile.in
--- /dev/null Wed May 6 05:32:27 1998
+++ wine/dlls/ctl3d/Makefile.in Wed Jan 1 20:36:56 2003
@@ -0,0 +1,26 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = ctl3d32.dll
+IMPORTS = kernel32 user32
+ALTNAMES = ctl3d.dll ctl3dv2.dll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
+
+C_SRCS = ctl3d32.c
+
+C_SRCS16 = ctl3d.c
+
+@MAKE_DLL_RULES@
+
+# Special rules for 16-bit resource and spec files
+
+ctl3d.spec.c: ctl3d.spec
+ $(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -M $(MODULE) --spec $(SRCDIR)/ctl3d.spec
+
+ctl3dv2.spec.c: ctl3dv2.spec
+ $(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -M $(MODULE) --spec $(SRCDIR)/ctl3dv2.spec
+
+### Dependencies:
diff -u /dev/null wine/dlls/ctl3d/ctl3d.c
--- /dev/null Wed May 6 05:32:27 1998
+++ wine/dlls/ctl3d/ctl3d.c Wed Jan 1 21:11:33 2003
@@ -0,0 +1,113 @@
+/*
+ * 16-bit CTL3D and CTL3DV2 API stubs.
+ *
+ * Copyright (c) 2003 Dmitry Timoshkov
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "wine/winbase16.h"
+#include "wine/winuser16.h"
+
+BOOL16 WINAPI Ctl3dAutoSubclass16(HINSTANCE16 hInst)
+{
+ return TRUE;
+}
+
+BOOL16 WINAPI Ctl3dAutoSubclassEx16(HINSTANCE16 hInst, DWORD type)
+{
+ return TRUE;
+}
+
+BOOL16 WINAPI Ctl3dColorChange16(void)
+{
+ return TRUE;
+}
+
+HBRUSH WINAPI Ctl3dCtlColor16(HDC16 hdc, LONG hwnd)
+{
+ return 0;
+}
+
+HBRUSH WINAPI Ctl3dCtlColorEx16(UINT16 msg, WPARAM16 wParam, LPARAM lParam)
+{
+ return 0;
+}
+
+
+LONG WINAPI Ctl3dDlgFramePaint16(HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam)
+{
+ return DefWindowProc16(hwnd, msg, wParam, lParam);
+}
+
+BOOL16 WINAPI Ctl3dEnabled16(void)
+{
+ return FALSE;
+}
+
+WORD WINAPI Ctl3dGetVer16(void)
+{
+ return MAKEWORD(31,2);
+}
+
+BOOL16 WINAPI Ctl3dIsAutoSubclass16(void)
+{
+ return FALSE;
+}
+
+BOOL16 WINAPI Ctl3dRegister16(HINSTANCE16 hInst)
+{
+ return FALSE;
+}
+
+BOOL16 WINAPI Ctl3dSubclassCtl16(HWND16 hwnd)
+{
+ return FALSE;
+}
+
+BOOL16 WINAPI Ctl3dSubclassCtlEx16(HWND16 hwnd, INT16 type)
+{
+ return FALSE;
+}
+
+BOOL16 WINAPI Ctl3dSubclassDlg16(HWND16 hwnd, WORD types)
+{
+ return FALSE;
+}
+
+BOOL16 WINAPI Ctl3dSubclassDlgEx16(HWND16 hwnd, DWORD types)
+{
+ return FALSE;
+}
+
+BOOL16 WINAPI Ctl3dUnAutoSubclass16(void)
+{
+ return FALSE;
+}
+
+BOOL16 WINAPI Ctl3dUnregister16(HINSTANCE16 hInst)
+{
+ return TRUE;
+}
+
+
+BOOL16 WINAPI Ctl3dUnsubclassCtl16(HWND16 hwnd)
+{
+ return FALSE;
+}
+
+void WINAPI Ctl3dWinIniChange16(void)
+{
+}
diff -u /dev/null wine/dlls/ctl3d/ctl3d.spec
--- /dev/null Wed May 6 05:32:27 1998
+++ wine/dlls/ctl3d/ctl3d.spec Wed Jan 1 20:23:25 2003
@@ -0,0 +1,25 @@
+1 pascal16 Ctl3dGetVer() Ctl3dGetVer16
+2 pascal16 Ctl3dSubclassDlg(word word) Ctl3dSubclassDlg16
+3 pascal16 Ctl3dSubclassCtl(word) Ctl3dSubclassCtl16
+4 pascal16 Ctl3dCtlColor(word long) Ctl3dCtlColor16
+5 pascal16 Ctl3dEnabled() Ctl3dEnabled16
+6 pascal16 Ctl3dColorChange() Ctl3dColorChange16
+7 stub BtnWndProc3d
+8 stub EditWndProc3d
+9 stub ListWndProc3d
+10 stub ComboWndProc3d
+11 stub StaticWndProc3d
+12 pascal16 Ctl3dRegister(word) Ctl3dRegister16
+13 pascal16 Ctl3dUnregister(word) Ctl3dUnregister16
+16 pascal16 Ctl3dAutoSubclass(word) Ctl3dAutoSubclass16
+17 stub Ctl3dDlgProc
+18 pascal16 Ctl3dCtlColorEx(word word long) Ctl3dCtlColorEx16
+19 stub Ctl3dSetStyle
+20 pascal Ctl3dDlgFramePaint(word word word long) Ctl3dDlgFramePaint16
+21 pascal16 Ctl3dSubclassDlgEx(word long) Ctl3dSubclassDlgEx16
+22 pascal16 Ctl3dWinIniChange() Ctl3dWinIniChange16
+23 pascal16 Ctl3dIsAutoSubclass() Ctl3dIsAutoSubclass16
+24 pascal16 Ctl3dUnAutoSubclass() Ctl3dUnAutoSubclass16
+25 pascal16 Ctl3dSubclassCtlEx(word word) Ctl3dSubclassCtlEx16
+26 pascal16 Ctl3dUnsubclassCtl(word) Ctl3dUnsubclassCtl16
+27 pascal16 Ctl3dAutoSubclassEx(word long) Ctl3dAutoSubclassEx16
diff -u /dev/null wine/dlls/ctl3d/ctl3d32.c
--- /dev/null Wed May 6 05:32:27 1998
+++ wine/dlls/ctl3d/ctl3d32.c Wed Jan 1 21:12:28 2003
@@ -0,0 +1,113 @@
+/*
+ * CTL3D32 API stubs.
+ *
+ * Copyright (c) 2003 Dmitry Timoshkov
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "winbase.h"
+#include "winuser.h"
+
+BOOL WINAPI Ctl3dAutoSubclass(HINSTANCE hInst)
+{
+ return TRUE;
+}
+
+BOOL WINAPI Ctl3dAutoSubclassEx(HINSTANCE hInst, DWORD type)
+{
+ return TRUE;
+}
+
+BOOL WINAPI Ctl3dColorChange(void)
+{
+ return TRUE;
+}
+
+HBRUSH WINAPI Ctl3dCtlColor(HDC hdc, LONG hwnd)
+{
+ return 0;
+}
+
+HBRUSH WINAPI Ctl3dCtlColorEx(UINT msg, WPARAM wParam, LPARAM lParam)
+{
+ return 0;
+}
+
+
+LONG WINAPI Ctl3dDlgFramePaint(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+ return DefWindowProcA(hwnd, msg, wParam, lParam);
+}
+
+BOOL WINAPI Ctl3dEnabled(void)
+{
+ return FALSE;
+}
+
+WORD WINAPI Ctl3dGetVer(void)
+{
+ return MAKEWORD(31,2);
+}
+
+BOOL WINAPI Ctl3dIsAutoSubclass(void)
+{
+ return FALSE;
+}
+
+BOOL WINAPI Ctl3dRegister(HINSTANCE hInst)
+{
+ return FALSE;
+}
+
+BOOL WINAPI Ctl3dSubclassCtl(HWND hwnd)
+{
+ return FALSE;
+}
+
+BOOL WINAPI Ctl3dSubclassCtlEx(HWND hwnd, int type)
+{
+ return FALSE;
+}
+
+BOOL WINAPI Ctl3dSubclassDlg(HWND hwnd, WORD types)
+{
+ return FALSE;
+}
+
+BOOL WINAPI Ctl3dSubclassDlgEx(HWND hwnd, DWORD types)
+{
+ return FALSE;
+}
+
+BOOL WINAPI Ctl3dUnAutoSubclass(void)
+{
+ return FALSE;
+}
+
+BOOL WINAPI Ctl3dUnregister(HINSTANCE hInst)
+{
+ return TRUE;
+}
+
+
+BOOL WINAPI Ctl3dUnsubclassCtl(HWND hwnd)
+{
+ return FALSE;
+}
+
+void WINAPI Ctl3dWinIniChange(void)
+{
+}
diff -u /dev/null wine/dlls/ctl3d/ctl3d32.spec
--- /dev/null Wed May 6 05:32:27 1998
+++ wine/dlls/ctl3d/ctl3d32.spec Wed Jan 1 20:23:25 2003
@@ -0,0 +1,25 @@
+@ stub BtnWndProc3d
+@ stub ComboWndProc3d
+@ stdcall Ctl3dAutoSubclass(long) Ctl3dAutoSubclass
+@ stdcall Ctl3dAutoSubclassEx(long long) Ctl3dAutoSubclassEx
+@ stdcall Ctl3dColorChange() Ctl3dColorChange
+@ stdcall Ctl3dCtlColor(long long) Ctl3dCtlColor
+@ stdcall Ctl3dCtlColorEx(long long long) Ctl3dCtlColorEx
+@ stdcall Ctl3dDlgFramePaint(long long long long) Ctl3dDlgFramePaint
+@ stub Ctl3dDlgProc
+@ stdcall Ctl3dEnabled() Ctl3dEnabled
+@ stdcall Ctl3dGetVer() Ctl3dGetVer
+@ stdcall Ctl3dIsAutoSubclass() Ctl3dIsAutoSubclass
+@ stdcall Ctl3dRegister(long) Ctl3dRegister
+@ stub Ctl3dSetStyle
+@ stdcall Ctl3dSubclassCtl(long) Ctl3dSubclassCtl
+@ stdcall Ctl3dSubclassCtlEx(long long) Ctl3dSubclassCtlEx
+@ stdcall Ctl3dSubclassDlg(long long) Ctl3dSubclassDlg
+@ stdcall Ctl3dSubclassDlgEx(long long) Ctl3dSubclassDlgEx
+@ stdcall Ctl3dUnAutoSubclass() Ctl3dUnAutoSubclass
+@ stdcall Ctl3dUnregister(long) Ctl3dUnregister
+@ stdcall Ctl3dUnsubclassCtl(long) Ctl3dUnsubclassCtl
+@ stdcall Ctl3dWinIniChange() Ctl3dWinIniChange
+@ stub EditWndProc3d
+@ stub ListWndProc3d
+@ stub StaticWndProc3d
diff -u /dev/null wine/dlls/ctl3d/ctl3dv2.spec
--- /dev/null Wed May 6 05:32:27 1998
+++ wine/dlls/ctl3d/ctl3dv2.spec Wed Jan 1 20:23:25 2003
@@ -0,0 +1,25 @@
+1 pascal16 Ctl3dGetVer() Ctl3dGetVer16
+2 pascal16 Ctl3dSubclassDlg(word word) Ctl3dSubclassDlg16
+3 pascal16 Ctl3dSubclassCtl(word) Ctl3dSubclassCtl16
+4 pascal16 Ctl3dCtlColor(word long) Ctl3dCtlColor16
+5 pascal16 Ctl3dEnabled() Ctl3dEnabled16
+6 pascal16 Ctl3dColorChange() Ctl3dColorChange16
+7 stub BtnWndProc3d
+8 stub EditWndProc3d
+9 stub ListWndProc3d
+10 stub ComboWndProc3d
+11 stub StaticWndProc3d
+12 pascal16 Ctl3dRegister(word) Ctl3dRegister16
+13 pascal16 Ctl3dUnregister(word) Ctl3dUnregister16
+16 pascal16 Ctl3dAutoSubclass(word) Ctl3dAutoSubclass16
+17 stub Ctl3dDlgProc
+18 pascal16 Ctl3dCtlColorEx(word word long) Ctl3dCtlColorEx16
+19 stub Ctl3dSetStyle
+20 pascal Ctl3dDlgFramePaint(word word word long) Ctl3dDlgFramePaint16
+21 pascal16 Ctl3dSubclassDlgEx(word long) Ctl3dSubclassDlgEx16
+22 pascal16 Ctl3dWinIniChange() Ctl3dWinIniChange16
+23 pascal16 Ctl3dIsAutoSubclass() Ctl3dIsAutoSubclass16
+24 pascal16 Ctl3dUnAutoSubclass() Ctl3dUnAutoSubclass16
+25 pascal16 Ctl3dSubclassCtlEx(word word) Ctl3dSubclassCtlEx16
+26 pascal16 Ctl3dUnsubclassCtl(word) Ctl3dUnsubclassCtl16
+27 pascal16 Ctl3dAutoSubclassEx(word long) Ctl3dAutoSubclassEx16
diff -u cvs/hq/wine/dlls/user/user32.spec wine/dlls/user/user32.spec
--- cvs/hq/wine/dlls/user/user32.spec Wed Dec 11 15:15:54 2002
+++ wine/dlls/user/user32.spec Wed Jan 1 20:35:20 2003
@@ -666,6 +666,7 @@
@ stdcall CloseDriver16(long long long) CloseDriver16
@ stdcall CreateDialogIndirectParam16(long ptr long long long) CreateDialogIndirectParam16
@ stdcall DefDriverProc16(long long long long long) DefDriverProc16
+@ stdcall DefWindowProc16(long long long long) DefWindowProc16
@ stdcall DestroyIcon32(long long) DestroyIcon32
@ stdcall DialogBoxIndirectParam16(long long long long long) DialogBoxIndirectParam16
@ stdcall GetDriverModuleHandle16(long) GetDriverModuleHandle16
