Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 30127: - implement renaming of MyComputer object - doesnot work yet because ISF_Desktop_fnSetNameOf is _not_ implemented See issue #376 for more details.
by janderwald＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: janderwald Date: Sun Nov 4 22:28:55 2007 New Revision: 30127 URL: http://svn.reactos.org/svn/reactos?rev=30127&view=rev Log: - implement renaming of MyComputer object - doesnot work yet because ISF_Desktop_fnSetNameOf is _not_ implemented See issue #376 for more details. Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.c Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_mycomp.c (original) +++ trunk/reactos/dll/win32/shell32/shfldr_mycomp.c Sun Nov 4 22:28:55 2007 @@ -61,6 +61,7 @@ /* both paths are parsible from the desktop */ LPITEMIDLIST pidlRoot; /* absolute pidl */ + LPWSTR sName; } IGenericSFImpl; static const IShellFolder2Vtbl vt_ShellFolder2; @@ -102,7 +103,8 @@ HRESULT WINAPI ISF_MyComputer_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) { IGenericSFImpl *sf; - + DWORD dwSize; + WCHAR szName[100]; TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); if (!ppv) @@ -123,6 +125,24 @@ { IUnknown_Release (_IUnknown_ (sf)); return E_NOINTERFACE; + } + + dwSize = sizeof(szName); + if (RegGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CLSID\\{20D04FE0-3AEA-1069-A2D8-08002B30309D}", + NULL, + RRF_RT_REG_SZ, + NULL, + szName, + &dwSize) == ERROR_SUCCESS) + { + szName[MAX_PATH-1] = 0; + sf->sName = SHAlloc((strlenW(szName)+1) * sizeof(WCHAR)); + if (sf->sName) + { + lstrcpyW( sf->sName, szName ); + } + TRACE("sName %s\n", debugstr_w(sf->sName)); } TRACE ("--(%p)\n", sf); @@ -649,7 +669,13 @@ else { /* user friendly name */ - HCR_GetClassNameW (clsid, pszPath, MAX_PATH); + + if (_ILIsMyComputer(pidl) && This->sName) + strcpyW(pszPath, This->sName); + else + HCR_GetClassNameW (clsid, pszPath, MAX_PATH); + + TRACE("pszPath %s\n", debugstr_w(pszPath)); } } else @@ -722,9 +748,45 @@ LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) { IGenericSFImpl *This = (IGenericSFImpl *)iface; - FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, + LPWSTR sName; + HKEY hKey; + UINT length; + + TRACE ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); - return E_FAIL; + + if (pPidlOut != NULL) + { + *pPidlOut = _ILCreateMyComputer(); + } + + length = (strlenW(lpName)+1) * sizeof(WCHAR); + sName = SHAlloc(length); + + if (!sName) + { + return E_OUTOFMEMORY; + } + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CLSID\\{20D04FE0-3AEA-1069-A2D8-08002B30309D}", + 0, + KEY_WRITE, + &hKey) != ERROR_SUCCESS) + { + WARN("Error: failed to open registry key\n"); + } + else + { + RegSetValueExW(hKey, NULL, 0, REG_SZ, (const LPBYTE)lpName, length); + RegCloseKey(hKey); + } + + lstrcpyW(sName, lpName); + SHFree(This->sName); + This->sName = sName; + TRACE("result %s\n", debugstr_w(This->sName)); + return S_OK; } static HRESULT WINAPI ISF_MyComputer_fnGetDefaultSearchGUID (

1 0

[janderwald] 30126: - add registry setting to support changing desktop object name - uncomment fileext setting
by janderwald＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: janderwald Date: Sun Nov 4 21:26:24 2007 New Revision: 30126 URL: http://svn.reactos.org/svn/reactos?rev=30126&view=rev Log: - add registry setting to support changing desktop object name - uncomment fileext setting Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Sun Nov 4 21:26:24 2007 @@ -47,7 +47,8 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders",,0x00000012 -;HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\FileExts",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\FileExts",,0x00000012 +HKCU,"Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{20D04FE0-3AEA-1069-A2D8-08002B30309D}",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows NT",,0x00000012

