[PATCH 0/1] MR2961: wow32: Use spec file imports.
From: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wow32/Makefile.in | 2 - dlls/wow32/wow32.spec | 34 ++++---- dlls/wow32/wow_main.c | 180 ----------------------------------------- 3 files changed, 17 insertions(+), 199 deletions(-) delete mode 100644 dlls/wow32/wow_main.c diff --git a/dlls/wow32/Makefile.in b/dlls/wow32/Makefile.in index 5f0e13a7fb6..9b29b00dfb7 100644 --- a/dlls/wow32/Makefile.in +++ b/dlls/wow32/Makefile.in @@ -1,5 +1,3 @@ MODULE = wow32.dll IMPORTLIB = wow32 IMPORTS = kernel - -C_SRCS = wow_main.c diff --git a/dlls/wow32/wow32.spec b/dlls/wow32/wow32.spec index 5459685b487..6065a059b29 100644 --- a/dlls/wow32/wow32.spec +++ b/dlls/wow32/wow32.spec @@ -1,19 +1,19 @@ # ordinal exports -1 stdcall WOWGetDescriptor(long ptr) +1 stdcall -import WOWGetDescriptor(long ptr) K32WOWGetDescriptor -@ stdcall WOWCallback16(long long) -@ stdcall WOWCallback16Ex(long long long ptr ptr) -@ stdcall WOWDirectedYield16(long) -@ stdcall WOWGetVDMPointer(long long long) -@ stdcall WOWGetVDMPointerFix(long long long) -@ stdcall WOWGetVDMPointerUnfix(long) -@ stdcall WOWGlobalAlloc16(long long) -@ stdcall WOWGlobalAllocLock16(long long ptr) -@ stdcall WOWGlobalFree16(long) -@ stdcall WOWGlobalLock16(long) -@ stdcall WOWGlobalLockSize16(long ptr) -@ stdcall WOWGlobalUnlock16(long) -@ stdcall WOWGlobalUnlockFree16(long) -@ stdcall WOWHandle16(long long) -@ stdcall WOWHandle32(long long) -@ stdcall WOWYield16() +@ stdcall -import WOWCallback16(long long) K32WOWCallback16 +@ stdcall -import WOWCallback16Ex(long long long ptr ptr) K32WOWCallback16Ex +@ stdcall -import WOWDirectedYield16(long) K32WOWDirectedYield16 +@ stdcall -import WOWGetVDMPointer(long long long) K32WOWGetVDMPointer +@ stdcall -import WOWGetVDMPointerFix(long long long) K32WOWGetVDMPointerFix +@ stdcall -import WOWGetVDMPointerUnfix(long) K32WOWGetVDMPointerUnfix +@ stdcall -import WOWGlobalAlloc16(long long) K32WOWGlobalAlloc16 +@ stdcall -import WOWGlobalAllocLock16(long long ptr) K32WOWGlobalAllocLock16 +@ stdcall -import WOWGlobalFree16(long) K32WOWGlobalFree16 +@ stdcall -import WOWGlobalLock16(long) K32WOWGlobalLock16 +@ stdcall -import WOWGlobalLockSize16(long ptr) K32WOWGlobalLockSize16 +@ stdcall -import WOWGlobalUnlock16(long) K32WOWGlobalUnlock16 +@ stdcall -import WOWGlobalUnlockFree16(long) K32WOWGlobalUnlockFree16 +@ stdcall -import WOWHandle16(long long) K32WOWHandle16 +@ stdcall -import WOWHandle32(long long) K32WOWHandle32 +@ stdcall -import WOWYield16() K32WOWYield16 diff --git a/dlls/wow32/wow_main.c b/dlls/wow32/wow_main.c deleted file mode 100644 index e2795830d37..00000000000 --- a/dlls/wow32/wow_main.c +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Win32 Windows-on-Windows support - * - * Copyright 2005 Alexandre Julliard - * - * 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 "wownt32.h" - -#undef WOWCallback16 -#undef WOWCallback16Ex -#undef WOWDirectedYield16 -#undef WOWGetVDMPointer -#undef WOWGetVDMPointerFix -#undef WOWGetVDMPointerUnfix -#undef WOWGlobalAlloc16 -#undef WOWGlobalAllocLock16 -#undef WOWGlobalFree16 -#undef WOWGlobalLock16 -#undef WOWGlobalLockSize16 -#undef WOWGlobalUnlock16 -#undef WOWGlobalUnlockFree16 -#undef WOWHandle16 -#undef WOWHandle32 -#undef WOWYield16 - -BOOL WINAPI K32WOWGetDescriptor(DWORD,LPLDT_ENTRY); - -/********************************************************************** - * WOWGetDescriptor (WOW32.1) - */ -BOOL WINAPI WOWGetDescriptor( DWORD segptr, LPLDT_ENTRY ldtent ) -{ - return K32WOWGetDescriptor( segptr, ldtent ); -} - -/********************************************************************** - * WOWGetVDMPointer (WOW32.@) - */ -LPVOID WINAPI WOWGetVDMPointer( DWORD vp, DWORD dwBytes, BOOL fProtectedMode ) -{ - return K32WOWGetVDMPointer( vp, dwBytes, fProtectedMode ); -} - -/********************************************************************** - * WOWGetVDMPointerFix (WOW32.@) - */ -LPVOID WINAPI WOWGetVDMPointerFix( DWORD vp, DWORD dwBytes, BOOL fProtectedMode ) -{ - return K32WOWGetVDMPointerFix( vp, dwBytes, fProtectedMode ); -} - -/********************************************************************** - * WOWGetVDMPointerUnfix (WOW32.@) - */ -void WINAPI WOWGetVDMPointerUnfix( DWORD vp ) -{ - K32WOWGetVDMPointerUnfix( vp ); -} - -/********************************************************************** - * WOWGlobalAlloc16 (WOW32.@) - */ -WORD WINAPI WOWGlobalAlloc16( WORD wFlags, DWORD cb ) -{ - return K32WOWGlobalAlloc16( wFlags, cb ); -} - -/********************************************************************** - * WOWGlobalFree16 (WOW32.@) - */ -WORD WINAPI WOWGlobalFree16( WORD hMem ) -{ - return K32WOWGlobalFree16( hMem ); -} - -/********************************************************************** - * WOWGlobalLock16 (WOW32.@) - */ -DWORD WINAPI WOWGlobalLock16( WORD hMem ) -{ - return K32WOWGlobalLock16( hMem ); -} - -/********************************************************************** - * WOWGlobalUnlock16 (WOW32.@) - */ -BOOL WINAPI WOWGlobalUnlock16( WORD hMem ) -{ - return K32WOWGlobalUnlock16( hMem ); -} - -/********************************************************************** - * WOWGlobalAllocLock16 (WOW32.@) - */ -DWORD WINAPI WOWGlobalAllocLock16( WORD wFlags, DWORD cb, WORD *phMem ) -{ - return K32WOWGlobalAllocLock16( wFlags, cb, phMem ); -} - -/********************************************************************** - * WOWGlobalLockSize16 (WOW32.@) - */ -DWORD WINAPI WOWGlobalLockSize16( WORD hMem, PDWORD pcb ) -{ - return K32WOWGlobalLockSize16( hMem, pcb ); -} - -/********************************************************************** - * WOWGlobalUnlockFree16 (WOW32.@) - */ -WORD WINAPI WOWGlobalUnlockFree16( DWORD vpMem ) -{ - return K32WOWGlobalUnlockFree16( vpMem ); -} - -/********************************************************************** - * WOWYield16 (WOW32.@) - */ -void WINAPI WOWYield16(void) -{ - K32WOWYield16(); -} - -/********************************************************************** - * WOWDirectedYield16 (WOW32.@) - */ -void WINAPI WOWDirectedYield16( WORD htask16 ) -{ - K32WOWDirectedYield16( htask16 ); -} - -/*********************************************************************** - * WOWHandle32 (WOW32.@) - */ -HANDLE WINAPI WOWHandle32( WORD handle, WOW_HANDLE_TYPE type ) -{ - return K32WOWHandle32( handle, type ); -} - -/*********************************************************************** - * WOWHandle16 (WOW32.@) - */ -WORD WINAPI WOWHandle16( HANDLE handle, WOW_HANDLE_TYPE type ) -{ - return K32WOWHandle16( handle, type ); -} - -/********************************************************************** - * WOWCallback16Ex (WOW32.@) - */ -BOOL WINAPI WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, - DWORD cbArgs, PVOID pArgs, PDWORD pdwRetCode ) -{ - return K32WOWCallback16Ex( vpfn16, dwFlags, cbArgs, pArgs, pdwRetCode ); -} - -/********************************************************************** - * WOWCallback16 (WOW32.@) - */ -DWORD WINAPI WOWCallback16( DWORD vpfn16, DWORD dwParam ) -{ - return K32WOWCallback16( vpfn16, dwParam ); -} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2961
This merge request was approved by Etaash Mathamsetty. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2961
participants (3)
-
Etaash Mathamsetty (＠etaash.mathamsetty) -
Zebediah Figura
-
Zebediah Figura (＠zfigura)