Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 43844: - Don't convert the host name to lower case
by cgutman＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: cgutman Date: Fri Oct 30 05:29:38 2009 New Revision: 43844 URL: http://svn.reactos.org/svn/reactos?rev=43844&view=rev Log: - Don't convert the host name to lower case Modified: trunk/reactos/base/services/dhcp/util.c Modified: trunk/reactos/base/services/dhcp/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/util.c?… ============================================================================== --- trunk/reactos/base/services/dhcp/util.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/util.c [iso-8859-1] Fri Oct 30 05:29:38 2009 @@ -119,7 +119,7 @@ if (lpCompName !=NULL) { memcpy(lpCompName, ComputerName, ComputerNameSize + 1); /* Send our hostname, some dhcpds use this to update DNS */ - config->send_options[DHO_HOST_NAME].data = (u_int8_t*)_strlwr(lpCompName); + config->send_options[DHO_HOST_NAME].data = (u_int8_t*)lpCompName; config->send_options[DHO_HOST_NAME].len = ComputerNameSize; debug("Hostname: %s, length: %d", config->send_options[DHO_HOST_NAME].data,

1 0

[sserapion] 43843: Temporarily remove mmebuddy dependencies.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Fri Oct 30 01:36:40 2009 New Revision: 43843 URL: http://svn.reactos.org/svn/reactos?rev=43843&view=rev Log: Temporarily remove mmebuddy dependencies. Modified: branches/ros-amd64-bringup/reactos/dll/win32/win32.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/win32.rbuild [iso-8859-1] Fri Oct 30 01:36:40 2009 @@ -499,9 +499,9 @@ <directory name="smdll"> <xi:include href="smdll/smdll.rbuild" /> </directory> -<directory name="sndblst"> + <directory name="snmpapi"> <xi:include href="snmpapi/snmpapi.rbuild" /> </directory> @@ -583,9 +583,9 @@ <directory name="version"> <xi:include href="version/version.rbuild" /> </directory> -<directory name="wdmaud.drv"> + <directory name="windowscodecs"> <xi:include href="windowscodecs/windowscodecs.rbuild" /> </directory>

1 0

[sserapion] 43842: Fix gdi32 build.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Fri Oct 30 01:24:32 2009 New Revision: 43842 URL: http://svn.reactos.org/svn/reactos?rev=43842&view=rev Log: Fix gdi32 build. Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/eng.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/font.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Fri Oct 30 01:24:32 2009 @@ -418,7 +418,7 @@ } } - if ((ULONG)lpvBits & (sizeof(DWORD) - 1)) + if ((PtrToUlong(lpvBits)) & (sizeof(DWORD) - 1)) { pvSafeBits = RtlAllocateHeap(RtlGetProcessHeap(), 0, cjBmpScanSize); if (!pvSafeBits) Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Fri Oct 30 01:24:32 2009 @@ -322,7 +322,7 @@ /* From Wine: DeleteObject does not SetLastError() on a null object */ if(!hObject) return FALSE; - if (0 != ((DWORD) hObject & GDI_HANDLE_STOCK_MASK)) + if (0 != (HandleToUlong(hObject) & GDI_HANDLE_STOCK_MASK)) { // Relax! This is a normal return! DPRINT("Trying to delete system object 0x%x\n", hObject); return TRUE; @@ -1559,7 +1559,7 @@ switch (uType) { case GDI_OBJECT_TYPE_REGION: - return (HGDIOBJ)ExtSelectClipRgn(hDC, hGdiObj, RGN_COPY); + return ULongToHandle(ExtSelectClipRgn(hDC, hGdiObj, RGN_COPY)); case GDI_OBJECT_TYPE_BITMAP: return NtGdiSelectBitmap(hDC, hGdiObj); Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] Fri Oct 30 01:24:32 2009 @@ -163,7 +163,7 @@ if (pPDev->Sig != PDEV_UMPD_ID) { - pPDev = (PUMPDEV)pPDev->Sig; + pPDev = (PUMPDEV)ULongToPtr(pPDev->Sig);//wtf? } return pPDev->pdi5Info->pDriverPath; } @@ -180,7 +180,7 @@ if (pPDev->Sig != PDEV_UMPD_ID) { - pPDev = (PUMPDEV)pPDev->Sig; + pPDev = (PUMPDEV)ULongToPtr(pPDev->Sig);//wtf } return pPDev->pdi5Info->pDataFile; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Fri Oct 30 01:24:32 2009 @@ -1021,19 +1021,19 @@ needed = sizeof(OUTLINETEXTMETRICA); if(lpOTMW->otmpFamilyName) needed += WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFamilyName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpFamilyName), -1, NULL, 0, NULL, NULL); if(lpOTMW->otmpFaceName) needed += WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFaceName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpFaceName), -1, NULL, 0, NULL, NULL); if(lpOTMW->otmpStyleName) needed += WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpStyleName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpStyleName), -1, NULL, 0, NULL, NULL); if(lpOTMW->otmpFullName) needed += WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFullName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpFullName), -1, NULL, 0, NULL, NULL); if(!lpOTM) { @@ -1090,7 +1090,7 @@ if(lpOTMW->otmpFamilyName) { output->otmpFamilyName = (LPSTR)(ptr - (char*)output); len = WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFamilyName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpFamilyName), -1, ptr, left, NULL, NULL); left -= len; ptr += len; @@ -1100,7 +1100,7 @@ if(lpOTMW->otmpFaceName) { output->otmpFaceName = (LPSTR)(ptr - (char*)output); len = WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFaceName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpFaceName), -1, ptr, left, NULL, NULL); left -= len; ptr += len; @@ -1110,7 +1110,7 @@ if(lpOTMW->otmpStyleName) { output->otmpStyleName = (LPSTR)(ptr - (char*)output); len = WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpStyleName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpStyleName), -1, ptr, left, NULL, NULL); left -= len; ptr += len; @@ -1120,7 +1120,7 @@ if(lpOTMW->otmpFullName) { output->otmpFullName = (LPSTR)(ptr - (char*)output); len = WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFullName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpFullName), -1, ptr, left, NULL, NULL); left -= len; } else Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Fri Oct 30 01:24:32 2009 @@ -142,7 +142,7 @@ WINAPI CreatePolygonRgn( const POINT * lppt, int cPoints, int fnPolyFillMode) { - return (HRGN) NtGdiPolyPolyDraw( (HDC) fnPolyFillMode, (PPOINT) lppt, (PULONG) &cPoints, 1, GdiPolyPolyRgn); + return (HRGN) NtGdiPolyPolyDraw( ULongToPtr(fnPolyFillMode), (PPOINT) lppt, (PULONG) &cPoints, 1, GdiPolyPolyRgn); } @@ -156,7 +156,7 @@ int nCount, int fnPolyFillMode) { - return (HRGN) NtGdiPolyPolyDraw( (HDC) fnPolyFillMode, (PPOINT) lppt, (PULONG) lpPolyCounts, (ULONG) nCount, GdiPolyPolyRgn ); + return (HRGN) NtGdiPolyPolyDraw( ULongToHandle(fnPolyFillMode), (PPOINT) lppt, (PULONG) lpPolyCounts, (ULONG) nCount, GdiPolyPolyRgn ); }