1 0

[greatlrd] 30125: start remove stuff got home made stuff or base on wine dx add global file version of dx dll.
by greatlrd＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: greatlrd Date: Sun Nov 4 20:50:09 2007 New Revision: 30125 URL: http://svn.reactos.org/svn/reactos?rev=30125&view=rev Log: start remove stuff got home made stuff or base on wine dx add global file version of dx dll. Removed: branches/reactx/reactos/dll/directx/devenum/ branches/reactx/reactos/dll/directx/dinput/ branches/reactx/reactos/dll/directx/dplay/ Modified: branches/reactx/reactos/dll/directx/d3d8/d3d8.rc branches/reactx/reactos/dll/directx/d3d8thk/d3d8thk.rc branches/reactx/reactos/dll/directx/d3d9/d3d9.rc branches/reactx/reactos/dll/directx/ddraw/ddraw.rc Modified: branches/reactx/reactos/dll/directx/d3d8/d3d8.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/d3d8… ============================================================================== --- branches/reactx/reactos/dll/directx/d3d8/d3d8.rc (original) +++ branches/reactx/reactos/dll/directx/d3d8/d3d8.rc Sun Nov 4 20:50:09 2007 @@ -5,9 +5,6 @@ #define REACTOS_STR_INTERNAL_NAME "d3d8\0" #define REACTOS_STR_ORIGINAL_FILENAME "d3d8.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc> Modified: branches/reactx/reactos/dll/directx/d3d8thk/d3d8thk.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/d3d8… ============================================================================== --- branches/reactx/reactos/dll/directx/d3d8thk/d3d8thk.rc (original) +++ branches/reactx/reactos/dll/directx/d3d8thk/d3d8thk.rc Sun Nov 4 20:50:09 2007 @@ -3,9 +3,6 @@ #define REACTOS_STR_INTERNAL_NAME "d3d8thk\0" #define REACTOS_STR_ORIGINAL_FILENAME "d3d8thk.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc> Modified: branches/reactx/reactos/dll/directx/d3d9/d3d9.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/d3d9… ============================================================================== --- branches/reactx/reactos/dll/directx/d3d9/d3d9.rc (original) +++ branches/reactx/reactos/dll/directx/d3d9/d3d9.rc Sun Nov 4 20:50:09 2007 @@ -5,9 +5,6 @@ #define REACTOS_STR_INTERNAL_NAME "d3d9\0" #define REACTOS_STR_ORIGINAL_FILENAME "d3d9.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc> Modified: branches/reactx/reactos/dll/directx/ddraw/ddraw.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/ddraw.rc (original) +++ branches/reactx/reactos/dll/directx/ddraw/ddraw.rc Sun Nov 4 20:50:09 2007 @@ -5,9 +5,6 @@ #define REACTOS_STR_INTERNAL_NAME "ddraw\0" #define REACTOS_STR_ORIGINAL_FILENAME "ddraw.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc>

1 0

