wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Juan Lang : kernel32: Implement GetErrorMode/SetErrorMode on top of NTDLL.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 5e87ca772ed20897673f42eab18af313ef6fe316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e87ca772ed20897673f42eab… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jun 21 11:04:04 2010 -0700 kernel32: Implement GetErrorMode/SetErrorMode on top of NTDLL. --- dlls/kernel32/process.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index fc170f9..65dc2eb 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -70,8 +70,6 @@ typedef struct DWORD dwReserved; } LOADPARMS32; -static UINT process_error_mode; - static DWORD shutdown_flags = 0; static DWORD shutdown_priority = 0x280; static BOOL is_wow64; @@ -2450,8 +2448,12 @@ BOOL WINAPI GetExitCodeProcess( HANDLE hProcess, LPDWORD lpExitCode ) */ UINT WINAPI SetErrorMode( UINT mode ) { - UINT old = process_error_mode; - process_error_mode = mode; + UINT old; + + NtQueryInformationProcess( GetCurrentProcess(), ProcessDefaultHardErrorMode, + &old, sizeof(old), NULL ); + NtSetInformationProcess( GetCurrentProcess(), ProcessDefaultHardErrorMode, + &mode, sizeof(mode) ); return old; } @@ -2460,7 +2462,11 @@ UINT WINAPI SetErrorMode( UINT mode ) */ UINT WINAPI GetErrorMode( void ) { - return process_error_mode; + UINT mode; + + NtQueryInformationProcess( GetCurrentProcess(), ProcessDefaultHardErrorMode, + &mode, sizeof(mode), NULL ); + return mode; } /**********************************************************************

1 0

Juan Lang : ntdll: Implement NtSetInformationProcess for ProcessDefaultHardErrorMode.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: a4331aaf5dd1a425992d318d69677a56c2d6f2aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4331aaf5dd1a425992d318d6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Apr 22 09:33:28 2010 -0700 ntdll: Implement NtSetInformationProcess for ProcessDefaultHardErrorMode. --- dlls/ntdll/process.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 2e73c91..b9b81ca 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -440,6 +440,10 @@ NTSTATUS WINAPI NtSetInformationProcess( switch (ProcessInformationClass) { + case ProcessDefaultHardErrorMode: + if (ProcessInformationLength != sizeof(UINT)) return STATUS_INVALID_PARAMETER; + process_error_mode = *(UINT *)ProcessInformation; + break; case ProcessAffinityMask: if (ProcessInformationLength != sizeof(DWORD_PTR)) return STATUS_INVALID_PARAMETER; if (*(PDWORD_PTR)ProcessInformation & ~(((DWORD_PTR)1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1))

1 0

Juan Lang : ntdll: Implement NtQueryInformationProcess for ProcessDefaultHardErrorMode.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 9cb3664bb774605b1446a956ae454d05516a8338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb3664bb774605b1446a956a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 14 13:20:03 2010 -0700 ntdll: Implement NtQueryInformationProcess for ProcessDefaultHardErrorMode. --- dlls/ntdll/process.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index f331429..2e73c91 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -90,6 +90,7 @@ HANDLE CDECL __wine_make_process_system(void) return ret; } +static UINT process_error_mode; #define UNIMPLEMENTED_INFO_CLASS(c) \ case c: \ @@ -126,7 +127,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( UNIMPLEMENTED_INFO_CLASS(ProcessAccessToken); UNIMPLEMENTED_INFO_CLASS(ProcessLdtInformation); UNIMPLEMENTED_INFO_CLASS(ProcessLdtSize); - UNIMPLEMENTED_INFO_CLASS(ProcessDefaultHardErrorMode); UNIMPLEMENTED_INFO_CLASS(ProcessIoPortHandlers); UNIMPLEMENTED_INFO_CLASS(ProcessPooledUsageAndLimits); UNIMPLEMENTED_INFO_CLASS(ProcessWorkingSetWatch); @@ -314,6 +314,13 @@ NTSTATUS WINAPI NtQueryInformationProcess( else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessDefaultHardErrorMode: + len = sizeof(process_error_mode); + if (ProcessInformationLength == len) + memcpy(ProcessInformation, &process_error_mode, len); + else + ret = STATUS_INFO_LENGTH_MISMATCH; + break; case ProcessDebugObjectHandle: /* "These are not the debuggers you are looking for." * * set it to 0 aka "no debugger" to satisfy copy protections */

1 0

Detlef Riekenberg : include: Add inaddr.h.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: c8c12668813ceb9aeda542cb7a75f2b4a10f9da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c12668813ceb9aeda542cb7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Aug 4 21:48:02 2010 +0200 include: Add inaddr.h. --- include/Makefile.in | 1 + include/inaddr.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index e6215e3..b8d26ec 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -281,6 +281,7 @@ SRCDIR_INCLUDES = \ imagehlp.h \ imm.h \ in6addr.h \ + inaddr.h \ initguid.h \ intshcut.h \ ipexport.h \ diff --git a/include/inaddr.h b/include/inaddr.h new file mode 100644 index 0000000..a663b08 --- /dev/null +++ b/include/inaddr.h @@ -0,0 +1,53 @@ +/* + * Copyright 2010 Detlef Riekenberg + * + * 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 __INADDR_H__ +#define __INADDR_H__ + +#ifdef USE_WS_PREFIX +#define WS(x) WS_##x +#else +#define WS(x) x +#endif + +typedef struct WS(in_addr) +{ + union { + struct { + UCHAR s_b1,s_b2,s_b3,s_b4; + } S_un_b; + struct { + USHORT s_w1,s_w2; + } S_un_w; + ULONG S_addr; + } S_un; +} IN_ADDR, *PIN_ADDR, *LPIN_ADDR; + +#undef WS + +#ifndef USE_WS_PREFIX +#define s_addr S_un.S_addr +#define s_net S_un.S_un_b.s_b1 +#define s_host S_un.S_un_b.s_b2 +#define s_lh S_un.S_un_b.s_b3 +#define s_impno S_un.S_un_b.s_b4 +#define s_imp S_un.S_un_w.s_w2 +#endif /* USE_WS_PREFIX */ + +#endif /* __INADDR_H__ */

1 0

Jacek Caban : shdocvw: Ignore invalid NULL PostData.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 6caca88ae1bc8e7fc13fe005f359c5211b7ee0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6caca88ae1bc8e7fc13fe005f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 12:38:29 2010 +0200 shdocvw: Ignore invalid NULL PostData. --- dlls/shdocvw/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 368a3c3..e3f0af8 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -761,7 +761,7 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, Flags, Flags ? V_VT(Flags) : -1, TargetFrameName, TargetFrameName ? V_VT(TargetFrameName) : -1); - if(PostData && V_VT(PostData) == (VT_ARRAY | VT_UI1)) { + if(PostData && V_VT(PostData) == (VT_ARRAY | VT_UI1) && V_ARRAY(PostData)) { SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data); post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements; }

1 0

