Changeset 39080

Timestamp:

12/11/11 02:03:52 (18 months ago)

Author:

saturday06

Message:

aosidfjaspdfasdf

Location:

lang/objective-cplusplus/i3/trunk

Files:

• configure.ac (modified) (4 diffs)
• tmp/dwmedit/ApiHook.cc (modified) (2 diffs)
• tmp/dwmedit/BlurEditController.cc (modified) (2 diffs)
• tmp/dwmedit/DWMEdit.cc (modified) (2 diffs)
• tmp/dwmedit/DWMEdit.vcxproj (modified) (2 diffs)
• tmp/dwmedit/configure.ac (modified) (1 diff)
• unix/m4-local/i3.m4 (added)
• unix/scripts/ac_init_version.sh (deleted)
• unix/scripts/get_version_for_ac_init.sh (added)

lang/objective-cplusplus/i3/trunk/configure.ac

@@ -2 +2 @@
 
 m4_define(
-    [I3_VERSION_M4_MACRO],
-    [m4_esyscmd([. ./unix/scripts/ac_init_version.sh | tr -d '\r\n'])])
+    [I3_VERSION_FOR_AC_INIT],
+    [m4_esyscmd([. ./unix/scripts/get_version_for_ac_init.sh | tr -d '\r\n'])])
 
 AC_PREREQ([2.61])
-AC_INIT([windcrest],[I3_VERSION_M4_MACRO],[dyob@lunaport.net])
-
-#
-# macros
-#
-
-AC_DEFUN([I3_HIGHLIGHTED_ECHO],[
-    echo $1 | GREP_COLOR='01' grep --color=auto '.' 2> /dev/null
-    if test $? -ne 0; then
-        echo $1
-    fi
-])
-
-AC_DEFUN([I3_ADD_OPTION],[
-    if test "$2" != ""; then
-        AC_MSG_CHECKING([for $2 ])
-        orig="$$1"
-        $1="$2 $$1"
-
-        check_result=no
-
-        case $1 in
-            CPPFLAGS)
-                AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[$3]],[[$4]])],[check_result=yes])
-                ;;
-            CFLAGS)
-                AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$3]],[[$4]])],[check_result=yes])
-                ;;
-            CXXFLAGS)
-                AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$3]],[[$4]])],[check_result=yes])
-                ;;
-            LDFLAGS)
-                AC_LINK_IFELSE([AC_LANG_PROGRAM([[$3]],[[$4]])],[check_result=yes])
-                ;;
-            LIBS)
-                AC_LINK_IFELSE([AC_LANG_PROGRAM([[$3]],[[$4]])],[check_result=yes])
-                ;;
-            *)
-                AC_MSG_FAILURE([unknown variable name])
-                ;;
-        esac
-
-        AC_MSG_RESULT([$check_result])
-        if test "$check_result" = "yes"; then
-            true
-            $5
-        else
-            $1="$orig"
-            $6
-        fi
-    fi
-])
-
-AC_DEFUN([I3_ADD_CPPFLAGS],[I3_ADD_OPTION([CPPFLAGS],[$1],[$2],[$3],[$4],[$5])])
-AC_DEFUN([I3_ADD_CFLAGS],  [I3_ADD_OPTION([CFLAGS],  [$1],[$2],[$3],[$4],[$5])])
-AC_DEFUN([I3_ADD_CXXFLAGS],[I3_ADD_OPTION([CXXFLAGS],[$1],[$2],[$3],[$4],[$5])])
-AC_DEFUN([I3_ADD_LDFLAGS], [I3_ADD_OPTION([LDFLAGS], [$1],[$2],[$3],[$4],[$5])])
-AC_DEFUN([I3_ADD_LIBS],    [I3_ADD_OPTION([LIBS],    [$1],[$2],[$3],[$4],[$5])])
+AC_INIT([windcrest],[I3_VERSION_FOR_AC_INIT],[dyob@lunaport.net])
 
 CFLAGS_before_configure="$CFLAGS"
@@ -73 +16 @@
 
 I3_HIGHLIGHTED_ECHO([$0: $PACKAGE_STRING])
-
 
 #
@@ -86 +28 @@
 AC_USE_SYSTEM_EXTENSIONS
 AC_CANONICAL_HOST
-
-
 
 AC_PROG_CXXCPP # for some configurations of cygwin
@@ -159 +99 @@
     #I3_ADD_CXXFLAGS([-Wno-unused])           # ...
 fi
-
 
 # ---------------------------------------

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

@@ -4 +4 @@
 #include <tlhelp32.h>
 #include <stdio.h>
