[ros-diffs] [cwittich] 39228: add loadperf and lodctr from wine 1.1.14

Author: cwittich
Date: Sat Jan 31 07:09:48 2009
New Revision: 39228

URL: http://svn.reactos.org/svn/reactos?rev=39228&view=rev
Log:
add loadperf and lodctr from wine 1.1.14

Added:
    trunk/reactos/dll/win32/loadperf/   (with props)
    trunk/reactos/dll/win32/loadperf/loadperf.rbuild   (with props)
    trunk/reactos/dll/win32/loadperf/loadperf.spec   (with props)
    trunk/reactos/dll/win32/loadperf/loadperf_main.c   (with props)
    trunk/reactos/include/psdk/loadperf.h   (with props)
Modified:
    trunk/reactos/base/applications/cmdutils/cmdutils.rbuild
    trunk/reactos/baseaddress.rbuild
    trunk/reactos/boot/bootdata/packages/reactos.dff
    trunk/reactos/dll/win32/win32.rbuild

Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/cmdutils.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/cmdutils.rbuild [iso-8859-1] Sat Jan 31
07:09:48 2009
@@ -13,6 +13,9 @@
 	<directory name="hostname">
 		<xi:include href="hostname/hostname.rbuild" />
 	</directory>
+	<directory name="lodctr">
+		<xi:include href="lodctr/lodctr.rbuild" />
+	</directory>
 	<directory name="more">
 		<xi:include href="more/more.rbuild" />
 	</directory>

Modified: trunk/reactos/baseaddress.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=392…
==============================================================================
--- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original)
+++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sat Jan 31 07:09:48 2009
@@ -9,6 +9,7 @@
   <property name="BASEADDRESS_RSABASE" value="0x35700000" />
   <property name="BASEADDRESS_RSAENH" value="0x35780000" />
   <property name="BASEADDRESS_DWMAPI" value="0x4A3F0000" />
+  <property name="BASEADDRESS_LOADPERF" value="0x4B920000" />
   <property name="BASEADDRESS_MPRAPI" value="0x4C400000" />
   <property name="BASEADDRESS_PSTOREC" value="0x513D0000" />
   <property name="BASEADDRESS_LPK" value="0x516C0000" />

Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Jan 31 07:09:48
2009
@@ -37,6 +37,7 @@
 base\applications\cmdutils\doskey\doskey.exe            1
 base\applications\cmdutils\find\find.exe                1
 base\applications\cmdutils\hostname\hostname.exe        1
+base\applications\cmdutils\lodctr\lodctr.exe            1
 base\applications\cmdutils\more\more.exe                1
 base\applications\cmdutils\xcopy\xcopy.exe              1
 base\applications\control\control.exe                   1
@@ -278,6 +279,7 @@
 dll\win32\itss\itss.dll                             1
 dll\win32\jscript\jscript.dll                       1
 dll\win32\kernel32\kernel32.dll                     1
+dll\win32\loadperf\loadperf.dll                     1
 dll\win32\localui\localui.dll                       1
 dll\win32\lsasrv\lsasrv.dll                         1
 dll\win32\lz32\lz32.dll                             1

Propchange: trunk/reactos/dll/win32/loadperf/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Jan 31 07:09:48 2009
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)

Propchange: trunk/reactos/dll/win32/loadperf/
------------------------------------------------------------------------------
    bugtraq:message = See issue #%BUGID% for more details.

Propchange: trunk/reactos/dll/win32/loadperf/
------------------------------------------------------------------------------
    bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: trunk/reactos/dll/win32/loadperf/
------------------------------------------------------------------------------
    tsvn:logminsize = 10

Added: trunk/reactos/dll/win32/loadperf/loadperf.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/loadper…
==============================================================================
--- trunk/reactos/dll/win32/loadperf/loadperf.rbuild (added)
+++ trunk/reactos/dll/win32/loadperf/loadperf.rbuild [iso-8859-1] Sat Jan 31 07:09:48
2009
@@ -1,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="loadperf" type="win32dll"
baseaddress="${BASEADDRESS_LOADPERF}" installbase="system32"
installname="loadperf.dll" allowwarnings="true">
+	<importlibrary definition="loadperf.spec" />
+	<include base="loadperf">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<define name="__WINESRC__" />
+	<file>loadperf_main.c</file>
+	<library>wine</library>
+	<library>kernel32</library>
+	<library>ntdll</library>
+</module>
+

Propchange: trunk/reactos/dll/win32/loadperf/loadperf.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/loadperf/loadperf.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/loadper…
==============================================================================
--- trunk/reactos/dll/win32/loadperf/loadperf.spec (added)
+++ trunk/reactos/dll/win32/loadperf/loadperf.spec [iso-8859-1] Sat Jan 31 07:09:48 2009
@@ -1,0 +1,14 @@
+@ stub BackupPerfRegistryToFileW
+@ stdcall InstallPerfDllA(str str ptr)
+@ stdcall InstallPerfDllW(wstr wstr ptr)
+@ stub LoadMofFromInstalledServiceA
+@ stub LoadMofFromInstalledServiceW
+@ stdcall LoadPerfCounterTextStringsA(str long)
+@ stdcall LoadPerfCounterTextStringsW(wstr long)
+@ stub RestorePerfRegistryFromFileW
+@ stub SetServiceAsTrustedA
+@ stub SetServiceAsTrustedW
+@ stdcall UnloadPerfCounterTextStringsA(str long)
+@ stdcall UnloadPerfCounterTextStringsW(wstr long)
+@ stub UpdatePerfNameFilesA
+@ stub UpdatePerfNameFilesW

Propchange: trunk/reactos/dll/win32/loadperf/loadperf.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/loadperf/loadperf_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/loadper…
==============================================================================
--- trunk/reactos/dll/win32/loadperf/loadperf_main.c (added)
+++ trunk/reactos/dll/win32/loadperf/loadperf_main.c [iso-8859-1] Sat Jan 31 07:09:48
2009
@@ -1,0 +1,165 @@
+/*
+ * Implementation of loadperf.dll
+ *
+ * Copyright 2009 Andrey Turkin
+ *
+ * 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 "config.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winnls.h"
+#include "wine/debug.h"
+
+#include "loadperf.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(loadperf);
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+    TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved);
+
+    switch(fdwReason)
+    {
+    case DLL_WINE_PREATTACH:
+        return FALSE; /* prefer native version */
+    case DLL_PROCESS_ATTACH:
+        DisableThreadLibraryCalls(hinstDLL);
+        break;
+    case DLL_PROCESS_DETACH:
+        break;
+    }
+
+    return TRUE;
+}
+
+static WCHAR *strdupAW(const char *str)
+{
+    WCHAR *ret = NULL;
+    if (str)
+    {
+        INT len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0);
+        if (!(ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) return NULL;
+        MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len);
+    }
+    return ret;
+}
+
+/*************************************************************
+ *     InstallPerfDllA (loadperf.@)
+ */
+DWORD WINAPI InstallPerfDllA(LPCSTR computer, LPCSTR ini, ULONG_PTR flags)
+{
+    DWORD ret;
+    LPWSTR computerW = NULL, iniW = NULL;
+
+    if (computer && !(computerW = strdupAW(computer))) return ERROR_OUTOFMEMORY;
+    if (ini && !(iniW = strdupAW(ini)))
+    {
+        HeapFree(GetProcessHeap(), 0, computerW);
+        return ERROR_OUTOFMEMORY;
+    }
+
+    ret = InstallPerfDllW(computerW, iniW, flags);
+
+    HeapFree(GetProcessHeap(), 0, computerW);
+    HeapFree(GetProcessHeap(), 0, iniW);
+
+    return ret;
+}
+
+/*************************************************************
+ *     InstallPerfDllW (loadperf.@)
+ */
+DWORD WINAPI InstallPerfDllW(LPCWSTR computer, LPCWSTR ini, ULONG_PTR flags)
+{
+    FIXME("(%s, %s, %lx)\n", debugstr_w(computer), debugstr_w(ini), flags);
+    return ERROR_SUCCESS;
+}
+
+/*************************************************************
+ *     LoadPerfCounterTextStringsA (loadperf.@)
+ *
+ * NOTES
+ *   See LoadPerfCounterTextStringsW
+ */
+DWORD WINAPI LoadPerfCounterTextStringsA(LPCSTR cmdline, BOOL quiet)
+{
+    DWORD ret;
+    LPWSTR cmdlineW = NULL;
+
+    if (cmdline && !(cmdlineW = strdupAW(cmdline))) return ERROR_OUTOFMEMORY;
+
+    ret = LoadPerfCounterTextStringsW(cmdlineW, quiet);
+
+    HeapFree(GetProcessHeap(), 0, cmdlineW);
+
+    return ret;
+}
+
+/*************************************************************
+ *     LoadPerfCounterTextStringsW (loadperf.@)
+ *
+ * PARAMS
+ *   cmdline [in] Last argument in command line - ini file to be used
+ *   quiet   [in] FALSE - the function may write to stdout
+ *
+ */
+DWORD WINAPI LoadPerfCounterTextStringsW(LPCWSTR cmdline, BOOL quiet)
+{
+    FIXME("(%s, %d): stub\n", debugstr_w(cmdline), quiet);
+
+    return ERROR_SUCCESS;
+}
+
+/*************************************************************
+ *     UnloadPerfCounterTextStringsA (loadperf.@)
+ *
+ * NOTES
+ *   See UnloadPerfCounterTextStringsW
+ */
+DWORD WINAPI UnloadPerfCounterTextStringsA(LPCSTR cmdline, BOOL quiet)
+{
+    DWORD ret;
+    LPWSTR cmdlineW = NULL;
+
+    if (cmdline && !(cmdlineW = strdupAW(cmdline))) return ERROR_OUTOFMEMORY;
+
+    ret = UnloadPerfCounterTextStringsW(cmdlineW, quiet);
+
+    HeapFree(GetProcessHeap(), 0, cmdlineW);
+
+    return ret;
+}
+
+/*************************************************************
+ *     UnloadPerfCounterTextStringsW (loadperf.@)
+ *
+ * PARAMS
+ *   cmdline [in] Last argument in command line - application counters to be removed
+ *   quiet   [in] FALSE - the function may write to stdout
+ *
+ */
+DWORD WINAPI UnloadPerfCounterTextStringsW(LPCWSTR cmdline, BOOL quiet)
+{
+    FIXME("(%s, %d): stub\n", debugstr_w(cmdline), quiet);
+
+    return ERROR_SUCCESS;
+}

Propchange: trunk/reactos/dll/win32/loadperf/loadperf_main.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/win32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev…
==============================================================================
--- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sat Jan 31 07:09:48 2009
@@ -148,6 +148,9 @@
 <directory name="kernel32">
 	<xi:include href="kernel32/kernel32.rbuild" />
 </directory>
+<directory name="loadperf">
+	<xi:include href="loadperf/loadperf.rbuild" />
+</directory>
 <directory name="localui">
 	<xi:include href="localui/localui.rbuild" />
 </directory>

Added: trunk/reactos/include/psdk/loadperf.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/loadperf.h?re…
==============================================================================
--- trunk/reactos/include/psdk/loadperf.h (added)
+++ trunk/reactos/include/psdk/loadperf.h [iso-8859-1] Sat Jan 31 07:09:48 2009
@@ -1,0 +1,42 @@
+/*
+ * Copyright (C) 2009 Andrey Turkin
+ *
+ * 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
+ */
+
+#ifndef __WINE_LOADPERF_H
+#define __WINE_LOADPERF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+DWORD WINAPI InstallPerfDllA(LPCSTR, LPCSTR, ULONG_PTR);
+DWORD WINAPI InstallPerfDllW(LPCWSTR, LPCWSTR, ULONG_PTR);
+#define      InstallPerfDll WINELIB_NAME_AW(InstallPerfDll);
+
+DWORD WINAPI LoadPerfCounterTextStringsA(LPCSTR, BOOL);
+DWORD WINAPI LoadPerfCounterTextStringsW(LPCWSTR, BOOL);
+#define      LoadPerfCounterTextStrings WINELIB_NAME_AW(LoadPerfCounterTextStrings)
+
+DWORD WINAPI UnloadPerfCounterTextStringsA(LPCSTR, BOOL);
+DWORD WINAPI UnloadPerfCounterTextStringsW(LPCWSTR, BOOL);
+#define      UnloadPerfCounterTextStrings WINELIB_NAME_AW(UnloadPerfCounterTextStrings)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __WINE_LOADPERF_H */

Propchange: trunk/reactos/include/psdk/loadperf.h
------------------------------------------------------------------------------
    svn:eol-style = native