April 2008 - Wine-commits - list.winehq.org

David Adam : amstream: Register CLSID_AMDirectDrawStream.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 8c21ebc6854d46c486e9e29e100a414fbdfef90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c21ebc6854d46c486e9e29e1… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun Apr 27 12:16:33 2008 +0200 amstream: Register CLSID_AMDirectDrawStream. --- dlls/amstream/main.c | 1 + dlls/amstream/regsvr.c | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 080fc17..7bebe90 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -74,6 +74,7 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { { &CLSID_AMMultiMediaStream, AM_create }, + { &CLSID_AMDirectDrawStream, AM_create }, }; static HRESULT WINAPI diff --git a/dlls/amstream/regsvr.c b/dlls/amstream/regsvr.c index 054de6a..478818f 100644 --- a/dlls/amstream/regsvr.c +++ b/dlls/amstream/regsvr.c @@ -447,6 +447,14 @@ static struct regsvr_coclass const coclass_list[] = { "amstream.dll", "Both" }, + + { &CLSID_AMDirectDrawStream, + "ActiveMovie MultiMedia Stream", + NULL, + "amstream.dll", + "Both" + }, + { NULL } /* list terminator */ };

1 0

Jeff Zaroyko : msacm32.drv: Increase the reported vDriverVersion.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 120cd69ddd07b9ef45afcd2db4653d870f89ed67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120cd69ddd07b9ef45afcd2db… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Sun Apr 27 17:27:39 2008 +1000 msacm32.drv: Increase the reported vDriverVersion. --- dlls/msacm32.drv/wavemap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index 38bb1f1..9e58a3d 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -509,7 +509,7 @@ static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveC WAVEOUTCAPSW woc; woc.wMid = 0x00FF; woc.wPid = 0x0001; - woc.vDriverVersion = 0x0100; + woc.vDriverVersion = 0x0332; lstrcpyW(woc.szPname, name); woc.dwFormats = WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 |

1 0

Jeff Zaroyko : wine.inf: Use lowercase for some drivers32 entries and remove trailing whitespace.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: c6d0d6d1854547e25614040aed2946d7ad0bcf26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6d0d6d1854547e25614040ae… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Mon Apr 28 19:21:45 2008 +1000 wine.inf: Use lowercase for some drivers32 entries and remove trailing whitespace. --- tools/wine.inf.in | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 5a610d4..f3750b3 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2295,25 +2295,25 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Internet Explorer,iexplore.exe [SystemIni] -system.ini, mci,,"MPEGVideo=mciqtz.drv" -system.ini, mci,,"MPEGVideo2=mciqtz.drv" -system.ini, mci,,"avivideo=mciavi32.dll" -system.ini, mci,,"cdaudio=mcicda.dll" -system.ini, mci,,"sequencer=mciseq.dll" -system.ini, mci,,"vcr=mcivisca.drv" -system.ini, mci,,"; videodisc=mcipionr.drv" -system.ini, mci,,"waveaudio=mciwave.dll" - -system.ini, drivers32,,"MSACM.imaadpcm=imaadp32.acm" -system.ini, drivers32,,"MSACM.msadpcm=msadp32.acm" -system.ini, drivers32,,"MSACM.msg711=msg711.acm" -system.ini, drivers32,,"MSACM.winemp3=winemp3.acm" -system.ini, drivers32,,"vidc.MRLE=msrle32.dll" -system.ini, drivers32,,"vidc.MSVC=msvidc32.dll" -system.ini, drivers32,,"vidc.CVID=iccvid.dll" -system.ini, drivers32,,"; vidc.IV50=ir50_32.dll" -system.ini, drivers32,,"; vidc.IV31=ir32_32.dll" -system.ini, drivers32,,"; vidc.IV32=ir32_32.dll" +system.ini, mci,,"MPEGVideo=mciqtz.drv" +system.ini, mci,,"MPEGVideo2=mciqtz.drv" +system.ini, mci,,"avivideo=mciavi32.dll" +system.ini, mci,,"cdaudio=mcicda.dll" +system.ini, mci,,"sequencer=mciseq.dll" +system.ini, mci,,"vcr=mcivisca.drv" +system.ini, mci,,"; videodisc=mcipionr.drv" +system.ini, mci,,"waveaudio=mciwave.dll" + +system.ini, drivers32,,"msacm.imaadpcm=imaadp32.acm" +system.ini, drivers32,,"msacm.msadpcm=msadp32.acm" +system.ini, drivers32,,"msacm.msg711=msg711.acm" +system.ini, drivers32,,"msacm.winemp3=winemp3.acm" +system.ini, drivers32,,"vidc.mrle=msrle32.dll" +system.ini, drivers32,,"vidc.msvc=msvidc32.dll" +system.ini, drivers32,,"vidc.cvid=iccvid.dll" +system.ini, drivers32,,"; vidc.IV50=ir50_32.dll" +system.ini, drivers32,,"; vidc.IV31=ir32_32.dll" +system.ini, drivers32,,"; vidc.IV32=ir32_32.dll" [Timezones] ; The timezone information (TZI field) comes from the Olson timezone database