[greatlrd] 30124: global header for directx version info for the rc file.
by greatlrd＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: greatlrd Date: Sun Nov 4 20:43:50 2007 New Revision: 30124 URL: http://svn.reactos.org/svn/reactos?rev=30124&view=rev Log: global header for directx version info for the rc file. Added: branches/reactx/reactos/include/reactos/reactx.h (with props) Added: branches/reactx/reactos/include/reactos/reactx.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/reactx.h (added) +++ branches/reactx/reactos/include/reactos/reactx.h Sun Nov 4 20:43:50 2007 @@ -1,0 +1,4 @@ +#define REACTOS_FILEVERSION 5,3,0,900 +#define REACTOS_STR_FILE_VERSION "5.3.0.900" +#define REACTOS_PRODUCTVERSION 5,3,0,900 +#define REACTOS_STR_PRODUCT_VERSION "5.3" Propchange: branches/reactx/reactos/include/reactos/reactx.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 30123: start remove stuff got home made stuff or base on wine dx
by greatlrd＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: greatlrd Date: Sun Nov 4 20:33:57 2007 New Revision: 30123 URL: http://svn.reactos.org/svn/reactos?rev=30123&view=rev Log: start remove stuff got home made stuff or base on wine dx Removed: branches/reactx/reactos/dll/directx/dsound/ branches/reactx/reactos/dll/directx/dxdiagn/ branches/reactx/reactos/dll/directx/wine/ Modified: branches/reactx/reactos/dll/directx/directx.rbuild Modified: branches/reactx/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/dire… ============================================================================== --- branches/reactx/reactos/dll/directx/directx.rbuild (original) +++ branches/reactx/reactos/dll/directx/directx.rbuild Sun Nov 4 20:33:57 2007 @@ -4,35 +4,5 @@ <directory name="d3d8thk"> <xi:include href="d3d8thk/d3d8thk.rbuild" /> </directory> - <directory name="devenum"> - <xi:include href="devenum/devenum.rbuild" /> - </directory> - <directory name="ddraw"> - <xi:include href="ddraw/ddraw.rbuild" /> - </directory> - <directory name="dinput"> - <xi:include href="dinput/dinput.rbuild" /> - </directory> - <directory name="dinput8"> - <xi:include href="dinput8/dinput8.rbuild" /> - </directory> - <directory name="dplay"> - <xi:include href="dplay/dplay.rbuild" /> - </directory> - <directory name="dplayx"> - <xi:include href="dplayx/dplayx.rbuild" /> - </directory> - <directory name="dsound"> - <xi:include href="dsound/dsound.rbuild" /> - </directory> - <directory name="dxdiagn"> - <xi:include href="dxdiagn/dxdiagn.rbuild" /> - </directory> - - <directory name="wine"> - <xi:include href="wine/wine.rbuild" /> - </directory> - <directory name="d3d9"> - <xi:include href="d3d9/d3d9.rbuild" /> - </directory> + </group>

1 0

[janderwald] 30122: - check if group policy is active - in this case check if the shell extension has been registered as approved and only accept it if it is listed
by janderwald＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: janderwald Date: Sun Nov 4 20:07:40 2007 New Revision: 30122 URL: http://svn.reactos.org/svn/reactos?rev=30122&view=rev Log: - check if group policy is active - in this case check if the shell extension has been registered as approved and only accept it if it is listed Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Sun Nov 4 20:07:40 2007 @@ -80,7 +80,7 @@ } ItemCmImpl; UINT -SH_EnumerateDynamicContextHandlerForKey(LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj); +SH_EnumerateDynamicContextHandlerForKey(LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj, DWORD bGroupPolicyActive); WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls); WCHAR *strdupW(LPWSTR str); static const IContextMenu2Vtbl cmvt; @@ -310,9 +310,22 @@ UINT idCmdFirst = 0x6000; UINT idCmdLast = 0xFFF0; PDynamicShellEntry curEntry; + DWORD bGroupPolicyActive = FALSE; + DWORD dwSize; static WCHAR szAny[] = { '*',0}; - SH_EnumerateDynamicContextHandlerForKey(szAny, This, pDataObj); + dwSize = sizeof(DWORD); + RegGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer", + L"EnforceShellExtensionSecurity", + RRF_RT_DWORD, + NULL, + &bGroupPolicyActive, + &dwSize); + + + + SH_EnumerateDynamicContextHandlerForKey(szAny, This, pDataObj, bGroupPolicyActive); for (i = 0; i < This->cidl; i++) { @@ -326,7 +339,7 @@ if (hr == S_OK) { memcpy(&buffer[6], pwszCLSID, 38 * sizeof(WCHAR)); - SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj); + SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj, bGroupPolicyActive); } } @@ -335,7 +348,7 @@ ebuf[0] = L'.'; buffer[0] = L'\0'; if (MultiByteToWideChar(CP_ACP, 0, ebuf, -1, buffer, 111)) - SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj); + SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj, bGroupPolicyActive); } } TRACE("-- done loading\n"); @@ -1159,7 +1172,7 @@ } UINT -SH_EnumerateDynamicContextHandlerForKey(const LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj) +SH_EnumerateDynamicContextHandlerForKey(const LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj, DWORD bGroupPolicyActive) { HKEY hKey; WCHAR szKey[MAX_PATH] = {0}; @@ -1191,18 +1204,53 @@ if (res == ERROR_SUCCESS) { hResult = CLSIDFromString(szName, &clsid); - if (hResult != NOERROR) + if (hResult != S_OK) { dwName = MAX_PATH; if (RegGetValueW(hKey, szName, NULL, RRF_RT_REG_SZ, NULL, szKey, &dwName) == ERROR_SUCCESS) { - hResult = CLSIDFromString(szKey, &clsid); + if (CLSIDFromString(szKey, &clsid) == S_OK) + { + if (bGroupPolicyActive) + { + if (RegGetValueW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", + szKey, + RRF_RT_REG_SZ, + NULL, + NULL, + &dwName) == ERROR_SUCCESS) + { + SH_LoadDynamicContextMenuHandler(hKey, &clsid, This, pDataObj); + } + + } + else + { + SH_LoadDynamicContextMenuHandler(hKey, &clsid, This, pDataObj); + } + } } } - TRACE("hResult %x szKey %s name %s\n",hResult, debugstr_w(szKey), debugstr_w(szName)); if (hResult == S_OK) { - SH_LoadDynamicContextMenuHandler(hKey, &clsid, This, pDataObj); + if (bGroupPolicyActive) + { + if (RegGetValueW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", + szKey, + RRF_RT_REG_SZ, + NULL, + NULL, + &dwName) == ERROR_SUCCESS) + { + SH_LoadDynamicContextMenuHandler(hKey, &clsid, This, pDataObj); + } + } + else + { + SH_LoadDynamicContextMenuHandler(hKey, &clsid, This, pDataObj); + } } } dwIndex++;

1 0

[greatlrd] 30121: Fill in more info in the lockup tables.
by greatlrd＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: greatlrd Date: Sun Nov 4 19:49:20 2007 New Revision: 30121 URL: http://svn.reactos.org/svn/reactos?rev=30121&view=rev Log: Fill in more info in the lockup tables. Modified: branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h Modified: branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h (original) +++ branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h Sun Nov 4 19:49:20 2007 @@ -57,8 +57,10 @@ 0, // DD_DXAPI_OPENDIRECTDRAW 0, // DD_DXAPI_OPENSURFACE 0, // DD_DXAPI_OPENVIDEOPORT - 0, // DD_DXAPI_GETKERNELCAPS - 0, // DD_DXAPI_GET_VP_FIELD_NUMBER + /* DD_DXAPI_GETKERNELCAPS */ + sizeof(HANDLE), + /* DD_DXAPI_GET_VP_FIELD_NUMBER */ + sizeof(DDGETFIELDNUMIN), 0, // DD_DXAPI_SET_VP_FIELD_NUMBER 0, // DD_DXAPI_SET_VP_SKIP_FIELD 0, // DD_DXAPI_GET_SURFACE_STATE @@ -95,8 +97,10 @@ 0, // DD_DXAPI_OPENDIRECTDRAW 0, // DD_DXAPI_OPENSURFACE 0, // DD_DXAPI_OPENVIDEOPORT - 0, // DD_DXAPI_GETKERNELCAPS - 0, // DD_DXAPI_GET_VP_FIELD_NUMBER + /* DD_DXAPI_GETKERNELCAPS */ + sizeof(DDGETKERNELCAPSOUT), + /* DD_DXAPI_GET_VP_FIELD_NUMBER */ + sizeof(DDGETFIELDNUMOUT), 0, // DD_DXAPI_SET_VP_FIELD_NUMBER 0, // DD_DXAPI_SET_VP_SKIP_FIELD 0, // DD_DXAPI_GET_SURFACE_STATE

1 0

[greatlrd] 30120: Implement DxGetVersionNumber comment up some functions that are implement.
by greatlrd＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: greatlrd Date: Sun Nov 4 19:23:11 2007 New Revision: 30120 URL: http://svn.reactos.org/svn/reactos?rev=30120&view=rev Log: Implement DxGetVersionNumber comment up some functions that are implement. Modified: branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h branches/reactx/reactos/drivers/directx/dxapi/main.c Modified: branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h (original) +++ branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h Sun Nov 4 19:23:11 2007 @@ -24,7 +24,7 @@ #include <ddk/ddkmapi.h> /* Prototypes */ -VOID DxGetVersionNumber(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxGetVersionNumber(PVOID lpvInBuffer, LPDDGETVERSIONNUMBER lpvOutBuffer); VOID DxCloseHandle(PVOID lpvInBuffer, PVOID lpvOutBuffer); VOID DxOpenDirectDraw(PVOID lpvInBuffer, PVOID lpvOutBuffer); VOID DxOpenSurface(PVOID lpvInBuffer, PVOID lpvOutBuffer); Modified: branches/reactx/reactos/drivers/directx/dxapi/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxapi/main.c (original) +++ branches/reactx/reactos/drivers/directx/dxapi/main.c Sun Nov 4 19:23:11 2007 @@ -10,32 +10,7 @@ */ - -/* DDK/NDK/SDK Headers */ -/* DDK/NDK/SDK Headers */ -#include <ddk/ntddk.h> -#include <ddk/ntddmou.h> -#include <ddk/ntifs.h> -#include <ddk/tvout.h> -#include <ndk/ntndk.h> - - - -#include <stdarg.h> -#include <windef.h> -#include <winerror.h> -#include <wingdi.h> -#include <winddi.h> -#include <winuser.h> -#include <prntfont.h> -#include <dde.h> -#include <wincon.h> - -#include <ddk/ddkmapi.h> #include "dxapi_driver.h" - - - NTSTATUS DriverEntry(IN PVOID Context1, @@ -57,6 +32,19 @@ +/*++ +* @name DxApiGetVersion +* @implemented +* +* The function DxApiGetVersion return the dsound version, and it always return 4.02 +* +* @return +* Always return 4.02 +* +* @remarks. +* none +* +*--*/ ULONG DxApiGetVersion() { @@ -65,11 +53,49 @@ } -/* protype from dxapi.h and ddkmapi.h from ddk, MSDN does not provide protype for this api, only which - * functions it support, if u search in msdn you found full documations for each function - * for each functions. - */ - + +/*++ +* @name DxApi +* @implemented +* +* The function DxApi calls to diffent functions, follow functions +* are supported +* DxGetVersionNumber, DxCloseHandle, DxOpenDirectDraw, DxOpenSurface, +* DxOpenVideoPort, DxGetKernelCaps, DxGetFieldNumber, DxSetFieldNumber, +* DxSetSkipPattern, DxGetSurfaceState, DxSetSurfaceState, DxLock, +* DxFlipOverlay, DxFlipVideoPort, DxGetCurrentAutoflip, DxGetPreviousAutoflip, +* DxRegisterEvent, DxUnregisterEvent, DxGetPolarity, DxOpenVpCatureDevice, +* DxAddVpCaptureBuffer, DxFlushVpCaptureBuffs +* +* See ddkmapi.h as well + +* +* @param ULONG dwFunctionNum +* The function id we want call on in the dxapi.sys see ddkmapi.h for the id +* +* @param PVOID lpvInBuffer +* Our input buffer to the functions we call to, This param can be NULL +* +* @param ULONG cbInBuffer +* Our size in bytes of the input buffer, rember wrong size will result in the function +* does not being call. +* +* @param PVOID lpvOutBuffer +* Our Output buffer, there the function fill in the info, this param can not +* be null. if it null the functions we trying call on will not be call +* +* @param ULONG cbOutBuffer +* Our size in bytes of the output buffer, rember wrong size will result in the function +* does not being call. +* +* @return +* Return Always 0. +* +* @remarks. +* before call to any of this functions, do not forget set lpvOutBuffer->ddRVal = DDERR_GEN*, +* if that member exists in the outbuffer ; +* +*--*/ DWORD DxApi(ULONG dwFunctionNum, PVOID lpvInBuffer, @@ -92,14 +118,28 @@ } gDxApiEntryPoint[dwFunctionNum].pfn(lpvInBuffer, lpvOutBuffer); - return 0; } -VOID -DxGetVersionNumber(PVOID lpvInBuffer, PVOID lpvOutBuffer) -{ - /* FIXME Unimplement */ +/*++ +* @name DxGetVersionNumber +* @implemented +* +* The function DxGetVersionNumber return dxapi interface version, that is 1.0 +* +* @return +* Always return 1.0 +* +* @remarks. +* none +* +*--*/ +VOID +DxGetVersionNumber(PVOID lpvInBuffer, LPDDGETVERSIONNUMBER lpvOutBuffer) +{ + lpvOutBuffer->ddRVal = DD_OK; + lpvOutBuffer->dwMajorVersion = 1; + lpvOutBuffer->dwMinorVersion = 0; } VOID

1 0

[fireball] 30119: - Update msvcrt_winetest to Wine-04112007. - Disable test_codepage, since it causes internal GCC error during compiling.
by fireball＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: fireball Date: Sun Nov 4 18:54:33 2007 New Revision: 30119 URL: http://svn.reactos.org/svn/reactos?rev=30119&view=rev Log: - Update msvcrt_winetest to Wine-04112007. - Disable test_codepage, since it causes internal GCC error during compiling. Added: trunk/rostests/winetests/msvcrt/data.c (with props) trunk/rostests/winetests/msvcrt/headers.c (with props) Modified: trunk/rostests/winetests/msvcrt/cpp.c trunk/rostests/winetests/msvcrt/dir.c trunk/rostests/winetests/msvcrt/environ.c trunk/rostests/winetests/msvcrt/file.c trunk/rostests/winetests/msvcrt/heap.c trunk/rostests/winetests/msvcrt/msvcrt.rbuild trunk/rostests/winetests/msvcrt/printf.c trunk/rostests/winetests/msvcrt/scanf.c trunk/rostests/winetests/msvcrt/string.c trunk/rostests/winetests/msvcrt/testlist.c trunk/rostests/winetests/msvcrt/time.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/msvcrt/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/cpp.c?re… Added: trunk/rostests/winetests/msvcrt/data.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/data.c?r… Modified: trunk/rostests/winetests/msvcrt/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/dir.c?re… Modified: trunk/rostests/winetests/msvcrt/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/environ.… Modified: trunk/rostests/winetests/msvcrt/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/file.c?r… Added: trunk/rostests/winetests/msvcrt/headers.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/headers.… Modified: trunk/rostests/winetests/msvcrt/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/heap.c?r… Modified: trunk/rostests/winetests/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/msvcrt.r… Modified: trunk/rostests/winetests/msvcrt/printf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/printf.c… Modified: trunk/rostests/winetests/msvcrt/scanf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/scanf.c?… Modified: trunk/rostests/winetests/msvcrt/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/string.c… Modified: trunk/rostests/winetests/msvcrt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/testlist… Modified: trunk/rostests/winetests/msvcrt/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/time.c?r…

1 0

[fireball] 30118: - Add some defines from Wine.
by fireball＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: fireball Date: Sun Nov 4 18:53:24 2007 New Revision: 30118 URL: http://svn.reactos.org/svn/reactos?rev=30118&view=rev Log: - Add some defines from Wine. Modified: trunk/reactos/include/crt/mbctype.h Modified: trunk/reactos/include/crt/mbctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbctype.h?rev=… ============================================================================== --- trunk/reactos/include/crt/mbctype.h (original) +++ trunk/reactos/include/crt/mbctype.h Sun Nov 4 18:53:24 2007 @@ -36,15 +36,14 @@ #define _MB_CP_ANSI (-3) #define _MB_CP_LOCALE (-4) -/* TODO: bit masks */ -/* -#define _MS -#define _MP -#define _M1 -#define _M2 -#define _SBUP -#define _SBLOW -*/ +#define _MS 0x01 +#define _MP 0x02 +#define _M1 0x04 +#define _M2 0x08 + +#define _SBUP 0x10 +#define _SBLOW 0x20 + #ifndef RC_INVOKED

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