October 2008 - Wine-Commits

Alexander Nicolaysen Sørnes : Allow removing downloadurl from queued versions
by Chris Morgan Oct. 3, 2008

Oct. 3, 2008

Module: appdb Branch: master Commit: e738a6d58e8305aabbe07be8e326bc66ffc6e1ae URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e738a6d58e8305aabbe07be8… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Oct 3 13:53:13 2008 +0200 Allow removing downloadurl from queued versions --- include/downloadurl.php | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/downloadurl.php b/include/downloadurl.php index 340e2f2..4b0498d 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -351,6 +351,12 @@ class downloadurl if(!$this->bQueued && !$this->canEdit($this->iVersionId)) return FALSE; + if(!$this->sDescription && !$this->sUrl) + { + $this->delete(); + return true; + } + $hResult = query_parameters("UPDATE appData SET description = '?', url = '?' WHERE id = '?'", $this->sDescription, $this->sUrl, $this->iId);

1 0

Alexander Nicolaysen Sørnes : Allow adding downloadurl to queued versions
by Chris Morgan Oct. 3, 2008

Oct. 3, 2008

Module: appdb Branch: master Commit: 20712278953e3d6da9106dc1e09aa62f19edcd65 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=20712278953e3d6da9106dc1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Oct 3 13:20:45 2008 +0200 Allow adding downloadurl to queued versions --- include/downloadurl.php | 5 +++++ include/version_queue.php | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/include/downloadurl.php b/include/downloadurl.php index acdfdf4..d4903da 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -63,6 +63,11 @@ class downloadurl return $sReturn; } + public function objectSetParent($iId, $sClass = 'version') + { + $this->iVersionId = $iId; + } + function objectGetChildren($bIncludeDeleted = false) { /* We have none */ diff --git a/include/version_queue.php b/include/version_queue.php index 553cb8e..db3dd01 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -33,6 +33,9 @@ class version_queue $this->oTestDataQueue = new testData_queue($iTestingId); $this->oDownloadUrl = new downloadurl($iDownloadUrlId); + + if(!$this->oDownloadUrl->objectGetId() && $iVersionId) + $this->oDownloadUrl->objectSetParent($iVersionId); } function create() @@ -69,7 +72,13 @@ class version_queue function update() { $this->oVersion->update(); - $this->oDownloadUrl->update(); + + /* A downloadurl is optional and can thus be added later */ + if($this->oDownloadUrl->objectGetId()) + $this->oDownloadUrl->update(); + else + $this->oDownloadUrl->create(); + $this->oTestDataQueue->update(); }

1 0

Alexander Nicolaysen Sørnes : Fix handling of queued downloadurls
by Chris Morgan Oct. 3, 2008

Oct. 3, 2008

Module: appdb Branch: master Commit: e86ccd1390852e1de7da9163f8e286e3fa4d5b52 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e86ccd1390852e1de7da9163… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Oct 3 12:53:26 2008 +0200 Fix handling of queued downloadurls --- include/appData.php | 6 +++++- include/downloadurl.php | 2 +- include/version_queue.php | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/appData.php b/include/appData.php index a5e32c4..407c079 100644 --- a/include/appData.php +++ b/include/appData.php @@ -120,10 +120,14 @@ class appData function listSubmittedBy($iUserId, $bQueued = true) { + $sExtra = ''; + if($bQueued) // downloadurls are only queued together with versions + $sExtra = " AND appData.type != 'downloadurl' "; + $hResult = query_parameters("SELECT * FROM appData WHERE appData.submitterId = '?' AND - appData.state = '?' + appData.state = '?' $sExtra ORDER BY appData.id", $iUserId, $bQueued ? 'queued' : 'accepted'); diff --git a/include/downloadurl.php b/include/downloadurl.php index 3a50457..acdfdf4 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -330,7 +330,7 @@ class downloadurl VALUES('?', '?', '?', '?', '?', ?, '?')", $this->iVersionId, "downloadurl", $this->sDescription, $this->sUrl, - downloadurl::canEdit($this->iVersionId) ? 'accepted' : 'queued', + $this->mustBeQueued() ? 'queued' : 'accepted', "NOW()", $_SESSION['current']->iUserId); diff --git a/include/version_queue.php b/include/version_queue.php index 18cf062..553cb8e 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -69,6 +69,7 @@ class version_queue function update() { $this->oVersion->update(); + $this->oDownloadUrl->update(); $this->oTestDataQueue->update(); } @@ -195,6 +196,7 @@ class version_queue { $this->oVersion->iAppId = $aClean['iAppId']; $this->oVersion->getOutputEditorValues($aClean); + $this->oDownloadUrl->getOutputEditorValues($aClean); $this->oTestDataQueue->getOutputEditorValues($aClean); }

1 0

Alexander Nicolaysen Sørnes : Remove downloadurl::processFormSingle
by Chris Morgan Oct. 3, 2008

Oct. 3, 2008

Module: appdb Branch: master Commit: a57d236392c96ebd038db66f120d69d2ffc038f4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a57d236392c96ebd038db66f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Oct 3 13:48:56 2008 +0200 Remove downloadurl::processFormSingle --- include/downloadurl.php | 31 ------------------------------- include/version_queue.php | 5 ++--- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/include/downloadurl.php b/include/downloadurl.php index d4903da..340e2f2 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -361,37 +361,6 @@ class downloadurl return TRUE; } - /* Process a form made only for submitting one URL */ - function processFormSingle($iVersionId, $aValues, $bUnQueue = FALSE) - { - /* Calling this function without suitable input data is perfectly valid, - but in that case there is nothing to do here */ - if(empty($aValues['sDownloadUrlDescription']) || - empty($aValues['sDownloadUrlUrl'])) - return; - - $iId = null; - if($hResult = appData::getData($iVersionId, "downloadurl", TRUE, TRUE)) - { - $oObject = query_fetch_object($hResult); - $iId = $oObject->id; - } - - $oDownloadurl = new downloadurl($iId); - - $oDownloadurl->sDescription = $aValues['sDownloadUrlDescription']; - $oDownloadurl->sUrl = $aValues['sDownloadUrlUrl']; - $oDownloadurl->iVersionId = $iVersionId; - - if($iId) - $oDownloadurl->update(); - else - $oDownloadurl->create(); - - if($bUnQueue) - $oDownloadurl->unQueue(); - } - function unQueue() { if($this->mustBeQueued()) diff --git a/include/version_queue.php b/include/version_queue.php index db3dd01..e2bba12 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -46,9 +46,8 @@ class version_queue $this->oTestDataQueue->oTestData->iVersionId = $this->oVersion->iVersionId; $this->oTestDataQueue->create(); - $this->oDownloadUrl->processFormSingle($this->oVersion->iVersionId, - $aClean, - $this->oVersion->canEdit()); + $this->oDownloadUrl->objectSetParent($this->oVersion->objectGetId()); + $this->oDownloadUrl->create(); return TRUE; }

1 0

Jeff Zaroyko : msvcrt: Avoid a NULL pointer deref in ctime.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: 82f77cc17a190dbc87415fc697e76261fcbd972f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f77cc17a190dbc87415fc69… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Tue Sep 30 15:34:51 2008 +1000 msvcrt: Avoid a NULL pointer deref in ctime. --- dlls/msvcrt/tests/time.c | 8 ++++++++ dlls/msvcrt/time.c | 5 ++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 1fe6cbf..33b2e56 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -31,6 +31,13 @@ #define MINSPERHOUR 60 #define HOURSPERDAY 24 +static void test_ctime(void) +{ + time_t badtime = -1; + char* ret; + ret = ctime(&badtime); + ok(ret == NULL, "expected ctime to return NULL, got %s\n", ret); +} static void test_gmtime(void) { time_t gmt = (time_t)NULL; @@ -249,6 +256,7 @@ static void test_wstrtime(void) START_TEST(time) { + test_ctime(); test_gmtime(); test_mktime(); test_localtime(); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 69762e0..ba4e95c 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -447,7 +447,10 @@ MSVCRT_wchar_t * CDECL MSVCRT__wasctime(const struct MSVCRT_tm *mstm) */ char * CDECL MSVCRT_ctime(const MSVCRT_time_t *time) { - return MSVCRT_asctime( MSVCRT_localtime(time) ); + struct MSVCRT_tm *t; + t = MSVCRT_localtime( time ); + if (!t) return NULL; + return MSVCRT_asctime( t ); } /*********************************************************************

