Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[cfinck] 373: - Separate the logs into an extra table "winetest_logs" to lower the memory requirements for JOINs with "winetest_results" by several magnitudes Fixes testman's slowness on our testing web server. - Escape the log with htmlspecialchars() in detail.php (fixes showing KDBG frames)
by cfinck＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: cfinck Date: Thu Apr 16 03:47:13 2009 New Revision: 373 URL: http://svn.reactos.org/svn/reactos?rev=373&view=rev Log: - Separate the logs into an extra table "winetest_logs" to lower the memory requirements for JOINs with "winetest_results" by several magnitudes Fixes testman's slowness on our testing web server. - Escape the log with htmlspecialchars() in detail.php (fixes showing KDBG frames) Modified: branches/danny-web/resources/testman/testman.sql branches/danny-web/www/www.reactos.org/testman/detail.php branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… Modified: branches/danny-web/resources/testman/testman.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/resources/testman/tes… ============================================================================== --- branches/danny-web/resources/testman/testman.sql [iso-8859-1] (original) +++ branches/danny-web/resources/testman/testman.sql [iso-8859-1] Thu Apr 16 03:47:13 2009 @@ -5,11 +5,16 @@ PRIMARY KEY (`user_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; +CREATE TABLE `winetest_logs` ( + `id` int(10) unsigned NOT NULL auto_increment, + `log` longtext collate latin1_general_ci NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; + CREATE TABLE `winetest_results` ( `id` int(10) unsigned NOT NULL auto_increment, `test_id` int(10) unsigned NOT NULL, `suite_id` int(10) unsigned NOT NULL, - `log` longtext collate latin1_general_ci NOT NULL, `count` int(10) NOT NULL COMMENT 'Number of all executed tests', `todo` int(10) unsigned NOT NULL COMMENT 'Tests marked as TODO', `failures` int(10) unsigned NOT NULL COMMENT 'Number of failed tests', Modified: branches/danny-web/www/www.reactos.org/testman/detail.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/detail.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/detail.php [iso-8859-1] Thu Apr 16 03:47:13 2009 @@ -52,8 +52,9 @@ // Get information about this result $stmt = $dbh->prepare( - "SELECT e.log, e.count, e.todo, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, a.name, r.comment " . + "SELECT l.log, e.count, e.todo, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, a.name, r.comment " . "FROM " . DB_TESTMAN . ".winetest_results e " . + "JOIN " . DB_TESTMAN . ".winetest_logs l ON e.id = l.id " . "JOIN " . DB_TESTMAN . ".winetest_suites s ON e.suite_id = s.id " . "JOIN " . DB_TESTMAN . ".winetest_runs r ON e.test_id = r.id " . "JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id " . @@ -91,7 +92,7 @@ </tr> <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["log"]; ?>:</td> - <td><pre><?php echo $row["log"]; ?></pre></td> + <td><pre><?php echo htmlspecialchars($row["log"]); ?></pre></td> </tr> </table><br /> Modified: branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… [iso-8859-1] Thu Apr 16 03:47:13 2009 @@ -84,15 +84,19 @@ } // Add the information into the DB - $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_results (test_id, suite_id, log, count, todo, failures, skipped) VALUES (:testid, :suiteid, :log, :count, :todo, :failures, :skipped)"); + $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_results (test_id, suite_id, count, todo, failures, skipped) VALUES (:testid, :suiteid, :count, :todo, :failures, :skipped)"); $stmt->bindValue(":testid", (int)$test_id); $stmt->bindValue(":suiteid", (int)$suite_id); - $stmt->bindParam(":log", $log); $stmt->bindParam(":count", $count); $stmt->bindParam(":todo", $todo); $stmt->bindParam(":failures", $failures); $stmt->bindParam(":skipped", $skipped); $stmt->execute() or die("Submit(): SQL failed #2"); + + $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_logs (id, log) VALUES (:id, :log)"); + $stmt->bindValue(":id", (int)$dbh->lastInsertId()); + $stmt->bindParam(":log", $log); + $stmt->execute() or die("Submit(): SQL failed #3"); return "OK"; }

1 0

[cwittich] 40535: fix some setupapi winetests
by cwittich＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: cwittich Date: Thu Apr 16 01:19:48 2009 New Revision: 40535 URL: http://svn.reactos.org/svn/reactos?rev=40535&view=rev Log: fix some setupapi winetests Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Thu Apr 16 01:19:48 2009 @@ -3373,7 +3373,12 @@ PWSTR InfFileNameW = NULL; BOOL Result; - if (InfFileName) + if (!InfFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + else { InfFileNameW = MultiByteToUnicode(InfFileName, CP_ACP); if (InfFileNameW == NULL)

1 0

[khornicek] 40534: - sync wined3d, d3d8, d3d9, ddraw with Wine 1.1.19
by khornicek＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: khornicek Date: Thu Apr 16 00:40:10 2009 New Revision: 40534 URL: http://svn.reactos.org/svn/reactos?rev=40534&view=rev Log: - sync wined3d, d3d8, d3d9, ddraw with Wine 1.1.19 Removed: trunk/reactos/dll/directx/wine/d3d9/Makefile.in Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/direct3d.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/wined3d.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/inde… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Removed: trunk/reactos/dll/directx/wine/d3d9/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/Make… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/direct3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dir… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

