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

Alexandre Julliard : winex11: Avoid printing traces without a \n.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: a9c2f791e1ef07a9fa5e1256456951ad435aa0e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c2f791e1ef07a9fa5e12564… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 12:37:28 2008 +0200 winex11: Avoid printing traces without a \n. --- dlls/winex11.drv/ime.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c179410..b9c76f4 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -684,7 +684,6 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) case NI_SETCANDIDATE_PAGESTART: FIXME("NI_SETCANDIDATE_PAGESTART\n"); break; case NI_SETCANDIDATE_PAGESIZE: FIXME("NI_SETCANDIDATE_PAGESIZE\n"); break; case NI_CONTEXTUPDATED: - FIXME("NI_CONTEXTUPDATED:"); switch (dwValue) { case IMC_SETCOMPOSITIONWINDOW: FIXME("IMC_SETCOMPOSITIONWINDOW\n"); break; @@ -735,7 +734,6 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) } break; case NI_COMPOSITIONSTR: - TRACE("NI_COMPOSITIONSTR:"); switch (dwIndex) { case CPS_COMPLETE:

1 0

Guy Albertelli : usp10: Use passed hdc instead of cached one for ScriptTextOut with test to check.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: c0aa44bb6cc77a9aed4353be9ab9364d7fff511e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0aa44bb6cc77a9aed4353be9… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Tue Apr 29 00:15:23 2008 -0400 usp10: Use passed hdc instead of cached one for ScriptTextOut with test to check. --- dlls/usp10/tests/usp10.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 2 +- 2 files changed, 89 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index f054e62..b0a0b85 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -526,6 +526,93 @@ static void test_ScriptTextOut(HDC hdc) } } +static void test_ScriptTextOut2(HDC hdc) +{ +/* Intent is to validate that the HDC passed into ScriptTextOut is + * used instead of the (possibly) invalid cached one + */ + HRESULT hr; + + HDC hdc1, hdc2; + int cInChars; + int cMaxItems; + SCRIPT_ITEM pItem[255]; + int pcItems; + WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; + + SCRIPT_CACHE psc; + int cChars; + int cMaxGlyphs; + unsigned short pwOutGlyphs1[256]; + WORD pwLogClust[256]; + SCRIPT_VISATTR psva[256]; + int pcGlyphs; + int piAdvance[256]; + GOFFSET pGoffset[256]; + ABC pABC[256]; + + /* Create an extra DC that will be used until the ScriptTextOut */ + hdc1 = CreateCompatibleDC(hdc); + ok (hdc1 != 0, "CreateCompatibleDC failed to create a DC\n"); + hdc2 = CreateCompatibleDC(hdc); + ok (hdc2 != 0, "CreateCompatibleDC failed to create a DC\n"); + + /* This is a valid test that will cause parsing to take place */ + cInChars = 5; + cMaxItems = 255; + hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); + /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * + * returned. */ + ok (pcItems > 0, "The number of SCRIPT_ITEMS should be greater than 0\n"); + if (pcItems > 0) + ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == cInChars, + "Start pos not = 0 (%d) or end pos not = %d (%d)\n", + pItem[0].iCharPos, cInChars, pItem[1].iCharPos); + + /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue + * ie. ScriptItemize has succeeded and that pItem has been set */ + cInChars = 5; + cMaxItems = 255; + if (hr == 0) { + psc = NULL; /* must be null on first call */ + cChars = cInChars; + cMaxGlyphs = cInChars; + cMaxGlyphs = 256; + hr = ScriptShape(hdc2, &psc, TestItem1, cChars, + cMaxGlyphs, &pItem[0].a, + pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok (hr == 0, "ScriptShape should return 0 not (%08x)\n", hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); + if (hr ==0) { + /* Note hdc is needed as glyph info is not yet in psc */ + hr = ScriptPlace(hdc2, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, + pGoffset, pABC); + ok (hr == 0, "Should return 0 not (%08x)\n", hr); + + /* key part!!! cached dc is being deleted */ + hr = DeleteDC(hdc2); + ok(hr == 1, "DeleteDC should return 1 not %08x\n", hr); + + /* At this point the cached hdc (hdc2) has been destroyed, + * however, we are passing in a *real* hdc (the original hdc). + * The text should be written to that DC + */ + hr = ScriptTextOut(hdc1, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, + piAdvance, NULL, pGoffset); + ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + + DeleteDC(hdc1); + + /* Clean up and go */ + ScriptFreeCache(&psc); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + } + } +} + static void test_ScriptXtoX(void) /**************************************************************************************** * This routine tests the ScriptXtoCP and ScriptCPtoX functions using static variables * @@ -1282,6 +1369,7 @@ START_TEST(usp10) test_ScriptGetFontProperties(hdc); test_ScriptTextOut(hdc); + test_ScriptTextOut2(hdc); test_ScriptXtoX(); test_ScriptString(hdc); test_ScriptStringXtoCP_CPtoX(hdc); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 3f0c896..e8e9bf0 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1424,7 +1424,7 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!psa->fNoGlyphIndex) /* Have Glyphs? */ fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ - if (!ExtTextOutW(get_cache_hdc(psc), x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) + if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) hr = S_FALSE; unselect_cached_font(psc, hfont);

1 0

Lei Zhang : userenv: Add a test for variable inheritance for CreateEnvironmentBlock.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 0f7bae5af8f1d661155bdd8f4661fc8b09d5bcea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f7bae5af8f1d661155bdd8f4… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 30 17:45:21 2008 -0700 userenv: Add a test for variable inheritance for CreateEnvironmentBlock. --- dlls/userenv/tests/userenv.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 0923774..eccb1f1 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -186,6 +186,9 @@ static void test_create_env(void) { 0, { 0, 0, 0, 0 } } }; + r = SetEnvironmentVariableA("WINE_XYZZY", "ZZYZX"); + expect(TRUE, r); + r = CreateEnvironmentBlock(NULL, NULL, FALSE); expect(FALSE, r); @@ -268,6 +271,15 @@ static void test_create_env(void) expect_env(TRUE, r, htok_vars[i].name); i++; } + + r = get_env(env1, "WINE_XYZZY", &st); + expect(FALSE, r); + r = get_env(env2, "WINE_XYZZY", &st); + expect(FALSE, r); + r = get_env(env3, "WINE_XYZZY", &st); + expect(TRUE, r); + r = get_env(env4, "WINE_XYZZY", &st); + expect(TRUE, r); } START_TEST(userenv)

1 0

Lei Zhang : userenv: Add more tests for environment variables for CreateEnvironmentBlock.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: bf02fa309bcc08686d7751c51f08c33b74de33f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf02fa309bcc08686d7751c51… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 30 17:39:07 2008 -0700 userenv: Add more tests for environment variables for CreateEnvironmentBlock. --- dlls/userenv/tests/userenv.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index e7f691d..0923774 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -178,6 +178,13 @@ static void test_create_env(void) { "ProgramFiles", { 1, 1, 0, 0 } }, { 0, { 0, 0, 0, 0 } } }; + static const struct profile_item htok_vars[] = { + { "PATH", { 1, 1, 0, 0 } }, + { "TEMP", { 1, 1, 0, 0 } }, + { "TMP", { 1, 1, 0, 0 } }, + { "USERPROFILE", { 1, 1, 0, 0 } }, + { 0, { 0, 0, 0, 0 } } + }; r = CreateEnvironmentBlock(NULL, NULL, FALSE); expect(FALSE, r); @@ -230,6 +237,37 @@ static void test_create_env(void) expect_env(TRUE, r, common_vars[i].name); i++; } + + /* Test for environment variables with values that depends on htok */ + i = 0; + while (htok_vars[i].name) + { + j = 0; + r = get_env(env1, htok_vars[i].name, &st); + if (htok_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, htok_vars[i].name); + else + expect_env(TRUE, r, htok_vars[i].name); + j++; + r = get_env(env2, htok_vars[i].name, &st); + if (htok_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, htok_vars[i].name); + else + expect_env(TRUE, r, htok_vars[i].name); + j++; + r = get_env(env3, htok_vars[i].name, &st); + if (htok_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, htok_vars[i].name); + else + expect_env(TRUE, r, htok_vars[i].name); + j++; + r = get_env(env4, htok_vars[i].name, &st); + if (htok_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, htok_vars[i].name); + else + expect_env(TRUE, r, htok_vars[i].name); + i++; + } } START_TEST(userenv)

