January 2020 - Wine-Commits

Nikolay Sivov : ole32: Add support for non-default counter for anti moniker.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: b9ce037abb6e1c19389be6e7069d96b32702ba1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9ce037abb6e1c19389be6e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 24 12:21:28 2020 +0300 ole32: Add support for non-default counter for anti moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 66 ++++++++++++++++++++++++++++------------------ dlls/ole32/tests/moniker.c | 10 ------- 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index f7912fad78..bff6500fa5 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -40,6 +40,7 @@ typedef struct AntiMonikerImpl{ IROTData IROTData_iface; LONG ref; IUnknown *pMarshal; /* custom marshaler */ + DWORD count; } AntiMonikerImpl; static inline AntiMonikerImpl *impl_from_IMoniker(IMoniker *iface) @@ -168,30 +169,35 @@ AntiMonikerImpl_IsDirty(IMoniker* iface) /****************************************************************************** * AntiMoniker_Load ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_Load(IMoniker* iface,IStream* pStm) +static HRESULT WINAPI AntiMonikerImpl_Load(IMoniker *iface, IStream *stream) { - DWORD constant=1,dwbuffer; - HRESULT res; + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + DWORD count = 0; + HRESULT hr; + + TRACE("%p, %p.\n", iface, stream); - /* data read by this function is only a DWORD constant (must be 1) ! */ - res=IStream_Read(pStm,&dwbuffer,sizeof(DWORD),NULL); + if (FAILED(hr = IStream_Read(stream, &count, sizeof(count), NULL))) + return hr; + + if (count > 0xfffff) + return E_INVALIDARG; - if (SUCCEEDED(res)&& dwbuffer!=constant) - return E_FAIL; + moniker->count = count; - return res; + return S_OK; } /****************************************************************************** * AntiMoniker_Save ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDirty) +static HRESULT WINAPI AntiMonikerImpl_Save(IMoniker *iface, IStream *stream, BOOL clear_dirty) { - static const DWORD constant = 1; - /* data written by this function is only a DWORD constant set to 1 ! */ - return IStream_Write(pStm,&constant,sizeof(constant),NULL); + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + + TRACE("%p, %p, %d.\n", iface, stream, clear_dirty); + + return IStream_Write(stream, &moniker->count, sizeof(moniker->count), NULL); } /****************************************************************************** @@ -323,12 +329,16 @@ AntiMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) /****************************************************************************** * AntiMoniker_Hash ******************************************************************************/ -static HRESULT WINAPI AntiMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) +static HRESULT WINAPI AntiMonikerImpl_Hash(IMoniker *iface, DWORD *hash) { - if (pdwHash==NULL) + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + + TRACE("%p, %p.\n", iface, hash); + + if (!hash) return E_POINTER; - *pdwHash = 0x80000001; + *hash = 0x80000000 | moniker->count; return S_OK; } @@ -434,14 +444,16 @@ AntiMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppm * AntiMoniker_GetDisplayName ******************************************************************************/ static HRESULT WINAPI -AntiMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, - IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName) +AntiMonikerImpl_GetDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *displayname) { - static const WCHAR back[]={'\\','.','.',0}; + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + static const WCHAR nameW[] = {'\\','.','.'}; + WCHAR *ptrW; + int i; - TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName); + TRACE("%p, %p, %p, %p.\n", iface, pbc, pmkToLeft, displayname); - if (ppszDisplayName==NULL) + if (!displayname) return E_POINTER; if (pmkToLeft!=NULL){ @@ -449,12 +461,13 @@ AntiMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, return E_NOTIMPL; } - *ppszDisplayName=CoTaskMemAlloc(sizeof(back)); - - if (*ppszDisplayName==NULL) + *displayname = ptrW = CoTaskMemAlloc((moniker->count * ARRAY_SIZE(nameW) + 1) * sizeof(WCHAR)); + if (!*displayname) return E_OUTOFMEMORY; - lstrcpyW(*ppszDisplayName,back); + for (i = 0; i < moniker->count; ++i) + memcpy(ptrW + i * ARRAY_SIZE(nameW), nameW, sizeof(nameW)); + ptrW[moniker->count * ARRAY_SIZE(nameW)] = 0; return S_OK; } @@ -598,6 +611,7 @@ static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This) This->IROTData_iface.lpVtbl = &VT_ROTDataImpl; This->ref = 0; This->pMarshal = NULL; + This->count = 1; return S_OK; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index e0e3020234..dff6cbbe57 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2328,7 +2328,6 @@ todo_wine stream_write_dword(stream, 2); hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, moniker2); @@ -2341,13 +2340,11 @@ todo_wine hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x80000002, "Unexpected hash value %#x.\n", hash); /* Display name reflects anti combination. */ hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &name); ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(name, L"\\..\\.."), "Unexpected display name %s.\n", wine_dbgstr_w(name)); CoTaskMemFree(name); @@ -2355,30 +2352,25 @@ todo_wine stream_write_dword(stream, 0xfffff); hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x800fffff, "Unexpected hash value %#x.\n", hash); stream_write_dword(stream, 0xfffff + 1); hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x800fffff, "Unexpected hash value %#x.\n", hash); /* Zero combining counter is also valid. */ stream_write_dword(stream, 0); hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, moniker2); @@ -2391,12 +2383,10 @@ todo_wine hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x80000000, "Unexpected hash value %#x.\n", hash); hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &name); ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(name, L""), "Unexpected display name %s.\n", wine_dbgstr_w(name)); CoTaskMemFree(name);

1 0

Nikolay Sivov : dwrite: Implement GetInformationalStrings() for fontfaces.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 6b0e68f2fadd6ff8f7dc4bd88d80481f0aee5a3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b0e68f2fadd6ff8f7dc4bd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 24 11:17:37 2020 +0300 dwrite: Implement GetInformationalStrings() for fontfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 95 +++++++++++++++++++++++++++++--------------- dlls/dwrite/tests/font.c | 20 ++++++++++ 3 files changed, 83 insertions(+), 33 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index c70326c865..eea3cbabbe 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -231,6 +231,7 @@ struct dwrite_fontface FONTSIGNATURE fontsig; UINT32 glyph_image_formats; + IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME+1]; IDWriteLocalizedStrings *family_names; IDWriteLocalizedStrings *names; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a81433b242..2732693b4c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -431,7 +431,8 @@ static void release_font_data(struct dwrite_font_data *data) if (InterlockedDecrement(&data->ref) > 0) return; - for (i = DWRITE_INFORMATIONAL_STRING_NONE; i < ARRAY_SIZE(data->info_strings); i++) { + for (i = 0; i < ARRAY_SIZE(data->info_strings); ++i) + { if (data->info_strings[i]) IDWriteLocalizedStrings_Release(data->info_strings[i]); } @@ -547,6 +548,11 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) IDWriteLocalizedStrings_Release(fontface->names); if (fontface->family_names) IDWriteLocalizedStrings_Release(fontface->family_names); + for (i = 0; i < ARRAY_SIZE(fontface->info_strings); ++i) + { + if (fontface->info_strings[i]) + IDWriteLocalizedStrings_Release(fontface->info_strings[i]); + } for (i = 0; i < ARRAY_SIZE(fontface->glyphs); i++) heap_free(fontface->glyphs[i]); @@ -1276,12 +1282,53 @@ static HRESULT WINAPI dwritefontface3_GetFaceNames(IDWriteFontFace5 *iface, IDWr return clone_localizedstrings(fontface->names, names); } +static HRESULT get_font_info_strings(const struct file_stream_desc *stream_desc, IDWriteFontFile *file, + DWRITE_INFORMATIONAL_STRING_ID stringid, IDWriteLocalizedStrings **strings_cache, + IDWriteLocalizedStrings **ret, BOOL *exists) +{ + HRESULT hr = S_OK; + + *exists = FALSE; + *ret = NULL; + + if (stringid > DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME || stringid == DWRITE_INFORMATIONAL_STRING_NONE) + return S_OK; + + if (!strings_cache[stringid]) + { + struct file_stream_desc desc = *stream_desc; + + if (!desc.stream) + hr = get_filestream_from_file(file, &desc.stream); + if (SUCCEEDED(hr)) + hr = opentype_get_font_info_strings(&desc, stringid, &strings_cache[stringid]); + + if (!stream_desc->stream && desc.stream) + IDWriteFontFileStream_Release(desc.stream); + } + + if (SUCCEEDED(hr) && strings_cache[stringid]) + { + hr = clone_localizedstrings(strings_cache[stringid], ret); + if (SUCCEEDED(hr)) + *exists = TRUE; + } + + return hr; +} + static HRESULT WINAPI dwritefontface3_GetInformationalStrings(IDWriteFontFace5 *iface, DWRITE_INFORMATIONAL_STRING_ID stringid, IDWriteLocalizedStrings **strings, BOOL *exists) { - FIXME("%p, %u, %p, %p: stub\n", iface, stringid, strings, exists); + struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); + struct file_stream_desc stream_desc; - return E_NOTIMPL; + TRACE("%p, %u, %p, %p.\n", iface, stringid, strings, exists); + + stream_desc.stream = fontface->stream; + stream_desc.face_index = fontface->index; + stream_desc.face_type = fontface->type; + return get_font_info_strings(&stream_desc, NULL, stringid, fontface->info_strings, strings, exists); } static BOOL WINAPI dwritefontface3_HasCharacter(IDWriteFontFace5 *iface, UINT32 ch) @@ -1640,39 +1687,15 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont3 *iface, { struct dwrite_font *font = impl_from_IDWriteFont3(iface); struct dwrite_font_data *data = font->data; - HRESULT hr = S_OK; + struct file_stream_desc stream_desc; TRACE("%p, %d, %p, %p.\n", iface, stringid, strings, exists); - *exists = FALSE; - *strings = NULL; - - if (stringid > DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME || stringid == DWRITE_INFORMATIONAL_STRING_NONE) - return S_OK; - - if (!data->info_strings[stringid]) - { - struct file_stream_desc stream_desc; - - if (SUCCEEDED(hr = get_filestream_from_file(data->file, &stream_desc.stream))) - { - stream_desc.face_type = data->face_type; - stream_desc.face_index = data->face_index; - - hr = opentype_get_font_info_strings(&stream_desc, stringid, &data->info_strings[stringid]); - - IDWriteFontFileStream_Release(stream_desc.stream); - } - } - - if (SUCCEEDED(hr) && data->info_strings[stringid]) - { - hr = clone_localizedstrings(data->info_strings[stringid], strings); - if (SUCCEEDED(hr)) - *exists = TRUE; - } - - return hr; + /* Stream will be created if necessary. */ + stream_desc.stream = NULL; + stream_desc.face_index = data->face_index; + stream_desc.face_type = data->face_type; + return get_font_info_strings(&stream_desc, data->file, stringid, data->info_strings, strings, exists); } static DWRITE_FONT_SIMULATIONS WINAPI dwritefont_GetSimulations(IDWriteFont3 *iface) @@ -4709,6 +4732,12 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->family_names = font_data->family_names; if (fontface->family_names) IDWriteLocalizedStrings_AddRef(fontface->family_names); + memcpy(fontface->info_strings, font_data->info_strings, sizeof(fontface->info_strings)); + for (i = 0; i < ARRAY_SIZE(fontface->info_strings); ++i) + { + if (fontface->info_strings[i]) + IDWriteLocalizedStrings_AddRef(fontface->info_strings[i]); + } release_font_data(font_data); fontface->cached = factory_cache_fontface(fontface->factory, cached_list, &fontface->IDWriteFontFace5_iface); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index cb5f7631f5..19c6928dd7 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4026,6 +4026,8 @@ static void test_GetInformationalStrings(void) { IDWriteLocalizedStrings *strings, *strings2; IDWriteFontCollection *collection; + IDWriteFontFace3 *fontface3; + IDWriteFontFace *fontface; IDWriteFontFamily *family; IDWriteFactory *factory; IDWriteFont *font; @@ -4072,6 +4074,24 @@ static void test_GetInformationalStrings(void) IDWriteLocalizedStrings_Release(strings); IDWriteLocalizedStrings_Release(strings2); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + + if (SUCCEEDED(hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace3, (void **)&fontface3))) + { + hr = IDWriteFontFace3_GetInformationalStrings(fontface3, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, + &strings, &exists); + ok(hr == S_OK, "Failed to get info strings, hr %#x.\n", hr); + IDWriteLocalizedStrings_Release(strings); + + IDWriteFontFace3_Release(fontface3); + } + else + win_skip("IDWriteFontFace3::GetInformationalStrings() is not supported.\n"); + + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); IDWriteFontFamily_Release(family); IDWriteFontCollection_Release(collection);

