May 2016 - Wine-commits - list.winehq.org

Francois Gouget : dwrite: Notify_factory_fallback_removed() is unused so remove it.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: b62c76207fae4af63271d19dc74a65e8f7a97072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b62c76207fae4af63271d19dc… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:38:42 2016 +0200 dwrite: Notify_factory_fallback_removed() is unused so remove it. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 7c9f085..9b1c50f 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -540,12 +540,6 @@ static inline struct dwritefactory *impl_from_IDWriteFactory3(IDWriteFactory3 *i return CONTAINING_RECORD(iface, struct dwritefactory, IDWriteFactory3_iface); } -void notify_factory_fallback_removed(IDWriteFactory3 *iface) -{ - struct dwritefactory *factory = impl_from_IDWriteFactory3(iface); - factory->fallback = NULL; -} - static void release_fontface_cache(struct list *fontfaces) { struct fontfacecached *fontface, *fontface2;

1 0

Francois Gouget : user32/tests: Fix a spelling error in a scroll comment.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 6fe747bbbc66bea5c410bd9e135078ebbc1384f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe747bbbc66bea5c410bd9e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:36:03 2016 +0200 user32/tests: Fix a spelling error in a scroll comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/scroll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 1c454fb..7691af3 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -114,7 +114,7 @@ static void test_EnableScrollBar(void) ok( ret, "The scrollbar should be enabled.\n" ); ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); - /* disable window, try to reenable */ + /* disable window, try to re-enable */ ret = EnableWindow( hScroll, FALSE ); ok( !ret, "got %d\n", ret ); ok( !IsWindowEnabled( hScroll ), "The scrollbar window should be disabled.\n" );

1 0

Francois Gouget : kernel32/tests: Fix a spelling typo in a virtual comment.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 2bd154d838d2443a680f3e4698cf5cc7c2c23837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bd154d838d2443a680f3e469… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:33:17 2016 +0200 kernel32/tests: Fix a spelling typo in a virtual comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 5503e25..37206b5 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2591,7 +2591,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) ok( count == 1, "wrong count %lu\n", count ); ok( results[0] == base, "wrong result %p\n", results[0] ); - /* Create a new window class and associcated Window (see above) */ + /* Create a new window class and associated Window (see above) */ success = VirtualProtect( base, size, PAGE_EXECUTE_READWRITE, &old_prot ); ok( success, "VirtualProtect failed %u\n", GetLastError() );

1 0

Nikolay Sivov : kernel32/nls: Added SSHORTESTDAYNAME* entries.
by Alexandre Julliard 16 May '16

16 May '16

1 0

