September 2019 - Wine-Commits

Francois Gouget : testbot/TestAgent: Give up early connecting to invalid hostnames / ports.
by Alexandre Julliard Sept. 10, 2019

Sept. 10, 2019

Module: tools Branch: master Commit: 68cdb4bfb942b0c98a3e65a8ddbf7e22f8a6ce18 URL: https://source.winehq.org/git/tools.git/?a=commit;h=68cdb4bfb942b0c98a3e65a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 10 11:01:27 2019 +0200 testbot/TestAgent: Give up early connecting to invalid hostnames / ports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index ca81283..a4a2f49 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -905,6 +905,11 @@ sub _Connect($) if (!$self->{fd}) { alarm(0); + if ($!{EINVAL}) + { + $self->_SetError($FATAL, "The '$self->{agenthost}' hostname or the '$self->{agentport}' port is invalid."); + die "socket"; + } $self->_SetError($FATAL, $!); return; # out of eval } @@ -930,12 +935,16 @@ sub _Connect($) $self->{rpc} = $OldRPC; return 1; } + if ($@) { - $self->_SetError($FATAL, "Timed out in $Step while connecting to $self->{connection}"); + if ($@ eq "timeout") + { + $self->_SetError($FATAL, "Timed out in $Step while connecting to $self->{connection}"); + } + last; } - # Ideally we should probably check the error and not retry if it is likely - # permanent, like a hostname that does not resolve. + my $Remaining = $Attempt * $self->{cinterval} - (time() - $Start); sleep($Remaining) if ($Remaining > 0); }

1 0

Francois Gouget : testbot/web: Use NotifyAdministrator() to send admin notifications.
by Alexandre Julliard Sept. 10, 2019

Sept. 10, 2019

Module: tools Branch: master Commit: 26b4a620dd65cce2e635acab1a1ff4bad274f094 URL: https://source.winehq.org/git/tools.git/?a=commit;h=26b4a620dd65cce2e635aca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 10 11:08:00 2019 +0200 testbot/web: Use NotifyAdministrator() to send admin notifications. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Feedback.pl | 17 ++++++----------- testbot/web/Register.pl | 11 +---------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 2adc4cd..36f0a2b 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -26,6 +26,7 @@ our @ISA = qw(ObjectModel::CGI::FreeFormPage); use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; +use WineTestBot::Utils; sub _initialize($$$) @@ -83,17 +84,11 @@ sub OnSend($) return !1; } - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL <<"EOF"; -From: $RobotEMail -To: $AdminEMail -Subject: winetestbot feedback - -EOF - print SENDMAIL "Name: ", $self->GetParam("Name"), "\n"; - print SENDMAIL "EMail: ", $self->GetParam("EMail"), "\n\n"; - print SENDMAIL "Remarks:\n", $self->GetParam("Remarks"), "\n"; - close(SENDMAIL); + NotifyAdministrator("winetestbot feedback", + "Name: ". $self->GetParam("Name") ."\n". + "EMail: ". $self->GetParam("EMail") ."\n\n". + "Remarks:\n". + $self->GetParam("Remarks")); return 1; } diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 207728e..23f57a9 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -142,16 +142,7 @@ sub OnSendRequest($) my $URL = ($UseSSL ? "https://" : "http://") . $WebHostName . "/admin/UserDetails.pl?Key=" . uri_escape($self->GetParam("Name")); $Msg .= "\nTo approve or deny the request, please go to " . $URL; - - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL <<"EOF"; -From: $RobotEMail -To: $AdminEMail -Subject: winetestbot account request - -$Msg -EOF - close(SENDMAIL); + NotifyAdministrator("winetestbot account request", $Msg); return 1; }

1 0

Jeremy Newman : fix function required param for php 7.3
by Jeremy Newman Sept. 9, 2019

Sept. 9, 2019

Module: appdb Branch: master Commit: 0984a022cfdcaa1d5e329e8452fa6724a323018b URL: https://source.winehq.org/git/appdb.git/?a=commit;h=0984a022cfdcaa1d5e329e8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Sep 9 19:08:07 2019 -0500 fix function required param for php 7.3 --- include/objectManager.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 50f5bf3..2cec8cf 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -332,7 +332,7 @@ class ObjectManager $this->showNumberOfResults($oObject); /* Should we let the class draw its own custom table? */ - if(method_exists($this->sClass, 'objectWantCustomDraw') && + if(method_exists($this->sClass, 'objectWantCustomDraw') && $oObject->objectWantCustomDraw('table', $sQueued)) $oObject->objectDrawCustomTable($hResult, $sQueued, $this); else @@ -419,7 +419,7 @@ class ObjectManager echo html_frame_start($sReplyFieldHeader, "90%", "", 0); echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; echo '<tr valign=top><td class="color0"><b>E-mail Text</b></td>',"\n"; - echo '<td><textarea name="sReplyText" style="width: 100%" cols="80" '. + echo '<td><textarea name="sReplyText" style="width: 100%" cols="80" '. 'rows="10">'.$sDefaultReply.'</textarea></td></tr>',"\n"; } if($this->getIsQueue()) @@ -446,7 +446,7 @@ class ObjectManager echo '<tr valign=top><td class="color0"></td>',"\n"; echo '<td class="color0">'; echo '<span class="pseudolink" onClick="document.forms[\'sQform\'][\'sReplyText\'].value += \''.addcslashes(htmlspecialchars($sReply),"'\r\n").' \';">'.nl2br($sReply).'</span>'; - echo '</td>',"\n"; + echo '</td>',"\n"; } // end output for common responses ///////////////////////////////////////////////// @@ -455,7 +455,7 @@ class ObjectManager /* buttons for operations we can perform on this entry */ echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n"; - echo '<input name="sSubmit" type="submit" value="Submit" class="button" '. + echo '<input name="sSubmit" type="submit" value="Submit" class="button" '. '>',"\n"; if(!$this->getOptionalSetting("objectHideDelete", FALSE)) { @@ -948,7 +948,7 @@ class ObjectManager if($oCandidate->objectGetId() == $oParent->objectGetId()) continue; - echo html_tr(array($oCandidate->objectMakeLink(), + echo html_tr(array($oCandidate->objectMakeLink(), "<a href=\"".$this->makeUrl('changeParent', $this->iId). "&iNewId=".$oCandidate->objectGetId()."\">Move here</a>"), ($i % 2) ? "color0" : "color1"); $i++; @@ -1022,7 +1022,7 @@ class ObjectManager if($oCandidate->objectGetId() == $this->iId) continue; - echo html_tr(array($oCandidate->objectMakeLink(), + echo html_tr(array($oCandidate->objectMakeLink(), "<a href=\"".$this->makeUrl("moveChildren", $this->iId). "&iNewId=".$oCandidate->objectGetId()."\">Move here</a>"), ($i % 2) ? "color0" : "color1"); $i++; @@ -1463,7 +1463,7 @@ class ObjectManager $this->oObject = $oObject; $this->delete_entry($aClean['sReplyText']); break; - + case "Cancel": break; @@ -1592,7 +1592,7 @@ class ObjectManager } /* Output headers for a table */ - private function outputHeader($sClass) + private function outputHeader($sClass = "") { $oObject = new $this->sClass(); $oTableRow = $oObject->objectGetHeader($this->sState); @@ -1667,12 +1667,12 @@ class ObjectManager $iItemsPerPage = $iDefaultPerPage; - if ( isset($aClean['iItemsPerPage']) && + if ( isset($aClean['iItemsPerPage']) && in_array($aClean['iItemsPerPage'], $aItemsPerPage) ) { $iItemsPerPage = $aClean['iItemsPerPage']; } - + // if $bItemsPerPageSelector is true, display the items // per-page dropdown and update button if($bItemsPerPageSelector)

1 0

Jeremy Newman : switch to redis for sessions
by Jeremy Newman Sept. 9, 2019

Sept. 9, 2019

Module: appdb Branch: master Commit: 880812e7cccdfd2eaf08e05cb34469e024c77f69 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=880812e7cccdfd2eaf08e05… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Sep 9 19:08:34 2019 -0500 switch to redis for sessions --- include/session.php | 83 ++++++----------------------------------------------- 1 file changed, 9 insertions(+), 74 deletions(-) diff --git a/include/session.php b/include/session.php index 0a90584..db6da24 100644 --- a/include/session.php +++ b/include/session.php @@ -9,21 +9,12 @@ class session { // defines - private $_server; - private $_expire; - private $_db; private $name; public $msg; // create session object public function __construct ($name, $server = "127.0.0.1", $expire = 30) { - // set the connection server - $this->_server = $server; - - // set the session and cookie expiration time in days (default 30 days) - $this->_expire = (60 * 60 * 24 * $expire); - // set name for this session $this->name = $name; @@ -32,28 +23,18 @@ class session ini_set('session.use_cookies', true); ini_set('session.use_only_cookies', true); - // setup session object - session_set_save_handler( - array(&$this, "_open"), - array(&$this, "_close"), - array(&$this, "_read"), - array(&$this, "_write"), - array(&$this, "_destroy"), - array(&$this, "_gc") - ); - - // default lifetime on session cookie - session_set_cookie_params( - $this->_expire, - '/' - ); + // use memcached + ini_set('session.save_handler', 'redis'); + ini_set('session.save_path', "tcp://{$server}:6379?&database=2"); - // start the loaded session - session_start(); + // default lifetime on session cookie expiration (default 30 days) + ini_set('session.gc_maxlifetime', (60 * 60 * 24 * $expire)); + session_set_cookie_params((60 * 60 * 24 * $expire), '/'); - // make sure we have a valid memcache server connection - if (!$this->_db->getVersion()) + // start the loaded session + if (!session_start()) { + // session failed to start trigger_error("Unable to Connect to Session Server", E_USER_ERROR); } } @@ -116,52 +97,6 @@ class session } $_SESSION['_msg'] = array(); } - - // connect to session - public function _open ($save_path, $session_name) - { - $this->_db = new Memcache; - return $this->_db->connect($this->_server, "11211"); - } - - // close the session - public function _close () - { - return $this->_db->close(); - } - - // restore a session from memory - public function _read ($id) - { - return $this->_db->get($id); - } - - // write the session - public function _write ($id, $data) - { - if ($this->_db->get($id)) - { - $this->_db->replace($id, $data, null, $this->_expire); - } - else - { - $this->_db->set($id, $data, null, $this->_expire); - } - return true; - } - - // Delete the Session - public function _destroy ($id) - { - return $this->_db->delete($id, 0); - } - - // Garbage Collector (Not Needed for MemCache) - public function _gc ($maxlifetime) - { - return true; - } - } // end session

1 0

Zebediah Figura : winegstreamer: Get rid of the unused "discont" field from GstImpl.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: c98c263266cd1f3d285c1780b55d04fc3e37d2ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=c98c263266cd1f3d285c1780… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 8 13:55:05 2019 -0500 winegstreamer: Get rid of the unused "discont" field from GstImpl. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3761dbc..41afc22 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -60,7 +60,7 @@ typedef struct GSTImpl { LONGLONG filesize; - BOOL discont, initial, ignore_flush; + BOOL initial, ignore_flush; GstElement *container; GstPad *my_src, *their_sink; GstBus *bus; @@ -1123,7 +1123,7 @@ static HRESULT GST_Connect(GSTImpl *This, IPin *pConnectPin, ALLOCATOR_PROPERTIE This->start = This->nextofs = This->nextpullofs = This->stop = 0; /* Add initial pins */ - This->initial = This->discont = TRUE; + This->initial = TRUE; ResetEvent(This->no_more_pads_event); gst_element_set_state(This->container, GST_STATE_PLAYING); ret = gst_element_get_state(This->container, NULL, NULL, -1);

1 0

Zebediah Figura : winegstreamer: Get rid of the unused "gstpool" field from GSTOutPin.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: da69d353aa58120a1cf913ccbdd7ea7f99eebd0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=da69d353aa58120a1cf913cc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 8 13:55:02 2019 -0500 winegstreamer: Get rid of the unused "gstpool" field from GSTOutPin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index bf8f1de..ef11ed6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -82,7 +82,6 @@ struct GSTOutPin { GstPad *flip_sink, *flip_src; GstPad *their_src; GstPad *my_sink; - GstBufferPool *gstpool; BOOL isaud, isvid; AM_MEDIA_TYPE * pmt; HANDLE caps_event; @@ -1769,8 +1768,6 @@ static void free_source_pin(GSTOutPin *pin) CloseHandle(pin->caps_event); DeleteMediaType(pin->pmt); gst_segment_free(pin->segment); - if (pin->gstpool) - gst_object_unref(pin->gstpool); strmbase_source_cleanup(&pin->pin); heap_free(pin);

1 0

Zebediah Figura : winegstreamer: Get rid of the "isaud" and "isvid" fields of GstOutPin.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: 92e4d336359096deecde07a8d5248c0c4df8380f URL: https://source.winehq.org/git/wine.git/?a=commit;h=92e4d336359096deecde07a8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 8 13:55:03 2019 -0500 winegstreamer: Get rid of the "isaud" and "isvid" fields of GstOutPin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index ef11ed6..4b64dba 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -82,7 +82,6 @@ struct GSTOutPin { GstPad *flip_sink, *flip_src; GstPad *their_src; GstPad *my_sink; - BOOL isaud, isvid; AM_MEDIA_TYPE * pmt; HANDLE caps_event; GstSegment *segment; @@ -258,7 +257,6 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) static gboolean accept_caps_sink(GstPad *pad, GstCaps *caps) { - GSTOutPin *pin = gst_pad_get_element_private(pad); AM_MEDIA_TYPE amt; GstStructure *arg; const char *typename; @@ -269,20 +267,12 @@ static gboolean accept_caps_sink(GstPad *pad, GstCaps *caps) arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); if (!strcmp(typename, "audio/x-raw")) { - if (!pin->isaud) { - ERR("Setting audio caps on non-audio pad?\n"); - return FALSE; - } ret = amt_from_gst_caps_audio(caps, &amt); if (ret) FreeMediaType(&amt); TRACE("+%i\n", ret); return ret; } else if (!strcmp(typename, "video/x-raw")) { - if (!pin->isvid) { - ERR("Setting video caps on non-video pad?\n"); - return FALSE; - } ret = amt_from_gst_caps_video(caps, &amt); if (ret) FreeMediaType(&amt); @@ -308,16 +298,8 @@ static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); if (!strcmp(typename, "audio/x-raw")) { - if (!pin->isaud) { - ERR("Setting audio caps on non-audio pad?\n"); - return FALSE; - } ret = amt_from_gst_caps_audio(caps, &amt); } else if (!strcmp(typename, "video/x-raw")) { - if (!pin->isvid) { - ERR("Setting video caps on non-video pad?\n"); - return FALSE; - } ret = amt_from_gst_caps_video(caps, &amt); if (ret) This->props.cbBuffer = max(This->props.cbBuffer, ((VIDEOINFOHEADER*)amt.pbFormat)->bmiHeader.biSizeImage); @@ -793,7 +775,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) GstPad *mypad; GSTOutPin *pin; int ret; - BOOL isvid = FALSE, isaud = FALSE; gchar my_name[1024]; WCHAR nameW[128]; @@ -817,11 +798,8 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) gst_pad_set_event_function(mypad, event_sink_wrapper); gst_pad_set_query_function(mypad, query_sink_wrapper); - if (!strcmp(typename, "audio/x-raw")) { - isaud = TRUE; - } else if (!strcmp(typename, "video/x-raw")) { - isvid = TRUE; - } else { + if (strcmp(typename, "audio/x-raw") && strcmp(typename, "video/x-raw")) + { FIXME("Unknown type \'%s\'\n", typename); return; } @@ -835,12 +813,11 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) pin = This->ppPins[This->cStreams - 1]; gst_pad_set_element_private(mypad, pin); pin->my_sink = mypad; - pin->isaud = isaud; - pin->isvid = isvid; gst_segment_init(pin->segment, GST_FORMAT_TIME); - if (isvid) { + if (!strcmp(typename, "video/x-raw")) + { GstElement *vconv; TRACE("setting up videoflip filter for pin %p, my_sink: %p, their_src: %p\n",

1 0

Alistair Leslie-Hughes : include: Add DSFX_I3DL2REVERB defines.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: 74c6751c671771fb6c10f7eb9e7dfe7af3c1dc38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74c6751c671771fb6c10f7eb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 9 04:55:03 2019 +0000 include: Add DSFX_I3DL2REVERB defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index 44bfccf..74b4bcd 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -460,6 +460,46 @@ typedef struct _DSFXI3DL2Reverb FLOAT flHFReference; } DSFXI3DL2Reverb, *LPDSFXI3DL2Reverb; +#define DSFX_I3DL2REVERB_DECAYTIME_DEFAULT 1.49f +#define DSFX_I3DL2REVERB_DECAYTIME_MIN 0.1f +#define DSFX_I3DL2REVERB_DECAYTIME_MAX 20.0f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_DEFAULT 0.83f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_MIN 0.1f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_MAX 2.0f +#define DSFX_I3DL2REVERB_DENSITY_DEFAULT 100.0f +#define DSFX_I3DL2REVERB_DENSITY_MIN 0.0f +#define DSFX_I3DL2REVERB_DENSITY_MAX 100.0f +#define DSFX_I3DL2REVERB_DIFFUSION_DEFAULT 100.0f +#define DSFX_I3DL2REVERB_DIFFUSION_MIN 0.0f +#define DSFX_I3DL2REVERB_DIFFUSION_MAX 100.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_DEFAULT 5000.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_MIN 20.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_MAX 20000.0f +#define DSFX_I3DL2REVERB_QUALITY_DEFAULT 2 +#define DSFX_I3DL2REVERB_QUALITY_MIN 0 +#define DSFX_I3DL2REVERB_QUALITY_MAX 3 +#define DSFX_I3DL2REVERB_REFLECTIONS_DEFAULT (-2602) +#define DSFX_I3DL2REVERB_REFLECTIONS_MIN (-10000) +#define DSFX_I3DL2REVERB_REFLECTIONS_MAX 1000 +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_DEFAULT 0.007f +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MIN 0.0f +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MAX 0.3f +#define DSFX_I3DL2REVERB_REVERB_MIN (-10000) +#define DSFX_I3DL2REVERB_REVERB_MAX 2000 +#define DSFX_I3DL2REVERB_REVERB_DEFAULT 200 +#define DSFX_I3DL2REVERB_REVERBDELAY_MIN 0.0f +#define DSFX_I3DL2REVERB_REVERBDELAY_MAX 0.1f +#define DSFX_I3DL2REVERB_REVERBDELAY_DEFAULT 0.011f +#define DSFX_I3DL2REVERB_ROOM_DEFAULT (-1000) +#define DSFX_I3DL2REVERB_ROOM_MIN 10000 +#define DSFX_I3DL2REVERB_ROOM_MAX 0 +#define DSFX_I3DL2REVERB_ROOMHF_MIN (-10000) +#define DSFX_I3DL2REVERB_ROOMHF_MAX 0 +#define DSFX_I3DL2REVERB_ROOMHF_DEFAULT (-100) +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MIN 0.0f +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MAX 10.0f +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_DEFAULT 0.0f + typedef const DSFXI3DL2Reverb *LPCDSFXI3DL2Reverb; #define DSCCAPS_EMULDRIVER DSCAPS_EMULDRIVER

1 0

Dmitry Timoshkov : localspl/tests: Add support for monitors providing the MONITOR2 interface.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: ce9835df01adc6996c99c20422cf056416e6ad6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9835df01adc6996c99c204… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:58:05 2019 +0800 localspl/tests: Add support for monitors providing the MONITOR2 interface. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/tests/localmon.c | 190 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 168 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce9835df01adc6996c99…

1 0

Dmitry Timoshkov : localspl: Add MONITORREG stub callbacks for InitializePrintMonitor2.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: 29ecb6f4bc48ed6520584785d0bb828bc503d922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29ecb6f4bc48ed6520584785… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:57:55 2019 +0800 localspl: Add MONITORREG stub callbacks for InitializePrintMonitor2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 866a074..326313d 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -369,6 +369,92 @@ static void monitor_unloadall(void) LeaveCriticalSection(&monitor_handles_cs); } +static LONG WINAPI CreateKey(HANDLE hcKey, LPCWSTR pszSubKey, DWORD dwOptions, + REGSAM samDesired, PSECURITY_ATTRIBUTES pSecurityAttributes, + PHANDLE phckResult, PDWORD pdwDisposition, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI OpenKey(HANDLE hcKey, LPCWSTR pszSubKey, REGSAM samDesired, + PHANDLE phkResult, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI CloseKey(HANDLE hcKey, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI DeleteKey(HANDLE hcKey, LPCWSTR pszSubKey, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI EnumKey(HANDLE hcKey, DWORD dwIndex, LPWSTR pszName, + PDWORD pcchName, PFILETIME pftLastWriteTime, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI QueryInfoKey(HANDLE hcKey, PDWORD pcSubKeys, PDWORD pcbKey, + PDWORD pcValues, PDWORD pcbValue, PDWORD pcbData, + PDWORD pcbSecurityDescriptor, PFILETIME pftLastWriteTime, + HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI SetValue(HANDLE hcKey, LPCWSTR pszValue, DWORD dwType, + const BYTE* pData, DWORD cbData, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI DeleteValue(HANDLE hcKey, LPCWSTR pszValue, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI EnumValue(HANDLE hcKey, DWORD dwIndex, LPWSTR pszValue, + PDWORD pcbValue, PDWORD pType, PBYTE pData, PDWORD pcbData, + HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static LONG WINAPI QueryValue(HANDLE hcKey, LPCWSTR pszValue, PDWORD pType, + PBYTE pData, PDWORD pcbData, HANDLE hSpooler) +{ + FIXME("stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static MONITORREG monreg = +{ + sizeof(MONITORREG), + CreateKey, + OpenKey, + CloseKey, + DeleteKey, + EnumKey, + QueryInfoKey, + SetValue, + DeleteValue, + EnumValue, + QueryValue +}; + /****************************************************************** * monitor_load [internal] * @@ -491,6 +577,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) memset(&init, 0, sizeof(init)); init.cbSize = sizeof(init); init.hckRegistryRoot = hroot; + init.pMonitorReg = &monreg; init.bLocal = TRUE; monitor2 = pInitializePrintMonitor2(&init, &hmon);

1 0