Module: wine
Branch: master
Commit: 2855fac64584ed1789865a535ecef686470f6af2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2855fac64584ed1789865a535…
Author: Paul Bolle <pebolle(a)tiscali.nl>
Date: Mon Aug 30 13:33:25 2010 +0200
winedbg: gdb proxy mode: allow interrupt from command line.
Ignore SIGINT (in gdb_startup) so an interrupt from the command line
will break the debuggee and bring up the gdb prompt (instead of killing
both winedbg and the debuggee).
---
programs/winedbg/gdbproxy.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c
index 885ff86..4aad6e1 100644
--- a/programs/winedbg/gdbproxy.c
+++ b/programs/winedbg/gdbproxy.c
@@ -2252,6 +2252,7 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl
fprintf(stderr, "Cannot create gdb\n");
return FALSE;
default: /* in parent... success */
+ signal(SIGINT, SIG_IGN);
break;
case 0: /* in child... and alive */
gdb_exec(imh_mod.LoadedImageName, s_addrs.sin_port, flags);
Module: wine
Branch: master
Commit: 2274150759285649248e529ab87c17f86e8c2199
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2274150759285649248e529ab…
Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk>
Date: Fri Aug 27 21:36:09 2010 +0200
kernel32: Add stub for WerRegisterFile.
---
dlls/kernel32/Makefile.in | 3 ++-
dlls/kernel32/kernel32.spec | 1 +
dlls/kernel32/wer.c | 41 +++++++++++++++++++++++++++++++++++++++++
include/Makefile.in | 1 +
include/werapi.h | 41 +++++++++++++++++++++++++++++++++++++++++
5 files changed, 86 insertions(+), 1 deletions(-)
diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in
index c55c910..9c0ae8d 100644
--- a/dlls/kernel32/Makefile.in
+++ b/dlls/kernel32/Makefile.in
@@ -44,7 +44,8 @@ C_SRCS = \
toolhelp.c \
version.c \
virtual.c \
- volume.c
+ volume.c \
+ wer.c
RC_SRCS = \
locale_rc.rc \
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index fc9e3cc..1ba7978 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -1153,6 +1153,7 @@
@ stdcall WaitForSingleObjectEx(long long long)
@ stdcall WaitNamedPipeA (str long)
@ stdcall WaitNamedPipeW (wstr long)
+@ stdcall WerRegisterFile(wstr long long)
@ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr)
@ stdcall WinExec(str long)
@ stdcall Wow64EnableWow64FsRedirection(long)
diff --git a/dlls/kernel32/wer.c b/dlls/kernel32/wer.c
new file mode 100644
index 0000000..d5e27b6
--- /dev/null
+++ b/dlls/kernel32/wer.c
@@ -0,0 +1,41 @@
+/*
+ * Windows Error Reporting functions
+ *
+ * Copyright 2010 Louis Lenders
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "werapi.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(wer);
+
+/***********************************************************************
+ * WerRegisterFile (KERNEL32.@)
+ *
+ * Register a file to be included in WER error report.
+ */
+HRESULT WINAPI WerRegisterFile(PCWSTR file, WER_REGISTER_FILE_TYPE regfiletype, DWORD flags)
+{
+ FIXME("(%s, %d, %d) stub!\n", debugstr_w(file), regfiletype, flags);
+ return E_NOTIMPL;
+}
diff --git a/include/Makefile.in b/include/Makefile.in
index c454490..2812eff 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -486,6 +486,7 @@ SRCDIR_INCLUDES = \
vfw.h \
vfwmsgs.h \
vmrender.idl \
+ werapi.h \
wfext.h \
wia.h \
winbase.h \
diff --git a/include/werapi.h b/include/werapi.h
new file mode 100644
index 0000000..7ac03f3
--- /dev/null
+++ b/include/werapi.h
@@ -0,0 +1,41 @@
+/*
+ * Windows Error Reporing definitions
+ *
+ * Copyright (C) 2010 Louis Lenders
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_WERAPI_H
+#define __WINE_WERAPI_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum _WER_REGISTER_FILE_TYPE
+{
+ WerRegFileTypeUserDocument = 1,
+ WerRegFileTypeOther = 2,
+ WerRegFileTypeMax
+} WER_REGISTER_FILE_TYPE;
+
+HRESULT WINAPI WerRegisterFile(PCWSTR file, WER_REGISTER_FILE_TYPE regfiletype, DWORD flags);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __WINE_WERAPI_H */