Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 22358: Add some unit tests for setupapi
by hpoussin＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: hpoussin Date: Thu Jun 15 16:49:04 2006 New Revision: 22358 URL: http://svn.reactos.ru/svn/reactos?rev=22358&view=rev Log: Add some unit tests for setupapi Added: trunk/reactos/regtests/winetests/setupapi/devclass.c (with props) trunk/reactos/regtests/winetests/setupapi/install.c (with props) Modified: trunk/reactos/regtests/winetests/setupapi/parser.c trunk/reactos/regtests/winetests/setupapi/setupapi.rbuild trunk/reactos/regtests/winetests/setupapi/testlist.c Added: trunk/reactos/regtests/winetests/setupapi/devclass.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/setupapi… ============================================================================== --- trunk/reactos/regtests/winetests/setupapi/devclass.c (added) +++ trunk/reactos/regtests/winetests/setupapi/devclass.c Thu Jun 15 16:49:04 2006 @@ -1,0 +1,346 @@ +/* + * SetupAPI device class-related functions tests + * + * Copyright 2006 Hervé Poussineau + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public Licence as + * published by the Free Software Foundation; either version 2 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 + * General Public License for more details. + * + * You should have received a copy of the GNU 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 <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "cfgmgr32.h" +#include "setupapi.h" + +#include "wine/test.h" + +static GUID test_class_guid = { 0x4d36e967, 0xe325, 0x11ce, { 0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18 } }; +static char test_class_name[MAX_CLASS_NAME_LEN] = "DiskDrive"; + +static const char *debugstr_guid(const GUID *guid) +{ + static char guidSTR1[39]; + static char guidSTR2[39]; + char* guidSTR; + static BOOL index; + + if (!guid) return NULL; + + index = !index; + guidSTR = index ? guidSTR1 : guidSTR2; + + snprintf(guidSTR, sizeof(guidSTR1), + "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return guidSTR; +} + +static void test_SetupDiBuildClassInfoList(void) +{ + LPGUID guid_list = NULL; + DWORD required_size, size; + + SetLastError( 0xdeadbeef ); + ok( !SetupDiBuildClassInfoList( 0, NULL, 0, NULL ), + "Fail expected" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + + SetLastError( 0xdeadbeef ); + ok( !SetupDiBuildClassInfoList( 0, NULL, 0, &required_size ), + "Fail expected" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error %lx, got %lx", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + + guid_list = HeapAlloc( GetProcessHeap(), 0, ( required_size + 1 ) * sizeof( GUID ) ); + if ( !guid_list ) + return; + + SetLastError( 0xdeadbeef ); + ok( SetupDiBuildClassInfoList( 0, guid_list, required_size, &size ), + "Error reported %lx", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + SetLastError( 0xdeadbeef ); + ok( SetupDiBuildClassInfoList( 0, guid_list, required_size + 1, &size ), + "Error reported %lx", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + + if ( size > 0 ) + { + /* That's better to use the first class found, as we know for sure that it exists */ + memcpy(&test_class_guid, &guid_list[0], sizeof( GUID ) ); + SetupDiClassNameFromGuidA( &test_class_guid, test_class_name, sizeof( test_class_name ), NULL ); + } + HeapFree( GetProcessHeap(), 0, guid_list ); +} + +static void test_SetupDiClassGuidsFromNameA(void) +{ + LPGUID guid_list = NULL; + DWORD required_size, size; + + SetLastError( 0xdeadbeef ); + ok( !SetupDiClassGuidsFromNameA( NULL, NULL, 0, NULL ), + "Fail expected" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + + SetLastError( 0xdeadbeef ); + ok( !SetupDiClassGuidsFromNameA( NULL, NULL, 0, &required_size ), + "Fail expected" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + + SetLastError( 0xdeadbeef ); + ok( SetupDiClassGuidsFromNameA( "", NULL, 0, &required_size ), + "Error reported %lx", GetLastError() ); + ok( required_size == 0, "Expected 0, got %lu", required_size ); + + SetLastError( 0xdeadbeef ); + ok( !SetupDiClassGuidsFromNameA( test_class_name, NULL, 0, &required_size ), + "Fail expected" ); + SetLastError( 0xdeadbeef ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error %lx, got %lx", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + ok( required_size > 0, "Expected > 0, got %lu", required_size ); + + guid_list = HeapAlloc( GetProcessHeap(), 0, ( required_size + 1 ) * sizeof( GUID ) ); + if ( !guid_list ) + return; + + SetLastError( 0xdeadbeef ); + ok( SetupDiClassGuidsFromNameA( test_class_name, guid_list, required_size, &size ), + "Error reported %lx", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + ok( IsEqualIID( &guid_list[0], &test_class_guid ), + "Expected %s, got %s", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); + SetLastError( 0xdeadbeef ); + ok( SetupDiClassGuidsFromNameA( test_class_name, guid_list, required_size + 1, &size ), + "Error reported %lx", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + ok( IsEqualIID( &guid_list[0], &test_class_guid ), + "Expected %s, got %s", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); + + HeapFree( GetProcessHeap(), 0, guid_list ); +} + +static void test_SetupDiClassNameFromGuidA(void) +{ + CHAR* class_name = NULL; + DWORD required_size, size; + + SetLastError( 0xdeadbeef ); + ok( !SetupDiClassNameFromGuidA( NULL, NULL, 0, NULL ), + "Fail expected" ); + ok( GetLastError() == ERROR_INVALID_CLASS, + "Expected error %x, got %lx", ERROR_INVALID_CLASS, GetLastError() ); + + SetLastError( 0xdeadbeef ); + ok( !SetupDiClassNameFromGuidA( NULL, NULL, 0, &required_size ), + "Fail expected" ); + ok( GetLastError() == ERROR_INVALID_CLASS, + "Expected error %x, got %lx", ERROR_INVALID_CLASS, GetLastError() ); + + SetLastError( 0xdeadbeef ); + ok( !SetupDiClassNameFromGuidA( &test_class_guid, NULL, 0, &required_size ), + "Fail expected" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error %lx, got %lx", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + ok( required_size > 0, "Expected > 0, got %lu", required_size ); + ok( required_size < MAX_CLASS_NAME_LEN, "Expected < %u, got %lu", MAX_CLASS_NAME_LEN, required_size ); + + class_name = HeapAlloc( GetProcessHeap(), 0, required_size ); + if ( !class_name ) + return; + + SetLastError( 0xdeadbeef ); + ok( SetupDiClassNameFromGuidA( &test_class_guid, class_name, required_size, &size ), + "Error reported %lx", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + ok( !strcmp( class_name, test_class_name ), + "Expected %s, got %s", test_class_name, class_name ); + SetLastError( 0xdeadbeef ); + ok( SetupDiClassNameFromGuidA( &test_class_guid, class_name, required_size + 1, &size ), + "Error reported %lx", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + ok( !strcmp( class_name, test_class_name ), + "Expected %s, got %s", test_class_name, class_name ); + + HeapFree( GetProcessHeap(), 0, class_name ); +} + +static void test_SetupDiGetClassDescriptionA(void) +{ + CHAR* class_desc = NULL; + DWORD required_size, size; + + SetLastError( 0xdeadbeef ); + ok( !SetupDiGetClassDescriptionA( NULL, NULL, 0, NULL ), + "Fail expected" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + + SetLastError( 0xdeadbeef ); + ok( !SetupDiGetClassDescriptionA( NULL, NULL, 0, &required_size ), + "Fail expected" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + + SetLastError( 0xdeadbeef ); + ok( !SetupDiGetClassDescriptionA( &test_class_guid, NULL, 0, &required_size ), + "Fail expected" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error %lx, got %lx", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + ok( required_size > 0, "Expected > 0, got %lu", required_size ); + ok( required_size < LINE_LEN, "Expected < %u, got %lu", LINE_LEN, required_size ); + + class_desc = HeapAlloc( GetProcessHeap(), 0, required_size ); + if ( !class_desc ) + return; + + SetLastError( 0xdeadbeef ); + ok( SetupDiGetClassDescriptionA( &test_class_guid, class_desc, required_size, &size ), + "Error reported %lx", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + SetLastError( 0xdeadbeef ); + ok( SetupDiGetClassDescriptionA( &test_class_guid, class_desc, required_size + 1, &size ), + "Error reported %lx", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + + HeapFree( GetProcessHeap(), 0, class_desc ); +} + +static void test_SetupDiGetClassDevsA(void) +{ + HDEVINFO device_info; + + SetLastError( 0xdeadbeef ); + device_info = SetupDiGetClassDevs( NULL, NULL, NULL, 0 ); + ok( device_info == INVALID_HANDLE_VALUE, + "Fail expected" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + + SetLastError( 0xdeadbeef ); + device_info = SetupDiGetClassDevs( NULL, NULL, NULL, DIGCF_ALLCLASSES ); + ok( device_info != INVALID_HANDLE_VALUE, + "Error reported %lx", GetLastError() ); + SetLastError( 0xdeadbeef ); + ok( SetupDiDestroyDeviceInfoList( device_info ), + "Error reported %lx", GetLastError() ); + + SetLastError( 0xdeadbeef ); + device_info = SetupDiGetClassDevs( NULL, NULL, NULL, DIGCF_DEVICEINTERFACE ); + ok( device_info == INVALID_HANDLE_VALUE, + "Fail expected" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + + SetLastError( 0xdeadbeef ); + device_info = SetupDiGetClassDevs( &test_class_guid, NULL, NULL, 0 ); + ok( device_info != INVALID_HANDLE_VALUE, + "Error reported %lx", GetLastError() ); + SetLastError( 0xdeadbeef ); + ok( SetupDiDestroyDeviceInfoList( device_info ), + "Error reported %lx", GetLastError() ); + + SetLastError( 0xdeadbeef ); + device_info = SetupDiGetClassDevs( NULL, "(invalid enumerator)", NULL, DIGCF_ALLCLASSES ); + ok( device_info == INVALID_HANDLE_VALUE, + "Fail expected" ); + ok( GetLastError() == ERROR_INVALID_DATA, + "Expected error %lx, got %lx", ERROR_INVALID_DATA, GetLastError() ); + + SetLastError( 0xdeadbeef ); + device_info = SetupDiGetClassDevs( NULL, "Root", NULL, DIGCF_ALLCLASSES ); + ok( device_info != INVALID_HANDLE_VALUE, + "Error reported %lx", GetLastError() ); + SetLastError( 0xdeadbeef ); + ok( SetupDiDestroyDeviceInfoList( device_info ), + "Error reported %lx", GetLastError() ); +} + +static void test_SetupDiOpenClassRegKeyExA(void) +{ + HKEY hkey; + LONG err; + + SetLastError( 0xdeadbeef ); + hkey = SetupDiOpenClassRegKeyExA( NULL, 0, 0, NULL, NULL ); + ok( hkey == INVALID_HANDLE_VALUE, + "Fail expected" ); + ok( GetLastError() == ERROR_INVALID_FLAGS, + "Expected error %lx, got %lx", ERROR_INVALID_FLAGS, GetLastError() ); + + SetLastError( 0xdeadbeef ); + hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INSTALLER | DIOCR_INTERFACE, NULL, NULL ); + ok( hkey == INVALID_HANDLE_VALUE, + "Fail expected" ); + ok( GetLastError() == ERROR_INVALID_FLAGS, + "Expected error %lx, got %lx", ERROR_INVALID_FLAGS, GetLastError() ); + + SetLastError( 0xdeadbeef ); + hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INSTALLER, NULL, NULL ); + ok( hkey == INVALID_HANDLE_VALUE, + "Fail expected" ); + ok( GetLastError() == ERROR_INVALID_CLASS, + "Expected error %x, got %lx", ERROR_INVALID_CLASS, GetLastError() ); + + SetLastError( 0xdeadbeef ); + hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INTERFACE, NULL, NULL ); + ok( hkey == INVALID_HANDLE_VALUE, + "Fail expected" ); + ok( GetLastError() == ERROR_INVALID_CLASS, + "Expected error %x, got %lx", ERROR_INVALID_CLASS, GetLastError() ); + + SetLastError( 0xdeadbeef ); + hkey = SetupDiOpenClassRegKeyExA( NULL, KEY_QUERY_VALUE, DIOCR_INSTALLER, NULL, NULL ); + ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx", GetLastError() ); + err = RegCloseKey( hkey ); + ok( err == ERROR_SUCCESS, "Got error %lx", err ); + + SetLastError( 0xdeadbeef ); + hkey = SetupDiOpenClassRegKeyExA( NULL, KEY_QUERY_VALUE, DIOCR_INTERFACE, NULL, NULL ); + ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx", GetLastError() ); + err = RegCloseKey( hkey ); + ok( err == ERROR_SUCCESS, "Got error %lx", err ); + + SetLastError( 0xdeadbeef ); + hkey = SetupDiOpenClassRegKeyExA( &test_class_guid, KEY_QUERY_VALUE, DIOCR_INSTALLER, NULL, NULL ); + ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx", GetLastError() ); + err = RegCloseKey( hkey ); + ok( err == ERROR_SUCCESS, "Got error %lx", err ); + + err = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Class", 0, KEY_SET_VALUE, &hkey); + ok( err == ERROR_SUCCESS, "Got error %lx", err ); +} + +START_TEST(devclass) +{ + test_SetupDiBuildClassInfoList(); + test_SetupDiClassGuidsFromNameA(); + test_SetupDiClassNameFromGuidA(); + test_SetupDiGetClassDescriptionA(); + test_SetupDiGetClassDevsA(); + test_SetupDiOpenClassRegKeyExA(); +} Propchange: trunk/reactos/regtests/winetests/setupapi/devclass.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/regtests/winetests/setupapi/install.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/setupapi… ============================================================================== --- trunk/reactos/regtests/winetests/setupapi/install.c (added) +++ trunk/reactos/regtests/winetests/setupapi/install.c Thu Jun 15 16:49:04 2006 @@ -1,0 +1,117 @@ +/* + * INF file parsing tests + * + * Copyright 2006 Hervé Poussineau + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public Licence as + * published by the Free Software Foundation; either version 2 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 + * General Public License for more details. + * + * You should have received a copy of the GNU 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 <assert.h> +#include <stdarg.h> +#include <unistd.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "setupapi.h" + +#include "wine/test.h" + +#define TMPFILE ".\\tmp.inf" + +#define STD_HEADER "[Version]\r\nSignature=\"$CHICAGO$\"\r\n" + +/* create a new file with specified contents and open it */ +static HINF test_file_contents( const char *data, UINT *err_line ) +{ + DWORD res; + HANDLE handle = CreateFileA( TMPFILE, GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) return 0; + if (!WriteFile( handle, data, strlen(data), &res, NULL )) trace( "write error\n" ); + CloseHandle( handle ); + return SetupOpenInfFileA( TMPFILE, 0, INF_STYLE_WIN4, err_line ); +} + +static void test_InstallHinfSectionA(void) +{ + char buffer[MAX_INF_STRING_LENGTH]; + UINT err_line; + HINF hinf; + DWORD err; + DWORD len; + + SetLastError( 0xdeadbeef ); + hinf = test_file_contents( STD_HEADER + "[s]\r\nAddReg=s.Reg\r\n[s.Reg]\r\nHKCU,,Test,,none\r\n" + "[s.Win]\r\nAddReg=sWin.Reg\r\n[sWin.Reg]\r\nHKCU,,Test,,win\r\n" + "[s.NT]\r\nAddReg=sNT.Reg\r\n[sNT.Reg]\r\nHKCU,,Test,,nt\r\n" + , &err_line ); + ok( hinf != INVALID_HANDLE_VALUE, "open failed err %lx", GetLastError() ); + if ( hinf == INVALID_HANDLE_VALUE ) return; + + system( "rundll32.exe setupapi,InstallHinfSection s 128 " TMPFILE ); + + len = sizeof( buffer ); + err = RegQueryValueExA( HKEY_CURRENT_USER, "Test", NULL, NULL, (LPBYTE)buffer, &len ); + ok( err == ERROR_SUCCESS, "error %lx", err); + + if (GetVersion() & 0x80000000) + ok( !strcmp( buffer, "win" ), "bad section %s/win\n", buffer ); + else + ok( !strcmp( buffer, "nt" ), "bad section %s/nt\n", buffer ); + + err = RegDeleteValue( HKEY_CURRENT_USER, "Test" ); + ok( err == ERROR_SUCCESS, "error %lx", err); +} + +static void test_SetupInstallFromInfSectionA(void) +{ + char buffer[MAX_INF_STRING_LENGTH]; + UINT err_line; + HINF hinf; + DWORD err; + DWORD len; + + SetLastError( 0xdeadbeef ); + hinf = test_file_contents( STD_HEADER + "[s]\r\nAddReg=s.Reg\r\n[s.Reg]\r\nHKR,,Test,,none\r\n" + "[s.Win]\r\nAddReg=sWin.Reg\r\n[sWin.Reg]\r\nHKR,,Test,,win\r\n" + "[s.NT]\r\nAddReg=sNT.Reg\r\n[sNT.Reg]\r\nHKR,,Test,,nt\r\n" + , &err_line ); + ok( hinf != INVALID_HANDLE_VALUE, "open failed err %lx", GetLastError() ); + if (hinf == INVALID_HANDLE_VALUE) return; + + SetLastError( 0xdeadbeef ); + ok ( SetupInstallFromInfSectionA( NULL, hinf, "s", SPINST_REGISTRY, HKEY_CURRENT_USER, NULL, 0, NULL, NULL, NULL, NULL ), + "Error code set to %lx", GetLastError() ); + + len = sizeof( buffer ); + err = RegQueryValueExA( HKEY_CURRENT_USER, "Test", NULL, NULL, (LPBYTE)buffer, &len ); + ok( err == ERROR_SUCCESS, "error %lx", err); + ok( !strcmp( buffer, "none" ), "bad value %s/none", buffer ); + + err = RegDeleteValue( HKEY_CURRENT_USER, "Test" ); + ok( err == ERROR_SUCCESS, "error %lx", err); +} + +START_TEST(install) +{ + test_InstallHinfSectionA(); + test_SetupInstallFromInfSectionA(); + DeleteFileA( TMPFILE ); +} Propchange: trunk/reactos/regtests/winetests/setupapi/install.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/regtests/winetests/setupapi/parser.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/setupapi… ============================================================================== --- trunk/reactos/regtests/winetests/setupapi/parser.c (original) +++ trunk/reactos/regtests/winetests/setupapi/parser.c Thu Jun 15 16:49:04 2006 @@ -387,10 +387,18 @@ } +static void test_SetupCloseInfFile(void) +{ + /* try to close with invalid handles */ + SetupCloseInfFile( NULL ); + SetupCloseInfFile( INVALID_HANDLE_VALUE ); +} + START_TEST(parser) { test_invalid_files(); test_section_names(); test_key_names(); + test_SetupCloseInfFile(); DeleteFileA( tmpfile ); } Modified: trunk/reactos/regtests/winetests/setupapi/setupapi.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/setupapi… ============================================================================== --- trunk/reactos/regtests/winetests/setupapi/setupapi.rbuild (original) +++ trunk/reactos/regtests/winetests/setupapi/setupapi.rbuild Thu Jun 15 16:49:04 2006 @@ -3,6 +3,8 @@ <define name="__USE_W32API" /> <library>ntdll</library> <library>setupapi</library> + <file>devclass.c</file> + <file>install.c</file> <file>parser.c</file> <file>query.c</file> <file>stringtable.c</file> Modified: trunk/reactos/regtests/winetests/setupapi/testlist.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/setupapi… ============================================================================== --- trunk/reactos/regtests/winetests/setupapi/testlist.c (original) +++ trunk/reactos/regtests/winetests/setupapi/testlist.c Thu Jun 15 16:49:04 2006 @@ -6,12 +6,16 @@ #define STANDALONE #include "wine/test.h" +extern void func_devclass(void); +extern void func_install(void); extern void func_parser(void); extern void func_query(void); extern void func_stringtable(void); const struct test winetest_testlist[] = { + { "devclass", func_devclass }, + { "install", func_install }, { "parser", func_parser }, { "query", func_query }, { "stringtable", func_stringtable },

1 0

[hpoussin] 22357: Set svn:eol-style to native
by hpoussin＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: hpoussin Date: Thu Jun 15 16:41:57 2006 New Revision: 22357 URL: http://svn.reactos.ru/svn/reactos?rev=22357&view=rev Log: Set svn:eol-style to native Modified: trunk/reactos/regtests/winetests/setupapi/parser.c (props changed) trunk/reactos/regtests/winetests/setupapi/query.c (props changed) trunk/reactos/regtests/winetests/setupapi/testlist.c (props changed) Propchange: trunk/reactos/regtests/winetests/setupapi/parser.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/regtests/winetests/setupapi/parser.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: trunk/reactos/regtests/winetests/setupapi/query.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/regtests/winetests/setupapi/query.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: trunk/reactos/regtests/winetests/setupapi/testlist.c ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -*

1 0

[hpoussin] 22356: Create configuration list only once (in MSVCBackend::Process) and use it everywhere. Remove dead code
by hpoussin＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: hpoussin Date: Thu Jun 15 16:33:47 2006 New Revision: 22356 URL: http://svn.reactos.ru/svn/reactos?rev=22356&view=rev Log: Create configuration list only once (in MSVCBackend::Process) and use it everywhere. Remove dead code Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/msvc.h trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/m… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Thu Jun 15 16:33:47 2006 @@ -56,6 +56,27 @@ void MSVCBackend::Process() { + // TODO FIXME wine hack? + bool only_msvc_headers = false; + + while ( m_configurations.size () > 0 ) + { + const MSVCConfiguration* cfg = m_configurations.back(); + m_configurations.pop_back(); + delete cfg; + } + + m_configurations.push_back ( new MSVCConfiguration( Debug )); + m_configurations.push_back ( new MSVCConfiguration( Release )); + m_configurations.push_back ( new MSVCConfiguration( Speed )); + + if (!only_msvc_headers) + { + m_configurations.push_back ( new MSVCConfiguration( Debug, WineHeaders )); + m_configurations.push_back ( new MSVCConfiguration( Release, WineHeaders )); + m_configurations.push_back ( new MSVCConfiguration( Speed, WineHeaders )); + } + if ( configuration.CleanAsYouGo ) { _clean_project_files(); return; @@ -65,20 +86,11 @@ return; } string filename_sln ( ProjectNode.name ); - //string filename_rules = "gccasm.rules"; if ( configuration.VSProjectVersion == "6.00" ) filename_sln += "_auto.dsw"; - else { + else filename_sln += "_auto.sln"; - - //m_rulesFile = fopen ( filename_rules.c_str(), "wb" ); - //if ( m_rulesFile ) - //{ - // _generate_rules_file ( m_rulesFile ); - //} - //fclose ( m_rulesFile ); - } printf ( "Creating MSVC workspace: %s\n", filename_sln.c_str() ); @@ -112,14 +124,6 @@ _generate_dsp ( module ); else _generate_vcproj ( module ); - - - /*for(size_t k = 0; k < module.non_if_data.files.size(); k++) - { - File &file = *module.non_if_data.files[k]; - - ProcessFile(file.name); - }*/ } } Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/m… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h Thu Jun 15 16:33:47 2006 @@ -86,7 +86,7 @@ std::string SuoFileName ( const Module& module ) const; std::string NcbFileName ( const Module& module ) const; - + std::vector<MSVCConfiguration*> m_configurations; std::vector<FileUnit> m_fileUnits; std::vector<std::string> m_folders; Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/v… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Thu Jun 15 16:33:47 2006 @@ -100,23 +100,6 @@ bool console = exe && (module.type == Win32CUI); - // TODO FIXME - not sure if the count here is right... - int parts = 0; - const char* p = strpbrk ( vcproj_file.c_str(), "/\\" ); - while ( p ) - { - ++parts; - p = strpbrk ( p+1, "/\\" ); - } - string msvc_wine_dir = ".."; - while ( --parts ) - msvc_wine_dir += "\\.."; - - string wine_include_dir = msvc_wine_dir + "\\include"; - - //$progress_current++; - //$output->progress("$dsp_file (file $progress_current of $progress_max)"); - string vcproj_path = module.GetBasePath(); vector<string> source_files, resource_files, includes, includes_wine, libraries; StringSet common_defines; @@ -194,22 +177,6 @@ vector<string> header_files; - // TODO FIXME wine hack? - bool no_msvc_headers = true; - - std::vector<MSVCConfiguration*> cfgs; - - cfgs.push_back ( new MSVCConfiguration( Debug )); - cfgs.push_back ( new MSVCConfiguration( Release )); - cfgs.push_back ( new MSVCConfiguration( Speed )); - - if (!no_msvc_headers) - { - cfgs.push_back ( new MSVCConfiguration( Debug, WineHeaders )); - cfgs.push_back ( new MSVCConfiguration( Release, WineHeaders )); - cfgs.push_back ( new MSVCConfiguration( Speed, WineHeaders )); - } - string include_string; fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" ); @@ -243,9 +210,9 @@ std::string output_dir; fprintf ( OUT, "\t<Configurations>\r\n" ); - for ( size_t icfg = 0; icfg < cfgs.size(); icfg++ ) - { - const MSVCConfiguration& cfg = *cfgs[icfg]; + for ( size_t icfg = 0; icfg < m_configurations.size(); icfg++ ) + { + const MSVCConfiguration& cfg = *m_configurations[icfg]; bool debug = ( cfg.optimization == Debug ); bool release = ( cfg.optimization == Release ); @@ -272,7 +239,6 @@ { if ( multiple_includes ) fprintf ( OUT, ";" ); - fprintf ( OUT, "%s", include.c_str() ); include_string += " /I " + include; multiple_includes = true; @@ -523,9 +489,9 @@ fprintf ( OUT, "\t\t\t<File\r\n" ); fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", source_file.c_str() ); - for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ ) - { - const MSVCConfiguration& config = *cfgs[iconfig]; + for ( size_t iconfig = 0; iconfig < m_configurations.size(); iconfig++ ) + { + const MSVCConfiguration& config = *m_configurations[iconfig]; if (( isrcfile == 0 ) && ( module.pch != NULL )) { @@ -635,31 +601,6 @@ return version; } - -//void -//MSVCBackend::_generate_rules_file ( FILE* OUT ) -//{ -// fprintf ( OUT, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" ); -// fprintf ( OUT, "<VisualStudioToolFile\r\n" ); -// fprintf ( OUT, "\tName=\"GCC Assembler\"\r\n" ); -// fprintf ( OUT, "\tVersion=\"%s\"\r\n", _get_solution_verion().c_str() ); -// fprintf ( OUT, "\t>\r\n" ); -// fprintf ( OUT, "\t<Rules>\r\n" ); -// fprintf ( OUT, "\t\t<CustomBuildRule\r\n" ); -// fprintf ( OUT, "\t\t\tName=\"Assembler\"\r\n" ); -// fprintf ( OUT, "\t\t\tDisplayName=\"Assembler Files\"\r\n" ); -// fprintf ( OUT, "\t\t\tCommandLine=\"cl /E "$(InputPath)" | as -o "$(OutDir)\\$(InputName).obj"\"\r\n" ); -// fprintf ( OUT, "\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"\r\n" ); -// fprintf ( OUT, "\t\t\tFileExtensions=\"*.S\"\r\n" ); -// fprintf ( OUT, "\t\t\tExecutionDescription=\"asm\"\r\n" ); -// fprintf ( OUT, "\t\t\t>\r\n" ); -// fprintf ( OUT, "\t\t\t<Properties>\r\n" ); -// fprintf ( OUT, "\t\t\t</Properties>\r\n" ); -// fprintf ( OUT, "\t\t</CustomBuildRule>\r\n" ); -// fprintf ( OUT, "\t</Rules>\r\n" ); -// fprintf ( OUT, "</VisualStudioToolFile>\r\n" ); -//} - void MSVCBackend::_generate_sln_header ( FILE* OUT ) { @@ -703,8 +644,8 @@ { fprintf ( OUT, "Global\r\n" ); fprintf ( OUT, "\tGlobalSection(SolutionConfiguration) = preSolution\r\n" ); - fprintf ( OUT, "\t\tDebug = Debug\r\n" ); - fprintf ( OUT, "\t\tRelease = Release\r\n" ); + for ( size_t i = 0; i < m_configurations.size(); i++ ) + fprintf ( OUT, "\t\t%s = %s\r\n", m_configurations[i]->name.c_str(), m_configurations[i]->name.c_str() ); fprintf ( OUT, "\tEndGlobalSection\r\n" ); fprintf ( OUT, "\tGlobalSection(ProjectConfiguration) = postSolution\r\n" ); for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) @@ -739,10 +680,12 @@ void MSVCBackend::_generate_sln_configurations ( FILE* OUT, std::string vcproj_guid ) { - fprintf ( OUT, "\t\t%s.Debug|Win32.ActiveCfg = Debug|Win32\r\n", vcproj_guid.c_str() ); - fprintf ( OUT, "\t\t%s.Debug|Win32.Build.0 = Debug|Win32\r\n", vcproj_guid.c_str() ); - fprintf ( OUT, "\t\t%s.Release|Win32.ActiveCfg = Release|Win32\r\n", vcproj_guid.c_str() ); - fprintf ( OUT, "\t\t%s.Release|Win32.Build.0 = Release|Win32\r\n", vcproj_guid.c_str() ); + for ( size_t i = 0; i < m_configurations.size (); i++) + { + const MSVCConfiguration& cfg = *m_configurations[i]; + fprintf ( OUT, "\t\t%s.%s|Win32.ActiveCfg = %s|Win32\r\n", vcproj_guid.c_str(), cfg.name.c_str(), cfg.name.c_str() ); + fprintf ( OUT, "\t\t%s.%s|Win32.Build.0 = %s|Win32\r\n", vcproj_guid.c_str(), cfg.name.c_str(), cfg.name.c_str() ); + } } void

1 0

[janderwald] 22355: remove endless loop
by janderwald＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: janderwald Date: Thu Jun 15 15:12:22 2006 New Revision: 22355 URL: http://svn.reactos.ru/svn/reactos?rev=22355&view=rev Log: remove endless loop Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=223… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c (original) +++ trunk/reactos/ntoskrnl/po/power.c Thu Jun 15 15:12:22 2006 @@ -373,7 +373,6 @@ Status = STATUS_NOT_IMPLEMENTED; DPRINT1("PowerInformationLevel 0x%x is UNIMPLEMENTED! Have a nice day.\n", PowerInformationLevel); - for (;;); break; }

1 0

[fireball] 22354: [FORMATTING] Generalize formatting a bit, normalize file's header
by fireball＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: fireball Date: Thu Jun 15 12:33:38 2006 New Revision: 22354 URL: http://svn.reactos.ru/svn/reactos?rev=22354&view=rev Log: [FORMATTING] Generalize formatting a bit, normalize file's header Modified: trunk/reactos/base/system/autochk/autochk.c Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/autochk/autochk… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c (original) +++ trunk/reactos/base/system/autochk/autochk.c Thu Jun 15 12:33:38 2006 @@ -1,28 +1,9 @@ -/* - * ReactOS kernel - * Copyright (C) 2002 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. - */ /* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: apps/system/autochk/autochk.c - * PURPOSE: Filesystem checker - * PROGRAMMER: Eric Kohl + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/autochk/autochk.c + * PURPOSE: Filesystem checker + * PROGRAMMERS: Eric Kohl */ /* INCLUDES *****************************************************************/ @@ -38,68 +19,69 @@ void DisplayString(LPCWSTR lpwString) { - UNICODE_STRING us; + UNICODE_STRING us; - RtlInitUnicodeString(&us, lpwString); - NtDisplayString(&us); + RtlInitUnicodeString(&us, lpwString); + NtDisplayString(&us); } - void PrintString(char* fmt,...) { - char buffer[512]; - va_list ap; - UNICODE_STRING UnicodeString; - ANSI_STRING AnsiString; + char buffer[512]; + va_list ap; + UNICODE_STRING UnicodeString; + ANSI_STRING AnsiString; - va_start(ap, fmt); - vsprintf(buffer, fmt, ap); - va_end(ap); + va_start(ap, fmt); + vsprintf(buffer, fmt, ap); + va_end(ap); - RtlInitAnsiString(&AnsiString, buffer); - RtlAnsiStringToUnicodeString(&UnicodeString, - &AnsiString, - TRUE); - NtDisplayString(&UnicodeString); - RtlFreeUnicodeString(&UnicodeString); + RtlInitAnsiString(&AnsiString, buffer); + RtlAnsiStringToUnicodeString(&UnicodeString, + &AnsiString, + TRUE); + NtDisplayString(&UnicodeString); + RtlFreeUnicodeString(&UnicodeString); } /* Native image's entry point */ - -int _cdecl +int +_cdecl _main(int argc, char *argv[], char *envp[], int DebugFlag) { - PROCESS_DEVICEMAP_INFORMATION DeviceMap; - ULONG i; - NTSTATUS Status; + PROCESS_DEVICEMAP_INFORMATION DeviceMap; + ULONG i; + NTSTATUS Status; - PrintString("Autochk 0.0.1\n"); + PrintString("Autochk 0.0.1\n"); - Status = NtQueryInformationProcess(NtCurrentProcess(), - ProcessDeviceMap, - &DeviceMap.Query, - sizeof(DeviceMap.Query), - NULL); - if(NT_SUCCESS(Status)) - { - for (i = 0; i < 26; i++) - { - if ((DeviceMap.Query.DriveMap & (1 << i)) && - (DeviceMap.Query.DriveType[i] == DOSDEVICE_DRIVE_FIXED)) - { - PrintString(" Checking drive %c:", 'A'+i); - PrintString(" OK\n"); - } - } - PrintString("\n"); - return 0; - } - return 1; + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessDeviceMap, + &DeviceMap.Query, + sizeof(DeviceMap.Query), + NULL); + + if(NT_SUCCESS(Status)) + { + for (i = 0; i < 26; i++) + { + if ((DeviceMap.Query.DriveMap & (1 << i)) && + (DeviceMap.Query.DriveType[i] == DOSDEVICE_DRIVE_FIXED)) + { + PrintString(" Checking drive %c:", 'A'+i); + PrintString(" OK\n"); + } + } + PrintString("\n"); + return 0; + } + + return 1; } /* EOF */

1 0

[jimtabor] 22353: Fix functionality in TWOPARAM_ROUTINE_ROS_SHOWWINDOW. Use one PWINDOW_OBJECT Window in NtUserCallTwoParam to help with cleanup.
by jimtabor＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: jimtabor Date: Thu Jun 15 11:07:54 2006 New Revision: 22353 URL: http://svn.reactos.ru/svn/reactos?rev=22353&view=rev Log: Fix functionality in TWOPARAM_ROUTINE_ROS_SHOWWINDOW. Use one PWINDOW_OBJECT Window in NtUserCallTwoParam to help with cleanup. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Thu Jun 15 11:07:54 2006 @@ -493,7 +493,7 @@ { DWORD Ret; RECT rcRect; - PWINDOW_OBJECT Window = UserGetWindowObject((HWND)Param1); + Window = UserGetWindowObject((HWND)Param1); if (!Window) RETURN(ERROR); Ret = (DWORD)IntGetWindowRgnBox(Window, &rcRect); @@ -507,7 +507,7 @@ } case TWOPARAM_ROUTINE_GETWINDOWRGN: { - PWINDOW_OBJECT Window = UserGetWindowObject((HWND)Param1); + Window = UserGetWindowObject((HWND)Param1); if (!Window) RETURN(ERROR); RETURN( (DWORD)IntGetWindowRgn(Window, (HRGN)Param2)); @@ -567,7 +567,7 @@ case TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS: { - PWINDOW_OBJECT Window = UserGetWindowObject((HWND)Param1); + Window = UserGetWindowObject((HWND)Param1); if (!Window) RETURN(0); RETURN( (DWORD)IntShowOwnedPopups(Window, (BOOL) Param2)); @@ -576,19 +576,18 @@ case TWOPARAM_ROUTINE_ROS_SHOWWINDOW: { #define WIN_NEEDS_SHOW_OWNEDPOPUP (0x00000040) - PWINDOW_OBJECT Window; DPRINT1("ROS_SHOWWINDOW\n"); if (!(Window = UserGetWindowObject((HWND)Param1))) { - RETURN( FALSE); + RETURN( 1 ); } if (Param2) { if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) { - RETURN( TRUE); + RETURN( -1 ); } Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP; } @@ -596,8 +595,9 @@ Window->Flags |= WIN_NEEDS_SHOW_OWNEDPOPUP; DPRINT1("ROS_SHOWWINDOW ---> 0x%x\n",Window->Flags); - RETURN( TRUE); - } + RETURN( 0 ); + } + case TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW: UNIMPLEMENTED RETURN( 0);

1 0

[gedmurphy] 22352: delete previous tag
by gedmurphy＠svn.reactos.org 14 Jun '06

14 Jun '06

Author: gedmurphy Date: Thu Jun 15 01:51:31 2006 New Revision: 22352 URL: http://svn.reactos.ru/svn/reactos?rev=22352&view=rev Log: delete previous tag Removed: vendor/wine/dlls/riched20/Wine-0_9_10/

1 0

[gedmurphy] 22351: made a copy
by gedmurphy＠svn.reactos.org 14 Jun '06

14 Jun '06

Author: gedmurphy Date: Thu Jun 15 01:50:14 2006 New Revision: 22351 URL: http://svn.reactos.ru/svn/reactos?rev=22351&view=rev Log: made a copy Added: vendor/wine/dlls/riched20/Wine-0_9_15/ - copied from r22350, vendor/wine/dlls/riched20/current/

1 0

[gedmurphy] 22350: Wine 0.9.15 vendor drop
by gedmurphy＠svn.reactos.org 14 Jun '06

14 Jun '06

Author: gedmurphy Date: Thu Jun 15 01:47:25 2006 New Revision: 22350 URL: http://svn.reactos.ru/svn/reactos?rev=22350&view=rev Log: Wine 0.9.15 vendor drop Added: vendor/wine/dlls/riched20/current/version.rc Modified: vendor/wine/dlls/riched20/current/Makefile.in vendor/wine/dlls/riched20/current/caret.c vendor/wine/dlls/riched20/current/clipboard.c vendor/wine/dlls/riched20/current/context.c vendor/wine/dlls/riched20/current/editor.c vendor/wine/dlls/riched20/current/editor.h vendor/wine/dlls/riched20/current/editstr.h vendor/wine/dlls/riched20/current/list.c vendor/wine/dlls/riched20/current/paint.c vendor/wine/dlls/riched20/current/para.c vendor/wine/dlls/riched20/current/reader.c vendor/wine/dlls/riched20/current/richole.c vendor/wine/dlls/riched20/current/row.c vendor/wine/dlls/riched20/current/run.c vendor/wine/dlls/riched20/current/string.c vendor/wine/dlls/riched20/current/style.c vendor/wine/dlls/riched20/current/txtsrv.c vendor/wine/dlls/riched20/current/undo.c vendor/wine/dlls/riched20/current/wrap.c vendor/wine/dlls/riched20/current/writer.c Modified: vendor/wine/dlls/riched20/current/Makefile.in URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/Makefil… ============================================================================== --- vendor/wine/dlls/riched20/current/Makefile.in (original) +++ vendor/wine/dlls/riched20/current/Makefile.in Thu Jun 15 01:47:25 2006 @@ -28,6 +28,8 @@ SUBDIRS = tests +RC_SRCS = version.rc + @MAKE_DLL_RULES@ ### Dependencies: Modified: vendor/wine/dlls/riched20/current/caret.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/caret.c… ============================================================================== --- vendor/wine/dlls/riched20/current/caret.c (original) +++ vendor/wine/dlls/riched20/current/caret.c Thu Jun 15 01:47:25 2006 @@ -16,7 +16,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ Modified: vendor/wine/dlls/riched20/current/clipboard.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/clipboa… ============================================================================== --- vendor/wine/dlls/riched20/current/clipboard.c (original) +++ vendor/wine/dlls/riched20/current/clipboard.c Thu Jun 15 01:47:25 2006 @@ -1,412 +1,412 @@ -/* - * Richedit clipboard handling - * - * Copyright (C) 2006 Kevin Koltzau - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "editor.h" - -WINE_DEFAULT_DEBUG_CHANNEL(richedit); - -static UINT cfRTF = 0; - -typedef struct DataObjectImpl { - const IDataObjectVtbl *lpVtbl; - LONG ref; - - FORMATETC *fmtetc; - UINT fmtetc_cnt; - - HANDLE unicode; - HANDLE rtf; -} DataObjectImpl; - -typedef struct EnumFormatImpl { - const IEnumFORMATETCVtbl *lpVtbl; - LONG ref; - - FORMATETC *fmtetc; - UINT fmtetc_cnt; - - UINT cur; -} EnumFormatImpl; - -static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT size, LPENUMFORMATETC *lplpformatetc); - -static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFIID riid, LPVOID *ppvObj) -{ - EnumFormatImpl *This = (EnumFormatImpl*)iface; - TRACE("%p %s\n", This, debugstr_guid(riid)); - - if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) { - IEnumFORMATETC_AddRef(iface); - *ppvObj = (LPVOID)This; - return S_OK; - } - *ppvObj = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI EnumFormatImpl_AddRef(IEnumFORMATETC *iface) -{ - EnumFormatImpl *This = (EnumFormatImpl*)iface; - LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%ld\n", This, ref); - return ref; -} - -static ULONG WINAPI EnumFormatImpl_Release(IEnumFORMATETC *iface) -{ - EnumFormatImpl *This = (EnumFormatImpl*)iface; - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%ld\n", This, ref); - - if(!ref) { - HeapFree(GetProcessHeap(), 0, This->fmtetc); - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI EnumFormatImpl_Next(IEnumFORMATETC *iface, ULONG celt, - FORMATETC *rgelt, ULONG *pceltFetched) -{ - EnumFormatImpl *This = (EnumFormatImpl*)iface; - ULONG count = 0; - TRACE("(%p)->(%ld %p %p)\n", This, celt, rgelt, pceltFetched); - - if(!rgelt) - return E_INVALIDARG; - - count = min(celt, This->fmtetc_cnt-This->cur); - if(count > 0) { - memcpy(rgelt, This->fmtetc+This->cur, count*sizeof(FORMATETC)); - This->cur += count; - } - if(pceltFetched) - *pceltFetched = count; - return count == celt ? S_OK : S_FALSE; -} - -static HRESULT WINAPI EnumFormatImpl_Skip(IEnumFORMATETC *iface, ULONG celt) -{ - EnumFormatImpl *This = (EnumFormatImpl*)iface; - ULONG count = 0; - TRACE("(%p)->(%ld)\n", This, celt); - - count = min(celt, This->fmtetc_cnt-This->cur); - This->cur += count; - return count == celt ? S_OK : S_FALSE; -} - -static HRESULT WINAPI EnumFormatImpl_Reset(IEnumFORMATETC *iface) -{ - EnumFormatImpl *This = (EnumFormatImpl*)iface; - TRACE("(%p)\n", This); - - This->cur = 0; - return S_OK; -} - -static HRESULT WINAPI EnumFormatImpl_Clone(IEnumFORMATETC *iface, IEnumFORMATETC **ppenum) -{ - EnumFormatImpl *This = (EnumFormatImpl*)iface; - HRESULT hr; - TRACE("(%p)->(%p)\n", This, ppenum); - - if(!ppenum) - return E_INVALIDARG; - hr = EnumFormatImpl_Create(This->fmtetc, This->fmtetc_cnt, ppenum); - if(SUCCEEDED(hr)) - hr = IEnumFORMATETC_Skip(*ppenum, This->cur); - return hr; -} - -static const IEnumFORMATETCVtbl VT_EnumFormatImpl = { - EnumFormatImpl_QueryInterface, - EnumFormatImpl_AddRef, - EnumFormatImpl_Release, - EnumFormatImpl_Next, - EnumFormatImpl_Skip, - EnumFormatImpl_Reset, - EnumFormatImpl_Clone -}; - -static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT fmtetc_cnt, IEnumFORMATETC **lplpformatetc) -{ - EnumFormatImpl *ret; - TRACE("\n"); - - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(EnumFormatImpl)); - ret->lpVtbl = &VT_EnumFormatImpl; - ret->ref = 1; - ret->cur = 0; - ret->fmtetc_cnt = fmtetc_cnt; - ret->fmtetc = HeapAlloc(GetProcessHeap(), 0, fmtetc_cnt*sizeof(FORMATETC)); - memcpy(ret->fmtetc, fmtetc, fmtetc_cnt*sizeof(FORMATETC)); - *lplpformatetc = (LPENUMFORMATETC)ret; - return S_OK; -} - -static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID riid, LPVOID *ppvObj) -{ - DataObjectImpl *This = (DataObjectImpl*)iface; - TRACE("(%p)->(%s)\n", This, debugstr_guid(riid)); - - if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) { - IDataObject_AddRef(iface); - *ppvObj = (LPVOID)This; - return S_OK; - } - *ppvObj = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI DataObjectImpl_AddRef(IDataObject* iface) -{ - DataObjectImpl *This = (DataObjectImpl*)iface; - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%ld\n", This, ref); - return ref; -} - -static ULONG WINAPI DataObjectImpl_Release(IDataObject* iface) -{ - DataObjectImpl *This = (DataObjectImpl*)iface; - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%ld\n",This, ref); - - if(!ref) { - if(This->unicode) GlobalFree(This->unicode); - if(This->rtf) GlobalFree(This->rtf); - if(This->fmtetc) GlobalFree(This->fmtetc); - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pformatetc, STGMEDIUM *pmedium) -{ - DataObjectImpl *This = (DataObjectImpl*)iface; - TRACE("(%p)->(fmt=0x%08x tym=0x%08lx)\n", This, pformatetc->cfFormat, pformatetc->tymed); - - if(pformatetc->lindex != -1) - return DV_E_LINDEX; - - if(!(pformatetc->tymed & TYMED_HGLOBAL)) - return DV_E_TYMED; - - if(This->unicode && pformatetc->cfFormat == CF_UNICODETEXT) - pmedium->u.hGlobal = This->unicode; - else if(This->rtf && pformatetc->cfFormat == cfRTF) - pmedium->u.hGlobal = This->rtf; - else - return DV_E_FORMATETC; - - pmedium->tymed = TYMED_HGLOBAL; - pmedium->pUnkForRelease = (LPUNKNOWN)iface; - IUnknown_AddRef(pmedium->pUnkForRelease); - return S_OK; -} - -static HRESULT WINAPI DataObjectImpl_GetDataHere(IDataObject* iface, FORMATETC *pformatetc, STGMEDIUM *pmedium) -{ - DataObjectImpl *This = (DataObjectImpl*)iface; - FIXME("(%p): stub\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI DataObjectImpl_QueryGetData(IDataObject* iface, FORMATETC *pformatetc) -{ - DataObjectImpl *This = (DataObjectImpl*)iface; - UINT i; - BOOL foundFormat = FALSE; - TRACE("(%p)->(fmt=0x%08x tym=0x%08lx)\n", This, pformatetc->cfFormat, pformatetc->tymed); - - if(pformatetc->lindex != -1) - return DV_E_LINDEX; - - for(i=0; i<This->fmtetc_cnt; i++) { - if(This->fmtetc[i].cfFormat == pformatetc->cfFormat) { - foundFormat = TRUE; - if(This->fmtetc[i].tymed == pformatetc->tymed) - return S_OK; - } - } - return foundFormat?DV_E_FORMATETC:DV_E_TYMED; -} - -static HRESULT WINAPI DataObjectImpl_GetCanonicalFormatEtc(IDataObject* iface, FORMATETC *pformatectIn, - FORMATETC *pformatetcOut) -{ - DataObjectImpl *This = (DataObjectImpl*)iface; - TRACE("(%p)->(%p,%p)\n", This, pformatectIn, pformatetcOut); - - if(pformatetcOut) { - memcpy(pformatetcOut, pformatectIn, sizeof(FORMATETC)); - pformatetcOut->ptd = NULL; - } - return DATA_S_SAMEFORMATETC; -} - -static HRESULT WINAPI DataObjectImpl_SetData(IDataObject* iface, FORMATETC *pformatetc, - STGMEDIUM *pmedium, BOOL fRelease) -{ - DataObjectImpl *This = (DataObjectImpl*)iface; - FIXME("(%p): stub\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI DataObjectImpl_EnumFormatEtc(IDataObject* iface, DWORD dwDirection, - IEnumFORMATETC **ppenumFormatEtc) -{ - DataObjectImpl *This = (DataObjectImpl*)iface; - TRACE("(%p)->(%ld)\n", This, dwDirection); - - if(dwDirection != DATADIR_GET) { - FIXME("Unsupported direction: %ld\n", dwDirection); - /* WinXP riched20 also returns E_NOTIMPL in this case */ - return E_NOTIMPL; - } - return EnumFormatImpl_Create(This->fmtetc, This->fmtetc_cnt, ppenumFormatEtc); -} - -static HRESULT WINAPI DataObjectImpl_DAdvise(IDataObject* iface, FORMATETC *pformatetc, DWORD advf, - IAdviseSink *pAdvSink, DWORD *pdwConnection) -{ - DataObjectImpl *This = (DataObjectImpl*)iface; - FIXME("(%p): stub\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI DataObjectImpl_DUnadvise(IDataObject* iface, DWORD dwConnection) -{ - DataObjectImpl *This = (DataObjectImpl*)iface; - FIXME("(%p): stub\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI DataObjectImpl_EnumDAdvise(IDataObject* iface, IEnumSTATDATA **ppenumAdvise) -{ - DataObjectImpl *This = (DataObjectImpl*)iface; - FIXME("(%p): stub\n", This); - return E_NOTIMPL; -} - -static const IDataObjectVtbl VT_DataObjectImpl = -{ - DataObjectImpl_QueryInterface, - DataObjectImpl_AddRef, - DataObjectImpl_Release, - DataObjectImpl_GetData, - DataObjectImpl_GetDataHere, - DataObjectImpl_QueryGetData, - DataObjectImpl_GetCanonicalFormatEtc, - DataObjectImpl_SetData, - DataObjectImpl_EnumFormatEtc, - DataObjectImpl_DAdvise, - DataObjectImpl_DUnadvise, - DataObjectImpl_EnumDAdvise -}; - -static HGLOBAL get_unicode_text(ME_TextEditor *editor, CHARRANGE *lpchrg) -{ - int pars, len; - WCHAR *data; - HANDLE ret; - - pars = ME_CountParagraphsBetween(editor, lpchrg->cpMin, lpchrg->cpMax); - len = lpchrg->cpMax-lpchrg->cpMin; - ret = GlobalAlloc(GMEM_MOVEABLE, sizeof(WCHAR)*(len+pars+1)); - data = (WCHAR *)GlobalLock(ret); - len = ME_GetTextW(editor, data, lpchrg->cpMin, len, TRUE); - data[len] = 0; - GlobalUnlock(ret); - return ret; -} - -typedef struct tagME_GlobalDestStruct -{ - HGLOBAL hData; - int nLength; -} ME_GlobalDestStruct; - -static DWORD CALLBACK ME_AppendToHGLOBAL(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG cb, LONG *pcb) -{ - ME_GlobalDestStruct *pData = (ME_GlobalDestStruct *)dwCookie; - int nMaxSize; - BYTE *pDest; - - nMaxSize = GlobalSize(pData->hData); - if (pData->nLength+cb+1 >= cb) { - /* round up to 2^17 */ - int nNewSize = (((nMaxSize+cb+1)|0x1FFFF)+1) & 0xFFFE0000; - pData->hData = GlobalReAlloc(pData->hData, nNewSize, 0); - } - pDest = (BYTE *)GlobalLock(pData->hData); - memcpy(pDest + pData->nLength, lpBuff, cb); - pData->nLength += cb; - pDest[pData->nLength] = '\0'; - GlobalUnlock(pData->hData); - *pcb = cb; - - return 0; -} - -static HGLOBAL get_rtf_text(ME_TextEditor *editor, CHARRANGE *lpchrg) -{ - EDITSTREAM es; - ME_GlobalDestStruct gds; - - gds.hData = GlobalAlloc(GMEM_MOVEABLE, 0); - gds.nLength = 0; - es.dwCookie = (DWORD_PTR)&gds; - es.pfnCallback = ME_AppendToHGLOBAL; - ME_StreamOutRange(editor, SF_RTF, lpchrg->cpMin, lpchrg->cpMax, &es); - GlobalReAlloc(gds.hData, gds.nLength+1, 0); - return gds.hData; -} - -HRESULT ME_GetDataObject(ME_TextEditor *editor, CHARRANGE *lpchrg, LPDATAOBJECT *lplpdataobj) -{ - DataObjectImpl *obj; - TRACE("(%p,%ld,%ld)\n", editor, lpchrg->cpMin, lpchrg->cpMax); - - obj = HeapAlloc(GetProcessHeap(), 0, sizeof(DataObjectImpl)); - if(cfRTF == 0) - cfRTF = RegisterClipboardFormatA("Rich Text Format"); - - obj->lpVtbl = &VT_DataObjectImpl; - obj->ref = 1; - obj->unicode = get_unicode_text(editor, lpchrg); - obj->rtf = NULL; - - obj->fmtetc_cnt = 1; - if(editor->mode & TM_RICHTEXT) - obj->fmtetc_cnt++; - obj->fmtetc = HeapAlloc(GetProcessHeap(), 0, obj->fmtetc_cnt*sizeof(FORMATETC)); - InitFormatEtc(obj->fmtetc[0], CF_UNICODETEXT, TYMED_HGLOBAL); - if(editor->mode & TM_RICHTEXT) { - obj->rtf = get_rtf_text(editor, lpchrg); - InitFormatEtc(obj->fmtetc[1], cfRTF, TYMED_HGLOBAL); - } - - *lplpdataobj = (LPDATAOBJECT)obj; - return S_OK; -} +/* + * Richedit clipboard handling + * + * Copyright (C) 2006 Kevin Koltzau + * + * 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 "editor.h" + +WINE_DEFAULT_DEBUG_CHANNEL(richedit); + +static UINT cfRTF = 0; + +typedef struct DataObjectImpl { + const IDataObjectVtbl *lpVtbl; + LONG ref; + + FORMATETC *fmtetc; + UINT fmtetc_cnt; + + HANDLE unicode; + HANDLE rtf; +} DataObjectImpl; + +typedef struct EnumFormatImpl { + const IEnumFORMATETCVtbl *lpVtbl; + LONG ref; + + FORMATETC *fmtetc; + UINT fmtetc_cnt; + + UINT cur; +} EnumFormatImpl; + +static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT size, LPENUMFORMATETC *lplpformatetc); + +static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFIID riid, LPVOID *ppvObj) +{ + EnumFormatImpl *This = (EnumFormatImpl*)iface; + TRACE("%p %s\n", This, debugstr_guid(riid)); + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) { + IEnumFORMATETC_AddRef(iface); + *ppvObj = (LPVOID)This; + return S_OK; + } + *ppvObj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI EnumFormatImpl_AddRef(IEnumFORMATETC *iface) +{ + EnumFormatImpl *This = (EnumFormatImpl*)iface; + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) ref=%ld\n", This, ref); + return ref; +} + +static ULONG WINAPI EnumFormatImpl_Release(IEnumFORMATETC *iface) +{ + EnumFormatImpl *This = (EnumFormatImpl*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) ref=%ld\n", This, ref); + + if(!ref) { + HeapFree(GetProcessHeap(), 0, This->fmtetc); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI EnumFormatImpl_Next(IEnumFORMATETC *iface, ULONG celt, + FORMATETC *rgelt, ULONG *pceltFetched) +{ + EnumFormatImpl *This = (EnumFormatImpl*)iface; + ULONG count = 0; + TRACE("(%p)->(%ld %p %p)\n", This, celt, rgelt, pceltFetched); + + if(!rgelt) + return E_INVALIDARG; + + count = min(celt, This->fmtetc_cnt-This->cur); + if(count > 0) { + memcpy(rgelt, This->fmtetc+This->cur, count*sizeof(FORMATETC)); + This->cur += count; + } + if(pceltFetched) + *pceltFetched = count; + return count == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI EnumFormatImpl_Skip(IEnumFORMATETC *iface, ULONG celt) +{ + EnumFormatImpl *This = (EnumFormatImpl*)iface; + ULONG count = 0; + TRACE("(%p)->(%ld)\n", This, celt); + + count = min(celt, This->fmtetc_cnt-This->cur); + This->cur += count; + return count == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI EnumFormatImpl_Reset(IEnumFORMATETC *iface) +{ + EnumFormatImpl *This = (EnumFormatImpl*)iface; + TRACE("(%p)\n", This); + + This->cur = 0; + return S_OK; +} + +static HRESULT WINAPI EnumFormatImpl_Clone(IEnumFORMATETC *iface, IEnumFORMATETC **ppenum) +{ + EnumFormatImpl *This = (EnumFormatImpl*)iface; + HRESULT hr; + TRACE("(%p)->(%p)\n", This, ppenum); + + if(!ppenum) + return E_INVALIDARG; + hr = EnumFormatImpl_Create(This->fmtetc, This->fmtetc_cnt, ppenum); + if(SUCCEEDED(hr)) + hr = IEnumFORMATETC_Skip(*ppenum, This->cur); + return hr; +} + +static const IEnumFORMATETCVtbl VT_EnumFormatImpl = { + EnumFormatImpl_QueryInterface, + EnumFormatImpl_AddRef, + EnumFormatImpl_Release, + EnumFormatImpl_Next, + EnumFormatImpl_Skip, + EnumFormatImpl_Reset, + EnumFormatImpl_Clone +}; + +static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT fmtetc_cnt, IEnumFORMATETC **lplpformatetc) +{ + EnumFormatImpl *ret; + TRACE("\n"); + + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(EnumFormatImpl)); + ret->lpVtbl = &VT_EnumFormatImpl; + ret->ref = 1; + ret->cur = 0; + ret->fmtetc_cnt = fmtetc_cnt; + ret->fmtetc = HeapAlloc(GetProcessHeap(), 0, fmtetc_cnt*sizeof(FORMATETC)); + memcpy(ret->fmtetc, fmtetc, fmtetc_cnt*sizeof(FORMATETC)); + *lplpformatetc = (LPENUMFORMATETC)ret; + return S_OK; +} + +static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID riid, LPVOID *ppvObj) +{ + DataObjectImpl *This = (DataObjectImpl*)iface; + TRACE("(%p)->(%s)\n", This, debugstr_guid(riid)); + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) { + IDataObject_AddRef(iface); + *ppvObj = (LPVOID)This; + return S_OK; + } + *ppvObj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI DataObjectImpl_AddRef(IDataObject* iface) +{ + DataObjectImpl *This = (DataObjectImpl*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) ref=%ld\n", This, ref); + return ref; +} + +static ULONG WINAPI DataObjectImpl_Release(IDataObject* iface) +{ + DataObjectImpl *This = (DataObjectImpl*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) ref=%ld\n",This, ref); + + if(!ref) { + if(This->unicode) GlobalFree(This->unicode); + if(This->rtf) GlobalFree(This->rtf); + if(This->fmtetc) GlobalFree(This->fmtetc); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pformatetc, STGMEDIUM *pmedium) +{ + DataObjectImpl *This = (DataObjectImpl*)iface; + TRACE("(%p)->(fmt=0x%08x tym=0x%08lx)\n", This, pformatetc->cfFormat, pformatetc->tymed); + + if(pformatetc->lindex != -1) + return DV_E_LINDEX; + + if(!(pformatetc->tymed & TYMED_HGLOBAL)) + return DV_E_TYMED; + + if(This->unicode && pformatetc->cfFormat == CF_UNICODETEXT) + pmedium->u.hGlobal = This->unicode; + else if(This->rtf && pformatetc->cfFormat == cfRTF) + pmedium->u.hGlobal = This->rtf; + else + return DV_E_FORMATETC; + + pmedium->tymed = TYMED_HGLOBAL; + pmedium->pUnkForRelease = (LPUNKNOWN)iface; + IUnknown_AddRef(pmedium->pUnkForRelease); + return S_OK; +} + +static HRESULT WINAPI DataObjectImpl_GetDataHere(IDataObject* iface, FORMATETC *pformatetc, STGMEDIUM *pmedium) +{ + DataObjectImpl *This = (DataObjectImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObjectImpl_QueryGetData(IDataObject* iface, FORMATETC *pformatetc) +{ + DataObjectImpl *This = (DataObjectImpl*)iface; + UINT i; + BOOL foundFormat = FALSE; + TRACE("(%p)->(fmt=0x%08x tym=0x%08lx)\n", This, pformatetc->cfFormat, pformatetc->tymed); + + if(pformatetc->lindex != -1) + return DV_E_LINDEX; + + for(i=0; i<This->fmtetc_cnt; i++) { + if(This->fmtetc[i].cfFormat == pformatetc->cfFormat) { + foundFormat = TRUE; + if(This->fmtetc[i].tymed == pformatetc->tymed) + return S_OK; + } + } + return foundFormat?DV_E_FORMATETC:DV_E_TYMED; +} + +static HRESULT WINAPI DataObjectImpl_GetCanonicalFormatEtc(IDataObject* iface, FORMATETC *pformatectIn, + FORMATETC *pformatetcOut) +{ + DataObjectImpl *This = (DataObjectImpl*)iface; + TRACE("(%p)->(%p,%p)\n", This, pformatectIn, pformatetcOut); + + if(pformatetcOut) { + memcpy(pformatetcOut, pformatectIn, sizeof(FORMATETC)); + pformatetcOut->ptd = NULL; + } + return DATA_S_SAMEFORMATETC; +} + +static HRESULT WINAPI DataObjectImpl_SetData(IDataObject* iface, FORMATETC *pformatetc, + STGMEDIUM *pmedium, BOOL fRelease) +{ + DataObjectImpl *This = (DataObjectImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObjectImpl_EnumFormatEtc(IDataObject* iface, DWORD dwDirection, + IEnumFORMATETC **ppenumFormatEtc) +{ + DataObjectImpl *This = (DataObjectImpl*)iface; + TRACE("(%p)->(%ld)\n", This, dwDirection); + + if(dwDirection != DATADIR_GET) { + FIXME("Unsupported direction: %ld\n", dwDirection); + /* WinXP riched20 also returns E_NOTIMPL in this case */ + return E_NOTIMPL; + } + return EnumFormatImpl_Create(This->fmtetc, This->fmtetc_cnt, ppenumFormatEtc); +} + +static HRESULT WINAPI DataObjectImpl_DAdvise(IDataObject* iface, FORMATETC *pformatetc, DWORD advf, + IAdviseSink *pAdvSink, DWORD *pdwConnection) +{ + DataObjectImpl *This = (DataObjectImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObjectImpl_DUnadvise(IDataObject* iface, DWORD dwConnection) +{ + DataObjectImpl *This = (DataObjectImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObjectImpl_EnumDAdvise(IDataObject* iface, IEnumSTATDATA **ppenumAdvise) +{ + DataObjectImpl *This = (DataObjectImpl*)iface; + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static const IDataObjectVtbl VT_DataObjectImpl = +{ + DataObjectImpl_QueryInterface, + DataObjectImpl_AddRef, + DataObjectImpl_Release, + DataObjectImpl_GetData, + DataObjectImpl_GetDataHere, + DataObjectImpl_QueryGetData, + DataObjectImpl_GetCanonicalFormatEtc, + DataObjectImpl_SetData, + DataObjectImpl_EnumFormatEtc, + DataObjectImpl_DAdvise, + DataObjectImpl_DUnadvise, + DataObjectImpl_EnumDAdvise +}; + +static HGLOBAL get_unicode_text(ME_TextEditor *editor, CHARRANGE *lpchrg) +{ + int pars, len; + WCHAR *data; + HANDLE ret; + + pars = ME_CountParagraphsBetween(editor, lpchrg->cpMin, lpchrg->cpMax); + len = lpchrg->cpMax-lpchrg->cpMin; + ret = GlobalAlloc(GMEM_MOVEABLE, sizeof(WCHAR)*(len+pars+1)); + data = (WCHAR *)GlobalLock(ret); + len = ME_GetTextW(editor, data, lpchrg->cpMin, len, TRUE); + data[len] = 0; + GlobalUnlock(ret); + return ret; +} + +typedef struct tagME_GlobalDestStruct +{ + HGLOBAL hData; + int nLength; +} ME_GlobalDestStruct; + +static DWORD CALLBACK ME_AppendToHGLOBAL(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG cb, LONG *pcb) +{ + ME_GlobalDestStruct *pData = (ME_GlobalDestStruct *)dwCookie; + int nMaxSize; + BYTE *pDest; + + nMaxSize = GlobalSize(pData->hData); + if (pData->nLength+cb+1 >= cb) { + /* round up to 2^17 */ + int nNewSize = (((nMaxSize+cb+1)|0x1FFFF)+1) & 0xFFFE0000; + pData->hData = GlobalReAlloc(pData->hData, nNewSize, 0); + } + pDest = (BYTE *)GlobalLock(pData->hData); + memcpy(pDest + pData->nLength, lpBuff, cb); + pData->nLength += cb; + pDest[pData->nLength] = '\0'; + GlobalUnlock(pData->hData); + *pcb = cb; + + return 0; +} + +static HGLOBAL get_rtf_text(ME_TextEditor *editor, CHARRANGE *lpchrg) +{ + EDITSTREAM es; + ME_GlobalDestStruct gds; + + gds.hData = GlobalAlloc(GMEM_MOVEABLE, 0); + gds.nLength = 0; + es.dwCookie = (DWORD_PTR)&gds; + es.pfnCallback = ME_AppendToHGLOBAL; + ME_StreamOutRange(editor, SF_RTF, lpchrg->cpMin, lpchrg->cpMax, &es); + GlobalReAlloc(gds.hData, gds.nLength+1, 0); + return gds.hData; +} + +HRESULT ME_GetDataObject(ME_TextEditor *editor, CHARRANGE *lpchrg, LPDATAOBJECT *lplpdataobj) +{ + DataObjectImpl *obj; + TRACE("(%p,%ld,%ld)\n", editor, lpchrg->cpMin, lpchrg->cpMax); + + obj = HeapAlloc(GetProcessHeap(), 0, sizeof(DataObjectImpl)); + if(cfRTF == 0) + cfRTF = RegisterClipboardFormatA("Rich Text Format"); + + obj->lpVtbl = &VT_DataObjectImpl; + obj->ref = 1; + obj->unicode = get_unicode_text(editor, lpchrg); + obj->rtf = NULL; + + obj->fmtetc_cnt = 1; + if(editor->mode & TM_RICHTEXT) + obj->fmtetc_cnt++; + obj->fmtetc = HeapAlloc(GetProcessHeap(), 0, obj->fmtetc_cnt*sizeof(FORMATETC)); + InitFormatEtc(obj->fmtetc[0], CF_UNICODETEXT, TYMED_HGLOBAL); + if(editor->mode & TM_RICHTEXT) { + obj->rtf = get_rtf_text(editor, lpchrg); + InitFormatEtc(obj->fmtetc[1], cfRTF, TYMED_HGLOBAL); + } + + *lplpdataobj = (LPDATAOBJECT)obj; + return S_OK; +} Modified: vendor/wine/dlls/riched20/current/context.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/context… ============================================================================== --- vendor/wine/dlls/riched20/current/context.c (original) +++ vendor/wine/dlls/riched20/current/context.c Thu Jun 15 01:47:25 2006 @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "editor.h" Modified: vendor/wine/dlls/riched20/current/editor.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/editor.… ============================================================================== --- vendor/wine/dlls/riched20/current/editor.c (original) +++ vendor/wine/dlls/riched20/current/editor.c Thu Jun 15 01:47:25 2006 @@ -17,7 +17,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* @@ -117,7 +117,7 @@ + EM_SETTEXTEX 3.0 (unicode only, no rich text insertion handling, proper style?) - EM_SETTEXTMODE 2.0 - EM_SETTYPOGRAPHYOPTIONS 3.0 - - EM_SETUNDOLIMIT 2.0 + + EM_SETUNDOLIMIT 2.0 + EM_SETWORDBREAKPROC (used only for word movement at the moment) - EM_SETWORDBREAKPROCEX - EM_SETWORDWRAPMODE 1.0asian @@ -229,6 +229,9 @@ #include "imm.h" #include "textserv.h" #include "rtf.h" + +#define STACK_SIZE_DEFAULT 100 +#define STACK_SIZE_MAX 1000 WINE_DEFAULT_DEBUG_CHANNEL(richedit); @@ -488,6 +491,9 @@ RTFFlushOutputBuffer(info); para = ME_GetParagraph(info->editor->pCursors[0].pRun); + /* Release possibly inherited cell definitions */ + ME_DestroyTableCellList(para); + para->member.para.pCells = ALLOC_OBJ(ME_TableCell); para->member.para.pCells->nRightBoundary = 0; para->member.para.pCells->next = NULL; @@ -764,34 +770,38 @@ static int ME_FindText(ME_TextEditor *editor, DWORD flags, CHARRANGE *chrg, WCHAR *text, CHARRANGE *chrgText) { + const int nLen = lstrlenW(text); + const int nTextLen = ME_GetTextLength(editor); int nStart, nEnd; - int nLen = lstrlenW(text); int nMin, nMax; ME_DisplayItem *item; ME_DisplayItem *para; + WCHAR wLastChar = ' '; TRACE("flags==0x%08lx, chrg->cpMin==%ld, chrg->cpMax==%ld text==%s\n", flags, chrg->cpMin, chrg->cpMax, debugstr_w(text)); - if (flags & ~(FR_DOWN | FR_MATCHCASE)) - FIXME("Flags 0x%08lx not implemented\n", flags & ~(FR_DOWN | FR_MATCHCASE)); + if (flags & ~(FR_DOWN | FR_MATCHCASE | FR_WHOLEWORD)) + FIXME("Flags 0x%08lx not implemented\n", + flags & ~(FR_DOWN | FR_MATCHCASE | FR_WHOLEWORD)); nMin = chrg->cpMin; if (chrg->cpMax == -1) - nMax = ME_GetTextLength(editor); + nMax = nTextLen; else - nMax = chrg->cpMax; + nMax = chrg->cpMax > nTextLen ? nTextLen : chrg->cpMax; /* when searching up, if cpMin < cpMax, then instead of searching * on [cpMin,cpMax], we search on [0,cpMin], otherwise, search on - * [cpMax, cpMin] + * [cpMax, cpMin]. The exception is when cpMax is -1, in which + * case, it is always bigger than cpMin. */ if (!(flags & FR_DOWN)) { int nSwap = nMax; - nMax = nMin; - if (nMin < nSwap) + nMax = nMin > nTextLen ? nTextLen : nMin; + if (nMin < nSwap || chrg->cpMax == -1) nMin = 0; else nMin = nSwap; @@ -806,6 +816,20 @@ if (flags & FR_DOWN) /* Forward search */ { + /* If possible, find the character before where the search starts */ + if ((flags & FR_WHOLEWORD) && nMin) + { + nStart = nMin - 1; + item = ME_FindItemAtOffset(editor, diRun, nStart, &nStart); + if (!item) + { + if (chrgText) + chrgText->cpMin = chrgText->cpMax = -1; + return -1; + } + wLastChar = item->member.run.strText->szData[nStart]; + } + nStart = nMin; item = ME_FindItemAtOffset(editor, diRun, nStart, &nStart); if (!item) @@ -825,10 +849,35 @@ while (pCurItem && ME_CharCompare(pCurItem->member.run.strText->szData[nCurStart + nMatched], text[nMatched], (flags & FR_MATCHCASE))) { + if ((flags & FR_WHOLEWORD) && isalnumW(wLastChar)) + break; + nMatched++; if (nMatched == nLen) { - nStart += para->member.para.nCharOfs + item->member.run.nCharOfs; + ME_DisplayItem *pNextItem = pCurItem; + int nNextStart = nCurStart; + WCHAR wNextChar; + + /* Check to see if next character is a whitespace */ + if (flags & FR_WHOLEWORD) + { + if (nCurStart + nMatched == ME_StrLen(pCurItem->member.run.strText)) + { + pNextItem = ME_FindItemFwd(pCurItem, diRun); + nNextStart = -nMatched; + } + + if (pNextItem) + wNextChar = pNextItem->member.run.strText->szData[nNextStart + nMatched]; + else + wNextChar = ' '; + + if (isalnumW(wNextChar)) + break; + } + + nStart += para->member.para.nCharOfs + pCurItem->member.run.nCharOfs; if (chrgText) { chrgText->cpMin = nStart; @@ -844,6 +893,11 @@ nCurStart = -nMatched; } } + if (pCurItem) + wLastChar = pCurItem->member.run.strText->szData[nCurStart + nMatched]; + else + wLastChar = ' '; + nStart++; if (nStart == ME_StrLen(item->member.run.strText)) { @@ -855,9 +909,24 @@ } else /* Backward search */ { + /* If possible, find the character after where the search ends */ + if ((flags & FR_WHOLEWORD) && nMax < nTextLen - 1) + { + nEnd = nMax + 1; + item = ME_FindItemAtOffset(editor, diRun, nEnd, &nEnd); + if (!item) + { + if (chrgText) + chrgText->cpMin = chrgText->cpMax = -1; + return -1; + } + wLastChar = item->member.run.strText->szData[nEnd]; + } + nEnd = nMax; item = ME_FindItemAtOffset(editor, diRun, nEnd, &nEnd); - if (!item) { + if (!item) + { if (chrgText) chrgText->cpMin = chrgText->cpMax = -1; return -1; @@ -872,12 +941,45 @@ int nCurEnd = nEnd; int nMatched = 0; - while (ME_CharCompare(pCurItem->member.run.strText->szData[nCurEnd - nMatched - 1], text[nLen - nMatched - 1], (flags & FR_MATCHCASE))) + if (nCurEnd - nMatched == 0) { + pCurItem = ME_FindItemBack(pCurItem, diRun); + para = ME_GetParagraph(pCurItem); + nCurEnd = ME_StrLen(pCurItem->member.run.strText) + nMatched; + } + + while (pCurItem && ME_CharCompare(pCurItem->member.run.strText->szData[nCurEnd - nMatched - 1], text[nLen - nMatched - 1], (flags & FR_MATCHCASE))) + { + if ((flags & FR_WHOLEWORD) && isalnumW(wLastChar)) + break; + nMatched++; if (nMatched == nLen) { - nStart = para->member.para.nCharOfs + item->member.run.nCharOfs + nCurEnd - nMatched; + ME_DisplayItem *pPrevItem = pCurItem; + int nPrevEnd = nCurEnd; + WCHAR wPrevChar; + + /* Check to see if previous character is a whitespace */ + if (flags & FR_WHOLEWORD) + { + if (nPrevEnd - nMatched == 0) + { + pPrevItem = ME_FindItemBack(pCurItem, diRun); + if (pPrevItem) + nPrevEnd = ME_StrLen(pPrevItem->member.run.strText) + nMatched; + } + + if (pPrevItem) + wPrevChar = pPrevItem->member.run.strText->szData[nPrevEnd - nMatched - 1]; + else + wPrevChar = ' '; + + if (isalnumW(wPrevChar)) + break; + } + + nStart = para->member.para.nCharOfs + pCurItem->member.run.nCharOfs + nCurEnd - nMatched; if (chrgText) { chrgText->cpMin = nStart; @@ -895,6 +997,11 @@ nCurEnd = ME_StrLen(pCurItem->member.run.strText) + nMatched; } } + if (pCurItem) + wLastChar = pCurItem->member.run.strText->szData[nCurEnd - nMatched - 1]; + else + wLastChar = ' '; + nEnd--; if (nEnd < 0) { @@ -1015,7 +1122,9 @@ ed->bCaretAtEnd = FALSE; ed->nEventMask = 0; ed->nModifyStep = 0; - ed->pUndoStack = ed->pRedoStack = NULL; + ed->pUndoStack = ed->pRedoStack = ed->pUndoStackBottom = NULL; + ed->nUndoStackSize = 0; + ed->nUndoLimit = STACK_SIZE_DEFAULT; ed->nUndoMode = umAddToUndo; ed->nParagraphs = 1; ed->nLastSelStart = ed->nLastSelEnd = 0; @@ -1322,7 +1431,6 @@ UNSUPPORTED_MSG(EM_SETTABSTOPS) UNSUPPORTED_MSG(EM_SETTARGETDEVICE) UNSUPPORTED_MSG(EM_SETTYPOGRAPHYOPTIONS) - UNSUPPORTED_MSG(EM_SETUNDOLIMIT) UNSUPPORTED_MSG(EM_SETWORDBREAKPROCEX) UNSUPPORTED_MSG(EM_SHOWSCROLLBAR) UNSUPPORTED_MSG(WM_SETFONT) @@ -1372,6 +1480,17 @@ ME_GetSelection(editor, (int *)&pRange->cpMin, (int *)&pRange->cpMax); TRACE("EM_EXGETSEL = (%ld,%ld)\n", pRange->cpMin, pRange->cpMax); return 0; + } + case EM_SETUNDOLIMIT: + { + if ((int)wParam < 0) + editor->nUndoLimit = STACK_SIZE_DEFAULT; + else + editor->nUndoLimit = min(wParam, STACK_SIZE_MAX); + /* Setting a max stack size keeps wine from getting killed + for hogging memory. Windows allocates all this memory at once, so + no program would realisticly set a value above our maxiumum. */ + return editor->nUndoLimit; } case EM_CANUNDO: return editor->pUndoStack != NULL; @@ -1852,7 +1971,7 @@ DWORD flags = 0; buflen = ME_GetTextW(editor, buffer, nStart, nCount, ex->flags & GT_USECRLF); - rc = WideCharToMultiByte(ex->codepage, flags, buffer, buflen, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); + rc = WideCharToMultiByte(ex->codepage, flags, buffer, -1, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); HeapFree(GetProcessHeap(),0,buffer); return rc; @@ -2395,21 +2514,26 @@ int nLen = ME_StrLen(item->member.run.strText); if (nLen > nChars) nLen = nChars; - + if (item->member.run.nFlags & MERF_ENDPARA) { - *buffer = '\r'; - if (bCRLF) - { - *(++buffer) = '\n'; - nWritten++; - } - assert(nLen == 1); - /* our end paragraph consists of 2 characters now */ - if (editor->bEmulateVersion10) - nChars--; - } - else + if (!ME_FindItemFwd(item, diRun)) + /* No '\r' is appended to the last paragraph. */ + nLen = 0; + else { + *buffer = '\r'; + if (bCRLF) + { + *(++buffer) = '\n'; + nWritten++; + } + assert(nLen == 1); + /* our end paragraph consists of 2 characters now */ + if (editor->bEmulateVersion10) + nChars--; + } + } + else CopyMemory(buffer, item->member.run.strText->szData, sizeof(WCHAR)*nLen); nChars -= nLen; nWritten += nLen; Modified: vendor/wine/dlls/riched20/current/editor.h URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/editor.… ============================================================================== --- vendor/wine/dlls/riched20/current/editor.h (original) +++ vendor/wine/dlls/riched20/current/editor.h Thu Jun 15 01:47:25 2006 @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "editstr.h" Modified: vendor/wine/dlls/riched20/current/editstr.h URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/editstr… ============================================================================== --- vendor/wine/dlls/riched20/current/editstr.h (original) +++ vendor/wine/dlls/riched20/current/editstr.h Thu Jun 15 01:47:25 2006 @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __EDITSTR_H @@ -298,7 +298,9 @@ BOOL bCaretAtEnd; int nEventMask; int nModifyStep; - ME_DisplayItem *pUndoStack, *pRedoStack; + ME_DisplayItem *pUndoStack, *pRedoStack, *pUndoStackBottom; + int nUndoStackSize; + int nUndoLimit; ME_UndoMode nUndoMode; int nParagraphs; int nLastSelStart, nLastSelEnd; Modified: vendor/wine/dlls/riched20/current/list.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/list.c?… ============================================================================== --- vendor/wine/dlls/riched20/current/list.c (original) +++ vendor/wine/dlls/riched20/current/list.c Thu Jun 15 01:47:25 2006 @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ Modified: vendor/wine/dlls/riched20/current/paint.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/paint.c… ============================================================================== --- vendor/wine/dlls/riched20/current/paint.c (original) +++ vendor/wine/dlls/riched20/current/paint.c Thu Jun 15 01:47:25 2006 @@ -16,7 +16,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "editor.h" Modified: vendor/wine/dlls/riched20/current/para.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/para.c?… ============================================================================== --- vendor/wine/dlls/riched20/current/para.c (original) +++ vendor/wine/dlls/riched20/current/para.c Thu Jun 15 01:47:25 2006 @@ -16,7 +16,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "editor.h" @@ -136,8 +136,26 @@ new_para->member.para.nFirstMargin = run_para->member.para.nFirstMargin; new_para->member.para.bTable = run_para->member.para.bTable; + + /* Inherit previous cell definitions if any */ new_para->member.para.pCells = NULL; - + if (run_para->member.para.pCells) + { + ME_TableCell *pCell, *pNewCell; + + for (pCell = run_para->member.para.pCells; pCell; pCell = pCell->next) + { + pNewCell = ALLOC_OBJ(ME_TableCell); + pNewCell->nRightBoundary = pCell->nRightBoundary; + pNewCell->next = NULL; + if (new_para->member.para.pCells) + new_para->member.para.pLastCell->next = pNewCell; + else + new_para->member.para.pCells = pNewCell; + new_para->member.para.pLastCell = pNewCell; + } + } + /* fix paragraph properties. FIXME only needed when called from RTF reader */ if (run_para->member.para.pCells && !run_para->member.para.bTable) { Modified: vendor/wine/dlls/riched20/current/reader.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/reader.… ============================================================================== --- vendor/wine/dlls/riched20/current/reader.c (original) +++ vendor/wine/dlls/riched20/current/reader.c Thu Jun 15 01:47:25 2006 @@ -16,7 +16,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* Modified: vendor/wine/dlls/riched20/current/richole.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/richole… ============================================================================== --- vendor/wine/dlls/riched20/current/richole.c (original) +++ vendor/wine/dlls/riched20/current/richole.c Thu Jun 15 01:47:25 2006 @@ -16,7 +16,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> Modified: vendor/wine/dlls/riched20/current/row.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/row.c?r… ============================================================================== --- vendor/wine/dlls/riched20/current/row.c (original) +++ vendor/wine/dlls/riched20/current/row.c Thu Jun 15 01:47:25 2006 @@ -18,7 +18,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ Modified: vendor/wine/dlls/riched20/current/run.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/run.c?r… ============================================================================== --- vendor/wine/dlls/riched20/current/run.c (original) +++ vendor/wine/dlls/riched20/current/run.c Thu Jun 15 01:47:25 2006 @@ -18,7 +18,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "editor.h" Modified: vendor/wine/dlls/riched20/current/string.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/string.… ============================================================================== --- vendor/wine/dlls/riched20/current/string.c (original) +++ vendor/wine/dlls/riched20/current/string.c Thu Jun 15 01:47:25 2006 @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "editor.h" Modified: vendor/wine/dlls/riched20/current/style.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/style.c… ============================================================================== --- vendor/wine/dlls/riched20/current/style.c (original) +++ vendor/wine/dlls/riched20/current/style.c Thu Jun 15 01:47:25 2006 @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "editor.h" Modified: vendor/wine/dlls/riched20/current/txtsrv.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/txtsrv.… ============================================================================== --- vendor/wine/dlls/riched20/current/txtsrv.c (original) +++ vendor/wine/dlls/riched20/current/txtsrv.c Thu Jun 15 01:47:25 2006 @@ -1,390 +1,391 @@ -/* - * RichEdit - functions and interfaces around CreateTextServices - * - * Copyright 2005, 2006, Maarten Lankhorst - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "config.h" -#include "wine/port.h" - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#define COBJMACROS - -#include "editor.h" -#include "ole2.h" -#include "richole.h" -#include "winreg.h" -#include "imm.h" -#include "textserv.h" -#include "wine/debug.h" -#include "editstr.h" - -#ifdef __i386__ /* thiscall functions are i386-specific */ - -#define THISCALL(func) __thiscall_ ## func -#define DEFINE_THISCALL_WRAPPER(func) \ - extern typeof(func) THISCALL(func); \ - __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) ) -#else /* __i386__ */ - -#define THISCALL(func) func -#define DEFINE_THISCALL_WRAPPER(func) /* nothing */ - -#endif /* __i386__ */ - -WINE_DEFAULT_DEBUG_CHANNEL(richedit); - -typedef struct ITextServicesImpl { - const ITextServicesVtbl *lpVtbl; - ITextHost *pMyHost; - LONG ref; - CRITICAL_SECTION csTxtSrv; -} ITextServicesImpl; - -static const ITextServicesVtbl textservices_Vtbl; - -/****************************************************************** - * CreateTextServices (RICHED20.4) - */ -HRESULT WINAPI CreateTextServices(IUnknown * pUnkOuter, - ITextHost * pITextHost, - IUnknown **ppUnk) -{ - ITextServicesImpl *ITextImpl; - TRACE("%p %p --> %p\n", pUnkOuter, pITextHost, ppUnk); - if (pITextHost == NULL) - return E_POINTER; - - ITextImpl = CoTaskMemAlloc(sizeof(*ITextImpl)); - if (ITextImpl == NULL) - return E_OUTOFMEMORY; - InitializeCriticalSection(&ITextImpl->csTxtSrv); - ITextImpl->ref = 1; - ITextImpl->pMyHost = pITextHost; - ITextImpl->lpVtbl = &textservices_Vtbl; - - if (pUnkOuter) - { - FIXME("Support aggregation\n"); - return CLASS_E_NOAGGREGATION; - } - - *ppUnk = (IUnknown *)ITextImpl; - return S_OK; -} - -#define ICOM_THIS_MULTI(impl,field,iface) \ - impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) - -static HRESULT WINAPI fnTextSrv_QueryInterface(ITextServices * iface, - REFIID riid, - LPVOID * ppv) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextServices)) - *ppv = (LPVOID)This; - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - TRACE ("-- Interface = %p\n", *ppv); - return S_OK; - } - FIXME("Unknown interface: %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI fnTextSrv_AddRef(ITextServices *iface) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - DWORD ref = InterlockedIncrement(&This->ref); - - TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, ref - 1); - return ref; -} - -static ULONG WINAPI fnTextSrv_Release(ITextServices *iface) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - DWORD ref = InterlockedDecrement(&This->ref); - - TRACE("(%p/%p)->() Release from %ld\n", This, iface, ref + 1); - - if (!ref) - { - ITextHost_Release(This->pMyHost); - DeleteCriticalSection(&This->csTxtSrv); - CoTaskMemFree(This); - } - return ref; -} - -HRESULT WINAPI fnTextSrv_TxSendMessage(ITextServices *iface, - UINT msg, - WPARAM wparam, - LPARAM lparam, - LRESULT* plresult) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_TxDraw(ITextServices *iface, - DWORD dwDrawAspect, - LONG lindex, - void* pvAspect, - DVTARGETDEVICE* ptd, - HDC hdcDraw, - HDC hdcTargetDev, - LPCRECTL lprcBounds, - LPCRECTL lprcWBounds, - LPRECT lprcUpdate, - BOOL (CALLBACK * pfnContinue)(DWORD), - DWORD dwContinue, - LONG lViewId) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_TxGetHScroll(ITextServices *iface, - LONG* plMin, - LONG* plMax, - LONG* plPos, - LONG* plPage, - BOOL* pfEnabled) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_TxGetVScroll(ITextServices *iface, - LONG* plMin, - LONG* plMax, - LONG* plPos, - LONG* plPage, - BOOL* pfEnabled) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_OnTxSetCursor(ITextServices *iface, - DWORD dwDrawAspect, - LONG lindex, - void* pvAspect, - DVTARGETDEVICE* ptd, - HDC hdcDraw, - HDC hicTargetDev, - LPCRECT lprcClient, - INT x, INT y) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_TxQueryHitPoint(ITextServices *iface, - DWORD dwDrawAspect, - LONG lindex, - void* pvAspect, - DVTARGETDEVICE* ptd, - HDC hdcDraw, - HDC hicTargetDev, - LPCRECT lprcClient, - INT x, INT y, - DWORD* pHitResult) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_OnTxInplaceActivate(ITextServices *iface, - LPCRECT prcClient) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_OnTxInplaceDeactivate(ITextServices *iface) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_OnTxUIActivate(ITextServices *iface) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_OnTxUIDeactivate(ITextServices *iface) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_TxGetText(ITextServices *iface, - BSTR* pbstrText) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_TxSetText(ITextServices *iface, - LPCWSTR pszText) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_TxGetCurrentTargetX(ITextServices *iface, - LONG* x) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_TxGetBaseLinePos(ITextServices *iface, - LONG* x) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_TxGetNaturalSize(ITextServices *iface, - DWORD dwAspect, - HDC hdcDraw, - HDC hicTargetDev, - DVTARGETDEVICE* ptd, - DWORD dwMode, - const SIZEL* psizelExtent, - LONG* pwidth, - LONG* pheight) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_TxGetDropTarget(ITextServices *iface, - IDropTarget** ppDropTarget) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_OnTxPropertyBitsChange(ITextServices *iface, - DWORD dwMask, - DWORD dwBits) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -HRESULT WINAPI fnTextSrv_TxGetCachedSize(ITextServices *iface, - DWORD* pdwWidth, - DWORD* pdwHeight) -{ - ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - - FIXME("%p: STUB\n", This); - return E_NOTIMPL; -} - -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSendMessage); -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxDraw); -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetHScroll); -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetVScroll); -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxSetCursor); -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxQueryHitPoint); -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceActivate); -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceDeactivate); -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIActivate); -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIDeactivate); -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetText); -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSetText); -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCurrentTargetX); -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetBaseLinePos); -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetNaturalSize); -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget); -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxPropertyBitsChange); -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCachedSize); - -static const ITextServicesVtbl textservices_Vtbl = -{ - fnTextSrv_QueryInterface, - fnTextSrv_AddRef, - fnTextSrv_Release, - THISCALL(fnTextSrv_TxSendMessage), - THISCALL(fnTextSrv_TxDraw), - THISCALL(fnTextSrv_TxGetHScroll), - THISCALL(fnTextSrv_TxGetVScroll), - THISCALL(fnTextSrv_OnTxSetCursor), - THISCALL(fnTextSrv_TxQueryHitPoint), - THISCALL(fnTextSrv_OnTxInplaceActivate), - THISCALL(fnTextSrv_OnTxInplaceDeactivate), - THISCALL(fnTextSrv_OnTxUIActivate), - THISCALL(fnTextSrv_OnTxUIDeactivate), - THISCALL(fnTextSrv_TxGetText), - THISCALL(fnTextSrv_TxSetText), - THISCALL(fnTextSrv_TxGetCurrentTargetX), - THISCALL(fnTextSrv_TxGetBaseLinePos), - THISCALL(fnTextSrv_TxGetNaturalSize), - THISCALL(fnTextSrv_TxGetDropTarget), - THISCALL(fnTextSrv_OnTxPropertyBitsChange), - THISCALL(fnTextSrv_TxGetCachedSize) -}; +/* + * RichEdit - functions and interfaces around CreateTextServices + * + * Copyright 2005, 2006, Maarten Lankhorst + * + * 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 "wine/port.h" + +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#define COBJMACROS + +#include "editor.h" +#include "ole2.h" +#include "richole.h" +#include "winreg.h" +#include "imm.h" +#include "textserv.h" +#include "wine/debug.h" +#include "editstr.h" + +#ifdef __i386__ /* thiscall functions are i386-specific */ + +#define THISCALL(func) __thiscall_ ## func +#define DEFINE_THISCALL_WRAPPER(func) \ + extern typeof(func) THISCALL(func); \ + __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) ) +#else /* __i386__ */ + +#define THISCALL(func) func +#define DEFINE_THISCALL_WRAPPER(func) /* nothing */ + +#endif /* __i386__ */ + +WINE_DEFAULT_DEBUG_CHANNEL(richedit); + +typedef struct ITextServicesImpl { + const ITextServicesVtbl *lpVtbl; + ITextHost *pMyHost; + LONG ref; + CRITICAL_SECTION csTxtSrv; +} ITextServicesImpl; + +static const ITextServicesVtbl textservices_Vtbl; + +/****************************************************************** + * CreateTextServices (RICHED20.4) + */ +HRESULT WINAPI CreateTextServices(IUnknown * pUnkOuter, + ITextHost * pITextHost, + IUnknown **ppUnk) +{ + ITextServicesImpl *ITextImpl; + TRACE("%p %p --> %p\n", pUnkOuter, pITextHost, ppUnk); + if (pITextHost == NULL) + return E_POINTER; + + ITextImpl = CoTaskMemAlloc(sizeof(*ITextImpl)); + if (ITextImpl == NULL) + return E_OUTOFMEMORY; + InitializeCriticalSection(&ITextImpl->csTxtSrv); + ITextImpl->ref = 1; + ITextHost_AddRef(pITextHost); + ITextImpl->pMyHost = pITextHost; + ITextImpl->lpVtbl = &textservices_Vtbl; + + if (pUnkOuter) + { + FIXME("Support aggregation\n"); + return CLASS_E_NOAGGREGATION; + } + + *ppUnk = (IUnknown *)ITextImpl; + return S_OK; +} + +#define ICOM_THIS_MULTI(impl,field,iface) \ + impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) + +static HRESULT WINAPI fnTextSrv_QueryInterface(ITextServices * iface, + REFIID riid, + LPVOID * ppv) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextServices)) + *ppv = (LPVOID)This; + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)(*ppv)); + TRACE ("-- Interface = %p\n", *ppv); + return S_OK; + } + FIXME("Unknown interface: %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI fnTextSrv_AddRef(ITextServices *iface) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + DWORD ref = InterlockedIncrement(&This->ref); + + TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, ref - 1); + return ref; +} + +static ULONG WINAPI fnTextSrv_Release(ITextServices *iface) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + DWORD ref = InterlockedDecrement(&This->ref); + + TRACE("(%p/%p)->() Release from %ld\n", This, iface, ref + 1); + + if (!ref) + { + ITextHost_Release(This->pMyHost); + DeleteCriticalSection(&This->csTxtSrv); + CoTaskMemFree(This); + } + return ref; +} + +HRESULT WINAPI fnTextSrv_TxSendMessage(ITextServices *iface, + UINT msg, + WPARAM wparam, + LPARAM lparam, + LRESULT* plresult) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_TxDraw(ITextServices *iface, + DWORD dwDrawAspect, + LONG lindex, + void* pvAspect, + DVTARGETDEVICE* ptd, + HDC hdcDraw, + HDC hdcTargetDev, + LPCRECTL lprcBounds, + LPCRECTL lprcWBounds, + LPRECT lprcUpdate, + BOOL (CALLBACK * pfnContinue)(DWORD), + DWORD dwContinue, + LONG lViewId) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_TxGetHScroll(ITextServices *iface, + LONG* plMin, + LONG* plMax, + LONG* plPos, + LONG* plPage, + BOOL* pfEnabled) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_TxGetVScroll(ITextServices *iface, + LONG* plMin, + LONG* plMax, + LONG* plPos, + LONG* plPage, + BOOL* pfEnabled) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_OnTxSetCursor(ITextServices *iface, + DWORD dwDrawAspect, + LONG lindex, + void* pvAspect, + DVTARGETDEVICE* ptd, + HDC hdcDraw, + HDC hicTargetDev, + LPCRECT lprcClient, + INT x, INT y) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_TxQueryHitPoint(ITextServices *iface, + DWORD dwDrawAspect, + LONG lindex, + void* pvAspect, + DVTARGETDEVICE* ptd, + HDC hdcDraw, + HDC hicTargetDev, + LPCRECT lprcClient, + INT x, INT y, + DWORD* pHitResult) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_OnTxInplaceActivate(ITextServices *iface, + LPCRECT prcClient) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_OnTxInplaceDeactivate(ITextServices *iface) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_OnTxUIActivate(ITextServices *iface) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_OnTxUIDeactivate(ITextServices *iface) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_TxGetText(ITextServices *iface, + BSTR* pbstrText) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_TxSetText(ITextServices *iface, + LPCWSTR pszText) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_TxGetCurrentTargetX(ITextServices *iface, + LONG* x) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_TxGetBaseLinePos(ITextServices *iface, + LONG* x) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_TxGetNaturalSize(ITextServices *iface, + DWORD dwAspect, + HDC hdcDraw, + HDC hicTargetDev, + DVTARGETDEVICE* ptd, + DWORD dwMode, + const SIZEL* psizelExtent, + LONG* pwidth, + LONG* pheight) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_TxGetDropTarget(ITextServices *iface, + IDropTarget** ppDropTarget) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_OnTxPropertyBitsChange(ITextServices *iface, + DWORD dwMask, + DWORD dwBits) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +HRESULT WINAPI fnTextSrv_TxGetCachedSize(ITextServices *iface, + DWORD* pdwWidth, + DWORD* pdwHeight) +{ + ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + + FIXME("%p: STUB\n", This); + return E_NOTIMPL; +} + +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSendMessage); +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxDraw); +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetHScroll); +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetVScroll); +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxSetCursor); +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxQueryHitPoint); +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceActivate); +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceDeactivate); +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIActivate); +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIDeactivate); +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetText); +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSetText); +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCurrentTargetX); +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetBaseLinePos); +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetNaturalSize); +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget); +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxPropertyBitsChange); +DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCachedSize); + +static const ITextServicesVtbl textservices_Vtbl = +{ + fnTextSrv_QueryInterface, + fnTextSrv_AddRef, + fnTextSrv_Release, + THISCALL(fnTextSrv_TxSendMessage), + THISCALL(fnTextSrv_TxDraw), + THISCALL(fnTextSrv_TxGetHScroll), + THISCALL(fnTextSrv_TxGetVScroll), + THISCALL(fnTextSrv_OnTxSetCursor), + THISCALL(fnTextSrv_TxQueryHitPoint), + THISCALL(fnTextSrv_OnTxInplaceActivate), + THISCALL(fnTextSrv_OnTxInplaceDeactivate), + THISCALL(fnTextSrv_OnTxUIActivate), + THISCALL(fnTextSrv_OnTxUIDeactivate), + THISCALL(fnTextSrv_TxGetText), + THISCALL(fnTextSrv_TxSetText), + THISCALL(fnTextSrv_TxGetCurrentTargetX), + THISCALL(fnTextSrv_TxGetBaseLinePos), + THISCALL(fnTextSrv_TxGetNaturalSize), + THISCALL(fnTextSrv_TxGetDropTarget), + THISCALL(fnTextSrv_OnTxPropertyBitsChange), + THISCALL(fnTextSrv_TxGetCachedSize) +}; Modified: vendor/wine/dlls/riched20/current/undo.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/undo.c?… ============================================================================== --- vendor/wine/dlls/riched20/current/undo.c (original) +++ vendor/wine/dlls/riched20/current/undo.c Thu Jun 15 01:47:25 2006 @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "editor.h" @@ -32,7 +32,8 @@ TRACE("Emptying undo stack\n"); p = editor->pUndoStack; - editor->pUndoStack = NULL; + editor->pUndoStack = editor->pUndoStackBottom = NULL; + editor->nUndoStackSize = 0; while(p) { pNext = p->next; ME_DestroyDisplayItem(p); @@ -50,6 +51,8 @@ ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, ME_DisplayItem *pdi) { if (editor->nUndoMode == umIgnore) return NULL; + else if (editor->nUndoLimit == 0) + return NULL; else { ME_DisplayItem *pItem = (ME_DisplayItem *)ALLOC_OBJ(ME_UndoItem); @@ -93,10 +96,31 @@ TRACE("Pushing id=%s to undo stack, deleting redo stack\n", ME_GetDITypeName(type)); else TRACE("Pushing id=%s to undo stack\n", ME_GetDITypeName(type)); + pItem->next = editor->pUndoStack; + if (type == diUndoEndTransaction) + editor->nUndoStackSize++; if (editor->pUndoStack) editor->pUndoStack->prev = pItem; + else + editor->pUndoStackBottom = pItem; editor->pUndoStack = pItem; + + if (editor->nUndoStackSize > editor->nUndoLimit) + { /* remove oldest undo from stack */ + ME_DisplayItem *p = editor->pUndoStackBottom; + while (p->type !=diUndoEndTransaction) + p = p->prev; /*find new stack bottom */ + editor->pUndoStackBottom = p->prev; + editor->pUndoStackBottom->next = NULL; + do + { + ME_DisplayItem *pp = p->next; + ME_DestroyDisplayItem(p); + p = pp; + } while (p); + editor->nUndoStackSize--; + } /* any new operation (not redo) clears the redo stack */ if (editor->nUndoMode == umAddToUndo) { ME_DisplayItem *p = editor->pRedoStack; @@ -233,6 +257,7 @@ } while(p && p->type != diUndoEndTransaction); ME_AddUndoItem(editor, diUndoEndTransaction, NULL); editor->pUndoStack = p; + editor->nUndoStackSize--; if (p) p->prev = NULL; editor->nUndoMode = nMode; Added: vendor/wine/dlls/riched20/current/version.rc URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/version… ============================================================================== --- vendor/wine/dlls/riched20/current/version.rc (added) +++ vendor/wine/dlls/riched20/current/version.rc Thu Jun 15 01:47:25 2006 @@ -1,0 +1,26 @@ +/* + * Copyright (c) 2006 Mike McCormack + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Richedit dll" +#define WINE_FILENAME_STR "riched20.dll" +#define WINE_FILEVERSION 5,30,23,1215 +#define WINE_FILEVERSION_STR "5,30,23,1215" +#define WINE_PRODUCTVERSION 5,30,23,1215 +#define WINE_PRODUCTVERSION_STR "5,30,23,1215" + +#include "wine/wine_common_ver.rc" Modified: vendor/wine/dlls/riched20/current/wrap.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/wrap.c?… ============================================================================== --- vendor/wine/dlls/riched20/current/wrap.c (original) +++ vendor/wine/dlls/riched20/current/wrap.c Thu Jun 15 01:47:25 2006 @@ -16,7 +16,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ Modified: vendor/wine/dlls/riched20/current/writer.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/riched20/current/writer.… ============================================================================== --- vendor/wine/dlls/riched20/current/writer.c (original) +++ vendor/wine/dlls/riched20/current/writer.c Thu Jun 15 01:47:25 2006 @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "editor.h" @@ -782,8 +782,7 @@ nSize = WideCharToMultiByte(nCodePage, 0, item->member.run.strText->szData + nStart, nLen, NULL, 0, NULL, NULL); if (nSize > nBufLen) { - if (buffer) - FREE_OBJ(buffer); + FREE_OBJ(buffer); buffer = ALLOC_N_OBJ(char, nSize); nBufLen = nSize; } @@ -800,8 +799,7 @@ item = ME_FindItemFwd(item, diRun); } - if (buffer) - FREE_OBJ(buffer); + FREE_OBJ(buffer); return success; }

1 0

[fireball] 22349: - Johannes Anderwald and Thomas Weidenmueller: WIN32K: window class fixes (bug 1570) - Reduces user32_winetest class failures from 85 to 64 - The patch doesn't introduce obvious regressions (reactos boots, explorer works, miranda and mirc loads)
by fireball＠svn.reactos.org 14 Jun '06

14 Jun '06

Author: fireball Date: Thu Jun 15 01:03:34 2006 New Revision: 22349 URL: http://svn.reactos.ru/svn/reactos?rev=22349&view=rev Log: - Johannes Anderwald and Thomas Weidenmueller: WIN32K: window class fixes (bug 1570) - Reduces user32_winetest class failures from 85 to 64 - The patch doesn't introduce obvious regressions (reactos boots, explorer works, miranda and mirc loads) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Thu Jun 15 01:03:34 2006 @@ -1366,7 +1366,7 @@ ClassName->Buffer, &BufLen); - if (NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { SetLastNtError(Status); _SEH_LEAVE; @@ -1396,7 +1396,7 @@ { ULONG_PTR Ret = 0; - if (Index > 0) + if (Index >= 0) { PULONG_PTR Data; @@ -1407,7 +1407,7 @@ return 0; } - Data = (PULONG_PTR)((ULONG_PTR)Class + Class->ClassExtraDataOffset); + Data = (PULONG_PTR)((ULONG_PTR)Class + Class->ClassExtraDataOffset + Index); /* FIXME - Data might be a unaligned pointer! Might be a problem on certain architectures, maybe using RtlCopyMemory is a @@ -1592,7 +1592,7 @@ /* change the information in the base class first, then update the clones */ Class = Class->Base; - if (Index > 0) + if (Index >= 0) { PULONG_PTR Data; @@ -1603,7 +1603,7 @@ return 0; } - Data = (PULONG_PTR)((ULONG_PTR)Class + Class->ClassExtraDataOffset); + Data = (PULONG_PTR)((ULONG_PTR)Class + Class->ClassExtraDataOffset + Index); /* FIXME - Data might be a unaligned pointer! Might be a problem on certain architectures, maybe using RtlCopyMemory is a @@ -1615,7 +1615,7 @@ Class = Class->Clone; while (Class != NULL) { - *(PULONG_PTR)((ULONG_PTR)Class + Class->ClassExtraDataOffset) = NewLong; + *(PULONG_PTR)((ULONG_PTR)Class + Class->ClassExtraDataOffset + Index) = NewLong; Class = Class->Next; } @@ -2170,6 +2170,9 @@ (PVOID)Class->AnsiMenuName : (PVOID)Class->MenuName)); } + + /* Undocumented behavior! Return the class atom as a BOOL! */ + Ret = (BOOL)ClassAtom; } } }

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