July 2007 - Wine-Commits - list.winehq.org

Markus Gömmel : user32: Center MessageBox dialogs to desktop, as Windows does.
by Alexandre Julliard July 2, 2007

July 2, 2007

Module: wine Branch: master Commit: ddb4be2bb0d03ec9a6beccfcb688844087a4f0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb4be2bb0d03ec9a6beccfcb… Author: Markus Gömmel <m.goemmel(a)compulab.de> Date: Fri Jun 22 13:53:30 2007 +0200 user32: Center MessageBox dialogs to desktop, as Windows does. --- dlls/user32/msgbox.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index fc74314..1353d6b 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -70,9 +70,11 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) HWND hItem; HDC hdc; int i, buttons; - int bspace, bw, bh, theight, tleft, wwidth, wheight, bpos; + int bspace, bw, bh, theight, tleft, wwidth, wheight, wleft, wtop, bpos; int borheight, borwidth, iheight, ileft, iwidth, twidth, tiheight; NONCLIENTMETRICSW nclm; + HMONITOR monitor = 0; + MONITORINFO mon_info; LPCWSTR lpszText; WCHAR buf[256]; @@ -244,9 +246,15 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) wwidth = tleft + twidth + ileft + borwidth; wheight = 8 + tiheight + bh + borheight; - /* Resize the window */ - SetWindowPos(hwnd, 0, 0, 0, wwidth, wheight, - SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW); + /* Message boxes are always desktop centered, so query desktop size and center window */ + monitor = MonitorFromWindow(lpmb->hwndOwner ? lpmb->hwndOwner : GetActiveWindow(), MONITOR_DEFAULTTOPRIMARY); + GetMonitorInfoW(monitor, &mon_info); + wleft = (mon_info.rcWork.left + mon_info.rcWork.right - wwidth) / 2; + wtop = (mon_info.rcWork.top + mon_info.rcWork.bottom - wheight) / 2; + + /* Resize and center the window */ + SetWindowPos(hwnd, 0, wleft, wtop, wwidth, wheight, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW); /* Position the icon */ SetWindowPos(GetDlgItem(hwnd, MSGBOX_IDICON), 0, ileft, (tiheight - iheight) / 2, 0, 0,

1 0

Aric Stewart : imm32: Implementation of GCS_CURSORPOS.
by Alexandre Julliard July 2, 2007

July 2, 2007

Module: wine Branch: master Commit: 6302b965fa840db56c947b1e2f9aea08e0b56d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6302b965fa840db56c947b1e2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jun 29 11:03:08 2007 -0500 imm32: Implementation of GCS_CURSORPOS. --- dlls/imm32/imm.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c3763fe..9f392c9 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -590,6 +590,13 @@ LONG WINAPI ImmGetCompositionStringA( } rc = sizeof(DWORD)*2; } + else if (dwIndex == GCS_CURSORPOS) + { + TRACE("GSC_CURSORPOS\n"); + rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)data->CompositionString, + data->dwCompStringLength/ sizeof(WCHAR), NULL, + 0, NULL, NULL); + } else { FIXME("Unhandled index 0x%x\n",dwIndex); @@ -667,6 +674,11 @@ LONG WINAPI ImmGetCompositionStringW( rc = data->dwCompReadStringSize; } + else if (dwIndex == GCS_CURSORPOS) + { + TRACE("GSC_CURSORPOS\n"); + rc = data->dwCompStringLength; + } else { FIXME("Unhandled index 0x%x\n",dwIndex);

1 0

Markus Gömmel : comctl32/datetime: Added a missing InvalidateRect to update display after WM_ENABLE.
by Alexandre Julliard July 2, 2007

July 2, 2007

Module: wine Branch: master Commit: f281d0e77d175588ef5bde08eceede73bad2b14b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f281d0e77d175588ef5bde08e… Author: Markus Gömmel <m.goemmel(a)compulab.de> Date: Thu Jun 21 11:24:16 2007 +0200 comctl32/datetime: Added a missing InvalidateRect to update display after WM_ENABLE. --- dlls/comctl32/datetime.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index ad989ec..40c2ca5 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -811,6 +811,9 @@ DATETIME_Enable (DATETIME_INFO *infoPtr, BOOL bEnable) infoPtr->dwStyle &= ~WS_DISABLED; else infoPtr->dwStyle |= WS_DISABLED; + + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + return 0; }

1 0

appdb/include mail.php
by WineHQ July 1, 2007

July 1, 2007

ChangeSet ID: 31237 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/01 20:09:16 Modified files: include : mail.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Make mail_appdb() send mail with Bcc and only appdb-noreply(a)winehq.org as the recipient. Patch: http://cvs.winehq.org/patch.py?id=31237 Old revision New revision Changes Path 1.9 1.10 +5 -1 appdb/include/mail.php Index: appdb/include/mail.php diff -u -p appdb/include/mail.php:1.9 appdb/include/mail.php:1.10 --- appdb/include/mail.php:1.9 2 Jul 2007 1: 9:16 -0000 +++ appdb/include/mail.php 2 Jul 2007 1: 9:16 -0000 @@ -8,9 +8,12 @@ function mail_appdb($sEmailList,$sSubjec if(defined("DISABLE_EMAIL")) return; + $sEmailList = str_replace(" ",",",$sEmailList); + $sHeaders = "MIME-Version: 1.0\r\n"; $sHeaders .= "From: AppDB <".APPDB_SENDER_EMAIL.">\r\n"; $sHeaders .= "Reply-to: AppDB <".APPDB_SENDER_EMAIL.">\r\n"; + $sHeaders .= "Bcc: $sEmailList\r\n"; $sHeaders .= "X-Priority: 3\r\n"; $sHeaders .= "X-Mailer: ".APPDB_OWNER." mailer\r\n"; $sMsg = trim(ereg_replace("\r\n","\n",$sMsg)); @@ -32,7 +35,8 @@ function mail_appdb($sEmailList,$sSubjec return; } - $bResult = mail(str_replace(" ",",",$sEmailList), "[AppDB] ".$sSubject, $sMsg, $sHeaders, "-f".APPDB_SENDER_EMAIL); + $bResult = mail(APPDB_SENDER_EMAIL, "[AppDB] ".$sSubject, $sMsg, $sHeaders, + "-f".APPDB_SENDER_EMAIL); if($bResult) addmsg("Message sent to: ".$sEmailList, "green"); else

1 0

appdb/include objectManager.php
by WineHQ July 1, 2007

July 1, 2007

ChangeSet ID: 31236 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/01 20:07:09 Modified files: include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Display login link when processing queues. Display a login link when processing queues and the user isn't logged in, rather than saying that there are no entries. Patch: http://cvs.winehq.org/patch.py?id=31236 Old revision New revision Changes Path 1.34 1.35 +9 -0 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.34 appdb/include/objectManager.php:1.35 --- appdb/include/objectManager.php:1.34 2 Jul 2007 1: 7: 9 -0000 +++ appdb/include/objectManager.php 2 Jul 2007 1: 7: 9 -0000 @@ -84,6 +84,15 @@ class ObjectManager $this->checkMethods(array("ObjectGetEntries", "ObjectGetHeader", "objectGetTableRow", "objectGetId", "canEdit")); + /* We cannot process a queue if we are not logged in */ + if(!$_SESSION['current']->isLoggedIn()) + { + $sQueueText = $this->bIsRejected ? "rejected" : "queued"; + echo '<div align="center">You need to <a href="'.login_url().'">'; + echo "log in</a> in order to process $sQueueText entries</div>\n"; + return; + } + $oObject = new $this->sClass(); /* Display selectors for items per page and current page, if applicable. The function

1 0

appdb/include objectManager.php
by WineHQ July 1, 2007

July 1, 2007

ChangeSet ID: 31235 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/01 19:50:32 Modified files: include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Check for valid result resource before number of rows. objectGetEntries() may return FALSE if the user does not have permission to view a queue, for instance. Patch: http://cvs.winehq.org/patch.py?id=31235 Old revision New revision Changes Path 1.33 1.34 +1 -1 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.33 appdb/include/objectManager.php:1.34 --- appdb/include/objectManager.php:1.33 2 Jul 2007 0:50:32 -0000 +++ appdb/include/objectManager.php 2 Jul 2007 0:50:32 -0000 @@ -101,7 +101,7 @@ class ObjectManager $hResult = $oObject->objectGetEntries($this->bIsQueue, $this->bIsRejected); /* did we get any entries? */ - if(mysql_num_rows($hResult) == 0) + if(!$hResult || mysql_num_rows($hResult) == 0) { switch($this->getQueueString($this->bIsQueue, $this->bIsRejected)) {

1 0

appdb/include appData.php application.php dist ...
by WineHQ July 1, 2007

July 1, 2007

ChangeSet ID: 31234 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/01 19:35:17 Modified files: include : appData.php application.php distribution.php maintainer.php objectManager.php screenshot.php testData.php vendor.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Make objectGetTableRow() return a TableRow class instance. Added accessors to set the appropriate parameters in the TableRow class. Removed some unused parameters from the TableRow class. Patch: http://cvs.winehq.org/patch.py?id=31234 Old revision New revision Changes Path 1.27 1.28 +2 -1 appdb/include/appData.php 1.116 1.117 +2 -1 appdb/include/application.php 1.36 1.37 +5 -3 appdb/include/distribution.php 1.44 1.45 +2 -1 appdb/include/maintainer.php 1.32 1.33 +29 -21 appdb/include/objectManager.php 1.72 1.73 +2 -1 appdb/include/screenshot.php 1.62 1.63 +5 -1 appdb/include/testData.php 1.32 1.33 +4 -1 appdb/include/vendor.php 1.133 1.134 +2 -1 appdb/include/version.php

1 0