wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Francois Gouget : testbot/TestAgent: Give up early connecting to invalid hostnames / ports.
by Alexandre Julliard 10 Sep '19

10 Sep '19

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/Engine: Make sure not to schedule jobs on VMs undergoing maintenance!.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: tools Branch: master Commit: faf695bc06e43191a6af80075c0eda859bdf7942 URL: https://source.winehq.org/git/tools.git/?a=commit;h=faf695bc06e43191a6af800… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 10 11:07:52 2019 +0200 testbot/Engine: Make sure not to schedule jobs on VMs undergoing maintenance!. After a series of revert failures the scheduler would put the VM in maintenance mode but still put it in the list of VMs that can be reverted to run a new task. Now such VMs are put in the busy list so no task is scheduled on them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 3ce9089..1b42ea9 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -274,15 +274,22 @@ sub _CheckAndClassifyVMs() { my $Errors = ($VM->Errors || 0) + 1; $VM->Errors($Errors); - $NewStatus = "maintenance" if ($Errors >= $MaxVMErrors); + if ($Errors >= $MaxVMErrors) + { + $NewStatus = "maintenance"; + $Sched->{busyvms}->{$VMKey} = 1; + } } $VM->Status($NewStatus); $VM->KillChild(); $VM->Save(); $VM->RecordResult($Sched->{records}, "boterror stuck process"); - $Sched->{lambvms}->{$VMKey} = 1; - $Host->{dirty}++; - $Host->{active}++; + if ($NewStatus eq "dirty") + { + $Sched->{lambvms}->{$VMKey} = 1; + $Host->{dirty}++; + $Host->{active}++; + } } elsif ($VM->Status =~ /^(?:dirty|running|reverting)$/) {

1 0

Jeremy Newman : switch to redis for sessions
by Jeremy Newman 10 Sep '19

10 Sep '19

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

Jeremy Newman : fix function required param for php 7.3
by Jeremy Newman 10 Sep '19

10 Sep '19

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

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 01b19b63a454aa455928c10c694895fdba901aba URL: https://source.winehq.org/git/wine.git/?a=commit;h=01b19b63a454aa455928c10c… Author: Kim Malmo <berencamlost(a)msn.com> Date: Sun Sep 8 10:00:48 2019 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 72 ++++++------------------------------------------------------- 1 file changed, 7 insertions(+), 65 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 0b6284a..2e345fc 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -172,7 +172,7 @@ msgid "" "href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine fant ikke wine-mono-pakken, som er nødvendig for at .NET programmer " +"Wine fant ikke wine-mono pakken, som er nødvendig for at .NET programmer " "skal fungere ordentlig. Wine kan laste ned og installere denne pakken for " "deg.\n" "\n" @@ -7333,10 +7333,8 @@ msgid "Stream descriptor is not selected.\n" msgstr "Enheten er ikke koblet til.\n" #: mferror.mc:697 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "Indeksen mangler.\n" +msgstr "Kilde mangler.\n" #: mferror.mc:704 msgid "Topology loader does not support sink activates.\n" @@ -11161,10 +11159,6 @@ msgid "" msgstr "Tidsformatet til \"song pointer\" og SMPTE kan ikke brukes sammen." #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -11185,10 +11179,6 @@ msgid "An error occurred with the specified port." msgstr "En feil oppstod med den oppgitte porten." #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." @@ -15339,7 +15329,7 @@ msgstr "Vanlig metafil-framviser" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metafiler (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -15510,16 +15500,12 @@ msgid "Drive configuration" msgstr "Oppsett av stasjoner" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." msgstr "" -"Klarte ikke koble til monteringsbehandleren; diskstasjonene kan derfor ikke " -"redigeres." +"Klarte ikke koble til monteringsbehandleren; stasjonsoppsettet kan derfor " +"ikke redigeres." #: winecfg.rc:236 msgid "A&dd..." @@ -15804,12 +15790,6 @@ msgid "System drive" msgstr "Systemstasjon" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -16888,10 +16868,8 @@ msgid "Text documents (*.txt)" msgstr "Tekstdokument (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Unicode-tekstdokument (*.txt)" +msgstr "Unicode-tekstdokumenter (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)" @@ -17093,42 +17071,6 @@ msgid "D" msgstr "K" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -17192,7 +17134,7 @@ msgstr "" "[/A] Bare kopier filer som er markert som arkiv.\n" "[/M] Bare kopier filer som er markert som arkiv; fjern denne\n" "\tmerkingen etterpå.\n" -"[/K] Kopier filegenskaper, uten denne blir ikke egenskapene preservert.\n" +"[/K] Kopier filegenskaper; uten denne blir ikke egenskapene preservert.\n" "[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n" "\t\tden oppgitte datoen. Hvis ingen dato oppgis kopieres det bare hvis\n" "\t\tmålet er eldre enn kilden.\n"

1 0

Dmitry Timoshkov : localspl/tests: Add support for monitors providing the MONITOR2 interface.
by Alexandre Julliard 09 Sep '19

09 Sep '19

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 09 Sep '19

09 Sep '19

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

Dmitry Timoshkov : winsplp.h: Fix MONITORINIT definition.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: a471c42b8fa73633edf6509790350b9c0e57a8df URL: https://source.winehq.org/git/wine.git/?a=commit;h=a471c42b8fa73633edf65097… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:57:52 2019 +0800 winsplp.h: Fix MONITORINIT definition. 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> --- include/ddk/winsplp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/winsplp.h b/include/ddk/winsplp.h index 3776ba6..162f673 100644 --- a/include/ddk/winsplp.h +++ b/include/ddk/winsplp.h @@ -155,6 +155,7 @@ typedef struct _MONITORINIT { HANDLE hckRegistryRoot; PMONITORREG pMonitorReg; BOOL bLocal; + LPCWSTR pszServerName; } MONITORINIT, *PMONITORINIT; typedef struct _MONITORUI {

1 0

Dmitry Timoshkov : localspl: Fix MONITOR2 callback prototypes.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 01d6835835e44cbc5a3d2be3ba8810ade943806d URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d6835835e44cbc5a3d2be3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:57:48 2019 +0800 localspl: Fix MONITOR2 callback prototypes. 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 | 106 ++++++++++++++++++++++++++++++++++++++++++----- include/ddk/winsplp.h | 17 ++++---- 2 files changed, 105 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01d6835835e44cbc5a3d…

1 0

Dmitry Timoshkov : localspl: Fix MONITOR2.cbSize calculation when converting from MONITOREX.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 24a16c0037fd7c0f0d15c6980e4cc77ea642e89e URL: https://source.winehq.org/git/wine.git/?a=commit;h=24a16c0037fd7c0f0d15c698… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:57:45 2019 +0800 localspl: Fix MONITOR2.cbSize calculation when converting from MONITOREX. 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/localmon.c | 2 +- dlls/localspl/provider.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 6937e05..e634a33 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -777,7 +777,7 @@ LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot) { static MONITOREX mymonitorex = { - sizeof(MONITOREX) - sizeof(DWORD), + sizeof(MONITOR), { localmon_EnumPortsW, localmon_OpenPortW, diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4627284..7a12751 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -504,7 +504,9 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (pmonitorEx) { /* Layout of MONITOREX and MONITOR2 mostly matches */ - memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize + sizeof(DWORD), sizeof(pm->monitor))); + memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize + sizeof(void *), sizeof(pm->monitor))); + /* MONITOREX.dwMonitorSize doesn't include the size field, while MONITOR2.cbSize does */ + pm->monitor.cbSize += sizeof(void *); pm->old_XcvOpenPort = pmonitorEx->Monitor.pfnXcvOpenPort; pm->monitor.pfnXcvOpenPort = NULL; }

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2019