Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[mbosma] 17539: Fill some more structs, that ms ddraw fill as well.
by mbosma＠svn.reactos.com 25 Aug '05

25 Aug '05

Fill some more structs, that ms ddraw fill as well. Modified: trunk/reactos/lib/ddraw/hal/ddraw.c Modified: trunk/reactos/lib/ddraw/main/ddraw.c Modified: trunk/reactos/lib/ddraw/main/surface.c Modified: trunk/reactos/lib/ddraw/main.c Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw.c --- trunk/reactos/lib/ddraw/hal/ddraw.c 2005-08-25 12:33:37 UTC (rev 17538) +++ trunk/reactos/lib/ddraw/hal/ddraw.c 2005-08-25 15:31:28 UTC (rev 17539) @@ -15,60 +15,88 @@ { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + /* get the object */ if(!DdCreateDirectDrawObject (&This->DirectDrawGlobal, This->hdc)) return DDERR_INVALIDPARAMS; - + + /* alloc some space */ + This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), 0, sizeof(DDHAL_CALLBACKS)); + memset(This->DirectDrawGlobal.lpDDCBtmp, 0, sizeof(DDHAL_CALLBACKS)); + This->HalInfo.lpDDCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->cbDDCallbacks; + This->HalInfo.lpDDSurfaceCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->cbDDSurfaceCallbacks; + This->HalInfo.lpDDExeBufCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->cbDDExeBufCallbacks; + This->HalInfo.lpDDPaletteCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->cbDDPaletteCallbacks; + This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(), 0, sizeof(D3DHAL_CALLBACKS)); + This->DirectDrawGlobal.lpD3DGlobalDriverData = (ULONG_PTR)HeapAlloc(GetProcessHeap(), 0, sizeof(D3DHAL_GLOBALDRIVERDATA)); + + /* fill the sizeofs */ This->HalInfo.dwSize = sizeof(DDHALINFO); - This->D3dDriverData.dwSize = sizeof(D3DHAL_GLOBALDRIVERDATA); - This->DriverCallbacks.DdMain.dwSize = sizeof(DDHAL_DDCALLBACKS); - This->DriverCallbacks.DdSurface.dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); - This->DriverCallbacks.DdPalette.dwSize = sizeof(DDHAL_DDPALETTECALLBACKS); - This->DriverCallbacks.D3dMain.dwSize = sizeof(D3DHAL_CALLBACKS); - This->DriverCallbacks.D3dBufferCallbacks.dwSize = sizeof(DDHAL_DDEXEBUFCALLBACKS); - + This->HalInfo.lpDDCallbacks->dwSize = sizeof(DDHAL_DDCALLBACKS); + This->HalInfo.lpDDSurfaceCallbacks->dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); + This->HalInfo.lpDDPaletteCallbacks->dwSize = sizeof(DDHAL_DDPALETTECALLBACKS); + This->HalInfo.lpDDExeBufCallbacks->dwSize = sizeof(DDHAL_DDEXEBUFCALLBACKS); + ((LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks)->dwSize = sizeof(D3DHAL_CALLBACKS); + ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->dwSize = sizeof(D3DHAL_GLOBALDRIVERDATA); + + /* query all kinds of infos from the driver */ if(!DdQueryDirectDrawObject ( &This->DirectDrawGlobal, &This->HalInfo, - &This->DriverCallbacks.DdMain, - &This->DriverCallbacks.DdSurface, - &This->DriverCallbacks.DdPalette, - &This->DriverCallbacks.D3dMain, - &This->D3dDriverData, - &This->DriverCallbacks.D3dBufferCallbacks, + This->HalInfo.lpDDCallbacks, + This->HalInfo.lpDDSurfaceCallbacks, + This->HalInfo.lpDDPaletteCallbacks, + (LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks, + (LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData, + This->HalInfo.lpDDExeBufCallbacks, NULL, NULL, NULL )) - return DDERR_INVALIDPARAMS; + { + OutputDebugString(L"First DdQueryDirectDrawObject failed"); + return 1; + } - This->pD3dTextureFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDSURFACEDESC) * This->D3dDriverData.dwNumTextureFormats); + /* ms wants us to call that function twice */ This->HalInfo.vmiData.pvmList = HeapAlloc(GetProcessHeap(), 0, sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps); This->DirectDrawGlobal.lpdwFourCC = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * This->HalInfo.ddCaps.dwNumFourCCCodes); This->DirectDrawGlobal.lpZPixelFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDPIXELFORMAT) * This->DirectDrawGlobal.dwNumZPixelFormats); + ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDSURFACEDESC) * ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->dwNumTextureFormats); if(!DdQueryDirectDrawObject ( &This->DirectDrawGlobal, &This->HalInfo, - &This->DriverCallbacks.DdMain, - &This->DriverCallbacks.DdSurface, - &This->DriverCallbacks.DdPalette, - &This->DriverCallbacks.D3dMain, - &This->D3dDriverData, - &This->DriverCallbacks.D3dBufferCallbacks, - This->pD3dTextureFormats, + This->HalInfo.lpDDCallbacks, + This->HalInfo.lpDDSurfaceCallbacks, + This->HalInfo.lpDDPaletteCallbacks, + (LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks, + (LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData, + This->HalInfo.lpDDExeBufCallbacks, + ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats, This->DirectDrawGlobal.lpdwFourCC, - This->HalInfo.vmiData.pvmList )) - return DDERR_INVALIDPARAMS; + This->HalInfo.vmiData.pvmList + )) + { + OutputDebugString(L"Second DdQueryDirectDrawObject failed"); + return 1; + } + /* fill some extra data */ This->DirectDrawGlobal.vmiData.dwDisplayWidth = This->Width; This->DirectDrawGlobal.vmiData.dwDisplayHeight = This->Height; This->DirectDrawGlobal.vmiData.lDisplayPitch = This->Width * This->Bpp/8; - //This->DirectDrawGlobal.vmiData.ddpfDisplay; // This has to be filled This->DirectDrawGlobal.vmiData.dwOffscreenAlign = 64; This->DirectDrawGlobal.vmiData.dwOverlayAlign = 64; This->DirectDrawGlobal.vmiData.dwTextureAlign = 64; This->DirectDrawGlobal.vmiData.dwZBufferAlign = 64; This->DirectDrawGlobal.vmiData.dwAlphaAlign = 64; + //This->DirectDrawGlobal.vmiData.ddpfDisplay; // This has to be filled + This->DirectDrawGlobal.ddCaps = This->HalInfo.ddCaps; + This->DirectDrawGlobal.lpDDCBtmp->HALDD = This->DirectDrawGlobal.lpDDCBtmp->cbDDCallbacks; + This->DirectDrawGlobal.lpDDCBtmp->HALDDSurface = This->DirectDrawGlobal.lpDDCBtmp->cbDDSurfaceCallbacks; + This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf = This->DirectDrawGlobal.lpDDCBtmp->cbDDExeBufCallbacks; + This->DirectDrawGlobal.lpDDCBtmp->HALDDPalette = This->DirectDrawGlobal.lpDDCBtmp->cbDDPaletteCallbacks; + return DD_OK; } @@ -82,11 +110,20 @@ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; DdDeleteDirectDrawObject (&This->DirectDrawGlobal); - - if(This->pD3dTextureFormats) - HeapFree(GetProcessHeap(), 0, This->pD3dTextureFormats); + + if(This->HalInfo.vmiData.pvmList) + HeapFree(GetProcessHeap(), 0, This->HalInfo.vmiData.pvmList); if(This->DirectDrawGlobal.lpdwFourCC) HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpdwFourCC); - if(This->HalInfo.vmiData.pvmList) - HeapFree(GetProcessHeap(), 0, This->HalInfo.vmiData.pvmList); + if(This->DirectDrawGlobal.lpZPixelFormats) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpZPixelFormats); + if(((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverD ata)->lpTextureFormats) + HeapFree(GetProcessHeap(), 0, ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats); + + if(This->DirectDrawGlobal.lpDDCBtmp) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDCBtmp); + if(This->DirectDrawGlobal.lpD3DHALCallbacks) + HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks); + if(This->DirectDrawGlobal.lpD3DGlobalDriverData) + HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DGlobalDriverData); } _____ Modified: trunk/reactos/lib/ddraw/main/ddraw.c --- trunk/reactos/lib/ddraw/main/ddraw.c 2005-08-25 12:33:37 UTC (rev 17538) +++ trunk/reactos/lib/ddraw/main/ddraw.c 2005-08-25 15:31:28 UTC (rev 17539) @@ -25,8 +25,8 @@ // get the HDC This->hdc = GetWindowDC(GetDesktopWindow()); - This->Height = GetDeviceCaps(This->hdc, HORZRES); - This->Width = GetDeviceCaps(This->hdc, VERTRES); + This->Height = GetDeviceCaps(This->hdc, VERTRES); + This->Width = GetDeviceCaps(This->hdc, HORZRES); This->Bpp = GetDeviceCaps(This->hdc, BITSPIXEL); // call software first @@ -151,7 +151,7 @@ ULONG WINAPI Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->DirectDrawGlobal.dwRefCnt); return ref; } @@ -159,7 +159,7 @@ ULONG WINAPI Main_DirectDraw_Release (LPDIRECTDRAW7 iface) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - ULONG ref = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->DirectDrawGlobal.dwRefCnt); if (ref == 0) { _____ Modified: trunk/reactos/lib/ddraw/main/surface.c --- trunk/reactos/lib/ddraw/main/surface.c 2005-08-25 12:33:37 UTC (rev 17538) +++ trunk/reactos/lib/ddraw/main/surface.c 2005-08-25 15:31:28 UTC (rev 17539) @@ -25,74 +25,71 @@ return DDERR_INVALIDPARAMS; This->owner = (IDirectDrawImpl*)pDD; + + /* can the driver create the surface */ + DDHAL_CANCREATESURFACEDATA CanCreateData; + memset(&CanCreateData, 0, sizeof(DD_CANCREATESURFACEDATA)); + CanCreateData.lpDD = &This->owner->DirectDrawGlobal; + CanCreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD; + CanCreateData.CanCreateSurface = This->owner->HalInfo.lpDDCallbacks->CanCreateSurface; + + if (CanCreateData.CanCreateSurface(&CanCreateData) == DDHAL_DRIVER_NOTHANDLED) + return DDERR_INVALIDPARAMS; + + if(CanCreateData.ddRVal != DD_OK) + return CanCreateData.ddRVal; - // Surface Global Struct + /* surface global struct */ DDRAWI_DDRAWSURFACE_GBL Global; memset(&Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - - if(pDDSD->ddsCaps.dwCaps == DDSCAPS_PRIMARYSURFACE) - Global.dwGlobalFlags |= DDRAWISURFGBL_ISGDISURFACE; - Global.lpDD = &This->owner->DirectDrawGlobal; Global.wHeight = This->owner->Height; Global.wWidth = This->owner->Width; Global.dwLinearSize = Global.wWidth * This->owner->Bpp/8; - // Surface More Struct + /* surface more struct */ DDRAWI_DDRAWSURFACE_MORE More; memset(&More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); More.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - // Surface Local Struct + /* surface local struct */ DDRAWI_DDRAWSURFACE_LCL Local; memset(&Local, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); Local.lpGbl = &Global; Local.lpSurfMore = &More; Local.ddsCaps = *(DDSCAPS*)&pDDSD->ddsCaps; - - // BitDepth = DDSurf_BitDepth(psurf); ? - + /* we need to set some flags if we create the primary surface */ if(pDDSD->ddsCaps.dwCaps == DDSCAPS_PRIMARYSURFACE) + { Local.dwFlags |= DDRAWISURF_FRONTBUFFER; + Global.dwGlobalFlags |= DDRAWISURFGBL_ISGDISURFACE; + } - DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; // for stupid double pointer below + /* for the double pointer below */ + DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; + pLocal[0] = &Local; + pLocal[1] = NULL; // we need this one for bad written drivers - pLocal[0] = &Local; - pLocal[1] = NULL; - - // The Parameter Struct + /* the parameter struct */ DDHAL_CREATESURFACEDATA CreateData; memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA)); CreateData.lpDD = &This->owner->DirectDrawGlobal; CreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD; CreateData.dwSCnt = 1; CreateData.lplpSList = pLocal; - + CreateData.CreateSurface = This->owner->HalInfo.lpDDCallbacks->CreateSurface; - - DDHAL_CANCREATESURFACEDATA CanCreateData; - memset(&CanCreateData, 0, sizeof(DD_CANCREATESURFACEDATA)); - CanCreateData.lpDD = &This->owner->DirectDrawGlobal; - CanCreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD; - - - if (This->owner->DriverCallbacks.DdMain.CanCreateSurface (&CanCreateData) == DDHAL_DRIVER_NOTHANDLED) - return DDERR_INVALIDPARAMS; - - if(CanCreateData.ddRVal != DD_OK) - return CanCreateData.ddRVal; - - - if(This->owner->DriverCallbacks.DdMain.CreateSurface (&CreateData) == DDHAL_DRIVER_NOTHANDLED) + /* this is the call we were waiting for */ + if(CreateData.CreateSurface(&CreateData) == DDHAL_DRIVER_NOTHANDLED) return DDERR_INVALIDPARAMS; if(CreateData.ddRVal != DD_OK) return CreateData.ddRVal; + OutputDebugString(L"This does not get hit :( "); + OutputDebugString(L"Yet ;)"); - OutputDebugString(L"This does not get hit."); - return DD_OK; } @@ -122,7 +119,7 @@ ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7 iface) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) _____ Modified: trunk/reactos/lib/ddraw/main.c --- trunk/reactos/lib/ddraw/main.c 2005-08-25 12:33:37 UTC (rev 17538) +++ trunk/reactos/lib/ddraw/main.c 2005-08-25 15:31:28 UTC (rev 17539) @@ -24,7 +24,7 @@ ZeroMemory(This,sizeof(IDirectDrawImpl)); This->lpVtbl = &DirectDraw_VTable; - This->ref = 1; + This->DirectDrawGlobal.dwRefCnt = 1; *pIface = (LPDIRECTDRAW)This; return This->lpVtbl->Initialize ((LPDIRECTDRAW7)This, pGUID); @@ -39,7 +39,6 @@ return DDERR_INVALIDPARAMS; } - return Create_DirectDraw (lpGUID, lplpDD, pUnkOuter, FALSE); } _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-08-25 12:33:37 UTC (rev 17538) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-08-25 15:31:28 UTC (rev 17539) @@ -18,23 +18,9 @@ typedef struct { - DDHAL_DDCALLBACKS DdMain; - DDHAL_DDSURFACECALLBACKS DdSurface; - DDHAL_DDPALETTECALLBACKS DdPalette; - D3DHAL_CALLBACKS D3dMain; - DDHAL_DDEXEBUFCALLBACKS D3dBufferCallbacks; - -} DRIVERCALLBACKS; - -typedef struct -{ IDirectDraw7Vtbl* lpVtbl; - DRIVERCALLBACKS DriverCallbacks; - DWORD ref; - + DDRAWI_DIRECTDRAW_GBL DirectDrawGlobal; DDHALINFO HalInfo; - D3DHAL_GLOBALDRIVERDATA D3dDriverData; - LPDDSURFACEDESC pD3dTextureFormats; HWND window; DWORD cooperative_level; @@ -42,7 +28,6 @@ int Height, Width, Bpp; GUID* lpGUID; - DDRAWI_DIRECTDRAW_GBL DirectDrawGlobal; } IDirectDrawImpl;

1 0

[hbirr] 17538: Fixed a bug in RtlLeaveCriticalSection. We have only to signal the event if someone waits on it.
by hbirr＠svn.reactos.com 25 Aug '05

25 Aug '05

Fixed a bug in RtlLeaveCriticalSection. We have only to signal the event if someone waits on it. Modified: trunk/reactos/lib/ntdll/rtl/critical.c _____ Modified: trunk/reactos/lib/ntdll/rtl/critical.c --- trunk/reactos/lib/ntdll/rtl/critical.c 2005-08-25 12:30:10 UTC (rev 17537) +++ trunk/reactos/lib/ntdll/rtl/critical.c 2005-08-25 12:33:37 UTC (rev 17538) @@ -329,10 +329,11 @@ CriticalSection->OwningThread = 0; /* Was someone wanting us? This needs to be done atomically. */ - InterlockedDecrement(&CriticalSection->LockCount); + if (-1 != InterlockedDecrement(&CriticalSection->LockCount)) { - /* Let him have us */ - RtlpUnWaitCriticalSection(CriticalSection); + /* Let him have us */ + RtlpUnWaitCriticalSection(CriticalSection); + } } /* Sucessful! */

1 0

[weiden] 17537: minor simplifications
by weiden＠svn.reactos.com 25 Aug '05

25 Aug '05

minor simplifications Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-08-25 12:27:25 UTC (rev 17536) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-08-25 12:30:10 UTC (rev 17537) @@ -833,12 +833,14 @@ { return RtlNtStatusToDosError(Status); } + + KeyHandle = SubKeyHandle; } RtlInitUnicodeString(&ValueName, (LPWSTR)lpValueName); - Status = NtDeleteValueKey((SubKeyHandle != NULL) ? SubKeyHandle : KeyHandle, + Status = NtDeleteValueKey(KeyHandle, &ValueName); if (SubKeyHandle != NULL) @@ -944,6 +946,8 @@ { return RtlNtStatusToDosError(Status); } + + KeyHandle = SubKeyHandle; } /* FIXME - delete all keys recursively */ @@ -1041,9 +1045,11 @@ { return RtlNtStatusToDosError(Status); } + + KeyHandle = SubKeyHandle; } - Ret = RegSetValueExW((SubKeyHandle != NULL) ? SubKeyHandle : KeyHandle, + Ret = RegSetValueExW(KeyHandle, lpValueName, 0, dwType, @@ -1110,9 +1116,11 @@ { return RtlNtStatusToDosError(Status); } + + KeyHandle = SubKeyHandle; } - Ret = RegSetValueExA((SubKeyHandle != NULL) ? SubKeyHandle : KeyHandle, + Ret = RegSetValueExA(KeyHandle, lpValueName, 0, dwType,

1 0

[weiden] 17536: open subkey with sufficient rights in RegDeleteTree
by weiden＠svn.reactos.com 25 Aug '05

25 Aug '05

open subkey with sufficient rights in RegDeleteTree Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-08-25 12:25:11 UTC (rev 17535) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-08-25 12:27:25 UTC (rev 17536) @@ -938,7 +938,7 @@ NULL); Status = NtOpenKey(&SubKeyHandle, - KEY_READ, + DELETE | KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, &ObjectAttributes); if (!NT_SUCCESS(Status)) {

1 0

[weiden] 17535: added stubs for RegDeleteTreeA/W() and RegCopyTreeA/W()
by weiden＠svn.reactos.com 25 Aug '05

25 Aug '05

added stubs for RegDeleteTreeA/W() and RegCopyTreeA/W() Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-08-25 11:36:49 UTC (rev 17534) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-08-25 12:25:11 UTC (rev 17535) @@ -467,6 +467,8 @@ RegCloseKey@4 RegConnectRegistryA@12 RegConnectRegistryW@12 +RegCopyTreeA@12 +RegCopyTreeW@12 RegCreateKeyA@12 RegCreateKeyExA@36 RegCreateKeyExW@36 @@ -475,6 +477,8 @@ RegDeleteKeyW@8 RegDeleteKeyValueA@12 RegDeleteKeyValueW@12 +RegDeleteTreeA@8 +RegDeleteTreeW@8 RegDeleteValueA@8 RegDeleteValueW@8 ;RegDisablePredefinedCache _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-08-25 11:36:49 UTC (rev 17534) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-08-25 12:25:11 UTC (rev 17535) @@ -298,6 +298,108 @@ /*********************************************************************** * + * RegCopyTreeW + * + * @unimplemented + */ +LONG STDCALL +RegCopyTreeW(IN HKEY hKeySrc, + IN LPCWSTR lpSubKey OPTIONAL, + IN HKEY hKeyDest) +{ + HANDLE DestKeyHandle, KeyHandle, SubKeyHandle = NULL; + NTSTATUS Status; + + Status = MapDefaultKey(&KeyHandle, + hKeySrc); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + Status = MapDefaultKey(&DestKeyHandle, + hKeyDest); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + if (lpSubKey != NULL) + { + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING SubKeyName; + + RtlInitUnicodeString(&SubKeyName, + (LPWSTR)lpSubKey); + + InitializeObjectAttributes(&ObjectAttributes, + &SubKeyName, + OBJ_CASE_INSENSITIVE, + KeyHandle, + NULL); + + Status = NtOpenKey(&SubKeyHandle, + KEY_READ, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + } + + /* FIXME - copy all keys and values recursively */ + Status = STATUS_NOT_IMPLEMENTED; + + if (SubKeyHandle != NULL) + { + NtClose(SubKeyHandle); + } + + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + return ERROR_SUCCESS; +} + + +/********************************************************************** ** + * RegCopyTreeA + * + * @implemented + */ +LONG STDCALL +RegCopyTreeA(IN HKEY hKeySrc, + IN LPCSTR lpSubKey OPTIONAL, + IN HKEY hKeyDest) +{ + UNICODE_STRING SubKeyName; + LONG Ret; + + if (lpSubKey != NULL) + { + if (!RtlCreateUnicodeStringFromAsciiz(&SubKeyName, + (LPSTR)lpSubKey)) + { + return ERROR_NOT_ENOUGH_MEMORY; + } + } + else + RtlInitUnicodeString(&SubKeyName, + NULL); + + Ret = RegCopyTreeW(hKeySrc, + SubKeyName.Buffer, + hKeyDest); + + RtlFreeUnicodeString(&SubKeyName); + + return Ret; +} + + +/********************************************************************** ** * RegConnectRegistryW * * @unimplemented @@ -803,6 +905,98 @@ /*********************************************************************** * + * RegDeleteTreeW + * + * @unimplemented + */ +LONG STDCALL +RegDeleteTreeW(IN HKEY hKey, + IN LPCWSTR lpSubKey OPTIONAL) +{ + HANDLE KeyHandle, SubKeyHandle = NULL; + NTSTATUS Status; + + Status = MapDefaultKey(&KeyHandle, + hKey); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + if (lpSubKey != NULL) + { + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING SubKeyName; + + RtlInitUnicodeString(&SubKeyName, + (LPWSTR)lpSubKey); + + InitializeObjectAttributes(&ObjectAttributes, + &SubKeyName, + OBJ_CASE_INSENSITIVE, + KeyHandle, + NULL); + + Status = NtOpenKey(&SubKeyHandle, + KEY_READ, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + } + + /* FIXME - delete all keys recursively */ + Status = STATUS_NOT_IMPLEMENTED; + + if (SubKeyHandle != NULL) + { + NtClose(SubKeyHandle); + } + + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError(Status); + } + + return ERROR_SUCCESS; +} + + +/********************************************************************** ** + * RegDeleteTreeA + * + * @implemented + */ +LONG STDCALL +RegDeleteTreeA(IN HKEY hKey, + IN LPCSTR lpSubKey OPTIONAL) +{ + UNICODE_STRING SubKeyName; + LONG Ret; + + if (lpSubKey != NULL) + { + if (!RtlCreateUnicodeStringFromAsciiz(&SubKeyName, + (LPSTR)lpSubKey)) + { + return ERROR_NOT_ENOUGH_MEMORY; + } + } + else + RtlInitUnicodeString(&SubKeyName, + NULL); + + Ret = RegDeleteTreeW(hKey, + SubKeyName.Buffer); + + RtlFreeUnicodeString(&SubKeyName); + + return Ret; +} + + +/********************************************************************** ** * RegSetKeyValueW * * @implemented @@ -897,7 +1091,7 @@ if (!RtlCreateUnicodeStringFromAsciiz(&SubKeyName, (LPSTR)lpSubKey)) { - return RtlNtStatusToDosError(Status); + return ERROR_NOT_ENOUGH_MEMORY; } InitializeObjectAttributes(&ObjectAttributes,

1 0

[mbosma] 17534: Change Install Name to ddraw_demo.exe
by mbosma＠svn.reactos.com 25 Aug '05

25 Aug '05

Change Install Name to ddraw_demo.exe Modified: trunk/rosapps/demos/ddraw/ddraw.xml _____ Modified: trunk/rosapps/demos/ddraw/ddraw.xml --- trunk/rosapps/demos/ddraw/ddraw.xml 2005-08-25 01:44:23 UTC (rev 17533) +++ trunk/rosapps/demos/ddraw/ddraw.xml 2005-08-25 11:36:49 UTC (rev 17534) @@ -1,4 +1,4 @@ -<module name="ddraw_demo" type="win32gui" installbase="system32" installname="ddraw.exe"> +´??<module name="ddraw_demo" type="win32gui" installbase="system32" installname="ddraw_demo.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" />

1 0

[royce] 17533: $default_cfg fix
by royce＠svn.reactos.com 25 Aug '05

25 Aug '05

$default_cfg fix cleaned up more code that isn't enabled yet generate correct line endings on *nix, too Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-08-25 01:31:21 UTC (rev 17532) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-08-25 01:44:23 UTC (rev 17533) @@ -65,7 +65,7 @@ ProcessModules(); - m_dswFile = fopen ( filename.c_str(), "w" ); + m_dswFile = fopen ( filename.c_str(), "wb" ); if ( !m_dswFile ) { _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-08-25 01:31:21 UTC (rev 17532) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-08-25 01:44:23 UTC (rev 17533) @@ -20,8 +20,8 @@ const bool wine = false; string dsp_file = DspFileName(module); - printf ( "Creating MSVC project: '%s'\n", dsp_file.c_str() ); - FILE* OUT = fopen ( dsp_file.c_str(), "w" ); + printf ( "Creating MSVC project: '%s'\r\n", dsp_file.c_str() ); + FILE* OUT = fopen ( dsp_file.c_str(), "wb" ); vector<string> imports; for ( i = 0; i < module.non_if_data.libraries.size(); i++ ) @@ -84,9 +84,9 @@ // TODO FIXME - wine hack? /*if (module.name !~ /^wine(?:_unicode|build|runtests|test)?$/ && module.name !~ /^(?:gdi32)_.+?$/ && - module.name !~ /_test$/) + Right ( module.name, 5 ) == "_test" ) { - push @source_files, "$project.spec" ); + source_files.push_back ( module.name + ".spec" ); @source_files = sort(@source_files); }*/ @@ -94,7 +94,7 @@ bool no_msvc_headers = true; // TODO FIXME - wine hack? /*if (module.name =~ /^wine(?:runtests|test)$/ - || module.name =~ /_test$/) + || Right ( module.name, 5 ) == "_test" ) { no_msvc_headers = false; }*/ @@ -142,64 +142,64 @@ string default_cfg = cfgs.back(); - fprintf ( OUT, "# Microsoft Developer Studio Project File - Name=\"%s\" - Package Owner=<4>\n", module.name.c_str() ); - fprintf ( OUT, "# Microsoft Developer Studio Generated Build File, Format Version 6.00\n" ); - fprintf ( OUT, "# ** DO NOT EDIT **\n" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "# Microsoft Developer Studio Project File - Name=\"%s\" - Package Owner=<4>\r\n", module.name.c_str() ); + fprintf ( OUT, "# Microsoft Developer Studio Generated Build File, Format Version 6.00\r\n" ); + fprintf ( OUT, "# ** DO NOT EDIT **\r\n" ); + fprintf ( OUT, "\r\n" ); if ( lib ) { - fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Static Library\" 0x0104\n" ); + fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Static Library\" 0x0104\r\n" ); } else if ( dll ) { - fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Dynamic-Link Library\" 0x0102\n" ); + fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Dynamic-Link Library\" 0x0102\r\n" ); } else { - fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Console Application\" 0x0103\n" ); + fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Console Application\" 0x0103\r\n" ); } - fprintf ( OUT, "\n" ); + fprintf ( OUT, "\r\n" ); - fprintf ( OUT, "CFG=$default_cfg\n" ); - fprintf ( OUT, "!MESSAGE This is not a valid makefile. To build this project using NMAKE,\n" ); - fprintf ( OUT, "!MESSAGE use the Export Makefile command and run\n" ); - fprintf ( OUT, "!MESSAGE \n" ); - fprintf ( OUT, "!MESSAGE NMAKE /f \"%s.mak\".\n", module.name.c_str() ); - fprintf ( OUT, "!MESSAGE \n" ); - fprintf ( OUT, "!MESSAGE You can specify a configuration when running NMAKE\n" ); - fprintf ( OUT, "!MESSAGE by defining the macro CFG on the command line. For example:\n" ); - fprintf ( OUT, "!MESSAGE \n" ); - fprintf ( OUT, "!MESSAGE NMAKE /f \"%s.mak\" CFG=\"%s\"\n", module.name.c_str(), default_cfg.c_str() ); - fprintf ( OUT, "!MESSAGE \n" ); - fprintf ( OUT, "!MESSAGE Possible choices for configuration are:\n" ); - fprintf ( OUT, "!MESSAGE \n" ); + fprintf ( OUT, "CFG=%s\r\n", default_cfg.c_str() ); + fprintf ( OUT, "!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r\n" ); + fprintf ( OUT, "!MESSAGE use the Export Makefile command and run\r\n" ); + fprintf ( OUT, "!MESSAGE \r\n" ); + fprintf ( OUT, "!MESSAGE NMAKE /f \"%s.mak\".\r\n", module.name.c_str() ); + fprintf ( OUT, "!MESSAGE \r\n" ); + fprintf ( OUT, "!MESSAGE You can specify a configuration when running NMAKE\r\n" ); + fprintf ( OUT, "!MESSAGE by defining the macro CFG on the command line. For example:\r\n" ); + fprintf ( OUT, "!MESSAGE \r\n" ); + fprintf ( OUT, "!MESSAGE NMAKE /f \"%s.mak\" CFG=\"%s\"\r\n", module.name.c_str(), default_cfg.c_str() ); + fprintf ( OUT, "!MESSAGE \r\n" ); + fprintf ( OUT, "!MESSAGE Possible choices for configuration are:\r\n" ); + fprintf ( OUT, "!MESSAGE \r\n" ); for ( i = 0; i < cfgs.size(); i++ ) { const string& cfg = cfgs[i]; if ( lib ) { - fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Static Library\")\n", cfg.c_str() ); + fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Static Library\")\r\n", cfg.c_str() ); } else if ( dll ) { - fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Dynamic-Link Library\")\n", cfg.c_str() ); + fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Dynamic-Link Library\")\r\n", cfg.c_str() ); } else { - fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Console Application\")\n", cfg.c_str() ); + fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Console Application\")\r\n", cfg.c_str() ); } } - fprintf ( OUT, "!MESSAGE \n" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "!MESSAGE \r\n" ); + fprintf ( OUT, "\r\n" ); - fprintf ( OUT, "# Begin Project\n" ); - fprintf ( OUT, "# PROP AllowPerConfigDependencies 0\n" ); - fprintf ( OUT, "# PROP Scc_ProjName \"\"\n" ); - fprintf ( OUT, "# PROP Scc_LocalPath \"\"\n" ); - fprintf ( OUT, "CPP=cl.exe\n" ); - if ( !lib && !exe ) fprintf ( OUT, "MTL=midl.exe\n" ); - fprintf ( OUT, "RSC=rc.exe\n" ); + fprintf ( OUT, "# Begin Project\r\n" ); + fprintf ( OUT, "# PROP AllowPerConfigDependencies 0\r\n" ); + fprintf ( OUT, "# PROP Scc_ProjName \"\"\r\n" ); + fprintf ( OUT, "# PROP Scc_LocalPath \"\"\r\n" ); + fprintf ( OUT, "CPP=cl.exe\r\n" ); + if ( !lib && !exe ) fprintf ( OUT, "MTL=midl.exe\r\n" ); + fprintf ( OUT, "RSC=rc.exe\r\n" ); int n = 0; @@ -211,29 +211,29 @@ { if ( n == 0 ) { - fprintf ( OUT, "!IF \"$(CFG)\" == \"%s\"\n", cfg.c_str() ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "!IF \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() ); + fprintf ( OUT, "\r\n" ); } else { - fprintf ( OUT, "\n" ); - fprintf ( OUT, "!ELSEIF \"$(CFG)\" == \"%s\"\n", cfg.c_str() ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "!ELSEIF \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() ); + fprintf ( OUT, "\r\n" ); } } bool debug = !strstr ( cfg.c_str(), "Release" ); bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) ); - fprintf ( OUT, "# PROP BASE Use_MFC 0\n" ); + fprintf ( OUT, "# PROP BASE Use_MFC 0\r\n" ); if ( debug ) { - fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 1\n" ); + fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 1\r\n" ); } else { - fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 0\n" ); + fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 0\r\n" ); } output_dir = Replace(cfg,module.name + " - ",""); @@ -243,25 +243,25 @@ //if ( output_prefix_dir.size() ) // output_dir = output_prefix_dir + "\\" + output_dir; - fprintf ( OUT, "# PROP BASE Output_Dir \"%s\"\n", output_dir.c_str() ); - fprintf ( OUT, "# PROP BASE Intermediate_Dir \"%s\"\n", output_dir.c_str() ); + fprintf ( OUT, "# PROP BASE Output_Dir \"%s\"\r\n", output_dir.c_str() ); + fprintf ( OUT, "# PROP BASE Intermediate_Dir \"%s\"\r\n", output_dir.c_str() ); - fprintf ( OUT, "# PROP BASE Target_Dir \"\"\n" ); + fprintf ( OUT, "# PROP BASE Target_Dir \"\"\r\n" ); - fprintf ( OUT, "# PROP Use_MFC 0\n" ); + fprintf ( OUT, "# PROP Use_MFC 0\r\n" ); if ( debug ) { - fprintf ( OUT, "# PROP Use_Debug_Libraries 1\n" ); + fprintf ( OUT, "# PROP Use_Debug_Libraries 1\r\n" ); } else { - fprintf ( OUT, "# PROP Use_Debug_Libraries 0\n" ); + fprintf ( OUT, "# PROP Use_Debug_Libraries 0\r\n" ); } - fprintf ( OUT, "# PROP Output_Dir \"%s\"\n", output_dir.c_str() ); - fprintf ( OUT, "# PROP Intermediate_Dir \"%s\"\n", output_dir.c_str() ); + fprintf ( OUT, "# PROP Output_Dir \"%s\"\r\n", output_dir.c_str() ); + fprintf ( OUT, "# PROP Intermediate_Dir \"%s\"\r\n", output_dir.c_str() ); - if ( dll ) fprintf ( OUT, "# PROP Ignore_Export_Lib 0\n" ); - fprintf ( OUT, "# PROP Target_Dir \"\"\n" ); + if ( dll ) fprintf ( OUT, "# PROP Ignore_Export_Lib 0\r\n" ); + fprintf ( OUT, "# PROP Target_Dir \"\"\r\n" ); vector<string> defines; defines.push_back ( "WINVER=0x0501" ); @@ -318,7 +318,7 @@ if ( lib || exe ) fprintf ( OUT, " " ); } fprintf ( OUT, " /c" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "\r\n" ); vector<string> defines2; defines2.push_back ( "WINVER=0x0501" ); @@ -373,16 +373,18 @@ defines2.push_back ( "_X86_" ); // TODO FIXME - wine hacks? - /*if($project =~ /^gdi32_(?:enhmfdrv|mfdrv)$/) { + /*if(module.name =~ /^gdi32_(?:enhmfdrv|mfdrv)$/) { push @includes, ".." ); } - if ($project =~ /_test$/) { - push @includes, "$msvc_wine_dir\\$output_dir" ); + if ( strstr ( module.name.c_str(), "_test" ) + { + include.push_back ( msvc_wine_dir + "\\" + output_dir ); } - if (!$msvc_headers || $project eq "winetest") { - push @includes, $wine_include_dir; + if (!msvc_headers || module.name == "winetest") + { + includes.push_back ( wine_include_dir ); }*/ } @@ -415,7 +417,7 @@ } } if ( wine ) fprintf ( OUT, " /D inline=__inline" ); - //fprintf ( OUT, " /D \"__STDC__\"" if 0 && $wine; + if ( 0 && wine ) fprintf ( OUT, " /D \"__STDC__\"" ); fprintf ( OUT, lib ? " /YX" : " /FR" ); fprintf ( OUT, " /FD" ); @@ -423,17 +425,17 @@ if ( debug && lib ) fprintf ( OUT, " " ); fprintf ( OUT, " /c" ); if ( !no_cpp ) fprintf ( OUT, " /TP" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "\r\n" ); if ( debug ) { if ( dll ) { - fprintf ( OUT, "# SUBTRACT CPP /X /YX\n" ); - fprintf ( OUT, "# ADD BASE MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\n" ); - fprintf ( OUT, "# ADD MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\n" ); + fprintf ( OUT, "# SUBTRACT CPP /X /YX\r\n" ); + fprintf ( OUT, "# ADD BASE MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\r\n" ); + fprintf ( OUT, "# ADD MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\r\n" ); } - fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"_DEBUG\"\n" ); + fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"_DEBUG\"\r\n" ); fprintf ( OUT, "# ADD RSC /l 0x41d" ); if ( wine ) { @@ -442,32 +444,32 @@ fprintf ( OUT, " /i \"%s\"", includes[i].c_str() ); } } - fprintf ( OUT, " /d \"_DEBUG\"\n" ); + fprintf ( OUT, " /d \"_DEBUG\"\r\n" ); } else { if ( dll ) { - fprintf ( OUT, "# SUBTRACT CPP /YX\n" ); - fprintf ( OUT, "# ADD BASE MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\n" ); - fprintf ( OUT, "# ADD MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\n" ); + fprintf ( OUT, "# SUBTRACT CPP /YX\r\n" ); + fprintf ( OUT, "# ADD BASE MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\r\n" ); + fprintf ( OUT, "# ADD MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\r\n" ); } - fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"NDEBUG\"\n" ); + fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"NDEBUG\"\r\n" ); fprintf ( OUT, "# ADD RSC /l 0x41d" ); if ( wine ) { for ( i = 0; i < includes.size(); i++ ) fprintf ( OUT, " /i \"%s\"", includes[i].c_str() ); } - fprintf ( OUT, "/d \"NDEBUG\"\n" ); + fprintf ( OUT, "/d \"NDEBUG\"\r\n" ); } - fprintf ( OUT, "BSC32=bscmake.exe\n" ); - fprintf ( OUT, "# ADD BASE BSC32 /nologo\n" ); - fprintf ( OUT, "# ADD BSC32 /nologo\n" ); + fprintf ( OUT, "BSC32=bscmake.exe\r\n" ); + fprintf ( OUT, "# ADD BASE BSC32 /nologo\r\n" ); + fprintf ( OUT, "# ADD BSC32 /nologo\r\n" ); if ( exe || dll ) { - fprintf ( OUT, "LINK32=link.exe\n" ); + fprintf ( OUT, "LINK32=link.exe\r\n" ); fprintf ( OUT, "# ADD BASE LINK32 " ); vector<string> libraries; libraries.push_back ( "kernel32.lib" ); @@ -492,12 +494,12 @@ if ( debug ) fprintf ( OUT, " /debug" ); fprintf ( OUT, " /machine:I386" ); if ( debug ) fprintf ( OUT, " /pdbtype:sept" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "\r\n" ); fprintf ( OUT, "# ADD LINK32" ); fprintf ( OUT, " /nologo" ); // TODO FIXME - do we need their kludge? - //fprintf ( OUT, " libcmt.lib" if $project =~ /^ntdll$/; # FIXME: Kludge + //if ( module.name == "ntdll" ) fprintf ( OUT, " libcmt.lib" ); // FIXME: Kludge for ( i = 0; i < imports.size(); i++ ) { const string& import = imports[i]; @@ -509,16 +511,16 @@ if ( debug ) fprintf ( OUT, " /debug" ); fprintf ( OUT, " /machine:I386" ); // TODO FIXME - do we need their kludge? - //fprintf ( OUT, " /nodefaultlib" if $project =~ /^ntdll$/; # FIXME: Kludge + //if ( module.name == "ntdll" ) fprintf ( OUT, " /nodefaultlib" ); // FIXME: Kludge if ( dll ) fprintf ( OUT, " /def:\"%s.def\"", module.name.c_str() ); if ( debug ) fprintf ( OUT, " /pdbtype:sept" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "\r\n" ); } else { - fprintf ( OUT, "LIB32=link.exe -lib\n" ); - fprintf ( OUT, "# ADD BASE LIB32 /nologo\n" ); - fprintf ( OUT, "# ADD LIB32 /nologo\n" ); + fprintf ( OUT, "LIB32=link.exe -lib\r\n" ); + fprintf ( OUT, "# ADD BASE LIB32 /nologo\r\n" ); + fprintf ( OUT, "# ADD LIB32 /nologo\r\n" ); } n++; @@ -526,33 +528,33 @@ if ( cfgs.size() != 0 ) { - fprintf ( OUT, "\n" ); - fprintf ( OUT, "!ENDIF \n" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "!ENDIF \r\n" ); + fprintf ( OUT, "\r\n" ); } if ( module.name == "winebuild" ) { - fprintf ( OUT, "# Begin Special Build Tool\n" ); - fprintf ( OUT, "SOURCE=\"$(InputPath)\"\n" ); - fprintf ( OUT, "PostBuild_Desc=Copying wine.dll and wine_unicode.dll ...\n" ); + fprintf ( OUT, "# Begin Special Build Tool\r\n" ); + fprintf ( OUT, "SOURCE=\"$(InputPath)\"\r\n" ); + fprintf ( OUT, "PostBuild_Desc=Copying wine.dll and wine_unicode.dll ...\r\n" ); fprintf ( OUT, "PostBuild_Cmds=" ); fprintf ( OUT, "copy ..\\..\\library\\%s\\wine.dll $(OutDir)\t", output_dir.c_str() ); - fprintf ( OUT, "copy ..\\..\\unicode\\%s\\wine_unicode.dll $(OutDir)\n", + fprintf ( OUT, "copy ..\\..\\unicode\\%s\\wine_unicode.dll $(OutDir)\r\n", output_dir.c_str() ); - fprintf ( OUT, "# End Special Build Tool\n" ); + fprintf ( OUT, "# End Special Build Tool\r\n" ); } - fprintf ( OUT, "# Begin Target\n" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "# Begin Target\r\n" ); + fprintf ( OUT, "\r\n" ); for ( i = 0; i < cfgs.size(); i++ ) { - fprintf ( OUT, "# Name \"%s\"\n", cfgs[i].c_str() ); + fprintf ( OUT, "# Name \"%s\"\r\n", cfgs[i].c_str() ); } - fprintf ( OUT, "# Begin Group \"Source Files\"\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "# PROP Default_Filter \"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\"\n" ); + fprintf ( OUT, "# Begin Group \"Source Files\"\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "# PROP Default_Filter \"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\"\r\n" ); for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ ) { @@ -568,19 +570,19 @@ string basename = string ( source_file.c_str(), source_file.size() - 5 ); // TODO FIXME - not sure what this is doing? wine hack maybe? - //if ( $basename !~ /\..{1,3}$/; ) basename += string(".dll"); + //if ( basename !~ /\..{1,3}$/; ) basename += string(".dll"); string dbg_c_file = basename + ".dbg.c"; - fprintf ( OUT, "# Begin Source File\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "SOURCE=%s\n", dbg_c_file.c_str() ); - fprintf ( OUT, "# End Source File\n" ); + fprintf ( OUT, "# Begin Source File\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "SOURCE=%s\r\n", dbg_c_file.c_str() ); + fprintf ( OUT, "# End Source File\r\n" ); } - fprintf ( OUT, "# Begin Source File\n" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "# Begin Source File\r\n" ); + fprintf ( OUT, "\r\n" ); - fprintf ( OUT, "SOURCE=%s\n", source_file.c_str() ); + fprintf ( OUT, "SOURCE=%s\r\n", source_file.c_str() ); if ( !strcmp ( &source_file[source_file.size()-5], ".spec" ) ) { @@ -590,17 +592,17 @@ string def_file = basename + ".def"; // TODO FIXME - not sure what this is doing? wine hack maybe? - //if ( $basename !~ /\..{1,3}$/; ) basename += ".dll"; + //if ( basename !~ /\..{1,3}$/; ) basename += ".dll"; string dbg_file = basename + ".dbg"; string dbg_c_file = basename + ".dbg.c"; string srcdir = "."; // FIXME: Is this really always correct? - fprintf ( OUT, "# Begin Custom Build\n" ); - fprintf ( OUT, "InputPath=%s\n", spec_file.c_str() ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "BuildCmds= \\\n" ); - fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe --def %s > %s \\\n", + fprintf ( OUT, "# Begin Custom Build\r\n" ); + fprintf ( OUT, "InputPath=%s\r\n", spec_file.c_str() ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "BuildCmds= \\\r\n" ); + fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe --def %s > %s \\\r\n", output_dir.c_str(), spec_file.c_str(), def_file.c_str() ); @@ -613,16 +615,16 @@ const string& c_src = c_srcs[i]; if(n++ > 0) { - fprintf ( OUT, "\techo %s >> %s \\\n", c_src.c_str(), dbg_file.c_str() ); + fprintf ( OUT, "\techo %s >> %s \\\r\n", c_src.c_str(), dbg_file.c_str() ); } else { - fprintf ( OUT, "\techo %s > %s \\\n", c_src.c_str(), dbg_file.c_str() ); + fprintf ( OUT, "\techo %s > %s \\\r\n", c_src.c_str(), dbg_file.c_str() ); } } fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe", output_dir.c_str() ); - fprintf ( OUT, " -o %s --debug -C%s %s \\\n", + fprintf ( OUT, " -o %s --debug -C%s %s \\\r\n", dbg_c_file.c_str(), srcdir.c_str(), dbg_file.c_str() ); @@ -643,20 +645,20 @@ fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe", output_dir.c_str() ); - fprintf ( OUT, " -o %s --debug -C%s %s \\\n", + fprintf ( OUT, " -o %s --debug -C%s %s \\\r\n", dbg_c_file.c_str(), srcdir.c_str(), sc_srcs.c_str() ); } - fprintf ( OUT, "\t\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "\"%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n", def_file.c_str() ); - fprintf ( OUT, " $(BuildCmds)\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "\"%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n", dbg_c_file.c_str() ); - fprintf ( OUT, " $(BuildCmds)\n" ); - fprintf ( OUT, "# End Custom Build\n" ); + fprintf ( OUT, "\t\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "\"%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", def_file.c_str() ); + fprintf ( OUT, " $(BuildCmds)\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "\"%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", dbg_c_file.c_str() ); + fprintf ( OUT, " $(BuildCmds)\r\n" ); + fprintf ( OUT, "# End Custom Build\r\n" ); } /*else if ( source_file =~ /([^\\]*?\.h)$/ ) { @@ -666,12 +668,12 @@ if($#cfgs == 0) { # Nothing } elsif($n == 0) { - fprintf ( OUT, "!IF \"$(CFG)\" == \"$cfg\"\n" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "!IF \"$(CFG)\" == \"$cfg\"\r\n" ); + fprintf ( OUT, "\r\n" ); } else { - fprintf ( OUT, "\n" ); - fprintf ( OUT, "!ELSEIF \"$(CFG)\" == \"$cfg\"\n" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "!ELSEIF \"$(CFG)\" == \"$cfg\"\r\n" ); + fprintf ( OUT, "\r\n" ); } $output_dir = $cfg; @@ -682,58 +684,58 @@ $output_dir = "$output_prefix_dir\\$output_dir" ); } - fprintf ( OUT, "# Begin Custom Build\n" ); - fprintf ( OUT, "OutDir=%s\n", output_dir.c_str() ); - fprintf ( OUT, "InputPath=%s\n", source_file.c_str() ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "\"$(OutDir)\\wine\\%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n", h_file.c_str() ); - fprintf ( OUT, "\tcopy \"$(InputPath)\" \"$(OutDir)\\wine\"\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "# End Custom Build\n" ); + fprintf ( OUT, "# Begin Custom Build\r\n" ); + fprintf ( OUT, "OutDir=%s\r\n", output_dir.c_str() ); + fprintf ( OUT, "InputPath=%s\r\n", source_file.c_str() ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "\"$(OutDir)\\wine\\%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", h_file.c_str() ); + fprintf ( OUT, "\tcopy \"$(InputPath)\" \"$(OutDir)\\wine\"\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "# End Custom Build\r\n" ); } if ( cfgs.size() != 0) { - fprintf ( OUT, "\n" ); - fprintf ( OUT, "!ENDIF \n" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "!ENDIF \r\n" ); + fprintf ( OUT, "\r\n" ); } }*/ - fprintf ( OUT, "# End Source File\n" ); + fprintf ( OUT, "# End Source File\r\n" ); } - fprintf ( OUT, "# End Group\n" ); + fprintf ( OUT, "# End Group\r\n" ); - fprintf ( OUT, "# Begin Group \"Header Files\"\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "# PROP Default_Filter \"h;hpp;hxx;hm;inl\"\n" ); + fprintf ( OUT, "# Begin Group \"Header Files\"\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "# PROP Default_Filter \"h;hpp;hxx;hm;inl\"\r\n" ); for ( i = 0; i < header_files.size(); i++ ) { const string& header_file = header_files[i]; - fprintf ( OUT, "# Begin Source File\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "SOURCE=.\\%s\n", header_file.c_str() ); - fprintf ( OUT, "# End Source File\n" ); + fprintf ( OUT, "# Begin Source File\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "SOURCE=.\\%s\r\n", header_file.c_str() ); + fprintf ( OUT, "# End Source File\r\n" ); } - fprintf ( OUT, "# End Group\n" ); + fprintf ( OUT, "# End Group\r\n" ); - fprintf ( OUT, "# Begin Group \"Resource Files\"\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "# PROP Default_Filter \"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\"\n" ); + fprintf ( OUT, "# Begin Group \"Resource Files\"\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "# PROP Default_Filter \"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\"\r\n" ); for ( i = 0; i < resource_files.size(); i++ ) { const string& resource_file = resource_files[i]; - fprintf ( OUT, "# Begin Source File\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "SOURCE=.\\%s\n", resource_file.c_str() ); - fprintf ( OUT, "# End Source File\n" ); + fprintf ( OUT, "# Begin Source File\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "SOURCE=.\\%s\r\n", resource_file.c_str() ); + fprintf ( OUT, "# End Source File\r\n" ); } - fprintf ( OUT, "# End Group\n" ); + fprintf ( OUT, "# End Group\r\n" ); - fprintf ( OUT, "# End Target\n" ); - fprintf ( OUT, "# End Project\n" ); + fprintf ( OUT, "# End Target\r\n" ); + fprintf ( OUT, "# End Project\r\n" ); fclose(OUT); } @@ -741,9 +743,9 @@ void MSVCBackend::_generate_dsw_header ( FILE* OUT ) { - fprintf ( OUT, "Microsoft Developer Studio Workspace File, Format Version 6.00\n" ); - fprintf ( OUT, "# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\n" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "Microsoft Developer Studio Workspace File, Format Version 6.00\r\n" ); + fprintf ( OUT, "# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r\n" ); + fprintf ( OUT, "\r\n" ); } void @@ -753,51 +755,49 @@ std::string dsp_file, const std::vector<Dependency*>& dependencies ) { - dsp_file = std::string(".\\") + dsp_file; - // TODO FIXME - what does next line do? - //$dsp_file =~ y%/%\\%; + dsp_file = DosSeparator ( std::string(".\\") + dsp_file ); // TODO FIXME - must they be sorted? //@dependencies = sort(@dependencies); - fprintf ( OUT, "####################################################################### ########\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "Project: \"%s\"=%s - Package Owner=<4>\n", module.name.c_str(), dsp_file.c_str() ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "Package=<5>\n" ); - fprintf ( OUT, "{{{\n" ); - fprintf ( OUT, "}}}\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "Package=<4>\n" ); - fprintf ( OUT, "{{{\n" ); + fprintf ( OUT, "####################################################################### ########\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Project: \"%s\"=%s - Package Owner=<4>\r\n", module.name.c_str(), dsp_file.c_str() ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Package=<5>\r\n" ); + fprintf ( OUT, "{{{\r\n" ); + fprintf ( OUT, "}}}\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Package=<4>\r\n" ); + fprintf ( OUT, "{{{\r\n" ); for ( size_t i = 0; i < dependencies.size(); i++ ) { Dependency& dependency = *dependencies[i]; - fprintf ( OUT, " Begin Project Dependency\n" ); - fprintf ( OUT, " Project_Dep_Name %s\n", dependency.module.name.c_str() ); - fprintf ( OUT, " End Project Dependency\n" ); + fprintf ( OUT, " Begin Project Dependency\r\n" ); + fprintf ( OUT, " Project_Dep_Name %s\r\n", dependency.module.name.c_str() ); + fprintf ( OUT, " End Project Dependency\r\n" ); } - fprintf ( OUT, "}}}\n" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "}}}\r\n" ); + fprintf ( OUT, "\r\n" ); } void MSVCBackend::_generate_dsw_footer ( FILE* OUT ) { - fprintf ( OUT, "####################################################################### ########\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "Global:\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "Package=<5>\n" ); - fprintf ( OUT, "{{{\n" ); - fprintf ( OUT, "}}}\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "Package=<3>\n" ); - fprintf ( OUT, "{{{\n" ); - fprintf ( OUT, "}}}\n" ); - fprintf ( OUT, "\n" ); - fprintf ( OUT, "####################################################################### ########\n" ); - fprintf ( OUT, "\n" ); + fprintf ( OUT, "####################################################################### ########\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Global:\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Package=<5>\r\n" ); + fprintf ( OUT, "{{{\r\n" ); + fprintf ( OUT, "}}}\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Package=<3>\r\n" ); + fprintf ( OUT, "{{{\r\n" ); + fprintf ( OUT, "}}}\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "####################################################################### ########\r\n" ); + fprintf ( OUT, "\r\n" ); } void @@ -806,22 +806,20 @@ _generate_dsw_header(OUT); // TODO FIXME - is it necessary to sort them? for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) - //foreach my $module (sort(keys(%modules))) { Module& module = *ProjectNode.modules[i]; - //my $project = module->{project}; std::string dsp_file = DspFileName ( module ); // TODO FIXME - more wine hacks? - /*if($project =~ /^gdi32$/) { - foreach my $dir (@gdi32_dirs) { - my $dir2 = $dir; + /*if ( module.name == "gdi32" ) + { + for ( size_t idir = 0; idir < gdi32_dirs.size(); idir++ ) + { + string dir2 = gdi32_dirs[idir]; $dir2 =~ s%^.*?/([^/]+)$%$1%; - my $module = "gdi32_$dir2"; - $module =~ s%/%_%g; - push @dependencies, $module; + dependencies.push_back ( Replace ( "gdi32_" + dir2, "/", "_" ) ); } }*/

1 0

[royce] 17532: svn maintenance
by royce＠svn.reactos.com 25 Aug '05

25 Aug '05

svn maintenance Property changes on: trunk/reactos/tools/rbuild ___________________________________________________________________ Name: svn:ignore - *.exe + *.exe Debug

1 0

[weiden] 17531: check for console handles in Get/SetFileAttributesByHandle()
by weiden＠svn.reactos.com 25 Aug '05

25 Aug '05

check for console handles in Get/SetFileAttributesByHandle() Modified: trunk/reactos/lib/kernel32/file/file.c _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2005-08-24 23:59:03 UTC (rev 17530) +++ trunk/reactos/lib/kernel32/file/file.c 2005-08-25 00:33:37 UTC (rev 17531) @@ -979,6 +979,12 @@ UNREFERENCED_PARAMETER(dwFlags); + if (IsConsoleHandle(hFile)) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + Status = NtQueryInformationFile(hFile, &IoStatusBlock, &FileBasic, @@ -1008,6 +1014,12 @@ NTSTATUS Status; UNREFERENCED_PARAMETER(dwFlags); + + if (IsConsoleHandle(hFile)) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } Status = NtQueryInformationFile(hFile, &IoStatusBlock,

1 0

[weiden] 17530: implemented SetFileAttributesByHandle() and GetFileAttributesByHandle()
by weiden＠svn.reactos.com 24 Aug '05

24 Aug '05

implemented SetFileAttributesByHandle() and GetFileAttributesByHandle() Modified: trunk/reactos/lib/kernel32/file/file.c Modified: trunk/reactos/lib/kernel32/kernel32.def _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2005-08-24 23:44:27 UTC (rev 17529) +++ trunk/reactos/lib/kernel32/file/file.c 2005-08-24 23:59:03 UTC (rev 17530) @@ -964,7 +964,81 @@ return Result ? FileAttributeData.dwFileAttributes : INVALID_FILE_ATTRIBUTES; } + +/* + * @implemented + */ BOOL STDCALL +GetFileAttributesByHandle(IN HANDLE hFile, + OUT LPDWORD dwFileAttributes, + IN DWORD dwFlags) +{ + FILE_BASIC_INFORMATION FileBasic; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + UNREFERENCED_PARAMETER(dwFlags); + + Status = NtQueryInformationFile(hFile, + &IoStatusBlock, + &FileBasic, + sizeof(FileBasic), + FileBasicInformation); + if (NT_SUCCESS(Status)) + { + *dwFileAttributes = FileBasic.FileAttributes; + return TRUE; + } + + SetLastErrorByStatus(Status); + return FALSE; +} + + +/* + * @implemented + */ +BOOL STDCALL +SetFileAttributesByHandle(IN HANDLE hFile, + IN DWORD dwFileAttributes, + IN DWORD dwFlags) +{ + FILE_BASIC_INFORMATION FileBasic; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + UNREFERENCED_PARAMETER(dwFlags); + + Status = NtQueryInformationFile(hFile, + &IoStatusBlock, + &FileBasic, + sizeof(FileBasic), + FileBasicInformation); + if (NT_SUCCESS(Status)) + { + FileBasic.FileAttributes = dwFileAttributes; + + Status = NtSetInformationFile(hFile, + &IoStatusBlock, + &FileBasic, + sizeof(FileBasic), + FileBasicInformation); + } + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOL STDCALL SetFileAttributesA( LPCSTR lpFileName, DWORD dwFileAttributes) _____ Modified: trunk/reactos/lib/kernel32/kernel32.def --- trunk/reactos/lib/kernel32/kernel32.def 2005-08-24 23:44:27 UTC (rev 17529) +++ trunk/reactos/lib/kernel32/kernel32.def 2005-08-24 23:59:03 UTC (rev 17530) @@ -372,6 +372,7 @@ GetExpandedNameW@8 GetFileAttributesA@4 GetFileAttributesW@4 +GetFileAttributesByHandle@12 GetFileAttributesExA@12 GetFileAttributesExW@12 GetFileInformationByHandle@8 @@ -805,6 +806,7 @@ SetFileApisToOEM@0 SetFileAttributesA@8 SetFileAttributesW@8 +SetFileAttributesByHandle@12 SetFilePointer@16 SetFilePointerEx@20 SetFileShortNameA@8

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005