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
Piotr Caban : msvcrt: Rewrite asctime function.
by Alexandre Julliard
11 Apr '12
11 Apr '12
Module: wine Branch: master Commit: 0f7c834bd1cad6cf568d1fa758e956615ac68ad8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0f7c834bd1cad6cf568d1fa75…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 11 15:21:32 2012 +0200 msvcrt: Rewrite asctime function. --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/time.c | 68 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/time.c | 74 +++++++++++++++++++++++++++++----------------- 3 files changed, 116 insertions(+), 27 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 6103c1e..26a1177 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -895,6 +895,7 @@ int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist ); int __cdecl MSVCRT__snwprintf(MSVCRT_wchar_t*, unsigned int, const MSVCRT_wchar_t*, ...); int __cdecl MSVCRT_sprintf(char*,const char*,...); +int __cdecl MSVCRT__snprintf(char*,unsigned int,const char*,...); int __cdecl MSVCRT__scprintf(const char*,...); int __cdecl MSVCRT_raise(int sig); diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index a7790d5..16f8b9c 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -48,6 +48,7 @@ static int* (__cdecl *p__daylight)(void); static int* (__cdecl *p___p__daylight)(void); static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); static size_t (__cdecl *p_wcsftime)(wchar_t *, size_t, const wchar_t *, const struct tm *); +static char* (__cdecl *p_asctime)(const struct tm *); static void init(void) { @@ -65,6 +66,7 @@ static void init(void) p___p__daylight = (void*)GetProcAddress(hmod, "__p__daylight"); p_strftime = (void*)GetProcAddress(hmod, "strftime"); p_wcsftime = (void*)GetProcAddress(hmod, "wcsftime"); + p_asctime = (void*)GetProcAddress(hmod, "asctime"); } static int get_test_year(time_t *start) @@ -612,6 +614,71 @@ todo_wine ok(strcmp(bufA, buf) == 0, "expected %s, got %s\n", bufA, buf); } +static void test_asctime(void) +{ + struct tm* gmt_tm; + time_t gmt; + char *ret; + + if(!p_asctime || !p_gmtime) + { + win_skip("asctime or gmtime is not available\n"); + return; + } + + gmt = 0; + gmt_tm = p_gmtime(&gmt); + ret = p_asctime(gmt_tm); + ok(!strcmp(ret, "Thu Jan 01 00:00:00 1970\n"), "asctime retunred %s\n", ret); + + gmt = 312433121; + gmt_tm = p_gmtime(&gmt); + ret = p_asctime(gmt_tm); + ok(!strcmp(ret, "Mon Nov 26 02:58:41 1979\n"), "asctime retunred %s\n", ret); + + /* Week day is only checked if it's in 0..6 range */ + gmt_tm->tm_wday = 3; + ret = p_asctime(gmt_tm); + ok(!strcmp(ret, "Wed Nov 26 02:58:41 1979\n"), "asctime returned %s\n", ret); + + errno = 0xdeadbeef; + gmt_tm->tm_wday = 7; + ret = p_asctime(gmt_tm); + ok(!ret || broken(!ret[0]), "asctime returned %s\n", ret); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + + /* Year day is ignored */ + gmt_tm->tm_wday = 3; + gmt_tm->tm_yday = 1300; + ret = p_asctime(gmt_tm); + ok(!strcmp(ret, "Wed Nov 26 02:58:41 1979\n"), "asctime returned %s\n", ret); + + /* Dates that can't be displayed using 26 characters are broken */ + gmt_tm->tm_mday = 28; + gmt_tm->tm_year = 8100; + ret = p_asctime(gmt_tm); + ok(!strcmp(ret, "Wed Nov 28 02:58:41 :000\n"), "asctime returned %s\n", ret); + + gmt_tm->tm_year = 264100; + ret = p_asctime(gmt_tm); + ok(!strcmp(ret, "Wed Nov 28 02:58:41 :000\n"), "asctime returned %s\n", ret); + + /* asctime works from year 1900 */ + errno = 0xdeadbeef; + gmt_tm->tm_year = -1; + ret = p_asctime(gmt_tm); + ok(!ret || broken(!strcmp(ret, "Wed Nov 28 02:58:41 190/\n")), "asctime returned %s\n", ret); + ok(errno==EINVAL || broken(errno == 0xdeadbeef), "errno = %d\n", errno); + + errno = 0xdeadbeef; + gmt_tm->tm_mon = 1; + gmt_tm->tm_mday = 30; + gmt_tm->tm_year = 79; + ret = p_asctime(gmt_tm); + ok(!ret || broken(!strcmp(ret, "Wed Feb 30 02:58:41 1979\n")), "asctime returned %s\n", ret); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); +} + START_TEST(time) { init(); @@ -628,4 +695,5 @@ START_TEST(time) test_localtime32_s(); test_localtime64_s(); test_daylight(); + test_asctime(); } diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index f9de5c5..90dc790 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -877,30 +877,46 @@ MSVCRT_size_t CDECL MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, return len; } +static char* asctime_buf(char *buf, const struct MSVCRT_tm *mstm) +{ + static const char wday[7][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; + static const char month[12][4] = {"Jan", "Feb", "Mar", "Apr", "May", + "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; + + if (mstm->tm_sec<0 || mstm->tm_sec>59 + || mstm->tm_min<0 || mstm->tm_min>59 + || mstm->tm_hour<0 || mstm->tm_hour>23 + || mstm->tm_mon<0 || mstm->tm_mon>11 + || mstm->tm_wday<0 || mstm->tm_wday>6 + || mstm->tm_year<0 || mstm->tm_mday<0 + || mstm->tm_mday>MonthLengths[IsLeapYear(1900+mstm->tm_year)][mstm->tm_mon]) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return NULL; + } + + MSVCRT__snprintf(buf, 26, "%s %s %02d %02d:%02d:%02d %c%03d\n", wday[mstm->tm_wday], + month[mstm->tm_mon], mstm->tm_mday, mstm->tm_hour, mstm->tm_min, + mstm->tm_sec, '1'+(mstm->tm_year+900)/1000, (900+mstm->tm_year)%1000); + return buf; +} + /********************************************************************* * asctime (MSVCRT.@) */ char * CDECL MSVCRT_asctime(const struct MSVCRT_tm *mstm) { - char bufferA[30]; - WCHAR bufferW[30]; - thread_data_t *data = msvcrt_get_thread_data(); - struct tm tm; - - msvcrt_tm_to_unix( &tm, mstm ); - if (!data->asctime_buffer) - data->asctime_buffer = MSVCRT_malloc( 30 ); /* ought to be enough */ + /* asctime returns date in format that always has exactly 26 characters */ + if (!data->asctime_buffer) { + data->asctime_buffer = MSVCRT_malloc(26); + if (!data->asctime_buffer) { + *MSVCRT__errno() = MSVCRT_ENOMEM; + return NULL; + } + } -#ifdef HAVE_ASCTIME_R - asctime_r( &tm, bufferA ); -#else - strcpy( bufferA, asctime(&tm) ); -#endif - MultiByteToWideChar( CP_UNIXCP, 0, bufferA, -1, bufferW, 30 ); - WideCharToMultiByte( CP_ACP, 0, bufferW, -1, data->asctime_buffer, 30, NULL, NULL ); - return data->asctime_buffer; + return asctime_buf(data->asctime_buffer, mstm); } /********************************************************************* @@ -908,23 +924,27 @@ char * CDECL MSVCRT_asctime(const struct MSVCRT_tm *mstm) */ int CDECL MSVCRT_asctime_s(char* time, MSVCRT_size_t size, const struct MSVCRT_tm *mstm) { - char* asc; - unsigned int len; - - if (!MSVCRT_CHECK_PMT(time != NULL) || !MSVCRT_CHECK_PMT(mstm != NULL)) { + if (!MSVCRT_CHECK_PMT(time != NULL) + || !MSVCRT_CHECK_PMT(mstm != NULL) + || !MSVCRT_CHECK_PMT(size >= 26)) { + if (time && size) + time[0] = 0; *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } - asc = MSVCRT_asctime(mstm); - len = strlen(asc) + 1; - - if(!MSVCRT_CHECK_PMT(size >= len)) { - *MSVCRT__errno() = MSVCRT_ERANGE; - return MSVCRT_ERANGE; + if (!MSVCRT_CHECK_PMT(mstm->tm_sec>=0) || !MSVCRT_CHECK_PMT(mstm->tm_sec<60) + || !MSVCRT_CHECK_PMT(mstm->tm_min>=0) || !MSVCRT_CHECK_PMT(mstm->tm_min<60) + || !MSVCRT_CHECK_PMT(mstm->tm_hour>=0) || !MSVCRT_CHECK_PMT(mstm->tm_hour<24) + || !MSVCRT_CHECK_PMT(mstm->tm_mon>=0) || !MSVCRT_CHECK_PMT(mstm->tm_mon<12) + || !MSVCRT_CHECK_PMT(mstm->tm_wday>=0) || !MSVCRT_CHECK_PMT(mstm->tm_wday<7) + || !MSVCRT_CHECK_PMT(mstm->tm_year>=0) || !MSVCRT_CHECK_PMT(mstm->tm_mday>=0) + || !MSVCRT_CHECK_PMT(mstm->tm_mday <= MonthLengths[IsLeapYear(1900+mstm->tm_year)][mstm->tm_mon])) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; } - strcpy(time, asc); + asctime_buf(time, mstm); return 0; }
1
0
0
0
Huw Davies : wordpad: Don' t quit if the user cancels the save-as dialog when being prompted to save changes .
by Alexandre Julliard
11 Apr '12
11 Apr '12
Module: wine Branch: master Commit: 965388465d7d358a4cf08d5470485ac370c2f840 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=965388465d7d358a4cf08d547…
Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 13:50:57 2012 +0100 wordpad: Don't quit if the user cancels the save-as dialog when being prompted to save changes. --- programs/wordpad/wordpad.c | 30 +++++++++++------------------- 1 files changed, 11 insertions(+), 19 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index f47aedd..24d956a 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -835,7 +835,7 @@ static void ShowWriteError(DWORD Code) MessageBoxW(hMainWnd, Message, wszAppTitle, MB_ICONEXCLAMATION | MB_OK); } -static void DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) +static BOOL DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) { HANDLE hFile; EDITSTREAM stream; @@ -847,7 +847,7 @@ static void DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) if(hFile == INVALID_HANDLE_VALUE) { ShowWriteError(GetLastError()); - return; + return FALSE; } if(format == (SF_TEXT | SF_UNICODE)) @@ -859,7 +859,7 @@ static void DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) if(writeOut != sizeof(unicode)) { CloseHandle(hFile); - return; + return FALSE; } } @@ -879,16 +879,18 @@ static void DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) gt.codepage = 1200; if(SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)>, 0)) - return; + return FALSE; } lstrcpyW(wszFileName, wszSaveFileName); set_caption(wszFileName); SendMessageW(hEditorWnd, EM_SETMODIFY, FALSE, 0); set_fileformat(format); + + return TRUE; } -static void DialogSaveFile(void) +static BOOL DialogSaveFile(void) { OPENFILENAMEW sfn; @@ -912,19 +914,11 @@ static void DialogSaveFile(void) { if(MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SAVE_LOSEFORMATTING), wszAppTitle, MB_YESNO | MB_ICONEXCLAMATION) != IDYES) - { continue; - } else - { - DoSaveFile(sfn.lpstrFile, fileformat_flags(sfn.nFilterIndex-1)); - break; - } - } else - { - DoSaveFile(sfn.lpstrFile, fileformat_flags(sfn.nFilterIndex-1)); - break; } + return DoSaveFile(sfn.lpstrFile, fileformat_flags(sfn.nFilterIndex-1)); } + return FALSE; } static BOOL prompt_save_changes(void) @@ -971,10 +965,8 @@ static BOOL prompt_save_changes(void) case IDYES: if(wszFileName[0]) - DoSaveFile(wszFileName, fileFormat); - else - DialogSaveFile(); - return TRUE; + return DoSaveFile(wszFileName, fileFormat); + return DialogSaveFile(); default: return FALSE;
1
0
0
0
Huw Davies : wineps: Set the printer's devmode using SetPrinter.
by Alexandre Julliard
11 Apr '12
11 Apr '12
Module: wine Branch: master Commit: 43cffa0888d643d77f11eedfd14ad4ebeae8a642 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=43cffa0888d643d77f11eedfd…
Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:20 2012 +0100 wineps: Set the printer's devmode using SetPrinter. --- dlls/wineps.drv/init.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index cc950e3..4af6ca9 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -113,7 +113,6 @@ static const LOGFONTA DefaultLogFont = { DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, "" }; -static const CHAR default_devmodeA[] = "Default DevMode"; static const struct gdi_dc_funcs psdrv_funcs; /********************************************************************* @@ -610,6 +609,14 @@ static PSDRV_DEVMODEA *get_devmode( HANDLE printer, const char *nameA, BOOL *is_ return dm; } +static BOOL set_devmode( HANDLE printer, PSDRV_DEVMODEA *dm ) +{ + PRINTER_INFO_9A info; + info.pDevMode = &dm->dmPublic; + + return SetPrinterA( printer, 9, (BYTE *)&info, 0 ); +} + static struct list printer_list = LIST_INIT( printer_list ); /********************************************************************** @@ -761,8 +768,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) PSDRV_MergeDevmodes(pi->Devmode, &dm, pi); } - SetPrinterDataExA(hPrinter, NULL, default_devmodeA, REG_BINARY, - (LPBYTE)pi->Devmode, sizeof(DefaultDevmode)); + set_devmode( hPrinter, pi->Devmode ); } if(pi->ppd->DefaultPageSize) { /* We'll let the ppd override the devmode */
1
0
0
0
Huw Davies : wineps: Retrieve the printer's devmode using GetPrinter.
by Alexandre Julliard
11 Apr '12
11 Apr '12
Module: wine Branch: master Commit: a7f42d32810d7720b9a451daad070bdebac3792c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a7f42d32810d7720b9a451daa…
Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:19 2012 +0100 wineps: Retrieve the printer's devmode using GetPrinter. --- dlls/wineps.drv/init.c | 80 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 58 insertions(+), 22 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index affbcbc..cc950e3 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -555,6 +555,61 @@ static PRINTER_ENUM_VALUESA *load_font_sub_table( HANDLE printer, DWORD *num_ent return table; } +static PSDRV_DEVMODEA *get_printer_devmode( HANDLE printer ) +{ + DWORD needed, dm_size; + BOOL res; + PRINTER_INFO_9A *info; + PSDRV_DEVMODEA *dm; + + GetPrinterA( printer, 9, NULL, 0, &needed ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; + + info = HeapAlloc( PSDRV_Heap, 0, needed ); + res = GetPrinterA( printer, 9, (BYTE *)info, needed, &needed ); + if (!res || !info->pDevMode) + { + HeapFree( PSDRV_Heap, 0, info ); + return NULL; + } + + /* sanity check the sizes */ + dm_size = info->pDevMode->dmSize + info->pDevMode->dmDriverExtra; + if ((char *)info->pDevMode - (char *)info + dm_size > needed) + { + HeapFree( PSDRV_Heap, 0, info ); + return NULL; + } + + dm = (PSDRV_DEVMODEA*)info; + memmove( dm, info->pDevMode, dm_size ); + return dm; +} + +static PSDRV_DEVMODEA *get_devmode( HANDLE printer, const char *nameA, BOOL *is_default ) +{ + PSDRV_DEVMODEA *dm = get_printer_devmode( printer ); + + *is_default = FALSE; + + if (dm && dm->dmPublic.dmSize + dm->dmPublic.dmDriverExtra >= sizeof(DefaultDevmode)) + { + TRACE( "Retrieved devmode from winspool\n" ); + return dm; + } + HeapFree( PSDRV_Heap, 0, dm ); + + TRACE( "Using default devmode\n" ); + dm = HeapAlloc( PSDRV_Heap, 0, sizeof(DefaultDevmode) ); + if (dm) + { + *dm = DefaultDevmode; + lstrcpynA((LPSTR)dm->dmPublic.dmDeviceName, nameA, CCHDEVICENAME); + *is_default = TRUE; + } + return dm; +} + static struct list printer_list = LIST_INIT( printer_list ); /********************************************************************** @@ -562,7 +617,7 @@ static struct list printer_list = LIST_INIT( printer_list ); */ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) { - DWORD type = REG_BINARY, needed, res, dwPaperSize; + DWORD needed, res, dwPaperSize; PRINTERINFO *pi; FONTNAME *font; const AFM *afm; @@ -597,27 +652,8 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) nameA = HeapAlloc( GetProcessHeap(), 0, len ); WideCharToMultiByte( CP_ACP, 0, name, -1, nameA, len, NULL, NULL ); - needed = 0; - res = GetPrinterDataExA(hPrinter, NULL, default_devmodeA, &type, NULL, 0, &needed); - - if (needed < sizeof(DefaultDevmode)) { - pi->Devmode = HeapAlloc( PSDRV_Heap, 0, sizeof(DefaultDevmode) ); - if (pi->Devmode == NULL) - goto closeprinter; - - *pi->Devmode = DefaultDevmode; - lstrcpynA((LPSTR)pi->Devmode->dmPublic.dmDeviceName, nameA, CCHDEVICENAME); - using_default_devmode = TRUE; - } - else { - pi->Devmode = HeapAlloc( PSDRV_Heap, 0, needed ); - if (pi->Devmode == NULL) - goto closeprinter; - - GetPrinterDataExA(hPrinter, NULL, default_devmodeA, &type, (LPBYTE)pi->Devmode, needed, &needed); - } - - + pi->Devmode = get_devmode( hPrinter, nameA, &using_default_devmode ); + if (!pi->Devmode) goto closeprinter; #ifdef SONAME_LIBCUPS if (cupshandle != (void*)-1) {
1
0
0
0
Huw Davies : wineps: Remove the installed options list as it' s never populated.
by Alexandre Julliard
11 Apr '12
11 Apr '12
Module: wine Branch: master Commit: 7b3ae93578602c90be2c6df26468707942cf3ba1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7b3ae93578602c90be2c6df26…
Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:18 2012 +0100 wineps: Remove the installed options list as it's never populated. --- dlls/wineps.drv/ppd.c | 11 ----------- dlls/wineps.drv/psdrv.h | 16 ---------------- 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index e84f46f..c4dff21 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -969,8 +969,6 @@ PPD *PSDRV_ParsePPD(char *fname) PAGESIZE *page; CONSTRAINT *con; INPUTSLOT *slot; - OPTION *option; - OPTIONENTRY *optionEntry; LIST_FOR_EACH_ENTRY( fn, &ppd->InstalledFonts, FONTNAME, entry ) TRACE("'%s'\n", fn->Name); @@ -991,15 +989,6 @@ PPD *PSDRV_ParsePPD(char *fname) TRACE("CONSTRAINTS@ %s %s %s %s\n", con->Feature1, con->Value1, con->Feature2, con->Value2); - for(option = ppd->InstalledOptions; option; option = option->next) { - TRACE("OPTION: %s %s %s\n", option->OptionName, - option->FullName, option->DefaultOption); - for(optionEntry = option->Options; optionEntry; - optionEntry = optionEntry->next) - TRACE("\tOPTIONENTRY: %s %s %s\n", optionEntry->Name, - optionEntry->FullName, optionEntry->InvocationString); - } - LIST_FOR_EACH_ENTRY( slot, &ppd->InputSlots, INPUTSLOT, entry ) TRACE("INPUTSLOTS '%s' Name '%s' (%d) Invocation '%s'\n", debugstr_a(slot->Name), slot->FullName, slot->WinBin, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 05545dd..23fb28e 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -153,21 +153,6 @@ typedef struct _BANDINFOSTRUCT RECT GraphicsRect; } BANDINFOSTRUCT, *PBANDINFOSTRUCT; -typedef struct _tagOPTIONENTRY { - char *Name; /* eg "True" */ - char *FullName; /* eg "Installed" */ - char *InvocationString; /* Often NULL */ - struct _tagOPTIONENTRY *next; -} OPTIONENTRY; - -typedef struct _tagOPTION { /* Treat bool as a special case of pickone */ - char *OptionName; /* eg "*Option1" */ - char *FullName; /* eg "Envelope Feeder" */ - char *DefaultOption; /* eg "False" */ - OPTIONENTRY *Options; - struct _tagOPTION *next; -} OPTION; - typedef struct { struct list entry; @@ -220,7 +205,6 @@ typedef struct { struct list InstalledFonts; struct list PageSizes; PAGESIZE *DefaultPageSize; - OPTION *InstalledOptions; struct list Constraints; struct list InputSlots; RASTERIZEROPTION TTRasterizer;
1
0
0
0
Huw Davies : wineps: Move the duplex list to a standard list.
by Alexandre Julliard
11 Apr '12
11 Apr '12
Module: wine Branch: master Commit: 5a0129c0d24122db0b2bc549c30dccb592ac15fb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5a0129c0d24122db0b2bc549c…
Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:17 2012 +0100 wineps: Move the duplex list to a standard list. --- dlls/wineps.drv/driver.c | 25 +++++++++++++++++-------- dlls/wineps.drv/ppd.c | 40 +++++++++++++++++++++------------------- dlls/wineps.drv/ps.c | 3 ++- dlls/wineps.drv/psdrv.h | 7 ++++--- 4 files changed, 44 insertions(+), 31 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 7ff117f..83597c3 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -195,7 +195,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { PSDRV_DLGINFO *di; - int i, Cursel = 0; + int i, Cursel; PAGESIZE *ps; DUPLEX *duplex; @@ -204,7 +204,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, di = (PSDRV_DLGINFO*)((PROPSHEETPAGEA*)lParam)->lParam; SetWindowLongPtrW(hwnd, DWLP_USER, (LONG_PTR)di); - i = 0; + i = Cursel = 0; LIST_FOR_EACH_ENTRY(ps, &di->pi->ppd->PageSizes, PAGESIZE, entry) { SendDlgItemMessageA(hwnd, IDD_PAPERS, LB_INSERTSTRING, i, (LPARAM)ps->FullName); @@ -219,16 +219,21 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, DMORIENT_PORTRAIT ? IDD_ORIENT_PORTRAIT : IDD_ORIENT_LANDSCAPE); - if(!di->pi->ppd->Duplexes) { + if (list_empty( &di->pi->ppd->Duplexes )) + { ShowWindow(GetDlgItem(hwnd, IDD_DUPLEX), SW_HIDE); ShowWindow(GetDlgItem(hwnd, IDD_DUPLEX_NAME), SW_HIDE); - } else { - Cursel = 0; - for(duplex = di->pi->ppd->Duplexes, i = 0; duplex; duplex = duplex->next, i++) { + } + else + { + i = Cursel = 0; + LIST_FOR_EACH_ENTRY( duplex, &di->pi->ppd->Duplexes, DUPLEX, entry ) + { SendDlgItemMessageA(hwnd, IDD_DUPLEX, CB_INSERTSTRING, i, (LPARAM)(duplex->FullName ? duplex->FullName : duplex->Name)); if(di->pi->Devmode->dmPublic.dmDuplex == duplex->WinDuplex) Cursel = i; + i++; } SendDlgItemMessageA(hwnd, IDD_DUPLEX, CB_SETCURSEL, Cursel, 0); } @@ -261,8 +266,12 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, case IDD_DUPLEX: if(HIWORD(wParam) == CBN_SELCHANGE) { Cursel = SendDlgItemMessageA(hwnd, LOWORD(wParam), CB_GETCURSEL, 0, 0); - for(i = 0, duplex = di->pi->ppd->Duplexes; i < Cursel; i++, duplex = duplex->next) - ; + i = 0; + LIST_FOR_EACH_ENTRY( duplex, &di->pi->ppd->Duplexes, DUPLEX, entry ) + { + if (i >= Cursel) break; + i++; + } TRACE("Setting duplex to item %d Winduplex = %d\n", Cursel, duplex->WinDuplex); di->dlgdm->dmPublic.dmDuplex = duplex->WinDuplex; SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0); diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 508f141..e84f46f 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -632,6 +632,7 @@ PPD *PSDRV_ParsePPD(char *fname) list_init( &ppd->PageSizes ); list_init( &ppd->Constraints ); list_init( &ppd->InputSlots ); + list_init( &ppd->Duplexes ); /* * The Windows PostScript drivers create the following "virtual bin" for @@ -869,27 +870,24 @@ PPD *PSDRV_ParsePPD(char *fname) TRACE("*TTRasterizer = %d\n", ppd->TTRasterizer); } - else if(!strcmp("*Duplex", tuple.key)) { - DUPLEX **duplex; - for(duplex = &ppd->Duplexes; *duplex; duplex = &(*duplex)->next) - ; - *duplex = HeapAlloc(GetProcessHeap(), 0, sizeof(**duplex)); - (*duplex)->Name = tuple.option; - (*duplex)->FullName = tuple.opttrans; - (*duplex)->InvocationString = tuple.value; - (*duplex)->next = NULL; + else if(!strcmp("*Duplex", tuple.key)) + { + DUPLEX *duplex = HeapAlloc( GetProcessHeap(), 0, sizeof(*duplex) ); + duplex->Name = tuple.option; + duplex->FullName = tuple.opttrans; + duplex->InvocationString = tuple.value; if(!strcasecmp("None", tuple.option) || !strcasecmp("False", tuple.option) || !strcasecmp("Simplex", tuple.option)) - (*duplex)->WinDuplex = DMDUP_SIMPLEX; + duplex->WinDuplex = DMDUP_SIMPLEX; else if(!strcasecmp("DuplexNoTumble", tuple.option)) - (*duplex)->WinDuplex = DMDUP_VERTICAL; + duplex->WinDuplex = DMDUP_VERTICAL; else if(!strcasecmp("DuplexTumble", tuple.option)) - (*duplex)->WinDuplex = DMDUP_HORIZONTAL; + duplex->WinDuplex = DMDUP_HORIZONTAL; else if(!strcasecmp("Notcapable", tuple.option)) - (*duplex)->WinDuplex = 0; + duplex->WinDuplex = 0; else { FIXME("Unknown option %s for *Duplex defaulting to simplex\n", tuple.option); - (*duplex)->WinDuplex = DMDUP_SIMPLEX; + duplex->WinDuplex = DMDUP_SIMPLEX; } tuple.option = tuple.opttrans = tuple.value = NULL; } @@ -945,10 +943,13 @@ PPD *PSDRV_ParsePPD(char *fname) } ppd->DefaultDuplex = NULL; - if(default_duplex) { + if (default_duplex) + { DUPLEX *duplex; - for(duplex = ppd->Duplexes; duplex; duplex = duplex->next) { - if(!strcmp(duplex->Name, default_duplex)) { + LIST_FOR_EACH_ENTRY( duplex, &ppd->Duplexes, DUPLEX, entry ) + { + if (!strcmp(duplex->Name, default_duplex)) + { ppd->DefaultDuplex = duplex; TRACE("DefaultDuplex: %s\n", duplex->Name); break; @@ -956,8 +957,9 @@ PPD *PSDRV_ParsePPD(char *fname) } HeapFree(PSDRV_Heap, 0, default_duplex); } - if(!ppd->DefaultDuplex) { - ppd->DefaultDuplex = ppd->Duplexes; + if (!ppd->DefaultDuplex) + { + ppd->DefaultDuplex = LIST_ENTRY( list_head( &ppd->Duplexes ), DUPLEX, entry ); TRACE("Setting DefaultDuplex to first in list\n"); } diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 5db80f1..1e30736 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -372,7 +372,8 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) win_duplex = physDev->Devmode->dmPublic.dmFields & DM_DUPLEX ? physDev->Devmode->dmPublic.dmDuplex : 0; - for(duplex = physDev->pi->ppd->Duplexes; duplex; duplex = duplex->next) { + LIST_FOR_EACH_ENTRY( duplex, &physDev->pi->ppd->Duplexes, DUPLEX, entry ) + { if(duplex->WinDuplex == win_duplex) { if(duplex->InvocationString) { PSDRV_WriteFeature(dev, "*Duplex", duplex->Name, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index e2d3c84..05545dd 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -189,12 +189,13 @@ typedef struct typedef enum _RASTERIZEROPTION {RO_None, RO_Accept68K, RO_Type42, RO_TrueImage} RASTERIZEROPTION; -typedef struct _tagDUPLEX { +typedef struct +{ + struct list entry; char *Name; char *FullName; char *InvocationString; WORD WinDuplex; /* eg DMDUP_SIMPLEX */ - struct _tagDUPLEX *next; } DUPLEX; /* Many Mac OS X based ppd files don't include a *ColorDevice line, so @@ -223,7 +224,7 @@ typedef struct { struct list Constraints; struct list InputSlots; RASTERIZEROPTION TTRasterizer; - DUPLEX *Duplexes; + struct list Duplexes; DUPLEX *DefaultDuplex; } PPD;
1
0
0
0
Huw Davies : wineps: Move the input slot list to a standard list.
by Alexandre Julliard
11 Apr '12
11 Apr '12
Module: wine Branch: master Commit: e6e42c8610edb9603d7054ad216087ce6b096d16 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e6e42c8610edb9603d7054ad2…
Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:16 2012 +0100 wineps: Move the input slot list to a standard list. --- dlls/wineps.drv/driver.c | 38 +++++++++++++++++++++++--------------- dlls/wineps.drv/ppd.c | 20 ++++++++------------ dlls/wineps.drv/ps.c | 2 +- dlls/wineps.drv/psdrv.h | 7 ++++--- 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 50fb59f..7ff117f 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -116,20 +116,21 @@ void PSDRV_MergeDevmodes(PSDRV_DEVMODEA *dm1, PSDRV_DEVMODEA *dm2, TRACE("Changing Copies to %d\n", dm2->dmPublic.u1.s1.dmCopies); } - if(dm2->dmPublic.dmFields & DM_DEFAULTSOURCE) { + if (dm2->dmPublic.dmFields & DM_DEFAULTSOURCE) + { INPUTSLOT *slot; - for(slot = pi->ppd->InputSlots; slot; slot = slot->next) { + LIST_FOR_EACH_ENTRY( slot, &pi->ppd->InputSlots, INPUTSLOT, entry ) if(slot->WinBin == dm2->dmPublic.u1.s1.dmDefaultSource) break; - } - if(slot) { + + if (&slot->entry != &pi->ppd->InputSlots) + { dm1->dmPublic.u1.s1.dmDefaultSource = dm2->dmPublic.u1.s1.dmDefaultSource; TRACE("Changing bin to '%s'\n", slot->FullName); - } else { - TRACE("Trying to change to unsupported bin %d\n", - dm2->dmPublic.u1.s1.dmDefaultSource); } + else + TRACE("Trying to change to unsupported bin %d\n", dm2->dmPublic.u1.s1.dmDefaultSource); } if (dm2->dmPublic.dmFields & DM_DEFAULTSOURCE ) @@ -512,9 +513,12 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP WORD *wp = (WORD *)lpszOutput; int i = 0; - for(slot = pi->ppd->InputSlots; slot; slot = slot->next, i++) - if(lpszOutput != NULL) - *wp++ = slot->WinBin; + LIST_FOR_EACH_ENTRY( slot, &pi->ppd->InputSlots, INPUTSLOT, entry ) + { + i++; + if (lpszOutput != NULL) + *wp++ = slot->WinBin; + } return i; } @@ -524,11 +528,15 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP char *cp = lpszOutput; int i = 0; - for(slot = pi->ppd->InputSlots; slot; slot = slot->next, i++) - if(lpszOutput != NULL) { - lstrcpynA(cp, slot->FullName, 24); - cp += 24; - } + LIST_FOR_EACH_ENTRY( slot, &pi->ppd->InputSlots, INPUTSLOT, entry ) + { + i++; + if (lpszOutput != NULL) + { + lstrcpynA( cp, slot->FullName, 24 ); + cp += 24; + } + } return i; } diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 37c6094..508f141 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -583,23 +583,19 @@ static BOOL parse_resolution(const char *str, SIZE *sz) * PSDRV_AddSlot * */ -static INT PSDRV_AddSlot(PPD *ppd, LPCSTR szName, LPCSTR szFullName, +static BOOL PSDRV_AddSlot(PPD *ppd, LPCSTR szName, LPCSTR szFullName, LPSTR szInvocationString, WORD wWinBin) { - INPUTSLOT *slot, **insert = &ppd->InputSlots; - - while (*insert) - insert = &((*insert)->next); - - slot = *insert = HeapAlloc(PSDRV_Heap, HEAP_ZERO_MEMORY, sizeof(INPUTSLOT)); - if (!slot) return 1; + INPUTSLOT *slot = HeapAlloc( PSDRV_Heap, 0, sizeof(INPUTSLOT) ); + if (!slot) return FALSE; slot->Name = szName; slot->FullName = szFullName; slot->InvocationString = szInvocationString; slot->WinBin = wWinBin; - return 0; + list_add_tail( &ppd->InputSlots, &slot->entry ); + return TRUE; } /*********************************************************************** @@ -635,13 +631,13 @@ PPD *PSDRV_ParsePPD(char *fname) list_init( &ppd->InstalledFonts ); list_init( &ppd->PageSizes ); list_init( &ppd->Constraints ); + list_init( &ppd->InputSlots ); /* * The Windows PostScript drivers create the following "virtual bin" for * every PostScript printer */ - if (PSDRV_AddSlot(ppd, NULL, "Automatically Select", NULL, - DMBIN_FORMSOURCE)) + if (!PSDRV_AddSlot( ppd, NULL, "Automatically Select", NULL, DMBIN_FORMSOURCE )) { HeapFree (PSDRV_Heap, 0, ppd); fclose(fp); @@ -1002,7 +998,7 @@ PPD *PSDRV_ParsePPD(char *fname) optionEntry->FullName, optionEntry->InvocationString); } - for(slot = ppd->InputSlots; slot; slot = slot->next) + LIST_FOR_EACH_ENTRY( slot, &ppd->InputSlots, INPUTSLOT, entry ) TRACE("INPUTSLOTS '%s' Name '%s' (%d) Invocation '%s'\n", debugstr_a(slot->Name), slot->FullName, slot->WinBin, debugstr_a(slot->InvocationString)); diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 27a2cc1..5db80f1 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -350,7 +350,7 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) write_spool(dev, copies_buf, strlen(copies_buf)); } - for(slot = physDev->pi->ppd->InputSlots; slot; slot = slot->next) { + LIST_FOR_EACH_ENTRY( slot, &physDev->pi->ppd->InputSlots, INPUTSLOT, entry ) { if(slot->WinBin == physDev->Devmode->dmPublic.u1.s1.dmDefaultSource) { if(slot->InvocationString) { PSDRV_WriteFeature(dev, "*InputSlot", slot->Name, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index a240f4f..e2d3c84 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -177,12 +177,13 @@ typedef struct char *Value2; } CONSTRAINT; -typedef struct _tagINPUTSLOT { +typedef struct +{ + struct list entry; const char *Name; const char *FullName; char *InvocationString; WORD WinBin; /* eg DMBIN_LOWER */ - struct _tagINPUTSLOT *next; } INPUTSLOT; typedef enum _RASTERIZEROPTION @@ -220,7 +221,7 @@ typedef struct { PAGESIZE *DefaultPageSize; OPTION *InstalledOptions; struct list Constraints; - INPUTSLOT *InputSlots; + struct list InputSlots; RASTERIZEROPTION TTRasterizer; DUPLEX *Duplexes; DUPLEX *DefaultDuplex;
1
0
0
0
Huw Davies : wineps: Move the constraints list to a standard list.
by Alexandre Julliard
11 Apr '12
11 Apr '12
Module: wine Branch: master Commit: 4dfef2ef2d1743e3f47d59f4ed83c1b41d3d1db7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4dfef2ef2d1743e3f47d59f4e…
Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:15 2012 +0100 wineps: Move the constraints list to a standard list. --- dlls/wineps.drv/ppd.c | 19 ++++++++----------- dlls/wineps.drv/psdrv.h | 7 ++++--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 3f2c473..37c6094 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -634,6 +634,7 @@ PPD *PSDRV_ParsePPD(char *fname) list_init( &ppd->InstalledFonts ); list_init( &ppd->PageSizes ); + list_init( &ppd->Constraints ); /* * The Windows PostScript drivers create the following "virtual bin" for @@ -812,23 +813,19 @@ PPD *PSDRV_ParsePPD(char *fname) ppd->LandscapeOrientation); } - else if(!strcmp("*UIConstraints", tuple.key)) { + else if(!strcmp("*UIConstraints", tuple.key)) + { char *start; - CONSTRAINT *con, **insert = &ppd->Constraints; - - while(*insert) - insert = &((*insert)->next); - - con = *insert = HeapAlloc( PSDRV_Heap, HEAP_ZERO_MEMORY, - sizeof(*con) ); + CONSTRAINT *con = HeapAlloc( PSDRV_Heap, 0, sizeof(*con) ); start = tuple.value; - con->Feature1 = PSDRV_PPDGetWord(start, &start); con->Value1 = PSDRV_PPDGetWord(start, &start); con->Feature2 = PSDRV_PPDGetWord(start, &start); con->Value2 = PSDRV_PPDGetWord(start, &start); - } + + list_add_tail( &ppd->Constraints, &con->entry ); + } else if (!strcmp("*InputSlot", tuple.key)) { @@ -992,7 +989,7 @@ PPD *PSDRV_ParsePPD(char *fname) page->PaperDimension->x, page->PaperDimension->y); } - for(con = ppd->Constraints; con; con = con->next) + LIST_FOR_EACH_ENTRY( con, &ppd->Constraints, CONSTRAINT, entry ) TRACE("CONSTRAINTS@ %s %s %s %s\n", con->Feature1, con->Value1, con->Feature2, con->Value2); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index a4ac759..a240f4f 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -168,12 +168,13 @@ typedef struct _tagOPTION { /* Treat bool as a special case of pickone */ struct _tagOPTION *next; } OPTION; -typedef struct _tagCONSTRAINT { +typedef struct +{ + struct list entry; char *Feature1; char *Value1; char *Feature2; char *Value2; - struct _tagCONSTRAINT *next; } CONSTRAINT; typedef struct _tagINPUTSLOT { @@ -218,7 +219,7 @@ typedef struct { struct list PageSizes; PAGESIZE *DefaultPageSize; OPTION *InstalledOptions; - CONSTRAINT *Constraints; + struct list Constraints; INPUTSLOT *InputSlots; RASTERIZEROPTION TTRasterizer; DUPLEX *Duplexes;
1
0
0
0
Huw Davies : wineps: Move the installed font list to a standard list.
by Alexandre Julliard
11 Apr '12
11 Apr '12
Module: wine Branch: master Commit: 4ff9b7f11a92091c0485504f1a750e9b37844064 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4ff9b7f11a92091c0485504f1…
Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:14 2012 +0100 wineps: Move the installed font list to a standard list. --- dlls/wineps.drv/init.c | 3 ++- dlls/wineps.drv/ppd.c | 32 ++++++++++++-------------------- dlls/wineps.drv/psdrv.h | 7 ++++--- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 0c06ecb..affbcbc 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -773,7 +773,8 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) pi->Fonts = NULL; - for(font = pi->ppd->InstalledFonts; font; font = font->next) { + LIST_FOR_EACH_ENTRY( font, &pi->ppd->InstalledFonts, FONTNAME, entry ) + { afm = PSDRV_FindAFMinList(PSDRV_AFMFontList, font->Name); if(!afm) { TRACE( "Couldn't find AFM file for installed printer font '%s' - " diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index c2c422d..3f2c473 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -631,7 +631,9 @@ PPD *PSDRV_ParsePPD(char *fname) } ppd->ColorDevice = CD_NotSpecified; - list_init(&ppd->PageSizes); + + list_init( &ppd->InstalledFonts ); + list_init( &ppd->PageSizes ); /* * The Windows PostScript drivers create the following "virtual bin" for @@ -678,23 +680,13 @@ PPD *PSDRV_ParsePPD(char *fname) WARN("failed to parse DefaultResolution %s\n", debugstr_a(tuple.value)); } - else if(!strcmp("*Font", tuple.key)) { - FONTNAME *fn; - - for(fn = ppd->InstalledFonts; fn && fn->next; fn = fn->next) - ; - if(!fn) { - ppd->InstalledFonts = HeapAlloc(PSDRV_Heap, - HEAP_ZERO_MEMORY, sizeof(*fn)); - fn = ppd->InstalledFonts; - } else { - fn->next = HeapAlloc(PSDRV_Heap, - HEAP_ZERO_MEMORY, sizeof(*fn)); - fn = fn->next; - } - fn->Name = tuple.option; - tuple.option = NULL; - } + else if(!strcmp("*Font", tuple.key)) + { + FONTNAME *fn = HeapAlloc( PSDRV_Heap, 0, sizeof(*fn) ); + fn->Name = tuple.option; + tuple.option = NULL; + list_add_tail( &ppd->InstalledFonts, &fn->entry ); + } else if(!strcmp("*DefaultFont", tuple.key)) { ppd->DefaultFont = tuple.value; @@ -985,8 +977,8 @@ PPD *PSDRV_ParsePPD(char *fname) OPTION *option; OPTIONENTRY *optionEntry; - for(fn = ppd->InstalledFonts; fn; fn = fn->next) - TRACE("'%s'\n", fn->Name); + LIST_FOR_EACH_ENTRY( fn, &ppd->InstalledFonts, FONTNAME, entry ) + TRACE("'%s'\n", fn->Name); LIST_FOR_EACH_ENTRY(page, &ppd->PageSizes, PAGESIZE, entry) { TRACE("'%s' aka '%s' (%d) invoked by '%s'\n", page->Name, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index df86c70..a4ac759 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -118,9 +118,10 @@ typedef struct _tagFONTFAMILY { extern FONTFAMILY *PSDRV_AFMFontList DECLSPEC_HIDDEN; extern const AFM *const PSDRV_BuiltinAFMs[] DECLSPEC_HIDDEN; /* last element is NULL */ -typedef struct _tagFONTNAME { +typedef struct +{ + struct list entry; char *Name; - struct _tagFONTNAME *next; } FONTNAME; typedef struct { @@ -213,7 +214,7 @@ typedef struct { char *JCLToPSInterpreter; char *JCLEnd; char *DefaultFont; - FONTNAME *InstalledFonts; /* ptr to a list of FontNames */ + struct list InstalledFonts; struct list PageSizes; PAGESIZE *DefaultPageSize; OPTION *InstalledOptions;
1
0
0
0
Dmitry Timoshkov : fonts: Update cyrillic bitmap glyphs in Tahoma Bold.
by Alexandre Julliard
11 Apr '12
11 Apr '12
Module: wine Branch: master Commit: 4f819f8efcd08e29a1a7650300e204839b43af2c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4f819f8efcd08e29a1a765030…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 11 19:09:53 2012 +0900 fonts: Update cyrillic bitmap glyphs in Tahoma Bold. --- fonts/tahomabd.sfd | 274 ++++++++++++++++++++++++++-------------------------- fonts/tahomabd.ttf | Bin 86440 -> 86520 bytes 2 files changed, 137 insertions(+), 137 deletions(-) diff --git a/fonts/tahomabd.sfd b/fonts/tahomabd.sfd index bdb7651..d3b6cbe 100644 --- a/fonts/tahomabd.sfd +++ b/fonts/tahomabd.sfd @@ -95,7 +95,7 @@ NameList: Adobe Glyph List DisplaySize: 9 AntiAlias: 1 FitToEm: 1 -WinInfo: 56 56 19 +WinInfo: 0 53 17 BeginPrivate: 10 BlueValues 27 [-30 0 1120 1177 1522 1522] OtherBlues 11 [-426 -426] @@ -10883,142 +10883,142 @@ BDFChar: 336 370 7 0 5 -2 6 bfn;Tbfk;c2uipY BDFChar: 337 371 6 0 4 -2 4 f\"j/GRt\l -BDFChar: 338 1040 6 0 4 0 6 -+Abm2G_h.U -BDFChar: 339 1041 6 1 5 0 6 -n:6&YOGNB+ -BDFChar: 340 1042 6 1 5 0 6 -n;raiOGNB+ -BDFChar: 341 1043 5 1 4 0 6 -n:6%>J:N.M -BDFChar: 342 1044 7 0 5 -1 6 -3(QS284`Z3 -BDFChar: 343 1045 6 1 4 0 6 -n:6&YJ:R+h -BDFChar: 344 1046 9 0 7 0 6 -JPn<e1fAl) -BDFChar: 345 1047 6 1 4 0 6 -i"-IX&.mb" -BDFChar: 346 1048 7 0 4 0 6 -#ah!XW5q4( -BDFChar: 347 1049 7 0 4 0 8 -5VN0DR&Ht)5QCca -BDFChar: 348 1050 6 1 5 0 6 -Lle:FTTGN@ +BDFChar: 338 1040 8 0 6 0 6 +3&k_jI)a/+ +BDFChar: 339 1041 7 0 5 0 6 +pqX]?bfoh^ +BDFChar: 340 1042 7 0 5 0 6 +prptWbfoh^ +BDFChar: 341 1043 6 0 4 0 6 +pqX\\^qd_c +BDFChar: 342 1044 8 0 6 -1 6 +4D\hMCi'*j +BDFChar: 343 1045 6 0 4 0 6 +pqX]?^qf^F +BDFChar: 344 1046 11 0 9 0 6 +beS(GD1FhND1HJRbeO2Y +BDFChar: 345 1047 7 0 5 0 6 +Gg$S@%*Wqr +BDFChar: 346 1048 7 0 5 0 6 +bhV"Om-Mpr +BDFChar: 347 1049 7 0 5 0 8 +82/9Ch#-O*bQ%VC +BDFChar: 348 1050 7 0 5 0 6 +bfn`/fZ_P> BDFChar: 349 1051 7 0 5 0 6 -4<u0t,XfQN -BDFChar: 350 1052 8 1 5 0 6 -LtLADW/-60 -BDFChar: 351 1053 7 1 4 0 6 -OH>RnOH>P( -BDFChar: 352 1054 7 0 5 0 6 -GfYPkKS4RM -BDFChar: 353 1055 7 1 4 0 6 -n;r`nOH>P( -BDFChar: 354 1056 6 1 4 0 6 -i/j%^i.-=X -BDFChar: 355 1057 6 0 4 0 6 -Geei[J:MkE -BDFChar: 356 1058 6 0 4 0 6 -p`L\%+<Vd, -BDFChar: 357 1059 6 0 4 0 6 -Le(?=+<WoL -BDFChar: 358 1060 8 0 5 0 6 -&:B_,PZ0UB -BDFChar: 359 1061 6 0 4 0 6 -Le(>b:f)rJ -BDFChar: 360 1062 7 1 5 -2 6 -J<5kSOHB5C#QOi) -BDFChar: 361 1063 6 1 4 0 6 -OH>QcE"EQ\ -BDFChar: 362 1064 10 1 7 0 6 -P*1ukP*5eE -BDFChar: 363 1065 10 1 8 -2 6 -P*1ukP*5hG!<<*" -BDFChar: 364 1066 7 0 5 0 6 -i#j.),U>JP -BDFChar: 365 1067 9 0 5 0 6 -KS5$NPa(e? -BDFChar: 366 1068 6 1 4 0 6 -J:N1.OHAB# -BDFChar: 367 1069 6 0 4 0 6 -@$h4E#RKo" -BDFChar: 368 1070 10 1 7 0 6 -]]?rH_SWqc -BDFChar: 369 1071 6 0 4 0 6 -3(SirGY!Vj -BDFChar: 370 1072 5 0 3 0 4 -?k@:=n,NFg -BDFChar: 371 1073 6 0 4 0 6 -0L.mBLkp!M -BDFChar: 372 1074 5 0 3 0 4 -n;uRin,NFg -BDFChar: 373 1075 4 0 2 0 4 -i.-?.J,fQL -BDFChar: 374 1076 6 0 4 -1 4 -E)9A-pkSnM -BDFChar: 375 1077 5 0 4 0 4 -E/=:>GQ7^D -BDFChar: 376 1078 8 0 5 0 4 -<*2+^PQ1[` -BDFChar: 377 1079 5 0 3 0 4 -E"HCgn,NFg -BDFChar: 378 1080 6 0 3 0 4 -&?rCc5QCca -BDFChar: 379 1081 6 0 3 0 6 -:gaj=Yg>W8 -BDFChar: 380 1082 5 1 4 0 4 -TV0)nO8o7\ -BDFChar: 381 1083 6 -1 3 0 4 -3(QS2a8c2? -BDFChar: 382 1084 7 0 4 0 4 -8D(G.#QOi) -BDFChar: 383 1085 6 0 3 1 3 -ODp9] +Hu*V8Ci%;q +BDFChar: 350 1052 9 0 7 0 6 +_rp4_gV^o/ +BDFChar: 351 1053 7 0 5 0 6 +bfn</bfn92 +BDFChar: 352 1054 8 0 6 0 6 +I)a1G`l<B+ +BDFChar: 353 1055 7 0 5 0 6 +r63C/bfn92 +BDFChar: 354 1056 7 0 5 0 6 +prpt+pqXZF +BDFChar: 355 1057 7 0 5 0 6 +Gg*t=^s%$' +BDFChar: 356 1058 7 0 5 0 6 +r%KfY0JG0\ +BDFChar: 357 1059 7 0 5 0 6 +bfjm:3&'7j +BDFChar: 358 1060 9 0 7 0 6 +(k15ogO9t> +BDFChar: 359 1061 7 0 5 0 6 +bfk;cGg+A3 +BDFChar: 360 1062 8 0 6 -2 6 +bfn;Tbfp%j"onW' +BDFChar: 361 1063 7 0 5 0 6 +bfn;THjgD` +BDFChar: 362 1064 11 0 9 0 6 +beVH<beVH<beVH<s1eU7 +BDFChar: 363 1065 11 0 10 -2 6 +beVH<beVH<beVH<s53lb!+5d, +BDFChar: 364 1066 8 0 6 0 6 +i*^qEAnHDj +BDFChar: 365 1067 10 0 8 0 6 +_19@Pq1-_?c%+&hq1&GF +BDFChar: 366 1068 7 0 5 0 6 +^qf`hbfoh^ +BDFChar: 367 1069 7 0 5 0 6 +Gg$SD%*Wqr +BDFChar: 368 1070 10 0 8 0 6 +cN)XKfmrmKfmqb+cN!qF +BDFChar: 369 1071 6 0 5 0 6 +I*BgYHu.", +BDFChar: 370 1072 6 0 4 0 4 +E#<iPGQ7^D +BDFChar: 371 1073 7 0 5 0 6 +(i[:cbfk;3 +BDFChar: 372 1074 6 0 4 0 4 +nC[6_n,NFg +BDFChar: 373 1075 5 0 3 0 4 +nA)iT^]4?7 +BDFChar: 374 1076 7 0 6 -1 4 +Hu*V8rl+p< +BDFChar: 375 1077 6 0 4 0 4 +E7js$GQ7^D +BDFChar: 376 1078 8 0 6 0 4 +epKH)ec5[M +BDFChar: 377 1079 6 0 4 0 4 +n/-*]n,NFg +BDFChar: 378 1080 7 0 5 0 4 +bhW-_bQ%VC +BDFChar: 379 1081 7 0 5 0 6 +82/9Cr9VW- +BDFChar: 380 1082 5 0 4 0 4 +f^RhgfDkmO +BDFChar: 381 1083 7 0 5 0 4 +4D\hMbQ%VC +BDFChar: 382 1084 8 0 6 0 4 +`pWiW`W,u= +BDFChar: 383 1085 7 0 5 0 4 +bfp"/bQ%VC BDFChar: 384 1086 6 0 4 0 4 -E/9=+Du]k< -BDFChar: 385 1087 6 0 3 1 4 -E0-0C +E7igqDu]k< +BDFChar: 385 1087 7 0 5 0 4 +r63C/bQ%VC BDFChar: 386 1088 6 0 4 -2 4 -n;)mVn:6#h +nCZCGnA)g> BDFChar: 387 1089 5 0 3 0 4 -E.EIhDu]k< -BDFChar: 388 1090 5 0 4 0 4 -p`L\%+92BA +E599)Du]k< +BDFChar: 388 1090 6 0 5 0 4 +r%KfY0E;(Q BDFChar: 389 1091 5 0 4 -2 4 -LlbG@+<\H" -BDFChar: 390 1092 8 0 6 -2 6 -&.j5PP*12(&-)\1 -BDFChar: 391 1093 5 0 3 0 4 -OC02=O8o7\ -BDFChar: 392 1094 6 0 4 -1 3 -OH>QK#QOi) -BDFChar: 393 1095 6 0 3 0 4 -OHArC&-)\1 -BDFChar: 394 1096 8 1 6 0 4 -Unjf^qu?]s -BDFChar: 395 1097 8 0 6 -1 4 -&<rEDIKBKL -BDFChar: 396 1098 6 0 4 0 4 -^d*-8GQ7^D -BDFChar: 397 1099 8 0 5 0 4 -KS8u^oDejk -BDFChar: 398 1100 5 0 3 0 4 -J:R-Nn,NFg -BDFChar: 399 1101 5 0 3 0 4 -i"0i=huE`W -BDFChar: 400 1102 8 0 6 0 4 -S>,#;S,`Nh -BDFChar: 401 1103 5 0 3 0 4 -n;qTcO8o7\ -BDFChar: 402 1104 5 0 4 0 6 -+96A:pjdSh -BDFChar: 403 1105 5 0 4 0 6 -:]PHjpjdSh -BDFChar: 404 1024 6 1 4 0 8 -5QL;(JFJ)>n,NFg -BDFChar: 405 1025 6 1 4 0 7 -T^[J^n:6&Y +f\#t<0OVZr +BDFChar: 390 1092 9 0 7 -2 6 +(`7_VgY7/o(]XO9 +BDFChar: 391 1093 5 0 4 0 4 +f_BF\fDkmO +BDFChar: 392 1094 7 0 6 -1 4 +bfn;TrWW?& +BDFChar: 393 1095 6 0 5 0 4 +bfkGC$ig8- +BDFChar: 394 1096 9 0 7 0 4 +gY:K;rr<$! +BDFChar: 395 1097 9 0 8 -1 4 +gAot.gAot.s*t-# +BDFChar: 396 1098 7 0 5 0 4 +i*^eGGQ7^D +BDFChar: 397 1099 9 0 7 0 4 +_o)*#o)Jaj +BDFChar: 398 1100 6 0 4 0 4 +^qfHln,NFg +BDFChar: 399 1101 5 0 4 0 4 +n/-Ben,NFg +BDFChar: 400 1102 9 0 7 0 4 +cJ/6Nc2[hE +BDFChar: 401 1103 5 0 4 0 4 +Gh@7CQiI*d +BDFChar: 402 1104 6 0 4 0 6 ++96B5pqV+S +BDFChar: 403 1105 6 0 4 0 6 +:]PIepqV+S +BDFChar: 404 1024 6 0 4 0 8 ++9;2P_"b^\p](9o +BDFChar: 405 1025 6 0 4 0 7 +;#%iApqX]? BDFChar: 406 1029 6 0 4 0 6 G^t<`#RKo" BDFChar: 407 1030 4 0 2 0 6 @@ -11032,15 +11032,15 @@ T]"b$TV)8b BDFChar: 411 1118 5 0 4 -2 7 :`oaoOAK=-+M[sW BDFChar: 412 1038 6 0 4 0 8 -:`tRM:f&8W^]4?7 +:a"ECpi%op^]4?7 BDFChar: 413 1111 3 0 2 0 6 TE%5B5X7R7 BDFChar: 414 1110 3 0 0 0 6 J,k+MJ:N.M -BDFChar: 415 1169 4 1 3 0 4 -i.-?.J,fQL -BDFChar: 416 1168 5 1 4 0 6 -n:6%>J:N.M +BDFChar: 415 1169 5 0 3 0 4 +nA)iT^]4?7 +BDFChar: 416 1168 6 0 4 0 6 +pqX\\^qd_c BDFChar: 417 1170 5 0 4 0 6 GX1a`5X7R7 BDFChar: 418 1171 4 1 3 0 4 diff --git a/fonts/tahomabd.ttf b/fonts/tahomabd.ttf index afa2d39..82ce9fa 100644 Binary files a/fonts/tahomabd.ttf and b/fonts/tahomabd.ttf differ
1
0
0
0
← Newer
1
...
43
44
45
46
47
48
49
...
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