luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 23:58:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug 541036 - Gnumeric crashes when trying to open Desktop or user's folder

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

	Bug 541036 - Gnumeric crashes when trying to open Desktop or
	user's folder under Windows

	* win32/gwin32directorymonitor.c
	(g_win32_directory_monitor_constructor): Ignore error from
	CreateFile() when opening directory. Instead of asserting, just
	store INVALID_HANDLE_VALUE then in
	GWin32DirectoryMonitorPrivate::hDirectory. Also ignore error from
	ReadDirectoryChangesW().
	(g_win32_directory_monitor_cancel): Don't attempt to close
	directory handle if it is INVALID_HANDLE_VALUE.


svn path=/trunk/; revision=7289
This commit is contained in:
Tor Lillqvist
2008-08-02 23:51:51 +00:00
committed by Tor Lillqvist
parent e4194cb055
commit 8258d6863b
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gio/ChangeLog
View File

@@ -1,3 +1,17 @@
2008-08-03 Tor Lillqvist <tml@novell.com>
Bug 541036 - Gnumeric crashes when trying to open Desktop or
user's folder under Windows
* win32/gwin32directorymonitor.c
(g_win32_directory_monitor_constructor): Ignore error from
CreateFile() when opening directory. Instead of asserting, just
store INVALID_HANDLE_VALUE then in
GWin32DirectoryMonitorPrivate::hDirectory. Also ignore error from
ReadDirectoryChangesW().
(g_win32_directory_monitor_cancel): Don't attempt to close
directory handle if it is INVALID_HANDLE_VALUE.
2008-08-01 Matthias Clasen <mclasen@redhat.com> 2008-08-01 Matthias Clasen <mclasen@redhat.com>
* gdesktopappinfo.c: Remove debug spew * gdesktopappinfo.c: Remove debug spew

13
gio/win32/gwin32directorymonitor.c
View File

@@ -69,7 +69,8 @@ static gboolean g_win32_directory_monitor_cancel (GFileMonitor* base) {
self = G_WIN32_DIRECTORY_MONITOR (base); self = G_WIN32_DIRECTORY_MONITOR (base);
/* this triggers a last callback() with nBytes=0 */ /* this triggers a last callback() with nBytes=0 */
CloseHandle (self->priv->hDirectory); if (self->priv->hDirectory != INVALID_HANDLE_VALUE)
CloseHandle (self->priv->hDirectory);
if (G_FILE_MONITOR_CLASS (g_win32_directory_monitor_parent_class)->cancel) if (G_FILE_MONITOR_CLASS (g_win32_directory_monitor_parent_class)->cancel)
(*G_FILE_MONITOR_CLASS (g_win32_directory_monitor_parent_class)->cancel) (base); (*G_FILE_MONITOR_CLASS (g_win32_directory_monitor_parent_class)->cancel) (base);
@@ -130,13 +131,17 @@ static GObject * g_win32_directory_monitor_constructor (GType type, guint n_cons
self->priv->hDirectory = CreateFile (dirname, FILE_LIST_DIRECTORY, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, self->priv->hDirectory = CreateFile (dirname, 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_assert (self->priv->hDirectory != INVALID_HANDLE_VALUE); /* harsh */ if (self->priv->hDirectory == INVALID_HANDLE_VALUE)
{
/* Ignore errors */
return obj;
}
result = ReadDirectoryChangesW (self->priv->hDirectory, (gpointer)self->priv->file_notify_buffer, self->priv->buffer_allocated_bytes, FALSE, result = ReadDirectoryChangesW (self->priv->hDirectory, (gpointer)self->priv->file_notify_buffer, self->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, &self->priv->buffer_filled_bytes, &self->priv->overlapped, g_win32_directory_monitor_callback); FILE_NOTIFY_CHANGE_SIZE, &self->priv->buffer_filled_bytes, &self->priv->overlapped, g_win32_directory_monitor_callback);
g_assert (result); /* harsh */ /* Ignore errors */
return obj; return obj;
} }