Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 56565: [WIN32K] - Fix RGB vs BGR mistake in SURFACE_iCompression - Return the number of copied scanlines in GreGetDIBits - Fix calculation of destination address in GreGetDIBits
by tkreuzer＠svn.reactos.org 12 May '12

12 May '12

Author: tkreuzer Date: Sat May 12 17:40:58 2012 New Revision: 56565 URL: http://svn.reactos.org/svn/reactos?rev=56565&view=rev Log: [WIN32K] - Fix RGB vs BGR mistake in SURFACE_iCompression - Return the number of copied scanlines in GreGetDIBits - Fix calculation of destination address in GreGetDIBits Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] Sat May 12 17:40:58 2012 @@ -676,11 +676,10 @@ if (psurf->SurfObj.iBitmapFormat == BMF_PNG) return BI_PNG; /* Check the type of the palette */ - if (psurf->ppal->flFlags & (PAL_INDEXED|PAL_RGB|PAL_RGB16_555)) - return PAL_RGB; + if (psurf->ppal->flFlags & (PAL_INDEXED|PAL_BGR|PAL_RGB16_555)) + return BI_RGB; /* Everything else must be bitfields */ - ASSERT(psurf->ppal->flFlags & PAL_BITFIELDS); return BI_BITFIELDS; } @@ -770,6 +769,7 @@ ULONG iCompression, cBitsPixel, cjLine; LONG lDeltaDst; PBYTE pjSrc; + INT iResult = 0; /* Lock the DC */ pdc = DC_LockDc(hdc); @@ -812,14 +812,17 @@ /* Check for top-down bitmaps */ if (pbmi->bmiHeader.biHeight > 0) { - /* Adjust lDelta and start position */ + /* Adjust start position and lDelta */ + pjBits += (cScans - 1) * lDeltaDst; lDeltaDst = -lDeltaDst; - pjBits += (cScans - 1) * lDeltaDst; } /* Calculate the start address from where to copy */ pjSrc = psurf->SurfObj.pvScan0; pjSrc += iStartScan * psurf->SurfObj.lDelta; + + /* Save number of scan lines being copied */ + iResult = cScans; /* Loop all scan lines */ while (cScans--) @@ -844,7 +847,7 @@ else { /* There is nothing to copy */ - cScans = 0; + iResult = 0; } /* Unlock the bitmap surface */ @@ -852,7 +855,7 @@ DC_UnlockDc(pdc); - return cScans; + return iResult; } INT @@ -871,9 +874,6 @@ PBITMAPINFO pbmi; HANDLE hSecure; INT iResult; - //ULONG cjHeader; - - __debugbreak(); /* Check if the size of the bitmap info is large enough */ if (cjMaxInfo < sizeof(BITMAPINFOHEADER))

1 0

[akhaldi] 56564: [PSDK] * Add missing HS_API_MAX definition.
by akhaldi＠svn.reactos.org 12 May '12

12 May '12

Author: akhaldi Date: Sat May 12 16:49:36 2012 New Revision: 56564 URL: http://svn.reactos.org/svn/reactos?rev=56564&view=rev Log: [PSDK] * Add missing HS_API_MAX definition. Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sat May 12 16:49:36 2012 @@ -570,6 +570,7 @@ #define HS_FDIAGONAL 2 #define HS_HORIZONTAL 0 #define HS_VERTICAL 1 +#define HS_API_MAX 12 #define PS_GEOMETRIC 65536 #define PS_COSMETIC 0 #define PS_ALTERNATE 8

1 0

[akhaldi] 56563: [GDI32_WINETEST] * Sync to Wine 1.5.4. I excluded bitmap and dib tests from the sync until bug #7070 is fixed.
by akhaldi＠svn.reactos.org 12 May '12

12 May '12

