Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 39234: sync msi with wine 1.1.14
by cwittich＠svn.reactos.org 31 Jan '09

31 Jan '09

Author: cwittich Date: Sat Jan 31 08:13:20 2009 New Revision: 39234 URL: http://svn.reactos.org/svn/reactos?rev=39234&view=rev Log: sync msi with wine 1.1.14 Modified: trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.spec trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/regsvr.c trunk/reactos/dll/win32/msi/source.c trunk/reactos/dll/win32/msi/storages.c trunk/reactos/dll/win32/msi/table.c Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/database.c [iso-8859-1] Sat Jan 31 08:13:20 2009 @@ -1206,7 +1206,7 @@ MERGETABLE *table = data->curtable; MERGEROW *mergerow; MSIQUERY *dbview; - MSIRECORD *row; + MSIRECORD *row = NULL; LPWSTR query; UINT r; Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=39… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Sat Jan 31 08:13:20 2009 @@ -1553,7 +1553,7 @@ TRACE("(%s, %s, %d, %s, %p)\n", debugstr_w(szProductCode), debugstr_w(szUserSid), dwContext, debugstr_w(szComponent), pdwState); - if (!pdwState) + if (!pdwState || !szComponent) return ERROR_INVALID_PARAMETER; if (!szProductCode || !*szProductCode || lstrlenW(szProductCode) != GUID_SIZE - 1) Modified: trunk/reactos/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] Sat Jan 31 08:13:20 2009 @@ -250,8 +250,8 @@ 254 stub MsiDeterminePatchSequenceW 255 stdcall MsiSourceListAddSourceExA(str str long long str long) 256 stdcall MsiSourceListAddSourceExW(wstr wstr long long wstr long) -257 stub MsiSourceListClearSourceA -258 stub MsiSourceListClearSourceW +257 stdcall MsiSourceListClearSourceA(str str long long str) +258 stdcall MsiSourceListClearSourceW(wstr wstr long long wstr) 259 stub MsiSourceListClearAllExA 260 stub MsiSourceListClearAllExW 261 stub MsiSourceListForceResolutionExA Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] Sat Jan 31 08:13:20 2009 @@ -1894,7 +1894,7 @@ MSIINSTALLCONTEXT *pdwTargetProductContext, LPWSTR szTargetUserSid, LPDWORD pcchTargetUserSid, LPWSTR *szTransforms) { - UINT r; + UINT r = ERROR_INVALID_PARAMETER; if (dwContext & MSIINSTALLCONTEXT_USERMANAGED) { Modified: trunk/reactos/dll/win32/msi/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/regsvr.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/regsvr.c [iso-8859-1] Sat Jan 31 08:13:20 2009 @@ -42,7 +42,6 @@ #include "initguid.h" #include "msipriv.h" #include "msiserver.h" - WINE_DEFAULT_DEBUG_CHANNEL(msi); /* Modified: trunk/reactos/dll/win32/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/source.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/source.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/source.c [iso-8859-1] Sat Jan 31 08:13:20 2009 @@ -1314,3 +1314,27 @@ FIXME("(%s %s %d)\n", debugstr_w(szProduct), debugstr_w(szUserName), dwReserved); return ERROR_SUCCESS; } + +/****************************************************************** + * MsiSourceListClearSourceA (MSI.@) + */ +UINT WINAPI MsiSourceListClearSourceA(LPCSTR szProductCodeOrPatchCode, LPCSTR szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions, + LPCSTR szSource) +{ + FIXME("(%s %s %x %x %s)\n", debugstr_a(szProductCodeOrPatchCode), debugstr_a(szUserSid), + dwContext, dwOptions, debugstr_a(szSource)); + return ERROR_SUCCESS; +} + +/****************************************************************** + * MsiSourceListClearSourceW (MSI.@) + */ +UINT WINAPI MsiSourceListClearSourceW(LPCWSTR szProductCodeOrPatchCode, LPCWSTR szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions, + LPCWSTR szSource) +{ + FIXME("(%s %s %x %x %s)\n", debugstr_w(szProductCodeOrPatchCode), debugstr_w(szUserSid), + dwContext, dwOptions, debugstr_w(szSource)); + return ERROR_SUCCESS; +} Modified: trunk/reactos/dll/win32/msi/storages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/storages.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/storages.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/storages.c [iso-8859-1] Sat Jan 31 08:13:20 2009 @@ -134,7 +134,7 @@ static HRESULT stream_to_storage(IStream *stm, IStorage **stg) { - ILockBytes *lockbytes; + ILockBytes *lockbytes = NULL; STATSTG stat; LPVOID data; HRESULT hr; @@ -177,7 +177,7 @@ done: msi_free(data); - ILockBytes_Release(lockbytes); + if (lockbytes) ILockBytes_Release(lockbytes); return hr; } Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/table.c [iso-8859-1] Sat Jan 31 08:13:20 2009 @@ -1818,7 +1818,7 @@ done: msiobj_release(&rec->hdr); - if (columns) columns->ops->delete(columns); + columns->ops->delete(columns); return r; }

1 0

[cwittich] 39233: add stubs for SHFlushSFCache and SHGetImageList (from wine)
by cwittich＠svn.reactos.org 31 Jan '09

31 Jan '09

Author: cwittich Date: Sat Jan 31 08:01:57 2009 New Revision: 39233 URL: http://svn.reactos.org/svn/reactos?rev=39233&view=rev Log: add stubs for SHFlushSFCache and SHGetImageList (from wine) Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shellord.c Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Sat Jan 31 08:01:57 2009 @@ -234,6 +234,7 @@ 523 stdcall SHFreeShared(long long) 524 stdcall RealDriveType(long long) 525 stub RealDriveTypeFlags + 526 stdcall SHFlushSFCache() 640 stdcall -noname NTSHChangeNotifyRegister(long long long long long long) 641 stdcall -noname NTSHChangeNotifyDeregister(long) @@ -256,7 +257,9 @@ 680 stdcall IsUserAnAdmin() 701 stdcall CDefFolderMenu_Create2(ptr ptr long ptr ptr ptr long ptr ptr) 704 stdcall -noname GUIDFromStringW(wstr ptr) + 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW + 727 stdcall SHGetImageList(long ptr ptr) 730 stdcall RestartDialogEx(long wstr long long) 1217 stub FOOBAR1217 # no joke! This is the real name!! Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Sat Jan 31 08:01:57 2009 @@ -2162,6 +2162,26 @@ return TRUE; } + +/************************************************************************* + * SHFlushSFCache (SHELL32.526) + * + * Notifies the shell that a user-specified special folder location has changed. + * + * NOTES + * In Wine, the shell folder registry values are not cached, so this function + * has no effect. + */ +void WINAPI SHFlushSFCache(void) +{ +} + +HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) +{ + FIXME("STUB: %i %s\n",iImageList,debugstr_guid(riid)); + return E_NOINTERFACE; +} + /************************************************************************* * SHParseDisplayName [shell version 6.0] */

1 0

[cwittich] 39232: make explicit use of unicode functions
by cwittich＠svn.reactos.org 31 Jan '09

31 Jan '09

Author: cwittich Date: Sat Jan 31 07:44:48 2009 New Revision: 39232 URL: http://svn.reactos.org/svn/reactos?rev=39232&view=rev Log: make explicit use of unicode functions Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Sat Jan 31 07:44:48 2009 @@ -108,9 +108,9 @@ if (*lpDependencies == 0) { - RegDeleteValue(hServiceKey, + RegDeleteValueW(hServiceKey, L"DependOnService"); - RegDeleteValue(hServiceKey, + RegDeleteValueW(hServiceKey, L"DependOnGroup"); } else Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sat Jan 31 07:44:48 2009 @@ -497,8 +497,8 @@ it is now safe to delete the service */ /* Delete the Service Key */ - dwError = RegDeleteKey(hServicesKey, - lpService->lpServiceName); + dwError = RegDeleteKeyW(hServicesKey, + lpService->lpServiceName); RegCloseKey(hServicesKey);

1 0

[cwittich] 39231: add lodctr
by cwittich＠svn.reactos.org 31 Jan '09

31 Jan '09

Author: cwittich Date: Sat Jan 31 07:21:11 2009 New Revision: 39231 URL: http://svn.reactos.org/svn/reactos?rev=39231&view=rev Log: add lodctr Added: trunk/reactos/base/applications/cmdutils/lodctr/ (with props) trunk/reactos/base/applications/cmdutils/lodctr/lodctr.rbuild (with props) trunk/reactos/base/applications/cmdutils/lodctr/lodctr_main.c (with props) Propchange: trunk/reactos/base/applications/cmdutils/lodctr/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Jan 31 07:21:11 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/cmdutils/lodctr/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/cmdutils/lodctr/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/cmdutils/lodctr/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/cmdutils/lodctr/lodctr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/lodctr/lodctr.rbuild (added) +++ trunk/reactos/base/applications/cmdutils/lodctr/lodctr.rbuild [iso-8859-1] Sat Jan 31 07:21:11 2009 @@ -1,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="lodctr" type="win32cui" installbase="system32" installname="lodctr.exe" unicode="yes"> + <library>kernel32</library> + <library>loadperf</library> + <library>wine</library> + <file>lodctr_main.c</file> +</module> Propchange: trunk/reactos/base/applications/cmdutils/lodctr/lodctr.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/lodctr/lodctr_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/lodctr/lodctr_main.c (added) +++ trunk/reactos/base/applications/cmdutils/lodctr/lodctr_main.c [iso-8859-1] Sat Jan 31 07:21:11 2009 @@ -1,0 +1,25 @@ +/* + * Copyright (C) 2009 Andrey Turkin + * + * 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 + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <loadperf.h> + +int wmain(int argc, WCHAR *argv[]) +{ + return LoadPerfCounterTextStringsW(GetCommandLineW(), FALSE); +} Propchange: trunk/reactos/base/applications/cmdutils/lodctr/lodctr_main.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 39230: Hack: Revert the dispatch routine for WM_SETREDRAW to the pre-Wine-1.1.7 version to hackfix mIRC and probably other applications using riched20.
by cfinck＠svn.reactos.org 31 Jan '09

31 Jan '09

Author: cfinck Date: Sat Jan 31 07:18:17 2009 New Revision: 39230 URL: http://svn.reactos.org/svn/reactos?rev=39230&view=rev Log: Hack: Revert the dispatch routine for WM_SETREDRAW to the pre-Wine-1.1.7 version to hackfix mIRC and probably other applications using riched20. Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/editor.c Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_8/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/reactos/dll/win32/riched20/editor.c [iso-8859-1] Sat Jan 31 07:18:17 2009 @@ -4191,7 +4191,9 @@ ME_SendRequestResize(editor, TRUE); return 0; case WM_SETREDRAW: - goto do_default; + if (wParam) + ME_RewrapRepaint(editor); + return 0; case WM_SIZE: { RECT clientRect;

1 0

[cfinck] 39229: Merge r39224 (riched20 sync)
by cfinck＠svn.reactos.org 31 Jan '09

31 Jan '09

Author: cfinck Date: Sat Jan 31 07:11:26 2009 New Revision: 39229 URL: http://svn.reactos.org/svn/reactos?rev=39229&view=rev Log: Merge r39224 (riched20 sync) Added: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/txthost.c - copied unchanged from r39224, trunk/reactos/dll/win32/riched20/txthost.c Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/caret.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/clipboard.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/context.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/editor.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/editor.h branches/ros-branch-0_3_8/reactos/dll/win32/riched20/editstr.h branches/ros-branch-0_3_8/reactos/dll/win32/riched20/list.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/paint.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/para.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/reader.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/riched20.rbuild branches/ros-branch-0_3_8/reactos/dll/win32/riched20/richole.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/rtf.h branches/ros-branch-0_3_8/reactos/dll/win32/riched20/run.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/string.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/style.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/table.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/txtsrv.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/undo.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/wrap.c branches/ros-branch-0_3_8/reactos/dll/win32/riched20/writer.c branches/ros-branch-0_3_8/reactos/include/psdk/textserv.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/context.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/list.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/paint.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/rtf.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/run.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/string.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/style.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/table.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/undo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/dll/win32/riched20/writer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… Modified: branches/ros-branch-0_3_8/reactos/include/psdk/textserv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/includ…

1 0

[cwittich] 39228: add loadperf and lodctr from wine 1.1.14
by cwittich＠svn.reactos.org 31 Jan '09

31 Jan '09

Author: cwittich Date: Sat Jan 31 07:09:48 2009 New Revision: 39228 URL: http://svn.reactos.org/svn/reactos?rev=39228&view=rev Log: add loadperf and lodctr from wine 1.1.14 Added: trunk/reactos/dll/win32/loadperf/ (with props) trunk/reactos/dll/win32/loadperf/loadperf.rbuild (with props) trunk/reactos/dll/win32/loadperf/loadperf.spec (with props) trunk/reactos/dll/win32/loadperf/loadperf_main.c (with props) trunk/reactos/include/psdk/loadperf.h (with props) Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/cmdutils.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/cmdutils.rbuild [iso-8859-1] Sat Jan 31 07:09:48 2009 @@ -13,6 +13,9 @@ <directory name="hostname"> <xi:include href="hostname/hostname.rbuild" /> </directory> + <directory name="lodctr"> + <xi:include href="lodctr/lodctr.rbuild" /> + </directory> <directory name="more"> <xi:include href="more/more.rbuild" /> </directory> Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=392… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sat Jan 31 07:09:48 2009 @@ -9,6 +9,7 @@ <property name="BASEADDRESS_RSABASE" value="0x35700000" /> <property name="BASEADDRESS_RSAENH" value="0x35780000" /> <property name="BASEADDRESS_DWMAPI" value="0x4A3F0000" /> + <property name="BASEADDRESS_LOADPERF" value="0x4B920000" /> <property name="BASEADDRESS_MPRAPI" value="0x4C400000" /> <property name="BASEADDRESS_PSTOREC" value="0x513D0000" /> <property name="BASEADDRESS_LPK" value="0x516C0000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Jan 31 07:09:48 2009 @@ -37,6 +37,7 @@ base\applications\cmdutils\doskey\doskey.exe 1 base\applications\cmdutils\find\find.exe 1 base\applications\cmdutils\hostname\hostname.exe 1 +base\applications\cmdutils\lodctr\lodctr.exe 1 base\applications\cmdutils\more\more.exe 1 base\applications\cmdutils\xcopy\xcopy.exe 1 base\applications\control\control.exe 1 @@ -278,6 +279,7 @@ dll\win32\itss\itss.dll 1 dll\win32\jscript\jscript.dll 1 dll\win32\kernel32\kernel32.dll 1 +dll\win32\loadperf\loadperf.dll 1 dll\win32\localui\localui.dll 1 dll\win32\lsasrv\lsasrv.dll 1 dll\win32\lz32\lz32.dll 1 Propchange: trunk/reactos/dll/win32/loadperf/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Jan 31 07:09:48 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/loadperf/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/loadperf/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/loadperf/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/loadperf/loadperf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/loadper… ============================================================================== --- trunk/reactos/dll/win32/loadperf/loadperf.rbuild (added) +++ trunk/reactos/dll/win32/loadperf/loadperf.rbuild [iso-8859-1] Sat Jan 31 07:09:48 2009 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="loadperf" type="win32dll" baseaddress="${BASEADDRESS_LOADPERF}" installbase="system32" installname="loadperf.dll" allowwarnings="true"> + <importlibrary definition="loadperf.spec" /> + <include base="loadperf">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>loadperf_main.c</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> + Propchange: trunk/reactos/dll/win32/loadperf/loadperf.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/loadperf/loadperf.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/loadper… ============================================================================== --- trunk/reactos/dll/win32/loadperf/loadperf.spec (added) +++ trunk/reactos/dll/win32/loadperf/loadperf.spec [iso-8859-1] Sat Jan 31 07:09:48 2009 @@ -1,0 +1,14 @@ +@ stub BackupPerfRegistryToFileW +@ stdcall InstallPerfDllA(str str ptr) +@ stdcall InstallPerfDllW(wstr wstr ptr) +@ stub LoadMofFromInstalledServiceA +@ stub LoadMofFromInstalledServiceW +@ stdcall LoadPerfCounterTextStringsA(str long) +@ stdcall LoadPerfCounterTextStringsW(wstr long) +@ stub RestorePerfRegistryFromFileW +@ stub SetServiceAsTrustedA +@ stub SetServiceAsTrustedW +@ stdcall UnloadPerfCounterTextStringsA(str long) +@ stdcall UnloadPerfCounterTextStringsW(wstr long) +@ stub UpdatePerfNameFilesA +@ stub UpdatePerfNameFilesW Propchange: trunk/reactos/dll/win32/loadperf/loadperf.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/loadperf/loadperf_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/loadper… ============================================================================== --- trunk/reactos/dll/win32/loadperf/loadperf_main.c (added) +++ trunk/reactos/dll/win32/loadperf/loadperf_main.c [iso-8859-1] Sat Jan 31 07:09:48 2009 @@ -1,0 +1,165 @@ +/* + * Implementation of loadperf.dll + * + * Copyright 2009 Andrey Turkin + * + * 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 + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winnls.h" +#include "wine/debug.h" + +#include "loadperf.h" + +WINE_DEFAULT_DEBUG_CHANNEL(loadperf); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} + +static WCHAR *strdupAW(const char *str) +{ + WCHAR *ret = NULL; + if (str) + { + INT len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + if (!(ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) return NULL; + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + return ret; +} + +/************************************************************* + * InstallPerfDllA (loadperf.@) + */ +DWORD WINAPI InstallPerfDllA(LPCSTR computer, LPCSTR ini, ULONG_PTR flags) +{ + DWORD ret; + LPWSTR computerW = NULL, iniW = NULL; + + if (computer && !(computerW = strdupAW(computer))) return ERROR_OUTOFMEMORY; + if (ini && !(iniW = strdupAW(ini))) + { + HeapFree(GetProcessHeap(), 0, computerW); + return ERROR_OUTOFMEMORY; + } + + ret = InstallPerfDllW(computerW, iniW, flags); + + HeapFree(GetProcessHeap(), 0, computerW); + HeapFree(GetProcessHeap(), 0, iniW); + + return ret; +} + +/************************************************************* + * InstallPerfDllW (loadperf.@) + */ +DWORD WINAPI InstallPerfDllW(LPCWSTR computer, LPCWSTR ini, ULONG_PTR flags) +{ + FIXME("(%s, %s, %lx)\n", debugstr_w(computer), debugstr_w(ini), flags); + return ERROR_SUCCESS; +} + +/************************************************************* + * LoadPerfCounterTextStringsA (loadperf.@) + * + * NOTES + * See LoadPerfCounterTextStringsW + */ +DWORD WINAPI LoadPerfCounterTextStringsA(LPCSTR cmdline, BOOL quiet) +{ + DWORD ret; + LPWSTR cmdlineW = NULL; + + if (cmdline && !(cmdlineW = strdupAW(cmdline))) return ERROR_OUTOFMEMORY; + + ret = LoadPerfCounterTextStringsW(cmdlineW, quiet); + + HeapFree(GetProcessHeap(), 0, cmdlineW); + + return ret; +} + +/************************************************************* + * LoadPerfCounterTextStringsW (loadperf.@) + * + * PARAMS + * cmdline [in] Last argument in command line - ini file to be used + * quiet [in] FALSE - the function may write to stdout + * + */ +DWORD WINAPI LoadPerfCounterTextStringsW(LPCWSTR cmdline, BOOL quiet) +{ + FIXME("(%s, %d): stub\n", debugstr_w(cmdline), quiet); + + return ERROR_SUCCESS; +} + +/************************************************************* + * UnloadPerfCounterTextStringsA (loadperf.@) + * + * NOTES + * See UnloadPerfCounterTextStringsW + */ +DWORD WINAPI UnloadPerfCounterTextStringsA(LPCSTR cmdline, BOOL quiet) +{ + DWORD ret; + LPWSTR cmdlineW = NULL; + + if (cmdline && !(cmdlineW = strdupAW(cmdline))) return ERROR_OUTOFMEMORY; + + ret = UnloadPerfCounterTextStringsW(cmdlineW, quiet); + + HeapFree(GetProcessHeap(), 0, cmdlineW); + + return ret; +} + +/************************************************************* + * UnloadPerfCounterTextStringsW (loadperf.@) + * + * PARAMS + * cmdline [in] Last argument in command line - application counters to be removed + * quiet [in] FALSE - the function may write to stdout + * + */ +DWORD WINAPI UnloadPerfCounterTextStringsW(LPCWSTR cmdline, BOOL quiet) +{ + FIXME("(%s, %d): stub\n", debugstr_w(cmdline), quiet); + + return ERROR_SUCCESS; +} Propchange: trunk/reactos/dll/win32/loadperf/loadperf_main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sat Jan 31 07:09:48 2009 @@ -148,6 +148,9 @@ <directory name="kernel32"> <xi:include href="kernel32/kernel32.rbuild" /> </directory> +<directory name="loadperf"> + <xi:include href="loadperf/loadperf.rbuild" /> +</directory> <directory name="localui"> <xi:include href="localui/localui.rbuild" /> </directory> Added: trunk/reactos/include/psdk/loadperf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/loadperf.h?re… ============================================================================== --- trunk/reactos/include/psdk/loadperf.h (added) +++ trunk/reactos/include/psdk/loadperf.h [iso-8859-1] Sat Jan 31 07:09:48 2009 @@ -1,0 +1,42 @@ +/* + * Copyright (C) 2009 Andrey Turkin + * + * 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 + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_LOADPERF_H +#define __WINE_LOADPERF_H + +#ifdef __cplusplus +extern "C" { +#endif + +DWORD WINAPI InstallPerfDllA(LPCSTR, LPCSTR, ULONG_PTR); +DWORD WINAPI InstallPerfDllW(LPCWSTR, LPCWSTR, ULONG_PTR); +#define InstallPerfDll WINELIB_NAME_AW(InstallPerfDll); + +DWORD WINAPI LoadPerfCounterTextStringsA(LPCSTR, BOOL); +DWORD WINAPI LoadPerfCounterTextStringsW(LPCWSTR, BOOL); +#define LoadPerfCounterTextStrings WINELIB_NAME_AW(LoadPerfCounterTextStrings) + +DWORD WINAPI UnloadPerfCounterTextStringsA(LPCSTR, BOOL); +DWORD WINAPI UnloadPerfCounterTextStringsW(LPCWSTR, BOOL); +#define UnloadPerfCounterTextStrings WINELIB_NAME_AW(UnloadPerfCounterTextStrings) + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_LOADPERF_H */ Propchange: trunk/reactos/include/psdk/loadperf.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gschneider] 39227: Evgeny Boltik <BSTSoft AT narod DOT ru>: Generic StretchBlt implementation for all bitrates with partial ROP and clipping support, see bug #4075. Some changes from me applied to the patch: - ROP variables renamed, applied consistent indentation, abort operation if pattern ROP and dprint once, split src and dst dprints - Access source surface only if source is actually used, fixes mem access crashes - Offer external drivers a NULL surface ptr if source is not used, since they
by gschneider＠svn.reactos.org 31 Jan '09

