Changeset 39069

Timestamp:

11/13/11 17:21:20 (19 months ago)

Author:

saturday06

Message:

matomoni-ugoita

Files:

• lang/objective-cplusplus/i3/trunk/tmp/dwmedit/BlurEditController.cc (modified) (14 diffs)

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

@@ -3 +3 @@
 #include <stdio.h>
 #include <usp10.h>
+#include <utility>
 
 #include "ApiHook.h"
@@ -21 +22 @@
 extern BlurEditController self;
 struct BlurEditController {
-    LONG cancel_count; // thread guard
-    LONG ext_text_out_count; // thread guard
+    LONG paint_enable; // thread guard
+    bool auto_paint_ignored; // raw
     DWORD thread_id; // raw
-    int ignored; // raw
 
     WNDPROC DefaultWindowProceduer;
@@ -33 +33 @@
     BP_PAINTPARAMS bp_paintparams;
 
-    class Ignore {
-        LONG cancel;
+    class PaintEnable {
+        const LONG saved_paint_enable;
+        PaintEnable& operator=(const PaintEnable& that);
     public:
-        Ignore() {
-            cancel = InterlockedExchange(&self.cancel_count, 0);
-        }
-        ~Ignore() {
-            InterlockedExchange(&self.cancel_count, cancel);
+        PaintEnable() : saved_paint_enable(InterlockedExchange(&self.paint_enable, 1)) {
+        }
+        ~PaintEnable() {
+            InterlockedExchange(&self.paint_enable, saved_paint_enable);
         }
     };
 
-    static bool select() {
-        LONG cancel = InterlockedExchangeAdd(&self.cancel_count, 0);
-        if (!cancel || self.thread_id != GetCurrentThreadId()) {
+    static bool isPaintEnable() {
+        LONG paint_enable = InterlockedExchangeAdd(&self.paint_enable, 0);
+        if (paint_enable || self.thread_id != GetCurrentThreadId()) {
             return true;
         }
-        self.ignored = 1;
         return false;
     }
@@ -65 +64 @@
         static HRESULT WINAPI DrawThemeBackground(HTHEME a, HDC b, int c, int d,
             const RECT * e, const RECT * f) {
-            if (select()) {
-                self.o.DrawThemeBackground(a, b, c, d, e, f);
-            }
+            if (isPaintEnable()) {
+                return self.o.DrawThemeBackground(a, b, c, d, e, f);
+            }
+            self.auto_paint_ignored = true;
             return  S_OK;
         }
@@ -79 +79 @@
             LPCTSTR lpString, UINT cbCount, CONST INT *lpDx) {
 
-            if (self.thread_id != GetCurrentThreadId()) {
+            if (isPaintEnable()) {
                 return self.o.ExtTextOutW(hdc, x, y, fuOptions, lprc, lpString, cbCount, lpDx); 
             }
 
-            static int x_ = 0;
+            // ����PI�Ăяo�����E�N���b�N���j���[�`�����߂̂����𔻕�
+            // TODO ���Ə�����            static int x_ = 0;
             static int y_ = 0;
             static UINT fuOptions_ = 0;
@@ -94 +95 @@
 
             DWORD objectType = GetObjectType(hdc);
-            if (objectType == OBJ_DC && match) {
-                return TRUE;
-            }
-
-            return self.o.ExtTextOutW(hdc, x, y, fuOptions, lprc, lpString, cbCount, lpDx);
+            if (objectType != OBJ_DC || !match) {
+                // �E�N���b�N���j���[�̕`���ꍇ
+                return self.o.ExtTextOutW(hdc, x, y, fuOptions, lprc, lpString, cbCount, lpDx);
+            }
+
+            self.auto_paint_ignored = true;
+            return TRUE;
         }
     };
@@ -106 +109 @@
         capture = false;
         focus = false;
+        paint_enable = 0;
+        auto_paint_ignored = false;
 
         black_brush = (HBRUSH)GetStockObject(BLACK_BRUSH);
@@ -142 +147 @@
         }
 
-        ReplaceIATEntryInAllMods("gdi32.dll", o.ExtTextOutW, H::ExtTextOutW);
+        //ReplaceIATEntryInAllMods("gdi32.dll", o.ExtTextOutW, H::ExtTextOutW);
+        ReplaceIATEntryInOneMod("gdi32.dll", o.ExtTextOutW, H::ExtTextOutW, GetModuleHandle(_T("usp10.dll")));
         ReplaceIATEntryInOneMod("kernel32.dll", o.GetProcAddress, H::GetProcAddress, GetModuleHandle(_T("comctl32.dll")));
     }
@@ -155 +161 @@
     }
 
+    /**
+     * �����ςȐݒ��`�悳�����܂����߁A������������
+     * �ŁA���ꂪ�������ꂽ�ꍇ�ɐ������ݒ��ĕ`�悷��     */
     static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
+        (void)static_cast<WNDPROC>(WndProc);
+
         bool redraw = false;
-        WNDPROC wp = WndProc;
-        (void)wp;
 
         if (message == WM_PAINT) {
@@ -175 +184 @@
             HPAINTBUFFER paint_buffer1 = dll.BeginBufferedPaint(hdc, &ps.rcPaint, BPBF_TOPDOWNDIB, NULL, &mem_dc1);
             if (paint_buffer1 == 0) {
+                // fatal error
                 EndPaint(hWnd, &ps);
                 return CallWindowProc(self.DefaultWindowProceduer, hWnd, message, wParam, lParam);
@@ -182 +192 @@
                 // �s�����̏ꍇ
                 {
-                    Ignore ignore;
+                    PaintEnable paintEnable;
                     CallWindowProc(self.DefaultWindowProceduer, hWnd, WM_PRINTCLIENT, (WPARAM)mem_dc1, PRF_CLIENT);
                 }
@@ -192 +202 @@
                 HPAINTBUFFER paint_buffer2 = dll.BeginBufferedPaint(mem_dc1, &ps.rcPaint, BPBF_TOPDOWNDIB, &self.bp_paintparams, &mem_dc2);
                 if (paint_buffer2 == 0) {
+                    // fatal error
                     dll.EndBufferedPaint(paint_buffer1, FALSE);
                     EndPaint(hWnd, &ps);
@@ -198 +209 @@
 
                 {
-                    Ignore ignore;
+                    PaintEnable paintEnable;
                     CallWindowProc(self.DefaultWindowProceduer, hWnd, WM_PRINTCLIENT, (WPARAM)mem_dc2, PRF_CLIENT);
                 }
@@ -263 +274 @@
 
         {
-            InterlockedExchangeAdd(&self.cancel_count, 1);
             LRESULT l = CallWindowProc(self.DefaultWindowProceduer, hWnd, message, wParam, lParam);
-            InterlockedExchangeAdd(&self.cancel_count, -1);
-
-            if (redraw || self.ignored) {
-                self.ignored = 0;
+
+            if (redraw || self.auto_paint_ignored) {
+                self.auto_paint_ignored = false;
                 InvalidateRect(hWnd, NULL, FALSE);
-                //WndProc(hWnd, WM_PAINT, 0, 0);
+                // WndProc(hWnd, WM_PAINT, 0, 0);
             }