1 0

Alistair Leslie-Hughes : msxml3: Added IObjectWithSite support in IXMLDOMDocument2.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 340f34ddf632fab78608075781d273c6520f5999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=340f34ddf632fab7860807578… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Apr 26 22:55:05 2008 +1000 msxml3: Added IObjectWithSite support in IXMLDOMDocument2. --- dlls/msxml3/domdoc.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a05247a..7ce17bd 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -34,6 +34,7 @@ #include "urlmon.h" #include "winreg.h" #include "shlwapi.h" +#include "ocidl.h" #include "wine/debug.h" @@ -169,6 +170,7 @@ typedef struct _domdoc { const struct IXMLDOMDocument2Vtbl *lpVtbl; const struct IPersistStreamVtbl *lpvtblIPersistStream; + const struct IObjectWithSiteVtbl *lpvtblIObjectWithSite; LONG ref; VARIANT_BOOL async; VARIANT_BOOL validating; @@ -182,6 +184,9 @@ typedef struct _domdoc /* IPersistStream */ IStream *stream; + + /* IObjectWithSite*/ + IUnknown *site; } domdoc; LONG xmldoc_add_ref(xmlDocPtr doc) @@ -219,6 +224,11 @@ static inline domdoc *impl_from_IPersistStream(IPersistStream *iface) return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblIPersistStream)); } +static inline domdoc *impl_from_IObjectWithSite(IObjectWithSite *iface) +{ + return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblIObjectWithSite)); +} + /************************************************************************ * xmldoc implementation of IPersistStream. */ @@ -368,6 +378,10 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii { *ppvObject = (IPersistStream*)&(This->lpvtblIPersistStream); } + else if (IsEqualGUID(&IID_IObjectWithSite, riid)) + { + *ppvObject = (IObjectWithSite*)&(This->lpvtblIObjectWithSite); + } else if(IsEqualGUID(&IID_IRunnableObject, riid)) { TRACE("IID_IRunnableObject not supported returning NULL\n"); @@ -405,6 +419,8 @@ static ULONG WINAPI domdoc_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { + if (This->site) + IUnknown_Release( This->site ); IUnknown_Release( This->node_unk ); if(This->schema) IXMLDOMSchemaCollection_Release( This->schema ); if (This->stream) IStream_Release(This->stream); @@ -1930,6 +1946,79 @@ static const struct IXMLDOMDocument2Vtbl domdoc_vtbl = domdoc_getProperty }; +/* xmldoc implementation of IObjectWithSite */ +static HRESULT WINAPI +xmldoc_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) +{ + domdoc *This = impl_from_IObjectWithSite(iface); + return IXMLDocument_QueryInterface( (IXMLDocument *)This, riid, ppvObject ); +} + +static ULONG WINAPI +xmldoc_ObjectWithSite_AddRef( IObjectWithSite* iface ) +{ + domdoc *This = impl_from_IObjectWithSite(iface); + return IXMLDocument_AddRef((IXMLDocument *)This); +} + +static ULONG WINAPI +xmldoc_ObjectWithSite_Release( IObjectWithSite* iface ) +{ + domdoc *This = impl_from_IObjectWithSite(iface); + return IXMLDocument_Release((IXMLDocument *)This); +} + +static HRESULT WINAPI +xmldoc_GetSite( IObjectWithSite *iface, REFIID iid, void ** ppvSite ) +{ + domdoc *This = impl_from_IObjectWithSite(iface); + + TRACE("%p %s %p\n", This, debugstr_guid( iid ), ppvSite ); + + if ( !This->site ) + return E_FAIL; + + return IUnknown_QueryInterface( This->site, iid, ppvSite ); +} + +static HRESULT WINAPI +xmldoc_SetSite( IObjectWithSite *iface, IUnknown *punk ) +{ + domdoc *This = impl_from_IObjectWithSite(iface); + + TRACE("%p %p\n", iface, punk); + + if(!punk) + { + if(This->site) + { + IUnknown_Release( This->site ); + This->site = NULL; + } + + return S_OK; + } + + if ( punk ) + IUnknown_AddRef( punk ); + + if(This->site) + IUnknown_Release( This->site ); + + This->site = punk; + + return S_OK; +} + +static const IObjectWithSiteVtbl domdocObjectSite = +{ + xmldoc_ObjectWithSite_QueryInterface, + xmldoc_ObjectWithSite_AddRef, + xmldoc_ObjectWithSite_Release, + xmldoc_SetSite, + xmldoc_GetSite, +}; + HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) { domdoc *doc; @@ -1944,6 +2033,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->lpVtbl = &domdoc_vtbl; doc->lpvtblIPersistStream = &xmldoc_IPersistStream_VTable; + doc->lpvtblIObjectWithSite = &domdocObjectSite; doc->ref = 1; doc->async = 0; doc->validating = 0; @@ -1953,6 +2043,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->error = S_OK; doc->schema = NULL; doc->stream = NULL; + doc->site = NULL; xmldoc = xmlNewDoc(NULL); if(!xmldoc)

1 0

ByeongSik Jeon : imm32: Updated implementation of the Imm{Get|Set}CompositionFont{A|W}.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 4ce9b42c80472150df22cad924e65d1ece99f6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce9b42c80472150df22cad92… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Sat Apr 26 00:19:42 2008 +0900 imm32: Updated implementation of the Imm{Get|Set}CompositionFont{A|W}. --- dlls/imm32/imm.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2a29361..2247cf4 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -774,13 +774,13 @@ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) TRACE("(%p, %p):\n", hIMC, lplf); rc = ImmGetCompositionFontW(hIMC,&lfW); - if (rc) - { - memcpy(lplf,&lfW,sizeof(LOGFONTA)); - WideCharToMultiByte(CP_ACP, 0, lfW.lfFaceName, -1, lplf->lfFaceName, + if (!rc || !lplf) + return FALSE; + + memcpy(lplf,&lfW,sizeof(LOGFONTA)); + WideCharToMultiByte(CP_ACP, 0, lfW.lfFaceName, -1, lplf->lfFaceName, LF_FACESIZE, NULL, NULL); - } - return rc; + return TRUE; } /*********************************************************************** @@ -792,7 +792,7 @@ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) TRACE("(%p, %p):\n", hIMC, lplf); - if (!data) + if (!data || !lplf) return FALSE; *lplf = data->IMC.lfFont.W; @@ -1658,12 +1658,13 @@ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) InputContextData *data = (InputContextData*)hIMC; TRACE("(%p, %p)\n", hIMC, lplf); - if (!data) + if (!data || !lplf) return FALSE; memcpy(&data->IMC.lfFont.W,lplf,sizeof(LOGFONTA)); MultiByteToWideChar(CP_ACP, 0, lplf->lfFaceName, -1, data->IMC.lfFont.W.lfFaceName, LF_FACESIZE); + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT); ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); return TRUE; @@ -1677,10 +1678,11 @@ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) InputContextData *data = (InputContextData*)hIMC; TRACE("(%p, %p)\n", hIMC, lplf); - if (!data) + if (!data || !lplf) return FALSE; data->IMC.lfFont.W = *lplf; + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT); ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); return TRUE;

1 0

Bryan DeGrendel : winex11: Rudimentary drawing support for display balloon tool tips in systray.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 6ed80f15297486877a9fd89863a60735ce6b390e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ed80f15297486877a9fd8986… Author: Bryan DeGrendel <sirnuke(a)gmail.com> Date: Sat Apr 26 06:44:07 2008 -0400 winex11: Rudimentary drawing support for display balloon tool tips in systray. --- dlls/winex11.drv/systray.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 460fd47..a6cf182 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -55,7 +55,8 @@ struct tray_icon HWND tooltip; /* Icon tooltip */ UINT id; /* the unique id given by the app */ UINT callback_message; - WCHAR tiptext[128]; /* Tooltip text. If empty => tooltip disabled */ + WCHAR tiptext[256]; /* Tooltip text. If empty => tooltip disabled */ + WCHAR tiptitle[64]; /* Tooltip title for ballon style tooltips. If empty => tooltip is not balloon style. */ }; static struct list icon_list = LIST_INIT( icon_list ); @@ -95,12 +96,22 @@ static void create_tooltip(struct tray_icon *icon) InitCommonControlsEx(&init_tooltip); tooltips_initialized = TRUE; } - - icon->tooltip = CreateWindowExW( WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, - WS_POPUP | TTS_ALWAYSTIP, - CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, - icon->window, NULL, NULL, NULL); + if (icon->tiptitle[0] != 0) + { + icon->tooltip = CreateWindowExW( WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, + WS_POPUP | TTS_ALWAYSTIP | TTS_BALLOON, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + icon->window, NULL, NULL, NULL); + } + else + { + icon->tooltip = CreateWindowExW( WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, + WS_POPUP | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + icon->window, NULL, NULL, NULL); + } if (icon->tooltip) { TTTOOLINFOW ti; @@ -344,11 +355,14 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) if (nid->uFlags & NIF_TIP) { lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR)); + icon->tiptitle[0] = 0; if (icon->tooltip) update_tooltip_text(icon); } if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) { - FIXME("balloon tip title %s, message %s\n", wine_dbgstr_w(nid->szInfoTitle), wine_dbgstr_w(nid->szInfo)); + lstrcpynW(icon->tiptext, nid->szInfo, sizeof(icon->tiptext)/sizeof(WCHAR)); + lstrcpynW(icon->tiptitle, nid->szInfoTitle, sizeof(icon->tiptitle)/sizeof(WCHAR)); + if (icon->tooltip) update_tooltip_text(icon); } return TRUE; }

1 0

ByeongSik Jeon : imm32: Implementation of the Imm{Get|Set}StatusWindowPos.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: b322bc682e814e5d9c3bee717f76812240cf93cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b322bc682e814e5d9c3bee717… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Sat Apr 26 00:19:34 2008 +0900 imm32: Implementation of the Imm{Get|Set}StatusWindowPos. --- dlls/imm32/imm.c | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 259bf3a..2a29361 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1384,9 +1384,16 @@ UINT WINAPI ImmGetRegisterWordStyleW( */ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { - FIXME("(%p, %p): stub\n", hIMC, lpptPos); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("(%p, %p)\n", hIMC, lpptPos); + + if (!data || !lpptPos) + return FALSE; + + *lpptPos = data->IMC.ptStatusWndPos; + + return TRUE; } /*********************************************************************** @@ -1882,9 +1889,20 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) */ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { - FIXME("(%p, %p): stub\n", hIMC, lpptPos); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("(%p, %p)\n", hIMC, lpptPos); + + if (!data || !lpptPos) + return FALSE; + + TRACE("\t(%i,%i)\n", lpptPos->x, lpptPos->y); + + data->IMC.ptStatusWndPos = *lpptPos; + ImmNotifyIME( hIMC, NI_CONTEXTUPDATED, 0, IMC_SETSTATUSWINDOWPOS); + ImmInternalSendIMENotify(data, IMN_SETSTATUSWINDOWPOS, 0); + + return TRUE; } /***********************************************************************

1 0

ByeongSik Jeon : imm32: Add the updated ImmTranslateMessage declaration.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 63d81263e2ce8c181a6fa202f80f2bfeced5f0b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d81263e2ce8c181a6fa202f… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Sat Apr 26 00:19:15 2008 +0900 imm32: Add the updated ImmTranslateMessage declaration. --- dlls/imm32/imm.c | 6 ++++-- include/ddk/imm.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index f89dd2a..0400939 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2233,7 +2233,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) * ImmTranslateMessage(IMM32.@) * ( Undocumented, call internally and from user32.dll ) */ -BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData) +BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyData) { InputContextData *data; HIMC imc = ImmGetContext(hwnd); @@ -2244,7 +2244,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData) UINT uVirtKey; static const int list_count = 10; - TRACE("%p %x %x %x\n",hwnd, msg, chr, (UINT)lKeyData); + TRACE("%p %x %x %x\n",hwnd, msg, (UINT)wParam, (UINT)lKeyData); if (imc) data = (InputContextData*)imc; @@ -2262,6 +2262,8 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData) if (data->immKbd->imeInfo.fdwProperty & IME_PROP_KBD_CHAR_FIRST) { + WCHAR chr; + if (!is_himc_ime_unicode(data)) ToAscii(data->lastVK, scancode, state, &chr, 0); else diff --git a/include/ddk/imm.h b/include/ddk/imm.h index a33073d..6e4d42f 100644 --- a/include/ddk/imm.h +++ b/include/ddk/imm.h @@ -144,7 +144,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC); LRESULT WINAPI ImmRequestMessageA(HIMC, WPARAM, LPARAM); LRESULT WINAPI ImmRequestMessageW(HIMC, WPARAM, LPARAM); #define ImmRequestMessage WINELIB_NAME_AW(ImmRequestMessage); - +BOOL WINAPI ImmTranslateMessage(HWND, UINT, WPARAM, LPARAM); HWND WINAPI ImmCreateSoftKeyboard(UINT, UINT, int, int); BOOL WINAPI ImmDestroySoftKeyboard(HWND); BOOL WINAPI ImmShowSoftKeyboard(HWND, int);

1 0

ByeongSik Jeon : user32: Set the vkey value to VK_PROCESSKEY when IME process key.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 936e8473dbea0790ecb64d8af843e87840a6b331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=936e8473dbea0790ecb64d8af… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Sat Apr 26 00:19:22 2008 +0900 user32: Set the vkey value to VK_PROCESSKEY when IME process key. --- dlls/user32/message.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 7f3407e..7f1b68b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -36,6 +36,7 @@ #include "dbt.h" #include "dde.h" #include "imm.h" +#include "ddk/imm.h" #include "wine/unicode.h" #include "wine/server.h" #include "user_private.h" @@ -1747,6 +1748,11 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, return FALSE; } accept_hardware_message( hw_id, remove, 0 ); + + if ( msg->message == WM_KEYDOWN || msg->message == WM_KEYUP ) + if ( ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam, 0) ) + msg->wParam = VK_PROCESSKEY; + return TRUE; } @@ -2995,8 +3001,8 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) TRACE_(key)("Translating key %s (%04lx), scancode %02x\n", SPY_GetVKeyName(msg->wParam), msg->wParam, LOBYTE(HIWORD(msg->lParam))); - if (ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam,0)) - return TRUE; + if ( msg->wParam == VK_PROCESSKEY ) + return ImmTranslateMessage(msg->hwnd, msg->message, msg->wParam, msg->lParam); GetKeyboardState( state ); /* FIXME : should handle ToUnicode yielding 2 */

1 0

ByeongSik Jeon : imm32: Implementation of the Imm{Get|Set}CandidateWindow.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 5d49b3db8d80d8f37c97d32dbb2defa132200f27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d49b3db8d80d8f37c97d32db… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Sat Apr 26 00:19:27 2008 +0900 imm32: Implementation of the Imm{Get|Set}CandidateWindow. --- dlls/imm32/imm.c | 42 +++++++++++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 0400939..259bf3a 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -746,11 +746,21 @@ DWORD WINAPI ImmGetCandidateListW( * ImmGetCandidateWindow (IMM32.@) */ BOOL WINAPI ImmGetCandidateWindow( - HIMC hIMC, DWORD dwBufLen, LPCANDIDATEFORM lpCandidate) + HIMC hIMC, DWORD dwIndex, LPCANDIDATEFORM lpCandidate) { - FIXME("(%p, %d, %p): stub\n", hIMC, dwBufLen, lpCandidate); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("%p, %d, %p\n", hIMC, dwIndex, lpCandidate); + + if (!data || !lpCandidate) + return FALSE; + + if ( dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) + return FALSE; + + *lpCandidate = data->IMC.cfCandForm[dwIndex]; + + return TRUE; } /*********************************************************************** @@ -1610,9 +1620,27 @@ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) BOOL WINAPI ImmSetCandidateWindow( HIMC hIMC, LPCANDIDATEFORM lpCandidate) { - FIXME("(%p, %p): stub\n", hIMC, lpCandidate); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("(%p, %p)\n", hIMC, lpCandidate); + + if (!data || !lpCandidate) + 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); + + if ( lpCandidate->dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) + return FALSE; + + data->IMC.cfCandForm[lpCandidate->dwIndex] = *lpCandidate; + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCANDIDATEPOS); + ImmInternalSendIMENotify(data, IMN_SETCANDIDATEPOS, 1 << lpCandidate->dwIndex); + + return TRUE; } /***********************************************************************

1 0