wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Dmitry Timoshkov : rsaenh: Avoid double 'va_end(args)' in case of a premature loop termination.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: f7fd2c2be10eee71d037cd038eb2d530d9a8f80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7fd2c2be10eee71d037cd038… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 11:54:07 2017 +0800 rsaenh: Avoid double 'va_end(args)' in case of a premature loop termination. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/mpi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 03e3102..e05fa59 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -2365,11 +2365,8 @@ int mp_init_multi(mp_int *mp, ...) succeeded in init-ing, then return error. */ va_list clean_args; - - /* end the current list */ - va_end(args); - - /* now start cleaning up */ + + /* now start cleaning up */ cur_arg = mp; va_start(clean_args, mp); while (n--) {

1 0

Dmitry Timoshkov : propsys: Add support for VT_LPSTR and VT_LPWSTR to PropVariantCompareEx.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: ff9601147d88b04c99cd99629187d169d2111921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff9601147d88b04c99cd99629… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 11:38:46 2017 +0800 propsys: Add support for VT_LPSTR and VT_LPWSTR to PropVariantCompareEx. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/propsys/tests/propsys.c | 4 ++-- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8a8698f..90e20e3 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -18,8 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #define NONAMELESSUNION @@ -112,6 +116,25 @@ static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, src_signed = FALSE; *res = 0; break; + case VT_LPSTR: + { + char *end; + *res = strtoll(pv->u.pszVal, &end, 0); + if (pv->u.pszVal == end) + return DISP_E_TYPEMISMATCH; + src_signed = *res < 0; + break; + } + case VT_LPWSTR: + case VT_BSTR: + { + WCHAR *end; + *res = strtolW(pv->u.pwszVal, &end, 0); + if (pv->u.pwszVal == end) + return DISP_E_TYPEMISMATCH; + src_signed = *res < 0; + break; + } default: FIXME("unhandled vt %d\n", pv->vt); return E_NOTIMPL; @@ -698,8 +721,19 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 CMP_INT_VALUE(uhVal.QuadPart); break; case VT_BSTR: - /* FIXME: Use string flags. */ - res = lstrcmpW(propvar1->u.bstrVal, propvar2->u.bstrVal); + case VT_LPWSTR: + /* FIXME: Use other string flags. */ + if (flags & (PVCF_USESTRCMPI | PVCF_USESTRCMPIC)) + res = lstrcmpiW(propvar1->u.bstrVal, propvar2_converted->u.bstrVal); + else + res = lstrcmpW(propvar1->u.bstrVal, propvar2_converted->u.bstrVal); + break; + case VT_LPSTR: + /* FIXME: Use other string flags. */ + if (flags & (PVCF_USESTRCMPI | PVCF_USESTRCMPIC)) + res = lstrcmpiA(propvar1->u.pszVal, propvar2_converted->u.pszVal); + else + res = lstrcmpA(propvar1->u.pszVal, propvar2_converted->u.pszVal); break; default: FIXME("vartype %d not handled\n", propvar1->vt); diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 71b6a93..54b45ac 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -735,10 +735,10 @@ static void test_PropVariantCompare(void) ok(res == 0, "res=%i\n", res); res = PropVariantCompareEx(&i2_2, &str_2, 0, 0); - todo_wine ok(res == 0, "res=%i\n", res); + ok(res == 0, "res=%i\n", res); res = PropVariantCompareEx(&i2_2, &str_02, 0, 0); - todo_wine ok(res == 0, "res=%i\n", res); + ok(res == 0, "res=%i\n", res); res = PropVariantCompareEx(&str_2, &i2_2, 0, 0); todo_wine ok(res == 0, "res=%i\n", res);

1 0

Paul Gofman : d3dx9/tests: Modify transpose boolean matrix test to reproduce the case of incomplete last row.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 5cbc84e51eca1a8ce35916ddeebe79b4ccbd761d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbc84e51eca1a8ce35916dde… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jun 19 12:24:22 2017 +0300 d3dx9/tests: Modify transpose boolean matrix test to reproduce the case of incomplete last row. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index d75c5ce..2a78074 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3230,7 +3230,7 @@ PS_OUTPUT RenderScenePS( VS_OUTPUT In, uniform bool2x3 mb) Output.RGBColor.xy += mul(Output.RGBColor, m3x2column); Output.RGBColor.xy += mul(Output.RGBColor, m3x2row); } - if (mb2x3column[0][1]) + if (mb2x3column[0][0]) { Output.RGBColor += sin(Output.RGBColor); Output.RGBColor += cos(Output.RGBColor); @@ -3486,7 +3486,7 @@ static const DWORD test_effect_preshader_effect_blob[] = 0x00000002, 0x00000118, 0x00000128, 0x00000148, 0x00060002, 0x00000002, 0x00000150, 0x00000160, 0x00000180, 0x00000002, 0x00000003, 0x0000018c, 0x0000019c, 0x000001cc, 0x000a0002, 0x00000002, 0x000001d4, 0x000001e4, 0x00000204, 0x000c0002, 0x00000002, 0x00000210, 0x00000220, 0x00000240, - 0x00030002, 0x00000003, 0x00000248, 0x00000258, 0x00000288, 0x00050000, 0x00000002, 0x00000294, + 0x00030002, 0x00000003, 0x00000248, 0x00000258, 0x00000288, 0x00050000, 0x00000001, 0x00000294, 0x000002a4, 0x000002bc, 0x00000000, 0x00000005, 0x000002c8, 0x000002a4, 0x000002d8, 0x00000003, 0x00000001, 0x000002e4, 0x00000000, 0x56695f67, 0x00746365, 0x00020001, 0x00040001, 0x00000001, 0x00000000, 0x00000004, 0x00000003, 0x00000002, 0x00000001, 0x3278326d, 0x756c6f63, 0xab006e6d, @@ -3543,7 +3543,7 @@ static const DWORD test_effect_preshader_effect_blob[] = 0x80e40003, 0xa0e4000d, 0x03000002, 0x80030000, 0x80e40000, 0x80e40003, 0x03000005, 0x800c0000, 0x80550000, 0xa0440004, 0x04000004, 0x800c0000, 0x80000000, 0xa0440003, 0x80e40000, 0x04000004, 0x800c0000, 0x80aa0003, 0xa0440005, 0x80e40000, 0x03000002, 0x80030003, 0x80ee0000, 0x80e40000, - 0x0000002a, 0x02000001, 0x80080003, 0x90ff0001, 0x0000002b, 0x01000028, 0xe0e40806, 0x04000004, + 0x0000002a, 0x02000001, 0x80080003, 0x90ff0001, 0x0000002b, 0x01000028, 0xe0e40805, 0x04000004, 0x800f0000, 0x80e40003, 0xa0550010, 0xa0aa0010, 0x02000013, 0x800f0000, 0x80e40000, 0x04000004, 0x800f0000, 0x80e40000, 0xa000000f, 0xa055000f, 0x03000005, 0x800f0000, 0x80e40000, 0x80e40000, 0x04000004, 0x800f0002, 0x80e40000, 0xa0aa000f, 0xa0ff000f, 0x04000004, 0x800f0002, 0x80e40000, @@ -4317,7 +4317,7 @@ got (%g, %g, %g, %g), parameter %s.\n", static const BOOL test_effect_preshader_bconsts[] = { - TRUE, FALSE, TRUE, FALSE, TRUE, TRUE, FALSE + TRUE, FALSE, TRUE, FALSE, TRUE, TRUE }; static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) @@ -6057,7 +6057,7 @@ static void test_effect_state_manager(IDirect3DDevice9 *device) {14, 0, 0}, {15, 0, 14}, {16, 0, 1}, - {17, 0, 7}, + {17, 0, 6}, }; static D3DLIGHT9 light_filler = {D3DLIGHT_DIRECTIONAL, {0.5f, 0.5f, 0.5f, 0.5f}, {0.5f, 0.5f, 0.5f, 0.5f}, {0.5f, 0.5f, 0.5f, 0.5f}};

1 0

Matteo Bruni : d3dx9: Make the assert() in regstore_set_values() a bit more strict.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: bd7a12b23c51f19ee67beefa2512e4516d1a9850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7a12b23c51f19ee67beefa2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 21 21:54:21 2017 +0200 d3dx9: Make the assert() in regstore_set_values() a bit more strict. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 2785ca3..7ca0c8f 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -372,14 +372,17 @@ static void regstore_set_modified(struct d3dx_regstore *rs, unsigned int table, static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, const void *data, unsigned int start_offset, unsigned int count) { - void *out; + BYTE *dst = rs->tables[table]; + const BYTE *src = data; + unsigned int size; if (!count) return; - out = (BYTE *)rs->tables[table] + start_offset * table_info[table].component_size; - assert(data != out); - memcpy(out, data, count * table_info[table].component_size); + dst += start_offset * table_info[table].component_size; + size = count * table_info[table].component_size; + assert((src < dst && size <= dst - src) || (src > dst && size <= src - dst)); + memcpy(dst, src, size); regstore_set_modified(rs, table, start_offset, count); }

1 0

Austin English : ntoskrnl.exe: Add KeReleaseSpinLock stub.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 362ceb2e5625c2a2162c6c5b432a36fc45b7ca1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=362ceb2e5625c2a2162c6c5b4… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 21 13:29:37 2017 -0500 ntoskrnl.exe: Add KeReleaseSpinLock stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 414e49b..ae706e0 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -76,7 +76,7 @@ @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel @ stub KeRaiseIrqlToSynchLevel -@ stub KeReleaseSpinLock +@ stdcall KeReleaseSpinLock(ptr long) ntoskrnl.exe.KeReleaseSpinLock @ stub KeStallExecutionProcessor @ stub READ_PORT_BUFFER_UCHAR @ stub READ_PORT_BUFFER_ULONG diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6287967..105bb7d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3251,3 +3251,11 @@ KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK *spinlock) FIXME( "stub: %p\n", spinlock ); return 0; } + +/*********************************************************************** + * KeReleaseSpinLock (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeReleaseSpinLock( KSPIN_LOCK *spinlock, KIRQL irql ) +{ + FIXME( "stub: %p %u\n", spinlock, irql ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index aba5cb5..339e7c5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -592,6 +592,7 @@ @ stub KeReleaseMutant @ stdcall KeReleaseMutex(ptr long) @ stdcall KeReleaseSemaphore(ptr long long long) +@ stdcall KeReleaseSpinLock(ptr long) @ stub KeReleaseSpinLockFromDpcLevel @ stub KeRemoveByKeyDeviceQueue @ stub KeRemoveByKeyDeviceQueueIfBusy

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICMetadataQueryReader:: GetContainerFormat.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: f25890357b8d897f67ceae7a43419f1a1c44c171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25890357b8d897f67ceae7a4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:22 2017 +0800 windowscodecs: Implement IWICMetadataQueryReader::GetContainerFormat. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 8e58684..29df42e 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -89,12 +89,13 @@ static ULONG WINAPI mqr_Release(IWICMetadataQueryReader *iface) return ref; } -static HRESULT WINAPI mqr_GetContainerFormat(IWICMetadataQueryReader *iface, - GUID *pguidContainerFormat) +static HRESULT WINAPI mqr_GetContainerFormat(IWICMetadataQueryReader *iface, GUID *format) { QueryReader *This = impl_from_IWICMetadataQueryReader(iface); - FIXME("(%p,%p)\n", This, pguidContainerFormat); - return E_NOTIMPL; + + TRACE("(%p,%p)\n", This, format); + + return IWICMetadataBlockReader_GetContainerFormat(This->block, format); } static HRESULT WINAPI mqr_GetLocation(IWICMetadataQueryReader *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement WICMapSchemaToName.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 714175e1448c5b615b1658275c86296445e6c0b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=714175e1448c5b615b1658275… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:18 2017 +0800 windowscodecs: Implement WICMapSchemaToName. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 127 ++++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 196 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- include/wincodec.idl | 1 + 4 files changed, 325 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=714175e1448c5b615b165…

1 0

Dmitry Timoshkov : windowscodecs: Implement WICMapShortNameToGuid.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: e1eed88401befee456852b6df3f213123c79c2bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1eed88401befee456852b6df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:15 2017 +0800 windowscodecs: Implement WICMapShortNameToGuid. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 20 +++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 36 +++++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- include/wincodec.idl | 1 + 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 6d8efa0..a7eedc0 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -277,3 +277,23 @@ HRESULT WINAPI WICMapGuidToShortName(REFGUID guid, UINT len, WCHAR *name, UINT * return WINCODEC_ERR_PROPERTYNOTFOUND; } + +HRESULT WINAPI WICMapShortNameToGuid(PCWSTR name, GUID *guid) +{ + UINT i; + + TRACE("%s,%p\n", debugstr_w(name), guid); + + if (!name || !guid) return E_INVALIDARG; + + for (i = 0; i < sizeof(guid2name)/sizeof(guid2name[0]); i++) + { + if (!lstrcmpiW(name, guid2name[i].name)) + { + *guid = *guid2name[i].guid; + return S_OK; + } + } + + return WINCODEC_ERR_PROPERTYNOTFOUND; +} diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 4e9d691..f70ddad 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -2017,11 +2017,47 @@ static void test_WICMapGuidToShortName(void) ok(hr == E_INVALIDARG, "got %#x\n", hr); } +static void test_WICMapShortNameToGuid(void) +{ + static const WCHAR unkW[] = { 'u','n','k',0 }; + static const WCHAR xmpW[] = { 'x','m','p',0 }; + static const WCHAR XmPW[] = { 'X','m','P',0 }; + static const WCHAR unknownW[] = { 'u','n','k','n','o','w','n',0 }; + HRESULT hr; + GUID guid; + + hr = WICMapShortNameToGuid(NULL, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + hr = WICMapShortNameToGuid(NULL, &guid); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + hr = WICMapShortNameToGuid(unknownW, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + hr = WICMapShortNameToGuid(unkW, &guid); + ok(hr == WINCODEC_ERR_PROPERTYNOTFOUND, "got %#x\n", hr); + + hr = WICMapShortNameToGuid(unknownW, &guid); + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&guid, &GUID_MetadataFormatUnknown), "got %s\n", wine_dbgstr_guid(&guid)); + + hr = WICMapShortNameToGuid(xmpW, &guid); + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&guid, &GUID_MetadataFormatXMP), "got %s\n", wine_dbgstr_guid(&guid)); + + guid = GUID_NULL; + hr = WICMapShortNameToGuid(XmPW, &guid); + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&guid, &GUID_MetadataFormatXMP), "got %s\n", wine_dbgstr_guid(&guid)); +} + START_TEST(metadata) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_WICMapGuidToShortName(); + test_WICMapShortNameToGuid(); test_metadata_unknown(); test_metadata_tEXt(); test_metadata_gAMA(); diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 0972aed..ace3b33 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -111,7 +111,7 @@ @ stub WICGetMetadataContentSize @ stdcall WICMapGuidToShortName(ptr long ptr ptr) @ stub WICMapSchemaToName -@ stub WICMapShortNameToGuid +@ stdcall WICMapShortNameToGuid(wstr ptr) @ stub WICMatchMetadataContent @ stub WICSerializeMetadataContent @ stdcall WICSetEncoderFormat_Proxy(ptr ptr ptr ptr) diff --git a/include/wincodec.idl b/include/wincodec.idl index 5c46aed..55f22d5 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -1052,6 +1052,7 @@ interface IWICEnumMetadataItem : IUnknown cpp_quote("HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst);") cpp_quote("HRESULT WINAPI WICMapGuidToShortName(REFGUID,UINT,WCHAR *,UINT *);") +cpp_quote("HRESULT WINAPI WICMapShortNameToGuid(PCWSTR,GUID *);") cpp_quote("DEFINE_GUID(CLSID_WICBmpDecoder, 0x6b462062,0x7cbf,0x400d,0x9f,0xdb,0x81,0x3d,0xd1,0x0f,0x27,0x78);") cpp_quote("DEFINE_GUID(CLSID_WICPngDecoder, 0x389ea17b,0x5078,0x4cde,0xb6,0xef,0x25,0xc1,0x51,0x75,0xc7,0x51);")

1 0

Dmitry Timoshkov : windowscodecs: Implement WICMapGuidToShortName.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 37ae4f24c05dac31523e770e58aff749ecbec2c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ae4f24c05dac31523e770e5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:10 2017 +0800 windowscodecs: Implement WICMapGuidToShortName. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 129 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 60 +++++++++++++++- dlls/windowscodecs/windowscodecs.spec | 2 +- include/wincodec.idl | 2 + include/wincodecsdk.idl | 23 ++++++ 5 files changed, 214 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37ae4f24c05dac31523e7…

1 0

Ken Thomases : winemac: Break out of the window-dragging message loop if the window is hidden or destroyed.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 6250eb54fe7d6d8091768cab535b46493c78da6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6250eb54fe7d6d8091768cab5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 21 10:15:50 2017 -0500 winemac: Break out of the window-dragging message loop if the window is hidden or destroyed. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 12 +++++++++++ dlls/winemac.drv/cocoa_window.m | 3 +++ dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/window.c | 45 +++++++++++++++++++++++++---------------- 5 files changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index e76a47c..c88b894 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -121,6 +121,7 @@ enum { - (void) noteKey:(uint16_t)keyCode pressed:(BOOL)pressed; - (void) window:(WineWindow*)window isBeingDragged:(BOOL)dragged; + - (void) windowWillOrderOut:(WineWindow*)window; - (void) flipRect:(NSRect*)rect; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 77be095..2cf67f1 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1553,6 +1553,18 @@ static NSString* WineLocalizedString(unsigned int stringID) [self updateCursorClippingState]; } + - (void) windowWillOrderOut:(WineWindow*)window + { + if ([windowsBeingDragged containsObject:window]) + { + [self window:window isBeingDragged:NO]; + + macdrv_event* event = macdrv_create_event(WINDOW_DRAG_END, window); + [window.queue postEvent:event]; + macdrv_release_event(event); + } + } + - (void) handleMouseMove:(NSEvent*)anEvent { WineWindow* targetWindow; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 2333c1f..65dc392 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1653,6 +1653,9 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi BOOL wasVisible = [self isVisible]; BOOL wasOnActiveSpace = [self isOnActiveSpace]; + [self endWindowDragging]; + [controller windowWillOrderOut:self]; + if (enteringFullScreen || exitingFullScreen) { pendingOrderOut = TRUE; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 53dcd87..bb0e8ed 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -136,13 +136,13 @@ struct macdrv_win_data RECT client_rect; /* client area relative to parent */ int pixel_format; /* pixel format for GL */ COLORREF color_key; /* color key for layered window; CLR_INVALID is not color keyed */ + HANDLE drag_event; /* event to signal that Cocoa-driven window dragging has ended */ unsigned int on_screen : 1; /* is window ordered in? (minimized or not) */ unsigned int shaped : 1; /* is window using a custom region shape? */ unsigned int layered : 1; /* is window layered and with valid attributes? */ unsigned int ulw_layered : 1; /* has UpdateLayeredWindow() been called for window? */ unsigned int per_pixel_alpha : 1; /* is window using per-pixel alpha? */ unsigned int minimized : 1; /* is window minimized? */ - unsigned int being_dragged : 1; /* is window being dragged under Cocoa's control? */ unsigned int swap_interval : 1; /* GL swap interval for window */ struct window_surface *surface; struct window_surface *unminimized_surface; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e2de40d..bdd623d 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1573,6 +1573,7 @@ void CDECL macdrv_DestroyWindow(HWND hwnd) if (!(data = get_win_data(hwnd))) return; if (hwnd == GetCapture()) macdrv_SetCapture(0, 0); + if (data->drag_event) SetEvent(data->drag_event); destroy_cocoa_window(data); destroy_cocoa_view(data); @@ -2268,7 +2269,7 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) TRACE("%p resizing from (%dx%d) to (%dx%d)\n", hwnd, data->window_rect.right - data->window_rect.left, data->window_rect.bottom - data->window_rect.top, width, height); - being_dragged = data->being_dragged; + being_dragged = data->drag_event != NULL; release_win_data(data); if (event->window_frame_changed.fullscreen) @@ -2486,6 +2487,8 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) { DWORD style = GetWindowLongW(hwnd, GWL_STYLE); struct macdrv_win_data *data; + HANDLE drag_event = NULL; + BOOL loop = TRUE; MSG msg; TRACE("win %p\n", hwnd); @@ -2494,9 +2497,12 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) if (!(style & WS_VISIBLE)) return; if (!(data = get_win_data(hwnd))) return; - if (data->being_dragged) goto done; + if (data->drag_event) goto done; - data->being_dragged = TRUE; + drag_event = CreateEventW(NULL, TRUE, FALSE, NULL); + if (!drag_event) goto done; + + data->drag_event = drag_event; release_win_data(data); if (!event->window_drag_begin.no_activate && can_activate_window(hwnd) && GetForegroundWindow() != hwnd) @@ -2515,13 +2521,22 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); ReleaseCapture(); - while (GetMessageW(&msg, 0, 0, 0)) + while (loop) { - if (msg.message == WM_EXITSIZEMOVE) + while (!PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) { - SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); - break; + DWORD result = MsgWaitForMultipleObjectsEx(1, &drag_event, INFINITE, QS_ALLINPUT, MWMO_INPUTAVAILABLE); + if (result == WAIT_OBJECT_0) + { + loop = FALSE; + break; + } } + if (!loop) + break; + + if (msg.message == WM_QUIT) + break; if (!CallMsgFilterW(&msg, MSGF_SIZE) && msg.message != WM_KEYDOWN && msg.message != WM_MOUSEMOVE && msg.message != WM_LBUTTONDOWN && msg.message != WM_LBUTTONUP) @@ -2531,13 +2546,16 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) } } + SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); + TRACE("done\n"); if ((data = get_win_data(hwnd))) - data->being_dragged = FALSE; + data->drag_event = NULL; done: release_win_data(data); + if (drag_event) CloseHandle(drag_event); } @@ -2549,20 +2567,13 @@ done: void macdrv_window_drag_end(HWND hwnd) { struct macdrv_win_data *data; - BOOL being_dragged; TRACE("win %p\n", hwnd); if (!(data = get_win_data(hwnd))) return; - being_dragged = data->being_dragged; + if (data->drag_event) + SetEvent(data->drag_event); release_win_data(data); - - if (being_dragged) - { - /* Post this rather than sending it, so that the message loop in - macdrv_window_drag_begin() will see it. */ - PostMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); - } }

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
60
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 June 2017