ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Moved NPAPI struct declarations to npplugin.c.

Browse Source 
They are no longer needed in nsiface.idl
This commit is contained in:
Jacek Caban 2012-01-13 12:16:39 +01:00 committed by Alexandre Julliard
parent 607e274f81
commit 06e51bc694
2 changed files with 119 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
dlls/mshtml/npplugin.c
View File

@ -37,6 +37,125 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
/* Parts of npapi.h */ /* Parts of npapi.h */
#define NP_VERSION_MAJOR 0
#define NP_VERSION_MINOR 25
typedef unsigned char NPBool;
typedef INT16 NPError;
typedef INT16 NPReason;
typedef char *NPMIMEType;
typedef struct _NPP {
void *pdata;
void *ndata;
} NPP_t, *NPP;
typedef struct _NPStream {
void *pdata;
void *ndata;
const char *url;
UINT32 end;
UINT32 lastmodified;
void *notifyData;
const char *headers;
} NPStream;
typedef struct _NPSavedData {
INT32 len;
void *buf;
} NPSavedData;
typedef struct _NPRect {
UINT16 top;
UINT16 left;
UINT16 bottom;
UINT16 right;
} NPRect;
typedef enum {
NPFocusNext = 0,
NPFocusPrevious = 1
} NPFocusDirection;
#define NP_ABI_MASK 0
typedef enum {
NPPVpluginNameString = 1,
NPPVpluginDescriptionString,
NPPVpluginWindowBool,
NPPVpluginTransparentBool,
NPPVjavaClass,
NPPVpluginWindowSize,
NPPVpluginTimerInterval,
NPPVpluginScriptableInstance = (10 | NP_ABI_MASK),
NPPVpluginScriptableIID = 11,
NPPVjavascriptPushCallerBool = 12,
NPPVpluginKeepLibraryInMemory = 13,
NPPVpluginNeedsXEmbed = 14,
NPPVpluginScriptableNPObject = 15,
NPPVformValue = 16,
NPPVpluginUrlRequestsDisplayedBool = 17,
NPPVpluginWantsAllNetworkStreams = 18,
NPPVpluginNativeAccessibleAtkPlugId = 19,
NPPVpluginCancelSrcStream = 20,
NPPVSupportsAdvancedKeyHandling = 21
} NPPVariable;
typedef enum {
NPNVxDisplay = 1,
NPNVxtAppContext,
NPNVnetscapeWindow,
NPNVjavascriptEnabledBool,
NPNVasdEnabledBool,
NPNVisOfflineBool,
NPNVserviceManager = (10 | NP_ABI_MASK),
NPNVDOMElement = (11 | NP_ABI_MASK),
NPNVDOMWindow = (12 | NP_ABI_MASK),
NPNVToolkit = (13 | NP_ABI_MASK),
NPNVSupportsXEmbedBool = 14,
NPNVWindowNPObject = 15,
NPNVPluginElementNPObject = 16,
NPNVSupportsWindowless = 17,
NPNVprivateModeBool = 18,
NPNVsupportsAdvancedKeyHandling = 21
} NPNVariable;
typedef enum {
NPWindowTypeWindow = 1,
NPWindowTypeDrawable
} NPWindowType;
typedef struct _NPWindow {
void *window;
INT32 x;
INT32 y;
UINT32 width;
UINT32 height;
NPRect clipRect;
NPWindowType type;
} NPWindow;
typedef struct _NPFullPrint {
NPBool pluginPrinted;
NPBool printOne;
void *platformPrint;
} NPFullPrint;
typedef struct _NPEmbedPrint {
NPWindow window;
void *platformPrint;
} NPEmbedPrint;
typedef struct _NPPrint {
UINT16 mode;
union {
NPFullPrint fullPrint;
NPEmbedPrint embedPrint;
} print;
} NPPrint;
typedef HRGN NPRegion;
#define NPERR_BASE 0 #define NPERR_BASE 0
#define NPERR_NO_ERROR (NPERR_BASE + 0) #define NPERR_NO_ERROR (NPERR_BASE + 0)
#define NPERR_GENERIC_ERROR (NPERR_BASE + 1) #define NPERR_GENERIC_ERROR (NPERR_BASE + 1)

