March 2019 - Wine-devel - list.winehq.org

[PATCH 3/3] dnsapi: No longer prefer native.
by Hans Leidekker 01 Mar '19

01 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 93528a2302..3272470209 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -36,8 +36,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); break; -- 2.11.0

2 1

[PATCH] msacm32: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return MMSYSERR_NOMEM if pad is NULL. dlls/msacm32/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index e0c5fdd90e..2d7862cb73 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -600,7 +600,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe return MMSYSERR_NOERROR; gotError: WARN("failed: ret = %08x\n", ret); - if (pad && !pad->hDrvr) + if (!pad->hDrvr) HeapFree(MSACM_hHeap, 0, pad); return ret; } -- 2.20.1

2 1

[PATCH] mshtml: Open pages in the native browser in HlinkTarget_Navigate().
by Zebediah Figura 01 Mar '19

01 Mar '19

This matches native Windows behaviour as well, as demonstrated by running the interactive hlink:hlink tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44423 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mshtml/persist.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index b82750a85e..0607306586 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -30,6 +30,7 @@ #include "shlguid.h" #include "idispids.h" #include "mimeole.h" +#include "shellapi.h" #define NO_SHLWAPI_REG #include "shlwapi.h" @@ -1187,8 +1188,19 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L if(pwzJumpLocation) FIXME("JumpLocation not supported\n"); - if(!This->doc_obj->client) - return navigate_new_window(This->window, This->window->uri, NULL, NULL, NULL); + if(!This->doc_obj->client) { + static const WCHAR szOpen[] = {'o','p','e','n',0}; + HRESULT hres; + BSTR uri; + + hres = IUri_GetAbsoluteUri(This->window->uri, &uri); + if (FAILED(hres)) + return hres; + + ShellExecuteW(NULL, szOpen, uri, NULL, NULL, SW_SHOW); + SysFreeString(uri); + return S_OK; + } return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); } -- 2.20.1

2 1

[PATCH] urlmon: Remove useless casts to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/bindctx.c | 2 +- dlls/urlmon/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 2759f3d226..61917518c0 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -45,7 +45,7 @@ static void *get_callback_iface(BindStatusCallback *This, REFIID riid) void *ret; HRESULT hres; - hres = IBindStatusCallback_QueryInterface(This->callback, riid, (void**)&ret); + hres = IBindStatusCallback_QueryInterface(This->callback, riid, &ret); if(FAILED(hres) && This->serv_prov) hres = IServiceProvider_QueryService(This->serv_prov, riid, riid, &ret); diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 11e6ecee90..cc1ba81606 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -434,7 +434,7 @@ HRESULT FileProtocol_Construct(IUnknown *outer, LPVOID *ppobj) ret->file = INVALID_HANDLE_VALUE; ret->priority = 0; ret->ref = 1; - ret->outer = outer ? outer : (IUnknown*)&ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_outer; *ppobj = &ret->IUnknown_outer; return S_OK; -- 2.20.1

2 1

[PATCH v3] po: Update German translation.
by Isira Seneviratne 01 Mar '19

01 Mar '19

1 0

[PATCH v2] po: Update German translation.
by Isira Seneviratne 01 Mar '19

01 Mar '19

2 1

