marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winnls32: Make winnls.dll into a stand-alone 16-bit module.

oldstable
Alexandre Julliard 2009-03-24 09:31:03 +01:00
parent b0530a5fbd
commit 9bf9eb0941
10 changed files with 73 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -96,7 +96,6 @@ dlls/w32sys.dll16
dlls/win32s16.dll16
dlls/wineps16.drv16
dlls/wing.dll16
dlls/winnls.dll16
dlls/winsock.dll16
dlls/wprocs.dll16
include/activaut.h

9
configure vendored
View File

@ -27655,6 +27655,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/winmm/tests/Makefile: dlls/winmm/tests/Makefile.in dlls/Maketest.rules"
ac_config_files="$ac_config_files dlls/winmm/tests/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/winnls.dll16/Makefile"
test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
winnls.dll16"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/winnls.dll16/Makefile: dlls/winnls.dll16/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/winnls.dll16/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/winnls32/Makefile"
test "x$enable_winnls32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
@ -29448,6 +29456,7 @@ do
"dlls/wininet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/tests/Makefile" ;;
"dlls/winmm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/Makefile" ;;
"dlls/winmm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/tests/Makefile" ;;
"dlls/winnls.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winnls.dll16/Makefile" ;;
"dlls/winnls32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winnls32/Makefile" ;;
"dlls/winscard/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winscard/Makefile" ;;
"dlls/winspool.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winspool.drv/Makefile" ;;

1
configure.ac
View File

@ -2271,6 +2271,7 @@ WINE_CONFIG_MAKEFILE([dlls/wininet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL
WINE_CONFIG_MAKEFILE([dlls/wininet/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/winmm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winmm/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/winnls.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
WINE_CONFIG_MAKEFILE([dlls/winnls32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winscard/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winspool.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])

4
dlls/Makefile.in
View File

@ -35,7 +35,6 @@ WIN16_FILES = \
win32s16.dll16 \
wineps16.drv16 \
wing.dll16 \
winnls.dll16 \
winsock.dll16 \
wprocs.dll16
@ -86,9 +85,6 @@ wineps16.drv16:
mmsystem.dll16:
echo "winmm.dll" >$@
winnls.dll16:
echo "winnls32.dll" >$@
winsock.dll16:
echo "ws2_32.dll" >$@

15
dlls/winnls.dll16/Makefile.in 100644
View File

@ -0,0 +1,15 @@
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = winnls.dll16
IMPORTS = winnls32 kernel32
EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,winnls32.dll
SPEC_SRCS = winnls.dll16.spec
C_SRCS = winnls.c
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend

41
dlls/winnls.dll16/winnls.c 100644
View File

@ -0,0 +1,41 @@
/*
* Copyright 2001 Andreas Mohr
*
* 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 <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "winnls32.h"
#include "wownt32.h"
#include "wine/winuser16.h"
/***********************************************************************
* WINNLSEnableIME (WINNLS.16)
*/
BOOL WINAPI WINNLSEnableIME16( HWND16 hwnd, BOOL enable )
{
return WINNLSEnableIME( HWND_32(hwnd), enable );
}
/***********************************************************************
* WINNLSGetEnableStatus (WINNLS.18)
*/
BOOL WINAPI WINNLSGetEnableStatus16( HWND16 hwnd )
{
return WINNLSGetEnableStatus( HWND_32(hwnd) );
}

0
dlls/winnls32/winnls.spec → dlls/winnls.dll16/winnls.dll16.spec
View File

2
dlls/winnls32/Makefile.in
View File

@ -9,8 +9,6 @@ IMPORTS = kernel32
C_SRCS = \
winnls.c
SPEC_SRCS16 = winnls.spec
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend

19
dlls/winnls32/winnls.c
View File

@ -20,7 +20,7 @@
#include "windef.h"
#include "winbase.h"
#include "wine/winuser16.h"
#include "winnls32.h"
/***********************************************************************
* DllMain (WINNLS.@)
@ -39,26 +39,17 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
}
/***********************************************************************
* WINNLSEnableIME (WINNLS.16)
* WINNLSGetEnableStatus (WINNLS32.2)
*/
BOOL WINAPI WINNLSEnableIME16(HWND16 hWnd, BOOL fEnable)
{
/* fake return of previous status. is this what this function should do ? */
return !fEnable;
}
/***********************************************************************
* WINNLSGetEnableStatus (WINNLS.18)
*/
BOOL WINAPI WINNLSGetEnableStatus16(HWND16 hWnd)
BOOL WINAPI WINNLSGetEnableStatus(HWND hWnd)
{
return FALSE;
}
/***********************************************************************
* WINNLS32EnableIME (WINNLS32.1)
* WINNLSEnableIME (WINNLS32.1)
*/
BOOL WINAPI WINNLS32EnableIME(HWND hWnd, BOOL fEnable)
BOOL WINAPI WINNLSEnableIME(HWND hWnd, BOOL fEnable)
{
/* fake return of previous status. is this what this function should do ? */
return !fEnable;

4
dlls/winnls32/winnls32.spec
View File

@ -1,5 +1,5 @@
1 stdcall WINNLS32EnableIME(long long)
2 stub WINNLS32GetEnableStatus
1 stdcall WINNLSEnableIME(long long)
2 stdcall WINNLSGetEnableStatus(long)
3 stub WINNLS32GetIMEHotKey
21 stub IMP32GetIME
22 stub IMP32QueryIME