1 0

John Klehm : wintab32: Handle negative output context range for y-axe.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: b77f0a16726a962ede71b12128611d4826581448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77f0a16726a962ede71b1212… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Mon Sep 29 17:20:15 2008 -0500 wintab32: Handle negative output context range for y-axe. --- dlls/wintab32/context.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index cf62154..bf46170 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -215,6 +215,8 @@ LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) /* flip the Y axis */ if (ptr->context.lcOutExtY > 0) packet->pkY = ptr->context.lcOutExtY - packet->pkY; + else if (ptr->context.lcOutExtY < 0) + packet->pkY = abs(ptr->context.lcOutExtY + packet->pkY); DUMPPACKET(*packet);

1 0

John Klehm : wintab32: Improve tracing of LOGCONTEXT struct.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: bf1f0568d0eb32b809781fea846f2160430c095a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1f0568d0eb32b809781fea8… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Wed Oct 1 11:26:05 2008 -0500 wintab32: Improve tracing of LOGCONTEXT struct. --- dlls/wintab32/context.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 9b1da18..cf62154 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -114,7 +114,19 @@ static inline void DUMPPACKET(WTPACKET packet) static inline void DUMPCONTEXT(LOGCONTEXTW lc) { - TRACE("context: %s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %i ,%i, %i, %i, %i, %i,%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i %i %i\n", + TRACE("Name: %s, Options: %x, Status: %x, Locks: %x, MsgBase: %x, " + "Device: %x, PktRate: %x, " + "%x%s, %x%s, %x%s, " + "BtnDnMask: %x, BtnUpMask: %x, " + "InOrgX: %i, InOrgY: %i, InOrgZ: %i, " + "InExtX: %i, InExtY: %i, InExtZ: %i, " + "OutOrgX: %i, OutOrgY: %i, OutOrgZ: %i, " + "OutExtX: %i, OutExtY: %i, OutExtZ: %i, " + "SensX: %i, SensY: %i, SensZ: %i, " + "SysMode: %i, " + "SysOrgX: %i, SysOrgY: %i, " + "SysExtX: %i, SysExtY: %i, " + "SysSensX: %i, SysSensY: %i\n", wine_dbgstr_w(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, lc.lcDevice, lc.lcPktRate, lc.lcPktData, DUMPBITS(lc.lcPktData), lc.lcPktMode, DUMPBITS(lc.lcPktMode), lc.lcMoveMask,

1 0

Andrey Turkin : dwmapi: Add a few stub implementations.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: a8790e55fdbbe944b9d389dfc6a6095087779599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8790e55fdbbe944b9d389dfc… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Wed Oct 1 19:53:23 2008 +0400 dwmapi: Add a few stub implementations. --- dlls/dwmapi/dwmapi.spec | 6 +++--- dlls/dwmapi/dwmapi_main.c | 30 ++++++++++++++++++++++++++++++ include/dwmapi.h | 2 ++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index bce53e5..63ee2f5 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -25,9 +25,9 @@ @ stub DwmDetachMilContent @ stub DwmEnableBlurBehindWindow @ stub DwmEnableMMCSS -@ stub DwmExtendFrameIntoClientArea -@ stub DwmFlush -@ stub DwmGetColorizationColor +@ stdcall DwmExtendFrameIntoClientArea(long ptr) +@ stdcall DwmFlush() +@ stdcall DwmGetColorizationColor(ptr long) @ stub DwmGetCompositionTimingInfo @ stub DwmGetGraphicsStreamClient @ stub DwmGetGraphicsStreamTransformHint diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6a87701..e306c56 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -71,6 +71,36 @@ HRESULT WINAPI DwmEnableComposition(UINT uCompositionAction) } /********************************************************************** + * DwmExtendFrameIntoClientArea (DWMAPI.@) + */ +HRESULT WINAPI DwmExtendFrameIntoClientArea(HWND hwnd, const MARGINS* margins) +{ + FIXME("(%p, %p) stub\n", hwnd, margins); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmGetColorizationColor (DWMAPI.@) + */ +HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL opaque_blend) +{ + FIXME("(%p, %d) stub\n", colorization, opaque_blend); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmFlush (DWMAPI.@) + */ +HRESULT WINAPI DwmFlush() +{ + FIXME("() stub\n"); + + return E_NOTIMPL; +} + +/********************************************************************** * DwmSetWindowAttribute (DWMAPI.@) */ HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attribute, DWORD size) diff --git a/include/dwmapi.h b/include/dwmapi.h index 967efed..710e3f4 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -32,6 +32,8 @@ extern "C" { DECLARE_HANDLE(HTHUMBNAIL); DWMAPI DwmEnableComposition(UINT); +DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); +DWMAPI DwmGetColorizationColor(DWORD*,BOOL); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL);

1 0

Piotr Caban : msxml: Fix implementation of ISAXContentHandler_characters.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: 2a55b8d8e7002c16fca54f5b87a82a73e267b176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a55b8d8e7002c16fca54f5b8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Oct 1 19:52:48 2008 +0200 msxml: Fix implementation of ISAXContentHandler_characters. --- dlls/msxml3/saxreader.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 7d3946a..62058d1 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -197,6 +197,23 @@ static BSTR QName_from_xmlChar(const xmlChar *prefix, const xmlChar *name) return bstr; } +BSTR bstr_from_xmlChar_wn(const xmlChar *buf, int len) +{ + DWORD size; + LPWSTR str; + BSTR bstr; + + if(!buf) return NULL; + + size = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, NULL, 0); + str = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, size*sizeof(WCHAR)); + if(!str) return NULL; + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, str, size); + bstr = SysAllocStringLen(str, size); + HeapFree(GetProcessHeap(), 0, str); + return bstr; +} + static void format_error_message_from_id(saxlocator *This, HRESULT hr) { xmlStopParser(This->pParserCtxt); @@ -1176,8 +1193,6 @@ static void libxmlCharacters( chEnd = This->lastCur+len; while(*chEnd != '<') chEnd++; - Chars = bstr_from_xmlChar(ch); - lastCurCopy = This->lastCur; columnCopy = This->column; lineCopy = This->line; @@ -1195,7 +1210,7 @@ static void libxmlCharacters( end++; } - Chars = bstr_from_xmlChar(This->lastCur); + Chars = bstr_from_xmlChar_wn(This->lastCur, end-This->lastCur+2); if(*end == '\r' && *(end+1) == '\n') {

1 0

Paul Vriens : comctl32/tests: Don't crash on some win9x boxes.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: d0dfd9d7840b72ae984954b681f9c49f58bec371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0dfd9d7840b72ae984954b68… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 1 22:25:11 2008 +0200 comctl32/tests: Don't crash on some win9x boxes. --- dlls/comctl32/tests/header.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 4a6c54a..fd0c4c4 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1034,6 +1034,10 @@ static void test_hdm_filterMessages(HWND hParent) else ok_sequence(sequences, HEADER_SEQ_INDEX, filterMessages_seq_noninteractive, "filterMessages sequence testing", FALSE); + /* Some Win9x versions don't send a WM_KILLFOCUS. + * Set the focus explicitly to the parent to avoid a crash. + */ + SetFocus(hParent); DestroyWindow(hChild); }

1 0