September 2021 - Wine-Commits

Jeremy Newman : update appdb montage image urls
by Jeremy Newman Sept. 21, 2021

Sept. 21, 2021

Module: website Branch: master Commit: 7d8b74d0b728e9194f474575e3d257c5f8ce45e0 URL: https://source.winehq.org/git/website.git/?a=commit;h=7d8b74d0b728e9194f474… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Sep 21 12:16:20 2021 -0500 update appdb montage image urls --- templates/ko/home.template | 24 ++++++++++++------------ templates/nl/home.template | 24 ++++++++++++------------ templates/zh-cn/home.template | 24 ++++++++++++------------ 3 files changed, 36 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=7d8b74d0b728e9194…

1 0

Jeremy Newman : load appdb montage images from CDN
by Jeremy Newman Sept. 21, 2021

Sept. 21, 2021

Module: website Branch: master Commit: 212a9118eb5659d26325ae67e387380ea1941da0 URL: https://source.winehq.org/git/website.git/?a=commit;h=212a9118eb5659d26325a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Sep 21 12:13:06 2021 -0500 load appdb montage images from CDN --- templates/en/home.template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/en/home.template b/templates/en/home.template index 9fc15054..20212534 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -40,40 +40,40 @@ <div id="carouselScreenshots" class="carousel slide" data-ride="carousel"> <div class="carousel-inner"> <div class="item"> - <img src="https://appdb.winehq.org/images/steam.jpg" alt="First slide"> + <img src="https://dl.winehq.org/share/images/screenshots/steam.jpg" alt="First slide"> </div> <div class="item"> - <img src="https://appdb.winehq.org/images/outlook2010.jpg" alt="Second slide"> + <img src="https://dl.winehq.org/share/images/screenshots/outlook2010.jpg" alt="Second slide"> </div> <div class="item"> - <img src="https://appdb.winehq.org/images/eveonline.jpg" alt="Third slide"> + <img src="https://dl.winehq.org/share/images/screenshots/eveonline.jpg" alt="Third slide"> </div> <div class="item"> - <img src="https://appdb.winehq.org/images/photoshopcc2015.jpg" alt="Fourth slide"> + <img src="https://dl.winehq.org/share/images/screenshots/photoshopcc2015.jpg" alt="Fourth slide"> </div> <div class="item"> - <img src="https://appdb.winehq.org/images/falloutnv.jpg" alt="Fifth slide"> + <img src="https://dl.winehq.org/share/images/screenshots/falloutnv.jpg" alt="Fifth slide"> </div> <div class="item"> - <img src="https://appdb.winehq.org/images/reason.jpg" alt="Sixth slide"> + <img src="https://dl.winehq.org/share/images/screenshots/reason.jpg" alt="Sixth slide"> </div> <div class="item"> - <img src="https://appdb.winehq.org/images/skyrim_specialed.jpg" alt="Seventh slide"> + <img src="https://dl.winehq.org/share/images/screenshots/skyrim_specialed.jpg" alt="Seventh slide"> </div> <div class="item"> - <img src="https://appdb.winehq.org/images/goggalaxy.jpg" alt="Eighth slide"> + <img src="https://dl.winehq.org/share/images/screenshots/goggalaxy.jpg" alt="Eighth slide"> </div> <div class="item active"> - <img src="https://appdb.winehq.org/images/wizard101.jpg" alt="Ninth slide"> + <img src="https://dl.winehq.org/share/images/screenshots/wizard101.jpg" alt="Ninth slide"> </div> <div class="item"> - <img src="https://appdb.winehq.org/images/matlab.jpg" alt="Tenth slide"> + <img src="https://dl.winehq.org/share/images/screenshots/matlab.jpg" alt="Tenth slide"> </div> <div class="item"> - <img src="https://appdb.winehq.org/images/sims3.jpg" alt="Eleventh slide"> + <img src="https://dl.winehq.org/share/images/screenshots/sims3.jpg" alt="Eleventh slide"> </div> <div class="item"> - <img src="https://appdb.winehq.org/images/metatrader5.jpg" alt="Twelfth slide"> + <img src="https://dl.winehq.org/share/images/screenshots/metatrader5.jpg" alt="Twelfth slide"> </div> </div> <a class="left carousel-control" href="#carouselScreenshots" data-slide="prev">

1 0

Jeremy Newman : move montage images to the CDN
by Jeremy Newman Sept. 21, 2021

Sept. 21, 2021

Module: appdb Branch: master Commit: 2747c5962f3da6d27940f54947f1248949567d45 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=2747c5962f3da6d27940f54… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Sep 21 12:06:31 2021 -0500 move montage images to the CDN --- images/eveonline.jpg | Bin 69858 -> 0 bytes images/falloutnv.jpg | Bin 70037 -> 0 bytes images/goggalaxy.jpg | Bin 69163 -> 0 bytes images/matlab.jpg | Bin 76130 -> 0 bytes images/metatrader5.jpg | Bin 128684 -> 0 bytes images/outlook2010.jpg | Bin 46640 -> 0 bytes images/photoshopcc2015.jpg | Bin 31937 -> 0 bytes images/reason.jpg | Bin 107342 -> 0 bytes images/sims3.jpg | Bin 66462 -> 0 bytes images/skyrim_specialed.jpg | Bin 102001 -> 0 bytes images/steam.jpg | Bin 66903 -> 0 bytes images/wizard101.jpg | Bin 117375 -> 0 bytes images/xinha-red-95.png | Bin 4379 -> 0 bytes index.php | 26 +++++++++++++------------- 14 files changed, 13 insertions(+), 13 deletions(-) diff --git a/images/eveonline.jpg b/images/eveonline.jpg deleted file mode 100644 index 2e336a8..0000000 Binary files a/images/eveonline.jpg and /dev/null differ diff --git a/images/falloutnv.jpg b/images/falloutnv.jpg deleted file mode 100644 index 6ade796..0000000 Binary files a/images/falloutnv.jpg and /dev/null differ diff --git a/images/goggalaxy.jpg b/images/goggalaxy.jpg deleted file mode 100644 index 6291efd..0000000 Binary files a/images/goggalaxy.jpg and /dev/null differ diff --git a/images/matlab.jpg b/images/matlab.jpg deleted file mode 100644 index b5c41ed..0000000 Binary files a/images/matlab.jpg and /dev/null differ diff --git a/images/metatrader5.jpg b/images/metatrader5.jpg deleted file mode 100644 index 480e157..0000000 Binary files a/images/metatrader5.jpg and /dev/null differ diff --git a/images/outlook2010.jpg b/images/outlook2010.jpg deleted file mode 100644 index 3ebf42a..0000000 Binary files a/images/outlook2010.jpg and /dev/null differ diff --git a/images/photoshopcc2015.jpg b/images/photoshopcc2015.jpg deleted file mode 100644 index bd9a50d..0000000 Binary files a/images/photoshopcc2015.jpg and /dev/null differ diff --git a/images/reason.jpg b/images/reason.jpg deleted file mode 100644 index 8270e8f..0000000 Binary files a/images/reason.jpg and /dev/null differ diff --git a/images/sims3.jpg b/images/sims3.jpg deleted file mode 100644 index 0872e31..0000000 Binary files a/images/sims3.jpg and /dev/null differ diff --git a/images/skyrim_specialed.jpg b/images/skyrim_specialed.jpg deleted file mode 100644 index 29446ac..0000000 Binary files a/images/skyrim_specialed.jpg and /dev/null differ diff --git a/images/steam.jpg b/images/steam.jpg deleted file mode 100644 index 365c391..0000000 Binary files a/images/steam.jpg and /dev/null differ diff --git a/images/wizard101.jpg b/images/wizard101.jpg deleted file mode 100644 index 23d8844..0000000 Binary files a/images/wizard101.jpg and /dev/null differ diff --git a/images/xinha-red-95.png b/images/xinha-red-95.png deleted file mode 100644 index 71e6a77..0000000 Binary files a/images/xinha-red-95.png and /dev/null differ diff --git a/index.php b/index.php index b63b55d..97a5133 100644 --- a/index.php +++ b/index.php @@ -176,42 +176,42 @@ else <div id="carouselScreenshots" class="carousel slide container col-md-6" data-ride="carousel"> <div class="carousel-inner" style="margin-bottom:10px"> <div class="item active"> - <img src="images/steam.jpg" alt="First slide"> + <img src="https://dl.winehq.org/share/images/screenshots/steam.jpg" alt="First slide"> </div> <div class="item"> - <img src="images/outlook2010.jpg" alt="Second slide"> + <img src="https://dl.winehq.org/share/images/screenshots/outlook2010.jpg" alt="Second slide"> </div> <div class="item"> - <img src="images/eveonline.jpg" alt="Third slide"> + <img src="https://dl.winehq.org/share/images/screenshots/eveonline.jpg" alt="Third slide"> </div> <div class="item"> - <img src="images/photoshopcc2015.jpg" alt="Fourth slide"> + <img src="https://dl.winehq.org/share/images/screenshots/photoshopcc2015.jpg" alt="Fourth slide"> </div> <div class="item"> - <img src="images/falloutnv.jpg" alt="Fifth slide"> + <img src="https://dl.winehq.org/share/images/screenshots/falloutnv.jpg" alt="Fifth slide"> </div> <div class="item"> - <img src="images/reason.jpg" alt="Sixth slide"> + <img src="https://dl.winehq.org/share/images/screenshots/reason.jpg" alt="Sixth slide"> </div> <div class="item"> - <img src="images/skyrim_specialed.jpg" alt="Seventh slide"> + <img src="https://dl.winehq.org/share/images/screenshots/skyrim_specialed.jpg" alt="Seventh slide"> </div> <div class="item"> - <img src="images/goggalaxy.jpg" alt="Eighth slide"> + <img src="https://dl.winehq.org/share/images/screenshots/goggalaxy.jpg" alt="Eighth slide"> </div> <div class="item"> - <img src="images/wizard101.jpg" alt="Ninth slide"> + <img src="https://dl.winehq.org/share/images/screenshots/wizard101.jpg" alt="Ninth slide"> </div> <div class="item"> - <img src="images/matlab.jpg" alt="Tenth slide"> + <img src="https://dl.winehq.org/share/images/screenshots/matlab.jpg" alt="Tenth slide"> </div> <div class="item"> - <img src="images/sims3.jpg" alt="Eleventh slide"> + <img src="https://dl.winehq.org/share/images/screenshots/sims3.jpg" alt="Eleventh slide"> </div> <div class="item"> - <img src="images/metatrader5.jpg" alt="Twelfth slide"> + <img src="https://dl.winehq.org/share/images/screenshots/metatrader5.jpg" alt="Twelfth slide"> </div> - </div> + </div> <a class="left carousel-control" href="#carouselScreenshots" data-slide="prev"> <span class="glyphicon glyphicon-chevron-left"></span> <span class="sr-only">Previous</span>

1 0

Jeremy Newman : use url var so local url can work
by Jeremy Newman Sept. 21, 2021

Sept. 21, 2021

Module: appdb Branch: master Commit: bf51036010a5f9ee3564dec42c89792c136157b0 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=bf51036010a5f9ee3564dec… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Sep 21 11:45:30 2021 -0500 use url var so local url can work --- include/screenshot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index 9102aa0..ecdd6bd 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -564,8 +564,8 @@ class screenshot else $url = APPDB_ROOT."data/"; $this->sDescription = preg_replace('/\n/', '', $this->sDescription); - return "<div class=\"whq-shot\"><img src=\"".APPDB_SCREENSHOT_URL."thumbnails/".$this->iScreenshotId."\" style=\"width:130px;\" ". - "alt=\"{$this->sDescription}\" data-shot=\"".APPDB_SCREENSHOT_URL.$this->iScreenshotId."\"><i class=\"fa fa-search-plus\"></i></div>\n"; + return "<div class=\"whq-shot\"><img src=\"".$url."thumbnails/".$this->iScreenshotId."\" style=\"width:130px;\" ". + "alt=\"{$this->sDescription}\" data-shot=\"".$url.$this->iScreenshotId."\"><i class=\"fa fa-search-plus\"></i></div>\n"; } public static function objectGetItemsPerPage($sState = 'accepted')

1 0

Jeremy Newman : session call change
by Jeremy Newman Sept. 21, 2021

Sept. 21, 2021

Module: appdb Branch: master Commit: 89d525fa14ec671b80e7f1eaed3d6e321b9f3ba8 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=89d525fa14ec671b80e7f1e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Sep 21 11:12:39 2021 -0500 session call change --- include/header.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/header.php b/include/header.php index b36aec9..e42d4e3 100644 --- a/include/header.php +++ b/include/header.php @@ -71,11 +71,13 @@ if (!empty($sHeaderCode)) <?php // Display Status Messages -$GLOBALS['session']->dumpmsgbuffer(); -if (is_array($GLOBALS['session']->msg) and count($GLOBALS['session']->msg) > 0) +global $session; +$session->dumpmsgbuffer(); + +if (is_array($session->msg) and count($session->msg) > 0) { echo "<div id=\"whq-alert\">\n"; - foreach ($GLOBALS['session']->msg as $msg) + foreach ($session->msg as $msg) { if (empty($msg)) continue;

1 0

Jeremy Newman : set a session server config option
by Jeremy Newman Sept. 21, 2021

Sept. 21, 2021

Module: appdb Branch: master Commit: 32461dd89cb8b52673085dc6a5e22e42b54f326f URL: https://source.winehq.org/git/appdb.git/?a=commit;h=32461dd89cb8b52673085dc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Sep 21 10:45:46 2021 -0500 set a session server config option --- include/config.php.sample | 4 ++++ include/incl.php | 2 +- include/session.php | 8 ++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/config.php.sample b/include/config.php.sample index 8e1408b..f75d6d8 100644 --- a/include/config.php.sample +++ b/include/config.php.sample @@ -37,6 +37,10 @@ define("RECAPTCHA_SECRET",""); // How old (days) a test report has to before it is judged to be aged define("TESTDATA_AGED_THRESHOLD", 175); +/* + * session server (redis url) + */ +define("APPDB_SESSION_SERVER", "tcp://127.0.0.1:6379?&database=2"); /* * apps database info diff --git a/include/incl.php b/include/incl.php index fe38923..777b5f8 100644 --- a/include/incl.php +++ b/include/incl.php @@ -44,7 +44,7 @@ $_APPDB_debugLog = ""; * Init Session (stores user info in session) */ -$session = new session("whq_appdb"); +$session = new session("whq_appdb", APPDB_SESSION_SERVER); $session->register("current"); if(!isset($_SESSION['current'])) { diff --git a/include/session.php b/include/session.php index db6da24..06c6a22 100644 --- a/include/session.php +++ b/include/session.php @@ -13,11 +13,15 @@ class session public $msg; // create session object - public function __construct ($name, $server = "127.0.0.1", $expire = 30) + public function __construct ($name, $server = "", $expire = 30) { // set name for this session $this->name = $name; + // require server setting + if (empty($server)) + trigger_error("No Session Server Defined!", E_USER_ERROR); + // define options for sessions ini_set('session.name', $this->name); ini_set('session.use_cookies', true); @@ -25,7 +29,7 @@ class session // use memcached ini_set('session.save_handler', 'redis'); - ini_set('session.save_path', "tcp://{$server}:6379?&database=2"); + ini_set('session.save_path', "{$server}"); // default lifetime on session cookie expiration (default 30 days) ini_set('session.gc_maxlifetime', (60 * 60 * 24 * $expire));

1 0

Jeremy Newman : remove appimage loader and load images from CDN
by Jeremy Newman Sept. 21, 2021

Sept. 21, 2021

Module: appdb Branch: master Commit: 0f74052d3a7f447d79d17ef1fcedcdd243d2f0fd URL: https://source.winehq.org/git/appdb.git/?a=commit;h=0f74052d3a7f447d79d17ef… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Sep 21 11:15:46 2021 -0500 remove appimage loader and load images from CDN this should reduce load on the winehq webserver --- appimage.php | 88 ----------------------------------------------- include/config.php.sample | 1 + include/screenshot.php | 33 ++++-------------- 3 files changed, 7 insertions(+), 115 deletions(-) diff --git a/appimage.php b/appimage.php deleted file mode 100644 index f4d1b58..0000000 --- a/appimage.php +++ /dev/null @@ -1,88 +0,0 @@ -<?php -/** - * Shows a thumbnail or a full size screenshot. - * - * Mandatory parameters: - * - iId, image identifier - * - * Optional parameters: - * - bThumbnail, "true" if we want to see a thumbnail, "false" otherwise - * - sREQUEST_METHOD - * - * TODO: - * - rename and document sREQUEST_METHOD - * - replace iId with iScreenshotId - */ - -/** - * parse all the date formats required by HTTP 1.1 into PHP time values - */ -function pHttpDate($sDate) { - $iDate = strtotime($sDate); - if ($iDate != -1) return $iDate; - /* the RFC also requires asctime() format... */ - $aTs = strptime($sDate,"%a %b %e %H:%M:%S %Y"); - $iDate = gmmktime($aTs[2],$aTs[1],$aTs[0],$aTs[4],$aTs[3],$aTs[5],0); - return $iDate; -} - -// application environment -require("path.php"); -require(BASE."include/incl.php"); -require_once(BASE."include/screenshot.php"); - -// an image doesn't have a link, so a cookie makes no sense -header("Set-Cookie: "); -header("Pragma: "); - -// is the user supposed to be viewing this image ? -if(!$_SESSION['current']->canViewImage($aClean['iId'])) - util_show_error_page_and_exit("Insufficient privileges."); - -$oScreenshot = new Screenshot($aClean['iId']); -$fImage = fopen(appdb_fullpath("data/screenshots/".$oScreenshot->sUrl), "rb"); - -/* if we can open the image we should get its last modified time and read */ -/* a few bytes from its header information and close it */ -if($fImage) -{ - $fstat_val = fstat($fImage); - $iModTime = $fstat_val['mtime']; - $sMagic = fread($fImage, 8); /* read 8 bytes from the header, that lets us idenfity the type of - image without loading it */ - fclose($fImage); /* don't leave the fopened image open */ -} - -/* identify what kind of image this is, if we can't identify it */ -/* we should report that its a bad image */ -if (strcmp("\x89PNG\r\n\x1A\n", $sMagic)==0) -{ - header("Content-Type: image/png"); -} else if (preg_match("^\xD8\xFF^", $sMagic)) { - header("Content-Type: image/jpeg"); -} else { - header("500 Bad image format"); - exit; -} - -header("Cache-Control: public"); -header("Expires: "); - -/* if the browser is asking if the file was modified since a particular date */ -/* and the date is the same that the file was modified, then we can report */ -/* that the file wasn't modified, the browser can used the cached image */ -if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && - $iModTime == pHttpDate($_SERVER['HTTP_IF_MODIFIED_SINCE'])) -{ - header("HTTP/1.0 304 Not Modified"); - exit; -} - -header("Last-Modified: ".gmdate("D, d M Y H:i:s",$iModTime)." GMT"); - -if(!$aClean['bThumbnail']) - $oScreenshot->output_screenshot(false); -else - $oScreenshot->output_screenshot(true); - -?> diff --git a/include/config.php.sample b/include/config.php.sample index f75d6d8..8531dca 100644 --- a/include/config.php.sample +++ b/include/config.php.sample @@ -18,6 +18,7 @@ define("APPDB_OWNER","WineHQ"); // with what product/company is this AppDB relat define("APPDB_OWNER_URL","https://www.winehq.org/"); // website of this product/company define("APPDB_OWNER_EMAIL","appdb(a)winehq.org"); // e-mail of this product/company define("APPDB_SENDER_EMAIL","appdb-noreply(a)winehq.org"); // The e-mail address which appears as the sender in mails sent by the AppDB +define("APPDB_SCREENSHOT_URL","https://dl.winehq.org/winehq/appdb/"); // CDN URL of WineHQ appdb images, leave empty to use local define("BUGZILLA_ROOT","https://bugs.winehq.org/"); // path to bugzilla // Google reCaptcha Secret Key - required on account creations diff --git a/include/screenshot.php b/include/screenshot.php index a2f4da2..9102aa0 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -316,24 +316,6 @@ class screenshot return array(); } - function get_screenshot_height() - { - $this->load_image(false); - return $this->oScreenshotImage->get_height(); - } - - function get_thumbnail_width() - { - $this->load_image(true); - return $this->oThumbnailImage->get_width(); - } - - function get_thumbnail_height() - { - $this->load_image(true); - return $this->oThumbnailImage->get_height(); - } - function objectGetSubmitterId() { return $this->iSubmitterId; @@ -577,16 +559,13 @@ class screenshot function get_thumbnail_img() { - $sImgUrl = apidb_fullurl("appimage.php").'?iId='.$this->iScreenshotId; - $sImgWidth = $this->get_thumbnail_width(); - $sImgHeight = $this->get_thumbnail_height(); - if (!$sImgWidth) - $sImgWidth = '130'; - if (!$sImgHeight) - $sImgHeight = '100'; + if (defined("APPDB_SCREENSHOT_URL") and !empty(APPDB_SCREENSHOT_URL)) + $url = APPDB_SCREENSHOT_URL; + else + $url = APPDB_ROOT."data/"; $this->sDescription = preg_replace('/\n/', '', $this->sDescription); - return "<div class=\"whq-shot\"><img src=\"{$sImgUrl}&bThumbnail=true\" style=\"width:{$sImgWidth}px;height:{$sImgHeight}px;\" ". - "alt=\"{$this->sDescription}\" data-shot=\"{$sImgUrl}\"><i class=\"fa fa-search-plus\"></i></div>\n"; + return "<div class=\"whq-shot\"><img src=\"".APPDB_SCREENSHOT_URL."thumbnails/".$this->iScreenshotId."\" style=\"width:130px;\" ". + "alt=\"{$this->sDescription}\" data-shot=\"".APPDB_SCREENSHOT_URL.$this->iScreenshotId."\"><i class=\"fa fa-search-plus\"></i></div>\n"; } public static function objectGetItemsPerPage($sState = 'accepted')

