July 2008 - Wine-Commits - list.winehq.org

Alexander Nicolaysen Sørnes : notepad: Fix opening Unicode files.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: d50e2df17baaf6602db980b19ef4e7f3f5c769a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50e2df17baaf6602db980b19… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 13 14:08:58 2008 +0200 notepad: Fix opening Unicode files. --- programs/notepad/dialog.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index f326906..716abd8 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -249,13 +249,8 @@ void DoOpenFile(LPCWSTR szFileName) CloseHandle(hFile); pTemp[dwNumRead] = 0; - if (IsTextUnicode(pTemp, dwNumRead, NULL)) - { - LPWSTR p = (LPWSTR)pTemp; - /* We need to strip BOM Unicode character, SetWindowTextW won't do it for us. */ - if (*p == 0xFEFF || *p == 0xFFFE) p++; - SetWindowTextW(Globals.hEdit, p); - } + if((size -1) >= 2 && (BYTE)pTemp[0] == 0xff && (BYTE)pTemp[1] == 0xfe) + SetWindowTextW(Globals.hEdit, (LPWSTR)pTemp + 1); else SetWindowTextA(Globals.hEdit, pTemp);

1 0

Alexander Nicolaysen Sørnes : regedit: Add missing fclose on file import.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: d1e02c169d25c37b9af3b19cb9fb35dc6c2a59fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e02c169d25c37b9af3b19cb… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 13 14:50:34 2008 +0200 regedit: Add missing fclose on file import. --- programs/regedit/framewnd.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 5262e55..b661019 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -313,12 +313,18 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME *pofn) static BOOL import_registry_filename(LPTSTR filename) { + BOOL Success; FILE* reg_file = fopen(filename, "r"); if(!reg_file) return FALSE; - return import_registry_file(reg_file); + Success = import_registry_file(reg_file); + + if(fclose(reg_file) != 0) + Success = FALSE; + + return Success; } static BOOL ImportRegistryFile(HWND hWnd)

1 0

Alexander Nicolaysen Sørnes : regedit: Fix concat handling in unicode import.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: 4ef4777630a45971fcf5cf12d9283565a10419fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef4777630a45971fcf5cf12d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 13 13:58:40 2008 +0200 regedit: Fix concat handling in unicode import. --- programs/regedit/regproc.c | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index a716f3d..2b2daf1 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -704,7 +704,7 @@ void processRegLinesW(FILE *in) { WCHAR* buf = NULL; /* line read from input stream */ ULONG lineSize = REG_VAL_BUF_SIZE; - size_t check = -1; + size_t CharsInBuf = -1; WCHAR* s; /* The pointer into line for where the current fgets should read */ @@ -741,10 +741,10 @@ void processRegLinesW(FILE *in) */ size_to_get = (size_remaining > INT_MAX ? INT_MAX : size_remaining); - check = fread(s, sizeof(WCHAR), size_to_get - 1, in); - s[check] = 0; + CharsInBuf = fread(s, sizeof(WCHAR), size_to_get - 1, in); + s[CharsInBuf] = 0; - if (check == 0) { + if (CharsInBuf == 0) { if (ferror(in)) { perror ("While reading input"); exit (IO_ERROR); @@ -772,6 +772,25 @@ void processRegLinesW(FILE *in) continue; } + /* If there is a concatenating \\ then go around again */ + if ((*(s_eol-1) == '\\') || + (*(s_eol-1) == '\r' && *(s_eol-2) == '\\')) { + WCHAR* NextLine = s_eol; + + while(*(NextLine+1) == ' ' || *(NextLine+1) == '\t') + NextLine++; + + NextLine++; + + if(*(s_eol-1) == '\r') + s_eol--; + + MoveMemory(s_eol - 1, NextLine, (CharsInBuf - (NextLine - buf) + 1)*sizeof(WCHAR)); + CharsInBuf -= NextLine - s_eol + 1; + s_eol = 0; + continue; + } + /* Remove any line feed. Leave s_eol on the \0 */ if (s_eol) { *s_eol = '\0'; @@ -779,21 +798,6 @@ void processRegLinesW(FILE *in) *(s_eol-1) = '\0'; } - /* If there is a concatenating \\ then go around again */ - if (s_eol > buf && *(s_eol-1) == '\\') { - WCHAR c[2]; - s = s_eol+1; - /* The following error protection could be made more self- - * correcting but I thought it not worth trying. - */ - if(!fread(&c, sizeof(WCHAR), 2, in)) - break; - if (feof(in) || c[0] != ' ' || c[1] != ' ') - fprintf(stderr,"%s: ERROR - invalid continuation.\n", - getAppName()); - continue; - } - if(!s_eol) break;

1 0

Dylan Smith : richedit: Cannot undo setting of default character format.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: e3efa88c456890308c08d29a1ecca3409789e653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3efa88c456890308c08d29a1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jul 11 20:06:05 2008 -0400 richedit: Cannot undo setting of default character format. This also reverts commit 2b52dd845097f16076c0185b02a003f63898dcab: wordpad: Empty the richedit undo buffer on creation. The reverted commit I created to fix an issue that only applied to Wine, but it just masked the issue which was in richedit controls. The default character format was set in two places while wordpad was starting up, and caused wordpad to have two undo items at startup. --- dlls/riched20/editstr.h | 3 +-- dlls/riched20/list.c | 3 +-- dlls/riched20/run.c | 9 --------- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/undo.c | 6 ------ programs/wordpad/wordpad.c | 1 - 6 files changed, 3 insertions(+), 21 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index f3e837e..81f4cc3 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -86,8 +86,7 @@ typedef enum { diUndoSetParagraphFormat, /* 15 */ diUndoSetCharFormat, /* 16 */ diUndoEndTransaction, /* 17 - marks the end of a group of changes for undo */ - diUndoSetDefaultCharFormat, /* 18 */ - diUndoPotentialEndTransaction, /* 19 - allows grouping typed chars for undo */ + diUndoPotentialEndTransaction, /* 18 - allows grouping typed chars for undo */ } ME_DIType; #define SELECTIONBAR_WIDTH 9 diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 60c49e3..0b14aec 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -119,7 +119,7 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) { ME_ReleaseStyle(item->member.run.style); ME_DestroyString(item->member.run.strText); } - if (item->type==diUndoSetCharFormat || item->type==diUndoSetDefaultCharFormat) { + if (item->type==diUndoSetCharFormat) { ME_ReleaseStyle(item->member.ustyle); } if (item->type==diUndoSplitParagraph) @@ -175,7 +175,6 @@ const char *ME_GetDITypeName(ME_DIType type) case diUndoDeleteRun: return "diUndoDeleteRun"; case diUndoJoinParagraphs: return "diJoinParagraphs"; case diUndoSplitParagraph: return "diSplitParagraph"; - case diUndoSetDefaultCharFormat: return "diUndoSetDefaultCharFormat"; default: return "?"; } } diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 0028536..19ebf1b 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -832,17 +832,8 @@ void ME_SetCharFormat(ME_TextEditor *editor, int nOfs, int nChars, CHARFORMAT2W void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) { ME_Style *style; - ME_UndoItem *undo; - /* FIXME: Should this be removed? It breaks a test. */ assert(mod->cbSize == sizeof(CHARFORMAT2W)); - undo = ME_AddUndoItem(editor, diUndoSetDefaultCharFormat, NULL); - if (undo) { - undo->nStart = -1; - undo->nLen = -1; - undo->di.member.ustyle = editor->pBuffer->pDefaultStyle; - ME_AddRefStyle(undo->di.member.ustyle); - } style = ME_ApplyStyle(editor->pBuffer->pDefaultStyle, mod); editor->pBuffer->pDefaultStyle->fmt = style->fmt; editor->pBuffer->pDefaultStyle->tm = style->tm; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 6c8756c..8d22e85 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -614,7 +614,7 @@ static void test_EM_SETCHARFORMAT(void) (LPARAM) &cf2); ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); rc = SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0); - todo_wine ok(rc == FALSE, "Should not be able to undo here.\n"); + ok(rc == FALSE, "Should not be able to undo here.\n"); SendMessage(hwndRichEdit, EM_EMPTYUNDOBUFFER, 0, 0); /* A valid flag, CHARFORMAT2 structure minimally filled */ diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index bf992ab..eaf1791 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -84,7 +84,6 @@ ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_Disp else pItem->member.run.ole_obj = NULL; break; case diUndoSetCharFormat: - case diUndoSetDefaultCharFormat: break; case diUndoDeleteRun: case diUndoJoinParagraphs: @@ -292,11 +291,6 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, ME_DisplayItem *pItem) ME_SetCharFormat(editor, pUItem->nStart, pUItem->nLen, &pItem->member.ustyle->fmt); break; } - case diUndoSetDefaultCharFormat: - { - ME_SetDefaultCharFormat(editor, &pItem->member.ustyle->fmt); - break; - } case diUndoInsertRun: { ME_InsertRun(editor, pItem->member.run.nCharOfs, pItem); diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 80638c8..6f3e41a 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2532,7 +2532,6 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar set_caption(NULL); set_bar_states(); set_fileformat(SF_RTF); - SendMessageW(hEditorWnd, EM_EMPTYUNDOBUFFER, 0, 0); hPopupMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_POPUP)); get_default_printer_opts(); target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]);

1 0

Alexander Nicolaysen Sørnes : wordpad: Show error message if saving fails.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: bd2734d9c6cc34ea0d36c893865ba26e45019eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd2734d9c6cc34ea0d36c8938… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 11 20:38:50 2008 +0200 wordpad: Show error message if saving fails. --- programs/wordpad/En.rc | 2 ++ programs/wordpad/No.rc | 2 ++ programs/wordpad/wordpad.c | 19 +++++++++++++++++++ programs/wordpad/wordpad.h | 2 ++ 4 files changed, 25 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 87f5a97..d1a8473 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -234,4 +234,6 @@ BEGIN "Are you sure that you wish to do this?" STRING_INVALID_NUMBER, "Invalid number format" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" + STRING_WRITE_FAILED, "Could not save the file." + STRING_WRITE_ACCESS_DENIED, "You do not have access to save the file." END diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 411e58a..f73b145 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -234,4 +234,6 @@ BEGIN "sikker p� at du vil fortsette?" STRING_INVALID_NUMBER, "Ugyldig tallformat" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" + STRING_WRITE_FAILED, "Klarte ikke lagre filen." + STRING_WRITE_ACCESS_DENIED, "Du har ikke tilgang til � lagre filen." END diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 6f3e41a..20fa60c 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -753,6 +753,22 @@ static void DoOpenFile(LPCWSTR szOpenFileName) update_font_list(); } +static void ShowWriteError(DWORD Code) +{ + LPWSTR Message; + + switch(Code) + { + case ERROR_ACCESS_DENIED: + Message = MAKEINTRESOURCEW(STRING_WRITE_ACCESS_DENIED); + break; + + default: + Message = MAKEINTRESOURCEW(STRING_WRITE_FAILED); + } + MessageBoxW(hMainWnd, Message, wszAppTitle, MB_ICONEXCLAMATION | MB_OK); +} + static void DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) { HANDLE hFile; @@ -763,7 +779,10 @@ static void DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) FILE_ATTRIBUTE_NORMAL, NULL); if(hFile == INVALID_HANDLE_VALUE) + { + ShowWriteError(GetLastError()); return; + } if(format == (SF_TEXT | SF_UNICODE)) { diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 53a6c13..c5305bb 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -193,6 +193,8 @@ #define STRING_SAVE_LOSEFORMATTING 1704 #define STRING_INVALID_NUMBER 1705 #define STRING_OLE_STORAGE_NOT_SUPPORTED 1706 +#define STRING_WRITE_FAILED 1707 +#define STRING_WRITE_ACCESS_DENIED 1708 LPWSTR file_basename(LPWSTR);

1 0

Dylan Smith : richedit: Enforce the maximum font size.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: 43ad427a15cbefcd24982781cab5dd099a168be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ad427a15cbefcd24982781c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jul 11 20:05:57 2008 -0400 richedit: Enforce the maximum font size. Trying to set the font size to a value larger than 1638 in points (yHeightCharPtsMost) using EM_SETCHARFORMAT will cause it to be set to actually set to the maximum. --- dlls/riched20/style.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 66e45f5..b7dae3e 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -197,7 +197,10 @@ ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style) COPY_STYLE_ITEM(CFM_LCID, lcid); COPY_STYLE_ITEM(CFM_OFFSET, yOffset); COPY_STYLE_ITEM(CFM_REVAUTHOR, bRevAuthor); - COPY_STYLE_ITEM(CFM_SIZE, yHeight); + if (style->dwMask & CFM_SIZE) { + s->fmt.dwMask |= CFM_SIZE; + s->fmt.yHeight = min(style->yHeight, yHeightCharPtsMost * 20); + } COPY_STYLE_ITEM(CFM_SPACING, sSpacing); COPY_STYLE_ITEM(CFM_STYLE, sStyle); COPY_STYLE_ITEM(CFM_UNDERLINETYPE, bUnderlineType);

1 0

Aurimas Fischer : richedit: Spelling fixes.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: 88c25518d5c5825b4fa90b4c77f93f64faf9c734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c25518d5c5825b4fa90b4c7… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Fri Jul 11 22:38:07 2008 +0300 richedit: Spelling fixes. --- dlls/riched20/tests/editor.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 16085d3..6c8756c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4492,25 +4492,25 @@ static void test_word_movement(void) /* one |two three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); - ok(sel_start == 4, "Cursur is at %d instead of %d\n", sel_start, 4); + ok(sel_start == 4, "Cursor is at %d instead of %d\n", sel_start, 4); SEND_CTRL_RIGHT(hwnd); /* one two |three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); - ok(sel_start == 9, "Cursur is at %d instead of %d\n", sel_start, 9); + ok(sel_start == 9, "Cursor is at %d instead of %d\n", sel_start, 9); SEND_CTRL_LEFT(hwnd); /* one |two three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); - ok(sel_start == 4, "Cursur is at %d instead of %d\n", sel_start, 4); + ok(sel_start == 4, "Cursor is at %d instead of %d\n", sel_start, 4); SEND_CTRL_LEFT(hwnd); /* |one two three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); - ok(sel_start == 0, "Cursur is at %d instead of %d\n", sel_start, 0); + ok(sel_start == 0, "Cursor is at %d instead of %d\n", sel_start, 0); SendMessage(hwnd, EM_SETSEL, 8, 8); /* one two | three */ @@ -4518,7 +4518,7 @@ static void test_word_movement(void) /* one two |three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); - ok(sel_start == 9, "Cursur is at %d instead of %d\n", sel_start, 9); + ok(sel_start == 9, "Cursor is at %d instead of %d\n", sel_start, 9); SendMessage(hwnd, EM_SETSEL, 11, 11); /* one two th|ree */ @@ -4526,7 +4526,7 @@ static void test_word_movement(void) /* one two |three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); - ok(sel_start == 9, "Cursur is at %d instead of %d\n", sel_start, 9); + ok(sel_start == 9, "Cursor is at %d instead of %d\n", sel_start, 9); DestroyWindow(hwnd); }

1 0

Maarten Lankhorst : quartz: Fix memory and sample leaks.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: cf1d2f5e42fe418b0a66984bb9b0bf9134c23f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1d2f5e42fe418b0a66984bb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jul 11 10:51:25 2008 -0700 quartz: Fix memory and sample leaks. --- dlls/quartz/parser.c | 1 - dlls/quartz/pin.c | 29 +++++++++++------------------ dlls/quartz/pin.h | 1 - 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 6883e47..91d1ce9 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -246,7 +246,6 @@ HRESULT WINAPI Parser_Stop(IBaseFilter * iface) PullPin_PauseProcessing(This->pInputPin); PullPin_WaitForStateChange(This->pInputPin, INFINITE); - IAsyncReader_EndFlush(This->pInputPin->pReader); LeaveCriticalSection(&pin->thread_lock); return S_OK; diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 0abeb13..5daaf7e 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -387,6 +387,8 @@ HRESULT WINAPI IPinImpl_Disconnect(IPin * iface) { IPin_Release(This->pConnectedTo); This->pConnectedTo = NULL; + FreeMediaType(&This->mtCurrent); + ZeroMemory(&This->mtCurrent, sizeof(This->mtCurrent)); hr = S_OK; } else @@ -944,7 +946,7 @@ HRESULT WINAPI OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDI (This->pConnectSpecific(iface, pReceivePin, pmtCandidate) == S_OK)) { hr = S_OK; - CoTaskMemFree(pmtCandidate); + DeleteMediaType(pmtCandidate); break; } DeleteMediaType(pmtCandidate); @@ -967,7 +969,7 @@ HRESULT WINAPI OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDI (This->pConnectSpecific(iface, pReceivePin, pmtCandidate) == S_OK)) { hr = S_OK; - CoTaskMemFree(pmtCandidate); + DeleteMediaType(pmtCandidate); break; } DeleteMediaType(pmtCandidate); @@ -1008,6 +1010,8 @@ HRESULT WINAPI OutputPin_Disconnect(IPin * iface) { IPin_Release(This->pin.pConnectedTo); This->pin.pConnectedTo = NULL; + FreeMediaType(&This->pin.mtCurrent); + ZeroMemory(&This->pin.mtCurrent, sizeof(This->pin.mtCurrent)); hr = S_OK; } else @@ -1559,6 +1563,8 @@ static void CALLBACK PullPin_Thread_Process(PullPin *This) static void CALLBACK PullPin_Thread_Pause(PullPin *This) { + PullPin_Flush(This); + EnterCriticalSection(This->pin.pCritSec); This->state = Req_Sleepy; SetEvent(This->hEventStateChanged); @@ -1583,16 +1589,6 @@ static void CALLBACK PullPin_Thread_Stop(PullPin *This) ExitThread(0); } -static void CALLBACK PullPin_Thread_Flush(PullPin *This) -{ - PullPin_Flush(This); - - EnterCriticalSection(This->pin.pCritSec); - This->state = Req_Sleepy; - SetEvent(This->hEventStateChanged); - LeaveCriticalSection(This->pin.pCritSec); -} - static DWORD WINAPI PullPin_Thread_Main(LPVOID pv) { PullPin *This = pv; @@ -1611,7 +1607,6 @@ static DWORD WINAPI PullPin_Thread_Main(LPVOID pv) case Req_Die: PullPin_Thread_Stop(This); break; case Req_Run: PullPin_Thread_Process(This); break; case Req_Pause: PullPin_Thread_Pause(This); break; - case Req_Flush: PullPin_Thread_Flush(This); break; case Req_Sleepy: ERR("Should not be signalled with SLEEPY!\n"); break; default: ERR("Unknown state request: %d\n", This->state); break; } @@ -1768,11 +1763,6 @@ HRESULT WINAPI PullPin_BeginFlush(IPin * iface) PullPin_PauseProcessing(This); PullPin_WaitForStateChange(This, INFINITE); } - - This->state = Req_Flush; - ResetEvent(This->hEventStateChanged); - SetEvent(This->thread_sleepy); - PullPin_WaitForStateChange(This, INFINITE); } LeaveCriticalSection(&This->thread_lock); @@ -1828,6 +1818,9 @@ HRESULT WINAPI PullPin_Disconnect(IPin *iface) IPin_Release(This->pin.pConnectedTo); This->pin.pConnectedTo = NULL; PullPin_StopProcessing(This); + + FreeMediaType(&This->pin.mtCurrent); + ZeroMemory(&This->pin.mtCurrent, sizeof(This->pin.mtCurrent)); hr = S_OK; } else diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index 4170ca5..3a9719c 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -140,7 +140,6 @@ typedef struct PullPin #define Req_Die 1 #define Req_Run 2 #define Req_Pause 3 -#define Req_Flush 4 /*** Constructors ***/ HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PUSH pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin);

1 0

Maarten Lankhorst : quartz: Only allocate 1 buffer in transform filter.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: 0e9704b02dfa0d0bdb1af4941cebddde84a2af0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e9704b02dfa0d0bdb1af4941… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jul 11 11:20:23 2008 -0700 quartz: Only allocate 1 buffer in transform filter. --- dlls/quartz/transform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 97812bd..322c76a 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -184,7 +184,7 @@ HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSI props.cbAlign = 1; props.cbPrefix = 0; props.cbBuffer = 0; /* Will be updated at connection time */ - props.cBuffers = 2; + props.cBuffers = 1; hr = OutputPin_Construct(&TransformFilter_OutputPin_Vtbl, sizeof(OutputPin), &piOutput, &props, pTransformFilter, TransformFilter_Output_QueryAccept, &pTransformFilter->csFilter, &pTransformFilter->ppPins[1]);

1 0

Maarten Lankhorst : quartz: Fix reference leak in avi splitter on end of stream.
by Alexandre Julliard July 14, 2008

July 14, 2008

Module: wine Branch: master Commit: 28d6203ca9bd0ba17ce38e309f340b518f954c08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d6203ca9bd0ba17ce38e309… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jul 11 11:20:47 2008 -0700 quartz: Fix reference leak in avi splitter on end of stream. --- dlls/quartz/avisplit.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index f2c0636..9d00b4d 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -201,6 +201,7 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe if (stream->index_next >= stream->entries) { ERR("END OF STREAM ON %u\n", streamnumber); + IMediaSample_Release(sample); hr = AVISplitter_SendEndOfFile(This, streamnumber); return S_FALSE; } @@ -240,6 +241,7 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe /* End of file */ if (stream->pos_next * sizeof(This->oldindex->aIndex[0]) >= This->oldindex->cb) { + IMediaSample_Release(sample); stream->pos_next = 0; ++stream->index_next; ERR("END OF STREAM ON %u\n", streamnumber); @@ -377,6 +379,8 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample, DWORD_PT return hr; } +static HRESULT AVISplitter_done_process(LPVOID iface); + /* On the first request we have to be sure that (cStreams-1) samples have * already been processed, because otherwise some pins might not ever finish * a Pause state change @@ -420,26 +424,21 @@ static HRESULT AVISplitter_first_request(LPVOID iface) assert(hr == S_OK); assert(sample); - /* This should not happen! (Maybe the threads didn't terminate?) */ - if (dwUser != x - 1) - { - ERR("dwUser: %lu, x-1: %u\n", dwUser, x-1); - assert(dwUser == x - 1); - } AVISplitter_Sample(iface, sample, dwUser); IMediaSample_Release(sample); } hr = AVISplitter_next_request(This, x); TRACE("-->%08x\n", hr); - /* assert(SUCCEEDED(hr)); * With quick transitions this might not be the case (eg stop->running->stop) */ /* Could be an EOF instead */ have_sample = (hr == S_OK); + if (FAILED(hr)) + break; } /* FIXME: Don't do this for each pin that sent an EOF */ - for (x = 0; x < This->Parser.cStreams; ++x) + for (x = 0; x < This->Parser.cStreams && SUCCEEDED(hr); ++x) { struct thread_args *args; DWORD tid; @@ -1092,7 +1091,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, props->cbAlign = 1; props->cbPrefix = 0; /* Comrades, prevent shortage of buffers, or you will feel the consequences! DA! */ - props->cBuffers = 3 * pAviSplit->Parser.cStreams; + props->cBuffers = 2 * pAviSplit->Parser.cStreams; /* Now peek into the idx1 index, if available */ if (hr == S_OK && (total - pos) > sizeof(RIFFCHUNK))

1 0