January 2017 - Wine-commits

André Hentschel : kernel32: Fix some spec file entries.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 92efdb108e2f911e40a35ca676d1f0d6860cf88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=92efdb108e2f911e40a35ca67… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:58:48 2017 +0100 kernel32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-sidebyside-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec b/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec index bad0023..0bf78e2 100644 --- a/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec +++ b/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec @@ -1,7 +1,7 @@ @ stdcall ActivateActCtx(ptr ptr) kernel32.ActivateActCtx @ stdcall AddRefActCtx(ptr) kernel32.AddRefActCtx @ stdcall CreateActCtxW(ptr) kernel32.CreateActCtxW -@ stdcall DeactivateActCtx(long ptr) kernel32.DeactivateActCtx +@ stdcall DeactivateActCtx(long long) kernel32.DeactivateActCtx @ stdcall FindActCtxSectionGuid(long ptr long ptr ptr) kernel32.FindActCtxSectionGuid @ stdcall FindActCtxSectionStringW(long ptr long wstr ptr) kernel32.FindActCtxSectionStringW @ stdcall GetCurrentActCtx(ptr) kernel32.GetCurrentActCtx diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 06b89de..a6cefef 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -348,7 +348,7 @@ @ stdcall CreateWaitableTimerExW(ptr wstr long long) @ stdcall CreateWaitableTimerW(ptr long wstr) # @ stub CtrlRoutine -@ stdcall DeactivateActCtx(long ptr) +@ stdcall DeactivateActCtx(long long) @ stdcall DebugActiveProcess(long) @ stdcall DebugActiveProcessStop(long) @ stdcall DebugBreak() @@ -564,7 +564,7 @@ # @ stub GetCalendarSupportedDateRange # @ stub GetCalendarWeekNumber # @ stub GetComPlusPackageInstallStatus -@ stdcall GetCommConfig(long ptr long) +@ stdcall GetCommConfig(long ptr ptr) @ stdcall GetCommMask(long ptr) @ stdcall GetCommModemStatus(long ptr) @ stdcall GetCommProperties(long ptr) @@ -640,8 +640,8 @@ @ stdcall GetDateFormatEx(wstr long ptr wstr ptr long wstr) @ stdcall GetDateFormatW(long long ptr wstr ptr long) @ stdcall GetDaylightFlag() -@ stdcall GetDefaultCommConfigA(str ptr long) -@ stdcall GetDefaultCommConfigW(wstr ptr long) +@ stdcall GetDefaultCommConfigA(str ptr ptr) +@ stdcall GetDefaultCommConfigW(wstr ptr ptr) @ stub GetDefaultSortkeySize @ stdcall GetDevicePowerState(long ptr) @ stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr) @@ -1329,7 +1329,7 @@ # @ stub SetComPlusPackageInstallStatus @ stdcall SetCommBreak(long) @ stdcall SetCommConfig(long ptr long) -@ stdcall SetCommMask(long ptr) +@ stdcall SetCommMask(long long) @ stdcall SetCommState(long ptr) @ stdcall SetCommTimeouts(long ptr) @ stdcall SetComputerNameA(str)

1 0

André Hentschel : winemapi: Fix some spec file entries.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: dc37226566dce37947922f33f9a33e838f8488da URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc37226566dce37947922f33f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:58:58 2017 +0100 winemapi: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemapi/winemapi.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winemapi/winemapi.spec b/dlls/winemapi/winemapi.spec index 83de280..40a1244 100644 --- a/dlls/winemapi/winemapi.spec +++ b/dlls/winemapi/winemapi.spec @@ -1,11 +1,11 @@ -@ stdcall MAPIAddress(ptr ptr str long str long ptr long long ptr ptr) -@ stdcall MAPIDeleteMail(ptr ptr str long long) -@ stdcall MAPIDetails(ptr ptr ptr long long) -@ stdcall MAPIFindNext(ptr ptr str str long long ptr) -@ stdcall MAPILogon(ptr str str long long ptr) -@ stdcall MAPILogoff(ptr ptr long long) -@ stdcall MAPIReadMail(ptr ptr str long long ptr) -@ stdcall MAPIResolveName(ptr ptr str long long ptr) -@ stdcall MAPISaveMail(ptr ptr ptr long long str) -@ stdcall MAPISendDocuments(ptr str str str long) -@ stdcall MAPISendMail(ptr ptr ptr long long) +@ stdcall MAPIAddress(ptr long str long str long ptr long long ptr ptr) +@ stdcall MAPIDeleteMail(ptr long str long long) +@ stdcall MAPIDetails(ptr long ptr long long) +@ stdcall MAPIFindNext(ptr long str str long long ptr) +@ stdcall MAPILogon(long str str long long ptr) +@ stdcall MAPILogoff(ptr long long long) +@ stdcall MAPIReadMail(ptr long str long long ptr) +@ stdcall MAPIResolveName(ptr long str long long ptr) +@ stdcall MAPISaveMail(ptr long ptr long long str) +@ stdcall MAPISendDocuments(long str str str long) +@ stdcall MAPISendMail(ptr long ptr long long)

1 0

