April 2011 - Wine-Commits - list.winehq.org

Austin English : msvcp100: Add stub dll.
by Alexandre Julliard April 6, 2011

April 6, 2011

Module: wine Branch: master Commit: dfbf47b00c80932af579df771d45373638332a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfbf47b00c80932af579df771… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 5 12:47:46 2011 -0700 msvcp100: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/msvcp100/Makefile.in | 6 + dlls/msvcp100/msvcp100.c | 37 + dlls/msvcp100/msvcp100.spec | 5789 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 5834 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfbf47b00c80932af579d…

1 0

Alexandre Julliard : winex11: Simplify the event handler lookup, and support names in debug traces for extension events.
by Alexandre Julliard April 6, 2011

April 6, 2011

Module: wine Branch: master Commit: 9c8911e342f74d82ab43a2547b64fd4813ccf443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8911e342f74d82ab43a2547… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 6 13:26:42 2011 +0200 winex11: Simplify the event handler lookup, and support names in debug traces for extension events. --- dlls/winex11.drv/event.c | 164 ++++++++++++++++----------------------------- dlls/winex11.drv/wintab.c | 21 ++++-- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 73 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c8911e342f74d82ab43a…

1 0

Jacek Caban : urlmon: Use dedicated data. php URL for testing regular http binding.
by Alexandre Julliard April 6, 2011

April 6, 2011

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

Hans Leidekker : msi: More Wow64 fixes.
by Alexandre Julliard April 6, 2011

April 6, 2011

Module: wine Branch: master Commit: 88b4bbfc6acc6977a9f1d6b332fdd5edc61a0adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b4bbfc6acc6977a9f1d6b33… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 09:52:16 2011 +0200 msi: More Wow64 fixes. --- dlls/msi/msi.c | 6 +++--- dlls/msi/registry.c | 24 ++++++++++++++---------- dlls/msi/tests/action.c | 8 ++++---- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 44a4e21..def9e72 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1571,11 +1571,11 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, r = ERROR_UNKNOWN_PATCH; - res = RegOpenKeyExW(udprod, szPatches, 0, KEY_READ, &patches); + res = RegOpenKeyExW(udprod, szPatches, 0, KEY_WOW64_64KEY|KEY_READ, &patches); if (res != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW(patches, squished_patch, 0, KEY_READ, &patch); + res = RegOpenKeyExW(patches, squished_patch, 0, KEY_WOW64_64KEY|KEY_READ, &patch); if (res != ERROR_SUCCESS) goto done; @@ -1585,7 +1585,7 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, &prod, FALSE) != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW(prod, szPatches, 0, KEY_ALL_ACCESS, &prodpatches); + res = RegOpenKeyExW(prod, szPatches, 0, KEY_WOW64_64KEY|KEY_ALL_ACCESS, &prodpatches); if (res != ERROR_SUCCESS) goto done; diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 5db5a4b..353cb6d 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -150,9 +150,11 @@ static const WCHAR szInstaller_LocalClassesFeat[] = { 'I','n','s','t','a','l','l','e','r','\\','F','e','a','t','u','r','e','s','\\',0}; static const WCHAR szInstaller_ClassesUpgradeCode[] = { + 'S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s','\\', 'I','n','s','t','a','l','l','e','r','\\','U','p','g','r','a','d','e','C','o','d','e','s','\\',0}; static const WCHAR szInstaller_ClassesUpgradeCodes[] = { + 'S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s','\\', 'I','n','s','t','a','l','l','e','r','\\','U','p','g','r','a','d','e','C','o','d','e','s',0}; static const WCHAR szInstaller_Features[] = { @@ -991,8 +993,8 @@ UINT MSIREG_OpenClassesUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY *key, BOOL cr strcpyW(keypath, szInstaller_ClassesUpgradeCode); strcatW(keypath, squished_pc); - if (create) return RegCreateKeyExW(HKEY_CLASSES_ROOT, keypath, 0, NULL, 0, access, NULL, key, NULL); - return RegOpenKeyExW(HKEY_CLASSES_ROOT, keypath, 0, access, key); + if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); + return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); } UINT MSIREG_DeleteClassesUpgradeCodesKey(LPCWSTR szUpgradeCode) @@ -1005,7 +1007,7 @@ UINT MSIREG_DeleteClassesUpgradeCodesKey(LPCWSTR szUpgradeCode) if (!squash_guid(szUpgradeCode, squished_pc)) return ERROR_FUNCTION_FAILED; TRACE("%s squished %s\n", debugstr_w(szUpgradeCode), debugstr_w(squished_pc)); - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szInstaller_ClassesUpgradeCodes, 0, access, &hkey)) return ERROR_SUCCESS; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szInstaller_ClassesUpgradeCodes, 0, access, &hkey)) return ERROR_SUCCESS; r = RegDeleteTreeW(hkey, squished_pc); RegCloseKey(hkey); return r; @@ -1143,6 +1145,7 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) UINT r; WCHAR szKeyName[SQUISH_GUID_SIZE]; HKEY key; + REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; DWORD machine_count, managed_count, unmanaged_count; WCHAR keypath[MAX_PATH]; LPWSTR usersid = NULL; @@ -1158,7 +1161,7 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) return ERROR_INVALID_PARAMETER; key = 0; - r = RegCreateKeyW(HKEY_LOCAL_MACHINE, szInstaller_LocalClassesProducts, &key); + r = RegCreateKeyExW(HKEY_LOCAL_MACHINE, szInstaller_LocalClassesProducts, 0, NULL, 0, access, NULL, &key, NULL); if( r != ERROR_SUCCESS ) goto failed; r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &machine_count, NULL, NULL, @@ -1188,7 +1191,7 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) sprintfW(keypath, szInstaller_LocalManaged_fmt, usersid); LocalFree(usersid); - r = RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, &key); + r = RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &key, NULL); if( r != ERROR_SUCCESS ) goto failed; r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &managed_count, NULL, NULL, @@ -1301,21 +1304,22 @@ UINT WINAPI MsiEnumComponentsA(DWORD index, LPSTR lpguid) UINT WINAPI MsiEnumComponentsW(DWORD index, LPWSTR lpguid) { - HKEY hkeyComponents = 0; - DWORD r; + HKEY hkey; + REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; WCHAR szKeyName[SQUISH_GUID_SIZE]; + DWORD r; TRACE("%d %p\n", index, lpguid); - r = RegCreateKeyW(HKEY_LOCAL_MACHINE, szInstaller_Components, &hkeyComponents); + r = RegCreateKeyExW(HKEY_LOCAL_MACHINE, szInstaller_Components, 0, NULL, 0, access, NULL, &hkey, NULL); if( r != ERROR_SUCCESS ) return ERROR_NO_MORE_ITEMS; - r = RegEnumKeyW(hkeyComponents, index, szKeyName, SQUISH_GUID_SIZE); + r = RegEnumKeyW(hkey, index, szKeyName, SQUISH_GUID_SIZE); if( r == ERROR_SUCCESS ) unsquash_guid(szKeyName, lpguid); - RegCloseKey(hkeyComponents); + RegCloseKey(hkey); return r; } diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 2643e39..1d06509 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2781,8 +2781,8 @@ static void test_publish_product(void) static const CHAR badprod[] = "Software\\Microsoft\\Windows\\CurrentVersion" "\\Installer\\Products" "\\84A88FD7F6998CE40A22FB59F6B9C2BB"; - static const CHAR machprod[] = "Installer\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB"; - static const CHAR machup[] = "Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2"; + static const CHAR machprod[] = "Software\\Classes\\Installer\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB"; + static const CHAR machup[] = "Software\\Classes\\Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2"; if (is_process_limited()) { @@ -2936,7 +2936,7 @@ currentuser: RegCloseKey(hkey); machprod: - res = RegOpenKeyExA(HKEY_CLASSES_ROOT, machprod, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, machprod, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); @@ -2982,7 +2982,7 @@ machprod: ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); RegCloseKey(hkey); - res = RegOpenKeyExA(HKEY_CLASSES_ROOT, machup, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, machup, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL);

1 0

Aric Stewart : strmbase: Create OutputQueue for queuing outgoing samples.
by Alexandre Julliard April 6, 2011

April 6, 2011

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

Aric Stewart : wineqtdecoder: Move pixel buffer access to utility module.
by Alexandre Julliard April 6, 2011

April 6, 2011

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 April 6, 2011

April 6, 2011

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 : wineqtdecoder: Implement a Wine specific Data Handler.
by Alexandre Julliard April 6, 2011

April 6, 2011

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

Vincent Povirk : windowscodecs: Implement TiffFrameEncode_Initialize.
by Alexandre Julliard April 6, 2011

April 6, 2011

Module: wine Branch: master Commit: 2cad663198357b4fb0bda3f2f2bb8cde0c4dcc64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cad663198357b4fb0bda3f2f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 29 16:30:59 2011 -0500 windowscodecs: Implement TiffFrameEncode_Initialize. --- dlls/windowscodecs/tiffformat.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 98e2376..65a65a5 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1136,6 +1136,8 @@ typedef struct TiffFrameEncode { IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; LONG ref; TiffEncoder *parent; + /* fields below are protected by parent->lock */ + BOOL initialized; } TiffFrameEncode; static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) @@ -1195,8 +1197,22 @@ static ULONG WINAPI TiffFrameEncode_Release(IWICBitmapFrameEncode *iface) static HRESULT WINAPI TiffFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { - FIXME("(%p,%p): stub\n", iface, pIEncoderOptions); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%p)\n", iface, pIEncoderOptions); + + EnterCriticalSection(&This->parent->lock); + + if (This->initialized) + { + LeaveCriticalSection(&This->parent->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + This->initialized = TRUE; + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_SetSize(IWICBitmapFrameEncode *iface, @@ -1443,6 +1459,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, result->IWICBitmapFrameEncode_iface.lpVtbl = &TiffFrameEncode_Vtbl; result->ref = 1; result->parent = This; + result->initialized = FALSE; IWICBitmapEncoder_AddRef(iface); *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface;

1 0

Aric Stewart : wineqtdecoder: Work to add a QuickTime video Splitter.
by Alexandre Julliard April 6, 2011

April 6, 2011

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