+#include <delayimp.h>
 
 namespace api_hook {
+        void replaceAddress(IMAGE_THUNK_DATA* importAddressTable, const void* pfnCurrent, const void* pfnNew) {
+        for (; importAddressTable->u1.Function; ++importAddressTable) {
+            void** ppfn = reinterpret_cast<void**>(&importAddressTable->u1.Function);
+            if (*ppfn != pfnCurrent) {
+                continue;
+            }
+            DWORD dwDummy = 0;
+            VirtualProtect(ppfn, sizeof(ppfn), PAGE_EXECUTE_READWRITE, &dwDummy);
+            // DLL code will be CoW
+            WriteProcessMemory(GetCurrentProcess(), ppfn, &pfnNew, sizeof(pfnNew), NULL);
+            puts("  +++++ REPLACE OK +++++");
+            return;
+        }
+        }
+
+
+    void delay(
+        const char* pszModuleName,
+        const void* pfnCurrent,
+        const void* pfnNew,
+        HMODULE hmodCaller) {
+
+        ULONG ulSize = 0;
+
+        ImgDelayDescr* delayDescr = 
+            reinterpret_cast<ImgDelayDescr*>(
+                dll.ImageDirectoryEntryToData(
+                    hmodCaller, TRUE, IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT, &ulSize));
+
+        if (!delayDescr) {
+            return;
+        }
+
+        printf("  delay import\n");
+        char* const base = reinterpret_cast<char* const>(hmodCaller);
+        for (; delayDescr->grAttrs; ++delayDescr) {
+            char* const name = base + delayDescr->rvaDLLName;
+            printf("    name=%08p:%s\n", base, name);
+            if (lstrcmpiA(name, pszModuleName) == 0) {
+                break;
+            }
+        }
+
+        if (!delayDescr->grAttrs) {
+            return;
+        }
+
+                IMAGE_THUNK_DATA* importAddressTable = 
+                        reinterpret_cast<IMAGE_THUNK_DATA*>(base + delayDescr->rvaIAT);
+
+                replaceAddress(importAddressTable, pfnCurrent, pfnNew);
+    }
+
+    void normal(
+        const char* pszModuleName,
+        const void* pfnCurrent,
+        const void* pfnNew,
+        HMODULE hmodCaller) {
+
+        printf("DLL: %s\n", pszModuleName);
+
+        ULONG ulSize = 0;
+
+        IMAGE_IMPORT_DESCRIPTOR* pImportDesc = 
+            reinterpret_cast<IMAGE_IMPORT_DESCRIPTOR*>(
+                dll.ImageDirectoryEntryToData(
+                    hmodCaller, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ulSize));
+
+        if (!pImportDesc) {
+            return;
+        }
+
+        for (; pImportDesc->Characteristics; ++pImportDesc) {
+            char* base = reinterpret_cast<char*>(hmodCaller);
+            ptrdiff_t off = pImportDesc->Name;
+            char* pszModName = base + off;
+            printf("  base=0x%p, off=0x%x pszModName=%s\n", base, off, pszModName);
+            if (lstrcmpiA(pszModName, pszModuleName) == 0) {
+                break;
+            }
+        }
+
+        if (!pImportDesc->Characteristics) {
+            return;
+        }
+
+        IMAGE_THUNK_DATA* importAddressTable = 
+            reinterpret_cast<IMAGE_THUNK_DATA*>(
+                reinterpret_cast<char*>(hmodCaller) + pImportDesc->FirstThunk);
+
+                replaceAddress(importAddressTable, pfnCurrent, pfnNew);
+    }
 
     /**
@@ -18 +111 @@
         HMODULE hmodCaller)
     {
-        ULONG ulSize = 0;
-
-
-        IMAGE_IMPORT_DESCRIPTOR* pImportDesc = NULL;
-        int entries[] = {IMAGE_DIRECTORY_ENTRY_IMPORT, IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT};
-        for (int i = 0; i < _countof(entries); ++i) {
-
-            pImportDesc = 
-                reinterpret_cast<IMAGE_IMPORT_DESCRIPTOR*>(
-                    dll.ImageDirectoryEntryToData(
-                        hmodCaller, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ulSize));
-
-            if (!pImportDesc) {
-                continue;
-            }
-
-            for (; pImportDesc->Name; ++pImportDesc) {
-                char* base = reinterpret_cast<char*>(hmodCaller);
-                ptrdiff_t off = pImportDesc->Name;
-                char* pszModName = base + off;
-                printf("  base=0x%p, off=0x%x pszModName=%s\n", base, off, pszModName);
-                if (lstrcmpiA(pszModName, pszModuleName) == 0) {
-                    break;
-                }
-            }
-
-            if (pImportDesc->Name) {
-                break;
-            }
-        }
-
-        if (!pImportDesc) {
-            puts("    failed 1");
-            return;
-        }
-
-        if (!pImportDesc->Name) {
-            puts("    failed 2");
-            return;
-        }
-
-        IMAGE_THUNK_DATA* pThunk = 
-            reinterpret_cast<IMAGE_THUNK_DATA*>(
-                reinterpret_cast<char*>(hmodCaller) + pImportDesc->FirstThunk);
-
-        for (; pThunk->u1.Function; ++pThunk) {
-            void** ppfn = reinterpret_cast<void**>(&pThunk->u1.Function);
-            if (*ppfn != pfnCurrent) {
-                continue;
-            }
-            DWORD dwDummy = 0;
-            VirtualProtect(ppfn, sizeof(ppfn), PAGE_EXECUTE_READWRITE, &dwDummy);
-            // DLL code will be CoW
-            WriteProcessMemory(GetCurrentProcess(), ppfn, &pfnNew, sizeof(pfnNew), NULL);
-            puts("++++++++++++ REPLACE OK ++++++++++++++");
-            return;
-        }
-        puts("    failed 3");
+        normal(pszModuleName, pfnCurrent, pfnNew, hmodCaller);
+        delay(pszModuleName, pfnCurrent, pfnNew, hmodCaller);
     }
 

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

@@ -20 +20 @@
 
 bool v() {
+        return true;
     // DrawThemeBackground(0, 0, 0, 0, NULL, NULL);
     OSVERSIONINFO osvi = {};
     osvi.dwOSVersionInfoSize = sizeof(osvi);
     GetVersionEx(&osvi);
-    if (osvi.dwMajorVersion > 6 || (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion > 1)) {
+    if (osvi.dwMajorVersion > 6 || (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion > 1)) { // Windows 8
         return true;
     }
@@ -160 +161 @@
         }
 
-        o.GetProcAddress = (decltype(&H::GetProcAddress))GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "GetProcAddress");
-        if (!o.GetProcAddress) {
-            return;
-        }
-
-        o.DrawThemeBackground = (decltype(&H::DrawThemeBackground))GetProcAddress(GetModuleHandleW(L"uxtheme.dll"), "DrawThemeBackground");
-        if (!o.DrawThemeBackground) {
-            return;
-        }
-
-        o.ExtTextOutW = (decltype(&H::ExtTextOutW))GetProcAddress(GetModuleHandleW(L"gdi32.dll"), "ExtTextOutW");
-        if (!o.ExtTextOutW) {
-            return;
-        }
+                HMODULE kernel32Dll = GetModuleHandleW(L"kernel32.dll");
+                if (kernel32Dll) {
+                o.GetProcAddress = (decltype(&H::GetProcAddress))GetProcAddress(kernel32Dll, "GetProcAddress");
+                    if (!o.GetProcAddress) {
+                            return;
+                        }
+                }
+
+                HMODULE uxthemeDll = GetModuleHandleW(L"uxtheme.dll");
+                if (uxthemeDll) {
+                        o.DrawThemeBackground = (decltype(&H::DrawThemeBackground))GetProcAddress(uxthemeDll, "DrawThemeBackground");
+                        if (!o.DrawThemeBackground) {
+                                return;
+                        }
+                }
+
+                HMODULE gdi32Dll = GetModuleHandleW(L"gdi32.dll");
+                if (gdi32Dll) {
+                        o.ExtTextOutW = (decltype(&H::ExtTextOutW))GetProcAddress(gdi32Dll, "ExtTextOutW");
+                        if (!o.ExtTextOutW) {
+                                return;
+                        }
+                }
 
         if (!v()) {

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

@@ -38 +38 @@
     if (message == WM_WINDOWPOSCHANGING) {
         WINDOWPOS* window_pos = (WINDOWPOS*)lParam;
-        if (window_pos->flags | SWP_SHOWWINDOW && window_pos->flags | SWP_NOREDRAW) {
-            // First time ShowWindow() is special on Windows 7 (ignore SWP_NOREDRAW)
+        if (window_pos->flags & (SWP_SHOWWINDOW | SWP_NOREDRAW)) {
+            // First time ShowWindow() is special on Windows 7
+                        // then we should ignore SWP_NOREDRAW
             InvalidateRect(hWnd, NULL, FALSE);
             WndProc(hWnd, WM_PAINT, 0, 0);
@@ -186 +187 @@
 }
 
-

lang/objective-cplusplus/i3/trunk/tmp/dwmedit/DWMEdit.vcxproj

@@ -105 +105 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
@@ -174 +175 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;DWMEDIT_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <EnablePREfast>true</EnablePREfast>
     </ClCompile>
     <Link>

lang/objective-cplusplus/i3/trunk/tmp/dwmedit/configure.ac

@@ -11 +11 @@
 AC_DEFINE(MIL_CONFIG_H_INCLUDED, 1, [config.h include guard])
 
-CXXFLAGS="$CXXFLAGS -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0601 -Wno-missing-field-initializers"
+CXXFLAGS="$CXXFLAGS -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0601 -Wno-missing-field-initializers -static"
 
 AC_CHECK_HEADERS([uxtheme.h dwmapi.h],[],[],[