luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-05 10:38:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make prototype match LPOVERLAPPED_COMPLETION_ROUTINE to avoid warning.

Browse Source 
2008-08-03  Tor Lillqvist  <tml@novell.com>

	* win32/gwin32directorymonitor.c
	(g_win32_directory_monitor_callback): Make prototype match
	LPOVERLAPPED_COMPLETION_ROUTINE to avoid warning. Cast
	LPOVERLAPPED parameter to local GWin32DirectoryMonitorPrivate
	pointer.

	(g_win32_directory_monitor_constructor):
	GLocalDirectoryMonitor::dirname is in UTF-8 like all other file
	names in the GLib API on Windows, so convert to UTF-16 and open
	with CreateFileW().


svn path=/trunk/; revision=7290
This commit is contained in:
Tor Lillqvist 2008-08-03 00:06:39 +00:00 committed by Tor Lillqvist
parent 8258d6863b
commit 3bf84fb1cc
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gio/ChangeLog
View File

@ -1,3 +1,16 @@
2008-08-03 Tor Lillqvist <tml@novell.com>
* win32/gwin32directorymonitor.c
(g_win32_directory_monitor_callback): Make prototype match
LPOVERLAPPED_COMPLETION_ROUTINE to avoid warning. Cast
LPOVERLAPPED parameter to local GWin32DirectoryMonitorPrivate
pointer.
(g_win32_directory_monitor_constructor):
GLocalDirectoryMonitor::dirname is in UTF-8 like all other file
names in the GLib API on Windows, so convert to UTF-16 and open
with CreateFileW().
2008-08-03 Tor Lillqvist <tml@novell.com> 2008-08-03 Tor Lillqvist <tml@novell.com>
Bug 541036 - Gnumeric crashes when trying to open Desktop or Bug 541036 - Gnumeric crashes when trying to open Desktop or

20
gio/win32/gwin32directorymonitor.c
View File

@ -77,13 +77,14 @@ static gboolean g_win32_directory_monitor_cancel (GFileMonitor* base) {
return TRUE; return TRUE;
} }
void CALLBACK g_win32_directory_monitor_callback (DWORD error, DWORD nBytes, GWin32DirectoryMonitorPrivate* lpOverlapped) void CALLBACK g_win32_directory_monitor_callback (DWORD error, DWORD nBytes, LPOVERLAPPED lpOverlapped)
{ {
gulong offset; gulong offset;
PFILE_NOTIFY_INFORMATION pfile_notify_walker; PFILE_NOTIFY_INFORMATION pfile_notify_walker;
gulong file_name_len; gulong file_name_len;
gchar* file_name; gchar* file_name;
GFile * file; GFile * file;
GWin32DirectoryMonitorPrivate *priv = (GWin32DirectoryMonitorPrivate *) lpOverlapped;
static GFileMonitorEvent events[] = {0, static GFileMonitorEvent events[] = {0,
G_FILE_MONITOR_EVENT_CREATED, /* FILE_ACTION_ADDED */ G_FILE_MONITOR_EVENT_CREATED, /* FILE_ACTION_ADDED */
@ -96,23 +97,23 @@ void CALLBACK g_win32_directory_monitor_callback (DWORD error, DWORD nBytes, GWi
if (!nBytes) /* monitor was cancelled/finalized */ if (!nBytes) /* monitor was cancelled/finalized */
return; return;
if (g_file_monitor_is_cancelled (G_FILE_MONITOR (lpOverlapped->self))) if (g_file_monitor_is_cancelled (G_FILE_MONITOR (priv->self)))
return; /* and ReadDirectoryChangesW doesn't get called this time */ return; /* and ReadDirectoryChangesW doesn't get called this time */
offset = 0; offset = 0;
do { do {
pfile_notify_walker = (PFILE_NOTIFY_INFORMATION)(lpOverlapped->file_notify_buffer + offset); pfile_notify_walker = (PFILE_NOTIFY_INFORMATION)(priv->file_notify_buffer + offset);
offset += pfile_notify_walker->NextEntryOffset; offset += pfile_notify_walker->NextEntryOffset;
file_name = g_utf16_to_utf8 (pfile_notify_walker->FileName, pfile_notify_walker->FileNameLength / sizeof(WCHAR), NULL, &file_name_len, NULL); file_name = g_utf16_to_utf8 (pfile_notify_walker->FileName, pfile_notify_walker->FileNameLength / sizeof(WCHAR), NULL, &file_name_len, NULL);
file = g_file_new_for_path (file_name); file = g_file_new_for_path (file_name);
g_file_monitor_emit_event (lpOverlapped->self, file, NULL, events [pfile_notify_walker->Action]); g_file_monitor_emit_event (priv->self, file, NULL, events [pfile_notify_walker->Action]);
g_object_unref (file); g_object_unref (file);
g_free (file_name); g_free (file_name);
} while (pfile_notify_walker->NextEntryOffset); } while (pfile_notify_walker->NextEntryOffset);
ReadDirectoryChangesW (lpOverlapped->hDirectory, (gpointer)lpOverlapped->file_notify_buffer, lpOverlapped->buffer_allocated_bytes, FALSE, ReadDirectoryChangesW (priv->hDirectory, (gpointer)priv->file_notify_buffer, priv->buffer_allocated_bytes, FALSE,
FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_ATTRIBUTES |
FILE_NOTIFY_CHANGE_SIZE, &lpOverlapped->buffer_filled_bytes, &lpOverlapped->overlapped, g_win32_directory_monitor_callback); FILE_NOTIFY_CHANGE_SIZE, &priv->buffer_filled_bytes, &priv->overlapped, g_win32_directory_monitor_callback);
} }
static GObject * g_win32_directory_monitor_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties) { static GObject * g_win32_directory_monitor_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties) {
@ -120,17 +121,18 @@ static GObject * g_win32_directory_monitor_constructor (GType type, guint n_cons
GWin32DirectoryMonitorClass * klass; GWin32DirectoryMonitorClass * klass;
GObjectClass * parent_class; GObjectClass * parent_class;
GWin32DirectoryMonitor * self; GWin32DirectoryMonitor * self;
gchar * dirname; wchar_t * wdirname;
gboolean result; gboolean result;
klass = G_WIN32_DIRECTORY_MONITOR_CLASS (g_type_class_peek (G_TYPE_WIN32_DIRECTORY_MONITOR)); klass = G_WIN32_DIRECTORY_MONITOR_CLASS (g_type_class_peek (G_TYPE_WIN32_DIRECTORY_MONITOR));
parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass)); parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass));
obj = parent_class->constructor (type, n_construct_properties, construct_properties); obj = parent_class->constructor (type, n_construct_properties, construct_properties);
self = G_WIN32_DIRECTORY_MONITOR (obj); self = G_WIN32_DIRECTORY_MONITOR (obj);
dirname = G_LOCAL_DIRECTORY_MONITOR (obj)->dirname; wdirname = g_utf8_to_utf16 (G_LOCAL_DIRECTORY_MONITOR (obj)->dirname, -1, NULL, NULL, NULL);
self->priv->hDirectory = CreateFile (dirname, FILE_LIST_DIRECTORY, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, self->priv->hDirectory = CreateFileW (wdirname, FILE_LIST_DIRECTORY, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL); NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL);
g_free (wdirname);
if (self->priv->hDirectory == INVALID_HANDLE_VALUE) if (self->priv->hDirectory == INVALID_HANDLE_VALUE)
{ {
/* Ignore errors */ /* Ignore errors */