Bruno Jesus : dinput: Fix GetEffectStatus for Linux when effect was not downloaded.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: cc373223b0803d19bc3b2bb315000e1e31274b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc373223b0803d19bc3b2bb31… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 26 17:07:01 2017 -0200 dinput: Fix GetEffectStatus for Linux when effect was not downloaded. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 0fd16ed..7477bc7 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -234,11 +234,16 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetEffectStatus( LPDIRECTINPUTEFFECT iface, LPDWORD pdwFlags) { - TRACE("(this=%p,%p)\n", iface, pdwFlags); + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); + + TRACE("(this=%p,%p)\n", This, pdwFlags); if (!pdwFlags) return E_POINTER; + if (This->effect.id == -1) + return DIERR_NOTDOWNLOADED; + /* linux sends the effect status through an event. * that event is trapped by our parent joystick driver * and there is no clean way to pass it back to us. */

1 0

Bruno Jesus : dinput: Downgrade a FIXME to WARN in JoystickWImpl_SendForceFeedbackCommand.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 2d2d83324865d50f0b543c9df9940821b1cf324c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2d83324865d50f0b543c9df… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 26 17:07:02 2017 -0200 dinput: Downgrade a FIXME to WARN in JoystickWImpl_SendForceFeedbackCommand. All valid commands are already there, anything else is an app bug. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 44d72fc..790802d 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1351,7 +1351,7 @@ static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE } case DISFFC_PAUSE: case DISFFC_CONTINUE: - FIXME("No support for Pause or Continue in linux\n"); + FIXME("No support for Pause or Continue in linux\n"); break; case DISFFC_SETACTUATORSOFF: @@ -1360,8 +1360,8 @@ static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE break; default: - FIXME("Unknown Force Feedback Command!\n"); - return DIERR_INVALIDPARAM; + WARN("Unknown Force Feedback Command %u!\n", dwFlags); + return DIERR_INVALIDPARAM; } return DI_OK; #else

1 0

Bruno Jesus : dinput: DISFFC_RESET will not release the effects.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 27f456844b8195dac09bfce0c4cc906236462a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f456844b8195dac09bfce0c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 26 17:07:03 2017 -0200 dinput: DISFFC_RESET will not release the effects. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 790802d..f62893b 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1331,9 +1331,9 @@ static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE { case DISFFC_STOPALL: { - /* Stop all effects */ effect_list_item *itr; + /* Stop all effects */ LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) IDirectInputEffect_Stop(itr->ref); break; @@ -1341,12 +1341,14 @@ static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE case DISFFC_RESET: { - effect_list_item *itr, *ptr; + effect_list_item *itr; - /* Stop, unload, release and free all effects */ - /* This returns the device to its "bare" state */ - LIST_FOR_EACH_ENTRY_SAFE(itr, ptr, &This->ff_effects, effect_list_item, entry) - IDirectInputEffect_Release(itr->ref); + /* Stop and unload all effects. It is not true that effects are released */ + LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) + { + IDirectInputEffect_Stop(itr->ref); + IDirectInputEffect_Unload(itr->ref); + } break; } case DISFFC_PAUSE:

1 0

Bruno Jesus : dinput: Simplify JoystickWImpl_Unacquire for Linux.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 8339de07ca51723faf3ff25f81f331233f337c5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8339de07ca51723faf3ff25f8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 26 17:07:04 2017 -0200 dinput: Simplify JoystickWImpl_Unacquire for Linux. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index f62893b..910e755 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -88,6 +88,8 @@ HRESULT linuxinput_create_effect(int* fd, REFGUID rguid, struct list *parent_lis HRESULT linuxinput_get_info_A(int fd, REFGUID rguid, LPDIEFFECTINFOA info); HRESULT linuxinput_get_info_W(int fd, REFGUID rguid, LPDIEFFECTINFOW info); +static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags); + typedef struct JoystickImpl JoystickImpl; static const IDirectInputDevice8AVtbl JoystickAvt; static const IDirectInputDevice8WVtbl JoystickWvt; @@ -745,18 +747,10 @@ static HRESULT WINAPI JoystickWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) TRACE("(this=%p)\n",This); res = IDirectInputDevice2WImpl_Unacquire(iface); if (res==DI_OK && This->joyfd!=-1) { - effect_list_item *itr; struct input_event event; - /* For each known effect: - * - stop it - * - unload it - * But, unlike DISFFC_RESET, do not release the effect. - */ - LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) { - IDirectInputEffect_Stop(itr->ref); - IDirectInputEffect_Unload(itr->ref); - } + /* Stop and unload all effects */ + JoystickWImpl_SendForceFeedbackCommand(iface, DISFFC_RESET); /* Enable autocenter. */ event.type = EV_FF;

1 0

