Skip to content

W
wine-cw
Commit 9a19d8af authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

ctl3d32: Make ctl3d.dll and ctl3dv2.dll into stand-alone 16-bit modules.

parent e1a1ae5e
Hide whitespace changes
Inline Side-by-side
Showing with 269 additions and 37 deletions
.gitignore
View file @ 9a19d8af
......@@ -27,8 +27,6 @@ dlls/advapi32/svcctl_c.c
dlls/atl/atliface.h
dlls/avifile.dll16
dlls/commdlg.dll16
dlls/ctl3d.dll16
dlls/ctl3dv2.dll16
dlls/ddeml.dll16
dlls/gdi.exe16
dlls/imm.dll16
......
configure
View file @ 9a19d8af
......@@ -24856,6 +24856,14 @@ dlls/ctapi32/Makefile: dlls/ctapi32/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/ctapi32/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/ctl3d.dll16/Makefile"
test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
ctl3d.dll16"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/ctl3d.dll16/Makefile: dlls/ctl3d.dll16/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/ctl3d.dll16/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/ctl3d32/Makefile"
test "x$enable_ctl3d32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
ctl3d32"
......@@ -24864,6 +24872,14 @@ dlls/ctl3d32/Makefile: dlls/ctl3d32/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/ctl3d32/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/ctl3dv2.dll16/Makefile"
test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
ctl3dv2.dll16"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/ctl3dv2.dll16/Makefile: dlls/ctl3dv2.dll16/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/ctl3dv2.dll16/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/d3d10/Makefile"
test "x$enable_d3d10" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
d3d10"
......@@ -29034,7 +29050,9 @@ do
"dlls/cryptui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptui/Makefile" ;;
"dlls/cryptui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptui/tests/Makefile" ;;
"dlls/ctapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctapi32/Makefile" ;;
"dlls/ctl3d.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctl3d.dll16/Makefile" ;;
"dlls/ctl3d32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctl3d32/Makefile" ;;
"dlls/ctl3dv2.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctl3dv2.dll16/Makefile" ;;
"dlls/d3d10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/Makefile" ;;
"dlls/d3d10/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/tests/Makefile" ;;
"dlls/d3d10core/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10core/Makefile" ;;
......
configure.ac
View file @ 9a19d8af
......@@ -1921,7 +1921,9 @@ WINE_CONFIG_MAKEFILE([dlls/cryptnet/tests/Makefile],[dlls/Maketest.rules],[dlls]
WINE_CONFIG_MAKEFILE([dlls/cryptui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/cryptui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/ctapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/ctl3d.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
WINE_CONFIG_MAKEFILE([dlls/ctl3d32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/ctl3dv2.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
WINE_CONFIG_MAKEFILE([dlls/d3d10/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/d3d10/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/d3d10core/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
......
dlls/Makefile.in
View file @ 9a19d8af
......@@ -20,8 +20,6 @@ DOCSUBDIRS = $(DLLSUBDIRS)
WIN16_FILES = \
avifile.dll16 \
commdlg.dll16 \
ctl3d.dll16 \
ctl3dv2.dll16 \
ddeml.dll16 \
gdi.exe16 \
imm.dll16 \
......@@ -61,9 +59,6 @@ avifile.dll16:
commdlg.dll16:
echo "comdlg32.dll" >$@
ctl3d.dll16 ctl3dv2.dll16:
echo "ctl3d32.dll" >$@
gdi.exe16 wing.dll16:
echo "gdi32.dll" >$@
......
dlls/ctl3d.dll16/Makefile.in 0 → 100644
View file @ 9a19d8af
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = ctl3d.dll16
IMPORTS = user32 kernel32
EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ctl3d32.dll
SPEC_SRCS = ctl3d.dll16.spec
C_SRCS = ctl3d.c
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend
dlls/ctl3d32/ctl3d.c → dlls/ctl3d.dll16/ctl3d.c
View file @ 9a19d8af
......@@ -25,7 +25,6 @@ static BOOL16 CTL3D16_is_auto_subclass = FALSE;
/***********************************************************************
* Ctl3dAutoSubclass (CTL3D.16)
* Ctl3dAutoSubclass (CTL3DV2.16)
*/
BOOL16 WINAPI Ctl3dAutoSubclass16(HINSTANCE16 hInst)
{
......@@ -35,7 +34,6 @@ BOOL16 WINAPI Ctl3dAutoSubclass16(HINSTANCE16 hInst)
/***********************************************************************
* Ctl3dAutoSubclassEx (CTL3D.27)
* Ctl3dAutoSubclassEx (CTL3DV2.27)
*/
BOOL16 WINAPI Ctl3dAutoSubclassEx16(HINSTANCE16 hInst, DWORD type)
{
......@@ -45,7 +43,6 @@ BOOL16 WINAPI Ctl3dAutoSubclassEx16(HINSTANCE16 hInst, DWORD type)
/***********************************************************************
* Ctl3dColorChange (CTL3D.6)
* Ctl3dColorChange (CTL3DV2.6)
*/
BOOL16 WINAPI Ctl3dColorChange16(void)
{
......@@ -54,7 +51,6 @@ BOOL16 WINAPI Ctl3dColorChange16(void)
/***********************************************************************
* Ctl3dCtlColor (CTL3D.4)
* Ctl3dCtlColor (CTL3DV2.4)
*/
HBRUSH WINAPI Ctl3dCtlColor16(HDC16 hdc, LONG hwnd)
{
......@@ -63,7 +59,6 @@ HBRUSH WINAPI Ctl3dCtlColor16(HDC16 hdc, LONG hwnd)
/***********************************************************************
* Ctl3dCtlColorEx (CTL3D.18)
* Ctl3dCtlColorEx (CTL3DV2.18)
*/
HBRUSH WINAPI Ctl3dCtlColorEx16(UINT16 msg, WPARAM16 wParam, LPARAM lParam)
{
......@@ -72,7 +67,6 @@ HBRUSH WINAPI Ctl3dCtlColorEx16(UINT16 msg, WPARAM16 wParam, LPARAM lParam)
/***********************************************************************
* Ctl3dDlgFramePaint (CTL3D.20)
* Ctl3dDlgFramePaint (CTL3DV2.20)
*/
LONG WINAPI Ctl3dDlgFramePaint16(HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam)
{
......@@ -81,7 +75,6 @@ LONG WINAPI Ctl3dDlgFramePaint16(HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARA
/***********************************************************************
* Ctl3dEnabled (CTL3D.5)
* Ctl3dEnabled (CTL3DV2.5)
*/
BOOL16 WINAPI Ctl3dEnabled16(void)
{
......@@ -90,7 +83,6 @@ BOOL16 WINAPI Ctl3dEnabled16(void)
/***********************************************************************
* Ctl3dGetVer (CTL3D.1)
* Ctl3dGetVer (CTL3DV2.1)
*/
WORD WINAPI Ctl3dGetVer16(void)
{
......@@ -99,7 +91,6 @@ WORD WINAPI Ctl3dGetVer16(void)
/***********************************************************************
* Ctl3dIsAutoSubclass (CTL3D.23)
* Ctl3dIsAutoSubclass (CTL3DV2.23)
*/
BOOL16 WINAPI Ctl3dIsAutoSubclass16(void)
{
......@@ -108,7 +99,6 @@ BOOL16 WINAPI Ctl3dIsAutoSubclass16(void)
/***********************************************************************
* Ctl3dRegister (CTL3D.12)
* Ctl3dRegister (CTL3DV2.12)
*/
BOOL16 WINAPI Ctl3dRegister16(HINSTANCE16 hInst)
{
......@@ -117,7 +107,6 @@ BOOL16 WINAPI Ctl3dRegister16(HINSTANCE16 hInst)
/***********************************************************************
* Ctl3dSubclassCtl (CTL3D.3)
* Ctl3dSubclassCtl (CTL3DV2.3)
*/
BOOL16 WINAPI Ctl3dSubclassCtl16(HWND16 hwnd)
{
......@@ -126,7 +115,6 @@ BOOL16 WINAPI Ctl3dSubclassCtl16(HWND16 hwnd)
/***********************************************************************
* Ctl3dSubclassCtlEx (CTL3D.25)
* Ctl3dSubclassCtlEx (CTL3DV2.25)
*/
BOOL16 WINAPI Ctl3dSubclassCtlEx16(HWND16 hwnd, INT16 type)
{
......@@ -135,7 +123,6 @@ BOOL16 WINAPI Ctl3dSubclassCtlEx16(HWND16 hwnd, INT16 type)
/***********************************************************************
* Ctl3dSubclassDlg (CTL3D.2)
* Ctl3dSubclassDlg (CTL3DV2.2)
*/
BOOL16 WINAPI Ctl3dSubclassDlg16(HWND16 hwnd, WORD types)
{
......@@ -144,7 +131,6 @@ BOOL16 WINAPI Ctl3dSubclassDlg16(HWND16 hwnd, WORD types)
/***********************************************************************
* Ctl3dSubclassDlgEx (CTL3D.21)
* Ctl3dSubclassDlgEx (CTL3DV2.21)
*/
BOOL16 WINAPI Ctl3dSubclassDlgEx16(HWND16 hwnd, DWORD types)
{
......@@ -153,7 +139,6 @@ BOOL16 WINAPI Ctl3dSubclassDlgEx16(HWND16 hwnd, DWORD types)
/***********************************************************************
* Ctl3dUnAutoSubclass (CTL3D.24)
* Ctl3dUnAutoSubclass (CTL3DV2.24)
*/
BOOL16 WINAPI Ctl3dUnAutoSubclass16(void)
{
......@@ -163,7 +148,6 @@ BOOL16 WINAPI Ctl3dUnAutoSubclass16(void)
/***********************************************************************
* Ctl3dUnregister (CTL3D.13)
* Ctl3dUnregister (CTL3DV2.13)
*/
BOOL16 WINAPI Ctl3dUnregister16(HINSTANCE16 hInst)
{
......@@ -173,7 +157,6 @@ BOOL16 WINAPI Ctl3dUnregister16(HINSTANCE16 hInst)
/***********************************************************************
* Ctl3dUnsubclassCtl (CTL3D.26)
* Ctl3dUnsubclassCtl (CTL3DV2.26)
*/
BOOL16 WINAPI Ctl3dUnsubclassCtl16(HWND16 hwnd)
{
......@@ -182,7 +165,6 @@ BOOL16 WINAPI Ctl3dUnsubclassCtl16(HWND16 hwnd)
/***********************************************************************
* Ctl3dWinIniChange (CTL3D.22)
* Ctl3dWinIniChange (CTL3DV2.22)
*/
void WINAPI Ctl3dWinIniChange16(void)
{
......@@ -190,7 +172,6 @@ void WINAPI Ctl3dWinIniChange16(void)
/***********************************************************************
* ComboWndProc3d (CTL3D.10)
* ComboWndProc3d (CTL3DV2.10)
*/
LRESULT WINAPI ComboWndProc3d16(HWND16 hwnd, UINT16 msg,WPARAM16 wparam, LPARAM lparam)
{
......@@ -199,7 +180,6 @@ LRESULT WINAPI ComboWndProc3d16(HWND16 hwnd, UINT16 msg,WPARAM16 wparam, LPARAM
/***********************************************************************
* BtnWndProc3d (CTL3D.7)
* BtnWndProc3d (CTL3DV2.7)
*/
LRESULT WINAPI BtnWndProc3d16(HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM lparam)
{
......@@ -208,7 +188,6 @@ LRESULT WINAPI BtnWndProc3d16(HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM l
/***********************************************************************
* StaticWndProc3d (CTL3D.11)
* StaticWndProc3d (CTL3DV2.11)
*/
LRESULT WINAPI StaticWndProc3d16(HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM lparam)
{
......@@ -217,7 +196,6 @@ LRESULT WINAPI StaticWndProc3d16(HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARA
/***********************************************************************
* EditWndProc3d (CTL3D.8)
* EditWndProc3d (CTL3DV2.8)
*/
LRESULT WINAPI EditWndProc3d16(HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM lparam)
{
......@@ -226,7 +204,6 @@ LRESULT WINAPI EditWndProc3d16(HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM
/***********************************************************************
* ListWndProc3d (CTL3D.9)
* ListWndProc3d (CTL3DV2.9)
*/
LRESULT WINAPI ListWndProc3d16(HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM lparam)
{
......@@ -235,7 +212,6 @@ LRESULT WINAPI ListWndProc3d16(HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM
/***********************************************************************
* Ctl3dDlgProc (CTL3D.17)
* Ctl3dDlgProc (CTL3DV2.17)
*/
LRESULT WINAPI Ctl3dDlgProc16(HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM lparam)
{
......
dlls/ctl3d32/Makefile.in
View file @ 9a19d8af
......@@ -8,12 +8,6 @@ IMPORTS = user32 kernel32
C_SRCS = ctl3d32.c
C_SRCS16 = ctl3d.c
SPEC_SRCS16 = \
ctl3d.spec \
ctl3dv2.spec
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend
dlls/ctl3dv2.dll16/Makefile.in 0 → 100644
View file @ 9a19d8af
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = ctl3dv2.dll16
IMPORTS = user32 kernel32
EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ctl3d32.dll
SPEC_SRCS = ctl3dv2.dll16.spec
C_SRCS = ctl3d.c
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend
dlls/ctl3dv2.dll16/ctl3d.c 0 → 100644
View file @ 9a19d8af
/*
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "wine/winbase16.h"
#include "wine/winuser16.h"
static BOOL16 CTL3D16_is_auto_subclass = FALSE;
/***********************************************************************
* Ctl3dAutoSubclass (CTL3DV2.16)
*/
BOOL16 WINAPI Ctl3dAutoSubclass16(HINSTANCE16 hInst)
{
CTL3D16_is_auto_subclass = TRUE;
return TRUE;
}
/***********************************************************************
* Ctl3dAutoSubclassEx (CTL3DV2.27)
*/
BOOL16 WINAPI Ctl3dAutoSubclassEx16(HINSTANCE16 hInst, DWORD type)
{
CTL3D16_is_auto_subclass = TRUE;
return TRUE;
}
/***********************************************************************
* Ctl3dColorChange (CTL3DV2.6)
*/
BOOL16 WINAPI Ctl3dColorChange16(void)
{
return TRUE;
}
/***********************************************************************
* Ctl3dCtlColor (CTL3DV2.4)
*/
HBRUSH WINAPI Ctl3dCtlColor16(HDC16 hdc, LONG hwnd)
{
return 0;
}
/***********************************************************************
* Ctl3dCtlColorEx (CTL3DV2.18)
*/
HBRUSH WINAPI Ctl3dCtlColorEx16(UINT16 msg, WPARAM16 wParam, LPARAM lParam)
{
return 0;
}
/***********************************************************************
* Ctl3dDlgFramePaint (CTL3DV2.20)
*/
LONG WINAPI Ctl3dDlgFramePaint16(HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam)
{
return DefWindowProc16(hwnd, msg, wParam, lParam);
}
/***********************************************************************
* Ctl3dEnabled (CTL3DV2.5)
*/
BOOL16 WINAPI Ctl3dEnabled16(void)
{
return FALSE;
}
/***********************************************************************
* Ctl3dGetVer (CTL3DV2.1)
*/
WORD WINAPI Ctl3dGetVer16(void)
{
return MAKEWORD(31,2);
}
/***********************************************************************
* Ctl3dIsAutoSubclass (CTL3DV2.23)
*/
BOOL16 WINAPI Ctl3dIsAutoSubclass16(void)
{
return CTL3D16_is_auto_subclass;
}
/***********************************************************************
* Ctl3dRegister (CTL3DV2.12)
*/
BOOL16 WINAPI Ctl3dRegister16(HINSTANCE16 hInst)
{
return FALSE;
}
/***********************************************************************
* Ctl3dSubclassCtl (CTL3DV2.3)
*/
BOOL16 WINAPI Ctl3dSubclassCtl16(HWND16 hwnd)
{
return FALSE;
}
/***********************************************************************
* Ctl3dSubclassCtlEx (CTL3DV2.25)
*/
BOOL16 WINAPI Ctl3dSubclassCtlEx16(HWND16 hwnd, INT16 type)
{
return FALSE;
}
/***********************************************************************
* Ctl3dSubclassDlg (CTL3DV2.2)
*/
BOOL16 WINAPI Ctl3dSubclassDlg16(HWND16 hwnd, WORD types)
{
return FALSE;
}
/***********************************************************************
* Ctl3dSubclassDlgEx (CTL3DV2.21)
*/
BOOL16 WINAPI Ctl3dSubclassDlgEx16(HWND16 hwnd, DWORD types)
{
return FALSE;
}
/***********************************************************************
* Ctl3dUnAutoSubclass (CTL3DV2.24)
*/
BOOL16 WINAPI Ctl3dUnAutoSubclass16(void)
{
CTL3D16_is_auto_subclass = FALSE;
return FALSE;
}
/***********************************************************************
* Ctl3dUnregister (CTL3DV2.13)
*/
BOOL16 WINAPI Ctl3dUnregister16(HINSTANCE16 hInst)
{
CTL3D16_is_auto_subclass = FALSE;
return TRUE;
}
/***********************************************************************
* Ctl3dUnsubclassCtl (CTL3DV2.26)
*/
BOOL16 WINAPI Ctl3dUnsubclassCtl16(HWND16 hwnd)
{
return FALSE;
}
/***********************************************************************
* Ctl3dWinIniChange (CTL3DV2.22)
*/
void WINAPI Ctl3dWinIniChange16(void)
{
}
/***********************************************************************
* ComboWndProc3d (CTL3DV2.10)
*/
LRESULT WINAPI ComboWndProc3d16(HWND16 hwnd, UINT16 msg,WPARAM16 wparam, LPARAM lparam)
{
return 0;
}
/***********************************************************************
* BtnWndProc3d (CTL3DV2.7)
*/
LRESULT WINAPI BtnWndProc3d16(HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM lparam)
{
return 0;
}
/***********************************************************************
* StaticWndProc3d (CTL3DV2.11)
*/
LRESULT WINAPI StaticWndProc3d16(HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM lparam)
{
return 0;
}
/***********************************************************************
* EditWndProc3d (CTL3DV2.8)
*/
LRESULT WINAPI EditWndProc3d16(HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM lparam)
{
return 0;
}
/***********************************************************************
* ListWndProc3d (CTL3DV2.9)
*/
LRESULT WINAPI ListWndProc3d16(HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM lparam)
{
return 0;
}
/***********************************************************************
* Ctl3dDlgProc (CTL3DV2.17)
*/
LRESULT WINAPI Ctl3dDlgProc16(HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM lparam)
{
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment