August 2010 - Wine-commits - list.winehq.org

Austin Lund : dmime/tests: Added tests for IDirectMusicPerformance.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 203272eafa2bd530c9078d8e59fc38550e9b3056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203272eafa2bd530c9078d8e5… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Aug 6 17:50:49 2010 +1000 dmime/tests: Added tests for IDirectMusicPerformance. --- configure | 1 + configure.ac | 1 + dlls/dmime/tests/Makefile.in | 11 ++++ dlls/dmime/tests/performance.c | 102 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 05a9317..4549b38 100755 --- a/configure +++ b/configure @@ -14499,6 +14499,7 @@ wine_fn_config_dll display.drv16 enable_win16 wine_fn_config_dll dmband enable_dmband wine_fn_config_dll dmcompos enable_dmcompos wine_fn_config_dll dmime enable_dmime +wine_fn_config_test dlls/dmime/tests dmime_test wine_fn_config_dll dmloader enable_dmloader wine_fn_config_test dlls/dmloader/tests dmloader_test wine_fn_config_dll dmscript enable_dmscript diff --git a/configure.ac b/configure.ac index eedfec5..5b56bb9 100644 --- a/configure.ac +++ b/configure.ac @@ -2338,6 +2338,7 @@ WINE_CONFIG_DLL(display.drv16,enable_win16) WINE_CONFIG_DLL(dmband) WINE_CONFIG_DLL(dmcompos) WINE_CONFIG_DLL(dmime) +WINE_CONFIG_TEST(dlls/dmime/tests) WINE_CONFIG_DLL(dmloader) WINE_CONFIG_TEST(dlls/dmloader/tests) WINE_CONFIG_DLL(dmscript) diff --git a/dlls/dmime/tests/Makefile.in b/dlls/dmime/tests/Makefile.in new file mode 100644 index 0000000..f3c83dc --- /dev/null +++ b/dlls/dmime/tests/Makefile.in @@ -0,0 +1,11 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = dmime.dll +IMPORTS = user32 ole32 + +C_SRCS = \ + performance.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c new file mode 100644 index 0000000..a681b6a --- /dev/null +++ b/dlls/dmime/tests/performance.c @@ -0,0 +1,102 @@ +/* + * Unit test suite for IDirectMusicPerformance + * + * Copyright 2010 Austin Lund + * + * 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 + */ + +#include <stdarg.h> +#include <windef.h> +#include <initguid.h> +#include <wine/test.h> +#include <dmusici.h> + +IDirectMusicPerformance8 *idmusicperformance; + +static HRESULT test_InitAudio(void) +{ + IDirectSound *pDirectSound; + HRESULT hr; + + pDirectSound = NULL; + hr = IDirectMusicPerformance8_InitAudio(idmusicperformance ,NULL, + &pDirectSound, NULL, DMUS_APATH_SHARED_STEREOPLUSREVERB, 128, DMUS_AUDIOF_ALL, NULL); + return hr; +} + +static void test_PChannelInfo(void) +{ + IDirectMusicPort *pDirectMusicPort; + HRESULT hr; + + pDirectMusicPort = NULL; + hr = IDirectMusicPerformance8_PChannelInfo(idmusicperformance, 0, &pDirectMusicPort, NULL, NULL); + ok(hr == S_OK, "Failed to call PChannelInfo (%x)\n", hr); + todo_wine ok(pDirectMusicPort != NULL, "IDirectMusicPort not set\n"); + if (hr == S_OK && pDirectMusicPort != NULL) + IDirectMusicPort_Release(pDirectMusicPort); +} + +static void test_GetDefaultAudioPath(void) +{ + IDirectMusicAudioPath *pDirectMusicAudioPath; + HRESULT hr; + + hr = IDirectMusicPerformance8_GetDefaultAudioPath(idmusicperformance, &pDirectMusicAudioPath); + ok(hr == S_OK, "Failed to call GetDefaultAudioPath (%x)\n", hr); + if (hr == S_OK) + IDirectMusicAudioPath_Release(pDirectMusicAudioPath); +} + +static void test_CloseDown(void) +{ + HRESULT hr; + + hr = IDirectMusicPerformance8_CloseDown(idmusicperformance); + ok(hr == S_OK, "Failed to call CloseDown (%x)\n", hr); +} + +START_TEST( performance ) +{ + HRESULT hr; + + hr = CoInitialize(NULL); + if (FAILED(hr)) { + skip("Cannot initialize COM (%x)\n", hr); + return; + } + + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, + CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (LPVOID *)&idmusicperformance); + if (hr != S_OK) { + skip("Cannot create DirectMusicPerformance object (%x)\n", hr); + CoUninitialize(); + return; + } + + hr = test_InitAudio(); + if (hr != S_OK) { + skip("InitAudio failed (%x)\n", hr); + return; + } + + test_GetDefaultAudioPath(); + test_PChannelInfo(); + test_CloseDown(); + + IDirectMusicPerformance8_Release(idmusicperformance); + CoUninitialize(); +}

1 0

Austin Lund : dmime: Ensure IDirectMusicPort is initialised when calling IDirectMusicPerformance ::PChannelInfo.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 5b27cdf93b2f4a21427dc5af57176098cb79b586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b27cdf93b2f4a21427dc5af5… Author: Austin Lund <austin.lund(a)gmail.com> Date: Sat Aug 7 15:01:14 2010 +1000 dmime: Ensure IDirectMusicPort is initialised when calling IDirectMusicPerformance::PChannelInfo. --- dlls/dmime/performance.c | 9 +++++++++ dlls/dmime/tests/performance.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 850d834..91df283 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -588,7 +588,16 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel (LPDIRECTMUSIC static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo (LPDIRECTMUSICPERFORMANCE8 iface, DWORD dwPChannel, IDirectMusicPort** ppPort, DWORD* pdwGroup, DWORD* pdwMChannel) { IDirectMusicPerformance8Impl *This = (IDirectMusicPerformance8Impl *)iface; + DMUS_PORTPARAMS8 dmusportparams; + GUID def; + FIXME("(%p, %d, %p, %p, %p): stub\n", This, dwPChannel, ppPort, pdwGroup, pdwMChannel); + + dmusportparams.dwSize = sizeof(DMUS_PORTPARAMS8); + dmusportparams.dwValidParams = 0; + IDirectMusic8_GetDefaultPort(This->pDirectMusic, &def); + IDirectMusic8_CreatePort(This->pDirectMusic, &def, &dmusportparams, ppPort, NULL); + return S_OK; } diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index a681b6a..f184314 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -45,7 +45,7 @@ static void test_PChannelInfo(void) pDirectMusicPort = NULL; hr = IDirectMusicPerformance8_PChannelInfo(idmusicperformance, 0, &pDirectMusicPort, NULL, NULL); ok(hr == S_OK, "Failed to call PChannelInfo (%x)\n", hr); - todo_wine ok(pDirectMusicPort != NULL, "IDirectMusicPort not set\n"); + ok(pDirectMusicPort != NULL, "IDirectMusicPort not set\n"); if (hr == S_OK && pDirectMusicPort != NULL) IDirectMusicPort_Release(pDirectMusicPort); }

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

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

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

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

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 : 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

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

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