Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 36272: RSetServiceStatus: - Don't fail if the system is shutting down because services must report successful shutdown to the service manager while the system is shutting down. - Add some more parameter checks.
by ekohl＠svn.reactos.org 16 Sep '08

16 Sep '08

Author: ekohl Date: Tue Sep 16 14:47:16 2008 New Revision: 36272 URL: http://svn.reactos.org/svn/reactos?rev=36272&view=rev Log: RSetServiceStatus: - Don't fail if the system is shutting down because services must report successful shutdown to the service manager while the system is shutting down. - Add some more parameter checks. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Tue Sep 16 14:47:16 2008 @@ -982,6 +982,26 @@ } +static BOOL +ScmIsValidServiceState(DWORD dwCurrentState) +{ + switch (dwCurrentState) + { + case SERVICE_STOPPED: + case SERVICE_START_PENDING: + case SERVICE_STOP_PENDING: + case SERVICE_RUNNING: + case SERVICE_CONTINUE_PENDING: + case SERVICE_PAUSE_PENDING: + case SERVICE_PAUSED: + return TRUE; + + default: + return FALSE; + } +} + + /* Function 7 */ DWORD RSetServiceStatus( handle_t BindingHandle, @@ -991,9 +1011,20 @@ PSERVICE lpService; DPRINT("RSetServiceStatus() called\n"); - - if (ScmShutdown) - return ERROR_SHUTDOWN_IN_PROGRESS; + DPRINT("hServiceStatus = %p\n", hServiceStatus); + DPRINT("dwServiceType = %lu\n", lpServiceStatus->dwServiceType); + DPRINT("dwCurrentState = %lu\n", lpServiceStatus->dwCurrentState); + DPRINT("dwControlsAccepted = %lu\n", lpServiceStatus->dwControlsAccepted); + DPRINT("dwWin32ExitCode = %lu\n", lpServiceStatus->dwWin32ExitCode); + DPRINT("dwServiceSpecificExitCode = %lu\n", lpServiceStatus->dwServiceSpecificExitCode); + DPRINT("dwCheckPoint = %lu\n", lpServiceStatus->dwCheckPoint); + DPRINT("dwWaitHint = %lu\n", lpServiceStatus->dwWaitHint); + + if (hServiceStatus == 0) + { + DPRINT1("hServiceStatus == NULL!\n"); + return ERROR_INVALID_HANDLE; + } lpService = ScmGetServiceEntryByClientHandle((ULONG)hServiceStatus); if (lpService == NULL) @@ -1001,6 +1032,30 @@ DPRINT1("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } + + /* Check current state */ + if (!ScmIsValidServiceState(lpServiceStatus->dwCurrentState)) + { + DPRINT1("Invalid service state!\n"); + return ERROR_INVALID_DATA; + } + + /* Check service type */ + if (!(lpServiceStatus->dwServiceType & SERVICE_WIN32) && + (lpServiceStatus->dwServiceType & SERVICE_DRIVER)) + { + DPRINT1("Invalid service type!\n"); + return ERROR_INVALID_DATA; + } + + /* Check accepted controls */ + if (lpServiceStatus->dwControlsAccepted == 0 || + lpServiceStatus->dwControlsAccepted & ~0xFF) + { + DPRINT1("Invalid controls accepted!\n"); + return ERROR_INVALID_DATA; + } + RtlCopyMemory(&lpService->Status, lpServiceStatus,

1 0

[gbrunmar] 36271: D3D9: Implemented part of IDirect3DDevice9::CreateTexture()
by gbrunmar＠svn.reactos.org 16 Sep '08

16 Sep '08

Author: gbrunmar Date: Tue Sep 16 14:21:02 2008 New Revision: 36271 URL: http://svn.reactos.org/svn/reactos?rev=36271&view=rev Log: D3D9: Implemented part of IDirect3DDevice9::CreateTexture() Added: trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c (with props) trunk/reactos/dll/directx/d3d9/d3d9_mipmap.h (with props) trunk/reactos/dll/directx/d3d9/d3d9_resource.h (with props) trunk/reactos/dll/directx/d3d9/d3d9_texture.h (with props) Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_device.c Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild [iso-8859-1] Tue Sep 16 14:21:02 2008 @@ -21,6 +21,7 @@ <file>d3d9_haldevice.c</file> <file>d3d9_helpers.c</file> <file>d3d9_impl.c</file> + <file>d3d9_mipmap.c</file> <file>d3d9_puredevice.c</file> <file>d3d9_swapchain.c</file> <file>adapter.c</file> Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Tue Sep 16 14:21:02 2008 @@ -10,6 +10,7 @@ #include "adapter.h" #include <debug.h> #include "d3d9_create.h" +#include "d3d9_mipmap.h" #define LOCK_D3DDEVICE9() if (This->bLockDevice) EnterCriticalSection(&This->CriticalSection); #define UNLOCK_D3DDEVICE9() if (This->bLockDevice) LeaveCriticalSection(&This->CriticalSection); @@ -21,6 +22,13 @@ return NULL; return (LPDIRECT3DDEVICE9_INT)((ULONG_PTR)iface - FIELD_OFFSET(DIRECT3DDEVICE9_INT, lpVtbl)); +} + +static HRESULT InvalidCall(LPDIRECT3DDEVICE9_INT This, LPSTR ErrorMsg) +{ + DPRINT1(ErrorMsg); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; } /* IDirect3DDevice9: IUnknown implementation */ @@ -448,11 +456,72 @@ UNIMPLEMENTED } +/*++ +* @name IDirect3DDevice9::CreateTexture +* @implemented +* +* The function IDirect3DDevice9Base_CreateTexture creates a D3D9 texture. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice() +* +* @param UINT Width +* Desired width of the texture +* +* @param UINT Height +* Desired height of the texture +* +* @param UINT Levels +* Number of mip-maps. If Levels are zero, mip-maps down to size 1x1 will be generated. +* +* @param DWORD Usage +* Valid combinations of the D3DUSAGE constants. +* +* @param D3DFORMAT Format +* One of the D3DFORMAT enum members for the surface format. +* +* @param D3DPOOL Pool +* One of the D3DPOOL enum members for where the texture should be placed. +* +* @param IDirect3DTexture9** ppTexture +* Return parameter for the created texture +* +* @param HANDLE* pSharedHandle +* Set to NULL, shared resources are not implemented yet +* +* @return HRESULT +* Returns D3D_OK if everything went well. +* +*/ HRESULT WINAPI IDirect3DDevice9Base_CreateTexture(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9** ppTexture, HANDLE* pSharedHandle) { - UNIMPLEMENTED - - return D3D_OK; + HRESULT hResult; + LPDIRECT3DDEVICE9_INT This = IDirect3DDevice9ToImpl(iface); + LOCK_D3DDEVICE9(); + + if (NULL == This) + return InvalidCall(This, "Invalid 'this' parameter specified"); + + if (NULL == ppTexture) + return InvalidCall(This, "Invalid ppTexture parameter specified"); + + *ppTexture = NULL; + + if (D3DFMT_UNKNOWN == Format) + return InvalidCall(This, "Invalid Format parameter specified, D3DFMT_UNKNOWN is not a valid Format"); + + if (NULL == pSharedHandle) + { + UNIMPLEMENTED; + return InvalidCall(This, "Invalid pSharedHandle parameter specified, only NULL is supported at the moment"); + } + + hResult = CreateD3D9MipMap(This, Width, Height, Levels, Usage, Format, Pool, ppTexture); + if (FAILED(hResult)) + DPRINT1("Failed to create texture"); + + UNLOCK_D3DDEVICE9(); + return hResult; } HRESULT WINAPI IDirect3DDevice9Base_CreateVolumeTexture(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DVolumeTexture9** ppVolumeTexture, HANDLE* pSharedHandle) Added: trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_mipm… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c [iso-8859-1] Tue Sep 16 14:21:02 2008 @@ -1,0 +1,17 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_mipmap.c + * PURPOSE: d3d9.dll internal mip map surface functions + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ +#include "d3d9_mipmap.h" +#include "debug.h" +#include "d3d9_device.h" + +HRESULT CreateD3D9MipMap(DIRECT3DDEVICE9_INT* pDevice, UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9** ppTexture) +{ + UNIMPLEMENTED; + return D3D_OK; +} + Propchange: trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/d3d9/d3d9_mipmap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_mipm… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_mipmap.h (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_mipmap.h [iso-8859-1] Tue Sep 16 14:21:02 2008 @@ -1,0 +1,26 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_mipmap.h + * PURPOSE: d3d9.dll internal mip map surface structures + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ +#ifndef _D3D9_MIPMAP_H_ +#define _D3D9_MIPMAP_H_ + +#include "d3d9_texture.h" + +struct _Direct3DDevice9_INT; + +typedef struct _D3D9MipMap +{ +/* 0x0000 */ D3D9Texture BaseTexture; +/* 0x0068 */ DWORD dwUnknown68; +/* 0x006c */ DWORD dwUnknown6c; +/* 0x0070 */ DWORD dwUnknown70; +/* 0x0074 */ DWORD dwUnknown74; +} D3D9MipMap; + +HRESULT CreateD3D9MipMap(struct _Direct3DDevice9_INT* pDevice, UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9** ppTexture); + +#endif // _D3D9_MIPMAP_H_ Propchange: trunk/reactos/dll/directx/d3d9/d3d9_mipmap.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/d3d9/d3d9_resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_reso… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_resource.h (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_resource.h [iso-8859-1] Tue Sep 16 14:21:02 2008 @@ -1,0 +1,27 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_mipmap.h + * PURPOSE: d3d9.dll internal resource structures + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ +#ifndef _D3D9_RESOURCE_H_ +#define _D3D9_RESOURCE_H_ + +#include "d3d9_baseobject.h" + +typedef struct _D3D9Resource +{ +/* 0x0000 */ D3D9BaseObject BaseObject; +/* 0x0020 */ DWORD dwUnknown20; +/* 0x0024 */ DWORD dwUnknown24; +/* 0x0028 */ DWORD dwUnknown28; +/* 0x002c */ DWORD dwUnknown2c; +/* 0x0030 */ DWORD dwUnknown30; +/* 0x0034 */ DWORD dwUnknown34; +/* 0x0038 */ DWORD dwUnknown38; +/* 0x003c */ DWORD dwUnknown3c; +/* 0x0040 */ DWORD dwUnknown40; +} D3D9Resource; + +#endif // _D3D9_RESOURCE_H_ Propchange: trunk/reactos/dll/directx/d3d9/d3d9_resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/d3d9/d3d9_texture.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_text… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_texture.h (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_texture.h [iso-8859-1] Tue Sep 16 14:21:02 2008 @@ -1,0 +1,27 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_texture.h + * PURPOSE: d3d9.dll internal texture surface structures + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ +#ifndef _D3D9_TEXTURE_H_ +#define _D3D9_TEXTURE_H_ + +#include "d3d9_resource.h" + +typedef struct _D3D9Texture +{ +/* 0x0000 */ D3D9Resource BaseResource; +/* 0x0044 */ DWORD dwUnknown44; +/* 0x0048 */ DWORD dwUnknown48; +/* 0x004c */ DWORD dwUnknown4c; +/* 0x0050 */ DWORD dwUnknown50; +/* 0x0054 */ DWORD dwUnknown54; +/* 0x0058 */ DWORD dwUnknown58; +/* 0x005c */ DWORD dwUnknown5c; +/* 0x0060 */ DWORD dwUnknown60; +/* 0x0064 */ DWORD dwUnknown64; +} D3D9Texture; + +#endif // _D3D9_TEXTURE_H_ Propchange: trunk/reactos/dll/directx/d3d9/d3d9_texture.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 36270: - Add the root "index.php" file from the server, containing a copied function from "lang.php" (thanks for keeping things interesting.....) - Add support for Vietnamese and finally fix support for Hebrew
by cfinck＠svn.reactos.org 16 Sep '08

16 Sep '08

Author: cfinck Date: Tue Sep 16 12:50:12 2008 New Revision: 36270 URL: http://svn.reactos.org/svn/reactos?rev=36270&view=rev Log: - Add the root "index.php" file from the server, containing a copied function from "lang.php" (thanks for keeping things interesting.....) - Add support for Vietnamese and finally fix support for Hebrew Added: trunk/web/reactos.org/htdocs/index.php (with props) Modified: trunk/web/reactos.org/htdocs/roscms/lang.php Added: trunk/web/reactos.org/htdocs/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/index.php?r… ============================================================================== --- trunk/web/reactos.org/htdocs/index.php (added) +++ trunk/web/reactos.org/htdocs/index.php [iso-8859-1] Tue Sep 16 12:50:12 2008 @@ -1,0 +1,185 @@ +<?php + + // RosCMS Config File: + include("roscms/roscms_config.php"); + + // Browser Detection: + $userAgent = strtolower($_SERVER['HTTP_USER_AGENT']); + if ($is_opera = strchr($userAgent,"opera")) $is_opera = 1; + if ($is_saf = strchr($userAgent,"applewebkit") || $is_saf = strchr($userAgent,"apple computer, inc.")) $is_saf = 1; + if ($is_webtv = strchr($userAgent,"webtv")) $is_webtv = 1; + if ($is_ie = strchr($userAgent,"msie") && (!$is_opera) && (!$is_webtv)) $is_ie = 1; + if (($is_ie) && $is_ie4 = strchr($userAgent,"msie 4.")) $is_ie4 = 1; + if ($is_moz = strchr($userAgent,"gecko") && (!$is_saf)) $is_moz = 1; + if (($is_moz) && $is_mozff = strchr($userAgent,"firefox")) $is_mozff = 1; + if ($is_kon = strchr($userAgent,"konqueror")) $is_kon = 1; + if ($is_ns = strchr($userAgent,"compatible") && $is_ns = strchr($userAgent,"mozilla") && (!$is_ie) && (!$is_opera) && (!$is_webtv) && (!$is_saf)) $is_ns = 1; + + session_start(); + + $roscms_page_format = ".html"; + + // Language detection + function check_lang($lang) + { + if (preg_match('/^([a-zA-Z]+)(-[a-zA-Z]+)?$/', $lang, $matches)) { + $checked_lang = strtolower($matches[1]); + switch($checked_lang) { + case 'ar': + case 'bg': + case 'ca': + case 'cz': + case 'da': + case 'de': + case 'el': + case 'en': + case 'es': + case 'fr': + case 'he': + case 'hu': + case 'id': + case 'it': + case 'ja': + case 'ko': + case 'lt': + case 'nl': + case 'no': + case 'pl': + case 'pt': + case 'ru': + case 'sv': + case 'uk': + case 'zh': + case 'ro': + case 'tw': + case 'sk': + case 'vi': + break; + default: + $checked_lang = ''; + } + } + else if ($lang == '*') { + $checked_lang = 'en'; + } + else { + $checked_lang = ''; + } + + return $checked_lang; + } + + if (array_key_exists("page", $_GET)) $rpm_page=htmlspecialchars($_GET["page"]); + $rpm_lang = check_lang($_REQUEST['lang']); + if (array_key_exists("forma", $_GET)) $rpm_forma=htmlspecialchars($_GET["forma"]); + if (array_key_exists("format", $_GET)) $rpm_forma=htmlspecialchars($_GET["format"]); + if (array_key_exists("skin", $_GET)) $rpm_skin=htmlspecialchars($_GET["skin"]); + + + if ($rpm_lang == '' && isset($_COOKIE['roscms_usrset_lang'])) { + $rpm_lang = $_COOKIE['roscms_usrset_lang']; + if (substr($rpm_lang, -1) == '/') { + $rpm_lang = substr($rpm_lang, strlen($rpm_lang) - 1); + } + $rpm_lang = check_lang($rpm_lang); + } + + if ($rpm_lang == '') { + /* After parameter and cookie processing, we still don't have a valid + language. So check whether the HTTP Accept-language header can + help us. */ + $accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE']; + $best_q = 0; + while (preg_match('/^\s*([^,]+)((,(.*))|$)/', + $accept_language, $matches)) { + $lang_range = $matches[1]; + $accept_language = $matches[4]; + if (preg_match('/^(([a-zA-Z]+)(-[a-zA-Z]+)?)(;q=([0-1](\.[0-9]{1,3})?))?/', + $lang_range, $matches)) { + $lang = check_lang($matches[1]); + if ($lang != '') { + $q = $matches[5]; + if ($q == "") { + $q = 1; + } + else { + settype($q, 'float'); + } + if ($best_q < $q) { + $rpm_lang = $lang; + $best_q = $q; + } + } + } + } + } + if ($rpm_lang == '') { + /* If all else fails, use the default language */ + $rpm_lang = check_lang('*'); + } + + $roscms_page_lang = $rpm_lang . '/'; + + + $rpm_pic = ""; + if (array_key_exists("pic", $_GET)) $rpm_pic=htmlspecialchars($_GET["pic"]); + + + switch ($rpm_page) { + case "home": + case "index": + default: // Frontpage + if ($rpm_pic == "/reactos.gif") { + require("stats/stats.php"); // stats + exit; + } + else { + $roscms_page_content = "index"; + } + break; + case "cms": // CMS Interface + case "roscms": + $roscms_page_content = "roscms/?page=home"; + $roscms_page_format = ""; + $roscms_page_lang = ""; + break; + case "admin": + $roscms_page_content = "roscms/?page=admin"; + $roscms_page_format = ""; + $roscms_page_lang = ""; + break; + case "support": + $roscms_page_content = "support/"; + $roscms_page_format = ""; + $roscms_page_lang = ""; + break; + case "development": + $roscms_page_content = "development"; + break; + case "community": + $roscms_page_content = "community"; + break; + case "info": + $roscms_page_content = "info"; + break; + case "download": + $roscms_page_content = "download"; + break; + } + + if ($rpm_page && $roscms_page_content == "index") { + $roscms_page_content = $rpm_page; + } + + + if (isset($_COOKIE['roscms_usrset_lang']) || isset($_REQUEST['lang'])) { + /* Delete an existing cookie (if any) which uses the full hostname */ + setcookie('roscms_usrset_lang', '', -3600); + /* Add cookie using just the domain name */ + require_once('roscms/inc/utils.php'); + setcookie('roscms_usrset_lang', $rpm_lang, time() + 5 * 30 * 24 * 3600, + '/', cookie_domain()); + } + + header("Location: " . $roscms_page_lang . $roscms_page_content . $roscms_page_format); +?> Propchange: trunk/web/reactos.org/htdocs/index.php ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/web/reactos.org/htdocs/roscms/lang.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/lang… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/lang.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/lang.php [iso-8859-1] Tue Sep 16 12:50:12 2008 @@ -34,6 +34,7 @@ case 'ro': case 'tw': case 'sk': + case 'vi': break; default: $checked_lang = '';

1 0

[gedmurphy] 36269: - Starting from the top, add a brand new top level network library, written by Alex and taken from his original network rewrite branch. A _huge_ improvement on our existing library with proper provider and catalog support. - Make the lib both GCC and MSVC friendly. - It won't build yet as it will rely on a rewrite of the network headers
by gedmurphy＠svn.reactos.org 16 Sep '08

16 Sep '08

Author: gedmurphy Date: Tue Sep 16 11:41:18 2008 New Revision: 36269 URL: http://svn.reactos.org/svn/reactos?rev=36269&view=rev Log: - Starting from the top, add a brand new top level network library, written by Alex and taken from his original network rewrite branch. A _huge_ improvement on our existing library with proper provider and catalog support. - Make the lib both GCC and MSVC friendly. - It won't build yet as it will rely on a rewrite of the network headers Added: branches/umode-network-branch/dll/win32/ws2_32/inc/ (with props) branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32.h (with props) branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h (with props) branches/umode-network-branch/dll/win32/ws2_32/src/ (with props) branches/umode-network-branch/dll/win32/ws2_32/src/addrconv.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/addrinfo.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/async.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/bhook.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/dcatalog.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/dcatitem.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/dllmain.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/dprocess.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/dprovide.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/dsocket.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/dthread.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/dupsock.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/enumprot.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/event.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/getproto.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/getxbyxx.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/ioctl.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/nscatalo.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/nscatent.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/nspinstl.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/nsprovid.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/nsquery.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/qos.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/qshelpr.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/rasdial.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/recv.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/rnr.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/scihlpr.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/select.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/send.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/sockctrl.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/socklife.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/spinstal.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/sputil.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/startup.c (with props) branches/umode-network-branch/dll/win32/ws2_32/src/wsautil.c (with props) Removed: branches/umode-network-branch/dll/win32/ws2_32/include/ branches/umode-network-branch/dll/win32/ws2_32/misc/ branches/umode-network-branch/dll/win32/ws2_32/tests/ Modified: branches/umode-network-branch/dll/win32/ws2_32/ws2_32.rbuild branches/umode-network-branch/dll/win32/ws2_32/ws2_32.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/addrconv.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/async.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/bhook.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/dcatalog.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/dcatitem.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/dprocess.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/dprovide.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/dsocket.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/dthread.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/dupsock.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/enumprot.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/event.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/getproto.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/getxbyxx.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/ioctl.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/nscatalo.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/nscatent.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/nspinstl.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/nsprovid.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/nsquery.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/qos.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/qshelpr.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/rasdial.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/recv.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/rnr.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/scihlpr.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/select.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/send.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/sockctrl.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/socklife.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/spinstal.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/sputil.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/startup.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Added: branches/umode-network-branch/dll/win32/ws2_32/src/wsautil.c URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Modified: branches/umode-network-branch/dll/win32/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… Modified: branches/umode-network-branch/dll/win32/ws2_32/ws2_32.rc URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/…

1 0

[janderwald] 36268: - add IID_INetConnectionConnectUi
by janderwald＠svn.reactos.org 16 Sep '08

16 Sep '08

Author: janderwald Date: Tue Sep 16 09:44:42 2008 New Revision: 36268 URL: http://svn.reactos.org/svn/reactos?rev=36268&view=rev Log: - add IID_INetConnectionConnectUi Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=36… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Tue Sep 16 09:44:42 2008 @@ -103,6 +103,7 @@ DEFINE_GUID(IID_IEnumNetConnection, 0xC08956A0,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetConnection, 0xC08956A1,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetConnectionManager, 0xC08956A2,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); +DEFINE_GUID(IID_INetConnectionConnectUi, 0xC08956A3,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetConnectionPropertyUi, 0xC08956A4,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_INetLanConnectionUiInfo, 0xC08956A6,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); DEFINE_GUID(IID_IEnumNetCfgComponent, 0xC0E8AE92,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E);

1 0

[cfinck] 36267: Fix some mistakes detected by a true XML parser
by cfinck＠svn.reactos.org 16 Sep '08

16 Sep '08

Author: cfinck Date: Tue Sep 16 09:29:21 2008 New Revision: 36267 URL: http://svn.reactos.org/svn/reactos?rev=36267&view=rev Log: Fix some mistakes detected by a true XML parser Modified: trunk/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild trunk/rosapps/applications/sysutils/chklib/chklib.rbuild Modified: trunk/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/chkd… ============================================================================== --- trunk/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild [iso-8859-1] Tue Sep 16 09:29:21 2008 @@ -1,6 +1,6 @@ <module name="chkdsk" type="win32cui" installbase="system32" installname="chkdsk.exe" allowwarnings="true" unicode="yes"> <include base="reactos">include/reactos/libs/fmifs</include> - <include base="chkdsk>..</include> + <include base="chkdsk">..</include> <library>fmifs</library> <library>win32err</library> Modified: trunk/rosapps/applications/sysutils/chklib/chklib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/chkl… ============================================================================== --- trunk/rosapps/applications/sysutils/chklib/chklib.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/chklib/chklib.rbuild [iso-8859-1] Tue Sep 16 09:29:21 2008 @@ -1,5 +1,5 @@ <module name="chklib" type="win32cui" installbase="system32" installname="chklib.exe" allowwarnings="true"> - <include base="chklib>..</include> + <include base="chklib">..</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define>

1 0

[sginsberg] 36266: - EngCreateEvent: Don't allocate with zero tag - EngAllocMem: Make sure we get a tag - Misc cleanup
by sginsberg＠svn.reactos.org 16 Sep '08

16 Sep '08

Author: sginsberg Date: Tue Sep 16 06:57:24 2008 New Revision: 36266 URL: http://svn.reactos.org/svn/reactos?rev=36266&view=rev Log: - EngCreateEvent: Don't allocate with zero tag - EngAllocMem: Make sure we get a tag - Misc cleanup Modified: branches/nwin32/subsystems/win32/win32k/eng/engevent.c branches/nwin32/subsystems/win32/win32k/eng/engmem.c branches/nwin32/subsystems/win32/win32k/eng/engrtl.c Modified: branches/nwin32/subsystems/win32/win32k/eng/engevent.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engevent.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/eng/engevent.c [iso-8859-1] Tue Sep 16 06:57:24 2008 @@ -12,28 +12,33 @@ #define NDEBUG #include <debug.h> +#define TAG_ENG TAG('E', 'n', 'g', ' ') + /* PUBLIC FUNCTIONS **********************************************************/ BOOL APIENTRY EngCreateEvent(OUT PEVENT* Event) { + PKEVENT LocalEvent; + /* Allocate memory for the event */ - *Event = EngAllocMem(FL_NONPAGED_MEMORY, - sizeof(KEVENT), - 0); + LocalEvent = EngAllocMem(FL_NONPAGED_MEMORY, + sizeof(KEVENT), + TAG_ENG); /* Check if we are out of memory */ - if (!*Event) + if (!LocalEvent) { /* We are, fail */ return FALSE; } - /* Initialize the event */ - KeInitializeEvent((PKEVENT)*Event, + /* Initialize the event and return it */ + KeInitializeEvent(LocalEvent, SynchronizationEvent, FALSE); + *Event = (PEVENT)LocalEvent; /* Return success */ return TRUE; @@ -43,10 +48,8 @@ APIENTRY EngDeleteEvent(IN PEVENT Event) { - /* Free the event */ + /* Just free the event */ EngFreeMem(Event); - - /* Return success */ return TRUE; } @@ -86,8 +89,9 @@ { PKEVENT Event; NTSTATUS Status; - - /* FIXME: Should we do anything with the reserved parameters? */ + + /* Assume failure */ + Event = NULL; /* Reference the object */ Status = ObReferenceObjectByHandle(hUserObject, @@ -114,10 +118,8 @@ APIENTRY EngUnmapEvent(IN PEVENT Event) { - /* Dereference the event */ + /* Just dereference the event */ ObDereferenceObject(Event); - - /* Return success */ return TRUE; } Modified: branches/nwin32/subsystems/win32/win32k/eng/engmem.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engmem.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/eng/engmem.c [iso-8859-1] Tue Sep 16 06:57:24 2008 @@ -22,6 +22,9 @@ { PVOID AllocatedMemory; POOL_TYPE AllocationType; + + /* Make sure we get a tag */ + ASSERT(Tag != 0); /* Get the requested pool type */ AllocationType = (Flags & FL_NONPAGED_MEMORY) ? NonPagedPool : PagedPool; Modified: branches/nwin32/subsystems/win32/win32k/eng/engrtl.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/eng/engrtl.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/eng/engrtl.c [iso-8859-1] Tue Sep 16 06:57:24 2008 @@ -25,12 +25,11 @@ VOID APIENTRY -EngMultiByteToUnicodeN( - OUT LPWSTR UnicodeString, - IN ULONG MaxBytesInUnicodeString, - OUT PULONG BytesInUnicodeString, - IN PCHAR MultiByteString, - IN ULONG BytesInMultiByteString) +EngMultiByteToUnicodeN(OUT LPWSTR UnicodeString, + IN ULONG MaxBytesInUnicodeString, + OUT PULONG BytesInUnicodeString, + IN PCHAR MultiByteString, + IN ULONG BytesInMultiByteString) { /* Call Rtl */ RtlMultiByteToUnicodeN(UnicodeString,

