Jacek Caban : gdi32: Remove ordinal exports.

Alexandre Julliard julliard at winehq.org
Mon Sep 13 16:12:33 CDT 2021


Module: wine
Branch: master
Commit: 689046b2162a7eaade0b6902eadb7b7396628640
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=689046b2162a7eaade0b6902eadb7b7396628640

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Sep 13 13:50:58 2021 +0200

gdi32: Remove ordinal exports.

We no longer need them for our winspool and they are not present on Windows.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/gdi32/driver.c   | 134 --------------------------------------------------
 dlls/gdi32/gdi32.spec |   7 ---
 2 files changed, 141 deletions(-)

diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index d5528128089..ea857599b93 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -935,140 +935,6 @@ BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size )
 }
 
 
-/*****************************************************************************
- *      @ [GDI32.100]
- *
- * This should thunk to 16-bit and simply call the proc with the given args.
- */
-INT WINAPI GDI_CallDevInstall16( FARPROC16 lpfnDevInstallProc, HWND hWnd,
-                                 LPSTR lpModelName, LPSTR OldPort, LPSTR NewPort )
-{
-    FIXME("(%p, %p, %s, %s, %s)\n", lpfnDevInstallProc, hWnd, lpModelName, OldPort, NewPort );
-    return -1;
-}
-
-/*****************************************************************************
- *      @ [GDI32.101]
- *
- * This should load the correct driver for lpszDevice and calls this driver's
- * ExtDeviceModePropSheet proc.
- *
- * Note: The driver calls a callback routine for each property sheet page; these
- * pages are supposed to be filled into the structure pointed to by lpPropSheet.
- * The layout of this structure is:
- *
- * struct
- * {
- *   DWORD  nPages;
- *   DWORD  unknown;
- *   HPROPSHEETPAGE  pages[10];
- * };
- */
-INT WINAPI GDI_CallExtDeviceModePropSheet16( HWND hWnd, LPCSTR lpszDevice,
-                                             LPCSTR lpszPort, LPVOID lpPropSheet )
-{
-    FIXME("(%p, %s, %s, %p)\n", hWnd, lpszDevice, lpszPort, lpPropSheet );
-    return -1;
-}
-
-/*****************************************************************************
- *      @ [GDI32.102]
- *
- * This should load the correct driver for lpszDevice and call this driver's
- * ExtDeviceMode proc.
- *
- * FIXME: convert ExtDeviceMode to unicode in the driver interface
- */
-INT WINAPI GDI_CallExtDeviceMode16( HWND hwnd,
-                                    LPDEVMODEA lpdmOutput, LPSTR lpszDevice,
-                                    LPSTR lpszPort, LPDEVMODEA lpdmInput,
-                                    LPSTR lpszProfile, DWORD fwMode )
-{
-    WCHAR deviceW[300];
-    WCHAR bufW[300];
-    char buf[300];
-    HDC hdc;
-    DC *dc;
-    INT ret = -1;
-
-    TRACE("(%p, %p, %s, %s, %p, %s, %d)\n",
-          hwnd, lpdmOutput, lpszDevice, lpszPort, lpdmInput, lpszProfile, fwMode );
-
-    if (!lpszDevice) return -1;
-    if (!MultiByteToWideChar(CP_ACP, 0, lpszDevice, -1, deviceW, 300)) return -1;
-
-    if(!DRIVER_GetDriverName( deviceW, bufW, 300 )) return -1;
-
-    if (!WideCharToMultiByte(CP_ACP, 0, bufW, -1, buf, 300, NULL, NULL)) return -1;
-
-    if (!(hdc = CreateICA( buf, lpszDevice, lpszPort, NULL ))) return -1;
-
-    if ((dc = get_dc_ptr( hdc )))
-    {
-        PHYSDEV physdev = GET_DC_PHYSDEV( dc, pExtDeviceMode );
-        ret = physdev->funcs->pExtDeviceMode( buf, hwnd, lpdmOutput, lpszDevice, lpszPort,
-                                              lpdmInput, lpszProfile, fwMode );
-	release_dc_ptr( dc );
-    }
-    DeleteDC( hdc );
-    return ret;
-}
-
-/****************************************************************************
- *      @ [GDI32.103]
- *
- * This should load the correct driver for lpszDevice and calls this driver's
- * AdvancedSetupDialog proc.
- */
-INT WINAPI GDI_CallAdvancedSetupDialog16( HWND hwnd, LPSTR lpszDevice,
-                                          LPDEVMODEA devin, LPDEVMODEA devout )
-{
-    TRACE("(%p, %s, %p, %p)\n", hwnd, lpszDevice, devin, devout );
-    return -1;
-}
-
-/*****************************************************************************
- *      @ [GDI32.104]
- *
- * This should load the correct driver for lpszDevice and calls this driver's
- * DeviceCapabilities proc.
- *
- * FIXME: convert DeviceCapabilities to unicode in the driver interface
- */
-DWORD WINAPI GDI_CallDeviceCapabilities16( LPCSTR lpszDevice, LPCSTR lpszPort,
-                                           WORD fwCapability, LPSTR lpszOutput,
-                                           LPDEVMODEA lpdm )
-{
-    WCHAR deviceW[300];
-    WCHAR bufW[300];
-    char buf[300];
-    HDC hdc;
-    DC *dc;
-    INT ret = -1;
-
-    TRACE("(%s, %s, %d, %p, %p)\n", lpszDevice, lpszPort, fwCapability, lpszOutput, lpdm );
-
-    if (!lpszDevice) return -1;
-    if (!MultiByteToWideChar(CP_ACP, 0, lpszDevice, -1, deviceW, 300)) return -1;
-
-    if(!DRIVER_GetDriverName( deviceW, bufW, 300 )) return -1;
-
-    if (!WideCharToMultiByte(CP_ACP, 0, bufW, -1, buf, 300, NULL, NULL)) return -1;
-
-    if (!(hdc = CreateICA( buf, lpszDevice, lpszPort, NULL ))) return -1;
-
-    if ((dc = get_dc_ptr( hdc )))
-    {
-        PHYSDEV physdev = GET_DC_PHYSDEV( dc, pDeviceCapabilities );
-        ret = physdev->funcs->pDeviceCapabilities( buf, lpszDevice, lpszPort,
-                                                   fwCapability, lpszOutput, lpdm );
-        release_dc_ptr( dc );
-    }
-    DeleteDC( hdc );
-    return ret;
-}
-
-
 /******************************************************************************
  *		NtGdiExtEscape   (win32u.@)
  *
diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec
index 81a4dd5d1e9..6dbc8a9bf12 100644
--- a/dlls/gdi32/gdi32.spec
+++ b/dlls/gdi32/gdi32.spec
@@ -1,10 +1,3 @@
-# ordinal exports
-100 stdcall @(long long str str str) GDI_CallDevInstall16
-101 stdcall @(long str str ptr) GDI_CallExtDeviceModePropSheet16
-102 stdcall @(long ptr str str ptr str long) GDI_CallExtDeviceMode16
-103 stdcall @(long str ptr ptr) GDI_CallAdvancedSetupDialog16
-104 stdcall @(str str long ptr ptr) GDI_CallDeviceCapabilities16
-
 @ stdcall AbortDoc(long)
 @ stdcall AbortPath(long)
 @ stdcall AddFontMemResourceEx(ptr long ptr ptr)




More information about the wine-cvs mailing list