Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[cfinck] 372: Reorganize the directory structure to make more sense and checkouts on the Web Server easier
by cfinck＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: cfinck Date: Wed Apr 15 18:13:42 2009 New Revision: 372 URL: http://svn.reactos.org/svn/reactos?rev=372&view=rev Log: Reorganize the directory structure to make more sense and checkouts on the Web Server easier Added: branches/danny-web/resources/ (props changed) - copied from r371, branches/danny-web/reactos.org/resources/ branches/danny-web/scripts/ (props changed) - copied from r371, branches/danny-web/reactos.org/scripts/ branches/danny-web/sql/ (props changed) - copied from r371, branches/danny-web/reactos.org/sql/ branches/danny-web/www/ - copied from r371, branches/danny-web/reactos.org/ branches/danny-web/www/www.reactos.org/ - copied from r371, branches/danny-web/reactos.org/htdocs/ Removed: branches/danny-web/reactos.org/ branches/danny-web/www/htdocs/ branches/danny-web/www/resources/ branches/danny-web/www/scripts/ branches/danny-web/www/sql/ Propchange: branches/danny-web/resources/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk/web/reactos.org/resources:288-336 Propchange: branches/danny-web/scripts/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk/web/reactos.org/scripts:288-336 Propchange: branches/danny-web/sql/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk/web/reactos.org/sql:288-336

1 0

[gschneider] 40526: - Allow creation of icons without color bitmap in CreateIconIndirect - Compare color and mask size if color is present, compare height against height - Fixes 13 user32 cursoricon winetests - DbgPrint -> ERR or FIXME
by gschneider＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: gschneider Date: Wed Apr 15 16:36:37 2009 New Revision: 40526 URL: http://svn.reactos.org/svn/reactos?rev=40526&view=rev Log: - Allow creation of icons without color bitmap in CreateIconIndirect - Compare color and mask size if color is present, compare height against height - Fixes 13 user32 cursoricon winetests - DbgPrint -> ERR or FIXME Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c trunk/reactos/dll/win32/user32/windows/icon.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c [iso-8859-1] Wed Apr 15 16:36:37 2009 @@ -285,7 +285,7 @@ if (fuLoad & LR_SHARED) { - DbgPrint("FIXME: need LR_SHARED support for loading icon images from files\n"); + FIXME("Need LR_SHARED support for loading icon images from files\n"); } hFile = CreateFileW(lpszName, GENERIC_READ, FILE_SHARE_READ, NULL, @@ -491,7 +491,7 @@ if (Hit) { - DbgPrint("We have a thread overrun, these are already freed! pi -> %d bi -> %d\n", PrivateInfo, BitmapInfo); + ERR("We have a thread overrun, these are already freed! pi -> %d, bi -> %d\n", PrivateInfo, BitmapInfo); RtlFreeHeap(GetProcessHeap(), 0, PrivateInfo); if (fuLoad & LR_LOADFROMFILE) UnmapViewOfFile(BitmapInfo); 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 16:36:37 2009 @@ -345,20 +345,19 @@ { return (HICON)0; } - /* FIXME - does there really *have* to be a color bitmap? monochrome cursors don't have one */ - if(/*IconInfo->hbmColor &&*/ !GetObjectW(IconInfo->hbmColor, sizeof(BITMAP), &ColorBitmap)) + + /* Try to get color bitmap */ + if (GetObjectW(IconInfo->hbmColor, sizeof(BITMAP), &ColorBitmap)) { - return (HICON)0; + /* Compare size of color and mask bitmap*/ + if(ColorBitmap.bmWidth != MaskBitmap.bmWidth || + ColorBitmap.bmHeight != MaskBitmap.bmHeight) + { + ERR("Color and mask size are different!"); + SetLastError(ERROR_INVALID_PARAMETER); + return (HICON)0; + } } - - /* FIXME - i doubt this is right (monochrome cursors */ - /*if(ColorBitmap.bmWidth != MaskBitmap.bmWidth || - ColorBitmap.bmHeight != MaskBitmap.bmWidth) - { - SetLastError(ERROR_INVALID_PARAMETER); - return (HICON)0; - }*/ - return (HICON)NtUserCreateCursorIconHandle(IconInfo, TRUE); }

1 0

[dgoette] 371: * fix a problem in subsystem_wiki, wrong user_id was used and resulted in an error message * remove some queries that inserted a new mapping, where only the subsystem data should be updated
by dgoette＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: dgoette Date: Wed Apr 15 16:12:25 2009 New Revision: 371 URL: http://svn.reactos.org/svn/reactos?rev=371&view=rev Log: * fix a problem in subsystem_wiki, wrong user_id was used and resulted in an error message * remove some queries that inserted a new mapping, where only the subsystem data should be updated Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil… branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_PHPBB.… branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Wiki.c… Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil… [iso-8859-1] Wed Apr 15 16:12:25 2009 @@ -235,16 +235,8 @@ if (false === self::updateUserPrivate($user_id, $user['name'], $user['email'],$user['register'], $bz_user_id)){ return false; } - - // Insert a row in the mapping table - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_SUBSYS." (user_id, subsys, subsys_user_id) VALUES(:roscms_user, 'bugzilla', :bugzilla_user)"); - $stmt->bindParam('roscms_user',$user_id,PDO::PARAM_INT); - $stmt->bindParam('bugzilla_user',$bz_user_id,PDO::PARAM_INT); - $stmt->execute() or die('DB error (subsys_bugzilla #9)'); - - return true; - } - return false; + } + return true; } // end of member function addMapping Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_PHPBB.… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_PHPBB.… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_PHPBB.… [iso-8859-1] Wed Apr 15 16:12:25 2009 @@ -232,22 +232,8 @@ if (false === self::updateUserPrivate($user_id, $user['name'], $user['email'],$user['register'], $phpbb_user_id)){ return false; } - - $stmt=&DBConnection::getInstance()->prepare("SELECT 1 FROM ".ROSCMST_SUBSYS." WHERE user_id=:roscms_user AND subsys='phpbb' AND subsys_user_id=:phpbb_user"); - $stmt->bindParam('roscms_user',$user_id,PDO::PARAM_INT); - $stmt->bindParam('phpbb_user',$phpbb_user_id,PDO::PARAM_INT); - $stmt->execute(); - if ($stmt->fetchColumn() === false) { - - // Insert a row in the mapping table - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_SUBSYS." (user_id, subsys, subsys_user_id) VALUES(:roscms_user, 'phpbb', :phpbb_user)"); - $stmt->bindParam('roscms_user',$user_id,PDO::PARAM_INT); - $stmt->bindParam('phpbb_user',$phpbb_user_id,PDO::PARAM_INT); - $stmt->execute() or die('DB error (subsys_phpbb #9)'); - } - - return true; - } + } + return true; } // end of member function addUser Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Wiki.c… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Wiki.c… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Wiki.c… [iso-8859-1] Wed Apr 15 16:12:25 2009 @@ -120,7 +120,7 @@ $stmt=&DBConnection::getInstance()->prepare("SELECT COUNT(*) FROM ".$this->user_table." WHERE (LOWER(user_name) = LOWER(:user_name) OR LOWER(user_email) = LOWER(:user_email)) AND user_id <> :user_id"); $stmt->bindParam('user_name',$wiki_user_name,PDO::PARAM_STR); $stmt->bindParam('user_email',$user_email,PDO::PARAM_STR); - $stmt->bindParam('user_id',$user_id,PDO::PARAM_INT); + $stmt->bindParam('user_id',$subsys_user,PDO::PARAM_INT); $stmt->execute() or die('DB error (subsys_wiki #7)'); // stop if one of both already exists @@ -214,13 +214,8 @@ if (false === self::updateUserPrivate($user_id, $user['name'], $user['email'], $user['fullname'], $wiki_user_id)) { return false; } - - // Insert a row in the mapping table - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_SUBSYS." (user_id, subsys, subsys_user_id) VALUES(:roscms_user, 'wiki', :wiki_user)"); - $stmt->bindParam('roscms_user',$user_id,PDO::PARAM_INT); - $stmt->bindParam('wiki_user',$wiki_user_id,PDO::PARAM_INT); - return $stmt->execute(); - } + } + return true; } // end of member function addUser

1 0