1 0

Nikolay Sivov : ole32: Fix CommonPrefixWith() for antimoniker, when other is also antimoniker.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: cdf51b39228f5c2da0ab8663d72101cf66622a79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf51b39228f5c2da0ab8663… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 24 12:21:31 2020 +0300 ole32: Fix CommonPrefixWith() for antimoniker, when other is also antimoniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 37 +++++++++++++++----------- dlls/ole32/tests/moniker.c | 66 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 86 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index ff2e287070..5bce4fc5da 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -400,25 +400,32 @@ AntiMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) /****************************************************************************** * AntiMoniker_CommonPrefixWith ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) +static HRESULT WINAPI AntiMonikerImpl_CommonPrefixWith(IMoniker *iface, IMoniker *other, IMoniker **prefix) { - DWORD mkSys; - - IMoniker_IsSystemMoniker(pmkOther,&mkSys); - - if(mkSys==MKSYS_ANTIMONIKER){ - - IMoniker_AddRef(iface); - - *ppmkPrefix=iface; + AntiMonikerImpl *moniker = impl_from_IMoniker(iface), *other_moniker; + HRESULT hr; - IMoniker_AddRef(iface); + TRACE("%p, %p, %p.\n", iface, other, prefix); - return MK_S_US; + other_moniker = unsafe_impl_from_IMoniker(other); + if (other_moniker) + { + if (moniker->count <= other_moniker->count) + { + *prefix = iface; + hr = moniker->count == other_moniker->count ? MK_S_US : MK_S_ME; + } + else + { + *prefix = other; + hr = MK_S_HIM; + } + + IMoniker_AddRef(*prefix); + return hr; } - else - return MonikerCommonPrefixWith(iface,pmkOther,ppmkPrefix); + + return MonikerCommonPrefixWith(iface, other, prefix); } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 5fff7041ef..8c533d1ff7 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2430,8 +2430,6 @@ todo_wine hr = IMoniker_IsEqual(moniker, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - IStream_Release(stream); - /* Reduce() */ hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); @@ -2453,6 +2451,70 @@ todo_wine todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + /* CommonPrefixWith() */ + stream_write_dword(stream, 0); + + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); + ok(hr == MK_S_ME, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + hr = IMoniker_CommonPrefixWith(moniker2, moniker, &moniker3); + ok(hr == MK_S_HIM, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + stream_write_dword(stream, 10); + + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + stream_write_dword(stream, 5); + + hr = IMoniker_Load(moniker2, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); + ok(hr == MK_S_HIM, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker2, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + hr = IMoniker_CommonPrefixWith(moniker2, moniker, &moniker3); + ok(hr == MK_S_ME, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker2, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + /* Now same length, 0 or 2 */ + stream_write_dword(stream, 0); + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + stream_write_dword(stream, 0); + hr = IMoniker_Load(moniker2, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + stream_write_dword(stream, 2); + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + stream_write_dword(stream, 2); + hr = IMoniker_Load(moniker2, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + IStream_Release(stream); IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2);

1 0

Nikolay Sivov : ole32: Fix comparison data for antimoniker.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 31f5f9da801c7c04dfff67e832f9eea5d1051a38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31f5f9da801c7c04dfff67e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 24 12:21:30 2020 +0300 ole32: Fix comparison data for antimoniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 15 +++++++-------- dlls/ole32/tests/moniker.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 9b02129021..ff2e287070 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -540,19 +540,18 @@ static ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface) * AntiMonikerIROTData_GetComparisonData ******************************************************************************/ static HRESULT WINAPI -AntiMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData, - ULONG cbMax, ULONG* pcbData) +AntiMonikerROTDataImpl_GetComparisonData(IROTData *iface, BYTE *data, ULONG data_len, ULONG *data_req) { - DWORD constant = 1; + AntiMonikerImpl *moniker = impl_from_IROTData(iface); - TRACE("(%p, %u, %p)\n", pbData, cbMax, pcbData); + TRACE("%p, %p, %u, %p.\n", iface, data, data_len, data_req); - *pcbData = sizeof(CLSID) + sizeof(DWORD); - if (cbMax < *pcbData) + *data_req = sizeof(CLSID) + sizeof(DWORD); + if (data_len < *data_req) return E_OUTOFMEMORY; - memcpy(pbData, &CLSID_AntiMoniker, sizeof(CLSID)); - memcpy(pbData+sizeof(CLSID), &constant, sizeof(DWORD)); + memcpy(data, &CLSID_AntiMoniker, sizeof(CLSID)); + memcpy(data + sizeof(CLSID), &moniker->count, sizeof(moniker->count)); return S_OK; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 65cd279b1a..5fff7041ef 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1412,11 +1412,27 @@ static const BYTE expected_anti_moniker_marshal_data[] = 0x01,0x00,0x00,0x00, }; +static const BYTE expected_anti_moniker_marshal_data2[] = +{ + 0x4d,0x45,0x4f,0x57,0x04,0x00,0x00,0x00, + 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x05,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x00,0x00,0x00,0x00,0x14,0x00,0x00,0x00, + 0x02,0x00,0x00,0x00, +}; + static const BYTE expected_anti_moniker_saved_data[] = { 0x01,0x00,0x00,0x00, }; +static const BYTE expected_anti_moniker_saved_data2[] = +{ + 0x02,0x00,0x00,0x00, +}; + static const BYTE expected_anti_moniker_comparison_data[] = { 0x05,0x03,0x00,0x00,0x00,0x00,0x00,0x00, @@ -1424,6 +1440,13 @@ static const BYTE expected_anti_moniker_comparison_data[] = 0x01,0x00,0x00,0x00, }; +static const BYTE expected_anti_moniker_comparison_data2[] = +{ + 0x05,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x02,0x00,0x00,0x00, +}; + static const BYTE expected_gc_moniker_marshal_data[] = { 0x4d,0x45,0x4f,0x57,0x04,0x00,0x00,0x00, @@ -2330,6 +2353,12 @@ todo_wine hr = IMoniker_Load(moniker, stream); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + test_moniker("anti moniker 2", moniker, + expected_anti_moniker_marshal_data2, sizeof(expected_anti_moniker_marshal_data2), + expected_anti_moniker_saved_data2, sizeof(expected_anti_moniker_saved_data2), + expected_anti_moniker_comparison_data2, sizeof(expected_anti_moniker_comparison_data2), + 20, L"\\..\\.."); + hr = IMoniker_IsEqual(moniker, moniker2); ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : ole32: Fix IsEqual() for antimoniker.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 9a4959de4a4aeeacdd886a222b7f2db60b25f045 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a4959de4a4aeeacdd886a22… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 24 12:21:29 2020 +0300 ole32: Fix IsEqual() for antimoniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 28 +++++++++++++++++----------- dlls/ole32/tests/moniker.c | 5 ----- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index bff6500fa5..9b02129021 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -53,6 +53,7 @@ static inline AntiMonikerImpl *impl_from_IROTData(IROTData *iface) return CONTAINING_RECORD(iface, AntiMonikerImpl, IROTData_iface); } +static AntiMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface); /******************************************************************************* * AntiMoniker_QueryInterface @@ -308,22 +309,20 @@ AntiMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker /****************************************************************************** * AntiMoniker_IsEqual ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) +static HRESULT WINAPI AntiMonikerImpl_IsEqual(IMoniker *iface, IMoniker *other) { - DWORD mkSys; - - TRACE("(%p,%p)\n",iface,pmkOtherMoniker); + AntiMonikerImpl *moniker = impl_from_IMoniker(iface), *other_moniker; - if (pmkOtherMoniker==NULL) - return S_FALSE; + TRACE("%p, %p.\n", iface, other); - IMoniker_IsSystemMoniker(pmkOtherMoniker,&mkSys); + if (!other) + return E_INVALIDARG; - if (mkSys==MKSYS_ANTIMONIKER) - return S_OK; - else + other_moniker = unsafe_impl_from_IMoniker(other); + if (!other_moniker) return S_FALSE; + + return moniker->count == other_moniker->count ? S_OK : S_FALSE; } /****************************************************************************** @@ -588,6 +587,13 @@ static const IMonikerVtbl VT_AntiMonikerImpl = AntiMonikerImpl_IsSystemMoniker }; +static AntiMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface) +{ + if (iface->lpVtbl != &VT_AntiMonikerImpl) + return NULL; + return CONTAINING_RECORD(iface, AntiMonikerImpl, IMoniker_iface); +} + /********************************************************************************/ /* Virtual function table for the IROTData class. */ static const IROTDataVtbl VT_ROTDataImpl = diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index dff6cbbe57..65cd279b1a 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2331,11 +2331,9 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, moniker2); -todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker2, moniker); -todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IMoniker_Hash(moniker, &hash); @@ -2374,11 +2372,9 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, moniker2); -todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker2, moniker); -todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IMoniker_Hash(moniker, &hash); @@ -2403,7 +2399,6 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, NULL); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); IStream_Release(stream);