1 0

[gedmurphy] 36265: umode network rewrite branch for the 0.4 series
by gedmurphy＠svn.reactos.org 16 Sep '08

16 Sep '08

Author: gedmurphy Date: Tue Sep 16 06:16:35 2008 New Revision: 36265 URL: http://svn.reactos.org/svn/reactos?rev=36265&view=rev Log: umode network rewrite branch for the 0.4 series Added: branches/umode-network-branch/ - copied from r36264, trunk/reactos/

1 0

[arty] 36264: Added for ease of use.
by arty＠svn.reactos.org 16 Sep '08

16 Sep '08

Author: arty Date: Tue Sep 16 03:18:44 2008 New Revision: 36264 URL: http://svn.reactos.org/svn/reactos?rev=36264&view=rev Log: Added for ease of use. Added: trunk/tools/reactosdbg/dbghelptest/libdbghelp.a (with props) Added: trunk/tools/reactosdbg/dbghelptest/libdbghelp.a URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/dbghelptest/libdb… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/reactosdbg/dbghelptest/libdbghelp.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[sginsberg] 36263: - Implement IoSetFileOrigin
by sginsberg＠svn.reactos.org 15 Sep '08

15 Sep '08

Author: sginsberg Date: Mon Sep 15 12:47:16 2008 New Revision: 36263 URL: http://svn.reactos.org/svn/reactos?rev=36263&view=rev Log: - Implement IoSetFileOrigin Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Mon Sep 15 12:47:16 2008 @@ -2418,15 +2418,38 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI IoSetFileOrigin(IN PFILE_OBJECT FileObject, IN BOOLEAN Remote) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status = STATUS_SUCCESS; + BOOLEAN FlagSet; + + /* Get the flag status */ + FlagSet = FileObject->Flags & FO_REMOTE_ORIGIN ? TRUE : FALSE; + + /* Don't set the flag if it was set already, and don't remove it if it wasn't set */ + if (Remote && !FlagSet) + { + /* Set the flag */ + FileObject->Flags |= FO_REMOTE_ORIGIN; + } + else if (!Remote && FlagSet) + { + /* Remove the flag */ + FileObject->Flags &= ~FO_REMOTE_ORIGIN; + } + else + { + /* Fail */ + Status = STATUS_INVALID_PARAMETER_MIX; + } + + /* Return status */ + return Status; } /*

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