wine-commits October 2007

wine-commits@winehq.org

4 participants
996 discussions

Alexander Nicolaysen Sørnes : queueditems: Allow users to edit and delete their submissions
by Chris Morgan 31 Oct '07

31 Oct '07

Module: appdb Branch: master Commit: 2aad57fbeca62691ce446a8d0038eb478bf9577c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2aad57fbeca62691ce446a8d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Oct 31 11:05:32 2007 +0100 queueditems: Allow users to edit and delete their submissions --- include/appData.php | 57 ++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 41 insertions(+), 16 deletions(-) diff --git a/include/appData.php b/include/appData.php index 3f793b8..ac1f1f4 100644 --- a/include/appData.php +++ b/include/appData.php @@ -14,6 +14,7 @@ class appData var $iSubmitterId; var $sSubmitTime; var $sDescription; + var $bQueued; function appData($iId = null, $oRow = null, $oObject = null) { @@ -31,6 +32,7 @@ class appData $this->iVersionId = $oObject->iVersionId; $this->sSubmitTime = $oObject->sSubmitTime; $this->iId = $iId; + $this->bQueued = $oObject->bQueued; return; } @@ -47,6 +49,7 @@ class appData $this->iVersionId = $oRow->versionId; $this->sSubmitTime = $oRow->submitTime; $this->iId = $iId; + $this->bQueued = ($oRow->sQueued == "false") ? false : true; $this->sDescription = $oRow->description; } } @@ -122,16 +125,26 @@ class appData if(!$hResult || !query_num_rows($hResult)) return false; - $sReturn = html_table_begin("width=\"100%\" align=\"center\""); - $sReturn .= html_tr(array( - "Version", - "Type", - "Description", - "Submission Date"), - "color4"); + $oTable = new table(); + $oTable->setWidth("100%"); + $oTable->setAlign("center"); + + $oTableRow = new tableRow(); + + $oTableRow->addTextCell("Version"); + $oTableRow->addTextCell("Type"); + $oTableRow->addTextCell("Description"); + $oTableRow->addTextCell("Submission Date"); + + if($bQueued) + $oTableRow->addTextCell("Action"); + + $oTableRow->setClass("color4"); + $oTable->addRow($oTableRow); for($i = 1; $oRow = query_fetch_object($hResult); $i++) { + $oTableRow = new tableRow(); if($oRow->versionId) { $oVersion = new version($oRow->versionId); @@ -142,17 +155,26 @@ class appData $oApp = new application($this->appId); $sLink = $oApp->objectMakeLink(); } - $sReturn .= html_tr(array( - $sLink, - $oRow->type, - $oRow->description, - print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))), - ($i % 2) ? "color0" : "color1"); - } - $sReturn .= html_table_end(""); + $oTableRow->addTextCell($sLink); + $oTableRow->addTextCell($oRow->type); + $oTableRow->addTextCell($oRow->description); + $oTableRow->addTextCell(print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))); - return $sReturn; + if($bQueued) + { + $oM = new objectManager($oRow->type); + $oM->setReturnTo(array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : ""); + $shDeleteLink = '<a href="'.$oM->makeUrl("delete", $oRow->id, "Delete entry").'">delete</a>'; + $shEditLink = '<a href="'.$oM->makeUrl("edit", $oRow->id, "Edit entry").'">edit</a>'; + $oTableRow->addTextCell("[ $shEditLink ]   [ $shDeleteLink ]"); + } + + $oTableRow->setClass(($i % 2) ? "color0" : "color1"); + $oTable->addRow($oTableRow); + } + + return $oTable->getString(); } @@ -448,6 +470,9 @@ class appData return TRUE; if($this) { + if($this->bQueued && $this->iSubmitterId == $_SESSION['current']->iUserId) + return true; + if($this->iVersionId) { $oVersion = new version($this->iVersionId);

1 0

Alexander Nicolaysen Sørnes : screenshot : Fully initialize appData object in canEdit()
by Chris Morgan 31 Oct '07

31 Oct '07

Module: appdb Branch: master Commit: 8b5231005116e39773afbcb82e8ec59d6b49db62 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8b5231005116e39773afbcb8… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Oct 31 11:00:42 2007 +0100 screenshot: Fully initialize appData object in canEdit() --- include/screenshot.php | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index 81eec26..bf2000a 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -606,9 +606,7 @@ class screenshot { if($this) { - $oAppData = new appData(); - $oAppData->iVersionId = $this->iVersionId; - $oAppData->iAppId = NULL; + $oAppData = new appData($this->objectGetId(), null, $this); return $oAppData->canEdit(); } else return appData::canEdit();

1 0

Alexander Nicolaysen Sørnes : bugs: fix mustBeQueued()
by Chris Morgan 31 Oct '07

31 Oct '07

Module: appdb Branch: master Commit: 4c05f0518058592fc679a5cafb6133d6fc6e648b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4c05f0518058592fc679a5ca… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Oct 31 10:29:27 2007 +0100 bugs: fix mustBeQueued() --- include/bugs.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index 2a1c383..84020d3 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -300,7 +300,7 @@ class Bug { $oBug = new Bug($oRow->bug_id); $sReturn .= html_tr(array( - version::fullNameUrl($oRow->versionId), + version::fullNameLink($oRow->versionId), "<a href=\"".BUGZILLA_ROOT."show_bug.cgi?id=".$oRow->bug_id."\">".$oRow->bug_id."</a>", $oBug->sBug_status, $oBug->sResolution, @@ -326,6 +326,8 @@ class Bug function mustBeQueued() { + $oVersion = new version($this->iVersionId); + if($_SESSION['current']->hasPriv("admin") || $_SESSION['current']->isMaintainer($oVersion->iVersionId) || $_SESSION['current']->isSuperMaintainer($oVersion->iAppId))

1 0

Alexander Nicolaysen Sørnes : maintainer : add new 'pending' queue state
by Chris Morgan 31 Oct '07

31 Oct '07

Module: appdb Branch: master Commit: 3723f34a1169620eb7ce4fc082d56585844655cc URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3723f34a1169620eb7ce4fc0… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Oct 25 23:36:46 2007 +0200 maintainer: add new 'pending' queue state --- include/maintainer.php | 12 +++++++++++- tables/maintainers.sql | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 04dbeae..c3d64aa 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -209,12 +209,22 @@ class maintainer if(!$this->iUserId) $this->iUserId = $_SESSION['current']->iUserId; + $oApp = new application($this->iAppId); + if(!$this->bSuperMaintainer) + $oVersion = new version($this->iVersionId); + + if($oApp->sQueued != "false" || + (!$this->bSuperMaintainer && $oVersion->sQueued != "false")) + $this->sQueued = "pending"; + else + $this->sQueued = $this->mustBeQueued() ? "true" : "false"; + $hResult = query_parameters("INSERT INTO appMaintainers (appId, versionId, ". "userId, maintainReason, superMaintainer, submitTime, queued) ". "VALUES ('?', '?', '?', '?', '?', ?, '?')", $this->iAppId, $this->iVersionId, $this->iUserId, $this->sMaintainReason, - $this->bSuperMaintainer, "NOW()", $this->mustBeQueued() ? "true" : "false"); + $this->bSuperMaintainer, "NOW()", $this->sQueued); /* this objects id is the insert id returned by the database */ $this->iMaintainerId = query_appdb_insert_id(); diff --git a/tables/maintainers.sql b/tables/maintainers.sql index dcedfce..e149eda 100644 --- a/tables/maintainers.sql +++ b/tables/maintainers.sql @@ -19,7 +19,7 @@ create table appMaintainers ( maintainReason text, superMaintainer bool, submitTime datetime, - queued enum('true','false','rejected') NOT NULL default 'false', + queued enum('true','false','rejected','pending') NOT NULL default 'false', notificationLevel int not null default '0', notificationTime datetime, key(maintainerId)

1 0

Dan Kegel : ntdll: NtAccessCheck: Only send used bytes to server.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: ab07d61b916cbdb698879226cc77075c4405ee88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab07d61b916cbdb698879226c… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Oct 30 23:17:31 2007 -0700 ntdll: NtAccessCheck: Only send used bytes to server. --- dlls/ntdll/sec.c | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 0a9fa5c..2815838 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -45,6 +45,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); #define NT_SUCCESS(status) (status == STATUS_SUCCESS) +/* helper function to retrieve active length of an ACL */ +static size_t acl_bytesInUse(PACL pAcl) +{ + int i; + size_t bytesInUse = sizeof(ACL); + PACE_HEADER ace = (PACE_HEADER) (pAcl + 1); + for (i = 0; i < pAcl->AceCount; i++) + { + bytesInUse += ace->AceSize; + ace = (PACE_HEADER)(((BYTE*)ace)+ace->AceSize); + } + return bytesInUse; +} + /* helper function to copy an ACL */ static BOOLEAN copy_acl(DWORD nDestinationAclLength, PACL pDestinationAcl, PACL pSourceAcl) { @@ -655,7 +669,7 @@ NTSTATUS WINAPI RtlGetSaclSecurityDescriptor( SECURITY_DESCRIPTOR* lpsd=pSecurityDescriptor; TRACE("(%p,%p,%p,%p)\n", - pSecurityDescriptor, lpbSaclPresent, *pSacl, lpbSaclDefaulted); + pSecurityDescriptor, lpbSaclPresent, pSacl, lpbSaclDefaulted); if (lpsd->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; @@ -1553,9 +1567,9 @@ NtAccessCheck( RtlGetGroupSecurityDescriptor( SecurityDescriptor, &group, &defaulted ); sd.group_len = RtlLengthSid( group ); RtlGetSaclSecurityDescriptor( SecurityDescriptor, &present, &sacl, &defaulted ); - sd.sacl_len = ((present && sacl) ? sacl->AclSize : 0); + sd.sacl_len = ((present && sacl) ? acl_bytesInUse(sacl) : 0); RtlGetDaclSecurityDescriptor( SecurityDescriptor, &present, &dacl, &defaulted ); - sd.dacl_len = ((present && dacl) ? dacl->AclSize : 0); + sd.dacl_len = ((present && dacl) ? acl_bytesInUse(dacl) : 0); wine_server_add_data( req, &sd, sizeof(sd) ); wine_server_add_data( req, owner, sd.owner_len ); @@ -1637,7 +1651,7 @@ NTSTATUS WINAPI NtSetSecurityObject(HANDLE Handle, { status = RtlGetSaclSecurityDescriptor( SecurityDescriptor, &present, &sacl, &defaulted ); if (status != STATUS_SUCCESS) return status; - sd.sacl_len = (sacl && present) ? sacl->AclSize : 0; + sd.sacl_len = (sacl && present) ? acl_bytesInUse(sacl) : 0; sd.control |= SE_SACL_PRESENT; } @@ -1645,7 +1659,7 @@ NTSTATUS WINAPI NtSetSecurityObject(HANDLE Handle, { status = RtlGetDaclSecurityDescriptor( SecurityDescriptor, &present, &dacl, &defaulted ); if (status != STATUS_SUCCESS) return status; - sd.dacl_len = (dacl && present) ? dacl->AclSize : 0; + sd.dacl_len = (dacl && present) ? acl_bytesInUse(dacl) : 0; sd.control |= SE_DACL_PRESENT; } @@ -1745,23 +1759,11 @@ NTSTATUS WINAPI RtlQueryInformationAcl( status = STATUS_INVALID_PARAMETER; else { - INT i; - PACE_HEADER ace; - paclsize->AceCount = pAcl->AceCount; - - paclsize->AclBytesInUse = 0; - ace = (PACE_HEADER) (pAcl + 1); - - for (i = 0; i < pAcl->AceCount; i++) - { - paclsize->AclBytesInUse += ace->AceSize; - ace = (PACE_HEADER)(((BYTE*)ace)+ace->AceSize); - } - + paclsize->AclBytesInUse = acl_bytesInUse(pAcl); if (pAcl->AclSize < paclsize->AclBytesInUse) { - WARN("Acl has %d bytes free\n", paclsize->AclBytesFree); + WARN("Acl uses %d bytes, but only has %d allocated! Returning smaller of the two values.\n", pAcl->AclSize, paclsize->AclBytesInUse); paclsize->AclBytesFree = 0; paclsize->AclBytesInUse = pAcl->AclSize; }

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : winemine: Update Korean resource.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: 7c8330ac9a06757e2d10e8571a6f7fed7c00596e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8330ac9a06757e2d10e8571… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Oct 30 10:15:16 2007 +0900 winemine: Update Korean resource. --- programs/winemine/Ko.rc | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/winemine/Ko.rc b/programs/winemine/Ko.rc index 07cd570..09d5164 100644 --- a/programs/winemine/Ko.rc +++ b/programs/winemine/Ko.rc @@ -4,7 +4,7 @@ * * Copyright 2000 Joshua Thielen * Copyright 2003 Marcelo Duarte - * Copyright 2005 YunSong Hwang + * Copyright 2005,2007 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -52,6 +52,7 @@ DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "�ִ� �ð�" +FONT 8, "MS Shell Dlg" { GROUPBOX "�ִ� �ð�", IDIGNORE, 10, 10, 140, 45 LTEXT "�ʺ��", IDIGNORE, 20, 20, 40, 8 @@ -70,6 +71,7 @@ DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "��մϴ�!" +FONT 8, "MS Shell Dlg" { LTEXT "�� ̸�� ּ��", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -80,6 +82,7 @@ DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "�� " +FONT 8, "MS Shell Dlg" { LTEXT "��", IDIGNORE, 5, 5, 30, 10 LTEXT "��", IDIGNORE, 5, 35, 30, 10 @@ -95,6 +98,7 @@ DLG_ABOUT DIALOG DISCARDABLE 0, 0, 160, 80 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "��" +FONT 8, "MS Shell Dlg" { LTEXT "Winemine", IDIGNORE, 10, 10, 50, 10 LTEXT "Copyright 2000, Joshua Thielen", IDIGNORE, 35, 25, 115, 10

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : user32: Updated Korean resource.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: 6aadc86297e2be5bd59087699c7850a760e229bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aadc86297e2be5bd59087699… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Oct 30 10:09:28 2007 +0900 user32: Updated Korean resource. --- dlls/user32/resources/user32_Ko.rc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/resources/user32_Ko.rc b/dlls/user32/resources/user32_Ko.rc index 432e665..0734773 100644 --- a/dlls/user32/resources/user32_Ko.rc +++ b/dlls/user32/resources/user32_Ko.rc @@ -1,6 +1,7 @@ /* * Copyright 1996 Bang Jun Young - * + * Copyright 2007 YunSong Hwang + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -52,6 +53,7 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE MSGBOX DIALOG 100, 80, 216, 168 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 9, "MS Shell Dlg" BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : progman: Updated Korean resource.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: 718fe212bd2299fec8747e51fea086e990d23661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718fe212bd2299fec8747e51f… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Oct 30 10:08:20 2007 +0900 progman: Updated Korean resource. --- programs/progman/Ko.rc | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/progman/Ko.rc b/programs/progman/Ko.rc index fe76aa6..b0a56f4 100644 --- a/programs/progman/Ko.rc +++ b/programs/progman/Ko.rc @@ -3,7 +3,7 @@ * * Copyright 1996 Ulrich Schmid * Copyright 2002 Sylvain Petreolle - * Copyright 2006 YunSong Hwang + * Copyright 2006,2007 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,7 +22,7 @@ /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT { POPUP "��(&F)" { MENUITEM "�� ۾�(&N)...", PM_NEW @@ -69,6 +69,7 @@ DIALOG_NEW DIALOG 0, 0, 170, 65 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�� ۾�" +FONT 9, "MS Shell Dlg" { RADIOBUTTON "", PM_NEW_GROUP, 10, 15, 10, 15 LTEXT "Ǯ�׸� �׷�(&G)", PM_NEW_GROUP, 20, 18, 80, 15 @@ -85,6 +86,7 @@ PUSHBUTTON "��(&H)", PM_HELP, 105, 45, 60, 15, WS_TABSTOP LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� �̵�" +FONT 9, "MS Shell Dlg" { LTEXT "Ǯ�׸� �̵�:", IDIGNORE, 5, 5, 90, 15 LTEXT "", PM_PROGRAM, 95, 5, 90, 15 @@ -103,6 +105,7 @@ DIALOG_COPY DIALOG 0, 0, 250, 65 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� ��" +FONT 9, "MS Shell Dlg" { LTEXT "Ǯ�׸� ��:", IDIGNORE, 5, 5, 90, 15 LTEXT "", PM_PROGRAM, 95, 5, 90, 15 @@ -121,6 +124,7 @@ DIALOG_GROUP DIALOG 0, 0, 230, 65 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� �׷� �Ӽ�" +FONT 9, "MS Shell Dlg" { LTEXT "��(&D):", PM_DESCRIPTION_TXT, 05, 18, 50, 10 EDITTEXT PM_DESCRIPTION, 60, 18, 90, 15, WS_TABSTOP @@ -137,6 +141,7 @@ DIALOG_PROGRAM DIALOG 0, 0, 250, 105 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� �Ӽ�" +FONT 9, "MS Shell Dlg" { LTEXT "��(&D):", PM_DESCRIPTION_TXT, 05, 10, 60, 10 EDITTEXT PM_DESCRIPTION, 80, 10, 90, 15, WS_TABSTOP @@ -162,8 +167,9 @@ DIALOG_SYMBOL DIALOG 0, 0, 200, 85 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�� ٲٱ�" +FONT 9, "MS Shell Dlg" { -LTEXT "�� ̸�(&F):", PM_ICON_FILE_TXT, 5, 15, 40, 10 +LTEXT "��̸�(&F):", PM_ICON_FILE_TXT, 5, 15, 40, 10 EDITTEXT PM_ICON_FILE, 45, 15, 85, 15, WS_TABSTOP LTEXT "�� (&I):", PM_SYMBOL_LIST_TXT, 5, 30, 125, 10 COMBOBOX PM_SYMBOL_LIST, 5, 40, 125, 50, @@ -180,6 +186,7 @@ DIALOG_EXECUTE DIALOG 0, 0, 200, 85 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� ��" +FONT 9, "MS Shell Dlg" { LTEXT "�� (&C):", IDIGNORE, 05, 15, 120, 10 EDITTEXT PM_COMMAND, 05, 25, 120, 15, WS_TABSTOP

1 0

Alex Villacís Lasso : riched20: Allow for Win98 behavior for return value of EM_REPLACESEL.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: 38234fabeb41448e54b92ac31ae3888f86e174aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=38234fabeb41448e54b92ac31… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Oct 29 10:25:31 2007 -0500 riched20: Allow for Win98 behavior for return value of EM_REPLACESEL. --- dlls/riched20/tests/editor.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 3dfa28e..670096e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1778,9 +1778,17 @@ static void test_EM_REPLACESEL(void) ok(strcmp(buffer, "RichEdit1\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); + /* Win98's riched20 and WinXP's riched20 disagree on what to return from + EM_REPLACESEL. The general rule seems to be that Win98's riched20 + returns the number of characters *inserted* into the control (after + required conversions), but WinXP's riched20 returns the number of + characters interpreted from the original lParam. Wine's builtin riched20 + implements the WinXP behavior. + */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "RichEdit1\r\n"); - ok(11 == r, "EM_REPLACESEL returned %d, expected 11\n", r); + ok(11 == r /* WinXP */ || 10 == r /* Win98 */, + "EM_REPLACESEL returned %d, expected 11 or 10\n", r); r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); @@ -1806,7 +1814,8 @@ static void test_EM_REPLACESEL(void) /* The following tests show that richedit should handle the special \r\r\n sequence by turning it into a single space on insertion. However, - EM_REPLACESEL returns the number of characters in the original string. + EM_REPLACESEL on WinXP returns the number of characters in the original + string. */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); @@ -1829,7 +1838,8 @@ static void test_EM_REPLACESEL(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\r\r\n"); - ok(3 == r, "EM_REPLACESEL returned %d, expected 3\n", r); + ok(3 == r /* WinXP */ || 1 == r /* Win98 */, + "EM_REPLACESEL returned %d, expected 3 or 1\n", r); r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); ok(cr.cpMin == 1, "EM_EXGETSEL returned cpMin=%d, expected 1\n", cr.cpMin); @@ -1847,7 +1857,8 @@ static void test_EM_REPLACESEL(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\r\r\r\r\r\n\r\r\r"); - ok(9 == r, "EM_REPLACESEL returned %d, expected 9\n", r); + ok(9 == r /* WinXP */ || 7 == r /* Win98 */, + "EM_REPLACESEL returned %d, expected 9 or 7\n", r); r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); ok(cr.cpMin == 7, "EM_EXGETSEL returned cpMin=%d, expected 7\n", cr.cpMin); @@ -1865,7 +1876,8 @@ static void test_EM_REPLACESEL(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\r\r\n\r\n"); - ok(5 == r, "EM_REPLACESEL returned %d, expected 5\n", r); + ok(5 == r /* WinXP */ || 2 == r /* Win98 */, + "EM_REPLACESEL returned %d, expected 5 or 2\n", r); r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); ok(cr.cpMin == 2, "EM_EXGETSEL returned cpMin=%d, expected 2\n", cr.cpMin); @@ -1883,7 +1895,8 @@ static void test_EM_REPLACESEL(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\r\r\n\r\r"); - ok(5 == r, "EM_REPLACESEL returned %d, expected 5\n", r); + ok(5 == r /* WinXP */ || 3 == r /* Win98 */, + "EM_REPLACESEL returned %d, expected 5 or 3\n", r); r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); ok(cr.cpMin == 3, "EM_EXGETSEL returned cpMin=%d, expected 3\n", cr.cpMin); @@ -1901,7 +1914,8 @@ static void test_EM_REPLACESEL(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\rX\r\n\r\r"); - ok(6 == r, "EM_REPLACESEL returned %d, expected 5\n", r); + ok(6 == r /* WinXP */ || 5 == r /* Win98 */, + "EM_REPLACESEL returned %d, expected 6 or 5\n", r); r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); ok(cr.cpMin == 5, "EM_EXGETSEL returned cpMin=%d, expected 5\n", cr.cpMin); @@ -1937,7 +1951,8 @@ static void test_EM_REPLACESEL(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)NULL); r = SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) "\n\n\n\n\r\r\r\r\n"); - ok(9 == r, "EM_REPLACESEL returned %d, expected 9\n", r); + ok(9 == r /* WinXP */ || 7 == r /* Win98 */, + "EM_REPLACESEL returned %d, expected 9 or 7\n", r); r = SendMessage(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); ok(cr.cpMin == 7, "EM_EXGETSEL returned cpMin=%d, expected 7\n", cr.cpMin);

1 0

Hans Leidekker : pdh: Remove or fix tests that fail on Windows.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: fcb8e3b1974ee6841a688a882571af03103e7e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb8e3b1974ee6841a688a882… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Oct 22 14:03:34 2007 +0200 pdh: Remove or fix tests that fail on Windows. --- dlls/pdh/tests/pdh.c | 39 ++++----------------------------------- 1 files changed, 4 insertions(+), 35 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index f0a33fa..51a2b5f 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -478,7 +478,7 @@ static void test_PdhGetCounterInfoA( void ) ok(ret == ERROR_SUCCESS, "PdhAddCounterA failed 0x%08x\n", ret); ret = PdhGetCounterInfoA( NULL, 0, NULL, NULL ); - ok(ret == PDH_INVALID_HANDLE, "PdhGetCounterInfoA failed 0x%08x\n", ret); + ok(ret == PDH_INVALID_HANDLE || ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoA failed 0x%08x\n", ret); ret = PdhGetCounterInfoA( counter, 0, NULL, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoA failed 0x%08x\n", ret); @@ -532,7 +532,7 @@ static void test_PdhGetCounterInfoW( void ) ok(ret == ERROR_SUCCESS, "PdhAddCounterW failed 0x%08x\n", ret); ret = PdhGetCounterInfoW( NULL, 0, NULL, NULL ); - ok(ret == PDH_INVALID_HANDLE, "PdhGetCounterInfoW failed 0x%08x\n", ret); + ok(ret == PDH_INVALID_HANDLE || ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoW failed 0x%08x\n", ret); ret = PdhGetCounterInfoW( counter, 0, NULL, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoW failed 0x%08x\n", ret); @@ -634,20 +634,9 @@ static void test_PdhLookupPerfNameByIndexA( void ) ret = PdhLookupPerfNameByIndexA( NULL, 0, NULL, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); - size = 1; - ret = PdhLookupPerfNameByIndexA( NULL, 0, NULL, &size ); - ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); - ok(size == 1, "PdhLookupPerfNameByIndexA failed %d\n", size); - - size = sizeof(buffer); - ret = PdhLookupPerfNameByIndexA( NULL, 0, buffer, &size ); - ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); - ok(!strcmp(buffer, "!!"), "PdhLookupPerfNameByIndexA failed %s\n", buffer); - size = 0; ret = PdhLookupPerfNameByIndexA( NULL, 6, buffer, &size ); - ok(ret == PDH_MORE_DATA, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); - ok(size == sizeof("% Processor Time"), "PdhLookupPerfNameByIndexA failed %d\n", size); + ok(ret == PDH_MORE_DATA || ret == PDH_INSUFFICIENT_BUFFER, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); size = sizeof(buffer); ret = PdhLookupPerfNameByIndexA( NULL, 6, buffer, &size ); @@ -656,11 +645,6 @@ static void test_PdhLookupPerfNameByIndexA( void ) "PdhLookupPerfNameByIndexA failed, got %s expected \'%% Processor Time\'\n", buffer); ok(size == sizeof("% Processor Time"), "PdhLookupPerfNameByIndexA failed %d\n", size); - size = 0; - ret = PdhLookupPerfNameByIndexA( NULL, 674, NULL, &size ); - ok(ret == PDH_MORE_DATA, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); - ok(size == sizeof("System Up Time"), "PdhLookupPerfNameByIndexA failed %d\n", size); - size = sizeof(buffer); ret = PdhLookupPerfNameByIndexA( NULL, 674, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); @@ -678,30 +662,15 @@ static void test_PdhLookupPerfNameByIndexW( void ) ret = PdhLookupPerfNameByIndexW( NULL, 0, NULL, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - size = 1; - ret = PdhLookupPerfNameByIndexW( NULL, 0, NULL, &size ); - ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == 1, "PdhLookupPerfNameByIndexW failed %d\n", size); - - size = sizeof(buffer) / sizeof(WCHAR); - ret = PdhLookupPerfNameByIndexW( NULL, 0, buffer, &size ); - ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - size = 0; ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size ); - ok(ret == PDH_MORE_DATA, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == sizeof(processor_time) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); + ok(ret == PDH_MORE_DATA || ret == PDH_INSUFFICIENT_BUFFER, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); size = sizeof(buffer) / sizeof(WCHAR); ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); ok(size == sizeof(processor_time) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); - size = 0; - ret = PdhLookupPerfNameByIndexW( NULL, 674, NULL, &size ); - ok(ret == PDH_MORE_DATA, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == sizeof(uptime) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); - size = sizeof(buffer) / sizeof(WCHAR); ret = PdhLookupPerfNameByIndexW( NULL, 674, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret);

1 0

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 October 2007