wdm 0.1.0 → 0.1.1

data/ext/wdm/rb_monitor.h

@@ -1,40 +1,40 @@
-#ifndef WDM_RB_MONITOR_H
-#define WDM_RB_MONITOR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-// ---------------------------------------------------------
-// Constants
-// ---------------------------------------------------------
-
-#define WDM_MONITOR_FLAGS_DEFAULT       \
-    FILE_NOTIFY_CHANGE_FILE_NAME        \
-        | FILE_NOTIFY_CHANGE_DIR_NAME   \
-        | FILE_NOTIFY_CHANGE_LAST_WRITE
-
-// ----------------------------------------------------------
-// Global variables
-// ----------------------------------------------------------
-
-extern VALUE cWDM_Monitor;
-
-extern VALUE eWDM_UnknownFlagError;
-extern VALUE eWDM_MonitorRunningError;
-extern VALUE eWDM_InvalidDirectoryError;
-extern VALUE eWDM_UnwatchableDirectoryError;
-
-// ---------------------------------------------------------
-// Prototypes
-// ---------------------------------------------------------
-
-void wdm_rb_monitor_init();
-
-// ---------------------------------------------------------
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
+#ifndef WDM_RB_MONITOR_H
+#define WDM_RB_MONITOR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+// ---------------------------------------------------------
+// Constants
+// ---------------------------------------------------------
+
+#define WDM_MONITOR_FLAGS_DEFAULT       \
+    FILE_NOTIFY_CHANGE_FILE_NAME        \
+        | FILE_NOTIFY_CHANGE_DIR_NAME   \
+        | FILE_NOTIFY_CHANGE_LAST_WRITE
+
+// ----------------------------------------------------------
+// Global variables
+// ----------------------------------------------------------
+
+extern VALUE cWDM_Monitor;
+
+extern VALUE eWDM_UnknownFlagError;
+extern VALUE eWDM_MonitorRunningError;
+extern VALUE eWDM_InvalidDirectoryError;
+extern VALUE eWDM_UnwatchableDirectoryError;
+
+// ---------------------------------------------------------
+// Prototypes
+// ---------------------------------------------------------
+
+void wdm_rb_monitor_init();
+
+// ---------------------------------------------------------
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
 #endif // WDM_RB_MONITOR_H

data/ext/wdm/utils.c

@@ -1,77 +1,77 @@
-#include "wdm.h"
-
-#include "memory.h"
-#include "utils.h"
-
-// ---------------------------------------------------------
-// Paths functions
-// ---------------------------------------------------------
-
-LPWSTR
-wdm_utils_convert_back_to_forward_slashes(LPWSTR path, DWORD path_len)
-{
-    UINT i;
-
-    for(i = 0; i < (path_len - 1); ++i) { // path_len-1 because we don't need to check the NULL-char!
-        if ( path[i] == L'\\' ) path[i] = L'/';
-    }
-
-    return path;
-}
-
-LPWSTR
-wdm_utils_full_pathname(const LPWSTR path)
-{
-    WCHAR maxed_path[WDM_MAX_WCHAR_LONG_PATH];
-    LPWSTR full_path;
-    size_t full_path_len;
-    BOOL is_directory;
-
-    if ( GetFullPathNameW(path, WDM_MAX_WCHAR_LONG_PATH, maxed_path, NULL) == 0 ) {
-        return 0;
-    }
-
-    is_directory = wdm_utils_unicode_is_directory(maxed_path);
-
-    full_path_len = wcslen(maxed_path);
-    full_path = WDM_ALLOC_N(WCHAR, full_path_len + (is_directory ? 2 : 1)); // When it's a directory, add extra 1 for the (\) at the end
-
-    wcscpy(full_path, maxed_path);
-
-    if ( is_directory ) wcscat(full_path, L"\\");
-
-    return full_path;
-}
-
-BOOL
-wdm_utils_unicode_is_directory(const LPWSTR path)
-{
-    WCHAR unicode_path[WDM_MAX_WCHAR_LONG_PATH];
-
-    wcscpy(unicode_path, L"\\\\?\\");
-
-    if ( wdm_utils_is_unc_path(path) ) {
-        wcscat(unicode_path, L"UNC\\");
-        wcscat(unicode_path, path + 2); // +2 to skip the begin of a UNC path
-    }
-    else {
-        wcscat(unicode_path, path);
-    }
-
-    return wdm_utils_is_directory(unicode_path);
-}
-
-BOOL
-wdm_utils_is_directory(const LPWSTR path)
-{
-  DWORD dwAttrib = GetFileAttributesW(path);
-
-  return (dwAttrib != INVALID_FILE_ATTRIBUTES &&
-         (dwAttrib & FILE_ATTRIBUTE_DIRECTORY));
-}
-
-BOOL
-wdm_utils_is_unc_path(const LPWSTR path)
-{
-    return path[0] == path[1] && path[0] == L'\\';
+#include "wdm.h"
+
+#include "memory.h"
+#include "utils.h"
+
+// ---------------------------------------------------------
+// Paths functions
+// ---------------------------------------------------------
+
+LPWSTR
+wdm_utils_convert_back_to_forward_slashes(LPWSTR path, DWORD path_len)
+{
+    UINT i;
+
+    for(i = 0; i < (path_len - 1); ++i) { // path_len-1 because we don't need to check the NULL-char!
+        if ( path[i] == L'\\' ) path[i] = L'/';
+    }
+
+    return path;
+}
+
+LPWSTR
+wdm_utils_full_pathname(const LPWSTR path)
+{
+    WCHAR maxed_path[WDM_MAX_WCHAR_LONG_PATH];
+    LPWSTR full_path;
+    size_t full_path_len;
+    BOOL is_directory;
+
+    if ( GetFullPathNameW(path, WDM_MAX_WCHAR_LONG_PATH, maxed_path, NULL) == 0 ) {
+        return 0;
+    }
+
+    is_directory = wdm_utils_unicode_is_directory(maxed_path);
+
+    full_path_len = wcslen(maxed_path);
+    full_path = WDM_ALLOC_N(WCHAR, full_path_len + (is_directory ? 2 : 1)); // When it's a directory, add extra 1 for the (\) at the end
+
+    wcscpy(full_path, maxed_path);
+
+    if ( is_directory ) wcscat(full_path, L"\\");
+
+    return full_path;
+}
+
+BOOL
+wdm_utils_unicode_is_directory(const LPWSTR path)
+{
+    WCHAR unicode_path[WDM_MAX_WCHAR_LONG_PATH];
+
+    wcscpy(unicode_path, L"\\\\?\\");
+
+    if ( wdm_utils_is_unc_path(path) ) {
+        wcscat(unicode_path, L"UNC\\");
+        wcscat(unicode_path, path + 2); // +2 to skip the begin of a UNC path
+    }
+    else {
+        wcscat(unicode_path, path);
+    }
+
+    return wdm_utils_is_directory(unicode_path);
+}
+
+BOOL
+wdm_utils_is_directory(const LPWSTR path)
+{
+  DWORD dwAttrib = GetFileAttributesW(path);
+
+  return (dwAttrib != INVALID_FILE_ATTRIBUTES &&
+         (dwAttrib & FILE_ATTRIBUTE_DIRECTORY));
+}
+
+BOOL
+wdm_utils_is_unc_path(const LPWSTR path)
+{
+    return path[0] == path[1] && path[0] == L'\\';
 }

data/ext/wdm/utils.h

@@ -1,26 +1,26 @@
-#include <Windows.h>
-
-#ifndef WDM_UTILS_H
-#define WDM_UTILS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-// ---------------------------------------------------------
-// Prototypes
-// ---------------------------------------------------------
-
-LPWSTR wdm_utils_convert_back_to_forward_slashes(LPWSTR, DWORD);
-LPWSTR wdm_utils_full_pathname(const LPWSTR path);
-BOOL wdm_utils_is_unc_path(const LPWSTR);
-BOOL wdm_utils_is_directory(const LPWSTR);
-BOOL wdm_utils_unicode_is_directory(const LPWSTR);
-
-// ---------------------------------------------------------
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
+#include <Windows.h>
+
+#ifndef WDM_UTILS_H
+#define WDM_UTILS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+// ---------------------------------------------------------
+// Prototypes
+// ---------------------------------------------------------
+
+LPWSTR wdm_utils_convert_back_to_forward_slashes(LPWSTR, DWORD);
+LPWSTR wdm_utils_full_pathname(const LPWSTR path);
+BOOL wdm_utils_is_unc_path(const LPWSTR);
+BOOL wdm_utils_is_directory(const LPWSTR);
+BOOL wdm_utils_unicode_is_directory(const LPWSTR);
+
+// ---------------------------------------------------------
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
 #endif // WDM_UTILS_H

data/ext/wdm/wdm.c

@@ -1,47 +1,47 @@
-#include "wdm.h"
-
-#include "entry.h"
-#include "queue.h"
-#include "monitor.h"
-
-#include "rb_monitor.h"
-#include "rb_change.h"
-
-// ----------------------------------------------------------
-// Global variables
-// ----------------------------------------------------------
-
-VALUE mWDM;
-
-VALUE eWDM_Error;
-VALUE eWDM_MonitorRunningError;
-VALUE eWDM_InvalidDirectoryError;
-VALUE eWDM_UnwatchableDirectoryError;
-
-ID wdm_rb_sym_call;
-ID wdm_rb_sym_at_file;
-ID wdm_rb_sym_at_type;
-ID wdm_rb_sym_added;
-ID wdm_rb_sym_modified;
-ID wdm_rb_sym_removed;
-ID wdm_rb_sym_renamed_old_file;
-ID wdm_rb_sym_renamed_new_file;
-
-rb_encoding *wdm_rb_enc_utf8;
-
-// ----------------------------------------------------------
-
-void
-Init_wdm_ext()
-{
-    WDM_DEBUG("Registering WDM with Ruby!");
-
-    wdm_rb_enc_utf8 = rb_utf8_encoding();
-
-    mWDM = rb_define_module("WDM");
-
-    eWDM_Error = rb_define_class_under(mWDM, "Error", rb_eStandardError);
-
-    wdm_rb_monitor_init();
-    wdm_rb_change_init();
+#include "wdm.h"
+
+#include "entry.h"
+#include "queue.h"
+#include "monitor.h"
+
+#include "rb_monitor.h"
+#include "rb_change.h"
+
+// ----------------------------------------------------------
+// Global variables
+// ----------------------------------------------------------
+
+VALUE mWDM;
+
+VALUE eWDM_Error;
+VALUE eWDM_MonitorRunningError;
+VALUE eWDM_InvalidDirectoryError;
+VALUE eWDM_UnwatchableDirectoryError;
+
+ID wdm_rb_sym_call;
+ID wdm_rb_sym_at_file;
+ID wdm_rb_sym_at_type;
+ID wdm_rb_sym_added;
+ID wdm_rb_sym_modified;
+ID wdm_rb_sym_removed;
+ID wdm_rb_sym_renamed_old_file;
+ID wdm_rb_sym_renamed_new_file;
+
+rb_encoding *wdm_rb_enc_utf8;
+
+// ----------------------------------------------------------
+
+void
+Init_wdm_ext()
+{
+    WDM_DEBUG("Registering WDM with Ruby!");
+
+    wdm_rb_enc_utf8 = rb_utf8_encoding();
+
+    mWDM = rb_define_module("WDM");
+
+    eWDM_Error = rb_define_class_under(mWDM, "Error", rb_eStandardError);
+
+    wdm_rb_monitor_init();
+    wdm_rb_change_init();
 }

data/ext/wdm/wdm.h

@@ -1,72 +1,82 @@
-#include <stdio.h>
-
-#define WINVER 0x0500       // Support Windows 2000 and later,
-#define _WIN32_WINNT 0x0500 // this is needed for 'GetLongPathNameW'
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN        // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <Windows.h>
-
-#include <ruby.h>
-#include <ruby/encoding.h>
-
-#ifndef WDM_H
-#define WDM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-// ---------------------------------------------------------
-// Constants
-// ---------------------------------------------------------
-
-#define WDM_DEBUG_ENABLED FALSE
-
-#define WDM_BUFFER_SIZE 16384 // 2^14 or 16Kb
-
-// The maximum WCHAR's for buffers used in functions that have
-// a unicode variant and require to prepend "\\?\" to the path
-#define WDM_MAX_WCHAR_LONG_PATH 32767
-
-// ---------------------------------------------------------
-// Macros
-// ---------------------------------------------------------
-
-#if WDM_DEBUG_ENABLED == TRUE
-    #define WDM_DEBUG(str, ...) \
-        fprintf(stderr, "[DEBUG] (%s@%d): " str "\n", __FILE__, __LINE__, ##__VA_ARGS__)
-
-    #define WDM_WDEBUG(str, ...) \
-        fwprintf(stderr, L"[DEBUG] (%S@%d): " str "\n", __FILE__, __LINE__, ##__VA_ARGS__)
-
-#else
-    #define WDM_DEBUG(str, ...)
-    #define WDM_WDEBUG(str, ...)
-#endif
-
-// ----------------------------------------------------------
-// Extern global variables
-// ----------------------------------------------------------
-
-extern VALUE mWDM;
-
-extern VALUE eWDM_Error;
-
-extern rb_encoding *wdm_rb_enc_utf8;
-
-// ---------------------------------------------------------
-// Prototypes
-// ---------------------------------------------------------
-
-void Init_wdm_ext();
-
-// ---------------------------------------------------------
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
+#include <stdio.h>
+
+// Support Windows 2000 and later,
+// this is needed for 'GetLongPathNameW' (both of the following defines)
+#ifndef WINVER
+#define WINVER 0x0500 
+#endif
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500
+#endif
+
+// Exclude rarely-used stuff from Windows headers (both of the following defines)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef VC_EXTRALEAN
+#define VC_EXTRALEAN        
+#endif
+
+#include <Windows.h>
+
+#include <ruby.h>
+#include <ruby/encoding.h>
+
+#ifndef WDM_H
+#define WDM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+// ---------------------------------------------------------
+// Constants
+// ---------------------------------------------------------
+
+#define WDM_DEBUG_ENABLED FALSE
+
+#define WDM_BUFFER_SIZE 16384 // 2^14 or 16Kb
+
+// The maximum WCHAR's for buffers used in functions that have
+// a unicode variant and require to prepend "\\?\" to the path
+#define WDM_MAX_WCHAR_LONG_PATH 32767
+
+// ---------------------------------------------------------
+// Macros
+// ---------------------------------------------------------
+
+#if WDM_DEBUG_ENABLED == TRUE
+    #define WDM_DEBUG(str, ...) \
+        fprintf(stderr, "[DEBUG] (%s@%d): " str "\n", __FILE__, __LINE__, ##__VA_ARGS__)
+
+    #define WDM_WDEBUG(str, ...) \
+        fwprintf(stderr, L"[DEBUG] (%S@%d): " str "\n", __FILE__, __LINE__, ##__VA_ARGS__)
+
+#else
+    #define WDM_DEBUG(str, ...)
+    #define WDM_WDEBUG(str, ...)
+#endif
+
+// ----------------------------------------------------------
+// Extern global variables
+// ----------------------------------------------------------
+
+extern VALUE mWDM;
+
+extern VALUE eWDM_Error;
+
+extern rb_encoding *wdm_rb_enc_utf8;
+
+// ---------------------------------------------------------
+// Prototypes
+// ---------------------------------------------------------
+
+void Init_wdm_ext();
+
+// ---------------------------------------------------------
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
 #endif // WDM_H