Author: akhaldi Date: Sat May 12 16:46:20 2012 New Revision: 56563 URL: http://svn.reactos.org/svn/reactos?rev=56563&view=rev Log: [GDI32_WINETEST] * Sync to Wine 1.5.4. I excluded bitmap and dib tests from the sync until bug #7070 is fixed. Added: trunk/rostests/winetests/gdi32/vertical.sfd trunk/rostests/winetests/gdi32/vertical.ttf (with props) Modified: trunk/rostests/winetests/gdi32/brush.c trunk/rostests/winetests/gdi32/clipping.c trunk/rostests/winetests/gdi32/dc.c trunk/rostests/winetests/gdi32/font.c trunk/rostests/winetests/gdi32/mapping.c trunk/rostests/winetests/gdi32/metafile.c trunk/rostests/winetests/gdi32/palette.c trunk/rostests/winetests/gdi32/path.c trunk/rostests/winetests/gdi32/pen.c trunk/rostests/winetests/gdi32/resource.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/gdi32/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/brush.c?r… Modified: trunk/rostests/winetests/gdi32/clipping.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/clipping.… Modified: trunk/rostests/winetests/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dc.c?rev=… Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… Modified: trunk/rostests/winetests/gdi32/mapping.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/mapping.c… Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… Modified: trunk/rostests/winetests/gdi32/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/palette.c… Modified: trunk/rostests/winetests/gdi32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/path.c?re… Modified: trunk/rostests/winetests/gdi32/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/pen.c?rev… Modified: trunk/rostests/winetests/gdi32/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/resource.… Added: trunk/rostests/winetests/gdi32/vertical.sfd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/vertical.… Added: trunk/rostests/winetests/gdi32/vertical.ttf URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/vertical.…

1 0

[akhaldi] 56562: [SHELL32] * Remove an unused variable.
by akhaldi＠svn.reactos.org 12 May '12

12 May '12

Author: akhaldi Date: Sat May 12 15:05:02 2012 New Revision: 56562 URL: http://svn.reactos.org/svn/reactos?rev=56562&view=rev Log: [SHELL32] * Remove an unused variable. Modified: trunk/reactos/dll/win32/shell32/brsfolder.cpp Modified: trunk/reactos/dll/win32/shell32/brsfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/brsfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/brsfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/brsfolder.cpp [iso-8859-1] Sat May 12 15:05:02 2012 @@ -396,7 +396,6 @@ static void FillTreeView( browse_info *info, IShellFolder * lpsf, LPITEMIDLIST pidl, HTREEITEM hParent, IEnumIDList* lpe) { - HTREEITEM hPrev = 0; LPITEMIDLIST pidlTemp = 0; ULONG ulFetched; HRESULT hr; @@ -436,7 +435,7 @@ } } - if (!(hPrev = InsertTreeViewItem(info, lpsf, pidlTemp, pidl, pEnumIL, hParent))) + if (!InsertTreeViewItem(info, lpsf, pidlTemp, pidl, pEnumIL, hParent)) goto done; SHFree(pidlTemp); /* Finally, free the pidl that the shell gave us... */ pidlTemp=NULL;

1 0

[tkreuzer] 56561: [WIN32K] Some work on NtGdiGetDIBitsInternal
by tkreuzer＠svn.reactos.org 10 May '12

10 May '12

