winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
July
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2012
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
718 discussions
Start a n
N
ew thread
Vincent Povirk : gdiplus: Default path gradient center color depends on the constructor.
by Alexandre Julliard
04 Apr '12
04 Apr '12
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
0
0
Huw Davies : wineps: Add a helper to retrieve the font substitution table.
by Alexandre Julliard
04 Apr '12
04 Apr '12
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
0
0
Huw Davies : wineps: Change the printer info list into a standard list.
by Alexandre Julliard
04 Apr '12
04 Apr '12
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
0
0
Huw Davies : wineps: Fix a memory leak.
by Alexandre Julliard
04 Apr '12
04 Apr '12
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
0
0
Huw Davies : wineps: Move some allocations to the process heap.
by Alexandre Julliard
04 Apr '12
04 Apr '12
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
0
0
Jacek Caban : mshtml: Added IHTMLWindow2::onerror semi-stub implementation.
by Alexandre Julliard
04 Apr '12
04 Apr '12
Module: wine Branch: master Commit: e370f4bf3a113d253b9fc85e3bac72975b9a6bb7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e370f4bf3a113d253b9fc85e3…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 4 15:08:38 2012 +0200 mshtml: Added IHTMLWindow2::onerror semi-stub implementation. --- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 12 ++++++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index cf2d808..cfba560 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -68,6 +68,9 @@ static const WCHAR ondragW[] = {'o','n','d','r','a','g',0}; static const WCHAR dragstartW[] = {'d','r','a','g','s','t','a','r','t',0}; static const WCHAR ondragstartW[] = {'o','n','d','r','a','g','s','t','a','r','t',0}; +static const WCHAR errorW[] = {'e','r','r','o','r',0}; +static const WCHAR onerrorW[] = {'o','n','e','r','r','o','r',0}; + static const WCHAR focusW[] = {'f','o','c','u','s',0}; static const WCHAR onfocusW[] = {'o','n','f','o','c','u','s',0}; @@ -160,6 +163,8 @@ static const event_info_t event_info[] = { EVENT_CANCELABLE}, {dragstartW, ondragstartW, EVENTT_MOUSE, DISPID_EVMETH_ONDRAGSTART, EVENT_CANCELABLE}, + {errorW, onerrorW, EVENTT_NONE, DISPID_EVMETH_ONERROR, + 0}, {focusW, onfocusW, EVENTT_HTML, DISPID_EVMETH_ONFOCUS, EVENT_DEFAULTLISTENER}, {keydownW, onkeydownW, EVENTT_KEY, DISPID_EVMETH_ONKEYDOWN, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index b3ff251..70056b3 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -25,6 +25,7 @@ typedef enum { EVENTID_DBLCLICK, EVENTID_DRAG, EVENTID_DRAGSTART, + EVENTID_ERROR, EVENTID_FOCUS, EVENTID_KEYDOWN, EVENTID_KEYUP, diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2bd5d7e..294f551 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -971,15 +971,19 @@ static HRESULT WINAPI HTMLWindow2_get_onhelp(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_put_onerror(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + FIXME("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_ERROR, &v); } static HRESULT WINAPI HTMLWindow2_get_onerror(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_ERROR, p); } static HRESULT WINAPI HTMLWindow2_put_onresize(IHTMLWindow2 *iface, VARIANT v)
1
0
0
0
Piotr Caban : wininet: Only mark elements as deleted in DeleteUrlCacheEntry function.
by Alexandre Julliard
04 Apr '12
04 Apr '12
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
0
0
Aric Stewart : quartz: COM cleanup for DSoundRenderImpl.
by Alexandre Julliard
04 Apr '12
04 Apr '12
Module: wine Branch: master Commit: 5bc4c1591aaa0b79e51c8bb3576804012f4d32ab URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5bc4c1591aaa0b79e51c8bb35…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:28:37 2012 -0500 quartz: COM cleanup for DSoundRenderImpl. --- dlls/quartz/dsoundrender.c | 118 +++++++++++++++++++++++++------------------- 1 files changed, 67 insertions(+), 51 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=5bc4c1591aaa0b79e51c8…
1
0
0
0
Aric Stewart : strmbase: Add IMediaPosition implementation to PosPassThru.
by Alexandre Julliard
04 Apr '12
04 Apr '12
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
0
0
Aric Stewart : strmbase: Fix issues with new quality control implementation in TransformFilter.
by Alexandre Julliard
04 Apr '12
04 Apr '12
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
0
0
← Newer
1
...
57
58
59
60
61
62
63
...
72
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
Results per page:
10
25
50
100
200