[PDH] Sync with Wine Staging 3.3. CORE-14434

diff --git a/dll/win32/pdh/pdh_main.c b/dll/win32/pdh/pdh_main.c
index 3a3f882..fb131bd 100644 (file)
--- a/dll/win32/pdh/pdh_main.c
+++ b/dll/win32/pdh/pdh_main.c
@@ -19,23 +19,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#define WIN32_NO_STATUS
-

 #include <stdarg.h>
 #include <math.h>
 
 #define NONAMELESSUNION
 #include <stdarg.h>
 #include <math.h>
 
 #define NONAMELESSUNION

-#define NONAMELESSSTRUCT
-#include <windef.h>
-#include <winbase.h>

 
 

-#include <pdh.h>
-#include <pdhmsg.h>
-//#include "winperf.h"
+#include "windef.h"
+#include "winbase.h"
+
+#include "pdh.h"
+#include "pdhmsg.h"
+#include "winperf.h"

 
 

-#include <wine/debug.h>
-#include <wine/list.h>
-#include <wine/unicode.h>
+#include "wine/debug.h"
+#include "wine/heap.h"
+#include "wine/list.h"
+#include "wine/unicode.h"

 
 WINE_DEFAULT_DEBUG_CHANNEL(pdh);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(pdh);
 


@@ -49,21 +48,6 @@ static CRITICAL_SECTION_DEBUG pdh_handle_cs_debug =
 };
 static CRITICAL_SECTION pdh_handle_cs = { &pdh_handle_cs_debug, -1, 0, 0, 0, 0 };
 
 };
 static CRITICAL_SECTION pdh_handle_cs = { &pdh_handle_cs_debug, -1, 0, 0, 0, 0 };
 

-static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
-{
-    return HeapAlloc(GetProcessHeap(), 0, size);
-}
-
-static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size)
-{
-    return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size);
-}
-
-static inline BOOL heap_free(void *mem)
-{
-    return HeapFree(GetProcessHeap(), 0, mem);
-}
-

 static inline WCHAR *pdh_strdup( const WCHAR *src )
 {
     WCHAR *dst;
 static inline WCHAR *pdh_strdup( const WCHAR *src )
 {
     WCHAR *dst;

diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 5a0d98b..a9a74aa 100644 (file)
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -147,7 +147,7 @@ reactos/dll/win32/oledlg              # Synced to WineStaging-3.3
 reactos/dll/win32/olepro32            # Synced to WineStaging-3.3
 reactos/dll/win32/olesvr32            # Synced to WineStaging-3.3
 reactos/dll/win32/olethk32            # Synced to WineStaging-3.3
 reactos/dll/win32/olepro32            # Synced to WineStaging-3.3
 reactos/dll/win32/olesvr32            # Synced to WineStaging-3.3
 reactos/dll/win32/olethk32            # Synced to WineStaging-3.3

-reactos/dll/win32/pdh                 # Synced to WineStaging-2.9
+reactos/dll/win32/pdh                 # Synced to WineStaging-3.3

 reactos/dll/win32/pidgen              # Synced to WineStaging-2.9
 reactos/dll/win32/powrprof            # Forked at Wine-1.0rc5
 reactos/dll/win32/printui             # Synced to WineStaging-2.9
 reactos/dll/win32/pidgen              # Synced to WineStaging-2.9
 reactos/dll/win32/powrprof            # Forked at Wine-1.0rc5
 reactos/dll/win32/printui             # Synced to WineStaging-2.9