Author: tkreuzer Date: Thu May 10 19:28:53 2012 New Revision: 56561 URL: http://svn.reactos.org/svn/reactos?rev=56561&view=rev Log: [WIN32K] Some work on NtGdiGetDIBitsInternal Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] Thu May 10 19:28:53 2012 @@ -616,6 +616,8 @@ HANDLE hSecure; HBITMAP hbmp; +__debugbreak(); + if (fInit & CBM_INIT) { if (pjInit) @@ -663,9 +665,96 @@ return hbmp; } +ULONG +SURFACE_iCompression( + _In_ PSURFACE psurf) +{ + /* Check what compression the surface has */ + if (psurf->SurfObj.iBitmapFormat == BMF_4RLE) return BI_RLE4; + if (psurf->SurfObj.iBitmapFormat == BMF_8RLE) return BI_RLE8; + if (psurf->SurfObj.iBitmapFormat == BMF_JPEG) return BI_JPEG; + if (psurf->SurfObj.iBitmapFormat == BMF_PNG) return BI_PNG; + + /* Check the type of the palette */ + if (psurf->ppal->flFlags & (PAL_INDEXED|PAL_RGB|PAL_RGB16_555)) + return PAL_RGB; + + /* Everything else must be bitfields */ + ASSERT(psurf->ppal->flFlags & PAL_BITFIELDS); + return BI_BITFIELDS; +} + INT APIENTRY -GreGetDIBitsInternal( +GreGetDIBitmapInfo( + _In_ HBITMAP hbm, + _Inout_ LPBITMAPINFO pbmi, + _In_ UINT iUsage, + _In_ UINT cjMaxInfo) +{ + PSURFACE psurf; + + /* Lock the bitmap */ + psurf = SURFACE_ShareLockSurface(hbm); + if (!psurf) + { + return 0; + } + + /* Fill the bitmap info header */ + pbmi->bmiHeader.biWidth = psurf->SurfObj.sizlBitmap.cx; + if (psurf->SurfObj.fjBitmap & BMF_TOPDOWN) + pbmi->bmiHeader.biHeight = -psurf->SurfObj.sizlBitmap.cy; + else + pbmi->bmiHeader.biHeight = psurf->SurfObj.sizlBitmap.cy; + pbmi->bmiHeader.biPlanes = 1; + pbmi->bmiHeader.biCompression = SURFACE_iCompression(psurf); + pbmi->bmiHeader.biSizeImage = psurf->SurfObj.cjBits; + pbmi->bmiHeader.biXPelsPerMeter = psurf->sizlDim.cx; + pbmi->bmiHeader.biYPelsPerMeter = psurf->sizlDim.cy; + + /* Check if the caller requests a color table */ + if (pbmi->bmiHeader.biBitCount != 0) + { + /* Synthesize a color table */ + __debugbreak(); + } + else + { + /* Just return the bit depth */ + pbmi->bmiHeader.biBitCount = + gajBitsPerFormat[psurf->SurfObj.iBitmapFormat]; + } + + /* Set the number of colors */ + pbmi->bmiHeader.biClrUsed = 1 << pbmi->bmiHeader.biBitCount; + pbmi->bmiHeader.biClrImportant = pbmi->bmiHeader.biClrUsed; + + if (pbmi->bmiHeader.biSize >= sizeof(BITMAPV4HEADER)) + { + PBITMAPV4HEADER pbV4Header = (PBITMAPV4HEADER)pbmi; + + pbV4Header->bV4RedMask = 0; + pbV4Header->bV4GreenMask = 0; + pbV4Header->bV4BlueMask = 0; + pbV4Header->bV4AlphaMask = 0; + pbV4Header->bV4CSType = 0; + //pbV4Header->bV4Endpoints; + pbV4Header->bV4GammaRed = 0; + pbV4Header->bV4GammaGreen = 0; + pbV4Header->bV4GammaBlue = 0; + } + + /* Unlock the bitmap surface */ + SURFACE_ShareUnlockSurface(psurf); + + return 1; +} + + +INT +APIENTRY +GreGetDIBits( _In_ HDC hdc, _In_ HBITMAP hbm, _In_ UINT iStartScan, @@ -676,11 +765,94 @@ _In_ UINT cjMaxBits, _In_ UINT cjMaxInfo) { - - __debugbreak(); - - - return 0; + PDC pdc; + PSURFACE psurf; + ULONG iCompression, cBitsPixel, cjLine; + LONG lDeltaDst; + PBYTE pjSrc; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) + { + return 0; + } + + /* Lock the bitmap */ + psurf = SURFACE_ShareLockSurface(hbm); + if (!psurf) + { + + return 0; + } + + /* Check if there is anything to do */ + if (iStartScan < (ULONG)psurf->SurfObj.sizlBitmap.cy) + { + /* Get the bit depth of the bitmap */ + cBitsPixel = gajBitsPerFormat[psurf->SurfObj.iBitmapFormat]; + + /* Get the compression of the bitmap */ + iCompression = SURFACE_iCompression(psurf); + + /* Check if the requested format matches the actual one */ + if ((cBitsPixel == pbmi->bmiHeader.biBitCount) && + (iCompression == pbmi->bmiHeader.biCompression)) + { + /* Calculate width of one dest line */ + lDeltaDst = WIDTH_BYTES_ALIGN32(pbmi->bmiHeader.biWidth, cBitsPixel); + + /* Calculate the maximum number of scan lines to be copied */ + cScans = min(cScans, psurf->SurfObj.sizlBitmap.cy - iStartScan); + cScans = min(cScans, cjMaxBits / lDeltaDst); + + /* Calculate the maximum length of a line */ + cjLine = min(lDeltaDst, abs(psurf->SurfObj.lDelta)); + + /* Check for top-down bitmaps */ + if (pbmi->bmiHeader.biHeight > 0) + { + /* Adjust lDelta and start position */ + lDeltaDst = -lDeltaDst; + pjBits += (cScans - 1) * lDeltaDst; + } + + /* Calculate the start address from where to copy */ + pjSrc = psurf->SurfObj.pvScan0; + pjSrc += iStartScan * psurf->SurfObj.lDelta; + + /* Loop all scan lines */ + while (cScans--) + { + /* Copy one scan line */ + RtlCopyMemory(pjBits, pjSrc, cjLine); + + /* go to the next scan line */ + pjSrc += psurf->SurfObj.lDelta; + pjBits += lDeltaDst; + } + + { + // TODO: create color table + } + } + else + { + __debugbreak(); + } + } + else + { + /* There is nothing to copy */ + cScans = 0; + } + + /* Unlock the bitmap surface */ + SURFACE_ShareUnlockSurface(psurf); + + DC_UnlockDc(pdc); + + return cScans; } INT @@ -691,13 +863,84 @@ _In_ UINT iStartScan, _In_ UINT cScans, _Out_opt_ LPBYTE pjBits, - _Inout_ LPBITMAPINFO pbmi, + _Inout_ LPBITMAPINFO pbmiUser, _In_ UINT iUsage, _In_ UINT cjMaxBits, _In_ UINT cjMaxInfo) { + PBITMAPINFO pbmi; + HANDLE hSecure; + INT iResult; + //ULONG cjHeader; + __debugbreak(); - return 0; + + /* Check if the size of the bitmap info is large enough */ + if (cjMaxInfo < sizeof(BITMAPINFOHEADER)) + { + return 0; + } + + if (pjBits) + { + hSecure = EngSecureMem(pjBits, cjMaxBits); + if (!hSecure) + { + return 0; + } + } + + pbmi = ExAllocatePoolWithTag(PagedPool, cjMaxInfo, GDITAG_BITMAPINFO); + if (!pbmi) + { + __debugbreak(); + } + + _SEH2_TRY + { + ProbeForWrite(pbmiUser, cjMaxInfo, 1); + RtlCopyMemory(pbmi, pbmiUser, cjMaxInfo); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + __debugbreak(); + } + _SEH2_END; + + // FIXME: check pbmi size + + if (pjBits) + { + /* Call the internal functiomn */ + iResult = GreGetDIBits(hdc, + hbm, + iStartScan, + cScans, + pjBits, + pbmi, + iUsage, + cjMaxBits, + cjMaxInfo); + } + else + { + iResult = GreGetDIBitmapInfo(hbm, pbmi, iUsage, cjMaxInfo); + } + + _SEH2_TRY + { + RtlCopyMemory(pbmiUser, pbmi, cjMaxInfo); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + + ExFreePoolWithTag(pbmi, GDITAG_BITMAPINFO); + + + return iResult; } INT

