From 06e51bc6948badfc101d41927d1270153377d04b Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Fri, 13 Jan 2012 12:16:39 +0100
Subject: [PATCH] mshtml: Moved NPAPI struct declarations to npplugin.c.

They are no longer needed in nsiface.idl
---
 dlls/mshtml/npplugin.c  | 119 +++++++++++++++++++++++++++++++++++++++++++++++
 dlls/mshtml/nsiface.idl | 121 ------------------------------------------------
 2 files changed, 119 insertions(+), 121 deletions(-)

diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c
index e22499bcb95..435933a8790 100644
--- a/dlls/mshtml/npplugin.c
+++ b/dlls/mshtml/npplugin.c
@@ -37,6 +37,125 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 /* 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_NO_ERROR                    (NPERR_BASE + 0)
 #define NPERR_GENERIC_ERROR               (NPERR_BASE + 1)
diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index 1477f2d6f85..6a8810354ba 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -3208,127 +3208,6 @@ interface nsIContentUtils : nsISupports
     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,
     uuid(8f672000-bab9-4c60-aaaf-2673c4e2a4c6),
-- 
2.11.4.GIT