Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 37548: - No, Winetests doesn't treat ntdef.h as a PSDK header, they don't include it. The include was added when the Winetest was added to ros, because of missing NTSTATUS type. Include NDK instead.
by sginsberg＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: sginsberg Date: Sat Nov 22 05:03:56 2008 New Revision: 37548 URL: http://svn.reactos.org/svn/reactos?rev=37548&view=rev Log: - No, Winetests doesn't treat ntdef.h as a PSDK header, they don't include it. The include was added when the Winetest was added to ros, because of missing NTSTATUS type. Include NDK instead. Modified: trunk/rostests/winetests/kernel32/debugger.c Modified: trunk/rostests/winetests/kernel32/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/debugg… ============================================================================== --- trunk/rostests/winetests/kernel32/debugger.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/debugger.c [iso-8859-1] Sat Nov 22 05:03:56 2008 @@ -20,9 +20,9 @@ #include <stdio.h> #include <assert.h> -#include <ntdef.h> #include <windows.h> #include <winreg.h> +#include <ntndk.h> #include "wine/test.h" #ifndef STATUS_DEBUGGER_INACTIVE

1 0

[sginsberg] 37547: - Deprecate PSDK's usage of system_header for real now that rostests/winetests are fixed
by sginsberg＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: sginsberg Date: Sat Nov 22 04:47:17 2008 New Revision: 37547 URL: http://svn.reactos.org/svn/reactos?rev=37547&view=rev Log: - Deprecate PSDK's usage of system_header for real now that rostests/winetests are fixed Modified: trunk/reactos/include/psdk/windef.h trunk/reactos/include/psdk/windows.h Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Sat Nov 22 04:47:17 2008 @@ -1,9 +1,5 @@ #ifndef _WINDEF_H #define _WINDEF_H - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Sat Nov 22 04:47:17 2008 @@ -12,10 +12,6 @@ */ #ifndef _WINDOWS_H #define _WINDOWS_H - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif #ifdef __GNUC__ #include <msvctarget.h>

1 0

[sginsberg] 37546: - Silence more "has virtual functions but non-virtual destructor" warnings
by sginsberg＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: sginsberg Date: Sat Nov 22 04:38:09 2008 New Revision: 37546 URL: http://svn.reactos.org/svn/reactos?rev=37546&view=rev Log: - Silence more "has virtual functions but non-virtual destructor" warnings Modified: trunk/rostests/dibtests/patblt/patblt.rbuild trunk/rostests/dibtests/stretchblt/stretchblt.rbuild Modified: trunk/rostests/dibtests/patblt/patblt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/patblt/patblt.rb… ============================================================================== --- trunk/rostests/dibtests/patblt/patblt.rbuild [iso-8859-1] (original) +++ trunk/rostests/dibtests/patblt/patblt.rbuild [iso-8859-1] Sat Nov 22 04:38:09 2008 @@ -3,5 +3,6 @@ <library>kernel32</library> <library>user32</library> <library>gdi32</library> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <file>patblt.cpp</file> </module> Modified: trunk/rostests/dibtests/stretchblt/stretchblt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/stretchblt/stret… ============================================================================== --- trunk/rostests/dibtests/stretchblt/stretchblt.rbuild [iso-8859-1] (original) +++ trunk/rostests/dibtests/stretchblt/stretchblt.rbuild [iso-8859-1] Sat Nov 22 04:38:09 2008 @@ -3,5 +3,6 @@ <library>kernel32</library> <library>user32</library> <library>gdi32</library> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <file>stretchblt.cpp</file> </module>

1 0

[sginsberg] 37545: - Silence more "has virtual functions but non-virtual destructor" warnings - Disable outdated and unused libjpeg
by sginsberg＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: sginsberg Date: Sat Nov 22 04:37:47 2008 New Revision: 37545 URL: http://svn.reactos.org/svn/reactos?rev=37545&view=rev Log: - Silence more "has virtual functions but non-virtual destructor" warnings - Disable outdated and unused libjpeg Modified: trunk/rosapps/applications/net/netreg/netreg.rbuild trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild trunk/rosapps/lib/directory.rbuild Modified: trunk/rosapps/applications/net/netreg/netreg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/netreg/ne… ============================================================================== --- trunk/rosapps/applications/net/netreg/netreg.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/net/netreg/netreg.rbuild [iso-8859-1] Sat Nov 22 04:37:47 2008 @@ -4,7 +4,7 @@ <library>user32</library> <library>ws2_32</library> <library>advapi32</library> - + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <file>netreg.cpp</file> <file>netreg.rc</file> </module> Modified: trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/roshttpd/… ============================================================================== --- trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild [iso-8859-1] Sat Nov 22 04:37:47 2008 @@ -6,6 +6,7 @@ <library>kernel32</library> <library>ws2_32</library> <library>user32</library> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <file>config.cpp</file> <file>error.cpp</file> <file>http.cpp</file> Modified: trunk/rosapps/lib/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/directory.rbuild?rev=3… ============================================================================== --- trunk/rosapps/lib/directory.rbuild [iso-8859-1] (original) +++ trunk/rosapps/lib/directory.rbuild [iso-8859-1] Sat Nov 22 04:37:47 2008 @@ -5,11 +5,11 @@ <directory name="dflat32"> <xi:include href="dflat32/dflat32.rbuild" /> </directory> - --> + <directory name="libjpeg"> <xi:include href="libjpeg/libjpeg.rbuild" /> </directory> - + --> <directory name="libpng"> <xi:include href="libpng/libpng.rbuild" /> </directory>

1 0

[sginsberg] 37544: - Fix indentation (spaces -> tabs)
by sginsberg＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: sginsberg Date: Sat Nov 22 03:09:50 2008 New Revision: 37544 URL: http://svn.reactos.org/svn/reactos?rev=37544&view=rev Log: - Fix indentation (spaces -> tabs) Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Sat Nov 22 03:09:50 2008 @@ -123,7 +123,7 @@ <compilerflag compiler="cpp">-fno-exceptions</compilerflag> <compilerflag compiler="cpp">-fno-rtti</compilerflag> - <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <directory name="misc"> <file>icustubs.cpp</file>

1 0

[fireball] 37543: Dmitry Gorbachev - Fix an issue with choosing nonexistent x86 registers %sil/%dil, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10153 for more details. - Add "memory" to _InterlockedAddLargeStatistic(). "In Visual C++ 2005, this function behaves as a read-write barrier." -- MSDN library. - Use "+m" instead of "=m". See issue #3772 for more details.
by fireball＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: fireball Date: Sat Nov 22 02:32:15 2008 New Revision: 37543 URL: http://svn.reactos.org/svn/reactos?rev=37543&view=rev Log: Dmitry Gorbachev - Fix an issue with choosing nonexistent x86 registers %sil/%dil, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10153 for more details. - Add "memory" to _InterlockedAddLargeStatistic(). "In Visual C++ 2005, this function behaves as a read-write barrier." -- MSDN library. - Use "+m" instead of "=m". See issue #3772 for more details. Modified: trunk/reactos/include/psdk/intrin_x86.h Modified: trunk/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_x86.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intrin_x86.h [iso-8859-1] Sat Nov 22 02:32:15 2008 @@ -457,8 +457,9 @@ "jae LABEL%=;" "lock; adc $0, %[Hi32];" "LABEL%=:;" : - [Lo32] "=m" (*((volatile long *)(Addend) + 0)), [Hi32] "=m" (*((volatile long *)(Addend) + 1)) : - [Value] "ir" (Value) + [Lo32] "+m" (*((volatile long *)(Addend) + 0)), [Hi32] "+m" (*((volatile long *)(Addend) + 1)) : + [Value] "ir" (Value) : + "memory" ); return Value; @@ -499,7 +500,7 @@ static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandreset(volatile long * a, const long b) { unsigned char retval; - __asm__("lock; btrl %[b], %[a]; setb %b[retval]" : [retval] "=r" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); + __asm__("lock; btrl %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); return retval; } @@ -515,7 +516,7 @@ static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandset(volatile long * a, const long b) { unsigned char retval; - __asm__("lock; btsl %[b], %[a]; setc %b[retval]" : [retval] "=r" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); + __asm__("lock; btsl %[b], %[a]; setc %b[retval]" : [retval] "=q" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); return retval; }

1 0

[fireball] 37542: Dmitry Gorbachev - SETxx instructions require 8-bit operand, but "r" constraint is used. Use "q" instead ("r" means any general register, including esi and edi, which are not suitable as an operand of setnz.) See issue #3772 for more details.
by fireball＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: fireball Date: Sat Nov 22 02:26:53 2008 New Revision: 37542 URL: http://svn.reactos.org/svn/reactos?rev=37542&view=rev Log: Dmitry Gorbachev - SETxx instructions require 8-bit operand, but "r" constraint is used. Use "q" instead ("r" means any general register, including esi and edi, which are not suitable as an operand of setnz.) See issue #3772 for more details. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Nov 22 02:26:53 2008 @@ -4812,7 +4812,7 @@ #if defined(_M_IX86) __asm__ __volatile__("bsrl %2,%0\n\t" "setnz %1\n\t" - :"=&r" (*Index), "=r" (BitPosition) + :"=&r" (*Index), "=q" (BitPosition) :"rm" (Mask) :"memory"); return BitPosition;

1 0

[dreimer] 37541: My Plans for near Future. Sort of brainstorming for myself
by dreimer＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: dreimer Date: Sat Nov 22 02:19:26 2008 New Revision: 37541 URL: http://svn.reactos.org/svn/reactos?rev=37541&view=rev Log: My Plans for near Future. Sort of brainstorming for myself Added: trunk/tools/RosBE/RosBE-Windows/plans.txt (with props) Added: trunk/tools/RosBE/RosBE-Windows/plans.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/plans.tx… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/plans.txt (added) +++ trunk/tools/RosBE/RosBE-Windows/plans.txt [iso-8859-1] Sat Nov 22 02:19:26 2008 @@ -1,0 +1,23 @@ +updater ideen: +Erweiterte Update Pakete für einzelne Komponenten. + +Die Dateien werden durchnummeriert. %_ROSBE_VERSION%-1.7z, %_ROSBE_VERSION%-2.7z, %_ROSBE_VERSION%-3.7z und die dazugehörigen Changelogs mit der selben Benennung. Gespeichert werden sie in %_ROSBE_BASEDIR%\Updates + +Die klassische Methode, wie schon bei den anderen 7z Dateien wird angewendet, um zu erfahren, ob die Dateien aktualisiert oder erstellt wurden. + +Wenn ja, gebe die heruntergeladene changelog + Größenangabe über type aus und frage nach ob man das Paket laden will. Wenn nein wird wegen der Struktur an sich später nicht mehr nachgefragt, ob das Paket installiert werden soll. Deswegen löschen wir die changelog, um dies zu forcieren. + +Wenn es installiert werden soll, entpacke in \. und starte die %_ROSBE_VERSION%-1.cmd, %_ROSBE_VERSION%-2.cmd, %_ROSBE_VERSION%-3.cmd... der aktualisierten Pakete als update skript. + +Die abfrage kann entweder statisch geschehn, also z.b. fest codiert von %_ROSBE_VERSION%-1.7z bis %_ROSBE_VERSION%-9.7z, oder uU variabel über %_ROSBE_VERSION%-%_ROSBE_UPDATE%.7z und dann set /a %_ROSBE_UPDATE% += 1, bis eine Datei nicht vorhanden und deswegen der Updatevorgang fertig ist. Ab aus der schleife und gut ist. + +Die einzelnen Skripts haben folgende Grundelemente: +- Befehle zum Kopieren der Dateien. +- u.U integrierte Abfragen und Entscheidungen möglich. + +Einzelne Commands: +reset - Löscht alle changelogs, also werden alle updates wieder ausgeführt, ob installiert oder nicht. + +nr X - Installiert nur Paket Nummer X, egal ob schon installiert oder nicht und beendet. + +status - Prüft nach neuen Updates und gibt das Resultat als Einzeiler aus. Kopiere die changelogs in einen temp Ordner. Jedes noch nicht vorhandene Update wird mit seiner Nummer an eine variable angehängt und diese am Ende ausgegeben, also z.B. "Update Packs 3,4,5,6 are available" Diese updates werden zu der Zeit noch nicht heruntergeladen und die zur Überprüfung verwendeten changelogs sind deswegen in einem Temp Ordner angesiedelt, um die Aussagekräftigen changelogs nicht zu verändern. Sinnvoll für den Start von RosBE. Propchange: trunk/tools/RosBE/RosBE-Windows/plans.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 37540: - Call NtUserAttachThreadInput
by dchapyshev＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: dchapyshev Date: Sat Nov 22 00:16:19 2008 New Revision: 37540 URL: http://svn.reactos.org/svn/reactos?rev=37540&view=rev Log: - Call NtUserAttachThreadInput Modified: trunk/reactos/dll/win32/user32/misc/stubs.c Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Sat Nov 22 00:16:19 2008 @@ -25,8 +25,7 @@ DWORD idAttachTo, BOOL fAttach) { - UNIMPLEMENTED; - return FALSE; + return NtUserAttachThreadInput(idAttach, idAttachTo, fAttach); }

1 0

[dchapyshev] 37539: - Sync inetcomm with Wine head
by dchapyshev＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: dchapyshev Date: Fri Nov 21 22:28:03 2008 New Revision: 37539 URL: http://svn.reactos.org/svn/reactos?rev=37539&view=rev Log: - Sync inetcomm with Wine head Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_main.c trunk/reactos/dll/win32/inetcomm/inetcomm_private.h trunk/reactos/dll/win32/inetcomm/mimeole.c trunk/reactos/dll/win32/inetcomm/pop3transport.c trunk/reactos/dll/win32/inetcomm/regsvr.c Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm_main.c [iso-8859-1] Fri Nov 21 22:28:03 2008 @@ -139,6 +139,7 @@ static cf mime_allocator_cf = { &cf_vtbl, MimeAllocator_create }; static cf mime_message_cf = { &cf_vtbl, MimeMessage_create }; static cf mime_security_cf = { &cf_vtbl, MimeSecurity_create }; +static cf virtual_stream_cf = { &cf_vtbl, VirtualStream_create }; /*********************************************************************** * DllGetClassObject (INETCOMM.@) @@ -177,6 +178,10 @@ { cf = (IClassFactory*) &mime_allocator_cf.lpVtbl; } + else if( IsEqualCLSID( rclsid, &CLSID_IVirtualStream )) + { + cf = (IClassFactory*) &virtual_stream_cf.lpVtbl; + } if ( !cf ) { Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm_private.h [iso-8859-1] Fri Nov 21 22:28:03 2008 @@ -77,6 +77,7 @@ HRESULT MimeAllocator_create(IUnknown *outer, void **obj); HRESULT MimeMessage_create(IUnknown *outer, void **obj); HRESULT MimeSecurity_create(IUnknown *outer, void **obj); +HRESULT VirtualStream_create(IUnknown *outer, void **obj); HRESULT MimeInternational_Construct(IMimeInternational **internat); Modified: trunk/reactos/dll/win32/inetcomm/mimeole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/mimeole… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] Fri Nov 21 22:28:03 2008 @@ -2989,3 +2989,13 @@ { return MimeAllocator_create(NULL, (void**)alloc); } + +HRESULT VirtualStream_create(IUnknown *outer, void **obj) +{ + FIXME("(%p, %p)\n", outer, obj); + + *obj = NULL; + if (outer) return CLASS_E_NOAGGREGATION; + + return MimeOleCreateVirtualStream((IStream **)obj); +} Modified: trunk/reactos/dll/win32/inetcomm/pop3transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/pop3tra… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/pop3transport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/pop3transport.c [iso-8859-1] Fri Nov 21 22:28:03 2008 @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define NONAMELESSUNION #include <stdarg.h> #include <stdio.h> @@ -35,32 +36,342 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); +enum parse_state +{ + STATE_NONE, + STATE_OK, + STATE_MULTILINE, + STATE_DONE +}; + typedef struct { InternetTransport InetTransport; ULONG refs; - INETSERVER server; POP3COMMAND command; + POP3CMDTYPE type; + char *response; + char *ptr; + enum parse_state state; + BOOL valid_info; + DWORD msgid; + DWORD preview_lines; } POP3Transport; +static HRESULT parse_response(POP3Transport *This) +{ + switch (This->state) + { + case STATE_NONE: + { + if (strlen(This->response) < 3) + { + WARN("parse error\n"); + This->state = STATE_DONE; + return S_FALSE; + } + if (!memcmp(This->response, "+OK", 3)) + { + This->ptr = This->response + 3; + This->state = STATE_OK; + return S_OK; + } + This->state = STATE_DONE; + return S_FALSE; + } + default: return S_OK; + } +} + +static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl) +{ + char *p; + + uidl->dwPopId = 0; + uidl->pszUidl = NULL; + switch (This->state) + { + case STATE_OK: + { + if (This->type == POP3CMD_GET_POPID) + { + if ((p = strchr(This->ptr, ' '))) + { + while (*p == ' ') p++; + sscanf(p, "%u", &uidl->dwPopId); + if ((p = strchr(p, ' '))) + { + while (*p == ' ') p++; + uidl->pszUidl = p; + This->valid_info = TRUE; + } + } + This->state = STATE_DONE; + return S_OK; + } + This->state = STATE_MULTILINE; + return S_OK; + } + case STATE_MULTILINE: + { + if (This->response[0] == '.' && !This->response[1]) + { + This->valid_info = FALSE; + This->state = STATE_DONE; + return S_OK; + } + sscanf(This->response, "%u", &uidl->dwPopId); + if ((p = strchr(This->response, ' '))) + { + while (*p == ' ') p++; + uidl->pszUidl = p; + This->valid_info = TRUE; + return S_OK; + } + } + default: + { + WARN("parse error\n"); + This->state = STATE_DONE; + return S_FALSE; + } + } +} + +static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat) +{ + char *p; + + stat->cMessages = 0; + stat->cbMessages = 0; + switch (This->state) + { + case STATE_OK: + { + if ((p = strchr(This->ptr, ' '))) + { + while (*p == ' ') p++; + sscanf(p, "%u %u", &stat->cMessages, &stat->cbMessages); + This->valid_info = TRUE; + This->state = STATE_DONE; + return S_OK; + } + } + default: + { + WARN("parse error\n"); + This->state = STATE_DONE; + return S_FALSE; + } + } +} + +static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list) +{ + char *p; + + list->dwPopId = 0; + list->cbSize = 0; + switch (This->state) + { + case STATE_OK: + { + if (This->type == POP3CMD_GET_POPID) + { + if ((p = strchr(This->ptr, ' '))) + { + while (*p == ' ') p++; + sscanf(p, "%u %u", &list->dwPopId, &list->cbSize); + This->valid_info = TRUE; + } + This->state = STATE_DONE; + return S_OK; + } + This->state = STATE_MULTILINE; + return S_OK; + } + case STATE_MULTILINE: + { + if (This->response[0] == '.' && !This->response[1]) + { + This->valid_info = FALSE; + This->state = STATE_DONE; + return S_OK; + } + sscanf(This->response, "%u", &list->dwPopId); + if ((p = strchr(This->response, ' '))) + { + while (*p == ' ') p++; + sscanf(p, "%u", &list->cbSize); + This->valid_info = TRUE; + return S_OK; + } + } + default: + { + WARN("parse error\n"); + This->state = STATE_DONE; + return S_FALSE; + } + } +} + +static HRESULT parse_dele_response(POP3Transport *This, DWORD *dwPopId) +{ + switch (This->state) + { + case STATE_OK: + { + *dwPopId = 0; /* FIXME */ + This->state = STATE_DONE; + return S_OK; + } + default: + { + WARN("parse error\n"); + This->state = STATE_DONE; + return S_FALSE; + } + } +} + +static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr) +{ + switch (This->state) + { + case STATE_OK: + { + retr->fHeader = FALSE; + retr->fBody = FALSE; + retr->dwPopId = This->msgid; + retr->cbSoFar = 0; + retr->pszLines = This->response; + retr->cbLines = 0; + + This->state = STATE_MULTILINE; + This->valid_info = FALSE; + return S_OK; + } + case STATE_MULTILINE: + { + int len; + + if (This->response[0] == '.' && !This->response[1]) + { + retr->cbLines = retr->cbSoFar; + This->state = STATE_DONE; + return S_OK; + } + retr->fHeader = TRUE; + if (!This->response[0]) retr->fBody = TRUE; + + len = strlen(This->response); + retr->cbSoFar += len; + retr->pszLines = This->response; + retr->cbLines = len; + + This->valid_info = TRUE; + return S_OK; + } + default: + { + WARN("parse error\n"); + This->state = STATE_DONE; + return S_FALSE; + } + } +} + +static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) +{ + switch (This->state) + { + case STATE_OK: + { + top->fHeader = FALSE; + top->fBody = FALSE; + top->dwPopId = This->msgid; + top->cPreviewLines = This->preview_lines; + top->cbSoFar = 0; + top->pszLines = This->response; + top->cbLines = 0; + + This->state = STATE_MULTILINE; + This->valid_info = FALSE; + return S_OK; + } + case STATE_MULTILINE: + { + int len; + + if (This->response[0] == '.' && !This->response[1]) + { + top->cbLines = top->cbSoFar; + This->state = STATE_DONE; + return S_OK; + } + top->fHeader = TRUE; + if (!This->response[0]) top->fBody = TRUE; + + len = strlen(This->response); + top->cbSoFar += len; + top->pszLines = This->response; + top->cbLines = len; + + This->valid_info = TRUE; + return S_OK; + } + default: + { + WARN("parse error\n"); + This->state = STATE_DONE; + return S_FALSE; + } + } +} + +static void init_parser(POP3Transport *This, POP3COMMAND command, POP3CMDTYPE type) +{ + This->state = STATE_NONE; + This->command = command; + This->type = type; +} + static HRESULT POP3Transport_ParseResponse(POP3Transport *This, char *pszResponse, POP3RESPONSE *pResponse) { + HRESULT hr; + TRACE("response: %s\n", debugstr_a(pszResponse)); + This->response = pszResponse; + This->valid_info = FALSE; + TRACE("state %u\n", This->state); + + if (SUCCEEDED((hr = parse_response(This)))) + { + switch (This->command) + { + case POP3_UIDL: hr = parse_uidl_response(This, &pResponse->u.rUidlInfo); break; + case POP3_STAT: hr = parse_stat_response(This, &pResponse->u.rStatInfo); break; + case POP3_LIST: hr = parse_list_response(This, &pResponse->u.rListInfo); break; + case POP3_DELE: hr = parse_dele_response(This, &pResponse->u.dwPopId); break; + case POP3_RETR: hr = parse_retr_response(This, &pResponse->u.rRetrInfo); break; + case POP3_TOP: hr = parse_top_response(This, &pResponse->u.rTopInfo); break; + default: + This->state = STATE_DONE; + break; + } + } pResponse->command = This->command; - pResponse->fDone = TRUE; /* FIXME */ - - if (!memcmp(pszResponse, "+OK", 3)) - pResponse->rIxpResult.hrResult = S_OK; - else - pResponse->rIxpResult.hrResult = S_FALSE; - + pResponse->fDone = (This->state == STATE_DONE); + pResponse->fValidInfo = This->valid_info; + pResponse->rIxpResult.hrResult = hr; pResponse->rIxpResult.pszResponse = pszResponse; pResponse->rIxpResult.uiServerError = 0; pResponse->rIxpResult.hrServerError = pResponse->rIxpResult.hrResult; - pResponse->rIxpResult.dwSocketError = 0; + pResponse->rIxpResult.dwSocketError = WSAGetLastError(); + pResponse->rIxpResult.pszProblem = NULL; pResponse->pTransport = (IPOP3Transport *)&This->InetTransport.u.vtblPOP3; - pResponse->fValidInfo = FALSE; /* FIXME */ if (This->InetTransport.pCallback && This->InetTransport.fCommandLogging) { @@ -71,6 +382,152 @@ return S_OK; } +static void POP3Transport_CallbackProcessDELEResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); +} + +static void POP3Transport_CallbackRecvDELEResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessDELEResp); +} + +static void POP3Transport_CallbackProcessNOOPResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); +} + +static void POP3Transport_CallbackRecvNOOPResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessNOOPResp); +} + +static void POP3Transport_CallbackProcessRSETResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); +} + +static void POP3Transport_CallbackRecvRSETResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessRSETResp); +} + +void POP3Transport_CallbackProcessRETRResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); + + if (!response.fDone) + { + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessRETRResp); + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); +} + +static void POP3Transport_CallbackRecvRETRResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessRETRResp); +} + +static void POP3Transport_CallbackProcessTOPResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); + + if (!response.fDone) + { + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessTOPResp); + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); +} + +static void POP3Transport_CallbackRecvTOPResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessTOPResp); +} + static void POP3Transport_CallbackProcessLISTResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) { POP3Transport *This = (POP3Transport *)iface; @@ -87,6 +544,14 @@ } IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); + + if (!response.fDone) + { + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessLISTResp); + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); } static void POP3Transport_CallbackRecvLISTResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) @@ -109,6 +574,14 @@ if (FAILED(hr)) { /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); + + if (!response.fDone) + { + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessUIDLResp); return; } @@ -198,12 +671,14 @@ IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); - len = sizeof(pass) + strlen(This->server.szPassword) + 2; /* "\r\n" */ + len = sizeof(pass) + strlen(This->InetTransport.ServerInfo.szPassword) + 2; /* "\r\n" */ command = HeapAlloc(GetProcessHeap(), 0, len); strcpy(command, pass); - strcat(command, This->server.szPassword); + strcat(command, This->InetTransport.ServerInfo.szPassword); strcat(command, "\r\n"); + + init_parser(This, POP3_PASS, POP3_NONE); InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvPASSResp); HeapFree(GetProcessHeap(), 0, command); @@ -226,11 +701,11 @@ TRACE("\n"); - len = sizeof(user) + strlen(This->server.szUserName) + 2; /* "\r\n" */ + len = sizeof(user) + strlen(This->InetTransport.ServerInfo.szUserName) + 2; /* "\r\n" */ command = HeapAlloc(GetProcessHeap(), 0, len); strcpy(command, user); - strcat(command, This->server.szUserName); + strcat(command, This->InetTransport.ServerInfo.szUserName); strcat(command, "\r\n"); InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvUSERResp); @@ -344,8 +819,7 @@ if (FAILED(hr)) return hr; - This->command = POP3_USER; - This->server = *pInetServer; + init_parser(This, POP3_USER, POP3_NONE); return InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackSendUSERCmd); } @@ -424,13 +898,13 @@ TRACE("(%s)\n", username); len = sizeof(user) + strlen(username) + 2; /* "\r\n" */ - command = HeapAlloc(GetProcessHeap(), 0, len); + if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE; strcpy(command, user); strcat(command, username); strcat(command, "\r\n"); - This->command = POP3_USER; + init_parser(This, POP3_USER, POP3_NONE); InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvUSERResp); HeapFree(GetProcessHeap(), 0, command); @@ -447,13 +921,13 @@ TRACE("(%p)\n", password); len = sizeof(pass) + strlen(password) + 2; /* "\r\n" */ - command = HeapAlloc(GetProcessHeap(), 0, len); + if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE; strcpy(command, pass); strcat(command, password); strcat(command, "\r\n"); - This->command = POP3_PASS; + init_parser(This, POP3_PASS, POP3_NONE); InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvPASSResp); HeapFree(GetProcessHeap(), 0, command); @@ -463,21 +937,49 @@ static HRESULT WINAPI POP3Transport_CommandLIST( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) { - static char list[] = "LIST\r\n"; - POP3Transport *This = (POP3Transport *)iface; + static char list[] = "LIST %u\r\n"; + static char list_all[] = "LIST\r\n"; + POP3Transport *This = (POP3Transport *)iface; + char *command; + int len; TRACE("(%u, %u)\n", cmdtype, dwPopId); - This->command = POP3_LIST; - InternetTransport_DoCommand(&This->InetTransport, list, POP3Transport_CallbackRecvLISTResp); + if (dwPopId) + { + len = sizeof(list) + 10 + 2; /* "4294967296" + "\r\n" */ + if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE; + sprintf(command, list, dwPopId); + } + else command = list_all; + + init_parser(This, POP3_LIST, cmdtype); + InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvLISTResp); + + if (dwPopId) HeapFree(GetProcessHeap(), 0, command); return S_OK; } static HRESULT WINAPI POP3Transport_CommandTOP( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId, DWORD cPreviewLines) { - FIXME("(%u, %u, %u)\n", cmdtype, dwPopId, cPreviewLines); - return E_NOTIMPL; + static char top[] = "TOP %u %u\r\n"; + POP3Transport *This = (POP3Transport *)iface; + char *command; + int len; + + TRACE("(%u, %u, %u)\n", cmdtype, dwPopId, cPreviewLines); + + len = sizeof(top) + 20 + 2; /* 2 * "4294967296" + "\r\n" */ + if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE; + sprintf(command, top, dwPopId, cPreviewLines); + + This->preview_lines = cPreviewLines; + init_parser(This, POP3_TOP, cmdtype); + InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvTOPResp); + + HeapFree(GetProcessHeap(), 0, command); + return S_OK; } static HRESULT WINAPI POP3Transport_CommandQUIT(IPOP3Transport *iface) @@ -487,7 +989,9 @@ TRACE("()\n"); - This->command = POP3_QUIT; + InternetTransport_ChangeStatus(&This->InetTransport, IXP_DISCONNECTING); + + init_parser(This, POP3_QUIT, POP3_NONE); return InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvQUITResp); } @@ -498,48 +1002,101 @@ TRACE("\n"); - This->command = POP3_STAT; + init_parser(This, POP3_STAT, POP3_NONE); InternetTransport_DoCommand(&This->InetTransport, stat, POP3Transport_CallbackRecvSTATResp); return S_OK; } static HRESULT WINAPI POP3Transport_CommandNOOP(IPOP3Transport *iface) { - FIXME("()\n"); - return E_NOTIMPL; + static char noop[] = "NOOP\r\n"; + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + + init_parser(This, POP3_NOOP, POP3_NONE); + InternetTransport_DoCommand(&This->InetTransport, noop, POP3Transport_CallbackRecvNOOPResp); + return S_OK; } static HRESULT WINAPI POP3Transport_CommandRSET(IPOP3Transport *iface) { - FIXME("()\n"); - return E_NOTIMPL; + static char rset[] = "RSET\r\n"; + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + + init_parser(This, POP3_RSET, POP3_NONE); + InternetTransport_DoCommand(&This->InetTransport, rset, POP3Transport_CallbackRecvRSETResp); + return S_OK; } static HRESULT WINAPI POP3Transport_CommandUIDL( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) { - static char uidl[] = "UIDL\r\n"; - POP3Transport *This = (POP3Transport *)iface; + static char uidl[] = "UIDL %u\r\n"; + static char uidl_all[] = "UIDL\r\n"; + POP3Transport *This = (POP3Transport *)iface; + char *command; + int len; TRACE("(%u, %u)\n", cmdtype, dwPopId); - This->command = POP3_UIDL; - InternetTransport_DoCommand(&This->InetTransport, uidl, POP3Transport_CallbackRecvUIDLResp); + if (dwPopId) + { + len = sizeof(uidl) + 10 + 2; /* "4294967296" + "\r\n" */ + if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE; + sprintf(command, uidl, dwPopId); + } + else command = uidl_all; + + init_parser(This, POP3_UIDL, cmdtype); + InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvUIDLResp); + + if (dwPopId) HeapFree(GetProcessHeap(), 0, command); return S_OK; } static HRESULT WINAPI POP3Transport_CommandDELE( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) { - FIXME("(%u, %u)\n", cmdtype, dwPopId); - return E_NOTIMPL; + static char dele[] = "DELE %u\r\n"; + POP3Transport *This = (POP3Transport *)iface; + char *command; + int len; + + TRACE("(%u, %u)\n", cmdtype, dwPopId); + + len = sizeof(dele) + 10 + 2; /* "4294967296" + "\r\n" */ + if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE; + sprintf(command, dele, dwPopId); + + init_parser(This, POP3_DELE, cmdtype); + InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvDELEResp); + + HeapFree(GetProcessHeap(), 0, command); + return S_OK; } static HRESULT WINAPI POP3Transport_CommandRETR( IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) { - FIXME("(%u, %u)\n", cmdtype, dwPopId); - return E_NOTIMPL; + static char retr[] = "RETR %u\r\n"; + POP3Transport *This = (POP3Transport *)iface; + char *command; + int len; + + TRACE("(%u, %u)\n", cmdtype, dwPopId); + + len = sizeof(retr) + 10 + 2; /* "4294967296" + "\r\n" */ + if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE; + sprintf(command, retr, dwPopId); + + init_parser(This, POP3_RETR, cmdtype); + InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvRETRResp); + + HeapFree(GetProcessHeap(), 0, command); + return S_OK; } static const IPOP3TransportVtbl POP3TransportVtbl = Modified: trunk/reactos/dll/win32/inetcomm/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/regsvr.… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/regsvr.c [iso-8859-1] Fri Nov 21 22:28:03 2008 @@ -464,6 +464,12 @@ "inetcomm.dll", "Both" }, + { &CLSID_IVirtualStream, + "CLSID_IVirtualStream", + NULL, + "inetcomm.dll", + "Both" + }, { NULL } /* list terminator */ };

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs