Changeset 39066

Timestamp:

11/13/11 14:52:50 (19 months ago)

Author:

saturday06

Message:

zsiodf

Location:

lang/objective-cplusplus/i3/trunk/tmp/dwmedit

Files:

• ApiHook.cc (modified) (4 diffs)
• ApiHook.h (modified) (1 diff)
• Makefile (deleted)
• Makefile.am (modified) (1 diff)

lang/objective-cplusplus/i3/trunk/tmp/dwmedit/ApiHook.cc

@@ -6 +6 @@
 namespace api_hook {
 
-    // �ЂƂ‚̃��W���[���ɑ΂���PI�t�b�N����֐�
+    /**
+     * �ЂƂ‚̃��W���[���ɑ΂���PI�t�b�N����֐�
+     * @see http://ruffnex.oc.to/kenji/text/api_hook/
+     */
     void ReplaceIATEntryInOneMod(
         const char* pszModuleName,
-        PROC pfnCurrent,
-        PROC pfnNew,
+        void* pfnCurrent,
+        void* pfnNew,
         HMODULE hmodCaller)
     {
         ULONG ulSize = 0;
-        IMAGE_IMPORT_DESCRIPTOR* pImportDesc = NULL;
-        pImportDesc = (IMAGE_IMPORT_DESCRIPTOR*)dll.ImageDirectoryEntryToData(
-            hmodCaller, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ulSize);
+        IMAGE_IMPORT_DESCRIPTOR* pImportDesc = 
+            reinterpret_cast<IMAGE_IMPORT_DESCRIPTOR*>(
+                dll.ImageDirectoryEntryToData(
+                    hmodCaller, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ulSize));
 
         if (pImportDesc == NULL) {
@@ -22 +26 @@
         }
 
-        while(pImportDesc->Name) {
-            char* pszModName = (char*)((BYTE*)hmodCaller + pImportDesc->Name);
+        for (; pImportDesc->Name; ++pImportDesc) {
+            char* pszModName = reinterpret_cast<char*>(hmodCaller) + pImportDesc->Name;
             if (lstrcmpiA(pszModName, pszModuleName) == 0) {
                 break;
             }
-            pImportDesc++;
         }
 
@@ -34 +37 @@
         }
 
-        IMAGE_THUNK_DATA* pThunk = (IMAGE_THUNK_DATA*)((BYTE*)hmodCaller + pImportDesc->FirstThunk);
+        IMAGE_THUNK_DATA* pThunk = 
+            reinterpret_cast<IMAGE_THUNK_DATA*>(
+                reinterpret_cast<char*>(hmodCaller) + pImportDesc->FirstThunk);
 
-        while(pThunk->u1.Function) {
-            PROC* ppfn = (PROC*)&pThunk->u1.Function;
-            if (*ppfn == pfnCurrent) {
-                DWORD dwDummy;
-                VirtualProtect(ppfn, sizeof(ppfn), PAGE_EXECUTE_READWRITE, &dwDummy);
-                // DLL code will be CoW
-                WriteProcessMemory(GetCurrentProcess(), ppfn, &pfnNew, sizeof(pfnNew), NULL); 
-                return;
+        for (; pThunk->u1.Function; ++pThunk) {
+            void** ppfn = reinterpret_cast<void**>(&pThunk->u1.Function);
+            if (*ppfn != pfnCurrent) {
+                continue;
             }
-            pThunk++;
+            DWORD dwDummy = 0;
+            VirtualProtect(ppfn, sizeof(ppfn), PAGE_EXECUTE_READWRITE, &dwDummy);
+            // DLL code will be CoW
+            WriteProcessMemory(GetCurrentProcess(), ppfn, &pfnNew, sizeof(pfnNew), NULL); 
+            return;
         }
     }
 
-    // ���ׂẴ��W���[���ɑ΂���PI�t�b�N����֐�
+    /**
+     * ���ׂẴ��W���[���ɑ΂���PI�t�b�N����֐�
+     * @see http://ruffnex.oc.to/kenji/text/api_hook/
+     */
     void ReplaceIATEntryInAllMods(
         const char* pszModuleName,
-        PROC pfnCurrent,
-        PROC pfnNew)
+        void* pfnCurrent,
+        void* pfnNew)
     {
         // ���W���[�����X�g���
@@ -72 +80 @@
         CloseHandle(hModuleSnap);
     }
-
 }

lang/objective-cplusplus/i3/trunk/tmp/dwmedit/ApiHook.h

@@ -5 +5 @@
 namespace api_hook {
 
-    // �ЂƂ‚̃��W���[���ɑ΂���PI�t�b�N����֐�
+    /**
+     * �ЂƂ‚̃��W���[���ɑ΂���PI�t�b�N����֐�
+     */
     void ReplaceIATEntryInOneMod(
         const char* pszModuleName,
-        PROC pfnCurrent,
-        PROC pfnNew,
+        void* pfnCurrent,
+        void* pfnNew,
         HMODULE hmodCaller);
 
-    // ���ׂẴ��W���[���ɑ΂���PI�t�b�N����֐�
+    /**
+     * ���ׂẴ��W���[���ɑ΂���PI�t�b�N����֐�
+     */
     void ReplaceIATEntryInAllMods(
         const char* pszModuleName,
-        PROC pfnCurrent,
-        PROC pfnNew);
+        void* pfnCurrent,
+        void* pfnNew);
 
 }

lang/objective-cplusplus/i3/trunk/tmp/dwmedit/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS    = dwmedit
+ACLOCAL_AMFLAGS = -I m4
 dwmedit_SOURCES = Aaa.cc DWMEdit.cc ApiHook.cc BlurEditController.cc WindowsVersionHelp.cc
 dwmedit_CXXFLAGS = -include config.h -Wextra -Wall --std=gnu++0x