1 0

[sserapion] 43841: Fix some prototypes.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Fri Oct 30 01:22:42 2009 New Revision: 43841 URL: http://svn.reactos.org/svn/reactos?rev=43841&view=rev Log: Fix some prototypes. Modified: branches/ros-amd64-bringup/reactos/include/psdk/ntgdi.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/ntgdi.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/ntgdi.h [iso-8859-1] Fri Oct 30 01:22:42 2009 @@ -2794,7 +2794,7 @@ IN HDC hdc, IN ULONG_PTR idEnum, IN ULONG cjEfdw, - OUT ULONG *pcjEfdw, + OUT ULONG_PTR *pcjEfdw, OUT PENUMFONTDATAW pefdw ); #endif @@ -2809,7 +2809,7 @@ IN ULONG cwchMax, IN OPTIONAL LPWSTR pwszFaceName, IN ULONG lfCharSet, - OUT ULONG *pulCount + OUT ULONG_PTR *pulCount ); W32KAPI

1 0

[sserapion] 43840: Fix LOGBRUSH definition.
by sserapion＠svn.reactos.org 29 Oct '09

29 Oct '09

Author: sserapion Date: Fri Oct 30 00:25:11 2009 New Revision: 43840 URL: http://svn.reactos.org/svn/reactos?rev=43840&view=rev Log: Fix LOGBRUSH definition. Modified: branches/ros-amd64-bringup/reactos/include/psdk/wingdi.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/wingdi.h [iso-8859-1] Fri Oct 30 00:25:11 2009 @@ -1655,7 +1655,7 @@ typedef struct tagLOGBRUSH { UINT lbStyle; COLORREF lbColor; - LONG lbHatch; + ULONG_PTR lbHatch; } LOGBRUSH,*PLOGBRUSH,*LPLOGBRUSH; typedef LOGBRUSH PATTERN,*PPATTERN,*LPPATTERN; typedef struct tagLOGBRUSH32 {

1 0

[sserapion] 43839: Fix Build.
by sserapion＠svn.reactos.org 29 Oct '09

29 Oct '09

Author: sserapion Date: Thu Oct 29 23:44:55 2009 New Revision: 43839 URL: http://svn.reactos.org/svn/reactos?rev=43839&view=rev Log: Fix Build. Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_device.c branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Thu Oct 29 23:44:55 2009 @@ -26,7 +26,7 @@ static HRESULT InvalidCall(LPDIRECT3DDEVICE9_INT This, LPSTR ErrorMsg) { - DPRINT1(ErrorMsg); + DPRINT1("%s",ErrorMsg); UNLOCK_D3DDEVICE9(); return D3DERR_INVALIDCALL; } Modified: branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] Thu Oct 29 23:44:55 2009 @@ -84,7 +84,7 @@ /* Get our hdc for the active window */ - hDC = GetDC(lpLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); + hDC = GetDC((HWND)lpLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); if (hDC != NULL) { @@ -200,7 +200,7 @@ DX_WINDBG_trace(); /* Get our hdc for the active window */ - hDC = GetDC(lpUnLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); + hDC = GetDC((HWND)lpUnLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); if (hDC != NULL) {

