November 2016 - Wine-Commits

Akihiro Sagawa : include: Add ime.h based on mingw-w64.
by Alexandre Julliard Nov. 1, 2016

Nov. 1, 2016

Module: wine Branch: master Commit: fe7a7933ed1f57f2560ef49eaf022efe675a5a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7a7933ed1f57f2560ef49ea… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Nov 1 21:33:13 2016 +0900 include: Add ime.h based on mingw-w64. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ime.h | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 174 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 89004b8..401b02b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -392,6 +392,7 @@ HEADER_SRCS = \ ifdef.h \ ifmib.h \ imagehlp.h \ + ime.h \ imm.h \ in6addr.h \ inaddr.h \ diff --git a/include/ime.h b/include/ime.h new file mode 100644 index 0000000..9312e37 --- /dev/null +++ b/include/ime.h @@ -0,0 +1,173 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef _IME_ +#define _IME_ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _WINDEF_ +typedef unsigned int UINT; +#endif + +#define IME_MAXPROCESS 32 + +LRESULT WINAPI SendIMEMessageExA(HWND,LPARAM); +LRESULT WINAPI SendIMEMessageExW(HWND,LPARAM); +#define SendIMEMessageEx WINELIB_NAME_AW(SendIMEMessageEx) + +typedef struct tagIMESTRUCT { + UINT fnc; + WPARAM wParam; + UINT wCount; + UINT dchSource; + UINT dchDest; + LPARAM lParam1; + LPARAM lParam2; + LPARAM lParam3; +} IMESTRUCT,*PIMESTRUCT,*NPIMESTRUCT,*LPIMESTRUCT; + +#define CP_HWND 0 +#define CP_OPEN 1 +#define CP_DIRECT 2 +#define CP_LEVEL 3 + +#if !defined(VK_DBE_ALPHANUMERIC) +#define VK_DBE_ALPHANUMERIC 0x0f0 +#define VK_DBE_KATAKANA 0x0f1 +#define VK_DBE_HIRAGANA 0x0f2 +#define VK_DBE_SBCSCHAR 0x0f3 +#define VK_DBE_DBCSCHAR 0x0f4 +#define VK_DBE_ROMAN 0x0f5 +#define VK_DBE_NOROMAN 0x0f6 +#define VK_DBE_ENTERWORDREGISTERMODE 0x0f7 +#define VK_DBE_ENTERIMECONFIGMODE 0x0f8 +#define VK_DBE_FLUSHSTRING 0x0f9 +#define VK_DBE_CODEINPUT 0x0fa +#define VK_DBE_NOCODEINPUT 0x0fb +#define VK_DBE_DETERMINESTRING 0x0fc +#define VK_DBE_ENTERDLGCONVERSIONMODE 0x0fd +#endif + +#define MCW_DEFAULT 0x00 +#define MCW_RECT 0x01 +#define MCW_WINDOW 0x02 +#define MCW_SCREEN 0x04 +#define MCW_VERTICAL 0x08 +#define MCW_HIDDEN 0x10 + +#define IME_MODE_ALPHANUMERIC 0x0001 + +#ifdef KOREA +#define IME_MODE_SBCSCHAR 0x0002 +#else +#define IME_MODE_SBCSCHAR 0x0008 +#endif + +#define IME_MODE_KATAKANA 0x0002 +#define IME_MODE_HIRAGANA 0x0004 +#define IME_MODE_HANJACONVERT 0x0004 +#define IME_MODE_DBCSCHAR 0x0010 +#define IME_MODE_ROMAN 0x0020 +#define IME_MODE_NOROMAN 0x0040 +#define IME_MODE_CODEINPUT 0x0080 +#define IME_MODE_NOCODEINPUT 0x0100 + +#define IME_GETIMECAPS 0x03 +#define IME_SETOPEN 0x04 +#define IME_GETOPEN 0x05 +#define IME_GETVERSION 0x07 +#define IME_SETCONVERSIONWINDOW 0x08 +#define IME_MOVEIMEWINDOW IME_SETCONVERSIONWINDOW +#define IME_SETCONVERSIONMODE 0x10 + +#define IME_GETCONVERSIONMODE 0x11 +#define IME_SET_MODE 0x12 +#define IME_SENDVKEY 0x13 +#define IME_ENTERWORDREGISTERMODE 0x18 +#define IME_SETCONVERSIONFONTEX 0x19 + +#define IME_BANJAtoJUNJA 0x13 +#define IME_JUNJAtoBANJA 0x14 +#define IME_JOHABtoKS 0x15 +#define IME_KStoJOHAB 0x16 + +#define IMEA_INIT 0x01 +#define IMEA_NEXT 0x02 +#define IMEA_PREV 0x03 + +#define IME_REQUEST_CONVERT 0x01 +#define IME_ENABLE_CONVERT 0x02 + +#define INTERIM_WINDOW 0x00 +#define MODE_WINDOW 0x01 +#define HANJA_WINDOW 0x02 + +#define IME_RS_ERROR 0x01 +#define IME_RS_NOIME 0x02 +#define IME_RS_TOOLONG 0x05 +#define IME_RS_ILLEGAL 0x06 +#define IME_RS_NOTFOUND 0x07 +#define IME_RS_NOROOM 0x0a +#define IME_RS_DISKERROR 0x0e +#define IME_RS_INVALID 0x11 +#define IME_RS_NEST 0x12 +#define IME_RS_SYSTEMMODAL 0x13 + +#define WM_IME_REPORT 0x0280 + +#define IR_STRINGSTART 0x100 +#define IR_STRINGEND 0x101 +#define IR_OPENCONVERT 0x120 +#define IR_CHANGECONVERT 0x121 +#define IR_CLOSECONVERT 0x122 +#define IR_FULLCONVERT 0x123 +#define IR_IMESELECT 0x130 +#define IR_STRING 0x140 +#define IR_DBCSCHAR 0x160 +#define IR_UNDETERMINE 0x170 +#define IR_STRINGEX 0x180 +#define IR_MODEINFO 0x190 + +#define WM_WNT_CONVERTREQUESTEX 0x0109 +#define WM_CONVERTREQUEST 0x010A +#define WM_CONVERTRESULT 0x010B +#define WM_INTERIM 0x010C + +#define WM_IMEKEYDOWN 0x290 +#define WM_IMEKEYUP 0x291 + +typedef struct tagUNDETERMINESTRUCT { + DWORD dwSize; + UINT uDefIMESize; + UINT uDefIMEPos; + UINT uUndetTextLen; + UINT uUndetTextPos; + UINT uUndetAttrPos; + UINT uCursorPos; + UINT uDeltaStart; + UINT uDetermineTextLen; + UINT uDetermineTextPos; + UINT uDetermineDelimPos; + UINT uYomiTextLen; + UINT uYomiTextPos; + UINT uYomiDelimPos; +} UNDETERMINESTRUCT,*PUNDETERMINESTRUCT,*NPUNDETERMINESTRUCT,*LPUNDETERMINESTRUCT; + +typedef struct tagSTRINGEXSTRUCT { + DWORD dwSize; + UINT uDeterminePos; + UINT uDetermineDelimPos; + UINT uYomiPos; + UINT uYomiDelimPos; +} STRINGEXSTRUCT,*NPSTRINGEXSTRUCT,*LPSTRINGEXSTRUCT; + +#ifdef __cplusplus +} +#endif +#endif

1 0

Nikolay Sivov : d2d1: Fix a typo in traced error message parameter.
by Alexandre Julliard Nov. 1, 2016

Nov. 1, 2016

Module: wine Branch: master Commit: aa552066266df76da23bd22d28743272c05bac8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa552066266df76da23bd22d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 1 03:34:05 2016 +0300 d2d1: Fix a typo in traced error message parameter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 4110b48..d51f53f 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -881,7 +881,7 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b { if (opacity_brush->type >= sizeof(brush_sizes) / sizeof(*brush_sizes)) { - ERR("Unhandled opacity brush type %#x.\n", brush->type); + ERR("Unhandled opacity brush type %#x.\n", opacity_brush->type); return E_NOTIMPL; } buffer_desc.ByteWidth += brush_sizes[opacity_brush->type];

1 0

Akihiro Sagawa : comctl32: Show none hotkey text properly.
by Alexandre Julliard Nov. 1, 2016

Nov. 1, 2016

Module: wine Branch: master Commit: 62d205514c160504ca4f631b03e6d74ab5d5020d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d205514c160504ca4f631b0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Nov 1 21:33:16 2016 +0900 comctl32: Show none hotkey text properly. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/hotkey.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index a72b487..a6b3486 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -140,7 +140,7 @@ HOTKEY_Refresh(HOTKEY_INFO *infoPtr, HDC hdc) TRACE("(infoPtr=%p hdc=%p)\n", infoPtr, hdc); if(!infoPtr->CurrMod && !infoPtr->HotKey) { - HOTKEY_DrawHotKey (infoPtr, hdc, infoPtr->strNone, 4); + HOTKEY_DrawHotKey (infoPtr, hdc, infoPtr->strNone, lstrlenW(infoPtr->strNone)); return; }

1 0

Akihiro Sagawa : winex11: Add Japanese special key support.
by Alexandre Julliard Nov. 1, 2016

Nov. 1, 2016

Module: wine Branch: master Commit: 08b531ed0d317d0ba5d285ea66b0eec32afa1355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b531ed0d317d0ba5d285ea6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Nov 1 21:33:15 2016 +0900 winex11: Add Japanese special key support. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index e9c7b7f..37e51b2 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -46,6 +46,7 @@ #include "winuser.h" #include "winreg.h" #include "winnls.h" +#include "ime.h" #include "x11drv.h" #include "wine/server.h" #include "wine/unicode.h" @@ -980,11 +981,14 @@ static const WORD nonchar_key_vkey[256] = VK_BACK, VK_TAB, 0, VK_CLEAR, 0, VK_RETURN, 0, 0, /* FF08 */ 0, 0, 0, VK_PAUSE, VK_SCROLL, 0, 0, 0, /* FF10 */ 0, 0, 0, VK_ESCAPE, 0, 0, 0, 0, /* FF18 */ - /* unused */ - 0, 0, 0, 0, 0, 0, 0, 0, /* FF20 */ - 0, 0, 0, 0, 0, 0, 0, 0, /* FF28 */ - 0, VK_HANGUL, 0, 0, VK_HANJA, 0, 0, 0, /* FF30 */ + /* Japanese special keys */ + 0, VK_KANJI, VK_NONCONVERT, VK_CONVERT, /* FF20 */ + VK_DBE_ROMAN, 0, 0, VK_DBE_HIRAGANA, + 0, 0, VK_DBE_SBCSCHAR, 0, 0, 0, 0, 0, /* FF28 */ + /* Korean special keys (FF31-) */ + VK_DBE_ALPHANUMERIC, VK_HANGUL, 0, 0, VK_HANJA, 0, 0, 0, /* FF30 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FF38 */ + /* unused */ 0, 0, 0, 0, 0, 0, 0, 0, /* FF40 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FF48 */ /* cursor keys */ @@ -1034,11 +1038,13 @@ static const WORD nonchar_key_scan[256] = 0x0E, 0x0F, 0x00, /*?*/ 0, 0x00, 0x1C, 0x00, 0x00, /* FF08 */ 0x00, 0x00, 0x00, 0x45, 0x46, 0x00, 0x00, 0x00, /* FF10 */ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, /* FF18 */ - /* unused */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF20 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF28 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF30 */ + /* Japanese special keys */ + 0x00, 0x29, 0x7B, 0x79, 0x70, 0x00, 0x00, 0x70, /* FF20 */ + 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF28 */ + /* Korean special keys (FF31-) */ + 0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF30 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF38 */ + /* unused */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF40 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF48 */ /* cursor keys */

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.22
by Jeremy Newman Nov. 1, 2016

Nov. 1, 2016

Module: website Branch: master Commit: f08407c67d1bf92cdce898646c3b8a55ec6648a4 URL: http://source.winehq.org/git/website.git/?a=commit;h=f08407c67d1bf92cdce898… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Oct 29 07:52:27 2016 +0200 Polish translation for release 1.9.22 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016102801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2016102801.xml b/news/pl/2016102801.xml new file mode 100644 index 0000000..594420b --- /dev/null +++ b/news/pl/2016102801.xml @@ -0,0 +1,16 @@ +<news> +<date>Październik 28, 2016</date> +<title>Wydano Wine 1.9.22</title> +<body> + Wydanie rozwojowe Wine 1.9.22 jest już dostępne. + <a href="{$root}/announce/1.9.22">Co nowego</a> w tym wydaniu: +<ul> + <li>Przystosowano obsługę schowka macOS do nowej struktury.</li> + <li>Początkowa implementacja wyświetlania bitmap w Direct2D.</li> + <li>Szersza implementacja UsługSieciowych.</li> + <li>Kilka kroków dalej do implementacji obsługi HID.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.22.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0