September 2013 - Wine-commits

André Hentschel : Wine 1.7.3 freigegeben
by Jeremy Newman 27 Sep '13

27 Sep '13

Module: website Branch: master Commit: 06ffd5a2a101660a202cfb952b61c648d676983e URL: http://source.winehq.org/git/website.git/?a=commit;h=06ffd5a2a101660a202cfb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 27 22:02:17 2013 +0200 Wine 1.7.3 freigegeben --- news/de/2013092701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2013092701.xml b/news/de/2013092701.xml new file mode 100644 index 0000000..37b8a69 --- /dev/null +++ b/news/de/2013092701.xml @@ -0,0 +1,16 @@ +<news> +<date>27. September 2013</date> +<title>Wine 1.7.3 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Gecko Engine, basierend auf Firefox 24.</li> + <li>Vorarbeit für den Direct3D Befehlsstrom.</li> + <li>Fehlerbehebungen für die Fensterverwaltung im Mac Treiber.</li> + <li>Unterstützung für IPHLPAPI Funktionen unter Android.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.3.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.3
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: website Branch: master Commit: 8b972afe3a692a2f400c4e3caa041b743ea3208e URL: http://source.winehq.org/git/website.git/?a=commit;h=8b972afe3a692a2f400c4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 20:40:27 2013 +0200 Wine release 1.7.3 --- news/en/2013092701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2013092701.xml b/news/en/2013092701.xml new file mode 100644 index 0000000..3dce258 --- /dev/null +++ b/news/en/2013092701.xml @@ -0,0 +1,16 @@ +<news> +<date>September 27, 2013</date> +<title>Wine 1.7.3 Released</title> +<body> + The Wine development release 1.7.3 is now available. + <a href="{$root}/announce/1.7.3">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine based on Firefox 24.</li> + <li>Preparation work for the Direct3D command stream.</li> + <li>Window management fixes in the Mac driver.</li> + <li>Support for IPHLPAPI functions on Android.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.3.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.7.3.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: d9cd943056f5ca6e3a616475ad71bc92ce8f5a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9cd943056f5ca6e3a616475a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 20:32:14 2013 +0200 Release 1.7.3. --- ANNOUNCE | 760 ++++++++++++++++++++++++++++++------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 385 insertions(+), 397 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9cd943056f5ca6e3a616…

1 0

Tag wine-1.7.3 : Alexandre Julliard : Release 1.7.3
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: refs/tags/wine-1.7.3 Tag: 9171214231c86e5a6fc84912dc78ec58d93af7d5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=9171214231c86e5a6fc84912dc78… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 27 20:32:14 2013 +0200 Release 1.7.3

1 0

Nikolay Sivov : ntdll/tests: Add proper skips in tests.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 437c84655a1f132ef56c094ac999c36f21e665c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=437c84655a1f132ef56c094ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 25 10:36:33 2013 +0400 ntdll/tests: Add proper skips in tests. --- dlls/ntdll/tests/path.c | 41 +++++++++++++++++++++++++++++++---------- 1 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 90db536..442dd82 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -30,7 +30,7 @@ static BOOLEAN (WINAPI *pRtlIsNameLegalDOS8Dot3)(const UNICODE_STRING*,POEM_STRI static DWORD (WINAPI *pRtlGetFullPathName_U)(const WCHAR*,ULONG,WCHAR*,WCHAR**); -static void test_RtlDetermineDosPathNameType(void) +static void test_RtlDetermineDosPathNameType_U(void) { struct test { @@ -75,6 +75,12 @@ static void test_RtlDetermineDosPathNameType(void) WCHAR buffer[MAX_PATH]; UINT ret; + if (!pRtlDetermineDosPathNameType_U) + { + win_skip("RtlDetermineDosPathNameType_U is not available\n"); + return; + } + for (test = tests; test->path; test++) { pRtlMultiByteToUnicodeN( buffer, sizeof(buffer), NULL, test->path, strlen(test->path)+1 ); @@ -84,7 +90,7 @@ static void test_RtlDetermineDosPathNameType(void) } -static void test_RtlIsDosDeviceName(void) +static void test_RtlIsDosDeviceName_U(void) { struct test { @@ -142,6 +148,12 @@ static void test_RtlIsDosDeviceName(void) WCHAR buffer[2000]; ULONG ret; + if (!pRtlIsDosDeviceName_U) + { + win_skip("RtlIsDosDeviceName_U is not available\n"); + return; + } + for (test = tests; test->path; test++) { pRtlMultiByteToUnicodeN( buffer, sizeof(buffer), NULL, test->path, strlen(test->path)+1 ); @@ -195,6 +207,12 @@ static void test_RtlIsNameLegalDOS8Dot3(void) char buff2[12]; BOOLEAN ret, spaces; + if (!pRtlIsNameLegalDOS8Dot3) + { + win_skip("RtlIsNameLegalDOS8Dot3 is not available\n"); + return; + } + ustr.MaximumLength = sizeof(buffer); ustr.Buffer = buffer; for (test = tests; test->path; test++) @@ -272,6 +290,12 @@ static void test_RtlGetFullPathName_U(void) DWORD reslen; UINT len; + if (!pRtlGetFullPathName_U) + { + win_skip("RtlGetFullPathName_U is not available\n"); + return; + } + file_part = (WCHAR *)0xdeadbeef; lstrcpyW(rbufferW, deadbeefW); ret = pRtlGetFullPathName_U(NULL, MAX_PATH, rbufferW, &file_part); @@ -334,12 +358,9 @@ START_TEST(path) pRtlOemStringToUnicodeString = (void *)GetProcAddress(mod,"RtlOemStringToUnicodeString"); pRtlIsNameLegalDOS8Dot3 = (void *)GetProcAddress(mod,"RtlIsNameLegalDOS8Dot3"); pRtlGetFullPathName_U = (void *)GetProcAddress(mod,"RtlGetFullPathName_U"); - if (pRtlDetermineDosPathNameType_U) - test_RtlDetermineDosPathNameType(); - if (pRtlIsDosDeviceName_U) - test_RtlIsDosDeviceName(); - if (pRtlIsNameLegalDOS8Dot3) - test_RtlIsNameLegalDOS8Dot3(); - if (pRtlGetFullPathName_U && pRtlMultiByteToUnicodeN) - test_RtlGetFullPathName_U(); + + test_RtlDetermineDosPathNameType_U(); + test_RtlIsDosDeviceName_U(); + test_RtlIsNameLegalDOS8Dot3(); + test_RtlGetFullPathName_U(); }

1 0

Jactry Zeng : riched20/tests: Add UTF8 BOM tests for EM_SETTEXTEX.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 5520dcab8a3d4189be9885ce46b9fc3566cdfc8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5520dcab8a3d4189be9885ce4… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Fri Sep 27 13:01:39 2013 +0800 riched20/tests: Add UTF8 BOM tests for EM_SETTEXTEX. --- dlls/riched20/tests/editor.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index fed9b95..15e1132 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3913,6 +3913,23 @@ static void test_EM_SETTEXTEX(void) SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) bufACP); ok(!strcmp(bufACP, "morerichtext"), "expected 'morerichtext' but got '%s'\n", bufACP); + /* test for utf8 text with BOM */ + setText.flags = 0; + setText.codepage = CP_ACP; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"\xef\xbb\xbfTestUTF8WithBOM"); + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + todo_wine ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); + result = strcmp(bufACP, "TestUTF8WithBOM"); + todo_wine ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); + + setText.flags = 0; + setText.codepage = CP_UTF8; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"\xef\xbb\xbfTestUTF8WithBOM"); + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + todo_wine ok(result == 15, "EM_SETTEXTEX: Test UTF8 with BOM returned %d, expected 15\n", result); + result = strcmp(bufACP, "TestUTF8WithBOM"); + todo_wine ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); + DestroyWindow(hwndRichEdit); }

1 0