1 0

[sedwards] 40533: make telnetd manual
by sedwards＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: sedwards Date: Wed Apr 15 22:29:37 2009 New Revision: 40533 URL: http://svn.reactos.org/svn/reactos?rev=40533&view=rev Log: make telnetd manual Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Apr 15 22:29:37 2009 @@ -1067,7 +1067,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Group",0x00000000,"Network" HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","ImagePath",0x00020000,"%SystemRoot%\system32\telnetd.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Type",0x00010001,0x00000020 ; Sound Blaster (NT4)

1 0

[dchapyshev] 40532: - Revert r40529
by dchapyshev＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: dchapyshev Date: Wed Apr 15 21:18:20 2009 New Revision: 40532 URL: http://svn.reactos.org/svn/reactos?rev=40532&view=rev Log: - Revert r40529 Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Wed Apr 15 21:18:20 2009 @@ -718,6 +718,38 @@ return FALSE; } + if (lpCurrentDirectory) + { + LPWSTR FilePart, Buffer = NULL; + + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + (MAX_PATH + 1) * sizeof(WCHAR)); + + if (!Buffer) + { + SetLastErrorByStatus(STATUS_NO_MEMORY); + return FALSE; + } + + if (GetFullPathNameW(lpCurrentDirectory, MAX_PATH, Buffer, &FilePart) > MAX_PATH) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + SetLastError(ERROR_DIRECTORY); + return FALSE; + } + + if ((GetFileAttributesW(Buffer) == INVALID_FILE_ATTRIBUTES) || + !(GetFileAttributesW(Buffer) & FILE_ATTRIBUTE_DIRECTORY)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + SetLastError(ERROR_DIRECTORY); + return FALSE; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + } + /* * We're going to modify and mask out flags and stuff in lpStartupInfo, * so we'll use our own local copy for that.

1 0

[gschneider] 40531: - Detect switched color and mask bitmaps in CreateCursorIndirect and switch them back - Don't set the icon hotspot too early in CreateIcon - Fixes five cursoricon winetests
by gschneider＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: gschneider Date: Wed Apr 15 21:09:17 2009 New Revision: 40531 URL: http://svn.reactos.org/svn/reactos?rev=40531&view=rev Log: - Detect switched color and mask bitmaps in CreateCursorIndirect and switch them back - Don't set the icon hotspot too early in CreateIcon - Fixes five cursoricon winetests Modified: trunk/reactos/dll/win32/user32/windows/icon.c Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] Wed Apr 15 21:09:17 2009 @@ -195,8 +195,6 @@ ICONINFO IconInfo; IconInfo.fIcon = TRUE; - IconInfo.xHotspot = nWidth / 2; - IconInfo.yHotspot = nHeight / 2; if (cBitsPixel == 1) { @@ -347,6 +345,7 @@ { BITMAP ColorBitmap; BITMAP MaskBitmap; + HBITMAP hbmTemp; if(!IconInfo) { @@ -363,12 +362,19 @@ if (GetObjectW(IconInfo->hbmColor, sizeof(BITMAP), &ColorBitmap)) { /* Compare size of color and mask bitmap*/ - if(ColorBitmap.bmWidth != MaskBitmap.bmWidth || + if (ColorBitmap.bmWidth != MaskBitmap.bmWidth || ColorBitmap.bmHeight != MaskBitmap.bmHeight) { ERR("Color and mask size are different!"); SetLastError(ERROR_INVALID_PARAMETER); return (HICON)0; + } + /* Check if color and mask are switched and switch them back */ + if (MaskBitmap.bmBitsPixel != 1 && ColorBitmap.bmBitsPixel == 1) + { + hbmTemp = IconInfo->hbmMask; + IconInfo->hbmMask = IconInfo->hbmColor; + IconInfo->hbmColor = hbmTemp; } } return (HICON)NtUserCreateCursorIconHandle(IconInfo, TRUE);

1 0

[gschneider] 40530: More monochrome icon handling fixes in CreateIcon and CreateCursorIconHandle, fixes two cursoricon winetests
by gschneider＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: gschneider Date: Wed Apr 15 20:00:22 2009 New Revision: 40530 URL: http://svn.reactos.org/svn/reactos?rev=40530&view=rev Log: More monochrome icon handling fixes in CreateIcon and CreateCursorIconHandle, fixes two cursoricon winetests Modified: trunk/reactos/dll/win32/user32/windows/icon.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] Wed Apr 15 20:00:22 2009 @@ -197,6 +197,11 @@ IconInfo.fIcon = TRUE; IconInfo.xHotspot = nWidth / 2; IconInfo.yHotspot = nHeight / 2; + + if (cBitsPixel == 1) + { + nHeight <<= 1; + } IconInfo.hbmMask = CreateBitmap(nWidth, nHeight, 1, 1, ANDbits); if(!IconInfo.hbmMask) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Apr 15 20:00:22 2009 @@ -561,7 +561,7 @@ if (CurIcon->IconInfo.hbmColor == NULL) { CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; + CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy >> 1; } SURFACE_UnlockSurface(psurfBmp); GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL);

