wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

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

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

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

Dmitry Timoshkov : avifil32: AVIFileGetStream should set stream to NULL in case of an error.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 7ee4021694630d7ed1d0cd4d87c2ec79911609ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee4021694630d7ed1d0cd4d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 26 17:32:53 2017 +0100 avifil32: AVIFileGetStream should set stream to NULL in case of an error. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/avifile.c | 1 + dlls/avifil32/tests/api.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index f649d05..7a4caaa 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -316,6 +316,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, IAVIStream **avis, D } /* Sorry, but the specified stream doesn't exist */ + *avis = NULL; return AVIERR_NODATA; } diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index b3d822d..66ba205 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -373,6 +373,11 @@ static void test_default_data(void) res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); ok(res == 0, "Unable to open file: error=%u\n", res); + pStream0 = (void *)0xdeadbeef; + res = AVIFileGetStream(pFile, &pStream0, ~0U, 0); + ok(res == AVIERR_NODATA, "expected AVIERR_NODATA, got %u\n", res); + ok(pStream0 == NULL, "AVIFileGetStream should set stream to NULL\n"); + res = AVIFileGetStream(pFile, &pStream0, 0, 0); ok(res == 0, "Unable to open video stream: error=%u\n", res);

1 0

Nikolay Sivov : windowscodecs/tests: Test to show that SetPalette() does not keep IWICPalette reference, for PNG encoder.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 981b97948ccb1613afd1242f6f0ee50d0d586fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=981b97948ccb1613afd1242f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 09:22:18 2017 +0300 windowscodecs/tests: Test to show that SetPalette() does not keep IWICPalette reference, for PNG encoder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 48 ++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 2af9857..9da82f1 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -25,6 +25,7 @@ #include "windef.h" #include "objbase.h" #include "wincodec.h" +#include "wincodecsdk.h" #include "wine/test.h" typedef struct bitmap_data { @@ -577,6 +578,50 @@ struct setting { void *value; }; +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + +static void test_set_frame_palette(IWICBitmapFrameEncode *frameencode) +{ + IWICComponentFactory *factory; + IWICPalette *palette; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICComponentFactory, (void **)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + + hr = IWICBitmapFrameEncode_SetPalette(frameencode, NULL); + ok(hr == E_INVALIDARG, "SetPalette failed, hr=%x\n", hr); + + hr = IWICComponentFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette failed, hr=%x\n", hr); + + hr = IWICBitmapFrameEncode_SetPalette(frameencode, palette); +todo_wine + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr=%x\n", hr); + + hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedHalftone256, FALSE); + ok(hr == S_OK, "InitializePredefined failed, hr=%x\n", hr); + + EXPECT_REF(palette, 1); + hr = IWICBitmapFrameEncode_SetPalette(frameencode, palette); + ok(hr == S_OK, "SetPalette failed, hr=%x\n", hr); + EXPECT_REF(palette, 1); + + hr = IWICBitmapFrameEncode_SetPalette(frameencode, NULL); + ok(hr == E_INVALIDARG, "SetPalette failed, hr=%x\n", hr); + + IWICPalette_Release(palette); + IWICComponentFactory_Release(factory); +} + static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* clsid_encoder, const struct bitmap_data **dsts, const CLSID *clsid_decoder, WICRect *rc, const struct setting *settings, const char *name) @@ -655,6 +700,9 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); + if (IsEqualGUID(clsid_encoder, &CLSID_WICPngEncoder)) + test_set_frame_palette(frameencode); + hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, rc); if (rc && (rc->Width <= 0 || rc->Height <= 0)) {

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapFrameEncode:: SetPalette in PNG encoder.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 8e694423f4eca7467cc8d7806a1f757c089921aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e694423f4eca7467cc8d7806… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 27 09:22:17 2017 +0300 windowscodecs: Implement IWICBitmapFrameEncode::SetPalette in PNG encoder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 9a84162..990dcf6 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1363,6 +1363,8 @@ typedef struct PngEncoder { BYTE *data; UINT stride; UINT passes; + WICColor palette[256]; + UINT colors; } PngEncoder; static inline PngEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) @@ -1554,10 +1556,24 @@ static HRESULT WINAPI PngFrameEncode_SetColorContexts(IWICBitmapFrameEncode *ifa } static HRESULT WINAPI PngFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; + + TRACE("(%p,%p)\n", iface, palette); + + if (!palette) return E_INVALIDARG; + + EnterCriticalSection(&This->lock); + + if (This->frame_initialized) + hr = IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + else + hr = WINCODEC_ERR_NOTINITIALIZED; + + LeaveCriticalSection(&This->lock); + return hr; } static HRESULT WINAPI PngFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, @@ -2081,6 +2097,7 @@ HRESULT PngEncoder_CreateInstance(REFIID iid, void** ppv) This->frame_committed = FALSE; This->committed = FALSE; This->data = NULL; + This->colors = 0; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PngEncoder.lock");

1 0

André Hentschel : usp10: Fix ScriptRecordDigitSubstitution spec file entry.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 961e1e6857eb750bdc556655b9a930e1b2e6d151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961e1e6857eb750bdc556655b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 26 23:46:48 2017 +0100 usp10: Fix ScriptRecordDigitSubstitution spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 4d99134..3880895 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -22,7 +22,7 @@ @ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) @ stdcall ScriptPlaceOpenType(ptr ptr ptr long long ptr ptr long wstr ptr ptr long ptr ptr long ptr ptr ptr) @ stub ScriptPositionSingleGlyph -@ stdcall ScriptRecordDigitSubstitution(ptr ptr) +@ stdcall ScriptRecordDigitSubstitution(long ptr) @ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall ScriptShapeOpenType(ptr ptr ptr long long ptr ptr long wstr long long ptr ptr ptr ptr ptr) @ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr)

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
50
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 January 2017