[PATCH] riched20/tests: Avoid using the comma operator
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/tests/richole.c | 62 +++++++++++++++++------------------ dlls/riched32/tests/editor.c | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ddb101810e..f6158d9a3d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4970,7 +4970,7 @@ static void test_EM_EXSETSEL(void) /* Test with multibyte character */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); /* 012345 6 78901 */ - cr.cpMin = 4, cr.cpMax = 8; + cr.cpMin = 4; cr.cpMax = 8; result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); ok(result == 8, "EM_EXSETSEL return %ld expected 8\n", result); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d3ffdce4a7..52399047ad 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -531,21 +531,21 @@ static void test_GetText(void) SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); /* ITextSelection */ - first = 0, lim = 4; + first = 0; lim = 4; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW1), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 4, lim = 0; + first = 4; lim = 0; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW1), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 1, lim = 1; + first = 1; lim = 1; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); @@ -557,35 +557,35 @@ static void test_GetText(void) ok(hres == E_INVALIDARG, "ITextSelection_GetText\n"); } - first = 8, lim = 12; + first = 8; lim = 12; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW3), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 8, lim = 13; + first = 8; lim = 13; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW2), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 12, lim = 13; + first = 12; lim = 13; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW5), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = 0, lim = -1; + first = 0; lim = -1; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!lstrcmpW(bstr, bufW4), "got wrong text: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - first = -1, lim = 9; + first = -1; lim = 9; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == S_OK, "ITextSelection_GetText\n"); @@ -757,7 +757,7 @@ static void test_ITextRange_GetChar(void) ITextRange_Release(txtRge); release_interfaces(&w, &reOle, &txtDoc, NULL); - first = 0, lim = 0; + first = 0; lim = 0; create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); @@ -769,7 +769,7 @@ static void test_ITextRange_GetChar(void) ITextRange_Release(txtRge); release_interfaces(&w, &reOle, &txtDoc, NULL); - first = 12, lim = 12; + first = 12; lim = 12; create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); @@ -781,7 +781,7 @@ static void test_ITextRange_GetChar(void) ITextRange_Release(txtRge); release_interfaces(&w, &reOle, &txtDoc, NULL); - first = 13, lim = 13; + first = 13; lim = 13; create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); @@ -795,7 +795,7 @@ static void test_ITextRange_GetChar(void) create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 12, lim = 12; + first = 12; lim = 12; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetChar(txtRge, NULL); @@ -885,28 +885,28 @@ static void test_ITextSelection_GetChar(void) create_interfaces(&w, &reOle, &txtDoc, &txtSel); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 0, lim = 4; + first = 0; lim = 4; SendMessageA(w, EM_SETSEL, first, lim); pch = 0xdeadbeef; hres = ITextSelection_GetChar(txtSel, &pch); ok(hres == S_OK, "ITextSelection_GetChar\n"); ok(pch == 'T', "got wrong char: %c\n", pch); - first = 0, lim = 0; + first = 0; lim = 0; SendMessageA(w, EM_SETSEL, first, lim); pch = 0xdeadbeef; hres = ITextSelection_GetChar(txtSel, &pch); ok(hres == S_OK, "ITextSelection_GetChar\n"); ok(pch == 'T', "got wrong char: %c\n", pch); - first = 12, lim = 12; + first = 12; lim = 12; SendMessageA(w, EM_SETSEL, first, lim); pch = 0xdeadbeef; hres = ITextSelection_GetChar(txtSel, &pch); ok(hres == S_OK, "ITextSelection_GetChar\n"); ok(pch == '\r', "got wrong char: %c\n", pch); - first = 13, lim = 13; + first = 13; lim = 13; SendMessageA(w, EM_SETSEL, first, lim); pch = 0xdeadbeef; hres = ITextSelection_GetChar(txtSel, &pch); @@ -940,7 +940,7 @@ static void test_ITextRange_GetStart_GetEnd(void) create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 1, lim = 6; + first = 1; lim = 6; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); start = 0xdeadbeef; @@ -953,7 +953,7 @@ static void test_ITextRange_GetStart_GetEnd(void) ok(end == 6, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = 6, lim = 1; + first = 6; lim = 1; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); start = 0xdeadbeef; @@ -966,7 +966,7 @@ static void test_ITextRange_GetStart_GetEnd(void) ok(end == 6, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = -1, lim = 13; + first = -1; lim = 13; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); start = 0xdeadbeef; @@ -979,7 +979,7 @@ static void test_ITextRange_GetStart_GetEnd(void) ok(end == 13, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = 13, lim = 13; + first = 13; lim = 13; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); start = 0xdeadbeef; @@ -1159,7 +1159,7 @@ static void test_ITextSelection_GetStart_GetEnd(void) create_interfaces(&w, &reOle, &txtDoc, &txtSel); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 2, lim = 5; + first = 2; lim = 5; SendMessageA(w, EM_SETSEL, first, lim); start = 0xdeadbeef; hres = ITextSelection_GetStart(txtSel, &start); @@ -1170,7 +1170,7 @@ static void test_ITextSelection_GetStart_GetEnd(void) ok(hres == S_OK, "ITextSelection_GetEnd\n"); ok(end == 5, "got wrong end value: %d\n", end); - first = 5, lim = 2; + first = 5; lim = 2; SendMessageA(w, EM_SETSEL, first, lim); start = 0xdeadbeef; hres = ITextSelection_GetStart(txtSel, &start); @@ -1181,7 +1181,7 @@ static void test_ITextSelection_GetStart_GetEnd(void) ok(hres == S_OK, "ITextSelection_GetEnd\n"); ok(end == 5, "got wrong end value: %d\n", end); - first = 0, lim = -1; + first = 0; lim = -1; SendMessageA(w, EM_SETSEL, first, lim); start = 0xdeadbeef; hres = ITextSelection_GetStart(txtSel, &start); @@ -1192,7 +1192,7 @@ static void test_ITextSelection_GetStart_GetEnd(void) ok(hres == S_OK, "ITextSelection_GetEnd\n"); ok(end == 13, "got wrong end value: %d\n", end); - first = 13, lim = 13; + first = 13; lim = 13; SendMessageA(w, EM_SETSEL, first, lim); start = 0xdeadbeef; hres = ITextSelection_GetStart(txtSel, &start); @@ -1365,7 +1365,7 @@ static void test_ITextRange_GetDuplicate(void) create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 0, lim = 4; + first = 0; lim = 4; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "ITextDocument_Range fails 0x%x.\n", hres); @@ -1408,7 +1408,7 @@ static void test_ITextRange_Collapse(void) create_interfaces(&w, &reOle, &txtDoc, NULL); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 4, lim = 8; + first = 4; lim = 8; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_Collapse(txtRge, tomTrue); @@ -1470,7 +1470,7 @@ static void test_ITextRange_Collapse(void) ok(end == 4, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = 6, lim = 6; + first = 6; lim = 6; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_Collapse(txtRge, tomEnd); @@ -1483,7 +1483,7 @@ static void test_ITextRange_Collapse(void) ok(end == 6, "got wrong end value: %d\n", end); ITextRange_Release(txtRge); - first = 8, lim = 8; + first = 8; lim = 8; hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_Collapse(txtRge, tomStart); @@ -1519,7 +1519,7 @@ static void test_ITextSelection_Collapse(void) create_interfaces(&w, &reOle, &txtDoc, &txtSel); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); - first = 4, lim = 8; + first = 4; lim = 8; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_Collapse(txtSel, tomTrue); ok(hres == S_OK, "ITextSelection_Collapse\n"); @@ -1556,7 +1556,7 @@ static void test_ITextSelection_Collapse(void) ok(start == 4, "got wrong start value: %d\n", start); ok(end == 4, "got wrong end value: %d\n", end); - first = 6, lim = 6; + first = 6; lim = 6; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_Collapse(txtSel, tomEnd); ok(hres == S_FALSE, "ITextSelection_Collapse\n"); @@ -1564,7 +1564,7 @@ static void test_ITextSelection_Collapse(void) ok(start == 6, "got wrong start value: %d\n", start); ok(end == 6, "got wrong end value: %d\n", end); - first = 8, lim = 8; + first = 8; lim = 8; SendMessageA(w, EM_SETSEL, first, lim); hres = ITextSelection_Collapse(txtSel, tomStart); ok(hres == S_FALSE, "ITextSelection_Collapse\n"); diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index dd9773c3f6..7394203cb7 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1358,7 +1358,7 @@ static void test_EM_EXSETSEL(void) /* Test with multibyte character */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); /* 012345 6 7 8901 */ - cr.cpMin = 4, cr.cpMax = 8; + cr.cpMin = 4; cr.cpMax = 8; result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); todo_wine ok(result == 7, "EM_EXSETSEL return %ld expected 7\n", result); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); -- 2.20.1

2 1

[PATCH] ole32: Remove useless casts to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- dlls/ole32/tests/compobj.c | 6 +++--- dlls/ole32/tests/marshal.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 3eff56908d..6d4bcca96a 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1003,7 +1003,7 @@ static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream meta_place_rec.bounding_box[3] = (LONGLONG)mfpict->yExt * meta_place_rec.inch / 2540; GlobalUnlock(entry->stgmedium.u.hMetaFilePict); - for (check = (WORD *)&meta_place_rec; check != (WORD *)&meta_place_rec.checksum; check++) + for (check = (WORD *)&meta_place_rec; check != &meta_place_rec.checksum; check++) meta_place_rec.checksum ^= *check; hr = IStream_Write(stream, &meta_place_rec, sizeof(struct meta_placeable), NULL); if (hr == S_OK && data_size) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b4dd83e63d..aebe9674a1 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1031,7 +1031,7 @@ static HRESULT WINAPI PSFactoryBuffer_CreateStub( { CHECK_EXPECT(CreateStub); - ok(pUnkServer == (IUnknown*)&Test_Unknown, "unexpected pUnkServer %p\n", pUnkServer); + ok(pUnkServer == &Test_Unknown, "unexpected pUnkServer %p\n", pUnkServer); if(!ps_factory_buffer) return E_NOTIMPL; @@ -3753,10 +3753,10 @@ static DWORD CALLBACK implicit_mta_proc(void *param) hr = CoRegisterMessageFilter(NULL, NULL); ok(hr == CO_E_NOT_SUPPORTED, "got %#x\n", hr); - hr = CoLockObjectExternal((IUnknown *)&Test_Unknown, TRUE, TRUE); + hr = CoLockObjectExternal(&Test_Unknown, TRUE, TRUE); ok_ole_success(hr, "CoLockObjectExternal"); - hr = CoDisconnectObject((IUnknown *)&Test_Unknown, 0); + hr = CoDisconnectObject(&Test_Unknown, 0); ok_ole_success(hr, "CoDisconnectObject"); return 0; diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index c53acf236c..33b155d474 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -329,7 +329,7 @@ static HRESULT WINAPI Test_IClassFactory_CreateInstance( LPVOID *ppvObj) { if (pUnkOuter) return CLASS_E_NOAGGREGATION; - return IUnknown_QueryInterface((IUnknown*)&Test_Unknown, riid, ppvObj); + return IUnknown_QueryInterface(&Test_Unknown, riid, ppvObj); } static HRESULT WINAPI Test_IClassFactory_LockServer( -- 2.20.1

3 2

[PATCH 1/5] user32/listbox: Use a helper to set item data by index
by Gabriel Ivăncescu 01 Mar '19

01 Mar '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/listbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 826ce01..9bf9f90 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -156,6 +156,11 @@ static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; } +static void set_item_data( LB_DESCR *descr, UINT index, ULONG_PTR data ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].data = data; +} + static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) { return HAS_STRINGS(descr) ? descr->items[index].str : NULL; @@ -2743,7 +2748,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - if (!(descr->style & LBS_NODATA)) descr->items[wParam].data = lParam; + set_item_data(descr, wParam, lParam); /* undocumented: returns TRUE, not LB_OKAY (0) */ return TRUE; -- 2.20.1

3 13

[PATCH] dwrite: Remove useless casts to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/font.c | 2 +- dlls/dwrite/layout.c | 4 ++-- dlls/dwrite/opentype.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 948c1dfa05..374236657b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2420,7 +2420,7 @@ static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT3 BOOL is_system_collection(IDWriteFontCollection *collection) { void *obj; - return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, (void**)&obj) == S_OK; + return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, &obj) == S_OK; } static HRESULT WINAPI dwritesystemfontcollection_QueryInterface(IDWriteFontCollection1 *iface, REFIID riid, void **obj) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index de79fd4c7f..4cd5ce445f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2520,7 +2520,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ changed = set_layout_range_iface_attr((IUnknown**)&dest->object, (IUnknown*)value->u.object); break; case LAYOUT_RANGE_ATTR_EFFECT: - changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.effect); + changed = set_layout_range_iface_attr(&dest_iface->iface, value->u.effect); break; case LAYOUT_RANGE_ATTR_UNDERLINE: changed = dest_bool->value != value->u.underline; @@ -2560,7 +2560,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ dest_spacing->min_advance = value->u.spacing.min_advance; break; case LAYOUT_RANGE_ATTR_TYPOGRAPHY: - changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.typography); + changed = set_layout_range_iface_attr(&dest_iface->iface, (IUnknown*)value->u.typography); break; default: ; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b13f424019..4772236770 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -538,7 +538,7 @@ struct ot_lookup_table WORD subtable[1]; }; -#define GLYPH_NOT_COVERED ((unsigned int)~0u) +#define GLYPH_NOT_COVERED (~0u) struct ot_coverage_format1 { -- 2.20.1

2 1