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

ByeongSik Jeon : imm32: More implementation of the ImmGetConversionStatus() .
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: a720292bac0c27bb97fd64ebe1b35569f0f02c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a720292bac0c27bb97fd64ebe… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Wed Apr 23 19:05:46 2008 +0900 imm32: More implementation of the ImmGetConversionStatus(). Match the ImmSetConversionStatus() function. --- dlls/imm32/imm.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9a46ef5..04b0d77 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1095,11 +1095,18 @@ DWORD WINAPI ImmGetConversionListW( BOOL WINAPI ImmGetConversionStatus( HIMC hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence) { - TRACE("(%p, %p, %p): best guess\n", hIMC, lpfdwConversion, lpfdwSentence); + InputContextData *data = (InputContextData*)hIMC; + + TRACE("%p %p %p\n", hIMC, lpfdwConversion, lpfdwSentence); + + if (!data) + return FALSE; + if (lpfdwConversion) - *lpfdwConversion = IME_CMODE_NATIVE; + *lpfdwConversion = data->IMC.fdwConversion; if (lpfdwSentence) - *lpfdwSentence = IME_SMODE_NONE; + *lpfdwSentence = data->IMC.fdwSentence; + return TRUE; }

1 0

ByeongSik Jeon : user32: Pass the WM_IME_NOTIFY message to the default IME window.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 4b77bb4ae2b05023a87c6f14590d6192495c3f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b77bb4ae2b05023a87c6f145… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 12:33:22 2008 +0900 user32: Pass the WM_IME_NOTIFY message to the default IME window. --- dlls/user32/defwnd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 43ae405..9d72f9a 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -854,6 +854,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case WM_IME_COMPOSITION: case WM_IME_ENDCOMPOSITION: case WM_IME_SELECT: + case WM_IME_NOTIFY: { HWND hwndIME; @@ -1006,6 +1007,7 @@ LRESULT WINAPI DefWindowProcW( case WM_IME_COMPOSITION: case WM_IME_ENDCOMPOSITION: case WM_IME_SELECT: + case WM_IME_NOTIFY: { HWND hwndIME;

1 0

ByeongSik Jeon : imm32: Examine whether the fOpen value differs with its old value.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 9a89e4d68c01e1869908746f22b49dd84c6a8d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a89e4d68c01e1869908746f2… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Wed Apr 23 19:05:23 2008 +0900 imm32: Examine whether the fOpen value differs with its old value. --- dlls/imm32/imm.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 932f1ed..c4fab3c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1824,8 +1824,14 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) IMM_GetThreadData()->hwndDefault = data->imeWnd; } - data->IMC.fOpen = fOpen; - return ImmNotifyIME(hIMC,NI_CONTEXTUPDATED,0,IMC_SETOPENSTATUS); + if (!fOpen != !data->IMC.fOpen) + { + data->IMC.fOpen = fOpen; + ImmNotifyIME( hIMC, NI_CONTEXTUPDATED, 0, IMC_SETOPENSTATUS); + ImmInternalSendIMENotify(data, IMN_SETSENTENCEMODE, 0); + } + + return TRUE; } /***********************************************************************

1 0

ByeongSik Jeon : imm32: Add stub and header of Imm{Create|Show|Destroy}SoftKeyboard.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: a6ff00c4dabb6245264e3d024973b6f290e713dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ff00c4dabb6245264e3d024… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 21:44:39 2008 +0900 imm32: Add stub and header of Imm{Create|Show|Destroy}SoftKeyboard. --- dlls/imm32/imm.c | 30 ++++++++++++++++++++++++++++++ dlls/imm32/imm32.spec | 6 +++--- include/ddk/imm.h | 4 ++++ 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 959bb5c..932f1ed 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1839,6 +1839,36 @@ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) } /*********************************************************************** + * ImmCreateSoftKeyboard(IMM32.@) + */ +HWND WINAPI ImmCreateSoftKeyboard(UINT uType, UINT hOwner, int x, int y) +{ + FIXME("(%d, %d, %d, %d): stub\n", uType, hOwner, x, y); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/*********************************************************************** + * ImmDestroySoftKeyboard(IMM32.@) + */ +BOOL WINAPI ImmDestroySoftKeyboard(HWND hSoftWnd) +{ + FIXME("(%p): stub\n", hSoftWnd); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * ImmShowSoftKeyboard(IMM32.@) + */ +BOOL WINAPI ImmShowSoftKeyboard(HWND hSoftWnd, int nCmdShow) +{ + FIXME("(%p, %d): stub\n", hSoftWnd, nCmdShow); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * ImmSimulateHotKey (IMM32.@) */ BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID) diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 058e313..e0c9385 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -5,10 +5,10 @@ @ stdcall ImmConfigureIMEW(long long long ptr) @ stdcall ImmCreateContext() @ stdcall ImmCreateIMCC(long) -@ stub ImmCreateSoftKeyboard +@ stdcall ImmCreateSoftKeyboard(long long long long) @ stdcall ImmDestroyContext(long) @ stdcall ImmDestroyIMCC(long) -@ stub ImmDestroySoftKeyboard +@ stdcall ImmDestroySoftKeyboard(long) @ stdcall ImmDisableIME(long) @ stdcall ImmDisableIme(long) ImmDisableIME @ stub ImmEnumInputContext @@ -96,7 +96,7 @@ #@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey @ stdcall ImmSetOpenStatus(long long) @ stdcall ImmSetStatusWindowPos(long ptr) -@ stub ImmShowSoftKeyboard +@ stdcall ImmShowSoftKeyboard(long long) @ stdcall ImmSimulateHotKey(long long) @ stub ImmSystemHandler @ stdcall ImmTranslateMessage(long long long long) diff --git a/include/ddk/imm.h b/include/ddk/imm.h index 4c3ec45..a33073d 100644 --- a/include/ddk/imm.h +++ b/include/ddk/imm.h @@ -145,6 +145,10 @@ LRESULT WINAPI ImmRequestMessageA(HIMC, WPARAM, LPARAM); LRESULT WINAPI ImmRequestMessageW(HIMC, WPARAM, LPARAM); #define ImmRequestMessage WINELIB_NAME_AW(ImmRequestMessage); +HWND WINAPI ImmCreateSoftKeyboard(UINT, UINT, int, int); +BOOL WINAPI ImmDestroySoftKeyboard(HWND); +BOOL WINAPI ImmShowSoftKeyboard(HWND, int); + BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, LPCWSTR lpszOptions); BOOL WINAPI ImeConfigure (HKL, HWND, DWORD, LPVOID); DWORD WINAPI ImeConversionList(HIMC, LPCWSTR, LPCANDIDATELIST,DWORD,UINT);

1 0

Tomasz Jezierski : shell32: Secure filename copy to fixed size variable wfileName.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 3229c3de92dfba4fd32d55a28b09ef42514800d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3229c3de92dfba4fd32d55a28… Author: Tomasz Jezierski <developers(a)tefnet.pl> Date: Tue Apr 22 09:39:48 2008 +0200 shell32: Secure filename copy to fixed size variable wfileName. --- dlls/shell32/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 794d0bd..fec7870 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1711,10 +1711,10 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) } } - strcpyW(wfileName, sei_tmp.lpFile); + lstrcpynW(wfileName, sei_tmp.lpFile,sizeof(wfileName)/sizeof(WCHAR)); } } else - strcpyW(wfileName, sei_tmp.lpFile); + lstrcpynW(wfileName, sei_tmp.lpFile,sizeof(wfileName)/sizeof(WCHAR)); lpFile = wfileName;

1 0

ByeongSik Jeon : imm32: Add stub and header of ImmRequestMessage.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: f9316b187782fd5d9d36033beaaa80b4b33e6519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9316b187782fd5d9d36033be… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 21:44:22 2008 +0900 imm32: Add stub and header of ImmRequestMessage. --- dlls/imm32/imm.c | 20 ++++++++++++++++++++ dlls/imm32/imm32.spec | 4 ++-- include/ddk/imm.h | 3 +++ include/imm.h | 2 ++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c267a70..959bb5c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1573,6 +1573,26 @@ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) } /*********************************************************************** +* ImmRequestMessageA(IMM32.@) +*/ +LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam) +{ + FIXME("(%p %ld %ld): stub\n", hIMC, wParam, wParam); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/*********************************************************************** +* ImmRequestMessageW(IMM32.@) +*/ +LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) +{ + FIXME("(%p %ld %ld): stub\n", hIMC, wParam, wParam); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/*********************************************************************** * ImmSetCandidateWindow (IMM32.@) */ BOOL WINAPI ImmSetCandidateWindow( diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 4e0b023..058e313 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -79,8 +79,8 @@ @ stdcall ImmRegisterWordA(long str long str) @ stdcall ImmRegisterWordW(long wstr long wstr) @ stdcall ImmReleaseContext(long long) -@ stub ImmRequestMessageA -@ stub ImmRequestMessageW +@ stdcall ImmRequestMessageA(ptr long long) +@ stdcall ImmRequestMessageW(ptr long long) @ stub ImmSendIMEMessageExA @ stub ImmSendIMEMessageExW @ stub ImmSendMessageToActiveDefImeWndW diff --git a/include/ddk/imm.h b/include/ddk/imm.h index ee10b27..4c3ec45 100644 --- a/include/ddk/imm.h +++ b/include/ddk/imm.h @@ -141,6 +141,9 @@ DWORD WINAPI ImmGetIMCCSize(HIMCC); #define NI_IMEMENUSELECTED 0x0018 BOOL WINAPI ImmGenerateMessage(HIMC); +LRESULT WINAPI ImmRequestMessageA(HIMC, WPARAM, LPARAM); +LRESULT WINAPI ImmRequestMessageW(HIMC, WPARAM, LPARAM); +#define ImmRequestMessage WINELIB_NAME_AW(ImmRequestMessage); BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, LPCWSTR lpszOptions); BOOL WINAPI ImeConfigure (HKL, HWND, DWORD, LPVOID); diff --git a/include/imm.h b/include/imm.h index 1b4cc71..57658de 100644 --- a/include/imm.h +++ b/include/imm.h @@ -394,6 +394,8 @@ typedef struct _tagCOMPOSITIONFORM #define IMR_COMPOSITIONFONT 0x0003 #define IMR_RECONVERTSTRING 0x0004 #define IMR_CONFIRMRECONVERTSTRING 0x0005 +#define IMR_QUERYCHARPOSITION 0x0006 +#define IMR_DOCUMENTFEED 0x0007 /* error code of ImmGetCompositionString */

1 0

Maarten Lankhorst : quartz: Make the file source support multiple samples by preallocating enough handles .
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: e0fe0ef01b32b06503e22310c1a54ae9c765b54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0fe0ef01b32b06503e22310c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 22 16:54:28 2008 -0700 quartz: Make the file source support multiple samples by preallocating enough handles. --- dlls/quartz/filesource.c | 214 ++++++++++++++++++++++++++------------------- 1 files changed, 124 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0fe0ef01b32b06503e22…

1 0

Maarten Lankhorst : dsound: Skip WAVE_FORMAT_EXTENSIBLE tests on directx < 8.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: bf739cbcc38c2ba95a0f087cb34be61f5ca395ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf739cbcc38c2ba95a0f087cb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 22 17:12:28 2008 -0700 dsound: Skip WAVE_FORMAT_EXTENSIBLE tests on directx < 8. --- dlls/dsound/tests/dsound.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 3a1bd18..6c81640 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -44,6 +44,8 @@ static HRESULT (WINAPI *pDirectSoundEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL; static HRESULT (WINAPI *pDirectSoundCreate)(LPCGUID,LPDIRECTSOUND*, LPUNKNOWN)=NULL; +static BOOL gotdx8; + static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, LPCGUID lpGuid) { @@ -569,8 +571,13 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) formats[f][2]); wfx2=wfx; rc=IDirectSoundBuffer_SetFormat(primary,&wfx); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", - format_string(&wfx), DXGetErrorString8(rc)); + + if (wfx.wBitsPerSample <= 16) + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", + format_string(&wfx), DXGetErrorString8(rc)); + else + ok(rc==DS_OK || rc == E_INVALIDARG, "SetFormat (%s) failed: %s\n", + format_string(&wfx), DXGetErrorString8(rc)); /* There is no guarantee that SetFormat will actually change the * format to what we asked for. It depends on what the soundcard @@ -723,14 +730,30 @@ static HRESULT test_secondary(LPGUID lpGuid) wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - if (wfx.wBitsPerSample != 8 && wfx.wBitsPerSample != 16) - ok(rc == DSERR_CONTROLUNAVAIL && !secondary, "IDirectSound_CreateSoundBuffer() " - "should have returned DSERR_CONTROLUNAVAIL and NULL, returned: %s %p\n", - DXGetErrorString8(rc), secondary); + if (gotdx8 || wfx.wBitsPerSample <= 16) + { + if (wfx.wBitsPerSample > 16) + ok(rc == DSERR_CONTROLUNAVAIL && !secondary, "IDirectSound_CreateSoundBuffer() " + "should have returned DSERR_CONTROLUNAVAIL and NULL, returned: %s %p\n", + DXGetErrorString8(rc), secondary); + else + ok(rc==DS_OK && secondary!=NULL, + "IDirectSound_CreateSoundBuffer() failed to create a secondary " + "buffer %s\n",DXGetErrorString8(rc)); + } else - ok(rc==DS_OK && secondary!=NULL, - "IDirectSound_CreateSoundBuffer() failed to create a secondary " - "buffer %s\n",DXGetErrorString8(rc)); + ok(rc==E_INVALIDARG, "Creating %d bpp buffer on dx < 8 returned: %p %s\n", + wfx.wBitsPerSample, secondary, DXGetErrorString8(rc)); + + if (!gotdx8) + { + skip("Not doing the WAVE_FORMAT_EXTENSIBLE tests\n"); + /* Apparently they succeed with bogus values, + * which means that older dsound doesn't look at them + */ + goto no_wfe; + } + if (secondary) IDirectSoundBuffer_Release(secondary); secondary = NULL; @@ -792,6 +815,7 @@ static HRESULT test_secondary(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() failed to create a secondary " "buffer %s\n",DXGetErrorString8(rc)); +no_wfe: if (rc==DS_OK && secondary!=NULL) { if (winetest_interactive) { trace(" Testing a secondary buffer at %dx%dx%d " @@ -1066,6 +1090,8 @@ START_TEST(dsound) pDirectSoundCreate = (void*)GetProcAddress(hDsound, "DirectSoundCreate"); + gotdx8 = !!GetProcAddress(hDsound, "DirectSoundCreate8"); + IDirectSound_tests(); dsound_tests();

1 0

Maarten Lankhorst : quartz: Make wave parser and mpeg splitter zero copy by getting rid of the seperate allocator for the output pin .
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 3a39805ed8345047d217f4a0d7de3954cce7cb93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a39805ed8345047d217f4a0d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 22 13:57:11 2008 -0700 quartz: Make wave parser and mpeg splitter zero copy by getting rid of the seperate allocator for the output pin. --- dlls/quartz/avisplit.c | 7 +- dlls/quartz/mpegsplit.c | 362 +++++++++++++++++---------------------------- dlls/quartz/parser.c | 26 +++- dlls/quartz/parser.h | 4 +- dlls/quartz/pin.c | 158 +++++++++++++------- dlls/quartz/pin.h | 10 +- dlls/quartz/waveparser.c | 211 ++++++++++++++------------- 7 files changed, 384 insertions(+), 394 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a39805ed8345047d217f…

1 0

Maarten Lankhorst : quartz: Add some sanity checks to file splitter.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: ec124be8239b6292ba239bb24f125cd4e267fdd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec124be8239b6292ba239bb24… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 22 13:44:33 2008 -0700 quartz: Add some sanity checks to file splitter. --- dlls/quartz/filesource.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 930ebfc..396384f 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1107,6 +1107,9 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw if (!This->bFlushing) { + if (!This->pHead) + ERR("Called without samples in queue!\n"); + /* wait for the read to finish or timeout */ if (WaitForSingleObject(This->hEvent, dwTimeout) == WAIT_TIMEOUT) hr = VFW_E_TIMEOUT; @@ -1139,10 +1142,10 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw *pdwUser = pDataRq->dwUserData; if (This->bFlushing) - { hr = VFW_E_WRONG_STATE; + + if (FAILED(hr)) dwBytes = 0; - } /* Set the time on the sample */ IMediaSample_SetActualDataLength(pDataRq->pSample, dwBytes); @@ -1156,6 +1159,12 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw assert(rtStop <= rtSampleStop); IMediaSample_SetTime(pDataRq->pSample, &rtStart, &rtStop); + assert(rtStart == rtSampleStart); + if (hr == S_OK) + assert(rtStop == rtSampleStop); + else + assert(rtStop == rtStart); + } /* no need to close event handle since we will close it when the pin is destroyed */

1 0