Merge pull request #349 from RamonUnch/RamonUnch-patch-1

Minor fixes

Author: RamonUnch

hooks.c

@@ -1334,9 +1334,11 @@ static void GetMonitorRect(const POINT *pt, int full, RECT *_mon)
 //}
 
 static void WaitMovementEnd()
-{ // Only wait 192ms maximum
-    int i=0;
-    while (LastWin.hwnd && i++ < 12) Sleep(16);
+{ // Only wait 64ms maximum
+    if (conf.FullWin) {
+        int i=0;
+        while (LastWin.hwnd && i++ < 4) Sleep(16);
+    }
     LastWin.hwnd = NULL; // Zero out in case.
 }
 ///////////////////////////////////////////////////////////////////////////
@@ -4279,6 +4281,7 @@ static int TitleBarActions(POINT pt, enum action action, enum button button)
 //static void FinishMovement() { PostMessage(g_hkhwnd, WM_FINISHMOVEMENT, 0, 0); }
 static void FinishMovement()
 {
+    LOG("FinishMovement");
     StopSpeedMes();
 //    Sleep(5000);
     if (LastWin.hwnd
@@ -4445,8 +4448,8 @@ LRESULT CALLBACK LowLevelMouseProc(int nCode, WPARAM wParam, LPARAM lParam)
     }
 
 //    if ((0x201 > wParam || wParam > 0x205) && wParam != 0x20a)
-//        LOGA("wParam=%lx, data=%lx, time=%lu, extra=%lx", (DWORD)wParam
-//            , (DWORD)msg->mouseData, (DWORD)msg->time, (DWORD)msg->dwExtraInfo);
+//        LOGA("wParam=%lx, data=%lx, time=%lu, extra=%lx, block?=%d", (DWORD)wParam
+//            , (DWORD)msg->mouseData, (DWORD)msg->time, (DWORD)msg->dwExtraInfo, (int)state.blockmouseup);
 
     //Get Button state and data.
     enum buttonstate buttonstate = GetButtonState(wParam);
@@ -5251,7 +5254,7 @@ static void readblacklist(const TCHAR *section, struct blacklist *blacklist, con
         }
 
         // Store item
-        LOGA( "%ls:%ls|%ls", exenm, title, klass);
+        LOG( "%ls:%ls|%ls", exenm, title, klass);
         blacklist->items[blacklist->length].exename = exenm;
         blacklist->items[blacklist->length].title = title;
         blacklist->items[blacklist->length].classname = klass;

hooks.h

@@ -28,15 +28,15 @@
 #define APP_NAME       TEXT("AltSnap")
 #define APP_NAMEA      "AltSnap"
 #define APP_VERSION    "1.58"
-#define APP_PROPPT     APP_NAMEA"-RDim"
-#define APP_PROPFL     APP_NAMEA"-RFlag"
-#define APP_PROPOFFSET APP_NAMEA"-ROffset"
-#define APP_PRBDLESS   APP_NAMEA"-RStyle"
-#define APP_ROLLED     APP_NAMEA"-Rolled"
-#define APP_ASONOFF    APP_NAMEA"-ASOnOff"
-#define APP_MOVEONOFF  APP_NAMEA"-MoveOnOff"
-#define FZ_PROPPT      "FancyZones_RestoreSize"
-#define FZ_PROPZONES   "FancyZones_zones"
+#define APP_PROPPT     TEXT(APP_NAMEA"-RDim")
+#define APP_PROPFL     TEXT(APP_NAMEA"-RFlag")
+#define APP_PROPOFFSET TEXT(APP_NAMEA"-ROffset")
+#define APP_PRBDLESS   TEXT(APP_NAMEA"-RStyle")
+#define APP_ROLLED     TEXT(APP_NAMEA"-Rolled")
+#define APP_ASONOFF    TEXT(APP_NAMEA"-ASOnOff")
+#define APP_MOVEONOFF  TEXT(APP_NAMEA"-MoveOnOff")
+#define FZ_PROPPT      TEXT("FancyZones_RestoreSize")
+#define FZ_PROPZONES   TEXT("FancyZones_zones")
 
 // User Messages
 #define WM_TRAY           (WM_USER+2)