1 0

[jimtabor] 56560: [Win32k] - Patch by Dmitry Timoshkov : SetParent() should use ShowWindow() to make a reparented window visible and move a window to new position. - Note: SetWindowPos should be co...
by jimtabor＠svn.reactos.org 10 May '12

10 May '12

Author: jimtabor Date: Thu May 10 16:26:02 2012 New Revision: 56560 URL: http://svn.reactos.org/svn/reactos?rev=56560&view=rev Log: [Win32k] - Patch by Dmitry Timoshkov : SetParent() should use ShowWindow() to make a reparented window visible and move a window to new position. - Note: SetWindowPos should be correct, http://www.winehq.org/pipermail/wine-cvs/2012-April/086267.html Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Thu May 10 16:26:02 2012 @@ -1027,6 +1027,7 @@ { PWND WndOldParent, pWndExam; BOOL WasVisible; + POINT pt; ASSERT(Wnd); ASSERT(WndNewParent); @@ -1065,8 +1066,11 @@ WasVisible = co_WinPosShowWindow(Wnd, SW_HIDE); /* Window must belong to current process */ - if (Wnd->head.pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) + if (Wnd->head.pti->ppi != PsGetCurrentProcessWin32Process()) return NULL; + + pt.x = Wnd->rcWindow.left; + pt.y = Wnd->rcWindow.top; WndOldParent = Wnd->spwndParent; @@ -1091,14 +1095,10 @@ * in the z-order and send the expected WM_WINDOWPOSCHANGING and * WM_WINDOWPOSCHANGED notification messages. */ - co_WinPosSetWindowPos(Wnd, (0 == (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOP : HWND_TOPMOST), - 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE - | (WasVisible ? SWP_SHOWWINDOW : 0)); - - /* - * FIXME: A WM_MOVE is also generated (in the DefWindowProc handler - * for WM_WINDOWPOSCHANGED) in Windows, should probably remove SWP_NOMOVE. - */ + co_WinPosSetWindowPos( Wnd, + (0 == (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOP : HWND_TOPMOST), + pt.x, pt.y, 0, 0, SWP_NOSIZE ); + if (WasVisible) co_WinPosShowWindow(Wnd, SW_SHOWNORMAL); return WndOldParent;

