November 2007 - Wine-commits

Rob Shearman : rpcrt4: Add stubs for RpcMgmtSetCancelTimeout and RpcCancelThread.
by Alexandre Julliard 07 Nov '07

07 Nov '07

Module: wine Branch: master Commit: 7ad36eabfc2c2ad2a0319adf35242ddb8b8db7a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad36eabfc2c2ad2a0319adf3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 6 15:55:06 2007 +0000 rpcrt4: Add stubs for RpcMgmtSetCancelTimeout and RpcCancelThread. --- dlls/rpcrt4/rpcrt4.spec | 4 ++-- dlls/rpcrt4/rpcrt4_main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 8accabc..631d135 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -395,7 +395,7 @@ @ stdcall RpcBindingToStringBindingW(ptr ptr) @ stdcall RpcBindingVectorFree(ptr) @ stub RpcCancelAsyncCall -@ stub RpcCancelThread +@ stdcall RpcCancelThread(ptr) @ stub RpcCancelThreadEx @ stub RpcCertGeneratePrincipalNameA @ stub RpcCertGeneratePrincipalNameW @@ -438,7 +438,7 @@ @ stub RpcMgmtInqStats @ stdcall RpcMgmtIsServerListening(ptr) @ stub RpcMgmtSetAuthorizationFn -@ stub RpcMgmtSetCancelTimeout +@ stdcall RpcMgmtSetCancelTimeout(long) @ stdcall RpcMgmtSetComTimeout(ptr long) @ stub RpcMgmtSetParameter # win9x @ stdcall RpcMgmtSetServerStackSize(long) diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index a7c3c21..e067d0e 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -837,3 +837,21 @@ RPC_STATUS RPC_ENTRY RpcErrorStartEnumeration(void** EnumHandle) FIXME("(%p): stub\n", EnumHandle); return RPC_S_ENTRY_NOT_FOUND; } + +/****************************************************************************** + * RpcMgmtSetCancelTimeout (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcMgmtSetCancelTimeout(LONG Timeout) +{ + FIXME("(%d): stub\n", Timeout); + return RPC_S_OK; +} + +/****************************************************************************** + * RpcCancelThread (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcCancelThread(HANDLE ThreadHandle) +{ + FIXME("(%p): stub\n", ThreadHandle); + return RPC_S_OK; +}

1 0

EA Durbin : wininet: Return true for case INTERNET_OPTION_SECURITY_FLAGS.
by Alexandre Julliard 07 Nov '07

07 Nov '07

Module: wine Branch: master Commit: bc745fa4c4bd8659ba0e9bfd7785ed9e8ac8af0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc745fa4c4bd8659ba0e9bfd7… Author: EA Durbin <ead1234(a)hotmail.com> Date: Tue Nov 6 11:18:00 2007 -0600 wininet: Return true for case INTERNET_OPTION_SECURITY_FLAGS. --- dlls/wininet/internet.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4c1472c..5848ea1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2244,6 +2244,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d } case INTERNET_OPTION_SECURITY_FLAGS: FIXME("INTERNET_OPTION_SECURITY_FLAGS: Stub\n"); + bSuccess = TRUE; break; case INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT:

1 0

Stefan Dösinger : wined3d: Shader Model 3. 0 varying tests.
by Alexandre Julliard 07 Nov '07

07 Nov '07

Module: wine Branch: master Commit: 5fc54b5459cce80cc3f29386da0f3b1f0a8c244b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc54b5459cce80cc3f29386d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 20:33:33 2007 +0100 wined3d: Shader Model 3.0 varying tests. --- dlls/d3d9/tests/visual.c | 684 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 683 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fc54b5459cce80cc3f29…

1 0

Alexandre Julliard : include: Moved AttachThreadInput prototype to winuser. h where it belongs.
by Alexandre Julliard 07 Nov '07

07 Nov '07

Module: wine Branch: master Commit: 113e40c28fc6a865ab4ac7903afde1ebde2f796e URL: http://source.winehq.org/git/wine.git/?a=commit;h=113e40c28fc6a865ab4ac7903… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 6 19:57:18 2007 +0100 include: Moved AttachThreadInput prototype to winuser.h where it belongs. --- include/winbase.h | 1 - include/winuser.h | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index c2fab88..78c0f4f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1247,7 +1247,6 @@ BOOL WINAPI AddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL); VOID WINAPI AddRefActCtx(HANDLE); PVOID WINAPI AddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); BOOL WINAPI AdjustTokenGroups(HANDLE,BOOL,PTOKEN_GROUPS,DWORD,PTOKEN_GROUPS,PDWORD); -BOOL WINAPI AttachThreadInput(DWORD,DWORD,BOOL); BOOL WINAPI AccessCheck(PSECURITY_DESCRIPTOR,HANDLE,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); diff --git a/include/winuser.h b/include/winuser.h index 974cef8..941f050 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4388,6 +4388,7 @@ BOOL WINAPI AppendMenuA(HMENU,UINT,UINT_PTR,LPCSTR); BOOL WINAPI AppendMenuW(HMENU,UINT,UINT_PTR,LPCWSTR); #define AppendMenu WINELIB_NAME_AW(AppendMenu) UINT WINAPI ArrangeIconicWindows(HWND); +BOOL WINAPI AttachThreadInput(DWORD,DWORD,BOOL); HDWP WINAPI BeginDeferWindowPos(INT); HDC WINAPI BeginPaint(HWND,LPPAINTSTRUCT); BOOL WINAPI BringWindowToTop(HWND);

1 0

Alexandre Julliard : kernel32: Add spec entries for LocaleNameToLCID and LCIDToLocaleName.
by Alexandre Julliard 07 Nov '07

07 Nov '07

Module: wine Branch: master Commit: 964d83501a3568bfcae1e856a98c68cdb5db47d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=964d83501a3568bfcae1e856a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 6 20:37:54 2007 +0100 kernel32: Add spec entries for LocaleNameToLCID and LCIDToLocaleName. --- dlls/kernel32/kernel32.spec | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ff92b2e..2bf20c1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -740,6 +740,7 @@ @ stdcall IsWow64Process(ptr ptr) @ stdcall -i386 -register K32Thk1632Epilog() @ stdcall -i386 -register K32Thk1632Prolog() +@ stdcall LCIDToLocaleName(long ptr long long) @ stdcall LCMapStringA(long long str long ptr long) @ stdcall LCMapStringW(long long wstr long ptr long) @ stdcall LZClose(long) @@ -771,6 +772,7 @@ @ stdcall LocalShrink(long long) @ stdcall LocalSize(long) @ stdcall LocalUnlock(long) +@ stdcall LocaleNameToLCID(wstr long) @ stdcall LockFile(long long long long long) @ stdcall LockFileEx(long long long long long ptr) @ stdcall LockResource(long)

1 0

Alexander Nicolaysen Sørnes : version: Add 'pending' queue state
by Chris Morgan 07 Nov '07

07 Nov '07

Module: appdb Branch: master Commit: 62e3a98fca06912ea3f02f203797fe1fa14691c1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=62e3a98fca06912ea3f02f20… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Nov 6 23:27:33 2007 +0100 version: Add 'pending' queue state --- include/version.php | 8 ++++++-- include/version_queue.php | 1 - tables/appdb_tables.sql | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/version.php b/include/version.php index d69e0ee..371a947 100644 --- a/include/version.php +++ b/include/version.php @@ -92,7 +92,11 @@ class version { if(!$_SESSION['current']->canCreateVersion()) return; - $this->sQueued = $this->mustBeQueued() ? "true" : "false"; + $oApp = new application($this->iAppId); + if($oApp->sQueued != "false") + $this->sQueued = "pending"; + else + $this->sQueued = $this->mustBeQueued() ? "true" : "false"; $hResult = query_parameters("INSERT INTO appVersion (versionName, description, maintainer_release, @@ -274,7 +278,7 @@ class version { return; // If we are not in the queue, we can't move the version out of the queue. - if(!$this->sQueued == 'true') + if($this->sQueued == 'false') return false; if(query_parameters("UPDATE appVersion SET queued = '?' WHERE versionId = '?'", diff --git a/include/version_queue.php b/include/version_queue.php index afc25b0..d2bb809 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -52,7 +52,6 @@ class version_queue function reQueue() { - $this->oVersion->reQueue(); $this->oDownloadUrl->reQueue(); } diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index d064108..4273e3e 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -58,7 +58,7 @@ create table appVersion ( maintainer_release text, submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', - queued enum('true','false','rejected') NOT NULL default 'false', + queued enum('true','false','rejected','pending') NOT NULL default 'false', license enum('Retail','Open Source','Freeware','Demo','Shareware'), obsoleteBy int(11) NOT NULL default '0', key(versionId),

1 0

Alexander Nicolaysen Sørnes : testData: Simplify SQL code
by Chris Morgan 07 Nov '07

07 Nov '07

Module: appdb Branch: master Commit: 0776bdeeb94fadb500a6ee66ad14774ca0f3543b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0776bdeeb94fadb500a6ee66… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Nov 6 22:25:30 2007 +0100 testData: Simplify SQL code --- include/testData.php | 29 ++++------------------------- 1 files changed, 4 insertions(+), 25 deletions(-) diff --git a/include/testData.php b/include/testData.php index 0605c81..a1d4b42 100644 --- a/include/testData.php +++ b/include/testData.php @@ -920,11 +920,7 @@ class testData{ if($bRejected) { $sQuery = "SELECT COUNT(testingId) AS count FROM - testResults, appVersion WHERE - appVersion.queued = 'false' - AND - appVersion.versionId = testResults.versionId - AND + testResults WHERE testResults.submitterId = '?' AND testResults.queued = '?'"; @@ -934,8 +930,6 @@ class testData{ testResults, appVersion, appMaintainers WHERE testResults.versionId = appVersion.versionId AND - appVersion.queued = 'false' - AND appMaintainers.userId = '?' AND appMaintainers.queued = 'false' @@ -961,12 +955,7 @@ class testData{ $sQueued); } else { - $sQuery = "SELECT COUNT(testingId) as count FROM testResults, - appVersion WHERE - appVersion.versionId = testResults.versionId - AND - appVersion.queued = 'false' - AND + $sQuery = "SELECT COUNT(testingId) as count FROM testResults WHERE testResults.queued = '?'"; $hResult = query_parameters($sQuery, $sQueued); } @@ -1002,11 +991,7 @@ class testData{ { if($bRejected) { - $sQuery = "SELECT testResults.* FROM testResults, appVersion WHERE - appVersion.queued = 'false' - AND - appVersion.versionId = testResults.versionId - AND + $sQuery = "SELECT testResults.* FROM testResults WHERE testResults.submitterId = '?' AND testResults.queued = '?' ORDER BY ?$sLimit"; @@ -1018,8 +1003,6 @@ class testData{ AND appMaintainers.userId = '?' AND - appVersion.queued = 'false' - AND ( ( appMaintainers.superMaintainer = '1' @@ -1049,11 +1032,7 @@ class testData{ } } else { - $sQuery = "SELECT testResults.* FROM testResults, appVersion WHERE - testResults.versionId = appVersion.versionId - AND - appVersion.queued = 'false' - AND + $sQuery = "SELECT testResults.* FROM testResults WHERE testResults.queued = '?' ORDER by ?$sLimit"; if($sLimit) $hResult = query_parameters($sQuery, $sQueued, $sOrderBy, $iStart, $iRows);

1 0

Alexander Nicolaysen Sørnes : comment: Fix possible undefined var in constructor
by Chris Morgan 07 Nov '07

07 Nov '07

Module: appdb Branch: master Commit: d05ee436f57d46478094e624724ab4a4835ea7c4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d05ee436f57d46478094e624… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Nov 6 23:56:49 2007 +0100 comment: Fix possible undefined var in constructor --- include/comment.php | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/include/comment.php b/include/comment.php index ca29670..0a85529 100644 --- a/include/comment.php +++ b/include/comment.php @@ -46,7 +46,15 @@ class Comment { { $this->iCommentId = $oRow->commentId; $this->iParentId = $oRow->parentId; - $this->iAppId = $oRow->appId; + + if($oRow->appId) + { + $this->iAppId = $oRow->appId; + } else + { + $oVersion = new version($this->iVersionId); + $this->iAppId = $oApp->iAppId; + } $this->iVersionId = $oRow->versionId; $this->sSubject = $oRow->subject; $this->sBody = $oRow->body;

1 0

Alexander Nicolaysen Sørnes : version: Simplify SQL code
by Chris Morgan 07 Nov '07

07 Nov '07

Module: appdb Branch: master Commit: 489698c29ff0a8aac82c77cf9dbe7b197f3be423 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=489698c29ff0a8aac82c77cf… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Nov 6 23:34:50 2007 +0100 version: Simplify SQL code --- include/version.php | 68 ++++++++------------------------------------------ 1 files changed, 11 insertions(+), 57 deletions(-) diff --git a/include/version.php b/include/version.php index 2cfc2df..d69e0ee 100644 --- a/include/version.php +++ b/include/version.php @@ -1360,34 +1360,16 @@ class version { not be able to see rejected entries for versions they maintain */ if($bRejected) $sQuery = "SELECT COUNT(DISTINCT appVersion.versionId) as count FROM - appVersion, appFamily WHERE - appFamily.appId = appVersion.appId - AND - appFamily.queued = 'false' - AND + appVersion WHERE appVersion.submitterId = '?' AND appVersion.queued = '?'"; else $sQuery = "SELECT COUNT(DISTINCT appVersion.versionId) as count FROM - appVersion, appMaintainers, appFamily WHERE - appFamily.appId = appVersion.appId + appVersion, appMaintainers WHERE + appMaintainers.appId = appVersion.appId AND - appFamily.queued = 'false' - AND - ( - ( - appMaintainers.appId = appVersion.appId - AND - superMaintainer = '1' - ) - OR - ( - appMaintainers.versionId = appVersion.versionId - AND - superMaintainer = '0' - ) - ) + superMaintainer = '1' AND appMaintainers.userId = '?' AND @@ -1399,11 +1381,7 @@ class version { } else { $sQuery = "SELECT COUNT(DISTINCT versionId) as count - FROM appVersion, appFamily WHERE - appFamily.appId = appVersion.appId - AND - appFamily.queued = 'false' - AND + FROM appVersion WHERE appVersion.queued = '?'"; $hResult = query_parameters($sQuery, $sQueued); } @@ -1508,35 +1486,16 @@ class version { /* Users should see their own rejected entries, but maintainers should not be able to see rejected entries for versions they maintain */ if($bRejected) - $sQuery = "SELECT appVersion.* FROM - appVersion, appFamily WHERE - appFamily.appId = appVersion.appId - AND - appFamily.queued = 'false' - AND + $sQuery = "SELECT * FROM appVersion WHERE appVersion.submitterId = '?' AND appVersion.queued = '?' ORDER BY ?$sLimit"; else $sQuery = "SELECT appVersion.* FROM - appVersion, appMaintainers, appFamily WHERE - appFamily.appId = appVersion.appId - AND - appFamily.queued = 'false' - AND - ( - ( - appMaintainers.appId = appVersion.appId - AND - superMaintainer = '1' - ) - OR - ( - appMaintainers.versionId = appVersion.versionId - AND - superMaintainer = '0' - ) - ) + appVersion, appMaintainers WHERE + appMaintainers.appId = appVersion.appId + and + superMaintainer = '1' AND appMaintainers.userId = '?' AND @@ -1555,12 +1514,7 @@ class version { } } else { - $sQuery = "SELECT appVersion.* - FROM appVersion, appFamily WHERE - appFamily.appId = appVersion.appId - AND - appFamily.queued = 'false' - AND + $sQuery = "SELECT * FROM appVersion WHERE appVersion.queued = '?' ORDER BY ?$sLimit"; if($sLimit)

1 0

Alexander Nicolaysen Sørnes : testData: add 'pending' queue state
by Chris Morgan 07 Nov '07

07 Nov '07

Module: appdb Branch: master Commit: da471d1ad8f79d52f113c323650db29d6501a7e5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=da471d1ad8f79d52f113c323… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Nov 6 22:12:32 2007 +0100 testData: add 'pending' queue state --- include/testData.php | 10 ++++++++-- include/version_queue.php | 6 +----- tables/testResults.sql | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/testData.php b/include/testData.php index a1d4b42..2ebf56a 100644 --- a/include/testData.php +++ b/include/testData.php @@ -63,6 +63,12 @@ class testData{ // Creates a new Test Results. function create() { + $oVersion = new version($this->iVersionId); + if($oVersion->sQueued != "false") + $this->sQueued = "pending"; + else + $this->sQueued = $this->mustBeQueued() ? "true" : "false"; + $hResult = query_parameters("INSERT INTO testResults (versionId, whatWorks, whatDoesnt,". "whatNotTested, testedDate, distributionId, testedRelease,". "installs, runs, testedRating, comments,". @@ -79,7 +85,7 @@ class testData{ $this->sTestedRating, $this->sComments, "NOW()", $_SESSION['current']->iUserId, - $this->mustBeQueued() ? "true" : "false"); + $this->sQueued); if($hResult) { @@ -246,7 +252,7 @@ class testData{ } // If we are not in the queue, we can't move the test data out of the queue. - if(!$this->sQueued == 'true') + if($this->sQueued == 'false') return false; if(query_parameters("UPDATE testResults SET queued = '?' WHERE testingId = '?'", diff --git a/include/version_queue.php b/include/version_queue.php index 007296a..afc25b0 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -17,8 +17,7 @@ class version_queue if($iVersionId) { - $iTestingId = testData::getNewestTestIdFromVersionId($iVersionId, - $this->oVersion->sQueued); + $iTestingId = testData::getNewestTestIdFromVersionId($iVersionId, "pending"); /* This illustrates the importance of converting downloadurl completely to the objectManager model. If we don't get a match searching for a queued entry, try finding a rejected one. */ @@ -54,7 +53,6 @@ class version_queue function reQueue() { $this->oVersion->reQueue(); - $this->oTestDataQueue->reQueue(); $this->oDownloadUrl->reQueue(); } @@ -64,8 +62,6 @@ class version_queue if($this->oDownloadUrl->iId) $this->oDownloadUrl->reject(); - - $this->oTestDataQueue->reject(); } function update() diff --git a/tables/testResults.sql b/tables/testResults.sql index 2b1da31..b23b82f 100644 --- a/tables/testResults.sql +++ b/tables/testResults.sql @@ -20,6 +20,6 @@ create table testResults ( comments text, submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', - queued enum('true','false','rejected') NOT NULL default 'false', + queued enum('true','false','rejected','pending') NOT NULL default 'false', key(testingId) );

1 0