winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
January 2011
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
879 discussions
Start a n
N
ew thread
Yaron Shahrabani : po: Hebrew update.
by Alexandre Julliard
20 Jan '11
20 Jan '11
Module: wine Branch: master Commit: 7571fb5456cba62a5e2cb8d62d84c5afbb3c3448 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7571fb5456cba62a5e2cb8d62…
Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Jan 20 17:17:05 2011 +0200 po: Hebrew update. --- po/he.po | 1079 +++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 612 insertions(+), 467 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=7571fb5456cba62a5e2cb…
1
0
0
0
Greg Geldorp : winhttp/tests: No reconnect on redirect when using proxy.
by Alexandre Julliard
20 Jan '11
20 Jan '11
Module: wine Branch: master Commit: f213cdbc4e0215be595c70f943142e0f63df6d4e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f213cdbc4e0215be595c70f94…
Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Thu Jan 20 13:39:05 2011 +0100 winhttp/tests: No reconnect on redirect when using proxy. --- dlls/winhttp/tests/notification.c | 42 +++++++++++++++++++++++++++++------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index bd6db58..6c9142b 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -46,6 +46,7 @@ struct notification unsigned int status; /* status received */ int todo; int ignore; + int skipped_for_proxy; }; struct info @@ -58,6 +59,25 @@ struct info unsigned int line; }; +static BOOL proxy_active(void) +{ + WINHTTP_PROXY_INFO proxy_info; + BOOL active = FALSE; + + if (WinHttpGetDefaultProxyConfiguration(&proxy_info)) + { + active = (proxy_info.lpszProxy != NULL); + if (active) + GlobalFree((HGLOBAL) proxy_info.lpszProxy); + if (proxy_info.lpszProxyBypass != NULL) + GlobalFree((HGLOBAL) proxy_info.lpszProxyBypass); + } + else + active = FALSE; + + return active; +} + static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DWORD status, LPVOID buffer, DWORD buflen ) { BOOL status_ok, function_ok; @@ -88,6 +108,12 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW } } if (status_ok) info->index++; + if (proxy_active()) + { + while (info->test[info->index].skipped_for_proxy) + info->index++; + } + if (status & (WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS | WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING)) { SetEvent( info->wait ); @@ -222,10 +248,10 @@ static const struct notification redirect_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0, 0, 1 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, @@ -299,10 +325,10 @@ static const struct notification async_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0, 0, 1 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 },
1
0
0
0
Jacek Caban : mshtml: Forward nsIURL::[Get|Set]FilePath to nsIURI::[Get|Set ]Path.
by Alexandre Julliard
20 Jan '11
20 Jan '11
Module: wine Branch: master Commit: ba229eed59d12df9dc5a1c9bdd843ad9e77e5a7f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ba229eed59d12df9dc5a1c9bd…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 20 12:21:20 2011 +0100 mshtml: Forward nsIURL::[Get|Set]FilePath to nsIURI::[Get|Set]Path. --- dlls/mshtml/nsio.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b6887fa..492f845 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2130,11 +2130,7 @@ static nsresult NSAPI nsURL_GetFilePath(nsIURL *iface, nsACString *aFilePath) TRACE("(%p)->(%p)\n", This, aFilePath); - if(This->nsurl) - return nsIURL_GetFilePath(This->nsurl, aFilePath); - - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return nsIURL_GetPath(&This->nsIURL_iface, aFilePath); } static nsresult NSAPI nsURL_SetFilePath(nsIURL *iface, const nsACString *aFilePath) @@ -2143,13 +2139,7 @@ static nsresult NSAPI nsURL_SetFilePath(nsIURL *iface, const nsACString *aFilePa TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFilePath)); - if(This->nsurl) { - invalidate_uri(This); - return nsIURL_SetFilePath(This->nsurl, aFilePath); - } - - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return nsIURL_SetPath(&This->nsIURL_iface, aFilePath); } static nsresult NSAPI nsURL_GetParam(nsIURL *iface, nsACString *aParam)
1
0
0
0
Nikolay Sivov : msvcrt: Partially implement _set_abort_behavior.
by Alexandre Julliard
20 Jan '11
20 Jan '11
Module: wine Branch: master Commit: 03ca06e79151301e808202cf137c1841453f3ff7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=03ca06e79151301e808202cf1…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 20 01:21:11 2011 +0300 msvcrt: Partially implement _set_abort_behavior. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 27 +++++++++++++++++++++++++++ dlls/msvcrt/exit.c | 31 +++++++++++++++++++++++++++---- dlls/msvcrt/msvcrt.h | 4 ++++ dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/tests/headers.c | 2 ++ include/msvcrt/stdlib.h | 3 +++ 9 files changed, 67 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a07400e..c103916 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1068,7 +1068,7 @@ @ stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable -@ stub _set_abort_behavior +@ cdecl _set_abort_behavior(long long) msvcrt._set_abort_behavior @ stub _set_controlfp @ cdecl _set_doserrno(long) msvcrt._set_doserrno @ cdecl _set_errno(long) msvcrt._set_errno diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f983944..4879e13 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -920,7 +920,7 @@ @ stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable -@ stub _set_abort_behavior +@ cdecl _set_abort_behavior(long long) msvcrt._set_abort_behavior @ stub _set_amblksiz @ stub _set_controlfp @ cdecl _set_doserrno(long) msvcrt._set_doserrno diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fb9073d..aa0f981 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -906,7 +906,7 @@ @ stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable -@ stub _set_abort_behavior +@ cdecl _set_abort_behavior(long long) msvcrt._set_abort_behavior @ stub _set_amblksiz @ stub _set_controlfp @ cdecl _set_doserrno(long) msvcrt._set_doserrno diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 40caa05..dcf893d 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -69,6 +69,7 @@ static int (__cdecl *p_wcsncat_s)(wchar_t *dst, size_t elem, const wchar_t *src, static void (__cdecl *p_qsort_s)(void *, size_t, size_t, int (__cdecl *)(void *, const void *, const void *), void *); static int (__cdecl *p_controlfp_s)(unsigned int *, unsigned int, unsigned int); static int (__cdecl *p_atoflt)(_CRT_FLOAT *, char *); +static unsigned int (__cdecl *p_set_abort_behavior)(unsigned int, unsigned int); static void* (WINAPI *pEncodePointer)(void *); @@ -680,6 +681,30 @@ if (0) } } +static void test__set_abort_behavior(void) +{ + unsigned int res; + + if (!p_set_abort_behavior) + { + win_skip("_set_abort_behavior not found\n"); + return; + } + + /* default is _WRITE_ABORT_MSG | _CALL_REPORTFAULT */ + res = p_set_abort_behavior(0, 0); + ok (res == (_WRITE_ABORT_MSG | _CALL_REPORTFAULT), + "got 0x%x (expected 0x%x)\n", res, _WRITE_ABORT_MSG | _CALL_REPORTFAULT); + + /* no internal mask */ + p_set_abort_behavior(0xffffffff, 0xffffffff); + res = p_set_abort_behavior(0, 0); + ok (res == 0xffffffff, "got 0x%x (expected 0x%x)\n", res, 0xffffffff); + + /* set to default value */ + p_set_abort_behavior(_WRITE_ABORT_MSG | _CALL_REPORTFAULT, 0xffffffff); +} + START_TEST(msvcr90) { HMODULE hcrt; @@ -712,6 +737,7 @@ START_TEST(msvcr90) p_qsort_s = (void *) GetProcAddress(hcrt, "qsort_s"); p_controlfp_s = (void *) GetProcAddress(hcrt, "_controlfp_s"); p_atoflt = (void* )GetProcAddress(hcrt, "_atoflt"); + p_set_abort_behavior = (void *) GetProcAddress(hcrt, "_set_abort_behavior"); hkernel32 = GetModuleHandleA("kernel32.dll"); pEncodePointer = (void *) GetProcAddress(hkernel32, "EncodePointer"); @@ -725,4 +751,5 @@ START_TEST(msvcr90) test_qsort_s(); test_controlfp_s(); test__atoflt(); + test__set_abort_behavior(); } diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 80749fc..ac7e9b3 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -39,6 +39,8 @@ static const char szMsgBoxTitle[] = "Wine C++ Runtime Library"; extern int MSVCRT_app_type; extern char *MSVCRT__pgmptr; +static unsigned int MSVCRT_abort_behavior = MSVCRT__WRITE_ABORT_MSG | MSVCRT__CALL_REPORTFAULT; + void (*CDECL _aexit_rtn)(int) = MSVCRT__exit; /* INTERNAL: call atexit functions */ @@ -150,18 +152,39 @@ void CDECL _amsg_exit(int errnum) void CDECL MSVCRT_abort(void) { TRACE("()\n"); - if (MSVCRT_app_type == 2) + + if (MSVCRT_abort_behavior & MSVCRT__WRITE_ABORT_MSG) { - DoMessageBox("Runtime error!", "abnormal program termination"); + if (MSVCRT_app_type == 2) + { + DoMessageBox("Runtime error!", "abnormal program termination"); + } + else + _cputs("\nabnormal program termination\n"); } - else - _cputs("\nabnormal program termination\n"); MSVCRT_raise(MSVCRT_SIGABRT); /* in case raise() returns */ MSVCRT__exit(3); } /********************************************************************* + * _set_abort_behavior (MSVCRT.@) + * + * Not exported by native msvcrt, added in msvcr80 + */ +unsigned int CDECL MSVCRT__set_abort_behavior(unsigned int flags, unsigned int mask) +{ + unsigned int old = MSVCRT_abort_behavior; + + TRACE("%x, %x\n", flags, mask); + if (mask & MSVCRT__CALL_REPORTFAULT) + FIXME("_WRITE_CALL_REPORTFAULT unhandled\n"); + + MSVCRT_abort_behavior = (MSVCRT_abort_behavior & ~mask) | (flags & mask); + return old; +} + +/********************************************************************* * _assert (MSVCRT.@) */ void CDECL MSVCRT__assert(const char* str, const char* file, unsigned int line) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9e29d31..d2292e4 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -732,6 +732,10 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int); #define _MAX__TIME64_T (((MSVCRT___time64_t)0x00000007 << 32) | 0x93406FFF) +/* _set_abort_behavior codes */ +#define MSVCRT__WRITE_ABORT_MSG 1 +#define MSVCRT__CALL_REPORTFAULT 2 + void __cdecl MSVCRT_free(void*); void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a6160a4..85334d3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1475,6 +1475,7 @@ @ varargs wscanf_s(wstr) MSVCRT_wscanf_s # Functions not exported in native dll: +@ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _get_invalid_parameter_handler() @ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _create_locale(long str) MSVCRT__create_locale diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index 829fe47..f02b61f 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -453,6 +453,8 @@ static void test_defines(void) CHECK_DEF(_EM_AMBIGUOUS); CHECK_DEF(_OVERFLOW); CHECK_DEF(_UNDERFLOW); + CHECK_DEF(_WRITE_ABORT_MSG); + CHECK_DEF(_CALL_REPORTFAULT); } #endif /* __WINE_USE_MSVCRT */ diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index d30e483..6a6398d 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -73,6 +73,9 @@ typedef struct _ldiv_t { #define _OUT_TO_MSGBOX 2 #define _REPORT_ERRMODE 3 +/* _set_abort_behavior codes */ +#define _WRITE_ABORT_MSG 1 +#define _CALL_REPORTFAULT 2 #ifdef __cplusplus extern "C" {
1
0
0
0
Jacek Caban : mshtml: Fixed some leaks in tests (valgrind).
by Alexandre Julliard
20 Jan '11
20 Jan '11
Module: wine Branch: master Commit: 103ef913d175d9d29a751fb1a7d17b4cf9012c99 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=103ef913d175d9d29a751fb1a…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 20 11:49:12 2011 +0100 mshtml: Fixed some leaks in tests (valgrind). --- dlls/mshtml/tests/activex.c | 1 + dlls/mshtml/tests/dom.c | 2 ++ dlls/mshtml/tests/events.c | 1 + 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index d3cbb9d..bf3e2e9 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -471,6 +471,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper ok(hres == S_OK, "Read failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); ok(!strcmp_wa(V_BSTR(&v), "3"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + SysFreeString(V_BSTR(&v)); V_VT(&v) = VT_I4; V_I4(&v) = 0xdeadbeef; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f753b14..c883a70 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2909,6 +2909,7 @@ static IHTMLElement *_test_create_elem(unsigned line, IHTMLDocument2 *doc, const hres = IHTMLDocument2_createElement(doc, tmp, &elem); ok_(__FILE__,line) (hres == S_OK, "createElement failed: %08x\n", hres); ok_(__FILE__,line) (elem != NULL, "elem == NULL\n"); + SysFreeString(tmp); return elem; } @@ -2927,6 +2928,7 @@ static IHTMLDOMNode *_test_create_text(unsigned line, IHTMLDocument2 *doc, const tmp = a2bstr(text); hres = IHTMLDocument3_createTextNode(doc3, tmp, &node); IHTMLDocument3_Release(doc3); + SysFreeString(tmp); ok_(__FILE__,line) (hres == S_OK, "createElement failed: %08x\n", hres); ok_(__FILE__,line) (node != NULL, "node == NULL\n"); diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 7d69dd5..4be0212 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -986,6 +986,7 @@ static HRESULT WINAPI iframe_onreadystatechange(IDispatchEx *iface, DISPID id, L else ok(0, "unexpected state %s\n", wine_dbgstr_w(str)); + SysFreeString(str); IHTMLDocument2_Release(iframe_doc); IHTMLFrameBase2_Release(iframe); return S_OK;
1
0
0
0
Jacek Caban : mshtml: Fixed leaks (valgrind).
by Alexandre Julliard
20 Jan '11
20 Jan '11
Module: wine Branch: master Commit: 60d8c481320c2ee05eaa95db15d61bfdb6306715 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=60d8c481320c2ee05eaa95db1…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 20 11:48:56 2011 +0100 mshtml: Fixed leaks (valgrind). --- dlls/mshtml/htmlform.c | 39 +++------------------------------------ dlls/mshtml/nsio.c | 1 + 2 files changed, 4 insertions(+), 36 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index b51cf61..3dff376 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -228,17 +228,7 @@ static HRESULT WINAPI HTMLFormElement_get_encoding(IHTMLFormElement *iface, BSTR nsAString_Init(&encoding_str, NULL); nsres = nsIDOMHTMLFormElement_GetEnctype(This->nsform, &encoding_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *encoding; - nsAString_GetData(&encoding_str, &encoding); - - *p = SysAllocString(encoding); - if(!*p) - return E_OUTOFMEMORY; - }else - return E_FAIL; - - return S_OK; + return return_nsstr(nsres, &encoding_str, p); } static HRESULT WINAPI HTMLFormElement_put_method(IHTMLFormElement *iface, BSTR v) @@ -276,17 +266,7 @@ static HRESULT WINAPI HTMLFormElement_get_method(IHTMLFormElement *iface, BSTR * nsAString_Init(&method_str, NULL); nsres = nsIDOMHTMLFormElement_GetMethod(This->nsform, &method_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *method; - nsAString_GetData(&method_str, &method); - - *p = SysAllocString(method); - if(!*p) - return E_OUTOFMEMORY; - }else - return E_FAIL; - - return S_OK; + return return_nsstr(nsres, &method_str, p); } static HRESULT WINAPI HTMLFormElement_get_elements(IHTMLFormElement *iface, IDispatch **p) @@ -337,20 +317,7 @@ static HRESULT WINAPI HTMLFormElement_get_name(IHTMLFormElement *iface, BSTR *p) nsAString_Init(&name_str, NULL); nsres = nsIDOMHTMLFormElement_GetName(This->nsform, &name_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *name; - nsAString_GetData(&name_str, &name); - - if(*name) { - *p = SysAllocString(name); - if(!*p) - return E_OUTOFMEMORY; - }else - *p = NULL; - }else - return E_FAIL; - - return S_OK; + return return_nsstr(nsres, &name_str, p); } static HRESULT WINAPI HTMLFormElement_put_onsubmit(IHTMLFormElement *iface, VARIANT v) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 617b3f3..b6887fa 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2007,6 +2007,7 @@ static nsresult NSAPI nsURI_SchemeIs(nsIURL *iface, const char *scheme, PRBool * MultiByteToWideChar(CP_ACP, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR)); *_retval = !strcmpW(scheme_name, buf); + SysFreeString(scheme_name); return NS_OK; }
1
0
0
0
Greg Geldorp : imm32/tests: Windows does post WM_IME_COMPOSITION messages sometimes.
by Alexandre Julliard
20 Jan '11
20 Jan '11
Module: wine Branch: master Commit: 2309d9f06a46e8f029997bfab354e0167d26cd35 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2309d9f06a46e8f029997bfab…
Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Thu Jan 20 11:41:11 2011 +0100 imm32/tests: Windows does post WM_IME_COMPOSITION messages sometimes. --- dlls/imm32/tests/imm32.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 8b8db90..9f40953 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -223,9 +223,7 @@ static void test_ImmNotifyIME(void) { msg_spy_flush_msgs(); ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0); - ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " - "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " - "the composition string being canceled is non empty.\n"); + msg_spy_flush_msgs(); /* behavior differs between win9x and NT */ ret = ImmGetCompositionString(imc, GCS_COMPSTR, resstr, sizeof(resstr));
1
0
0
0
Greg Geldorp : comctl32/tests: Fix failures for 120DPI display.
by Alexandre Julliard
20 Jan '11
20 Jan '11
Module: wine Branch: master Commit: 50a25a8ebbf6eb889bb7a11acc01d7fd7c706951 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=50a25a8ebbf6eb889bb7a11ac…
Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Thu Jan 20 11:40:17 2011 +0100 comctl32/tests: Fix failures for 120DPI display. --- dlls/comctl32/tests/listview.c | 4 ++-- dlls/comctl32/tests/rebar.c | 2 +- dlls/comctl32/tests/treeview.c | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 89619f7..5e71a6b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3309,7 +3309,7 @@ static void test_getitemrect(void) expect(0, rect.left); expect(0, rect.top); hdc = GetDC(hwnd); - todo_wine expect(GetDeviceCaps(hdc, LOGPIXELSX), rect.right); + todo_wine expect(((GetDeviceCaps(hdc, LOGPIXELSX) + 15) / 16) * 16, rect.right); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); @@ -4163,7 +4163,7 @@ static void test_getcolumnwidth(void) SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); hdc = GetDC(hwnd); - todo_wine expect(GetDeviceCaps(hdc, LOGPIXELSX), ret); + todo_wine expect(((GetDeviceCaps(hdc, LOGPIXELSX) + 15) / 16) * 16, ret); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); } diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 3a01756..d9ceb71 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -924,7 +924,7 @@ static void expect_band_content_(int line, HWND hRebar, UINT uBand, INT fStyle, expect_eq(line, rb.cyIntegral, cyIntegral, int, "%x"); expect_eq(line, rb.cxIdeal, cxIdeal, int, "%d"); expect_eq(line, rb.lParam, lParam, LPARAM, "%ld"); - ok(rb.cxHeader == cxHeader || broken(rb.cxHeader == cxHeader_broken), + ok(rb.cxHeader == cxHeader || rb.cxHeader == cxHeader + 1 || broken(rb.cxHeader == cxHeader_broken), "expected %d for %d from line %d\n", cxHeader, rb.cxHeader, line); } diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index ffc0e3e..457dd70 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -91,6 +91,10 @@ static const struct message focus_seq[] = { { WM_NCCALCSIZE, sent|wparam|defwinproc, TRUE }, { WM_WINDOWPOSCHANGED, sent|defwinproc }, { WM_SIZE, sent|defwinproc }, + { WM_WINDOWPOSCHANGING, sent|defwinproc|optional }, + { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, TRUE }, + { WM_WINDOWPOSCHANGED, sent|defwinproc|optional }, + { WM_SIZE, sent|defwinproc|optional }, { WM_PAINT, sent|defwinproc }, { WM_NCPAINT, sent|wparam|defwinproc, 1 }, { WM_ERASEBKGND, sent|defwinproc },
1
0
0
0
Michael Stefaniuc : ole2.dll16: COM cleanup for the ILockBytes16 iface.
by Alexandre Julliard
20 Jan '11
20 Jan '11
Module: wine Branch: master Commit: 40753023c2ea6354abc4f8270ceb18ab47bb3f08 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=40753023c2ea6354abc4f8270…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 20 11:10:36 2011 +0100 ole2.dll16: COM cleanup for the ILockBytes16 iface. --- dlls/ole2.dll16/memlockbytes.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ole2.dll16/memlockbytes.c b/dlls/ole2.dll16/memlockbytes.c index 11344ba..80153df 100644 --- a/dlls/ole2.dll16/memlockbytes.c +++ b/dlls/ole2.dll16/memlockbytes.c @@ -48,12 +48,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); */ struct HGLOBALLockBytesImpl16 { - /* - * Needs to be the first item in the struct - * since we want to cast this in an ILockBytes pointer - */ - const ILockBytes16Vtbl *lpVtbl; - LONG ref; + ILockBytes16 ILockBytes16_iface; + LONG ref; /* * Support for the LockBytes object @@ -79,6 +75,11 @@ typedef struct HGLOBALLockBytesImpl16 HGLOBALLockBytesImpl16; * */ +static inline HGLOBALLockBytesImpl16 *impl_from_ILockBytes16(ILockBytes16 *iface) +{ + return CONTAINING_RECORD(iface, HGLOBALLockBytesImpl16, ILockBytes16_iface); +} + /****************************************************************************** * This is the constructor for the HGLOBALLockBytesImpl16 class. * @@ -122,8 +123,8 @@ HGLOBALLockBytesImpl16_Construct(HGLOBAL16 hGlobal, #undef VTENT msegvt16 = MapLS( &vt16 ); } - newLockBytes->lpVtbl = (const ILockBytes16Vtbl*)msegvt16; - newLockBytes->ref = 0; + newLockBytes->ILockBytes16_iface.lpVtbl = (const ILockBytes16Vtbl*)msegvt16; + newLockBytes->ref = 0; /* * Initialize the support. */ @@ -177,7 +178,7 @@ static void HGLOBALLockBytesImpl16_Destroy(HGLOBALLockBytesImpl16* This) */ ULONG CDECL HGLOBALLockBytesImpl16_AddRef(ILockBytes16* iface) { - HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface; + HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface); TRACE("(%p)\n",This); @@ -227,7 +228,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_QueryInterface( * Query Interface always increases the reference count by one when it is * successful */ - HGLOBALLockBytesImpl16_AddRef((ILockBytes16*)This); + HGLOBALLockBytesImpl16_AddRef(&This->ILockBytes16_iface); return S_OK; } @@ -238,7 +239,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_QueryInterface( */ ULONG CDECL HGLOBALLockBytesImpl16_Release(ILockBytes16* iface) { - HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface; + HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface); ULONG ref; TRACE("(%p)\n",This); @@ -268,7 +269,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_ReadAt( ULONG cb, /* [in] */ ULONG* pcbRead) /* [out] */ { - HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface; + HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface); void* supportBuffer; ULONG bytesReadBuffer = 0; @@ -337,7 +338,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_SetSize( ILockBytes16* iface, ULARGE_INTEGER libNewSize) /* [in] */ { - HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface; + HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface); HGLOBAL16 supportHandle; TRACE("(%p,%d)\n",This,libNewSize.u.LowPart); @@ -379,7 +380,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_WriteAt( ULONG cb, /* [in] */ ULONG* pcbWritten) /* [out] */ { - HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface; + HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface); void* supportBuffer; ULARGE_INTEGER newSize; @@ -485,7 +486,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_Stat( STATSTG16* pstatstg, /* [out] */ DWORD grfStatFlag) /* [in] */ { - HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface; + HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface); memset(pstatstg, 0, sizeof(STATSTG16)); @@ -520,8 +521,7 @@ HRESULT WINAPI CreateILockBytesOnHGlobal16( newLockBytes = HGLOBALLockBytesImpl16_Construct(hGlobal, fDeleteOnRelease); if (newLockBytes != NULL) - return HGLOBALLockBytesImpl16_QueryInterface((ILockBytes16*)newLockBytes, - &IID_ILockBytes, - (void**)ppLkbyt); + return HGLOBALLockBytesImpl16_QueryInterface(&newLockBytes->ILockBytes16_iface, + &IID_ILockBytes, (void**)ppLkbyt); return E_OUTOFMEMORY; }
1
0
0
0
Michael Stefaniuc : ole2.dll16: Add missing ILockBytes:: Stat to the vtbl initialisation.
by Alexandre Julliard
20 Jan '11
20 Jan '11
Module: wine Branch: master Commit: d2bad4880dc791539929be74c7cec41bd73886f7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d2bad4880dc791539929be74c…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 20 11:09:54 2011 +0100 ole2.dll16: Add missing ILockBytes::Stat to the vtbl initialisation. --- dlls/ole2.dll16/memlockbytes.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole2.dll16/memlockbytes.c b/dlls/ole2.dll16/memlockbytes.c index 538f388..11344ba 100644 --- a/dlls/ole2.dll16/memlockbytes.c +++ b/dlls/ole2.dll16/memlockbytes.c @@ -118,6 +118,7 @@ HGLOBALLockBytesImpl16_Construct(HGLOBAL16 hGlobal, VTENT(SetSize); VTENT(LockRegion); VTENT(UnlockRegion); + VTENT(Stat); #undef VTENT msegvt16 = MapLS( &vt16 ); }
1
0
0
0
← Newer
1
...
25
26
27
28
29
30
31
...
88
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
Results per page:
10
25
50
100
200