1 0

[dchapyshev] 40529: - Revert r40483
by dchapyshev＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: dchapyshev Date: Wed Apr 15 19:47:45 2009 New Revision: 40529 URL: http://svn.reactos.org/svn/reactos?rev=40529&view=rev Log: - Revert r40483 Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Wed Apr 15 19:47:45 2009 @@ -718,38 +718,6 @@ return FALSE; } - if (lpCurrentDirectory) - { - LPWSTR FilePart, Buffer = NULL; - - Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - (MAX_PATH + 1) * sizeof(WCHAR)); - - if (!Buffer) - { - SetLastErrorByStatus(STATUS_NO_MEMORY); - return FALSE; - } - - if (GetFullPathNameW(lpCurrentDirectory, MAX_PATH, Buffer, &FilePart) > MAX_PATH) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - SetLastError(ERROR_DIRECTORY); - return FALSE; - } - - if ((GetFileAttributesW(Buffer) == INVALID_FILE_ATTRIBUTES) || - !(GetFileAttributesW(Buffer) & FILE_ATTRIBUTE_DIRECTORY)) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - SetLastError(ERROR_DIRECTORY); - return FALSE; - } - - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - } - /* * We're going to modify and mask out flags and stuff in lpStartupInfo, * so we'll use our own local copy for that.

1 0

[gschneider] 40528: - CreateIcon: create color bitmap only if bitsPixel specifies a non-monochrome icon - CreateCursorIconHandle: set hotspot for icons based on the bitmap size - Fixes seven user32 cursoricon winetests
by gschneider＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: gschneider Date: Wed Apr 15 19:39:46 2009 New Revision: 40528 URL: http://svn.reactos.org/svn/reactos?rev=40528&view=rev Log: - CreateIcon: create color bitmap only if bitsPixel specifies a non-monochrome icon - CreateCursorIconHandle: set hotspot for icons based on the bitmap size - Fixes seven user32 cursoricon winetests Modified: trunk/reactos/dll/win32/user32/windows/icon.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] Wed Apr 15 19:39:46 2009 @@ -202,11 +202,19 @@ { return (HICON)0; } - IconInfo.hbmColor = CreateBitmap(nWidth, nHeight, cPlanes, cBitsPixel, XORbits); - if(!IconInfo.hbmColor) + + if (cBitsPixel == 1) { - DeleteObject(IconInfo.hbmMask); - return (HICON)0; + IconInfo.hbmColor = (HBITMAP)0; + } + else + { + IconInfo.hbmColor = CreateBitmap(nWidth, nHeight, cPlanes, cBitsPixel, XORbits); + if(!IconInfo.hbmColor) + { + DeleteObject(IconInfo.hbmMask); + return (HICON)0; + } } return NtUserCreateCursorIconHandle(&IconInfo, FALSE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Apr 15 19:39:46 2009 @@ -541,6 +541,7 @@ Status = MmCopyFromCaller(&CurIcon->IconInfo, IconInfo, sizeof(ICONINFO)); if(NT_SUCCESS(Status)) { + /* Copy bitmaps and size info */ if(Indirect) { CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); @@ -560,10 +561,17 @@ if (CurIcon->IconInfo.hbmColor == NULL) { CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy / 2; + CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; } SURFACE_UnlockSurface(psurfBmp); GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); + } + + /* Calculate icon hotspot */ + if (CurIcon->IconInfo.fIcon == TRUE) + { + CurIcon->IconInfo.xHotspot = CurIcon->Size.cx >> 1; + CurIcon->IconInfo.yHotspot = CurIcon->Size.cy >> 1; } } else

1 0

[dchapyshev] 40527: - Revert r40484
by dchapyshev＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: dchapyshev Date: Wed Apr 15 19:32:04 2009 New Revision: 40527 URL: http://svn.reactos.org/svn/reactos?rev=40527&view=rev Log: - Revert r40484 Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Wed Apr 15 19:32:04 2009 @@ -720,12 +720,34 @@ if (lpCurrentDirectory) { - if ((GetFileAttributesW(lpCurrentDirectory) == INVALID_FILE_ATTRIBUTES) || - !(GetFileAttributesW(lpCurrentDirectory) & FILE_ATTRIBUTE_DIRECTORY)) - { + LPWSTR FilePart, Buffer = NULL; + + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + (MAX_PATH + 1) * sizeof(WCHAR)); + + if (!Buffer) + { + SetLastErrorByStatus(STATUS_NO_MEMORY); + return FALSE; + } + + if (GetFullPathNameW(lpCurrentDirectory, MAX_PATH, Buffer, &FilePart) > MAX_PATH) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); SetLastError(ERROR_DIRECTORY); return FALSE; } + + if ((GetFileAttributesW(Buffer) == INVALID_FILE_ATTRIBUTES) || + !(GetFileAttributesW(Buffer) & FILE_ATTRIBUTE_DIRECTORY)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + SetLastError(ERROR_DIRECTORY); + return FALSE; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); } /*

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
48
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 April 2009