Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[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

[arty] 37538: merge from trunk: fastfat that boots real windows
by arty＠svn.reactos.org 22 Nov '08

22 Nov '08

Author: arty Date: Fri Nov 21 18:13:31 2008 New Revision: 37538 URL: http://svn.reactos.org/svn/reactos?rev=37538&view=rev Log: merge from trunk: fastfat that boots real windows Modified: branches/arty-newcc/drivers/filesystems/fastfat/cleanup.c branches/arty-newcc/drivers/filesystems/fastfat/create.c branches/arty-newcc/drivers/filesystems/fastfat/dirwr.c branches/arty-newcc/drivers/filesystems/fastfat/fastio.c branches/arty-newcc/drivers/filesystems/fastfat/fcb.c branches/arty-newcc/drivers/filesystems/fastfat/finfo.c branches/arty-newcc/drivers/filesystems/fastfat/fsctl.c branches/arty-newcc/drivers/filesystems/fastfat/misc.c branches/arty-newcc/drivers/filesystems/fastfat/rw.c Modified: branches/arty-newcc/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -82,12 +82,7 @@ ObDereferenceObject(tmpFileObject); } -#if 0 - /* FIXME: - * CcPurgeCacheSection is unimplemented. - */ CcPurgeCacheSection(FileObject->SectionObjectPointer, NULL, 0, FALSE); -#endif } /* Uninitialize file cache if. */ if (FileObject->SectionObjectPointer->SharedCacheMap) Modified: branches/arty-newcc/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/create.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -198,7 +198,7 @@ DPRINT ("FindFile(Parent %p, FileToFind '%wZ', DirIndex: %d)\n", Parent, FileToFindU, DirContext->DirIndex); - DPRINT ("FindFile: Path %wZ)\n",&Parent->PathNameU); + DPRINT ("FindFile: Path %wZ\n",&Parent->PathNameU); PathNameBufferLength = LONGNAME_MAX_LENGTH * sizeof(WCHAR); PathNameBuffer = ExAllocatePoolWithTag(NonPagedPool, PathNameBufferLength + sizeof(WCHAR), TAG_VFAT); Modified: branches/arty-newcc/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -25,7 +25,6 @@ ULONG dirIndex; ASSERT(pFcb); - ASSERT(pFcb->parentFcb); if (pFcb->Flags & FCB_IS_FATX_ENTRY) { @@ -479,7 +478,7 @@ if (RequestedOptions & FILE_DIRECTORY_FILE) { FileOffset.QuadPart = 0; - CcMapData((*Fcb)->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, + CcPinRead((*Fcb)->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, &Context, (PVOID*)&pFatEntry); /* clear the new directory cluster */ RtlZeroMemory(pFatEntry, DeviceExt->FatInfo.BytesPerCluster); Modified: branches/arty-newcc/drivers/filesystems/fastfat/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/fastio.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/fastio.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -175,7 +175,7 @@ IN PDEVICE_OBJECT DeviceObject) { DPRINT("VfatAcquireForModWrite\n"); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_DEVICE_REQUEST; } static BOOLEAN NTAPI @@ -289,23 +289,41 @@ IN PDEVICE_OBJECT DeviceObject) { DPRINT("VfatReleaseForModWrite\n"); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_DEVICE_REQUEST; } static NTSTATUS NTAPI VfatAcquireForCcFlush(IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject) { + PVFATFCB Fcb = (PVFATFCB)FileObject->FsContext; + DPRINT("VfatAcquireForCcFlush\n"); - return STATUS_UNSUCCESSFUL; + + /* Make sure it is not a volume lock */ + ASSERT(!(Fcb->Flags & FCB_IS_VOLUME)); + + /* Acquire the resource */ + ExAcquireResourceExclusiveLite(&(Fcb->MainResource), TRUE); + + return STATUS_SUCCESS; } static NTSTATUS NTAPI VfatReleaseForCcFlush(IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject) { + PVFATFCB Fcb = (PVFATFCB)FileObject->FsContext; + DPRINT("VfatReleaseForCcFlush\n"); - return STATUS_UNSUCCESSFUL; + + /* Make sure it is not a volume lock */ + ASSERT(!(Fcb->Flags & FCB_IS_VOLUME)); + + /* Release the resource */ + ExReleaseResourceLite(&(Fcb->MainResource)); + + return STATUS_SUCCESS; } BOOLEAN NTAPI @@ -378,7 +396,6 @@ FastIoDispatch->ReleaseFileForNtCreateSection = VfatReleaseFileForNtCreateSection; FastIoDispatch->FastIoDetachDevice = VfatFastIoDetachDevice; FastIoDispatch->FastIoQueryNetworkOpenInfo = VfatFastIoQueryNetworkOpenInfo; - FastIoDispatch->AcquireForModWrite = VfatAcquireForModWrite; FastIoDispatch->MdlRead = VfatMdlRead; FastIoDispatch->MdlReadComplete = VfatMdlReadComplete; FastIoDispatch->PrepareMdlWrite = VfatPrepareMdlWrite; @@ -388,6 +405,7 @@ FastIoDispatch->MdlReadCompleteCompressed = VfatMdlReadCompleteCompressed; FastIoDispatch->MdlWriteCompleteCompressed = VfatMdlWriteCompleteCompressed; FastIoDispatch->FastIoQueryOpen = VfatFastIoQueryOpen; + FastIoDispatch->AcquireForModWrite = VfatAcquireForModWrite; FastIoDispatch->ReleaseForModWrite = VfatReleaseForModWrite; FastIoDispatch->AcquireForCcFlush = VfatAcquireForCcFlush; FastIoDispatch->ReleaseForCcFlush = VfatReleaseForCcFlush; Modified: branches/arty-newcc/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -332,7 +332,7 @@ CcInitializeCacheMap(fileObject, (PCC_FILE_SIZES)(&fcb->RFCB.AllocationSize), - FALSE, + TRUE, &VfatGlobalData->CacheMgrCallbacks, fcb); Modified: branches/arty-newcc/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -91,7 +91,7 @@ StandardInfo->EndOfFile = FCB->RFCB.FileSize; StandardInfo->Directory = FALSE; } - StandardInfo->NumberOfLinks = 0; + StandardInfo->NumberOfLinks = 1; StandardInfo->DeletePending = FCB->Flags & FCB_DELETE_PENDING ? TRUE : FALSE; *BufferLength -= sizeof(FILE_STANDARD_INFORMATION); @@ -271,7 +271,7 @@ PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; #endif - DPRINT ("FsdSetDispositionInformation()\n"); + DPRINT ("FsdSetDispositionInformation(<%wZ>, Delete %d)\n", &FCB->PathNameU, DispositionInfo->DeleteFile); ASSERT(DeviceExt != NULL); ASSERT(DeviceExt->FatInfo.BytesPerCluster != 0); @@ -338,15 +338,33 @@ * FUNCTION: Retrieve the file name information */ { + ULONG BytesToCopy; ASSERT(NameInfo != NULL); ASSERT(FCB != NULL); + /* If buffer can't hold at least the file name length, bail out */ + if (*BufferLength < FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + return STATUS_BUFFER_OVERFLOW; + + /* Save file name length, and as much file len, as buffer length allows */ NameInfo->FileNameLength = FCB->PathNameU.Length; - if (*BufferLength < FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + FCB->PathNameU.Length) + + /* Calculate amount of bytes to copy not to overflow the buffer */ + BytesToCopy = min(FCB->PathNameU.Length, + *BufferLength - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])); + + /* Fill in the bytes */ + RtlCopyMemory(NameInfo->FileName, FCB->PathNameU.Buffer, BytesToCopy); + + /* Check if we could write more but are not able to */ + if (*BufferLength < FCB->PathNameU.Length + FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + { + /* Return number of bytes written */ + *BufferLength -= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + BytesToCopy; return STATUS_BUFFER_OVERFLOW; - - RtlCopyMemory(NameInfo->FileName, FCB->PathNameU.Buffer, FCB->PathNameU.Length); - + } + + /* We filled up as many bytes, as needed */ *BufferLength -= (FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + FCB->PathNameU.Length); return STATUS_SUCCESS; @@ -551,7 +569,8 @@ ULONG NCluster; BOOLEAN AllocSizeChanged = FALSE; - DPRINT("VfatSetAllocationSizeInformation()\n"); + DPRINT("VfatSetAllocationSizeInformation(File <%wZ>, AllocationSize %d %d)\n", &Fcb->PathNameU, + AllocationSize->HighPart, AllocationSize->LowPart); if (Fcb->Flags & FCB_IS_FATX_ENTRY) OldSize = Fcb->entry.FatX.FileSize; @@ -748,7 +767,7 @@ FILE_INFORMATION_CLASS FileInformationClass; PVFATFCB FCB = NULL; - NTSTATUS RC = STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS; PVOID SystemBuffer; ULONG BufferLength; @@ -779,44 +798,44 @@ switch (FileInformationClass) { case FileStandardInformation: - RC = VfatGetStandardInformation(FCB, + Status = VfatGetStandardInformation(FCB, SystemBuffer, &BufferLength); break; case FilePositionInformation: - RC = VfatGetPositionInformation(IrpContext->FileObject, + Status = VfatGetPositionInformation(IrpContext->FileObject, FCB, IrpContext->DeviceObject, SystemBuffer, &BufferLength); break; case FileBasicInformation: - RC = VfatGetBasicInformation(IrpContext->FileObject, + Status = VfatGetBasicInformation(IrpContext->FileObject, FCB, IrpContext->DeviceObject, SystemBuffer, &BufferLength); break; case FileNameInformation: - RC = VfatGetNameInformation(IrpContext->FileObject, + Status = VfatGetNameInformation(IrpContext->FileObject, FCB, IrpContext->DeviceObject, SystemBuffer, &BufferLength); break; case FileInternalInformation: - RC = VfatGetInternalInformation(FCB, + Status = VfatGetInternalInformation(FCB, SystemBuffer, &BufferLength); break; case FileNetworkOpenInformation: - RC = VfatGetNetworkOpenInformation(FCB, + Status = VfatGetNetworkOpenInformation(FCB, IrpContext->DeviceExt, SystemBuffer, &BufferLength); break; case FileAllInformation: - RC = VfatGetAllInformation(IrpContext->FileObject, + Status = VfatGetAllInformation(IrpContext->FileObject, FCB, IrpContext->DeviceObject, SystemBuffer, @@ -824,7 +843,7 @@ break; case FileEaInformation: - RC = VfatGetEaInformation(IrpContext->FileObject, + Status = VfatGetEaInformation(IrpContext->FileObject, FCB, IrpContext->DeviceObject, SystemBuffer, @@ -832,18 +851,18 @@ break; case FileAlternateNameInformation: - RC = STATUS_NOT_IMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; break; default: - RC = STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; } if (!(FCB->Flags & FCB_IS_PAGE_FILE)) { ExReleaseResourceLite(&FCB->MainResource); } - IrpContext->Irp->IoStatus.Status = RC; - if (NT_SUCCESS(RC)) + IrpContext->Irp->IoStatus.Status = Status; + if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) IrpContext->Irp->IoStatus.Information = IrpContext->Stack->Parameters.QueryFile.Length - BufferLength; else @@ -851,7 +870,7 @@ IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); VfatFreeIrpContext(IrpContext); - return RC; + return Status; } NTSTATUS VfatSetInformation(PVFAT_IRP_CONTEXT IrpContext) Modified: branches/arty-newcc/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -372,6 +372,7 @@ PVFATFCB VolumeFcb = NULL; PVFATCCB Ccb = NULL; PDEVICE_OBJECT DeviceToMount; + PVPB Vpb; UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\$$Fat$$"); UNICODE_STRING VolumeNameU = RTL_CONSTANT_STRING(L"\\$$Volume$$"); ULONG HashTableSize; @@ -389,6 +390,7 @@ } DeviceToMount = IrpContext->Stack->Parameters.MountVolume.DeviceObject; + Vpb = IrpContext->Stack->Parameters.MountVolume.Vpb; Status = VfatHasFileSystem (DeviceToMount, &RecognizedFS, &FatInfo); if (!NT_SUCCESS(Status)) @@ -422,7 +424,7 @@ Status = IoCreateDevice(VfatGlobalData->DriverObject, ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize, NULL, - FILE_DEVICE_FILE_SYSTEM, + FILE_DEVICE_DISK_FILE_SYSTEM, 0, FALSE, &DeviceObject); @@ -438,7 +440,9 @@ DeviceExt->HashTableSize = HashTableSize; /* use same vpb as device disk */ - DeviceObject->Vpb = DeviceToMount->Vpb; + DeviceObject->Vpb = Vpb; + DeviceToMount->Vpb = Vpb; + Status = VfatMountDevice(DeviceExt, DeviceToMount); if (!NT_SUCCESS(Status)) { @@ -538,7 +542,7 @@ CcInitializeCacheMap(DeviceExt->FATFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, + TRUE, &VfatGlobalData->CacheMgrCallbacks, Fcb); Modified: branches/arty-newcc/drivers/filesystems/fastfat/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/misc.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/misc.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -156,11 +156,6 @@ } else { - if (KeGetCurrentIrql() > PASSIVE_LEVEL) - { - DPRINT1("Vfat is entered at irql = %d\n", KeGetCurrentIrql()); - } - FsRtlEnterFileSystem(); Status = VfatDispatchRequest (IrpContext); FsRtlExitFileSystem(); Modified: branches/arty-newcc/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/fastfat/rw.c [iso-8859-1] Fri Nov 21 18:13:31 2008 @@ -678,7 +678,7 @@ (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT), Buffer, &IrpContext->Irp->IoStatus)) { - Status = IrpContext->Irp->IoStatus.Status;//STATUS_PENDING; + Status = STATUS_PENDING; goto ByeBye; } if (!NT_SUCCESS(IrpContext->Irp->IoStatus.Status))

1 0

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

21 Nov '08

Author: sginsberg Date: Fri Nov 21 17:14:30 2008 New Revision: 37537 URL: http://svn.reactos.org/svn/reactos?rev=37537&view=rev Log: - Silence more "has virtual functions but non-virtual destructor" Modified: trunk/rostests/tests/primitives/primitives.rbuild trunk/rostests/tests/txtscale/txtscale.rbuild trunk/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild Modified: trunk/rostests/tests/primitives/primitives.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/primitives/primitiv… ============================================================================== --- trunk/rostests/tests/primitives/primitives.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/primitives/primitives.rbuild [iso-8859-1] Fri Nov 21 17:14:30 2008 @@ -3,6 +3,7 @@ <library>kernel32</library> <library>user32</library> <library>gdi32</library> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <file>primitives.cpp</file> <file>mk_font.cpp</file> </module> Modified: trunk/rostests/tests/txtscale/txtscale.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/txtscale/txtscale.r… ============================================================================== --- trunk/rostests/tests/txtscale/txtscale.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/txtscale/txtscale.rbuild [iso-8859-1] Fri Nov 21 17:14:30 2008 @@ -4,6 +4,7 @@ <library>user32</library> <library>gdi32</library> <library>comctl32</library> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <file>txtscale.cpp</file> <file>mk_font.cpp</file> </module> Modified: trunk/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/wm_erasebkgnd/wm_er… ============================================================================== --- trunk/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild [iso-8859-1] Fri Nov 21 17:14:30 2008 @@ -3,5 +3,6 @@ <library>kernel32</library> <library>user32</library> <library>gdi32</library> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <file>wm_erasebkgnd.cpp</file> </module>

1 0

[tkreuzer] 37536: Add KTRAP_FRAME offsets to asm.h
by tkreuzer＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: tkreuzer Date: Fri Nov 21 17:12:02 2008 New Revision: 37536 URL: http://svn.reactos.org/svn/reactos?rev=37536&view=rev Log: Add KTRAP_FRAME offsets to asm.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] Fri Nov 21 17:12:02 2008 @@ -132,6 +132,62 @@ #define CONTEXT_LastExceptionFromRip 0x4c8 // +// KTRAP_FRAME Offsets +// +#define KTRAP_FRAME_P1Home 0x00 +#define KTRAP_FRAME_P2Home 0x08 +#define KTRAP_FRAME_P3Home 0x10 +#define KTRAP_FRAME_P4Home 0x18 +#define KTRAP_FRAME_P5 0x20 +#define KTRAP_FRAME_PreviousMode 0x28 +#define KTRAP_FRAME_PreviousIrql 0x29 +#define KTRAP_FRAME_FaultIndicator 0x2A +#define KTRAP_FRAME_ExceptionActive 0x2B +#define KTRAP_FRAME_MxCsr 0x2C +#define KTRAP_FRAME_Rax 0x30 +#define KTRAP_FRAME_Rcx 0x38 +#define KTRAP_FRAME_Rdx 0x40 +#define KTRAP_FRAME_R8 0x48 +#define KTRAP_FRAME_R9 0x50 +#define KTRAP_FRAME_R10 0x58 +#define KTRAP_FRAME_R11 0x60 +#define KTRAP_FRAME_Spare0 0x68 +#define KTRAP_FRAME_Xmm0 0x70 +#define KTRAP_FRAME_Xmm1 0x80 +#define KTRAP_FRAME_Xmm2 0x90 +#define KTRAP_FRAME_Xmm3 0xA0 +#define KTRAP_FRAME_Xmm4 0xB0 +#define KTRAP_FRAME_Xmm5 0xC0 +#define KTRAP_FRAME_FaultAddress 0xD0 +#define KTRAP_FRAME_Dr0 0xD8 +#define KTRAP_FRAME_Dr1 0xE0 +#define KTRAP_FRAME_Dr2 0xE8 +#define KTRAP_FRAME_Dr3 0xF0 +#define KTRAP_FRAME_Dr6 0xF8 +#define KTRAP_FRAME_Dr7 0x100 +#define KTRAP_FRAME_DebugControl 0x108 +#define KTRAP_FRAME_LastBranchToRip 0x110 +#define KTRAP_FRAME_LastBranchFromRip 0x118 +#define KTRAP_FRAME_LastExceptionToRip 0x120 +#define KTRAP_FRAME_LastExceptionFromRip 0x128 +#define KTRAP_FRAME_SegDs 0x130 +#define KTRAP_FRAME_SegEs 0x132 +#define KTRAP_FRAME_SegFs 0x134 +#define KTRAP_FRAME_SegGs 0x136 +#define KTRAP_FRAME_TrapFrame 0x138 +#define KTRAP_FRAME_Rbx 0x140 +#define KTRAP_FRAME_Rdi 0x148 +#define KTRAP_FRAME_Rsi 0x150 +#define KTRAP_FRAME_Rbp 0x158 +#define KTRAP_FRAME_ErrorCode 0x160 +#define KTRAP_FRAME_Rip 0x168 +#define KTRAP_FRAME_SegCs 0x170 +#define KTRAP_FRAME_EFlags 0x178 +#define KTRAP_FRAME_Rsp 0x180 +#define KTRAP_FRAME_SegSs 0x188 +#define SIZE_KTRAP_FRAME 0x190 + +// // CR0 // #define CR0_PE 0x1

1 0

[sginsberg] 37535: - ...revert until all Winetests/rostests are fixed. Using a broken RosBe beta which doesn't build /rostests/ or /rosapps/ when doing header changes is a bad, bad idea.
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 16:48:38 2008 New Revision: 37535 URL: http://svn.reactos.org/svn/reactos?rev=37535&view=rev Log: - ...revert until all Winetests/rostests are fixed. Using a broken RosBe beta which doesn't build /rostests/ or /rosapps/ when doing header changes is a bad, bad idea. 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] Fri Nov 21 16:48:38 2008 @@ -1,5 +1,9 @@ #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] Fri Nov 21 16:48:38 2008 @@ -12,6 +12,10 @@ */ #ifndef _WINDOWS_H #define _WINDOWS_H + +#if __GNUC__ >= 3 +#pragma GCC system_header +#endif #ifdef __GNUC__ #include <msvctarget.h>

1 0

[sginsberg] 37534: - Winetests treats ntdef.h as a psdk header, so temporarily hack it...
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 16:38:23 2008 New Revision: 37534 URL: http://svn.reactos.org/svn/reactos?rev=37534&view=rev Log: - Winetests treats ntdef.h as a psdk header, so temporarily hack it... Modified: trunk/reactos/include/ddk/ntdef.h Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=37… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Fri Nov 21 16:38:23 2008 @@ -1,5 +1,9 @@ #ifndef _NTDEF_H #define _NTDEF_H + +#if __GNUC__ >= 3 +#pragma GCC system_header +#endif #include <stdarg.h> #include <windef.h>

1 0

[sginsberg] 37533: - Fix rostests build, part 1 of ?
by sginsberg＠svn.reactos.org 21 Nov '08

21 Nov '08

Author: sginsberg Date: Fri Nov 21 16:23:46 2008 New Revision: 37533 URL: http://svn.reactos.org/svn/reactos?rev=37533&view=rev Log: - Fix rostests build, part 1 of ? Modified: trunk/rostests/tests/enumfonts/enumfonts.rbuild Modified: trunk/rostests/tests/enumfonts/enumfonts.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/enumfonts/enumfonts… ============================================================================== --- trunk/rostests/tests/enumfonts/enumfonts.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/enumfonts/enumfonts.rbuild [iso-8859-1] Fri Nov 21 16:23:46 2008 @@ -3,5 +3,6 @@ <library>kernel32</library> <library>user32</library> <library>gdi32</library> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <file>enumfonts.cpp</file> </module>

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008