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

Huw Davies : wineps: Return from a common point.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: 0c7a6d89a26ed24b5cf100dad2e11872729945c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7a6d89a26ed24b5cf100dad… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 12 13:03:09 2012 +0100 wineps: Return from a common point. --- dlls/wineps.drv/driver.c | 128 +++++++++++++++++++++++++++++---------------- 1 files changed, 82 insertions(+), 46 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 83597c3..4e8774b 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -473,7 +473,8 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP if(lpszOutput != NULL) *wp++ = ps->WinPage; } - return i; + ret = i; + break; } case DC_PAPERSIZE: @@ -492,7 +493,8 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP pt++; } } - return i; + ret = i; + break; } case DC_PAPERNAMES: @@ -510,11 +512,13 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP cp += 64; } } - return i; + ret = i; + break; } case DC_ORIENTATION: - return pi->ppd->LandscapeOrientation ? pi->ppd->LandscapeOrientation : 90; + ret = pi->ppd->LandscapeOrientation ? pi->ppd->LandscapeOrientation : 90; + break; case DC_BINS: { @@ -528,7 +532,8 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP if (lpszOutput != NULL) *wp++ = slot->WinBin; } - return i; + ret = i; + break; } case DC_BINNAMES: @@ -546,12 +551,14 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP cp += 24; } } - return i; + ret = i; + break; } case DC_BINADJUST: FIXME("DC_BINADJUST: stub.\n"); - return DCBA_FACEUPNONE; + ret = DCBA_FACEUPNONE; + break; case DC_ENUMRESOLUTIONS: { @@ -561,41 +568,49 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP lp[0] = pi->ppd->DefaultResolution; lp[1] = pi->ppd->DefaultResolution; } - return 1; + ret = 1; + break; } /* Windows returns 9999 too */ case DC_COPIES: TRACE("DC_COPIES: returning 9999\n"); - return 9999; + ret = 9999; + break; case DC_DRIVER: - return lpdm->dmDriverVersion; + ret = lpdm->dmDriverVersion; + break; case DC_DATATYPE_PRODUCED: FIXME("DATA_TYPE_PRODUCED: stub.\n"); - return -1; /* simulate that the driver supports 'RAW' */ + ret = -1; /* simulate that the driver supports 'RAW' */ + break; case DC_DUPLEX: ret = 0; if(pi->ppd->DefaultDuplex && pi->ppd->DefaultDuplex->WinDuplex != 0) ret = 1; TRACE("DC_DUPLEX: returning %d\n", ret); - return ret; + break; case DC_EMF_COMPLIANT: FIXME("DC_EMF_COMPLIANT: stub.\n"); - return -1; /* simulate that the driver do not support EMF */ + ret = -1; /* simulate that the driver do not support EMF */ + break; case DC_EXTRA: - return lpdm->dmDriverExtra; + ret = lpdm->dmDriverExtra; + break; case DC_FIELDS: - return lpdm->dmFields; + ret = lpdm->dmFields; + break; case DC_FILEDEPENDENCIES: FIXME("DC_FILEDEPENDENCIES: stub.\n"); - return 0; + ret = 0; + break; case DC_MAXEXTENT: { @@ -607,7 +622,8 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP if (ps->PaperDimension->x > x) x = ps->PaperDimension->x; if (ps->PaperDimension->y > y) y = ps->PaperDimension->y; } - return MAKELONG( paper_size_from_points(x), paper_size_from_points(y) ); + ret = MAKELONG( paper_size_from_points(x), paper_size_from_points(y) ); + break; } case DC_MINEXTENT: @@ -620,50 +636,60 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP if (ps->PaperDimension->x < x) x = ps->PaperDimension->x; if (ps->PaperDimension->y < y) y = ps->PaperDimension->y; } - return MAKELONG( paper_size_from_points(x), paper_size_from_points(y) ); + ret = MAKELONG( paper_size_from_points(x), paper_size_from_points(y) ); + break; } case DC_SIZE: - return lpdm->dmSize; + ret = lpdm->dmSize; + break; case DC_TRUETYPE: FIXME("DC_TRUETYPE: stub\n"); - return DCTT_SUBDEV; + ret = DCTT_SUBDEV; + break; case DC_VERSION: - return lpdm->dmSpecVersion; + ret = lpdm->dmSpecVersion; + break; /* We'll just return false here, very few printers can collate anyway */ case DC_COLLATE: TRACE("DC_COLLATE: returning FALSE\n"); - return FALSE; + ret = FALSE; + break; /* Printer supports colour printing - 1 if yes, 0 if no (Win2k/XP only) */ case DC_COLORDEVICE: - return (pi->ppd->ColorDevice != CD_False) ? TRUE : FALSE; + ret = (pi->ppd->ColorDevice != CD_False) ? TRUE : FALSE; + break; /* Identification number of the printer manufacturer for use with ICM (Win9x only) */ case DC_MANUFACTURER: FIXME("DC_MANUFACTURER: stub\n"); - return -1; - + ret = -1; + break; + /* Identification number of the printer model for use with ICM (Win9x only) */ case DC_MODEL: FIXME("DC_MODEL: stub\n"); - return -1; - + ret = -1; + break; + /* Nonzero if the printer supports stapling, zero otherwise (Win2k/XP only) */ case DC_STAPLE: /* WINVER >= 0x0500 */ FIXME("DC_STAPLE: stub\n"); - return -1; - + ret = -1; + break; + /* Returns an array of 64-character string buffers containing the names of the paper forms * available for use, unless pOutput is NULL. The return value is the number of paper forms. * (Win2k/XP only) */ case DC_MEDIAREADY: /* WINVER >= 0x0500 */ FIXME("DC_MEDIAREADY: stub\n"); - return -1; + ret = -1; + break; /* Returns an array of 64-character string buffers containing the names of the supported * media types, unless pOutput is NULL. The return value is the number of supported. @@ -671,14 +697,16 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP */ case DC_MEDIATYPENAMES: /* WINVER >= 0x0501 */ FIXME("DC_MEDIATYPENAMES: stub\n"); - return -1; - + ret = -1; + break; + /* Returns an array of DWORD values which represent the supported media types, unless * pOutput is NULL. The return value is the number of supported media types. (XP only) */ case DC_MEDIATYPES: /* WINVER >= 0x0501 */ FIXME("DC_MEDIATYPES: stub\n"); - return -1; + ret = -1; + break; /* Returns an array of DWORD values, each representing a supported number of document * pages per printed page, unless pOutput is NULL. The return value is the number of @@ -686,8 +714,9 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP */ case DC_NUP: FIXME("DC_NUP: stub\n"); - return -1; - + ret = -1; + break; + /* Returns an array of 32-character string buffers containing a list of printer description * languages supported by the printer, unless pOutput is NULL. The return value is * number of array entries. (Win2k/XP only) @@ -695,34 +724,41 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP case DC_PERSONALITY: /* WINVER >= 0x0500 */ FIXME("DC_PERSONALITY: stub\n"); - return -1; - + ret = -1; + break; + /* Returns the amount of printer memory in kilobytes. (Win2k/XP only) */ case DC_PRINTERMEM: /* WINVER >= 0x0500 */ FIXME("DC_PRINTERMEM: stub\n"); - return -1; - + ret = -1; + break; + /* Returns the printer's print rate in PRINTRATEUNIT units. (Win2k/XP only) */ case DC_PRINTRATE: /* WINVER >= 0x0500 */ FIXME("DC_PRINTRATE: stub\n"); - return -1; - + ret = -1; + break; + /* Returns the printer's print rate in pages per minute. (Win2k/XP only) */ case DC_PRINTRATEPPM: /* WINVER >= 0x0500 */ FIXME("DC_PRINTRATEPPM: stub\n"); - return -1; - + ret = -1; + break; + /* Returns the printer rate unit used for DC_PRINTRATE, which is one of * PRINTRATEUNIT_{CPS,IPM,LPM,PPM} (Win2k/XP only) */ case DC_PRINTRATEUNIT: /* WINVER >= 0x0500 */ FIXME("DC_PRINTRATEUNIT: stub\n"); - return -1; - + ret = -1; + break; + default: FIXME("Unsupported capability %d\n", fwCapability); + ret = -1; } - return -1; + + return ret; } #if 0

1 0

Huw Davies : wineps: Switch to using a Unicode devmode.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: 210f3e333828917335ec219bacd2fca712a7e339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=210f3e333828917335ec219ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 12 13:03:10 2012 +0100 wineps: Switch to using a Unicode devmode. --- dlls/wineps.drv/driver.c | 69 ++++++++++++++++++++++++++++----- dlls/wineps.drv/init.c | 96 ++++++++++++--------------------------------- dlls/wineps.drv/psdrv.h | 10 ++-- 3 files changed, 90 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=210f3e333828917335ec2…

1 0

Huw Davies : wineps: Pass the devmode to OpenPrinter.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: 83ba3189b3f669318dc9af35d5a942496268eae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ba3189b3f669318dc9af35d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 12 13:03:11 2012 +0100 wineps: Pass the devmode to OpenPrinter. --- dlls/wineps.drv/escape.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 512dfb7..d2a8d2a 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -415,6 +415,7 @@ INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); DOC_INFO_1W di; + PRINTER_DEFAULTSW prn_def; TRACE("(%p, %p) => %s, %s, %s\n", physDev, doc, debugstr_w(doc->lpszDocName), debugstr_w(doc->lpszOutput), debugstr_w(doc->lpszDatatype)); @@ -424,8 +425,12 @@ INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) return 0; } - /* FIXME: use PRINTER_DEFAULTS here */ - if(!OpenPrinterW( physDev->pi->friendly_name, &physDev->job.hprinter, NULL )) { + prn_def.pDatatype = NULL; + prn_def.pDevMode = &physDev->pi->Devmode->dmPublic; + prn_def.DesiredAccess = PRINTER_ACCESS_USE; + + if (!OpenPrinterW( physDev->pi->friendly_name, &physDev->job.hprinter, &prn_def )) + { WARN("OpenPrinter(%s, ...) failed: %d\n", debugstr_w(physDev->pi->friendly_name), GetLastError()); return 0;

1 0

Huw Davies : wineps: Simplify the failure path.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: 92bce60f37b5e870d92a04cbe178d04d3e8f55dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=92bce60f37b5e870d92a04cbe… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 12 13:03:12 2012 +0100 wineps: Simplify the failure path. --- dlls/wineps.drv/init.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 2e8087b..0134bd6 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -608,7 +608,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) if (OpenPrinterW( pi->friendly_name, &hPrinter, NULL ) == 0) { ERR ("OpenPrinter failed with code %i\n", GetLastError ()); - goto cleanup; + goto fail; } len = WideCharToMultiByte( CP_ACP, 0, name, -1, NULL, 0, NULL, NULL ); @@ -616,7 +616,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) WideCharToMultiByte( CP_ACP, 0, name, -1, nameA, len, NULL, NULL ); pi->Devmode = get_devmode( hPrinter, name, &using_default_devmode ); - if (!pi->Devmode) goto closeprinter; + if (!pi->Devmode) goto fail; #ifdef SONAME_LIBCUPS if (cupshandle != (void*)-1) { @@ -681,7 +681,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) { res = ERROR_FILE_NOT_FOUND; ERR ("Error %i getting PPD file name for printer '%s'\n", res, debugstr_w(name)); - goto closeprinter; + goto fail; } ppdFileName = HeapAlloc( PSDRV_Heap, 0, strlen(data_dir) + strlen(filename) + 1 ); strcpy( ppdFileName, data_dir ); @@ -704,7 +704,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) if(!pi->ppd) { MESSAGE("Couldn't find PPD file '%s', expect a crash now!\n", ppdFileName); - goto closeprinter; + goto fail; } /* Some gimp-print ppd files don't contain a DefaultResolution line @@ -748,7 +748,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) TRACE ("No 'Paper Size' for printer '%s'\n", debugstr_w(name)); else { ERR ("GetPrinterDataA returned %i\n", res); - goto closeprinter; + goto fail; } /* Duplex is indicated by the setting of the DM_DUPLEX bit in dmFields. @@ -767,10 +767,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) pi->FontSubTable = load_font_sub_table( hPrinter, &pi->FontSubTableSize ); - ClosePrinter( hPrinter ); - - pi->Fonts = NULL; - LIST_FOR_EACH_ENTRY( font, &pi->ppd->InstalledFonts, FONTNAME, entry ) { afm = PSDRV_FindAFMinList(PSDRV_AFMFontList, font->Name); @@ -782,24 +778,23 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) BOOL added; if (PSDRV_AddAFMtoList(&pi->Fonts, afm, &added) == FALSE) { PSDRV_FreeAFMList(pi->Fonts); - goto cleanup; + goto fail; } } } + ClosePrinter( hPrinter ); HeapFree( GetProcessHeap(), 0, nameA ); if (ppd) unlink(ppd); list_add_head( &printer_list, &pi->entry ); return pi; -closeprinter: - ClosePrinter(hPrinter); -cleanup: +fail: + if (hPrinter) ClosePrinter( hPrinter ); HeapFree(PSDRV_Heap, 0, ppdFileName); HeapFree(PSDRV_Heap, 0, pi->FontSubTable); HeapFree(PSDRV_Heap, 0, pi->friendly_name); HeapFree(PSDRV_Heap, 0, pi->Devmode); -fail: HeapFree(PSDRV_Heap, 0, pi); HeapFree( GetProcessHeap(), 0, nameA ); if (ppd) unlink(ppd);

1 0

Jeremy Newman : fix depreciated code
by Jeremy Newman 12 Apr '12

12 Apr '12

Module: website Branch: master Commit: 6b0603be401b695c71f9d03d8f9df21cb5f3491e URL: http://source.winehq.org/git/website.git/?a=commit;h=6b0603be401b695c71f9d0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 15:07:31 2012 -0500 fix depreciated code --- include/html.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/html.php b/include/html.php index a90daf0..9b2e83c 100644 --- a/include/html.php +++ b/include/html.php @@ -332,7 +332,8 @@ class html else if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) { // load from web browser environment - $avail = preg_split('/,/', array_shift(preg_split('/;/', $_SERVER["HTTP_ACCEPT_LANGUAGE"]))); + $hal = preg_split("/\;/", $_SERVER["HTTP_ACCEPT_LANGUAGE"]); + $avail = preg_split('/\,/', array_shift($hal)); if (isset($avail[0])) { // if first language is a variation, use the parent language @@ -345,7 +346,7 @@ class html $lang = $avail[0]; } } - unset($avail); + unset($hal, $avail); } // return language

1 0

Jeremy Newman : fix depreciated code
by Jeremy Newman 12 Apr '12

12 Apr '12

Module: website Branch: master Commit: 60ee8a13cac1a942c6df1376ef0b451e522222fb URL: http://source.winehq.org/git/website.git/?a=commit;h=60ee8a13cac1a942c6df13… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 15:00:22 2012 -0500 fix depreciated code --- include/config.php | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/config.php b/include/config.php index aa80daa..80f3311 100644 --- a/include/config.php +++ b/include/config.php @@ -6,9 +6,10 @@ by Jeremy Newman <jnewman(a)codeweavers.com> */ -class config -{ - function config () +class config +{ + // constructor + public function __construct () { // get files passed $files = func_get_args(); @@ -19,31 +20,30 @@ class config // read global config file $this->readConfig($path); } - // end of config() } - + // reads config from text file - function readConfig ($file) + private function readConfig ($file) { if (file_exists($file)) { $fd = fopen ($file, "r"); while (!feof ($fd)) { $buffer = trim(fgets($fd, 4096)); - if (ereg('^\#', $buffer)) continue; + if (preg_match('/^\#/', $buffer)) continue; if ($buffer == "") continue; $arr = preg_split('/:\s+/',$buffer,2); $arr[1] = preg_replace("/<br>/","\n",$arr[1]); - if (ereg('^\@', $arr[0])) + if (preg_match('/^\@/', $arr[0])) { // array - $arr[0] = ereg_replace('\@', '', $arr[0]); + $arr[0] = preg_replace('/\@/', '', $arr[0]); $this->$arr[0] = preg_split('/,\s+/', $arr[1]); } - else if (ereg('^\%', $arr[0])) + else if (preg_match('/^\%/', $arr[0])) { // assoc array - $arr[0] = ereg_replace('\%', '', $arr[0]); + $arr[0] = preg_replace('/\%/', '', $arr[0]); $this->$arr[0] = array(); $params = preg_split('/,\s+/', $arr[1]); while (list($n, $m) = each($params)) @@ -59,7 +59,7 @@ class config { // load other vars into existing var $arr[1] = preg_replace('/(.*)\{\$([a-z0-9_]+)\}(.*)/', "\\1,\\2,\\3", $arr[1]); - list($a,$b,$c) = split(",", $arr[1], 3); + list($a,$b,$c) = preg_split("/\,/", $arr[1], 3); if ($b and isset($this->$b)) $arr[1] = $a.$this->$b.$c; else @@ -72,7 +72,8 @@ class config } else { - trigger_error("Unable to read config: ".$file); + trigger_error("ERROR: Unable to read config!", E_USER_ERROR); + exit(); } // end of readConfig }

1 0

Jeremy Newman : fix some deprecated functions
by Jeremy Newman 12 Apr '12

12 Apr '12

Module: website Branch: master Commit: 0c420b931e776b7552ac9c6d7ccdbede6b400b0b URL: http://source.winehq.org/git/website.git/?a=commit;h=0c420b931e776b7552ac9c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:08:47 2012 -0500 fix some deprecated functions --- site | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site b/site index 5a7bd46..70499c7 100644 --- a/site +++ b/site @@ -18,7 +18,7 @@ if (!preg_match('/\/$/', $_SERVER['PHP_SELF'])) if (isset($_SERVER['PATH_INFO'])) { // set the Current Page - $dirs = split('/', $_SERVER['PATH_INFO']); + $dirs = preg_split('/\//', $_SERVER['PATH_INFO']); array_shift($dirs); if (count($dirs) > 1) { @@ -59,8 +59,8 @@ if (isset($_SERVER['PATH_INFO'])) // cleanup and define page $page = join('/',$good_dirs); - if (ereg('/$', $page)) - $page = ereg_replace('/$', '', $page); + if (preg_match('/\/$/', $page)) + $page = preg_replace('/\/$/', '', $page); unset($c); } else

1 0

Jeremy Newman : fix some depreciated functions
by Jeremy Newman 12 Apr '12

12 Apr '12

Module: website Branch: master Commit: b1fc778e554739273849bf4016d4d0570a4b01d6 URL: http://source.winehq.org/git/website.git/?a=commit;h=b1fc778e554739273849bf… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:24:03 2012 -0500 fix some depreciated functions --- include/utils.php | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/include/utils.php b/include/utils.php index 4cb98f3..e51b0c1 100644 --- a/include/utils.php +++ b/include/utils.php @@ -101,16 +101,28 @@ function get_files ($dir, $filter = null) { // read dir $files = array(); - $d = opendir($dir); while($entry = readdir($d)) { - if ($filter) - { - if(!eregi("(.+)\\.".$filter, $entry)) - continue; - } - array_push($files, $entry); + if (is_dir($dir.$entry)) + continue; + if (is_array($filter)) + { + $in = 0; + foreach ($filter as $f) + { + if (preg_match('/(.+)\\.'.$f.'/', $entry)) + $in = 1; + } + if (!$in) + continue; + } + else if ($filter) + { + if (!preg_match('/(.+)\\.'.$filter.'/', $entry)) + continue; + } + array_push($files, $entry); } closedir($d); @@ -127,11 +139,11 @@ function get_xml_tags ($file, $tags = null) { $content = array(); $fp = @fopen($file, "r"); - $data = fread($fp, filesize($file)); - @fclose($fp); + $data = fread($fp, filesize($file)); + @fclose($fp); foreach ($tags as $tag) { - if (eregi("<" . $tag . ">(.*)</" . $tag . ">", $data, $out)) + if (preg_match("/\<{$tag}\>(.*)\<\/{$tag}\>/Us", $data, $out)) { $content[$tag] = $out[1]; }

1 0

Jeremy Newman : use class autoloading, add some error handling functions
by Jeremy Newman 12 Apr '12

12 Apr '12

Module: website Branch: master Commit: 5d3f0d0ecdf591b011423b099f4a5627140c3111 URL: http://source.winehq.org/git/website.git/?a=commit;h=5d3f0d0ecdf591b011423b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:24:45 2012 -0500 use class autoloading, add some error handling functions --- include/incl.php | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/include/incl.php b/include/incl.php index d6f334e..457b684 100644 --- a/include/incl.php +++ b/include/incl.php @@ -10,23 +10,32 @@ * Main Include Library */ -// load config class -require("{$file_root}/include/config.php"); - -// create config object -$config = new config($file_root."/include/"."winehq.conf", $file_root."/include/"."globals.conf"); +// Require PHP version 5.3 or higher +if (version_compare(phpversion(), '5.3.0') < 0) +{ + trigger_error("PHP 5.3 or Higher Required!", E_USER_ERROR); +} // load global functions lib require_once("{$file_root}/include/utils.php"); +// Set Up the Class AutoLoader +spl_autoload_register("check_and_require"); + +// create config object +$config = new config("{$file_root}/include/winehq.conf", "{$file_root}/include/globals.conf"); + // load data lib -check_and_require("data"); $data = new data(); -// load html lib -check_and_require("html"); - // create html object $html = new html($file_root); +// setup html error handler when not at CLI +if (!defined('STDIN')) +{ + set_error_handler(array(&$html, 'error_handler')); + register_shutdown_function(array(&$html, 'error_shutdown')); +} + ?>

1 0

Jeremy Newman : add error handling function, fix depreciated functions
by Jeremy Newman 12 Apr '12

12 Apr '12

Module: website Branch: master Commit: 58eafdd1421c26da6d50fdd2ddd965efcc264bd2 URL: http://source.winehq.org/git/website.git/?a=commit;h=58eafdd1421c26da6d50fd… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 12 14:25:18 2012 -0500 add error handling function, fix depreciated functions --- include/html.php | 113 +++++++++++++++++++++++++++++------------------------ 1 files changed, 62 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=58eafdd1421c26da6d…

1 0