1 0

[sserapion] 43838: Fix csrss build.
by sserapion＠svn.reactos.org 29 Oct '09

29 Oct '09

Author: sserapion Date: Thu Oct 29 23:41:26 2009 New Revision: 43838 URL: http://svn.reactos.org/svn/reactos?rev=43838&view=rev Log: Fix csrss build. Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] Thu Oct 29 23:41:26 2009 @@ -188,7 +188,7 @@ ProcessData->HandleTable[i].Object = Object; ProcessData->HandleTable[i].Access = Access; ProcessData->HandleTable[i].Inheritable = Inheritable; - *Handle = (HANDLE)((i << 2) | 0x3); + *Handle = ULongToHandle(((i << 2) | 0x3)); _InterlockedIncrement( &Object->ReferenceCount ); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return(STATUS_SUCCESS);

1 0

[sserapion] 43837: Fix comctl32 build and potential bug.
by sserapion＠svn.reactos.org 29 Oct '09

29 Oct '09

Author: sserapion Date: Thu Oct 29 23:36:15 2009 New Revision: 43837 URL: http://svn.reactos.org/svn/reactos?rev=43837&view=rev Log: Fix comctl32 build and potential bug. Modified: branches/ros-amd64-bringup/reactos/dll/win32/comctl32/tooltips.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] Thu Oct 29 23:36:15 2009 @@ -2402,13 +2402,12 @@ static LRESULT -TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); +TOOLTIPS_NotifyFormat (TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +{ TTTOOL_INFO *toolPtr = infoPtr->tools; INT nResult; - TRACE("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam); + TRACE("hwnd=%p wParam=%lx lParam=%lx\n", infoPtr->hwndSelf, wParam, lParam); if (lParam == NF_QUERY) { if (toolPtr->bNotifyUnicode) { @@ -2418,8 +2417,8 @@ } } else if (lParam == NF_REQUERY) { - nResult = (INT) SendMessageW (toolPtr->hwnd, WM_NOTIFYFORMAT, - (WPARAM)hwnd, (LPARAM)NF_QUERY); + nResult = SendMessageW (toolPtr->hwnd, WM_NOTIFYFORMAT, + (WPARAM)infoPtr->hwndSelf, (LPARAM)NF_QUERY); if (nResult == NFR_ANSI) { toolPtr->bNotifyUnicode = FALSE; TRACE(" -- WM_NOTIFYFORMAT returns: NFR_ANSI\n");

1 0

[sserapion] 43836: Fix avicap32 build.
by sserapion＠svn.reactos.org 29 Oct '09

29 Oct '09

Author: sserapion Date: Thu Oct 29 23:15:19 2009 New Revision: 43836 URL: http://svn.reactos.org/svn/reactos?rev=43836&view=rev Log: Fix avicap32 build. Modified: branches/ros-amd64-bringup/reactos/dll/win32/avicap32/avicap32.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/avicap32/avicap32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/avicap32/avicap32.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/avicap32/avicap32.c [iso-8859-1] Thu Oct 29 23:15:19 2009 @@ -86,7 +86,7 @@ nWidth, nHeight, hWnd, - (HMENU)nID, + ULongToHandle(nID), hInstance, NULL); }

1 0

[tkreuzer] 43835: Fix merge artifact, spotted by encoded
by tkreuzer＠svn.reactos.org 29 Oct '09

29 Oct '09

Author: tkreuzer Date: Thu Oct 29 22:49:28 2009 New Revision: 43835 URL: http://svn.reactos.org/svn/reactos?rev=43835&view=rev Log: Fix merge artifact, spotted by encoded Modified: branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] Thu Oct 29 22:49:28 2009 @@ -627,23 +627,19 @@ #if (NTDDI_VERSION >= NTDDI_WS03) union { - BOOLEAN ImageUsesLargePages:1; BOOLEAN BitField; struct { UCHAR ImageUsesLargePages:1; - #if (NTDDI_VERSION >= NTDDI_LONGHORN) - BOOLEAN IsProtectedProcess:1; - BOOLEAN IsLegacyProcess:1; - BOOLEAN SpareBits:5; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) BOOLEAN IsProtectedProcess:1; BOOLEAN IsLegacyProcess:1; BOOLEAN IsImageDynamicallyRelocated:1; BOOLEAN SkipPatchingUser32Forwarders:1; BOOLEAN SpareBits:3; - #else +#else BOOLEAN SpareBits:7; - #endif +#endif }; }; #else

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs