Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[khornicek] 37683: - sync wined3d, d3d8, d3d9 to wine HEAD part 1/2

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu Nov 27 03:20:16 2008 New Revision: 37683 URL: http://svn.reactos.org/svn/reactos?rev=37683&view=rev Log: - sync wined3d, d3d8, d3d9 to wine HEAD part 1/2 Modified: trunk/reactos/dll/directx/wine/d3d8/Makefile.in trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/vertexshader.c trunk/reactos/dll/directx/wine/d3d9/basetexture.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c trunk/reactos/dll/directx/wine/d3d9/pixelshader.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/resource.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/vertexshader.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/Makefile.in trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/clipper.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/indexbuffer.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexbuffer.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d.def trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/Make… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/base… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Modified: trunk/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/pixe… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/reso… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/wined3d/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/M… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/i… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w…

16 years

[greatlrd] 37682: convert parts of DdQueryDirectDrawObject (gdientry 2) to use wined3d. and fixing a hdc leak

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Nov 27 02:55:13 2008 New Revision: 37682 URL: http://svn.reactos.org/svn/reactos?rev=37682&view=rev Log: convert parts of DdQueryDirectDrawObject (gdientry 2) to use wined3d. and fixing a hdc leak Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Thu Nov 27 02:55:13 2008 @@ -1834,6 +1834,7 @@ GetDIBits(hdc, hbmp, 0, 0, NULL, pbmi, 0); DeleteObject(hbmp); pMasks = (DWORD*)(pbmiData + sizeof(BITMAPINFOHEADER)); + DeleteDC(hdc); /* End dectect RGB bit mask */ if (pHalInfo) @@ -1903,8 +1904,32 @@ // FIXME pHalInfo->ddCaps DDCORECAPS + RtlZeroMemory(&pHalInfo->ddCaps, sizeof(DDCORECAPS)); + pHalInfo->ddCaps.dwSize = sizeof(DDCORECAPS); + + // FIXME fill in with wined3d caps here */ + // WINED3DCAPS WineCaps; + //pWineD3d->GetDeviceCaps(0,&WineCaps); + + /* example value and member that need be fill in */ + // pHalInfo->ddCaps.dwCaps : 0x94427bc1 + // pHalInfo->ddCaps.dwCaps2 : 0x004afe78 + // pHalInfo->ddCaps.dwCKeyCaps : 0x0003a311 + // pHalInfo->ddCaps.dwFXCaps : 0x27f95420 + // pHalInfo->ddCaps.dwMaxVisibleOverlays : 0x00000001 + // pHalInfo->ddCaps.dwNumFourCCCodes : 0x0000001c + // pHalInfo->ddCaps.ddsCaps.dwCaps : 0x30c272fc + // pHalInfo->ddCaps.dwMinOverlayStretch : 0x00000020 + // pHalInfo->ddCaps.dwMaxOverlayStretch : 0x0007d000 + // pHalInfo->ddCaps.dwMinLiveVideoStretch : 0x00000020 + // pHalInfo->ddCaps.dwMaxLiveVideoStretch : 0x00003e80 + // pHalInfo->ddCaps.dwMinHwCodecStretch : 0x00000020 + // pHalInfo->ddCaps.dwMaxHwCodecStretch : 0x00003e80 + // pHalInfo->ddCaps.dwSVBCaps : 0x80000040 + /* always force rope 0x1000 for hal it mean only source copy is supported */ pHalInfo->ddCaps.dwRops[6] = 0x1000; + pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo;

16 years

[dchapyshev] 37681: - .DEF -> .SPEC - Add some stubs

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Thu Nov 27 02:40:47 2008 New Revision: 37681 URL: http://svn.reactos.org/svn/reactos?rev=37681&view=rev Log: - .DEF -> .SPEC - Add some stubs Added: trunk/reactos/dll/win32/secur32/secur32.spec (with props) trunk/reactos/dll/win32/security/security.spec (with props) Removed: trunk/reactos/dll/win32/secur32/secur32.def trunk/reactos/dll/win32/security/security.def Modified: trunk/reactos/dll/win32/secur32/secur32.rbuild trunk/reactos/dll/win32/secur32/sspi.c trunk/reactos/dll/win32/security/security.rbuild Removed: trunk/reactos/dll/win32/secur32/secur32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/secur32.def (removed) @@ -1,79 +1,0 @@ -LIBRARY SECUR32.DLL -EXPORTS -LsaRegisterLogonProcess@12 -LsaLogonUser@56 -LsaDeregisterLogonProcess@4 -LsaConnectUntrusted@4 -LsaLookupAuthenticationPackage@12 -LsaFreeReturnBuffer@4 -LsaCallAuthenticationPackage@28 -;AcceptSecurityContext@36 -AcquireCredentialsHandleA@36 -AcquireCredentialsHandleW@36 -;@AddCredentialsA -;@AddCredentialsW -;@AddSecurityPackageA -;@AddSecurityPackageW -;ApplyControlTokenA@8 -ApplyControlToken@8=ApplyControlTokenW@8 -CompleteAuthToken@8 -;@CredMarshalTargetInfo -;@CredUnmarshalTargetInfo -DecryptMessage@16 -DeleteSecurityContext@4 -;@DeleteSecurityPackageA -;@DeleteSecurityPackageW -EncryptMessage@16 -EnumerateSecurityPackagesA@8 -EnumerateSecurityPackagesW@8 -;@ExportSecurityContext -FreeContextBuffer@4 -FreeCredentialsHandle@4 -GetComputerObjectNameA@12 -GetComputerObjectNameW@12 -;GetSecurityUserInfo -GetUserNameExA@12 -GetUserNameExW@12 -;ImpersonateSecurityContext@4 -;@ImportSecurityContextA -;@ImportSecurityContextW -;@InitSecurityInterfaceA -InitSecurityInterfaceW@0 -InitializeSecurityContextA@48 -InitializeSecurityContextW@48 -LsaEnumerateLogonSessions@8 -LsaGetLogonSessionData@8 -LsaRegisterPolicyChangeNotification@8 -LsaUnregisterPolicyChangeNotification@8 -MakeSignature@16 -QueryContextAttributesA@12 -QueryContextAttributesW@12 -;QueryCredentialsAttributesA@12 -;QueryCredentialsAttributesW@12 -;@QuerySecurityContextToken -QuerySecurityPackageInfoA@8 -QuerySecurityPackageInfoW@8 -;RevertSecurityContext@4 -;@SaslAcceptSecurityContext -;@SaslEnumerateProfilesA -;@SaslEnumerateProfilesW -;@SaslGetProfilePackageA -;@SaslGetProfilePackageW -;@SaslIdentifyPackageA -;@SaslIdentifyPackageW -;@SaslInitializeSecurityContextA -;@SaslInitializeSecurityContextW -;SealMessage -;SecCacheSspiPackages -;SecDeleteUserModeContext -;SecGetLocaleSpecificEncryptionRules -;SecInitUserModeContext -;SecpFreeMemory -;SecpTranslateName -;SecpTranslateNameEx -;@SetContextAttributesA -;@SetContextAttributesW -;TranslateNameA@20 -;TranslateNameW@20 -;UnsealMessage -VerifySignature@16 Modified: trunk/reactos/dll/win32/secur32/secur32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/secur32.rbuild [iso-8859-1] Thu Nov 27 02:40:47 2008 @@ -1,5 +1,5 @@ <module name="secur32" type="win32dll" baseaddress="${BASEADDRESS_SECUR32}" installbase="system32" installname="secur32.dll"> - <importlibrary definition="secur32.def" /> + <importlibrary definition="secur32.spec" /> <include base="secur32">.</include> <include base="ReactOS">include/reactos/subsys</include> <define name="__SECUR32__" /> Added: trunk/reactos/dll/win32/secur32/secur32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.spec (added) +++ trunk/reactos/dll/win32/secur32/secur32.spec [iso-8859-1] Thu Nov 27 02:40:47 2008 @@ -1,0 +1,77 @@ +@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) +@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LsaDeregisterLogonProcess(long) +@ stdcall LsaConnectUntrusted(long) +@ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) +@ stdcall LsaFreeReturnBuffer(ptr) +@ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) +@ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) +@ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) +@ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) +@ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr) +@ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr) +@ stub AddSecurityPackageA +@ stub AddSecurityPackageW +@ stdcall ApplyControlTokenA(ptr ptr) +@ stdcall ApplyControlToken(ptr ptr) ApplyControlTokenW +@ stdcall CompleteAuthToken(ptr ptr) +@ stub CredMarshalTargetInfo +@ stub CredUnmarshalTargetInfo +@ stdcall DecryptMessage(ptr ptr long ptr) +@ stdcall DeleteSecurityContext(ptr) +@ stub DeleteSecurityPackageA +@ stub DeleteSecurityPackageW +@ stdcall EncryptMessage(ptr long ptr long) +@ stdcall EnumerateSecurityPackagesA(ptr ptr) +@ stdcall EnumerateSecurityPackagesW(ptr ptr) +@ stdcall ExportSecurityContext(ptr long ptr ptr) +@ stdcall FreeContextBuffer(ptr) +@ stdcall FreeCredentialsHandle(ptr) +@ stdcall GetComputerObjectNameA(long ptr ptr) +@ stdcall GetComputerObjectNameW(long ptr ptr) +@ stub GetSecurityUserInfo +@ stdcall GetUserNameExA(long ptr ptr) +@ stdcall GetUserNameExW(long ptr ptr) +@ stdcall ImpersonateSecurityContext(ptr) +@ stdcall ImportSecurityContextA(str ptr ptr ptr) +@ stdcall ImportSecurityContextW(wstr ptr ptr ptr) +@ stdcall InitSecurityInterfaceA() +@ stdcall InitSecurityInterfaceW() +@ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) +@ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) +@ stdcall LsaEnumerateLogonSessions(ptr ptr) +@ stdcall LsaGetLogonSessionData(ptr ptr) +@ stdcall LsaRegisterPolicyChangeNotification(long ptr) +@ stdcall LsaUnregisterPolicyChangeNotification(long ptr) +@ stdcall MakeSignature(ptr long ptr long) +@ stdcall QueryContextAttributesA(ptr long ptr) +@ stdcall QueryContextAttributesW(ptr long ptr) +@ stdcall QueryCredentialsAttributesA(ptr long ptr) +@ stdcall QueryCredentialsAttributesW(ptr long ptr) +@ stdcall QuerySecurityContextToken(ptr ptr) +@ stdcall QuerySecurityPackageInfoA(str ptr) +@ stdcall QuerySecurityPackageInfoW(wstr ptr) +@ stdcall RevertSecurityContext(ptr) +@ stub SaslAcceptSecurityContext +@ stub SaslEnumerateProfilesA +@ stub SaslEnumerateProfilesW +@ stub SaslGetProfilePackageA +@ stub SaslGetProfilePackageW +@ stub SaslIdentifyPackageA +@ stub SaslIdentifyPackageW +@ stub SaslInitializeSecurityContextA +@ stub SaslInitializeSecurityContextW +@ stdcall SealMessage(ptr long ptr long) EncryptMessage +@ stub SecCacheSspiPackages +@ stub SecDeleteUserModeContext +@ stub SecGetLocaleSpecificEncryptionRules +@ stub SecInitUserModeContext +@ stub SecpFreeMemory +@ stub SecpTranslateName +@ stub SecpTranslateNameEx +@ stub SetContextAttributesA +@ stub SetContextAttributesW +@ stdcall TranslateNameA(str long long ptr ptr) +@ stdcall TranslateNameW(wstr long long ptr ptr) +@ stdcall UnsealMessage(ptr ptr long ptr) DecryptMessage +@ stdcall VerifySignature(ptr ptr long ptr) Propchange: trunk/reactos/dll/win32/secur32/secur32.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?r… ============================================================================== --- trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] Thu Nov 27 02:40:47 2008 @@ -85,6 +85,15 @@ SECURITY_STATUS WINAPI ApplyControlTokenW(PCtxtHandle Handle, + PSecBufferDesc Buffer) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +ApplyControlTokenA(PCtxtHandle Handle, PSecBufferDesc Buffer) { DPRINT1("%s() not implemented!\n", __FUNCTION__); @@ -247,3 +256,185 @@ DPRINT1("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; } + +SECURITY_STATUS +WINAPI +AcceptSecurityContext( + PCredHandle phCredential, + PCtxtHandle phContext, + PSecBufferDesc pInput, + ULONG fContextReq, + ULONG TargetDataRep, + PCtxtHandle phNewContext, + PSecBufferDesc pOutput, + ULONG *pfContextAttr, + PTimeStamp ptsExpiry +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +AddCredentialsA( + PCredHandle hCredentials, + SEC_CHAR *pszPrincipal, + SEC_CHAR *pszPackage, + ULONG fCredentialUse, + LPVOID pAuthData, + SEC_GET_KEY_FN pGetKeyFn, + LPVOID pvGetKeyArgument, + PTimeStamp ptsExpiry +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +AddCredentialsW( + PCredHandle hCredentials, + SEC_WCHAR *pszPrincipal, + SEC_WCHAR *pszPackage, + ULONG fCredentialUse, + LPVOID pAuthData, + SEC_GET_KEY_FN pGetKeyFn, + LPVOID pvGetKeyArgument, + PTimeStamp ptsExpiry +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +ExportSecurityContext( + PCtxtHandle phContext, + ULONG fFlags, + PSecBuffer pPackedContext, + LPVOID *pToken +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +ImpersonateSecurityContext( + PCtxtHandle phContext +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +ImportSecurityContextA( + SEC_CHAR *pszPackage, + PSecBuffer pPackedContext, + LPVOID Token, + PCtxtHandle phContext +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +ImportSecurityContextW( + SEC_WCHAR *pszPackage, + PSecBuffer pPackedContext, + LPVOID Token, + PCtxtHandle phContext +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +QueryCredentialsAttributesA( + PCredHandle phCredential, + ULONG ulAttribute, + LPVOID pBuffer +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +QueryCredentialsAttributesW( + PCredHandle phCredential, + ULONG ulAttribute, + LPVOID pBuffer +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +QuerySecurityContextToken( + PCtxtHandle phContext, + PHANDLE phToken +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +RevertSecurityContext( + PCtxtHandle phContext +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +PSecurityFunctionTableA +WINAPI +InitSecurityInterfaceA(VOID) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return NULL; +} + +BOOLEAN +WINAPI +TranslateNameA( + LPCSTR lpAccountName, + EXTENDED_NAME_FORMAT AccountNameFormat, + EXTENDED_NAME_FORMAT DesiredNameFormat, + LPSTR lpTranslatedName, + PULONG nSize +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return FALSE; +} + +BOOLEAN +WINAPI +TranslateNameW( + LPCWSTR lpAccountName, + EXTENDED_NAME_FORMAT AccountNameFormat, + EXTENDED_NAME_FORMAT DesiredNameFormat, + LPWSTR lpTranslatedName, + PULONG nSize +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return FALSE; +} Removed: trunk/reactos/dll/win32/security/security.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/security/securit… ============================================================================== --- trunk/reactos/dll/win32/security/security.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/security/security.def (removed) @@ -1,79 +1,0 @@ -LIBRARY SECURITY.DLL -EXPORTS; -LsaRegisterLogonProcess(a)12=SECUR32.LsaRegisterLogonProcess -LsaLogonUser(a)56=SECUR32.LsaLogonUser -LsaDeregisterLogonProcess(a)4=SECUR32.LsaDeregisterLogonProcess -LsaConnectUntrusted(a)4=SECUR32.LsaConnectUntrusted -LsaLookupAuthenticationPackage(a)12=SECUR32.LsaLookupAuthenticationPackage -LsaFreeReturnBuffer(a)4=SECUR32.LsaFreeReturnBuffer -LsaCallAuthenticationPackage(a)28=SECUR32.LsaCallAuthenticationPackage -;AcceptSecurityContext(a)36=SECUR32.AcceptSecurityContext -;AcquireCredentialsHandleA(a)36=SECUR32.AcquireCredentialsHandleA -;AcquireCredentialsHandleW(a)36=SECUR32.AcquireCredentialsHandleW -;(a)AddCredentialsA=SECUR32.AddCredentialsA -;(a)AddCredentialsW=SECUR32.AddCredentialsW -;(a)AddSecurityPackageA=SECUR32.AddSecurityPackageA -;(a)AddSecurityPackageW=SECUR32.AddSecurityPackageW -;ApplyControlTokenA(a)8=SECUR32.ApplyControlTokenA -;ApplyControlTokenW(a)8=SECUR32.ApplyControlTokenW -;CompleteAuthToken(a)8=SECUR32.CompleteAuthToken -;(a)CredMarshalTargetInfo=SECUR32.CredMarshalTargetInfo -;(a)CredUnmarshalTargetInfo=SECUR32.CredUnmarshalTargetInfo -;DecryptMessage(a)16=SECUR32.DecryptMessage -;DeleteSecurityContext(a)4=SECUR32.DeleteSecurityContext -;(a)DeleteSecurityPackageA=SECUR32.DeleteSecurityPackageA -;(a)DeleteSecurityPackageW=SECUR32.DeleteSecurityPackageW -;EncryptMessage(a)16=SECUR32.EncryptMessage -EnumerateSecurityPackagesA(a)8=SECUR32.EnumerateSecurityPackagesA -EnumerateSecurityPackagesW(a)8=SECUR32.EnumerateSecurityPackagesW -;(a)ExportSecurityContext=SECUR32.ExportSecurityContext -FreeContextBuffer(a)4=SECUR32.FreeContextBuffer -;FreeCredentialsHandle(a)4=SECUR32.FreeCredentialsHandle -GetComputerObjectNameA(a)12=SECUR32.GetComputerObjectNameA -GetComputerObjectNameW(a)12=SECUR32.GetComputerObjectNameW -;GetSecurityUserInfo=SECUR32.GetSecurityUserInfo -GetUserNameExA(a)12=SECUR32.GetUserNameExA -GetUserNameExW(a)12=SECUR32.GetUserNameExW -;ImpersonateSecurityContext(a)4=SECUR32.ImpersonateSecurityContext -;(a)ImportSecurityContextA=SECUR32.ImportSecurityContextA -;(a)ImportSecurityContextW=SECUR32.ImportSecurityContextW -;(a)InitSecurityInterfaceA=SECUR32.InitSecurityInterfaceA -;(a)InitSecurityInterfaceW=SECUR32.InitSecurityInterfaceW -;InitializeSecurityContextA(a)48=SECUR32.InitializeSecurityContextA -;InitializeSecurityContextW(a)48=SECUR32.InitializeSecurityContextW -LsaEnumerateLogonSessions(a)8=SECUR32.LsaEnumerateLogonSessions -LsaGetLogonSessionData(a)8=SECUR32.LsaGetLogonSessionData -LsaRegisterPolicyChangeNotification(a)8=SECUR32.LsaRegisterPolicyChangeNotification -LsaUnregisterPolicyChangeNotification(a)8=SECUR32.LsaUnregisterPolicyChangeNotification -;MakeSignature(a)16=SECUR32.MakeSignature -;QueryContextAttributesA(a)12=SECUR32.QueryContextAttributesA -;QueryContextAttributesW(a)12=SECUR32.QueryContextAttributesW -;QueryCredentialsAttributesA(a)12=SECUR32.QueryCredentialsAttributesA -;QueryCredentialsAttributesW(a)12=SECUR32.QueryCredentialsAttributesW -;(a)QuerySecurityContextToken=SECUR32.QuerySecurityContextToken -;(a)QuerySecurityPackageInfoA=SECUR32.QuerySecurityPackageInfoA -;(a)QuerySecurityPackageInfoW=SECUR32.QuerySecurityPackageInfoW -;RevertSecurityContext(a)4=SECUR32.RevertSecurityContext -;(a)SaslAcceptSecurityContext=SECUR32.SaslAcceptSecurityContext -;(a)SaslEnumerateProfilesA=SECUR32.SaslEnumerateProfilesA -;(a)SaslEnumerateProfilesW=SECUR32.SaslEnumerateProfilesW -;(a)SaslGetProfilePackageA=SECUR32.SaslGetProfilePackageA -;(a)SaslGetProfilePackageW=SECUR32.SaslGetProfilePackageW -;(a)SaslIdentifyPackageA=SECUR32.SaslIdentifyPackageA -;(a)SaslIdentifyPackageW=SECUR32.SaslIdentifyPackageW -;(a)SaslInitializeSecurityContextA=SECUR32.SaslInitializeSecurityContextA -;(a)SaslInitializeSecurityContextW=SECUR32.SaslInitializeSecurityContextW -;SealMessage=SECUR32.SealMessage -;SecCacheSspiPackages=SECUR32.SecCacheSspiPackages -;SecDeleteUserModeContext=SECUR32.SecDeleteUserModeContext -;SecGetLocaleSpecificEncryptionRules=SECUR32.SecGetLocaleSpecificEncryptionRules -;SecInitUserModeContext=SECUR32.SecInitUserModeContext -;SecpFreeMemory=SECUR32.SecpFreeMemory -;SecpTranslateName=SECUR32.SecpTranslateName -;SecpTranslateNameEx=SECUR32.SecpTranslateNameEx -;(a)SetContextAttributesA=SECUR32.SetContextAttributesA -;(a)SetContextAttributesW=SECUR32.SetContextAttributesW -;TranslateNameA(a)20=SECUR32.TranslateNameA -;TranslateNameW(a)20=SECUR32.TranslateNameW -;UnsealMessage=SECUR32.UnsealMessage -;VerifySignature(a)16=SECUR32.VerifySignature Modified: trunk/reactos/dll/win32/security/security.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/security/securit… ============================================================================== --- trunk/reactos/dll/win32/security/security.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/security/security.rbuild [iso-8859-1] Thu Nov 27 02:40:47 2008 @@ -1,5 +1,5 @@ <module name="security" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_SECUR32}" installbase="system32" installname="security.dll"> - <importlibrary definition="security.def" /> + <importlibrary definition="security.spec" /> <include base="security">.</include> <define name="__SECURITY__" /> <library>ntdll</library> Added: trunk/reactos/dll/win32/security/security.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/security/securit… ============================================================================== --- trunk/reactos/dll/win32/security/security.spec (added) +++ trunk/reactos/dll/win32/security/security.spec [iso-8859-1] Thu Nov 27 02:40:47 2008 @@ -1,0 +1,77 @@ +@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) secur32.LsaRegisterLogonProcess +@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) secur32.LsaLogonUser +@ stdcall LsaDeregisterLogonProcess(long) secur32.LsaDeregisterLogonProcess +@ stdcall LsaConnectUntrusted(long) secur32.LsaConnectUntrusted +@ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) SECUR32.LsaLookupAuthenticationPackage +@ stdcall LsaFreeReturnBuffer(ptr) SECUR32.LsaFreeReturnBuffer +@ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) SECUR32.LsaCallAuthenticationPackage +@ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) SECUR32.AcceptSecurityContext +@ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) SECUR32.AcquireCredentialsHandleA +@ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) SECUR32.AcquireCredentialsHandleW +@ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr) SECUR32.AddCredentialsA +@ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr) SECUR32.AddCredentialsW +@ stub AddSecurityPackageA # SECUR32.AddSecurityPackageA +@ stub AddSecurityPackageW # SECUR32.AddSecurityPackageW +@ stdcall ApplyControlTokenA(ptr ptr) SECUR32.ApplyControlTokenA +@ stdcall ApplyControlTokenW(ptr ptr) SECUR32.ApplyControlTokenW +@ stdcall CompleteAuthToken(ptr ptr) SECUR32.CompleteAuthToken +@ stub CredMarshalTargetInfo # SECUR32.CredMarshalTargetInfo +@ stub CredUnmarshalTargetInfo # SECUR32.CredUnmarshalTargetInfo +@ stdcall DecryptMessage(ptr ptr long ptr) SECUR32.DecryptMessage +@ stdcall DeleteSecurityContext(ptr) SECUR32.DeleteSecurityContext +@ stub DeleteSecurityPackageA # SECUR32.DeleteSecurityPackageA +@ stub DeleteSecurityPackageW # SECUR32.DeleteSecurityPackageW +@ stdcall EncryptMessage(ptr long ptr long) SECUR32.EncryptMessage +@ stdcall EnumerateSecurityPackagesA(ptr ptr) SECUR32.EnumerateSecurityPackagesA +@ stdcall EnumerateSecurityPackagesW(ptr ptr) SECUR32.EnumerateSecurityPackagesW +@ stdcall ExportSecurityContext(ptr long ptr ptr) SECUR32.ExportSecurityContext +@ stdcall FreeContextBuffer(ptr) SECUR32.FreeContextBuffer +@ stdcall FreeCredentialsHandle(ptr) SECUR32.FreeCredentialsHandle +@ stdcall GetComputerObjectNameA(long ptr ptr) SECUR32.GetComputerObjectNameA +@ stdcall GetComputerObjectNameW(long ptr ptr) SECUR32.GetComputerObjectNameW +@ stub GetSecurityUserInfo # SECUR32.GetSecurityUserInfo +@ stdcall GetUserNameExA(long ptr ptr) SECUR32.GetUserNameExA +@ stdcall GetUserNameExW(long ptr ptr) SECUR32.GetUserNameExW +@ stdcall ImpersonateSecurityContext(ptr) SECUR32.ImpersonateSecurityContext +@ stdcall ImportSecurityContextA(str ptr ptr ptr) SECUR32.ImportSecurityContextA +@ stdcall ImportSecurityContextW(wstr ptr ptr ptr) SECUR32.ImportSecurityContextW +@ stdcall InitSecurityInterfaceA() SECUR32.InitSecurityInterfaceA +@ stdcall InitSecurityInterfaceW() SECUR32.InitSecurityInterfaceW +@ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) SECUR32.InitializeSecurityContextA +@ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) SECUR32.InitializeSecurityContextW +@ stdcall LsaEnumerateLogonSessions(ptr ptr) SECUR32.LsaEnumerateLogonSessions +@ stdcall LsaGetLogonSessionData(ptr ptr) SECUR32.LsaGetLogonSessionData +@ stdcall LsaRegisterPolicyChangeNotification(long ptr) SECUR32.LsaRegisterPolicyChangeNotification +@ stdcall LsaUnregisterPolicyChangeNotification(long ptr) SECUR32.LsaUnregisterPolicyChangeNotification +@ stdcall MakeSignature(ptr long ptr long) SECUR32.MakeSignature +@ stdcall QueryContextAttributesA(ptr long ptr) SECUR32.QueryContextAttributesA +@ stdcall QueryContextAttributesW(ptr long ptr) SECUR32.QueryContextAttributesW +@ stdcall QueryCredentialsAttributesA(ptr long ptr) SECUR32.QueryCredentialsAttributesA +@ stdcall QueryCredentialsAttributesW(ptr long ptr) SECUR32.QueryCredentialsAttributesW +@ stdcall QuerySecurityContextToken(ptr ptr) SECUR32.QuerySecurityContextToken +@ stdcall QuerySecurityPackageInfoA(str ptr) SECUR32.QuerySecurityPackageInfoA +@ stdcall QuerySecurityPackageInfoW(wstr ptr) SECUR32.QuerySecurityPackageInfoW +@ stdcall RevertSecurityContext(ptr) SECUR32.RevertSecurityContext +@ stub SaslAcceptSecurityContext # SECUR32.SaslAcceptSecurityContext +@ stub SaslEnumerateProfilesA # SECUR32.SaslEnumerateProfilesA +@ stub SaslEnumerateProfilesW # SECUR32.SaslEnumerateProfilesW +@ stub SaslGetProfilePackageA # SECUR32.SaslGetProfilePackageA +@ stub SaslGetProfilePackageW # SECUR32.SaslGetProfilePackageW +@ stub SaslIdentifyPackageA # SECUR32.SaslIdentifyPackageA +@ stub SaslIdentifyPackageW # SECUR32.SaslIdentifyPackageW +@ stub SaslInitializeSecurityContextA # SECUR32.SaslInitializeSecurityContextA +@ stub SaslInitializeSecurityContextW # SECUR32.SaslInitializeSecurityContextW +@ stdcall SealMessage(ptr long ptr long) SECUR32.EncryptMessage +@ stub SecCacheSspiPackages # SECUR32.SecCacheSspiPackages +@ stub SecDeleteUserModeContext # SECUR32.SecDeleteUserModeContext +@ stub SecGetLocaleSpecificEncryptionRules # SECUR32.SecGetLocaleSpecificEncryptionRules +@ stub SecInitUserModeContext # SECUR32.SecInitUserModeContext +@ stub SecpFreeMemory # SECUR32.SecpFreeMemory +@ stub SecpTranslateName # SECUR32.SecpTranslateName +@ stub SecpTranslateNameEx # SECUR32.SecpTranslateNameEx +@ stub SetContextAttributesA # SECUR32.SetContextAttributesA +@ stub SetContextAttributesW #SECUR32.SetContextAttributesW +@ stdcall TranslateNameA(str long long ptr ptr) SECUR32.TranslateNameA +@ stdcall TranslateNameW(wstr long long ptr ptr) SECUR32.TranslateNameW +@ stdcall UnsealMessage(ptr ptr long ptr) SECUR32.DecryptMessage +@ stdcall VerifySignature(ptr ptr long ptr) SECUR32.VerifySignature Propchange: trunk/reactos/dll/win32/security/security.spec ------------------------------------------------------------------------------ svn:eol-style = native