1 0

[akhaldi] 56559: [KMTEST_DRV] * Link to chkstk.
by akhaldi＠svn.reactos.org 10 May '12

10 May '12

Author: akhaldi Date: Thu May 10 13:05:37 2012 New Revision: 56559 URL: http://svn.reactos.org/svn/reactos?rev=56559&view=rev Log: [KMTEST_DRV] * Link to chkstk. Modified: trunk/rostests/kmtests/CMakeLists.txt Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Thu May 10 13:05:37 2012 @@ -57,7 +57,7 @@ add_library(kmtest_drv SHARED ${KMTEST_DRV_SOURCE}) set_module_type(kmtest_drv kernelmodedriver) -target_link_libraries(kmtest_drv kmtest_printf ${PSEH_LIB}) +target_link_libraries(kmtest_drv kmtest_printf chkstk ${PSEH_LIB}) add_importlibs(kmtest_drv ntoskrnl hal) add_target_compile_definitions(kmtest_drv KMT_KERNEL_MODE NTDDI_VERSION=NTDDI_WS03SP1) #add_pch(kmtest_drv include/kmt_test.h)

1 0

[akhaldi] 56558: * Introduce _VS_ANALYZE_ option for the VS static analysis support.
by akhaldi＠svn.reactos.org 10 May '12

10 May '12

Author: akhaldi Date: Thu May 10 10:39:16 2012 New Revision: 56558 URL: http://svn.reactos.org/svn/reactos?rev=56558&view=rev Log: * Introduce _VS_ANALYZE_ option for the VS static analysis support. Modified: trunk/reactos/cmake/config.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=565… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Thu May 10 10:39:16 2012 @@ -69,6 +69,10 @@ "Whether to create a graphml dependency of dlls.") if(MSVC) + set(_PREFAST_ FALSE CACHE BOOL "Whether to enable PREFAST while compiling.") +set(_VS_ANALYZE_ FALSE CACHE BOOL +"Whether to enable static analysis while compiling.") + endif() Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=56558… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Thu May 10 10:39:16 2012 @@ -26,7 +26,7 @@ # Debugging if(${CMAKE_BUILD_TYPE} MATCHES Debug) - if(NOT _PREFAST_) + if(NOT (_PREFAST_ OR _VS_ANALYZE_)) add_compile_flags("/Zi") endif() add_compile_flags("/Ob0 /Od") @@ -56,21 +56,19 @@ "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") endif() -if(_PREFAST_) - if(MSVC_VERSION EQUAL 1600 OR MSVC_VERSION GREATER 1600) - add_compile_flags("/analyze") - else() - message("PREFAST enabled!") - set(CMAKE_C_COMPILE_OBJECT "prefast cl ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> <DEFINES> /Fo<OBJECT> -c <SOURCE>${CMAKE_END_TEMP_FILE}" +if(_VS_ANALYZE_) + message("VS static analysis enabled!") + add_compile_flags("/analyze") +elseif(_PREFAST_) + message("PREFAST enabled!") + set(CMAKE_C_COMPILE_OBJECT "prefast cl ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> <DEFINES> /Fo<OBJECT> -c <SOURCE>${CMAKE_END_TEMP_FILE}" "prefast LIST") - set(CMAKE_CXX_COMPILE_OBJECT "prefast cl ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> <DEFINES> /TP /Fo<OBJECT> -c <SOURCE>${CMAKE_END_TEMP_FILE}" + set(CMAKE_CXX_COMPILE_OBJECT "prefast cl ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> <DEFINES> /TP /Fo<OBJECT> -c <SOURCE>${CMAKE_END_TEMP_FILE}" "prefast LIST") - set(CMAKE_C_LINK_EXECUTABLE + set(CMAKE_C_LINK_EXECUTABLE "cl ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> -link /implib:<TARGET_IMPLIB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") - set(CMAKE_CXX_LINK_EXECUTABLE + set(CMAKE_CXX_LINK_EXECUTABLE "cl ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> -link /implib:<TARGET_IMPLIB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") - endif() - endif() set(CMAKE_RC_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY})

1 0

[jimtabor] 56557: [Win32SS] - Fix the remaining wine Win tests for FindWindow/Ex/A/W. Check the buffer not the length, buffer could be pointing to a null. Enable the message window handling. Use wi...
by jimtabor＠svn.reactos.org 10 May '12

10 May '12

