Skip to content

W
wine-winehq
Commit 3c506fa3 authored by Andreas Mohr's avatar Andreas Mohr Committed by Alexandre Julliard
Browse files
Options

Added an exception frame for lstrcpy16.

parent cba7be79
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
memory/string.c
View file @ 3c506fa3
...@@ -238,8 +238,7 @@ INT WINAPI lstrcmpiW( LPCWSTR str1, LPCWSTR str2 ) ...@@ -238,8 +238,7 @@ INT WINAPI lstrcmpiW( LPCWSTR str1, LPCWSTR str2 )
*/ */
SEGPTR WINAPI lstrcpy16( SEGPTR dst, LPCSTR src ) SEGPTR WINAPI lstrcpy16( SEGPTR dst, LPCSTR src )
{ {
/* this is how Windows does it */ if (!lstrcpyA( PTR_SEG_TO_LIN(dst), src )) dst = 0;
memmove( (LPSTR)PTR_SEG_TO_LIN(dst), src, strlen(src)+1 );
return dst; return dst;
} }
...@@ -256,6 +255,7 @@ LPSTR WINAPI lstrcpyA( LPSTR dst, LPCSTR src ) ...@@ -256,6 +255,7 @@ LPSTR WINAPI lstrcpyA( LPSTR dst, LPCSTR src )
} }
__EXCEPT(page_fault) __EXCEPT(page_fault)
{ {
ERR("(%p, %p): page fault occurred ! Caused by bug ?\n", dst, src);
SetLastError( ERROR_INVALID_PARAMETER ); SetLastError( ERROR_INVALID_PARAMETER );
return NULL; return NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment