January 2007 - Wine-commits

appdb/include testData.php
by WineHQ 09 Jan '07

09 Jan '07

ChangeSet ID: 30870 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/08 22:42:34 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Switch Xinha editor values from strings to html values so the filtering system won't strip out html tags Patch: http://cvs.winehq.org/patch.py?id=30870 Old revision New revision Changes Path 1.18 1.19 +26 -26 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.18 appdb/include/testData.php:1.19 --- appdb/include/testData.php:1.18 9 Jan 2007 4:42:34 -0000 +++ appdb/include/testData.php 9 Jan 2007 4:42:34 -0000 @@ -9,9 +9,9 @@ require_once(BASE."include/util.php"); class testData{ var $iTestingId; var $iVersionId; - var $sWhatWorks; - var $sWhatDoesnt; - var $sWhatNotTested; + var $shWhatWorks; + var $shWhatDoesnt; + var $shWhatNotTested; var $sTestedRelease; var $iDistributionId; var $sTestedDate; @@ -42,9 +42,9 @@ class testData{ { $this->iTestingId = $oRow->testingId; $this->iVersionId = $oRow->versionId; - $this->sWhatWorks = $oRow->whatWorks; - $this->sWhatDoesnt = $oRow->whatDoesnt; - $this->sWhatNotTested = $oRow->whatNotTested; + $this->shWhatWorks = $oRow->whatWorks; + $this->shWhatDoesnt = $oRow->whatDoesnt; + $this->shWhatNotTested = $oRow->whatNotTested; $this->sTestedDate = $oRow->testedDate; $this->iDistributionId = $oRow->distributionId; $this->sTestedRelease = $oRow->testedRelease; @@ -78,8 +78,8 @@ class testData{ "installs, runs, testedRating, comments, submitterId, queued)". " VALUES('?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?',". "'?', '?')", - $this->iVersionId, $this->sWhatWorks, $this->sWhatDoesnt, - $this->sWhatNotTested, $this->sTestedDate, $this->iDistributionId, + $this->iVersionId, $this->shWhatWorks, $this->shWhatDoesnt, + $this->shWhatNotTested, $this->sTestedDate, $this->iDistributionId, $this->sTestedRelease, $this->sInstalls, $this->sRuns, $this->sTestedRating, $this->sComments, $_SESSION['current']->iUserId, $this->sQueued); @@ -123,9 +123,9 @@ class testData{ comments = '?' WHERE testingId = '?'", $this->iVersionId, - $this->sWhatWorks, - $this->sWhatDoesnt, - $this->sWhatNotTested, + $this->shWhatWorks, + $this->shWhatDoesnt, + $this->shWhatNotTested, $this->sTestedDate, $this->iDistributionId, $this->sTestedRelease, @@ -357,11 +357,11 @@ class testData{ function ShowTestResult() { echo '<p><b>What works</b><br />',"\n"; - echo $this->sWhatWorks; + echo $this->shWhatWorks; echo '<p><b>What does not</b><br />',"\n"; - echo $this->sWhatDoesnt; + echo $this->shWhatDoesnt; echo '<p><b>What was not tested</b><br />',"\n"; - echo $this->sWhatNotTested; + echo $this->shWhatNotTested; echo '<p><b>Additional Comments</b><br />',"\n"; echo $this->sComments; } @@ -500,16 +500,16 @@ class testData{ // What works echo '<tr valign=top><td class="color0"><b>What works</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test1" name="sWhatWorks">'; - echo $this->sWhatWorks.'</textarea></p></td></tr>',"\n"; + echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test1" name="shWhatWorks">'; + echo $this->shWhatWorks.'</textarea></p></td></tr>',"\n"; // What Does not work echo '<tr valign=top><td class=color1><b>What does not work</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test2" name="sWhatDoesnt">'; - echo $this->sWhatDoesnt.'</textarea></p></td></tr>',"\n"; + echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test2" name="shWhatDoesnt">'; + echo $this->shWhatDoesnt.'</textarea></p></td></tr>',"\n"; // What was not tested echo '<tr valign=top><td class=color0><b>What was not tested</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test3" name="sWhatNotTested">'; - echo $this->sWhatNotTested.'</textarea></p></td></tr>',"\n"; + echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test3" name="shWhatNotTested">'; + echo $this->shWhatNotTested.'</textarea></p></td></tr>',"\n"; // Date Tested echo '<tr valign=top><td class="color1"><b>Date tested </b></td>',"\n"; echo '<td class="color0"><input type=text name="sTestedDate" value="'.$this->sTestedDate.'" size="20"></td></tr>',"\n"; @@ -557,13 +557,13 @@ class testData{ function CheckOutputEditorInput($aValues, $sDistribution="") { $errors = ""; - if (empty($aValues['sWhatWorks'])) + if (empty($aValues['shWhatWorks'])) $errors .= "<li>Please enter what worked.</li>\n"; - if (empty($aValues['sWhatDoesnt'])) + if (empty($aValues['shWhatDoesnt'])) $errors .= "<li>Please enter what did not work.</li>\n"; - if (empty($aValues['sWhatNotTested'])) + if (empty($aValues['shWhatNotTested'])) $errors .= "<li>Please enter what was not tested.</li>\n"; if (empty($aValues['sTestedDate'])) @@ -608,9 +608,9 @@ class testData{ { $this->iTestingId = $aValues['iTestingId']; $this->iVersionId = $aValues['iVersionId']; - $this->sWhatWorks = $aValues['sWhatWorks']; - $this->sWhatDoesnt = $aValues['sWhatDoesnt']; - $this->sWhatNotTested = $aValues['sWhatNotTested']; + $this->shWhatWorks = $aValues['shWhatWorks']; + $this->shWhatDoesnt = $aValues['shWhatDoesnt']; + $this->shWhatNotTested = $aValues['shWhatNotTested']; $this->sTestedDate = $aValues['sTestedDate']; $this->iDistributionId = $aValues['iDistributionId']; $this->sTestedRelease = $aValues['sTestedRelease'];

1 0

appdb/ include/sidebar.php ./browse_downloadab ...
by WineHQ 09 Jan '07

09 Jan '07

ChangeSet ID: 30869 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/08 22:29:51 Modified files: include : sidebar.php Added files: . : browse_downloadable.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add a page to browse downloadable applications Patch: http://cvs.winehq.org/patch.py?id=30869 Old revision New revision Changes Path Added 1.1 +0 -0 appdb/browse_downloadable.php 1.25 1.26 +1 -0 appdb/include/sidebar.php Index: appdb/browse_downloadable.php diff -u -p /dev/null appdb/browse_downloadable.php:1.1 --- /dev/null 9 Jan 2007 4:29:51 -0000 +++ appdb/browse_downloadable.php 9 Jan 2007 4:29:51 -0000 @@ -0,0 +1,98 @@ +<?php + +/** +* Browse downloadable applications +*/ + +require("path.php"); +require(BASE."include/incl.php"); + +apidb_header("Browse Downloadable Applications"); + +/* Set default values */ +if(!$aClean['iNumVersions'] || $aClean['iNumVersions'] > 200 || $aClean['iNumVersions'] < 0) + $aClean['iNumVersions'] = 25; + +if(!$aClean['iPage']) + $aClean['iPage'] = 1; + +/* Count the possible matches */ +$hResult = query_parameters("SELECT DISTINCT appFamily.appName, + appVersion.versionName, appVersion.versionId, appFamily.description + FROM appFamily, appVersion, appData + WHERE appData.type = '?' AND appData.versionId = appVersion.versionId + AND appFamily.appId = appVersion.appId", + "downloadurl"); + +if($hResult && mysql_num_rows($hResult)) + $num = mysql_num_rows($hResult); + +$iNumPages = ceil($num / $aClean['iNumVersions']); + +/* Check page logic */ +$aClean['iPage'] = min($aClean['iPage'], $iNumPages); + +/* Calculate values for the LIMIT clause */ +$iLimitLower = ($aClean['iPage'] - 1) * $aClean['iNumVersions']; + +/* Page selection */ +echo "<div align=\"center\">\n"; +echo "<b>Page ".$aClean['iPage']." of $iNumPages</b><br />\n"; +display_page_range($aClean['iPage'], $iPageRange, $iNumPages, + $_SERVER['PHP_SELF']."?iNumVersions=".$aClean['iNumVersions']); + +/* Selector for how many versions to display */ +echo "<form method=\"get\" action=\"".$_SERVER['PHP_SELF']."\">\n"; +echo "<b>How many versions to display:</b>\n"; +echo "<select name=\"iNumVersions\">\n"; + +$numVersionsArray = array(1, 25, 50, 100, 200); + +foreach($numVersionsArray as $i) +{ + if($i == $aClean['iNumVersions']) + echo "<option selected=\"selected\">$i</option>\n"; + else + echo "<option>$i</option>\n"; +} + +echo "</select>\n"; + +echo " <input type=\"submit\" value=\"Refresh\" />\n"; +echo "</form></div>\n<br />\n"; + +$hResult = query_parameters("SELECT DISTINCT appFamily.appName, + appVersion.versionName, appVersion.versionId, appFamily.description + FROM appFamily, appVersion, appData + WHERE appData.type = '?' AND appData.versionId = appVersion.versionId + AND appFamily.appId = appVersion.appId + ORDER BY appFamily.appName LIMIT ?, ?", + "downloadurl", $iLimitLower, $aClean['iNumVersions']); + +if($hResult && mysql_num_rows($hResult)) +{ + echo html_frame_start("", "90%"); + echo html_table_begin("width=\"100%\" align=\"center\""); + echo html_tr(array( + "<b>Name</b>", + "<b>Description</b>"), + "color4"); + + for($i = 1; $oRow = mysql_fetch_object($hResult); $i++) + { + echo html_tr_highlight_clickable( + "appview.php?iVersionId=$oRow->versionId", + ($i % 2) ? "color1" : "color0", + ($i % 2) ? "color1" : "color0", + ($i % 2) ? "color1" : "color0"); + echo "<td><a href=\"appview.php?iVersionId=$oRow->versionId\">". + "$oRow->appName $oRow->versionName</a></td>\n"; + echo "<td>$oRow->description</td>\n"; + echo "</tr>\n"; + } + + echo html_table_end(); + echo html_frame_end(" "); +} + +?> Index: appdb/include/sidebar.php diff -u -p appdb/include/sidebar.php:1.25 appdb/include/sidebar.php:1.26 --- appdb/include/sidebar.php:1.25 9 Jan 2007 4:29:51 -0000 +++ appdb/include/sidebar.php 9 Jan 2007 4:29:51 -0000 @@ -22,6 +22,7 @@ function global_sidebar_menu() $g->add("Screenshots", BASE."viewScreenshots.php"); $g->add("Browse Apps", BASE."appbrowse.php"); $g->add("Browse Newest Apps", BASE."browse_newest_apps.php"); + $g->add("Downloadable Apps", BASE."browse_downloadable.php"); $g->add("Browse Apps by Rating", BASE."browse_by_rating.php"); $g->add("Top 25", BASE."votestats.php"); $g->add("Submit Application", BASE."appsubmit.php?sSub=view&sAppType=application");

1 0

appdb/include testData.php
by WineHQ 09 Jan '07

09 Jan '07

ChangeSet ID: 30868 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/08 22:27:55 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix subject text of test data mails. It should simply say 'by' instead of 'submitted by'. Patch: http://cvs.winehq.org/patch.py?id=30868 Old revision New revision Changes Path 1.17 1.18 +5 -5 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.17 appdb/include/testData.php:1.18 --- appdb/include/testData.php:1.17 9 Jan 2007 4:27:55 -0000 +++ appdb/include/testData.php 9 Jan 2007 4:27:55 -0000 @@ -298,7 +298,7 @@ class testData{ case "add": if($this->sQueued == "false") { - $sSubject = "Test Results added to version ".$oVersion->sName." of ".$oApp->sName." submitted by ".$_SESSION['current']->sRealname; + $sSubject = "Test Results added to version ".$oVersion->sName." of ".$oApp->sName." by ".$_SESSION['current']->sRealname; $sMsg .= $sBacklink; if($this->iSubmitterId) { @@ -314,7 +314,7 @@ class testData{ addmsg("The test data was successfully added into the database.", "green"); } else // test data queued. { - $sSubject = "Test Results submitted for version ".$oVersion->sName." of ".$oApp->sName." submitted by ".$_SESSION['current']->sRealname; + $sSubject = "Test Results submitted for version ".$oVersion->sName." of ".$oApp->sName." by ".$_SESSION['current']->sRealname; $sMsg .= $sBacklink; $sMsg .= "This test data has been queued."; $sMsg .= "\n"; @@ -322,12 +322,12 @@ class testData{ } break; case "edit": - $sSubject = "Test Results modified for version ".$oVersion->sName." of ".$oApp->sName." submitted by ".$_SESSION['current']->sRealname; + $sSubject = "Test Results modified for version ".$oVersion->sName." of ".$oApp->sName." by ".$_SESSION['current']->sRealname; $sMsg .= $sBacklink; addmsg("test data modified.", "green"); break; case "delete": - $sSubject = "Test Results deleted for version ".$oVersion->sName." of ".$oApp->sName." submitted by ".$_SESSION['current']->sRealname; + $sSubject = "Test Results deleted for version ".$oVersion->sName." of ".$oApp->sName." by ".$_SESSION['current']->sRealname; // if replyText is set we should report the reason the data was deleted if($aClean['sReplyText']) { @@ -338,7 +338,7 @@ class testData{ addmsg("test data deleted.", "green"); break; case "reject": - $sSubject = "Test Results rejected for version ".$oVersion->sName." of ".$oApp->sName." submitted by ".$_SESSION['current']->sRealname; + $sSubject = "Test Results rejected for version ".$oVersion->sName." of ".$oApp->sName." by ".$_SESSION['current']->sRealname; $sMsg .= $sBacklink; // if replyText is set we should report the reason the data was rejected if($aClean['sReplyText'])

1 0

Alexandre Julliard : dsound: The dsconf.h GUIDs are now in libdxguid.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 6addb22017278cb78f5646182488b161f3948c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6addb22017278cb78f5646182… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 8 22:01:56 2007 +0100 dsound: The dsconf.h GUIDs are now in libdxguid. --- dlls/dsound/propset.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 4c75182..66a4af6 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -34,7 +34,6 @@ #include "dsound.h" #include "dsdriver.h" #include "dsound_private.h" -#include "initguid.h" #include "dsconf.h" #ifdef NONAMELESSSTRUCT

1 0

Alexandre Julliard : server: Don' t fail to map a shared section if the final sector is truncated.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 126bbb3fe35b9e32ce8ce2d28a44b0ab6f593d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=126bbb3fe35b9e32ce8ce2d28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 8 21:34:15 2007 +0100 server: Don't fail to map a shared section if the final sector is truncated. --- server/mapping.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index c7eb075..fe99879 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -184,6 +184,11 @@ static int build_shared_mapping( struct while (toread) { long res = pread( fd, buffer + file_size - toread, toread, read_pos ); + if (!res && toread < 0x200) /* partial sector at EOF is not an error */ + { + file_size -= toread; + break; + } if (res <= 0) goto error; toread -= res; read_pos += res;

1 0

Patrik Stridvall : dsound: The GUID:s defined in dsconf. h should be exported by dxguid.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 6e062a4e08c83f072076b15e0cd28b3a9048be41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e062a4e08c83f072076b15e0… Author: Patrik Stridvall <patrik(a)stridvall.se> Date: Mon Jan 8 00:20:14 2007 +0100 dsound: The GUID:s defined in dsconf.h should be exported by dxguid. --- dlls/dsound/tests/propset.c | 3 ++- dlls/dxguid/dxguid.c | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 28324a8..3beebf2 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -24,7 +24,6 @@ #include "wine/test.h" #include "dsound.h" -#include "initguid.h" #include "dsconf.h" #include "dxerr8.h" @@ -35,6 +34,8 @@ DSBCAPS_CTRLFREQUENCY|DSBCAPS_CTRLPAN|DSBCAPS_CTRLVOLUME #endif +#include "initguid.h" + DEFINE_GUID(DSPROPSETID_VoiceManager, \ 0x62A69BAE,0xDF9D,0x11D1,0x99,0xA6,0x00,0xC0,0x4F,0xC9,0x9D,0x46); DEFINE_GUID(DSPROPSETID_EAX20_ListenerProperties, \ diff --git a/dlls/dxguid/dxguid.c b/dlls/dxguid/dxguid.c index c2c102f..82bae2a 100644 --- a/dlls/dxguid/dxguid.c +++ b/dlls/dxguid/dxguid.c @@ -35,6 +35,7 @@ #include "ddraw.h" #include "mmsystem.h" #include "dsound.h" +#include "dsconf.h" #include "dsdriver.h" #include "dmusici.h" #include "dmusics.h"

1 0

Paul Vriens : kernel32/tests: Prevent memory leak.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: aea09ade58db61d5055ffad5dd486e5b23156eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea09ade58db61d5055ffad5d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jan 8 19:03:10 2007 +0100 kernel32/tests: Prevent memory leak. --- dlls/kernel32/tests/virtual.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 30b037a..767008f 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -58,11 +58,6 @@ static void test_VirtualAllocEx(void) hProcess = create_target_process("sleep"); ok(hProcess != NULL, "Can't start process\n"); - src = (char *) HeapAlloc( GetProcessHeap(), 0, alloc_size ); - dst = (char *) HeapAlloc( GetProcessHeap(), 0, alloc_size ); - for (i = 0; i < alloc_size; i++) - src[i] = 0xcafedead + i; - SetLastError(0xdeadbeef); addr1 = VirtualAllocEx(hProcess, NULL, alloc_size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); @@ -71,6 +66,12 @@ static void test_VirtualAllocEx(void) trace("VirtualAllocEx is not implemented, skipping the test\n"); return; } + + src = (char *) HeapAlloc( GetProcessHeap(), 0, alloc_size ); + dst = (char *) HeapAlloc( GetProcessHeap(), 0, alloc_size ); + for (i = 0; i < alloc_size; i++) + src[i] = 0xcafedead + i; + todo_wine ok(addr1 != NULL, "VirtualAllocEx error %u\n", GetLastError()); b = WriteProcessMemory(hProcess, addr1, src, alloc_size, &bytes_written); ok(b && (bytes_written == alloc_size), "%lu bytes written\n",

1 0

Patrik Stridvall : imm32: Only unregister the IME class if it was registered.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 4ef65b1e261658b5ab413572a30eb7d0a77e6c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef65b1e261658b5ab413572a… Author: Patrik Stridvall <patrik(a)stridvall.se> Date: Mon Jan 8 00:16:02 2007 +0100 imm32: Only unregister the IME class if it was registered. --- dlls/imm32/imm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index bee6472..8c07651 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -60,6 +60,7 @@ static InputContextData *root_context = static HWND hwndDefault = NULL; static HANDLE hImeInst; static const WCHAR WC_IMECLASSNAME[] = {'I','M','E',0}; +static ATOM atIMEClass = 0; /* MSIME messages */ static UINT WM_MSIME_SERVICE; @@ -109,12 +110,14 @@ static void IMM_Register(void) wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1); wndClass.lpszMenuName = 0; wndClass.lpszClassName = WC_IMECLASSNAME; - RegisterClassW(&wndClass); + atIMEClass = RegisterClassW(&wndClass); } static void IMM_Unregister(void) { - UnregisterClassW(WC_IMECLASSNAME, NULL); + if (atIMEClass) { + UnregisterClassW(WC_IMECLASSNAME, NULL); + } } static void IMM_RegisterMessages(void)

1 0

Vitaliy Margolen : dinput: Set event from queue_event, simplifying code a bit.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 4b33fd691a5028a62d1d5e077bb7224e9d5eec6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b33fd691a5028a62d1d5e077… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 7 00:14:56 2007 -0700 dinput: Set event from queue_event, simplifying code a bit. --- dlls/dinput/device.c | 2 ++ dlls/dinput/keyboard.c | 2 -- dlls/dinput/mouse.c | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d1efa6d..34a721d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -591,6 +591,8 @@ void queue_event(LPDIRECTINPUTDEVICE8A i This->data_queue[This->queue_head].dwTimeStamp = time; This->data_queue[This->queue_head].dwSequence = seq; This->queue_head = next_pos; + /* Send event if asked */ + if (This->hEvent) SetEvent(This->hEvent); } /****************************************************************************** diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 8ca463d..08c6cd8 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -89,8 +89,6 @@ static LRESULT CALLBACK KeyboardCallback EnterCriticalSection(&This->base.crit); queue_event((LPDIRECTINPUTDEVICE8A)This, dik_code, new_diks, hook->time, This->dinput->evsequence++); LeaveCriticalSection(&This->base.crit); - - if (This->base.hEvent) SetEvent(This->base.hEvent); return CallNextHookEx(0, code, wparam, lparam); } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 2d2ed44..dc330d9 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -376,9 +376,6 @@ static LRESULT CALLBACK dinput_mouse_hoo queue_event((LPDIRECTINPUTDEVICE8A)This, id_to_offset(&This->base.data_format, inst_id), wdata, hook->time, This->dinput->evsequence++); - /* Mouse moved -> send event if asked */ - if (This->base.hEvent) SetEvent(This->base.hEvent); - LeaveCriticalSection(&This->base.crit); /* Ignore message */

1 0

Vitaliy Margolen : dinput: Use proper offset when queuing keyboard events.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 8e8b4f03b042e85a79ddad8d0d56e98e3da4365c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e8b4f03b042e85a79ddad8d0… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 7 00:14:43 2007 -0700 dinput: Use proper offset when queuing keyboard events. --- dlls/dinput/keyboard.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 7288462..8ca463d 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -85,6 +85,7 @@ static LRESULT CALLBACK KeyboardCallback DInputKeyState[dik_code] = new_diks; TRACE(" setting %02X to %02X\n", dik_code, DInputKeyState[dik_code]); + dik_code = id_to_offset(&This->base.data_format, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON); EnterCriticalSection(&This->base.crit); queue_event((LPDIRECTINPUTDEVICE8A)This, dik_code, new_diks, hook->time, This->dinput->evsequence++); LeaveCriticalSection(&This->base.crit);

1 0