October 2014 - Wine-commits

Nikolay Sivov : dwrite: Set oblique simulation in GetFirstMatchingFont() when appropriate.
by Alexandre Julliard 29 Oct '14

29 Oct '14

Module: wine Branch: master Commit: 1d2993940ae0d0c9a63141ea0e54061be356c4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d2993940ae0d0c9a63141ea0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 19:01:48 2014 +0300 dwrite: Set oblique simulation in GetFirstMatchingFont() when appropriate. --- dlls/dwrite/font.c | 27 +++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 20 +++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index dd46ee7..4ebe261 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1213,6 +1213,17 @@ static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily *iface, return clone_localizedstring(This->data->familyname, names); } +static inline BOOL is_matching_font_style(DWRITE_FONT_STYLE style, DWRITE_FONT_STYLE font_style) +{ + if (style == font_style) + return TRUE; + + if (((style == DWRITE_FONT_STYLE_ITALIC) || (style == DWRITE_FONT_STYLE_OBLIQUE)) && font_style == DWRITE_FONT_STYLE_NORMAL) + return TRUE; + + return FALSE; +} + static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STRETCH stretch, DWRITE_FONT_STYLE style, IDWriteFont **font) { @@ -1237,7 +1248,7 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i int found = -1, i; for (i = 0; i < This->data->font_count; i++) { - if (style == This->data->fonts[i]->style && stretch == This->data->fonts[i]->stretch) { + if (is_matching_font_style(style, This->data->fonts[i]->style) && stretch == This->data->fonts[i]->stretch) { DWRITE_FONT_WEIGHT font_weight = This->data->fonts[i]->weight; UINT32 weight_diff = abs(font_weight - weight); if (weight_diff < min_weight_diff) { @@ -1247,7 +1258,19 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i } } - return found != -1 ? create_font_from_data(This->data->fonts[found], iface, DWRITE_FONT_SIMULATIONS_NONE, font) : DWRITE_E_NOFONT; + if (found != -1) { + DWRITE_FONT_SIMULATIONS simulations = DWRITE_FONT_SIMULATIONS_NONE; + + if (((style == DWRITE_FONT_STYLE_ITALIC) || (style == DWRITE_FONT_STYLE_OBLIQUE)) && + This->data->fonts[found]->style == DWRITE_FONT_STYLE_ITALIC) { + simulations = DWRITE_FONT_SIMULATIONS_OBLIQUE; + } + return create_font_from_data(This->data->fonts[found], iface, simulations, font); + } + else { + *font = NULL; + return DWRITE_E_NOFONT; + } } } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9cad650..74aad58 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1475,10 +1475,13 @@ if (font3) static void test_GetFirstMatchingFont(void) { + DWRITE_FONT_SIMULATIONS simulations; IDWriteFontCollection *collection; IDWriteFont *font, *font2; IDWriteFontFamily *family; IDWriteFactory *factory; + UINT32 index; + BOOL exists; HRESULT hr; factory = create_factory(); @@ -1486,7 +1489,13 @@ static void test_GetFirstMatchingFont(void) hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontCollection_GetFontFamily(collection, 0, &family); + index = ~0; + exists = FALSE; + hr = IDWriteFontCollection_FindFamilyName(collection, tahomaW, &index, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists, "got %d\n", exists); + + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, @@ -1497,6 +1506,15 @@ static void test_GetFirstMatchingFont(void) DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(font != font2, "got %p, %p\n", font, font2); + IDWriteFont_Release(font); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_ITALIC, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + simulations = IDWriteFont_GetSimulations(font); +todo_wine + ok(simulations == DWRITE_FONT_SIMULATIONS_OBLIQUE, "%d\n", simulations); IDWriteFont_Release(font); IDWriteFont_Release(font2);

1 0

Nikolay Sivov : dwrite: Reimplement ConvertFontFaceToLOGFONT().
by Alexandre Julliard 29 Oct '14

29 Oct '14

Module: wine Branch: master Commit: 6855740a5e2980f76f3c52b0dff02e38e376a9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6855740a5e2980f76f3c52b0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 28 08:13:51 2014 +0300 dwrite: Reimplement ConvertFontFaceToLOGFONT(). --- dlls/dwrite/font.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 3 +++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4ebe261..f8bff51 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -139,6 +139,7 @@ static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFon static HRESULT create_fontfamily_from_data(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily **family); static HRESULT create_font_base(IDWriteFont **font); static HRESULT create_font_from_data(struct dwrite_font_data*,IDWriteFontFamily*,DWRITE_FONT_SIMULATIONS,IDWriteFont**); +static HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**); static inline struct dwrite_fontface *impl_from_IDWriteFontFace2(IDWriteFontFace2 *iface) { @@ -723,11 +724,65 @@ static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace return S_OK; } +static void get_font_properties_from_stream(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_TYPE face_type, + UINT32 face_index, DWRITE_FONT_METRICS *metrics, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, + DWRITE_FONT_STYLE *style) +{ + const void *tt_os2 = NULL, *tt_head = NULL, *tt_post = NULL; + void *os2_context, *head_context, *post_context; + + opentype_get_font_table(stream, face_type, face_index, MS_OS2_TAG, &tt_os2, &os2_context, NULL, NULL); + opentype_get_font_table(stream, face_type, face_index, MS_HEAD_TAG, &tt_head, &head_context, NULL, NULL); + opentype_get_font_table(stream, face_type, face_index, MS_POST_TAG, &tt_post, &post_context, NULL, NULL); + + get_font_properties(tt_os2, tt_head, tt_post, metrics, stretch, weight, style); + + if (tt_os2) + IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); + if (tt_head) + IDWriteFontFileStream_ReleaseFileFragment(stream, head_context); + if (tt_post) + IDWriteFontFileStream_ReleaseFileFragment(stream, post_context); +} + HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) { - struct dwrite_fontface *fontface = impl_from_IDWriteFontFace2((IDWriteFontFace2*)face); + DWRITE_FONT_SIMULATIONS simulations; + DWRITE_FONT_FACE_TYPE face_type; + IDWriteFontFileStream *stream; + DWRITE_FONT_METRICS metrics; + DWRITE_FONT_STRETCH stretch; + DWRITE_FONT_STYLE style; + DWRITE_FONT_WEIGHT weight; + IDWriteFontFile *file = NULL; + UINT32 index; + HRESULT hr; + + memset(logfont, 0, sizeof(*logfont)); + + index = 1; + hr = IDWriteFontFace_GetFiles(face, &index, &file); + if (FAILED(hr) || !file) + return hr; + + hr = get_filestream_from_file(file, &stream); + if (FAILED(hr)) { + IDWriteFontFile_Release(file); + return hr; + } + + index = IDWriteFontFace_GetIndex(face); + face_type = IDWriteFontFace_GetType(face); + get_font_properties_from_stream(stream, face_type, index, &metrics, &stretch, &weight, &style); + IDWriteFontFileStream_Release(stream); + + simulations = IDWriteFontFace_GetSimulations(face); - *logfont = fontface->logfont; + logfont->lfCharSet = DEFAULT_CHARSET; + logfont->lfWeight = weight; + logfont->lfItalic = style == DWRITE_FONT_STYLE_ITALIC || (simulations | DWRITE_FONT_SIMULATIONS_OBLIQUE); + logfont->lfOutPrecision = OUT_OUTLINE_PRECIS; + /* TODO: set facename */ return S_OK; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 74aad58..7debdda 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1013,11 +1013,14 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(logfont.lfHeight == 0, "got %d\n", logfont.lfHeight); ok(logfont.lfWidth == 0, "got %d\n", logfont.lfWidth); +todo_wine ok(logfont.lfWeight == FW_NORMAL, "got %d\n", logfont.lfWeight); ok(logfont.lfEscapement == 0, "got %d\n", logfont.lfEscapement); +todo_wine ok(logfont.lfItalic == 1, "got %d\n", logfont.lfItalic); ok(logfont.lfUnderline == 0, "got %d\n", logfont.lfUnderline); ok(logfont.lfStrikeOut == 0, "got %d\n", logfont.lfStrikeOut); +todo_wine ok(!lstrcmpW(logfont.lfFaceName, tahomaW), "got %s\n", wine_dbgstr_w(logfont.lfFaceName)); IDWriteGdiInterop_Release(interop);

1 0

Michael Stefaniuc : crypt32/tests: Don't compare the result to itself ( PVS-Studio).
by Alexandre Julliard 29 Oct '14

29 Oct '14

Module: wine Branch: master Commit: d3c565f44b55cd66fb57227e3a74d3d4ff52acb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c565f44b55cd66fb57227e3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 29 09:21:50 2014 +0100 crypt32/tests: Don't compare the result to itself (PVS-Studio). --- dlls/crypt32/tests/encode.c | 2 +- dlls/crypt32/tests/msg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 16b3532..9e1853f 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -3732,7 +3732,7 @@ static void compareAltNameEntry(const CERT_ALT_NAME_ENTRY *expected, case CERT_ALT_NAME_IP_ADDRESS: ok(U(*got).IPAddress.cbData == U(*expected).IPAddress.cbData, "Unexpected IP address length %d\n", U(*got).IPAddress.cbData); - ok(!memcmp(U(*got).IPAddress.pbData, U(*got).IPAddress.pbData, + ok(!memcmp(U(*got).IPAddress.pbData, U(*expected).IPAddress.pbData, U(*got).IPAddress.cbData), "Unexpected value\n"); break; } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index b40302a..e9887b0 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2666,12 +2666,12 @@ static void compare_signer_info(const CMSG_SIGNER_INFO *got, ok(got->Issuer.cbData == expected->Issuer.cbData, "Expected issuer size %d, got %d\n", expected->Issuer.cbData, got->Issuer.cbData); - ok(!memcmp(got->Issuer.pbData, got->Issuer.pbData, got->Issuer.cbData), + ok(!memcmp(got->Issuer.pbData, expected->Issuer.pbData, got->Issuer.cbData), "Unexpected issuer\n"); ok(got->SerialNumber.cbData == expected->SerialNumber.cbData, "Expected serial number size %d, got %d\n", expected->SerialNumber.cbData, got->SerialNumber.cbData); - ok(!memcmp(got->SerialNumber.pbData, got->SerialNumber.pbData, + ok(!memcmp(got->SerialNumber.pbData, expected->SerialNumber.pbData, got->SerialNumber.cbData), "Unexpected serial number\n"); /* FIXME: check more things */ }

1 0

Huw Davies : user32: Merge the blitting of the centred and non-centred cases.
by Alexandre Julliard 29 Oct '14

29 Oct '14

Module: wine Branch: master Commit: 3cd145f63f0ba15726b32c6be800460e3aef84e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd145f63f0ba15726b32c6be… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 29 09:09:08 2014 +0000 user32: Merge the blitting of the centred and non-centred cases. --- dlls/user32/static.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index f4b5880..ff5c77c 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -775,19 +775,15 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) GetClientRect(hwnd, &rcClient); if (style & SS_CENTERIMAGE) { - INT x, y; - x = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; - y = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; FillRect( hdc, &rcClient, hbrush ); - BitBlt(hdc, x, y, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, - SRCCOPY); - } - else - { - StretchBlt(hdc, 0, 0, rcClient.right - rcClient.left, - rcClient.bottom - rcClient.top, hMemDC, - 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); + rcClient.left = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; + rcClient.top = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; + rcClient.right = rcClient.left + bm.bmWidth; + rcClient.bottom = rcClient.top + bm.bmHeight; } + StretchBlt(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, + rcClient.bottom - rcClient.top, hMemDC, + 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); SelectObject(hMemDC, oldbitmap); DeleteDC(hMemDC); }

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Address GetComponentByName.
by Alexandre Julliard 29 Oct '14

