Author: akhaldi
Date: Mon Nov 10 16:41:42 2014
New Revision: 65358
URL:
http://svn.reactos.org/svn/reactos?rev=65358&view=rev
Log:
[NPPTOOLS]
* Import from Wine 1.7.27.
CORE-8789 #resolve #comment Imported in r65358.
CORE-8540
Added:
trunk/reactos/dll/win32/npptools/ (with props)
trunk/reactos/dll/win32/npptools/CMakeLists.txt (with props)
trunk/reactos/dll/win32/npptools/main.c (with props)
trunk/reactos/dll/win32/npptools/npptools.spec (with props)
Modified:
trunk/reactos/dll/win32/CMakeLists.txt
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r…
==============================================================================
--- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Mon Nov 10 16:41:42 2014
@@ -135,6 +135,7 @@
add_subdirectory(netid)
add_subdirectory(netshell)
add_subdirectory(newdev)
+add_subdirectory(npptools)
add_subdirectory(ntdsapi)
add_subdirectory(ntlanman)
add_subdirectory(ntmarta)
Propchange: trunk/reactos/dll/win32/npptools/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Mon Nov 10 16:41:42 2014
@@ -0,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
Propchange: trunk/reactos/dll/win32/npptools/
------------------------------------------------------------------------------
bugtraq:message = See issue #%BUGID% for more details.
Propchange: trunk/reactos/dll/win32/npptools/
------------------------------------------------------------------------------
bugtraq:url =
http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: trunk/reactos/dll/win32/npptools/
------------------------------------------------------------------------------
tsvn:logminsize = 10
Added: trunk/reactos/dll/win32/npptools/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/npptools/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/npptools/CMakeLists.txt (added)
+++ trunk/reactos/dll/win32/npptools/CMakeLists.txt [iso-8859-1] Mon Nov 10 16:41:42 2014
@@ -0,0 +1,13 @@
+
+add_definitions(-D__WINESRC__)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+spec2def(npptools.dll npptools.spec)
+
+add_library(npptools SHARED
+ main.c
+ ${CMAKE_CURRENT_BINARY_DIR}/npptools_stubs.c
+ ${CMAKE_CURRENT_BINARY_DIR}/npptools.def)
+
+set_module_type(npptools win32dll)
+add_importlibs(npptools msvcrt kernel32 ntdll)
+add_cd_file(TARGET npptools DESTINATION reactos/system32 FOR all)
Propchange: trunk/reactos/dll/win32/npptools/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/win32/npptools/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/npptools/main.c?…
==============================================================================
--- trunk/reactos/dll/win32/npptools/main.c (added)
+++ trunk/reactos/dll/win32/npptools/main.c [iso-8859-1] Mon Nov 10 16:41:42 2014
@@ -0,0 +1,39 @@
+/*
+ *
+ * Copyright 2014 Austin English
+ *
+ * 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 <wine/config.h>
+
+#include <stdarg.h>
+
+#include <windef.h>
+#include <winbase.h>
+
+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
+{
+ switch (reason)
+ {
+ case DLL_WINE_PREATTACH:
+ return FALSE; /* prefer native version */
+ case DLL_PROCESS_ATTACH:
+ DisableThreadLibraryCalls(instance);
+ break;
+ }
+
+ return TRUE;
+}
Propchange: trunk/reactos/dll/win32/npptools/main.c
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/win32/npptools/npptools.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/npptools/npptool…
==============================================================================
--- trunk/reactos/dll/win32/npptools/npptools.spec (added)
+++ trunk/reactos/dll/win32/npptools/npptools.spec [iso-8859-1] Mon Nov 10 16:41:42 2014
@@ -0,0 +1,60 @@
+@ stub ClearEventData
+@ stub CreateBlob
+@ stub CreateNPPInterface
+@ stub DestroyBlob
+@ stub DestroyNPPBlobTable
+@ stub DuplicateBlob
+@ stub FilterNPPBlob
+@ stub FindOneOf
+@ stub FindUnknownBlobCategories
+@ stub FindUnknownBlobTags
+@ stub GetBoolFromBlob
+@ stub GetClassIDFromBlob
+@ stub GetDwordFromBlob
+@ stub GetMacAddressFromBlob
+@ stub GetNPPAddressFilterFromBlob
+@ stub GetNPPBlobFromUI
+@ stub GetNPPBlobTable
+@ stub GetNPPEtypeSapFilter
+@ stub GetNPPMacTypeAsNumber
+@ stub GetNPPPatternFilterFromBlob
+@ stub GetNPPTriggerFromBlob
+@ stub GetNetworkInfoFromBlob
+@ stub GetStringFromBlob
+@ stub GetStringsFromBlob
+@ stub IsRemoteNPP
+@ stub LockBlob
+@ stub MarshalBlob
+@ stub MergeBlob
+@ stub NmAddUsedEntry
+@ stub NmHeapAllocate
+@ stub NmHeapFree
+@ stub NmHeapReallocate
+@ stub NmHeapSetMaxSize
+@ stub NmHeapSize
+@ stub NmRemoveUsedEntry
+@ stub RaiseNMEvent
+@ stub ReadBlobFromFile
+@ stub RegCreateBlobKey
+@ stub RegOpenBlobKey
+@ stub ReleaseEventSystem
+@ stub RemoveFromBlob
+@ stub SelectNPPBlobFromTable
+@ stub SendEvent
+@ stub SetBoolInBlob
+@ stub SetClassIDInBlob
+@ stub SetDwordInBlob
+@ stub SetMacAddressInBlob
+@ stub SetNPPAddressFilterInBlob
+@ stub SetNPPEtypeSapFilter
+@ stub SetNPPPatternFilterInBlob
+@ stub SetNPPTriggerInBlob
+@ stub SetNetworkInfoInBlob
+@ stub SetStringInBlob
+@ stub SubkeyExists
+@ stub UnMarshalBlob
+@ stub UnlockBlob
+@ stub WriteBlobToFile
+@ stub WriteCrackedBlobToFile
+@ stub recursiveDeleteKey
+@ stub setKeyAndValue
Propchange: trunk/reactos/dll/win32/npptools/npptools.spec
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Nov 10 16:41:42 2014
@@ -145,6 +145,7 @@
reactos/dll/win32/msxml6 # Synced to Wine-1.7.27
reactos/dll/win32/nddeapi # Synced to Wine-1.7.27
reactos/dll/win32/netapi32 # Forked at Wine-1.3.34
+reactos/dll/win32/npptools # Synced to Wine-1.7.27
reactos/dll/win32/ntdsapi # Synced to Wine-1.7.27
reactos/dll/win32/ntprint # Synced to Wine-1.7.27
reactos/dll/win32/objsel # Synced to Wine-1.7.27