May 2007 - Wine-commits - list.winehq.org

appdb/ include/downloadurl.php unit_test/test_ ...
by WineHQ 31 May '07

31 May '07

ChangeSet ID: 31150 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/05/30 21:40:02 Modified files: include : downloadurl.php unit_test : test_om_objects.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> downloadurl: Add more objectManager functions. Allow us to unqueue queued downloadurls that are currently stuck in limbo. Patch: http://cvs.winehq.org/patch.py?id=31150 Old revision New revision Changes Path 1.15 1.16 +72 -1 appdb/include/downloadurl.php 1.12 1.13 +5 -0 appdb/unit_test/test_om_objects.php Index: appdb/include/downloadurl.php diff -u -p appdb/include/downloadurl.php:1.15 appdb/include/downloadurl.php:1.16 --- appdb/include/downloadurl.php:1.15 31 May 2007 2:40: 2 -0000 +++ appdb/include/downloadurl.php 31 May 2007 2:40: 2 -0000 @@ -57,8 +57,21 @@ class downloadurl } /* Output an editor for Download URL fields */ - function outputEditor($oVersion, $sFormAction) + function outputEditor($oVersion = null, $sFormAction = null) { + /* If we do not get any parameters we try to behave like a proper objectManager + object, by only showing an editor for one entry instead of several. This + code is sort of hacky, and should be fixed once the rest of the downloadurl + code is fully adapted to the objectManager */ + if(!$oVersion && !$sFormAction) + { + global $aClean; + echo downloadurl::outputEditorSingle($this->iVersionId); + } + + if(!$oVersion || !$sFormAction) + return FALSE; + /* Check for correct permissions */ if(!downloadurl::canEdit($oVersion->iVersionId)) return FALSE; @@ -356,6 +369,64 @@ class downloadurl return TRUE; } + + function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0) + { + return appData::objectGetEntries($bQueued, $bRejected, $iRows, $iStart, + "downloadurl"); + } + + function objectGetHeader() + { + return appData::objectGetHeader("downloadurl"); + } + + /* arg1 = OM object, arg2 = CSS style, arg3 = text for edit link */ + function objectOutputTableRow($oObject, $sClass, $sEditLinkLabel) + { + $oAppData = new AppData(); + $oAppData->objectOutputTableRow($oObject, $sClass, $sEditLinkLabel); + } + + function objectGetInstanceFromRow($oRow) + { + return new appData($oRow->id, $oRow); + } + + function getOutputEditorValues($aClean) + { + $this->sUrl = $aClean['sDownloadUrlUrl']; + $this->sDescription = $aClean['sDownloadUrlDescription']; + } + + function mustBeQueued() + { + if($this) + { + $oAppData = new appData(); + $oAppData->iVersionId = $this->iVersionId; + $oAppData->iAppId = NULL; + return $oAppData->mustBeQueued(); + } else + return appData::mustBeQueued(); + } + + function allowAnonymousSubmissions() + { + return FALSE; + } + + function objectMakeLink() + { + /* FIXME: not implemented */ + return TRUE; + } + + function objectMakeUrl() + { + /* FIXME: not implemented */ + return TRUE; + } } ?> Index: appdb/unit_test/test_om_objects.php diff -u -p appdb/unit_test/test_om_objects.php:1.12 appdb/unit_test/test_om_objects.php:1.13 --- appdb/unit_test/test_om_objects.php:1.12 31 May 2007 2:40: 2 -0000 +++ appdb/unit_test/test_om_objects.php 31 May 2007 2:40: 2 -0000 @@ -49,6 +49,10 @@ function test_class($sClassName, $aTestM $oTestObject->sName = "Silly test distribution"; $oTestObject->sUrl = "http://appdb.winehq.org/"; break; + case "downloadurl": + $oTestObject->sUrl = "http://appdb.winehq.org/"; + $oTestObject->sDescription = "DANGER"; + $oTestObject->iVersionId = 65000; // Just needs to be != 0 case "maintainer": $iAppId = 65555; $oApp = new application(); @@ -139,6 +143,7 @@ function test_object_methods() $aTestClasses = array("application", "application_queue", "distribution", + "downloadurl", "maintainer", "screenshot", "testData",

1 0

appdb/include version_queue.php
by WineHQ 31 May '07

31 May '07

ChangeSet ID: 31149 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/05/30 21:33:36 Modified files: include : version_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix un-queueing of download urls Patch: http://cvs.winehq.org/patch.py?id=31149 Old revision New revision Changes Path 1.10 1.11 +8 -1 appdb/include/version_queue.php Index: appdb/include/version_queue.php diff -u -p appdb/include/version_queue.php:1.10 appdb/include/version_queue.php:1.11 --- appdb/include/version_queue.php:1.10 31 May 2007 2:33:36 -0000 +++ appdb/include/version_queue.php 31 May 2007 2:33:36 -0000 @@ -10,15 +10,21 @@ class version_queue { $this->oVersion = new version($iVersionId); $iTestingId = null; + $iDownloadUrlId = null; if($iVersionId) { $iTestingId = testData::getNewestTestIdFromVersionId($iVersionId, $this->oVersion->sQueued); + if($hResult = appData::getData($iVersionId, "downloadurl", TRUE, TRUE)) + { + if($oRow = mysql_fetch_object($hResult)) + $iDownloadUrlId = $oRow->id; + } } $this->oTestDataQueue = new testData_queue($iTestingId); - $this->oDownloadUrl = new downloadurl(); + $this->oDownloadUrl = new downloadurl($iDownloadUrlId); } function create() @@ -67,6 +73,7 @@ class version_queue { $this->oVersion->unQueue(); $this->oTestDataQueue->unQueue(); + $this->oDownloadUrl->unQueue(); } function outputEditor()

1 0

appdb/include application_queue.php
by WineHQ 31 May '07

31 May '07

ChangeSet ID: 31148 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/05/30 21:31:14 Modified files: include : application_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix display of download url in app queue Patch: http://cvs.winehq.org/patch.py?id=31148 Old revision New revision Changes Path 1.4 1.5 +1 -1 appdb/include/application_queue.php Index: appdb/include/application_queue.php diff -u -p appdb/include/application_queue.php:1.4 appdb/include/application_queue.php:1.5 --- appdb/include/application_queue.php:1.4 31 May 2007 2:31:14 -0000 +++ appdb/include/application_queue.php 31 May 2007 2:31:14 -0000 @@ -180,7 +180,7 @@ class application_queue global $aClean; echo $this->oVersionQueue->oDownloadUrl->outputEditorSingle( - $this->oVersionQueue->Oversion->iVersionId, $aClean); + $this->oVersionQueue->oVersion->iVersionId, $aClean); $this->oVersionQueue->oTestDataQueue->outputEditor(); }

1 0

lostwages/templates/en about.template acknowle ...
by Jeremy Newman 30 May '07

30 May '07

ChangeSet ID: 31147 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/05/30 13:25:37 Modified files: templates/en : about.template acknowledgement.template Log message: Alex Waite <awaite2(a)uiuc.edu> Remove tables, use correct html elements for purpose, code cleanup Patch: http://cvs.winehq.org/patch.py?id=31147 Old revision New revision Changes Path 1.19 1.20 +6 -12 lostwages/templates/en/about.template 1.8 1.9 +52 -74 lostwages/templates/en/acknowledgement.template Index: lostwages/templates/en/about.template diff -u -p lostwages/templates/en/about.template:1.19 lostwages/templates/en/about.template:1.20 --- lostwages/templates/en/about.template:1.19 30 May 2007 18:25:37 -0000 +++ lostwages/templates/en/about.template 30 May 2007 18:25:37 -0000 @@ -32,10 +32,10 @@ implementation progress. website can be emailed to <a href="mailto:web-admin_at_winehq.org">web-admin_at_winehq.org</a>. Alexandre Julliard leads the Wine project, and may be reached by email at -<a href="mailto:julliard_at_winehq.org">julliard_at_winehq.org</a>. +<a href="mailto:julliard_at_winehq.org">julliard_at_winehq.org</a>. We've also assembled a short list of resources to help you understand -the project: +the project: <ul> <li><a href="{$root}/site/history">Wine's History</a></li> <li><a href="{$root}/site/who">Wine's Who's Who</a></li> @@ -46,13 +46,7 @@ the project: <li><a href="{$root}/site/acknowledgement">Acknowledgements</a></li> </ul> - -<hr> -<table width="100%" border=0 cellpadding=0 cellspacing=0> -<tr valign=top> - <td width="50%" align=right> - Wine's History :<a href="{$root}/site/history">Next</a> - </td> -</tr> -</table> -  +<hr /> +<div class="link-container"> + Wine's History: <a href="{$root}/site/history">Next</a> +</div> \ No newline at end of file Index: lostwages/templates/en/acknowledgement.template diff -u -p lostwages/templates/en/acknowledgement.template:1.8 lostwages/templates/en/acknowledgement.template:1.9 --- lostwages/templates/en/acknowledgement.template:1.8 30 May 2007 18:25:37 -0000 +++ lostwages/templates/en/acknowledgement.template 30 May 2007 18:25:37 -0000 @@ -14,67 +14,54 @@ Wine over the years and for that we'd li commercial development. A lot of companies have paid developers to spend time working on Wine and they've graciously given that work back to the community. Not very many free software projects are fortunate -enough to have paid staff tackling tough problems.. we are. +enough to have paid staff tackling tough problems.. we are. -<a href="http://www.codeweavers.com">CodeWeavers</a> -<ul> -CodeWeavers' mission is to make Linux a -Windows®-compatible operating system. To -that end, they've hired some of the best talent in the Wine community. -In fact, many of the large projects recently undertaken by Wine have started as -initiatives by CodeWeavers. Some of the different areas they've worked -on include TrueType fonts support, internationalization and Unicode, -Microsoft Installer support, DCOM support, DLL separation, and -gazillions of bug fixes. In 2004 CodeWeavers hosted WineConf 2004 at their -offices in St. Paul, Minnesota.</ul> +<dl> + <dt class="bold underline"><a href="http://www.codeweavers.com">CodeWeavers</a></dt> + <dd>CodeWeavers' mission is to make Linux a Windows® + -compatible operating system. To that end, they've hired some of the best + talent in the Wine community. In fact, many of the large projects recently + undertaken by Wine have started as initiatives by CodeWeavers. Some of the + different areas they've worked on include TrueType fonts support, + internationalization and Unicode, Microsoft Installer support, DCOM support, + DLL separation, and gazillions of bug fixes. In 2004 CodeWeavers hosted WineConf + 2004 at their offices in St. Paul, Minnesota.</dd> + <dt class="bold underline"><a href="http://www.corel.com">Corel</a></dt> + <dd>Corel dedicated a team of paid engineers to the Wine project in 1999. They + focused on adding functionality to Wine that let Corel applications, such as + WordPerfect, CorelDRAW, and Quattro Pro run on Linux and be ported as + native Linux applications. In the past, Corel had relied on conventional + porting techniques to move some of its applications (Corel WordPerfect 8) + to Linux. This provided a fast way to get these applications to Linux, but + meant that porting had to be repeated with each new version. Improving + Wine and compiling with Winelib allowed them to consolidate codebases. + While Corel ultimately moved on to other projects, they definitely had + a positive effect on Wine.</dd> + <dt class="bold underline"><a href="http://www.macadamian.com">Macadamian</a></dt> + <dd>Macadamian was subcontracted by Corel to improve several areas of Wine. + For two years engineers spent time improving Wine's windowing, controls + and dialogs.</dd> + <dt class="bold underline"><a href="http://www.reactos.org">ReactOS</a></dt> + <dd>Wine is at the heart of ReactOS' Win32 support. Initial work + improved Wine's portability by cleaning things up so MinGW could + compile it. From there, a considerable amount of effort was spent + improving Wine's shell32 infrastructure and various controls. + The ReactOS team is also responsible for the regedit and task manager + utilities.</dd> + <dt class="bold underline"><a href="http://www.transgaming.com">TransGaming</a></dt> + <dd>Development efforts at TransGaming, mostly in 2002, improved several + critical areas of Wine. Changes to DCOM, DirectDraw and 2D graphics support + helped new types of programs to install. Later, the widl utility was + donated to act as a MIDL replacement.</dd> + <dt class="bold underline">...And a cast of hundreds</dt> + <dd>If you haven't seen the <a href="http://www.winehq.org/site/who">Who's + Who</a> list, check that out for a list of major contributors. In + addition, the following individuals have spent a considerable amount + of time and effort improving Wine. Also note, contributions to "misc" + shouldn't be taken lightly. In most cases those folks have submitted + enough patches that you can't nail down any particular area of focus.</dd> +</dl> -<a href="http://www.corel.com">Corel</a> -<ul> -Corel dedicated a team of paid engineers to the Wine project in 1999. They -focused on adding functionality to Wine that let Corel applications, such as -WordPerfect, CorelDRAW, and Quattro Pro run on Linux and be ported as -native Linux applications. In the past, Corel had relied on conventional -porting techniques to move some of its applications (Corel WordPerfect 8) -to Linux. This provided a fast way to get these applications to Linux, but -meant that porting had to be repeated with each new version. Improving -Wine and compiling with Winelib allowed them to consolidate codebases. -While Corel ultimately moved on to other projects, they definitely had -a positive effect on Wine.</ul> - -<a href="http://www.macadamian.com">Macadamian</a> -<ul> -Macadamian was subcontracted by Corel to improve several areas of Wine. -For two years engineers spent time improving Wine's windowing, controls -and dialogs. </ul> - -<a href="http://www.reactos.org">ReactOS</a> -<ul>Wine is at the heart of ReactOS' Win32 support. Initial work -improved Wine's portability by cleaning things up so MinGW could -compile it. From there, a considerable amount of effort was spent -improving Wine's shell32 infrastructure and various controls. -The ReactOS team is also responsible for the regedit and task manager -utilities. -</ul> - -<a href="http://www.transgaming.com">TransGaming</a> -<ul>Development efforts at TransGaming, mostly in 2002, improved several -critical areas of Wine. Changes to DCOM, DirectDraw and 2D graphics support -helped new types of programs to install. Later, the widl utility was -donated to act as a MIDL replacement. -</ul> - - -..And a cast of hundreds - -<ul> -If you haven't seen the -<a href="http://www.winehq.org/site/who">Who's Who</a> list, check -that out for a list of major contributors. In addition, the following -individuals have spent a considerable amount of time and effort improving -Wine. Also note, contributions to "misc" shouldn't be taken lightly. -In most cases those folks have submitted enough patches that you can't -nail down any particular area of focus. -</ul> <table align=center> <tr><td>James Abbatiello</td> <td>misc</td> <td>1999-2001</td></tr> <tr><td>Guy L. Albertelli</td> <td>controls</td> <td>1999-2002</td></tr> @@ -217,19 +204,10 @@ nail down any particular area of focus. </table> A complete list of <a href="http://source.winehq.org/git/?p=wine.git;a=blob_plain;f=AUTHORS">authors</a> can be -found in the source code repository. -<hr> - -<hr> -<table width="100%" border=0 cellpadding=0 cellspacing=0> -<tr valign=top> - <td width="50%" align=left> - <a href="{$root}/site/wine_features">Previous</a>: Wine's Features - </td> - <td width="50%" align=right> - About Wine :<a href="{$root}/site/about">Next</a> - </td> -</tr> -</table> +found in the source code repository. +<hr /> -  +<div class="link-container"> + About Wine: <a href="{$root}/site/about">Next</a> + <a href="{$root}/site/wine_features">Previous</a>: Wine's Features +</div> \ No newline at end of file

1 0

lostwages/templates/en bug_tracking.template c ...
by Jeremy Newman 30 May '07

30 May '07

ChangeSet ID: 31146 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/05/30 13:22:29 Removed files: templates/en : bug_tracking.template change_theme.template developer_hints.template development.template support.template troubleshooting.template Log message: removing dead pages Patch: http://cvs.winehq.org/patch.py?id=31146 Old revision New revision Changes Path 1.7 Removed +0 -0 lostwages/templates/en/bug_tracking.template 1.1 Removed +0 -0 lostwages/templates/en/change_theme.template 1.3 Removed +0 -0 lostwages/templates/en/developer_hints.template 1.7 Removed +0 -0 lostwages/templates/en/development.template 1.7 Removed +0 -0 lostwages/templates/en/support.template 1.2 Removed +0 -0 lostwages/templates/en/troubleshooting.template

1 0

Andrew Talbot : msacm32.drv: Constify some variables.
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: 0bfd58014a136f50b50bebe70d8b14e31766f296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bfd58014a136f50b50bebe70… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun May 27 17:52:34 2007 +0100 msacm32.drv: Constify some variables. --- dlls/msacm32.drv/wavemap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index d2738aa..33e328d 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -67,7 +67,7 @@ typedef struct tagWAVEMAPDATA { DWORD nSamplesPerSecInner; } WAVEMAPDATA; -static BOOL WAVEMAP_IsData(WAVEMAPDATA* wm) +static BOOL WAVEMAP_IsData(const WAVEMAPDATA* wm) { return (!IsBadReadPtr(wm, sizeof(WAVEMAPDATA)) && wm->self == wm); }

1 0

Andrew Talbot : msadp32.acm: Constify some variables.
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: ece244b79ed9004881bab0f162d58e7ea33afc48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece244b79ed9004881bab0f16… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun May 27 19:38:55 2007 +0100 msadp32.acm: Constify some variables. --- dlls/msadp32.acm/msadp32.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 0336582..f0394ac 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -55,7 +55,7 @@ static LRESULT ADPCM_drvClose(DWORD_PTR dwDevID) typedef struct tagAcmAdpcmData { - void (*convert)(PACMDRVSTREAMINSTANCE adsi, + void (*convert)(const ACMDRVSTREAMINSTANCE *adsi, const unsigned char*, LPDWORD, unsigned char*, LPDWORD); } AcmAdpcmData; @@ -101,7 +101,7 @@ static ADPCMCOEFSET MSADPCM_CoeffSet[] = /*********************************************************************** * ADPCM_GetFormatIndex */ -static DWORD ADPCM_GetFormatIndex(WAVEFORMATEX* wfx) +static DWORD ADPCM_GetFormatIndex(const WAVEFORMATEX* wfx) { int i, hi; const Format* fmts; @@ -204,7 +204,7 @@ static inline void process_nibble(unsigned nibble, int* idelta, if (*idelta < 16) *idelta = 16; } -static void cvtSSms16K(PACMDRVSTREAMINSTANCE adsi, +static void cvtSSms16K(const ACMDRVSTREAMINSTANCE *adsi, const unsigned char* src, LPDWORD nsrc, unsigned char* dst, LPDWORD ndst) { @@ -254,7 +254,7 @@ static void cvtSSms16K(PACMDRVSTREAMINSTANCE adsi, } } -static void cvtMMms16K(PACMDRVSTREAMINSTANCE adsi, +static void cvtMMms16K(const ACMDRVSTREAMINSTANCE *adsi, const unsigned char* src, LPDWORD nsrc, unsigned char* dst, LPDWORD ndst) { @@ -616,7 +616,7 @@ static LRESULT ADPCM_StreamClose(PACMDRVSTREAMINSTANCE adsi) * ADPCM_StreamSize * */ -static LRESULT ADPCM_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE adss) +static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSIZE adss) { switch (adss->fdwSize) {

1 0

José Manuel Ferrer Ortiz : Some Spanish translations updated.
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: 01755125980cf75e692ca4b7b040d55a432f0baa URL: http://source.winehq.org/git/wine.git/?a=commit;h=01755125980cf75e692ca4b7b… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Fri May 25 14:32:35 2007 -0700 Some Spanish translations updated. --- programs/clock/Es.rc | 26 +++++++++- programs/cmd/Es.rc | 27 ++++++--- programs/cmdlgtst/Es.rc | 63 ++++++++++++++++++++++- programs/regedit/Es.rc | 132 +++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 220 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01755125980cf75e692ca…

1 0

Andrew Talbot : msacm32: Constify some variables.
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: af1a91d35ee278ad076d36655cc115f6d648762d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1a91d35ee278ad076d36655… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun May 27 17:52:30 2007 +0100 msacm32: Constify some variables. --- dlls/msacm32/internal.c | 12 ++++++------ dlls/msacm32/wineacm.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 204a7e2..84898ea 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -113,7 +113,7 @@ static void MSACM_DumpCache(PWINE_ACMDRIVERID padid) * Returns TRUE is the format tag fmtTag is present in the cache. * If so, idx is set to its index. */ -BOOL MSACM_FindFormatTagInCache(WINE_ACMDRIVERID* padid, DWORD fmtTag, LPDWORD idx) +BOOL MSACM_FindFormatTagInCache(const WINE_ACMDRIVERID* padid, DWORD fmtTag, LPDWORD idx) { unsigned i; @@ -249,7 +249,7 @@ static BOOL MSACM_ReadCache(PWINE_ACMDRIVERID padid) /*********************************************************************** * MSACM_WriteCache */ -static BOOL MSACM_WriteCache(PWINE_ACMDRIVERID padid) +static BOOL MSACM_WriteCache(const WINE_ACMDRIVERID *padid) { LPWSTR key = MSACM_GetRegistryKey(padid); HKEY hKey; @@ -259,11 +259,11 @@ static BOOL MSACM_WriteCache(PWINE_ACMDRIVERID padid) if (RegCreateKeyW(HKEY_LOCAL_MACHINE, key, &hKey)) goto errCleanUp; - if (RegSetValueExA(hKey, "cFormatTags", 0, REG_DWORD, (void*)&padid->cFormatTags, sizeof(DWORD))) + if (RegSetValueExA(hKey, "cFormatTags", 0, REG_DWORD, (const void*)&padid->cFormatTags, sizeof(DWORD))) goto errCleanUp; - if (RegSetValueExA(hKey, "cFilterTags", 0, REG_DWORD, (void*)&padid->cFilterTags, sizeof(DWORD))) + if (RegSetValueExA(hKey, "cFilterTags", 0, REG_DWORD, (const void*)&padid->cFilterTags, sizeof(DWORD))) goto errCleanUp; - if (RegSetValueExA(hKey, "fdwSupport", 0, REG_DWORD, (void*)&padid->fdwSupport, sizeof(DWORD))) + if (RegSetValueExA(hKey, "fdwSupport", 0, REG_DWORD, (const void*)&padid->fdwSupport, sizeof(DWORD))) goto errCleanUp; if (RegSetValueExA(hKey, "aFormatTagCache", 0, REG_BINARY, (void*)padid->aFormatTag, @@ -456,7 +456,7 @@ void MSACM_EnableNotifications(void) /*********************************************************************** * MSACM_UnRegisterNotificationWindow() */ -PWINE_ACMNOTIFYWND MSACM_UnRegisterNotificationWindow(PWINE_ACMNOTIFYWND panwnd) +PWINE_ACMNOTIFYWND MSACM_UnRegisterNotificationWindow(const WINE_ACMNOTIFYWND *panwnd) { PWINE_ACMNOTIFYWND p; diff --git a/dlls/msacm32/wineacm.h b/dlls/msacm32/wineacm.h index b575c8c..fc03401 100644 --- a/dlls/msacm32/wineacm.h +++ b/dlls/msacm32/wineacm.h @@ -382,7 +382,7 @@ extern PWINE_ACMNOTIFYWND MSACM_GetNotifyWnd(HACMDRIVERID hDriver); extern PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj, DWORD type); extern MMRESULT MSACM_Message(HACMDRIVER, UINT, LPARAM, LPARAM); -extern BOOL MSACM_FindFormatTagInCache(WINE_ACMDRIVERID*, DWORD, LPDWORD); +extern BOOL MSACM_FindFormatTagInCache(const WINE_ACMDRIVERID*, DWORD, LPDWORD); extern void MSACM_RePositionDriver(PWINE_ACMDRIVERID, DWORD); extern void MSACM_WriteCurrentPriorities(void); @@ -390,7 +390,7 @@ extern void MSACM_BroadcastNotification(void); extern void MSACM_DisableNotifications(void); extern void MSACM_EnableNotifications(void); extern PWINE_ACMNOTIFYWND MSACM_RegisterNotificationWindow(HWND hNotifyWnd, DWORD dwNotifyMsg); -extern PWINE_ACMNOTIFYWND MSACM_UnRegisterNotificationWindow(PWINE_ACMNOTIFYWND); +extern PWINE_ACMNOTIFYWND MSACM_UnRegisterNotificationWindow(const WINE_ACMNOTIFYWND*); extern PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry);

1 0

Stefan Leichter : advapi32: Added implementation of RegDeleteTreeA/W.
by Alexandre Julliard 30 May '07

30 May '07

Module: wine Branch: master Commit: 88b6bc4f7c20113f3b94a6ed8b80016a625d9bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b6bc4f7c20113f3b94a6ed8… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri May 25 18:15:54 2007 +0200 advapi32: Added implementation of RegDeleteTreeA/W. --- dlls/advapi32/advapi32.spec | 2 + dlls/advapi32/registry.c | 88 +++++++++++++++++++++++++++++++++++++++++++ include/winreg.h | 3 + 3 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0d27297..20f333d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -473,6 +473,8 @@ @ stdcall RegCreateKeyW(long wstr ptr) @ stdcall RegDeleteKeyA(long str) @ stdcall RegDeleteKeyW(long wstr) +@ stdcall RegDeleteTreeA(long str) +@ stdcall RegDeleteTreeW(long wstr) @ stdcall RegDeleteValueA(long str) @ stdcall RegDeleteValueW(long wstr) @ stdcall RegDisablePredefinedCache() diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 4406004..cb905ed 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2615,3 +2615,91 @@ LONG WINAPI RegDisablePredefinedCache(void) return ERROR_SUCCESS; } + +/****************************************************************************** + * RegDeleteTreeW [ADVAPI32.@] + * + */ +LONG WINAPI RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) +{ + LONG ret; + DWORD dwMaxSubkeyLen, dwMaxValueLen; + DWORD dwMaxLen, dwSize; + WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; + HKEY hSubKey = hKey; + + TRACE("(hkey=%p,%p %s)\n", hKey, lpszSubKey, debugstr_w(lpszSubKey)); + + if(lpszSubKey) + { + ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); + if (ret) return ret; + } + + /* Get highest length for keys, values */ + ret = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL, + &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); + if (ret) goto cleanup; + + dwMaxSubkeyLen++; + dwMaxValueLen++; + dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); + if (dwMaxLen > sizeof(szNameBuf)/sizeof(WCHAR)) + { + /* Name too big: alloc a buffer for it */ + if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen*sizeof(WCHAR)))) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + } + + + /* Recursively delete all the subkeys */ + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, + NULL, NULL, NULL)) break; + + ret = RegDeleteTreeW(hSubKey, lpszName); + if (ret) goto cleanup; + } + + if (lpszSubKey) + ret = RegDeleteKeyW(hKey, lpszSubKey); + else + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumValueW(hKey, 0, lpszName, &dwSize, + NULL, NULL, NULL, NULL)) break; + + ret = RegDeleteValueW(hKey, lpszName); + if (ret) goto cleanup; + } + +cleanup: + /* Free buffer if allocated */ + if (lpszName != szNameBuf) + HeapFree( GetProcessHeap(), 0, lpszName); + if(lpszSubKey) + RegCloseKey(hSubKey); + return ret; +} + +/****************************************************************************** + * RegDeleteTreeA [ADVAPI32.@] + * + */ +LONG WINAPI RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) +{ + LONG ret; + UNICODE_STRING lpszSubKeyW; + + if (lpszSubKey) RtlCreateUnicodeStringFromAsciiz( &lpszSubKeyW, lpszSubKey); + else lpszSubKeyW.Buffer = NULL; + ret = RegDeleteTreeW( hKey, lpszSubKeyW.Buffer); + RtlFreeUnicodeString( &lpszSubKeyW ); + return ret; +} diff --git a/include/winreg.h b/include/winreg.h index c694052..4e04956 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -154,6 +154,9 @@ LONG WINAPI RegCreateKeyW(HKEY,LPCWSTR,PHKEY); LONG WINAPI RegDeleteKeyA(HKEY,LPCSTR); LONG WINAPI RegDeleteKeyW(HKEY,LPCWSTR); #define RegDeleteKey WINELIB_NAME_AW(RegDeleteKey) +LONG WINAPI RegDeleteTreeA(HKEY,LPCSTR); +LONG WINAPI RegDeleteTreeW(HKEY,LPCWSTR); +#define RegDeleteTree WINELIB_NAME_AW(RegDeleteTree) LONG WINAPI RegDeleteValueA(HKEY,LPCSTR); LONG WINAPI RegDeleteValueW(HKEY,LPCWSTR); #define RegDeleteValue WINELIB_NAME_AW(RegDeleteValue)

1 0