121
dlls/mshtml/nsiface.idl
View File

@ -3208,127 +3208,6 @@ interface nsIContentUtils : nsISupports
nsresult AddScriptRunner(nsIRunnable *aRunnable); nsresult AddScriptRunner(nsIRunnable *aRunnable);
} }
/* Parts of npapi.h */
cpp_quote("#define NP_VERSION_MAJOR 0")
cpp_quote("#define NP_VERSION_MINOR 25")
typedef unsigned char NPBool;
typedef INT16 NPError;
typedef INT16 NPReason;
typedef char *NPMIMEType;
typedef struct _NPP {
void *pdata;
void *ndata;
} NPP_t, *NPP;
typedef struct _NPStream {
void *pdata;
void *ndata;
const char *url;
UINT32 end;
UINT32 lastmodified;
void *notifyData;
const char *headers;
} NPStream;
typedef struct _NPSavedData {
INT32 len;
void *buf;
} NPSavedData;
typedef struct _NPRect {
UINT16 top;
UINT16 left;
UINT16 bottom;
UINT16 right;
} NPRect;
typedef enum {
NPFocusNext = 0,
NPFocusPrevious = 1
} NPFocusDirection;
#define NP_ABI_MASK 0
typedef enum {
NPPVpluginNameString = 1,
NPPVpluginDescriptionString,
NPPVpluginWindowBool,
NPPVpluginTransparentBool,
NPPVjavaClass,
NPPVpluginWindowSize,
NPPVpluginTimerInterval,
NPPVpluginScriptableInstance = (10 | NP_ABI_MASK),
NPPVpluginScriptableIID = 11,
NPPVjavascriptPushCallerBool = 12,
NPPVpluginKeepLibraryInMemory = 13,
NPPVpluginNeedsXEmbed = 14,
NPPVpluginScriptableNPObject = 15,
NPPVformValue = 16,
NPPVpluginUrlRequestsDisplayedBool = 17,
NPPVpluginWantsAllNetworkStreams = 18,
NPPVpluginNativeAccessibleAtkPlugId = 19,
NPPVpluginCancelSrcStream = 20,
NPPVSupportsAdvancedKeyHandling = 21
} NPPVariable;
typedef enum {
NPNVxDisplay = 1,
NPNVxtAppContext,
NPNVnetscapeWindow,
NPNVjavascriptEnabledBool,
NPNVasdEnabledBool,
NPNVisOfflineBool,
NPNVserviceManager = (10 | NP_ABI_MASK),
NPNVDOMElement = (11 | NP_ABI_MASK),
NPNVDOMWindow = (12 | NP_ABI_MASK),
NPNVToolkit = (13 | NP_ABI_MASK),
NPNVSupportsXEmbedBool = 14,
NPNVWindowNPObject = 15,
NPNVPluginElementNPObject = 16,
NPNVSupportsWindowless = 17,
NPNVprivateModeBool = 18,
NPNVsupportsAdvancedKeyHandling = 21
} NPNVariable;
typedef enum {
NPWindowTypeWindow = 1,
NPWindowTypeDrawable
} NPWindowType;
typedef struct _NPWindow {
void *window;
INT32 x;
INT32 y;
UINT32 width;
UINT32 height;
NPRect clipRect;
NPWindowType type;
} NPWindow;
typedef struct _NPFullPrint {
NPBool pluginPrinted;
NPBool printOne;
void *platformPrint;
} NPFullPrint;
typedef struct _NPEmbedPrint {
NPWindow window;
void *platformPrint;
} NPEmbedPrint;
typedef struct _NPPrint {
UINT16 mode;
union {
NPFullPrint fullPrint;
NPEmbedPrint embedPrint;
} print;
} NPPrint;
typedef HRGN NPRegion;
[ [
object, object,
uuid(8f672000-bab9-4c60-aaaf-2673c4e2a4c6), uuid(8f672000-bab9-4c60-aaaf-2673c4e2a4c6),