[akhaldi] 60218: [IMAGEHLP] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Thu Sep 19 19:39:32 2013
New Revision: 60218

URL: http://svn.reactos.org/svn/reactos?rev=60218&view=rev
Log:
[IMAGEHLP]
* Sync with Wine 1.7.1.
CORE-7469

Removed:
    trunk/reactos/dll/win32/imagehlp/precomp.h
Modified:
    trunk/reactos/dll/win32/imagehlp/CMakeLists.txt
    trunk/reactos/dll/win32/imagehlp/access.c
    trunk/reactos/dll/win32/imagehlp/imagehlp_main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/imagehlp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/imagehlp/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/imagehlp/CMakeLists.txt	[iso-8859-1] Thu Sep 19 19:39:32 2013
@@ -14,10 +14,8 @@
     ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def)
 
 add_library(imagehlp SHARED ${SOURCE})
-
 set_module_type(imagehlp win32dll)
 target_link_libraries(imagehlp wine)
 add_importlibs(imagehlp dbghelp msvcrt kernel32 ntdll)
-
 add_pch(imagehlp precomp.h)
 add_cd_file(TARGET imagehlp DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/imagehlp/access.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/access.…
==============================================================================
--- trunk/reactos/dll/win32/imagehlp/access.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/imagehlp/access.c	[iso-8859-1] Thu Sep 19 19:39:32 2013
@@ -37,7 +37,6 @@
  */
 
 static PLOADED_IMAGE IMAGEHLP_pFirstLoadedImage=NULL;
-static PLOADED_IMAGE IMAGEHLP_pLastLoadedImage=NULL;
 
 static LOADED_IMAGE IMAGEHLP_EmptyLoadedImage = {
   NULL,       /* ModuleName */
@@ -138,9 +137,6 @@
 
   if(pCurrent->Flink)
     pCurrent->Flink->Blink = pCurrent->Blink;
-  else
-    IMAGEHLP_pLastLoadedImage = pCurrent->Blink?CONTAINING_RECORD(
-      pCurrent->Blink, LOADED_IMAGE, Links):NULL;
 
   return FALSE;
 }

Modified: trunk/reactos/dll/win32/imagehlp/imagehlp_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl…
==============================================================================
--- trunk/reactos/dll/win32/imagehlp/imagehlp_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/imagehlp/imagehlp_main.c	[iso-8859-1] Thu Sep 19 19:39:32
2013
@@ -42,10 +42,8 @@
       IMAGEHLP_hHeap = HeapCreate(0, 0x10000, 0);
       break;
     case DLL_PROCESS_DETACH:
+      if (lpvReserved) break;
       HeapDestroy(IMAGEHLP_hHeap);
-      IMAGEHLP_hHeap = NULL;
-      break;
-    default:
       break;
     }
   return TRUE;

Removed: trunk/reactos/dll/win32/imagehlp/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/precomp…
==============================================================================
--- trunk/reactos/dll/win32/imagehlp/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/imagehlp/precomp.h	(removed)
@@ -1,53 +0,0 @@
-/*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS System Libraries
- * FILE:            lib/imagehlp/precomp.h
- * PURPOSE:         Imagehlp Libary Header
- * PROGRAMMER:      Alex Ionescu (alex(a)relsoft.net)
- */
-
-/* INCLUDES ******************************************************************/
-
-/* Definitions */
-#define _CRT_SECURE_NO_DEPRECATE
-#define NTOS_MODE_USER
-#define WIN32_NO_STATUS
-
-/* PSDK/NDK Headers */
-#include <windows.h>
-#include <imagehlp.h>
-#include <ndk/umtypes.h>
-#include <ndk/rtlfuncs.h>
-
-/* C STDLIB Headers */
-#include <stdio.h>
-
-/* TYPES *********************************************************************/
-
-typedef struct _BOUND_FORWARDER_REFS
-{
-    struct _BOUND_FORWARDER_REFS *Next;
-    ULONG TimeDateStamp;
-    LPSTR ModuleName;
-} BOUND_FORWARDER_REFS, *PBOUND_FORWARDER_REFS;
-
-typedef struct _IMPORT_DESCRIPTOR
-{
-    struct _IMPORT_DESCRIPTOR *Next;
-    LPSTR ModuleName;
-    ULONG TimeDateStamp;
-    USHORT ForwaderReferences;
-    PBOUND_FORWARDER_REFS Forwarders;
-} IMPORT_DESCRIPTOR, *PIMPORT_DESCRIPTOR;
-
-/* DATA **********************************************************************/
-
-extern HANDLE IMAGEHLP_hHeap;
-
-/* FUNCTIONS *****************************************************************/
-
-BOOL
-IMAGEAPI
-UnloadAllImages(VOID);
-
-/* EOF */

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] Thu Sep 19 19:39:32 2013
@@ -82,7 +82,7 @@
 reactos/dll/win32/icmp            # Synced to Wine-0_9_10
 reactos/dll/win32/ieframe         # Synced to Wine-1.7.1
 reactos/dll/win32/imaadp32.acm    # Synced to Wine-1.7.1
-reactos/dll/win32/imagehlp        # Synced to Wine-1.5.4
+reactos/dll/win32/imagehlp        # Synced to Wine-1.7.1
 reactos/dll/win32/imm32           # Synced to Wine-1.5.19
 reactos/dll/win32/inetcomm        # Synced to Wine-1.5.4
 reactos/dll/win32/inetmib1        # Synced to Wine-1.5.4