Jacek Caban : jscript: Throw TypeError in in_eval.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: d6648e4f6a26204200e8b35c95d5d497a9f9912a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6648e4f6a26204200e8b35c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 12:36:59 2010 +0200 jscript: Throw TypeError in in_eval. --- dlls/jscript/engine.c | 6 ++---- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 167b5d9..c06bef4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2065,10 +2065,8 @@ static HRESULT in_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *obj, jsexcept_t BSTR str; HRESULT hres; - if(V_VT(obj) != VT_DISPATCH) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(V_VT(obj) != VT_DISPATCH || !V_DISPATCH(obj)) + return throw_type_error(ctx->parser->script, ei, IDS_OBJECT_EXPECTED, NULL); hres = to_string(ctx->parser->script, lval, ei, &str); if(FAILED(hres)) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 9a253dc..2e0ae0b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1891,6 +1891,9 @@ exception_test(function() {encodeURI('\udcaa');}, "URIError", -2146823264); exception_test(function() {(new Object()) instanceof 3;}, "TypeError", -2146823286); exception_test(function() {(new Object()) instanceof null;}, "TypeError", -2146823286); exception_test(function() {(new Object()) instanceof nullDisp;}, "TypeError", -2146823286); +exception_test(function() {"test" in 3;}, "TypeError", -2146823281); +exception_test(function() {"test" in null;}, "TypeError", -2146823281); +exception_test(function() {"test" in nullDisp;}, "TypeError", -2146823281); function testThisExcept(func, number) { exception_test(function() {func.call(new Object())}, "TypeError", number);

1 0

Jacek Caban : jscript: Throw TypeError in instanceof_expression_eval.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: be3dc38183d235ad01141e6462cdd2850eb0a9c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3dc38183d235ad01141e646… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 12:36:34 2010 +0200 jscript: Throw TypeError in instanceof_expression_eval. --- dlls/jscript/engine.c | 6 ++---- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 3 +++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b40a88e..167b5d9 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1999,10 +1999,8 @@ static HRESULT instanceof_eval(exec_ctx_t *ctx, VARIANT *inst, VARIANT *objv, js static const WCHAR prototypeW[] = {'p','r','o','t','o','t', 'y', 'p','e',0}; - if(V_VT(objv) != VT_DISPATCH) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(V_VT(objv) != VT_DISPATCH || !V_DISPATCH(objv)) + return throw_type_error(ctx->parser->script, ei, IDS_NOT_FUNC, NULL); obj = iface_to_jsdisp((IUnknown*)V_DISPATCH(objv)); if(!obj) { diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index d98b0b6..b8c7ad1 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -26,6 +26,7 @@ STRINGTABLE IDS_INVALID_CALL_ARG "Invalid procedure call or argument" IDS_CREATE_OBJ_ERROR "Automation server can't create object" IDS_NO_PROPERTY "Object doesn't support this property or method" + IDS_UNSUPPORTED_ACTION "Object doesn't support this action" IDS_ARG_NOT_OPT "Argument not optional" IDS_SYNTAX_ERROR "Syntax error" IDS_SEMICOLON "Expected ';'" diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index b88621f..074bdcd 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -22,6 +22,7 @@ #define IDS_INVALID_CALL_ARG 0x0005 #define IDS_CREATE_OBJ_ERROR 0x01AD #define IDS_NO_PROPERTY 0x01B6 +#define IDS_UNSUPPORTED_ACTION 0x01BD #define IDS_ARG_NOT_OPT 0x01c1 #define IDS_SYNTAX_ERROR 0x03EA #define IDS_SEMICOLON 0x03EC diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c57666d..9a253dc 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1888,6 +1888,9 @@ exception_test(function() {eval("'unterminated")}, "SyntaxError", -2146827273); exception_test(function() {eval("nonexistingfunc()")}, "TypeError", -2146823281); exception_test(function() {RegExp(/a/, "g");}, "RegExpError", -2146823271); exception_test(function() {encodeURI('\udcaa');}, "URIError", -2146823264); +exception_test(function() {(new Object()) instanceof 3;}, "TypeError", -2146823286); +exception_test(function() {(new Object()) instanceof null;}, "TypeError", -2146823286); +exception_test(function() {(new Object()) instanceof nullDisp;}, "TypeError", -2146823286); function testThisExcept(func, number) { exception_test(function() {func.call(new Object())}, "TypeError", number);

1 0

Mike Kaplinskiy : ws2_32: Fix a bad pointer crash.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 50ef3a20187ec5f3961a9327b281ea9fa3dece63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ef3a20187ec5f3961a9327b… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Aug 14 20:11:10 2010 -0400 ws2_32: Fix a bad pointer crash. --- dlls/ws2_32/socket.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 39c1d2a..c226fda 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1966,6 +1966,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n wsa->flags = 0; wsa->n_iovecs = sendBuf ? 1 : 0; wsa->first_iovec = 0; + wsa->completion_func = NULL; wsa->iovec[0].iov_base = sendBuf; wsa->iovec[0].iov_len = sendBufLen;

1 0

Detlef Riekenberg : shlwapi/tests: Run more language dependent tests only on English locales.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 6e079915dd95e84a653c1c6b0f6a11a3ada3876b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e079915dd95e84a653c1c6b0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 13 22:51:44 2010 +0200 shlwapi/tests: Run more language dependent tests only on English locales. --- dlls/shlwapi/tests/string.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index aa97088..00a4469 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -1421,19 +1421,17 @@ START_TEST(string) test_StrToIntExA(); test_StrToIntExW(); test_StrDupA(); - if (lstrcmp(thousandDelim, ",")==0 && lstrcmp(decimalDelim, ".")==0) - { - /* these tests are locale-dependent */ - test_StrFormatByteSize64A(); - test_StrFormatKBSizeA(); - test_StrFormatKBSizeW(); - } /* language-dependent test */ if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) - trace("Skipping StrFromTimeInterval test for non English language\n"); + skip("English is required for StrFromTimeInterval and StrFormat*Size tests\n"); else + { + test_StrFormatByteSize64A(); + test_StrFormatKBSizeA(); + test_StrFormatKBSizeW(); test_StrFromTimeIntervalA(); + } test_StrCmpA(); test_StrCmpW();

1 0

Konrad Wartke : browseui: Improved a FIXME in DllGetVersion.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: c4a3b39033fc6f561be3f93bd5e224a94fb2e49c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a3b39033fc6f561be3f93bd… Author: Konrad Wartke <kwartke(a)gmail.com> Date: Fri Aug 13 16:30:58 2010 +0200 browseui: Improved a FIXME in DllGetVersion. --- dlls/browseui/browseui_main.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index f09d817..2db169e 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -183,15 +183,28 @@ HRESULT WINAPI DllCanUnloadNow(void) */ HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info) { - if (info->cbSize != sizeof(DLLVERSIONINFO)) FIXME("support DLLVERSIONINFO2\n"); - - /* this is what IE6 on Windows 98 reports */ - info->dwMajorVersion = 6; - info->dwMinorVersion = 0; - info->dwBuildNumber = 2600; - info->dwPlatformID = DLLVER_PLATFORM_WINDOWS; + if(info->cbSize == sizeof(DLLVERSIONINFO) || + info->cbSize == sizeof(DLLVERSIONINFO2)) + { + /* this is what IE6 on Windows 98 reports */ + info->dwMajorVersion = 6; + info->dwMinorVersion = 0; + info->dwBuildNumber = 2600; + info->dwPlatformID = DLLVER_PLATFORM_WINDOWS; + if(info->cbSize == sizeof(DLLVERSIONINFO2)) + { + DLLVERSIONINFO2 *info2 = (DLLVERSIONINFO2*) info; + info2->dwFlags = 0; + info2->ullVersion = MAKEDLLVERULL(info->dwMajorVersion, + info->dwMinorVersion, + info->dwBuildNumber, + 0); /* FIXME: correct hotfix number */ + } + return S_OK; + } - return NOERROR; + WARN("wrong DLLVERSIONINFO size from app.\n"); + return E_INVALIDARG; } /***********************************************************************

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010