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

Vincent Povirk : gdiplus: Default path gradient center color depends on the constructor.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: b228426d8e147ea22ee9f7232066ef4a9c861993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b228426d8e147ea22ee9f7232… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 31 13:14:07 2012 -0500 gdiplus: Default path gradient center color depends on the constructor. --- dlls/gdiplus/brush.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 4bf4928..41b38a0 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -509,7 +509,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect* rect wrap, line); } -static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) +static GpStatus create_path_gradient(GpPath *path, ARGB centercolor, GpPathGradient **grad) { GpRectF bounds; GpStatus stat; @@ -554,7 +554,7 @@ static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) (*grad)->path = path; (*grad)->brush.bt = BrushTypePathGradient; - (*grad)->centercolor = 0xffffffff; + (*grad)->centercolor = centercolor; (*grad)->wrap = WrapModeClamp; (*grad)->gamma = FALSE; /* FIXME: this should be set to the "centroid" of the path by default */ @@ -591,7 +591,7 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, stat = GdipAddPathLine2(path, points, count); if (stat == Ok) - stat = create_path_gradient(path, grad); + stat = create_path_gradient(path, 0xff000000, grad); if (stat != Ok) GdipDeletePath(path); @@ -621,7 +621,7 @@ GpStatus WINGDIPAPI GdipCreatePathGradientI(GDIPCONST GpPoint* points, stat = GdipAddPathLine2I(path, points, count); if (stat == Ok) - stat = create_path_gradient(path, grad); + stat = create_path_gradient(path, 0xff000000, grad); if (stat != Ok) GdipDeletePath(path); @@ -648,7 +648,7 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, if (stat == Ok) { - stat = create_path_gradient(new_path, grad); + stat = create_path_gradient(new_path, 0xffffffff, grad); if (stat != Ok) GdipDeletePath(new_path);

1 0

Huw Davies : wineps: Move some allocations to the process heap.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: e31cfb0be18a33cb6b3b33c47cabb33f9659e3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31cfb0be18a33cb6b3b33c47… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 4 15:03:29 2012 +0100 wineps: Move some allocations to the process heap. --- dlls/wineps.drv/ps.c | 63 +++++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 31 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 8b0d576..27a2cc1 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -221,7 +221,7 @@ DWORD PSDRV_WriteSpool(PHYSDEV dev, LPCSTR lpData, DWORD cch) static INT PSDRV_WriteFeature(PHYSDEV dev, LPCSTR feature, LPCSTR value, LPCSTR invocation) { - char *buf = HeapAlloc( PSDRV_Heap, 0, sizeof(psbeginfeature) + + char *buf = HeapAlloc( GetProcessHeap(), 0, sizeof(psbeginfeature) + strlen(feature) + strlen(value)); sprintf(buf, psbeginfeature, feature, value); @@ -229,7 +229,7 @@ static INT PSDRV_WriteFeature(PHYSDEV dev, LPCSTR feature, LPCSTR value, LPCSTR write_spool( dev, invocation, strlen(invocation) ); write_spool( dev, psendfeature, strlen(psendfeature) ); - HeapFree( PSDRV_Heap, 0, buf ); + HeapFree( GetProcessHeap(), 0, buf ); return 1; } @@ -306,11 +306,12 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) DUPLEX *duplex; int win_duplex; int llx, lly, urx, ury; + int ret, len; TRACE("%s\n", debugstr_w(title)); escaped_title = escape_title(title); - buf = HeapAlloc( PSDRV_Heap, 0, sizeof(psheader) + + buf = HeapAlloc( GetProcessHeap(), 0, sizeof(psheader) + strlen(escaped_title) + 30 ); if(!buf) { WARN("HeapAlloc failed\n"); @@ -328,12 +329,15 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) sprintf(buf, psheader, escaped_title, llx, lly, urx, ury); HeapFree(GetProcessHeap(), 0, escaped_title); - if( write_spool( dev, buf, strlen(buf) ) != strlen(buf) ) { + + len = strlen( buf ); + ret = write_spool( dev, buf, len ); + HeapFree( GetProcessHeap(), 0, buf ); + if (ret != len) + { WARN("WriteSpool error\n"); - HeapFree( PSDRV_Heap, 0, buf ); - return 0; + return 0; } - HeapFree( PSDRV_Heap, 0, buf ); write_spool( dev, psbeginprolog, strlen(psbeginprolog) ); write_spool( dev, psprolog, strlen(psprolog) ); @@ -389,8 +393,9 @@ INT PSDRV_WriteFooter( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); char *buf; + int ret = 1; - buf = HeapAlloc( PSDRV_Heap, 0, sizeof(psfooter) + 100 ); + buf = HeapAlloc( GetProcessHeap(), 0, sizeof(psfooter) + 100 ); if(!buf) { WARN("HeapAlloc failed\n"); return 0; @@ -400,11 +405,10 @@ INT PSDRV_WriteFooter( PHYSDEV dev ) if( write_spool( dev, buf, strlen(buf) ) != strlen(buf) ) { WARN("WriteSpool error\n"); - HeapFree( PSDRV_Heap, 0, buf ); - return 0; + ret = 0; } - HeapFree( PSDRV_Heap, 0, buf ); - return 1; + HeapFree( GetProcessHeap(), 0, buf ); + return ret; } @@ -427,10 +431,11 @@ INT PSDRV_WriteNewPage( PHYSDEV dev ) char *buf; char name[100]; signed int xtrans, ytrans, rotation; + int ret = 1; sprintf(name, "%d", physDev->job.PageNo); - buf = HeapAlloc( PSDRV_Heap, 0, sizeof(psnewpage) + 200 ); + buf = HeapAlloc( GetProcessHeap(), 0, sizeof(psnewpage) + 200 ); if(!buf) { WARN("HeapAlloc failed\n"); return 0; @@ -458,11 +463,10 @@ INT PSDRV_WriteNewPage( PHYSDEV dev ) if( write_spool( dev, buf, strlen(buf) ) != strlen(buf) ) { WARN("WriteSpool error\n"); - HeapFree( PSDRV_Heap, 0, buf ); - return 0; + ret = 0; } - HeapFree( PSDRV_Heap, 0, buf ); - return 1; + HeapFree( GetProcessHeap(), 0, buf ); + return ret; } @@ -525,8 +529,7 @@ BOOL PSDRV_WriteSetFont(PHYSDEV dev, const char *name, matrix size, INT escapeme { char *buf; - buf = HeapAlloc( PSDRV_Heap, 0, sizeof(pssetfont) + - strlen(name) + 40); + buf = HeapAlloc( GetProcessHeap(), 0, sizeof(pssetfont) + strlen(name) + 40 ); if(!buf) { WARN("HeapAlloc failed\n"); @@ -536,7 +539,7 @@ BOOL PSDRV_WriteSetFont(PHYSDEV dev, const char *name, matrix size, INT escapeme sprintf(buf, pssetfont, name, size.xx, size.xy, size.yx, size.yy, -escapement); PSDRV_WriteSpool(dev, buf, strlen(buf)); - HeapFree(PSDRV_Heap, 0, buf); + HeapFree( GetProcessHeap(), 0, buf ); return TRUE; } @@ -678,7 +681,7 @@ BOOL PSDRV_WriteIndexColorSpaceEnd(PHYSDEV dev) static BOOL PSDRV_WriteRGB(PHYSDEV dev, COLORREF *map, int number) { - char *buf = HeapAlloc(PSDRV_Heap, 0, number * 7 + 1), *ptr; + char *buf = HeapAlloc( GetProcessHeap(), 0, number * 7 + 1 ), *ptr; int i; ptr = buf; @@ -689,13 +692,13 @@ static BOOL PSDRV_WriteRGB(PHYSDEV dev, COLORREF *map, int number) ptr += 7; } PSDRV_WriteSpool(dev, buf, number * 7); - HeapFree(PSDRV_Heap, 0, buf); + HeapFree( GetProcessHeap(), 0, buf ); return TRUE; } BOOL PSDRV_WriteRGBQUAD(PHYSDEV dev, const RGBQUAD *rgb, int number) { - char *buf = HeapAlloc(PSDRV_Heap, 0, number * 7 + 1), *ptr; + char *buf = HeapAlloc( GetProcessHeap(), 0, number * 7 + 1 ), *ptr; int i; ptr = buf; @@ -704,7 +707,7 @@ BOOL PSDRV_WriteRGBQUAD(PHYSDEV dev, const RGBQUAD *rgb, int number) ((i & 0x7) == 0x7) || (i == number - 1) ? '\n' : ' '); PSDRV_WriteSpool(dev, buf, ptr - buf); - HeapFree(PSDRV_Heap, 0, buf); + HeapFree( GetProcessHeap(), 0, buf ); return TRUE; } @@ -720,8 +723,7 @@ static BOOL PSDRV_WriteImageDict(PHYSDEV dev, WORD depth, static const char end[] = " /DataSource currentfile /ASCII85Decode filter /RunLengthDecode filter\n>>\n"; static const char endbits[] = " /DataSource <%s>\n>>\n"; - - char *buf = HeapAlloc(PSDRV_Heap, 0, 1000); + char buf[1000]; if (top_down) sprintf(buf, start, widthSrc, heightSrc, @@ -759,7 +761,6 @@ static BOOL PSDRV_WriteImageDict(PHYSDEV dev, WORD depth, PSDRV_WriteSpool(dev, buf, strlen(buf)); } - HeapFree(PSDRV_Heap, 0, buf); return TRUE; } @@ -785,7 +786,7 @@ BOOL PSDRV_WriteImage(PHYSDEV dev, WORD depth, INT xDst, INT yDst, BOOL PSDRV_WriteBytes(PHYSDEV dev, const BYTE *bytes, DWORD number) { - char *buf = HeapAlloc(PSDRV_Heap, 0, number * 3 + 1); + char *buf = HeapAlloc( GetProcessHeap(), 0, number * 3 + 1 ); char *ptr; unsigned int i; @@ -800,7 +801,7 @@ BOOL PSDRV_WriteBytes(PHYSDEV dev, const BYTE *bytes, DWORD number) } } PSDRV_WriteSpool(dev, buf, ptr - buf); - HeapFree(PSDRV_Heap, 0, buf); + HeapFree( GetProcessHeap(), 0, buf ); return TRUE; } @@ -873,7 +874,7 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U w = bmi->bmiHeader.biWidth & ~0x7; h = bmi->bmiHeader.biHeight & ~0x7; - buf = HeapAlloc(PSDRV_Heap, 0, sizeof(do_pattern) + 100); + buf = HeapAlloc( GetProcessHeap(), 0, sizeof(do_pattern) + 100 ); ptr = buf; for(y = h-1; y >= 0; y--) { for(x = 0; x < w/8; x++) { @@ -897,6 +898,6 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U h_mult = (physDev->logPixelsY + 150) / 300; sprintf(buf, do_pattern, w * w_mult, h * h_mult, w * w_mult, h * h_mult, w * w_mult, h * h_mult); PSDRV_WriteSpool(dev, buf, strlen(buf)); - HeapFree(PSDRV_Heap, 0, buf); + HeapFree( GetProcessHeap(), 0, buf ); return TRUE; }

1 0

Vincent Povirk : gdiplus: Set the wrap mode in the path gradient constructor.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: 09b7aed7a23a43fc2bf3a453730181dd1a64f4ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b7aed7a23a43fc2bf3a4537… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 31 13:19:40 2012 -0500 gdiplus: Set the wrap mode in the path gradient constructor. --- dlls/gdiplus/brush.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 41b38a0..359f4973 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -597,6 +597,9 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, GdipDeletePath(path); } + if (stat == Ok) + (*grad)->wrap = wrap; + return stat; } @@ -627,6 +630,9 @@ GpStatus WINGDIPAPI GdipCreatePathGradientI(GDIPCONST GpPoint* points, GdipDeletePath(path); } + if (stat == Ok) + (*grad)->wrap = wrap; + return stat; }

1 0

Huw Davies : wineps: Fix a memory leak.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: a37ee1e2e9fd3bce298134da58b6ff945629d383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37ee1e2e9fd3bce298134da5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 4 15:03:30 2012 +0100 wineps: Fix a memory leak. --- dlls/wineps.drv/driver.c | 20 ++++++++++++-------- dlls/wineps.drv/psdrv.h | 5 ----- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 5ad3b6a..50fb59f 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -179,6 +179,12 @@ void PSDRV_MergeDevmodes(PSDRV_DEVMODEA *dm1, PSDRV_DEVMODEA *dm2, } +typedef struct +{ + PRINTERINFO *pi; + PSDRV_DEVMODEA *dlgdm; +} PSDRV_DLGINFO; + /**************************************************************** * PSDRV_PaperDlgProc * @@ -360,8 +366,8 @@ INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, HPROPSHEETPAGE hpsp[1]; PROPSHEETPAGEW psp; PROPSHEETHEADERW psh; - PSDRV_DLGINFO *di; - PSDRV_DEVMODEA *dlgdm; + PSDRV_DLGINFO di; + PSDRV_DEVMODEA dlgdm; static const WCHAR PAPERW[] = {'P','A','P','E','R','\0'}; static const WCHAR SetupW[] = {'S','e','t','u','p','\0'}; @@ -372,17 +378,15 @@ INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, "CreatePropertySheetPageW"); pPropertySheet = (void*)GetProcAddress(hinstComctl32, "PropertySheetW"); memset(&psp,0,sizeof(psp)); - dlgdm = HeapAlloc( PSDRV_Heap, 0, sizeof(*dlgdm) ); - *dlgdm = *pi->Devmode; - di = HeapAlloc( PSDRV_Heap, 0, sizeof(*di) ); - di->pi = pi; - di->dlgdm = dlgdm; + dlgdm = *pi->Devmode; + di.pi = pi; + di.dlgdm = &dlgdm; psp.dwSize = sizeof(psp); psp.hInstance = PSDRV_hInstance; psp.u.pszTemplate = PAPERW; psp.u2.pszIcon = NULL; psp.pfnDlgProc = PSDRV_PaperDlgProc; - psp.lParam = (LPARAM)di; + psp.lParam = (LPARAM)&di; hpsp[0] = pCreatePropertySheetPage(&psp); memset(&psh, 0, sizeof(psh)); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 093a543..53186c7 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -385,11 +385,6 @@ typedef struct int pathdepth; } PSDRV_PDEVICE; -typedef struct { - PRINTERINFO *pi; - PSDRV_DEVMODEA *dlgdm; -} PSDRV_DLGINFO; - static inline PSDRV_PDEVICE *get_psdrv_dev( PHYSDEV dev ) { return (PSDRV_PDEVICE *)dev;

1 0

Piotr Caban : wininet: Only mark elements as deleted in DeleteUrlCacheEntry function.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: 299f9e6b4770c2b245716f7374959800eb4ada9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=299f9e6b4770c2b245716f737… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 4 09:25:58 2012 +0200 wininet: Only mark elements as deleted in DeleteUrlCacheEntry function. --- dlls/wininet/urlcache.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f5fcf10..fb9e701 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -72,7 +72,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define NEWFILE_SIZE (NEWFILE_NUM_BLOCKS * BLOCKSIZE + ENTRY_START_OFFSET) #define HASHTABLE_URL 0 -#define HASHTABLE_LEAK 1 +#define HASHTABLE_DEL 1 #define HASHTABLE_LOCK 2 #define HASHTABLE_FREE 3 #define HASHTABLE_REDR 5 @@ -838,11 +838,10 @@ static BOOL URLCache_DeleteEntry(LPURLCACHE_HEADER pHeader, CACHEFILE_ENTRY * pE BYTE * AllocationTable = (LPBYTE)pHeader + ALLOCATION_TABLE_OFFSET; /* update allocation table */ - dwStartBlock = ((DWORD)((BYTE *)pEntry - (BYTE *)pHeader)) / BLOCKSIZE; + dwStartBlock = ((DWORD)((BYTE *)pEntry - (BYTE *)pHeader) - ENTRY_START_OFFSET) / BLOCKSIZE; for (dwBlock = dwStartBlock; dwBlock < dwStartBlock + pEntry->dwBlocksUsed; dwBlock++) URLCache_Allocation_BlockFree(AllocationTable, dwBlock); - ZeroMemory(pEntry, pEntry->dwBlocksUsed * BLOCKSIZE); return TRUE; } @@ -1302,8 +1301,7 @@ static void URLCache_HashEntrySetFlags(struct _HASH_ENTRY * pHashEntry, DWORD dw */ static BOOL URLCache_DeleteEntryFromHash(struct _HASH_ENTRY * pHashEntry) { - pHashEntry->dwHashKey = HASHTABLE_FREE; - pHashEntry->dwOffsetEntry = HASHTABLE_FREE; + pHashEntry->dwHashKey = HASHTABLE_DEL; return TRUE; } @@ -1353,7 +1351,7 @@ static DWORD URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, for (i = 0; i < HASHTABLE_BLOCKSIZE; i++) { struct _HASH_ENTRY * pHashElement = &pHashEntry->HashTable[offset + i]; - if (pHashElement->dwHashKey == HASHTABLE_FREE) /* if the slot is free */ + if (pHashElement->dwHashKey==HASHTABLE_FREE || pHashElement->dwHashKey==HASHTABLE_DEL) /* if the slot is free */ { pHashElement->dwHashKey = key; pHashElement->dwOffsetEntry = dwOffsetEntry; @@ -1459,7 +1457,7 @@ static BOOL URLCache_EnumHashTableEntries(LPCURLCACHE_HEADER pHeader, const HASH { for (; *index < HASHTABLE_SIZE ; (*index)++) { - if (pHashEntry->HashTable[*index].dwHashKey == HASHTABLE_FREE) + if (pHashEntry->HashTable[*index].dwHashKey==HASHTABLE_FREE || pHashEntry->HashTable[*index].dwHashKey==HASHTABLE_DEL) continue; *ppHashEntry = &pHashEntry->HashTable[*index];

1 0

Huw Davies : wineps: Change the printer info list into a standard list.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: a2e6c7340d6059d394dcbeff3859384054a3513f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e6c7340d6059d394dcbeff3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 4 15:03:31 2012 +0100 wineps: Change the printer info list into a standard list. --- dlls/wineps.drv/init.c | 24 ++++++++++-------------- dlls/wineps.drv/psdrv.h | 5 +++-- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 84e4086..7e4ca51 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -530,15 +530,15 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) } } +static struct list printer_list = LIST_INIT( printer_list ); /********************************************************************** * PSDRV_FindPrinterInfo */ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) { - static PRINTERINFO *PSDRV_PrinterList; DWORD type = REG_BINARY, needed, res, dwPaperSize; - PRINTERINFO *pi = PSDRV_PrinterList, **last = &PSDRV_PrinterList; + PRINTERINFO *pi; FONTNAME *font; const AFM *afm; HANDLE hPrinter = 0; @@ -551,17 +551,14 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) TRACE("'%s'\n", debugstr_w(name)); - /* - * If this loop completes, last will point to the 'next' element of the - * final PRINTERINFO in the list - */ - for( ; pi; last = &pi->next, pi = pi->next) - if(!strcmpW(pi->friendly_name, name)) - return pi; + LIST_FOR_EACH_ENTRY( pi, &printer_list, PRINTERINFO, entry ) + { + if (!strcmpW( pi->friendly_name, name )) + return pi; + } - pi = *last = HeapAlloc( PSDRV_Heap, HEAP_ZERO_MEMORY, sizeof(*pi) ); - if (pi == NULL) - return NULL; + pi = HeapAlloc( PSDRV_Heap, HEAP_ZERO_MEMORY, sizeof(*pi) ); + if (pi == NULL) return NULL; if (!(pi->friendly_name = HeapAlloc( PSDRV_Heap, 0, (strlenW(name)+1)*sizeof(WCHAR) ))) goto fail; strcpyW( pi->friendly_name, name ); @@ -775,7 +772,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) goto cleanup; } - pi->next = NULL; pi->Fonts = NULL; for(font = pi->ppd->InstalledFonts; font; font = font->next) { @@ -795,6 +791,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) } HeapFree( GetProcessHeap(), 0, nameA ); if (ppd) unlink(ppd); + list_add_head( &printer_list, &pi->entry ); return pi; closeprinter: @@ -808,7 +805,6 @@ fail: HeapFree(PSDRV_Heap, 0, pi); HeapFree( GetProcessHeap(), 0, nameA ); if (ppd) unlink(ppd); - *last = NULL; return NULL; } diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 53186c7..df86c70 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -241,14 +241,15 @@ numInstalledOptions of OPTIONs } PSDRV_DEVMODEA; -typedef struct _tagPI { +typedef struct +{ + struct list entry; WCHAR *friendly_name; PPD *ppd; PSDRV_DEVMODEA *Devmode; FONTFAMILY *Fonts; PPRINTER_ENUM_VALUESA FontSubTable; DWORD FontSubTableSize; - struct _tagPI *next; } PRINTERINFO; typedef struct {

1 0

Huw Davies : wineps: Add a helper to retrieve the font substitution table.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: 28bf93561ddb3778b1b6b1dc35b5e8416a7bce19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28bf93561ddb3778b1b6b1dc3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 4 15:03:32 2012 +0100 wineps: Add a helper to retrieve the font substitution table. --- dlls/wineps.drv/init.c | 55 +++++++++++++++++++++++------------------------ 1 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 7e4ca51..0c06ecb 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -530,6 +530,31 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) } } +static PRINTER_ENUM_VALUESA *load_font_sub_table( HANDLE printer, DWORD *num_entries ) +{ + DWORD res, needed, num; + PRINTER_ENUM_VALUESA *table = NULL; + static const char fontsubkey[] = "PrinterDriverData\\FontSubTable"; + + *num_entries = 0; + + res = EnumPrinterDataExA( printer, fontsubkey, NULL, 0, &needed, &num ); + if (res != ERROR_MORE_DATA) return NULL; + + table = HeapAlloc( PSDRV_Heap, 0, needed ); + if (!table) return NULL; + + res = EnumPrinterDataExA( printer, fontsubkey, (LPBYTE)table, needed, &needed, &num ); + if (res != ERROR_SUCCESS) + { + HeapFree( PSDRV_Heap, 0, table ); + return NULL; + } + + *num_entries = num; + return table; +} + static struct list printer_list = LIST_INIT( printer_list ); /********************************************************************** @@ -742,35 +767,9 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) pi->Devmode->dmPublic.dmDuplex = DMDUP_SIMPLEX; } - res = EnumPrinterDataExA (hPrinter, "PrinterDriverData\\FontSubTable", NULL, - 0, &needed, &pi->FontSubTableSize); - if (res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND) { - TRACE ("No 'FontSubTable' for printer '%s'\n", debugstr_w(name)); - } - else if (res == ERROR_MORE_DATA) { - pi->FontSubTable = HeapAlloc (PSDRV_Heap, 0, needed); - if (pi->FontSubTable == NULL) { - ERR ("Failed to allocate %i bytes from heap\n", needed); - goto closeprinter; - } - - res = EnumPrinterDataExA (hPrinter, "PrinterDriverData\\FontSubTable", - (LPBYTE) pi->FontSubTable, needed, &needed, - &pi->FontSubTableSize); - if (res != ERROR_SUCCESS) { - ERR ("EnumPrinterDataExA returned %i\n", res); - goto closeprinter; - } - } - else { - ERR("EnumPrinterDataExA returned %i\n", res); - goto closeprinter; - } + pi->FontSubTable = load_font_sub_table( hPrinter, &pi->FontSubTableSize ); - if (ClosePrinter (hPrinter) == 0) { - ERR ("ClosePrinter failed with code %i\n", GetLastError ()); - goto cleanup; - } + ClosePrinter( hPrinter ); pi->Fonts = NULL;

1 0

Aric Stewart : strmbase: Add IMediaPosition implementation to PosPassThru.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: 51e3834bfb8c9d4718f0bacd3992a4f42f595427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e3834bfb8c9d4718f0bacd3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:29:51 2012 -0500 strmbase: Add IMediaPosition implementation to PosPassThru. --- dlls/quartz/tests/dsoundrender.c | 2 +- dlls/quartz/tests/videorenderer.c | 4 +- dlls/strmbase/pospass.c | 334 ++++++++++++++++++++++++++++++++++--- dlls/strmbase/renderer.c | 2 +- dlls/winegstreamer/gsttffilter.c | 2 +- dlls/wineqtdecoder/qtvdecoder.c | 2 +- 6 files changed, 320 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51e3834bfb8c9d4718f0b…

1 0

Jacek Caban : mshtml: Use helper for IHTMLStyle::get_height implementation.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: 9529fdb94f28004fc3f026d0e7e181ea7619f01f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9529fdb94f28004fc3f026d0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 4 10:30:59 2012 +0200 mshtml: Use helper for IHTMLStyle::get_height implementation. --- dlls/mshtml/htmlstyle.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 68a2c6b..e23cd65 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2001,18 +2001,10 @@ static HRESULT WINAPI HTMLStyle_put_height(IHTMLStyle *iface, VARIANT v) static HRESULT WINAPI HTMLStyle_get_height(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - BSTR ret; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - hres = get_style_attr(This, STYLEID_HEIGHT, &ret); - if(FAILED(hres)) - return hres; - - V_VT(p) = VT_BSTR; - V_BSTR(p) = ret; - return S_OK; + return get_nsstyle_attr_var(This->nsstyle, STYLEID_HEIGHT, p, 0); } static HRESULT WINAPI HTMLStyle_put_styleFloat(IHTMLStyle *iface, BSTR v)

1 0

Aric Stewart : strmbase: Fix issues with new quality control implementation in TransformFilter.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: 109ec4bbabc2c4fe04a38e450ec60e4c2184a23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=109ec4bbabc2c4fe04a38e450… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:27:47 2012 -0500 strmbase: Fix issues with new quality control implementation in TransformFilter. --- dlls/strmbase/transform.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 2a51576..f970527 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -235,6 +235,7 @@ static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* p ERR("Cannot create output pin (%x)\n", hr); else { QualityControlImpl_Create( pTransformFilter->ppPins[0], &pTransformFilter->filter.IBaseFilter_iface, &pTransformFilter->qcimpl); + pTransformFilter->qcimpl->IQualityControl_iface.lpVtbl = &TransformFilter_QualityControl_Vtbl; } } if (FAILED(hr)) @@ -404,7 +405,7 @@ HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStar HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *sender, Quality qm) { - return QualityControlImpl_Notify((IQualityControl*)&iface->qcimpl, sender, qm); + return QualityControlImpl_Notify((IQualityControl*)iface->qcimpl, sender, qm); } /** IBaseFilter implementation **/

1 0