31 Jan '09

Author: gschneider Date: Sat Jan 31 07:05:11 2009 New Revision: 39227 URL: http://svn.reactos.org/svn/reactos?rev=39227&view=rev Log: Evgeny Boltik <BSTSoft AT narod DOT ru>: Generic StretchBlt implementation for all bitrates with partial ROP and clipping support, see bug #4075. Some changes from me applied to the patch: - ROP variables renamed, applied consistent indentation, abort operation if pattern ROP and dprint once, split src and dst dprints - Access source surface only if source is actually used, fixes mem access crashes - Offer external drivers a NULL surface ptr if source is not used, since they (VMWare for example) access it although they shouldn't (another crash) - Fixes bug #2609, support for pattern ROPs will be added after some restructuring - Clipping still has some issues (bugs 3325, 3477, 4089) which seem to be related to IntEng- and EngStretchBlt Added: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c (with props) Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c trunk/reactos/subsystems/win32/win32k/dib/dib.h trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] Sat Jan 31 07:05:11 2009 @@ -39,37 +39,37 @@ /* BMF_1BPP */ { DIB_1BPP_PutPixel, DIB_1BPP_GetPixel, DIB_1BPP_HLine, DIB_1BPP_VLine, - DIB_1BPP_BitBlt, DIB_1BPP_BitBltSrcCopy, DIB_1BPP_StretchBlt, + DIB_1BPP_BitBlt, DIB_1BPP_BitBltSrcCopy, DIB_XXBPP_StretchBlt, DIB_1BPP_TransparentBlt, DIB_1BPP_ColorFill, DIB_1BPP_AlphaBlend }, /* BMF_4BPP */ { DIB_4BPP_PutPixel, DIB_4BPP_GetPixel, DIB_4BPP_HLine, DIB_4BPP_VLine, - DIB_4BPP_BitBlt, DIB_4BPP_BitBltSrcCopy, DIB_4BPP_StretchBlt, + DIB_4BPP_BitBlt, DIB_4BPP_BitBltSrcCopy, DIB_XXBPP_StretchBlt, DIB_4BPP_TransparentBlt, DIB_4BPP_ColorFill, DIB_4BPP_AlphaBlend }, /* BMF_8BPP */ { DIB_8BPP_PutPixel, DIB_8BPP_GetPixel, DIB_8BPP_HLine, DIB_8BPP_VLine, - DIB_8BPP_BitBlt, DIB_8BPP_BitBltSrcCopy, DIB_8BPP_StretchBlt, + DIB_8BPP_BitBlt, DIB_8BPP_BitBltSrcCopy, DIB_XXBPP_StretchBlt, DIB_8BPP_TransparentBlt, DIB_8BPP_ColorFill, DIB_8BPP_AlphaBlend }, /* BMF_16BPP */ { DIB_16BPP_PutPixel, DIB_16BPP_GetPixel, DIB_16BPP_HLine, DIB_16BPP_VLine, - DIB_16BPP_BitBlt, DIB_16BPP_BitBltSrcCopy, DIB_16BPP_StretchBlt, + DIB_16BPP_BitBlt, DIB_16BPP_BitBltSrcCopy, DIB_XXBPP_StretchBlt, DIB_16BPP_TransparentBlt, DIB_16BPP_ColorFill, DIB_16BPP_AlphaBlend }, /* BMF_24BPP */ { DIB_24BPP_PutPixel, DIB_24BPP_GetPixel, DIB_24BPP_HLine, DIB_24BPP_VLine, - DIB_24BPP_BitBlt, DIB_24BPP_BitBltSrcCopy, DIB_24BPP_StretchBlt, + DIB_24BPP_BitBlt, DIB_24BPP_BitBltSrcCopy, DIB_XXBPP_StretchBlt, DIB_24BPP_TransparentBlt, DIB_24BPP_ColorFill, DIB_24BPP_AlphaBlend }, /* BMF_32BPP */ { DIB_32BPP_PutPixel, DIB_32BPP_GetPixel, DIB_32BPP_HLine, DIB_32BPP_VLine, - DIB_32BPP_BitBlt, DIB_32BPP_BitBltSrcCopy, DIB_32BPP_StretchBlt, + DIB_32BPP_BitBlt, DIB_32BPP_BitBltSrcCopy, DIB_XXBPP_StretchBlt, DIB_32BPP_TransparentBlt, DIB_32BPP_ColorFill, DIB_32BPP_AlphaBlend }, /* BMF_4RLE */ Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] Sat Jan 31 07:05:11 2009 @@ -78,7 +78,6 @@ VOID DIB_1BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_1BPP_BitBlt(PBLTINFO); BOOLEAN DIB_1BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_1BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_1BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_1BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -89,7 +88,6 @@ VOID DIB_4BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_4BPP_BitBlt(PBLTINFO); BOOLEAN DIB_4BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_4BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_4BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_4BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -100,7 +98,6 @@ VOID DIB_8BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_8BPP_BitBlt(PBLTINFO); BOOLEAN DIB_8BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_8BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_8BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -111,7 +108,6 @@ VOID DIB_16BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_16BPP_BitBlt(PBLTINFO); BOOLEAN DIB_16BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_16BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_16BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -122,7 +118,6 @@ VOID DIB_24BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_24BPP_BitBlt(PBLTINFO); BOOLEAN DIB_24BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_24BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_24BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -133,10 +128,11 @@ VOID DIB_32BPP_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN DIB_32BPP_BitBlt(PBLTINFO); BOOLEAN DIB_32BPP_BitBltSrcCopy(PBLTINFO); -BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_32BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_32BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); + +BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ*,XLATEOBJ*,ULONG); extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; Added: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c (added) +++ trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] Sat Jan 31 07:05:11 2009 @@ -1,0 +1,181 @@ +/* + * ReactOS W32 Subsystem + * Copyright (C) 2009 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + +BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, + RECTL* DestRect, RECTL *SourceRect, + POINTL* MaskOrigin, POINTL BrushOrigin, + CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, + ULONG ROP) +{ + LONG SrcSizeY; + LONG SrcSizeX; + LONG DesSizeY; + LONG DesSizeX; + LONG sx = 0; + LONG sy = 0; + LONG DesX; + LONG DesY; + + LONG SrcZoomXHight; + LONG SrcZoomXLow; + LONG SrcZoomYHight; + LONG SrcZoomYLow; + + LONG sy_dec = 0; + LONG sy_max; + + LONG sx_dec = 0; + LONG sx_max; + ULONG color; + ULONG Dest, Source = 0, Pattern = 0; + ULONG xxBPPMask; + + PFN_DIB_GetPixel fnSource_GetPixel = NULL; + PFN_DIB_GetPixel fnDest_GetPixel = NULL; + PFN_DIB_PutPixel fnDest_PutPixel = NULL; + + RECT_ENUM RectEnum; + BOOL EnumMore; + unsigned i; + RECTL OutputRect; + + BOOL UsesSource = ROP4_USES_SOURCE(ROP); + BOOL UsesPattern = ROP4_USES_PATTERN(ROP); + + fnDest_GetPixel = DibFunctionsForBitmapFormat[DestSurf->iBitmapFormat].DIB_GetPixel; + fnDest_PutPixel = DibFunctionsForBitmapFormat[DestSurf->iBitmapFormat].DIB_PutPixel; + + DPRINT("Dest BPP: %u, dstRect: (%d,%d)-(%d,%d)\n", + BitsPerFormat(DestSurf->iBitmapFormat), DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); + + if (UsesSource) + { + fnSource_GetPixel = DibFunctionsForBitmapFormat[SourceSurf->iBitmapFormat].DIB_GetPixel; + DPRINT("Source BPP: %u, srcRect: (%d,%d)-(%d,%d)\n", + BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom); + } + + /* Calc the Zoom height of Source */ + SrcSizeY = SourceRect->bottom - SourceRect->top; + + /* Calc the Zoom Width of Source */ + SrcSizeX = SourceRect->right - SourceRect->left; + + /* Calc the Zoom height of Destinations */ + DesSizeY = DestRect->bottom - DestRect->top; + + /* Calc the Zoom width of Destinations */ + DesSizeX = DestRect->right - DestRect->left; + + /* Calc the zoom factor of source height */ + SrcZoomYHight = SrcSizeY / DesSizeY; + SrcZoomYLow = SrcSizeY - (SrcZoomYHight * DesSizeY); + + /* Calc the zoom factor of source width */ + SrcZoomXHight = SrcSizeX / DesSizeX; + SrcZoomXLow = SrcSizeX - (SrcZoomXHight * DesSizeX); + + sx_max = DesSizeX; + sy_max = DesSizeY; + + /* FIXME : MaskOrigin, BrushOrigin? */ + + switch(DestSurf->iBitmapFormat) + { + case BMF_1BPP: xxBPPMask = 0x1; break; + case BMF_4BPP: xxBPPMask = 0xF; break; + case BMF_8BPP: xxBPPMask = 0xFF; break; + case BMF_16BPP: xxBPPMask = 0xFFFF; break; + case BMF_24BPP: xxBPPMask = 0xFFFFFF; break; + default: + xxBPPMask = 0xFFFFFFFF; + } + + if (UsesPattern) + { + DPRINT1("StretchBlt does not support pattern ROPs yet\n"); + return TRUE; + } + + CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, CD_ANY, 0); + do + { + EnumMore = CLIPOBJ_bEnum(ClipRegion,(ULONG) sizeof(RectEnum), (PVOID) &RectEnum); + + for (i = 0; i < RectEnum.c; i++) + { + OutputRect.left = RectEnum.arcl[i].left; + OutputRect.right = RectEnum.arcl[i].right; + OutputRect.top = RectEnum.arcl[i].top; + OutputRect.bottom = RectEnum.arcl[i].bottom; + + sy = SourceRect->top; + sy_dec = 0; + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sx = SourceRect->left; + sx_dec = 0; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + if (UsesSource) + { + Source = XLATEOBJ_iXlate(ColorTranslation, fnSource_GetPixel(SourceSurf, sx, sy)); + } + + if (UsesPattern) + { + /* TBD as soon as BRUSHOBJ is available */ + } + + Dest = fnDest_GetPixel(DestSurf, DesX, DesY); + color = DIB_DoRop(ROP, Dest, Source, Pattern) & xxBPPMask; + + fnDest_PutPixel(DestSurf, DesX, DesY, color); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; + } + } + } + } + while (EnumMore); + + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sat Jan 31 07:05:11 2009 @@ -836,15 +836,19 @@ PSTRETCHRECTFUNC BltRectFunc; BOOLEAN Ret; POINTL AdjustedBrushOrigin; + BOOL UsesSource = ROP4_USES_SOURCE(Mode); InputRect.left = prclSrc->left; InputRect.right = prclSrc->right; InputRect.top = prclSrc->top; InputRect.bottom = prclSrc->bottom; - if (! IntEngEnter(&EnterLeaveSource, psoSource, &InputRect, TRUE, &Translate, &psoInput)) - { - return FALSE; + if (UsesSource) + { + if (! IntEngEnter(&EnterLeaveSource, psoSource, &InputRect, TRUE, &Translate, &psoInput)) + { + return FALSE; + } } InputPoint.x = InputRect.left + Translate.x; @@ -856,13 +860,19 @@ nothing to do */ if (OutputRect.right <= OutputRect.left || OutputRect.bottom <= OutputRect.top) { - IntEngLeave(&EnterLeaveSource); + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } return TRUE; } if (! IntEngEnter(&EnterLeaveDest, psoDest, &OutputRect, FALSE, &Translate, &psoOutput)) { - IntEngLeave(&EnterLeaveSource); + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } return FALSE; } @@ -886,8 +896,10 @@ //BltRectFunc = BltMask; DPRINT("EngStretchBlt isn't capable of handling mask yet.\n"); IntEngLeave(&EnterLeaveDest); - IntEngLeave(&EnterLeaveSource); - + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } return FALSE; } else @@ -901,7 +913,10 @@ &AdjustedBrushOrigin, Mode); IntEngLeave(&EnterLeaveDest); - IntEngLeave(&EnterLeaveSource); + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } return Ret; } @@ -917,13 +932,14 @@ POINTL *pMaskOrigin, BRUSHOBJ *Brush, POINTL *BrushOrigin, - ULONG Mode) + ROP4 ROP) { BOOLEAN ret; COLORADJUSTMENT ca; POINT MaskOrigin; SURFACE *psurfDest; SURFACE *psurfSource = NULL; + BOOL UsesSource = ROP4_USES_SOURCE(ROP); ASSERT(psoDest); psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); @@ -941,7 +957,7 @@ MouseSafetyOnDrawStart(psoDest, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - if (NULL != psoSource) + if (UsesSource) { psurfSource = CONTAINING_RECORD(psoSource, SURFACE, SurfObj); ASSERT(SourceRect); @@ -958,22 +974,21 @@ /* Call the driver's DrvStretchBlt if available */ if (psurfDest->flHooks & HOOK_STRETCHBLT) { - /* Drv->StretchBlt (look at http://www.osr.com/ddk/graphics/ddifncs_3ew7.htm ) - SURFOBJ *psoMask // optional, if it exists, then rop4=0xCCAA, otherwise rop4=0xCCCC */ + /* Drv->StretchBlt (look at http://www.osr.com/ddk/graphics/ddifncs_3ew7.htm ) */ // FIXME: MaskOrigin is always NULL ! ret = GDIDEVFUNCS(psoDest).StretchBlt( - psoDest, psoSource, MaskSurf, ClipRegion, ColorTranslation, - &ca, BrushOrigin, DestRect, SourceRect, NULL, Mode); + psoDest, (UsesSource) ? psoSource : NULL, MaskSurf, ClipRegion, ColorTranslation, + &ca, BrushOrigin, DestRect, SourceRect, NULL, ROP); } if (! ret) { // FIXME: see previous fixme ret = EngStretchBlt(psoDest, psoSource, MaskSurf, ClipRegion, ColorTranslation, - &ca, BrushOrigin, DestRect, SourceRect, NULL, Mode); - } - - if (NULL != psoSource) + &ca, BrushOrigin, DestRect, SourceRect, NULL, ROP); + } + + if (UsesSource) { MouseSafetyOnDrawEnd(psoSource); if (psoSource != psoDest) Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sat Jan 31 07:05:11 2009 @@ -750,8 +750,8 @@ BOOL Status = FALSE; XLATEOBJ *XlateObj = NULL; PGDIBRUSHOBJ BrushObj = NULL; - BOOL UsesSource = ((ROP & 0xCC0000) >> 2) != (ROP & 0x330000); - BOOL UsesPattern = ((ROP & 0xF00000) >> 4) != (ROP & 0x0F0000); + BOOL UsesSource = ROP3_USES_SOURCE(ROP); + BOOL UsesPattern = ROP3_USES_PATTERN(ROP); if (0 == WidthDest || 0 == HeightDest || 0 == WidthSrc || 0 == HeightSrc) { @@ -915,7 +915,7 @@ Status = IntEngStretchBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, NULL, DCDest->CombinedClip, XlateObj, &DestRect, &SourceRect, NULL, NULL, NULL, - COLORONCOLOR); + ROP3_TO_ROP4(ROP)); failed: if (XlateObj) Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat Jan 31 07:05:11 2009 @@ -28,6 +28,7 @@ <file>dib16bpp.c</file> <file>dib24bpp.c</file> <file>dib32bpp.c</file> + <file>dibXXbpp.c</file> <file>dib.c</file> <if property="ARCH" value="i386">

1 0

[janderwald] 39226: - Fix a few definitions
by janderwald＠svn.reactos.org 31 Jan '09

31 Jan '09

Author: janderwald Date: Sat Jan 31 06:59:56 2009 New Revision: 39226 URL: http://svn.reactos.org/svn/reactos?rev=39226&view=rev Log: - Fix a few definitions Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3922… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Sat Jan 31 06:59:56 2009 @@ -1120,6 +1120,20 @@ PFAST_IO_READ FastRead; PFAST_IO_WRITE FastWrite; } KSDISPATCH_TABLE, *PKSDISPATCH_TABLE; + + +#define KSCREATE_ITEM_IRP_STORAGE(Irp) (*(PKSOBJECT_CREATE_ITEM*)&(Irp)->Tail.Overlay.DriverContext[0]) +#define KSEVENT_SET_IRP_STORAGE(Irp) (*(const KSEVENT_SET**)&(Irp)->Tail.Overlay.DriverContext[0]) +#define KSEVENT_ITEM_IRP_STORAGE(Irp) (*(const KSEVENT_ITEM**)&(Irp)->Tail.Overlay.DriverContext[3]) +#define KSEVENT_ENTRY_IRP_STORAGE(Irp) (*(PKSEVENT_ENTRY*)&(Irp)->Tail.Overlay.DriverContext[0]) +#define KSMETHOD_SET_IRP_STORAGE(Irp) (*(const KSMETHOD_SET**)&(Irp)->Tail.Overlay.DriverContext[0]) +#define KSMETHOD_ITEM_IRP_STORAGE(Irp) (*(const KSMETHOD_ITEM**)&(Irp)->Tail.Overlay.DriverContext[3]) +#define KSMETHOD_TYPE_IRP_STORAGE(Irp) (*(ULONG_PTR*)(&(Irp)->Tail.Overlay.DriverContext[2])) +#define KSQUEUE_SPINLOCK_IRP_STORAGE(Irp) (*(PKSPIN_LOCK*)&(Irp)->Tail.Overlay.DriverContext[1]) +#define KSPROPERTY_SET_IRP_STORAGE(Irp) (*(const KSPROPERTY_SET**)&(Irp)->Tail.Overlay.DriverContext[0]) +#define KSPROPERTY_ITEM_IRP_STORAGE(Irp) (*(const KSPROPERTY_ITEM**)&(Irp)->Tail.Overlay.DriverContext[3]) +#define KSPROPERTY_ATTRIBUTES_IRP_STORAGE(Irp) (*(PKSATTRIBUTE_LIST*)&(Irp)->Tail.Overlay.DriverContext[2]) + #endif typedef struct @@ -1432,6 +1446,18 @@ typedef struct { + ULONG PropertySetsCount; + ULONG PropertyItemSize; + const KSPROPERTY_SET* PropertySets; + ULONG MethodSetsCount; + ULONG MethodItemSize; + const KSMETHOD_SET* MethodSets; + ULONG EventSetsCount; + ULONG EventItemSize; + const KSEVENT_SET* EventSets; +#if !defined(_WIN64) + PVOID Alignment; +#endif } KSAUTOMATION_TABLE, *PKSAUTOMATION_TABLE; typedef struct @@ -1648,11 +1674,17 @@ /* =============================================================== Device Dispatch */ + + + #if defined(_NTDDK_) -typedef struct -{ - /* TODO */ -} KSDEVICE, *PKSDEVICE; + +typedef struct _KSFILTER_DISPATCH KSFILTER_DISPATCH, *PKSFILTER_DISPATCH; +typedef struct _KSDEVICE KSDEVICE, *PKSDEVICE; +typedef struct _KSFILTER KSFILTER, *PKSFILTER; +typedef struct _KSNODE_DESCRIPTOR KSNODE_DESCRIPTOR, *PKSNODE_DESCRIPTOR; +typedef struct _KSFILTER_DESCRIPTOR KSFILTER_DESCRIPTOR, *PKSFILTER_DESCRIPTOR; +typedef struct _KSDEVICE_DESCRIPTOR KSDEVICE_DESCRIPTOR, *PKSDEVICE_DESCRIPTOR; typedef NTSTATUS (*PFNKSDEVICECREATE)( IN PKSDEVICE Device); @@ -1694,8 +1726,7 @@ IN DEVICE_POWER_STATE To, IN DEVICE_POWER_STATE From); -typedef struct _KSDEVICE_DISPATCH -{ +typedef struct _KSDEVICE_DISPATCH { PFNKSDEVICECREATE Add; PFNKSDEVICEPNPSTART Start; PFNKSDEVICE PostStart; @@ -1707,18 +1738,40 @@ PFNKSDEVICEIRPVOID Remove; PFNKSDEVICEQUERYCAPABILITIES QueryCapabilities; PFNKSDEVICEIRPVOID SurpriseRemoval; - PFNKSDEVICEQUERYPOWER Querypower; + PFNKSDEVICEQUERYPOWER QueryPower; PFNKSDEVICESETPOWER SetPower; -} KSDEVICE_DISPATCH, *PKSDEVICE_DISPATCH; + PFNKSDEVICEIRP QueryInterface; +}KSDEVICE_DISPATCH, *PKSDEVICE_DISPATCH; + +#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#define KSDEVICE_DESCRIPTOR_VERSION_2 (0x110) +#define MIN_DEV_VER_FOR_FLAGS (0x110) #endif +struct _KSDEVICE +{ + const KSDEVICE_DESCRIPTOR* Descriptor; + KSOBJECT_BAG Bag; + PVOID Context; + PDEVICE_OBJECT FunctionalDeviceObject; + PDEVICE_OBJECT PhysicalDeviceObject; + PDEVICE_OBJECT NextDeviceObject; + BOOLEAN Started; + SYSTEM_POWER_STATE SystemPowerState; + DEVICE_POWER_STATE DevicePowerState; +}; +#endif + /* =============================================================== Filter Dispatch */ #if defined(_NTDDK_) -typedef struct -{ -} KSFILTER, *PKSFILTER; +struct _KSFILTER +{ + const KSFILTER_DESCRIPTOR* Descriptor; + KSOBJECT_BAG Bag; + PVOID Context; +}; typedef NTSTATUS (*PFNKSFILTERIRP)( IN PKSFILTER Filter, @@ -1731,21 +1784,23 @@ typedef NTSTATUS (*PFNKSFILTERVOID)( IN PKSFILTER Filter); -typedef struct _KSFILTER_DISPATCH +struct _KSFILTER_DISPATCH { PFNKSFILTERIRP Create; PFNKSFILTERIRP Close; PFNKSFILTERPROCESS Process; PFNKSFILTERVOID Reset; -} KSFILTER_DISPATCH, *PKSFILTER_DISPATCH; - -typedef struct { +}; + +struct _KSNODE_DESCRIPTOR +{ const KSAUTOMATION_TABLE* AutomationTable; const GUID* Type; const GUID* Name; -} KSNODE_DESCRIPTOR, *PKSNODE_DESCRIPTOR; - -typedef struct { +}; + +struct _KSFILTER_DESCRIPTOR +{ const KSFILTER_DISPATCH* Dispatch; const KSAUTOMATION_TABLE* AutomationTable; ULONG Version; @@ -1762,14 +1817,14 @@ ULONG ConnectionsCount; const KSTOPOLOGY_CONNECTION* Connections; const KSCOMPONENTID* ComponentId; -} KSFILTER_DESCRIPTOR, *PKSFILTER_DESCRIPTOR; - -typedef struct +}; + +struct _KSDEVICE_DESCRIPTOR { const KSDEVICE_DISPATCH* Dispatch; ULONG FilterDescriptorsCount; const KSFILTER_DESCRIPTOR*const* FilterDescriptors; -} KSDEVICE_DESCRIPTOR, *PKSDEVICE_DESCRIPTOR; +}; #endif /* =============================================================== Minidriver Callbacks