29 Oct '14

Module: wine Branch: master Commit: a235e86316438a03a418de7cab975db4ada3d4d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a235e86316438a03a418de7ca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 29 16:11:46 2014 +1000 dpnet: Implement IDirectPlay8Address GetComponentByName. --- dlls/dpnet/address.c | 53 ++++++++++++++++++++++++++++++++++++++++++---- dlls/dpnet/tests/address.c | 23 +++++++++++++++++--- 2 files changed, 69 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 7df7ad6..2062bc4 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -316,9 +316,53 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetNumComponents(IDirectPlay8Addre static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByName(IDirectPlay8Address *iface, const WCHAR *const pwszName, void *pvBuffer, DWORD *pdwBufferSize, DWORD *pdwDataType) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + struct component *entry; + + TRACE("(%p)->(%p %p %p %p)\n", This, pwszName, pvBuffer, pdwBufferSize, pdwDataType); + + if(!pwszName || !pdwBufferSize || !pdwDataType || (!pvBuffer && pdwBufferSize)) + return E_POINTER; + + LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry) + { + if (lstrcmpW(pwszName, entry->name) == 0) + { + TRACE("Found %s\n", debugstr_w(pwszName)); + + if(*pdwBufferSize < entry->size) + { + *pdwBufferSize = entry->size; + return DPNERR_BUFFERTOOSMALL; + } + + *pdwBufferSize = entry->size; + *pdwDataType = entry->type; + + switch (entry->type) + { + case DPNA_DATATYPE_DWORD: + memcpy(pvBuffer, &entry->data.value, sizeof(DWORD)); + break; + case DPNA_DATATYPE_GUID: + memcpy(pvBuffer, &entry->data.guid, sizeof(GUID)); + break; + case DPNA_DATATYPE_STRING: + memcpy(pvBuffer, &entry->data.string, entry->size); + break; + case DPNA_DATATYPE_STRING_ANSI: + memcpy(pvBuffer, &entry->data.ansi, entry->size); + break; + case DPNA_DATATYPE_BINARY: + memcpy(pvBuffer, &entry->data.binary, entry->size); + break; + } + + return S_OK; + } + } + + return DPNERR_DOESNOTEXIST; } static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByIndex(IDirectPlay8Address *iface, @@ -364,7 +408,6 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * list_add_tail(&This->components, &entry->entry); } - entry->size = dwDataSize; switch (dwDataType) { case DPNA_DATATYPE_DWORD: @@ -402,6 +445,8 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * break; } + entry->size = dwDataSize; + return DPN_OK; } diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index ad35954..5908000 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -102,11 +102,28 @@ static void address_addcomponents(void) hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDirectPlay8Address_GetComponentByName(localaddr, NULL, &compguid, &size, &type); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, NULL, &size, &type); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, NULL, &type); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + size = sizeof(GUID)-1; + hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, &type); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(size == sizeof(GUID), "got %d\n", size); + size = sizeof(GUID); hr = IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, &compguid, &size, &type); - todo_wine ok(IsEqualGUID(&compguid, &IID_Random), "incorrect guid\n"); - ok(size == sizeof(GUID), "incorrect size\n"); - todo_wine ok(type == DPNA_DATATYPE_GUID, "incorrect type\n"); + ok(IsEqualGUID(&compguid, &IID_Random), "incorrect guid\n"); + ok(size == sizeof(GUID), "incorrect size got %d\n", size); + ok(type == DPNA_DATATYPE_GUID, "incorrect type\n"); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8Address_GetNumComponents(localaddr, NULL);

1 0

YongHao Hu : msvcp90: Add ostream::operator<< complex implementation and tests.
by Alexandre Julliard 29 Oct '14

29 Oct '14

Module: wine Branch: master Commit: 24de8560451440821d81bfa10dc77710f9623ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24de8560451440821d81bfa10… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Oct 27 12:43:54 2014 +0800 msvcp90: Add ostream::operator<<complex implementation and tests. --- dlls/msvcp71/msvcp71.spec | 12 ++--- dlls/msvcp80/msvcp80.spec | 12 ++--- dlls/msvcp90/ios.c | 102 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 12 ++--- dlls/msvcp90/tests/ios.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 229 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24de8560451440821d81b…

1 0

Piotr Caban : imm32: Return FALSE on WM_MSIME_* messages in ImmIsUIMessage.
by Alexandre Julliard 29 Oct '14

29 Oct '14

Module: wine Branch: master Commit: 3311684e6e0441923ab384ef945054dfc63123c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3311684e6e0441923ab384ef9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 28 12:19:24 2014 +0100 imm32: Return FALSE on WM_MSIME_* messages in ImmIsUIMessage. --- dlls/imm32/imm.c | 28 ++++++---------------------- dlls/imm32/tests/imm32.c | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2fa31ac..33a0d6da 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1945,28 +1945,20 @@ BOOL WINAPI ImmIsIME(HKL hKL) BOOL WINAPI ImmIsUIMessageA( HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) { - BOOL rc = FALSE; - TRACE("(%p, %x, %ld, %ld)\n", hWndIME, msg, wParam, lParam); if ((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) || (msg == WM_IME_SETCONTEXT) || (msg == WM_IME_NOTIFY) || (msg == WM_IME_COMPOSITIONFULL) || (msg == WM_IME_SELECT) || - (msg == 0x287 /* FIXME: WM_IME_SYSTEM */) || - (msg == WM_MSIME_RECONVERTOPTIONS) || - (msg == WM_MSIME_MOUSE) || - (msg == WM_MSIME_RECONVERTREQUEST) || - (msg == WM_MSIME_RECONVERT) || - (msg == WM_MSIME_QUERYPOSITION) || - (msg == WM_MSIME_DOCUMENTFEED)) + (msg == 0x287 /* FIXME: WM_IME_SYSTEM */)) { if (hWndIME) SendMessageA(hWndIME, msg, wParam, lParam); - rc = TRUE; + return TRUE; } - return rc; + return FALSE; } /*********************************************************************** @@ -1975,28 +1967,20 @@ BOOL WINAPI ImmIsUIMessageA( BOOL WINAPI ImmIsUIMessageW( HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) { - BOOL rc = FALSE; - TRACE("(%p, %x, %ld, %ld)\n", hWndIME, msg, wParam, lParam); if ((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) || (msg == WM_IME_SETCONTEXT) || (msg == WM_IME_NOTIFY) || (msg == WM_IME_COMPOSITIONFULL) || (msg == WM_IME_SELECT) || - (msg == 0x287 /* FIXME: WM_IME_SYSTEM */) || - (msg == WM_MSIME_RECONVERTOPTIONS) || - (msg == WM_MSIME_MOUSE) || - (msg == WM_MSIME_RECONVERTREQUEST) || - (msg == WM_MSIME_RECONVERT) || - (msg == WM_MSIME_QUERYPOSITION) || - (msg == WM_MSIME_DOCUMENTFEED)) + (msg == 0x287 /* FIXME: WM_IME_SYSTEM */)) { if (hWndIME) SendMessageW(hWndIME, msg, wParam, lParam); - rc = TRUE; + return TRUE; } - return rc; + return FALSE; } /*********************************************************************** diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 4c0a888..d434648 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -607,6 +607,14 @@ static void test_ImmIsUIMessage(void) { 0, FALSE } /* mark the end */ }; + UINT WM_MSIME_SERVICE = RegisterWindowMessageA("MSIMEService"); + UINT WM_MSIME_RECONVERTOPTIONS = RegisterWindowMessageA("MSIMEReconvertOptions"); + UINT WM_MSIME_MOUSE = RegisterWindowMessageA("MSIMEMouseOperation"); + UINT WM_MSIME_RECONVERTREQUEST = RegisterWindowMessageA("MSIMEReconvertRequest"); + UINT WM_MSIME_RECONVERT = RegisterWindowMessageA("MSIMEReconvert"); + UINT WM_MSIME_QUERYPOSITION = RegisterWindowMessageA("MSIMEQueryPosition"); + UINT WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); + const struct test *test; BOOL ret; @@ -626,6 +634,21 @@ static void test_ImmIsUIMessage(void) else ok(!msg_spy_find_msg(test->msg), "Windows does not send 0x%x\n", test->msg); } + + ret = pImmIsUIMessageA(NULL, WM_MSIME_SERVICE, 0, 0); + ok(!ret, "ImmIsUIMessageA returned TRUE for WM_MSIME_SERVICE\n"); + ret = pImmIsUIMessageA(NULL, WM_MSIME_RECONVERTOPTIONS, 0, 0); + ok(!ret, "ImmIsUIMessageA returned TRUE for WM_MSIME_RECONVERTOPTIONS\n"); + ret = pImmIsUIMessageA(NULL, WM_MSIME_MOUSE, 0, 0); + ok(!ret, "ImmIsUIMessageA returned TRUE for WM_MSIME_MOUSE\n"); + ret = pImmIsUIMessageA(NULL, WM_MSIME_RECONVERTREQUEST, 0, 0); + ok(!ret, "ImmIsUIMessageA returned TRUE for WM_MSIME_RECONVERTREQUEST\n"); + ret = pImmIsUIMessageA(NULL, WM_MSIME_RECONVERT, 0, 0); + ok(!ret, "ImmIsUIMessageA returned TRUE for WM_MSIME_RECONVERT\n"); + ret = pImmIsUIMessageA(NULL, WM_MSIME_QUERYPOSITION, 0, 0); + ok(!ret, "ImmIsUIMessageA returned TRUE for WM_MSIME_QUERYPOSITION\n"); + ret = pImmIsUIMessageA(NULL, WM_MSIME_DOCUMENTFEED, 0, 0); + ok(!ret, "ImmIsUIMessageA returned TRUE for WM_MSIME_DOCUMENTFEED\n"); } static void test_ImmGetContext(void)

1 0

Piotr Caban : user32: Show that IME window class is one of builtin classes.
by Alexandre Julliard 29 Oct '14

29 Oct '14

Module: wine Branch: master Commit: 43dcd40c0b6042cec4f072079be8c33e77a08b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43dcd40c0b6042cec4f072079… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 28 12:19:40 2014 +0100 user32: Show that IME window class is one of builtin classes. --- dlls/user32/tests/class.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 1d35832..2218e79 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1101,6 +1101,57 @@ static void test_comctl32_classes(void) } } +static void test_IME(void) +{ + static const WCHAR ime_classW[] = {'I','M','E',0}; + + char module_name[MAX_PATH], *ptr; + MEMORY_BASIC_INFORMATION mbi; + HMODULE imm32 = NULL; + WNDCLASSW wnd_classw; + WNDCLASSA wnd_class; + SIZE_T size; + BOOL ret; + + if (!GetProcAddress(GetModuleHandleA("user32.dll"), "BroadcastSystemMessageExA")) + { + skip("BroadcastSystemMessageExA not available, skipping IME class test\n"); + return; + } + + todo_wine ok(GetModuleHandleA("imm32") != 0, "imm32.dll is not loaded\n"); + if (!GetModuleHandleA("imm32")) + imm32 = LoadLibraryA("imm32"); + + ret = GetClassInfoA(NULL, "IME", &wnd_class); + ok(ret, "GetClassInfo failed: %d\n", GetLastError()); + + size = VirtualQuery(wnd_class.lpfnWndProc, &mbi, sizeof(mbi)); + todo_wine ok(size == sizeof(mbi), "VirtualQuery returned %ld\n", size); + if (size == sizeof(mbi)) { + size = GetModuleFileNameA(mbi.AllocationBase, module_name, sizeof(module_name)); + ok(size, "GetModuleFileName failed\n"); + for (ptr = module_name+size-1; ptr > module_name; ptr--) + if (*ptr == '\\' || *ptr == '/') break; + if (*ptr == '\\' || *ptr=='/') ptr++; + ok(!lstrcmpiA(ptr, "user32.dll") || !lstrcmpiA(ptr, "ntdll.dll"), "IME window proc implemented in %s\n", ptr); + } + + ret = GetClassInfoW(NULL, ime_classW, &wnd_classw); + ok(ret, "GetClassInfo failed: %d\n", GetLastError()); + + size = VirtualQuery(wnd_classw.lpfnWndProc, &mbi, sizeof(mbi)); + ok(size == sizeof(mbi), "VirtualQuery returned %ld\n", size); + size = GetModuleFileNameA(mbi.AllocationBase, module_name, sizeof(module_name)); + ok(size, "GetModuleFileName failed\n"); + for (ptr = module_name+size-1; ptr > module_name; ptr--) + if (*ptr == '\\' || *ptr == '/') break; + if (*ptr == '\\' || *ptr=='/') ptr++; + todo_wine ok(!lstrcmpiA(ptr, "user32.dll") || !lstrcmpiA(ptr, "ntdll.dll"), "IME window proc implemented in %s\n", ptr); + + if (imm32) FreeLibrary(imm32); +} + START_TEST(class) { char **argv; @@ -1113,6 +1164,7 @@ START_TEST(class) return; } + test_IME(); test_GetClassInfo(); test_extra_values();

1 0

Huw Davies : gdiplus: Blend in the background colour.
by Alexandre Julliard 29 Oct '14

29 Oct '14

Module: wine Branch: master Commit: 6df5ce7c9ef947df265c389859dc11977ddcf46b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df5ce7c9ef947df265c38985… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 28 16:28:47 2014 +0000 gdiplus: Blend in the background colour. --- dlls/gdiplus/image.c | 23 ++++++++++++ dlls/gdiplus/tests/image.c | 91 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 113 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0564f33..eec76f6 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1483,6 +1483,18 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromResource(HINSTANCE hInstance, return stat; } +static inline DWORD blend_argb_no_bkgnd_alpha(DWORD src, DWORD bkgnd) +{ + BYTE b = (BYTE)src; + BYTE g = (BYTE)(src >> 8); + BYTE r = (BYTE)(src >> 16); + DWORD alpha = (BYTE)(src >> 24); + return ((b + ((BYTE)bkgnd * (255 - alpha) + 127) / 255) | + (g + ((BYTE)(bkgnd >> 8) * (255 - alpha) + 127) / 255) << 8 | + (r + ((BYTE)(bkgnd >> 16) * (255 - alpha) + 127) / 255) << 16 | + (alpha << 24)); +} + GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, HBITMAP* hbmReturn, ARGB background) { @@ -1523,6 +1535,17 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, if (stat == Ok) stat = GdipBitmapUnlockBits(bitmap, &lockeddata); + + if (stat == Ok && (background & 0xffffff)) + { + DWORD *ptr; + UINT i; + for (ptr = (DWORD*)bits, i = 0; i < width * height; ptr++, i++) + { + if ((*ptr & 0xff000000) == 0xff000000) continue; + *ptr = blend_argb_no_bkgnd_alpha(*ptr, background); + } + } } else stat = GenericError; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b88238b..fe80bd6 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1695,6 +1695,10 @@ static void test_createhbitmap(void) stat = GdipDisposeImage((GpImage*)bitmap); expect(Ok, stat); + /* make (1,0) have no alpha and (2,0) a different blue value. */ + bits[7] = 0x00; + bits[8] = 0x40; + /* create alpha Bitmap */ stat = GdipCreateBitmapFromScan0(8, 20, 32, PixelFormat32bppARGB, bits, &bitmap); expect(Ok, stat); @@ -1720,21 +1724,106 @@ static void test_createhbitmap(void) { DWORD val = *(DWORD*)bm.bmBits; ok(val == 0x682a2a2a, "got %x, expected 0x682a2a2a\n", val); + val = *((DWORD*)bm.bmBits + (bm.bmHeight-1) * bm.bmWidthBytes/4 + 1); + ok(val == 0x0, "got %x, expected 0x682a2a2a\n", val); } hdc = CreateCompatibleDC(NULL); oldhbitmap = SelectObject(hdc, hbitmap); pixel = GetPixel(hdc, 5, 5); + expect(0x2a2a2a, pixel); + pixel = GetPixel(hdc, 1, 0); + expect(0x0, pixel); + SelectObject(hdc, oldhbitmap); DeleteDC(hdc); - expect(0x2a2a2a, pixel); DeleteObject(hbitmap); } + /* create HBITMAP with bkgnd colour */ + stat = GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0xff00ff); + expect(Ok, stat); + + if (stat == Ok) + { + ret = GetObjectA(hbitmap, sizeof(BITMAP), &bm); + expect(sizeof(BITMAP), ret); + + expect(0, bm.bmType); + expect(8, bm.bmWidth); + expect(20, bm.bmHeight); + expect(32, bm.bmWidthBytes); + expect(1, bm.bmPlanes); + expect(32, bm.bmBitsPixel); + ok(bm.bmBits != NULL, "got DDB, expected DIB\n"); + + if (bm.bmBits) + { + DWORD val = *(DWORD*)bm.bmBits; + ok(val == 0x68c12ac1, "got %x, expected 0x682a2a2a\n", val); + val = *((DWORD*)bm.bmBits + (bm.bmHeight-1) * bm.bmWidthBytes/4 + 1); + ok(val == 0xff00ff, "got %x, expected 0x682a2a2a\n", val); + } + + hdc = CreateCompatibleDC(NULL); + + oldhbitmap = SelectObject(hdc, hbitmap); + pixel = GetPixel(hdc, 5, 5); + expect(0xc12ac1, pixel); + pixel = GetPixel(hdc, 1, 0); + expect(0xff00ff, pixel); + pixel = GetPixel(hdc, 2, 0); + expect(0xb12ac1, pixel); + + SelectObject(hdc, oldhbitmap); + DeleteDC(hdc); + DeleteObject(hbitmap); + } + + /* create HBITMAP with bkgnd colour with alpha and show it behaves with no alpha. */ + stat = GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0x80ff00ff); + expect(Ok, stat); + + if (stat == Ok) + { + ret = GetObjectA(hbitmap, sizeof(BITMAP), &bm); + expect(sizeof(BITMAP), ret); + + expect(0, bm.bmType); + expect(8, bm.bmWidth); + expect(20, bm.bmHeight); + expect(32, bm.bmWidthBytes); + expect(1, bm.bmPlanes); + expect(32, bm.bmBitsPixel); + ok(bm.bmBits != NULL, "got DDB, expected DIB\n"); + + if (bm.bmBits) + { + DWORD val = *(DWORD*)bm.bmBits; + ok(val == 0x68c12ac1, "got %x, expected 0x682a2a2a\n", val); + val = *((DWORD*)bm.bmBits + (bm.bmHeight-1) * bm.bmWidthBytes/4 + 1); + ok(val == 0xff00ff, "got %x, expected 0x682a2a2a\n", val); + } + + hdc = CreateCompatibleDC(NULL); + + oldhbitmap = SelectObject(hdc, hbitmap); + pixel = GetPixel(hdc, 5, 5); + expect(0xc12ac1, pixel); + pixel = GetPixel(hdc, 1, 0); + expect(0xff00ff, pixel); + pixel = GetPixel(hdc, 2, 0); + expect(0xb12ac1, pixel); + + SelectObject(hdc, oldhbitmap); + DeleteDC(hdc); + DeleteObject(hbitmap); + } + stat = GdipDisposeImage((GpImage*)bitmap); expect(Ok, stat); }

1 0

Alexandre Julliard : kernel32/tests: Use a pointer instead of an array to make gcc happy.
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: 3e1c4908ef5d8ee12e349f760a70cab9758539c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e1c4908ef5d8ee12e349f760… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 28 15:59:55 2014 +0900 kernel32/tests: Use a pointer instead of an array to make gcc happy. --- dlls/kernel32/tests/actctx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index ae9674a..1f5683f 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2055,7 +2055,6 @@ static void run_child_process(void) static void init_paths(void) { LPWSTR ptr; - WCHAR last; static const WCHAR dot_manifest[] = {'.','M','a','n','i','f','e','s','t',0}; static const WCHAR backslash[] = {'\\',0}; @@ -2067,8 +2066,8 @@ static void init_paths(void) ptr[1] = 0; GetCurrentDirectoryW(MAX_PATH, work_dir); - last = work_dir[lstrlenW(work_dir) - 1]; - if (last != '\\' && last != '/') + ptr = work_dir + lstrlenW( work_dir ) - 1; + if (*ptr != '\\' && *ptr != '/') lstrcatW(work_dir, backslash); lstrcpyW(work_dir_subdir, work_dir); lstrcatW(work_dir_subdir, subdir);

1 0