16 years

[greatlrd] 37680: convert parts of DdQueryDirectDrawObject (gdientry 2) to use wined3d.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Nov 27 02:34:16 2008 New Revision: 37680 URL: http://svn.reactos.org/svn/reactos?rev=37680&view=rev Log: convert parts of DdQueryDirectDrawObject (gdientry 2) to use wined3d. Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Thu Nov 27 02:34:16 2008 @@ -1735,6 +1735,7 @@ /* Set the return value */ Return = pDirectDrawGlobal->hDD ? TRUE : FALSE; + } /* Return to caller */ @@ -1761,13 +1762,20 @@ LPVIDMEM pvmList) { + HDC hdc; + DEVMODEW DevMode; PVIDEOMEMORY VidMemList = NULL; //DWORD dwNumHeaps=0, FourCCs=0; - BOOL retVal = TRUE; + HBITMAP hbmp; + const UINT bmiSize = sizeof(BITMAPINFOHEADER) + 0x10; + UCHAR *pbmiData; + BITMAPINFO *pbmi; + DWORD *pMasks; + IWineD3D* pWineD3d; - WINED3DDISPLAYMODE d3ddm; + /* Note : XP always alloc 24*sizeof(VIDEOMEMORY) of pvmlist so we change it to it */ if ( (pvmList != NULL) && @@ -1790,64 +1798,143 @@ pWineD3d = (IWineD3D*) GetDdHandle(pDirectDrawGlobal->hDD); /* Get adapter res, we can use windows own api here */ - IWineD3D_GetAdapterDisplayMode( pWineD3d, D3DADAPTER_DEFAULT, &d3ddm); - - /* Clear the incoming pointer */ - RtlZeroMemory(pHalInfo, sizeof(DDHALINFO)); - - /* Convert all the data */ - pHalInfo->dwSize = sizeof(DDHALINFO); - pHalInfo->lpDDCallbacks = pDDCallbacks; - pHalInfo->lpDDSurfaceCallbacks = pDDSurfaceCallbacks; - pHalInfo->lpDDPaletteCallbacks = pDDPaletteCallbacks; - - /* Check for NT5+ D3D Data */ -/* FIXME - if ( (D3dCallbacks.dwSize != 0) && - (D3dDriverData.dwSize != 0) ) - { + //IWineD3D_GetAdapterDisplayMode( pWineD3d, D3DADAPTER_DEFAULT, &d3ddm); + EnumDisplaySettingsW(NULL,ENUM_CURRENT_SETTINGS,&DevMode); + + /* Dectect RGB bit mask */ + hdc = GetDC(GetDesktopWindow()); + if (hdc == NULL) + { + goto cleanup; + } + + hbmp = CreateCompatibleBitmap(hdc, 1, 1); + if (hbmp==NULL) + { + DeleteDC(hdc); + goto cleanup; + } + + pbmiData = (UCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bmiSize); + pbmi = (BITMAPINFO*)pbmiData; + + if (pbmiData==NULL) + { + DeleteDC(hdc); + DeleteObject(hbmp); + goto cleanup; + } + + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biBitCount = (WORD)DevMode.dmBitsPerPel; + pbmi->bmiHeader.biCompression = BI_BITFIELDS; + pbmi->bmiHeader.biWidth = 1; + pbmi->bmiHeader.biHeight = 1; + + GetDIBits(hdc, hbmp, 0, 0, NULL, pbmi, 0); + DeleteObject(hbmp); + pMasks = (DWORD*)(pbmiData + sizeof(BITMAPINFOHEADER)); + /* End dectect RGB bit mask */ + + if (pHalInfo) + { + /* Clear the incoming pointer */ + RtlZeroMemory(pHalInfo, sizeof(DDHALINFO)); + + /* Convert all the data */ + pHalInfo->dwSize = sizeof(DDHALINFO); + + pHalInfo->vmiData.fpPrimary = 0; + pHalInfo->vmiData.dwFlags = 0; // MSDN Currently unused and should be set to zero. + + pHalInfo->vmiData.dwDisplayWidth = DevMode.dmPelsHeight; + pHalInfo->vmiData.dwDisplayHeight = DevMode.dmPelsWidth; + + /* ToDo align it right, we skip align it, it must be algin like the graphice card delta for the screen + * the graphice card delta is same as pHalInfo->vmiData.lDisplayPitch + */ + pHalInfo->vmiData.lDisplayPitch = (DevMode.dmPelsWidth * DevMode.dmBitsPerPel) / 8; + + /* Setup DDPIXELFORMAT for pHalInfo->vmiData.ddpfDisplay */ + pHalInfo->vmiData.ddpfDisplay.dwSize = sizeof(DDPIXELFORMAT); + switch(DevMode.dmBitsPerPel) + { + case 1: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED1; + break; + + case 2: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED2; + break; + + case 4: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED4; + break; + + case 8: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED8; + break; + + case 16: + case 24: + case 32: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_RGB; + break; + default: + break; + } + + pHalInfo->vmiData.ddpfDisplay.dwFourCC = 0; + pHalInfo->vmiData.ddpfDisplay.dwRGBBitCount = DevMode.dmBitsPerPel; + pHalInfo->vmiData.ddpfDisplay.dwRBitMask = pMasks[0]; + pHalInfo->vmiData.ddpfDisplay.dwGBitMask = pMasks[1]; + pHalInfo->vmiData.ddpfDisplay.dwBBitMask = pMasks[2]; + pHalInfo->vmiData.ddpfDisplay.dwRGBAlphaBitMask = pMasks[3]; + + /* ToDo ? align setting for wined3d */ + pHalInfo->vmiData.dwOffscreenAlign = 0; + pHalInfo->vmiData.dwOverlayAlign = 0; + pHalInfo->vmiData.dwTextureAlign = 0; + pHalInfo->vmiData.dwZBufferAlign = 0; + pHalInfo->vmiData.dwAlphaAlign = 0; + + pHalInfo->vmiData.dwNumHeaps = 0; + pHalInfo->vmiData.pvmList = NULL; + + // FIXME pHalInfo->ddCaps DDCORECAPS + + /* always force rope 0x1000 for hal it mean only source copy is supported */ + pHalInfo->ddCaps.dwRops[6] = 0x1000; + + pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo; + + pHalInfo->dwFlags = DDHALINFO_ISPRIMARYDISPLAY; // we assume the current drv is the primary driver + /* DDHALINFO_ISPRIMARYDISPLAY + * Driver is the primary display driver. + * + * DDHALINFO_MODEXILLEGAL + * Hardware does not support ModeX modes + * + * DDHALINFO_GETDRIVERINFOSET + * The GetDriverInfo member is set, gdi32 does always set it + * + * DDHALINFO_GETDRIVERINFO2 + * Driver supports GetDriverInfo2 variant of GetDriverInfo + */ + + /* Setup callbacks */ + pHalInfo->lpDDCallbacks = pDDCallbacks; + pHalInfo->lpDDSurfaceCallbacks = pDDSurfaceCallbacks; + pHalInfo->lpDDPaletteCallbacks =pDDPaletteCallbacks; pHalInfo->lpD3DGlobalDriverData = (ULONG_PTR)pD3dDriverData; pHalInfo->lpD3DHALCallbacks = (ULONG_PTR)pD3dCallbacks; pHalInfo->lpDDExeBufCallbacks = pD3dBufferCallbacks; - } -*/ - /* Continue converting the rest */ - /* FIXME pHalInfo->vmiData.dwFlags */ - //pHalInfo->vmiData.dwFlags = HalInfo.vmiData.dwFlags; - pHalInfo->vmiData.dwDisplayWidth = d3ddm.Width; // HalInfo.vmiData.dwDisplayWidth; - pHalInfo->vmiData.dwDisplayHeight = d3ddm.Height;//HalInfo.vmiData.dwDisplayHeight; - // FIXME pHalInfo->vmiData.lDisplayPitch = d3ddm.Format//HalInfo.vmiData.lDisplayPitch; - pHalInfo->vmiData.fpPrimary = 0; - - /* FIXME - RtlCopyMemory( &pHalInfo->vmiData.ddpfDisplay, - &HalInfo.vmiData.ddpfDisplay, - sizeof(DDPIXELFORMAT)); - - pHalInfo->vmiData.dwOffscreenAlign = HalInfo.vmiData.dwOffscreenAlign; - pHalInfo->vmiData.dwOverlayAlign = HalInfo.vmiData.dwOverlayAlign; - pHalInfo->vmiData.dwTextureAlign = HalInfo.vmiData.dwTextureAlign; - pHalInfo->vmiData.dwZBufferAlign = HalInfo.vmiData.dwZBufferAlign; - pHalInfo->vmiData.dwAlphaAlign = HalInfo.vmiData.dwAlphaAlign; - - pHalInfo->vmiData.dwNumHeaps = dwNumHeaps; - pHalInfo->vmiData.pvmList = pvmList; - - RtlCopyMemory( &pHalInfo->ddCaps, - &HalInfo.ddCaps, - sizeof(DDCORECAPS )); - - pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; - pHalInfo->lpdwFourCC = pdwFourCC; - */ - - /* always force rope 0x1000 for hal it mean only source copy is supported */ - pHalInfo->ddCaps.dwRops[6] = 0x1000; - - - pHalInfo->dwFlags = DDHALINFO_GETDRIVERINFOSET; - pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo; + /* FIXME + pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; + pHalInfo->lpdwFourCC = pdwFourCC; + */ + } /* Now check if we got any DD callbacks */ if (pDDCallbacks)

16 years

[greatlrd] 37679: fix a typo

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Nov 26 22:37:14 2008 New Revision: 37679 URL: http://svn.reactos.org/svn/reactos?rev=37679&view=rev Log: fix a typo Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Wed Nov 26 22:37:14 2008 @@ -1866,6 +1866,7 @@ pDDCallbacks->GetScanLine = DdGetScanLine; } + /* Check for DD Surface Callbacks */ if (pDDSurfaceCallbacks) { @@ -1893,6 +1894,7 @@ pDDSurfaceCallbacks->AddAttachedSurface = DdAddAttachedSurface; } + /* Check for DD Palette Callbacks, This interface are dead for user mode, * only what it can support are being report back. */ @@ -1920,6 +1922,7 @@ // FIXME pD3dCallbacks->ContextDestroyAll = (LPD3DHAL_CONTEXTDESTROYALLCB) NtGdiD3dContextDestroyAll; } + /* Check for D3D Driver Data */ if (pD3dDriverData) { @@ -1929,7 +1932,7 @@ /* Write the pointer to the texture formats */ //FIXME pD3dDriverData->lpTextureFormats = pD3dTextureFormats; } - else + /* Check for D3D Buffer Callbacks */ if (pD3dBufferCallbacks)

16 years, 1 month

[greatlrd] 37678: convert parts of DdQueryDirectDrawObject (gdientry 2) to use wined3d.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Nov 26 22:23:05 2008 New Revision: 37678 URL: http://svn.reactos.org/svn/reactos?rev=37678&view=rev Log: convert parts of DdQueryDirectDrawObject (gdientry 2) to use wined3d. Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Wed Nov 26 22:23:05 2008 @@ -1762,30 +1762,18 @@ { PVIDEOMEMORY VidMemList = NULL; - DD_HALINFO HalInfo; - D3DNTHAL_CALLBACKS D3dCallbacks; - D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; - DD_D3DBUFCALLBACKS D3dBufferCallbacks; - DWORD CallbackFlags[3]; //DWORD dwNumHeaps=0, FourCCs=0; - DWORD Flags; + BOOL retVal = TRUE; IWineD3D* pWineD3d; WINED3DDISPLAYMODE d3ddm; - - /* Clear the structures */ - RtlZeroMemory(&HalInfo, sizeof(DD_HALINFO)); - RtlZeroMemory(&D3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)); - RtlZeroMemory(&D3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); - RtlZeroMemory(&D3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)); - RtlZeroMemory(CallbackFlags, sizeof(DWORD)*3); /* Note : XP always alloc 24*sizeof(VIDEOMEMORY) of pvmlist so we change it to it */ if ( (pvmList != NULL) && (pHalInfo->vmiData.dwNumHeaps != 0) ) { - VidMemList = (PVIDEOMEMORY) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(VIDEOMEMORY) * 24 ) * pHalInfo->vmiData.dwNumHeaps); + VidMemList = (PVIDEOMEMORY) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(VIDEOMEMORY) * 24 ) * pHalInfo->vmiData.dwNumHeaps); } /* Do the query */ @@ -1814,21 +1802,16 @@ pHalInfo->lpDDPaletteCallbacks = pDDPaletteCallbacks; /* Check for NT5+ D3D Data */ +/* FIXME if ( (D3dCallbacks.dwSize != 0) && (D3dDriverData.dwSize != 0) ) { - /* Write these down */ pHalInfo->lpD3DGlobalDriverData = (ULONG_PTR)pD3dDriverData; pHalInfo->lpD3DHALCallbacks = (ULONG_PTR)pD3dCallbacks; - - /* Check for Buffer Callbacks */ - if (D3dBufferCallbacks.dwSize) - { - /* Write this one too */ - pHalInfo->lpDDExeBufCallbacks = pD3dBufferCallbacks; - } - } - + pHalInfo->lpDDExeBufCallbacks = pD3dBufferCallbacks; + + } +*/ /* Continue converting the rest */ /* FIXME pHalInfo->vmiData.dwFlags */ //pHalInfo->vmiData.dwFlags = HalInfo.vmiData.dwFlags; @@ -1860,16 +1843,10 @@ */ /* always force rope 0x1000 for hal it mean only source copy is supported */ - pHalInfo->ddCaps.dwRops[6] = 0x1000; - - /* Set the HAL flags what ReactX got from the driver - * Windows XP force setting DDHALINFO_GETDRIVERINFOSET if the driver does not set it - * and ReactX doing same to keep compatible with drivers, but the driver are - * force support DdGetDriverInfo acoriding MSDN but it seam some driver do not set - * this flag even it is being supported. that is mean. It is small hack to keep - * bad driver working, that trust this is always being setting by it self at end - */ - pHalInfo->dwFlags = (HalInfo.dwFlags & ~DDHALINFO_GETDRIVERINFOSET) | DDHALINFO_GETDRIVERINFOSET; + pHalInfo->ddCaps.dwRops[6] = 0x1000; + + + pHalInfo->dwFlags = DDHALINFO_GETDRIVERINFOSET; pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo; /* Now check if we got any DD callbacks */ @@ -1877,34 +1854,16 @@ { /* Zero the structure */ RtlZeroMemory(pDDCallbacks, sizeof(DDHAL_DDCALLBACKS)); + + /* Fill in the size and the flags for DDHAL_DDCALLBACKS */ pDDCallbacks->dwSize = sizeof(DDHAL_DDCALLBACKS); - - /* Set the flags for this structure - * Windows XP force setting DDHAL_CB32_CREATESURFACE if the driver does not set it - * and ReactX doing same to keep compatible with drivers, but the driver are - * force support pDDCallbacks acoriding MSDN but it seam some driver do not set - * this flag even it is being supported. that is mean. It is small hack to keep - * bad driver working, that trust this is always being setting by it self at end - */ - Flags = (CallbackFlags[0] & ~DDHAL_CB32_CREATESURFACE) | DDHAL_CB32_CREATESURFACE; - pDDCallbacks->dwFlags = Flags; + pDDCallbacks->dwFlags = DDHAL_CB32_CANCREATESURFACE | DDHAL_CB32_GETSCANLINE | DDHAL_CB32_CREATESURFACE | DDHAL_CB32_WAITFORVERTICALBLANK; /* Write the always-on functions */ pDDCallbacks->CreateSurface = DdCreateSurface; - - /* Now write the pointers, if applicable */ - if (Flags & DDHAL_CB32_WAITFORVERTICALBLANK) - { - pDDCallbacks->WaitForVerticalBlank = DdWaitForVerticalBlank; - } - if (Flags & DDHAL_CB32_CANCREATESURFACE) - { - pDDCallbacks->CanCreateSurface = DdCanCreateSurface; - } - if (Flags & DDHAL_CB32_GETSCANLINE) - { - pDDCallbacks->GetScanLine = DdGetScanLine; - } + pDDCallbacks->WaitForVerticalBlank = DdWaitForVerticalBlank; + pDDCallbacks->CanCreateSurface = DdCanCreateSurface; + pDDCallbacks->GetScanLine = DdGetScanLine; } /* Check for DD Surface Callbacks */ @@ -1912,24 +1871,11 @@ { /* Zero the structures */ RtlZeroMemory(pDDSurfaceCallbacks, sizeof(DDHAL_DDSURFACECALLBACKS)); + + /* Setup the size and flags for DDHAL_DDSURFACECALLBACKS */ pDDSurfaceCallbacks->dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); - - /* Set the flags for this structure - * Windows XP force setting DDHAL_SURFCB32_LOCK, DDHAL_SURFCB32_UNLOCK, - * DDHAL_SURFCB32_SETCOLORKEY, DDHAL_SURFCB32_DESTROYSURFACE if the driver - * does not set it and ReactX doing same to keep compatible with drivers, - * but the driver are force support pDDSurfaceCallbacks acoriding MSDN but it seam - * some driver do not set this flag even it is being supported. that is mean. - * It is small hack to keep bad driver working, that trust this is always being - * setting by it self at end - */ - - Flags = (CallbackFlags[1] & ~(DDHAL_SURFCB32_LOCK | DDHAL_SURFCB32_UNLOCK | - DDHAL_SURFCB32_SETCOLORKEY | DDHAL_SURFCB32_DESTROYSURFACE)) | - (DDHAL_SURFCB32_LOCK | DDHAL_SURFCB32_UNLOCK | - DDHAL_SURFCB32_SETCOLORKEY | DDHAL_SURFCB32_DESTROYSURFACE); - - pDDSurfaceCallbacks->dwFlags = Flags; + pDDSurfaceCallbacks->dwFlags = DDHAL_SURFCB32_LOCK | DDHAL_SURFCB32_UNLOCK | DDHAL_SURFCB32_SETCOLORKEY | DDHAL_SURFCB32_DESTROYSURFACE; + /* Write the always-on functions */ pDDSurfaceCallbacks->Lock = DdLock; @@ -1937,35 +1883,14 @@ pDDSurfaceCallbacks->SetColorKey = DdSetColorKey; pDDSurfaceCallbacks->DestroySurface = DdDestroySurface; - /* Write the optional ones */ - if (Flags & DDHAL_SURFCB32_FLIP) - { - pDDSurfaceCallbacks->Flip = DdFlip; - } - if (Flags & DDHAL_SURFCB32_BLT) - { - pDDSurfaceCallbacks->Blt = DdBlt; - } - if (Flags & DDHAL_SURFCB32_GETBLTSTATUS) - { - pDDSurfaceCallbacks->GetBltStatus = DdGetBltStatus; - } - if (Flags & DDHAL_SURFCB32_GETFLIPSTATUS) - { - pDDSurfaceCallbacks->GetFlipStatus = DdGetFlipStatus; - } - if (Flags & DDHAL_SURFCB32_UPDATEOVERLAY) - { - pDDSurfaceCallbacks->UpdateOverlay = DdUpdateOverlay; - } - if (Flags & DDHAL_SURFCB32_SETOVERLAYPOSITION) - { - pDDSurfaceCallbacks->SetOverlayPosition = DdSetOverlayPosition; - } - if (Flags & DDHAL_SURFCB32_ADDATTACHEDSURFACE) - { - pDDSurfaceCallbacks->AddAttachedSurface = DdAddAttachedSurface; - } + /* Write the always-on functions */ + pDDSurfaceCallbacks->Flip = DdFlip; + pDDSurfaceCallbacks->Blt = DdBlt; + pDDSurfaceCallbacks->GetBltStatus = DdGetBltStatus; + pDDSurfaceCallbacks->GetFlipStatus = DdGetFlipStatus; + pDDSurfaceCallbacks->UpdateOverlay = DdUpdateOverlay; + pDDSurfaceCallbacks->SetOverlayPosition = DdSetOverlayPosition; + pDDSurfaceCallbacks->AddAttachedSurface = DdAddAttachedSurface; } /* Check for DD Palette Callbacks, This interface are dead for user mode, @@ -1977,8 +1902,8 @@ RtlZeroMemory(pDDPaletteCallbacks, sizeof(DDHAL_DDPALETTECALLBACKS)); /* Write the header */ - pDDPaletteCallbacks->dwSize = sizeof(DDHAL_DDPALETTECALLBACKS); - pDDPaletteCallbacks->dwFlags = CallbackFlags[2]; + pDDPaletteCallbacks->dwSize = sizeof(DDHAL_DDPALETTECALLBACKS); + pDDPaletteCallbacks->dwFlags = 0; } if (pD3dCallbacks) @@ -1989,32 +1914,22 @@ /* Write the header */ pD3dCallbacks->dwSize = sizeof(DDHAL_DDEXEBUFCALLBACKS); - /* Now check for each callback */ - if (D3dCallbacks.ContextCreate) - { - pD3dCallbacks->ContextCreate = (LPD3DHAL_CONTEXTCREATECB) D3dContextCreate; - } - if (D3dCallbacks.ContextDestroy) - { - /* FIXME */ - // pD3dCallbacks->ContextDestroy = (LPD3DHAL_CONTEXTDESTROYCB) NtGdiD3dContextDestroy; - } - if (D3dCallbacks.ContextDestroyAll) - { - /* FIXME */ - // pD3dCallbacks->ContextDestroyAll = (LPD3DHAL_CONTEXTDESTROYALLCB) NtGdiD3dContextDestroyAll; - } + /* Write the always-on functions */ + pD3dCallbacks->ContextCreate = (LPD3DHAL_CONTEXTCREATECB) D3dContextCreate; + // FIXME pD3dCallbacks->ContextDestroy = (LPD3DHAL_CONTEXTDESTROYCB) NtGdiD3dContextDestroy; + // FIXME pD3dCallbacks->ContextDestroyAll = (LPD3DHAL_CONTEXTDESTROYALLCB) NtGdiD3dContextDestroyAll; } /* Check for D3D Driver Data */ if (pD3dDriverData) { /* Copy the struct */ - RtlMoveMemory(pD3dDriverData, &D3dDriverData, sizeof(D3DHAL_GLOBALDRIVERDATA)); + //FIXME RtlMoveMemory(pD3dDriverData, &D3dDriverData, sizeof(D3DHAL_GLOBALDRIVERDATA)); /* Write the pointer to the texture formats */ //FIXME pD3dDriverData->lpTextureFormats = pD3dTextureFormats; } + else /* Check for D3D Buffer Callbacks */ if (pD3dBufferCallbacks) @@ -2022,34 +1937,15 @@ /* Zero the struct */ RtlZeroMemory(pD3dBufferCallbacks, sizeof(DDHAL_DDEXEBUFCALLBACKS)); - - pD3dBufferCallbacks->dwSize = D3dBufferCallbacks.dwSize; - - pD3dBufferCallbacks->dwFlags = D3dBufferCallbacks.dwFlags; - if ( D3dBufferCallbacks.CanCreateD3DBuffer) - { - pD3dBufferCallbacks->CanCreateExecuteBuffer = (LPDDHALEXEBUFCB_CANCREATEEXEBUF)DdCanCreateD3DBuffer; - } - - if ( D3dBufferCallbacks.CanCreateD3DBuffer) - { - pD3dBufferCallbacks->CreateExecuteBuffer = (LPDDHALEXEBUFCB_CREATEEXEBUF) DdCreateD3DBuffer; - } - - if ( D3dBufferCallbacks.DestroyD3DBuffer ) - { - pD3dBufferCallbacks->DestroyExecuteBuffer = (LPDDHALEXEBUFCB_DESTROYEXEBUF) DdDestroyD3DBuffer; - } - - if ( D3dBufferCallbacks.LockD3DBuffer ) - { - pD3dBufferCallbacks->LockExecuteBuffer = (LPDDHALEXEBUFCB_LOCKEXEBUF) DdLockD3D; - } - - if ( D3dBufferCallbacks.UnlockD3DBuffer ) - { - pD3dBufferCallbacks->UnlockExecuteBuffer = (LPDDHALEXEBUFCB_UNLOCKEXEBUF) DdUnlockD3D; - } + /* Write the header */ + pD3dBufferCallbacks->dwSize = sizeof(DDHAL_DDEXEBUFCALLBACKS); + pD3dBufferCallbacks->dwFlags = DDHAL_D3DBUFCB32_CREATED3DBUF | DDHAL_D3DBUFCB32_CANCREATED3DBUF | DDHAL_D3DBUFCB32_LOCKD3DBUF | DDHAL_D3DBUFCB32_UNLOCKD3DBUF; + + /* Write the always-on functions */ + pD3dBufferCallbacks->CanCreateExecuteBuffer = (LPDDHALEXEBUFCB_CANCREATEEXEBUF)DdCanCreateD3DBuffer; + pD3dBufferCallbacks->CreateExecuteBuffer = (LPDDHALEXEBUFCB_CREATEEXEBUF) DdCreateD3DBuffer; + pD3dBufferCallbacks->LockExecuteBuffer = (LPDDHALEXEBUFCB_LOCKEXEBUF) DdLockD3D; + pD3dBufferCallbacks->UnlockExecuteBuffer = (LPDDHALEXEBUFCB_UNLOCKEXEBUF) DdUnlockD3D; } /* FIXME VidMemList */

16 years, 1 month

[jimtabor] 37677: - Fixed stock object creation for pens. Now pass all but 25 pen cross tests. Please use latest wine gdi tests.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Nov 26 14:44:41 2008 New Revision: 37677 URL: http://svn.reactos.org/svn/reactos?rev=37677&view=rev Log: - Fixed stock object creation for pens. Now pass all but 25 pen cross tests. Please use latest wine gdi tests. Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/objects/pen.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] Wed Nov 26 14:44:41 2008 @@ -30,7 +30,7 @@ #define W32PF_MANUALGUICHECK (0x02000000) #define W32PF_CREATEDWINORDC (0x04000000) - +extern HGDIOBJ StockObjects[]; extern SHORT gusLanguageID; SHORT FASTCALL IntGdiGetLanguageID(); Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Wed Nov 26 14:44:41 2008 @@ -47,7 +47,7 @@ IN ULONG_PTR ulHatch, DWORD dwStyleCount, PULONG pStyle, - IN ULONG cjDIB, // FIXME! We are shipping this too! + IN ULONG cjDIB, IN BOOL bOldStylePen, IN OPTIONAL HBRUSH hbrush) { @@ -61,6 +61,11 @@ dwWidth = abs(dwWidth); + if ( (dwPenStyle & PS_STYLE_MASK) == PS_NULL) + { + return StockObjects[NULL_PEN]; + } + if (bOldStylePen) { PenObject = PENOBJ_AllocPenWithHandle(); @@ -79,7 +84,8 @@ hPen = PenObject->BaseObject.hHmgr; // If nWidth is zero, the pen is a single pixel wide, regardless of the current transformation. - if ((bOldStylePen) && (!dwWidth) && (dwPenStyle & PS_STYLE_MASK) != PS_SOLID) dwWidth = 1; + if ((bOldStylePen) && (!dwWidth) && (dwPenStyle & PS_STYLE_MASK) != PS_SOLID) + dwWidth = 1; PenObject->ptPenWidth.x = dwWidth; PenObject->ptPenWidth.y = 0; @@ -313,7 +319,7 @@ NULL, 0, TRUE, - 0); + hbr); } HPEN STDCALL @@ -369,24 +375,36 @@ } } - if (dwPenStyle != PS_NULL) - { - hPen = IntGdiExtCreatePen(dwPenStyle, + if (ulBrushStyle == BS_PATTERN) + { + _SEH_TRY + { + ProbeForRead((PVOID)ulHatch, cjDIB, 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + if (pSafeStyle) ExFreePoolWithTag(pSafeStyle, TAG_PENSTYLES); + return 0; + } + } + + hPen = IntGdiExtCreatePen(dwPenStyle, ulWidth, - ulBrushStyle, + ulBrushStyle, ulColor, - ulClientHatch, + ulClientHatch, ulHatch, - dwStyleCount, - pSafeStyle, - cjDIB, - bOldStylePen, - hBrush); - } - else - { - hPen = NtGdiGetStockObject(NULL_PEN); - } + dwStyleCount, + pSafeStyle, + cjDIB, + bOldStylePen, + hBrush); if (!hPen && pSafeStyle) { Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Wed Nov 26 14:44:41 2008 @@ -107,7 +107,45 @@ { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans -static HGDIOBJ StockObjects[NB_STOCK_OBJECTS]; +HGDIOBJ StockObjects[NB_STOCK_OBJECTS]; + +static +HPEN +FASTCALL +IntCreateStockPen( DWORD dwPenStyle, + DWORD dwWidth, + ULONG ulBrushStyle, + ULONG ulColor) +{ + HPEN hPen; + PGDIBRUSHOBJ PenObject = PENOBJ_AllocPenWithHandle(); + + if ((!dwWidth) && (dwPenStyle & PS_STYLE_MASK) != PS_SOLID) dwWidth = 1; + + PenObject->ptPenWidth.x = dwWidth; + PenObject->ptPenWidth.y = 0; + PenObject->ulPenStyle = dwPenStyle; + PenObject->BrushAttr.lbColor = ulColor; + PenObject->ulStyle = ulBrushStyle; + PenObject->hbmClient = (HANDLE)NULL; + PenObject->dwStyleCount = 0; + PenObject->pStyle = 0; + PenObject->flAttrs = GDIBRUSH_IS_OLDSTYLEPEN; + + switch (dwPenStyle & PS_STYLE_MASK) + { + case PS_NULL: + PenObject->flAttrs |= GDIBRUSH_IS_NULL; + break; + + case PS_SOLID: + PenObject->flAttrs |= GDIBRUSH_IS_SOLID; + break; + } + hPen = PenObject->BaseObject.hHmgr; + PENOBJ_UnlockPen(PenObject); + return hPen; +} /*! * Creates a bunch of stock objects: brushes, pens, fonts. @@ -129,10 +167,10 @@ StockObjects[BLACK_BRUSH] = IntGdiCreateSolidBrush(RGB(0,0,0)); StockObjects[NULL_BRUSH] = IntGdiCreateNullBrush(); - StockObjects[WHITE_PEN] = IntGdiExtCreatePen(WhitePen.lopnStyle, WhitePen.lopnWidth.x, BS_SOLID, WhitePen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); - StockObjects[BLACK_PEN] = IntGdiExtCreatePen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); - StockObjects[DC_PEN] = IntGdiExtCreatePen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); - StockObjects[NULL_PEN] = IntGdiExtCreatePen(NullPen.lopnStyle, NullPen.lopnWidth.x, BS_SOLID, NullPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); + StockObjects[WHITE_PEN] = IntCreateStockPen(WhitePen.lopnStyle, WhitePen.lopnWidth.x, BS_SOLID, WhitePen.lopnColor); + StockObjects[BLACK_PEN] = IntCreateStockPen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor); + StockObjects[DC_PEN] = IntCreateStockPen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor); + StockObjects[NULL_PEN] = IntCreateStockPen(NullPen.lopnStyle, NullPen.lopnWidth.x, BS_SOLID, NullPen.lopnColor); StockObjects[20] = NULL; /* TODO: Unknown internal stock object */ StockObjects[DEFAULT_BITMAP] = IntGdiCreateBitmap(1, 1, 1, 1, NULL); @@ -303,7 +341,7 @@ if(gpsi->SysColorPens[i] == NULL) { Pen.lopnColor = SysColors[i]; - gpsi->SysColorPens[i] = IntGdiExtCreatePen(Pen.lopnStyle, Pen.lopnWidth.x, BS_SOLID, Pen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); + gpsi->SysColorPens[i] = IntCreateStockPen(Pen.lopnStyle, Pen.lopnWidth.x, BS_SOLID, Pen.lopnColor); if(gpsi->SysColorPens[i] != NULL) { GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->SysColorPens[i]);

