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

Alexandre Julliard : make_requests: More aggressive grepping for status values.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 3d39c620dabed9c32185c35f4084b93a38f103a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d39c620dabed9c32185c35f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 4 18:01:22 2007 +0200 make_requests: More aggressive grepping for status values. --- server/trace.c | 5 +++++ tools/make_requests | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server/trace.c b/server/trace.c index 898998b..c4572bd 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4112,12 +4112,14 @@ static const struct unsigned int value; } status_names[] = { + { "ABANDONED_WAIT_0", STATUS_ABANDONED_WAIT_0 }, { "ACCESS_DENIED", STATUS_ACCESS_DENIED }, { "ACCESS_VIOLATION", STATUS_ACCESS_VIOLATION }, { "ALERTED", STATUS_ALERTED }, { "ALIAS_EXISTS", STATUS_ALIAS_EXISTS }, { "BAD_DEVICE_TYPE", STATUS_BAD_DEVICE_TYPE }, { "BAD_IMPERSONATION_LEVEL", STATUS_BAD_IMPERSONATION_LEVEL }, + { "BREAKPOINT", STATUS_BREAKPOINT }, { "BUFFER_OVERFLOW", STATUS_BUFFER_OVERFLOW }, { "BUFFER_TOO_SMALL", STATUS_BUFFER_TOO_SMALL }, { "CANCELLED", STATUS_CANCELLED }, @@ -4135,6 +4137,7 @@ static const struct { "ERROR_INVALID_WINDOW_HANDLE", 0xc0010000 | ERROR_INVALID_WINDOW_HANDLE }, { "FILE_IS_A_DIRECTORY", STATUS_FILE_IS_A_DIRECTORY }, { "FILE_LOCK_CONFLICT", STATUS_FILE_LOCK_CONFLICT }, + { "GENERIC_NOT_MAPPED", STATUS_GENERIC_NOT_MAPPED }, { "HANDLES_CLOSED", STATUS_HANDLES_CLOSED }, { "HANDLE_NOT_CLOSABLE", STATUS_HANDLE_NOT_CLOSABLE }, { "ILLEGAL_FUNCTION", STATUS_ILLEGAL_FUNCTION }, @@ -4143,6 +4146,7 @@ static const struct { "INVALID_FILE_FOR_SECTION", STATUS_INVALID_FILE_FOR_SECTION }, { "INVALID_HANDLE", STATUS_INVALID_HANDLE }, { "INVALID_PARAMETER", STATUS_INVALID_PARAMETER }, + { "INVALID_SECURITY_DESCR", STATUS_INVALID_SECURITY_DESCR }, { "IO_TIMEOUT", STATUS_IO_TIMEOUT }, { "KEY_DELETED", STATUS_KEY_DELETED }, { "MAPPED_FILE_SIZE_ZERO", STATUS_MAPPED_FILE_SIZE_ZERO }, @@ -4185,6 +4189,7 @@ static const struct { "TIMEOUT", STATUS_TIMEOUT }, { "TOO_MANY_OPENED_FILES", STATUS_TOO_MANY_OPENED_FILES }, { "UNSUCCESSFUL", STATUS_UNSUCCESSFUL }, + { "USER_APC", STATUS_USER_APC }, { "VOLUME_DISMOUNTED", STATUS_VOLUME_DISMOUNTED }, { "WAS_LOCKED", STATUS_WAS_LOCKED }, { NULL, 0 } diff --git a/tools/make_requests b/tools/make_requests index 6ce17f5..d5364d9 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -239,14 +239,11 @@ sub GET_ERROR_NAMES() my %errors = (); foreach my $f (glob "server/*.c") { + next if $f eq "server/trace.c"; open FILE, $f or die "Can't open $f"; while (<FILE>) { - if (/set_error\s*$\s*STATUS_(\w+)\s*$/) - { - $errors{$1} = "STATUS_$1" unless $1 eq "SUCCESS"; - } - elsif (/async_terminate_\w+\s*$.*,\s*STATUS_(\w+)\s*$/) + if (/STATUS_(\w+)/) { $errors{$1} = "STATUS_$1" unless $1 eq "SUCCESS"; }

1 0

Chris Robinson : quartz: Hold a reference on the PullPin' s filter while the processing thread is alive.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: c28b534550770eb57a6e4e3bb48410bf4ac9c868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28b534550770eb57a6e4e3bb… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Apr 3 05:55:29 2007 -0700 quartz: Hold a reference on the PullPin's filter while the processing thread is alive. Also removes dead code caused by the change. --- dlls/quartz/pin.c | 37 ++++++++++--------------------------- 1 files changed, 10 insertions(+), 27 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 06313e4..6791c2d 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1121,15 +1121,6 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const return hr; } -static void CALLBACK PullPin_SafeThreadStop(ULONG_PTR handle) -{ - HANDLE hThread = (HANDLE)handle; - - if (hThread) - CloseHandle(hThread); - ExitThread(0); -} - HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { PullPin *This = (PullPin *)iface; @@ -1163,15 +1154,6 @@ ULONG WINAPI PullPin_Release(IPin * iface) if (!refCount) { - if (This->hThread) - { - HRESULT hr; - - if (!QueueUserAPC(PullPin_SafeThreadStop, This->hThread, (ULONG_PTR)This->hThread)) - ERR("Cannot stop PullPin thread (GetLastError() = %d)!", GetLastError()); - if (This->pAlloc && FAILED(hr = IMemAllocator_Decommit(This->pAlloc))) - ERR("Allocator decommit failed with error %x. Possible memory leak\n", hr); - } if(This->pAlloc) IMemAllocator_Release(This->pAlloc); if(This->pReader) @@ -1195,7 +1177,6 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) HRESULT hr; ALLOCATOR_PROPERTIES allocProps; - PIN_INFO pinInfo; CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -1218,8 +1199,6 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) REFERENCE_TIME rtSampleStop; DWORD_PTR dwUser; - pinInfo.pFilter = NULL; - TRACE("Process sample\n"); hr = IMemAllocator_GetBuffer(This->pAlloc, &pSample, NULL, NULL, 0); @@ -1241,9 +1220,6 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) hr = IAsyncReader_WaitForNext(This->pReader, 10000, &pSample, &dwUser); if (SUCCEEDED(hr)) - hr = IPin_QueryPinInfo((IPin*)&This->pin, &pinInfo); - - if (SUCCEEDED(hr)) { rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(IMediaSample_GetActualDataLength(pSample)); if (rtSampleStop > This->rtStop) @@ -1256,8 +1232,6 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) else ERR("Processing error: %x\n", hr); - if (pinInfo.pFilter) - IBaseFilter_Release(pinInfo.pFilter); if (pSample) IMediaSample_Release(pSample); } @@ -1286,6 +1260,8 @@ static void CALLBACK PullPin_Thread_Stop(ULONG_PTR iface) SetEvent(This->hEventStateChanged); + IBaseFilter_Release(This->pin.pinInfo.pFilter); + ExitThread(0); } @@ -1305,9 +1281,16 @@ HRESULT PullPin_InitProcessing(PullPin * This) DWORD dwThreadId; assert(!This->hThread); + /* AddRef the filter to make sure it and it's pins will be around + * as long as the thread */ + IBaseFilter_AddRef(This->pin.pinInfo.pFilter); + This->hThread = CreateThread(NULL, 0, PullPin_Thread_Main, NULL, 0, &dwThreadId); if (!This->hThread) + { hr = HRESULT_FROM_WIN32(GetLastError()); + IBaseFilter_Release(This->pin.pinInfo.pFilter); + } if (SUCCEEDED(hr)) hr = IMemAllocator_Commit(This->pAlloc); @@ -1329,7 +1312,7 @@ HRESULT PullPin_StartProcessing(PullPin * This) assert(This->hThread); ResetEvent(This->hEventStateChanged); - + if (!QueueUserAPC(PullPin_Thread_Process, This->hThread, (ULONG_PTR)This)) return HRESULT_FROM_WIN32(GetLastError()); }

1 0

Chris Robinson : quartz: Connect input when the pins connect, not when querying.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 71bcdc9044cb616360d947ffdc11bfe9f36bf39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=71bcdc9044cb616360d947ffd… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Apr 2 23:45:27 2007 -0700 quartz: Connect input when the pins connect, not when querying. And clean up when disconnecting input. --- dlls/quartz/transform.c | 68 +++++++++++++++++++++++++++++------------------ 1 files changed, 42 insertions(+), 26 deletions(-) diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 0662523..5a1b502 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -97,11 +97,13 @@ static HRESULT TransformFilter_Sample(LPVOID iface, IMediaSample * pSample) static HRESULT TransformFilter_Input_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) { - TransformFilterImpl* This = (TransformFilterImpl*)iface; + /* TransformFilterImpl* This = (TransformFilterImpl*)iface; */ TRACE("%p\n", iface); dump_AM_MEDIA_TYPE(pmt); - return This->pFuncsTable->pfnConnectInput(This, pmt); + /* FIXME: Add a function to verify media type with the actual filter */ + /* return This->pFuncsTable->pfnConnectInput(This, pmt); */ + return S_OK; } @@ -294,8 +296,6 @@ static ULONG WINAPI TransformFilter_Release(IBaseFilter * iface) CoTaskMemFree(This->ppPins); This->lpVtbl = NULL; - This->pFuncsTable->pfnCleanup(This); - This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); @@ -535,14 +535,48 @@ static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) return hr; } +static HRESULT WINAPI TransformFilter_InputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) +{ + InputPin* This = (InputPin*) iface; + TransformFilterImpl* pTransform; + HRESULT hr; + + TRACE("(%p)->(%p, %p)\n", iface, pReceivePin, pmt); + + pTransform = (TransformFilterImpl*)This->pin.pinInfo.pFilter; + + hr = pTransform->pFuncsTable->pfnConnectInput(pTransform, pmt); + if (SUCCEEDED(hr)) + { + hr = InputPin_ReceiveConnection(iface, pReceivePin, pmt); + if (FAILED(hr)) + pTransform->pFuncsTable->pfnCleanup(pTransform); + } + + return hr; +} + +static HRESULT WINAPI TransformFilter_InputPin_Disconnect(IPin * iface) +{ + InputPin* This = (InputPin*) iface; + TransformFilterImpl* pTransform; + + TRACE("(%p)->()\n", iface); + + pTransform = (TransformFilterImpl*)This->pin.pinInfo.pFilter; + pTransform->pFuncsTable->pfnCleanup(pTransform); + + return IPinImpl_Disconnect(iface); +} + static const IPinVtbl TransformFilter_InputPin_Vtbl = { InputPin_QueryInterface, IPinImpl_AddRef, InputPin_Release, InputPin_Connect, - InputPin_ReceiveConnection, - IPinImpl_Disconnect, + TransformFilter_InputPin_ReceiveConnection, + TransformFilter_InputPin_Disconnect, IPinImpl_ConnectedTo, IPinImpl_ConnectionMediaType, IPinImpl_QueryPinInfo, @@ -570,32 +604,14 @@ static HRESULT WINAPI TransformFilter_Output_EnumMediaTypes(IPin * iface, IEnumM return IEnumMediaTypesImpl_Construct(&emd, ppEnum); } -static HRESULT WINAPI TransformFilter_Output_Disconnect(IPin * iface) -{ - OutputPin* This = (OutputPin*)iface; - HRESULT hr; - TransformFilterImpl* pTransformFilter = (TransformFilterImpl*)This->pin.pinInfo.pFilter; - - TRACE("(%p/%p)->()\n", This, iface); - - hr = OutputPin_Disconnect(iface); - - if (hr == S_OK) - { - pTransformFilter->pFuncsTable->pfnCleanup(pTransformFilter); - } - - return hr; -} - -static const IPinVtbl TransformFilter_OutputPin_Vtbl = +static const IPinVtbl TransformFilter_OutputPin_Vtbl = { OutputPin_QueryInterface, IPinImpl_AddRef, OutputPin_Release, OutputPin_Connect, OutputPin_ReceiveConnection, - TransformFilter_Output_Disconnect, + OutputPin_Disconnect, IPinImpl_ConnectedTo, IPinImpl_ConnectionMediaType, IPinImpl_QueryPinInfo,

1 0

Chris Robinson : quartz: Add a QueryConnect method for transform filters.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 243351d223e3171769576980540349daa611a5c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=243351d223e31717695769805… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Apr 3 00:06:16 2007 -0700 quartz: Add a QueryConnect method for transform filters. --- dlls/quartz/acmwrapper.c | 1 + dlls/quartz/avidec.c | 1 + dlls/quartz/transform.c | 8 +++++--- dlls/quartz/transform.h | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 344779c..b5a3f6c 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -240,6 +240,7 @@ static const TransformFuncsTable ACMWrapper_FuncsTable = { NULL, ACMWrapper_ProcessSampleData, NULL, + NULL, ACMWrapper_ConnectInput, ACMWrapper_Cleanup }; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index a878500..aa80800 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -261,6 +261,7 @@ static const TransformFuncsTable AVIDec_FuncsTable = { AVIDec_ProcessBegin, AVIDec_ProcessSampleData, AVIDec_ProcessEnd, + NULL, AVIDec_ConnectInput, AVIDec_Cleanup }; diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 5a1b502..2c2c0bf 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -97,12 +97,14 @@ static HRESULT TransformFilter_Sample(LPVOID iface, IMediaSample * pSample) static HRESULT TransformFilter_Input_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) { - /* TransformFilterImpl* This = (TransformFilterImpl*)iface; */ + TransformFilterImpl* This = (TransformFilterImpl*)iface; TRACE("%p\n", iface); dump_AM_MEDIA_TYPE(pmt); - /* FIXME: Add a function to verify media type with the actual filter */ - /* return This->pFuncsTable->pfnConnectInput(This, pmt); */ + if (This->pFuncsTable->pfnQueryConnect) + return This->pFuncsTable->pfnQueryConnect(This, pmt); + /* Assume OK if there's no query method (the connection will fail if + needed) */ return S_OK; } diff --git a/dlls/quartz/transform.h b/dlls/quartz/transform.h index 65adad0..c967dd4 100644 --- a/dlls/quartz/transform.h +++ b/dlls/quartz/transform.h @@ -24,6 +24,7 @@ typedef struct TransformFuncsTable { HRESULT (*pfnProcessBegin) (TransformFilterImpl* This); HRESULT (*pfnProcessSampleData) (TransformFilterImpl* This, LPBYTE data, DWORD size); HRESULT (*pfnProcessEnd) (TransformFilterImpl* This); + HRESULT (*pfnQueryConnect) (TransformFilterImpl* This, const AM_MEDIA_TYPE * pmt); HRESULT (*pfnConnectInput) (TransformFilterImpl* This, const AM_MEDIA_TYPE * pmt); HRESULT (*pfnCleanup) (TransformFilterImpl* This); } TransformFuncsTable;

1 0

Chris Robinson : quartz: Break loop on error in ACMWrapper.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: b7a4405d0a745a341ccf1b4c2aa9dd6a19889cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a4405d0a745a341ccf1b4c2… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Apr 3 06:53:22 2007 -0700 quartz: Break loop on error in ACMWrapper. --- dlls/quartz/acmwrapper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index b5a3f6c..1142a90 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -81,7 +81,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte return hr; } - while(!stop) + while(hr == S_OK && !stop) { DWORD rem_buf = This->max_size - This->current_size; DWORD rem_smp = size - offset;

1 0

Vit Hrachovy : winecfg: Fix outdated Czech localization.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: de0871795c94511b459ac9d6b6731d26c0bcb74f URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0871795c94511b459ac9d6b… Author: Vit Hrachovy <vit.hrachovy(a)sandbox.cz> Date: Tue Apr 3 13:29:44 2007 +0200 winecfg: Fix outdated Czech localization. --- programs/winecfg/Cs.rc | 285 ++++++++++++++++++++++++++++++++++--------- programs/winecfg/winecfg.rc | 2 +- 2 files changed, 229 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de0871795c94511b459ac…

1 0

Paul Vriens : ole32/stg_bigblockfile: Check page before use (Coverity).
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: ec30f6de308bb3296ad2d34959c41bacb1d89733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec30f6de308bb3296ad2d3495… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Apr 3 20:41:42 2007 +0200 ole32/stg_bigblockfile: Check page before use (Coverity). --- dlls/ole32/stg_bigblockfile.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index 08fc546..83454d4 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -861,18 +861,18 @@ static HRESULT WINAPI ImplBIGBLOCKFILE_WriteAt( MappedPage *page = BIGBLOCKFILE_GetMappedView(This, page_index); TRACE("page %i, offset %u, bytes_to_page %u, bytes_left %u\n", - page->page_index, offset_in_page, bytes_to_page, bytes_left); + page ? page->page_index : 0, offset_in_page, bytes_to_page, bytes_left); - if (page->mapped_bytes < bytes_to_page) + if (!page) { - ERR("Not enough bytes mapped to the page. This should never happen\n"); + ERR("Unable to get a page to write. This should never happen\n"); rc = E_FAIL; break; } - if (!page) + if (page->mapped_bytes < bytes_to_page) { - ERR("Unable to get a page to write. This should never happen\n"); + ERR("Not enough bytes mapped to the page. This should never happen\n"); rc = E_FAIL; break; }

1 0

Steven Edwards : winecfg: Add a button for audio test.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 8c62cbfa4eef304a49171f56db98fa8b1925086c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c62cbfa4eef304a49171f56d… Author: Steven Edwards <winehacker(a)gmail.com> Date: Tue Apr 3 16:09:02 2007 -0400 winecfg: Add a button for audio test. --- programs/winecfg/En.rc | 3 ++- programs/winecfg/audio.c | 3 +++ programs/winecfg/resource.h | 21 +++++++++++---------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index c59d517..4ba0899 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -162,7 +162,8 @@ BEGIN GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,195 LTEXT "Select a sound driver by checking the box of the desired driver. Disable sound by not selecting any driver. Selection of multiple drivers is not recommended. Configure a driver by right-clicking on it.",IDC_STATIC,15,20,227,30 CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 - PUSHBUTTON "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 + PUSHBUTTON "Test Sound",IDC_AUDIO_TEST,170,50,59,14 + PUSHBUTTON "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Hardware Acceleration: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 2fc8c39..75d1629 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -731,6 +731,9 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDC_AUDIO_CONFIGURE: configureAudioDriver(hDlg); break; + case IDC_AUDIO_TEST: + MessageBox(NULL, "Audio Test not implemented yet!", "Fixme", MB_OK | MB_ICONERROR); + break; case IDC_AUDIO_CONTROL_PANEL: MessageBox(NULL, "Launching audio control panel not implemented yet!", "Fixme", MB_OK | MB_ICONERROR); break; diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 6bab26f..c867caa 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -159,16 +159,17 @@ /* audio tab */ #define IDC_AUDIO_CONFIGURE 1300 -#define IDC_AUDIO_CONTROL_PANEL 1301 -#define IDC_DSOUND_HW_ACCEL 1302 -#define IDC_DSOUND_DRV_EMUL 1303 -#define IDC_AUDIO_TREE 1304 -#define IDR_WINECFG 1305 -#define IDB_CHECKBOX 1306 -#define IDB_DEVICE 1307 -#define IDS_AUDIO_MISSING 1308 -#define IDC_DSOUND_RATES 1309 -#define IDC_DSOUND_BITS 1310 +#define IDC_AUDIO_TEST 1301 +#define IDC_AUDIO_CONTROL_PANEL 1302 +#define IDC_DSOUND_HW_ACCEL 1303 +#define IDC_DSOUND_DRV_EMUL 1304 +#define IDC_AUDIO_TREE 1305 +#define IDR_WINECFG 1306 +#define IDB_CHECKBOX 1307 +#define IDB_DEVICE 1308 +#define IDS_AUDIO_MISSING 1309 +#define IDC_DSOUND_RATES 1310 +#define IDC_DSOUND_BITS 1311 #define IDS_ACCEL_FULL 8300 #define IDS_ACCEL_STANDARD 8301 #define IDS_ACCEL_BASIC 8302

1 0

Felix Nawothnig : wined3d: Downgrade some ERRs to FIXMEs.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 413b9b2ad26b45584f22755b91fb55f49a742343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=413b9b2ad26b45584f22755b9… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Tue Apr 3 23:38:21 2007 +0200 wined3d: Downgrade some ERRs to FIXMEs. --- dlls/wined3d/state.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9f6a215..ab2e448 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1325,7 +1325,7 @@ static void state_wrap(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DC stateblock->renderState[WINED3DRS_WRAP13] || stateblock->renderState[WINED3DRS_WRAP14] || stateblock->renderState[WINED3DRS_WRAP15] ) { - ERR("(WINED3DRS_WRAP0) Texture wraping not yet supported\n"); + FIXME("(WINED3DRS_WRAP0) Texture wraping not yet supported\n"); } } @@ -1387,25 +1387,25 @@ static void state_perspective(DWORD state, IWineD3DStateBlockImpl *stateblock, W static void state_stippledalpha(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { TRACE("Stub\n"); if (stateblock->renderState[WINED3DRS_STIPPLEDALPHA]) - ERR(" Stippled Alpha not supported yet.\n"); + FIXME(" Stippled Alpha not supported yet.\n"); } static void state_antialias(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { TRACE("Stub\n"); if (stateblock->renderState[WINED3DRS_ANTIALIAS]) - ERR(" Antialias not supported yet.\n"); + FIXME(" Antialias not supported yet.\n"); } static void state_multisampmask(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { TRACE("Stub\n"); if (stateblock->renderState[WINED3DRS_MULTISAMPLEMASK] != 0xFFFFFFFF) - ERR("(WINED3DRS_MULTISAMPLEMASK,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_MULTISAMPLEMASK]); + FIXME("(WINED3DRS_MULTISAMPLEMASK,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_MULTISAMPLEMASK]); } static void state_patchedgestyle(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { TRACE("Stub\n"); if (stateblock->renderState[WINED3DRS_PATCHEDGESTYLE] != WINED3DPATCHEDGE_DISCRETE) - ERR("(WINED3DRS_PATCHEDGESTYLE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_PATCHEDGESTYLE]); + FIXME("(WINED3DRS_PATCHEDGESTYLE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_PATCHEDGESTYLE]); } static void state_patchsegments(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { @@ -1419,20 +1419,20 @@ static void state_patchsegments(DWORD state, IWineD3DStateBlockImpl *stateblock, if (stateblock->renderState[WINED3DRS_PATCHSEGMENTS] != tmpvalue.d) { tmpvalue.d = stateblock->renderState[WINED3DRS_PATCHSEGMENTS]; - ERR("(WINED3DRS_PATCHSEGMENTS,%f) not yet implemented\n", tmpvalue.f); + FIXME("(WINED3DRS_PATCHSEGMENTS,%f) not yet implemented\n", tmpvalue.f); } } static void state_positiondegree(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { TRACE("Stub\n"); if (stateblock->renderState[WINED3DRS_POSITIONDEGREE] != WINED3DDEGREE_CUBIC) - ERR("(WINED3DRS_POSITIONDEGREE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_POSITIONDEGREE]); + FIXME("(WINED3DRS_POSITIONDEGREE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_POSITIONDEGREE]); } static void state_normaldegree(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { TRACE("Stub\n"); if (stateblock->renderState[WINED3DRS_NORMALDEGREE] != WINED3DDEGREE_LINEAR) - ERR("(WINED3DRS_NORMALDEGREE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_NORMALDEGREE]); + FIXME("(WINED3DRS_NORMALDEGREE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_NORMALDEGREE]); } static void state_tessellation(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { @@ -1444,7 +1444,7 @@ static void state_tessellation(DWORD state, IWineD3DStateBlockImpl *stateblock, static void state_srgbwrite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { if(stateblock->renderState[WINED3DRS_SRGBWRITEENABLE]) - ERR("Render state WINED3DRS_SRGBWRITEENABLE not yet implemented\n"); + FIXME("Render state WINED3DRS_SRGBWRITEENABLE not yet implemented\n"); } static void state_seperateblend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { @@ -1948,7 +1948,7 @@ static void tex_bumpenvlscale(DWORD state, IWineD3DStateBlockImpl *stateblock, W tmpvalue.d = stateblock->textureState[stage][WINED3DTSS_BUMPENVLSCALE]; if(tmpvalue.f != 0.0) { - ERR("WINED3DTSS_BUMPENVLSCALE not supported yet\n"); + FIXME("WINED3DTSS_BUMPENVLSCALE not supported yet\n"); } } @@ -1961,7 +1961,7 @@ static void tex_bumpenvloffset(DWORD state, IWineD3DStateBlockImpl *stateblock, tmpvalue.d = stateblock->textureState[stage][WINED3DTSS_BUMPENVLOFFSET]; if(tmpvalue.f != 0.0) { - ERR("WINED3DTSS_BUMPENVLOFFSET not supported yet\n"); + FIXME("WINED3DTSS_BUMPENVLOFFSET not supported yet\n"); } } @@ -1973,7 +1973,7 @@ static void tex_resultarg(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD } if(stateblock->textureState[stage][WINED3DTSS_RESULTARG] != WINED3DTA_CURRENT) { - ERR("WINED3DTSS_RESULTARG not supported yet\n"); + FIXME("WINED3DTSS_RESULTARG not supported yet\n"); } }

1 0

Alexandre Julliard : server: Make timeout status for async I/O specifiable. Fix mailslots timeout handling.
by Alexandre Julliard 04 Apr '07

04 Apr '07

Module: wine Branch: master Commit: 4e5c7038da0c6ee3126d7099326b13565e54cec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e5c7038da0c6ee3126d70993… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 3 19:12:31 2007 +0200 server: Make timeout status for async I/O specifiable. Fix mailslots timeout handling. --- dlls/kernel32/tests/mailslot.c | 2 +- server/async.c | 6 ++++-- server/file.h | 3 ++- server/mailslot.c | 20 +------------------- server/named_pipe.c | 2 +- server/serial.c | 2 +- 6 files changed, 10 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index 0c47fde..850b065 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -299,7 +299,7 @@ static int mailslot_test(void) ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n"); ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); dwTimeout = GetTickCount() - dwTimeout; - todo_wine ok( dwTimeout >= 1000, "timeout too short %u\n", dwTimeout ); + ok( dwTimeout >= 1000, "timeout too short %u\n", dwTimeout ); ok( CloseHandle( hSlot ), "closing the mailslot\n"); return 0; diff --git a/server/async.c b/server/async.c index 26221a3..c58ef5f 100644 --- a/server/async.c +++ b/server/async.c @@ -38,6 +38,7 @@ struct async struct thread *thread; /* owning thread */ struct list queue_entry; /* entry in file descriptor queue */ struct timeout_user *timeout; + unsigned int timeout_status; /* status to report upon timeout */ struct event *event; async_data_t data; /* data for async I/O call */ }; @@ -149,7 +150,7 @@ static void async_timeout( void *private ) struct async *async = private; async->timeout = NULL; - async_terminate( async, STATUS_TIMEOUT ); + async_terminate( async, async->timeout_status ); } /* create a new async queue for a given fd */ @@ -193,11 +194,12 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co } /* set the timeout of an async operation */ -void async_set_timeout( struct async *async, const struct timeval *timeout ) +void async_set_timeout( struct async *async, const struct timeval *timeout, unsigned int status ) { if (async->timeout) remove_timeout_user( async->timeout ); if (timeout) async->timeout = add_timeout_user( timeout, async_timeout, async ); else async->timeout = NULL; + async->timeout_status = status; } /* store the result of the client-side async callback */ diff --git a/server/file.h b/server/file.h index ca2e426..a46a24f 100644 --- a/server/file.h +++ b/server/file.h @@ -126,7 +126,8 @@ extern struct object *create_serial( struct fd *fd, unsigned int options ); extern struct async_queue *create_async_queue( struct fd *fd ); extern struct async *create_async( struct thread *thread, struct async_queue *queue, const async_data_t *data ); -extern void async_set_timeout( struct async *async, const struct timeval *timeout ); +extern void async_set_timeout( struct async *async, const struct timeval *timeout, + unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status ); extern int async_waiting( struct async_queue *queue ); extern void async_wake_up( struct async_queue *queue, unsigned int status ); diff --git a/server/mailslot.c b/server/mailslot.c index 227c99f..89af2bf 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -208,17 +208,6 @@ static void mailslot_dump( struct object *obj, int verbose ) mailslot->max_msgsize, mailslot->read_timeout ); } -static int mailslot_message_count(struct mailslot *mailslot) -{ - struct pollfd pfd; - - /* poll the socket to see if there's any messages */ - pfd.fd = get_unix_fd( mailslot->fd ); - pfd.events = POLLIN; - pfd.revents = 0; - return (poll( &pfd, 1, 0 ) == 1) ? 1 : 0; -} - static enum server_fd_type mailslot_get_info( struct fd *fd, int *flags ) { struct mailslot *mailslot = get_fd_user( fd ); @@ -286,20 +275,13 @@ static void mailslot_queue_async( struct fd *fd, const async_data_t *data, int t assert(mailslot->obj.ops == &mailslot_ops); - if (list_empty( &mailslot->writers ) || - !mailslot_message_count( mailslot )) - { - set_error(STATUS_IO_TIMEOUT); - return; - } - if ((async = fd_queue_async( fd, data, type, count ))) { if (mailslot->read_timeout != -1) { struct timeval when = current_time; add_timeout( &when, max(1,mailslot->read_timeout) ); - async_set_timeout( async, &when ); + async_set_timeout( async, &when, STATUS_IO_TIMEOUT ); } release_object( async ); set_error( STATUS_PENDING ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 6afcdb6..9136041 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -867,7 +867,7 @@ DECL_HANDLER(wait_named_pipe) struct timeval when = current_time; if (req->timeout == NMPWAIT_USE_DEFAULT_WAIT) add_timeout( &when, pipe->timeout ); else add_timeout( &when, req->timeout ); - async_set_timeout( async, &when ); + async_set_timeout( async, &when, STATUS_TIMEOUT ); } release_object( async ); set_error( STATUS_PENDING ); diff --git a/server/serial.c b/server/serial.c index 42a3f72..f2b88c1 100644 --- a/server/serial.c +++ b/server/serial.c @@ -219,7 +219,7 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ { struct timeval when = current_time; add_timeout( &when, timeout ); - async_set_timeout( async, &when ); + async_set_timeout( async, &when, STATUS_TIMEOUT ); } release_object( async ); set_error( STATUS_PENDING );

1 0