Author: jimtabor Date: Thu May 10 06:08:51 2012 New Revision: 56557 URL: http://svn.reactos.org/svn/reactos?rev=56557&view=rev Log: [Win32SS] - Fix the remaining wine Win tests for FindWindow/Ex/A/W. Check the buffer not the length, buffer could be pointing to a null. Enable the message window handling. Use wine code for FindWindowExA. Modified: trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/user32/windows/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Thu May 10 06:08:51 2012 @@ -2509,7 +2509,7 @@ ASSERT(Parent); - CheckWindowName = WindowName->Length != 0; + CheckWindowName = WindowName->Buffer != 0; if((List = IntWinListChildren(Parent))) { @@ -2588,6 +2588,7 @@ PWND Parent, ChildAfter; UNICODE_STRING ClassName = {0}, WindowName = {0}; HWND Desktop, Ret = NULL; + BOOL DoMessageWnd = FALSE; RTL_ATOM ClassAtom = (RTL_ATOM)0; DECLARE_RETURN(HWND); @@ -2657,7 +2658,10 @@ Desktop = IntGetCurrentThreadDesktopWindow(); if(hwndParent == NULL) + { hwndParent = Desktop; + DoMessageWnd = TRUE; + } else if(hwndParent == HWND_MESSAGE) { hwndParent = IntGetMessageWindow(); @@ -2698,7 +2702,7 @@ ; } - CheckWindowName = WindowName.Length != 0; + CheckWindowName = WindowName.Buffer != 0; /* search children */ while(*phWnd) @@ -2741,15 +2745,13 @@ } } else + { + ERR("FindWindowEx: Not Desktop Parent!\n"); Ret = IntFindWindow(Parent, ChildAfter, ClassAtom, &WindowName); - -#if 0 - - if(Ret == NULL && hwndParent == NULL && hwndChildAfter == NULL) + } + + if (Ret == NULL && DoMessageWnd) { - /* FIXME: If both hwndParent and hwndChildAfter are NULL, we also should - search the message-only windows. Should this also be done if - Parent is the desktop window??? */ PWND MsgWindows; if((MsgWindows = UserGetWindowObject(IntGetMessageWindow()))) @@ -2757,7 +2759,6 @@ Ret = IntFindWindow(MsgWindows, ChildAfter, ClassAtom, &WindowName); } } -#endif } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Modified: trunk/reactos/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Thu May 10 06:08:51 2012 @@ -744,54 +744,29 @@ LPCSTR lpszClass, LPCSTR lpszWindow) { - UNICODE_STRING ucClassName, *pucClassName = NULL; - UNICODE_STRING ucWindowName, *pucWindowName = NULL; - HWND Result; - - if (IS_ATOM(lpszClass)) - { - ucClassName.Buffer = (LPWSTR)lpszClass; - ucClassName.Length = 0; - pucClassName = &ucClassName; - } - else if (lpszClass != NULL) - { - if (!RtlCreateUnicodeStringFromAsciiz(&ucClassName, - (LPSTR)lpszClass)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - pucClassName = &ucClassName; - } - - if (lpszWindow != NULL) - { - if (!RtlCreateUnicodeStringFromAsciiz(&ucWindowName, - (LPSTR)lpszWindow)) - { - if (!IS_ATOM(lpszClass) && lpszClass != NULL) - RtlFreeUnicodeString(&ucWindowName); - - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - pucWindowName = &ucWindowName; - } - - Result = NtUserFindWindowEx(hwndParent, - hwndChildAfter, - pucClassName, - pucWindowName, - 0); - - if (!IS_ATOM(lpszClass) && lpszClass != NULL) - RtlFreeUnicodeString(&ucClassName); - if (lpszWindow != NULL) - RtlFreeUnicodeString(&ucWindowName); - - return Result; + LPWSTR titleW = NULL; + HWND hwnd = 0; + + if (lpszWindow) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, lpszWindow, -1, NULL, 0 ); + if (!(titleW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return 0; + MultiByteToWideChar( CP_ACP, 0, lpszWindow, -1, titleW, len ); + } + + if (!IS_INTRESOURCE(lpszClass)) + { + WCHAR classW[256]; + if (MultiByteToWideChar( CP_ACP, 0, lpszClass, -1, classW, sizeof(classW)/sizeof(WCHAR) )) + hwnd = FindWindowExW( hwndParent, hwndChildAfter, classW, titleW ); + } + else + { + hwnd = FindWindowExW( hwndParent, hwndChildAfter, (LPCWSTR)lpszClass, titleW ); + } + + HeapFree( GetProcessHeap(), 0, titleW ); + return hwnd; }

1 0

[spetreolle] 56556: [FUSION] Add a 4th instance of fusion.dll back into system32. (doesnt match any actual windows system but needed for wine's msi.)
by spetreolle＠svn.reactos.org 09 May '12

09 May '12

Author: spetreolle Date: Wed May 9 22:12:07 2012 New Revision: 56556 URL: http://svn.reactos.org/svn/reactos?rev=56556&view=rev Log: [FUSION] Add a 4th instance of fusion.dll back into system32. (doesnt match any actual windows system but needed for wine's msi.) Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Wed May 9 22:12:07 2012 @@ -26,3 +26,4 @@ add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all) +add_cd_file(TARGET fusion DESTINATION reactos/system32 FOR all)

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