[dchapyshev] 40525: - Implement ThreadPriorityBoost case in NtQueryInformationThread - Add ThreadDescriptorTableEntry case - Add check of parametres Approved by Aleksey.
by dchapyshev＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: dchapyshev Date: Wed Apr 15 15:57:48 2009 New Revision: 40525 URL: http://svn.reactos.org/svn/reactos?rev=40525&view=rev Log: - Implement ThreadPriorityBoost case in NtQueryInformationThread - Add ThreadDescriptorTableEntry case - Add check of parametres Approved by Aleksey. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=40… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Wed Apr 15 15:57:48 2009 @@ -1306,17 +1306,27 @@ KIRQL OldIrql; PAGED_CODE(); - /* Verify Information Class validity */ -#if 0 - Status = DefaultQueryInfoBufferCheck(ThreadInformationClass, - PsThreadInfoClass, - RTL_NUMBER_OF(PsThreadInfoClass), - ThreadInformation, - ThreadInformationLength, - ReturnLength, - PreviousMode); - if (!NT_SUCCESS(Status)) return Status; -#endif + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + ProbeForWrite(ThreadInformation, + ThreadInformationLength, + sizeof(ULONG)); + + if (ReturnLength) + { + ProbeForWriteUlong(ReturnLength); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) return Status; + } /* Check what class this is */ Access = THREAD_QUERY_INFORMATION; @@ -1497,6 +1507,33 @@ /* Lower IRQL back */ KeLowerIrql(OldIrql); + break; + + case ThreadDescriptorTableEntry: + DPRINT1("NtQueryInformationThread(): case ThreadDescriptorTableEntry not implemented!\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ThreadPriorityBoost: + + /* Set the return length*/ + Length = sizeof(ULONG); + + if (ThreadInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + _SEH2_TRY + { + *(PULONG)ThreadInformation = Thread->Tcb.DisableBoost ? 1 : 0; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; break; /* Anything else */

1 0

[dgoette] 370: * fix old table name and old attribute * fix typo in another attribute
by dgoette＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: dgoette Date: Wed Apr 15 15:57:10 2009 New Revision: 370 URL: http://svn.reactos.org/svn/reactos?rev=370&view=rev Log: * fix old table name and old attribute * fix typo in another attribute Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil… branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil… [iso-8859-1] Wed Apr 15 15:57:10 2009 @@ -186,7 +186,7 @@ } // Finally, insert a row in the mapping table - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_SUBSYS." (user_id, subsys, subsy_user_id) VALUES(:user_id, 'bugzilla', LAST_INSERT_ID())"); + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_SUBSYS." (user_id, subsys, subsys_user_id) VALUES(:user_id, 'bugzilla', LAST_INSERT_ID())"); $stmt->bindParam('user_id',$user_id,PDO::PARAM_INT); return $stmt->execute(); } // end of member function addUser Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… [iso-8859-1] Wed Apr 15 15:57:10 2009 @@ -153,7 +153,7 @@ // At this point, we've passed all checks and we have a valid login check if there's an existing session, if so, end that session if (0 != Login::in( Login::OPTIONAL, '')) { - $stmt=&DBConnection::getInstance()->prepare("DELETE FROM user_sessions WHERE usersession_user_id =:user_id"); + $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_SESSIONS." WHERE user_id =:user_id"); $stmt->bindParam('user_id',$_COOKIE[$config->cookieUserKey()],PDO::PARAM_INT); $stmt->execute(); }

1 0

[janderwald] 40524: - Plug in sample rate conversion library, doesnt work yet - Implement calloc, memset, memcpy as calling their Rtl* wrapper doesnt work- Add define for AC97 hacks
by janderwald＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: janderwald Date: Wed Apr 15 14:41:41 2009 New Revision: 40524 URL: http://svn.reactos.org/svn/reactos?rev=40524&view=rev Log: - Plug in sample rate conversion library, doesnt work yet - Implement calloc, memset, memcpy as calling their Rtl* wrapper doesnt work- Add define for AC97 hacks Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c trunk/reactos/drivers/wdm/audio/sysaudio/control.c Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Wed Apr 15 14:41:41 2009 @@ -9,6 +9,140 @@ #include "kmixer.h" const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; + +NTSTATUS +PerformSampleRateConversion( + PUCHAR Buffer, + ULONG BufferLength, + ULONG OldRate, + ULONG NewRate, + ULONG BytesPerSample, + ULONG NumChannels, + PVOID * Result, + PULONG ResultLength) +{ + KFLOATING_SAVE FloatSave; + NTSTATUS Status; + ULONG Index; + SRC_STATE * State; + SRC_DATA Data; + PUCHAR ResultOut; + int error; + PFLOAT FloatIn, FloatOut; + ULONG NumSamples; + ULONG NewSamples; + + DPRINT("PerformSampleRateConversion OldRate %u NewRate %u BytesPerSample %u NumChannels %u Irql %u\n", OldRate, NewRate, BytesPerSample, NumChannels, KeGetCurrentIrql()); + + /* first acquire float save context */ + Status = KeSaveFloatingPointState(&FloatSave); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("KeSaveFloatingPointState failed with %x\n", Status); + return Status; + } + + NumSamples = BufferLength / BytesPerSample; + + FloatIn = ExAllocatePool(NonPagedPool, NumSamples * sizeof(FLOAT)); + if (!FloatIn) + { + KeRestoreFloatingPointState(&FloatSave); + return STATUS_INSUFFICIENT_RESOURCES; + } + + NewSamples = lrintf(((FLOAT)NumSamples * ((FLOAT)NewRate / (FLOAT)OldRate))) + 2; + + FloatOut = ExAllocatePool(NonPagedPool, NewSamples * sizeof(FLOAT)); + if (!FloatOut) + { + ExFreePool(FloatIn); + KeRestoreFloatingPointState(&FloatSave); + return STATUS_INSUFFICIENT_RESOURCES; + } + + ResultOut = ExAllocatePool(NonPagedPool, NewSamples * (BytesPerSample/8)); + if (!FloatOut) + { + ExFreePool(FloatIn); + ExFreePool(FloatOut); + KeRestoreFloatingPointState(&FloatSave); + return STATUS_INSUFFICIENT_RESOURCES; + } + + State = src_new(SRC_SINC_FASTEST, NumChannels, &error); + if (!State) + { + DPRINT1("KeSaveFloatingPointState failed with %x\n", Status); + KeRestoreFloatingPointState(&FloatSave); + ExFreePool(FloatIn); + ExFreePool(FloatOut); + ExFreePool(ResultOut); + return STATUS_UNSUCCESSFUL; + } + + /* fixme use asm */ + if (BytesPerSample == 8) + { + for(Index = 0; Index < NumSamples; Index++) + FloatIn[Index] = (float)Buffer[Index]; + } + else if (BytesPerSample == 16) + { + PUSHORT Res = (PUSHORT)ResultOut; + for(Index = 0; Index < NumSamples; Index++) + FloatIn[Index] = (float)_byteswap_ushort(Res[Index]); + } + else + { + UNIMPLEMENTED + KeRestoreFloatingPointState(&FloatSave); + ExFreePool(FloatIn); + ExFreePool(FloatOut); + ExFreePool(ResultOut); + return STATUS_UNSUCCESSFUL; + } + + Data.data_in = FloatIn; + Data.data_out = FloatOut; + Data.input_frames = NumSamples / NumChannels; + Data.output_frames = NewSamples / NumChannels; + Data.src_ratio = (double)NewRate / (double)OldRate; + + error = src_process(State, &Data); + if (error) + { + DPRINT1("src_process failed with %x\n", error); + KeRestoreFloatingPointState(&FloatSave); + ExFreePool(FloatIn); + ExFreePool(FloatOut); + ExFreePool(ResultOut); + return STATUS_UNSUCCESSFUL; + } + + if (BytesPerSample == 8) + { + for(Index = 0; Index < Data.output_frames_gen * NumChannels; Index++) + ResultOut[Index] = lrintf(FloatOut[Index]); + } + else if (BytesPerSample == 16) + { + PUSHORT Res = (PUSHORT)ResultOut; + + for(Index = 0; Index < Data.output_frames_gen * NumChannels; Index++) + Res[Index] = _byteswap_ushort(lrintf(FloatOut[Index])); + } + + *Result = ResultOut; + *ResultLength = Data.output_frames_gen * (BytesPerSample/8) * NumChannels; + ExFreePool(FloatIn); + ExFreePool(FloatOut); + src_delete(State); + KeRestoreFloatingPointState(&FloatSave); + + return STATUS_SUCCESS; +} NTSTATUS PerformChannelConversion( @@ -502,7 +636,7 @@ StreamHeader->DataUsed, InputFormat->WaveFormatEx.nChannels, OutputFormat->WaveFormatEx.nChannels, - InputFormat->WaveFormatEx.wBitsPerSample, + OutputFormat->WaveFormatEx.wBitsPerSample, &BufferOut, &BufferLength); @@ -516,9 +650,20 @@ if (InputFormat->WaveFormatEx.nSamplesPerSec != OutputFormat->WaveFormatEx.nSamplesPerSec) { - /* sample format conversion must be done in a deferred routine */ - DPRINT1("SampleRate conversion not available yet %u %u\n", InputFormat->WaveFormatEx.nSamplesPerSec, OutputFormat->WaveFormatEx.nSamplesPerSec); - return FALSE; + Status = PerformSampleRateConversion(StreamHeader->Data, + StreamHeader->DataUsed, + InputFormat->WaveFormatEx.nSamplesPerSec, + OutputFormat->WaveFormatEx.nSamplesPerSec, + OutputFormat->WaveFormatEx.wBitsPerSample, + OutputFormat->WaveFormatEx.nChannels, + &BufferOut, + &BufferLength); + if (NT_SUCCESS(Status)) + { + ExFreePool(StreamHeader->Data); + StreamHeader->Data = BufferOut; + StreamHeader->DataUsed = BufferLength; + } } if (NT_SUCCESS(Status)) @@ -567,9 +712,13 @@ void * calloc(size_t Elements, size_t ElementSize) { - PVOID Block = ExAllocatePool(NonPagedPool, Elements * ElementSize); - if (Block) - RtlZeroMemory(Block, Elements * ElementSize); + ULONG Index; + PUCHAR Block = ExAllocatePool(NonPagedPool, Elements * ElementSize); + if (!Block) + return NULL; + + for(Index = 0; Index < Elements * ElementSize; Index++) + Block[Index] = 0; return Block; } @@ -584,7 +733,12 @@ int c, size_t count) { - RtlFillMemory(dest, count, c); + ULONG Index; + PUCHAR Block = (PUCHAR)dest; + + for(Index = 0; Index < count; Index++) + Block[Index] = c; + return dest; } @@ -593,18 +747,10 @@ const void* src, size_t count) { - RtlCopyMemory(dest, src, count); + ULONG Index; + PUCHAR Src = (PUCHAR)src, Dest = (PUCHAR)dest; + + for(Index = 0; Index < count; Index++) + Dest[Index] = Src[Index]; return dest; } - -void *memmove( - void* dest, - const void* src, - size_t count) -{ - RtlMoveMemory(dest, src, count); - return dest; -} - - - Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Wed Apr 15 14:41:41 2009 @@ -201,6 +201,7 @@ PFILE_OBJECT RealFileObject = NULL, VirtualFileObject = NULL; PSYSAUDIO_CLIENT AudioClient; PSYSAUDIO_PIN_HANDLE ClientPinHandle; + PKSDATAFORMAT_WAVEFORMATEX InputFormat; PKSDATAFORMAT_WAVEFORMATEX OutputFormat = NULL; PKSPIN_CONNECT MixerPinConnect = NULL; PPIN_WORKER_CONTEXT WorkerContext = (PPIN_WORKER_CONTEXT)Context; @@ -215,6 +216,11 @@ ASSERT(WorkerContext->PinConnect); ASSERT(WorkerContext->Entry->Pins); ASSERT(WorkerContext->Entry->NumberOfPins > WorkerContext->PinConnect->PinId); + + + /* Fetch input format */ + InputFormat = (PKSDATAFORMAT_WAVEFORMATEX)(WorkerContext->PinConnect + 1); + /* Let's try to create the audio irp pin */ Status = KsCreatePin(WorkerContext->Entry->Handle, WorkerContext->PinConnect, GENERIC_READ | GENERIC_WRITE, &RealPinHandle); @@ -258,6 +264,8 @@ KeBugCheck(0); return; } + DPRINT(" InputFormat: SampleRate %u Bits %u Channels %u\n", InputFormat->WaveFormatEx.nSamplesPerSec, InputFormat->WaveFormatEx.wBitsPerSample, InputFormat->WaveFormatEx.nChannels); + DPRINT("OutputFormat: SampleRate %u Bits %u Channels %u\n", OutputFormat->WaveFormatEx.nSamplesPerSec, OutputFormat->WaveFormatEx.wBitsPerSample, OutputFormat->WaveFormatEx.nChannels); } /* get pin file object */ @@ -286,15 +294,10 @@ /* Do we need to transform the audio stream */ if (OutputFormat != NULL) { - PKSDATAFORMAT InputFormat; - - /* Fetch input format */ - InputFormat = (PKSDATAFORMAT)(WorkerContext->PinConnect + 1); - /* Now create the mixer pin */ Status = CreateMixerPinAndSetFormat(WorkerContext->DeviceExtension->KMixerHandle, MixerPinConnect, - InputFormat, + (PKSDATAFORMAT)InputFormat, (PKSDATAFORMAT)OutputFormat, &WorkerContext->DispatchContext->hMixerPin, &WorkerContext->DispatchContext->MixerFileObject); @@ -583,6 +586,7 @@ AudioRange = (PKSDATARANGE_AUDIO)((PUCHAR)AudioRange + AudioRange->DataRange.FormatSize); } /* Select best quality available */ + MixerFormat->DataFormat.FormatSize = sizeof(KSDATAFORMAT) + sizeof(WAVEFORMATEX); MixerFormat->DataFormat.Flags = 0; MixerFormat->DataFormat.Reserved = 0; @@ -591,9 +595,23 @@ MixerFormat->DataFormat.Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX; MixerFormat->DataFormat.SampleSize = 4; MixerFormat->WaveFormatEx.wFormatTag = ClientFormat->WaveFormatEx.wFormatTag; - MixerFormat->WaveFormatEx.nChannels = min(2, AudioRange->MaximumChannels); /* AC97 does not support mono render / record */ +#ifndef NO_AC97_HACK + /* HACK: AC97 does not support mono render / record */ + MixerFormat->WaveFormatEx.nChannels = 2; + /*HACK: AC97 only supports 16-Bit Bits */ + MixerFormat->WaveFormatEx.wBitsPerSample = 16; + +#else + MixerFormat->WaveFormatEx.nChannels = min(ClientFormat->WaveFormatEx.nSamplesPerSec, AudioRange->MaximumChannels); + MixerFormat->WaveFormatEx.wBitsPerSample = AudioRange->MaximumBitsPerSample; +#endif + +#ifdef KMIXER_RESAMPLING_IMPLEMENTED MixerFormat->WaveFormatEx.nSamplesPerSec = AudioRange->MaximumSampleFrequency; - MixerFormat->WaveFormatEx.wBitsPerSample = AudioRange->MaximumBitsPerSample; +#else + MixerFormat->WaveFormatEx.nSamplesPerSec = max(AudioRange->MinimumSampleFrequency, min(ClientFormat->WaveFormatEx.nSamplesPerSec, AudioRange->MaximumSampleFrequency)); +#endif + MixerFormat->WaveFormatEx.cbSize = 0; MixerFormat->WaveFormatEx.nBlockAlign = (MixerFormat->WaveFormatEx.nChannels * MixerFormat->WaveFormatEx.wBitsPerSample) / 8; MixerFormat->WaveFormatEx.nAvgBytesPerSec = MixerFormat->WaveFormatEx.nChannels * MixerFormat->WaveFormatEx.nSamplesPerSec * (MixerFormat->WaveFormatEx.wBitsPerSample / 8);

1 0

[dchapyshev] 40523: - At an exception returns STATUS_DLL_NOT_FOUND. It fixes one wine test
by dchapyshev＠svn.reactos.org 15 Apr '09

15 Apr '09

Author: dchapyshev Date: Wed Apr 15 14:20:10 2009 New Revision: 40523 URL: http://svn.reactos.org/svn/reactos?rev=40523&view=rev Log: - At an exception returns STATUS_DLL_NOT_FOUND. It fixes one wine test Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Wed Apr 15 14:20:10 2009 @@ -2512,7 +2512,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Ignore exception and return */ + _SEH2_YIELD(return STATUS_DLL_NOT_FOUND); } _SEH2_END; return STATUS_PROCEDURE_NOT_FOUND;

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