msvcr: Added _crt_debugger_hook function

Andrey Zhezherun zhezherun at yandex.ru
Sun Nov 3 08:54:50 CST 2013


On 1 November 2013 09:47, Piotr Caban <piotr.caban at gmail.com> wrote:
> The trace needs to end with '\n' character. Probably it's better to use ERR
> or FIXME here.
Fixed. This function doesn't need to do anything AFAIK so I'd rather
not print any extra warnings there.

> Why do you need this function? In all cases I've seen the function was
> called only when the application was working incorrectly.
Frankly I don't remember exactly now as I first wrote this patch a few
months ago. Perhaps I might have indeed been trying to debug a
crashing program that I was working on and saw an error related to
this function being called.

Regards,
Andrey
-------------- next part --------------
--- wine-1.7.5.orig/dlls/msvcr100/msvcr100.spec	2013-10-25 18:45:30.000000000 +0100
+++ wine-1.7.5/dlls/msvcr100/msvcr100.spec	2013-10-30 11:09:56.000000000 +0000
@@ -746,7 +746,7 @@
 @ cdecl _cputws(wstr) msvcrt._cputws
 @ cdecl _creat(str long) msvcrt._creat
 @ cdecl _create_locale(long str) msvcrt._create_locale
-@ stub _crt_debugger_hook
+@ cdecl _crt_debugger_hook(long) msvcrt._crt_debugger_hook
 @ varargs _cscanf(str) msvcrt._cscanf
 @ varargs _cscanf_l(str ptr) msvcrt._cscanf_l
 @ varargs _cscanf_s(str) msvcrt._cscanf_s
--- wine-1.7.5.orig/dlls/msvcr110/msvcr110.spec	2013-10-25 18:45:30.000000000 +0100
+++ wine-1.7.5/dlls/msvcr110/msvcr110.spec	2013-10-30 11:09:56.000000000 +0000
@@ -1094,8 +1094,8 @@
 @ cdecl _cputws(wstr) msvcrt._cputws
 @ cdecl _creat(str long) msvcrt._creat
 @ cdecl _create_locale(long str) msvcrt._create_locale
-@ stub -arch=i386 _crt_debugger_hook
-@ stub -arch=arm,win64 __crt_debugger_hook
+@ cdecl -arch=i386 _crt_debugger_hook(long) msvcrt._crt_debugger_hook
+@ cdecl -arch=arm,win64 __crt_debugger_hook(long) msvcrt._crt_debugger_hook
 @ varargs _cscanf(str) msvcrt._cscanf
 @ varargs _cscanf_l(str ptr) msvcrt._cscanf_l
 @ varargs _cscanf_s(str) msvcrt._cscanf_s
--- wine-1.7.5.orig/dlls/msvcr80/msvcr80.spec	2013-10-25 18:45:30.000000000 +0100
+++ wine-1.7.5/dlls/msvcr80/msvcr80.spec	2013-10-30 11:09:56.000000000 +0000
@@ -410,8 +410,8 @@
 @ cdecl _cputws(wstr) msvcrt._cputws
 @ cdecl _creat(str long) msvcrt._creat
 @ cdecl _create_locale(long str) msvcrt._create_locale
-@ stub -arch=i386 _crt_debugger_hook
-@ stub -arch=arm,win64 __crt_debugger_hook
+@ cdecl -arch=i386 _crt_debugger_hook(long) msvcrt._crt_debugger_hook
+@ cdecl -arch=arm,win64 __crt_debugger_hook(long) msvcrt._crt_debugger_hook
 @ varargs _cscanf(str) msvcrt._cscanf
 @ varargs _cscanf_l(str ptr) msvcrt._cscanf_l
 @ varargs _cscanf_s(str) msvcrt._cscanf_s
--- wine-1.7.5.orig/dlls/msvcr90/msvcr90.spec	2013-10-25 18:45:30.000000000 +0100
+++ wine-1.7.5/dlls/msvcr90/msvcr90.spec	2013-10-30 11:09:56.000000000 +0000
@@ -393,7 +393,7 @@
 @ cdecl _cputws(wstr) msvcrt._cputws
 @ cdecl _creat(str long) msvcrt._creat
 @ cdecl _create_locale(long str) msvcrt._create_locale
-@ stub _crt_debugger_hook
+@ cdecl _crt_debugger_hook(long) msvcrt._crt_debugger_hook
 @ varargs _cscanf(str) msvcrt._cscanf
 @ varargs _cscanf_l(str ptr) msvcrt._cscanf_l
 @ varargs _cscanf_s(str) msvcrt._cscanf_s
--- wine-1.7.5.orig/dlls/msvcrt/misc.c	2013-10-25 18:45:30.000000000 +0100
+++ wine-1.7.5/dlls/msvcrt/misc.c	2013-11-01 14:49:35.000000000 +0000
@@ -334,3 +334,11 @@
     /* causes stack fault that updates NtCurrentTeb()->Tib.StackLimit */
     return VirtualProtect( &stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, NULL );
 }
+
+/*********************************************************************
+ * _crt_debugger_hook (MSVCRT.@)
+ */
+void CDECL MSVCRT__crt_debugger_hook(int reserved)
+{
+    TRACE("\n");
+}
--- wine-1.7.5.orig/dlls/msvcrt/msvcrt.spec	2013-10-25 18:45:30.000000000 +0100
+++ wine-1.7.5/dlls/msvcrt/msvcrt.spec	2013-10-30 11:09:56.000000000 +0000
@@ -378,6 +378,7 @@
 @ cdecl _cputws(wstr)
 @ cdecl _creat(str long) MSVCRT__creat
 @ cdecl _create_locale(long str) MSVCRT__create_locale
+@ cdecl _crt_debugger_hook(long) MSVCRT__crt_debugger_hook
 # stub _crtAssertBusy
 # stub _crtBreakAlloc
 # stub _crtDbgFlag


More information about the wine-devel mailing list