wine-devel

wine-devel@winehq.org

1 participants
84482 discussions

[PATCH 4/5] riched20: Use para and row ptrs in the row number from offset function.
by Huw Davies 03 Nov '20

03 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 12 ++++------- dlls/riched20/editor.h | 2 +- dlls/riched20/row.c | 47 +++++++++++++++++++----------------------- 3 files changed, 26 insertions(+), 35 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 168dc51d827..41906d28e4c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4312,17 +4312,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_LINEFROMCHAR: { - if (wParam == -1) - return ME_RowNumberFromCharOfs(editor, ME_GetCursorOfs(&editor->pCursors[1])); - else - return ME_RowNumberFromCharOfs(editor, wParam); + if (wParam == -1) wParam = ME_GetCursorOfs( editor->pCursors + 1 ); + return row_number_from_char_ofs( editor, wParam ); } case EM_EXLINEFROMCHAR: { - if (lParam == -1) - return ME_RowNumberFromCharOfs(editor, ME_GetCursorOfs(&editor->pCursors[1])); - else - return ME_RowNumberFromCharOfs(editor, lParam); + if (lParam == -1) lParam = ME_GetCursorOfs( editor->pCursors + 1 ); + return row_number_from_char_ofs( editor, lParam ); } case EM_LINEINDEX: { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e5d580846d0..e884cbee2f3 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -118,7 +118,7 @@ ME_Row *row_from_cursor( ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) DECLSPEC_HIDDEN; ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; -int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; +int row_number_from_char_ofs( ME_TextEditor *editor, int ofs ) DECLSPEC_HIDDEN; static inline ME_DisplayItem *row_get_di( ME_Row *row ) { return (ME_DisplayItem *)((ptrdiff_t)row - offsetof(ME_DisplayItem, member)); diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index a12a8c7449b..9a87cf27fb5 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -102,33 +102,28 @@ ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) } -int -ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) +int row_number_from_char_ofs( ME_TextEditor *editor, int ofs ) { - ME_DisplayItem *item = ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph); - int nRow = 0; - - while (item->type == diParagraph && - item->member.para.next_para->member.para.nCharOfs <= nOfs) - { - nRow += item->member.para.nRows; - item = item->member.para.next_para; - } - if (item->type == diParagraph) - { - ME_DisplayItem *next_para = item->member.para.next_para; - - nOfs -= item->member.para.nCharOfs; - item = ME_FindItemFwd(item, diRun); - while ((item = ME_FindItemFwd(item, diStartRowOrParagraph)) != NULL) + ME_Paragraph *para = editor_first_para( editor ); + ME_Row *row; + ME_Cursor cursor; + int row_num = 0; + + while (para_next( para ) && para_next( para )->nCharOfs <= ofs) + { + row_num += para->nRows; + para = para_next( para ); + } + + if (para_next( para )) { - if (item == next_para) - break; - item = ME_FindItemFwd(item, diRun); - if (item->member.run.nCharOfs > nOfs) - break; - nRow++; + for (row = para_first_row( para ); row; row = row_next( row )) + { + row_end_cursor( row, &cursor, TRUE ); + if (ME_GetCursorOfs( &cursor ) > ofs ) break; + row_num++; + } } - } - return nRow; + + return row_num; } -- 2.23.0

1 0

[PATCH 3/5] riched20: Remove unused ME_RowStart().
by Huw Davies 03 Nov '20

03 Nov '20

Its functionality has been replaced with row_from_cursor(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 2 -- dlls/riched20/row.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index d0d34ac5afc..e5d580846d0 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -118,8 +118,6 @@ ME_Row *row_from_cursor( ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) DECLSPEC_HIDDEN; ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) DECLSPEC_HIDDEN; -/* ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item); */ int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; static inline ME_DisplayItem *row_get_di( ME_Row *row ) { diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index 2c77962b56b..a12a8c7449b 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -82,10 +82,6 @@ void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) cursor->nOffset = (item->type == diStartRow || include_eop) ? cursor->pRun->member.run.len : 0; } -ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) { - return ME_FindItemBackOrHere(item, diStartRow); -} - ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) { ME_Paragraph *para = editor_first_para( editor ); -- 2.23.0

1 0

[PATCH 2/5] riched20: Use run ptrs in the text retrieval function.
by Huw Davies 03 Nov '20

03 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2bb1fbbe1e9..168dc51d827 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -5160,7 +5160,7 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, const ME_Cursor *start, int srcChars, BOOL bCRLF, BOOL bEOP) { - ME_DisplayItem *pRun, *pNextRun; + ME_Run *run, *next_run; const WCHAR *pStart = buffer; const WCHAR cr_lf[] = {'\r', '\n', 0}; const WCHAR *str; @@ -5169,18 +5169,15 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, /* bCRLF flag is only honored in 2.0 and up. 1.0 must always return text verbatim */ if (editor->bEmulateVersion10) bCRLF = FALSE; - pRun = start->pRun; - assert(pRun); - pNextRun = ME_FindItemFwd(pRun, diRun); + run = &start->pRun->member.run; + next_run = run_next_all_paras( run ); - nLen = pRun->member.run.len - start->nOffset; - str = get_text( &pRun->member.run, start->nOffset ); + nLen = run->len - start->nOffset; + str = get_text( run, start->nOffset ); - while (srcChars && buflen && pNextRun) + while (srcChars && buflen && next_run) { - int nFlags = pRun->member.run.nFlags; - - if (bCRLF && nFlags & MERF_ENDPARA && ~nFlags & MERF_ENDCELL) + if (bCRLF && run->nFlags & MERF_ENDPARA && ~run->nFlags & MERF_ENDCELL) { if (buflen == 1) break; /* FIXME: native fails to reduce srcChars here for WM_GETTEXT or @@ -5189,7 +5186,9 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, srcChars -= min(nLen, srcChars); nLen = 2; str = cr_lf; - } else { + } + else + { nLen = min(nLen, srcChars); srcChars -= nLen; } @@ -5201,14 +5200,14 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, buffer += nLen; - pRun = pNextRun; - pNextRun = ME_FindItemFwd(pRun, diRun); + run = next_run; + next_run = run_next_all_paras( run ); - nLen = pRun->member.run.len; - str = get_text( &pRun->member.run, 0 ); + nLen = run->len; + str = get_text( run, 0 ); } /* append '\r' to the last paragraph. */ - if (pRun->next->type == diTextEnd && bEOP) + if (run == para_end_run( para_prev( editor_end_para( editor ) ) ) && bEOP) { *buffer = '\r'; buffer ++; -- 2.23.0

1 0

[PATCH 1/5] riched20: Use row ptrs in the EM_GETLINELENGTH handler.
by Huw Davies 03 Nov '20

03 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 66f6bd5e114..2bb1fbbe1e9 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4341,8 +4341,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_LINELENGTH: { - ME_DisplayItem *item, *item_end; - int nChars = 0, nThisLineOfs = 0, nNextLineOfs = 0; + ME_Row *row; + int start_ofs, end_ofs; ME_Cursor cursor; if (wParam > ME_GetTextLength(editor)) @@ -4353,20 +4353,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; } cursor_from_char_ofs( editor, wParam, &cursor ); - item = ME_RowStart( cursor.pRun ); - nThisLineOfs = run_char_ofs( &ME_FindItemFwd( item, diRun )->member.run, 0 ); - item_end = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); - if (item_end->type == diStartRow) - nNextLineOfs = run_char_ofs( &ME_FindItemFwd( item_end, diRun )->member.run, 0 ); - else - { - ME_DisplayItem *endRun = ME_FindItemBack(item_end, diRun); - assert(endRun && endRun->member.run.nFlags & MERF_ENDPARA); - nNextLineOfs = run_char_ofs( &endRun->member.run, 0 ); - } - nChars = nNextLineOfs - nThisLineOfs; - TRACE("EM_LINELENGTH(%ld)==%d\n", wParam, nChars); - return nChars; + row = row_from_cursor( &cursor ); + row_first_cursor( row, &cursor ); + start_ofs = ME_GetCursorOfs( &cursor ); + row_end_cursor( row, &cursor, FALSE ); + end_ofs = ME_GetCursorOfs( &cursor ); + TRACE( "EM_LINELENGTH(%ld)==%d\n", wParam, end_ofs - start_ofs ); + return end_ofs - start_ofs; } case EM_EXLIMITTEXT: { -- 2.23.0

1 0

user32: Don't erase parent when child wnd has WS_CLIPCHILDREN style.
by Haidong Yu 03 Nov '20

03 Nov '20

2 1

[PATCH] d2d1: Add semi-implementation for ID2D1DeviceContext_DrawImage.
by Zhipeng Zhao 03 Nov '20

03 Nov '20

1 0

[PATCH] serialui: Use wide-char string literals.
by Michael Stefaniuc 03 Nov '20

03 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/serialui/confdlg.c | 26 +++++++------------------- dlls/serialui/tests/confdlg.c | 18 +++++++----------- 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index 45419edb421..23c9eb68c2a 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -46,8 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(comm); static HMODULE SERIALUI_hModule; -static const WCHAR comW[] = {'c','o','m',0 }; - /*********************************************************************** * DllMain [Internal] Initializes the internal 'SERIALUI.DLL'. * @@ -463,13 +461,7 @@ DWORD WINAPI drvCommConfigDialogA(LPCSTR lpszName, HWND hWndParent, LPCOMMCONFIG return r; } -static const WCHAR lpszCommKey[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'S','e','r','v','i','c','e','s','\\', - 'C','l','a','s','s','\\','P','o','r','t','s',0 -}; -static const WCHAR lpszDCB[] = {'D','C','B',0}; +static const WCHAR lpszCommKey[] = L"System\\CurrentControlSet\\Services\\Class\\Ports"; /*********************************************************************** * drvSetDefaultCommConfigW (SERIALUI.@) @@ -484,7 +476,6 @@ BOOL WINAPI drvSetDefaultCommConfigW( HKEY hKeyReg=0, hKeyPort=0; WCHAR szKeyName[100]; DWORD r,dwDCBSize; - static const WCHAR fmt[] = {'%','s','\\','%','s',0 }; TRACE("%p %p %x\n",lpszDevice,lpCommConfig,dwSize); @@ -498,13 +489,12 @@ BOOL WINAPI drvSetDefaultCommConfigW( if(r != ERROR_SUCCESS) return FALSE; - swprintf(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice); + swprintf(szKeyName, ARRAY_SIZE(szKeyName), L"%s\\%s", lpszCommKey, lpszDevice); r = RegCreateKeyW(hKeyReg, szKeyName, &hKeyPort); if(r == ERROR_SUCCESS) { dwDCBSize = sizeof (DCB); - r = RegSetValueExW( hKeyPort, lpszDCB, 0, REG_BINARY, - (LPBYTE)&lpCommConfig->dcb,dwDCBSize); + r = RegSetValueExW(hKeyPort, L"DCB", 0, REG_BINARY, (BYTE *)&lpCommConfig->dcb, dwDCBSize); TRACE("write key r=%d\n",r); RegCloseKey(hKeyPort); } @@ -539,7 +529,6 @@ DWORD WINAPI drvGetDefaultCommConfigW( HKEY hKeyReg, hKeyPort; WCHAR szKeyName[100]; DWORD r,dwSize,dwType; - static const WCHAR fmt[] = {'%','s','\\','%','s',0 }; TRACE("(%s, %p, %p) *lpdwSize: %u\n", debugstr_w(lpszDevice), lpCommConfig, lpdwSize, lpdwSize ? *lpdwSize : 0); @@ -553,11 +542,11 @@ DWORD WINAPI drvGetDefaultCommConfigW( } /* only "com1" - "com9" is allowed */ - r = ARRAY_SIZE(comW); /* len of "com\0" */ + r = ARRAY_SIZE(L"com"); lstrcpynW(szKeyName, lpszDevice, r); /* simulate a lstrcmpnW */ r--; - if( lstrcmpiW(szKeyName, comW) || + if (lstrcmpiW(szKeyName, L"com") || (lpszDevice[r] < '1') || (lpszDevice[r] > '9') || lpszDevice[r+1]) { return ERROR_BADKEY; } @@ -571,14 +560,13 @@ DWORD WINAPI drvGetDefaultCommConfigW( r = RegConnectRegistryW(NULL, HKEY_LOCAL_MACHINE, &hKeyReg); if(r != ERROR_SUCCESS) return r; - swprintf(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice); + swprintf(szKeyName, ARRAY_SIZE(szKeyName), L"%s\\%s", lpszCommKey, lpszDevice); r = RegOpenKeyW(hKeyReg, szKeyName, &hKeyPort); if(r == ERROR_SUCCESS) { dwSize = sizeof (DCB); dwType = 0; - r = RegQueryValueExW( hKeyPort, lpszDCB, NULL, - &dwType, (LPBYTE)&lpCommConfig->dcb, &dwSize); + r = RegQueryValueExW(hKeyPort, L"DCB", NULL, &dwType, (BYTE *)&lpCommConfig->dcb, &dwSize); RegCloseKey(hKeyPort); if ((r!=ERROR_SUCCESS) || (dwType != REG_BINARY) || (dwSize != sizeof(DCB))) { diff --git a/dlls/serialui/tests/confdlg.c b/dlls/serialui/tests/confdlg.c index bd541cda2b9..31669085d47 100644 --- a/dlls/serialui/tests/confdlg.c +++ b/dlls/serialui/tests/confdlg.c @@ -42,10 +42,6 @@ static const CHAR emptyA[] = ""; static const CHAR fmt_comA[] = "com%d"; static const CHAR str_colonA[] = ":"; -static const WCHAR com1W[] = {'c','o','m','1',0}; -static const WCHAR emptyW[] = {0}; -static const WCHAR str_colonW[] = {':',0}; - /* ################# */ static LPCSTR load_functions(void) @@ -202,7 +198,7 @@ static void test_drvCommConfigDialogW(void) ZeroMemory(pCC, sizeof(pCC)); SetLastError(0xdeadbeef); - res = pCommConfigDialogW(emptyW, NULL, pCC); + res = pCommConfigDialogW(L"", NULL, pCC); ok( res == ERROR_INSUFFICIENT_BUFFER, "returned %u with %u (expected ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError()); @@ -211,7 +207,7 @@ static void test_drvCommConfigDialogW(void) ZeroMemory(pCC, sizeof(pCC)); pCC[0].dwSize = sizeof(COMMCONFIG); SetLastError(0xdeadbeef); - res = pCommConfigDialogW(emptyW, NULL, pCC); + res = pCommConfigDialogW(L"", NULL, pCC); ok( res == ERROR_BADKEY, "returned %u with %u (expected ERROR_BADKEY)\n", res, GetLastError()); @@ -334,7 +330,7 @@ static void test_drvGetDefaultCommConfigW(void) len = sizeof(COMMCONFIG) -1; ZeroMemory(pCC, sizeof(pCC)); SetLastError(0xdeadbeef); - res = pGetDefaultCommConfigW(com1W, pCC, &len); + res = pGetDefaultCommConfigW(L"com1", pCC, &len); if (res == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("*W not implemented\n"); return; @@ -366,7 +362,7 @@ static void test_drvGetDefaultCommConfigW(void) /* a name with a colon is invalid */ if (res == ERROR_SUCCESS) { lstrcatA(bufferA, str_colonA); - lstrcatW(bufferW, str_colonW); + lstrcatW(bufferW, L":"); len = sizeof(pCC); ZeroMemory(pCC, sizeof(pCC)); res = pGetDefaultCommConfigW(bufferW, pCC, &len); @@ -380,7 +376,7 @@ static void test_drvGetDefaultCommConfigW(void) len = sizeof(pCC); ZeroMemory(pCC, sizeof(pCC)); SetLastError(0xdeadbeef); - res = pGetDefaultCommConfigW(emptyW, pCC, &len); + res = pGetDefaultCommConfigW(L"", pCC, &len); ok( res == ERROR_BADKEY, "returned %u with %u and %u for %s (expected ERROR_BADKEY)\n", res, GetLastError(), len, emptyA); @@ -397,14 +393,14 @@ static void test_drvGetDefaultCommConfigW(void) len = sizeof(pCC); SetLastError(0xdeadbeef); - res = pGetDefaultCommConfigW(com1W, NULL, &len); + res = pGetDefaultCommConfigW(L"com1", NULL, &len); ok( res == ERROR_INVALID_PARAMETER, "returned %u with %u and %u (expected ERROR_INVALID_PARAMETER)\n", res, GetLastError(), len); SetLastError(0xdeadbeef); - res = pGetDefaultCommConfigW(com1W, pCC, NULL); + res = pGetDefaultCommConfigW(L"com1", pCC, NULL); ok( res == ERROR_INVALID_PARAMETER, "returned %u with %u (expected ERROR_INVALID_PARAMETER)\n", res, GetLastError()); -- 2.26.2

1 0

[PATCH 1/2] msvcrt/tests: Add scanf tests for leading and trailing dash in scanset.
by Will Mainio 02 Nov '20

02 Nov '20

Signed-off-by: Will Mainio <will.mainio(a)fastmail.com> --- dlls/msvcrt/tests/scanf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 57d9cc0ba12..4b878e6d64e 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -186,6 +186,14 @@ static void test_sscanf( void ) ok( ret == 1, "Error with format \"%s\"\n","%*[a-cd-dg-e]%c"); ok( buffer[0] == 'h', "Error with \"abcefgdh\" \"%c\"\n", buffer[0]); + ret = p_sscanf("-123","%[-0-9]s",buffer); + ok( ret == 1, "Error with format \"%s\"\n","%[-0-9]s"); + ok( strncmp("-123",buffer,strlen(buffer)) == 0, "Error with \"-123\" \"%s\"\n",buffer); + + ret = p_sscanf("-321","%[0-9-]s",buffer); + ok( ret == 1, "Error with format \"%s\"\n","%[0-9-]s"); + ok( strncmp("-321",buffer,strlen(buffer)) == 0, "Error with \"-321\" \"%s\"\n",buffer); + buffer1[0] = 'b'; ret = p_sscanf("a","%s%s", buffer, buffer1); ok( ret == 1, "expected 1, got %u\n", ret); -- 2.28.0

4 10

[PATCH] avifil32: Only add the first stream reference to the parent.
by Esme Povirk 02 Nov '20

02 Nov '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- This fixes Arena Wars 2, which releases a stream too many times. dlls/avifil32/avifile.c | 4 ++-- dlls/avifil32/tests/api.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index b1654daa690..8f5c5e64562 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -699,7 +699,7 @@ static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface) TRACE("(%p) ref=%d\n", This, ref); /* also add ref to parent, so that it doesn't kill us */ - if (This->paf != NULL) + if (This->paf != NULL && ref == 1) IAVIFile_AddRef(&This->paf->IAVIFile_iface); return ref; @@ -712,7 +712,7 @@ static ULONG WINAPI IAVIStream_fnRelease(IAVIStream *iface) TRACE("(%p) ref=%d\n", This, ref); - if (This->paf != NULL) + if (This->paf != NULL && ref == 0) IAVIFile_Release(&This->paf->IAVIFile_iface); return ref; diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 66ba2051a06..23c845cb328 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -352,6 +352,12 @@ static void create_avi_file(const COMMON_AVI_HEADERS *cah, char *filename) CloseHandle(hFile); } +static ULONG get_file_refcount(PAVIFILE file) +{ + AVIFileAddRef(file); + return AVIFileRelease(file); +} + static void test_default_data(void) { COMMON_AVI_HEADERS cah; @@ -363,6 +369,7 @@ static void test_default_data(void) PAVISTREAM pStream1; AVISTREAMINFOA asi0, asi1; WAVEFORMATEX wfx; + ULONG refcount; GetTempPathA(MAX_PATH, filename); strcpy(filename+strlen(filename), testfilename); @@ -443,9 +450,34 @@ static void test_default_data(void) ok(wfx.nAvgBytesPerSec == 22050, "got %u (expected 22050)\n",wfx.nAvgBytesPerSec); ok(wfx.nBlockAlign == 2, "got %u (expected 2)\n",wfx.nBlockAlign); + refcount = get_file_refcount(pFile); + ok(refcount == 3, "got %u (expected 3)\n", refcount); + AVIStreamRelease(pStream0); + + refcount = get_file_refcount(pFile); + ok(refcount == 2, "got %u (expected 2)\n", refcount); + + AVIStreamAddRef(pStream1); + + refcount = get_file_refcount(pFile); + ok(refcount == 2, "got %u (expected 2)\n", refcount); + AVIStreamRelease(pStream1); - AVIFileRelease(pFile); + AVIStreamRelease(pStream1); + + refcount = get_file_refcount(pFile); + ok(refcount == 1, "got %u (expected 1)\n", refcount); + + refcount = AVIStreamRelease(pStream1); + ok(refcount == (ULONG)-1, "got %u (expected 4294967295)\n", refcount); + + refcount = get_file_refcount(pFile); + ok(refcount == 1, "got %u (expected 1)\n", refcount); + + refcount = AVIFileRelease(pFile); + ok(refcount == 0, "got %u (expected 0)\n", refcount); + ok(DeleteFileA(filename) !=0, "Deleting file %s failed\n", filename); } -- 2.17.1

1 0

[v2 PATCH 1/4] mfmediaengine: Keep "preload" property.
by Nikolay Sivov 02 Nov '20

02 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 22 ++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 9 ++++++--- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index d93e2b2f38c..64f0ae6d2a1 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -87,6 +87,7 @@ struct media_engine MF_MEDIA_ENGINE_ERR error_code; HRESULT extended_code; MF_MEDIA_ENGINE_READY ready_state; + MF_MEDIA_ENGINE_PRELOAD preload; IMFMediaSession *session; IMFSourceResolver *resolver; BSTR current_source; @@ -717,16 +718,29 @@ static USHORT WINAPI media_engine_GetNetworkState(IMFMediaEngine *iface) static MF_MEDIA_ENGINE_PRELOAD WINAPI media_engine_GetPreload(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + MF_MEDIA_ENGINE_PRELOAD preload; + + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + preload = engine->preload; + LeaveCriticalSection(&engine->cs); - return MF_MEDIA_ENGINE_PRELOAD_NONE; + return preload; } static HRESULT WINAPI media_engine_SetPreload(IMFMediaEngine *iface, MF_MEDIA_ENGINE_PRELOAD preload) { - FIXME("(%p, %d): stub.\n", iface, preload); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, preload); + + EnterCriticalSection(&engine->cs); + engine->preload = preload; + LeaveCriticalSection(&engine->cs); + + return S_OK; } static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngine *iface, IMFMediaTimeRange **buffered) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 660e5b95331..0394bcf6a0e 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -265,17 +265,20 @@ todo_wine /* Preload mode is still accessible. */ state = IMFMediaEngine_GetPreload(media_engine); -todo_wine ok(!state, "Unexpected state %d.\n", state); hr = IMFMediaEngine_SetPreload(media_engine, MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_GetPreload(media_engine); -todo_wine ok(state == MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC, "Unexpected state %d.\n", state); + hr = IMFMediaEngine_SetPreload(media_engine, 100); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + state = IMFMediaEngine_GetPreload(media_engine); + ok(state == 100, "Unexpected state %d.\n", state); + hr = IMFMediaEngine_GetBuffered(media_engine, &time_range); todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); -- 2.28.0

1 4

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-devel