January 2006 - Wine-Commits

appdb/admin adminMaintainerQueue.php
by WineHQ Jan. 23, 2006

Jan. 23, 2006

ChangeSet ID: 22445 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/22 20:12:41 Modified files: admin : adminMaintainerQueue.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix maintainer queue showing the wrong version due to the creation of a Application object instead of a Version object. Patch: http://cvs.winehq.org/patch.py?id=22445 Old revision New revision Changes Path 1.18 1.19 +1 -1 appdb/admin/adminMaintainerQueue.php Index: appdb/admin/adminMaintainerQueue.php diff -u -p appdb/admin/adminMaintainerQueue.php:1.18 appdb/admin/adminMaintainerQueue.php:1.19 --- appdb/admin/adminMaintainerQueue.php:1.18 23 Jan 2006 2:12:41 -0000 +++ appdb/admin/adminMaintainerQueue.php 23 Jan 2006 2:12:41 -0000 @@ -135,7 +135,7 @@ if ($_REQUEST['sub']) } $oApp = new Application($ob->appId); - $oVersion = new Application($ob->versionId); + $oVersion = new Version($ob->versionId); //app name echo '<tr valign=top><td class=color0><b>App Name</b></td>',"\n";

1 0

appdb/ ./appsubmit.php ./distributionView.php ...
by WineHQ Jan. 23, 2006

Jan. 23, 2006

ChangeSet ID: 22444 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/22 20:10:32 Modified files: . : appsubmit.php distributionView.php testResults.php admin : adminAppQueue.php adminTestResults.php include : testResults.php user.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Pass a version object into user::hasAppVersionModifyPermission() instead of the integer that is the index of the version in the database. Patch: http://cvs.winehq.org/patch.py?id=22444 Old revision New revision Changes Path 1.37 1.38 +1 -1 appdb/appsubmit.php 1.6 1.7 +1 -1 appdb/distributionView.php 1.2 1.3 +2 -1 appdb/testResults.php 1.49 1.50 +2 -3 appdb/admin/adminAppQueue.php 1.2 1.3 +2 -1 appdb/admin/adminTestResults.php 1.7 1.8 +14 -6 appdb/include/testResults.php 1.63 1.64 +3 -3 appdb/include/user.php Index: appdb/appsubmit.php diff -u -p appdb/appsubmit.php:1.37 appdb/appsubmit.php:1.38 --- appdb/appsubmit.php:1.37 23 Jan 2006 2:10:32 -0000 +++ appdb/appsubmit.php 23 Jan 2006 2:10:32 -0000 @@ -95,7 +95,7 @@ if ($_REQUEST['sub']) $oVersion = new Version($_REQUEST['versionId']); // make sure the user has permission to view this version - if(!$_SESSION['current']->hasAppVersionModifyPermission($oVersion->versionId) && + if(!$_SESSION['current']->hasAppVersionModifyPermission($oVersion) && (($oVersion->queued=="false")?true:false) && !$_SESSION['current']->isVersionSubmitter($oVersion->versionId)) { Index: appdb/distributionView.php diff -u -p appdb/distributionView.php:1.6 appdb/distributionView.php:1.7 --- appdb/distributionView.php:1.6 23 Jan 2006 2:10:32 -0000 +++ appdb/distributionView.php 23 Jan 2006 2:10:32 -0000 @@ -140,7 +140,7 @@ else echo '<td>'.$oTest->sInstalls.'&nbsp</td>',"\n"; echo '<td>'.$oTest->sRuns.'&nbsp</td>',"\n"; echo '<td>'.$oTest->sTestedRating.'&nbsp</td>',"\n"; - if ($_SESSION['current']->hasAppVersionModifyPermission($oTest->iVersionId)) + if ($_SESSION['current']->hasAppVersionModifyPermission($oVersion)) { echo '<td><a href="'.BASE.'admin/adminTestResults.php?sub=view&iTestingId='.$oTest->iTestingId.'">',"\n"; echo 'Edit</a></td>',"\n"; Index: appdb/testResults.php diff -u -p appdb/testResults.php:1.2 appdb/testResults.php:1.3 --- appdb/testResults.php:1.2 23 Jan 2006 2:10:32 -0000 +++ appdb/testResults.php 23 Jan 2006 2:10:32 -0000 @@ -69,8 +69,9 @@ if ($_REQUEST['sub']) if(is_numeric($_REQUEST['iTestingId'])) { // make sure the user has permission to view this testing result + $oVersion = new Version($oTest->iVersionId); if(!$_SESSION['current']->hasPriv("admin") && - !$_SESSION['current']->hasAppVersionModifyPermission($oTest->iVersionId)&& + !$_SESSION['current']->hasAppVersionModifyPermission($oVersion)&& !(($_SESSION['current']->iUserId == $oTest->iSubmitterId) && !($oTest->sQueued == 'false'))) { errorpage("Insufficient privileges."); Index: appdb/admin/adminAppQueue.php diff -u -p appdb/admin/adminAppQueue.php:1.49 appdb/admin/adminAppQueue.php:1.50 --- appdb/admin/adminAppQueue.php:1.49 23 Jan 2006 2:10:32 -0000 +++ appdb/admin/adminAppQueue.php 23 Jan 2006 2:10:32 -0000 @@ -104,13 +104,12 @@ if ($_REQUEST['sub']) else if($_REQUEST['apptype'] == 'version') { /* make sure the user has permission to view this version */ - if(!$_SESSION['current']->hasAppVersionModifyPermission($_REQUEST['versionId'])) + $oVersion = new Version($_REQUEST['versionId']); + if(!$_SESSION['current']->hasAppVersionModifyPermission($oVersion)) { errorpage("Insufficient privileges."); exit; } - - $oVersion = new Version($_REQUEST['versionId']); } else { //error no Id! Index: appdb/admin/adminTestResults.php diff -u -p appdb/admin/adminTestResults.php:1.2 appdb/admin/adminTestResults.php:1.3 --- appdb/admin/adminTestResults.php:1.2 23 Jan 2006 2:10:32 -0000 +++ appdb/admin/adminTestResults.php 23 Jan 2006 2:10:32 -0000 @@ -16,7 +16,8 @@ require_once(BASE."include/distributions if ($_REQUEST['sub']) { $oTest = new testData($_REQUEST['iTestingId']); - if (!($_SESSION['current']->hasAppVersionModifyPermission($oTest->iVersionId))) + $oVersion = new Version($oTest->iVersionId); + if(!($_SESSION['current']->hasAppVersionModifyPermission($oVersion))) { errorpage("Insufficient privileges."); exit; Index: appdb/include/testResults.php diff -u -p appdb/include/testResults.php:1.7 appdb/include/testResults.php:1.8 --- appdb/include/testResults.php:1.7 23 Jan 2006 2:10:32 -0000 +++ appdb/include/testResults.php 23 Jan 2006 2:10:32 -0000 @@ -62,8 +62,9 @@ class testData{ function create() { // Security, if we are not an administrator or an maintainer the test result must be queued. + $oVersion = new Version($oTest->iVersionId); if(!$_SESSION['current']->hasPriv("admin") && - !$_SESSION['current']->hasAppVersionModifyPermission($oTest->iVersionId)) + !$_SESSION['current']->hasAppVersionModifyPermission($oVersion)) $this->sQueued = 'true'; else $this->sQueued = 'false'; @@ -99,8 +100,9 @@ class testData{ function update($bSilent=false) { // is the current user allowed to update this testing result? + $oVersion = new Version($this->iVersionId); if(!$_SESSION['current']->hasPriv("admin") && - !$_SESSION['current']->hasAppVersionModifyPermission($this->iVersionId) && + !$_SESSION['current']->hasAppVersionModifyPermission($oVersion) && !(($_SESSION['current']->iUserId == $this->iSubmitterId) && !($this->sQueued == 'false'))) { return; @@ -132,8 +134,9 @@ class testData{ function delete($bSilent=false) { // is the current user allowed to delete this testing result? + $oVersion = new Version($this->iVersionId); if(!$_SESSION['current']->hasPriv("admin") && - !$_SESSION['current']->hasAppVersionModifyPermission($this->iVersionId) && + !$_SESSION['current']->hasAppVersionModifyPermission($oVersion) && !(($_SESSION['current']->iUserId == $this->iSubmitterId) && !($this->sQueued == 'false'))) { return; @@ -158,7 +161,9 @@ class testData{ function unQueue() { // is the current user allowed to delete this testing data? - if(!$_SESSION['current']->hasPriv("admin") && !$_SESSION['current']->hasAppVersionModifyPermission($this->iVersionId)) + $oVersion = new Version($this->iVersionId); + if(!$_SESSION['current']->hasPriv("admin") && + !$_SESSION['current']->hasAppVersionModifyPermission($oVersion)) { return; } @@ -180,7 +185,9 @@ class testData{ function Reject() { // is the current user allowed to delete this testing data? - if(!$_SESSION['current']->hasPriv("admin") && !$_SESSION['current']->hasAppVersionModifyPermission($this->iVersionId)) + $oVersion = new Version($this->iVersionId); + if(!$_SESSION['current']->hasPriv("admin") && + !$_SESSION['current']->hasAppVersionModifyPermission($oVersion)) { return; } @@ -202,8 +209,9 @@ class testData{ function ReQueue() { // is the current user allowed to requeue this data + $oVersion = new Version($this->iVersionId); if(!$_SESSION['current']->hasPriv("admin") && - !$_SESSION['current']->hasAppVersionModifyPermission($this->iVersionId) && + !$_SESSION['current']->hasAppVersionModifyPermission($oVersion) && !$_SESSION['current']->iUserId == $this->iSubmitterId) { return; Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.63 appdb/include/user.php:1.64 --- appdb/include/user.php:1.63 23 Jan 2006 2:10:32 -0000 +++ appdb/include/user.php 23 Jan 2006 2:10:32 -0000 @@ -931,7 +931,7 @@ class User { if($this->hasPriv("admin")) return true; - if($this->hasAppVersionModifyPermission($oVersion->iVersionId)) + if($this->hasAppVersionModifyPermission($oVersion)) return true; return false; @@ -945,7 +945,7 @@ class User { if($this->hasPriv("admin")) return true; - if($this->hasAppVersionModifyPermission($oVersion->iVersionId)) + if($this->hasAppVersionModifyPermission($oVersion)) return true; return false; @@ -959,7 +959,7 @@ class User { if($this->hasPriv("admin")) return true; - if($this->hasAppVersionModifyPermission($oVersion->iVersionId)) + if($this->hasAppVersionModifyPermission($oVersion)) return true; if(($this->iUserId == $oVersion->iSubmitterId) &&

1 0

Marcus Meissner : winebuild: Output a .note.GNU-stack section to allow nonexecutable stack.
by Alexandre Julliard Jan. 21, 2006

Jan. 21, 2006

Module: wine Branch: refs/heads/master Commit: 1ed3ca0883390089531dcc6f7a2daa6a6f84d991 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1ed3ca0883390089531dcc6… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat Jan 21 19:23:36 2006 +0100 winebuild: Output a .note.GNU-stack section to allow nonexecutable stack. --- tools/winebuild/build.h | 1 + tools/winebuild/relay.c | 2 ++ tools/winebuild/spec16.c | 1 + tools/winebuild/spec32.c | 1 + tools/winebuild/utils.c | 14 ++++++++++++++ 5 files changed, 19 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index a445be9..c100b2c 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -176,6 +176,7 @@ extern const char *get_asm_short_keyword extern const char *get_asm_rodata_section(void); extern const char *get_asm_string_section(void); extern void output_function_size( FILE *outfile, const char *name ); +extern void output_gnu_stack_note( FILE *outfile ); extern void add_import_dll( const char *name, const char *filename ); extern void add_delayed_import( const char *name ); diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 8d304d0..6900294 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -982,6 +982,7 @@ void BuildRelays16( FILE *outfile ) fprintf( outfile, "%s\n\t.long 0\n", asm_globl("CallTo16_DataSelector") ); fprintf( outfile, "%s\n\t.long 0\n", asm_globl("CallTo16_TebSelector") ); if (UsePIC) fprintf( outfile, "wine_ldt_copy_ptr:\t.long %s\n", asm_name("wine_ldt_copy") ); + output_gnu_stack_note( outfile ); } /******************************************************************* @@ -1007,4 +1008,5 @@ void BuildRelays32( FILE *outfile ) BuildCallFrom32Regs( outfile ); output_function_size( outfile, "__wine_spec_thunk_text_32" ); + output_gnu_stack_note( outfile ); } diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index c8a1026..d3b4ef3 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -804,6 +804,7 @@ void BuildSpec16File( FILE *outfile, DLL output_stubs( outfile, spec ); output_get_pc_thunk( outfile ); output_init_code( outfile, spec, header_name ); + output_gnu_stack_note( outfile ); free( typelist ); } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 963e916..aa1ce3d 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -479,6 +479,7 @@ void BuildSpec32File( FILE *outfile, DLL output_imports( outfile, spec ); output_resources( outfile, spec ); output_asm_constructor( outfile, "__wine_spec_init_ctor" ); + output_gnu_stack_note( outfile ); } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 8fb3acc..8ba3cf8 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -533,6 +533,20 @@ void output_function_size( FILE *outfile } } +/* output the GNU note for non-exec stack */ +void output_gnu_stack_note( FILE *outfile ) +{ + switch (target_platform) + { + case PLATFORM_WINDOWS: + case PLATFORM_APPLE: + break; + default: + fprintf( outfile, "\t.section .note.GNU-stack,\"\",@progbits\n" ); + break; + } +} + /* return a global symbol declaration for an assembly symbol */ const char *asm_globl( const char *func ) {

1 0

Marcus Meissner : gdi: Metafile records must be at least 3 words long.
by Alexandre Julliard Jan. 21, 2006

Jan. 21, 2006

Module: wine Branch: refs/heads/master Commit: d6d64196026221b046260d8ba24ecaca420f8d7f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d6d64196026221b046260d8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 21 19:23:17 2006 +0100 gdi: Metafile records must be at least 3 words long. --- dlls/gdi/metafile.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdi/metafile.c b/dlls/gdi/metafile.c index 80de9c7..96011ff 100644 --- a/dlls/gdi/metafile.c +++ b/dlls/gdi/metafile.c @@ -419,11 +419,10 @@ BOOL MF_PlayMetaFile( HDC hdc, METAHEADE mr = (METARECORD *)((char *)mh + offset); TRACE("offset=%04x,size=%08lx\n", offset, mr->rdSize); - if (!mr->rdSize) { - TRACE( - "Entry got size 0 at offset %d, total mf length is %ld\n", - offset,mh->mtSize*2); - break; /* would loop endlessly otherwise */ + if (mr->rdSize < 3) { /* catch illegal record sizes */ + TRACE("Entry got size %ld at offset %d, total mf length is %ld\n", + mr->rdSize,offset,mh->mtSize*2); + break; } offset += mr->rdSize * 2; PlayMetaFileRecord( hdc, ht, mr, mh->mtNoObjects );

1 0

Alexandre Julliard : msvcrt: Preserve all registers in call_ebp_func.
by Alexandre Julliard Jan. 21, 2006

Jan. 21, 2006

Module: wine Branch: refs/heads/master Commit: c0165091191becde9b04ba9c9a6ddad6d3daa4f4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0165091191becde9b04ba9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 21 19:23:02 2006 +0100 msvcrt: Preserve all registers in call_ebp_func. --- dlls/msvcrt/cppexcept.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index 425a384..29d7b58 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -52,8 +52,15 @@ DWORD cxx_frame_handler( PEXCEPTION_RECO inline static void *call_ebp_func( void *func, void *ebp ) { void *ret; - __asm__ __volatile__ ("pushl %%ebp; movl %2,%%ebp; call *%%eax; popl %%ebp" \ - : "=a" (ret) : "0" (func), "r" (ebp) : "ecx", "edx", "memory" ); + int dummy; + __asm__ __volatile__ ("pushl %%ebx\n\t" + "pushl %%ebp\n\t" + "movl %4,%%ebp\n\t" + "call *%%eax\n\t" + "popl %%ebp\n\t" + "popl %%ebx" + : "=a" (ret), "=S" (dummy), "=D" (dummy) + : "0" (func), "1" (ebp) : "ecx", "edx", "memory" ); return ret; }

1 0

Jacek Caban : mshtml: Return FALSE if Mozilla ActiveX Control could not be found.
by Alexandre Julliard Jan. 21, 2006

Jan. 21, 2006

Module: wine Branch: refs/heads/master Commit: a457249ff5c929e4442b7eeb1a3b3667de676109 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a457249ff5c929e4442b7ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 21 19:22:39 2006 +0100 mshtml: Return FALSE if Mozilla ActiveX Control could not be found. --- dlls/mshtml/nsembed.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index f409eae..c17319a 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -186,7 +186,7 @@ static BOOL get_mozctl_path(PRUnichar *g TRACE("Could not find Mozilla ActiveX Control\n"); - return TRUE; + return FALSE; } static BOOL get_wine_gecko_path(PRUnichar *gre_path)

1 0

James Hawkins : advpack: Add a stub for RebootCheckOnInstall.
by Alexandre Julliard Jan. 21, 2006

Jan. 21, 2006

Module: wine Branch: refs/heads/master Commit: 7e458398232de90664a87ed002aec17d8fb2780f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e458398232de90664a87ed… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 21 19:22:17 2006 +0100 advpack: Add a stub for RebootCheckOnInstall. --- dlls/advpack/advpack.c | 31 +++++++++++++++++++++++++++++++ dlls/advpack/advpack.spec | 2 +- include/advpub.h | 1 + 3 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 6cdd514..ed370fa 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -348,6 +348,37 @@ HRESULT WINAPI OpenINFEngine(PCSTR pszIn } /*********************************************************************** + * RebootCheckOnInstall (ADVPACK.@) + * + * Checks if a reboot is required for an installed INF section. + * + * PARAMS + * hWnd [I] Handle to the window used for messages. + * pszINF [I] Filename of the INF file. + * pszSec [I] INF section to check. + * dwReserved [I] Reserved. Must be 0. + * + * RETURNS + * Success: S_OK - Reboot is needed if the INF section is installed. + * S_FALSE - Reboot is not needed. + * Failure: HRESULT of GetLastError(). + * + * NOTES + * if pszSec is NULL, RebootCheckOnInstall checks the DefaultInstall + * or DefaultInstall.NT section. + * + * BUGS + * Unimplemented. + */ +HRESULT WINAPI RebootCheckOnInstall(HWND hWnd, LPCSTR pszINF, + LPCSTR pszSec, DWORD dwReserved) +{ + FIXME("(%p, %p, %p, %ld) stub\n", hWnd, pszINF, pszSec, dwReserved); + + return E_FAIL; +} + +/*********************************************************************** * RegisterOCX (ADVPACK.@) */ void WINAPI RegisterOCX( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show ) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 7ec9e95..f1d2590 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -18,7 +18,7 @@ @ stdcall NeedReboot(long) @ stdcall NeedRebootInit() @ stdcall OpenINFEngine(str str long ptr ptr) -@ stub RebootCheckOnInstall +@ stdcall RebootCheckOnInstall(long str str long) @ stdcall RegInstall(ptr str ptr) @ stdcall RegRestoreAll(ptr str long) @ stdcall RegSaveRestore(ptr str long str str str long) diff --git a/include/advpub.h b/include/advpub.h index d07f7e3..9358d6f 100644 --- a/include/advpub.h +++ b/include/advpub.h @@ -139,6 +139,7 @@ DWORD WINAPI NeedRebootInit(VOID); BOOL WINAPI NeedReboot(DWORD dwRebootCheck); HRESULT WINAPI OpenINFEngine(PCSTR pszInfFilename, PCSTR pszInstallSection, DWORD dwFlags, HINF *phInf, PVOID pvReserved); +HRESULT WINAPI RebootCheckOnInstall(HWND hWnd, LPCSTR pszINF, LPCSTR pszSec, DWORD dwReserved); HRESULT WINAPI RegInstall(HMODULE hm, LPCSTR pszSection, LPCSTRTABLE pstTable); HRESULT WINAPI RegRestoreAll(HWND hWnd, PSTR pszTitleString, HKEY hkBackupKey); HRESULT WINAPI RegSaveRestore(HWND hWnd, PCSTR pszTitleString, HKEY hkBackupKey,

1 0

James Hawkins : advpack: Fix the documentation for AddDelBackupEntry.
by Alexandre Julliard Jan. 21, 2006

Jan. 21, 2006

Module: wine Branch: refs/heads/master Commit: cac3bf8471faa8c2bf98243695386fdcd521511e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cac3bf8471faa8c2bf98243… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 21 19:21:51 2006 +0100 advpack: Fix the documentation for AddDelBackupEntry. --- dlls/advpack/files.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index f5be6b3..28c6108 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -35,19 +35,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); /*********************************************************************** * AddDelBackupEntry (ADVPACK.@) * - * Either marks the file in the file list as not existing during file - * save, or deletes the file entry from the INI. + * Either appends the files in the file list to the backup section of + * the specified INI, or deletes the entries from the INI file. * * PARAMS * lpcszFileList [I] NULL-separated list of filenames. * lpcszBackupDir [I] Path of the backup directory. - * lpcszBaseName [I] Basename of the backup files. - * dwFlags [I] See advpub.h. + * lpcszBaseName [I] Basename of the INI file. + * dwFlags [I] AADBE_ADD_ENTRY adds the entries in the file list + * to the INI file, while AADBE_DEL_ENTRY removes + * the entries from the INI file. * * RETURNS * Success: S_OK. * Failure: E_FAIL. * + * NOTES + * If the INI file does not exist before adding entries to it, the file + * will be created. + * + * If lpcszBackupDir is NULL, the INI file is assumed to exist in + * c:\windows or created there if it does not exist. + * * BUGS * Unimplemented. */

1 0

James Hawkins : advpack: Complete the documentation for CloseINFEngine.
by Alexandre Julliard Jan. 21, 2006

Jan. 21, 2006

Module: wine Branch: refs/heads/master Commit: bf1a56efc3be7e5fd3e64db7846a2f9c3d76a684 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf1a56efc3be7e5fd3e64db… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 21 19:21:45 2006 +0100 advpack: Complete the documentation for CloseINFEngine. --- dlls/advpack/advpack.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 1214901..6cdd514 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -39,9 +39,10 @@ typedef HRESULT (WINAPI *DLLREGISTER) (v /*********************************************************************** * CloseINFEngine (ADVPACK.@) * + * Closes a handle to an INF file opened with OpenINFEngine. * * PARAMS - * hInf [I] + * hInf [I] Handle to the INF file to close. * * RETURNS * Success: S_OK.

1 0

James Hawkins : advpack: Add a stub for SetPerUserSecValues.
by Alexandre Julliard Jan. 21, 2006

Jan. 21, 2006

Module: wine Branch: refs/heads/master Commit: 70566c033122ce5760cdd42a3c6fa2669a5bf66f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=70566c033122ce5760cdd42… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 21 19:21:22 2006 +0100 advpack: Add a stub for SetPerUserSecValues. --- dlls/advpack/advpack.c | 23 +++++++++++++++++++++++ dlls/advpack/advpack.spec | 2 +- include/advpub.h | 12 ++++++++++++ 3 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index b828455..1214901 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -414,6 +414,29 @@ HRESULT WINAPI ExecuteCab( HWND hwnd, PC } /*********************************************************************** + * SetPerUserSecValues (ADVPACK.@) + * + * Prepares the per-user stub values under IsInstalled\{GUID} that + * control the per-user installation. + * + * PARAMS + * pPerUser [I] Per-user stub values. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * + * BUGS + * Unimplemented. + */ +HRESULT WINAPI SetPerUserSecValues(PPERUSERSECTION pPerUser) +{ + FIXME("(%p) stub\n", pPerUser); + + return E_FAIL; +} + +/*********************************************************************** * TranslateInfString (ADVPACK.@) * * Translates the value of a specified key in an inf file into the diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index c3c4388..7ec9e95 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -25,7 +25,7 @@ @ stdcall RegSaveRestoreOnINF(ptr str str str long long long) @ stdcall RegisterOCX(ptr ptr str long) @ stdcall RunSetupCommand(long str str str str ptr long ptr) -@ stub SetPerUserSecValues +@ stdcall SetPerUserSecValues(ptr) @ stdcall TranslateInfString(str str str str ptr long ptr ptr) @ stdcall TranslateInfStringEx(long str str str str long ptr ptr) @ stdcall UserInstStubWrapper(long long str long) diff --git a/include/advpub.h b/include/advpub.h index 2924f97..d07f7e3 100644 --- a/include/advpub.h +++ b/include/advpub.h @@ -30,6 +30,17 @@ typedef struct _CabInfo { DWORD dwFlags; } CABINFO, *PCABINFO; +typedef struct _PERUSERSECTION { + char szGUID[39 /*MAX_GUID_STRING_LEN*/ + 20]; + char szDispName[128]; + char szLocale[10]; + char szStub[MAX_PATH * 4]; + char szVersion[32]; + char szCompID[128]; + DWORD dwIsInstalled; + BOOL bRollback; +} PERUSERSECTION, *PPERUSERSECTION; + typedef struct _StrEntry { LPSTR pszName; LPSTR pszValue; @@ -137,6 +148,7 @@ HRESULT WINAPI RegSaveRestoreOnINF(HWND HRESULT WINAPI RunSetupCommand(HWND hWnd, LPCSTR szCmdName, LPCSTR szInfSection, LPCSTR szDir, LPCSTR lpszTitle, HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved); +HRESULT WINAPI SetPerUserSecValues(PPERUSERSECTION pPerUser); HRESULT WINAPI TranslateInfString(PCSTR pszInfFilename, PCSTR pszInstallSection, PCSTR pszTranslateSection, PCSTR pszTranslateKey, PSTR pszBuffer, DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved);

1 0