1 0

Nikolay Sivov : dwrite: Enable DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME for GetInformationalStrings().
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 57a34227c242c3de10ed47b93e30f6e13ffcdb8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a34227c242c3de10ed47b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 24 11:17:38 2020 +0300 dwrite: Enable DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME for GetInformationalStrings(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 9 ++++++--- dlls/dwrite/opentype.c | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index eea3cbabbe..6adba28280 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -231,7 +231,7 @@ struct dwrite_fontface FONTSIGNATURE fontsig; UINT32 glyph_image_formats; - IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME+1]; + IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME + 1]; IDWriteLocalizedStrings *family_names; IDWriteLocalizedStrings *names; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2732693b4c..8bcbe11fcb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -82,7 +82,7 @@ struct dwrite_font_data struct dwrite_font_propvec propvec; DWRITE_FONT_METRICS1 metrics; - IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME+1]; + IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME + 1]; IDWriteLocalizedStrings *family_names; IDWriteLocalizedStrings *names; @@ -1291,8 +1291,11 @@ static HRESULT get_font_info_strings(const struct file_stream_desc *stream_desc, *exists = FALSE; *ret = NULL; - if (stringid > DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME || stringid == DWRITE_INFORMATIONAL_STRING_NONE) + if (stringid > DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME + || stringid == DWRITE_INFORMATIONAL_STRING_NONE) + { return S_OK; + } if (!strings_cache[stringid]) { @@ -1301,7 +1304,7 @@ static HRESULT get_font_info_strings(const struct file_stream_desc *stream_desc, if (!desc.stream) hr = get_filestream_from_file(file, &desc.stream); if (SUCCEEDED(hr)) - hr = opentype_get_font_info_strings(&desc, stringid, &strings_cache[stringid]); + opentype_get_font_info_strings(&desc, stringid, &strings_cache[stringid]); if (!stream_desc->stream && desc.stream) IDWriteFontFileStream_Release(desc.stream); diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 1e71ce8614..fd420e4360 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1098,7 +1098,7 @@ enum OPENTYPE_STRING_ID OPENTYPE_STRING_WWS_SUBFAMILY_NAME }; -static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME+1] = +static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME + 1] = { (UINT16)-1, /* DWRITE_INFORMATIONAL_STRING_NONE is not used */ OPENTYPE_STRING_COPYRIGHT_NOTICE, @@ -1118,7 +1118,8 @@ static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_POSTSCRIP OPENTYPE_STRING_SAMPLE_TEXT, OPENTYPE_STRING_FULL_FONTNAME, OPENTYPE_STRING_POSTSCRIPT_FONTNAME, - OPENTYPE_STRING_POSTSCRIPT_CID_NAME + OPENTYPE_STRING_POSTSCRIPT_CID_NAME, + OPENTYPE_STRING_WWS_FAMILY_NAME, }; /* CPAL table */

