Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[gvg] 15018: Sync to Wine-20050419:

by gvg＠svn.reactos.com

Sync to Wine-20050419: Robert Shearman <rob(a)codeweavers.com> - Fix deadlock caused by not leaving the critical section on all code paths. - RpcMgmtStopServerListen should not affect auto-listen interfaces. - Implement stub for RpcRevertToSelfEx. - Change the more verbose files to use a new debug channel, "rpc." Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Jakob Eriksson <jakov(a)vmlinux.org> - Get rid of HeapAlloc casts. Ralf S. Engelschall <rse(a)engelschall.com> - Fix incorrect random multicast MAC address creation. Modified: trunk/reactos/lib/rpcrt4/ndr_midl.c Modified: trunk/reactos/lib/rpcrt4/rpc_binding.c Modified: trunk/reactos/lib/rpcrt4/rpc_message.c Modified: trunk/reactos/lib/rpcrt4/rpc_server.c Modified: trunk/reactos/lib/rpcrt4/rpcrt4.spec Modified: trunk/reactos/lib/rpcrt4/rpcrt4_main.c _____ Modified: trunk/reactos/lib/rpcrt4/ndr_midl.c --- trunk/reactos/lib/rpcrt4/ndr_midl.c 2005-05-05 19:15:25 UTC (rev 15017) +++ trunk/reactos/lib/rpcrt4/ndr_midl.c 2005-05-05 19:17:25 UTC (rev 15018) @@ -44,7 +44,7 @@ #include "ndr_misc.h" #include "rpcndr.h" -WINE_DEFAULT_DEBUG_CHANNEL(ole); +WINE_DEFAULT_DEBUG_CHANNEL(rpc); /*********************************************************************** * NdrProxyInitialize [RPCRT4.@] _____ Modified: trunk/reactos/lib/rpcrt4/rpc_binding.c --- trunk/reactos/lib/rpcrt4/rpc_binding.c 2005-05-05 19:15:25 UTC (rev 15017) +++ trunk/reactos/lib/rpcrt4/rpc_binding.c 2005-05-05 19:17:25 UTC (rev 15018) @@ -44,7 +44,7 @@ #include "rpc_binding.h" #include "rpc_message.h" -WINE_DEFAULT_DEBUG_CHANNEL(ole); +WINE_DEFAULT_DEBUG_CHANNEL(rpc); LPSTR RPCRT4_strndupA(LPCSTR src, INT slen) { @@ -462,7 +462,7 @@ RPCRT4_DestroyConnection(Binding->FromConn); Binding->FromConn = NULL; } else { - /* we already have an connection with acceptable binding, so use it */ + /* we already have a connection with acceptable binding, so use it */ if (Binding->FromConn) { *Connection = Binding->FromConn; return RPC_S_OK; @@ -1118,9 +1118,38 @@ * RETURNS * Success: RPS_S_OK. * Failure: RPC_STATUS value. + * + * NOTES + * + * If BindingHandle is NULL then the function impersonates the client + * connected to the binding handle of the current thread. */ RPC_STATUS WINAPI RpcImpersonateClient(RPC_BINDING_HANDLE BindingHandle) { FIXME("(%p): stub\n", BindingHandle); - return RPC_S_NO_CONTEXT_AVAILABLE; + return RPC_S_OK; } + +/********************************************************************** * + * RpcRevertToSelfEx (RPCRT4.@) + * + * Stops impersonating the client connected to the binding handle so that security + * checks are no longer done in the context of the client. + * + * PARAMS + * BindingHandle [I] Handle to the binding to the client. + * + * RETURNS + * Success: RPS_S_OK. + * Failure: RPC_STATUS value. + * + * NOTES + * + * If BindingHandle is NULL then the function stops impersonating the client + * connected to the binding handle of the current thread. + */ +RPC_STATUS WINAPI RpcRevertToSelfEx(RPC_BINDING_HANDLE BindingHandle) +{ + FIXME("(%p): stub\n", BindingHandle); + return RPC_S_OK; +} _____ Modified: trunk/reactos/lib/rpcrt4/rpc_message.c --- trunk/reactos/lib/rpcrt4/rpc_message.c 2005-05-05 19:15:25 UTC (rev 15017) +++ trunk/reactos/lib/rpcrt4/rpc_message.c 2005-05-05 19:17:25 UTC (rev 15018) @@ -42,7 +42,7 @@ #include "rpc_misc.h" #include "rpc_defs.h" -WINE_DEFAULT_DEBUG_CHANNEL(ole); +WINE_DEFAULT_DEBUG_CHANNEL(rpc); DWORD RPCRT4_GetHeaderSize(RpcPktHdr *Header) { _____ Modified: trunk/reactos/lib/rpcrt4/rpc_server.c --- trunk/reactos/lib/rpcrt4/rpc_server.c 2005-05-05 19:15:25 UTC (rev 15017) +++ trunk/reactos/lib/rpcrt4/rpc_server.c 2005-05-05 19:17:25 UTC (rev 15018) @@ -50,7 +50,7 @@ #define MAX_THREADS 128 -WINE_DEFAULT_DEBUG_CHANNEL(ole); +WINE_DEFAULT_DEBUG_CHANNEL(rpc); typedef struct _RpcPacket { @@ -91,8 +91,12 @@ }; static CRITICAL_SECTION listen_cs = { &listen_cs_debug, -1, 0, 0, 0, 0 }; +/* whether the server is currently listening */ static BOOL std_listen; -static LONG listen_count = -1; +/* number of manual listeners (calls to RpcServerListen) */ +static LONG manual_listen_count; +/* total listeners including auto listeners */ +static LONG listen_count; /* set on change of configuration (e.g. listening on new protseq) */ static HANDLE mgr_event; /* mutex for ensuring only one thread can change state at a time */ @@ -156,7 +160,7 @@ while (cif) { if (!memcmp(if_id, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER)) && (check_object == FALSE || UuidEqual(MgrType, &cif->MgrTypeUuid, &status)) && - (std_listen || (cif->Flags & RPC_IF_AUTOLISTEN))) break; + std_listen) break; cif = cif->Next; } LeaveCriticalSection(&server_cs); @@ -583,38 +587,45 @@ ReleaseMutex(mgr_mutex); } -static void RPCRT4_start_listen(void) +static void RPCRT4_start_listen(BOOL auto_listen) { TRACE("\n"); EnterCriticalSection(&listen_cs); - if (! ++listen_count) { - if (!mgr_mutex) mgr_mutex = CreateMutexW(NULL, FALSE, NULL); - if (!mgr_event) mgr_event = CreateEventW(NULL, FALSE, FALSE, NULL); - if (!server_ready_event) server_ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); - if (!server_sem) server_sem = CreateSemaphoreW(NULL, 0, MAX_THREADS, NULL); - if (!worker_tls) worker_tls = TlsAlloc(); - std_listen = TRUE; - server_thread = CreateThread(NULL, 0, RPCRT4_server_thread, NULL, 0, NULL); - LeaveCriticalSection(&listen_cs); - } else { - LeaveCriticalSection(&listen_cs); - RPCRT4_sync_with_server_thread(); + if (auto_listen || (manual_listen_count++ == 0)) + { + if (++listen_count == 1) { + /* first listener creates server thread */ + if (!mgr_mutex) mgr_mutex = CreateMutexW(NULL, FALSE, NULL); + if (!mgr_event) mgr_event = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!server_ready_event) server_ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!server_sem) server_sem = CreateSemaphoreW(NULL, 0, MAX_THREADS, NULL); + if (!worker_tls) worker_tls = TlsAlloc(); + std_listen = TRUE; + server_thread = CreateThread(NULL, 0, RPCRT4_server_thread, NULL, 0, NULL); + } else { + LeaveCriticalSection(&listen_cs); + RPCRT4_sync_with_server_thread(); + return; + } } + LeaveCriticalSection(&listen_cs); } -static void RPCRT4_stop_listen(void) +static void RPCRT4_stop_listen(BOOL auto_listen) { EnterCriticalSection(&listen_cs); - if (listen_count == -1) - LeaveCriticalSection(&listen_cs); - else if (--listen_count == -1) { - std_listen = FALSE; - LeaveCriticalSection(&listen_cs); - RPCRT4_sync_with_server_thread(); - } else - LeaveCriticalSection(&listen_cs); - assert(listen_count > -2); + if (auto_listen || (--manual_listen_count == 0)) + { + if (listen_count != 0 && --listen_count == 0) { + std_listen = FALSE; + LeaveCriticalSection(&listen_cs); + RPCRT4_sync_with_server_thread(); + return; + } + assert(listen_count >= 0); + } + LeaveCriticalSection(&listen_cs); } static RPC_STATUS RPCRT4_use_protseq(RpcServerProtseq* ps) @@ -847,7 +858,7 @@ if (sif->Flags & RPC_IF_AUTOLISTEN) { /* well, start listening, I think... */ - RPCRT4_start_listen(); + RPCRT4_start_listen(TRUE); } return RPC_S_OK; @@ -978,7 +989,7 @@ return RPC_S_ALREADY_LISTENING; } - RPCRT4_start_listen(); + RPCRT4_start_listen(FALSE); LeaveCriticalSection(&listen_cs); @@ -1029,11 +1040,7 @@ return RPC_S_WRONG_KIND_OF_BINDING; } - /* hmm... */ - EnterCriticalSection(&listen_cs); - while (std_listen) - RPCRT4_stop_listen(); - LeaveCriticalSection(&listen_cs); + RPCRT4_stop_listen(FALSE); return RPC_S_OK; } _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4.spec --- trunk/reactos/lib/rpcrt4/rpcrt4.spec 2005-05-05 19:15:25 UTC (rev 15017) +++ trunk/reactos/lib/rpcrt4/rpcrt4.spec 2005-05-05 19:17:25 UTC (rev 15018) @@ -112,7 +112,7 @@ @ stdcall RpcRaiseException(long) @ stub RpcRegisterAsyncInfo @ stub RpcRevertToSelf -@ stub RpcRevertToSelfEx +@ stdcall RpcRevertToSelfEx(ptr) @ stdcall RpcServerInqBindings(ptr) @ stub RpcServerInqCallAttributesA # wxp @ stub RpcServerInqCallAttributesW # wxp _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4_main.c --- trunk/reactos/lib/rpcrt4/rpcrt4_main.c 2005-05-05 19:15:25 UTC (rev 15017) +++ trunk/reactos/lib/rpcrt4/rpcrt4_main.c 2005-05-05 19:17:25 UTC (rev 15018) @@ -114,7 +114,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(ole); +WINE_DEFAULT_DEBUG_CHANNEL(rpc); static UUID uuid_nil; static HANDLE master_mutex; @@ -328,11 +328,11 @@ DWORD status = RPC_S_OK; ULONG buflen = sizeof(IP_ADAPTER_INFO); - PIP_ADAPTER_INFO adapter = (PIP_ADAPTER_INFO)HeapAlloc(GetProcessHeap(), 0, buflen); + PIP_ADAPTER_INFO adapter = HeapAlloc(GetProcessHeap(), 0, buflen); if (GetAdaptersInfo(adapter, &buflen) == ERROR_BUFFER_OVERFLOW) { HeapFree(GetProcessHeap(), 0, adapter); - adapter = (IP_ADAPTER_INFO *)HeapAlloc(GetProcessHeap(), 0, buflen); + adapter = HeapAlloc(GetProcessHeap(), 0, buflen); } if (GetAdaptersInfo(adapter, &buflen) == NO_ERROR) { @@ -347,7 +347,7 @@ address[i] = rand() & 0xff; } - address[0] |= 0x80; + address[0] |= 0x01; status = RPC_S_UUID_LOCAL_ONLY; }

19 years, 4 months

[chorns] 15017: Merge 14551:14980 from trunk

by chorns＠svn.reactos.com

Merge 14551:14980 from trunk Modified: branches/xmlbuildsystem/reactos/apps/utils/net/finger/net.c Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/fake.c Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.c Modified: branches/xmlbuildsystem/reactos/apps/utils/ps/ps.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/FREELDR.INI Modified: branches/xmlbuildsystem/reactos/boot/freeldr/Makefile Modified: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile.powerpc Modified: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/fat.asm Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/arch.S Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/archmach. c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/boot.S Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hardware. c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Added: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/i386.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/i386disk. c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/linux.S Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/machpc.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/machxbox. c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/machxbox. h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/bootmgr.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/custom.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/disk/disk.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/disk/partition.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/drivemap.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/ext2.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/ext2.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/fat.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/fat.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/fs.c Deleted: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/fsrec.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/iso.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/iso.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/ntfs.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/bootmgr.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/disk.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/drivemap.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/fs.h Added: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/fsrec.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/inifile.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/linux.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/machine.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/miscboot.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/multiboot.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/oslist.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/reactos.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/ui.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/version.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/inifile/ini.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/inifile/ini_init.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/inifile/inifile.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/inifile/parse.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/linuxboot.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/machine.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/miscboot.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/options.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/oslist.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/reactos/arcname.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/reactos/binhive.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/reactos/registry.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/reactos/registry.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/ui/tui.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/ui/tui.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/ui/tuimenu.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/ui/ui.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/version.c Modified: branches/xmlbuildsystem/reactos/bootdata/hivesft.inf Modified: branches/xmlbuildsystem/reactos/bootdata/hivesys.inf Modified: branches/xmlbuildsystem/reactos/bootdata/packages/reactos.dff Modified: branches/xmlbuildsystem/reactos/bootdata/txtsetup.sif Modified: branches/xmlbuildsystem/reactos/drivers/bus/serenum/detect.c Modified: branches/xmlbuildsystem/reactos/drivers/bus/serenum/fdo.c Modified: branches/xmlbuildsystem/reactos/drivers/bus/serenum/misc.c Modified: branches/xmlbuildsystem/reactos/drivers/bus/serenum/pdo.c Modified: branches/xmlbuildsystem/reactos/drivers/bus/serenum/serenum.c Modified: branches/xmlbuildsystem/reactos/drivers/bus/serenum/serenum.h Added: branches/xmlbuildsystem/reactos/drivers/dd/green/ Deleted: branches/xmlbuildsystem/reactos/drivers/dd/sdisk/ Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/circularbuffer.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/create.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/devctrl.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/info.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/misc.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/pnp.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/rw.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.h Modified: branches/xmlbuildsystem/reactos/drivers/fs/ms/create.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/fsctrl.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/fsctl.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/shutdown.c [truncated at 100 lines; 721 more skipped] _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/finger/net.c --- branches/xmlbuildsystem/reactos/apps/utils/net/finger/net.c 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/apps/utils/net/finger/net.c 2005-05-05 19:15:25 UTC (rev 15017) @@ -33,7 +33,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - #include <sys/types.h> #include <winsock2.h> #include "unistd.h" @@ -52,14 +51,14 @@ struct hostent *hp, def; struct servent *sp; struct sockaddr_in sin; - int s; + SOCKET s; char *alist[1], *host; /* If this is a local request */ if (!(host = rindex(name, '@'))) return; - *host++ = 0; + *host++ = '\0'; if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != -1) { def.h_name = host; def.h_addr_list = alist; @@ -80,7 +79,7 @@ sin.sin_family = hp->h_addrtype; bcopy(hp->h_addr, (char *)&sin.sin_addr, hp->h_length); sin.sin_port = sp->s_port; - if ((s = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) { + if ((s = socket(hp->h_addrtype, SOCK_STREAM, 0)) == INVALID_SOCKET) { perror("finger: socket"); return; } _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/fake.c --- branches/xmlbuildsystem/reactos/apps/utils/net/ftp/fake.c 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ftp/fake.c 2005-05-05 19:15:25 UTC (rev 15017) @@ -235,7 +235,7 @@ static char input[256]; HANDLE in; HANDLE err; - int count; + DWORD count; in = GetStdHandle (STD_INPUT_HANDLE); err = GetStdHandle (STD_ERROR_HANDLE); _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.c --- branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.c 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.c 2005-05-05 19:15:25 UTC (rev 15017) @@ -97,7 +97,7 @@ sig_t lostpeer(); off_t restart_point = 0; -int cin, cout; +SOCKET cin, cout; int dataconn(char *mode); int command(char *fmt, ...); @@ -113,7 +113,8 @@ char *hookup(char *host, int port) { register struct hostent *hp = 0; - int s,len; + int len; + SOCKET s; static char hostnamebuf[80]; bzero((char *)&hisctladdr, sizeof (hisctladdr)); @@ -136,7 +137,7 @@ } hostname = hostnamebuf; s = socket(hisctladdr.sin_family, SOCK_STREAM, 0); - if (s < 0) { + if (s == INVALID_SOCKET) { perror("ftp: socket"); code = -1; return (0); @@ -1327,8 +1328,8 @@ char name[MAXHOSTNAMELEN]; struct sockaddr_in mctl; struct sockaddr_in hctl; - FILE *in; - FILE *out; + SOCKET in; + SOCKET out; int tpe; int cpnd; int sunqe; @@ -1371,10 +1372,10 @@ hisctladdr = op->hctl; ip->mctl = myctladdr; myctladdr = op->mctl; - (int) ip->in = cin; // What the hell am I looking at...? - cin = (int) op->in; - (int) ip->out = cout; // Same again... - cout = (int) op->out; + ip->in = cin; + cin = op->in; + ip->out = cout; + cout = op->out; ip->tpe = type; type = op->tpe; if (!type) _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/ps/ps.c --- branches/xmlbuildsystem/reactos/apps/utils/ps/ps.c 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/apps/utils/ps/ps.c 2005-05-05 19:15:25 UTC (rev 15017) @@ -110,8 +110,8 @@ DWORD r; ANSI_STRING astring; HANDLE stdout = GetStdHandle(STD_OUTPUT_HANDLE); - PSYSTEM_PROCESSES SystemProcesses = NULL; - PSYSTEM_PROCESSES CurrentProcess; + PSYSTEM_PROCESS_INFORMATION SystemProcesses = NULL; + PSYSTEM_PROCESS_INFORMATION CurrentProcess; ULONG BufferSize, ReturnSize; NTSTATUS Status; char buf[256]; @@ -140,7 +140,7 @@ /* For every process print the information. */ CurrentProcess = SystemProcesses; - while (CurrentProcess->NextEntryDelta != 0) + while (CurrentProcess->NextEntryOffset != 0) { int hour, hour1, thour, thour1; unsigned char minute, minute1, tmin, tmin1; @@ -159,53 +159,53 @@ minute1 = (ptime.QuadPart / (10000000LL * 60LL)) % 60LL; seconds1 = (ptime.QuadPart / 10000000LL) % 60LL; - RtlUnicodeStringToAnsiString(&astring, &CurrentProcess->ProcessName, TRUE); + RtlUnicodeStringToAnsiString(&astring, &CurrentProcess->ImageName, TRUE); wsprintf(buf,"P%8d %8d %3d:%02d:%02d %3d:%02d:%02d ProcName: %s\n", - CurrentProcess->ProcessId, CurrentProcess->InheritedFromProcessId, + CurrentProcess->UniqueProcessId, CurrentProcess->InheritedFromUniqueProcessId, hour, minute, seconds, hour1, minute1, seconds1, astring.Buffer); WriteFile(stdout, buf, lstrlen(buf), &r, NULL); RtlFreeAnsiString(&astring); - for (ti = 0; ti < CurrentProcess->ThreadCount; ti++) + for (ti = 0; ti < CurrentProcess->NumberOfThreads; ti++) { struct status *statt; struct waitres *waitt; char szWindowName[30] = {" "}; - ptime = CurrentProcess->Threads[ti].KernelTime; + ptime = CurrentProcess->TH[ti].KernelTime; thour = (ptime.QuadPart / (10000000LL * 3600LL)); tmin = (ptime.QuadPart / (10000000LL * 60LL)) % 60LL; tsec = (ptime.QuadPart / 10000000LL) % 60LL; - ptime = CurrentProcess->Threads[ti].UserTime; + ptime = CurrentProcess->TH[ti].UserTime; thour1 = (ptime.QuadPart / (10000000LL * 3600LL)); tmin1 = (ptime.QuadPart / (10000000LL * 60LL)) % 60LL; tsec1 = (ptime.QuadPart / 10000000LL) % 60LL; statt = thread_stat; - while (statt->state != CurrentProcess->Threads[ti].State && statt->state >= 0) + while (statt->state != CurrentProcess->TH[ti].ThreadState && statt->state >= 0) statt++; waitt = waitreason; - while (waitt->state != CurrentProcess->Threads[ti].WaitReason && waitt->state >= 0) + while (waitt->state != CurrentProcess->TH[ti].WaitReason && waitt->state >= 0) waitt++; wsprintf (buf1, "t% %8d %3d:%02d:%02d %3d:%02d:%02d %s %s\n", - CurrentProcess->Threads[ti].ClientId.UniqueThread, + CurrentProcess->TH[ti].ClientId.UniqueThread, thour, tmin, tsec, thour1, tmin1, tsec1, statt->desc , waitt->desc); WriteFile(stdout, buf1, lstrlen(buf1), &r, NULL); - EnumThreadWindows((DWORD)CurrentProcess->Threads[ti].ClientId.UniqueThre ad, + EnumThreadWindows((DWORD)CurrentProcess->TH[ti].ClientId.UniqueThread, (ENUMWINDOWSPROC) EnumThreadProc, (LPARAM)(LPTSTR) szWindowName ); } - CurrentProcess = (PSYSTEM_PROCESSES)((ULONG_PTR)CurrentProcess + - CurrentProcess->NextEntryDelta); + CurrentProcess = (PSYSTEM_PROCESS_INFORMATION)((ULONG_PTR)CurrentProcess + + CurrentProcess->NextEntryOffset); } return (0); } _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/FREELDR.INI --- branches/xmlbuildsystem/reactos/boot/freeldr/FREELDR.INI 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/boot/freeldr/FREELDR.INI 2005-05-05 19:15:25 UTC (rev 15017) @@ -51,8 +51,7 @@ ; [OS-General] Section Commands: ; ; BootType - sets the boot type: ReactOS, Linux, BootSector, Partition, Drive -; BootDrive - sets the boot drive: 0 - first floppy, 1 - second floppy, 0x80 - first hard disk, 0x81 - second hard disk -; BootPartition - sets the boot partition +; BootPath - ARC path e.g. multi(0)disk(0)rdisk(x)partition(y) ; DriveMap - maps a BIOS drive number to another (i.e. DriveMap=hd1,hd0 maps harddisk1 to harddisk0 or DriveMap=fd1,fd0) ; [BootSector OSType] Section Commands: @@ -134,8 +133,7 @@ [Linux] BootType=Linux -BootDrive=hd1 -BootPartition=1 +BootPath=multi(0)disk(0)rdisk(1)partition(1) Kernel=/vmlinuz Initrd=/initrd.img CommandLine="root=/dev/sdb1" @@ -146,13 +144,11 @@ [MSWinders] BootType=Partition -BootDrive=hd0 -BootPartition=1 +BootPath=multi(0)disk(0)rdisk(0)partition(1) ;DriveMap=hd1,hd0 ;DriveMap=hd2,hd0 ;DriveMap=hd3,hd0 [DriveD] BootType=Partition -BootDrive=hd1 -BootPartition=1 +BootPath=multi(0)disk(0)rdisk(1)partition(1) _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/Makefile --- branches/xmlbuildsystem/reactos/boot/freeldr/Makefile 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/boot/freeldr/Makefile 2005-05-05 19:15:25 UTC (rev 15017) @@ -20,6 +20,7 @@ PATH_TO_TOP = ../.. include rules.mak +include $(PATH_TO_TOP)/config all: $(MAKE) -C tools _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile.powerpc --- branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile.powerpc 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile.powerpc 2005-05-05 19:15:25 UTC (rev 15017) @@ -27,8 +27,8 @@ rm freeldr.tmp ofwldr: $(OBJS) - mppcw32-ld --no-omagic $(LDSECT) $(OBJS) -g -o $@.elf - mppcw32-objcopy $(SECTIONS) -O aixcoff-rs6000 $@.elf $@ + $(LD) -melf32ppc --no-omagic $(LDSECT) $(OBJS) -g -o $@.elf + $(OBJCOPY) $(SECTIONS) -O aixcoff-rs6000 $@.elf $@ $(TOOLS)/hack-coff $@ clean: _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/fat.asm --- branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/fat.asm 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/fat.asm 2005-05-05 19:15:25 UTC (rev 15017) @@ -89,9 +89,6 @@ mov es,ax ; Make ES correct - cmp BYTE [BYTE bp+BootDrive],BYTE 0xff ; If they have specified a boot drive then use it - jne GetDriveParameters - mov [BYTE bp+BootDrive],dl ; Save the boot drive _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/arch.S --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/arch.S 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/arch.S 2005-05-05 19:15:25 UTC (rev 15017) @@ -47,10 +47,10 @@ .code32 /* Store the boot drive */ - movb %dl,(_BootDrive) + movb %dl,(_i386BootDrive) /* Store the boot partition */ - movb %dh,(_BootPartition) + movb %dh,(_i386BootPartition) /* GO! */ xorl %eax,%eax @@ -275,9 +275,11 @@ * other boot loaders like Grub */ +#define MB_INFO_SIZE 90 #define MB_INFO_FLAGS_OFFSET 0 #define MB_INFO_BOOT_DEVICE_OFFSET 12 #define MB_INFO_COMMAND_LINE_OFFSET 16 +#define CMDLINE_SIZE 256 /* * We want to execute at 0x8000 (to be compatible with bootsector @@ -285,7 +287,6 @@ * above 1MB. So we let Grub load us there and then relocate * ourself to 0x8000 */ -#define CMDLINE_BASE 0x7000 #define FREELDR_BASE 0x8000 #define INITIAL_BASE 0x200000 @@ -328,6 +329,31 @@ movw %dx,%ds movw %dx,%es + /* Check for valid multiboot signature */ + cmpl $MULTIBOOT_BOOTLOADER_MAGIC,%eax + jne mbfail + + /* Store multiboot info in a safe place */ + movl %ebx,%esi + movl $(mb_info + INITIAL_BASE - FREELDR_BASE),%edi + movl $MB_INFO_SIZE,%ecx + rep movsb + + /* Save commandline */ + movl MB_INFO_FLAGS_OFFSET(%ebx),%edx + testl $MB_INFO_FLAG_COMMAND_LINE,MB_INFO_FLAGS_OFFSET(%ebx) + jz mb3 + movl MB_INFO_COMMAND_LINE_OFFSET(%ebx),%esi + movl $(cmdline + INITIAL_BASE - FREELDR_BASE),%edi + movl $CMDLINE_SIZE,%ecx +mb2: lodsb + stosb + testb %al,%al + jz mb3 + dec %ecx + jnz mb2 +mb3: + /* Copy to low mem */ movl $INITIAL_BASE,%esi movl $FREELDR_BASE,%edi @@ -342,8 +368,8 @@ /* Clear prefetch queue & correct CS, * jump to low mem */ - ljmp $PMODE_CS, $mb2 -mb2: + ljmp $PMODE_CS, $mb4 +mb4: /* Reload segment selectors */ movw $PMODE_DS,%dx movw %dx,%ds @@ -353,39 +379,28 @@ movw %dx,%ss movl $STACK32ADDR,%esp - /* Check for valid multiboot signature */ - cmpl $MULTIBOOT_BOOTLOADER_MAGIC,%eax - jne mbfail - + movl $mb_info,%ebx /* See if the boot device was passed in */ movl MB_INFO_FLAGS_OFFSET(%ebx),%edx testl $MB_INFO_FLAG_BOOT_DEVICE,%edx - jz mb3 + jz mb5 /* Retrieve boot device info */ movl MB_INFO_BOOT_DEVICE_OFFSET(%ebx),%eax shrl $16,%eax incb %al - movb %al,_BootPartition - movb %ah,_BootDrive - jmp mb4 -mb3: /* No boot device known, assume first partition of first harddisk */ - movb $0x80,_BootDrive - movb $1,_BootPartition -mb4: - - /* Check for a command line */ + movb %al,_i386BootPartition + movb %ah,_i386BootDrive + jmp mb6 +mb5: /* No boot device known, assume first partition of first harddisk */ + movb $0x80,_i386BootDrive + movb $1,_i386BootPartition +mb6: + /* Check for command line */ + mov $cmdline,%eax + testl $MB_INFO_FLAG_COMMAND_LINE,MB_INFO_FLAGS_OFFSET(%ebx) + jnz mb7 xorl %eax,%eax - testl $MB_INFO_FLAG_COMMAND_LINE,%edx - jz mb6 - /* Copy command line to low mem*/ - movl MB_INFO_COMMAND_LINE_OFFSET(%ebx),%esi - movl $CMDLINE_BASE,%edi -mb5: lodsb - stosb - testb %al,%al - jnz mb5 - movl $CMDLINE_BASE,%eax -mb6: +mb7: /* GO! */ pushl %eax @@ -462,8 +477,14 @@ .word 0x3ff /* Limit */ .long 0 /* Base Address */ -EXTERN(_BootDrive) +EXTERN(_i386BootDrive) .long 0 -EXTERN(_BootPartition) +EXTERN(_i386BootPartition) .long 0 + +mb_info: + .fill MB_INFO_SIZE, 1, 0 + +cmdline: + .fill CMDLINE_SIZE, 1, 0 _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/archmach. c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/archmach. c 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/archmach. c 2005-05-05 19:15:25 UTC (rev 15017) @@ -27,7 +27,7 @@ #include "rtl.h" VOID -MachInit(VOID) +MachInit(char *CmdLine) { ULONG PciId; @@ -39,11 +39,11 @@ PciId = READ_PORT_ULONG((ULONG*) 0xcfc); if (0x02a510de == PciId) { - XboxMachInit(); + XboxMachInit(CmdLine); } else { - PcMachInit(); + PcMachInit(CmdLine); } HalpCalibrateStallExecution(); _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/boot.S --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/boot.S 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/boot.S 2005-05-05 19:15:25 UTC (rev 15017) @@ -31,7 +31,7 @@ .code16 /* Set the boot drive */ - movb (_BootDrive),%dl + movb (_i386BootDrive),%dl /* Load segment registers */ cli _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hardware. c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hardware. c 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hardware. c 2005-05-05 19:15:25 UTC (rev 15017) @@ -101,9 +101,9 @@ typedef struct _CM_PNP_BIOS_DEVICE_NODE { USHORT Size; - UCHAR Node; + CHAR Node; ULONG ProductId; - UCHAR DeviceType[3]; + CHAR DeviceType[3]; USHORT DeviceAttributes; } __attribute__((packed)) CM_PNP_BIOS_DEVICE_NODE, *PCM_PNP_BIOS_DEVICE_NODE; @@ -258,7 +258,7 @@ Error = RegSetValue(ComponentKey, "Component Information", REG_BINARY, - (PUCHAR)&CompInfo, + (PCHAR)&CompInfo, sizeof(CM_COMPONENT_INFORMATION)); if (Error != ERROR_SUCCESS) { @@ -287,7 +287,7 @@ LONG Error; InstData = (PCM_PNP_BIOS_INSTALLATION_CHECK)PnpBiosSupported(); - if (InstData == NULL || strncmp(InstData->Signature, "$PnP", 4)) + if (InstData == NULL || strncmp((CHAR*)InstData->Signature, "$PnP", 4)) { DbgPrint((DPRINT_HWDETECT, "PnP-BIOS not supported\n")); return; @@ -335,7 +335,7 @@ Error = RegSetValue(BusKey, "Identifier", REG_SZ, - (PUCHAR)"PNP BIOS", + "PNP BIOS", 9); if (Error != ERROR_SUCCESS) { @@ -413,7 +413,7 @@ Error = RegSetValue(BusKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -495,7 +495,7 @@ Error = RegSetValue(DiskKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -516,7 +516,7 @@ ULONG i; ULONG Checksum; ULONG Signature; - char Identifier[20]; + CHAR Identifier[20]; LONG Error; /* Read the MBR */ @@ -568,7 +568,7 @@ Error = RegSetValue(DiskKey, "Identifier", REG_SZ, - (PUCHAR) Identifier, + Identifier, 20); if (Error != ERROR_SUCCESS) { @@ -673,7 +673,7 @@ Error = RegSetValue(SystemKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -829,7 +829,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -845,7 +845,7 @@ Error = RegSetValue(PeripheralKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + (PCHAR)Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -939,7 +939,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1280,7 +1280,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)&FullResourceDescriptor, + (PCHAR)&FullResourceDescriptor, sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); if (Error != ERROR_SUCCESS) @@ -1294,7 +1294,7 @@ Error = RegSetValue(PeripheralKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -1409,7 +1409,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1426,7 +1426,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PUCHAR)Buffer, + Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -1542,7 +1542,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1559,7 +1559,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PUCHAR)Buffer, + Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -1702,7 +1702,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)FullResourceDescriptor, + (PCHAR)FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1718,7 +1718,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PUCHAR)Buffer, + Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -1804,7 +1804,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)FullResourceDescriptor, + (PCHAR)FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1972,7 +1972,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)&FullResourceDescriptor, + (PCHAR)&FullResourceDescriptor, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); if (Error != ERROR_SUCCESS) { @@ -2014,7 +2014,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)&FullResourceDescriptor, + (PCHAR)&FullResourceDescriptor, sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); if (Error != ERROR_SUCCESS) @@ -2029,7 +2029,7 @@ Error = RegSetValue(PeripheralKey, "Identifier", REG_SZ, - (PUCHAR)"MICROSOFT PS2 MOUSE", + "MICROSOFT PS2 MOUSE", 20); if (Error != ERROR_SUCCESS) { @@ -2098,7 +2098,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PUCHAR)Buffer, + Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -2146,7 +2146,7 @@ Error = RegSetValue(BusKey, "Identifier", REG_SZ, - (PUCHAR)"ISA", + "ISA", 4); if (Error != ERROR_SUCCESS) { @@ -2175,7 +2175,7 @@ Error = RegSetValue(BusKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-05-05 19:15:25 UTC (rev 15017) @@ -92,7 +92,7 @@ Error = RegSetValue(BiosKey, "Identifier", REG_SZ, - (PUCHAR)"ACPI BIOS", + "ACPI BIOS", 10); if (Error != ERROR_SUCCESS) { _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c 2005-05-05 19:15:25 UTC (rev 15017) @@ -95,7 +95,7 @@ Error = RegSetValue(BiosKey, "Identifier", REG_SZ, - (PUCHAR)"APM", + "APM", 4); if (Error != ERROR_SUCCESS) { _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-05-05 19:15:25 UTC (rev 15017) @@ -111,8 +111,8 @@ DetectCPU(FRLDRHKEY CpuKey, FRLDRHKEY FpuKey) { - char VendorIdentifier[13]; - char Identifier[64]; + CHAR VendorIdentifier[13]; + CHAR Identifier[64]; ULONG FeatureSet; FRLDRHKEY CpuInstKey; FRLDRHKEY FpuInstKey; @@ -195,7 +195,7 @@ Error = RegSetValue(CpuInstKey, "FeatureSet", REG_DWORD, - (PUCHAR)&FeatureSet, + (PCHAR)&FeatureSet, sizeof(ULONG)); if (Error != ERROR_SUCCESS) { @@ -208,7 +208,7 @@ Error = RegSetValue(CpuInstKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -218,7 +218,7 @@ Error = RegSetValue(FpuInstKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -231,7 +231,7 @@ Error = RegSetValue(CpuInstKey, "VendorIdentifier", REG_SZ, - (PUCHAR)VendorIdentifier, + VendorIdentifier, strlen(VendorIdentifier) + 1); if (Error != ERROR_SUCCESS) { @@ -250,7 +250,7 @@ Error = RegSetValue(CpuInstKey, "~MHz", REG_DWORD, - (PUCHAR)&CpuSpeed, + (PCHAR)&CpuSpeed, sizeof(ULONG)); if (Error != ERROR_SUCCESS) { @@ -339,7 +339,7 @@ Error = RegSetValue(CpuInstKey, "FeatureSet", REG_DWORD, - (PUCHAR)&FeatureSet, + (PCHAR)&FeatureSet, sizeof(ULONG)); if (Error != ERROR_SUCCESS) { @@ -352,7 +352,7 @@ Error = RegSetValue(CpuInstKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -362,7 +362,7 @@ Error = RegSetValue(FpuInstKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -375,7 +375,7 @@ Error = RegSetValue(CpuInstKey, "VendorIdentifier", REG_SZ, - (PUCHAR)VendorIdentifier, + VendorIdentifier, strlen(VendorIdentifier) + 1); if (Error != ERROR_SUCCESS) { @@ -394,7 +394,7 @@ Error = RegSetValue(CpuInstKey, "~MHz", REG_DWORD, - (PUCHAR)&CpuSpeed, + (PCHAR)&CpuSpeed, sizeof(ULONG)); if (Error != ERROR_SUCCESS) { _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c 2005-05-05 19:15:25 UTC (rev 15017) @@ -178,7 +178,7 @@ Error = RegSetValue(TableKey, "Identifier", REG_SZ, - (PUCHAR)"PCI Real-mode IRQ Routing Table", + "PCI Real-mode IRQ Routing Table", 32); if (Error != ERROR_SUCCESS) { @@ -216,7 +216,7 @@ Error = RegSetValue(TableKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -272,7 +272,7 @@ Error = RegSetValue(BiosKey, "Identifier", REG_SZ, - (PUCHAR)"PCI BIOS", + "PCI BIOS", 9); if (Error != ERROR_SUCCESS) { @@ -301,7 +301,7 @@ Error = RegSetValue(BiosKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) _____ Copied: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/i386.h (from rev 14980, trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h) Property changes on: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/i386.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/i386disk. c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/i386disk. c 2005-05-05 19:11:20 UTC (rev 15016) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/i386disk. c 2005-05-05 19:15:25 UTC (rev 15017) @@ -19,6 +19,8 @@ #include "freeldr.h" #include "debug.h" +#include "i386.h" +#include "fsrec.h" //////////////////////////////////////////////////////////////////////// ///////////////////// // FUNCTIONS @@ -166,4 +168,244 @@ return TRUE; } -#endif // defined __i386__ +BOOL i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) +{ + PARTITION_TABLE_ENTRY PartitionTableEntry; + UCHAR VolumeType; + + DbgPrint((DPRINT_FILESYSTEM, "FsOpenVolume() DriveNumber: 0x%x PartitionNumber: 0x%x\n", i386BootDrive, i386BootPartition)); + + // Check and see if it is a floppy drive + // If so then just assume FAT12 file system type + if (DiskIsDriveRemovable(i386BootDrive)) + { + DbgPrint((DPRINT_FILESYSTEM, "Drive is a floppy diskette drive. Assuming FAT12 file system.\n")); + + *DriveNumber = i386BootDrive; + *StartSector = 0; + *SectorCount = 2 * 80 * 18; /* FIXME hardcoded for 1.44 Mb */ + *FsType = FS_FAT; + return TRUE; + } + + // Check for ISO9660 file system type + if (i386BootDrive >= 0x80 && FsRecIsIso9660(i386BootDrive)) + { + DbgPrint((DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n")); + + *DriveNumber = i386BootDrive; + *StartSector = 0; + *SectorCount = 0; + *FsType = FS_ISO9660; + return TRUE; + } + + // Get the requested partition entry + if (i386BootPartition == 0) + { + // Partition requested was zero which means the boot partition + if (! DiskGetActivePartitionEntry(i386BootDrive, &PartitionTableEntry)) + { + return FALSE; + } + } + else + { + // Get requested partition + if (! MachDiskGetPartitionEntry(i386BootDrive, i386BootPartition, &PartitionTableEntry)) + { + return FALSE; + } + } + + // Check for valid partition + if (PartitionTableEntry.SystemIndicator == PARTITION_ENTRY_UNUSED) + { + return FALSE; + } + + // Try to recognize the file system + if (!FsRecognizeVolume(i386BootDrive, PartitionTableEntry.SectorCountBeforePartition, &VolumeType)) + { + return FALSE; + } + + *DriveNumber = i386BootDrive; + *StartSector = PartitionTableEntry.SectorCountBeforePartition; + *SectorCount = PartitionTableEntry.PartitionSectorCount; + + //switch (PartitionTableEntry.SystemIndicator) + switch (VolumeType) + { + case PARTITION_FAT_12: + case PARTITION_FAT_16: + case PARTITION_HUGE: + case PARTITION_XINT13: + case PARTITION_FAT32: + case PARTITION_FAT32_XINT13: + *FsType = FS_FAT; + return TRUE; + case PARTITION_EXT2: + *FsType = FS_EXT2; + return TRUE; + case PARTITION_NTFS: + *FsType = FS_NTFS; + return TRUE; + default: [truncated at 1000 lines; 84535 more skipped]

19 years, 4 months

[gvg] 15016: Sync to Wine-20050419:

by gvg＠svn.reactos.com

Sync to Wine-20050419: Remove no longer needed files. Deleted: trunk/reactos/lib/richedit/ansi_gen.h Deleted: trunk/reactos/lib/richedit/ansi_sym.h Deleted: trunk/reactos/lib/richedit/reader.c Deleted: trunk/reactos/lib/richedit/riched32.h Deleted: trunk/reactos/lib/richedit/rtf.h Deleted: trunk/reactos/lib/richedit/rtf2text.h Deleted: trunk/reactos/lib/richedit/stdcharnames.h Deleted: trunk/reactos/lib/richedit/text-writer.c Deleted: trunk/reactos/lib/richedit/text_map.h _____ Deleted: trunk/reactos/lib/richedit/ansi_gen.h --- trunk/reactos/lib/richedit/ansi_gen.h 2005-05-05 19:05:42 UTC (rev 15015) +++ trunk/reactos/lib/richedit/ansi_gen.h 2005-05-05 19:11:20 UTC (rev 15016) @@ -1,211 +0,0 @@ -/* - RTF ANSI character set (\ansi) general map - These are taken from the ISO-Latin-1 (ISO-8859-1) encodings, with - a few additions - - Field 1 is the standard character name which the character value in - field 2 maps onto. (It doesn't mean "to produce the character in field 1, - use the value in field 2.) - - The character value may be given either as a single character (which will be - converted to the ASCII value of the character), or in numeric format, either - in decimal or 0xyy as hex yy. Single or double quotes may be used to quote - characters.*/ - -int ansi_gen[] = -{ - rtfSC_formula ,0x06, - rtfSC_nobrkhyphen ,0x1e, - rtfSC_opthyphen ,0x1f, - rtfSC_space ,' ', - rtfSC_exclam ,'!', - rtfSC_quotedbl ,'"', - rtfSC_numbersign ,'#', - rtfSC_dollar ,'$', - rtfSC_percent ,'%', - rtfSC_ampersand ,'&', - rtfSC_quoteright ,'\\', - rtfSC_parenleft ,'(', - rtfSC_parenright ,')', - rtfSC_asterisk ,'*', - rtfSC_plus ,'+', - rtfSC_comma ,',', - rtfSC_hyphen ,'-', - rtfSC_period ,'.', - rtfSC_slash ,'/', - rtfSC_zero ,'0', - rtfSC_one ,'1', - rtfSC_two ,'2', - rtfSC_three ,'3', - rtfSC_four ,'4', - rtfSC_five ,'5', - rtfSC_six ,'6', - rtfSC_seven ,'7', - rtfSC_eight ,'8', - rtfSC_nine ,'9', - rtfSC_colon ,':', - rtfSC_semicolon ,';', - rtfSC_less ,'<', - rtfSC_equal ,'=', - rtfSC_greater ,'>', - rtfSC_question ,'?', - rtfSC_at ,'@', - rtfSC_A ,'A', - rtfSC_B ,'B', - rtfSC_C ,'C', - rtfSC_D ,'D', - rtfSC_E ,'E', - rtfSC_F ,'F', - rtfSC_G ,'G', - rtfSC_H ,'H', - rtfSC_I ,'I', - rtfSC_J ,'J', - rtfSC_K ,'K', - rtfSC_L ,'L', - rtfSC_M ,'M', - rtfSC_N ,'N', - rtfSC_O ,'O', - rtfSC_P ,'P', - rtfSC_Q ,'Q', - rtfSC_R ,'R', - rtfSC_S ,'S', - rtfSC_T ,'T', - rtfSC_U ,'U', - rtfSC_V ,'V', - rtfSC_W ,'W', - rtfSC_X ,'X', - rtfSC_Y ,'Y', - rtfSC_Z ,'Z', - rtfSC_bracketleft ,'[', - rtfSC_backslash ,'\\', - rtfSC_bracketright ,']', - rtfSC_asciicircum ,'^', - rtfSC_underscore ,'_', - rtfSC_quoteleft ,'`', - rtfSC_a ,'a', - rtfSC_b ,'b', - rtfSC_c ,'c', - rtfSC_d ,'d', - rtfSC_e ,'e', - rtfSC_f ,'f', - rtfSC_g ,'g', - rtfSC_h ,'h', - rtfSC_i ,'i', - rtfSC_j ,'j', - rtfSC_k ,'k', - rtfSC_l ,'l', - rtfSC_m ,'m', - rtfSC_n ,'n', - rtfSC_o ,'o', - rtfSC_p ,'p', - rtfSC_q ,'q', - rtfSC_r ,'r', - rtfSC_s ,'s', - rtfSC_t ,'t', - rtfSC_u ,'u', - rtfSC_v ,'v', - rtfSC_w ,'w', - rtfSC_x ,'x', - rtfSC_y ,'y', - rtfSC_z ,'z', - rtfSC_braceleft ,'{', - rtfSC_bar ,'|', - rtfSC_braceright ,'}', - rtfSC_asciitilde ,'~', - rtfSC_nobrkspace ,0xa0, - rtfSC_exclamdown ,0xa1, - rtfSC_cent ,0xa2, - rtfSC_sterling ,0xa3, - rtfSC_currency ,0xa4, - rtfSC_yen ,0xa5, - rtfSC_brokenbar ,0xa6, - rtfSC_section ,0xa7, - rtfSC_dieresis ,0xa8, - rtfSC_copyright ,0xa9, - rtfSC_ordfeminine ,0xaa, - rtfSC_guillemotleft ,0xab, - rtfSC_logicalnot ,0xac, - rtfSC_opthyphen ,0xad, - rtfSC_registered ,0xae, - rtfSC_macron ,0xaf, - rtfSC_degree ,0xb0, - rtfSC_plusminus ,0xb1, - rtfSC_twosuperior ,0xb2, - rtfSC_threesuperior ,0xb3, - rtfSC_acute ,0xb4, - rtfSC_mu ,0xb5, - rtfSC_paragraph ,0xb6, - rtfSC_periodcentered ,0xb7, - rtfSC_cedilla ,0xb8, - rtfSC_onesuperior ,0xb9, - rtfSC_ordmasculine ,0xba, - rtfSC_guillemotright ,0xbb, - rtfSC_onequarter ,0xbc, - rtfSC_onehalf ,0xbd, - rtfSC_threequarters ,0xbe, - rtfSC_questiondown ,0xbf, - rtfSC_Agrave ,0xc0, - rtfSC_Aacute ,0xc1, - rtfSC_Acircumflex ,0xc2, - rtfSC_Atilde ,0xc3, - rtfSC_Adieresis ,0xc4, - rtfSC_Aring ,0xc5, - rtfSC_AE ,0xc6, - rtfSC_Ccedilla ,0xc7, - rtfSC_Egrave ,0xc8, - rtfSC_Eacute ,0xc9, - rtfSC_Ecircumflex ,0xca, - rtfSC_Edieresis ,0xcb, - rtfSC_Igrave ,0xcc, - rtfSC_Iacute ,0xcd, - rtfSC_Icircumflex ,0xce, - rtfSC_Idieresis ,0xcf, - rtfSC_Eth ,0xd0, - rtfSC_Ntilde ,0xd1, - rtfSC_Ograve ,0xd2, - rtfSC_Oacute ,0xd3, - rtfSC_Ocircumflex ,0xd4, - rtfSC_Otilde ,0xd5, - rtfSC_Odieresis ,0xd6, - rtfSC_multiply ,0xd7, - rtfSC_Oslash ,0xd8, - rtfSC_Ugrave ,0xd9, - rtfSC_Uacute ,0xda, - rtfSC_Ucircumflex ,0xdb, - rtfSC_Udieresis ,0xdc, - rtfSC_Yacute ,0xdd, - rtfSC_Thorn ,0xde, - rtfSC_germandbls ,0xdf, - rtfSC_agrave ,0xe0, - rtfSC_aacute ,0xe1, - rtfSC_acircumflex ,0xe2, - rtfSC_atilde ,0xe3, - rtfSC_adieresis ,0xe4, - rtfSC_aring ,0xe5, - rtfSC_ae ,0xe6, - rtfSC_ccedilla ,0xe7, - rtfSC_egrave ,0xe8, - rtfSC_eacute ,0xe9, - rtfSC_ecircumflex ,0xea, - rtfSC_edieresis ,0xeb, - rtfSC_igrave ,0xec, - rtfSC_iacute ,0xed, - rtfSC_icircumflex ,0xee, - rtfSC_idieresis ,0xef, - rtfSC_eth ,0xf0, - rtfSC_ntilde ,0xf1, - rtfSC_ograve ,0xf2, - rtfSC_oacute ,0xf3, - rtfSC_ocircumflex ,0xf4, - rtfSC_otilde ,0xf5, - rtfSC_odieresis ,0xf6, - rtfSC_divide ,0xf7, - rtfSC_oslash ,0xf8, - rtfSC_ugrave ,0xf9, - rtfSC_uacute ,0xfa, - rtfSC_ucircumflex ,0xfb, - rtfSC_udieresis ,0xfc, - rtfSC_yacute ,0xfd, - rtfSC_thorn ,0xfe, - rtfSC_ydieresis ,0xff -}; _____ Deleted: trunk/reactos/lib/richedit/ansi_sym.h --- trunk/reactos/lib/richedit/ansi_sym.h 2005-05-05 19:05:42 UTC (rev 15015) +++ trunk/reactos/lib/richedit/ansi_sym.h 2005-05-05 19:11:20 UTC (rev 15016) @@ -1,112 +0,0 @@ -/* - * RTF ANSI character set (\ansi) Symbol font map - * - * Field 1 is the standard character name which the character value in - * field 2 maps onto. (It doesn't mean "to produce the character in field 1, - * use the value in field 2.) - * - * The character value may be given either as a single character (which will be - * converted to the ASCII value of the character), or in numeric format, either - * in decimal or 0xyy as hex yy. Single or double quotes may be used to quote - * characters. - * - */ - -int ansi_sym[] = -{ - rtfSC_formula ,0x06, - rtfSC_nobrkhyphen ,0x1e, - rtfSC_opthyphen ,0x1f, - rtfSC_space ,' ', - rtfSC_exclam ,'!', - rtfSC_universal ,'"', - rtfSC_mathnumbersign ,'#', - rtfSC_existential ,'$', - rtfSC_percent ,'%', - rtfSC_ampersand ,'&', - rtfSC_suchthat ,'\\', - rtfSC_parenleft ,'(', - rtfSC_parenright ,')', - rtfSC_mathasterisk ,'*', - rtfSC_mathplus ,'+', - rtfSC_comma ,',', - rtfSC_mathminus ,'-', - rtfSC_period ,'.', - rtfSC_slash ,'/', - rtfSC_zero ,'0', - rtfSC_one ,'1', - rtfSC_two ,'2', - rtfSC_three ,'3', - rtfSC_four ,'4', - rtfSC_five ,'5', - rtfSC_six ,'6', - rtfSC_seven ,'7', - rtfSC_eight ,'8', - rtfSC_nine ,'9', - rtfSC_colon ,':', - rtfSC_semicolon ,';', - rtfSC_less ,'<', - rtfSC_mathequal ,'=', - rtfSC_greater ,'>', - rtfSC_question ,'?', - rtfSC_congruent ,'@', - rtfSC_Alpha ,'A', - rtfSC_Beta ,'B', - rtfSC_Chi ,'C', - rtfSC_Delta ,'D', - rtfSC_Epsilon ,'E', - rtfSC_Phi ,'F', - rtfSC_Gamma ,'G', - rtfSC_Eta ,'H', - rtfSC_Iota ,'I', - rtfSC_Kappa ,'K', - rtfSC_Lambda ,'L', - rtfSC_Mu ,'M', - rtfSC_Nu ,'N', - rtfSC_Omicron ,'O', - rtfSC_Pi ,'P', - rtfSC_Theta ,'Q', - rtfSC_Rho ,'R', - rtfSC_Sigma ,'S', - rtfSC_Tau ,'T', - rtfSC_Upsilon ,'U', - rtfSC_varsigma ,'V', - rtfSC_Omega ,'W', - rtfSC_Xi ,'X', - rtfSC_Psi ,'Y', - rtfSC_Zeta ,'Z', - rtfSC_bracketleft ,'[', - rtfSC_backslash ,'\\', - rtfSC_bracketright ,']', - rtfSC_asciicircum ,'^', - rtfSC_underscore ,'_', - rtfSC_quoteleft ,'`', - rtfSC_alpha ,'a', - rtfSC_beta ,'b', - rtfSC_chi ,'c', - rtfSC_delta ,'d', - rtfSC_epsilon ,'e', - rtfSC_phi ,'f', - rtfSC_gamma ,'g', - rtfSC_eta ,'h', - rtfSC_iota ,'i', - rtfSC_kappa ,'k', - rtfSC_lambda ,'l', - rtfSC_mu ,'m', - rtfSC_nu ,'n', - rtfSC_omicron ,'o', - rtfSC_pi ,'p', - rtfSC_theta ,'q', - rtfSC_rho ,'r', - rtfSC_sigma ,'s', - rtfSC_tau ,'t', - rtfSC_upsilon ,'u', - rtfSC_omega ,'w', - rtfSC_xi ,'x', - rtfSC_psi ,'y', - rtfSC_zeta ,'z', - rtfSC_braceleft ,'{', - rtfSC_bar ,'|', - rtfSC_braceright ,'}', - rtfSC_mathtilde ,'~' -}; _____ Deleted: trunk/reactos/lib/richedit/reader.c --- trunk/reactos/lib/richedit/reader.c 2005-05-05 19:05:42 UTC (rev 15015) +++ trunk/reactos/lib/richedit/reader.c 2005-05-05 19:11:20 UTC (rev 15016) @@ -1,2725 +0,0 @@ -/* - * WINE RTF file reader - * - * Portions Copyright 2004 Mike McCormack for CodeWeavers - * - * 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 - */ - -/* - * - Need to document error code meanings. - * - Need to do something with \* on destinations. - * - Make the parameter a long? - * - * reader.c - RTF file reader. Release 1.10. - * - * ASCII 10 (\n) and 13 (\r) are ignored and silently discarded. - * Nulls are also discarded. - * (although the read hook will still get a look at them.) - * - * "\:" is not a ":", it's a control symbol. But some versions of - * Word seem to write "\:" for ":". This reader treats "\:" as a - * plain text ":" - * - * 19 Mar 93 - * - Add hack to skip "{\*\keycode ... }" group in stylesheet. - * This is probably the wrong thing to do, but it's simple. - * 13 Jul 93 - * - Add THINK C awareness to malloc() declaration. Necessary so - * compiler knows the malloc argument is 4 bytes. Ugh. - * 07 Sep 93 - * - Text characters are mapped onto standard codes, which are placed - * in rtfMinor. - * - Eliminated use of index() function. - * 05 Mar 94 - * - Added zillions of new symbols (those defined in RTF spec 1.2). - * 14 Mar 94 - * - Public functions RTFMsg() and RTFPanic() now take variable arguments. - * This means RTFPanic() now is used in place of what was formerly the - * internal function Error(). - * - 8-bit characters are now legal, so they're not converted to \'xx - * hex char representation now. - * 01 Apr 94 - * - Added public variables rtfLineNum and rtfLinePos. - * - #include string.h or strings.h, avoiding strncmp() problem where - * last argument is treated as zero when prototype isn't available. - * 04 Apr 94 - * - Treat style numbers 222 and 0 properly as "no style" and "normal". - * - * Author: Paul DuBois dubois(a)primate.wisc.edu - * - * This software may be redistributed without restriction and used for - * any purpose whatsoever. - */ - -# include <stdio.h> -# include <ctype.h> -# include <string.h> -# include <stdarg.h> - -#include "rtf.h" -/* - * include hard coded charsets - */ - -#include "ansi_gen.h" -#include "ansi_sym.h" -#include "text_map.h" - -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(richedit); - -extern HANDLE RICHED32_hHeap; - -static int _RTFGetChar(RTF_Info *); -static void _RTFGetToken (RTF_Info *); -static void _RTFGetToken2 (RTF_Info *); -static int GetChar (RTF_Info *); -static void ReadFontTbl (RTF_Info *); -static void ReadColorTbl (RTF_Info *); -static void ReadStyleSheet (RTF_Info *); -static void ReadInfoGroup (RTF_Info *); -static void ReadPictGroup (RTF_Info *); -static void ReadObjGroup (RTF_Info *); -static void LookupInit (void); -static void Lookup (RTF_Info *, char *); -static int Hash (char*); - -static void CharSetInit (RTF_Info *); -static void ReadCharSetMaps (RTF_Info *); - - -/* - * This array is used to map standard character names onto their numeric codes. - * The position of the name within the array is the code. - * stdcharnames.h is generated in the ../h directory. - */ - -#include "stdcharnames.h" - -int _RTFGetChar(RTF_Info *info) -{ - int ch; - - TRACE("\n"); - - if( info->dwInputSize <= info->dwInputUsed ) - { - long count = 0; - info->editstream.pfnCallback(info->editstream.dwCookie, - info->InputBuffer, sizeof(info->InputBuffer), &count); - if(count == 0) - return EOF; - info->dwInputSize = count; - info->dwInputUsed = 0; - } - ch = info->InputBuffer[info->dwInputUsed++]; - if( !ch ) return EOF; - return ch; -} - -void RTFSetEditStream(RTF_Info *info, EDITSTREAM *es) -{ - TRACE("\n"); - - info->editstream.dwCookie = es->dwCookie; - info->editstream.dwError = es->dwError; - info->editstream.pfnCallback = es->pfnCallback; -} - -/* - * Initialize the reader. This may be called multiple times, - * to read multiple files. The only thing not reset is the input - * stream; that must be done with RTFSetStream(). - */ - -void RTFInit(RTF_Info *info) -{ -int i; -RTFColor *cp; -RTFFont *fp; -RTFStyle *sp; -RTFStyleElt *eltList, *ep; - - TRACE("\n"); - - if (info->rtfTextBuf == (char *) NULL) /* initialize the text buffers */ - { - info->rtfTextBuf = RTFAlloc (rtfBufSiz); - info->pushedTextBuf = RTFAlloc (rtfBufSiz); - if (info->rtfTextBuf == (char *) NULL - || info->pushedTextBuf == (char *) NULL) - RTFPanic (info,"Cannot allocate text buffers."); - info->rtfTextBuf[0] = info->pushedTextBuf[0] = '\0'; - } - - RTFFree (info->inputName); - RTFFree (info->outputName); - info->inputName = info->outputName = (char *) NULL; - - /* initialize lookup table */ - LookupInit (); - - for (i = 0; i < rtfMaxClass; i++) - RTFSetClassCallback (info, i, (RTFFuncPtr) NULL); - for (i = 0; i < rtfMaxDestination; i++) - RTFSetDestinationCallback (info, i, (RTFFuncPtr) NULL); - - /* install built-in destination readers */ - RTFSetDestinationCallback (info, rtfFontTbl, ReadFontTbl); - RTFSetDestinationCallback (info, rtfColorTbl, ReadColorTbl); - RTFSetDestinationCallback (info, rtfStyleSheet, ReadStyleSheet); - RTFSetDestinationCallback (info, rtfInfo, ReadInfoGroup); - RTFSetDestinationCallback (info, rtfPict, ReadPictGroup); - RTFSetDestinationCallback (info, rtfObject, ReadObjGroup); - - - RTFSetReadHook (info, (RTFFuncPtr) NULL); - - /* dump old lists if necessary */ - - while (info->fontList != (RTFFont *) NULL) - { - fp = info->fontList->rtfNextFont; - RTFFree (info->fontList->rtfFName); - RTFFree ((char *) info->fontList); - info->fontList = fp; - } - while (info->colorList != (RTFColor *) NULL) - { - cp = info->colorList->rtfNextColor; - RTFFree ((char *) info->colorList); - info->colorList = cp; - } - while (info->styleList != (RTFStyle *) NULL) - { - sp = info->styleList->rtfNextStyle; - eltList = info->styleList->rtfSSEList; - while (eltList != (RTFStyleElt *) NULL) - { - ep = eltList->rtfNextSE; - RTFFree (eltList->rtfSEText); - RTFFree ((char *) eltList); - eltList = ep; - } - RTFFree (info->styleList->rtfSName); - RTFFree ((char *) info->styleList); - info->styleList = sp; - } - - info->rtfClass = -1; - info->pushedClass = -1; - info->pushedChar = EOF; - - info->rtfLineNum = 0; - info->rtfLinePos = 0; - info->prevChar = EOF; - info->bumpLine = 0; - - CharSetInit (info); - info->csTop = 0; -} - -/* - * Set or get the input or output file name. These are never guaranteed - * to be accurate, only insofar as the calling program makes them so. - */ - -void RTFSetInputName(RTF_Info *info, char *name) -{ - TRACE("\n"); - - if ((info->inputName = RTFStrSave (name)) == (char *) NULL) - RTFPanic (info,"RTFSetInputName: out of memory"); -} - - -char *RTFGetInputName(RTF_Info *info) -{ - return (info->inputName); -} - - -void RTFSetOutputName(RTF_Info *info, char *name) -{ - TRACE("\n"); - - if ((info->outputName = RTFStrSave (name)) == (char *) NULL) - RTFPanic (info, "RTFSetOutputName: out of memory"); -} - - -char *RTFGetOutputName(RTF_Info *info) -{ - return (info->outputName); -} - - - -/* ---------------------------------------------------------------------- */ - -/* - * Callback table manipulation routines - */ - - -/* - * Install or return a writer callback for a token class - */ - -void RTFSetClassCallback(RTF_Info *info, int class, RTFFuncPtr callback) -{ - if (class >= 0 && class < rtfMaxClass) - info->ccb[class] = callback; -} - - -RTFFuncPtr RTFGetClassCallback(RTF_Info *info, int class) -{ - if (class >= 0 && class < rtfMaxClass) - return (info->ccb[class]); - return ((RTFFuncPtr) NULL); -} - - -/* - * Install or return a writer callback for a destination type - */ - -void RTFSetDestinationCallback(RTF_Info *info, int dest, RTFFuncPtr callback) -{ - if (dest >= 0 && dest < rtfMaxDestination) - info->dcb[dest] = callback; -} - - -RTFFuncPtr RTFGetDestinationCallback(RTF_Info *info, int dest) -{ - if (dest >= 0 && dest < rtfMaxDestination) - return (info->dcb[dest]); - return ((RTFFuncPtr) NULL); -} - - -/* ---------------------------------------------------------------------- */ - -/* - * Token reading routines - */ - - -/* - * Read the input stream, invoking the writer's callbacks - * where appropriate. - */ - -void RTFRead(RTF_Info *info) -{ - while (RTFGetToken (info) != rtfEOF) - RTFRouteToken (info); -} - - -/* - * Route a token. If it's a destination for which a reader is - * installed, process the destination internally, otherwise - * pass the token to the writer's class callback. - */ - -void RTFRouteToken(RTF_Info *info) -{ -RTFFuncPtr p; - - TRACE("\n"); - - if (info->rtfClass < 0 || info->rtfClass >= rtfMaxClass) /* watchdog */ - { - RTFPanic (info,"Unknown class %d: %s (reader malfunction)", - info->rtfClass, info->rtfTextBuf); - } - if (RTFCheckCM (info, rtfControl, rtfDestination)) - { - /* invoke destination-specific callback if there is one */ - if ((p = RTFGetDestinationCallback (info, info->rtfMinor)) - != (RTFFuncPtr) NULL) - { - (*p) (info); - return; - } - } - /* invoke class callback if there is one */ - if ((p = RTFGetClassCallback (info, info->rtfClass)) != (RTFFuncPtr) NULL) - (*p) (info); -} - - -/* - * Skip to the end of the current group. When this returns, - * writers that maintain a state stack may want to call their - * state unstacker; global vars will still be set to the group's - * closing brace. - */ - -void RTFSkipGroup(RTF_Info *info) -{ -int level = 1; - TRACE("\n"); - - while (RTFGetToken (info) != rtfEOF) - { - if (info->rtfClass == rtfGroup) - { - if (info->rtfMajor == rtfBeginGroup) - ++level; - else if (info->rtfMajor == rtfEndGroup) - { - if (--level < 1) - break; /* end of initial group */ - } - } - } -} - - -/* - * Read one token. Call the read hook if there is one. The - * token class is the return value. Returns rtfEOF when there - * are no more tokens. - */ - -int RTFGetToken(RTF_Info *info) -{ -RTFFuncPtr p; - TRACE("\n"); - - for (;;) - { - _RTFGetToken (info); - if ((p = RTFGetReadHook (info)) != (RTFFuncPtr) NULL) - (*p) (info); /* give read hook a look at token */ - - /* Silently discard newlines, carriage returns, nulls. */ - if (!(info->rtfClass == rtfText && info->rtfFormat != SF_TEXT - && (info->rtfMajor == '\r' || info->rtfMajor == '\n' || info->rtfMajor == '\0'))) - break; - } - return (info->rtfClass); -} - - -/* - * Install or return a token reader hook. - */ - -void RTFSetReadHook(RTF_Info *info, RTFFuncPtr f) -{ - info->readHook = f; -} - - -RTFFuncPtr RTFGetReadHook(RTF_Info *info) -{ - return (info->readHook); -} - - -void RTFUngetToken(RTF_Info *info) -{ - TRACE("\n"); - - if (info->pushedClass >= 0) /* there's already an ungotten token */ - RTFPanic (info,"cannot unget two tokens"); - if (info->rtfClass < 0) - RTFPanic (info,"no token to unget"); - info->pushedClass = info->rtfClass; - info->pushedMajor = info->rtfMajor; - info->pushedMinor = info->rtfMinor; - info->pushedParam = info->rtfParam; - (void) strcpy (info->pushedTextBuf, info->rtfTextBuf); -} - - -int RTFPeekToken(RTF_Info *info) -{ - _RTFGetToken (info); - RTFUngetToken (info); - return (info->rtfClass); -} - - -static void _RTFGetToken(RTF_Info *info) -{ -RTFFont *fp; - - TRACE("\n"); - - if (info->rtfFormat == SF_TEXT) { - info->rtfMajor = GetChar (info); - info->rtfMinor = rtfSC_nothing; - info->rtfParam = rtfNoParam; - info->rtfTextBuf[info->rtfTextLen = 0] = '\0'; - if (info->rtfMajor == EOF) - info->rtfClass = rtfEOF; - else - info->rtfClass = rtfText; - return; - } - - /* first check for pushed token from RTFUngetToken() */ - - if (info->pushedClass >= 0) - { - info->rtfClass = info->pushedClass; - info->rtfMajor = info->pushedMajor; - info->rtfMinor = info->pushedMinor; - info->rtfParam = info->pushedParam; - (void) strcpy (info->rtfTextBuf, info->pushedTextBuf); - info->rtfTextLen = strlen (info->rtfTextBuf); - info->pushedClass = -1; - return; - } - - /* - * Beyond this point, no token is ever seen twice, which is - * important, e.g., for making sure no "}" pops the font stack twice. - */ - - _RTFGetToken2 (info); - if (info->rtfClass == rtfText) /* map RTF char to standard code */ - info->rtfMinor = RTFMapChar (info, info->rtfMajor); - - /* - * If auto-charset stuff is activated, see if anything needs doing, - * like reading the charset maps or switching between them. - */ - - if (info->autoCharSetFlags == 0) - return; - - if ((info->autoCharSetFlags & rtfReadCharSet) - && RTFCheckCM (info, rtfControl, rtfCharSet)) - { - ReadCharSetMaps (info); - } - else if ((info->autoCharSetFlags & rtfSwitchCharSet) - && RTFCheckCMM (info, rtfControl, rtfCharAttr, rtfFontNum)) - { - if ((fp = RTFGetFont (info, info->rtfParam)) != (RTFFont *) NULL) - { - if (strncmp (fp->rtfFName, "Symbol", 6) == 0) - info->curCharSet = rtfCSSymbol; - else - info->curCharSet = rtfCSGeneral; - RTFSetCharSet (info, info->curCharSet); - } - } - else if ((info->autoCharSetFlags & rtfSwitchCharSet) && info->rtfClass == rtfGroup) - { - switch (info->rtfMajor) - { - case rtfBeginGroup: - if (info->csTop >= maxCSStack) - RTFPanic (info, "_RTFGetToken: stack overflow"); - info->csStack[info->csTop++] = info->curCharSet; - break; - case rtfEndGroup: - /* - * If stack top is 1 at this point, we are ending the - * group started by the initial {, which ends the - * RTF stream - */ - if (info->csTop <= 0) - RTFPanic (info,"_RTFGetToken: stack underflow"); - else if (info->csTop == 1) - info->rtfClass = rtfEOF; - else - { - info->curCharSet = info->csStack[--info->csTop]; - RTFSetCharSet (info, info->curCharSet); - } - break; - } - } -} - - -/* this shouldn't be called anywhere but from _RTFGetToken() */ - -static void _RTFGetToken2(RTF_Info *info) -{ -int sign; -int c; - - TRACE("\n"); - - /* initialize token vars */ - - info->rtfClass = rtfUnknown; - info->rtfParam = rtfNoParam; - info->rtfTextBuf[info->rtfTextLen = 0] = '\0'; - - /* get first character, which may be a pushback from previous token */ - - if (info->pushedChar != EOF) - { - c = info->pushedChar; - info->rtfTextBuf[info->rtfTextLen++] = c; - info->rtfTextBuf[info->rtfTextLen] = '\0'; - info->pushedChar = EOF; - } - else if ((c = GetChar (info)) == EOF) - { - info->rtfClass = rtfEOF; - return; - } - - if (c == '{') - { - info->rtfClass = rtfGroup; - info->rtfMajor = rtfBeginGroup; - return; - } - if (c == '}') - { - info->rtfClass = rtfGroup; - info->rtfMajor = rtfEndGroup; - return; - } - if (c != '\\') - { - /* - * Two possibilities here: - * 1) ASCII 9, effectively like \tab control symbol - * 2) literal text char - */ - if (c == '\t') /* ASCII 9 */ - { - info->rtfClass = rtfControl; - info->rtfMajor = rtfSpecialChar; - info->rtfMinor = rtfTab; - } - else - { - info->rtfClass = rtfText; - info->rtfMajor = c; - } - return; - } - if ((c = GetChar (info)) == EOF) - { - /* early eof, whoops (class is rtfUnknown) */ - return; - } - if (!isalpha (c)) - { - /* - * Three possibilities here: - * 1) hex encoded text char, e.g., \'d5, \'d3 - * 2) special escaped text char, e.g., \{, \} - * 3) control symbol, e.g., \_, \-, \|, \<10> - */ - if (c == '\'') /* hex char */ - { - int c2; - - if ((c = GetChar (info)) != EOF && (c2 = GetChar (info)) != EOF) - { - /* should do isxdigit check! */ - info->rtfClass = rtfText; - info->rtfMajor = RTFCharToHex (c) * 16 - + RTFCharToHex (c2); - return; - } - /* early eof, whoops (class is rtfUnknown) */ - return; - } - - /* escaped char */ - /*if (index (":{}\\", c) != (char *) NULL)*/ /* escaped char */ - if (c == ':' || c == '{' || c == '}' || c == '\\') - { - info->rtfClass = rtfText; - info->rtfMajor = c; - return; - } - [truncated at 1000 lines; 4495 more skipped]

19 years, 4 months

[greatlrd] 15015: swedish translation by Andreas Bjerkeholt

by greatlrd＠svn.reactos.com

swedish translation by Andreas Bjerkeholt Modified: trunk/reactos/lib/shlwapi/shlwapi.rc Added: trunk/reactos/lib/shlwapi/shlwapi_Sv.rc _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.rc --- trunk/reactos/lib/shlwapi/shlwapi.rc 2005-05-05 19:00:49 UTC (rev 15014) +++ trunk/reactos/lib/shlwapi/shlwapi.rc 2005-05-05 19:05:42 UTC (rev 15015) @@ -30,3 +30,4 @@ #include "shlwapi_It.rc" #include "shlwapi_Ja.rc" #include "shlwapi_Pt.rc" +#include "shlwapi_Sv.rc" \ No newline at end of file _____ Added: trunk/reactos/lib/shlwapi/shlwapi_Sv.rc --- trunk/reactos/lib/shlwapi/shlwapi_Sv.rc 2005-05-05 19:00:49 UTC (rev 15014) +++ trunk/reactos/lib/shlwapi/shlwapi_Sv.rc 2005-05-05 19:05:42 UTC (rev 15015) @@ -0,0 +1,35 @@ +/* + * Swedish resources for shlwapi + * + * Copyright 2005 Andreas Bjerkeholt + * + * 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 + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Fel!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "&Visa inte detta meddelande igen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Avbryt" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nej" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +}

19 years, 4 months

[gvg] 15014: Sync to Wine-20050419:

by gvg＠svn.reactos.com

Sync to Wine-20050419: Krzysztof Foltman <wdev(a)foltman.com> - removed trailing spaces from some files - tab support - indent support - PageUp key support. - Support for "normal" scroll bar functionality (line and page scrolling). - made string operations consistent wrt whitespace handling (which should greatly improve stability of the wrap code and eliminate regressions of the most recent versions) - completely new scrollbar handling (much more reliable) and related redraw fixes - Page Down handler (no Page Up yet, fixing wrap/redraw/scrollbar bugs was of higher priority) - RTF reader doesn't use RichEdit messages anymore (which saves on unnecessary repaints) - added unicode character support to RTF import (like: \u12345 ?) - small fixes - fixed whitespace identification bug - removed drawing of paragraph marks - improved stub implementations for IRichEditOle - Unknown destinations are now correctly skipped (so loading an RTF file generated by, for example, OpenOffice doesn't produce lots of garbage anymore). - Format stack for RTF groups (so that RTF reader can correctly read what RTF writer wrote :) ) - EM_STREAMIN can now deal with undo in a reasonable manner (no multiple undo actions in one EM_STREAMIN). - Related changes to undo code (umIgnore mode is now handled correctly). - Numerous improvements in the RTF reader: it reads some character attributes now (you will have proper small print in license agreements now). - Fixed a memory overwrite bug in conversion from CHARFORMAT2A to CHARFORMAT2W. - Optimized repaint of the area below the text. - ME_JoinRuns didn't mark the paragraph for rewrapping, fixed. - Removed PostQuitMessage(0) from WM_DESTROY handler (duh!). - Use of EM_GETOLEINTERFACE is reported with FIXME instead of TRACE (any app using this message is likely to encounter major problems). - WM_COPY (and WM_CUT) can now put both Unicode and RTF format (thanks to Phil Krylov's RTF generator code). - New message implemented - WM_PASTE. - RTF reader: rtfPlain implemented (kind of). - RTF writer: rewritten main loop (the old one crashed in some circumstances when SFF_SELECTION was used). - The meaning of the rewrap flag got inverted (MEPF_REWRAP instead of MEPF_WRAPPED) for consistency. - Major code cleanups in rewrap/repaint code, leading to "smarter" behaviour wrt repainting selections. - Old font management replaced by the cache-based one, which keeps maximum of 10 HFONTs at once, instead of one per a couple of runs. - EM_CANPASTE implemented - updated TODO list (including list of (un)implemented messages) - fixed WM_PASTE (the previous version might not close the clipboard if it didn't contain a usable format) - scrollbar operations (like clicking on arrows) should update scrollbar's current position Gerald Pfeifer <gerald(a)pfeifer.com> - Make ME_ArrowLeft() return a value in every case. Phil Krylov <phil(a)newstar.rinet.ru> - Make RTF reader fall back to simple text if a correct RTF header is not detected. This should fix some installers. - Made RTF reader and writer handle codepages mostly similar to the original riched20.dll. - Fixed support for RTF documents using ANSI charset and added support for multibyte charsets, so that BIG5 and UTF-8 RTF documents are working now. - Replaced slow and outdated character set handling in RTF reader by Unicode/codepages support. Added charset->codepage conversion. - Implemented hash table lookup for RTF keywords in RTF reader. - Added "generator" RTF destination handling. - Initial implementation of EM_STREAMOUT and RTF writer. - Fixed \u keyword to output signed 16-bit values. Also fixed CP_SYMBOL conversion and the detection of the default font's codepage. - Improved RTF export. Mike McCormack <mike(a)codeweavers.com> - Remove casts and unused code. Hannu Valtonen <Hannu.Valtonen(a)hut.fi> - Added mousewheel support. Vincent Beron <vberon(a)mecano.gme.usherb.ca> - Use "" for Windows includes in dlls, instead of <>. Jakob Eriksson <jakov(a)vmlinux.org> - Get rid of HeapAlloc casts. Jason Edmeades <us(a)the-edmeades.demon.co.uk> - Correct memory allocation macro. Modified: trunk/reactos/lib/riched20/Makefile.in Modified: trunk/reactos/lib/riched20/caret.c Modified: trunk/reactos/lib/riched20/editor.c Modified: trunk/reactos/lib/riched20/editor.h Modified: trunk/reactos/lib/riched20/editstr.h Modified: trunk/reactos/lib/riched20/paint.c Modified: trunk/reactos/lib/riched20/para.c Modified: trunk/reactos/lib/riched20/reader.c Modified: trunk/reactos/lib/riched20/richole.c Modified: trunk/reactos/lib/riched20/rtf.h Modified: trunk/reactos/lib/riched20/run.c Modified: trunk/reactos/lib/riched20/string.c Modified: trunk/reactos/lib/riched20/style.c Modified: trunk/reactos/lib/riched20/undo.c Modified: trunk/reactos/lib/riched20/wrap.c Added: trunk/reactos/lib/riched20/writer.c Modified: trunk/reactos/w32api/include/richedit.h _____ Modified: trunk/reactos/lib/riched20/Makefile.in --- trunk/reactos/lib/riched20/Makefile.in 2005-05-05 18:59:14 UTC (rev 15013) +++ trunk/reactos/lib/riched20/Makefile.in 2005-05-05 19:00:49 UTC (rev 15014) @@ -20,7 +20,8 @@ string.c \ style.c \ undo.c \ - wrap.c + wrap.c \ + writer.c @MAKE_DLL_RULES@ _____ Modified: trunk/reactos/lib/riched20/caret.c --- trunk/reactos/lib/riched20/caret.c 2005-05-05 18:59:14 UTC (rev 15013) +++ trunk/reactos/lib/riched20/caret.c 2005-05-05 19:00:49 UTC (rev 15014) @@ -104,15 +104,15 @@ { row = ME_FindItemBack(tmp, diStartRow); pSizeRun = run = tmp; - sz = ME_GetRunSize(&c, &run->member.run, ME_StrLen(run->member.run.strText)); + sz = ME_GetRunSize(&c, &para->member.para, &run->member.run, ME_StrLen(run->member.run.strText)); } } if (pCursor->nOffset && !(run->member.run.nFlags & MERF_SKIPPED)) { - sz = ME_GetRunSize(&c, &run->member.run, pCursor->nOffset); + sz = ME_GetRunSize(&c, &para->member.para, &run->member.run, pCursor->nOffset); } CreateCaret(editor->hWnd, NULL, 0, pSizeRun->member.run.nAscent+pSizeRun->member.run.nDescent); SetCaretPos(run->member.run.pt.x+sz.cx, - para->member.para.nYPos+row->member.row.nBaseline+pSizeRun->member.run.p t.y-pSizeRun->member.run.nAscent-GetScrollPos(editor->hWnd, SB_VERT)); + para->member.para.nYPos+row->member.row.nBaseline+pSizeRun->member.run.p t.y-pSizeRun->member.run.nAscent-ME_GetYScrollPos(editor)); } else { assert(0 == "Wrapped paragraph run without a row?"); CreateCaret(editor->hWnd, NULL, 0, 10); @@ -300,12 +300,6 @@ assert(style); editor->bCaretAtEnd = FALSE; - /* - if (!style) - style = ME_GetInsertStyle(editor, nCursor); - else - ME_AddRefStyle(style); - */ ME_AddRefStyle(style); /* FIXME really HERE ? */ @@ -317,10 +311,30 @@ len = lstrlenW(str); pos = str; /* FIXME this sucks - no respect for unicode (what else can be a line separator in unicode?) */ - while(pos-str < len && *pos != '\r' && *pos != '\n') + while(pos-str < len && *pos != '\r' && *pos != '\n' && *pos != '\t') pos++; - /* handle EOLs */ - if (pos-str < len) { + if (pos-str < len && *pos == '\t') { /* handle tabs */ + ME_DisplayItem *pNewRun = NULL; + WCHAR tab = '\t'; + + if (pos!=str) + ME_InsertTextFromCursor(editor, nCursor, str, pos-str, style); + + p = &editor->pCursors[nCursor]; + assert(style); + assert(p->pRun->type == diRun); + pNewRun = ME_MakeRun(style, ME_MakeStringN(&tab, 1), MERF_TAB); /* addrefs style */ + ME_InsertRun(editor, ME_CharOfsFromRunOfs(editor, p->pRun, p->nOffset), pNewRun); + ME_DestroyDisplayItem(pNewRun); + ME_ReleaseStyle(style); + + pos++; + if(pos-str < len) { + ME_InsertTextFromCursor(editor, nCursor, pos, len-(pos-str), style); + } + return; + } + if (pos-str < len) { /* handle EOLs */ ME_DisplayItem *tp, *end_run; ME_Paragraph *para; ME_Style *tmp_style; @@ -404,6 +418,7 @@ } assert(0); } + return FALSE; } BOOL ME_ArrowRight(ME_TextEditor *editor, ME_Cursor *p) @@ -537,7 +552,7 @@ editor->nUDArrowX = -1; - y += GetScrollPos(editor->hWnd, SB_VERT); + y += ME_GetYScrollPos(editor); tmp_cursor = editor->pCursors[0]; is_selection = ME_IsSelection(editor); @@ -568,7 +583,7 @@ { ME_Cursor tmp_cursor; - y += GetScrollPos(editor->hWnd, SB_VERT); + y += ME_GetYScrollPos(editor); tmp_cursor = editor->pCursors[0]; if (!ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd)) @@ -702,6 +717,109 @@ assert(pCursor->pRun->type == diRun); } +void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) +{ + ME_DisplayItem *pRun = pCursor->pRun; + ME_DisplayItem *pLast, *p; + int x, y, ys, yd, yp, yprev; + ME_Cursor tmp_curs = *pCursor; + + x = ME_GetXForArrow(editor, pCursor); + if (!pCursor->nOffset && editor->bCaretAtEnd) + pRun = ME_FindItemBack(pRun, diRun); + + p = ME_FindItemBack(pRun, diStartRowOrParagraph); + assert(p->type == diStartRow); + yp = ME_FindItemBack(p, diParagraph)->member.para.nYPos; + yprev = ys = y = yp + p->member.row.nYPos; + yd = y - editor->sizeWindow.cy; + pLast = p; + + do { + p = ME_FindItemBack(p, diStartRowOrParagraph); + if (!p) + break; + if (p->type == diParagraph) { /* crossing paragraphs */ + if (p->member.para.prev_para == NULL) + break; + yp = p->member.para.prev_para->member.para.nYPos; + continue; + } + y = yp + p->member.row.nYPos; + if (y < yd) + break; + pLast = p; + yprev = y; + } while(1); + + pCursor->pRun = ME_FindRunInRow(editor, pLast, x, &pCursor->nOffset, &editor->bCaretAtEnd); + ME_UpdateSelection(editor, &tmp_curs); + if (yprev < editor->sizeWindow.cy) + { + ME_EnsureVisible(editor, ME_FindItemFwd(editor->pBuffer->pFirst, diRun)); + ME_Repaint(editor); + } + else { + ME_Scroll(editor, 0, ys-yprev); + ME_Repaint(editor); + } + assert(pCursor->pRun); + assert(pCursor->pRun->type == diRun); +} + +/* FIXME: in the original RICHEDIT, PageDown always scrolls by the same amount + of pixels, even if it makes the scroll bar position exceed its normal maximum. + In such a situation, clicking the scrollbar restores its position back to the + normal range (ie. sets it to (doclength-screenheight)). */ + +void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) +{ + ME_DisplayItem *pRun = pCursor->pRun; + ME_DisplayItem *pLast, *p; + int x, y, ys, yd, yp, yprev; + ME_Cursor tmp_curs = *pCursor; + + x = ME_GetXForArrow(editor, pCursor); + if (!pCursor->nOffset && editor->bCaretAtEnd) + pRun = ME_FindItemBack(pRun, diRun); + + p = ME_FindItemBack(pRun, diStartRowOrParagraph); + assert(p->type == diStartRow); + yp = ME_FindItemBack(p, diParagraph)->member.para.nYPos; + yprev = ys = y = yp + p->member.row.nYPos; + yd = y + editor->sizeWindow.cy; + pLast = p; + + do { + p = ME_FindItemFwd(p, diStartRowOrParagraph); + if (!p) + break; + if (p->type == diParagraph) { + yp = p->member.para.nYPos; + continue; + } + y = yp + p->member.row.nYPos; + if (y >= yd) + break; + pLast = p; + yprev = y; + } while(1); + + pCursor->pRun = ME_FindRunInRow(editor, pLast, x, &pCursor->nOffset, &editor->bCaretAtEnd); + ME_UpdateSelection(editor, &tmp_curs); + if (yprev >= editor->nTotalLength-editor->sizeWindow.cy) + { + ME_EnsureVisible(editor, ME_FindItemBack(editor->pBuffer->pLast, diRun)); + ME_Repaint(editor); + } + else { + ME_Scroll(editor, 0, ys-yprev); + ME_Repaint(editor); + } + assert(pCursor->pRun); + assert(pCursor->pRun->type == diRun); +} + void ME_ArrowHome(ME_TextEditor *editor, ME_Cursor *pCursor) { ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diStartRow); @@ -799,45 +917,44 @@ editor->pCursors[1] = editor->pCursors[0]; else editor->pCursors[0] = editor->pCursors[1]; - /* FIXME optimize */ - ME_MarkAllForWrapping(editor); ME_Repaint(editor); return TRUE; } -void ME_RepaintSelection(ME_TextEditor *editor, ME_Cursor *pTempCursor) +BOOL ME_UpdateSelection(ME_TextEditor *editor, ME_Cursor *pTempCursor) { ME_Cursor old_anchor = editor->pCursors[1]; - BOOL bRedraw = FALSE; - bRedraw = memcmp(&editor->pCursors[0], &editor->pCursors[1], sizeof(ME_Cursor)); - if (bRedraw) - { - /* FIXME optimize */ - ME_MarkAllForWrapping(editor); - } - if (GetKeyState(VK_SHIFT)>=0) /* cancelling selection */ { /* any selection was present ? if so, it's no more, repaint ! */ editor->pCursors[1] = editor->pCursors[0]; if (memcmp(pTempCursor, &old_anchor, sizeof(ME_Cursor))) { - ME_Repaint(editor); - return; + return TRUE; } - return; + return FALSE; } else { if (!memcmp(pTempCursor, &editor->pCursors[1], sizeof(ME_Cursor))) /* starting selection */ { editor->pCursors[1] = *pTempCursor; + return TRUE; } } ME_Repaint(editor); + return TRUE; } +void ME_RepaintSelection(ME_TextEditor *editor, ME_Cursor *pTempCursor) +{ + if (ME_UpdateSelection(editor, pTempCursor)) { + ME_EnsureVisible(editor, editor->pCursors[0].pRun); + ME_Repaint(editor); + } +} + void ME_DeleteSelection(ME_TextEditor *editor) { int from, to; @@ -898,6 +1015,16 @@ ME_RepaintSelection(editor, &tmp_curs); ME_SendSelChange(editor); return TRUE; + case VK_PRIOR: + ME_ArrowPageUp(editor, p); + ME_ClearTempStyle(editor); + ME_SendSelChange(editor); + return TRUE; + case VK_NEXT: + ME_ArrowPageDown(editor, p); + ME_ClearTempStyle(editor); + ME_SendSelChange(editor); + return TRUE; } editor->nUDArrowX = -1; @@ -914,6 +1041,7 @@ } if (ME_ArrowLeft(editor, p)) { editor->bCaretAtEnd = FALSE; /* FIXME or maybe not */ + ME_ClearTempStyle(editor); ME_MoveCaret(editor); ME_DeleteTextAtCursor(editor, nCursor, 1); ME_UpdateRepaint(editor); @@ -927,10 +1055,12 @@ if (ME_IsSelection(editor)) { ME_DeleteSelection(editor); + ME_ClearTempStyle(editor); ME_UpdateRepaint(editor); return TRUE; } ME_DeleteTextAtCursor(editor, nCursor, 1); + ME_ClearTempStyle(editor); ME_UpdateRepaint(editor); return TRUE; } _____ Modified: trunk/reactos/lib/riched20/editor.c --- trunk/reactos/lib/riched20/editor.c 2005-05-05 18:59:14 UTC (rev 15013) +++ trunk/reactos/lib/riched20/editor.c 2005-05-05 19:00:49 UTC (rev 15014) @@ -23,7 +23,7 @@ Messages (ANSI versions not done yet) - EM_AUTOURLDETECT 2.0 - - EM_CANPASTE + + EM_CANPASTE + EM_CANREDO 2.0 + EM_CANUNDO - EM_CHARFROMPOS @@ -73,7 +73,7 @@ - EM_LINESCROLL - EM_PASTESPECIAL - EM_POSFROMCHARS - - EM_REDO 2.0 + + EM_REDO 2.0 - EM_REQUESTRESIZE + EM_REPLACESEL (proper style?) ANSI&Unicode - EM_SCROLL @@ -102,17 +102,17 @@ - EM_SETWORDBREAKPROCEX - EM_SETWORDWRAPMODE 1.0asian - EM_STOPGROUPTYPING 2.0 - - EM_STREAMIN - - EM_STREAMOUT - - EM_UNDO + + EM_STREAMIN (can't fall back to text when the RTF isn't really RTF) + + EM_STREAMOUT + + EM_UNDO + WM_CHAR + WM_CLEAR - - WM_COPY (lame implementation, no RTF support) - - WM_CUT (lame implementation, no RTF support) + + WM_COPY + + WM_CUT + WM_GETDLGCODE (the current implementation is incomplete) + WM_GETTEXT (ANSI&Unicode) + WM_GETTEXTLENGTH (ANSI version sucks) - - WM_PASTE + + WM_PASTE - WM_SETFONT + WM_SETTEXT (resets undo stack !) (proper style?) ANSI&Unicode - WM_STYLECHANGING @@ -166,30 +166,25 @@ /* * RICHED20 TODO (incomplete): * - * - font caching + * - messages/styles/notifications listed above + * - Undo coalescing * - add remaining CHARFORMAT/PARAFORMAT fields * - right/center align should strip spaces from the beginning - * - more advanced navigation (Ctrl-arrows, PageUp/PageDn) + * - more advanced navigation (Ctrl-arrows) * - tabs - * - pictures (not just smiling faces that lack API support ;-) ) - * - OLE objects + * - pictures/OLE objects (not just smiling faces that lack API support ;-) ) + * - COM interface (looks like a major pain in the TODO list) * - calculate heights of pictures (half-done) - * - EM_STREAMIN/EM_STREAMOUT * - horizontal scrolling (not even started) - * - fix scrollbars and refresh (it sucks bigtime) * - hysteresis during wrapping (related to scrollbars appearing/disappearing) - * - should remember maximum row width for wrap hysteresis * - find/replace * - how to implement EM_FORMATRANGE and EM_DISPLAYBAND ? (Mission Impossible) - * - italic cursor with italic fonts + * - italic caret with italic fonts * - IME * - most notifications aren't sent at all (the most important ones are) * - when should EN_SELCHANGE be sent after text change ? (before/after EN_UPDATE?) * - WM_SETTEXT may use wrong style (but I'm 80% sure it's OK) * - EM_GETCHARFORMAT with SCF_SELECTION may not behave 100% like in original (but very close) - * - bugs in end-of-text handling (the gray bar) could get me in jail ;-) - * - determination of row size - * - end-of-paragraph marks should be of reasonable size * * Bugs that are probably fixed, but not so easy to verify: * - EN_UPDATE/EN_CHANGE are handled very incorrectly (should be OK now) @@ -203,11 +198,11 @@ */ #include "editor.h" -#include <ole2.h> -#include <richole.h> -#include <winreg.h> +#include "ole2.h" +#include "richole.h" +#include "winreg.h" #define NO_SHLWAPI_STREAM -#include <shlwapi.h> +#include "shlwapi.h" #include "rtf.h" @@ -238,91 +233,388 @@ return buf; } -#define STREAMIN_BUFFER_SIZE 4096 /* M$ compatibility */ -static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream, ME_Style *style) +static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStream *stream, ME_Style *style) { - BYTE buffer[STREAMIN_BUFFER_SIZE+1]; WCHAR wszText[STREAMIN_BUFFER_SIZE+1]; + WCHAR *pText; TRACE("%08lx %p\n", dwFormat, stream); - stream->dwError = 0; do { - long nDataSize = 0, nWideChars = 0; - stream->dwError = stream->pfnCallback(stream->dwCookie, - (dwFormat & SF_UNICODE ? (BYTE *)wszText : buffer), - STREAMIN_BUFFER_SIZE, &nDataSize); - - if (stream->dwError) - break; - if (!nDataSize) - break; + long nWideChars = 0; + + if (!stream->dwSize) + { + ME_StreamInFill(stream); + if (stream->editstream->dwError) + break; + if (!stream->dwSize) + break; + } if (!(dwFormat & SF_UNICODE)) { /* FIXME? this is doomed to fail on true MBCS like UTF-8, luckily they're unlikely to be used as CP_ACP */ - nWideChars = MultiByteToWideChar(CP_ACP, 0, buffer, nDataSize, wszText, STREAMIN_BUFFER_SIZE); + nWideChars = MultiByteToWideChar(CP_ACP, 0, stream->buffer, stream->dwSize, wszText, STREAMIN_BUFFER_SIZE); + pText = wszText; } else - nWideChars = nDataSize>>1; - ME_InsertTextFromCursor(editor, 0, wszText, nWideChars, style); - if (nDataSize<STREAMIN_BUFFER_SIZE) + { + nWideChars = stream->dwSize >> 1; + pText = (WCHAR *)stream->buffer; + } + + ME_InsertTextFromCursor(editor, 0, pText, nWideChars, style); + if (stream->dwSize < STREAMIN_BUFFER_SIZE) break; } while(1); - ME_CommitUndo(editor); + ME_CommitUndo(editor); + ME_Repaint(editor); return 0; } +void ME_RTFCharAttrHook(RTF_Info *info) +{ + CHARFORMAT2W fmt; + fmt.cbSize = sizeof(fmt); + fmt.dwMask = 0; + + switch(info->rtfMinor) + { + case rtfPlain: + /* FIXME add more flags once they're implemented */ + fmt.dwMask = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT | CFM_COLOR | CFM_BACKCOLOR | CFM_SIZE | CFM_WEIGHT; + fmt.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; + fmt.yHeight = 12*20; /* 12pt */ + fmt.wWeight = 400; + break; + case rtfBold: + fmt.dwMask = CFM_BOLD; + fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; + break; + case rtfItalic: + fmt.dwMask = CFM_ITALIC; + fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; + break; + case rtfUnderline: + fmt.dwMask = CFM_UNDERLINE; + fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; + break; + case rtfStrikeThru: + fmt.dwMask = CFM_STRIKEOUT; + fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; + break; + case rtfBackColor: + fmt.dwMask = CFM_BACKCOLOR; + fmt.dwEffects = 0; + if (info->rtfParam == 0) + fmt.dwEffects = CFE_AUTOBACKCOLOR; + else if (info->rtfParam != rtfNoParam) + { + RTFColor *c = RTFGetColor(info, info->rtfParam); + fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); + } + break; + case rtfForeColor: + fmt.dwMask = CFM_COLOR; + fmt.dwEffects = 0; + if (info->rtfParam == 0) + fmt.dwEffects = CFE_AUTOCOLOR; + else if (info->rtfParam != rtfNoParam) + { + RTFColor *c = RTFGetColor(info, info->rtfParam); + fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); + } + break; + case rtfFontNum: + if (info->rtfParam != rtfNoParam) + { + RTFFont *f = RTFGetFont(info, info->rtfParam); + if (f) + { + MultiByteToWideChar(CP_ACP, 0, f->rtfFName, -1, fmt.szFaceName, sizeof(fmt.szFaceName)/sizeof(WCHAR)); + fmt.szFaceName[sizeof(fmt.szFaceName)/sizeof(WCHAR)-1] = '\0'; + fmt.bCharSet = f->rtfFCharSet; + fmt.dwMask = CFM_FACE | CFM_CHARSET; + } + } + break; + case rtfFontSize: + fmt.dwMask = CFM_SIZE; + if (info->rtfParam != rtfNoParam) + fmt.yHeight = info->rtfParam*10; + break; + } + if (fmt.dwMask) { + ME_Style *style2; + RTFFlushOutputBuffer(info); + /* FIXME too slow ? how come ? */ + style2 = ME_ApplyStyle(info->style, &fmt); + ME_ReleaseStyle(info->style); + info->style = style2; + } +} + +/* FIXME this function doesn't get any information about context of the RTF tag, which is very bad, + the same tags mean different things in different contexts */ +void ME_RTFParAttrHook(RTF_Info *info) +{ + PARAFORMAT2 fmt; + fmt.cbSize = sizeof(fmt); + fmt.dwMask = 0; + + switch(info->rtfMinor) + { + case rtfParDef: /* I'm not 100% sure what does it do, but I guess it restores default paragraph attributes */ + fmt.dwMask = PFM_ALIGNMENT | PFM_TABSTOPS | PFM_OFFSET | PFM_STARTINDENT; + fmt.wAlignment = PFA_LEFT; + fmt.cTabCount = 0; + fmt.dxOffset = fmt.dxStartIndent = 0; + break; + case rtfFirstIndent: + ME_GetSelectionParaFormat(info->editor, &fmt); + fmt.dwMask = PFM_STARTINDENT; + fmt.dxStartIndent = info->rtfParam + fmt.dxOffset; + break; + case rtfLeftIndent: + { + int first, left; + ME_GetSelectionParaFormat(info->editor, &fmt); + first = fmt.dxStartIndent; + left = info->rtfParam; + fmt.dwMask = PFM_STARTINDENT|PFM_OFFSET; + fmt.dxStartIndent = first + left; + fmt.dxOffset = -first; + break; + } + case rtfRightIndent: + fmt.dwMask = PFM_RIGHTINDENT; + fmt.dxRightIndent = info->rtfParam; + break; + case rtfQuadLeft: + case rtfQuadJust: + fmt.dwMask = PFM_ALIGNMENT; + fmt.wAlignment = PFA_LEFT; + break; + case rtfQuadRight: + fmt.dwMask = PFM_ALIGNMENT; + fmt.wAlignment = PFA_RIGHT; + break; + case rtfQuadCenter: + fmt.dwMask = PFM_ALIGNMENT; + fmt.wAlignment = PFA_CENTER; + break; + case rtfTabPos: + ME_GetSelectionParaFormat(info->editor, &fmt); + if (!(fmt.dwMask & PFM_TABSTOPS)) + { + fmt.dwMask |= PFM_TABSTOPS; + fmt.cTabCount = 0; + } + if (fmt.cTabCount < MAX_TAB_STOPS) + fmt.rgxTabs[fmt.cTabCount++] = info->rtfParam; + break; + } + if (fmt.dwMask) { + RTFFlushOutputBuffer(info); + /* FIXME too slow ? how come ?*/ + ME_SetSelectionParaFormat(info->editor, &fmt); + } +} + +void ME_RTFReadHook(RTF_Info *info) { + switch(info->rtfClass) + { + case rtfGroup: + switch(info->rtfMajor) + { + case rtfBeginGroup: + if (info->stackTop < maxStack) { + memcpy(&info->stack[info->stackTop].fmt, &info->style->fmt, sizeof(CHARFORMAT2W)); + info->stack[info->stackTop].codePage = info->codePage; + info->stack[info->stackTop].unicodeLength = info->unicodeLength; + } + info->stackTop++; + break; + case rtfEndGroup: + { + ME_Style *s; + RTFFlushOutputBuffer(info); + info->stackTop--; + /* FIXME too slow ? how come ? */ + s = ME_ApplyStyle(info->style, &info->stack[info->stackTop].fmt); + ME_ReleaseStyle(info->style); + info->style = s; + info->codePage = info->stack[info->stackTop].codePage; + info->unicodeLength = info->stack[info->stackTop].unicodeLength; + break; + } + } + break; + case rtfControl: + switch(info->rtfMajor) + { + case rtfCharAttr: + ME_RTFCharAttrHook(info); + break; + case rtfParAttr: + ME_RTFParAttrHook(info); + break; + } + break; + } +} + +void +ME_StreamInFill(ME_InStream *stream) +{ + stream->editstream->dwError = stream->editstream->pfnCallback(stream->editstream->dwCookie, + stream->buffer, + sizeof(stream->buffer), + &stream->dwSize); + stream->dwUsed = 0; +} + static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stream) { RTF_Info parser; ME_Style *style; + int from, to, to2, nUndoMode; + ME_UndoItem *pUI; + int nEventMask = editor->nEventMask; + ME_InStream inStream; TRACE("%p %p\n", stream, editor->hWnd); + editor->nEventMask = 0; + ME_GetSelection(editor, &from, &to); if (format & SFF_SELECTION) { style = ME_GetSelectionInsertStyle(editor); - SendMessageW(editor->hWnd, WM_CLEAR, 0, 0); + + ME_InternalDeleteText(editor, from, to-from); } else { style = editor->pBuffer->pDefaultStyle; ME_AddRefStyle(style); SendMessageA(editor->hWnd, EM_SETSEL, 0, 0); - SetWindowTextA(editor->hWnd, ""); + ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor)); + from = to = 0; ME_ClearTempStyle(editor); + /* FIXME restore default paragraph formatting ! */ } + + nUndoMode = editor->nUndoMode; + editor->nUndoMode = umIgnore; - if (format & SF_RTF) { - /* setup the RTF parser */ - memset(&parser, 0, sizeof parser); - RTFSetEditStream(&parser, stream); - parser.rtfFormat = format&(SF_TEXT|SF_RTF); - parser.hwndEdit = editor->hWnd; - WriterInit(&parser); - RTFInit(&parser); - BeginFile(&parser); + inStream.editstream = stream; + inStream.editstream->dwError = 0; + inStream.dwSize = 0; + inStream.dwUsed = 0; + + if (format & SF_RTF) + { + /* Check if it's really RTF, and if it is not, use plain text */ + ME_StreamInFill(&inStream); + if (!inStream.editstream->dwError) + { + if (strncmp(inStream.buffer, "{\\rtf1", 6) && strncmp(inStream.buffer, "{\\urtf", 6)) + { + format &= ~SF_RTF; + format |= SF_TEXT; + } + } + } + + if (!inStream.editstream->dwError) + { + if (format & SF_RTF) { + /* setup the RTF parser */ + memset(&parser, 0, sizeof parser); + RTFSetEditStream(&parser, &inStream); + parser.rtfFormat = format&(SF_TEXT|SF_RTF); + parser.hwndEdit = editor->hWnd; + parser.editor = editor; + parser.style = style; + WriterInit(&parser); + RTFInit(&parser); + RTFSetReadHook(&parser, ME_RTFReadHook); + BeginFile(&parser); - /* do the parsing */ - RTFRead(&parser); - RTFFlushOutputBuffer(&parser); + /* do the parsing */ + RTFRead(&parser); + RTFFlushOutputBuffer(&parser); + RTFDestroy(&parser); + + style = parser.style; + } + else if (format & SF_TEXT) + ME_StreamInText(editor, format, &inStream, style); + else + ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); + ME_GetSelection(editor, &to, &to2); + /* put the cursor at the top */ + if (!(format & SFF_SELECTION)) + SendMessageA(editor->hWnd, EM_SETSEL, 0, 0); + else + { + /* FIXME where to put cursor now ? */ + } } - else if (format & SF_TEXT) - ME_StreamInText(editor, format, stream, style); - else - ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); - /* put the cursor at the top */ - if (!(format & SFF_SELECTION)) - SendMessageA(editor->hWnd, EM_SETSEL, 0, 0); - else + + editor->nUndoMode = nUndoMode; + pUI = ME_AddUndoItem(editor, diUndoDeleteRun, NULL); + TRACE("from %d to %d\n", from, to); + if (pUI && from < to) { - /* FIXME where to put cursor now ? */ + pUI->nStart = from; + pUI->nLen = to-from; } - ME_ReleaseStyle(style); + ME_CommitUndo(editor); + ME_ReleaseStyle(style); + editor->nEventMask = nEventMask; + InvalidateRect(editor->hWnd, NULL, TRUE); + ME_UpdateRepaint(editor); + if (!(format & SFF_SELECTION)) { + ME_ClearTempStyle(editor); + } + ME_MoveCaret(editor); + ME_SendSelChange(editor); return 0; } + +ME_DisplayItem * +ME_FindItemAtOffset(ME_TextEditor *editor, ME_DIType nItemType, int nOffset, int *nItemOffset) +{ + ME_DisplayItem *item = ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph); + + while (item && item->member.para.next_para->member.para.nCharOfs <= nOffset) + item = ME_FindItemFwd(item, diParagraph); + + if (!item) + return item; + + nOffset -= item->member.para.nCharOfs; + if (nItemType == diParagraph) { + if (nItemOffset) + *nItemOffset = nOffset; + return item; + } + + do { + item = ME_FindItemFwd(item, diRun); + } while (item && (item->member.run.nCharOfs + ME_StrLen(item->member.run.strText) <= nOffset)); + if (item) { + nOffset -= item->member.run.nCharOfs; + if (nItemOffset) + *nItemOffset = nOffset; + } + return item; +} + + ME_TextEditor *ME_MakeEditor(HWND hWnd) { ME_TextEditor *ed = ALLOC_OBJ(ME_TextEditor); HDC hDC; @@ -340,7 +632,6 @@ ed->pCursors[1].pRun = ME_FindItemFwd(ed->pBuffer->pFirst, diRun); ed->pCursors[1].nOffset = 0; ed->nLastTotalLength = ed->nTotalLength = 0; - ed->nScrollPos = 0; ed->nUDArrowX = -1; ed->nSequence = 0; ed->rgbBackColor = -1; @@ -351,6 +642,7 @@ ed->nUndoMode = umAddToUndo; ed->nParagraphs = 1; ed->nLastSelStart = ed->nLastSelEnd = 0; + ed->nScrollPosY = 0; for (i=0; i<HFONT_CACHE_SIZE; i++) { ed->pFontCache[i].nRefs = 0; @@ -361,6 +653,70 @@ return ed; } +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 DWORD CALLBACK ME_ReadFromHGLOBALUnicode(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG cb, LONG *pcb) +{ + ME_GlobalDestStruct *pData = (ME_GlobalDestStruct *)dwCookie; + int i; + WORD *pSrc, *pDest; + + cb = cb >> 1; + pDest = (WORD *)lpBuff; + pSrc = (WORD *)GlobalLock(pData->hData); + for (i = 0; i<cb && pSrc[pData->nLength+i]; i++) { + pDest[i] = pSrc[pData->nLength+i]; + } + pData->nLength += i; + *pcb = 2*i; + GlobalUnlock(pData->hData); + return 0; +} + +static DWORD CALLBACK ME_ReadFromHGLOBALRTF(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG cb, LONG *pcb) +{ + ME_GlobalDestStruct *pData = (ME_GlobalDestStruct *)dwCookie; + int i; + BYTE *pSrc, *pDest; + + pDest = lpBuff; + pSrc = (BYTE *)GlobalLock(pData->hData); + for (i = 0; i<cb && pSrc[pData->nLength+i]; i++) { + pDest[i] = pSrc[pData->nLength+i]; + } + pData->nLength += i; + *pcb = i; + GlobalUnlock(pData->hData); + return 0; +} + void ME_DestroyEditor(ME_TextEditor *editor) { ME_DisplayItem *pFirst = editor->pBuffer->pFirst; @@ -401,7 +757,6 @@ switch(msg) { UNSUPPORTED_MSG(EM_AUTOURLDETECT) - UNSUPPORTED_MSG(EM_CANPASTE) UNSUPPORTED_MSG(EM_CHARFROMPOS) UNSUPPORTED_MSG(EM_DISPLAYBAND) UNSUPPORTED_MSG(EM_EXLIMITTEXT) @@ -448,9 +803,7 @@ UNSUPPORTED_MSG(EM_SETUNDOLIMIT) UNSUPPORTED_MSG(EM_SETWORDBREAKPROC) UNSUPPORTED_MSG(EM_SETWORDBREAKPROCEX) - UNSUPPORTED_MSG(EM_STREAMOUT) UNSUPPORTED_MSG(WM_SETFONT) - UNSUPPORTED_MSG(WM_PASTE) UNSUPPORTED_MSG(WM_STYLECHANGING) UNSUPPORTED_MSG(WM_STYLECHANGED) /* UNSUPPORTED_MSG(WM_UNICHAR) FIXME missing in Wine headers */ @@ -459,6 +812,8 @@ case EM_STREAMIN: return ME_StreamIn(editor, wParam, (EDITSTREAM*)lParam); + case EM_STREAMOUT: + return ME_StreamOut(editor, wParam, (EDITSTREAM *)lParam); case WM_GETDLGCODE: { UINT code = DLGC_WANTCHARS|DLGC_WANTARROWS; @@ -557,6 +912,7 @@ case EM_SETCHARFORMAT: { CHARFORMAT2W buf, *p; + BOOL bRepaint = TRUE; p = ME_ToCF2W(&buf, (CHARFORMAT2W *)lParam); if (!wParam) ME_SetDefaultCharFormat(editor, p); @@ -564,10 +920,15 @@ FIXME("word selection not supported\n"); else if (wParam == SCF_ALL) ME_SetCharFormat(editor, 0, ME_GetTextLength(editor), p); - else + else { + int from, to; + ME_GetSelection(editor, &from, &to); + bRepaint = (from != to); ME_SetSelectionCharFormat(editor, p); + } ME_CommitUndo(editor); - ME_UpdateRepaint(editor); + if (bRepaint) + ME_UpdateRepaint(editor); return 0; } case EM_GETCHARFORMAT: @@ -583,6 +944,7 @@ } case EM_SETPARAFORMAT: ME_SetSelectionParaFormat(editor, (PARAFORMAT2 *)lParam); + ME_UpdateRepaint(editor); ME_CommitUndo(editor); return 0; case EM_GETPARAFORMAT: @@ -635,12 +997,49 @@ ME_UpdateRepaint(editor); return 0; } + case EM_CANPASTE: [truncated at 1000 lines; 4802 more skipped]

19 years, 4 months

[hpoussin] 15013: ExFreePool -> ExFreePoolWithTag changes

by hpoussin＠svn.reactos.com

ExFreePool -> ExFreePoolWithTag changes Modified: trunk/reactos/lib/rtl/unicode.c _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-05-05 18:32:46 UTC (rev 15012) +++ trunk/reactos/lib/rtl/unicode.c 2005-05-05 18:59:14 UTC (rev 15013) @@ -352,7 +352,7 @@ if (AnsiString->Buffer == NULL) return; - ExFreePool(AnsiString->Buffer); + ExFreePoolWithTag(AnsiString->Buffer, TAG_ASTR); AnsiString->Buffer = NULL; AnsiString->Length = 0; @@ -370,7 +370,7 @@ if (OemString->Buffer == NULL) return; - ExFreePool(OemString->Buffer); + ExFreePoolWithTag(OemString->Buffer, TAG_OSTR); OemString->Buffer = NULL; OemString->Length = 0; @@ -388,7 +388,7 @@ if (UnicodeString->Buffer == NULL) return; - ExFreePool(UnicodeString->Buffer); + ExFreePoolWithTag(UnicodeString->Buffer, TAG_USTR); UnicodeString->Buffer = NULL; UnicodeString->Length = 0; @@ -1010,7 +1010,7 @@ if (!NT_SUCCESS(Status) && AllocateDestinationString) { - ExFreePool (AnsiDest->Buffer); + ExFreePoolWithTag(AnsiDest->Buffer, TAG_ASTR); return Status; } @@ -1094,7 +1094,7 @@ if (!NT_SUCCESS(Status) && AllocateDestinationString) { - ExFreePool (UniDest->Buffer); + ExFreePoolWithTag(UniDest->Buffer, TAG_USTR); return Status; } @@ -1178,7 +1178,7 @@ if (!NT_SUCCESS(Status) && AllocateDestinationString) { - ExFreePool(OemDest->Buffer); + ExFreePoolWithTag(OemDest->Buffer, TAG_OSTR); return Status; } @@ -1320,7 +1320,7 @@ if (!NT_SUCCESS(Status) && AllocateDestinationString) { - ExFreePool (UniDest->Buffer); + ExFreePoolWithTag(UniDest->Buffer, TAG_USTR); return Status; } @@ -1653,7 +1653,7 @@ if (!NT_SUCCESS(Status) && AllocateDestinationString) { - ExFreePool(OemDest->Buffer); + ExFreePoolWithTag(OemDest->Buffer, TAG_OSTR); } return Status; @@ -1857,7 +1857,7 @@ if (!NT_SUCCESS(Status) && AllocateDestinationString) { - ExFreePool(AnsiDest->Buffer); + ExFreePoolWithTag(AnsiDest->Buffer, TAG_ASTR); return Status; } @@ -1945,7 +1945,7 @@ if (!NT_SUCCESS(Status) && AllocateDestinationString) { - ExFreePool(OemDest->Buffer); + ExFreePoolWithTag(OemDest->Buffer, TAG_OSTR); return Status; } @@ -2032,7 +2032,7 @@ if (!NT_SUCCESS(Status) && AllocateDestinationString) { - ExFreePool(OemDest->Buffer); + ExFreePoolWithTag(OemDest->Buffer, TAG_OSTR); return Status; } @@ -2495,7 +2495,7 @@ if (!NT_SUCCESS(Status) && AllocateDestinationString) { - ExFreePool(UniDest->Buffer); + ExFreePoolWithTag(UniDest->Buffer, TAG_USTR); return Status; }

19 years, 4 months

[gvg] 15012: Sync to Wine-20050419:

by gvg＠svn.reactos.com

Sync to Wine-20050419: Peter Berg Larsen <pebl(a)math.ku.dk> - Replace strncpy with memcpy or lstrcpyn. Jakob Eriksson <jakov(a)vmlinux.org> - Get rid of HeapAlloc casts. Modified: trunk/reactos/lib/oledlg/insobjdlg.c _____ Modified: trunk/reactos/lib/oledlg/insobjdlg.c --- trunk/reactos/lib/oledlg/insobjdlg.c 2005-05-05 18:29:41 UTC (rev 15011) +++ trunk/reactos/lib/oledlg/insobjdlg.c 2005-05-05 18:32:46 UTC (rev 15012) @@ -375,7 +375,7 @@ len = MAX_PATH; if (ERROR_SUCCESS == RegQueryValueA(hkey, NULL, keydesc, &len)) { - CLSID* lpclsid = (CLSID*) HeapAlloc(GetProcessHeap(), 0, sizeof(CLSID)); + CLSID* lpclsid = HeapAlloc(GetProcessHeap(), 0, sizeof(CLSID)); memcpy(lpclsid, &clsid, sizeof(CLSID)); len = SendMessageA(pdlgInfo->hwndObjTypeLB, LB_ADDSTRING, 0, (LPARAM)keydesc); @@ -479,7 +479,7 @@ WCHAR wcsFile[MAX_PATH]; SendMessageA(pdlgInfo->hwndFileTB, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)fname); - strncpy(pdlgInfo->lpOleUIInsertObject->lpszFile, fname, pdlgInfo->lpOleUIInsertObject->cchFile); + lstrcpynA(pdlgInfo->lpOleUIInsertObject->lpszFile, fname, pdlgInfo->lpOleUIInsertObject->cchFile); RtlMultiByteToUnicodeN(wcsFile, MAX_PATH, NULL, fname, MAX_PATH); if (ERROR_SUCCESS == (hres = GetClassFile(wcsFile, &pdlgInfo->lpOleUIInsertObject->clsid)))

19 years, 4 months

[gvg] 15011: Sync to Wine-20050419:

by gvg＠svn.reactos.com

Sync to Wine-20050419: Daniel Remenak <dtremenak(a)gmail.com> - Implemented VarIdiv. - Return DISP_E_DIVBYZERO instead of crashing when asked to divide a variant by zero. - Remove unused variable in _copy_arg. Marcus Meissner <meissner(a)suse.de> - Serialize NULL pointer interfaces correctly. - Fixed VT_BSTR|VT_BYREF marshalling. - Added VT_I4|VT_BYREF marshalling. - Fixed ppvObject serializer (deref twice instead of once). - Actually pass back return value of remote call in type marshaller. - Format VT_UI1, VT_I1, VT_UI2, VT_I2 correctly. - Added IDispatch::GetIDsOfNames() special case serializing. - Handle VT_PTR / NULL marshalling correctly. Mike Hearn <mike(a)navi.cx> - Fix BSTR tracing in the typelib marshaller. - Fix PARAMFLAG_FOUT typo in the tmarshaller. Mike Hearn <mh(a)codeweavers.com> Robert Shearman <rob(a)codeweavers.com> - Implement VT_BYREF | VT_BSTR marshalling. - Add more integer types for marshaling and unmarshaling. - Implement VT_BYREF | VT_BSTR unmarshaling. - Don't allocate memory for TKIND_DISPATCH/TKIND_INTERFACE unmarshaling as it will be lost in the success case and interferes with the failure case. Robert Shearman <rob(a)codeweavers.com> - Add outer unknown support for typelib marshaler. Jakob Eriksson <jakov(a)vmlinux.org> - Get rid of HeapAlloc casts. Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Alex Villacis Lasso <a_villacis(a)palosanto.com> - Fix leftover negative sign in height parameter for transparent bitmap. - Properly announce whether bitmap is transparent in get_Attributes. - GIF transparency is now palette-index based, instead of RGB based. - Keep original bitmap and XOR mask separate, so that get_Handle returns original bitmap. - Initialize [orig|himetric][Width|Height] for PICTYPE_ICON case. - Fix failure to notice the use of a GIF palette index greater or equal to 128 for transparency. - After Float->string conversion via sprintfW(), VarDecFromR[4|8] is forced to use US locale for string->Decimal conversion, to agree with sprintfW(). Modified: trunk/reactos/lib/oleaut32/oleaut.c Modified: trunk/reactos/lib/oleaut32/oleaut32.spec Modified: trunk/reactos/lib/oleaut32/olepicture.c Modified: trunk/reactos/lib/oleaut32/safearray.c Modified: trunk/reactos/lib/oleaut32/tmarshal.c Modified: trunk/reactos/lib/oleaut32/typelib.c Modified: trunk/reactos/lib/oleaut32/typelib.h Modified: trunk/reactos/lib/oleaut32/variant.c Modified: trunk/reactos/lib/oleaut32/vartype.c _____ Modified: trunk/reactos/lib/oleaut32/oleaut.c --- trunk/reactos/lib/oleaut32/oleaut.c 2005-05-05 18:16:09 UTC (rev 15010) +++ trunk/reactos/lib/oleaut32/oleaut.c 2005-05-05 18:29:41 UTC (rev 15011) @@ -235,9 +235,8 @@ * buffer for the character count and an extra character at the * end for the NULL. */ - newBuffer = (DWORD*)HeapAlloc(GetProcessHeap(), - 0, - bufferSize + sizeof(WCHAR) + sizeof(DWORD)); + newBuffer = HeapAlloc(GetProcessHeap(), 0, + bufferSize + sizeof(WCHAR) + sizeof(DWORD)); /* * If the memory allocation failed, return a null pointer. @@ -350,9 +349,8 @@ * buffer for the character count and an extra character at the * end for the NULL. */ - newBuffer = (DWORD*)HeapAlloc(GetProcessHeap(), - 0, - len + sizeof(WCHAR) + sizeof(DWORD)); + newBuffer = HeapAlloc(GetProcessHeap(), 0, + len + sizeof(WCHAR) + sizeof(DWORD)); /* * If the memory allocation failed, return a null pointer. _____ Modified: trunk/reactos/lib/oleaut32/oleaut32.spec --- trunk/reactos/lib/oleaut32/oleaut32.spec 2005-05-05 18:16:09 UTC (rev 15010) +++ trunk/reactos/lib/oleaut32/oleaut32.spec 2005-05-05 18:29:41 UTC (rev 15011) @@ -148,7 +148,7 @@ 149 stdcall SysStringByteLen(ptr) 150 stdcall SysAllocStringByteLen(ptr long) 152 stdcall VarEqv(ptr ptr ptr) -153 stub VarIdiv # stdcall (ptr ptr ptr) +153 stdcall VarIdiv(ptr ptr ptr) 154 stub VarImp # stdcall (ptr ptr ptr) 155 stdcall VarMod(ptr ptr ptr) 156 stdcall VarMul(ptr ptr ptr) _____ Modified: trunk/reactos/lib/oleaut32/olepicture.c --- trunk/reactos/lib/oleaut32/olepicture.c 2005-05-05 18:16:09 UTC (rev 15010) +++ trunk/reactos/lib/oleaut32/olepicture.c 2005-05-05 18:29:41 UTC (rev 15011) @@ -185,6 +185,36 @@ DeleteDC(hdcRef); } +static void OLEPictureImpl_SetIcon(OLEPictureImpl * This) +{ + ICONINFO infoIcon; + + TRACE("icon handle %p\n", This->desc.u.icon.hicon); + if (GetIconInfo(This->desc.u.icon.hicon, &infoIcon)) { + HDC hdcRef; + BITMAP bm; + + TRACE("bitmap handle for icon is %p\n", infoIcon.hbmColor); + if(GetObjectA(infoIcon.hbmColor ? infoIcon.hbmColor : infoIcon.hbmMask, sizeof(bm), &bm) != sizeof(bm)) { + ERR("GetObject fails on icon bitmap\n"); + return; + } + + This->origWidth = bm.bmWidth; + This->origHeight = infoIcon.hbmColor ? bm.bmHeight : bm.bmHeight / 2; + /* see comment on HIMETRIC on OLEPictureImpl_SetBitmap() */ + hdcRef = GetDC(0); + This->himetricWidth = (This->origWidth *2540)/GetDeviceCaps(hdcRef, LOGPIXELSX); + This->himetricHeight= (This->origHeight *2540)/GetDeviceCaps(hdcRef, LOGPIXELSY); + ReleaseDC(0, hdcRef); + + DeleteObject(infoIcon.hbmMask); + if (infoIcon.hbmColor) DeleteObject(infoIcon.hbmColor); + } else { + ERR("GetIconInfo() fails on icon %p\n", This->desc.u.icon.hicon); + } +} + /*********************************************************************** * * OLEPictureImpl_Construct * @@ -260,6 +290,8 @@ break; case PICTYPE_ICON: + OLEPictureImpl_SetIcon(newObject); + break; case PICTYPE_ENHMETAFILE: default: FIXME("Unsupported type %d\n", pictDesc->picType); @@ -1071,7 +1103,7 @@ eb = si->ExtensionBlocks + i; if (eb->Function == 0xF9 && eb->ByteCount == 4) { if ((eb->Bytes[0] & 1) == 1) { - transparent = eb->Bytes[3]; + transparent = (unsigned char)eb->Bytes[3]; } } } @@ -1145,7 +1177,7 @@ This->hbmMask = CreateBitmap(bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, 1, 1, NULL); - hOldbitmap = SelectObject(hdc,This->desc.u.bmp.hbitmap); + hOldbitmap = SelectObject(hdc,This->desc.u.bmp.hbitmap); hOldbitmapmask = SelectObject(hdcMask, This->hbmMask); SetBkColor(hdc, This->rgbTrans); BitBlt(hdcMask, 0, 0, bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, hdc, 0, 0, SRCCOPY); @@ -1501,7 +1533,7 @@ BITMAPFILEHEADER * pFileHeader; BITMAPINFO * pInfoHeader; - pInfoBitmap = (BITMAPINFO *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + pInfoBitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); /* Find out bitmap size and padded length */ @@ -1511,8 +1543,7 @@ /* Fetch bitmap palette & pixel data */ - pPixelData = (unsigned char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - pInfoBitmap->bmiHeader.biSizeImage); + pPixelData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pInfoBitmap->bmiHeader.biSizeImage); GetDIBits(hDC, hBitmap, 0, pInfoBitmap->bmiHeader.biHeight, pPixelData, pInfoBitmap, DIB_RGB_COLORS); /* Calculate the total length required for the BMP data */ @@ -1530,7 +1561,7 @@ sizeof(BITMAPINFOHEADER) + iNumPaletteEntries * sizeof(RGBQUAD) + pInfoBitmap->bmiHeader.biSizeImage; - *ppBuffer = (void *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *pLength); + *ppBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *pLength); /* Fill the BITMAPFILEHEADER */ pFileHeader = (BITMAPFILEHEADER *)(*ppBuffer); @@ -1569,7 +1600,7 @@ unsigned char * pIconData = NULL; unsigned int iDataSize = 0; - pInfoBitmap = (BITMAPINFO *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + pInfoBitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); /* Find out icon size */ hDC = GetDC(0); @@ -1603,7 +1634,7 @@ */ /* Let's start with one CURSORICONFILEDIR and one CURSORICONFILEDIRENTRY */ iDataSize += 3 * sizeof(WORD) + sizeof(CURSORICONFILEDIRENTRY) + sizeof(BITMAPINFOHEADER); - pIconData = (unsigned char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iDataSize); + pIconData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iDataSize); /* Fill out the CURSORICONFILEDIR */ pIconDir = (CURSORICONFILEDIR *)pIconData; @@ -1651,7 +1682,7 @@ iDataSize += pIconBitmapHeader->biHeight * iLengthScanLineMask; pIconBitmapHeader->biSizeImage += pIconBitmapHeader->biHeight * iLengthScanLineMask; pIconBitmapHeader->biHeight *= 2; - pIconData = (unsigned char *)HeapReAlloc(GetProcessHeap(), 0, pIconData, iDataSize); + pIconData = HeapReAlloc(GetProcessHeap(), 0, pIconData, iDataSize); pIconEntry = (CURSORICONFILEDIRENTRY *)(pIconData + 3 * sizeof(WORD)); pIconBitmapHeader = (BITMAPINFOHEADER *)(pIconData + 3 * sizeof(WORD) + sizeof(CURSORICONFILEDIRENTRY)); pIconEntry->dwDIBSize = iDataSize - (3 * sizeof(WORD) + sizeof(CURSORICONFILEDIRENTRY)); _____ Modified: trunk/reactos/lib/oleaut32/safearray.c --- trunk/reactos/lib/oleaut32/safearray.c 2005-05-05 18:16:09 UTC (rev 15010) +++ trunk/reactos/lib/oleaut32/safearray.c 2005-05-05 18:29:41 UTC (rev 15011) @@ -647,7 +647,7 @@ /*********************************************************************** * * SafeArrayCreateVector (OLEAUT32.411) * - * Create a one dimensional, contigous SafeArray. + * Create a one dimensional, contiguous SafeArray. * * PARAMS * vt [I] Type to store in the safe array @@ -674,7 +674,7 @@ /*********************************************************************** * * SafeArrayCreateVectorEx (OLEAUT32.411) * - * Create a one dimensional, contigous SafeArray. + * Create a one dimensional, contiguous SafeArray. * * PARAMS * vt [I] Type to store in the safe array _____ Modified: trunk/reactos/lib/oleaut32/tmarshal.c --- trunk/reactos/lib/oleaut32/tmarshal.c 2005-05-05 18:16:09 UTC (rev 15010) +++ trunk/reactos/lib/oleaut32/tmarshal.c 2005-05-05 18:29:41 UTC (rev 15011) @@ -1,7 +1,7 @@ /* * TYPELIB Marshaler * - * Copyright 2002 Marcus Meissner + * Copyright 2002,2005 Marcus Meissner * * The olerelay debug channel allows you to see calls marshalled by * the typelib marshaller. It is not a generic COM relaying system. @@ -48,6 +48,8 @@ static const WCHAR riidW[5] = {'r','i','i','d',0}; static const WCHAR pdispparamsW[] = {'p','d','i','s','p','p','a','r','a','m','s',0}; static const WCHAR ppvObjectW[] = {'p','p','v','O','b','j','e','c','t',0}; +static const WCHAR IDispatchW[] = { 'I','D','i','s','p','a','t','c','h',0}; +static const WCHAR GetIDsOfNamesW[] = { 'G','e','t','I','D','s','O','f','N','a','m','e','s',0}; WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(olerelay); @@ -167,12 +169,19 @@ DWORD xsize; HRESULT hres; - hres = E_FAIL; if (!pUnk) { + /* this is valid, if for instance we serialize + * a VT_DISPATCH with NULL ptr which apparently + * can happen. S_OK to make sure we continue + * serializing. + */ ERR("pUnk is NULL?\n"); - goto fail; + xsize = 0; + return xbuf_add(buf,(LPBYTE)&xsize,sizeof(xsize)); } + hres = E_FAIL; + TRACE("...%s...\n",debugstr_guid(riid)); hres = IUnknown_QueryInterface(pUnk,riid,(LPVOID*)&newiface); if (hres) { @@ -355,6 +364,7 @@ IRpcChannelBuffer* chanbuf; IID iid; CRITICAL_SECTION crit; + IUnknown *outerunknown; } TMProxyImpl; static HRESULT WINAPI @@ -499,17 +509,36 @@ return S_OK; case VT_BOOL: case VT_ERROR: - case VT_UI4: case VT_UINT: case VT_I4: case VT_R4: + case VT_UI4: + hres = S_OK; + if (debugout) TRACE_(olerelay)("%lx",*arg); + if (writeit) + hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); + return hres; + case VT_I2: case VT_UI2: + hres = S_OK; + if (debugout) TRACE_(olerelay)("%04lx",*arg & 0xffff); + if (writeit) + hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); + return hres; + case VT_I1: case VT_UI1: hres = S_OK; - if (debugout) TRACE_(olerelay)("%lx",*arg); + if (debugout) TRACE_(olerelay)("%02lx",*arg & 0xff); if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); return hres; + case VT_I4|VT_BYREF: + hres = S_OK; + if (debugout) TRACE_(olerelay)("&0x%lx",*arg); + if (writeit) + hres = xbuf_add(buf,(LPBYTE)(DWORD*)*arg,sizeof(DWORD)); + /* do not dealloc at this time */ + return hres; case VT_VARIANT: { TYPEDESC tdesc2; VARIANT *vt = (VARIANT*)arg; @@ -526,10 +555,34 @@ if (debugout) TRACE_(olerelay)(")"); return hres; } + case VT_BSTR|VT_BYREF: { + if (debugout) TRACE_(olerelay)("[byref]'%s'", *(BSTR*)*arg ? relaystr(*((BSTR*)*arg)) : "<bstr NULL>"); + if (writeit) { + /* ptr to ptr to magic widestring, basically */ + BSTR *bstr = (BSTR *) *arg; + if (!*bstr) { + /* -1 means "null string" which is equivalent to empty string */ + DWORD fakelen = -1; + xbuf_add(buf, (LPBYTE)&fakelen,4); + } else { + /* BSTRs store the length behind the first character */ + DWORD *len = ((DWORD *)(*bstr))-1; + hres = xbuf_add(buf, (LPBYTE) len, *len + 4); + if (hres) return hres; + } + } + + if (dealloc && arg) { + BSTR *str = *((BSTR **)arg); + SysFreeString(*str); + } + return S_OK; + } + case VT_BSTR: { if (debugout) { - if (arg) - TRACE_(olerelay)("%s",relaystr((BSTR)*arg)); + if (*arg) + TRACE_(olerelay)("%s",relaystr((WCHAR*)*arg)); else TRACE_(olerelay)("<bstr NULL>"); } @@ -556,12 +609,12 @@ DWORD cookie; if (debugout) TRACE_(olerelay)("*"); - if (writeit) { - cookie = *arg ? 0x42424242 : 0; - hres = xbuf_add(buf,(LPBYTE)&cookie,sizeof(cookie)); - if (hres) - return hres; - } + /* Write always, so the other side knows when it gets a NULL pointer. + */ + cookie = *arg ? 0x42424242 : 0; + hres = xbuf_add(buf,(LPBYTE)&cookie,sizeof(cookie)); + if (hres) + return hres; if (!*arg) { if (debugout) TRACE_(olerelay)("NULL"); return S_OK; @@ -660,6 +713,7 @@ if (debugout) TRACE_(olerelay)("[%ld]",adesc->rgbounds[i].cElements); arrsize *= adesc->rgbounds[i].cElements; } + if (debugout) TRACE_(olerelay)("(vt %d)",adesc->tdescElem.vt); if (debugout) TRACE_(olerelay)("["); for (i=0;i<arrsize;i++) { hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)arg+i*_xsize(&adesc->tdescElem)), buf); @@ -676,7 +730,169 @@ } } +/* IDL desc: + * HRESULT GetIDsOfNames( + * [in] REFIID riid, args[1] + * [in, size_is(cNames)] LPOLESTR *rgszNames, args[2] + * [in] UINT cNames, args[3] + * [in] LCID lcid, args[4] + * [out, size_is(cNames)] DISPID *rgDispId); args[5] + * + * line format: + * IID iid; + * DWORD cNames; + * LPOLESTR rgszNames[cNames]; + * DWORD bytestrlen (incl 0) + * BYTE data[bytestrlen] (incl 0) + * LCID + */ static HRESULT +serialize_IDispatch_GetIDsOfNames( + BOOL inputparams, + BOOL debugout, + DWORD *args, + marshal_state *buf) +{ + HRESULT hres; + DWORD cNames = args[2]; + LPOLESTR *rgszNames = (LPOLESTR*)args[1]; + int i; + + if (inputparams) { + if (debugout) TRACE_(olerelay)("riid=%s,",debugstr_guid((REFIID)args[0])); + hres = xbuf_add(buf, (LPBYTE)args[0], sizeof(IID)); + if (hres) { + FIXME("serialize of IID failed.\n"); + return hres; + } + if (debugout) TRACE_(olerelay)("cNames=%ld,",cNames); + hres = xbuf_add(buf, (LPBYTE)&cNames, sizeof(DWORD)); + if (hres) { + FIXME("serialize of cNames failed.\n"); + return hres; + } + if (debugout) TRACE_(olerelay)("rgszNames=["); + for (i=0;i<cNames;i++) { + DWORD len = 2*(lstrlenW(rgszNames[i])+1); + + if (debugout) TRACE_(olerelay)("%s,",relaystr(rgszNames[i])); + hres = xbuf_add(buf, (LPBYTE)&len, sizeof(DWORD)); + if (hres) { + FIXME("serialize of len failed.\n"); + return hres; + } + hres = xbuf_add(buf, (LPBYTE)rgszNames[i], len); + if (hres) { + FIXME("serialize of rgszNames[i] failed.\n"); + return hres; + } + } + if (debugout) TRACE_(olerelay)("],lcid=%04lx)",args[3]); + hres = xbuf_add(buf, (LPBYTE)&args[3], sizeof(DWORD)); + if (hres) { + FIXME("serialize of lcid failed.\n"); + return hres; + } + } else { + DISPID *rgDispId = (DISPID*)args[4]; + + hres = xbuf_add(buf, (LPBYTE)rgDispId, sizeof(DISPID) * cNames); + if (hres) { + FIXME("serialize of rgDispId failed.\n"); + return hres; + } + if (debugout) { + TRACE_(olerelay)("riid=[in],rgszNames=[in],cNames=[in],rgDispId=["); + for (i=0;i<cNames;i++) + TRACE_(olerelay)("%08lx,",rgDispId[i]); + TRACE_(olerelay)("])"); + } + HeapFree(GetProcessHeap(),0,(IID*)args[0]); + rgszNames = (LPOLESTR*)args[1]; + for (i=0;i<cNames;i++) HeapFree(GetProcessHeap(),0,rgszNames[i]); + HeapFree(GetProcessHeap(),0,rgszNames); + HeapFree(GetProcessHeap(),0,rgDispId); + } + return S_OK; +} + +static HRESULT +deserialize_IDispatch_GetIDsOfNames( + BOOL inputparams, + BOOL debugout, + DWORD *args, + marshal_state *buf) +{ + HRESULT hres; + DWORD cNames; + LPOLESTR *rgszNames; + int i; + + if (inputparams) { + args[0] = (DWORD)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IID)); + if (!args[0]) return E_FAIL; + hres = xbuf_get(buf, (LPBYTE)args[0], sizeof(IID)); + if (hres) { + FIXME("deserialize of IID failed.\n"); + return hres; + } + if (debugout) TRACE_(olerelay)("riid=%s,",debugstr_guid((REFIID)args[0])); + + hres = xbuf_get(buf, (LPBYTE)&cNames, sizeof(DWORD)); + if (hres) { + FIXME("deserialize of cNames failed.\n"); + return hres; + } + args[2] = cNames; + if (debugout) TRACE_(olerelay)("cNames=%ld,",cNames); + if (debugout) TRACE_(olerelay)("rgszNames=["); + rgszNames = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(LPOLESTR) * cNames); + if (!rgszNames) return E_FAIL; + args[1] = (DWORD)rgszNames; + for (i=0;i<cNames;i++) { + DWORD len; + + hres = xbuf_get(buf, (LPBYTE)&len, sizeof(DWORD)); + if (hres) { + FIXME("serialize of len failed.\n"); + return hres; + } + rgszNames[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + if (!rgszNames[i]) { + FIXME("heapalloc of %ld bytes failed\n", len); + return E_FAIL; + } + hres = xbuf_get(buf, (LPBYTE)rgszNames[i], len); + if (hres) { + FIXME("serialize of rgszNames[i] failed.\n"); + return hres; + } + if (debugout) TRACE_(olerelay)("%s,",relaystr(rgszNames[i])); + } + hres = xbuf_get(buf, (LPBYTE)&args[3], sizeof(DWORD)); + if (hres) { + FIXME("deserialize of lcid failed.\n"); + return hres; + } + if (debugout) TRACE_(olerelay)("],lcid=%04lx,rgDispId=[out])",args[3]); + args[4] = (DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DISPID) * cNames); + } else { + hres = xbuf_get(buf, (LPBYTE)args[4], sizeof(DISPID) * args[2]); + if (hres) { + FIXME("serialize of rgDispId failed.\n"); + return hres; + } + if (debugout) { + TRACE_(olerelay)("dispid=["); + for (i=0;i<args[2];i++) + TRACE_(olerelay)("%08lx,",((DISPID*)args[4])[i]); + TRACE_(olerelay)("])"); + } + } + return S_OK; +} + +static HRESULT serialize_LPVOID_ptr( ITypeInfo *tinfo, BOOL writeit, @@ -696,13 +912,13 @@ FIXME("ppvObject not expressed as VT_PTR -> VT_PTR -> VT_VOID?\n"); return E_FAIL; } - cookie = (*arg) ? 0x42424242: 0x0; + cookie = (*(DWORD*)*arg) ? 0x42424242: 0x0; if (writeit) { hres = xbuf_add(buf, (LPVOID)&cookie, sizeof(cookie)); if (hres) return hres; } - if (!*arg) { + if (!*(DWORD*)*arg) { if (debugout) TRACE_(olerelay)("<lpvoid NULL>"); return S_OK; } @@ -849,15 +1065,79 @@ } } case VT_ERROR: - case VT_BOOL: case VT_I4: case VT_UI4: case VT_UINT: case VT_R4: - case VT_UI2: - case VT_UI1: + case VT_BOOL: + case VT_I4: + case VT_UINT: + case VT_R4: + case VT_UI4: if (readit) { hres = xbuf_get(buf,(LPBYTE)arg,sizeof(DWORD)); if (hres) ERR("Failed to read integer 4 byte\n"); } if (debugout) TRACE_(olerelay)("%lx",*arg); return hres; + case VT_I2: + case VT_UI2: + if (readit) { + DWORD x; + hres = xbuf_get(buf,(LPBYTE)&x,sizeof(DWORD)); + if (hres) ERR("Failed to read integer 4 byte\n"); + memcpy(arg,&x,2); + } + if (debugout) TRACE_(olerelay)("%04lx",*arg & 0xffff); + return hres; + case VT_I1: + case VT_UI1: + if (readit) { + DWORD x; + hres = xbuf_get(buf,(LPBYTE)&x,sizeof(DWORD)); + if (hres) ERR("Failed to read integer 4 byte\n"); + memcpy(arg,&x,1); + } + if (debugout) TRACE_(olerelay)("%02lx",*arg & 0xff); + return hres; + case VT_I4|VT_BYREF: + hres = S_OK; + if (alloc) + *arg = (DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DWORD)); + if (readit) { + hres = xbuf_get(buf,(LPBYTE)*arg,sizeof(DWORD)); + if (hres) ERR("Failed to read integer 4 byte\n"); + } + if (debugout) TRACE_(olerelay)("&0x%lx",*(DWORD*)*arg); + return hres; + case VT_BSTR|VT_BYREF: { + BSTR **bstr = (BSTR **)arg; + WCHAR *str; + DWORD len; + + if (readit) { + hres = xbuf_get(buf,(LPBYTE)&len,sizeof(DWORD)); + if (hres) { + ERR("failed to read bstr klen\n"); + return hres; + } + if (len == -1) { + *bstr = CoTaskMemAlloc(sizeof(BSTR *)); + **bstr = NULL; + if (debugout) TRACE_(olerelay)("<bstr NULL>"); + } else { + str = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,len+sizeof(WCHAR)); + hres = xbuf_get(buf,(LPBYTE)str,len); + if (hres) { + ERR("Failed to read BSTR.\n"); + return hres; + } + *bstr = CoTaskMemAlloc(sizeof(BSTR *)); + **bstr = SysAllocStringLen(str,len); + if (debugout) TRACE_(olerelay)("%s",relaystr(str)); + HeapFree(GetProcessHeap(),0,str); + } + } else { + *bstr = NULL; + } + return S_OK; + } case VT_BSTR: { WCHAR *str; DWORD len; @@ -889,24 +1169,26 @@ } case VT_PTR: { DWORD cookie; - BOOL derefhere = 0; + BOOL derefhere = 0; derefhere = (tdesc->u.lptdesc->vt != VT_USERDEFINED); - - if (readit) { - hres = xbuf_get(buf,(LPBYTE)&cookie,sizeof(cookie)); - if (hres) { - ERR("Failed to load pointer cookie.\n"); - return hres; - } - if (cookie != 0x42424242) { - if (debugout) TRACE_(olerelay)("NULL"); - *arg = 0; - return S_OK; - } - if (debugout) TRACE_(olerelay)("*"); + /* read it in all cases, we need to know if we have + * NULL pointer or not. + */ + hres = xbuf_get(buf,(LPBYTE)&cookie,sizeof(cookie)); + if (hres) { + ERR("Failed to load pointer cookie.\n"); + return hres; } + if (cookie != 0x42424242) { + /* we read a NULL ptr from the remote side */ + if (debugout) TRACE_(olerelay)("NULL"); + *arg = 0; + return S_OK; + } + if (debugout) TRACE_(olerelay)("*"); if (alloc) { + /* Allocate space for the referenced struct */ if (derefhere) *arg=(DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u. lptdesc)); } @@ -948,8 +1230,6 @@ if (hres) { ERR("Could not get typeattr in VT_USERDEFINED.\n"); } else { - if (alloc) - *arg = (DWORD)HeapAlloc(GetProcessHeap(),0,tattr->cbSizeInstance); switch (tattr->typekind) { case TKIND_DISPATCH: case TKIND_INTERFACE: @@ -959,6 +1239,9 @@ case TKIND_RECORD: { int i; + if (alloc) + *arg = (DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,tattr->cbSizeInstance ); + if (debugout) TRACE_(olerelay)("{"); for (i=0;i<tattr->cVars;i++) { VARDESC *vdesc; @@ -1056,8 +1339,10 @@ } if (readit) { hres = _unmarshal_interface(buf,&buf->iid,(LPUNKNOWN*)*arg); - if (hres) + if (hres) { + FIXME("_unmarshal_interface of %s , %p failed with %lx\n", debugstr_guid(&buf->iid), (LPUNKNOWN*)*arg, hres); return hres; + } } if (debugout) TRACE_(olerelay)("ppv(%p)",(LPVOID)*arg); return S_OK; @@ -1209,6 +1494,8 @@ BSTR fname,iname; BSTR names[10]; int nrofnames; + int is_idispatch_getidsofnames = 0; + DWORD remoteresult = 0; EnterCriticalSection(&tpinfo->crit); @@ -1235,9 +1522,35 @@ else TRACE_(olerelay)("%d",method); TRACE_(olerelay)("("); - if (iname) SysFreeString(iname); - if (fname) SysFreeString(fname); } + if (iname && fname && !lstrcmpW(iname,IDispatchW) && !lstrcmpW(fname,GetIDsOfNamesW)) + is_idispatch_getidsofnames = 1; + + if (iname) SysFreeString(iname); + if (fname) SysFreeString(fname); + + memset(&buf,0,sizeof(buf)); + buf.iid = IID_IUnknown; + + /* Special IDispatch::GetIDsOfNames() serializer */ + if (is_idispatch_getidsofnames) { + hres = serialize_IDispatch_GetIDsOfNames(TRUE,relaydeb,args,&buf); + if (hres != S_OK) { + FIXME("serialize of IDispatch::GetIDsOfNames failed!\n"); + return hres; + } + goto afterserialize; + } + + /* special QueryInterface serialize */ + if (method == 0) { + xbuf_add(&buf,(LPBYTE)args[0],sizeof(IID)); + if (relaydeb) TRACE_(olerelay)("riid=%s,[out])",debugstr_guid((REFIID)args[0])); + goto afterserialize; + } + + /* normal typelib driven serializing */ + /* Need them for hack below */ memset(names,0,sizeof(names)); if (ITypeInfo_GetNames(tpinfo->tinfo,fdesc->memid,names,sizeof(names)/sizeo f(names[0]),&nrofnames)) @@ -1245,62 +1558,42 @@ if (nrofnames > sizeof(names)/sizeof(names[0])) ERR("Need more names!\n"); - memset(&buf,0,sizeof(buf)); - buf.iid = IID_IUnknown; - if (method == 0) { - xbuf_add(&buf,(LPBYTE)args[0],sizeof(IID)); - if (relaydeb) TRACE_(olerelay)("riid=%s,[out]",debugstr_guid((REFIID)args[0])); - } else { - xargs = args; - for (i=0;i<fdesc->cParams;i++) { - ELEMDESC *elem = fdesc->lprgelemdescParam+i; - BOOL isserialized = FALSE; - if (relaydeb) { - if (i) TRACE_(olerelay)(","); - if (i+1<nrofnames && names[i+1]) - TRACE_(olerelay)("%s=",relaystr(names[i+1])); - } - /* No need to marshal other data than FIN */ - if (!(elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN)) { - xargs+=_argsize(elem->tdesc.vt); - if (relaydeb) TRACE_(olerelay)("[out]"); - continue; - } - if (((i+1)<nrofnames) && !IsBadStringPtrW(names[i+1],1)) { - /* If the parameter is 'riid', we use it as interface IID - * for a later ppvObject serialization. - */ - buf.thisisiid = !lstrcmpW(names[i+1],riidW); + xargs = args; + for (i=0;i<fdesc->cParams;i++) { + ELEMDESC *elem = fdesc->lprgelemdescParam+i; + BOOL isserialized = FALSE; + if (relaydeb) { + if (i) TRACE_(olerelay)(","); + if (i+1<nrofnames && names[i+1]) + TRACE_(olerelay)("%s=",relaystr(names[i+1])); + } + /* No need to marshal other data than FIN and any VT_PTR. */ + if (!(elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN) && (elem->tdesc.vt != VT_PTR)) { + xargs+=_argsize(elem->tdesc.vt); + if (relaydeb) TRACE_(olerelay)("[out]"); + continue; + } + if (((i+1)<nrofnames) && !IsBadStringPtrW(names[i+1],1)) { + /* If the parameter is 'riid', we use it as interface IID + * for a later ppvObject serialization. + */ + buf.thisisiid = !lstrcmpW(names[i+1],riidW); - /* DISPPARAMS* needs special serializer */ - if (!lstrcmpW(names[i+1],pdispparamsW)) { - hres = serialize_DISPPARAM_ptr( - tpinfo->tinfo, - elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN, - relaydeb, - FALSE, - &elem->tdesc, - xargs, - &buf - ); - isserialized = TRUE; - } - if (!lstrcmpW(names[i+1],ppvObjectW)) { - hres = serialize_LPVOID_ptr( - tpinfo->tinfo, - elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN, - relaydeb, - FALSE, - &elem->tdesc, - xargs, - &buf - ); - if (hres == S_OK) - isserialized = TRUE; - } + /* DISPPARAMS* needs special serializer */ + if (!lstrcmpW(names[i+1],pdispparamsW)) { + hres = serialize_DISPPARAM_ptr( + tpinfo->tinfo, + elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN, + relaydeb, + FALSE, + &elem->tdesc, + xargs, + &buf + ); + isserialized = TRUE; } - if (!isserialized) - hres = serialize_param( + if (!lstrcmpW(names[i+1],ppvObjectW)) { + hres = serialize_LPVOID_ptr( tpinfo->tinfo, elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN, relaydeb, @@ -1309,15 +1602,30 @@ xargs, &buf ); - - if (hres) { - ERR("Failed to serialize param, hres %lx\n",hres); - break; + if (hres == S_OK) + isserialized = TRUE; } - xargs+=_argsize(elem->tdesc.vt); } + if (!isserialized) + hres = serialize_param( + tpinfo->tinfo, + elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN, + relaydeb, + FALSE, + &elem->tdesc, + xargs, + &buf + ); + + if (hres) { + ERR("Failed to serialize param, hres %lx\n",hres); + break; + } + xargs+=_argsize(elem->tdesc.vt); } if (relaydeb) TRACE_(olerelay)(")"); + +afterserialize: memset(&msg,0,sizeof(msg)); msg.cbBuffer = buf.curoff; msg.iMethod = method; @@ -1336,7 +1644,7 @@ return hres; } - if (relaydeb) TRACE_(olerelay)(" = %08lx (",status); + if (relaydeb) TRACE_(olerelay)(" status = %08lx (",status); if (buf.base) buf.base = HeapReAlloc(GetProcessHeap(),0,buf.base,msg.cbBuffer); else @@ -1344,88 +1652,145 @@ buf.size = msg.cbBuffer; memcpy(buf.base,msg.Buffer,buf.size); buf.curoff = 0; + + /* Special IDispatch::GetIDsOfNames() deserializer */ + if (is_idispatch_getidsofnames) { + hres = deserialize_IDispatch_GetIDsOfNames(FALSE,relaydeb,args,&buf); + if (hres != S_OK) { + FIXME("deserialize of IDispatch::GetIDsOfNames failed!\n"); + return hres; + } + goto after_deserialize; + } + /* Special QueryInterface deserializer */ if (method == 0) { _unmarshal_interface(&buf,(REFIID)args[0],(LPUNKNOWN*)args[1]); if (relaydeb) TRACE_(olerelay)("[in],%p",*((DWORD**)args[1])); - } else { - xargs = args; - for (i=0;i<fdesc->cParams;i++) { - ELEMDESC *elem = fdesc->lprgelemdescParam+i; - BOOL isdeserialized = FALSE; + goto after_deserialize; + } - if (relaydeb) { - if (i) TRACE_(olerelay)(","); - if (i+1<nrofnames && names[i+1]) TRACE_(olerelay)("%s=",relaystr(names[i+1])); - } - /* No need to marshal other data than FOUT I think */ - if (!(elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT)) { - xargs += _argsize(elem->tdesc.vt); - if (relaydeb) TRACE_(olerelay)("[in]"); - continue; - } - if (((i+1)<nrofnames) && !IsBadStringPtrW(names[i+1],1)) { - /* If the parameter is 'riid', we use it as interface IID - * for a later ppvObject serialization. - */ - buf.thisisiid = !lstrcmpW(names[i+1],riidW); + /* generic deserializer using typelib description */ + xargs = args; + status = S_OK; + for (i=0;i<fdesc->cParams;i++) { + ELEMDESC *elem = fdesc->lprgelemdescParam+i; + BOOL isdeserialized = FALSE; - /* deserialize DISPPARAM */ - if (!lstrcmpW(names[i+1],pdispparamsW)) { - hres = deserialize_DISPPARAM_ptr( - tpinfo->tinfo, - elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT, - relaydeb, - FALSE, - &(elem->tdesc), - xargs, - &buf - ); - if (hres) { - ERR("Failed to deserialize DISPPARAM*, hres %lx\n",hres); - break; - } - isdeserialized = TRUE; + if (relaydeb) { + if (i) TRACE_(olerelay)(","); + if (i+1<nrofnames && names[i+1]) TRACE_(olerelay)("%s=",relaystr(names[i+1])); + } + /* No need to marshal other data than FOUT and any VT_PTR */ + if (!(elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT) && (elem->tdesc.vt != VT_PTR)) { + xargs += _argsize(elem->tdesc.vt); + if (relaydeb) TRACE_(olerelay)("[in]"); + continue; + } + if (((i+1)<nrofnames) && !IsBadStringPtrW(names[i+1],1)) { + /* If the parameter is 'riid', we use it as interface IID + * for a later ppvObject serialization. + */ + buf.thisisiid = !lstrcmpW(names[i+1],riidW); + + /* deserialize DISPPARAM */ + if (!lstrcmpW(names[i+1],pdispparamsW)) { + hres = deserialize_DISPPARAM_ptr( + tpinfo->tinfo, + elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT, + relaydeb, + FALSE, + &(elem->tdesc), + xargs, + &buf + ); + if (hres) { + ERR("Failed to deserialize DISPPARAM*, hres %lx\n",hres); + break; } - if (!lstrcmpW(names[i+1],ppvObjectW)) { - hres = deserialize_LPVOID_ptr( - tpinfo->tinfo, - elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT, - relaydeb, - FALSE, - &elem->tdesc, - xargs, - &buf - ); - if (hres == S_OK) - isdeserialized = TRUE; - } + isdeserialized = TRUE; } - if (!isdeserialized) - hres = deserialize_param( + if (!lstrcmpW(names[i+1],ppvObjectW)) { + hres = deserialize_LPVOID_ptr( tpinfo->tinfo, elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT, relaydeb, FALSE, - &(elem->tdesc), + &elem->tdesc, xargs, &buf ); - if (hres) { - ERR("Failed to unmarshall param, hres %lx\n",hres); - status = hres; - break; + if (hres == S_OK) + isdeserialized = TRUE; [truncated at 1000 lines; 474 more skipped]

19 years, 4 months

[gvg] 15010: Sync to Wine-20050419:

by gvg＠svn.reactos.com

Sync to Wine-20050419: Juan Lang <juan_lang(a)yahoo.com> - Implement PropSys{Alloc|Free}String, and support BSTRs in PropVariant{Clear|Copy} using them. - Begin implementing IPropertyStorage. - Add traces, add unit tests for IPropertyStorage, and fix the problems they caught. - Implement FmtIdToPropStgName & PropStgNameToFmtId, with tests. - add write support to IPropertyStorage, with tests - misc. cleanups the tests turned up - Add a comment about byte order, change types to reduce casting and not cast away constness. Vincent Beron <vberon(a)mecano.gme.usherb.ca> - Change prototypes so gcc with some warnings doesn't bark. - Correct and complete some api documentation. Mike McCormack <mike(a)codeweavers.com> - Eliminate forward declarations, make functions static. - Eliminate casts of the return value of HeapAlloc. - Remove function prototypes, make functions static. - StgOpenStorage shouldn't open zero length storage files. - Remove unnecessary function prototypes. Robert Shearman <rob(a)codeweavers.com> - Add critsec debugging info. - Move the modal loop called during RPCs into CoWaitForMultipleHandles. - Use a mutex for long remoting calls to IRemUnknown methods. - Remove locking in apartment_disconnectproxies as it is not needed. - Use PostMessage instead of SendMessage so we can run the message loop or not as appropriate. - Rename apartment functions to become more object-oriented. - Rename register_ifstub to marshal_object to more accurately describe what it does. - Add new function, apartment_getoxid, to prepare for a possible future patch where remoting is started on demand. Jon Griffiths <jon_p_griffiths(a)yahoo.com> - Use LMEM_ flags for LocalAlloc(), not GMEM_ (GlobalAlloc). Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Huw Davies <huw(a)codeweavers.com> - Don't close reg key if the open failed. - WriteFmtUserTypeStg doesn't pull a CLSID from the registry - it's unclear when (if at all) this gets written. Alexandre Julliard <julliard(a)winehq.org> - Fixed a buffer overflow. Joris Huizer <jorishuizer(a)planet.nl> - A few memory checks avoiding memory leaks. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Zero out an invalidated runningObjectTableInstance pointer. Dimitrie O. Paun <dpaun(a)rogers.com> - Remove the need for the non-standard (Close|Delete)MetaFile16(). Troy Rollo <wine(a)troy.rollo.name> - ix test for STGM_SHARE_EXCLUSIVE on nameless DocFiles. Modified: trunk/reactos/include/wine/objidl.h Modified: trunk/reactos/lib/ole32/Makefile.in Modified: trunk/reactos/lib/ole32/antimoniker.c Modified: trunk/reactos/lib/ole32/bindctx.c Modified: trunk/reactos/lib/ole32/clipboard.c Modified: trunk/reactos/lib/ole32/compobj.c Modified: trunk/reactos/lib/ole32/compobj_private.h Modified: trunk/reactos/lib/ole32/compositemoniker.c Modified: trunk/reactos/lib/ole32/datacache.c Added: trunk/reactos/lib/ole32/dictionary.c Added: trunk/reactos/lib/ole32/dictionary.h Modified: trunk/reactos/lib/ole32/errorinfo.c Modified: trunk/reactos/lib/ole32/ftmarshal.c Modified: trunk/reactos/lib/ole32/hglobalstream.c Modified: trunk/reactos/lib/ole32/ifs.c Modified: trunk/reactos/lib/ole32/marshal.c Modified: trunk/reactos/lib/ole32/memlockbytes.c Modified: trunk/reactos/lib/ole32/memlockbytes16.c Modified: trunk/reactos/lib/ole32/moniker.c Modified: trunk/reactos/lib/ole32/ole2.c Modified: trunk/reactos/lib/ole32/ole2_16.c Modified: trunk/reactos/lib/ole32/ole2impl.c Modified: trunk/reactos/lib/ole32/ole32.spec Modified: trunk/reactos/lib/ole32/oleobj.c Modified: trunk/reactos/lib/ole32/oleproxy.c Modified: trunk/reactos/lib/ole32/rpc.c Modified: trunk/reactos/lib/ole32/stg_bigblockfile.c Modified: trunk/reactos/lib/ole32/stg_prop.c Modified: trunk/reactos/lib/ole32/stg_stream.c Modified: trunk/reactos/lib/ole32/storage32.c Modified: trunk/reactos/lib/ole32/storage32.h Modified: trunk/reactos/lib/ole32/stubmanager.c Modified: trunk/reactos/w32api/include/objbase.h Modified: trunk/reactos/w32api/include/objidl.h Modified: trunk/reactos/w32api/include/propidl.h Modified: trunk/reactos/w32api/include/winerror.h _____ Modified: trunk/reactos/include/wine/objidl.h --- trunk/reactos/include/wine/objidl.h 2005-05-05 17:45:00 UTC (rev 15009) +++ trunk/reactos/include/wine/objidl.h 2005-05-05 18:16:09 UTC (rev 15010) @@ -111,6 +111,7 @@ FILETIME mtime; FILETIME ctime; FILETIME atime; + DWORD dwOSVersion; } STATPROPSETSTG; typedef enum tagEXTCONN { EXTCONN_STRONG=1, @@ -911,17 +912,17 @@ STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(ReadMultiple)(THIS_ ULONG,PROPSPEC const*,PROPVARIANT*) PURE; - STDMETHOD(WriteMultiple)(THIS_ ULONG,PROPSPEC const*,PROPVARIANT*,PROPID) PURE; + STDMETHOD(WriteMultiple)(THIS_ ULONG,const PROPSPEC *,const PROPVARIANT *,PROPID) PURE; STDMETHOD(DeleteMultiple)(THIS_ ULONG,PROPSPEC const*) PURE; STDMETHOD(ReadPropertyNames)(THIS_ ULONG,PROPID const*,LPWSTR*) PURE; STDMETHOD(WritePropertyNames)(THIS_ ULONG,PROPID const*,LPWSTR const*) PURE; STDMETHOD(DeletePropertyNames)(THIS_ ULONG,PROPID const*) PURE; - STDMETHOD(SetClass)(THIS_ REFCLSID) PURE; STDMETHOD(Commit)(THIS_ DWORD) PURE; STDMETHOD(Revert)(THIS) PURE; STDMETHOD(Enum)(THIS_ IEnumSTATPROPSTG**) PURE; - STDMETHOD(Stat)(THIS_ STATPROPSTG*) PURE; STDMETHOD(SetTimes)(THIS_ FILETIME const*,FILETIME const*,FILETIME const*) PURE; + STDMETHOD(SetClass)(THIS_ REFCLSID) PURE; + STDMETHOD(Stat)(THIS_ STATPROPSETSTG*) PURE; }; #undef INTERFACE @@ -932,7 +933,7 @@ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(Create)(THIS_ REFFMTID,CLSID*,DWORD,DWORD,LPPROPERTYSTORAGE*) PURE; + STDMETHOD(Create)(THIS_ REFFMTID,const CLSID*,DWORD,DWORD,LPPROPERTYSTORAGE*) PURE; STDMETHOD(Open)(THIS_ REFFMTID,DWORD,LPPROPERTYSTORAGE*) PURE; STDMETHOD(Delete)(THIS_ REFFMTID) PURE; STDMETHOD(Enum)(THIS_ IEnumSTATPROPSETSTG**) PURE; _____ Modified: trunk/reactos/lib/ole32/Makefile.in --- trunk/reactos/lib/ole32/Makefile.in 2005-05-05 17:45:00 UTC (rev 15009) +++ trunk/reactos/lib/ole32/Makefile.in 2005-05-05 18:16:09 UTC (rev 15010) @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = ole32.dll IMPORTS = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll -EXTRALIBS = -luuid +EXTRALIBS = -luuid $(LIBUNICODE) C_SRCS = \ antimoniker.c \ @@ -15,6 +15,7 @@ compositemoniker.c \ datacache.c \ defaulthandler.c \ + dictionary.c \ errorinfo.c \ filemoniker.c \ ftmarshal.c \ _____ Modified: trunk/reactos/lib/ole32/antimoniker.c --- trunk/reactos/lib/ole32/antimoniker.c 2005-05-05 17:45:00 UTC (rev 15009) +++ trunk/reactos/lib/ole32/antimoniker.c 2005-05-05 18:16:09 UTC (rev 15010) @@ -29,7 +29,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/unicode.h" #include "objbase.h" #include "wine/debug.h" #include "moniker.h" @@ -54,135 +53,48 @@ } AntiMonikerImpl; -/********************************************************************** **********/ -/* AntiMoniker prototype functions : */ -/* IUnknown prototype functions */ -static HRESULT WINAPI AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject); -static ULONG WINAPI AntiMonikerImpl_AddRef(IMoniker* iface); -static ULONG WINAPI AntiMonikerImpl_Release(IMoniker* iface); - -/* IPersist prototype functions */ -static HRESULT WINAPI AntiMonikerImpl_GetClassID(IMoniker* iface, CLSID *pClassID); - -/* IPersistStream prototype functions */ -static HRESULT WINAPI AntiMonikerImpl_IsDirty(IMoniker* iface); -static HRESULT WINAPI AntiMonikerImpl_Load(IMoniker* iface, IStream* pStm); -static HRESULT WINAPI AntiMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty); -static HRESULT WINAPI AntiMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize); - -/* IMoniker prototype functions */ -static HRESULT WINAPI AntiMonikerImpl_BindToObject(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult); -static HRESULT WINAPI AntiMonikerImpl_BindToStorage(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult); -static HRESULT WINAPI AntiMonikerImpl_Reduce(IMoniker* iface,IBindCtx* pbc, DWORD dwReduceHowFar,IMoniker** ppmkToLeft, IMoniker** ppmkReduced); -static HRESULT WINAPI AntiMonikerImpl_ComposeWith(IMoniker* iface,IMoniker* pmkRight,BOOL fOnlyIfNotGeneric, IMoniker** ppmkComposite); -static HRESULT WINAPI AntiMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker); -static HRESULT WINAPI AntiMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker); -static HRESULT WINAPI AntiMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash); -static HRESULT WINAPI AntiMonikerImpl_IsRunning(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, IMoniker* pmkNewlyRunning); -static HRESULT WINAPI AntiMonikerImpl_GetTimeOfLastChange(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, FILETIME* pAntiTime); -static HRESULT WINAPI AntiMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk); -static HRESULT WINAPI AntiMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther, IMoniker** ppmkPrefix); -static HRESULT WINAPI AntiMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath); -static HRESULT WINAPI AntiMonikerImpl_GetDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName); -static HRESULT WINAPI AntiMonikerImpl_ParseDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, LPOLESTR pszDisplayName, ULONG* pchEaten, IMoniker** ppmkOut); -static HRESULT WINAPI AntiMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys); - -/********************************************************************** **********/ -/* IROTData prototype functions */ - -/* IUnknown prototype functions */ -static HRESULT WINAPI AntiMonikerROTDataImpl_QueryInterface(IROTData* iface,REFIID riid,VOID** ppvObject); -static ULONG WINAPI AntiMonikerROTDataImpl_AddRef(IROTData* iface); -static ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface); - -/* IROTData prototype function */ -static HRESULT WINAPI AntiMonikerROTDataImpl_GetComparaisonData(IROTData* iface,BYTE* pbData,ULONG cbMax,ULONG* pcbData); - -/* Local function used by AntiMoniker implementation */ -HRESULT WINAPI AntiMonikerImpl_Construct(AntiMonikerImpl* iface); -HRESULT WINAPI AntiMonikerImpl_Destroy(AntiMonikerImpl* iface); - -/********************************************************************** **********/ -/* Virtual function table for the AntiMonikerImpl class which include IPersist,*/ -/* IPersistStream and IMoniker functions. */ -static IMonikerVtbl VT_AntiMonikerImpl = -{ - AntiMonikerImpl_QueryInterface, - AntiMonikerImpl_AddRef, - AntiMonikerImpl_Release, - AntiMonikerImpl_GetClassID, - AntiMonikerImpl_IsDirty, - AntiMonikerImpl_Load, - AntiMonikerImpl_Save, - AntiMonikerImpl_GetSizeMax, - AntiMonikerImpl_BindToObject, - AntiMonikerImpl_BindToStorage, - AntiMonikerImpl_Reduce, - AntiMonikerImpl_ComposeWith, - AntiMonikerImpl_Enum, - AntiMonikerImpl_IsEqual, - AntiMonikerImpl_Hash, - AntiMonikerImpl_IsRunning, - AntiMonikerImpl_GetTimeOfLastChange, - AntiMonikerImpl_Inverse, - AntiMonikerImpl_CommonPrefixWith, - AntiMonikerImpl_RelativePathTo, - AntiMonikerImpl_GetDisplayName, - AntiMonikerImpl_ParseDisplayName, - AntiMonikerImpl_IsSystemMoniker -}; - -/********************************************************************** **********/ -/* Virtual function table for the IROTData class. */ -static IROTDataVtbl VT_ROTDataImpl = -{ - AntiMonikerROTDataImpl_QueryInterface, - AntiMonikerROTDataImpl_AddRef, - AntiMonikerROTDataImpl_Release, - AntiMonikerROTDataImpl_GetComparaisonData -}; - /*********************************************************************** ******** * AntiMoniker_QueryInterface ************************************************************************ *******/ -HRESULT WINAPI AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) +static HRESULT WINAPI +AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { AntiMonikerImpl *This = (AntiMonikerImpl *)iface; - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%p,%p)\n",This,riid,ppvObject); - /* Perform a sanity check on the parameters.*/ + /* Perform a sanity check on the parameters.*/ if ( (This==0) || (ppvObject==0) ) return E_INVALIDARG; - /* Initialize the return parameter */ - *ppvObject = 0; + /* Initialize the return parameter */ + *ppvObject = 0; - /* Compare the riid with the interface IDs implemented by this object.*/ - if (IsEqualIID(&IID_IUnknown, riid) || - IsEqualIID(&IID_IPersist, riid) || - IsEqualIID(&IID_IPersistStream, riid) || - IsEqualIID(&IID_IMoniker, riid) - ) - *ppvObject = iface; + /* Compare the riid with the interface IDs implemented by this object.*/ + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IPersist, riid) || + IsEqualIID(&IID_IPersistStream, riid) || + IsEqualIID(&IID_IMoniker, riid)) + *ppvObject = iface; else if (IsEqualIID(&IID_IROTData, riid)) *ppvObject = (IROTData*)&(This->lpvtbl2); - /* Check that we obtained an interface.*/ + /* Check that we obtained an interface.*/ if ((*ppvObject)==0) return E_NOINTERFACE; - /* Query Interface always increases the reference count by one when it is successful */ - AntiMonikerImpl_AddRef(iface); + /* always increase the reference count by one when it is successful */ + IMoniker_AddRef(iface); - return S_OK; + return S_OK; } /*********************************************************************** ******* * AntiMoniker_AddRef ************************************************************************ ******/ -ULONG WINAPI AntiMonikerImpl_AddRef(IMoniker* iface) +static ULONG WINAPI +AntiMonikerImpl_AddRef(IMoniker* iface) { AntiMonikerImpl *This = (AntiMonikerImpl *)iface; @@ -194,7 +106,8 @@ /*********************************************************************** ******* * AntiMoniker_Release ************************************************************************ ******/ -ULONG WINAPI AntiMonikerImpl_Release(IMoniker* iface) +static ULONG WINAPI +AntiMonikerImpl_Release(IMoniker* iface) { AntiMonikerImpl *This = (AntiMonikerImpl *)iface; ULONG ref; @@ -204,7 +117,7 @@ ref = InterlockedDecrement(&This->ref); /* destroy the object if there's no more reference on it */ - if (ref == 0) AntiMonikerImpl_Destroy(This); + if (ref == 0) HeapFree(GetProcessHeap(),0,This); return ref; } @@ -212,7 +125,8 @@ /*********************************************************************** ******* * AntiMoniker_GetClassID ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID) +static HRESULT WINAPI +AntiMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID) { TRACE("(%p,%p),stub!\n",iface,pClassID); @@ -227,7 +141,8 @@ /*********************************************************************** ******* * AntiMoniker_IsDirty ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_IsDirty(IMoniker* iface) +static HRESULT WINAPI +AntiMonikerImpl_IsDirty(IMoniker* iface) { /* Note that the OLE-provided implementations of the IPersistStream::IsDirty method in the OLE-provided moniker interfaces always return S_FALSE because @@ -241,7 +156,8 @@ /*********************************************************************** ******* * AntiMoniker_Load ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_Load(IMoniker* iface,IStream* pStm) +static HRESULT WINAPI +AntiMonikerImpl_Load(IMoniker* iface,IStream* pStm) { DWORD constant=1,dwbuffer; HRESULT res; @@ -258,7 +174,8 @@ /*********************************************************************** ******* * AntiMoniker_Save ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDirty) +static HRESULT WINAPI +AntiMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDirty) { DWORD constant=1; HRESULT res; @@ -271,9 +188,12 @@ /*********************************************************************** ******* * AntiMoniker_GetSizeMax + * + * PARAMS + * pcbSize [out] Pointer to size of stream needed to save object ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_GetSizeMax(IMoniker* iface, - ULARGE_INTEGER* pcbSize)/* Pointer to size of stream needed to save object */ +static HRESULT WINAPI +AntiMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize) { TRACE("(%p,%p)\n",iface,pcbSize); @@ -282,8 +202,11 @@ /* for more details see AntiMonikerImpl_Save coments */ - /* Normaly the sizemax must be the size of DWORD ! but I tested this function it ususlly return 16 bytes */ - /* more than the number of bytes used by AntiMoniker::Save function */ + /* + * Normally the sizemax must be sizeof DWORD, but + * I tested this function it usually return 16 bytes + * more than the number of bytes used by AntiMoniker::Save function + */ pcbSize->u.LowPart = sizeof(DWORD)+16; pcbSize->u.HighPart=0; @@ -292,39 +215,11 @@ } /*********************************************************************** ******* - * AntiMoniker_Construct (local function) - ************************************************************************ *******/ -HRESULT WINAPI AntiMonikerImpl_Construct(AntiMonikerImpl* This) -{ - - TRACE("(%p)\n",This); - - /* Initialize the virtual fgunction table. */ - This->lpvtbl1 = &VT_AntiMonikerImpl; - This->lpvtbl2 = &VT_ROTDataImpl; - This->ref = 0; - - return S_OK; -} - -/********************************************************************** ******** - * AntiMoniker_Destroy (local function) - ************************************************************************ *******/ -HRESULT WINAPI AntiMonikerImpl_Destroy(AntiMonikerImpl* This) -{ - TRACE("(%p)\n",This); - - return HeapFree(GetProcessHeap(),0,This); -} - -/********************************************************************** ******** * AntiMoniker_BindToObject ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_BindToObject(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - REFIID riid, - VOID** ppvResult) +static HRESULT WINAPI +AntiMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, + REFIID riid, VOID** ppvResult) { TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); return E_NOTIMPL; @@ -333,11 +228,9 @@ /*********************************************************************** ******* * AntiMoniker_BindToStorage ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_BindToStorage(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - REFIID riid, - VOID** ppvResult) +static HRESULT WINAPI +AntiMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, + REFIID riid, VOID** ppvResult) { TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); return E_NOTIMPL; @@ -346,11 +239,9 @@ /*********************************************************************** ******* * AntiMoniker_Reduce ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_Reduce(IMoniker* iface, - IBindCtx* pbc, - DWORD dwReduceHowFar, - IMoniker** ppmkToLeft, - IMoniker** ppmkReduced) +static HRESULT WINAPI +AntiMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, + IMoniker** ppmkToLeft, IMoniker** ppmkReduced) { TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkRedu ced); @@ -366,10 +257,9 @@ /*********************************************************************** ******* * AntiMoniker_ComposeWith ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_ComposeWith(IMoniker* iface, - IMoniker* pmkRight, - BOOL fOnlyIfNotGeneric, - IMoniker** ppmkComposite) +static HRESULT WINAPI +AntiMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, + BOOL fOnlyIfNotGeneric, IMoniker** ppmkComposite) { TRACE("(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite); @@ -388,7 +278,8 @@ /*********************************************************************** ******* * AntiMoniker_Enum ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker) +static HRESULT WINAPI +AntiMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker) { TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker); @@ -403,7 +294,8 @@ /*********************************************************************** ******* * AntiMoniker_IsEqual ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) +static HRESULT WINAPI +AntiMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) { DWORD mkSys; @@ -423,7 +315,7 @@ /*********************************************************************** ******* * AntiMoniker_Hash ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) +static HRESULT WINAPI AntiMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) { if (pdwHash==NULL) return E_POINTER; @@ -436,10 +328,9 @@ /*********************************************************************** ******* * AntiMoniker_IsRunning ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_IsRunning(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - IMoniker* pmkNewlyRunning) +static HRESULT WINAPI +AntiMonikerImpl_IsRunning(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, + IMoniker* pmkNewlyRunning) { IRunningObjectTable* rot; HRESULT res; @@ -452,7 +343,7 @@ res=IBindCtx_GetRunningObjectTable(pbc,&rot); if (FAILED(res)) - return res; + return res; res = IRunningObjectTable_IsRunning(rot,iface); @@ -464,7 +355,7 @@ /*********************************************************************** ******* * AntiMoniker_GetTimeOfLastChange ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_GetTimeOfLastChange(IMoniker* iface, +static HRESULT WINAPI AntiMonikerImpl_GetTimeOfLastChange(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, FILETIME* pAntiTime) @@ -476,7 +367,8 @@ /*********************************************************************** ******* * AntiMoniker_Inverse ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) +static HRESULT WINAPI +AntiMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) { TRACE("(%p,%p)\n",iface,ppmk); @@ -491,7 +383,8 @@ /*********************************************************************** ******* * AntiMoniker_CommonPrefixWith ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) +static HRESULT WINAPI +AntiMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) { DWORD mkSys; @@ -514,7 +407,8 @@ /*********************************************************************** ******* * AntiMoniker_RelativePathTo ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath) +static HRESULT WINAPI +AntiMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath) { TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath); @@ -531,10 +425,9 @@ /*********************************************************************** ******* * AntiMoniker_GetDisplayName ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_GetDisplayName(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - LPOLESTR *ppszDisplayName) +static HRESULT WINAPI +AntiMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, + IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName) { static const WCHAR back[]={'\\','.','.',0}; @@ -553,7 +446,7 @@ if (*ppszDisplayName==NULL) return E_OUTOFMEMORY; - strcpyW(*ppszDisplayName,back); + lstrcpyW(*ppszDisplayName,back); return S_OK; } @@ -561,12 +454,10 @@ /*********************************************************************** ******* * AntiMoniker_ParseDisplayName ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_ParseDisplayName(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - LPOLESTR pszDisplayName, - ULONG* pchEaten, - IMoniker** ppmkOut) +static HRESULT WINAPI +AntiMonikerImpl_ParseDisplayName(IMoniker* iface, IBindCtx* pbc, + IMoniker* pmkToLeft, LPOLESTR pszDisplayName, + ULONG* pchEaten, IMoniker** ppmkOut) { TRACE("(%p,%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pszDisplayName,pchEate n,ppmkOut); return E_NOTIMPL; @@ -575,7 +466,8 @@ /*********************************************************************** ******* * AntiMoniker_IsSystemMoniker ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) +static HRESULT WINAPI +AntiMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) { TRACE("(%p,%p)\n",iface,pwdMksys); @@ -590,9 +482,9 @@ /*********************************************************************** ******** * AntiMonikerIROTData_QueryInterface ************************************************************************ *******/ -HRESULT WINAPI AntiMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) +static HRESULT WINAPI +AntiMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) { - ICOM_THIS_From_IROTData(IMoniker, iface); TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); @@ -603,7 +495,7 @@ /*********************************************************************** * AntiMonikerIROTData_AddRef */ -ULONG WINAPI AntiMonikerROTDataImpl_AddRef(IROTData *iface) +static ULONG WINAPI AntiMonikerROTDataImpl_AddRef(IROTData *iface) { ICOM_THIS_From_IROTData(IMoniker, iface); @@ -615,7 +507,7 @@ /*********************************************************************** * AntiMonikerIROTData_Release */ -ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface) +static ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface) { ICOM_THIS_From_IROTData(IMoniker, iface); @@ -627,16 +519,71 @@ /*********************************************************************** ******* * AntiMonikerIROTData_GetComparaisonData ************************************************************************ ******/ -HRESULT WINAPI AntiMonikerROTDataImpl_GetComparaisonData(IROTData* iface, - BYTE* pbData, - ULONG cbMax, - ULONG* pcbData) +static HRESULT WINAPI +AntiMonikerROTDataImpl_GetComparaisonData(IROTData* iface, BYTE* pbData, + ULONG cbMax, ULONG* pcbData) { FIXME("(),stub!\n"); return E_NOTIMPL; } +/********************************************************************** **********/ +/* Virtual function table for the AntiMonikerImpl class which include IPersist,*/ +/* IPersistStream and IMoniker functions. */ +static IMonikerVtbl VT_AntiMonikerImpl = +{ + AntiMonikerImpl_QueryInterface, + AntiMonikerImpl_AddRef, + AntiMonikerImpl_Release, + AntiMonikerImpl_GetClassID, + AntiMonikerImpl_IsDirty, + AntiMonikerImpl_Load, + AntiMonikerImpl_Save, + AntiMonikerImpl_GetSizeMax, + AntiMonikerImpl_BindToObject, + AntiMonikerImpl_BindToStorage, + AntiMonikerImpl_Reduce, + AntiMonikerImpl_ComposeWith, + AntiMonikerImpl_Enum, + AntiMonikerImpl_IsEqual, + AntiMonikerImpl_Hash, + AntiMonikerImpl_IsRunning, + AntiMonikerImpl_GetTimeOfLastChange, + AntiMonikerImpl_Inverse, + AntiMonikerImpl_CommonPrefixWith, + AntiMonikerImpl_RelativePathTo, + AntiMonikerImpl_GetDisplayName, + AntiMonikerImpl_ParseDisplayName, + AntiMonikerImpl_IsSystemMoniker +}; + +/********************************************************************** **********/ +/* Virtual function table for the IROTData class. */ +static IROTDataVtbl VT_ROTDataImpl = +{ + AntiMonikerROTDataImpl_QueryInterface, + AntiMonikerROTDataImpl_AddRef, + AntiMonikerROTDataImpl_Release, + AntiMonikerROTDataImpl_GetComparaisonData +}; + /*********************************************************************** ******* + * AntiMoniker_Construct (local function) + ************************************************************************ *******/ +static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This) +{ + + TRACE("(%p)\n",This); + + /* Initialize the virtual fgunction table. */ + This->lpvtbl1 = &VT_AntiMonikerImpl; + This->lpvtbl2 = &VT_ROTDataImpl; + This->ref = 0; + + return S_OK; +} + +/********************************************************************** ******** * CreateAntiMoniker [OLE32.@] ************************************************************************ ******/ HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk) @@ -653,9 +600,8 @@ return STG_E_INSUFFICIENTMEMORY; hr = AntiMonikerImpl_Construct(newAntiMoniker); - - if (FAILED(hr)){ - + if (FAILED(hr)) + { HeapFree(GetProcessHeap(),0,newAntiMoniker); return hr; } _____ Modified: trunk/reactos/lib/ole32/bindctx.c --- trunk/reactos/lib/ole32/bindctx.c 2005-05-05 17:45:00 UTC (rev 15009) +++ trunk/reactos/lib/ole32/bindctx.c 2005-05-05 18:16:09 UTC (rev 15010) @@ -27,7 +27,6 @@ #include "winerror.h" #include "windef.h" #include "winbase.h" -#include "wine/unicode.h" #include "objbase.h" #include "wine/debug.h" @@ -64,82 +63,42 @@ } BindCtxImpl; /* IBindCtx prototype functions : */ +static HRESULT WINAPI BindCtxImpl_ReleaseBoundObjects(IBindCtx*); +static HRESULT BindCtxImpl_GetObjectIndex(BindCtxImpl*, IUnknown*, LPOLESTR, DWORD *); -/* IUnknown functions*/ -static HRESULT WINAPI BindCtxImpl_QueryInterface(IBindCtx* iface,REFIID riid,void** ppvObject); -static ULONG WINAPI BindCtxImpl_AddRef(IBindCtx* iface); -static ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface); -/* IBindCtx functions */ -static HRESULT WINAPI BindCtxImpl_RegisterObjectBound(IBindCtx* iface,IUnknown* punk); -static HRESULT WINAPI BindCtxImpl_RevokeObjectBound(IBindCtx* iface, IUnknown* punk); -static HRESULT WINAPI BindCtxImpl_ReleaseBoundObjects(IBindCtx* iface); -static HRESULT WINAPI BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts); -static HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts); -static HRESULT WINAPI BindCtxImpl_GetRunningObjectTable(IBindCtx* iface,IRunningObjectTable** pprot); -static HRESULT WINAPI BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown* punk); -static HRESULT WINAPI BindCtxImpl_GetObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown** punk); -static HRESULT WINAPI BindCtxImpl_EnumObjectParam(IBindCtx* iface,IEnumString** ppenum); -static HRESULT WINAPI BindCtxImpl_RevokeObjectParam(IBindCtx* iface,LPOLESTR pszkey); -/* Local functions*/ -HRESULT WINAPI BindCtxImpl_Construct(BindCtxImpl* This); -HRESULT WINAPI BindCtxImpl_Destroy(BindCtxImpl* This); -HRESULT WINAPI BindCtxImpl_GetObjectIndex(BindCtxImpl* This,IUnknown* punk,LPOLESTR pszkey,DWORD *index); - -/* Virtual function table for the BindCtx class. */ -static IBindCtxVtbl VT_BindCtxImpl = - { - BindCtxImpl_QueryInterface, - BindCtxImpl_AddRef, - BindCtxImpl_Release, - BindCtxImpl_RegisterObjectBound, - BindCtxImpl_RevokeObjectBound, - BindCtxImpl_ReleaseBoundObjects, - BindCtxImpl_SetBindOptions, - BindCtxImpl_GetBindOptions, - BindCtxImpl_GetRunningObjectTable, - BindCtxImpl_RegisterObjectParam, - BindCtxImpl_GetObjectParam, - BindCtxImpl_EnumObjectParam, - BindCtxImpl_RevokeObjectParam -}; - /*********************************************************************** ******** * BindCtx_QueryInterface ************************************************************************ *******/ -HRESULT WINAPI BindCtxImpl_QueryInterface(IBindCtx* iface,REFIID riid,void** ppvObject) +static HRESULT WINAPI +BindCtxImpl_QueryInterface(IBindCtx* iface,REFIID riid,void** ppvObject) { - BindCtxImpl *This = (BindCtxImpl *)iface; + BindCtxImpl *This = (BindCtxImpl *)iface; - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%p,%p)\n",This,riid,ppvObject); - /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) - return E_INVALIDARG; + /* Perform a sanity check on the parameters.*/ + if ( (This==0) || (ppvObject==0) ) + return E_INVALIDARG; - /* Initialize the return parameter.*/ - *ppvObject = 0; + /* Initialize the return parameter.*/ + *ppvObject = 0; - /* Compare the riid with the interface IDs implemented by this object.*/ - if (IsEqualIID(&IID_IUnknown, riid)) - *ppvObject = (IBindCtx*)This; - else - if (IsEqualIID(&IID_IBindCtx, riid)) - *ppvObject = (IBindCtx*)This; + /* Compare the riid with the interface IDs implemented by this object.*/ + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IBindCtx, riid)) + { + *ppvObject = (IBindCtx*)This; + IBindCtx_AddRef(iface); + return S_OK; + } - /* Check that we obtained an interface.*/ - if ((*ppvObject)==0) - return E_NOINTERFACE; - - /* Query Interface always increases the reference count by one when it is successful */ - BindCtxImpl_AddRef(iface); - - return S_OK; + return E_NOINTERFACE; } /*********************************************************************** ******* * BindCtx_AddRef ************************************************************************ ******/ -ULONG WINAPI BindCtxImpl_AddRef(IBindCtx* iface) +static ULONG WINAPI BindCtxImpl_AddRef(IBindCtx* iface) { BindCtxImpl *This = (BindCtxImpl *)iface; @@ -149,9 +108,25 @@ } /*********************************************************************** ******* + * BindCtx_Destroy (local function) + ************************************************************************ *******/ +static HRESULT BindCtxImpl_Destroy(BindCtxImpl* This) +{ + TRACE("(%p)\n",This); + + /* free the table space memory */ + HeapFree(GetProcessHeap(),0,This->bindCtxTable); + + /* free the bindctx structure */ + HeapFree(GetProcessHeap(),0,This); + + return S_OK; +} + +/********************************************************************** ******** * BindCtx_Release ************************************************************************ ******/ -ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface) +static ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface) { BindCtxImpl *This = (BindCtxImpl *)iface; ULONG ref; @@ -159,8 +134,8 @@ TRACE("(%p)\n",This); ref = InterlockedDecrement(&This->ref); - - if (ref == 0){ + if (ref == 0) + { /* release all registered objects */ BindCtxImpl_ReleaseBoundObjects((IBindCtx*)This); @@ -171,59 +146,10 @@ /*********************************************************************** ******* - * BindCtx_Construct (local function) - ************************************************************************ *******/ -HRESULT WINAPI BindCtxImpl_Construct(BindCtxImpl* This) -{ - TRACE("(%p)\n",This); - - /* Initialize the virtual function table.*/ - This->lpVtbl = &VT_BindCtxImpl; - This->ref = 0; - - /* Initialize the BIND_OPTS2 structure */ - This->bindOption2.cbStruct = sizeof(BIND_OPTS2); - This->bindOption2.grfFlags = 0; - This->bindOption2.grfMode = STGM_READWRITE; - This->bindOption2.dwTickCountDeadline = 0; - - This->bindOption2.dwTrackFlags = 0; - This->bindOption2.dwClassContext = CLSCTX_SERVER; - This->bindOption2.locale = 1033; - This->bindOption2.pServerInfo = 0; - - /* Initialize the bindctx table */ - This->bindCtxTableSize=BLOCK_TAB_SIZE; - This->bindCtxTableLastIndex=0; - This->bindCtxTable= HeapAlloc(GetProcessHeap(), 0,This->bindCtxTableSize*sizeof(BindCtxObject)); - - if (This->bindCtxTable==NULL) - return E_OUTOFMEMORY; - - return S_OK; -} - -/********************************************************************** ******** - * BindCtx_Destroy (local function) - ************************************************************************ *******/ -HRESULT WINAPI BindCtxImpl_Destroy(BindCtxImpl* This) -{ - TRACE("(%p)\n",This); - - /* free the table space memory */ - HeapFree(GetProcessHeap(),0,This->bindCtxTable); - - /* free the bindctx structure */ - HeapFree(GetProcessHeap(),0,This); - - return S_OK; -} - - -/********************************************************************** ******** * BindCtx_RegisterObjectBound ************************************************************************ ******/ -HRESULT WINAPI BindCtxImpl_RegisterObjectBound(IBindCtx* iface,IUnknown* punk) +static HRESULT WINAPI +BindCtxImpl_RegisterObjectBound(IBindCtx* iface,IUnknown* punk) { BindCtxImpl *This = (BindCtxImpl *)iface; DWORD lastIndex=This->bindCtxTableLastIndex; @@ -261,7 +187,8 @@ /*********************************************************************** ******* * BindCtx_RevokeObjectBound ************************************************************************ ******/ -HRESULT WINAPI BindCtxImpl_RevokeObjectBound(IBindCtx* iface, IUnknown* punk) +static HRESULT WINAPI +BindCtxImpl_RevokeObjectBound(IBindCtx* iface, IUnknown* punk) { DWORD index,j; @@ -289,7 +216,8 @@ /*********************************************************************** ******* * BindCtx_ReleaseBoundObjects ************************************************************************ ******/ -HRESULT WINAPI BindCtxImpl_ReleaseBoundObjects(IBindCtx* iface) +static HRESULT WINAPI +BindCtxImpl_ReleaseBoundObjects(IBindCtx* iface) { DWORD i; @@ -312,7 +240,8 @@ /*********************************************************************** ******* * BindCtx_SetBindOptions ************************************************************************ ******/ -HRESULT WINAPI BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) +static HRESULT WINAPI +BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) { BindCtxImpl *This = (BindCtxImpl *)iface; @@ -333,7 +262,8 @@ /*********************************************************************** ******* * BindCtx_GetBindOptions ************************************************************************ ******/ -HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) +static HRESULT WINAPI +BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) { BindCtxImpl *This = (BindCtxImpl *)iface; @@ -354,7 +284,8 @@ /*********************************************************************** ******* * BindCtx_GetRunningObjectTable ************************************************************************ ******/ -HRESULT WINAPI BindCtxImpl_GetRunningObjectTable(IBindCtx* iface,IRunningObjectTable** pprot) +static HRESULT WINAPI +BindCtxImpl_GetRunningObjectTable(IBindCtx* iface,IRunningObjectTable** pprot) { HRESULT res; @@ -373,7 +304,8 @@ /*********************************************************************** ******* * BindCtx_RegisterObjectParam ************************************************************************ ******/ -HRESULT WINAPI BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown* punk) +static HRESULT WINAPI +BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown* punk) { DWORD index=0; BindCtxImpl *This = (BindCtxImpl *)iface; @@ -399,23 +331,26 @@ This->bindCtxTable[This->bindCtxTableLastIndex].pkeyObj=NULL; - else{ + else + { This->bindCtxTable[This->bindCtxTableLastIndex].pkeyObj= HeapAlloc(GetProcessHeap(),0,(sizeof(WCHAR)*(1+lstrlenW(pszkey)))); if (This->bindCtxTable[This->bindCtxTableLastIndex].pkeyObj==NULL) return E_OUTOFMEMORY; - strcpyW(This->bindCtxTable[This->bindCtxTableLastIndex].pkeyObj,pszkey); + lstrcpyW(This->bindCtxTable[This->bindCtxTableLastIndex].pkeyObj,pszkey) ; } This->bindCtxTableLastIndex++; - if (This->bindCtxTableLastIndex == This->bindCtxTableSize){ /* table is full ! must be resized */ + if (This->bindCtxTableLastIndex == This->bindCtxTableSize) + { + /* table is full ! must be resized */ This->bindCtxTableSize+=BLOCK_TAB_SIZE; /* new table size */ - - if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE)){ + if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE)) + { FIXME("This->bindCtxTableSize: %ld is out of data limite \n",This->bindCtxTableSize); return E_FAIL; } @@ -431,7 +366,8 @@ /*********************************************************************** ******* * BindCtx_GetObjectParam ************************************************************************ ******/ -HRESULT WINAPI BindCtxImpl_GetObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown** punk) +static HRESULT WINAPI +BindCtxImpl_GetObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown** punk) { DWORD index; BindCtxImpl *This = (BindCtxImpl *)iface; @@ -456,7 +392,8 @@ /*********************************************************************** ******* * BindCtx_RevokeObjectParam ************************************************************************ ******/ -HRESULT WINAPI BindCtxImpl_RevokeObjectParam(IBindCtx* iface,LPOLESTR ppenum) +static HRESULT WINAPI +BindCtxImpl_RevokeObjectParam(IBindCtx* iface,LPOLESTR ppenum) { DWORD index,j; @@ -484,7 +421,8 @@ /*********************************************************************** ******* * BindCtx_EnumObjectParam ************************************************************************ ******/ -HRESULT WINAPI BindCtxImpl_EnumObjectParam(IBindCtx* iface,IEnumString** pszkey) +static HRESULT WINAPI +BindCtxImpl_EnumObjectParam(IBindCtx* iface,IEnumString** pszkey) { FIXME("(%p,%p),stub!\n",iface,pszkey); [truncated at 1000 lines; 6850 more skipped]

19 years, 4 months

[weiden] 15009: implemented RegOpenUserClassesRoot (doesn't work in reactos because there's no symbolic link \Registry\User\<SID>_Classes yet)

by weiden＠svn.reactos.com

implemented RegOpenUserClassesRoot (doesn't work in reactos because there's no symbolic link \Registry\User\<SID>_Classes yet) Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-05-05 17:20:10 UTC (rev 15008) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-05-05 17:45:00 UTC (rev 15009) @@ -492,7 +492,7 @@ RegOpenKeyExA@20 RegOpenKeyExW@20 RegOpenKeyW@12 -;RegOpenUserClassesRoot +RegOpenUserClassesRoot@16 ;RegOverridePredefKey RegQueryInfoKeyA@48 RegQueryInfoKeyW@48 _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-05-05 17:20:10 UTC (rev 15008) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-05-05 17:45:00 UTC (rev 15009) @@ -1720,6 +1720,152 @@ /*********************************************************************** * + * RegOpenUserClassesRoot + * + * @implemented + */ +LONG STDCALL +RegOpenUserClassesRoot (IN HANDLE hToken, + IN DWORD dwOptions, + IN REGSAM samDesired, + OUT PHKEY phkResult) +{ + const WCHAR UserClassesKeyPrefix[] = L"\\Registry\\User\\"; + const WCHAR UserClassesKeySuffix[] = L"_Classes"; + PTOKEN_USER TokenUserData; + ULONG RequiredLength; + UNICODE_STRING UserSidString, UserClassesKeyRoot; + OBJECT_ATTRIBUTES ObjectAttributes; + LONG ErrorCode; + NTSTATUS Status; + + /* check parameters */ + if (hToken == NULL || dwOptions != 0 || phkResult == NULL) + { + return ERROR_INVALID_PARAMETER; + } + + /* + * Get the user sid from the token + */ + +ReadTokenSid: + /* determine how much memory we need */ + Status = NtQueryInformationToken(hToken, + TokenUser, + NULL, + 0, + &RequiredLength); + if (!NT_SUCCESS(Status) && (Status != STATUS_BUFFER_TOO_SMALL)) + { + /* NOTE - as opposed to all other registry functions windows does indeed + change the last error code in case the caller supplied a invalid + handle for example! */ + ErrorCode = RtlNtStatusToDosError (Status); + return ErrorCode; + } + + TokenUserData = RtlAllocateHeap(ProcessHeap, + 0, + RequiredLength); + if (TokenUserData == NULL) + { + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* attempt to read the information */ + Status = NtQueryInformationToken(hToken, + TokenUser, + TokenUserData, + RequiredLength, + &RequiredLength); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, + 0, + TokenUserData); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* the information appears to have changed?! try again */ + goto ReadTokenSid; + } + + /* NOTE - as opposed to all other registry functions windows does indeed + change the last error code in case the caller supplied a invalid + handle for example! */ + ErrorCode = RtlNtStatusToDosError (Status); + return ErrorCode; + } + + /* + * Build the absolute path for the user's registry in the form + * "\Registry\User\<SID>_Classes" + */ + Status = RtlConvertSidToUnicodeString(&UserSidString, + TokenUserData->User.Sid, + TRUE); + + /* we don't need the user data anymore, free it */ + RtlFreeHeap(ProcessHeap, + 0, + TokenUserData); + + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError (Status); + } + + /* allocate enough memory for the entire key string */ + UserClassesKeyRoot.Length = 0; + UserClassesKeyRoot.MaximumLength = UserSidString.Length + + sizeof(UserClassesKeyPrefix) + + sizeof(UserClassesKeySuffix); + UserClassesKeyRoot.Buffer = RtlAllocateHeap(ProcessHeap, + 0, + UserClassesKeyRoot.MaximumLength); + if (UserClassesKeyRoot.Buffer == NULL) + { + RtlFreeUnicodeString(&UserSidString); + return RtlNtStatusToDosError (Status); + } + + /* build the string */ + RtlAppendUnicodeToString(&UserClassesKeyRoot, + UserClassesKeyPrefix); + RtlAppendUnicodeStringToString(&UserClassesKeyRoot, + &UserSidString); + RtlAppendUnicodeToString(&UserClassesKeyRoot, + UserClassesKeySuffix); + + DPRINT("RegOpenUserClassesRoot: Absolute path: %wZ\n", &UserClassesKeyRoot); + + /* + * Open the key + */ + + InitializeObjectAttributes (&ObjectAttributes, + &UserClassesKeyRoot, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenKey((PHANDLE)phkResult, + samDesired, + &ObjectAttributes); + + RtlFreeUnicodeString(&UserSidString); + RtlFreeUnicodeString(&UserClassesKeyRoot); + + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError (Status); + } + + return ERROR_SUCCESS; +} + + +/********************************************************************** ** * RegQueryInfoKeyA * * @implemented

19 years, 4 months

← Newer
1
...
67
68
69
70
71
72
73
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005