Alexandre Julliard : kernel32/nls: Convert remaining files to UTF-8.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: d2fb19d6f7bdf39cd5685bb2a467acd1b1c6089f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fb19d6f7bdf39cd5685bb2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 16 15:40:44 2016 +0900 kernel32/nls: Convert remaining files to UTF-8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/tha.nls | 104 +++++++++++++++++++++++----------------------- dlls/kernel32/nls/vit.nls | 64 ++++++++++++++-------------- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/dlls/kernel32/nls/tha.nls b/dlls/kernel32/nls/tha.nls index 8602b0f..7e2e6ad 100644 --- a/dlls/kernel32/nls/tha.nls +++ b/dlls/kernel32/nls/tha.nls @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(874) +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT { @@ -65,37 +65,37 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_S1159 "AM" LOCALE_S2359 "PM" LOCALE_SABBREVCTRYNAME "THA" - LOCALE_SABBREVDAYNAME1 "�." - LOCALE_SABBREVDAYNAME2 "�." - LOCALE_SABBREVDAYNAME3 "�." - LOCALE_SABBREVDAYNAME4 "��." - LOCALE_SABBREVDAYNAME5 "�." - LOCALE_SABBREVDAYNAME6 "�." - LOCALE_SABBREVDAYNAME7 "��." + LOCALE_SABBREVDAYNAME1 "จ." + LOCALE_SABBREVDAYNAME2 "อ." + LOCALE_SABBREVDAYNAME3 "พ." + LOCALE_SABBREVDAYNAME4 "พฤ." + LOCALE_SABBREVDAYNAME5 "ศ." + LOCALE_SABBREVDAYNAME6 "ส." + LOCALE_SABBREVDAYNAME7 "อา." LOCALE_SABBREVLANGNAME "THA" - LOCALE_SABBREVMONTHNAME1 "�.�." - LOCALE_SABBREVMONTHNAME2 "�.�." - LOCALE_SABBREVMONTHNAME3 "��.�." - LOCALE_SABBREVMONTHNAME4 "��.�." - LOCALE_SABBREVMONTHNAME5 "�.�." - LOCALE_SABBREVMONTHNAME6 "��.�." - LOCALE_SABBREVMONTHNAME7 "�.�." - LOCALE_SABBREVMONTHNAME8 "�.�." - LOCALE_SABBREVMONTHNAME9 "�.�." - LOCALE_SABBREVMONTHNAME10 "�.�." - LOCALE_SABBREVMONTHNAME11 "�.�." - LOCALE_SABBREVMONTHNAME12 "�.�." + LOCALE_SABBREVMONTHNAME1 "ม.ค." + LOCALE_SABBREVMONTHNAME2 "ก.พ." + LOCALE_SABBREVMONTHNAME3 "มี.ค." + LOCALE_SABBREVMONTHNAME4 "เม.ย." + LOCALE_SABBREVMONTHNAME5 "พ.ค." + LOCALE_SABBREVMONTHNAME6 "มิ.ย." + LOCALE_SABBREVMONTHNAME7 "ก.ค." + LOCALE_SABBREVMONTHNAME8 "ส.ค." + LOCALE_SABBREVMONTHNAME9 "ก.ย." + LOCALE_SABBREVMONTHNAME10 "ต.ค." + LOCALE_SABBREVMONTHNAME11 "พ.ย." + LOCALE_SABBREVMONTHNAME12 "ธ.ค." LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Thailand" - LOCALE_SCURRENCY "�" + LOCALE_SCURRENCY "฿" LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "�ѹ��" - LOCALE_SDAYNAME2 "�ѧ��" - LOCALE_SDAYNAME3 "�ظ" - LOCALE_SDAYNAME4 "��ʺ��" - LOCALE_SDAYNAME5 "�ء��" - LOCALE_SDAYNAME6 "��" - LOCALE_SDAYNAME7 "�ҷԵ��" + LOCALE_SDAYNAME1 "จันทร์" + LOCALE_SDAYNAME2 "อังคาร" + LOCALE_SDAYNAME3 "พุธ" + LOCALE_SDAYNAME4 "พฤหัสบดี" + LOCALE_SDAYNAME5 "ศุกร์" + LOCALE_SDAYNAME6 "เสาร์" + LOCALE_SDAYNAME7 "อาทิตย์" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Thailand" LOCALE_SENGCURRNAME "Thai Baht" @@ -109,38 +109,38 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "." LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "��Ҥ�" - LOCALE_SMONTHNAME2 "��Ҿѹ��" - LOCALE_SMONTHNAME3 "�չҤ�" - LOCALE_SMONTHNAME4 "��¹" - LOCALE_SMONTHNAME5 "��Ҥ�" - LOCALE_SMONTHNAME6 "�Զع�¹" - LOCALE_SMONTHNAME7 "�á�Ҥ�" - LOCALE_SMONTHNAME8 "�ԧ�Ҥ�" - LOCALE_SMONTHNAME9 "�ѹ��¹" - LOCALE_SMONTHNAME10 "��Ҥ�" - LOCALE_SMONTHNAME11 "��Ȩԡ�¹" - LOCALE_SMONTHNAME12 "�ѹ�Ҥ�" + LOCALE_SMONTHNAME1 "มกราคม" + LOCALE_SMONTHNAME2 "กุมภาพันธ์" + LOCALE_SMONTHNAME3 "มีนาคม" + LOCALE_SMONTHNAME4 "เมษายน" + LOCALE_SMONTHNAME5 "พฤษภาคม" + LOCALE_SMONTHNAME6 "มิถุนายน" + LOCALE_SMONTHNAME7 "กรกฎาคม" + LOCALE_SMONTHNAME8 "สิงหาคม" + LOCALE_SMONTHNAME9 "กันยายน" + LOCALE_SMONTHNAME10 "ตุลาคม" + LOCALE_SMONTHNAME11 "พฤศจิกายน" + LOCALE_SMONTHNAME12 "ธันวาคม" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "th-TH" - LOCALE_SNATIVECTRYNAME "��" - LOCALE_SNATIVECURRNAME "�ҷ" - LOCALE_SNATIVEDIGITS "��" - LOCALE_SNATIVEDISPLAYNAME "�� (��)" - LOCALE_SNATIVELANGNAME "��" + LOCALE_SNATIVECTRYNAME "ไทย" + LOCALE_SNATIVECURRNAME "บาท" + LOCALE_SNATIVEDIGITS "๐๑๒๓๔๕๖๗๘๙" + LOCALE_SNATIVEDISPLAYNAME "ไทย (ไทย)" + LOCALE_SNATIVELANGNAME "ไทย" LOCALE_SNEGATIVESIGN "-" LOCALE_SOPENTYPELANGUAGETAG "THA " LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Thai;" LOCALE_SSHORTDATE "d/M/yyyy" - LOCALE_SSHORTESTDAYNAME1 "�." - LOCALE_SSHORTESTDAYNAME2 "�." - LOCALE_SSHORTESTDAYNAME3 "�." - LOCALE_SSHORTESTDAYNAME4 "��." - LOCALE_SSHORTESTDAYNAME5 "�." - LOCALE_SSHORTESTDAYNAME6 "�." - LOCALE_SSHORTESTDAYNAME7 "��." + LOCALE_SSHORTESTDAYNAME1 "จ." + LOCALE_SSHORTESTDAYNAME2 "อ." + LOCALE_SSHORTESTDAYNAME3 "พ." + LOCALE_SSHORTESTDAYNAME4 "พฤ." + LOCALE_SSHORTESTDAYNAME5 "ศ." + LOCALE_SSHORTESTDAYNAME6 "ส." + LOCALE_SSHORTESTDAYNAME7 "อา." LOCALE_SSHORTTIME "H:mm" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," diff --git a/dlls/kernel32/nls/vit.nls b/dlls/kernel32/nls/vit.nls index 182b230..89b030c 100644 --- a/dlls/kernel32/nls/vit.nls +++ b/dlls/kernel32/nls/vit.nls @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(1258) +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT { @@ -67,10 +67,10 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SABBREVCTRYNAME "VNM" LOCALE_SABBREVDAYNAME1 "hai" LOCALE_SABBREVDAYNAME2 "ba" - LOCALE_SABBREVDAYNAME3 "t�" - LOCALE_SABBREVDAYNAME4 "n�m" - LOCALE_SABBREVDAYNAME5 "sa�u" - LOCALE_SABBREVDAYNAME6 "ba�y" + LOCALE_SABBREVDAYNAME3 "tư" + LOCALE_SABBREVDAYNAME4 "năm" + LOCALE_SABBREVDAYNAME5 "sáu" + LOCALE_SABBREVDAYNAME6 "bảy" LOCALE_SABBREVDAYNAME7 "cn" LOCALE_SABBREVLANGNAME "VIT" LOCALE_SABBREVMONTHNAME1 "th1" @@ -87,15 +87,15 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME12 "th12" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Viet Nam" - LOCALE_SCURRENCY "�" + LOCALE_SCURRENCY "₫" LOCALE_SDATE "/" - LOCALE_SDAYNAME1 "th�� hai" - LOCALE_SDAYNAME2 "th�� ba" - LOCALE_SDAYNAME3 "th�� t�" - LOCALE_SDAYNAME4 "th�� n�m" - LOCALE_SDAYNAME5 "th�� sa�u" - LOCALE_SDAYNAME6 "th�� ba�y" - LOCALE_SDAYNAME7 "chu� nh��t" + LOCALE_SDAYNAME1 "thứ hai" + LOCALE_SDAYNAME2 "thứ ba" + LOCALE_SDAYNAME3 "thứ tư" + LOCALE_SDAYNAME4 "thứ năm" + LOCALE_SDAYNAME5 "thứ sáu" + LOCALE_SDAYNAME6 "thứ bảy" + LOCALE_SDAYNAME7 "chủ nhật" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Viet Nam" LOCALE_SENGCURRNAME "Vietnamese Dong" @@ -109,26 +109,26 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" - LOCALE_SMONTHNAME1 "tha�ng m��t" - LOCALE_SMONTHNAME2 "tha�ng hai" - LOCALE_SMONTHNAME3 "tha�ng ba" - LOCALE_SMONTHNAME4 "tha�ng t�" - LOCALE_SMONTHNAME5 "tha�ng n�m" - LOCALE_SMONTHNAME6 "tha�ng sa�u" - LOCALE_SMONTHNAME7 "tha�ng ba�y" - LOCALE_SMONTHNAME8 "tha�ng ta�m" - LOCALE_SMONTHNAME9 "tha�ng chi�n" - LOCALE_SMONTHNAME10 "tha�ng m��i" - LOCALE_SMONTHNAME11 "tha�ng m��i m��t" - LOCALE_SMONTHNAME12 "tha�ng m��i hai" + LOCALE_SMONTHNAME1 "tháng một" + LOCALE_SMONTHNAME2 "tháng hai" + LOCALE_SMONTHNAME3 "tháng ba" + LOCALE_SMONTHNAME4 "tháng tư" + LOCALE_SMONTHNAME5 "tháng năm" + LOCALE_SMONTHNAME6 "tháng sáu" + LOCALE_SMONTHNAME7 "tháng bảy" + LOCALE_SMONTHNAME8 "tháng tám" + LOCALE_SMONTHNAME9 "tháng chín" + LOCALE_SMONTHNAME10 "tháng mười" + LOCALE_SMONTHNAME11 "tháng mười một" + LOCALE_SMONTHNAME12 "tháng mười hai" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." LOCALE_SNAME "vi-VN" - LOCALE_SNATIVECTRYNAME "Vi��t Nam" + LOCALE_SNATIVECTRYNAME "Việt Nam" LOCALE_SNATIVECURRNAME L"Do\x0302\x0300ng" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVEDISPLAYNAME "Ti��ng Vi��t Nam (Vi��t Nam)" - LOCALE_SNATIVELANGNAME "Ti��ng Vi��t Nam" + LOCALE_SNATIVEDISPLAYNAME "Tiếng Việt Nam (Việt Nam)" + LOCALE_SNATIVELANGNAME "Tiếng Việt Nam" LOCALE_SNEGATIVESIGN "-" LOCALE_SOPENTYPELANGUAGETAG "VIT " LOCALE_SPOSITIVESIGN "" @@ -136,10 +136,10 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_SSHORTDATE "dd/MM/yyyy" LOCALE_SSHORTESTDAYNAME1 "hai" LOCALE_SSHORTESTDAYNAME2 "ba" - LOCALE_SSHORTESTDAYNAME3 "t�" - LOCALE_SSHORTESTDAYNAME4 "n�m" - LOCALE_SSHORTESTDAYNAME5 "sa�u" - LOCALE_SSHORTESTDAYNAME6 "ba�y" + LOCALE_SSHORTESTDAYNAME3 "tư" + LOCALE_SSHORTESTDAYNAME4 "năm" + LOCALE_SSHORTESTDAYNAME5 "sáu" + LOCALE_SSHORTESTDAYNAME6 "bảy" LOCALE_SSHORTESTDAYNAME7 "cn" LOCALE_SSHORTTIME "h:mm tt" LOCALE_SSORTNAME "Default"

1 0

Nikolay Sivov : webservices: Actually use channel type in WsCreateServiceProxyFromTemplate() (Clang).
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 8b5a9051bff83c6e8321920c8c43ca0e76ff6c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b5a9051bff83c6e8321920c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 00:18:16 2016 +0300 webservices: Actually use channel type in WsCreateServiceProxyFromTemplate() (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/proxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index aceaf6b..cd90e36 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -172,7 +172,7 @@ HRESULT WINAPI WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE channel_type, return E_NOTIMPL; } - if ((hr = create_channel( type, binding, channel_props, channel_props_count, &channel )) != S_OK) + if ((hr = create_channel( channel_type, binding, channel_props, channel_props_count, &channel )) != S_OK) return hr; if ((hr = create_proxy( channel, properties, count, handle )) != S_OK)

1 0

Alexandre Julliard : comctl32/status: Use DrawFrameControl to draw the size grip.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 7f8bf3e7bb1d7e3441e17dfc2b83a3b1963d838e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8bf3e7bb1d7e3441e17dfc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 14 12:38:18 2016 +0900 comctl32/status: Use DrawFrameControl to draw the size grip. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 48 +++++++----------------------------------------- 1 file changed, 7 insertions(+), 41 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 4528e24..738c33b 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -143,60 +143,26 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) static void STATUSBAR_DrawSizeGrip (HTHEME theme, HDC hdc, LPRECT lpRect) { - HPEN hPenFace, hPenShadow, hPenHighlight, hOldPen; - POINT pt; - INT i; + RECT rc = *lpRect; TRACE("draw size grip %s\n", wine_dbgstr_rect(lpRect)); if (theme) { - RECT gripperRect; SIZE gripperSize; - gripperRect = *lpRect; if (SUCCEEDED (GetThemePartSize (theme, hdc, SP_GRIPPER, 0, lpRect, TS_DRAW, &gripperSize))) { - gripperRect.left = gripperRect.right - gripperSize.cx; - gripperRect.top = gripperRect.bottom - gripperSize.cy; - if (SUCCEEDED (DrawThemeBackground(theme, hdc, SP_GRIPPER, 0, &gripperRect, NULL))) + rc.left = rc.right - gripperSize.cx; + rc.top = rc.bottom - gripperSize.cy; + if (SUCCEEDED (DrawThemeBackground(theme, hdc, SP_GRIPPER, 0, &rc, NULL))) return; } } - pt.x = lpRect->right - 1; - pt.y = lpRect->bottom - 1; - - hPenFace = CreatePen( PS_SOLID, 1, comctl32_color.clr3dFace); - hOldPen = SelectObject( hdc, hPenFace ); - MoveToEx (hdc, pt.x - 12, pt.y, NULL); - LineTo (hdc, pt.x, pt.y); - LineTo (hdc, pt.x, pt.y - 13); - - pt.x--; - pt.y--; - - hPenShadow = CreatePen( PS_SOLID, 1, comctl32_color.clr3dShadow); - SelectObject( hdc, hPenShadow ); - for (i = 1; i < 11; i += 4) { - MoveToEx (hdc, pt.x - i, pt.y, NULL); - LineTo (hdc, pt.x + 1, pt.y - i - 1); - - MoveToEx (hdc, pt.x - i - 1, pt.y, NULL); - LineTo (hdc, pt.x + 1, pt.y - i - 2); - } - - hPenHighlight = CreatePen( PS_SOLID, 1, comctl32_color.clr3dHilight); - SelectObject( hdc, hPenHighlight ); - for (i = 3; i < 13; i += 4) { - MoveToEx (hdc, pt.x - i, pt.y, NULL); - LineTo (hdc, pt.x + 1, pt.y - i - 1); - } - - SelectObject (hdc, hOldPen); - DeleteObject( hPenFace ); - DeleteObject( hPenShadow ); - DeleteObject( hPenHighlight ); + rc.left = max( rc.left, rc.right - GetSystemMetrics(SM_CXVSCROLL) - 1 ); + rc.top = max( rc.top, rc.bottom - GetSystemMetrics(SM_CYHSCROLL) - 1 ); + DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); }