1 0

Andrew Eikum : xinput: Implement XInputGetKeystroke.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: c1d51031ef2c8926777e45f596a49eae4a3ff328 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1d51031ef2c8926777e45f5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 23 14:28:56 2020 -0600 xinput: Implement XInputGetKeystroke. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/xinput_main.c | 216 ++++++++++++++++++++++++++++++++++++++-- dlls/xinput1_3/xinput_private.h | 1 + 2 files changed, 209 insertions(+), 8 deletions(-) diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 5485ae8d2d..63b7dd7f0b 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -202,19 +202,219 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE* state return xinput_get_state(index, state); } -DWORD WINAPI DECLSPEC_HOTPATCH XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) +static const int JS_STATE_OFF = 0; +static const int JS_STATE_LOW = 1; +static const int JS_STATE_HIGH = 2; + +static int joystick_state(const SHORT value) { - static int warn_once; + if (value > 20000) + return JS_STATE_HIGH; + if (value < -20000) + return JS_STATE_LOW; + return JS_STATE_OFF; +} - if (!warn_once++) - FIXME("(index %u, reserved %u, keystroke %p) Stub!\n", index, reserved, keystroke); +static WORD js_vk_offs(const int x, const int y) +{ + if (y == JS_STATE_OFF) + { + /*if (x == JS_STATE_OFF) shouldn't get here */ + if (x == JS_STATE_LOW) return 3; /* LEFT */ + /*if (x == JS_STATE_HIGH)*/ return 2; /* RIGHT */ + } + if (y == JS_STATE_HIGH) + { + if (x == JS_STATE_OFF) return 0; /* UP */ + if (x == JS_STATE_LOW) return 4; /* UPLEFT */ + /*if (x == JS_STATE_HIGH)*/ return 5; /* UPRIGHT */ + } + /*if (y == JS_STATE_LOW)*/ + { + if (x == JS_STATE_OFF) return 1; /* DOWN */ + if (x == JS_STATE_LOW) return 7; /* DOWNLEFT */ + /*if (x == JS_STATE_HIGH)*/ return 6; /* DOWNRIGHT */ + } +} - if (index >= XUSER_MAX_COUNT) - return ERROR_BAD_ARGUMENTS; - if (!controllers[index].platform_private) +static DWORD check_joystick_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke, + const SHORT *cur_x, const SHORT *cur_y, SHORT *last_x, SHORT *last_y, + const WORD base_vk) +{ + int cur_vk = 0, cur_x_st, cur_y_st; + int last_vk = 0, last_x_st, last_y_st; + + cur_x_st = joystick_state(*cur_x); + cur_y_st = joystick_state(*cur_y); + if (cur_x_st || cur_y_st) + cur_vk = base_vk + js_vk_offs(cur_x_st, cur_y_st); + + last_x_st = joystick_state(*last_x); + last_y_st = joystick_state(*last_y); + if (last_x_st || last_y_st) + last_vk = base_vk + js_vk_offs(last_x_st, last_y_st); + + if (cur_vk != last_vk) + { + if (last_vk) + { + /* joystick was set, and now different. send a KEYUP event, and set + * last pos to centered, so the appropriate KEYDOWN event will be + * sent on the next call. */ + keystroke->VirtualKey = last_vk; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = XINPUT_KEYSTROKE_KEYUP; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + + *last_x = 0; + *last_y = 0; + + return ERROR_SUCCESS; + } + + /* joystick was unset, send KEYDOWN. */ + keystroke->VirtualKey = cur_vk; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = XINPUT_KEYSTROKE_KEYDOWN; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + + *last_x = *cur_x; + *last_y = *cur_y; + + return ERROR_SUCCESS; + } + + *last_x = *cur_x; + *last_y = *cur_y; + + return ERROR_EMPTY; +} + +static BOOL trigger_is_on(const BYTE value) +{ + return value > 30; +} + +static DWORD check_for_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke) +{ + xinput_controller *device = &controllers[index]; + const XINPUT_GAMEPAD *cur; + DWORD ret = ERROR_EMPTY; + int i; + + static const struct { + int mask; + WORD vk; + } buttons[] = { + { XINPUT_GAMEPAD_DPAD_UP, VK_PAD_DPAD_UP }, + { XINPUT_GAMEPAD_DPAD_DOWN, VK_PAD_DPAD_DOWN }, + { XINPUT_GAMEPAD_DPAD_LEFT, VK_PAD_DPAD_LEFT }, + { XINPUT_GAMEPAD_DPAD_RIGHT, VK_PAD_DPAD_RIGHT }, + { XINPUT_GAMEPAD_START, VK_PAD_START }, + { XINPUT_GAMEPAD_BACK, VK_PAD_BACK }, + { XINPUT_GAMEPAD_LEFT_THUMB, VK_PAD_LTHUMB_PRESS }, + { XINPUT_GAMEPAD_RIGHT_THUMB, VK_PAD_RTHUMB_PRESS }, + { XINPUT_GAMEPAD_LEFT_SHOULDER, VK_PAD_LSHOULDER }, + { XINPUT_GAMEPAD_RIGHT_SHOULDER, VK_PAD_RSHOULDER }, + { XINPUT_GAMEPAD_A, VK_PAD_A }, + { XINPUT_GAMEPAD_B, VK_PAD_B }, + { XINPUT_GAMEPAD_X, VK_PAD_X }, + { XINPUT_GAMEPAD_Y, VK_PAD_Y }, + /* note: guide button does not send an event */ + }; + + if (!verify_and_lock_device(device)) return ERROR_DEVICE_NOT_CONNECTED; - return ERROR_NOT_SUPPORTED; + cur = &device->state.Gamepad; + + /*** buttons ***/ + for (i = 0; i < ARRAY_SIZE(buttons); ++i) + { + if ((cur->wButtons & buttons[i].mask) ^ (device->last_keystroke.wButtons & buttons[i].mask)) + { + keystroke->VirtualKey = buttons[i].vk; + keystroke->Unicode = 0; /* unused */ + if (cur->wButtons & buttons[i].mask) + { + keystroke->Flags = XINPUT_KEYSTROKE_KEYDOWN; + device->last_keystroke.wButtons |= buttons[i].mask; + } + else + { + keystroke->Flags = XINPUT_KEYSTROKE_KEYUP; + device->last_keystroke.wButtons &= ~buttons[i].mask; + } + keystroke->UserIndex = index; + keystroke->HidCode = 0; + ret = ERROR_SUCCESS; + goto done; + } + } + + /*** triggers ***/ + if (trigger_is_on(cur->bLeftTrigger) ^ trigger_is_on(device->last_keystroke.bLeftTrigger)) + { + keystroke->VirtualKey = VK_PAD_LTRIGGER; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = trigger_is_on(cur->bLeftTrigger) ? XINPUT_KEYSTROKE_KEYDOWN : XINPUT_KEYSTROKE_KEYUP; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + device->last_keystroke.bLeftTrigger = cur->bLeftTrigger; + ret = ERROR_SUCCESS; + goto done; + } + + if (trigger_is_on(cur->bRightTrigger) ^ trigger_is_on(device->last_keystroke.bRightTrigger)) + { + keystroke->VirtualKey = VK_PAD_RTRIGGER; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = trigger_is_on(cur->bRightTrigger) ? XINPUT_KEYSTROKE_KEYDOWN : XINPUT_KEYSTROKE_KEYUP; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + device->last_keystroke.bRightTrigger = cur->bRightTrigger; + ret = ERROR_SUCCESS; + goto done; + } + + /*** joysticks ***/ + ret = check_joystick_keystroke(index, keystroke, &cur->sThumbLX, &cur->sThumbLY, + &device->last_keystroke.sThumbLX, + &device->last_keystroke.sThumbLY, VK_PAD_LTHUMB_UP); + if (ret == ERROR_SUCCESS) + goto done; + + ret = check_joystick_keystroke(index, keystroke, &cur->sThumbRX, &cur->sThumbRY, + &device->last_keystroke.sThumbRX, + &device->last_keystroke.sThumbRY, VK_PAD_RTHUMB_UP); + if (ret == ERROR_SUCCESS) + goto done; + +done: + unlock_device(device); + + return ret; +} + +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) +{ + TRACE("(index %u, reserved %u, keystroke %p)\n", index, reserved, keystroke); + + if (index >= XUSER_MAX_COUNT && index != XUSER_INDEX_ANY) + return ERROR_BAD_ARGUMENTS; + + if (index == XUSER_INDEX_ANY) + { + int i; + for (i = 0; i < XUSER_MAX_COUNT; ++i) + if (check_for_keystroke(i, keystroke) == ERROR_SUCCESS) + return ERROR_SUCCESS; + return ERROR_EMPTY; + } + + return check_for_keystroke(index, keystroke); } DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, XINPUT_CAPABILITIES* capabilities) diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index f3456cd8e7..7de9a2a2e4 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -23,6 +23,7 @@ typedef struct _xinput_controller XINPUT_CAPABILITIES caps; void *platform_private; /* non-NULL when device is valid; validity may be read without holding crit */ XINPUT_STATE state; + XINPUT_GAMEPAD last_keystroke; XINPUT_VIBRATION vibration; } xinput_controller;

