January 2007 - Wine-commits

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

07 Jan '07

ChangeSet ID: 30864 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/07 11:41:51 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add more logic checking to test results. Runs? can only be set to 'Not Installable' if the application's installer does not work. Patch: http://cvs.winehq.org/patch.py?id=30864 Old revision New revision Changes Path 1.16 1.17 +5 -0 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.16 appdb/include/testData.php:1.17 --- appdb/include/testData.php:1.16 7 Jan 2007 17:41:51 -0000 +++ appdb/include/testData.php 7 Jan 2007 17:41:51 -0000 @@ -593,6 +593,11 @@ class testData{ if (($aValues['sInstalls'] == "No") && ($aValues['sTestedRating'] == PLATINUM_RATING)) $errors .= "<li>An application can only get a Platinum rating if it installs and runs ‘out of the box’.</li>\n"; + // Basic checking of logic. Runs? can obviously only be 'Not Installable' + // if the application does not install + if (($aValues['sInstalls'] != "No") && ($aValues['sRuns'] == "Not Installable")) + $errors .= "<li>You can only set Runs? to ‘Not Installable’ if the applicatino’s installer does not work</li>\n"; + return $errors; }

1 0

appdb/. appsubmit.php
by WineHQ 07 Jan '07

07 Jan '07

ChangeSet ID: 30863 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/06 23:22:23 Modified files: . : appsubmit.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix app submission. We should check values are non-zero or non-null, not whether they are numeric Patch: http://cvs.winehq.org/patch.py?id=30863 Old revision New revision Changes Path 1.58 1.59 +9 -9 appdb/appsubmit.php Index: appdb/appsubmit.php diff -u -p appdb/appsubmit.php:1.58 appdb/appsubmit.php:1.59 --- appdb/appsubmit.php:1.58 7 Jan 2007 5:22:23 -0000 +++ appdb/appsubmit.php 7 Jan 2007 5:22:23 -0000 @@ -168,7 +168,7 @@ if ($aClean['sSub']) } //FIXME: remove this when we fix vendor submission $oApp->sKeywords = $aClean['sAppKeywords']." *** ".$aClean['sAppVendorName']; - if(is_numeric($oApp->iAppId)) + if($oApp->iAppId) { $oApp->update(); $oApp->ReQueue(); @@ -187,7 +187,7 @@ if ($aClean['sSub']) } else { - if(is_numeric($oVersion->iVersionId)) + if($oVersion->iVersionId) { $oVersion->update(); $oVersion->ReQueue(); @@ -208,7 +208,7 @@ if ($aClean['sSub']) } } $oTest->iVersionId = $oVersion->iVersionId; - if(is_numeric($oTest->iTestingId)) + if($oTest->iTestingId) { $oTest->update(true); $oTest->ReQueue(); @@ -221,7 +221,7 @@ if ($aClean['sSub']) } if ($aClean['sSub'] == 'Delete') { - if (($aClean['sAppType'] == "application") && is_numeric($aClean['iAppId'])) // application + if (($aClean['sAppType'] == "application") && $aClean['iAppId']) // application { // get the queued versions that refers to the application entry we just removed // and delete them as we implicitly added a version entry when adding a new application @@ -239,7 +239,7 @@ if ($aClean['sSub']) // delete the application entry $oApp = new Application($aClean['iAppId']); $oApp->delete(); - } else if(($aClean['sAppType'] == "version") && is_numeric($aClean['iVersionId'])) // version + } else if(($aClean['sAppType'] == "version") && $aClean['iVersionId']) // version { $oVersion = new Version($aClean['iVersionId']); $oVersion->delete(); @@ -265,7 +265,7 @@ if ($aClean['sSub']) perform_search_and_output_results($oApp->sName); echo html_frame_end(" "); } - if(is_numeric($oApp->iAppId)) + if($oApp->iAppId) { //help @@ -316,7 +316,7 @@ if ($aClean['sSub']) $aClean['sAppVendorName'] = ""; } else //app version { - if(is_numeric($oVersion->iVersionId)) + if($oVersion->iVersionId) { $oAppForVersion = new Application($oVersion->iAppId); echo html_frame_start("Potential duplicate versions in the database for application: ".$oAppForVersion->sName,"90%","",0); @@ -362,7 +362,7 @@ if ($aClean['sSub']) if($aClean['sAppType'] == 'application') // application { echo '<input type="hidden" name="sAppType" value="application" />'; - if(is_numeric($oApp->iAppId)) + if($oApp->iAppId) { echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n"; echo '<input type=submit value=" Re-Submit App Into Database " class=button>&nbsp',"\n"; @@ -376,7 +376,7 @@ if ($aClean['sSub']) { echo '<input type="hidden" name="sAppType" value="version" />'; echo '<input type="hidden" name="iAppId" value="'.$aClean['iAppId'].'" />'; - if(is_numeric($oVersion->iVersionId)) + if($oVersion->iVersionId) { echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n"; echo '<input type="submit" value="Re-Submit Version Into Database " class="button">&nbsp',"\n";

1 0

appdb/. testResults.php
by WineHQ 07 Jan '07

07 Jan '07

ChangeSet ID: 30862 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/06 23:15:33 Modified files: . : testResults.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Chris Morgan <cmorgan(a)alum.wpi.edu> Fix testResults.php to work with the filter system Patch: http://cvs.winehq.org/patch.py?id=30862 Old revision New revision Changes Path 1.23 1.24 +11 -8 appdb/testResults.php Index: appdb/testResults.php diff -u -p appdb/testResults.php:1.23 appdb/testResults.php:1.24 --- appdb/testResults.php:1.23 7 Jan 2007 5:15:33 -0000 +++ appdb/testResults.php 7 Jan 2007 5:15:33 -0000 @@ -41,11 +41,11 @@ if ($aClean['sSub']) } if($aClean['sSub'] == 'Submit') { - $oTest->create(); + $oTest->create(); } else if($aClean['sSub'] == 'Resubmit') { $oTest->update(true); - $oTest->ReQueue(); + $oTest->ReQueue(); } util_redirect_and_exit($_SERVER['PHP_SELF']); } else @@ -57,17 +57,17 @@ if ($aClean['sSub']) // Delete test results if ($aClean['sSub'] == 'Delete') { - if(is_numeric($aClean['iTestingId'])) + if($aClean['iTestingId']) { $oTest = new testData($aClean['iTestingId']); $oTest->delete(); } - + util_redirect_and_exit($_SERVER['PHP_SELF']); } // is this an old test? - if(is_numeric($aClean['iTestingId'])) + if($aClean['iTestingId']) { // make sure the user has permission to view this test result $oVersion = new Version($oTest->iVersionId); @@ -77,11 +77,13 @@ if ($aClean['sSub']) { util_show_error_page_and_exit("Insufficient privileges."); } else - $oVersion = new Version($oTest->iVersionId); + { + $oVersion = new Version($oTest->iVersionId); + } } else { $oTest->iVersionId = $aClean['iVersionId']; - $oVersion = new Version($aClean['iVersionId']); + $oVersion = new Version($aClean['iVersionId']); $oTest->sQueued = "new"; } if ($aClean['sSub'] == 'view') @@ -105,7 +107,8 @@ if ($aClean['sSub']) apidb_header("Edit test results for ".$sVersionInfo); break; default: - apidb_header("Edit test results for "); + util_show_error_page_and_exit('$oTest->sQueued of \''.$oTest->sQueued."'is invalid"); + break; } echo '<form name="sQform" action="'.$_SERVER['PHP_SELF'].'" method="post" enctype="multipart/form-data">',"\n";

1 0

appdb/include application.php
by WineHQ 06 Jan '07

06 Jan '07

ChangeSet ID: 30861 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/06 12:14:36 Modified files: include : application.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix labelling of category in app change mails by changing 'vendor' to 'category' Patch: http://cvs.winehq.org/patch.py?id=30861 Old revision New revision Changes Path 1.83 1.84 +1 -1 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.83 appdb/include/application.php:1.84 --- appdb/include/application.php:1.83 6 Jan 2007 18:14:36 -0000 +++ appdb/include/application.php 6 Jan 2007 18:14:36 -0000 @@ -216,7 +216,7 @@ class Application { return false; $oCatBefore = new Category($oApp->iCatId); $oCatAfter = new Category($this->iCatId); - $sWhatChanged .= "Vendor was changed from ".$oCatBefore->sName." to ".$oCatAfter->sName.".\n\n"; + $sWhatChanged .= "Category was changed from ".$oCatBefore->sName." to ".$oCatAfter->sName.".\n\n"; } if($sWhatChanged and !$bSilent) $this->SendNotificationMail("edit",$sWhatChanged);

1 0

Dmitry Timoshkov : devenum: Do not store full DLL path in the registry.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: f663cc16225418883b1ddfe0b356c801e686d829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f663cc16225418883b1ddfe0b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Jan 6 16:51:01 2007 +0800 devenum: Do not store full DLL path in the registry. --- dlls/devenum/devenum_main.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index 3d8566d..bb4bbbe 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -296,7 +296,6 @@ HRESULT WINAPI DllUnregisterServer(void) static HRESULT register_clsids(int count, const register_info * pRegInfo, LPCWSTR pszThreadingModel) { HRESULT res = S_OK; - WCHAR dll_module[MAX_PATH]; LPOLESTR clsidString; HKEY hkeyClsid; HKEY hkeySub; @@ -305,18 +304,11 @@ static HRESULT register_clsids(int count int i; static const WCHAR wcszInproc32[] = {'I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; static const WCHAR wcszThreadingModel[] = {'T','h','r','e','a','d','i','n','g','M','o','d','e','l',0}; + static const WCHAR dll_module[] = {'d','e','v','e','n','u','m','.','d','l','l',0}; res = RegOpenKeyW(HKEY_CLASSES_ROOT, clsid_keyname, &hkeyClsid) == ERROR_SUCCESS ? S_OK : E_FAIL; - TRACE("HModule = %p\n", DEVENUM_hInstance); - i = GetModuleFileNameW(DEVENUM_hInstance, dll_module, - sizeof(dll_module) / sizeof(WCHAR)); - if (!i) - return HRESULT_FROM_WIN32(GetLastError()); - if (i >= sizeof(dll_module) / sizeof(WCHAR)) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - for (i = 0; i < count; i++) { if (SUCCEEDED(res))

1 0

Detlef Riekenberg : winspool: Start support for XcvMonitor and XcvPort in OpenPrinter.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: f85b02b6adaa3e37b071c431551904edd4572800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85b02b6adaa3e37b071c4315… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 5 01:09:13 2007 +0100 winspool: Start support for XcvMonitor and XcvPort in OpenPrinter. --- dlls/winspool.drv/info.c | 66 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 50 insertions(+), 16 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 201d3df..6bd2c92 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -116,6 +116,7 @@ typedef struct { typedef struct { LPWSTR name; LPWSTR printername; + monitor_t *pm; jobqueue_t *queue; started_doc_t *doc; } opened_printer_t; @@ -234,6 +235,8 @@ static const WCHAR deviceW[] = {'d','e' static const WCHAR devicesW[] = {'d','e','v','i','c','e','s',0}; static const WCHAR windowsW[] = {'w','i','n','d','o','w','s',0}; static const WCHAR emptyStringW[] = {0}; +static const WCHAR XcvMonitorW[] = {',','X','c','v','M','o','n','i','t','o','r',' ',0}; +static const WCHAR XcvPortW[] = {',','X','c','v','P','o','r','t',' ',0}; static const WCHAR May_Delete_Value[] = {'W','i','n','e','M','a','y','D','e','l','e','t','e','M','e',0}; @@ -1154,7 +1157,7 @@ static DWORD monitor_loadall(void) * On failure, NULL is returned */ -static monitor_t * monitor_load_by_port(LPWSTR portname) +static monitor_t * monitor_load_by_port(LPCWSTR portname) { HKEY hroot; HKEY hport; @@ -1375,6 +1378,7 @@ static HANDLE get_opened_printer_entry(L LPCWSTR printername; HKEY hkeyPrinters; HKEY hkeyPrinter; + DWORD len; servername = get_servername_from_name(name); if (servername) { @@ -1446,23 +1450,53 @@ static HANDLE get_opened_printer_entry(L } if (printername) { + len = sizeof(XcvMonitorW)/sizeof(WCHAR) - 1; + if (strncmpW(printername, XcvMonitorW, len) == 0) { + /* OpenPrinter(",XcvMonitor " detected */ + TRACE(",XcvMonitor: %s\n", debugstr_w(&printername[len])); + printer->pm = monitor_load(&printername[len], NULL); + if (printer->pm == NULL) { + SetLastError(ERROR_INVALID_PARAMETER); + handle = 0; + goto end; + } + } + else + { + len = sizeof(XcvPortW)/sizeof(WCHAR) - 1; + if (strncmpW( printername, XcvPortW, len) == 0) { + /* OpenPrinter(",XcvPort " detected */ + TRACE(",XcvPort: %s\n", debugstr_w(&printername[len])); + printer->pm = monitor_load_by_port(&printername[len]); + if (printer->pm == NULL) { + SetLastError(ERROR_INVALID_PARAMETER); + handle = 0; + goto end; + } + } + } - /* Does the Printer exist? */ - if (RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { - ERR("Can't create Printers key\n"); - handle = 0; - goto end; + if (printer->pm) { + FIXME("pm->pfnXcvOpenPort not implemented\n"); } - if (RegOpenKeyW(hkeyPrinters, printername, &hkeyPrinter) != ERROR_SUCCESS) { - WARN("Printer not found in Registry: '%s'\n", debugstr_w(printername)); + else + { + /* Does the Printer exist? */ + if (RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { + ERR("Can't create Printers key\n"); + handle = 0; + goto end; + } + if (RegOpenKeyW(hkeyPrinters, printername, &hkeyPrinter) != ERROR_SUCCESS) { + WARN("Printer not found in Registry: '%s'\n", debugstr_w(printername)); + RegCloseKey(hkeyPrinters); + SetLastError(ERROR_INVALID_PRINTER_NAME); + handle = 0; + goto end; + } + RegCloseKey(hkeyPrinter); RegCloseKey(hkeyPrinters); - SetLastError(ERROR_INVALID_PRINTER_NAME); - handle = 0; - goto end; } - RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); - } else { @@ -1489,6 +1523,7 @@ end: LeaveCriticalSection(&printer_handles_cs); if (!handle && printer) { /* Something failed: Free all resources */ + monitor_unload(printer->pm); HeapFree(GetProcessHeap(), 0, printer->printername); HeapFree(GetProcessHeap(), 0, printer->name); if (!queue) HeapFree(GetProcessHeap(), 0, printer->queue); @@ -1916,8 +1951,6 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinter * * BUGS *| Printer-Object not supported - *| XcvMonitor not supported - *| XcvPort not supported *| pDefaults is ignored * */ @@ -2879,6 +2912,7 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter } HeapFree(GetProcessHeap(), 0, printer->queue); } + monitor_unload(printer->pm); HeapFree(GetProcessHeap(), 0, printer->printername); HeapFree(GetProcessHeap(), 0, printer->name); HeapFree(GetProcessHeap(), 0, printer);

1 0

Detlef Riekenberg : winspool: Call the Portmonitor for XcvMonitor and XcvPort in OpenPrinter.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: 72b126b2204aff20f35be6b8a7b61f589dd9be87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72b126b2204aff20f35be6b8a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 5 01:09:46 2007 +0100 winspool: Call the Portmonitor for XcvMonitor and XcvPort in OpenPrinter. --- dlls/winspool.drv/info.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 6bd2c92..8b16252 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -117,6 +117,7 @@ typedef struct { LPWSTR name; LPWSTR printername; monitor_t *pm; + HANDLE hXcv; jobqueue_t *queue; started_doc_t *doc; } opened_printer_t; @@ -1477,7 +1478,14 @@ static HANDLE get_opened_printer_entry(L } if (printer->pm) { - FIXME("pm->pfnXcvOpenPort not implemented\n"); + if ((printer->pm->monitor) && (printer->pm->monitor->pfnXcvOpenPort)) { + printer->pm->monitor->pfnXcvOpenPort(&printername[len], pDefault->DesiredAccess, &printer->hXcv); + } + if (printer->hXcv == NULL) { + SetLastError(ERROR_INVALID_PARAMETER); + handle = 0; + goto end; + } } else { @@ -1523,6 +1531,7 @@ end: LeaveCriticalSection(&printer_handles_cs); if (!handle && printer) { /* Something failed: Free all resources */ + if (printer->hXcv) printer->pm->monitor->pfnXcvClosePort(printer->hXcv); monitor_unload(printer->pm); HeapFree(GetProcessHeap(), 0, printer->printername); HeapFree(GetProcessHeap(), 0, printer->name); @@ -2912,6 +2921,7 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter } HeapFree(GetProcessHeap(), 0, printer->queue); } + if (printer->hXcv) printer->pm->monitor->pfnXcvClosePort(printer->hXcv); monitor_unload(printer->pm); HeapFree(GetProcessHeap(), 0, printer->printername); HeapFree(GetProcessHeap(), 0, printer->name);

1 0

Detlef Riekenberg : winspool: Implement XcvDataW.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: e82d2285f4ce62f17dceb84ede4af7c8802786a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82d2285f4ce62f17dceb84ed… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 5 01:11:21 2007 +0100 winspool: Implement XcvDataW. --- dlls/winspool.drv/info.c | 50 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8b16252..551e8fc 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6,7 +6,7 @@ * Copyright 1999 Klaas van Gend * Copyright 1999, 2000 Huw D M Davies * Copyright 2001 Marcus Meissner - * Copyright 2005, 2006 Detlef Riekenberg + * Copyright 2005, 2006, 2007 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -6540,17 +6540,57 @@ emW_cleanup: /****************************************************************************** * XcvDataW (WINSPOOL.@) * - * Notes: - * There doesn't seem to be an A version... + * Execute commands in the Printmonitor DLL + * + * PARAMS + * hXcv [i] Handle from OpenPrinter (with XcvMonitor or XcvPort) + * pszDataName [i] Name of the command to execute + * pInputData [i] Buffer for extra Input Data (needed only for some commands) + * cbInputData [i] Size in Bytes of Buffer at pInputData + * pOutputData [o] Buffer to receive additional Data (needed only for some commands) + * cbOutputData [i] Size in Bytes of Buffer at pOutputData + * pcbOutputNeeded [o] PTR to receive the minimal Size in Bytes of the Buffer at pOutputData + * pdwStatus [o] PTR to receive the win32 error code from the Printmonitor DLL + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * Returning "TRUE" does mean, that the Printmonitor DLL was called successful. + * The execution of the command can still fail (check pdwStatus for ERROR_SUCCESS). + * + * Minimal List of commands, that a Printmonitor DLL should support: + * + *| "MonitorUI" : Return the Name of the Userinterface-DLL as WSTR in pOutputData + *| "AddPort" : Add a Port + *| "DeletePort": Delete a Port + * + * Many Printmonitors support additional commands. Examples for localspl.dll: + * "GetDefaultCommConfig", "SetDefaultCommConfig", + * "GetTransmissionRetryTimeout", "ConfigureLPTPortCommandOK" + * */ BOOL WINAPI XcvDataW( HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded, PDWORD pdwStatus) { - FIXME("%p %s %p %d %p %d %p %p\n", hXcv, debugstr_w(pszDataName), + opened_printer_t *printer; + + TRACE("(%p, %s, %p, %d, %p, %d, %p, %p)\n", hXcv, debugstr_w(pszDataName), pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded, pdwStatus); - return FALSE; + + printer = get_opened_printer(hXcv); + if (!printer || (!printer->hXcv)) { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + *pdwStatus = printer->pm->monitor->pfnXcvDataPort(printer->hXcv, pszDataName, + pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); + + return TRUE; } /*****************************************************************************

1 0

Dmitry Timoshkov : qcap: Do not store full DLL path in the registry.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: 802967921f9b12776817e63452c32f64e41476c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=802967921f9b12776817e6345… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Jan 6 16:51:15 2007 +0800 qcap: Do not store full DLL path in the registry. --- dlls/qcap/dllsetup.c | 8 ++------ dlls/qcap/dllsetup.h | 3 +-- dlls/qcap/qcap_main.c | 6 ++---- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/qcap/dllsetup.c b/dlls/qcap/dllsetup.c index 8218b25..d64b9db 100644 --- a/dlls/qcap/dllsetup.c +++ b/dlls/qcap/dllsetup.c @@ -271,17 +271,13 @@ static HRESULT SetupRegisterAllClasses(c * ****************************************************************************/ HRESULT SetupRegisterServers(const CFactoryTemplate * pList, int num, - HINSTANCE hinst, BOOL bRegister) + BOOL bRegister) { + static const WCHAR szFileName[] = {'q','c','a','p','.','d','l','l',0}; HRESULT hr = NOERROR; - WCHAR szFileName[MAX_PATH]; IFilterMapper2 *pIFM2 = NULL; IFilterMapper *pIFM = NULL; - /* Win95 wouldn't support the Unicode version of this API!! */ - if (!GetModuleFileNameW(hinst, szFileName, MAX_PATH)) - return HRESULT_FROM_WIN32(GetLastError()); - /* first register all server classes, just to make sure */ if (bRegister) hr = SetupRegisterAllClasses(pList, num, szFileName, TRUE ); diff --git a/dlls/qcap/dllsetup.h b/dlls/qcap/dllsetup.h index 4b18769..c1bcf98 100644 --- a/dlls/qcap/dllsetup.h +++ b/dlls/qcap/dllsetup.h @@ -66,8 +66,7 @@ typedef struct tagCFactoryTemplate { * CFactoryTemplate * ****************************************************************************/ -extern HRESULT SetupRegisterServers(const CFactoryTemplate * pList, int num, - HINSTANCE hinst, BOOL bRegister); +extern HRESULT SetupRegisterServers(const CFactoryTemplate * pList, int num, BOOL bRegister); /**************************************************************************** * SetupInitializeServers diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 6cf9b0c..6e3cca2 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -45,7 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); static LONG objects_ref = 0; static LONG server_locks = 0; -static HINSTANCE ghInst = NULL; static const WCHAR wAudioCaptFilter[] = {'A','u','d','i','o',' ','C','a','p','t','u','r','e',' ','F','i','l','t','e','r',0}; @@ -158,7 +157,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); - ghInst = hInstDLL; SetupInitializeServers(g_cTemplates, g_numTemplates, TRUE); break; case DLL_PROCESS_DETACH: @@ -175,7 +173,7 @@ HRESULT WINAPI DllRegisterServer(void) { TRACE("()\n"); - return SetupRegisterServers(g_cTemplates, g_numTemplates, ghInst, TRUE); + return SetupRegisterServers(g_cTemplates, g_numTemplates, TRUE); } /*********************************************************************** @@ -185,7 +183,7 @@ HRESULT WINAPI DllUnregisterServer(void) { TRACE("\n"); - return SetupRegisterServers(g_cTemplates, g_numTemplates, ghInst, FALSE); + return SetupRegisterServers(g_cTemplates, g_numTemplates, FALSE); } /***********************************************************************

1 0

Vitaliy Margolen : dinput: Fix mouse to use proper offset when queuing new events. Add handling of X-buttons.
by Alexandre Julliard 06 Jan '07

06 Jan '07

Module: wine Branch: master Commit: 30e2fbcb6ee30213538dd06918b49738500f9fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e2fbcb6ee30213538dd0691… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Jan 5 17:14:55 2007 -0700 dinput: Fix mouse to use proper offset when queuing new events. Add handling of X-buttons. We should use instance IDs instead of sequential numbers to get correct offset. --- dlls/dinput/device.c | 12 +++++- dlls/dinput/device_private.h | 1 + dlls/dinput/mouse.c | 88 +++++++++++++++++++++--------------------- 3 files changed, 55 insertions(+), 46 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 469f3d8..530f746 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -493,7 +493,7 @@ int offset_to_object(LPCDIDATAFORMAT df, int i; for (i = 0; i < df->dwNumObjs; i++) - if (df->rgodf[i].dwOfs == offset) + if (dataformat_to_odf(df, i)->dwOfs == offset) return i; return -1; @@ -503,13 +503,21 @@ static int id_to_object(LPCDIDATAFORMAT { int i; + id &= 0x00ffffff; for (i = 0; i < df->dwNumObjs; i++) - if ((df->rgodf[i].dwType & 0x00ffffff) == (id & 0x00ffffff)) + if ((dataformat_to_odf(df, i)->dwType & 0x00ffffff) == id) return i; return -1; } +int id_to_offset(DataFormat *df, int id) +{ + int obj = id_to_object(df->wine_df, id); + + return obj >= 0 && df->offsets ? df->offsets[obj] : -1; +} + int find_property(LPCDIDATAFORMAT df, LPCDIPROPHEADER ph) { switch (ph->dwHow) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index e35c9f4..638661a 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -74,6 +74,7 @@ extern void release_DataFormat(DataForma extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq); /* Helper functions to work with data format */ extern int offset_to_object(LPCDIDATAFORMAT df, int offset); +extern int id_to_offset(DataFormat *df, int id); extern int find_property(LPCDIDATAFORMAT df, LPCDIPROPHEADER ph); /** diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 6465482..f8eea4c 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -42,18 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); /* Wine mouse driver object instances */ #define WINE_MOUSE_X_AXIS_INSTANCE 0 #define WINE_MOUSE_Y_AXIS_INSTANCE 1 - -/* ------------------------------- */ -/* Wine mouse internal data format */ -/* ------------------------------- */ - -/* Constants used to access the offset array */ -#define WINE_MOUSE_X_POSITION 0 -#define WINE_MOUSE_Y_POSITION 1 -#define WINE_MOUSE_Z_POSITION 2 -#define WINE_MOUSE_L_POSITION 3 -#define WINE_MOUSE_R_POSITION 4 -#define WINE_MOUSE_M_POSITION 5 +#define WINE_MOUSE_Z_AXIS_INSTANCE 2 +#define WINE_MOUSE_BUTTONS_INSTANCE 3 static const IDirectInputDevice8AVtbl SysMouseAvt; static const IDirectInputDevice8WVtbl SysMouseWvt; @@ -298,7 +288,7 @@ static LRESULT CALLBACK dinput_mouse_hoo MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; SysMouseImpl* This = (SysMouseImpl*) current_lock; DWORD dwCoop; - int wdata; + int wdata = 0, inst_id = -1; if (code != HC_ACTION) return CallNextHookEx( 0, code, wparam, lparam ); @@ -322,58 +312,68 @@ static LRESULT CALLBACK dinput_mouse_hoo pt1 = pt; if (pt.x) - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_X_POSITION], + queue_event((LPDIRECTINPUTDEVICE8A)This, id_to_offset(&This->base.data_format, + DIDFT_MAKEINSTANCE(WINE_MOUSE_X_AXIS_INSTANCE) | DIDFT_RELAXIS), pt1.x, hook->time, This->dinput->evsequence); if (pt.y) - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_Y_POSITION], - pt1.y, hook->time, This->dinput->evsequence); + { + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS; + wdata = pt1.y; + } This->need_warp = (pt.x || pt.y) && dwCoop & DISCL_EXCLUSIVE; break; } + case WM_MOUSEWHEEL: + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_Z_AXIS_INSTANCE) | DIDFT_RELAXIS; + This->m_state.lZ += wdata = (short)HIWORD(hook->mouseData); + break; case WM_LBUTTONDOWN: - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_L_POSITION], - 0x80, hook->time, This->dinput->evsequence); - This->m_state.rgbButtons[0] = 0x80; + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 0) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[0] = wdata = 0x80; break; case WM_LBUTTONUP: - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_L_POSITION], - 0x00, hook->time, This->dinput->evsequence); - This->m_state.rgbButtons[0] = 0x00; + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 0) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[0] = wdata = 0x00; break; case WM_RBUTTONDOWN: - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_R_POSITION], - 0x80, hook->time, This->dinput->evsequence); - This->m_state.rgbButtons[1] = 0x80; + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 1) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[1] = wdata = 0x80; break; case WM_RBUTTONUP: - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_R_POSITION], - 0x00, hook->time, This->dinput->evsequence); - This->m_state.rgbButtons[1] = 0x00; + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 1) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[1] = wdata = 0x00; break; case WM_MBUTTONDOWN: - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_M_POSITION], - 0x80, hook->time, This->dinput->evsequence); - This->m_state.rgbButtons[2] = 0x80; + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 2) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[2] = wdata = 0x80; break; case WM_MBUTTONUP: - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_M_POSITION], - 0x00, hook->time, This->dinput->evsequence); - This->m_state.rgbButtons[2] = 0x00; - break; - case WM_MOUSEWHEEL: - wdata = (short)HIWORD(hook->mouseData); - queue_event((LPDIRECTINPUTDEVICE8A)This, This->base.data_format.offsets[WINE_MOUSE_Z_POSITION], - wdata, hook->time, This->dinput->evsequence); - This->m_state.lZ += wdata; + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 2) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[2] = wdata = 0x00; break; + case WM_XBUTTONDOWN: + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 2 + HIWORD(hook->mouseData)) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[2 + HIWORD(hook->mouseData)] = wdata = 0x80; + break; + case WM_XBUTTONUP: + inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 2 + HIWORD(hook->mouseData)) | DIDFT_PSHBUTTON; + This->m_state.rgbButtons[2 + HIWORD(hook->mouseData)] = wdata = 0x00; + break; } - TRACE("msg %x @ (%d %d): (X: %d - Y: %d L: %02x M: %02x R: %02x)\n", - wparam, hook->pt.x, hook->pt.y, This->m_state.lX, This->m_state.lY, - This->m_state.rgbButtons[0], This->m_state.rgbButtons[2], This->m_state.rgbButtons[1]); + if (TRACE_ON(dinput)) + { + int i; - This->dinput->evsequence++; + TRACE("msg %x @ (%d %d): (X: %d Y: %d Z: %d\n", wparam, hook->pt.x, hook->pt.y, + This->m_state.lX, This->m_state.lY, This->m_state.lZ); + for (i = 0; i < 5; i++) TRACE(" B%d: %02x", i, This->m_state.rgbButtons[i]); + TRACE(")\n"); + } + if (inst_id != -1) + 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);

1 0