1 0

Gabriel Ivăncescu : jscript: Return the failure code if the value invoke failed.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 749c5d55e546192dfa619d087c61aecd6b3af131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=749c5d55e546192dfa619d08… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 20 17:46:07 2021 +0300 jscript: Return the failure code if the value invoke failed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e5d711a0a53..c7e4ba933b7 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2143,6 +2143,8 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W if(args != buf) heap_free(args); + if(FAILED(hres)) + return hres; if(!r) return S_OK;

1 0

Connor McAdams : user32/tests: Fix missing messages in test_mdi_messages() message sequences.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 7f6d723e50ab841b0f6ffc32778f14cbc38db109 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f6d723e50ab841b0f6ffc32… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sat Sep 18 21:39:50 2021 -0400 user32/tests: Fix missing messages in test_mdi_messages() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f845286b850..ee1f5ced292 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3389,6 +3389,7 @@ static const struct message WmCreateMDIchildVisibleMaxSeq3[] = { { 0x0093, sent|optional }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* MDI child */ { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* MDI client, not sent on Win7. */ + { 0x0093, sent|optional }, /* Win8+ sends an extra. */ { WM_NCCALCSIZE, sent|wparam|optional, 1 }, /* XP sends it to MDI frame */ { 0x0093, sent|defwinproc|optional }, { 0x0093, sent|defwinproc|optional }, @@ -3617,6 +3618,7 @@ static const struct message WmDestroyMDIchildVisibleMaxSeq1[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* MDI child */ { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* MDI client */ { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* MDI frame */ + { 0x0093, sent|optional }, /* Win8+ sends an extra. */ { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* XP sends a duplicate */ /* in MDI frame */ @@ -3626,6 +3628,7 @@ static const struct message WmDestroyMDIchildVisibleMaxSeq1[] = { { 0x0093, sent|defwinproc|optional }, { 0x0093, sent|defwinproc|optional }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { 0x0093, sent|optional }, /* Win8+ sends an extra. */ { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* MDI frame */ { 0x0093, sent|optional }, @@ -18483,6 +18486,7 @@ START_TEST(msg) test_setwindowpos(); test_showwindow(); invisible_parent_tests(); + test_mdi_messages(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18493,7 +18497,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_mdi_messages(); test_button_messages(); test_button_bm_get_set_image(); test_button_style();

1 0

Eduard Permyakov : dsound: Commit next audio chunk between play cursor and write cursor to playing.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: wine Branch: master Commit: 975d0632a19efd41338cb73a97f1b0bdbe7bc0cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=975d0632a19efd41338cb73a… Author: Eduard Permyakov <epermyakov(a)codeweavers.com> Date: Tue Sep 14 13:05:18 2021 +0300 dsound: Commit next audio chunk between play cursor and write cursor to playing. This region of the audio buffer is forbidden to be written to by the DirectSound specification. The documentation states: "The write cursor is the point after which it is safe to write data into the buffer. The block between the play cursor and the write cursor is already committed to be played, and cannot be changed safely." However, some applications still do this, which has lead to audio glitches only when using the Wine DirectSound implementation. Experiments showed that the native DirctSound implementation will still play the old audio the first time around when the buffer region gets overwritten. Use an approach of copying the next forbidden region into a "committed buffer" to add the same behavior to the Wine implementation. Out of performance considerations, only copy data to the committed buffer when we detect that an overwrite is possible (i.e. the current mixing region of the buffer gets locked). Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 66 ++++++++++++++++++++++++++++++++++++++++++-- dlls/dsound/dsound_convert.c | 33 +++++++++++----------- dlls/dsound/dsound_private.h | 11 ++++++-- dlls/dsound/mixer.c | 48 +++++++++++++++++++++++++------- 4 files changed, 125 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=975d0632a19efd41338c…

1 0