wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Alexandre Julliard : winex11: Update the cursor on the clip window when the pointer grab starts.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 06948ebccf6d1471561e34824209ed3a9a07ba2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=06948ebccf6d1471561e34824… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 6 12:35:11 2011 +0200 winex11: Update the cursor on the clip window when the pointer grab starts. --- dlls/winex11.drv/mouse.c | 11 ++++------- dlls/winex11.drv/window.c | 10 ++-------- dlls/winex11.drv/x11drv.h | 3 +-- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e7e8d62..eb903cd 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -194,7 +194,7 @@ void set_window_cursor( Window window, HCURSOR handle ) /*********************************************************************** * sync_window_cursor */ -void sync_window_cursor( struct x11drv_win_data *data ) +void sync_window_cursor( Window window ) { HCURSOR cursor; @@ -206,11 +206,7 @@ void sync_window_cursor( struct x11drv_win_data *data ) } SERVER_END_REQ; - if (data->cursor != cursor) - { - data->cursor = cursor; - set_window_cursor( data->whole_window, cursor ); - } + set_window_cursor( window, cursor ); } /*********************************************************************** @@ -253,7 +249,7 @@ static void send_mouse_input( HWND hwnd, UINT flags, Window window, int x, int y if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || GetTickCount() - last_cursor_change > 100) { - sync_window_cursor( data ); + sync_window_cursor( data->whole_window ); last_cursor_change = GetTickCount(); } @@ -964,6 +960,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (clipping_cursor) { + sync_window_cursor( clip_window ); clip_rect = *clip; return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index e35547a..648ed59 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1715,10 +1715,7 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat XFlush( display ); /* make sure the window exists before we start painting to it */ wine_tsx11_unlock(); - sync_window_cursor( data ); - /* setting the cursor can fail if the window isn't created yet */ - /* so make sure that we try again once we receive a mouse event */ - data->cursor = (HANDLE)~0u; + sync_window_cursor( data->whole_window ); done: if (win_rgn) DeleteObject( win_rgn ); @@ -2701,10 +2698,7 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) return 0; case WM_X11DRV_SET_CURSOR: if ((data = X11DRV_get_win_data( hwnd )) && data->whole_window) - { - data->cursor = (HCURSOR)lp; - set_window_cursor( data->whole_window, data->cursor ); - } + set_window_cursor( data->whole_window, (HCURSOR)lp ); return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 986d03a..867d9fe 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -771,7 +771,6 @@ struct x11drv_win_data RECT whole_rect; /* X window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to parent */ XIC xic; /* X input context */ - HCURSOR cursor; /* current cursor */ XWMHints *wm_hints; /* window manager hints */ BOOL managed : 1; /* is window managed? */ BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */ @@ -822,7 +821,7 @@ extern void X11DRV_Clipboard_Cleanup(void); extern void X11DRV_ResetSelectionOwner(void); extern void CDECL X11DRV_SetFocus( HWND hwnd ); extern void set_window_cursor( Window window, HCURSOR handle ); -extern void sync_window_cursor( struct x11drv_win_data *data ); +extern void sync_window_cursor( Window window ); extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ); extern void X11DRV_InitKeyboard( Display *display ); extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout,

1 0

Alexandre Julliard : user32: Avoid accessing the dialog info of a destroyed window.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: ad32b28ac038e56c8e3940926aeb0d172e2bebe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad32b28ac038e56c8e3940926… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 6 12:35:01 2011 +0200 user32: Avoid accessing the dialog info of a destroyed window. --- dlls/user32/dialog.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index b7b3cce..2aa89d9 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -691,7 +691,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (dlgProc) { HWND focus = GetNextDlgTabItem( hwnd, 0, FALSE ); - if (SendMessageW( hwnd, WM_INITDIALOG, (WPARAM)focus, param ) && + if (SendMessageW( hwnd, WM_INITDIALOG, (WPARAM)focus, param ) && IsWindow( hwnd ) && ((~template.style & DS_CONTROL) || (template.style & WS_VISIBLE))) { /* By returning TRUE, app has requested a default focus assignment. @@ -811,15 +811,16 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) if (msg.message == WM_QUIT) { PostQuitMessage( msg.wParam ); - dlgInfo->flags |= DF_END; + if (!IsWindow( hwnd )) return 0; + break; } - if (!IsWindow( hwnd )) return 0; if (!(dlgInfo->flags & DF_END) && !IsDialogMessageW( hwnd, &msg)) { TranslateMessage( &msg ); DispatchMessageW( &msg ); } + if (!IsWindow( hwnd )) return 0; if (dlgInfo->flags & DF_END) break; if (bFirstEmpty && msg.message == WM_TIMER)

1 0

Jacek Caban : urlmon: Use dedicated data. php URL for testing regular http binding.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 548cef033f68626e34420fc58433f24f5cb74a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=548cef033f68626e34420fc58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 5 20:27:20 2011 +0200 urlmon: Use dedicated data.php URL for testing regular http binding. --- dlls/urlmon/tests/protocol.c | 44 +++++++---------------------------------- 1 files changed, 8 insertions(+), 36 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index be8494c..6c8e5db 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -215,25 +215,6 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(stra, buf); } -static BOOL proxy_active(void) -{ - HKEY internet_settings; - DWORD proxy_enable; - DWORD size; - - if (RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", - 0, KEY_QUERY_VALUE, &internet_settings) != ERROR_SUCCESS) - return FALSE; - - size = sizeof(DWORD); - if (RegQueryValueExA(internet_settings, "ProxyEnable", NULL, NULL, (LPBYTE) &proxy_enable, &size) != ERROR_SUCCESS) - proxy_enable = 0; - - RegCloseKey(internet_settings); - - return proxy_enable != 0; -} - static HRESULT WINAPI HttpSecurity_QueryInterface(IHttpSecurity *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) @@ -593,11 +574,6 @@ static void call_continue(PROTOCOLDATA *protocol_data) CLEAR_CALLED(ReportProgress_FINDINGRESOURCE); CLEAR_CALLED(ReportProgress_CONNECTING); CLEAR_CALLED(ReportProgress_PROXYDETECTING); - }else if(test_redirect) { - if (! proxy_active()) - CHECK_CALLED(ReportProgress_FINDINGRESOURCE); - else - CLEAR_CALLED(ReportProgress_FINDINGRESOURCE); }else todo_wine { CHECK_NOT_CALLED(ReportProgress_FINDINGRESOURCE); /* IE7 does call this */ @@ -652,7 +628,7 @@ static void call_continue(PROTOCOLDATA *protocol_data) state = STATE_DOWNLOADING; if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { CHECK_CALLED(OnResponse); - if(tested_protocol == HTTPS_TEST || test_abort) + if(tested_protocol == HTTPS_TEST) CHECK_CALLED(ReportProgress_ACCEPTRANGES); else if(test_redirect) CLEAR_CALLED(ReportProgress_ACCEPTRANGES); @@ -2892,9 +2868,6 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym static void test_http_protocol(void) { - static const WCHAR winehq_url[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.', - 'o','r','g','/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR posttest_url[] = {'h','t','t','p',':','/','/','c','r','o','s','s','o','v','e','r','.', 'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', @@ -2903,24 +2876,23 @@ static void test_http_protocol(void) {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', 't','e','s','t','s','/','r','e','d','i','r','e','c','t',0}; static const WCHAR winetest_url[] = - {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/','d','a','t','a','/',0}; + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', + 't','e','s','t','s','/','d','a','t','a','.','p','h','p',0}; trace("Testing http protocol (not from urlmon)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; - test_http_protocol_url(winehq_url, HTTP_TEST, TEST_FIRST_HTTP, TYMED_NULL); + test_http_protocol_url(winetest_url, HTTP_TEST, TEST_FIRST_HTTP, TYMED_NULL); trace("Testing http protocol (from urlmon)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON; - test_http_protocol_url(winehq_url, HTTP_TEST, 0, TYMED_NULL); + test_http_protocol_url(winetest_url, HTTP_TEST, 0, TYMED_NULL); trace("Testing http protocol (to file)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NEEDFILE; - test_http_protocol_url(winehq_url, HTTP_TEST, 0, TYMED_NULL); + test_http_protocol_url(winetest_url, HTTP_TEST, 0, TYMED_NULL); trace("Testing http protocol (post data)...\n"); - /* Without this flag we get a ReportProgress_CACHEFILENAMEAVAILABLE - * notification with BINDVERB_POST */ - bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON; test_http_protocol_url(posttest_url, HTTP_TEST, TEST_FIRST_HTTP|TEST_POST, TYMED_HGLOBAL); trace("Testing http protocol (post data stream)...\n"); @@ -2928,7 +2900,7 @@ static void test_http_protocol(void) trace("Testing http protocol (direct read)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON; - test_http_protocol_url(winehq_url, HTTP_TEST, TEST_DIRECT_READ|TEST_USEIURI, TYMED_NULL); + test_http_protocol_url(winetest_url, HTTP_TEST, TEST_DIRECT_READ|TEST_USEIURI, TYMED_NULL); trace("Testing http protocol (redirected)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON;

1 0

Aric Stewart : wineqtdecoder: Add processing for audio in the movie.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: f1da93da80773afcbf69fc727a112c48ab5a7d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1da93da80773afcbf69fc727… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 12:56:02 2011 -0500 wineqtdecoder: Add processing for audio in the movie. --- dlls/wineqtdecoder/qtsplitter.c | 286 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 271 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1da93da80773afcbf69f…

1 0

Aric Stewart : wineqtdecoder: Work to add a QuickTime video Splitter.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 2c9875e4c1336d83cd26beb07c0af278438386ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9875e4c1336d83cd26beb07… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 12:56:00 2011 -0500 wineqtdecoder: Work to add a QuickTime video Splitter. --- dlls/wineqtdecoder/Makefile.in | 1 + dlls/wineqtdecoder/main.c | 49 ++ dlls/wineqtdecoder/qtsplitter.c | 1063 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 1113 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c9875e4c1336d83cd26b…

1 0

Aric Stewart : wineqtdecoder: Add 64-bit functions to datahandler.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 0a7b99498c0915e895326f719a6e68dbee8c84ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7b99498c0915e895326f719… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 12:55:58 2011 -0500 wineqtdecoder: Add 64-bit functions to datahandler. --- dlls/wineqtdecoder/qtdatahandler.c | 87 ++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 3 deletions(-) diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index f6da6a6..4cca607 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -377,6 +377,70 @@ static pascal ComponentResult myDataHPlaybackHints(DataHandler dh, long flags, return noErr; } +static pascal ComponentResult myDataHGetFileSize64(DataHandler dh, wide * fileSize) +{ + Handle storage = GetComponentInstanceStorage(dh); + DHData *data = (DHData*)*storage; + LONGLONG total; + LONGLONG avaliable; + SInt64 total64; + + TRACE("%p\n",dh); + + IAsyncReader_Length(data->dataRef.pReader,&total,&avaliable); + total64 = total; + *fileSize = SInt64ToWide(total64); + return noErr; +} + +static pascal ComponentResult myDataHGetAvailableFileSize64(DataHandler dh, wide * fileSize) +{ + Handle storage = GetComponentInstanceStorage(dh); + DHData *data = (DHData*)*storage; + LONGLONG total; + LONGLONG avaliable; + SInt64 total64; + + TRACE("%p\n",dh); + + IAsyncReader_Length(data->dataRef.pReader,&total,&avaliable); + total64 = avaliable; + *fileSize = SInt64ToWide(total64); + return noErr; +} + +static pascal ComponentResult myDataHScheduleData64( DataHandler dh, + Ptr PlaceToPutDataPtr, + const wide * FileOffset, + long DataSize, + long RefCon, + DataHSchedulePtr scheduleRec, + DataHCompletionUPP CompletionRtn) +{ + Handle storage = GetComponentInstanceStorage(dh); + DHData *data = (DHData*)*storage; + HRESULT hr; + SInt64 fileOffset64 = WideToSInt64(*FileOffset); + LONGLONG offset = fileOffset64; + BYTE* buffer = (BYTE*)PlaceToPutDataPtr; + + TRACE("%p %p %lli %li %li %p %p\n",dh, PlaceToPutDataPtr, offset, DataSize, RefCon, scheduleRec, CompletionRtn); + + hr = IAsyncReader_SyncRead(data->dataRef.pReader, offset, DataSize, buffer); + TRACE("result %x\n",hr); + if (CompletionRtn) + { + if (data->AsyncCompletionRtn) + InvokeDataHCompletionUPP(data->AsyncPtr, data->AsyncRefCon, noErr, data->AsyncCompletionRtn); + + data->AsyncPtr = PlaceToPutDataPtr; + data->AsyncRefCon = RefCon; + data->AsyncCompletionRtn = CompletionRtn; + } + + return noErr; +} + static const struct { LPVOID proc; ProcInfoType type;} componentFunctions[] = { {NULL, 0}, /* 0 */ @@ -492,9 +556,22 @@ static const struct { LPVOID proc; ProcInfoType type;} componentFunctions[] = | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(DataHandler))) | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(UInt32*))) }, /* kDataHGetInfoFlagsSelect */ - {NULL, 0}, /* kDataHScheduleData64Select */ + {myDataHScheduleData64, kPascalStackBased + | RESULT_SIZE(SIZE_CODE(sizeof(ComponentResult))) + | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(DataHandler))) + | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(Ptr))) + | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(wide*))) + | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(long))) + | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(long))) + | STACK_ROUTINE_PARAMETER(6, SIZE_CODE(sizeof(DataHSchedulePtr))) + | STACK_ROUTINE_PARAMETER(7, SIZE_CODE(sizeof(DataHCompletionUPP))) +}, /* kDataHScheduleData64Select */ {NULL, 0}, /* kDataHWrite64Select */ - {NULL, 0}, /* kDataHGetFileSize64Select 0x30 */ + {myDataHGetFileSize64, kPascalStackBased + | RESULT_SIZE(SIZE_CODE(sizeof(ComponentResult))) + | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(DataHandler))) + | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(wide*))) +}, /* kDataHGetFileSize64Select 0x30 */ {NULL, 0}, /* kDataHPreextend64Select */ {NULL, 0}, /* kDataHSetFileSize64Select */ {NULL, 0}, /* kDataHGetFreeSpace64Select */ @@ -528,7 +605,11 @@ static const struct { LPVOID proc; ProcInfoType type;} componentFunctions[] = {NULL, 0}, /* 0x4B */ {NULL, 0}, /* 0x4C */ {NULL, 0}, /* 0x4D */ - {NULL, 0}, /* kDataHGetAvailableFileSize64Select */ + {myDataHGetAvailableFileSize64, kPascalStackBased + | RESULT_SIZE(SIZE_CODE(sizeof(ComponentResult))) + | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(DataHandler))) + | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(wide*))) +}, /* kDataHGetAvailableFileSize64Select */ {NULL, 0}, /* kDataHGetDataAvailability64Select */ };

1 0

Aric Stewart : wineqtdecoder: Implement a Wine specific Data Handler.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 800dbb49ca233f0f4194fb9493a4616194ee3d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=800dbb49ca233f0f4194fb949… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 12:55:55 2011 -0500 wineqtdecoder: Implement a Wine specific Data Handler. --- dlls/wineqtdecoder/Makefile.in | 1 + dlls/wineqtdecoder/qtdatahandler.c | 625 ++++++++++++++++++++++++++++++++++++ dlls/wineqtdecoder/qtprivate.h | 7 + 3 files changed, 633 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=800dbb49ca233f0f4194f…

1 0

Aric Stewart : wineqtdecoder: Move pixel buffer access to utility module.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: f9abb07fb341d1c713fa94910dee9950bfcfd06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9abb07fb341d1c713fa94910… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 12:55:53 2011 -0500 wineqtdecoder: Move pixel buffer access to utility module. --- dlls/wineqtdecoder/Makefile.in | 1 + dlls/wineqtdecoder/qtprivate.h | 21 +++++ dlls/wineqtdecoder/qtutils.c | 160 +++++++++++++++++++++++++++++++++++++++ dlls/wineqtdecoder/qtvdecoder.c | 53 ++++---------- 4 files changed, 196 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9abb07fb341d1c713fa9…

1 0

Aric Stewart : strmbase: Add OutputQueue_EOS implementation.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: ed71339d170e5a60d4f4fe6a7705305fececd19f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed71339d170e5a60d4f4fe6a7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 12:55:50 2011 -0500 strmbase: Add OutputQueue_EOS implementation. --- dlls/strmbase/outputqueue.c | 136 +++++++++++++++++++++++++++++++++++-------- include/wine/strmbase.h | 3 + 2 files changed, 115 insertions(+), 24 deletions(-) diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index 100b845..200e2da 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -31,7 +31,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +enum {SAMPLE_PACKET, EOS_PACKET}; + typedef struct tagQueuedEvent { + int type; struct list entry; IMediaSample *pSample; @@ -163,6 +166,7 @@ HRESULT WINAPI OutputQueue_ReceiveMultiple(OutputQueue *pOutputQueue, IMediaSamp hr = E_OUTOFMEMORY; break; } + qev->type = SAMPLE_PACKET; qev->pSample = ppSamples[i]; IMediaSample_AddRef(ppSamples[i]); list_add_tail(pOutputQueue->SampleList, &qev->entry); @@ -182,40 +186,124 @@ HRESULT WINAPI OutputQueue_Receive(OutputQueue *pOutputQueue, IMediaSample *pSam return OutputQueue_ReceiveMultiple(pOutputQueue,&pSample,1,&processed); } +VOID WINAPI OutputQueue_SendAnyway(OutputQueue *pOutputQueue) +{ + if (pOutputQueue->hThread) + { + EnterCriticalSection(&pOutputQueue->csQueue); + if (list_count(pOutputQueue->SampleList) > 0) + { + pOutputQueue->bSendAnyway = TRUE; + SetEvent(pOutputQueue->hProcessQueue); + } + LeaveCriticalSection(&pOutputQueue->csQueue); + } +} + +VOID WINAPI OutputQueue_EOS(OutputQueue *pOutputQueue) +{ + EnterCriticalSection(&pOutputQueue->csQueue); + if (pOutputQueue->hThread) + { + QueuedEvent *qev = HeapAlloc(GetProcessHeap(),0,sizeof(QueuedEvent)); + if (!qev) + { + ERR("Out of Memory\n"); + LeaveCriticalSection(&pOutputQueue->csQueue); + return; + } + qev->type = EOS_PACKET; + qev->pSample = NULL; + list_add_tail(pOutputQueue->SampleList, &qev->entry); + } + else + { + IPin* ppin = NULL; + IPin_ConnectedTo((IPin*)pOutputQueue->pInputPin, &ppin); + if (ppin) + { + IPin_EndOfStream(ppin); + IPin_Release(ppin); + } + } + LeaveCriticalSection(&pOutputQueue->csQueue); + /* Covers sending the Event to the worker Thread */ + OutputQueue_SendAnyway(pOutputQueue); +} + DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) { do { EnterCriticalSection(&pOutputQueue->csQueue); if (list_count(pOutputQueue->SampleList) > 0 && - (!pOutputQueue->bBatchExact || - list_count(pOutputQueue->SampleList) >= pOutputQueue->lBatchSize)) + (!pOutputQueue->bBatchExact || + list_count(pOutputQueue->SampleList) >= pOutputQueue->lBatchSize || + pOutputQueue->bSendAnyway + ) + ) { - IMediaSample **ppSamples; - LONG nSamples; - LONG nSamplesProcessed; - struct list *cursor, *cursor2; - int i = 0; - - nSamples = list_count(pOutputQueue->SampleList); - ppSamples = HeapAlloc(GetProcessHeap(),0,sizeof(IMediaSample*) * nSamples); - LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) + while (list_count(pOutputQueue->SampleList) > 0) { - QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); - list_remove(cursor); - ppSamples[i++] = qev->pSample; - HeapFree(GetProcessHeap(),0,qev); - } + IMediaSample **ppSamples; + LONG nSamples; + LONG nSamplesProcessed; + struct list *cursor, *cursor2; + int i = 0; - if (pOutputQueue->pInputPin->pin.pConnectedTo && pOutputQueue->pInputPin->pMemInputPin) - { - IMemInputPin_AddRef(pOutputQueue->pInputPin->pMemInputPin); - IMemInputPin_ReceiveMultiple(pOutputQueue->pInputPin->pMemInputPin, ppSamples, nSamples, &nSamplesProcessed); - IMemInputPin_Release(pOutputQueue->pInputPin->pMemInputPin); + /* First Pass Process Samples */ + i = list_count(pOutputQueue->SampleList); + ppSamples = HeapAlloc(GetProcessHeap(),0,sizeof(IMediaSample*) * i); + nSamples = 0; + LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) + { + QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); + if (qev->type == SAMPLE_PACKET) + ppSamples[nSamples++] = qev->pSample; + else + break; + list_remove(cursor); + HeapFree(GetProcessHeap(),0,qev); + } + + if (pOutputQueue->pInputPin->pin.pConnectedTo && pOutputQueue->pInputPin->pMemInputPin) + { + IMemInputPin_AddRef(pOutputQueue->pInputPin->pMemInputPin); + LeaveCriticalSection(&pOutputQueue->csQueue); + IMemInputPin_ReceiveMultiple(pOutputQueue->pInputPin->pMemInputPin, ppSamples, nSamples, &nSamplesProcessed); + EnterCriticalSection(&pOutputQueue->csQueue); + IMemInputPin_Release(pOutputQueue->pInputPin->pMemInputPin); + } + for (i = 0; i < nSamples; i++) + IUnknown_Release(ppSamples[i]); + HeapFree(GetProcessHeap(),0,ppSamples); + + /* Process Non-Samples */ + if (list_count(pOutputQueue->SampleList) > 0) + { + LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) + { + QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); + if (qev->type == EOS_PACKET) + { + IPin* ppin = NULL; + IPin_ConnectedTo((IPin*)pOutputQueue->pInputPin, &ppin); + if (ppin) + { + IPin_EndOfStream(ppin); + IPin_Release(ppin); + } + } + else if (qev->type == SAMPLE_PACKET) + break; + else + FIXME("Unhandled Event type %i\n",qev->type); + list_remove(cursor); + HeapFree(GetProcessHeap(),0,qev); + } + } } - for (i = 0; i < nSamples; i++) - IUnknown_Release(ppSamples[i]); - HeapFree(GetProcessHeap(),0,ppSamples); + pOutputQueue->bSendAnyway = FALSE; } LeaveCriticalSection(&pOutputQueue->csQueue); WaitForSingleObject(pOutputQueue->hProcessQueue, INFINITE); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 7063e79..3d06bf8 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -358,6 +358,7 @@ typedef struct tagOutputQueue { LONG lBatchSize; BOOL bBatchExact; BOOL bTerminate; + BOOL bSendAnyway; struct list *SampleList; @@ -377,6 +378,8 @@ HRESULT WINAPI OutputQueue_Construct( BaseOutputPin *pInputPin, BOOL bAuto, HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue); HRESULT WINAPI OutputQueue_ReceiveMultiple(OutputQueue *pOutputQueue, IMediaSample **ppSamples, LONG nSamples, LONG *nSamplesProcessed); HRESULT WINAPI OutputQueue_Receive(OutputQueue *pOutputQueue, IMediaSample *pSample); +VOID WINAPI OutputQueue_EOS(OutputQueue *pOutputQueue); +VOID WINAPI OutputQueue_SendAnyway(OutputQueue *pOutputQueue); DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue); /* Dll Functions */

1 0

Aric Stewart : strmbase: Create OutputQueue for queuing outgoing samples.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 928994d98605b8acdbd3fc98248d8f17cf8a95ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=928994d98605b8acdbd3fc982… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 12:55:47 2011 -0500 strmbase: Create OutputQueue for queuing outgoing samples. --- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/outputqueue.c | 225 +++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 33 +++++++ 3 files changed, 259 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 9ecb169..8c19a56 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -5,6 +5,7 @@ C_SRCS = \ enumpins.c \ filter.c \ mediatype.c \ + outputqueue.c \ pin.c \ qualitycontrol.c \ seeking.c \ diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c new file mode 100644 index 0000000..100b845 --- /dev/null +++ b/dlls/strmbase/outputqueue.c @@ -0,0 +1,225 @@ +/* + * Generic Implementation of COutputQueue + * + * Copyright 2011 Aric Stewart, CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "dshow.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/list.h" +#include "wine/strmbase.h" +#include "uuids.h" +#include "vfwmsgs.h" +#include <assert.h> + +WINE_DEFAULT_DEBUG_CHANNEL(strmbase); + +typedef struct tagQueuedEvent { + struct list entry; + + IMediaSample *pSample; +} QueuedEvent; + +static DWORD WINAPI OutputQueue_InitialThreadProc(LPVOID data) +{ + OutputQueue *This = (OutputQueue *)data; + return This->pFuncsTable->pfnThreadProc(This); +} + +static void OutputQueue_FreeSamples(OutputQueue *pOutputQueue) +{ + struct list *cursor, *cursor2; + LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) + { + QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); + list_remove(cursor); + HeapFree(GetProcessHeap(),0,qev); + } +} + +HRESULT WINAPI OutputQueue_Construct( + BaseOutputPin *pInputPin, + BOOL bAuto, + BOOL bQueue, + LONG lBatchSize, + BOOL bBatchExact, + DWORD dwPriority, + const OutputQueueFuncTable* pFuncsTable, + OutputQueue **ppOutputQueue ) + +{ + HRESULT hr = S_OK; + BOOL threaded = FALSE; + DWORD tid; + + OutputQueue *This; + + if (!pInputPin || !pFuncsTable || !ppOutputQueue) + return E_INVALIDARG; + + *ppOutputQueue = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(OutputQueue)); + if (!*ppOutputQueue) + return E_OUTOFMEMORY; + + This = *ppOutputQueue; + This->pFuncsTable = pFuncsTable; + This->lBatchSize = lBatchSize; + This->bBatchExact = bBatchExact; + InitializeCriticalSection(&This->csQueue); + This->csQueue.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": OutputQueue.csQueue"); + This->SampleList = HeapAlloc(GetProcessHeap(),0,sizeof(struct list)); + if (!This->SampleList) + { + OutputQueue_Destroy(This); + *ppOutputQueue = NULL; + return E_OUTOFMEMORY; + } + list_init(This->SampleList); + + This->pInputPin = pInputPin; + IPin_AddRef((IPin*)pInputPin); + + EnterCriticalSection(&This->csQueue); + if (bAuto && pInputPin->pMemInputPin) + threaded = IMemInputPin_ReceiveCanBlock(pInputPin->pMemInputPin); + else + threaded = bQueue; + + if (threaded) + { + This->hThread = CreateThread(NULL, 0, OutputQueue_InitialThreadProc, This, 0, &tid); + if (This->hThread) + { + SetThreadPriority(This->hThread, dwPriority); + This->hProcessQueue = CreateEventW(NULL, 0, 0, NULL); + } + } + LeaveCriticalSection(&This->csQueue); + + return hr; +} + +HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue) +{ + EnterCriticalSection(&pOutputQueue->csQueue); + OutputQueue_FreeSamples(pOutputQueue); + pOutputQueue->bTerminate = TRUE; + SetEvent(pOutputQueue->hProcessQueue); + LeaveCriticalSection(&pOutputQueue->csQueue); + + DeleteCriticalSection(&pOutputQueue->csQueue); + CloseHandle(pOutputQueue->hProcessQueue); + + if (pOutputQueue->SampleList) + HeapFree(GetProcessHeap(),0,pOutputQueue->SampleList); + + IPin_Release((IPin*)pOutputQueue->pInputPin); + HeapFree(GetProcessHeap(),0,pOutputQueue); + return S_OK; +} + +HRESULT WINAPI OutputQueue_ReceiveMultiple(OutputQueue *pOutputQueue, IMediaSample **ppSamples, LONG nSamples, LONG *nSamplesProcessed) +{ + HRESULT hr = S_OK; + int i; + + if (!pOutputQueue->pInputPin->pin.pConnectedTo || !pOutputQueue->pInputPin->pMemInputPin) + return VFW_E_NOT_CONNECTED; + + if (!pOutputQueue->hThread) + { + IMemInputPin_AddRef(pOutputQueue->pInputPin->pMemInputPin); + hr = IMemInputPin_ReceiveMultiple(pOutputQueue->pInputPin->pMemInputPin,ppSamples, nSamples, nSamplesProcessed); + IMemInputPin_Release(pOutputQueue->pInputPin->pMemInputPin); + } + else + { + EnterCriticalSection(&pOutputQueue->csQueue); + *nSamplesProcessed = 0; + + for (i = 0; i < nSamples; i++) + { + QueuedEvent *qev = HeapAlloc(GetProcessHeap(),0,sizeof(QueuedEvent)); + if (!qev) + { + ERR("Out of Memory\n"); + hr = E_OUTOFMEMORY; + break; + } + qev->pSample = ppSamples[i]; + IMediaSample_AddRef(ppSamples[i]); + list_add_tail(pOutputQueue->SampleList, &qev->entry); + (*nSamplesProcessed)++; + } + LeaveCriticalSection(&pOutputQueue->csQueue); + + if (!pOutputQueue->bBatchExact || list_count(pOutputQueue->SampleList) >= pOutputQueue->lBatchSize) + SetEvent(pOutputQueue->hProcessQueue); + } + return hr; +} + +HRESULT WINAPI OutputQueue_Receive(OutputQueue *pOutputQueue, IMediaSample *pSample) +{ + LONG processed; + return OutputQueue_ReceiveMultiple(pOutputQueue,&pSample,1,&processed); +} + +DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) +{ + do + { + EnterCriticalSection(&pOutputQueue->csQueue); + if (list_count(pOutputQueue->SampleList) > 0 && + (!pOutputQueue->bBatchExact || + list_count(pOutputQueue->SampleList) >= pOutputQueue->lBatchSize)) + { + IMediaSample **ppSamples; + LONG nSamples; + LONG nSamplesProcessed; + struct list *cursor, *cursor2; + int i = 0; + + nSamples = list_count(pOutputQueue->SampleList); + ppSamples = HeapAlloc(GetProcessHeap(),0,sizeof(IMediaSample*) * nSamples); + LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) + { + QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); + list_remove(cursor); + ppSamples[i++] = qev->pSample; + HeapFree(GetProcessHeap(),0,qev); + } + + if (pOutputQueue->pInputPin->pin.pConnectedTo && pOutputQueue->pInputPin->pMemInputPin) + { + IMemInputPin_AddRef(pOutputQueue->pInputPin->pMemInputPin); + IMemInputPin_ReceiveMultiple(pOutputQueue->pInputPin->pMemInputPin, ppSamples, nSamples, &nSamplesProcessed); + IMemInputPin_Release(pOutputQueue->pInputPin->pMemInputPin); + } + for (i = 0; i < nSamples; i++) + IUnknown_Release(ppSamples[i]); + HeapFree(GetProcessHeap(),0,ppSamples); + } + LeaveCriticalSection(&pOutputQueue->csQueue); + WaitForSingleObject(pOutputQueue->hProcessQueue, INFINITE); + } + while (!pOutputQueue->bTerminate); + return S_OK; +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 6b96c78..7063e79 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -346,6 +346,39 @@ typedef struct tagFactoryTemplate { HRESULT WINAPI AMovieDllRegisterServer2(BOOL bRegister); HRESULT WINAPI AMovieSetupRegisterFilter2(const AMOVIESETUP_FILTER *pFilter, IFilterMapper2 *pIFM2, BOOL bRegister); +/* Output Queue */ +typedef struct tagOutputQueue { + CRITICAL_SECTION csQueue; + + BaseOutputPin * pInputPin; + + HANDLE hThread; + HANDLE hProcessQueue; + + LONG lBatchSize; + BOOL bBatchExact; + BOOL bTerminate; + + struct list *SampleList; + + const struct OutputQueueFuncTable* pFuncsTable; +} OutputQueue; + +typedef DWORD (WINAPI *OutputQueue_ThreadProc)(OutputQueue *This); + +typedef struct OutputQueueFuncTable +{ + OutputQueue_ThreadProc pfnThreadProc; +} OutputQueueFuncTable; + +HRESULT WINAPI OutputQueue_Construct( BaseOutputPin *pInputPin, BOOL bAuto, + BOOL bQueue, LONG lBatchSize, BOOL bBatchExact, DWORD dwPriority, + const OutputQueueFuncTable* pFuncsTable, OutputQueue **ppOutputQueue ); +HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue); +HRESULT WINAPI OutputQueue_ReceiveMultiple(OutputQueue *pOutputQueue, IMediaSample **ppSamples, LONG nSamples, LONG *nSamplesProcessed); +HRESULT WINAPI OutputQueue_Receive(OutputQueue *pOutputQueue, IMediaSample *pSample); +DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue); + /* Dll Functions */ BOOL WINAPI STRMBASE_DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv); HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv);

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011