winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
4 participants
1278 discussions
Start a n
N
ew thread
ByeongSik Jeon : imm32: Pass the old conversion status value to the IME.
by Alexandre Julliard
23 Apr '08
23 Apr '08
Module: wine Branch: master Commit: 4c5a21c60e7f929ba5daf0bc28b0c0a1dc67ded6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4c5a21c60e7f929ba5daf0bc2…
Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Wed Apr 23 19:05:30 2008 +0900 imm32: Pass the old conversion status value to the IME. --- dlls/imm32/imm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c4fab3c..9a46ef5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1779,6 +1779,7 @@ BOOL WINAPI ImmSetCompositionWindow( BOOL WINAPI ImmSetConversionStatus( HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) { + DWORD oldConversion, oldSentence; InputContextData *data = (InputContextData*)hIMC; TRACE("%p %d %d\n", hIMC, fdwConversion, fdwSentence); @@ -1788,14 +1789,16 @@ BOOL WINAPI ImmSetConversionStatus( if ( fdwConversion != data->IMC.fdwConversion ) { + oldConversion = data->IMC.fdwConversion; data->IMC.fdwConversion = fdwConversion; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCONVERSIONMODE); + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldConversion, IMC_SETCONVERSIONMODE); ImmInternalSendIMENotify(data, IMN_SETCONVERSIONMODE, 0); } if ( fdwSentence != data->IMC.fdwSentence ) { + oldSentence = data->IMC.fdwSentence; data->IMC.fdwSentence = fdwSentence; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETSENTENCEMODE); + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldSentence, IMC_SETSENTENCEMODE); ImmInternalSendIMENotify(data, IMN_SETSENTENCEMODE, 0); }
1
0
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
0
← Newer
1
...
32
33
34
35
36
37
38
...
128
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
Results per page:
10
25
50
100
200