1 0

[cwittich] 39225: sync ole32 with wine 1.1.14
by cwittich＠svn.reactos.org 31 Jan '09

31 Jan '09

Author: cwittich Date: Sat Jan 31 06:40:36 2009 New Revision: 39225 URL: http://svn.reactos.org/svn/reactos?rev=39225&view=rev Log: sync ole32 with wine 1.1.14 Modified: trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compobj_private.h trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/ole32_oleidl.idl trunk/reactos/dll/win32/ole32/stg_bigblockfile.c trunk/reactos/dll/win32/ole32/storage32.h trunk/reactos/include/psdk/olectl.h trunk/reactos/include/psdk/oleidl.idl Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] Sat Jan 31 06:40:36 2009 @@ -1694,7 +1694,7 @@ return CO_E_CLASSSTRING; } RegCloseKey(xhkey); - return CLSIDFromString(buf2,clsid); + return __CLSIDFromString(buf2,clsid); } @@ -3352,10 +3352,46 @@ */ HRESULT WINAPI CoGetCallContext(REFIID riid, void **ppv) { - FIXME("(%s, %p): stub\n", debugstr_guid(riid), ppv); - - *ppv = NULL; - return E_NOINTERFACE; + struct oletls *info = COM_CurrentInfo(); + + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + if (!info) + return E_OUTOFMEMORY; + + if (!info->call_state) + return RPC_E_CALL_COMPLETE; + + return IUnknown_QueryInterface(info->call_state, riid, ppv); +} + +/*********************************************************************** + * CoSwitchCallContext [OLE32.@] + * + * Switches the context of the currently executing server call in the current + * thread. + * + * PARAMS + * pObject [I] Pointer to new context object + * ppOldObject [O] Pointer to memory that will receive old context object pointer + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + */ +HRESULT WINAPI CoSwitchCallContext(IUnknown *pObject, IUnknown **ppOldObject) +{ + struct oletls *info = COM_CurrentInfo(); + + TRACE("(%p, %p)\n", pObject, ppOldObject); + + if (!info) + return E_OUTOFMEMORY; + + *ppOldObject = info->call_state; + info->call_state = pObject; /* CoSwitchCallContext does not addref nor release objects */ + + return S_OK; } /*********************************************************************** @@ -3915,9 +3951,12 @@ */ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) { + struct oletls *info = COM_CurrentInfo(); static int calls; if(!(calls++)) FIXME( "stub\n" ); - if (token) *token = 0; + if (!info) + return E_OUTOFMEMORY; + if (token) *token = info->context_token; return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj_private.h [iso-8859-1] Sat Jan 31 06:40:36 2009 @@ -175,12 +175,18 @@ struct apartment *apt; IErrorInfo *errorinfo; /* see errorinfo.c */ IUnknown *state; /* see CoSetState */ + DWORD apt_mask; /* apartment mask (+0Ch on x86) */ IInitializeSpy *spy; /* The "SPY" from CoInitializeSpy */ DWORD inits; /* number of times CoInitializeEx called */ DWORD ole_inits; /* number of times OleInitialize called */ GUID causality_id; /* unique identifier for each COM call */ LONG pending_call_count_client; /* number of client calls pending */ LONG pending_call_count_server; /* number of server calls pending */ + DWORD unknown; + ULONG_PTR context_token; /* (+38h on x86) */ + IUnknown *call_state; /* current call context (+3Ch on x86) */ + DWORD unknown2[46]; + IUnknown *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */ }; Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Sat Jan 31 06:40:36 2009 @@ -73,7 +73,7 @@ @ stdcall CoSetProxyBlanket(ptr long long wstr long long ptr long) @ stdcall CoSetState(ptr) @ stdcall CoSuspendClassObjects() -@ stub CoSwitchCallContext +@ stdcall CoSwitchCallContext(ptr ptr) @ stdcall CoTaskMemAlloc(long) @ stdcall CoTaskMemFree(ptr) @ stdcall CoTaskMemRealloc(ptr long) Modified: trunk/reactos/dll/win32/ole32/ole32_oleidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32_olei… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32_oleidl.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32_oleidl.idl [iso-8859-1] Sat Jan 31 06:40:36 2009 @@ -16,5 +16,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("#include <winuser.h>") #include "oleidl.idl" Modified: trunk/reactos/dll/win32/ole32/stg_bigblockfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_bigblo… ============================================================================== --- trunk/reactos/dll/win32/ole32/stg_bigblockfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/stg_bigblockfile.c [iso-8859-1] Sat Jan 31 06:40:36 2009 @@ -85,6 +85,8 @@ * file this mapping represents. (The mappings are always * PAGE_SIZE-aligned.) */ + +typedef struct MappedPage MappedPage; struct MappedPage { MappedPage *next; @@ -99,22 +101,23 @@ BlockBits writable_blocks; }; +struct BigBlockFile +{ + BOOL fileBased; + ULARGE_INTEGER filesize; + ULONG blocksize; + HANDLE hfile; + HANDLE hfilemap; + DWORD flProtect; + MappedPage *maplist; + MappedPage *victimhead, *victimtail; + ULONG num_victim_pages; + ILockBytes *pLkbyt; +}; + /*********************************************************** * Prototypes for private methods */ -static void* BIGBLOCKFILE_GetMappedView(LPBIGBLOCKFILE This, - DWORD page_index); -static void BIGBLOCKFILE_ReleaseMappedPage(LPBIGBLOCKFILE This, - MappedPage *page); -static void BIGBLOCKFILE_FreeAllMappedPages(LPBIGBLOCKFILE This); -static void BIGBLOCKFILE_UnmapAllMappedPages(LPBIGBLOCKFILE This); -static void BIGBLOCKFILE_RemapAllMappedPages(LPBIGBLOCKFILE This); -static MappedPage* BIGBLOCKFILE_CreatePage(LPBIGBLOCKFILE This, - ULONG page_index); -static DWORD BIGBLOCKFILE_GetProtectMode(DWORD openFlags); -static BOOL BIGBLOCKFILE_FileInit(LPBIGBLOCKFILE This, HANDLE hFile); -static BOOL BIGBLOCKFILE_MemInit(LPBIGBLOCKFILE This, ILockBytes* plkbyt); -static void BIGBLOCKFILE_DeleteList(LPBIGBLOCKFILE This, MappedPage *list); /* Note that this evaluates a and b multiple times, so don't * pass expressions with side effects. */ @@ -154,68 +157,13 @@ } /****************************************************************************** - * BIGBLOCKFILE_Construct - * - * Construct a big block file. Create the file mapping object. - * Create the read only mapped pages list, the writable mapped page list - * and the blocks in use list. - */ -BigBlockFile * BIGBLOCKFILE_Construct( - HANDLE hFile, - ILockBytes* pLkByt, - DWORD openFlags, - ULONG blocksize, - BOOL fileBased) -{ - LPBIGBLOCKFILE This; - - This = HeapAlloc(GetProcessHeap(), 0, sizeof(BigBlockFile)); - - if (This == NULL) - return NULL; - - This->fileBased = fileBased; - - This->flProtect = BIGBLOCKFILE_GetProtectMode(openFlags); - - This->blocksize = blocksize; - - This->maplist = NULL; - This->victimhead = NULL; - This->victimtail = NULL; - This->num_victim_pages = 0; - - if (This->fileBased) - { - if (!BIGBLOCKFILE_FileInit(This, hFile)) - { - HeapFree(GetProcessHeap(), 0, This); - return NULL; - } - } - else - { - if (!BIGBLOCKFILE_MemInit(This, pLkByt)) - { - HeapFree(GetProcessHeap(), 0, This); - return NULL; - } - } - - return This; -} - -/****************************************************************************** * BIGBLOCKFILE_FileInit * * Initialize a big block object supported by a file. */ static BOOL BIGBLOCKFILE_FileInit(LPBIGBLOCKFILE This, HANDLE hFile) { - This->pLkbyt = NULL; - This->hbytearray = 0; - This->pbytearray = NULL; - + This->pLkbyt = NULL; This->hfile = hFile; if (This->hfile == INVALID_HANDLE_VALUE) @@ -251,164 +199,22 @@ } /****************************************************************************** - * BIGBLOCKFILE_MemInit - * - * Initialize a big block object supported by an ILockBytes on HGLOABL. - */ -static BOOL BIGBLOCKFILE_MemInit(LPBIGBLOCKFILE This, ILockBytes* plkbyt) -{ - This->hfile = 0; - This->hfilemap = 0; - - /* - * Retrieve the handle to the byte array from the LockByte object. - */ - if (GetHGlobalFromILockBytes(plkbyt, &(This->hbytearray)) != S_OK) - { - FIXME("May not be an ILockBytes on HGLOBAL\n"); - return FALSE; - } - - This->pLkbyt = plkbyt; - - /* - * Increment the reference count of the ILockByte object since - * we're keeping a reference to it. - */ - ILockBytes_AddRef(This->pLkbyt); - - This->filesize.u.LowPart = GlobalSize(This->hbytearray); - This->filesize.u.HighPart = 0; - - This->pbytearray = GlobalLock(This->hbytearray); - - TRACE("mem on %p len %u\n", This->pbytearray, This->filesize.u.LowPart); - - return TRUE; -} - -/****************************************************************************** - * BIGBLOCKFILE_Destructor - * - * Destructor. Clean up, free memory. - */ -void BIGBLOCKFILE_Destructor( - LPBIGBLOCKFILE This) -{ - BIGBLOCKFILE_FreeAllMappedPages(This); - - if (This->fileBased) - { - CloseHandle(This->hfilemap); - CloseHandle(This->hfile); - } - else - { - GlobalUnlock(This->hbytearray); - ILockBytes_Release(This->pLkbyt); - } - - /* destroy this - */ - HeapFree(GetProcessHeap(), 0, This); -} - -/****************************************************************************** - * BIGBLOCKFILE_EnsureExists - * - * Grows the file if necessary to make sure the block is valid. - */ -void BIGBLOCKFILE_EnsureExists(LPBIGBLOCKFILE This, ULONG index) -{ - /* - * block index starts at -1 - * translate to zero based index - */ - if (index == 0xffffffff) - index = 0; - else - index++; - - /* - * make sure that the block physically exists - */ - if ((This->blocksize * (index + 1)) > This->filesize.u.LowPart) - { - ULARGE_INTEGER newSize; - - newSize.u.HighPart = 0; - newSize.u.LowPart = This->blocksize * (index + 1); - - BIGBLOCKFILE_SetSize(This, newSize); - } -} - -/****************************************************************************** - * BIGBLOCKFILE_SetSize - * - * Sets the size of the file. - * - */ -void BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize) -{ - if (This->filesize.u.LowPart == newSize.u.LowPart) - return; - - TRACE("from %u to %u\n", This->filesize.u.LowPart, newSize.u.LowPart); - /* - * unmap all views, must be done before call to SetEndFile - * - * Just ditch the victim list because there is no guarantee we will need them - * and it is not worth the performance hit to unmap and remap them all. - */ - BIGBLOCKFILE_DeleteList(This, This->victimhead); - This->victimhead = NULL; - This->victimtail = NULL; - This->num_victim_pages = 0; - - BIGBLOCKFILE_UnmapAllMappedPages(This); - - if (This->fileBased) - { - LARGE_INTEGER newpos; - - newpos.QuadPart = newSize.QuadPart; - if (SetFilePointerEx(This->hfile, newpos, NULL, FILE_BEGIN)) - { - if( This->hfilemap ) CloseHandle(This->hfilemap); - - SetEndOfFile(This->hfile); - - /* - * re-create the file mapping object - */ - This->hfilemap = CreateFileMappingA(This->hfile, - NULL, - This->flProtect, - 0, 0, - NULL); - } - } - else - { - GlobalUnlock(This->hbytearray); - - /* - * Resize the byte array object. - */ - ILockBytes_SetSize(This->pLkbyt, newSize); - - /* - * Re-acquire the handle, it may have changed. - */ - GetHGlobalFromILockBytes(This->pLkbyt, &This->hbytearray); - This->pbytearray = GlobalLock(This->hbytearray); - } - - This->filesize.u.LowPart = newSize.u.LowPart; - This->filesize.u.HighPart = newSize.u.HighPart; - - BIGBLOCKFILE_RemapAllMappedPages(This); + * BIGBLOCKFILE_LockBytesInit + * + * Initialize a big block object supported by an ILockBytes. + */ +static BOOL BIGBLOCKFILE_LockBytesInit(LPBIGBLOCKFILE This, ILockBytes* plkbyt) +{ + This->hfile = 0; + This->hfilemap = 0; + This->pLkbyt = plkbyt; + ILockBytes_AddRef(This->pLkbyt); + + /* We'll get the size directly with ILockBytes_Stat */ + This->filesize.QuadPart = 0; + + TRACE("ILockBytes %p\n", This->pLkbyt); + return TRUE; } /****************************************************************************** @@ -444,6 +250,64 @@ page->prev = NULL; *head = page; } + +static BOOL BIGBLOCKFILE_MapPage(BigBlockFile *This, MappedPage *page) +{ + DWORD lowoffset = PAGE_SIZE * page->page_index; + DWORD numBytesToMap; + DWORD desired_access; + + assert(This->fileBased); + + if( !This->hfilemap ) + return FALSE; + + if (lowoffset + PAGE_SIZE > This->filesize.u.LowPart) + numBytesToMap = This->filesize.u.LowPart - lowoffset; + else + numBytesToMap = PAGE_SIZE; + + if (This->flProtect == PAGE_READONLY) + desired_access = FILE_MAP_READ; + else + desired_access = FILE_MAP_WRITE; + + page->lpBytes = MapViewOfFile(This->hfilemap, desired_access, 0, + lowoffset, numBytesToMap); + page->mapped_bytes = numBytesToMap; + + TRACE("mapped page %u to %p\n", page->page_index, page->lpBytes); + + return page->lpBytes != NULL; +} + + +static MappedPage *BIGBLOCKFILE_CreatePage(BigBlockFile *This, ULONG page_index) +{ + MappedPage *page; + + page = HeapAlloc(GetProcessHeap(), 0, sizeof(MappedPage)); + if (page == NULL) + return NULL; + + page->page_index = page_index; + page->refcnt = 1; + + page->next = NULL; + page->prev = NULL; + + if (!BIGBLOCKFILE_MapPage(This, page)) + { + HeapFree(GetProcessHeap(),0,page); + return NULL; + } + + BIGBLOCKFILE_Zero(&page->readable_blocks); + BIGBLOCKFILE_Zero(&page->writable_blocks); + + return page; +} + /****************************************************************************** * BIGBLOCKFILE_GetMappedView [PRIVATE] @@ -495,77 +359,16 @@ return page; } -static BOOL BIGBLOCKFILE_MapPage(LPBIGBLOCKFILE This, MappedPage *page) -{ - DWORD lowoffset = PAGE_SIZE * page->page_index; - - if (This->fileBased) - { - DWORD numBytesToMap; - DWORD desired_access; - - if( !This->hfilemap ) - return FALSE; - - if (lowoffset + PAGE_SIZE > This->filesize.u.LowPart) - numBytesToMap = This->filesize.u.LowPart - lowoffset; - else - numBytesToMap = PAGE_SIZE; - - if (This->flProtect == PAGE_READONLY) - desired_access = FILE_MAP_READ; - else - desired_access = FILE_MAP_WRITE; - - page->lpBytes = MapViewOfFile(This->hfilemap, desired_access, 0, - lowoffset, numBytesToMap); - page->mapped_bytes = numBytesToMap; - } - else - { - page->lpBytes = (LPBYTE)This->pbytearray + lowoffset; - page->mapped_bytes = PAGE_SIZE; - } - - TRACE("mapped page %u to %p\n", page->page_index, page->lpBytes); - - return page->lpBytes != NULL; -} - -static MappedPage *BIGBLOCKFILE_CreatePage(LPBIGBLOCKFILE This, - ULONG page_index) -{ - MappedPage *page; - - page = HeapAlloc(GetProcessHeap(), 0, sizeof(MappedPage)); - if (page == NULL) - return NULL; - - page->page_index = page_index; - page->refcnt = 1; - - page->next = NULL; - page->prev = NULL; - - if (!BIGBLOCKFILE_MapPage(This, page)) - { - HeapFree(GetProcessHeap(),0,page); - return NULL; - } - - BIGBLOCKFILE_Zero(&page->readable_blocks); - BIGBLOCKFILE_Zero(&page->writable_blocks); - - return page; -} - static void BIGBLOCKFILE_UnmapPage(LPBIGBLOCKFILE This, MappedPage *page) { TRACE("%d at %p\n", page->page_index, page->lpBytes); + + assert(This->fileBased); + if (page->refcnt > 0) ERR("unmapping inuse page %p\n", page->lpBytes); - if (This->fileBased && page->lpBytes) + if (page->lpBytes) UnmapViewOfFile(page->lpBytes); page->lpBytes = NULL; @@ -898,9 +701,79 @@ return rc; } - -HRESULT BIGBLOCKFILE_ReadAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset, - void* buffer, ULONG size, ULONG* bytesRead) +/****************************************************************************** + * BIGBLOCKFILE_Construct + * + * Construct a big block file. Create the file mapping object. + * Create the read only mapped pages list, the writable mapped page list + * and the blocks in use list. + */ +BigBlockFile *BIGBLOCKFILE_Construct(HANDLE hFile, ILockBytes* pLkByt, DWORD openFlags, + ULONG blocksize, BOOL fileBased) +{ + BigBlockFile *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(BigBlockFile)); + + if (This == NULL) + return NULL; + + This->fileBased = fileBased; + This->flProtect = BIGBLOCKFILE_GetProtectMode(openFlags); + This->blocksize = blocksize; + + This->maplist = NULL; + This->victimhead = NULL; + This->victimtail = NULL; + This->num_victim_pages = 0; + + if (This->fileBased) + { + if (!BIGBLOCKFILE_FileInit(This, hFile)) + { + HeapFree(GetProcessHeap(), 0, This); + return NULL; + } + } + else + { + if (!BIGBLOCKFILE_LockBytesInit(This, pLkByt)) + { + HeapFree(GetProcessHeap(), 0, This); + return NULL; + } + } + + return This; +} + +/****************************************************************************** + * BIGBLOCKFILE_Destructor + * + * Destructor. Clean up, free memory. + */ +void BIGBLOCKFILE_Destructor(BigBlockFile *This) +{ + BIGBLOCKFILE_FreeAllMappedPages(This); + + if (This->fileBased) + { + CloseHandle(This->hfilemap); + CloseHandle(This->hfile); + } + else + { + ILockBytes_Release(This->pLkbyt); + } + + HeapFree(GetProcessHeap(), 0, This); +} + +/****************************************************************************** + * BIGBLOCKFILE_ReadAt + */ +HRESULT BIGBLOCKFILE_ReadAt(BigBlockFile *This, ULARGE_INTEGER offset, + void* buffer, ULONG size, ULONG* bytesRead) { if (This->fileBased) return ImplBIGBLOCKFILE_ReadAt(This,offset,buffer,size,bytesRead); @@ -908,11 +781,113 @@ return ILockBytes_ReadAt(This->pLkbyt,offset,buffer,size,bytesRead); } -HRESULT BIGBLOCKFILE_WriteAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset, - const void* buffer, ULONG size, ULONG* bytesRead) +/****************************************************************************** + * BIGBLOCKFILE_WriteAt + */ +HRESULT BIGBLOCKFILE_WriteAt(BigBlockFile *This, ULARGE_INTEGER offset, + const void* buffer, ULONG size, ULONG* bytesRead) { if (This->fileBased) return ImplBIGBLOCKFILE_WriteAt(This,offset,buffer,size,bytesRead); else return ILockBytes_WriteAt(This->pLkbyt,offset,buffer,size,bytesRead); } + +/****************************************************************************** + * BIGBLOCKFILE_SetSize + * + * Sets the size of the file. + * + */ +HRESULT BIGBLOCKFILE_SetSize(BigBlockFile *This, ULARGE_INTEGER newSize) +{ + HRESULT hr = S_OK; + LARGE_INTEGER newpos; + + if (!This->fileBased) + return ILockBytes_SetSize(This->pLkbyt, newSize); + + if (This->filesize.u.LowPart == newSize.u.LowPart) + return hr; + + TRACE("from %u to %u\n", This->filesize.u.LowPart, newSize.u.LowPart); + + /* + * Unmap all views, must be done before call to SetEndFile. + * + * Just ditch the victim list because there is no guarantee we will need them + * and it is not worth the performance hit to unmap and remap them all. + */ + BIGBLOCKFILE_DeleteList(This, This->victimhead); + This->victimhead = NULL; + This->victimtail = NULL; + This->num_victim_pages = 0; + + BIGBLOCKFILE_UnmapAllMappedPages(This); + + newpos.QuadPart = newSize.QuadPart; + if (SetFilePointerEx(This->hfile, newpos, NULL, FILE_BEGIN)) + { + if( This->hfilemap ) CloseHandle(This->hfilemap); + + SetEndOfFile(This->hfile); + + /* re-create the file mapping object */ + This->hfilemap = CreateFileMappingA(This->hfile, NULL, This->flProtect, + 0, 0, NULL); + } + + This->filesize = newSize; + BIGBLOCKFILE_RemapAllMappedPages(This); + return hr; +} + +/****************************************************************************** + * BIGBLOCKFILE_GetSize + * + * Gets the size of the file. + * + */ +static HRESULT BIGBLOCKFILE_GetSize(BigBlockFile *This, ULARGE_INTEGER *size) +{ + HRESULT hr = S_OK; + if(This->fileBased) + *size = This->filesize; + else + { + STATSTG stat; + hr = ILockBytes_Stat(This->pLkbyt, &stat, STATFLAG_NONAME); + if(SUCCEEDED(hr)) *size = stat.cbSize; + } + return hr; +} + +/****************************************************************************** + * BIGBLOCKFILE_EnsureExists + * + * Grows the file if necessary to make sure the block is valid. + */ +HRESULT BIGBLOCKFILE_EnsureExists(BigBlockFile *This, ULONG index) +{ + ULARGE_INTEGER size; + HRESULT hr; + + /* Block index starts at -1 translate to zero based index */ + if (index == 0xffffffff) + index = 0; + else + index++; + + hr = BIGBLOCKFILE_GetSize(This, &size); + if(FAILED(hr)) return hr; + + /* make sure that the block physically exists */ + if ((This->blocksize * (index + 1)) > size.QuadPart) + { + ULARGE_INTEGER newSize; + + newSize.QuadPart = This->blocksize * (index + 1); + hr = BIGBLOCKFILE_SetSize(This, newSize); + } + return hr; +} Modified: trunk/reactos/dll/win32/ole32/storage32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… ============================================================================== --- trunk/reactos/dll/win32/ole32/storage32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/storage32.h [iso-8859-1] Sat Jan 31 06:40:36 2009 @@ -152,27 +152,7 @@ * this section appear in stg_bigblockfile.c */ -/* - * Declaration of the data structures - */ typedef struct BigBlockFile BigBlockFile,*LPBIGBLOCKFILE; -typedef struct MappedPage MappedPage,*LPMAPPEDPAGE; - -struct BigBlockFile -{ - BOOL fileBased; - ULARGE_INTEGER filesize; - ULONG blocksize; - HANDLE hfile; - HANDLE hfilemap; - DWORD flProtect; - MappedPage *maplist; - MappedPage *victimhead, *victimtail; - ULONG num_victim_pages; - ILockBytes *pLkbyt; - HGLOBAL hbytearray; - LPVOID pbytearray; -}; /* * Declaration of the functions used to manipulate the BigBlockFile @@ -184,8 +164,8 @@ ULONG blocksize, BOOL fileBased); void BIGBLOCKFILE_Destructor(LPBIGBLOCKFILE This); -void BIGBLOCKFILE_EnsureExists(LPBIGBLOCKFILE This, ULONG index); -void BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize); +HRESULT BIGBLOCKFILE_EnsureExists(LPBIGBLOCKFILE This, ULONG index); +HRESULT BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize); HRESULT BIGBLOCKFILE_ReadAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset, void* buffer, ULONG size, ULONG* bytesRead); HRESULT BIGBLOCKFILE_WriteAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset, Modified: trunk/reactos/include/psdk/olectl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/olectl.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/olectl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/olectl.h [iso-8859-1] Sat Jan 31 06:40:36 2009 @@ -157,10 +157,10 @@ } DUMMYUNIONNAME; } PICTDESC, *LPPICTDESC; -typedef long OLE_XPOS_PIXELS; -typedef long OLE_YPOS_PIXELS; -typedef long OLE_XSIZE_PIXELS; -typedef long OLE_YSIZE_PIXELS; +typedef LONG OLE_XPOS_PIXELS; +typedef LONG OLE_YPOS_PIXELS; +typedef LONG OLE_XSIZE_PIXELS; +typedef LONG OLE_YSIZE_PIXELS; typedef float OLE_XPOS_CONTAINER; typedef float OLE_YPOS_CONTAINER; typedef float OLE_XSIZE_CONTAINER; Modified: trunk/reactos/include/psdk/oleidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/oleidl.idl?re… ============================================================================== --- trunk/reactos/include/psdk/oleidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/oleidl.idl [iso-8859-1] Sat Jan 31 06:40:36 2009 @@ -23,6 +23,8 @@ #endif interface IOleInPlaceActiveObject; + +cpp_quote("#include <winuser.h>") /***************************************************************************** * IOleTypes interface

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs