PATCH: sane.ds / DECLSPEC hidden
Marcus Meissner
marcus at jet.franken.de
Mon Jun 12 14:57:25 CDT 2006
Hi,
Alexandre, is this how to reduce exports? ;)
Ciao, Marcus
Changelog:
Mark internal variables and functions as declspec hidden.
Index: dlls/sane.ds/sane_i.h
===================================================================
RCS file: /home/wine/wine/dlls/sane.ds/sane_i.h,v
retrieving revision 1.2
diff -u -r1.2 sane_i.h
--- dlls/sane.ds/sane_i.h 23 May 2006 12:48:34 -0000 1.2
+++ dlls/sane.ds/sane_i.h 12 Jun 2006 19:55:56 -0000
@@ -32,7 +32,7 @@
#include "winbase.h"
#include "twain.h"
-extern HINSTANCE SANE_instance;
+extern DECLSPEC_HIDDEN HINSTANCE SANE_instance;
/* internal information about an active data source */
struct tagActiveDS
@@ -54,164 +54,164 @@
#endif
/* Capabiblities */
TW_UINT16 capXferMech; /* ICAP_XFERMECH */
-} activeDS;
+} activeDS DECLSPEC_HIDDEN;
/* Helper functions */
-extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action);
+extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN;
/* */
extern TW_UINT16 SANE_ControlGroupHandler (
- pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData);
+ pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData) DECLSPEC_HIDDEN;
extern TW_UINT16 SANE_ImageGroupHandler (
- pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData);
+ pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData) DECLSPEC_HIDDEN;
extern TW_UINT16 SANE_AudioGroupHandler (
- pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData);
+ pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData) DECLSPEC_HIDDEN;
extern TW_UINT16 SANE_SourceManagerHandler (
- pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData);
+ pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData) DECLSPEC_HIDDEN;
/* Implementation of operation triplets
* From Application to Source (Control Information) */
-TW_UINT16 SANE_CapabilityGet (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+TW_UINT16 SANE_CapabilityGet (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_CapabilityGetCurrent
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_CapabilityGetDefault
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_CapabilityQuerySupport
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_CapabilityReset
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_CapabilitySet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_CustomDSDataGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_CustomDSDataSet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_AutomaticCaptureDirectory
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_ChangeDirectory
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_FileSystemCopy
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_CreateDirectory
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_FileSystemDelete
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_FormatMedia
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_FileSystemGetClose
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_FileSystemGetFirstFile
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_FileSystemGetInfo
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_FileSystemGetNextFile
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_FileSystemRename
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_ProcessEvent
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_PassThrough
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_PendingXfersEndXfer
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_PendingXfersGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_PendingXfersReset
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_PendingXfersStopFeeder
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_SetupFileXferGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_SetupFileXferGetDefault
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_SetupFileXferReset
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_SetupFileXferSet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_SetupFileXfer2Get
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_SetupFileXfer2GetDefault
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_SetupFileXfer2Reset
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_SetupFileXfer2Set
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_SetupMemXferGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_GetDSStatus
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_DisableDSUserInterface
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_EnableDSUserInterface
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_EnableDSUIOnly
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_XferGroupGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_XferGroupSet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
/* Implementation of operation triplets
* From Application to Source (Image Information) */
TW_UINT16 SANE_CIEColorGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_ExtImageInfoGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_GrayResponseReset
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_GrayResponseSet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_ImageFileXferGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_ImageInfoGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_ImageLayoutGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_ImageLayoutGetDefault
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_ImageLayoutReset
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_ImageLayoutSet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_ImageMemXferGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_ImageNativeXferGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_JPEGCompressionGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_JPEGCompressionGetDefault
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_JPEGCompressionReset
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_JPEGCompressionSet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_Palette8Get
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_Palette8GetDefault
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_Palette8Reset
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_Palette8Set
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_RGBResponseReset
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_RGBResponseSet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
/* Implementation of operation triplets
* From Application to Source (Audio Information) */
TW_UINT16 SANE_AudioFileXferGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_AudioInfoGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
TW_UINT16 SANE_AudioNativeXferGet
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
/* Implementation of TWAIN capabilities */
-TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action);
+TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN;
/* UI function */
-BOOL DoScannerUI(void);
-HWND ScanningDialogBox(HWND dialog, LONG progress);
+BOOL DoScannerUI(void) DECLSPEC_HIDDEN;
+HWND ScanningDialogBox(HWND dialog, LONG progress) DECLSPEC_HIDDEN;
#endif
Index: dlls/sane.ds/sane_main.c
===================================================================
RCS file: /home/wine/wine/dlls/sane.ds/sane_main.c,v
retrieving revision 1.3
diff -u -r1.3 sane_main.c
--- dlls/sane.ds/sane_main.c 3 Jun 2006 10:25:43 -0000 1.3
+++ dlls/sane.ds/sane_main.c 12 Jun 2006 19:55:57 -0000
@@ -66,6 +66,7 @@
static TW_UINT16 SANE_OpenDS( pTW_IDENTITY, pTW_IDENTITY);
#endif
+static
TW_UINT16 SANE_SourceControlHandler (
pTW_IDENTITY pOrigin,
TW_UINT16 DAT,
@@ -475,7 +476,7 @@
}
/* Main entry point for the TWAIN library */
-TW_UINT16 WINAPI
+TW_UINT16 WINAPI DECLSPEC_HIDDEN
DS_Entry ( pTW_IDENTITY pOrigin,
TW_UINT32 DG,
TW_UINT16 DAT,
More information about the wine-patches
mailing list