wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Alexandre Julliard : gdi32: Implement RemoveFontResource.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 4fc8bf18f3050f7e28d04b21caadfaf7854d483a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc8bf18f3050f7e28d04b21c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 12:34:40 2013 +0100 gdi32: Implement RemoveFontResource. --- dlls/gdi32/freetype.c | 89 +++++++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/tests/font.c | 3 +- 2 files changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 97f820c..59ac9a4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -537,6 +537,7 @@ static BOOL use_default_fallback = FALSE; static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph); static BOOL get_outline_text_metrics(GdiFont *font); static BOOL get_text_metrics(GdiFont *font, LPTEXTMETRICW ptm); +static void remove_face_from_cache( Face *face ); static const WCHAR system_link[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', @@ -1257,6 +1258,7 @@ static void release_face( Face *face ) if (--face->refcount) return; if (face->family) { + if (face->flags & ADDFONT_ADD_TO_CACHE) remove_face_from_cache( face ); list_remove( &face->entry ); release_family( face->family ); } @@ -1565,6 +1567,27 @@ static void add_face_to_cache(Face *face) RegCloseKey(hkey_family); } +static void remove_face_from_cache( Face *face ) +{ + HKEY hkey_family; + + RegOpenKeyExW( hkey_font_cache, face->family->FamilyName, 0, KEY_ALL_ACCESS, &hkey_family ); + + if (face->scalable) + { + RegDeleteKeyW( hkey_family, face->StyleName ); + } + else + { + static const WCHAR fmtW[] = {'%','s','\\','%','d',0}; + WCHAR *face_key_name = HeapAlloc(GetProcessHeap(), 0, (strlenW(face->StyleName) + 10) * sizeof(WCHAR)); + sprintfW(face_key_name, fmtW, face->StyleName, face->size.y_ppem); + RegDeleteKeyW( hkey_family, face_key_name ); + HeapFree(GetProcessHeap(), 0, face_key_name); + } + RegCloseKey(hkey_family); +} + static WCHAR *prepend_at(WCHAR *family) { WCHAR *str; @@ -1959,6 +1982,36 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ return ret; } +static int remove_font_resource( const char *file, DWORD flags ) +{ + Family *family, *family_next; + Face *face, *face_next; + char *filename; + struct stat st, st2; + int count = 0; + + if (stat( file, &st ) == -1) return 0; + LIST_FOR_EACH_ENTRY_SAFE( family, family_next, &font_list, Family, entry ) + { + family->refcount++; + LIST_FOR_EACH_ENTRY_SAFE( face, face_next, &family->faces, Face, entry ) + { + if (!face->file) continue; + if (LOWORD(face->flags) != LOWORD(flags)) continue; + filename = strWtoA( CP_UNIXCP, face->file ); + if (!stat( filename, &st2 ) && st.st_dev == st2.st_dev && st.st_ino == st2.st_ino) + { + TRACE( "removing matching face %s\n", debugstr_w(face->file) ); + release_face( face ); + count++; + } + HeapFree( GetProcessHeap(), 0, filename ); + } + release_family( family ); + } + return count; +} + static void DumpFontList(void) { Family *family; @@ -2914,9 +2967,41 @@ HANDLE WineEngAddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD */ BOOL WineEngRemoveFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { + INT ret = 0; + GDI_CheckNotLock(); - FIXME("(%s, %x, %p): stub\n", debugstr_w(file), flags, pdv); - return TRUE; + + if (ft_handle) /* do it only if we have freetype up and running */ + { + char *unixname; + + EnterCriticalSection( &freetype_cs ); + + if ((unixname = wine_get_unix_file_name(file))) + { + DWORD addfont_flags = ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE; + + if(!(flags & FR_PRIVATE)) addfont_flags |= ADDFONT_ADD_TO_CACHE; + ret = remove_font_resource( unixname, addfont_flags ); + HeapFree(GetProcessHeap(), 0, unixname); + } + if (!ret && !strchrW(file, '\\')) + { + if ((unixname = get_winfonts_dir_path( file ))) + { + ret = remove_font_resource( unixname, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); + HeapFree(GetProcessHeap(), 0, unixname); + } + if (!ret && (unixname = get_data_dir_path( file ))) + { + ret = remove_font_resource( unixname, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); + HeapFree(GetProcessHeap(), 0, unixname); + } + } + + LeaveCriticalSection( &freetype_cs ); + } + return ret; } static char *get_ttf_file_name( LPCWSTR font_file, LPCWSTR font_path ) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 337a6b9..1dfdd11 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4451,7 +4451,6 @@ static void test_CreateScalableFontResource(void) ok(ret, "DeleteFile() error %d\n", GetLastError()); ret = pRemoveFontResourceExA(fot_name, 0, 0); -todo_wine ok(!ret, "RemoveFontResourceEx() should fail\n"); /* test public font resource */ @@ -4472,11 +4471,11 @@ todo_wine test_GetGlyphOutline_empty_contour(); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); -todo_wine ok(!ret, "RemoveFontResourceEx() with not matching flags should fail\n"); SetLastError(0xdeadbeef); ret = pRemoveFontResourceExA(fot_name, 0, 0); +todo_wine ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test");

1 0

Alexandre Julliard : gdi32: Keep the main font cache key open.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 4d72b082ed1056fce52dc20d24302bff1d65d18b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d72b082ed1056fce52dc20d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 13:56:52 2013 +0100 gdi32: Keep the main font cache key open. --- dlls/gdi32/freetype.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5a79b35..97f820c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -518,6 +518,7 @@ struct font_mapping static struct list mappings_list = LIST_INIT( mappings_list ); static UINT default_aa_flags; +static HKEY hkey_font_cache; static CRITICAL_SECTION freetype_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -1516,11 +1517,9 @@ static LONG create_font_cache_key(HKEY *hkey, DWORD *disposition) static void add_face_to_cache(Face *face) { - HKEY hkey_font_cache, hkey_family, hkey_face; + HKEY hkey_family, hkey_face; WCHAR *face_key_name; - create_font_cache_key(&hkey_font_cache, NULL); - RegCreateKeyExW(hkey_font_cache, face->family->FamilyName, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey_family, NULL); if(face->family->EnglishName) @@ -1564,7 +1563,6 @@ static void add_face_to_cache(Face *face) } RegCloseKey(hkey_face); RegCloseKey(hkey_family); - RegCloseKey(hkey_font_cache); } static WCHAR *prepend_at(WCHAR *family) @@ -3794,7 +3792,6 @@ static void reorder_font_list(void) */ BOOL WineEngInit(void) { - HKEY hkey_font_cache; DWORD disposition; HANDLE font_mutex; @@ -3817,8 +3814,6 @@ BOOL WineEngInit(void) else load_font_list_from_cache(hkey_font_cache); - RegCloseKey(hkey_font_cache); - reorder_font_list(); DumpFontList();

1 0

Alexandre Julliard : gdi32: Add helper functions to compute font paths for AddFontResource.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: ab0ad4f5d81511b66728bd32e7d429550cb28e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab0ad4f5d81511b66728bd32e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 14 17:28:25 2013 +0100 gdi32: Add helper functions to compute font paths for AddFontResource. --- dlls/gdi32/freetype.c | 57 +++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 22080b1..5a79b35 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2614,27 +2614,33 @@ static void load_mac_fonts(void) #endif -static BOOL load_font_from_data_dir(LPCWSTR file) +static char *get_data_dir_path( LPCWSTR file ) { - BOOL ret = FALSE; + char *unix_name = NULL; const char *data_dir = wine_get_data_dir(); if (!data_dir) data_dir = wine_get_build_dir(); if (data_dir) { - INT len; - char *unix_name; - - len = WideCharToMultiByte(CP_UNIXCP, 0, file, -1, NULL, 0, NULL, NULL); + INT len = WideCharToMultiByte(CP_UNIXCP, 0, file, -1, NULL, 0, NULL, NULL); unix_name = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + len + sizeof("/fonts/")); - strcpy(unix_name, data_dir); strcat(unix_name, "/fonts/"); WideCharToMultiByte(CP_UNIXCP, 0, file, -1, unix_name + strlen(unix_name), len, NULL, NULL); + } + return unix_name; +} +static BOOL load_font_from_data_dir(LPCWSTR file) +{ + BOOL ret = FALSE; + char *unix_name = get_data_dir_path( file ); + + if (unix_name) + { EnterCriticalSection( &freetype_cs ); ret = AddFontToList(unix_name, NULL, 0, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); LeaveCriticalSection( &freetype_cs ); @@ -2643,24 +2649,16 @@ static BOOL load_font_from_data_dir(LPCWSTR file) return ret; } -static BOOL load_font_from_winfonts_dir(LPCWSTR file) +static char *get_winfonts_dir_path(LPCWSTR file) { static const WCHAR slashW[] = {'\\','\0'}; - BOOL ret = FALSE; WCHAR windowsdir[MAX_PATH]; - char *unixname; GetWindowsDirectoryW(windowsdir, sizeof(windowsdir) / sizeof(WCHAR)); strcatW(windowsdir, fontsW); strcatW(windowsdir, slashW); strcatW(windowsdir, file); - if ((unixname = wine_get_unix_file_name(windowsdir))) { - EnterCriticalSection( &freetype_cs ); - ret = AddFontToList(unixname, NULL, 0, ADDFONT_ALLOW_BITMAP); - LeaveCriticalSection( &freetype_cs ); - HeapFree(GetProcessHeap(), 0, unixname); - } - return ret; + return wine_get_unix_file_name( windowsdir ); } static void load_system_fonts(void) @@ -2846,31 +2844,34 @@ INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { char *unixname; - if(flags) - FIXME("Ignoring flags %x\n", flags); + EnterCriticalSection( &freetype_cs ); if((unixname = wine_get_unix_file_name(file))) { DWORD addfont_flags = ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE; if(!(flags & FR_PRIVATE)) addfont_flags |= ADDFONT_ADD_TO_CACHE; - EnterCriticalSection( &freetype_cs ); ret = AddFontToList(unixname, NULL, 0, addfont_flags); - LeaveCriticalSection( &freetype_cs ); HeapFree(GetProcessHeap(), 0, unixname); } if (!ret && !strchrW(file, '\\')) { /* Try in %WINDIR%/fonts, needed for Fotobuch Designer */ - ret = load_font_from_winfonts_dir(file); - if (!ret) { - /* Try in datadir/fonts (or builddir/fonts), - * needed for Magic the Gathering Online - */ - ret = load_font_from_data_dir(file); + if ((unixname = get_winfonts_dir_path( file ))) + { + ret = AddFontToList(unixname, NULL, 0, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE); + HeapFree(GetProcessHeap(), 0, unixname); + } + /* Try in datadir/fonts (or builddir/fonts), needed for Magic the Gathering Online */ + if (!ret && (unixname = get_data_dir_path( file ))) + { + ret = AddFontToList(unixname, NULL, 0, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE); + HeapFree(GetProcessHeap(), 0, unixname); } } + + LeaveCriticalSection( &freetype_cs ); } - return ret; + return ret; } /*************************************************************

1 0

Alexandre Julliard : gdi32: Store the vertical flag together with the other font flags.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 0f40a031e7e25e35ff6ce3b067a5e6eb18655102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f40a031e7e25e35ff6ce3b06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 14:13:09 2013 +0100 gdi32: Store the vertical flag together with the other font flags. --- dlls/gdi32/freetype.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c90f3c2..22080b1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -270,7 +270,6 @@ typedef struct tagFace { DWORD ntmFlags; FT_Fixed font_version; BOOL scalable; - BOOL vertical; Bitmap_Size size; /* set if face is a bitmap */ DWORD flags; /* ADDFONT flags */ struct tagFamily *family; @@ -282,6 +281,7 @@ typedef struct tagFace { #define ADDFONT_ALLOW_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 #define ADDFONT_ADD_RESOURCE 0x08 /* added through AddFontResource */ +#define ADDFONT_VERTICAL_FONT 0x10 #define ADDFONT_AA_FLAGS(flags) ((flags) << 16) typedef struct tagFamily { @@ -493,7 +493,6 @@ static const WCHAR english_name_value[] = {'E','n','g','l','i','s','h',' ','N',' static const WCHAR face_index_value[] = {'I','n','d','e','x',0}; static const WCHAR face_ntmflags_value[] = {'N','t','m','f','l','a','g','s',0}; static const WCHAR face_version_value[] = {'V','e','r','s','i','o','n',0}; -static const WCHAR face_vertical_value[] = {'V','e','r','t','i','c','a','l',0}; static const WCHAR face_height_value[] = {'H','e','i','g','h','t',0}; static const WCHAR face_width_value[] = {'W','i','d','t','h',0}; static const WCHAR face_size_value[] = {'S','i','z','e',0}; @@ -1394,7 +1393,6 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *bu reg_load_dword(hkey_face, face_index_value, (DWORD*)&face->face_index); reg_load_dword(hkey_face, face_ntmflags_value, &face->ntmFlags); reg_load_dword(hkey_face, face_version_value, (DWORD*)&face->font_version); - reg_load_dword(hkey_face, face_vertical_value, (DWORD*)&face->vertical); reg_load_dword(hkey_face, face_flags_value, (DWORD*)&face->flags); needed = sizeof(face->fs); @@ -1551,7 +1549,6 @@ static void add_face_to_cache(Face *face) reg_save_dword(hkey_face, face_index_value, face->face_index); reg_save_dword(hkey_face, face_ntmflags_value, face->ntmFlags); reg_save_dword(hkey_face, face_version_value, face->font_version); - if (face->vertical) reg_save_dword(hkey_face, face_vertical_value, face->vertical); if (face->flags) reg_save_dword(hkey_face, face_flags_value, face->flags); RegSetValueExW(hkey_face, face_font_sig_value, 0, REG_BINARY, (BYTE*)&face->fs, sizeof(face->fs)); @@ -1741,7 +1738,7 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) } static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, void *font_data_ptr, DWORD font_data_size, - DWORD flags, BOOL vertical ) + DWORD flags ) { Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); My_FT_Bitmap_Size *size = (My_FT_Bitmap_Size *)ft_face->available_sizes; @@ -1758,7 +1755,7 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); if (!face->FullName) face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES ); - if (vertical) + if (flags & ADDFONT_VERTICAL_FONT) face->FullName = prepend_at( face->FullName ); if (file) @@ -1799,7 +1796,6 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, } if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); - face->vertical = vertical; face->flags = flags; face->family = NULL; face->cached_enum_data = NULL; @@ -1813,13 +1809,13 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, } static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr, DWORD font_data_size, - FT_Long face_index, DWORD flags, BOOL vertical ) + FT_Long face_index, DWORD flags ) { Face *face; Family *family; - face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags, vertical ); - family = get_family( ft_face, vertical ); + face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags ); + family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (insert_face_in_family_list( face, family )) { if (flags & ADDFONT_ADD_TO_CACHE) @@ -1949,12 +1945,13 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ return 0; } - AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags, FALSE); + AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags); ++ret; if (FT_HAS_VERTICAL(ft_face)) { - AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags, TRUE); + AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, + flags | ADDFONT_VERTICAL_FONT); ++ret; } @@ -3007,7 +3004,7 @@ static BOOL get_fontdir( const char *unix_name, struct fontdir *fd ) DWORD type; if (!ft_face) return FALSE; - face = create_face( ft_face, 0, unix_name, NULL, 0, 0, FALSE ); + face = create_face( ft_face, 0, unix_name, NULL, 0, 0 ); get_family_names( ft_face, &name, &english_name, FALSE ); pFT_Done_Face( ft_face ); @@ -4783,7 +4780,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) font_link = find_font_link(family->FamilyName); face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { - if(face->vertical == want_vertical && + if(!(face->flags & ADDFONT_VERTICAL_FONT) == !want_vertical && (csi.fs.fsCsb[0] & face->fs.fsCsb[0] || (font_link != NULL && csi.fs.fsCsb[0] & font_link->fs.fsCsb[0]))) { if(face->scalable) @@ -4803,7 +4800,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { - if(face->scalable && face->vertical == want_vertical) { + if(face->scalable && !(face->flags & ADDFONT_VERTICAL_FONT) == !want_vertical) { csi.fs.fsCsb[0] = 0; WARN("just using first face for now\n"); goto found; @@ -4948,7 +4945,7 @@ found_face: ret->strikeout = lf.lfStrikeOut ? 0xff : 0; create_child_font_list(ret); - if (face->vertical) /* We need to try to load the GSUB table */ + if (face->flags & ADDFONT_VERTICAL_FONT) /* We need to try to load the GSUB table */ { int length = get_font_data(ret, GSUB_TAG , 0, NULL, 0); if (length != GDI_ERROR)

1 0

Alexandre Julliard : gdi32: Store the full flags in the face object, and add a flag for fonts added through AddFontResource.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: f90696e813ce636fec5285424bbd152c740ea72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90696e813ce636fec5285424… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 14 15:28:42 2013 +0100 gdi32: Store the full flags in the face object, and add a flag for fonts added through AddFontResource. --- dlls/gdi32/freetype.c | 59 +++++++++++++++++++++++------------------------- 1 files changed, 28 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f90696e813ce636fec528…

1 0

Damjan Jovanovic : qcap: Use the BaseOutputPin's IMemAllocator.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 632d82f4ac0f51a1c2773667d5dccc800bd27dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632d82f4ac0f51a1c2773667d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jan 15 08:46:28 2013 +0200 qcap: Use the BaseOutputPin's IMemAllocator. --- dlls/qcap/v4l.c | 34 +++++----------------------------- 1 files changed, 5 insertions(+), 29 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 2562c48..41cc752 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -684,7 +684,6 @@ HRESULT qcap_driver_run(Capture *capBox, FILTER_STATE *state) *state = State_Running; if (!capBox->iscommitted++) { - IMemAllocator * pAlloc = NULL; ALLOCATOR_PROPERTIES ap, actual; BaseOutputPin *out; @@ -698,16 +697,11 @@ HRESULT qcap_driver_run(Capture *capBox, FILTER_STATE *state) ap.cbPrefix = 0; out = (BaseOutputPin *)capBox->pOut; - hr = IMemInputPin_GetAllocator(out->pMemInputPin, &pAlloc); - if (SUCCEEDED(hr)) - hr = IMemAllocator_SetProperties(pAlloc, &ap, &actual); + hr = IMemAllocator_SetProperties(out->pAllocator, &ap, &actual); if (SUCCEEDED(hr)) - hr = IMemAllocator_Commit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); + hr = IMemAllocator_Commit(out->pAllocator); TRACE("Committing allocator: %x\n", hr); } @@ -765,32 +759,14 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) capBox->thread = 0; if (capBox->iscommitted) { - IMemInputPin *pMem = NULL; - IMemAllocator * pAlloc = NULL; - IPin *pConnect = NULL; + BaseOutputPin *out; HRESULT hr; capBox->iscommitted = 0; - hr = IPin_ConnectedTo(capBox->pOut, &pConnect); - - if (SUCCEEDED(hr)) - hr = IPin_QueryInterface(pConnect, &IID_IMemInputPin, (void **) &pMem); - - if (SUCCEEDED(hr)) - hr = IMemInputPin_GetAllocator(pMem, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_Decommit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); - - if (pMem) - IMemInputPin_Release(pMem); + out = (BaseOutputPin*)capBox->pOut; - if (pConnect) - IPin_Release(pConnect); + hr = IMemAllocator_Decommit(out->pAllocator); if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) WARN("Decommitting allocator: %x\n", hr);

1 0

Damjan Jovanovic : strmbase: Store and use the chosen IMemAllocator instead of getting it from the input pin .
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 7f767bb1957fc5ebdf0f145226d01f4fe3f7d80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f767bb1957fc5ebdf0f14522… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jan 15 08:43:33 2013 +0200 strmbase: Store and use the chosen IMemAllocator instead of getting it from the input pin. --- dlls/strmbase/pin.c | 52 ++++++++++------------------------------------- include/wine/strmbase.h | 1 + 2 files changed, 12 insertions(+), 41 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 936ae0c..750752e 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -402,6 +402,9 @@ ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface) if (!refCount) { FreeMediaType(&This->pin.mtCurrent); + if (This->pAllocator) + IMemAllocator_Release(This->pAllocator); + This->pAllocator = NULL; CoTaskMemFree(This); return 0; } @@ -584,18 +587,10 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSa hr = VFW_E_NOT_CONNECTED; else { - IMemAllocator * pAlloc = NULL; - - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_GetBuffer(pAlloc, ppSample, tStart, tStop, dwFlags); + hr = IMemAllocator_GetBuffer(This->pAllocator, ppSample, tStart, tStop, dwFlags); if (SUCCEEDED(hr)) hr = IMediaSample_SetTime(*ppSample, tStart, tStop); - - if (pAlloc) - IMemAllocator_Release(pAlloc); } return hr; @@ -653,17 +648,7 @@ HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin *This) if (!This->pin.pConnectedTo || !This->pMemInputPin) hr = VFW_E_NOT_CONNECTED; else - { - IMemAllocator * pAlloc = NULL; - - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_Commit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); - } + hr = IMemAllocator_Commit(This->pAllocator); } LeaveCriticalSection(This->pin.pCritSec); @@ -683,17 +668,7 @@ HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This) if (!This->pin.pConnectedTo || !This->pMemInputPin) hr = VFW_E_NOT_CONNECTED; else - { - IMemAllocator * pAlloc = NULL; - - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_Decommit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); - } + hr = IMemAllocator_Decommit(This->pAllocator); } LeaveCriticalSection(This->pin.pCritSec); @@ -714,15 +689,7 @@ HRESULT WINAPI BaseOutputPinImpl_BreakConnect(BaseOutputPin *This) hr = VFW_E_NOT_CONNECTED; else { - IMemAllocator * pAlloc = NULL; - - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_Decommit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); + hr = IMemAllocator_Decommit(This->pAllocator); if (SUCCEEDED(hr)) hr = IPin_Disconnect(This->pin.pConnectedTo); @@ -795,7 +762,9 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pRecei if (SUCCEEDED(hr)) { hr = This->pFuncsTable->pfnDecideAllocator(This, This->pMemInputPin, &pMemAlloc); - if (pMemAlloc) + if (SUCCEEDED(hr)) + This->pAllocator = pMemAlloc; + else if (pMemAlloc) IMemAllocator_Release(pMemAlloc); } @@ -839,6 +808,7 @@ static HRESULT OutputPin_Init(const IPinVtbl *OutputPin_Vtbl, const PIN_INFO * p /* Output pin attributes */ pPinImpl->pMemInputPin = NULL; + pPinImpl->pAllocator = NULL; pPinImpl->pFuncsTable = pBaseOutputFuncsTable; return S_OK; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index da6475d..cbb7d23 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -61,6 +61,7 @@ typedef struct BaseOutputPin /* inheritance C style! */ BasePin pin; IMemInputPin * pMemInputPin; + IMemAllocator * pAllocator; const struct BaseOutputPinFuncTable* pFuncsTable; } BaseOutputPin;

1 0

Ken Thomases : winemac: Implement layered windows: SetLayeredWindowAttributes() and UpdateLayeredWindow().
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: c0d43fb51f2466660bf027b766c501c7ce1c9874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d43fb51f2466660bf027b76… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 14 20:24:02 2013 -0600 winemac: Implement layered windows: SetLayeredWindowAttributes() and UpdateLayeredWindow(). --- dlls/winemac.drv/cocoa_window.h | 5 + dlls/winemac.drv/cocoa_window.m | 90 ++++++++++++++- dlls/winemac.drv/macdrv.h | 6 +- dlls/winemac.drv/macdrv_cocoa.h | 5 + dlls/winemac.drv/surface.c | 17 +++- dlls/winemac.drv/window.c | 232 ++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/winemac.drv.spec | 2 + 7 files changed, 350 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0d43fb51f2466660bf02…

1 0

Ken Thomases : winemac: Implement SetWindowRgn.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 2d4bcc47be73ae8ca78a21d7c36b04685fa78238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4bcc47be73ae8ca78a21d7c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 14 20:23:58 2013 -0600 winemac: Implement SetWindowRgn. --- dlls/winemac.drv/cocoa_window.h | 3 + dlls/winemac.drv/cocoa_window.m | 81 +++++++++++++++++ dlls/winemac.drv/macdrv.h | 7 ++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 172 +++++++++++++++++++++++++++++++++---- dlls/winemac.drv/winemac.drv.spec | 2 + 6 files changed, 250 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d4bcc47be73ae8ca78a2…

1 0

Ken Thomases : winemac: Implement window surface rendering.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 7d6ebfa742eac87c9f5ac5e228c0c5f68e785f9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d6ebfa742eac87c9f5ac5e22… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 14 20:23:55 2013 -0600 winemac: Implement window surface rendering. --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/cocoa_window.h | 3 + dlls/winemac.drv/cocoa_window.m | 82 ++++++++++ dlls/winemac.drv/macdrv.h | 4 + dlls/winemac.drv/macdrv_cocoa.h | 6 + dlls/winemac.drv/surface.c | 340 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/window.c | 107 ++++++++++++- 7 files changed, 542 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d6ebfa742eac87c9f5ac…

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2013