Bruno Jesus : dinput/tests: Add tests for DISFFC_STOPALL, DISFFC_RESET and GetEffectStatus.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 5e59d093a2442b37ce0571b1e6a99614ecd4b60c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e59d093a2442b37ce0571b1e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 26 17:07:05 2017 -0200 dinput/tests: Add tests for DISFFC_STOPALL, DISFFC_RESET and GetEffectStatus. Requires a FF-enabled joystick to test. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index fc267a5..b4ffba5 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -739,6 +739,46 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) ok(hr==DI_OK, "IDirectInputDevice_GetProperty() failed: %08x\n", hr); ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not updated: %i\n", dip_gain_get.dwData); + /* Test SendForceFeedbackCommand + * DISFFC_STOPALL - Should stop effects only + * DISFFC_RESET - Should stop effects and unload them (NOT release them) + * Tests for game Odallus (bug 41623) */ + hr = IDirectInputDevice2_SendForceFeedbackCommand((IDirectInputDevice2A*)pJoystick, 0); + ok(hr==DIERR_INVALIDPARAM, "IDirectInputDevice_SendForceFeedbackCommand() failed: %08x\n", hr); + hr = IDirectInputDevice2_SendForceFeedbackCommand((IDirectInputDevice2A*)pJoystick, 0xFF); + ok(hr==DIERR_INVALIDPARAM, "IDirectInputDevice_SendForceFeedbackCommand() failed: %08x\n", hr); + + hr = IDirectInputEffect_Download(effect); + ok(hr==DI_OK,"IDirectInputEffect_Download() failed: %08x\n", hr); + + /* Send STOPALL and prove that the effect can still be started */ + hr = IDirectInputDevice2_SendForceFeedbackCommand((IDirectInputDevice2A*)pJoystick, DISFFC_STOPALL); + ok(hr==DI_OK, "IDirectInputDevice_SendForceFeedbackCommand() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n"); + hr = IDirectInputEffect_Start(effect, 1, 0); + ok(hr==DI_OK,"IDirectInputEffect_Start() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectGuid(effect, &guid); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectGuid() failed: %08x\n", hr); + ok(IsEqualGUID(&effect_data.guid, &guid), "Wrong guid returned\n"); + + /* Send RESET and prove that we can still manipulate the effect, thus not released */ + hr = IDirectInputDevice2_SendForceFeedbackCommand((IDirectInputDevice2A*)pJoystick, DISFFC_RESET); + ok(hr==DI_OK, "IDirectInputDevice_SendForceFeedbackCommand() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DIERR_NOTDOWNLOADED,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + hr = IDirectInputEffect_Download(effect); + ok(hr==DI_OK,"IDirectInputEffect_Download() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n"); + hr = IDirectInputEffect_Start(effect, 1, 0); + ok(hr==DI_OK,"IDirectInputEffect_Start() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectGuid(effect, &guid); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectGuid() failed: %08x\n", hr); + ok(IsEqualGUID(&effect_data.guid, &guid), "Wrong guid returned\n"); + ref = IUnknown_Release(effect); ok(ref == 0, "IDirectInputDevice_Release() reference count = %d\n", ref); }

1 0

Nikolay Sivov : xmllite/reader: Handle NULL argument in GetNodeType().
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 1ed0631e5dccd51a4209442fb4ef370acc8d9be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed0631e5dccd51a4209442fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 11:17:41 2017 +0300 xmllite/reader: Handle NULL argument in GetNodeType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 4 ++++ dlls/xmllite/tests/reader.c | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index de61d13..1bb1cab 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2786,8 +2786,12 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype) static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node_type) { xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)->(%p)\n", This, node_type); + if (!node_type) + return E_INVALIDARG; + *node_type = reader_get_nodetype(This); return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 8e50b13..7144df7 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -427,6 +427,13 @@ static void test_reader_create(void) ok(hr == S_FALSE, "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "got %d\n", nodetype); + /* crashes on XP, 2k3, works on newer versions */ + if (0) + { + hr = IXmlReader_GetNodeType(reader, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + } + resolver = (void*)0xdeadbeef; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR*)&resolver); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Louis Lenders : xmllite/reader: Handle NULL node type argument in Read().
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 33d8a323d01f36785ea3db0f7c95eda5c36bea07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d8a323d01f36785ea3db0f7… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Jan 27 11:17:42 2017 +0300 xmllite/reader: Handle NULL node type argument in Read(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 1bb1cab..1e3c7aa 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2777,7 +2777,8 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype) if (hr == S_OK) { TRACE("node type %s\n", debugstr_nodetype(This->nodetype)); - *nodetype = This->nodetype; + if (nodetype) + *nodetype = This->nodetype; } return hr;

1 0

Nikolay Sivov : xmllite/tests: Test Read() with NULL type argument.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 7e635876f41007aed18fa2c5b297fc9ae1fdd3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e635876f41007aed18fa2c5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 11:17:43 2017 +0300 xmllite/tests: Test Read() with NULL type argument. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7144df7..dc586e8 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1841,8 +1841,7 @@ static void test_read_attribute(void) hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); + hr = IXmlReader_Read(reader, NULL); if (test->hr_broken) ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); @@ -1854,6 +1853,10 @@ static void test_read_attribute(void) WCHAR *str_exp; UINT len; + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "Failed to get node type, %#x\n", hr); + ok(type == XmlNodeType_Element, "got %d for %s\n", type, test->xml); hr = IXmlReader_MoveToFirstAttribute(reader);

1 0