January 2006 - Wine-commits

Phil Krylov : riched20: TODO list update.
by Alexandre Julliard 13 Jan '06

13 Jan '06

Module: wine Branch: refs/heads/master Commit: e0fc77288950be54dcfef2a57a21906d86dfc9a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0fc77288950be54dcfef2a… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Fri Jan 13 13:53:42 2006 +0100 riched20: TODO list update. --- dlls/riched20/editor.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 98ffd9c..ad6162f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -191,8 +191,6 @@ * - Undo coalescing * - add remaining CHARFORMAT/PARAFORMAT fields * - right/center align should strip spaces from the beginning - * - more advanced navigation (Ctrl-arrows) - * - tabs * - pictures/OLE objects (not just smiling faces that lack API support ;-) ) * - COM interface (looks like a major pain in the TODO list) * - calculate heights of pictures (half-done)

1 0

Phil Krylov : riched20: Fixed some selection painting bugs.
by Alexandre Julliard 13 Jan '06

13 Jan '06

Module: wine Branch: refs/heads/master Commit: 8205252f10d5658d011cfdf6ba5957c38d601c86 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8205252f10d5658d011cfdf… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Fri Jan 13 13:53:35 2006 +0100 riched20: Fixed some selection painting bugs. --- dlls/riched20/caret.c | 3 +-- dlls/riched20/paint.c | 29 +++++++++++++++++------------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 74e17e0..ca58c6d 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -725,10 +725,9 @@ void ME_LButtonDown(ME_TextEditor *edito is_selection = 1; } } + ME_InvalidateSelection(editor); HideCaret(editor->hWnd); ME_MoveCaret(editor); - if (is_selection) - ME_Repaint(editor); ShowCaret(editor->hWnd); ME_ClearTempStyle(editor); ME_SendSelChange(editor); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 6e4cfb2..0995482 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -2,6 +2,7 @@ * RichEdit - painting functions * * Copyright 2004 by Krzysztof Foltman + * Copyright 2005 by Phil Krylov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -265,25 +266,29 @@ void ME_DrawGraphics(ME_Context *c, int static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Paragraph *para) { ME_Run *run = &rundi->member.run; + ME_DisplayItem *start = ME_FindItemBack(rundi, diStartRow); int runofs = run->nCharOfs+para->nCharOfs; + int nSelFrom, nSelTo; + const WCHAR wszSpace[] = {' ', 0}; + ME_GetSelection(c->editor, &nSelFrom, &nSelTo); + + /* Draw selected end-of-paragraph mark */ + if (run->nFlags & MERF_ENDPARA && runofs >= nSelFrom && runofs < nSelTo) + ME_DrawTextWithStyle(c, x, y, wszSpace, 1, run->style, NULL, 0, 1, + c->pt.y + start->member.row.nYPos, + start->member.row.nHeight); + /* you can always comment it out if you need visible paragraph marks */ if (run->nFlags & (MERF_ENDPARA|MERF_TAB)) return; - if (run->nFlags & MERF_GRAPHICS) { - int blfrom, blto; - ME_GetSelection(c->editor, &blfrom, &blto); - ME_DrawGraphics(c, x, y, run, para, (runofs >= blfrom) && (runofs < blto)); - } else - { - int blfrom, blto; - ME_DisplayItem *start = ME_FindItemBack(rundi, diStartRow); - ME_GetSelection(c->editor, &blfrom, &blto); - + + if (run->nFlags & MERF_GRAPHICS) + ME_DrawGraphics(c, x, y, run, para, (runofs >= nSelFrom) && (runofs < nSelTo)); + else ME_DrawTextWithStyle(c, x, y, run->strText->szData, ME_StrVLen(run->strText), run->style, NULL, - blfrom-runofs, blto-runofs, c->pt.y+start->member.row.nYPos, start->member.row.nHeight); - } + nSelFrom-runofs,nSelTo-runofs, c->pt.y+start->member.row.nYPos, start->member.row.nHeight); } COLORREF ME_GetBackColor(ME_TextEditor *editor)

1 0

Jeremy White : msi: gcc 2.95 compatibility fix.
by Alexandre Julliard 13 Jan '06

13 Jan '06

Module: wine Branch: refs/heads/master Commit: 9d90ef017c9f3d9be414982bdbf0d85bc25f37e7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d90ef017c9f3d9be414982… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Jan 13 13:53:16 2006 +0100 msi: gcc 2.95 compatibility fix. --- dlls/msi/package.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index e2ba8e7..cb022bd 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -19,6 +19,7 @@ */ #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include <stdarg.h> #include <stdio.h> @@ -356,7 +357,7 @@ static VOID set_installer_properties(MSI MSI_SetPropertyW( package, szVersionMsi, bufstr ); GetSystemInfo( &sys_info ); - if (sys_info.u.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { sprintfW( bufstr, szScreenFormat, sys_info.wProcessorLevel ); MSI_SetPropertyW( package, szIntel, bufstr );

1 0

Alex Villacís Lasso : msacm: Add definition for ACM_DRIVERADDF_NAME.
by Alexandre Julliard 13 Jan '06

13 Jan '06

Module: wine Branch: refs/heads/master Commit: 1c6fbba11673408479ea9857e510add8bde0019c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1c6fbba11673408479ea985… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Fri Jan 13 13:52:49 2006 +0100 msacm: Add definition for ACM_DRIVERADDF_NAME. --- include/msacm.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/msacm.h b/include/msacm.h index 8e9c85b..a7d00a7 100644 --- a/include/msacm.h +++ b/include/msacm.h @@ -40,6 +40,7 @@ extern "C" { #define MM_ACM_CLOSE MM_STREAM_CLOSE #define MM_ACM_DONE MM_STREAM_DONE +#define ACM_DRIVERADDF_NAME 0x00000001L #define ACM_DRIVERADDF_FUNCTION 0x00000003L #define ACM_DRIVERADDF_NOTIFYHWND 0x00000004L #define ACM_DRIVERADDF_TYPEMASK 0x00000007L

1 0

Jeremy White : crypt32: Preserve gcc 2.95 compatibility.
by Alexandre Julliard 13 Jan '06

13 Jan '06

Module: wine Branch: refs/heads/master Commit: 2c79ae47469992bbf33a94479c30b2328a7d8b77 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c79ae47469992bbf33a944… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Jan 13 13:53:05 2006 +0100 crypt32: Preserve gcc 2.95 compatibility. --- dlls/crypt32/tests/encode.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 1849d3a..86f5347 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2270,9 +2270,9 @@ static void test_encodeCRLDistPoints(DWO /* A dist point with an invalid name */ point.DistPointName.dwDistPointNameChoice = CRL_DIST_POINT_FULL_NAME; entry.dwAltNameChoice = CERT_ALT_NAME_URL; - entry.pwszURL = (LPWSTR)nihongoURL; - point.DistPointName.FullName.cAltEntry = 1; - point.DistPointName.FullName.rgAltEntry = &entry; + U(entry).pwszURL = (LPWSTR)nihongoURL; + U(point.DistPointName).FullName.cAltEntry = 1; + U(point.DistPointName).FullName.rgAltEntry = &entry; ret = CryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); ok(!ret && GetLastError() == CRYPT_E_INVALID_IA5_STRING, @@ -2282,7 +2282,7 @@ static void test_encodeCRLDistPoints(DWO "Expected invalid char at index 7, got %ld\n", GET_CERT_ALT_NAME_VALUE_ERR_INDEX(size)); /* A dist point with (just) a valid name */ - entry.pwszURL = (LPWSTR)url; + U(entry).pwszURL = (LPWSTR)url; ret = CryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); if (buf) @@ -2376,13 +2376,13 @@ static void test_decodeCRLDistPoints(DWO CRL_DIST_POINT_FULL_NAME, "Expected CRL_DIST_POINT_FULL_NAME, got %ld\n", point->DistPointName.dwDistPointNameChoice); - ok(point->DistPointName.FullName.cAltEntry == 1, + ok(U(point->DistPointName).FullName.cAltEntry == 1, "Expected 1 name entry, got %ld\n", - point->DistPointName.FullName.cAltEntry); - entry = point->DistPointName.FullName.rgAltEntry; + U(point->DistPointName).FullName.cAltEntry); + entry = U(point->DistPointName).FullName.rgAltEntry; ok(entry->dwAltNameChoice == CERT_ALT_NAME_URL, "Expected CERT_ALT_NAME_URL, got %ld\n", entry->dwAltNameChoice); - ok(!lstrcmpW(entry->pwszURL, url), "Unexpected name\n"); + ok(!lstrcmpW(U(*entry).pwszURL, url), "Unexpected name\n"); ok(point->ReasonFlags.cbData == 0, "Expected no reason\n"); ok(point->CRLIssuer.cAltEntry == 0, "Expected no issuer\n"); LocalFree(buf); @@ -2426,20 +2426,20 @@ static void test_decodeCRLDistPoints(DWO CRL_DIST_POINT_FULL_NAME, "Expected CRL_DIST_POINT_FULL_NAME, got %ld\n", point->DistPointName.dwDistPointNameChoice); - ok(point->DistPointName.FullName.cAltEntry == 1, + ok(U(point->DistPointName).FullName.cAltEntry == 1, "Expected 1 name entry, got %ld\n", - point->DistPointName.FullName.cAltEntry); - entry = point->DistPointName.FullName.rgAltEntry; + U(point->DistPointName).FullName.cAltEntry); + entry = U(point->DistPointName).FullName.rgAltEntry; ok(entry->dwAltNameChoice == CERT_ALT_NAME_URL, "Expected CERT_ALT_NAME_URL, got %ld\n", entry->dwAltNameChoice); - ok(!lstrcmpW(entry->pwszURL, url), "Unexpected name\n"); + ok(!lstrcmpW(U(*entry).pwszURL, url), "Unexpected name\n"); ok(point->ReasonFlags.cbData == 0, "Expected no reason\n"); ok(point->CRLIssuer.cAltEntry == 1, "Expected 1 issuer entry, got %ld\n", point->CRLIssuer.cAltEntry); entry = point->CRLIssuer.rgAltEntry; ok(entry->dwAltNameChoice == CERT_ALT_NAME_URL, "Expected CERT_ALT_NAME_URL, got %ld\n", entry->dwAltNameChoice); - ok(!lstrcmpW(entry->pwszURL, url), "Unexpected name\n"); + ok(!lstrcmpW(U(*entry).pwszURL, url), "Unexpected name\n"); LocalFree(buf); } }

1 0

Alexandre Julliard : ntdll: Round PE header size to a page boundary for size checks.
by Alexandre Julliard 13 Jan '06

13 Jan '06

Module: wine Branch: refs/heads/master Commit: eca9e4449c857f6f0f767ba1b3f243dd7d7799eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eca9e4449c857f6f0f767ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 13 13:52:07 2006 +0100 ntdll: Round PE header size to a page boundary for size checks. --- dlls/ntdll/virtual.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e6d0236..e74b3e0 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -838,7 +838,7 @@ static NTSTATUS map_image( HANDLE hmappi off_t pos; struct stat st; struct file_view *view = NULL; - char *ptr; + char *ptr, *header_end; /* zero-map the whole range */ @@ -870,10 +870,10 @@ static NTSTATUS map_image( HANDLE hmappi removable ) != STATUS_SUCCESS) goto error; dos = (IMAGE_DOS_HEADER *)ptr; nt = (IMAGE_NT_HEADERS *)(ptr + dos->e_lfanew); - if ((char *)(nt + 1) > ptr + header_size) goto error; - + header_end = ptr + ROUND_SIZE( 0, header_size ); + if ((char *)(nt + 1) > header_end) goto error; sec = (IMAGE_SECTION_HEADER*)((char*)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader); - if ((char *)(sec + nt->FileHeader.NumberOfSections) > ptr + header_size) goto error; + if ((char *)(sec + nt->FileHeader.NumberOfSections) > header_end) goto error; imports = nt->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_IMPORT; if (!imports->Size || !imports->VirtualAddress) imports = NULL;

1 0

Saulius Krasuckas : mscms: Make enumerating more verbose.
by Alexandre Julliard 13 Jan '06

13 Jan '06

Module: wine Branch: refs/heads/master Commit: d37d5cd51de717b13db6b71b793d763a68a519bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d37d5cd51de717b13db6b71… Author: Saulius Krasuckas <saulius.krasuckas(a)gmail.com> Date: Fri Jan 13 13:52:21 2006 +0100 mscms: Make enumerating more verbose. --- dlls/mscms/tests/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 8ac6200..6e82fb3 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -485,7 +485,7 @@ static void enum_registered_color_profil if (ret) { present++; - trace(" found %s\n", known_colorspaces[i].szName); + trace(" found %s, pointing to '%s' (%d chars)\n", known_colorspaces[i].szName, profile, strlen(profile)); } } trace("Total profiles found: %ld.\n", present);

1 0

Aric Stewart : wininet: Handle NULL lpBuffersIn in HttpSendRequestExW.
by Alexandre Julliard 13 Jan '06

13 Jan '06

Module: wine Branch: refs/heads/master Commit: 21712d3d156740b18f2d9489ec819fbda41b3b13 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=21712d3d156740b18f2d948… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 13 13:52:38 2006 +0100 wininet: Handle NULL lpBuffersIn in HttpSendRequestExW. --- dlls/wininet/http.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ee78f24..1312380 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1788,15 +1788,27 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET workRequest.asyncall = HTTPSENDREQUESTW; workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); req = &workRequest.u.HttpSendRequestW; - if (lpBuffersIn->lpcszHeader) - /* FIXME: this should use dwHeadersLength or may not be necessary at all */ - req->lpszHeader = WININET_strdupW(lpBuffersIn->lpcszHeader); + if (lpBuffersIn) + { + if (lpBuffersIn->lpcszHeader) + /* FIXME: this should use dwHeadersLength or may not be necessary at all */ + req->lpszHeader = WININET_strdupW(lpBuffersIn->lpcszHeader); + else + req->lpszHeader = NULL; + req->dwHeaderLength = lpBuffersIn->dwHeadersLength; + req->lpOptional = lpBuffersIn->lpvBuffer; + req->dwOptionalLength = lpBuffersIn->dwBufferLength; + req->dwContentLength = lpBuffersIn->dwBufferTotal; + } else + { req->lpszHeader = NULL; - req->dwHeaderLength = lpBuffersIn->dwHeadersLength; - req->lpOptional = lpBuffersIn->lpvBuffer; - req->dwOptionalLength = lpBuffersIn->dwBufferLength; - req->dwContentLength = lpBuffersIn->dwBufferTotal; + req->dwHeaderLength = 0; + req->lpOptional = NULL; + req->dwOptionalLength = 0; + req->dwContentLength = 0; + } + req->bEndRequest = FALSE; INTERNET_AsyncCall(&workRequest);

1 0

appdb/. appview.php
by WineHQ 13 Jan '06

13 Jan '06

ChangeSet ID: 22258 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/12 21:05:06 Modified files: . : appview.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Check that users can view applications and versions before displaying them. Present an error message if they lack permission. Fixes a bug where we were allowing users to view applications and versions that were rejected. Patch: http://cvs.winehq.org/patch.py?id=22258 Old revision New revision Changes Path 1.76 1.77 +15 -0 appdb/appview.php Index: appdb/appview.php diff -u -p appdb/appview.php:1.76 appdb/appview.php:1.77 --- appdb/appview.php:1.76 13 Jan 2006 3: 5: 6 -0000 +++ appdb/appview.php 13 Jan 2006 3: 5: 6 -0000 @@ -191,6 +191,13 @@ if($_REQUEST['appId']) { $oApp = new Application($_REQUEST['appId']); + /* is this user supposed to view this version? */ + if(!$_SESSION['current']->canViewApplication($oApp)) + { + errorpage("Something went wrong with the application or version id"); + exit; + } + // show Vote Menu if($_SESSION['current']->isLoggedIn()) apidb_sidebar_add("vote_menu"); @@ -329,6 +336,14 @@ if($_REQUEST['appId']) else if($_REQUEST['versionId']) { $oVersion = new Version($_REQUEST['versionId']); + + /* is this user supposed to view this version? */ + if(!$_SESSION['current']->canViewVersion($oVersion)) + { + errorpage("Something went wrong with the application or version id"); + exit; + } + $oApp = new Application($oVersion->iAppId); if(!$oApp->iAppId) {

1 0

Eric Pouech : ntdll: Created infrastructure to support IOCTL for serial devices.
by Alexandre Julliard 12 Jan '06

12 Jan '06

Module: wine Branch: refs/heads/master Commit: 2cdace2760f127052b2d8f7746e8255079808386 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2cdace2760f127052b2d8f7… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Jan 12 13:32:51 2006 +0100 ntdll: Created infrastructure to support IOCTL for serial devices. - created infrastructure in ntdll to support IOCTL for serial devices - implemented IOCTLs in ntdll for serial break support - implemented the kernel32 equivalent on top of those IOCTLs --- dlls/kernel/comm.c | 55 ++---- dlls/ntdll/Makefile.in | 1 dlls/ntdll/file.c | 21 ++ dlls/ntdll/ntdll_misc.h | 7 + dlls/ntdll/serial.c | 197 +++++++++++++++++++++++ include/Makefile.in | 1 include/ddk/ntddser.h | 398 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 632 insertions(+), 48 deletions(-) create mode 100644 dlls/ntdll/serial.c create mode 100644 include/ddk/ntddser.h

1 0