wine-commits November 2007

wine-commits@winehq.org

3 participants
757 discussions

Maarten Lankhorst : dsound: Add conformance tests for 24/ 32 bits buffers and waveformatextensible.
by Alexandre Julliard 07 Nov '07

07 Nov '07

Module: wine Branch: master Commit: 511af0d18625a0b2e345bda0ae5979769cff6fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=511af0d18625a0b2e345bda0a… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Mon Nov 5 23:23:28 2007 +0100 dsound: Add conformance tests for 24/32 bits buffers and waveformatextensible. --- dlls/dsound/tests/ds3d.c | 41 ++++++++++++++++-- dlls/dsound/tests/ds3d8.c | 9 ++++- dlls/dsound/tests/dsound.c | 87 +++++++++++++++++++++++++++++++++++---- dlls/dsound/tests/dsound8.c | 87 +++++++++++++++++++++++++++++++++++---- dlls/dsound/tests/dsound_test.h | 26 +++++++++++- 5 files changed, 227 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=511af0d18625a0b2e345b…

1 0

Maarten Lankhorst : dsound: Add support for WAVEFORMATEXTENSIBLE format.
by Alexandre Julliard 07 Nov '07

07 Nov '07

Module: wine Branch: master Commit: 2a117a20176815b3b8e52c0e4b56a40c4e41e74d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a117a20176815b3b8e52c0e4… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Mon Nov 5 23:23:11 2007 +0100 dsound: Add support for WAVEFORMATEXTENSIBLE format. --- dlls/dsound/buffer.c | 3 ++- dlls/dsound/dsound.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/dsound_main.c | 3 +++ 3 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 5d95078..02b763e 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -495,8 +495,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetFormat( *wfwritten = size; } else { WARN("invalid parameter: wfsize too small\n"); + CopyMemory(lpwf,This->pwfx,wfsize); if (wfwritten) - *wfwritten = 0; + *wfwritten = wfsize; return DSERR_INVALIDPARAM; } } else { diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index ed6c221..457ced1 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -31,6 +31,10 @@ #include "mmsystem.h" #include "winternl.h" #include "mmddk.h" +#include "wingdi.h" +#include "mmreg.h" +#include "ks.h" +#include "ksmedia.h" #include "wine/debug.h" #include "dsound.h" #include "dsdriver.h" @@ -1522,6 +1526,7 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( WARN("invalid parameter: ppdsb == NULL\n"); return DSERR_INVALIDPARAM; } + *ppdsb = NULL; if (TRACE_ON(dsound)) { TRACE("(structsize=%d)\n",dsbd->dwSize); @@ -1558,12 +1563,51 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( } } else { IDirectSoundBufferImpl * dsb; + WAVEFORMATEXTENSIBLE *pwfxe; if (dsbd->lpwfxFormat == NULL) { WARN("invalid parameter: dsbd->lpwfxFormat can't be NULL for " "secondary buffer\n"); return DSERR_INVALIDPARAM; } + pwfxe = (WAVEFORMATEXTENSIBLE*)dsbd->lpwfxFormat; + + if (pwfxe->Format.wBitsPerSample != 16 && pwfxe->Format.wBitsPerSample != 8 && pwfxe->Format.wFormatTag != WAVE_FORMAT_EXTENSIBLE) + { + WARN("wBitsPerSample=%d needs a WAVEFORMATEXTENSIBLE\n", dsbd->lpwfxFormat->wBitsPerSample); + return DSERR_CONTROLUNAVAIL; + } + if (pwfxe->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) + { + if (pwfxe->Format.cbSize < (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))) + { + WARN("Too small a cbSize (%d/%d)\n", pwfxe->Format.cbSize, (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))); + return DSERR_INVALIDPARAM; + } + + if (pwfxe->Format.cbSize > (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))) + { + WARN("Too big a cbSize (%d/%d)\n", pwfxe->Format.cbSize, (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))); + return DSERR_CONTROLUNAVAIL; + } + + if (!IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) + { + if (!IsEqualGUID(&pwfxe->SubFormat, &GUID_NULL)) + FIXME("SubFormat %s not supported right now.\n", debugstr_guid(&pwfxe->SubFormat)); + return DSERR_INVALIDPARAM; + } + if (pwfxe->Samples.wValidBitsPerSample > dsbd->lpwfxFormat->wBitsPerSample) + { + WARN("Samples.wValidBitsPerSample(%d) > Format.wBitsPerSample (%d)\n", pwfxe->Samples.wValidBitsPerSample, pwfxe->Format.wBitsPerSample); + return DSERR_INVALIDPARAM; + } + if (pwfxe->Samples.wValidBitsPerSample && pwfxe->Samples.wValidBitsPerSample < dsbd->lpwfxFormat->wBitsPerSample) + { + FIXME("Non-packed formats not supported right now: %d/%d\n", pwfxe->Samples.wValidBitsPerSample, dsbd->lpwfxFormat->wBitsPerSample); + return DSERR_CONTROLUNAVAIL; + } + } TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," "bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 791b33c..53f27a7 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -48,8 +48,11 @@ #include "wine/debug.h" #include "dsound.h" #include "dsconf.h" +#include "ks.h" #include "initguid.h" +#include "ksmedia.h" #include "dsdriver.h" + #include "dsound_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dsound);

1 0

Maarten Lankhorst : include: Add a few speaker defines to ksmedia.h.
by Alexandre Julliard 07 Nov '07

07 Nov '07

Module: wine Branch: master Commit: 15eb4c6fc9845b8c08a1cadc2cf21c7c5fe12f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=15eb4c6fc9845b8c08a1cadc2… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Mon Nov 5 23:22:41 2007 +0100 include: Add a few speaker defines to ksmedia.h. --- include/ksmedia.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/ksmedia.h b/include/ksmedia.h index 6eb0caa..4f36ccc 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -26,4 +26,12 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +#define KSAUDIO_SPEAKER_DIRECTOUT 0 +#define KSAUDIO_SPEAKER_MONO SPEAKER_FRONT_CENTER +#define KSAUDIO_SPEAKER_STEREO (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT) +#define KSAUDIO_SPEAKER_QUAD (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define KSAUDIO_SPEAKER_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER) +#define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOWFREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define KSAUDIO_SPEAKER_7POINT1 (KSAUDIO_SPEAKER_5POINT1 | SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER) + #endif /* _KSMEDIA_ */

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

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

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: 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

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 : 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 : 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

← Newer
1
...
60
61
62
63
64
65
66
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2007