1 0

Nikolay Sivov : dwrite: Implement GetFamilyNames() for fontfaces.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 2d289681ebf8dd257f60add756ee3b21719a5e69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d289681ebf8dd257f60add7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 24 11:17:35 2020 +0300 dwrite: Implement GetFamilyNames() for fontfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 56 ++++++++++++++++++++++++-------------------- dlls/dwrite/tests/font.c | 30 +++++++++++++++++++++--- 3 files changed, 58 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d289681ebf8dd257f60…

1 0

Daniel Lehman : vcruntime140_1: Add stub dll.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 7a5cf7cce935841f8415fd6383cfbe6af4d8b3d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a5cf7cce935841f8415fd63… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jan 22 22:02:20 2020 -0800 vcruntime140_1: Add stub dll. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/vcruntime140_1/Makefile.in | 1 + dlls/vcruntime140_1/vcruntime140_1.spec | 3 +++ 4 files changed, 7 insertions(+) diff --git a/configure b/configure index 7ff3737bda..5fca5bd27f 100755 --- a/configure +++ b/configure @@ -1609,6 +1609,7 @@ enable_vcomp120 enable_vcomp140 enable_vcomp90 enable_vcruntime140 +enable_vcruntime140_1 enable_vdmdbg enable_version enable_virtdisk @@ -20907,6 +20908,7 @@ wine_fn_config_makefile dlls/vcomp120 enable_vcomp120 wine_fn_config_makefile dlls/vcomp140 enable_vcomp140 wine_fn_config_makefile dlls/vcomp90 enable_vcomp90 wine_fn_config_makefile dlls/vcruntime140 enable_vcruntime140 +wine_fn_config_makefile dlls/vcruntime140_1 enable_vcruntime140_1 wine_fn_config_makefile dlls/vdhcp.vxd enable_win16 wine_fn_config_makefile dlls/vdmdbg enable_vdmdbg wine_fn_config_makefile dlls/ver.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 681d315eed..36f65378a4 100644 --- a/configure.ac +++ b/configure.ac @@ -3717,6 +3717,7 @@ WINE_CONFIG_MAKEFILE(dlls/vcomp120) WINE_CONFIG_MAKEFILE(dlls/vcomp140) WINE_CONFIG_MAKEFILE(dlls/vcomp90) WINE_CONFIG_MAKEFILE(dlls/vcruntime140) +WINE_CONFIG_MAKEFILE(dlls/vcruntime140_1) WINE_CONFIG_MAKEFILE(dlls/vdhcp.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/vdmdbg) WINE_CONFIG_MAKEFILE(dlls/ver.dll16,enable_win16) diff --git a/dlls/vcruntime140_1/Makefile.in b/dlls/vcruntime140_1/Makefile.in new file mode 100644 index 0000000000..b5e20fe92f --- /dev/null +++ b/dlls/vcruntime140_1/Makefile.in @@ -0,0 +1 @@ +MODULE = vcruntime140_1.dll diff --git a/dlls/vcruntime140_1/vcruntime140_1.spec b/dlls/vcruntime140_1/vcruntime140_1.spec new file mode 100644 index 0000000000..55f568ef13 --- /dev/null +++ b/dlls/vcruntime140_1/vcruntime140_1.spec @@ -0,0 +1,3 @@ +@ stub __CxxFrameHandler4 +@ stub __NLG_Dispatch2 +@ stub __NLG_Return2

1 0

Gerald Pfeifer : winedump: Add a default case to numeric_leaf().
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 7299735fdf6cd4f0d7c96cf9dc89f8ef50785e1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7299735fdf6cd4f0d7c96cf9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jan 23 23:09:00 2020 +0100 winedump: Add a default case to numeric_leaf(). This addresses two warnings issues by GCC 10 (currently in development stage 4, so this is unlikely to change): msc.c:687:9: warning: 'value' may be used uninitialized in this function msc.c:301:13: warning: 'value' may be used uninitialized in this function Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index fbe7f9e541..6843f899b1 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -206,6 +206,7 @@ static int numeric_leaf(int* value, const unsigned short int* leaf) { case fv_integer: *value = fv.v.i; break; case fv_longlong: *value = (unsigned)fv.v.llu; printf("bad conversion\n"); break; + default: assert( 0 ); *value = 0; } return len; }

1 0