16 years, 1 month

[mkupfer] 37676: - tool for autoconverting INF files to utf-16le from an arbitrary unicode encoding

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Wed Nov 26 14:38:15 2008 New Revision: 37676 URL: http://svn.reactos.org/svn/reactos?rev=37676&view=rev Log: - tool for autoconverting INF files to utf-16le from an arbitrary unicode encoding Added: trunk/reactos/tools/utf16le/ trunk/reactos/tools/utf16le/utf16le.cpp (with props) trunk/reactos/tools/utf16le/utf16le.rbuild (with props) Modified: trunk/reactos/tools/tools.rbuild Modified: trunk/reactos/tools/tools.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.rbuild?rev=376… ============================================================================== --- trunk/reactos/tools/tools.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/tools.rbuild [iso-8859-1] Wed Nov 26 14:38:15 2008 @@ -31,4 +31,7 @@ <directory name="wrc"> <xi:include href="wrc/wrc.rbuild" /> </directory> +<directory name="utf16le"> + <xi:include href="utf16le/utf16le.rbuild" /> +</directory> </group> Added: trunk/reactos/tools/utf16le/utf16le.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/utf16le/utf16le.cpp?… ============================================================================== --- trunk/reactos/tools/utf16le/utf16le.cpp (added) +++ trunk/reactos/tools/utf16le/utf16le.cpp [iso-8859-1] Wed Nov 26 14:38:15 2008 @@ -1,0 +1,290 @@ +/* + * Usage: utf16le inputfile outputfile + * + * This is a tool and is compiled using the host compiler, + * i.e. on Linux gcc and not mingw-gcc (cross-compiler). + * It's a converter from utf-8, utf-16 (LE/BE) and utf-32 (LE/BE) + * to utf-16 LE and especially made for automatic conversions of + * INF-files from utf-8 to utf-16LE (so we can furthermore + * store the INF files in utf-8 for subversion. + * + * Author: Matthias Kupfer (mkupfer(a)reactos.org) + */ + +#include <fstream> +#include <iostream> + +//#define DISPLAY_DETECTED_UNICODE + +using namespace std; + +class utf_converter +{ + public: + // detect can detect utf-8 and both utf-16 variants, but assume utf-32 only + // due to ambiguous BOM + enum enc_types { detect, utf8, utf16le, utf16be, utf32le, utf32be }; + enum err_types { none, iopen, oopen, eof, read, write, decode }; + protected: + err_types error; + enc_types encoding; + unsigned char buffer[4], fill, index; // need 4 char buffer for optional BOM handling + fstream inputfile,outputfile; + static const unsigned char utf8table[64]; + public: + utf_converter(string ifname, string ofname, enc_types enc = detect) : error(none), encoding(enc), fill(0), index(0) + { + enc_types tmp_enc; + inputfile.open(ifname.c_str(), ios::in); + if (!inputfile) + { + error = iopen; + return; + } + outputfile.open(ofname.c_str(), ios::out); + if (!outputfile) + { + error = oopen; + return; + } + tmp_enc = getBOM(); + if (enc != detect) + { + if (enc != tmp_enc) + cerr << "Warning: UTF-BOM doesn't match encoding setting, but given encoding forced" << endl; + } + else + encoding = tmp_enc; + } + err_types getError() + { + return error; + } + enc_types getBOM() + { + index = 0; + /* first byte can also detect with: + if ((buffer[0] & 0x11) || !buffer[0])) + valid values are 0xef, 0xff, 0xfe, 0x00 + */ + inputfile.read(reinterpret_cast<char*>(&buffer),4); + fill =inputfile.gcount(); + // stupid utf8 bom + if ((fill > 2) && + (buffer[0] == 0xef) && + (buffer[1] == 0xbb) && + (buffer[2] == 0xbf)) + { + index += 3; + fill -=3; +#ifdef DISPLAY_DETECTED_UNICODE + cerr << "UTF-8 BOM found" << endl; +#endif + return utf8; + } + if ((fill > 1) && + (buffer[0] == 0xfe) && + (buffer[1] == 0xff)) + { + index += 2; + fill -= 2; +#ifdef DISPLAY_DETECTED_UNICODE + cerr << "UTF-16BE BOM found" << endl; +#endif + return utf16be; + } + if ((fill > 1) && + (buffer[0] == 0xff) && + (buffer[1] == 0xfe)) + { + if ((fill == 4) && + (buffer[2] == 0x00) && + (buffer[3] == 0x00)) + { + cerr << "UTF Error: ambiguous BOM UTF-16 or UTF-32; assume UTF-32" << endl; + fill = 0; + index = 0; + return utf32le; + } + fill -= 2; + index += 2; +#ifdef DISPLAY_DETECTED_UNICODE + cerr << "UTF-16LE BOM found" << endl; +#endif + return utf16le; + } + if ((fill == 4) && + (buffer[0] == 0x00) && + (buffer[1] == 0x00) && + (buffer[2] == 0xfe) && + (buffer[3] == 0xff)) + { + fill = 0; + index = 0; +#ifdef DISPLAY_DETECTED_UNICODE + cerr << "UTF-32BE BOM found" << endl; +#endif + return utf32be; + } + return utf8; // no valid bom so use utf8 as default + } + int getByte(unsigned char &c) + { + if (fill) + { + index %= 4; + --fill; + c = buffer[index++]; + return 1; + } else + { + inputfile.read(reinterpret_cast<char*>(&c),1); + return inputfile.gcount(); + } + } + int getWord(unsigned short &w) + { + unsigned char c[2]; + if (!getByte(c[0])) + return 0; + if (!getByte(c[1])) + return 1; + if (encoding == utf16le) + w = c[0] | (c[1] << 8); + else + w = c[1] | (c[0] << 8); + return 2; + } + int getDWord(wchar_t &d) + { + unsigned char c[4]; + for (int i=0;i<4;i++) + if (!getByte(c[i])) + return i; + if (encoding == utf32le) + d = c[0] | (c[1] << 8) | (c[2] << 16) | (c[3] << 24); + else + d = c[3] | (c[2] << 8) | (c[1] << 16) | (c[0] << 24); + return 4; + } + wchar_t get_wchar_t() + { + wchar_t ret = -1; + switch (encoding) + { + case detect: // if still unknwon + encoding = utf8; // assume utf8 as default + case utf8: + unsigned char c, tmp; + if (!getByte(tmp)) + return ret; + // table for 64 bytes (all 11xxxxxx resp. >=192) + // resulting byte is determined: + // lower 3 bits: number of following bytes (max.8) 0=error + // upper 5 bits: data filled with 0 + if (tmp & 0x80) + { + if (tmp & 0xc0 != 0xc0) + { + cerr << "UTF-8 Error: invalid data byte" << endl; + return ret; + } + unsigned char i = utf8table[tmp & 0x3f]; + ret = i >> 3; + i &= 7; + while (i--) + { + ret <<= 6; + if (!getByte(c)) + return wchar_t(-1); + ret |= c & 0x3f; + } + return ret; + } + else + return wchar_t(tmp); + case utf16le: + case utf16be: + unsigned short w,w2; + if (getWord(w) != 2) + return ret; + if ((w & 0xfc00) == 0xd800) // high surrogate first + { + if (getWord(w2) != 2) + return ret; + if ((w2 & 0xfc00) != 0xdc00) + { + cerr << "UTF-16 Error: invalid low surrogate" << endl; + return ret; + } + return (((w & 0x3ff) + 0x40) << 10) | (w2 & 0x3ff); + } + return w; + case utf32le: + case utf32be: + if (getDWord(ret) != 4) + return wchar_t (-1); + return ret; + } + return ret; + } + void convert2utf16le() + { + wchar_t c; + unsigned char buffer[2] = {0xff, 0xfe}; + outputfile.write(reinterpret_cast<char*>(&buffer),2); // write BOM + c = get_wchar_t(); + while (!inputfile.eof()) + { + buffer[0] = c & 0xff; + buffer[1] = (c >> 8) & 0xff; // create utf16-le char + outputfile.write(reinterpret_cast<char*>(&buffer),2); // write char + c = get_wchar_t(); + } + } + ~utf_converter() + { + if (inputfile) + inputfile.close(); + if (outputfile) + outputfile.close(); + } +}; + +const unsigned char utf_converter::utf8table[64] = { +1, 9, 17, 25, 33, 41, 49, 57, 65, 73, 81, 89, 97, 105, 113, 121, +129, 137, 145, 153, 161, 169, 177, 185, 193, 201, 209, 217, 225, 233, 241, 249, +2, 10, 18, 26, 34, 42, 50, 58, 66, 74, 82, 90, 98, 106, 114, 122, +3, 11, 19, 27, 35, 43, 51, 59, 4, 12, 20, 28, 5, 13, 6, 7 +}; + + +int main(int argc, char* argv[]) +{ + utf_converter::err_types err; + if (argc < 3) + { + cout << "usage: " << argv[0] << " inputfile outputfile" << endl; + return -1; + } + utf_converter conv(argv[1],argv[2]); + if ((err = conv.getError())!=utf_converter::none) + { + switch (err) + { + case utf_converter::iopen: + cerr << "Couldn't open input file." << endl; + break; + case utf_converter::oopen: + cerr << "Couldn't open output file." << endl; + break; + default: + cerr << "Unknown error." << endl; + } + return -1; + } else + conv.convert2utf16le(); + return 0; +} + +// vim:set ts=4 sw=4: Propchange: trunk/reactos/tools/utf16le/utf16le.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/utf16le/utf16le.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/utf16le/utf16le.rbui… ============================================================================== --- trunk/reactos/tools/utf16le/utf16le.rbuild (added) +++ trunk/reactos/tools/utf16le/utf16le.rbuild [iso-8859-1] Wed Nov 26 14:38:15 2008 @@ -1,0 +1,5 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="utf16le" type="buildtool"> + <file>utf16le.cpp</file> +</module> Propchange: trunk/reactos/tools/utf16le/utf16le.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 1 month

[sginsberg] 37675: - Slightly reorder freeldr.h's include order

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Nov 26 14:33:34 2008 New Revision: 37675 URL: http://svn.reactos.org/svn/reactos?rev=37675&view=rev Log: - Slightly reorder freeldr.h's include order Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Wed Nov 26 14:33:34 2008 @@ -22,9 +22,6 @@ #define UINT64_C(val) val##ULL -#include <stdlib.h> -#include <stdio.h> -#include <ctype.h> #define NTOSAPI #define printf TuiPrintf #include <ntddk.h> @@ -32,6 +29,12 @@ #include <arc/arc.h> #include <ketypes.h> #include <mmtypes.h> +#include <ndk/asm.h> +#include <ndk/rtlfuncs.h> +#include <ndk/ldrtypes.h> +#include <stdlib.h> +#include <stdio.h> +#include <ctype.h> #include <rosldr.h> #include <arch.h> #include <rtl.h> @@ -46,10 +49,6 @@ #include <inffile.h> #include <video.h> #include <ramdisk.h> -/* NDK, needed for ReactOS/Windows loaders */ -#include <ndk/asm.h> -#include <ndk/rtlfuncs.h> -#include <ndk/ldrtypes.h> #include <reactos.h> #include <registry.h> #include <winldr.h>

16 years, 1 month

[pschweitzer] 37674: Added a stubbed for VfatSetRenameInformation (it only handled one obvious case) Have a look to bug #3900

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Nov 26 14:00:18 2008 New Revision: 37674 URL: http://svn.reactos.org/svn/reactos?rev=37674&view=rev Log: Added a stubbed for VfatSetRenameInformation (it only handled one obvious case) Have a look to bug #3900 Modified: branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c Modified: branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Wed Nov 26 14:00:18 2008 @@ -748,6 +748,33 @@ return STATUS_SUCCESS; } +NTSTATUS +VfatSetRenameInformation(PVFAT_IRP_CONTEXT IrpContext) +{ + PIRP Irp; + PVFATFCB FCB, NewFCB; + PIO_STACK_LOCATION Stack; + PFILE_OBJECT FileObject, NewFileObject; + + DPRINT1("VfatSetRenameInformation is stubplemented!\n"); + + Irp = IrpContext->Irp; + Stack = IoGetCurrentIrpStackLocation(Irp); + + FileObject = IrpContext->FileObject; + FCB = FileObject->FsContext; + + NewFileObject = Stack->Parameters.SetFile.FileObject; + NewFCB = NewFileObject->FsContext; + + if (FsRtlAreNamesEqual(&(FCB->LongNameU), &(NewFCB->LongNameU), FALSE, NULL)) + { + return STATUS_SUCCESS; + } + + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS VfatQueryInformation(PVFAT_IRP_CONTEXT IrpContext) /* * FUNCTION: Retrieve the specified file information @@ -925,7 +952,7 @@ SystemBuffer); break; case FileRenameInformation: - RC = STATUS_NOT_IMPLEMENTED; + RC = VfatSetRenameInformation(IrpContext); break; default: RC = STATUS_NOT_SUPPORTED;

16 years, 1 month

← Newer
1
...
8
9
10
11
12
13
14
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008