1 0

Lei Zhang : userenv: Add tests for environment variables for CreateEnvironmentBlock.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: ed50b7746d99a50f985a9c7c20b5e17d1e2deb6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed50b7746d99a50f985a9c7c2… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 30 17:38:05 2008 -0700 userenv: Add tests for environment variables for CreateEnvironmentBlock. --- dlls/userenv/tests/userenv.c | 189 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 184 insertions(+), 5 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index c50b0a2..e7f691d 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -18,39 +18,218 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include <stdlib.h> #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "userenv.h" #include "wine/test.h" #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) +#define expect_env(EXPECTED,GOT,VAR) ok((GOT)==(EXPECTED), "Expected %d, got %d for %s (%d)\n", (EXPECTED), (GOT), (VAR), j) + +struct profile_item +{ + const char * name; + const int todo[4]; +}; + +/* Debugging functions from wine/libs/wine/debug.c, slightly modified */ + +/* allocate some tmp string space */ +/* FIXME: this is not 100% thread-safe */ +static char *get_tmp_space( int size ) +{ + static char *list[32]; + static long pos; + char *ret; + int idx; + + idx = ++pos % (sizeof(list)/sizeof(list[0])); + if ((ret = realloc( list[idx], size ))) list[idx] = ret; + return ret; +} + +/* default implementation of wine_dbgstr_wn */ +static const char *default_dbgstr_wn( const WCHAR *str, int n, BOOL quotes ) +{ + char *dst, *res; + + if (!HIWORD(str)) + { + if (!str) return "(null)"; + res = get_tmp_space( 6 ); + sprintf( res, "#%04x", LOWORD(str) ); + return res; + } + if (n == -1) n = lstrlenW(str); + if (n < 0) n = 0; + else if (n > 200) n = 200; + dst = res = get_tmp_space( n * 5 + 7 ); + if (quotes) + { + *dst++ = 'L'; + *dst++ = '"'; + } + while (n-- > 0) + { + WCHAR c = *str++; + switch (c) + { + case '\n': *dst++ = '\\'; *dst++ = 'n'; break; + case '\r': *dst++ = '\\'; *dst++ = 'r'; break; + case '\t': *dst++ = '\\'; *dst++ = 't'; break; + case '"': *dst++ = '\\'; *dst++ = '"'; break; + case '\\': *dst++ = '\\'; *dst++ = '\\'; break; + default: + if (c >= ' ' && c <= 126) + *dst++ = (char)c; + else + { + *dst++ = '\\'; + sprintf(dst,"%04x",c); + dst+=4; + } + } + } + if (quotes) *dst++ = '"'; + if (*str) + { + *dst++ = '.'; + *dst++ = '.'; + *dst++ = '.'; + } + *dst = 0; + return res; +} + +const char *wine_dbgstr_wn( const WCHAR *s, int n ) +{ + return default_dbgstr_wn(s, n, TRUE); +} + +const char *wine_dbgstr_w( const WCHAR *s ) +{ + return default_dbgstr_wn( s, -1, TRUE); +} + +const char *userenv_dbgstr_w( const WCHAR *s ) +{ + return default_dbgstr_wn( s, -1, FALSE); +} + +/* Helper function for retrieving environment variables */ +static BOOL get_env(const WCHAR * env, const char * var, char ** result) +{ + const WCHAR * p = env; + int envlen, varlen, buflen; + char buf[256]; + + if (!env || !var || !result) return FALSE; + + varlen = strlen(var); + do + { + envlen = lstrlenW(p); + sprintf(buf, "%s", userenv_dbgstr_w(p)); + if (CompareStringA(GetThreadLocale(), NORM_IGNORECASE|LOCALE_USE_CP_ACP, buf, varlen, var, varlen) == CSTR_EQUAL) + { + if (buf[varlen] == '=') + { + buflen = strlen(buf); + *result = HeapAlloc(GetProcessHeap(), 0, buflen + 1); + if (!*result) return FALSE; + memcpy(*result, buf, buflen + 1); + return TRUE; + } + } + p = p + envlen + 1; + } while (*p); + return FALSE; +} static void test_create_env(void) { BOOL r; HANDLE htok; - WCHAR * env; - WCHAR * env2; + WCHAR * env1, * env2, * env3, * env4; + char * st; + int i, j; + + static const struct profile_item common_vars[] = { + { "ALLUSERSPROFILE", { 1, 1, 1, 1 } }, + { "CommonProgramFiles", { 1, 1, 1, 1 } }, + { "ComSpec", { 1, 1, 0, 0 } }, + { "COMPUTERNAME", { 1, 1, 1, 1 } }, + { "NUMBER_OF_PROCESSORS", { 1, 1, 0, 0 } }, + { "OS", { 1, 1, 0, 0 } }, + { "PROCESSOR_ARCHITECTURE", { 1, 1, 0, 0 } }, + { "PROCESSOR_IDENTIFIER", { 1, 1, 0, 0 } }, + { "PROCESSOR_LEVEL", { 1, 1, 0, 0 } }, + { "PROCESSOR_REVISION", { 1, 1, 0, 0 } }, + { "SystemDrive", { 1, 1, 0, 0 } }, + { "SystemRoot", { 1, 1, 0, 0 } }, + { "windir", { 1, 1, 0, 0 } }, + { "ProgramFiles", { 1, 1, 0, 0 } }, + { 0, { 0, 0, 0, 0 } } + }; r = CreateEnvironmentBlock(NULL, NULL, FALSE); expect(FALSE, r); - r = CreateEnvironmentBlock((LPVOID) &env, NULL, FALSE); - expect(TRUE, r); - r = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok); expect(TRUE, r); r = CreateEnvironmentBlock(NULL, htok, FALSE); expect(FALSE, r); + r = CreateEnvironmentBlock((LPVOID) &env1, NULL, FALSE); + expect(TRUE, r); + r = CreateEnvironmentBlock((LPVOID) &env2, htok, FALSE); expect(TRUE, r); + + r = CreateEnvironmentBlock((LPVOID) &env3, NULL, TRUE); + expect(TRUE, r); + + r = CreateEnvironmentBlock((LPVOID) &env4, htok, TRUE); + expect(TRUE, r); + + /* Test for common environment variables */ + i = 0; + while (common_vars[i].name) + { + j = 0; + r = get_env(env1, common_vars[i].name, &st); + if (common_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, common_vars[i].name); + else + expect_env(TRUE, r, common_vars[i].name); + j++; + r = get_env(env2, common_vars[i].name, &st); + if (common_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, common_vars[i].name); + else + expect_env(TRUE, r, common_vars[i].name); + j++; + r = get_env(env3, common_vars[i].name, &st); + if (common_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, common_vars[i].name); + else + expect_env(TRUE, r, common_vars[i].name); + j++; + r = get_env(env4, common_vars[i].name, &st); + if (common_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, common_vars[i].name); + else + expect_env(TRUE, r, common_vars[i].name); + i++; + } } START_TEST(userenv)

1 0

Maarten Lankhorst : headers: Add some extra defines to vfw.h.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 9cc32202edf4aa361b40b1f8a6bc14a7def8a556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc32202edf4aa361b40b1f8a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 30 15:00:34 2008 -0700 headers: Add some extra defines to vfw.h. --- include/vfw.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/vfw.h b/include/vfw.h index aae8b1f..b3b6679 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -822,7 +822,9 @@ typedef struct { #define AVIIF_LIST 0x00000001 /* chunk is a 'LIST' */ #define AVIIF_TWOCC 0x00000002 #define AVIIF_KEYFRAME 0x00000010 /* this frame is a key frame. */ - +#define AVIIF_FIRSTPART 0x00000020 +#define AVIIF_LASTPART 0x00000040 +#define AVIIF_MIDPART (AVIIF_LASTPART|AVIIF_FIRSTPART) #define AVIIF_NOTIME 0x00000100 /* this frame doesn't take any time */ #define AVIIF_COMPUSE 0x0FFF0000

1 0

Maarten Lankhorst : quartz: Silence a fixme that isn't.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 753ac6f0159c82c8cb1cd99f221615707f309d6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=753ac6f0159c82c8cb1cd99f2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 30 14:39:36 2008 -0700 quartz: Silence a fixme that isn't. --- dlls/quartz/parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index f9140ae..33e3d04 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -522,7 +522,7 @@ static HRESULT Parser_RemoveOutputPins(ParserImpl * This) for (i = 0; i < This->cStreams; i++) { hr = OutputPin_DeliverDisconnect((OutputPin *)ppOldPins[i + 1]); - FIXME("Other side: %08x\n", hr); + TRACE("Disconnect: %08x\n", hr); IPin_Release(ppOldPins[i + 1]); }

1 0

Maarten Lankhorst : quartz: Get rid of the sample holding code in the wave parser.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 8099a624697dbf1a72c58e95fa960f3355345aef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8099a624697dbf1a72c58e95f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 30 14:34:19 2008 -0700 quartz: Get rid of the sample holding code in the wave parser. --- dlls/quartz/waveparser.c | 45 ++++++--------------------------------------- 1 files changed, 6 insertions(+), 39 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 3818214..a40bb65 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -42,7 +42,6 @@ static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n' typedef struct WAVEParserImpl { ParserImpl Parser; - IMediaSample * pCurrentSample; LONGLONG StartOfFile; /* in media time */ LONGLONG EndOfFile; DWORD dwSampleSize; @@ -97,28 +96,6 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample, DWORD_PTR pOutputPin = (Parser_OutputPin *)This->Parser.ppPins[1]; - /* Try to get rid of the current sample in case we had a S_FALSE last time */ - if (This->pCurrentSample) - { - Parser_OutputPin * pOutputPin = (Parser_OutputPin*)This->Parser.ppPins[1]; - IMediaSample *pCurrentSample = This->pCurrentSample; - - /* Requeue buffer */ - hr = OutputPin_SendSample(&pOutputPin->pin, pCurrentSample); - - if (hr != S_OK) - { - Sleep(10); - TRACE("Requeueing!\n"); - IMediaSample_AddRef(pSample); - IAsyncReader_Request(This->Parser.pInputPin->pReader, pSample, 0); - return hr; - } - - IMediaSample_Release(This->pCurrentSample); - This->pCurrentSample = NULL; - } - if (SUCCEEDED(hr)) hr = IMemAllocator_GetBuffer(pin->pAlloc, &newsample, NULL, NULL, 0); @@ -156,18 +133,14 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample, DWORD_PTR IMediaSample_SetTime(pSample, &tAviStart, &tAviStop); hr = OutputPin_SendSample(&pOutputPin->pin, pSample); - if (hr != S_OK && hr != VFW_E_NOT_CONNECTED && hr != S_FALSE) + if (hr != S_OK && hr != S_FALSE && hr != VFW_E_WRONG_STATE) ERR("Error sending sample (%x)\n", hr); - - if (hr == S_FALSE) - { - This->pCurrentSample = pSample; - IMediaSample_AddRef(pSample); - hr = S_OK; - } + else if (hr != S_OK) + /* Unset progression if denied! */ + This->Parser.pInputPin->rtCurrent = tStart; } - if (tStop >= This->EndOfFile || (bytepos_to_duration(This, tStop) >= This->Parser.mediaSeeking.llStop)) + if (tStop >= This->EndOfFile || (bytepos_to_duration(This, tStop) >= This->Parser.mediaSeeking.llStop) || hr == VFW_E_NOT_CONNECTED) { int i; @@ -338,7 +311,7 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, props->cbAlign = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; props->cbPrefix = 0; props->cbBuffer = 4096; - props->cBuffers = 2; + props->cBuffers = 3; pWAVEParser->dwSampleSize = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; IAsyncReader_Length(This->pReader, &length, &avail); pWAVEParser->dwLength = length / (ULONGLONG)pWAVEParser->dwSampleSize; @@ -364,10 +337,6 @@ static HRESULT WAVEParser_Cleanup(LPVOID iface) TRACE("(%p)->()\n", This); - if (This->pCurrentSample) - IMediaSample_Release(This->pCurrentSample); - This->pCurrentSample = NULL; - return S_OK; } @@ -457,8 +426,6 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) /* Note: This memory is managed by the transform filter once created */ This = CoTaskMemAlloc(sizeof(WAVEParserImpl)); - This->pCurrentSample = NULL; - hr = Parser_Create(&(This->Parser), &WAVEParser_Vtbl, &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, WAVEParser_disconnect, WAVEParser_first_request, NULL, NULL, WAVEParserImpl_seek, NULL); if (FAILED(hr))

1 0

Maarten Lankhorst : quartz: Get rid of the sample holding code in the mpeg splitter.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 0f73bbad8ca65d7db2f225cc23481811203c355d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f73bbad8ca65d7db2f225cc2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 30 14:34:07 2008 -0700 quartz: Get rid of the sample holding code in the mpeg splitter. Instead just revert the position slightly, this is a lot easier to maintain. --- dlls/quartz/mpegsplit.c | 46 +++++++--------------------------------------- 1 files changed, 7 insertions(+), 39 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 71027e9..9549a0d 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -63,7 +63,6 @@ struct seek_entry { typedef struct MPEGSplitterImpl { ParserImpl Parser; - IMediaSample *pCurrentSample; LONGLONG EndOfFile; LONGLONG duration; LONGLONG position; @@ -180,6 +179,7 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample) assert(length == len || length + 4 == len); IMediaSample_SetActualDataLength(pCurrentSample, length); + /* Queue the next sample */ if (length + 4 == len) { PullPin *pin = This->Parser.pInputPin; @@ -269,46 +269,18 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample, /* trace removed for performance reasons */ /* TRACE("(%p), %llu -> %llu\n", pSample, tStart, tStop); */ - /* Try to get rid of current sample, if any */ - if (This->pCurrentSample) - { - Parser_OutputPin * pOutputPin = (Parser_OutputPin*)This->Parser.ppPins[1]; - IMediaSample *pCurrentSample = This->pCurrentSample; - - /* Requeue buffer */ - hr = OutputPin_SendSample(&pOutputPin->pin, pCurrentSample); - - if (hr != S_OK) - { - Sleep(10); - TRACE("Yuck!\n"); - IMediaSample_AddRef(pSample); - IAsyncReader_Request(This->Parser.pInputPin->pReader, pSample, 0); - return hr; - } - - IMediaSample_Release(This->pCurrentSample); - This->pCurrentSample = NULL; - } - /* Now, try to find a new header */ hr = FillBuffer(This, pSample); if (hr != S_OK) { - /* We still have our sample! Do damage control and send it next round */ - WARN("Failed with hres: %08x!\n", hr); - /* If set to S_FALSE we keep the sample, to transmit it next time */ - if (hr == S_FALSE) + /* Unset progression if denied! */ + if (hr == VFW_E_WRONG_STATE || hr == S_FALSE) { - This->pCurrentSample = pSample; - IMediaSample_AddRef(This->pCurrentSample); + memcpy(This->header, pbSrcStream, 4); + This->Parser.pInputPin->rtCurrent = tStart; } - - /* Sample was rejected because of whatever reason (paused/flushing/etc), no need to terminate the processing */ - if (hr == S_FALSE) - hr = S_OK; } if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile || This->position >= This->Parser.mediaSeeking.llStop) @@ -555,7 +527,7 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin, ALLOCATO /* Make the output buffer a multiple of the frame size */ props->cbBuffer = 0x4000 / format->nBlockAlign * format->nBlockAlign; - props->cBuffers = 2; + props->cBuffers = 3; hr = Parser_AddPin(&(This->Parser), &piOutput, props, &amt); } @@ -644,11 +616,7 @@ static HRESULT MPEGSplitter_cleanup(LPVOID iface) { MPEGSplitterImpl *This = (MPEGSplitterImpl*)iface; - TRACE("(%p) Deleting sample\n", This); - - if (This->pCurrentSample) - IMediaSample_Release(This->pCurrentSample); - This->pCurrentSample = NULL; + TRACE("(%p)\n", This); return S_OK; }

1 0

Maarten Lankhorst : quartz: Clean up pullpin code.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 3066116f76c0c44950fde3552485b37dce24d1f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3066116f76c0c44950fde3552… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 30 14:28:21 2008 -0700 quartz: Clean up pullpin code. --- dlls/quartz/pin.c | 115 ++++++++++------------------------------------------- 1 files changed, 21 insertions(+), 94 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 8619776..5f705d0 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1233,6 +1233,7 @@ static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinI pPinImpl->rtStop = ((LONGLONG)0x7fffffff << 32) | 0xffffffff; pPinImpl->dRate = 1.0; pPinImpl->state = Req_Die; + assert(pCustomRequest); pPinImpl->fnCustomRequest = pCustomRequest; pPinImpl->stop_playback = 1; @@ -1399,44 +1400,6 @@ ULONG WINAPI PullPin_Release(IPin *iface) return refCount; } -static HRESULT PullPin_Standard_Request(PullPin *This, BOOL start) -{ - REFERENCE_TIME rtSampleStart; - REFERENCE_TIME rtSampleStop; - IMediaSample *sample = NULL; - HRESULT hr; - - TRACE("Requesting sample!\n"); - - if (start) - This->rtNext = This->rtCurrent; - - if (This->rtNext >= This->rtStop) - /* Last sample has already been queued, request nothing more */ - return S_OK; - - hr = IMemAllocator_GetBuffer(This->pAlloc, &sample, NULL, NULL, 0); - - if (SUCCEEDED(hr)) - { - rtSampleStart = This->rtNext; - rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(IMediaSample_GetSize(sample)); - if (rtSampleStop > This->rtStop) - rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(This->rtStop), This->cbAlign)); - hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - - This->rtCurrent = This->rtNext; - This->rtNext = rtSampleStop; - - if (SUCCEEDED(hr)) - hr = IAsyncReader_Request(This->pReader, sample, 0); - } - if (FAILED(hr)) - FIXME("Failed to queue sample : %08x\n", hr); - - return hr; -} - static void CALLBACK PullPin_Flush(PullPin *This) { IMediaSample *pSample; @@ -1445,6 +1408,8 @@ static void CALLBACK PullPin_Flush(PullPin *This) EnterCriticalSection(This->pin.pCritSec); if (This->pReader) { + SendFurther((IPin *)This, deliver_beginflush, NULL, NULL ); + /* Flush outstanding samples */ IAsyncReader_BeginFlush(This->pReader); for (;;) @@ -1457,13 +1422,12 @@ static void CALLBACK PullPin_Flush(PullPin *This) break; assert(!IMediaSample_GetActualDataLength(pSample)); - if (This->fnCustomRequest) - This->fnSampleProc(This->pin.pUserData, pSample, dwUser); - IMediaSample_Release(pSample); } IAsyncReader_EndFlush(This->pReader); + SendFurther((IPin *)This, deliver_endflush, NULL, NULL ); + This->fnCleanProc(This->pin.pUserData); } LeaveCriticalSection(This->pin.pCritSec); } @@ -1490,10 +1454,7 @@ static void CALLBACK PullPin_Thread_Process(PullPin *This) } /* There is no sample in our buffer */ - if (!This->fnCustomRequest) - hr = PullPin_Standard_Request(This, TRUE); - else - hr = This->fnCustomRequest(This->pin.pUserData); + hr = This->fnCustomRequest(This->pin.pUserData); if (FAILED(hr)) ERR("Request error: %x\n", hr); @@ -1510,46 +1471,18 @@ static void CALLBACK PullPin_Thread_Process(PullPin *This) hr = IAsyncReader_WaitForNext(This->pReader, 10000, &pSample, &dwUser); - /* Calling fnCustomRequest is not specifically useful here: It can be handled inside fnSampleProc */ - if (pSample && !This->fnCustomRequest) - hr = PullPin_Standard_Request(This, FALSE); - - /* Return an empty sample on error to the implementation in case it does custom parsing, so it knows it's gone */ - if (SUCCEEDED(hr) || (This->fnCustomRequest && pSample)) + if (SUCCEEDED(hr)) { REFERENCE_TIME rtStart, rtStop; - BOOL rejected; IMediaSample_GetTime(pSample, &rtStart, &rtStop); - do - { - hr = This->fnSampleProc(This->pin.pUserData, pSample, dwUser); - - if (This->fnCustomRequest) - break; - - rejected = FALSE; - if (This->rtCurrent == rtStart) - { - rejected = TRUE; - TRACE("DENIED!\n"); - Sleep(10); - /* Maybe it's transient? */ - } - /* rtNext = rtCurrent, because the next sample is already queued */ - else if (rtStop != This->rtCurrent && rtStop < This->rtStop) - { - WARN("Position changed! rtStop: %u, rtCurrent: %u\n", (DWORD)BYTES_FROM_MEDIATIME(rtStop), (DWORD)BYTES_FROM_MEDIATIME(This->rtCurrent)); - PullPin_Flush(This); - hr = PullPin_Standard_Request(This, TRUE); - } - } while (rejected && (This->rtCurrent < This->rtStop && hr == S_OK && !This->stop_playback)); + hr = This->fnSampleProc(This->pin.pUserData, pSample, dwUser); } else { /* FIXME: This is not well handled yet! */ - ERR("Processing error: %x\n", hr); + ERR("Processing/wait error: %x\n", hr); } if (pSample) @@ -1764,12 +1697,6 @@ HRESULT WINAPI PullPin_BeginFlush(IPin * iface) PullPin *This = (PullPin *)iface; TRACE("(%p)->()\n", This); - EnterCriticalSection(This->pin.pCritSec); - { - SendFurther( iface, deliver_beginflush, NULL, NULL ); - } - LeaveCriticalSection(This->pin.pCritSec); - EnterCriticalSection(&This->thread_lock); { PullPin_WaitForStateChange(This, INFINITE); @@ -1779,14 +1706,13 @@ HRESULT WINAPI PullPin_BeginFlush(IPin * iface) PullPin_PauseProcessing(This); PullPin_WaitForStateChange(This, INFINITE); } - } - LeaveCriticalSection(&This->thread_lock); - EnterCriticalSection(This->pin.pCritSec); - { - This->fnCleanProc(This->pin.pUserData); + EnterCriticalSection(This->pin.pCritSec); + SendFurther( iface, deliver_beginflush, NULL, NULL ); + LeaveCriticalSection(This->pin.pCritSec); } - LeaveCriticalSection(This->pin.pCritSec); + + LeaveCriticalSection(&This->thread_lock); return S_OK; } @@ -1802,17 +1728,18 @@ HRESULT WINAPI PullPin_EndFlush(IPin * iface) FILTER_STATE state; IBaseFilter_GetState(This->pin.pinInfo.pFilter, INFINITE, &state); + EnterCriticalSection(This->pin.pCritSec); + SendFurther( iface, deliver_endflush, NULL, NULL ); + LeaveCriticalSection(This->pin.pCritSec); + if (This->stop_playback && state == State_Running) + { PullPin_StartProcessing(This); - - PullPin_WaitForStateChange(This, INFINITE); + PullPin_WaitForStateChange(This, INFINITE); + } } LeaveCriticalSection(&This->thread_lock); - EnterCriticalSection(This->pin.pCritSec); - SendFurther( iface, deliver_endflush, NULL, NULL ); - LeaveCriticalSection(This->pin.pCritSec); - return S_OK; }

1 0