1 0

Akihiro Sagawa : imm32: Avoid null pointer dereference in trace.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 29043ff9757fdb3c0637440e3a724bb82e734db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29043ff9757fdb3c0637440e3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 8 20:25:10 2016 +0900 imm32: Avoid null pointer dereference in trace. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index af47470..85b1045 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2408,9 +2408,10 @@ BOOL WINAPI ImmSetCompositionWindow( InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %p)\n", hIMC, lpCompForm); - TRACE("\t%x, (%i,%i), (%i,%i - %i,%i)\n",lpCompForm->dwStyle, - lpCompForm->ptCurrentPos.x, lpCompForm->ptCurrentPos.y, lpCompForm->rcArea.top, - lpCompForm->rcArea.left, lpCompForm->rcArea.bottom, lpCompForm->rcArea.right); + if (lpCompForm) + TRACE("\t%x, (%i,%i), (%i,%i - %i,%i)\n",lpCompForm->dwStyle, + lpCompForm->ptCurrentPos.x, lpCompForm->ptCurrentPos.y, lpCompForm->rcArea.top, + lpCompForm->rcArea.left, lpCompForm->rcArea.bottom, lpCompForm->rcArea.right); if (!data) {

1 0

Akihiro Sagawa : imm32: Use wine_dbgstr_rect() and wine_dbgstr_point() in traces.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 57510485009bd1d3ce785c2b4aabfb3b5db33335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57510485009bd1d3ce785c2b4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 8 20:25:11 2016 +0900 imm32: Use wine_dbgstr_rect() and wine_dbgstr_point() in traces. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 85b1045..3c805dc 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2218,11 +2218,10 @@ BOOL WINAPI ImmSetCandidateWindow( if (IMM_IsCrossThreadAccess(NULL, hIMC)) return FALSE; - TRACE("\t%x, %x, (%i,%i), (%i,%i - %i,%i)\n", - lpCandidate->dwIndex, lpCandidate->dwStyle, - lpCandidate->ptCurrentPos.x, lpCandidate->ptCurrentPos.y, - lpCandidate->rcArea.top, lpCandidate->rcArea.left, - lpCandidate->rcArea.bottom, lpCandidate->rcArea.right); + TRACE("\t%x, %x, %s, %s\n", + lpCandidate->dwIndex, lpCandidate->dwStyle, + wine_dbgstr_point(&lpCandidate->ptCurrentPos), + wine_dbgstr_rect(&lpCandidate->rcArea)); if ( lpCandidate->dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) return FALSE; @@ -2409,9 +2408,9 @@ BOOL WINAPI ImmSetCompositionWindow( TRACE("(%p, %p)\n", hIMC, lpCompForm); if (lpCompForm) - TRACE("\t%x, (%i,%i), (%i,%i - %i,%i)\n",lpCompForm->dwStyle, - lpCompForm->ptCurrentPos.x, lpCompForm->ptCurrentPos.y, lpCompForm->rcArea.top, - lpCompForm->rcArea.left, lpCompForm->rcArea.bottom, lpCompForm->rcArea.right); + TRACE("\t%x, %s, %s\n", lpCompForm->dwStyle, + wine_dbgstr_point(&lpCompForm->ptCurrentPos), + wine_dbgstr_rect(&lpCompForm->rcArea)); if (!data) { @@ -2534,7 +2533,7 @@ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) if (IMM_IsCrossThreadAccess(NULL, hIMC)) return FALSE; - TRACE("\t(%i,%i)\n", lpptPos->x, lpptPos->y); + TRACE("\t%s\n", wine_dbgstr_point(lpptPos)); data->IMC.ptStatusWndPos = *lpptPos; ImmNotifyIME( hIMC, NI_CONTEXTUPDATED, 0, IMC_SETSTATUSWINDOWPOS);

1 0

Hugh McMaster : reg/tests: Add tests for 'reg query'.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 08853dcd0374bf43a7af0e4af213fa377d8be795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08853dcd0374bf43a7af0e4af… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 11 11:05:03 2016 +0000 reg/tests: Add tests for 'reg query'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 927288d..3237025 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -500,7 +500,111 @@ static void test_delete(void) static void test_query(void) { DWORD r; - run_reg_exe("reg Query", &r); + HKEY key, subkey; + LONG err; + const char hello[] = "Hello"; + const char world[] = "World"; + const char empty1[] = "Empty1"; + const char empty2[] = "Empty2"; + const DWORD dword1 = 0x123; + const DWORD dword2 = 0xabc; + + run_reg_exe("reg query", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Create a test key */ + err = RegCreateKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); + todo_wine ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), + "got exit code %d, expected 0\n", r); + + err = RegSetValueExA(key, "Test", 0, REG_SZ, (BYTE *)hello, sizeof(hello)); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegSetValueExA(key, "Wine", 0, REG_DWORD, (BYTE *)&dword1, sizeof(dword1)); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegSetValueExA(key, NULL, 0, REG_SZ, (BYTE *)empty1, sizeof(empty1)); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + run_reg_exe("reg query HKCU\\" KEY_BASE, &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Missing", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Wine", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + /* Create a test subkey */ + err = RegCreateKeyExA(key, "Subkey", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &subkey, NULL); + ok(err == ERROR_SUCCESS, "got %d\n", err); + + err = RegSetValueExA(subkey, "Test", 0, REG_SZ, (BYTE *)world, sizeof(world)); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegSetValueExA(subkey, "Wine", 0, REG_DWORD, (BYTE *)&dword2, sizeof(dword2)); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegSetValueExA(subkey, NULL, 0, REG_SZ, (BYTE *)empty2, sizeof(empty2)); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegCloseKey(subkey); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Wine", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /ve", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + /* Test recursion */ + run_reg_exe("reg query HKCU\\" KEY_BASE " /s", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /s", &r); + ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, + "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Wine /s", &r); + ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, + "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /ve /s", &r); + ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, + "got exit code %d, expected 0\n", r); + + /* Clean-up, then query */ + err = RegDeleteKeyA(key, "subkey"); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegCloseKey(key); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + run_reg_exe("reg query HKCU\\" KEY_BASE, &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); }

1 0