Frédéric Delanoy : msvcrt: Use BOOL type where appropriate.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: cb7546eaf799fab39a00f5973ff838c45cd7beff URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb7546eaf799fab39a00f5973… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 27 08:43:20 2013 +0200 msvcrt: Use BOOL type where appropriate. --- dlls/msvcrt/string.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 861389b..5678a89 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -987,7 +987,7 @@ int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) { MSVCRT_ulong val; unsigned int digit; - int is_negative; + BOOL is_negative; char buffer[33], *pos; size_t len; @@ -1001,12 +1001,12 @@ int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) if (value < 0 && radix == 10) { - is_negative = 1; + is_negative = TRUE; val = -value; } else { - is_negative = 0; + is_negative = FALSE; val = value; } @@ -1062,7 +1062,7 @@ int CDECL _ltow_s(MSVCRT_long value, MSVCRT_wchar_t *str, MSVCRT_size_t size, in { MSVCRT_ulong val; unsigned int digit; - int is_negative; + BOOL is_negative; MSVCRT_wchar_t buffer[33], *pos; size_t len; @@ -1076,12 +1076,12 @@ int CDECL _ltow_s(MSVCRT_long value, MSVCRT_wchar_t *str, MSVCRT_size_t size, in if (value < 0 && radix == 10) { - is_negative = 1; + is_negative = TRUE; val = -value; } else { - is_negative = 0; + is_negative = FALSE; val = value; } @@ -1338,7 +1338,7 @@ int CDECL _i64toa_s(__int64 value, char *str, MSVCRT_size_t size, int radix) { unsigned __int64 val; unsigned int digit; - int is_negative; + BOOL is_negative; char buffer[65], *pos; size_t len; @@ -1352,12 +1352,12 @@ int CDECL _i64toa_s(__int64 value, char *str, MSVCRT_size_t size, int radix) if (value < 0 && radix == 10) { - is_negative = 1; + is_negative = TRUE; val = -value; } else { - is_negative = 0; + is_negative = FALSE; val = value; } @@ -1413,7 +1413,7 @@ int CDECL _i64tow_s(__int64 value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int { unsigned __int64 val; unsigned int digit; - int is_negative; + BOOL is_negative; MSVCRT_wchar_t buffer[65], *pos; size_t len; @@ -1427,12 +1427,12 @@ int CDECL _i64tow_s(__int64 value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int if (value < 0 && radix == 10) { - is_negative = 1; + is_negative = TRUE; val = -value; } else { - is_negative = 0; + is_negative = FALSE; val = value; }

1 0

Frédéric Delanoy : user32: Use BOOL type where appropriate.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 2dd332789b5816c41e7598c4b9e933548656b69d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd332789b5816c41e7598c4b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 27 08:43:21 2013 +0200 user32: Use BOOL type where appropriate. --- dlls/user32/text.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index a32792e..12432b8 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -357,7 +357,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, unsigned int *chars_used, SIZE *size) { WCHAR *p; - int word_fits; + BOOL word_fits; SCRIPT_LOGATTR *sla; SCRIPT_ANALYSIS sa; int i; @@ -395,7 +395,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, /* If there was one or the first character didn't fit then */ if (word_fits) { - int next_is_space; + BOOL next_is_space; /* break the line before/after that character */ if (!(format & (DT_RIGHT | DT_CENTER)) || *p != SPACE) p++; @@ -562,7 +562,7 @@ static int TEXT_Reprefix (const WCHAR *str, unsigned int ns, * newline representation or nothing */ -static int remainder_is_none_or_newline (int num_chars, const WCHAR *str) +static BOOL remainder_is_none_or_newline (int num_chars, const WCHAR *str) { if (!num_chars) return TRUE; if (*str != LF && *str != CR) return FALSE; @@ -615,10 +615,8 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, int seg_i, seg_count, seg_j; int max_seg_width; int num_fit; - int word_broken; - int line_fits; + BOOL word_broken, line_fits, ellipsified; unsigned int j_in_seg; - int ellipsified; *pprefix_offset = -1; /* For each text segment in the line */ @@ -699,7 +697,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, * combined, and may differ between versions (to say nothing of the * several bugs in the Microsoft versions). */ - word_broken = 0; + word_broken = FALSE; line_fits = (num_fit >= j_in_seg); if (!line_fits && (format & DT_WORDBREAK)) { @@ -712,19 +710,19 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, TEXT_SkipChars (count, &s, seg_count, str+seg_i, i-seg_i, chars_used, !(format & DT_NOPREFIX)); i = s - str; - word_broken = 1; + word_broken = TRUE; } pellip->before = j_in_seg; pellip->under = 0; pellip->after = 0; pellip->len = 0; - ellipsified = 0; + ellipsified = FALSE; if (!line_fits && (format & DT_PATH_ELLIPSIS)) { TEXT_PathEllipsify (hdc, dest + seg_j, maxl-seg_j, &j_in_seg, max_seg_width, &size, *p_retstr, pellip); line_fits = (size.cx <= max_seg_width); - ellipsified = 1; + ellipsified = TRUE; } /* NB we may end up ellipsifying a word-broken or path_ellipsified * string */ @@ -885,7 +883,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, int tabwidth /* to keep gcc happy */ = 0; int prefix_offset; ellipsis_data ellip; - int invert_y=0; + BOOL invert_y=FALSE; TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, wine_dbgstr_rect(rect), flags); @@ -935,7 +933,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, GetWindowExtEx(hdc, &window_ext); GetViewportExtEx(hdc, &viewport_ext); if ((window_ext.cy > 0) != (viewport_ext.cy > 0)) - invert_y = 1; + invert_y = TRUE; } if (dtp)

1 0

Piotr Caban : msvcr90: Don't forward exception constructors to msvcrt.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 8b21fefbf66595849e837c91811ab6627164c111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b21fefbf66595849e837c918… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 27 12:00:44 2013 +0200 msvcr90: Don't forward exception constructors to msvcrt. --- dlls/msvcr90/msvcr90.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 16 ++++---- 2 files changed, 89 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 4787867..7640738 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -18,17 +18,58 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <config.h> + #include <stdarg.h> #include "stdio.h" #include "windef.h" #include "winbase.h" +#ifdef __i386__ + +#define THISCALL(func) __thiscall_ ## func +#define __thiscall __stdcall +#define DEFINE_THISCALL_WRAPPER(func,args) \ + extern void THISCALL(func)(void); \ + __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) + +extern void *call_thiscall_func; +__ASM_GLOBAL_FUNC(call_thiscall_func, + "popl %eax\n\t" + "popl %edx\n\t" + "popl %ecx\n\t" + "pushl %eax\n\t" + "jmp *%edx\n\t") + +#define call_func1(func,this) ((void* (WINAPI*)(void*,void*))&call_thiscall_func)(func,this) +#define call_func2(func,this,a) ((void* (WINAPI*)(void*,void*,const void*))&call_thiscall_func)(func,this,(const void*)(a)) +#define call_func3(func,this,a,b) ((void* (WINAPI*)(void*,void*,const void*,const void*))&call_thiscall_func)(func,this,(const void*)(a),(const void*)(b)) + +#else /* __i386__ */ + +#define __thiscall __cdecl +#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ + +#define call_func1(func,this) func(this) +#define call_func2(func,this,a) func(this,a) +#define call_func3(func,this,a,b) func(this,a,b) + +#endif /* __i386__ */ + typedef void (__cdecl *MSVCRT__se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); static void* (__cdecl *MSVCRT_operator_new)(size_t); static void (__cdecl *MSVCRT_operator_delete)(void*); static MSVCRT__se_translator_function (__cdecl *MSVCRT__set_se_translator)(MSVCRT__se_translator_function); +static void* (__thiscall *MSVCRT_exception_ctor)(void*, const char**); +static void* (__thiscall *MSVCRT_exception_ctor_noalloc)(void*, char**, int); +static void* (__thiscall *MSVCRT_exception_copy_ctor)(void*, const void*); +static void (__thiscall *MSVCRT_exception_dtor)(void*); static void init_cxx_funcs(void) { @@ -40,6 +81,10 @@ static void init_cxx_funcs(void) MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); MSVCRT__set_se_translator = (void*)GetProcAddress(hmod, "?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z"); + MSVCRT_exception_ctor = (void*)GetProcAddress(hmod, "??0exception@@QEAA(a)AEBQEBD@Z"); + MSVCRT_exception_ctor_noalloc = (void*)GetProcAddress(hmod, "??0exception@@QEAA(a)AEBQEBDH@Z"); + MSVCRT_exception_copy_ctor = (void*)GetProcAddress(hmod, "??0exception@@QEAA(a)AEBV0@@Z"); + MSVCRT_exception_dtor = (void*)GetProcAddress(hmod, "??1exception@@UEAA(a)XZ"); } else { @@ -47,6 +92,10 @@ static void init_cxx_funcs(void) MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); MSVCRT__set_se_translator = (void*)GetProcAddress(hmod, "?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z"); + MSVCRT_exception_ctor = (void*)GetProcAddress(hmod, "??0exception@@QAE(a)ABQBD@Z"); + MSVCRT_exception_ctor_noalloc = (void*)GetProcAddress(hmod, "??0exception@@QAE(a)ABQBDH@Z"); + MSVCRT_exception_copy_ctor = (void*)GetProcAddress(hmod, "??0exception@@QAE(a)ABV0@@Z"); + MSVCRT_exception_dtor = (void*)GetProcAddress(hmod, "??1exception@@UAE(a)XZ"); } } @@ -116,3 +165,35 @@ MSVCRT__se_translator_function CDECL MSVCR90__set_se_translator(MSVCRT__se_trans { return MSVCRT__set_se_translator(func); } + +/* ??0exception(a)std@@QAE(a)ABQBD@Z */ +/* ??0exception(a)std@@QEAA(a)AEBQEBD@Z */ +DEFINE_THISCALL_WRAPPER(exception_ctor, 8) +void* __thiscall exception_ctor(void *this, const char **name) +{ + return call_func2(MSVCRT_exception_ctor, this, name); +} + +/* ??0exception(a)std@@QAE(a)ABQBDH@Z */ +/* ??0exception(a)std@@QEAA(a)AEBQEBDH@Z */ +DEFINE_THISCALL_WRAPPER(exception_ctor_noalloc, 12) +void* __thiscall exception_ctor_noalloc(void *this, char **name, int noalloc) +{ + return call_func3(MSVCRT_exception_ctor_noalloc, this, name, noalloc); +} + +/* ??0exception(a)std@@QAE(a)ABV01@@Z */ +/* ??0exception(a)std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(exception_copy_ctor, 8) +void* __thiscall exception_copy_ctor(void *this, const void *rhs) +{ + return call_func2(MSVCRT_exception_copy_ctor, this, rhs); +} + +/* ??1exception(a)std@@UAE(a)XZ */ +/* ??1exception(a)std@@UEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(exception_dtor, 4) +void __thiscall exception_dtor(void *this) +{ + call_func1(MSVCRT_exception_dtor, this); +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3632599..36cf2e4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -12,12 +12,12 @@ @ cdecl -arch=win64 ??0bad_typeid(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) msvcrt.??0bad_typeid@@QEAA(a)AEBV0@@Z @ thiscall -arch=i386 ??0bad_typeid(a)std@@QAE(a)PBD@Z(ptr str) msvcrt.??0bad_typeid@@QAE(a)PBD@Z @ cdecl -arch=win64 ??0bad_typeid(a)std@@QEAA(a)PEBD@Z(ptr str) msvcrt.??0bad_typeid@@QEAA(a)PEBD@Z -@ thiscall -arch=i386 ??0exception(a)std@@QAE(a)ABQBD@Z(ptr ptr) msvcrt.??0exception@@QAE(a)ABQBD@Z -@ cdecl -arch=win64 ??0exception(a)std@@QEAA(a)AEBQEBD@Z(ptr ptr) msvcrt.??0exception@@QEAA(a)AEBQEBD@Z -@ thiscall -arch=i386 ??0exception(a)std@@QAE(a)ABQBDH@Z(ptr ptr long) msvcrt.??0exception@@QAE(a)ABQBDH@Z -@ cdecl -arch=win64 ??0exception(a)std@@QEAA(a)AEBQEBDH@Z(ptr ptr long) msvcrt.??0exception@@QEAA(a)AEBQEBDH@Z -@ thiscall -arch=i386 ??0exception(a)std@@QAE(a)ABV01@@Z(ptr ptr) msvcrt.??0exception@@QAE(a)ABV0@@Z -@ cdecl -arch=win64 ??0exception(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) msvcrt.??0exception@@QEAA(a)AEBV0@@Z +@ thiscall -arch=i386 ??0exception(a)std@@QAE(a)ABQBD@Z(ptr ptr) exception_ctor +@ cdecl -arch=win64 ??0exception(a)std@@QEAA(a)AEBQEBD@Z(ptr ptr) exception_ctor +@ thiscall -arch=i386 ??0exception(a)std@@QAE(a)ABQBDH@Z(ptr ptr long) exception_ctor_noalloc +@ cdecl -arch=win64 ??0exception(a)std@@QEAA(a)AEBQEBDH@Z(ptr ptr long) exception_ctor_noalloc +@ thiscall -arch=i386 ??0exception(a)std@@QAE(a)ABV01@@Z(ptr ptr) exception_copy_ctor +@ cdecl -arch=win64 ??0exception(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) exception_copy_ctor @ thiscall -arch=i386 ??0exception(a)std@@QAE(a)XZ(ptr) msvcrt.??0exception@@QAE(a)XZ @ cdecl -arch=win64 ??0exception(a)std@@QEAA(a)XZ(ptr) msvcrt.??0exception@@QEAA(a)XZ @ thiscall -arch=i386 ??1__non_rtti_object(a)std@@UAE(a)XZ(ptr) msvcrt.??1__non_rtti_object@@UAE(a)XZ @@ -26,8 +26,8 @@ @ cdecl -arch=win64 ??1bad_cast(a)std@@UEAA(a)XZ(ptr) msvcrt.??1bad_cast@@UEAA(a)XZ @ thiscall -arch=i386 ??1bad_typeid(a)std@@UAE(a)XZ(ptr) msvcrt.??1bad_typeid@@UAE(a)XZ @ cdecl -arch=win64 ??1bad_typeid(a)std@@UEAA(a)XZ(ptr) msvcrt.??1bad_typeid@@UEAA(a)XZ -@ thiscall -arch=i386 ??1exception(a)std@@UAE(a)XZ(ptr) msvcrt.??1exception@@UAE(a)XZ -@ cdecl -arch=win64 ??1exception(a)std@@UEAA(a)XZ(ptr) msvcrt.??1exception@@UEAA(a)XZ +@ thiscall -arch=i386 ??1exception(a)std@@UAE(a)XZ(ptr) exception_dtor +@ cdecl -arch=win64 ??1exception(a)std@@UEAA(a)XZ(ptr) exception_dtor @ cdecl -arch=arm ??1type_info@@UAA(a)XZ(ptr) msvcrt.??1type_info@@UAA(a)XZ @ thiscall -arch=i386 ??1type_info@@UAE(a)XZ(ptr) msvcrt.??1type_info@@UAE(a)XZ @ cdecl -arch=win64 ??1type_info@@UEAA(a)XZ(ptr) msvcrt.??1type_info@@UEAA(a)XZ

1 0

Huw Davies : dbghelp: Skip the dllprefix when matching PE with ELF modules.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 5c7c954658ff330a43bbe53cd8d5dad423b75de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7c954658ff330a43bbe53cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 27 11:14:42 2013 +0100 dbghelp: Skip the dllprefix when matching PE with ELF modules. --- dlls/dbghelp/Makefile.in | 2 +- dlls/dbghelp/module.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 3fb7b52..a9bf073 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -1,6 +1,6 @@ MODULE = dbghelp.dll IMPORTLIB = dbghelp -EXTRADEFS = -D_IMAGEHLP_SOURCE_ +EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DDLLPREFIX='"$(DLLPREFIX)"' IMPORTS = psapi DELAYIMPORTS = version EXTRALIBS = @ZLIB@ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 6bea436..521cdb3f 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -422,6 +422,16 @@ static BOOL module_is_container_loaded(const struct process* pcs, size_t len; struct module* module; PCWSTR filename, modname; + static WCHAR* dll_prefix; + static int dll_prefix_len; + + if (!dll_prefix) + { + dll_prefix_len = MultiByteToWideChar( CP_UNIXCP, 0, DLLPREFIX, -1, NULL, 0 ); + dll_prefix = HeapAlloc( GetProcessHeap(), 0, dll_prefix_len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_UNIXCP, 0, DLLPREFIX, -1, dll_prefix, dll_prefix_len ); + dll_prefix_len--; + } if (!base) return FALSE; filename = get_filename(ImageName, NULL); @@ -434,6 +444,7 @@ static BOOL module_is_container_loaded(const struct process* pcs, base < module->module.BaseOfImage + module->module.ImageSize) { modname = get_filename(module->module.LoadedImageName, NULL); + if (dll_prefix_len && !strncmpW( modname, dll_prefix, dll_prefix_len )) modname += dll_prefix_len; if (!strncmpiW(modname, filename, len) && !memcmp(modname + len, S_DotSoW, 3 * sizeof(WCHAR))) {

1 0