Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[ion] 18111: Fix calc.exe redraw problems on XP. Patch by Christoph_vW <Christoph@ApiViewer.de>
by ion＠svn.reactos.com 26 Sep '05

26 Sep '05

Fix calc.exe redraw problems on XP. Patch by Christoph_vW <Christoph(a)ApiViewer.de> Modified: trunk/reactos/subsys/system/calc/winecalc.c _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-09-26 21:39:04 UTC (rev 18110) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-09-26 21:49:03 UTC (rev 18111) @@ -194,7 +194,7 @@ hWnd = CreateWindow( appname, appname, - WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX, + WS_CLIPSIBLINGS | (WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX), CW_USEDEFAULT, CW_USEDEFAULT, calc.sciMode ? CALC_STANDARD_WIDTH : CALC_SCIENTIFIC_WIDTH,

1 0

[ion] 18110: - Implement alldvrm and aulldvrm and export them from ntoskrnl. This fixes bug 467.
by ion＠svn.reactos.com 26 Sep '05

26 Sep '05

- Implement alldvrm and aulldvrm and export them from ntoskrnl. This fixes bug 467. Modified: trunk/reactos/lib/rtl/i386/math.S Modified: trunk/reactos/ntoskrnl/ntoskrnl.def _____ Modified: trunk/reactos/lib/rtl/i386/math.S --- trunk/reactos/lib/rtl/i386/math.S 2005-09-26 20:52:20 UTC (rev 18109) +++ trunk/reactos/lib/rtl/i386/math.S 2005-09-26 21:39:04 UTC (rev 18110) @@ -5,7 +5,34 @@ * FILE: lib/rtl/i386/math.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) * Eric Kohl (ekohl(a)rz-online.de) - * REVISION HISTORY: 27/07/2005 Created + * + * Copyright (C) 2002 Michael Ringgaard. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ /* GLOBALS ****************************************************************/ @@ -19,6 +46,8 @@ .globl __aullrem .globl __allmul .globl __alldiv +.globl __aulldvrm +.globl __alldvrm /* FUNCTIONS ***************************************************************/ @@ -235,3 +264,368 @@ /* Remove stack frame and return*/ leave ret + +__alldvrm: + push edi + push esi + push ebp + +// Set up the local stack and save the index registers. When this is done +// the stack frame will look as follows (assuming that the expression a/b will +// generate a call to alldvrm(a, b)): +// +// ----------------- +// | | +// |---------------| +// | | +// |--divisor (b)--| +// | | +// |---------------| +// | | +// |--dividend (a)-| +// | | +// |---------------| +// | return addr** | +// |---------------| +// | EDI | +// |---------------| +// | ESI | +// |---------------| +// ESP---->| EBP | +// ----------------- +// + +#define DVNDLO [esp + 16] // stack address of dividend (a) +#define DVNDHI [esp + 20] // stack address of dividend (a) +#define DVSRLO [esp + 24] // stack address of divisor (b) +#define DVSRHI [esp + 28] // stack address of divisor (b) + +// Determine sign of the quotient (edi = 0 if result is positive, non-zero +// otherwise) and make operands positive. +// Sign of the remainder is kept in ebp. + + xor edi,edi // result sign assumed positive + xor ebp,ebp // result sign assumed positive + + mov eax,DVNDHI // hi word of a + or eax,eax // test to see if signed + jge short L1 // skip rest if a is already positive + inc edi // complement result sign flag + inc ebp // complement result sign flag + mov edx,DVNDLO // lo word of a + neg eax // make a positive + neg edx + sbb eax,0 + mov DVNDHI,eax // save positive value + mov DVNDLO,edx +L1: + mov eax,DVSRHI // hi word of b + or eax,eax // test to see if signed + jge short L2 // skip rest if b is already positive + inc edi // complement the result sign flag + mov edx,DVSRLO // lo word of a + neg eax // make b positive + neg edx + sbb eax,0 + mov DVSRHI,eax // save positive value + mov DVSRLO,edx +L2: + +// +// Now do the divide. First look to see if the divisor is less than 4194304K. +// If so, then we can use a simple algorithm with word divides, otherwise +// things get a little more complex. +// +// NOTE - eax currently contains the high order word of DVSR +// + + or eax,eax // check to see if divisor < 4194304K + jnz short L3 // nope, gotta do this the hard way + mov ecx,DVSRLO // load divisor + mov eax,DVNDHI // load high word of dividend + xor edx,edx + div ecx // eax <- high order bits of quotient + mov ebx,eax // save high bits of quotient + mov eax,DVNDLO // edx:eax <- remainder:lo word of dividend + div ecx // eax <- low order bits of quotient + mov esi,eax // ebx:esi <- quotient +// +// Now we need to do a multiply so that we can compute the remainder. +// + mov eax,ebx // set up high word of quotient + mul dword ptr DVSRLO // HIWORD(QUOT) * DVSR + mov ecx,eax // save the result in ecx + mov eax,esi // set up low word of quotient + mul dword ptr DVSRLO // LOWORD(QUOT) * DVSR + add edx,ecx // EDX:EAX = QUOT * DVSR + jmp short L4 // complete remainder calculation + +// +// Here we do it the hard way. Remember, eax contains the high word of DVSR +// + +L3: + mov ebx,eax // ebx:ecx <- divisor + mov ecx,DVSRLO + mov edx,DVNDHI // edx:eax <- dividend + mov eax,DVNDLO +L5: + shr ebx,1 // shift divisor right one bit + rcr ecx,1 + shr edx,1 // shift dividend right one bit + rcr eax,1 + or ebx,ebx + jnz short L5 // loop until divisor < 4194304K + div ecx // now divide, ignore remainder + mov esi,eax // save quotient + +// +// We may be off by one, so to check, we will multiply the quotient +// by the divisor and check the result against the orignal dividend +// Note that we must also check for overflow, which can occur if the +// dividend is close to 2**64 and the quotient is off by 1. +// + + mul dword ptr DVSRHI // QUOT * DVSRHI + mov ecx,eax + mov eax,DVSRLO + mul esi // QUOT * DVSRLO + add edx,ecx // EDX:EAX = QUOT * DVSR + jc short L6 // carry means Quotient is off by 1 + +// +// do long compare here between original dividend and the result of the +// multiply in edx:eax. If original is larger or equal, we are ok, otherwise +// subtract one (1) from the quotient. +// + + cmp edx,DVNDHI // compare hi words of result and original + ja short L6 // if result > original, do subtract + jb short L7 // if result < original, we are ok + cmp eax,DVNDLO // hi words are equal, compare lo words + jbe short L7 // if less or equal we are ok, else subtract +L6: + dec esi // subtract 1 from quotient + sub eax,DVSRLO // subtract divisor from result + sbb edx,DVSRHI +L7: + xor ebx,ebx // ebx:esi <- quotient + +L4: +// +// Calculate remainder by subtracting the result from the original dividend. +// Since the result is already in a register, we will do the subtract in the +// opposite direction and negate the result if necessary. +// + + sub eax,DVNDLO // subtract dividend from result + sbb edx,DVNDHI + +// +// Now check the result sign flag to see if the result is supposed to be positive +// or negative. It is currently negated (because we subtracted in the 'wrong' +// direction), so if the sign flag is set we are done, otherwise we must negate +// the result to make it positive again. +// + + dec ebp // check result sign flag + jns short L9 // result is ok, set up the quotient + neg edx // otherwise, negate the result + neg eax + sbb edx,0 + +// +// Now we need to get the quotient into edx:eax and the remainder into ebx:ecx. +// +L9: + mov ecx,edx + mov edx,ebx + mov ebx,ecx + mov ecx,eax + mov eax,esi + +// +// Just the cleanup left to do. edx:eax contains the quotient. Set the sign +// according to the save value, cleanup the stack, and return. +// + + dec edi // check to see if result is negative + jnz short L8 // if EDI == 0, result should be negative + neg edx // otherwise, negate the result + neg eax + sbb edx,0 + +// +// Restore the saved registers and return. +// + +L8: + pop ebp + pop esi + pop edi + + ret 16 + +__aulldvrm: + +// ulldvrm - unsigned long divide and remainder +// +// Purpose: +// Does a unsigned long divide and remainder of the arguments. Arguments +// are not changed. +// +// Entry: +// Arguments are passed on the stack: +// 1st pushed: divisor (QWORD) +// 2nd pushed: dividend (QWORD) +// +// Exit: +// EDX:EAX contains the quotient (dividend/divisor) +// EBX:ECX contains the remainder (divided % divisor) +// NOTE: this routine removes the parameters from the stack. +// +// Uses: +// ECX +// + push esi + +// Set up the local stack and save the index registers. When this is done +// the stack frame will look as follows (assuming that the expression a/b will +// generate a call to aulldvrm(a, b)): +// +// ----------------- +// | | +// |---------------| +// | | +// |--divisor (b)--| +// | | +// |---------------| +// | | +// |--dividend (a)-| +// | | +// |---------------| +// | return addr** | +// |---------------| +// ESP---->| ESI | +// ----------------- +// + +#undef DVNDLO +#undef DVNDHI +#undef DVSRLO +#undef DVSRHI +#define DVNDLO [esp + 8] // stack address of dividend (a) +#define DVNDHI [esp + 8] // stack address of dividend (a) +#define DVSRLO [esp + 16] // stack address of divisor (b) +#define DVSRHI [esp + 20] // stack address of divisor (b) + +// +// Now do the divide. First look to see if the divisor is less than 4194304K. +// If so, then we can use a simple algorithm with word divides, otherwise +// things get a little more complex. +// + + mov eax,DVSRHI // check to see if divisor < 4194304K + or eax,eax + jnz short .L1 // nope, gotta do this the hard way + mov ecx,DVSRLO // load divisor + mov eax,DVNDHI // load high word of dividend + xor edx,edx + div ecx // get high order bits of quotient + mov ebx,eax // save high bits of quotient + mov eax,DVNDLO // edx:eax <- remainder:lo word of dividend + div ecx // get low order bits of quotient + mov esi,eax // ebx:esi <- quotient + +// +// Now we need to do a multiply so that we can compute the remainder. +// + mov eax,ebx // set up high word of quotient + mul dword ptr DVSRLO // HIWORD(QUOT) * DVSR + mov ecx,eax // save the result in ecx + mov eax,esi // set up low word of quotient + mul dword ptr DVSRLO // LOWORD(QUOT) * DVSR + add edx,ecx // EDX:EAX = QUOT * DVSR + jmp short .L2 // complete remainder calculation + +// +// Here we do it the hard way. Remember, eax contains DVSRHI +// + +.L1: + mov ecx,eax // ecx:ebx <- divisor + mov ebx,DVSRLO + mov edx,DVNDHI // edx:eax <- dividend + mov eax,DVNDLO +.L3: + shr ecx,1 // shift divisor right one bit// hi bit <- 0 + rcr ebx,1 + shr edx,1 // shift dividend right one bit// hi bit <- 0 + rcr eax,1 + or ecx,ecx + jnz short .L3 // loop until divisor < 4194304K + div ebx // now divide, ignore remainder + mov esi,eax // save quotient + +// +// We may be off by one, so to check, we will multiply the quotient +// by the divisor and check the result against the orignal dividend +// Note that we must also check for overflow, which can occur if the +// dividend is close to 2**64 and the quotient is off by 1. +// + + mul dword ptr DVSRHI // QUOT * DVSRHI + mov ecx,eax + mov eax,DVSRLO + mul esi // QUOT * DVSRLO + add edx,ecx // EDX:EAX = QUOT * DVSR + jc short .L4 // carry means Quotient is off by 1 + +// +// do long compare here between original dividend and the result of the +// multiply in edx:eax. If original is larger or equal, we are ok, otherwise +// subtract one (1) from the quotient. +// + + cmp edx,DVNDHI // compare hi words of result and original + ja short .L4 // if result > original, do subtract + jb short .L5 // if result < original, we are ok + cmp eax,DVNDLO // hi words are equal, compare lo words + jbe short .L5 // if less or equal we are ok, else subtract +.L4: + dec esi // subtract 1 from quotient + sub eax,DVSRLO // subtract divisor from result + sbb edx,DVSRHI +.L5: + xor ebx,ebx // ebx:esi <- quotient + +.L2: +// +// Calculate remainder by subtracting the result from the original dividend. +// Since the result is already in a register, we will do the subtract in the +// opposite direction and negate the result. +// + + sub eax,DVNDLO // subtract dividend from result + sbb edx,DVNDHI + neg edx // otherwise, negate the result + neg eax + sbb edx,0 + +// +// Now we need to get the quotient into edx:eax and the remainder into ebx:ecx. +// + mov ecx,edx + mov edx,ebx + mov ebx,ecx + mov ecx,eax + mov eax,esi +// +// Just the cleanup left to do. edx:eax contains the quotient. +// Restore the saved registers and return. +// + + pop esi + + ret 16 + _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-09-26 20:52:20 UTC (rev 18109) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-09-26 21:39:04 UTC (rev 18110) @@ -1411,7 +1411,9 @@ _allrem _allshl _allshr +_alldvrm _aulldiv +_aulldvrm _aullrem _aullshr _except_handler2

1 0

[ion] 18109: Err, actually deliver APCs when returning from systemcalls... fixes bug 810
by ion＠svn.reactos.com 26 Sep '05

26 Sep '05

Err, actually deliver APCs when returning from systemcalls... fixes bug 810 Modified: trunk/reactos/ntoskrnl/ke/apc.c _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-09-26 20:44:43 UTC (rev 18108) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-09-26 20:52:20 UTC (rev 18109) @@ -808,7 +808,7 @@ KeGetCurrentThread()->TrapFrame); /* Don't deliver APCs in V86 mode */ - if (TrapFrame->Eflags & 2) return; + if (TrapFrame->Eflags & X86_EFLAGS_VM) return; /* Save the full context */ Context.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS;

1 0

[greatlrd] 18108: change from copyfileW to copyfileExW in MoveFileWithProgressW and add a error check for copyfileExW that was forgotten.
by greatlrd＠svn.reactos.com 26 Sep '05

26 Sep '05

change from copyfileW to copyfileExW in MoveFileWithProgressW and add a error check for copyfileExW that was forgotten. Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-26 20:29:08 UTC (rev 18107) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-26 20:44:43 UTC (rev 18108) @@ -633,9 +633,20 @@ size = wcslen(lpNewFileName); wcscpy((WCHAR *)&lpNewFileName2[size], (WCHAR *)&lpDeleteFile[size2]); - /* copy file */ - Result = CopyFileW(lpDeleteFile,lpNewFileName2, FALSE); + /* copy file */ + Result = CopyFileExW (lpDeleteFile, + lpNewFileName2, + lpProgressRoutine, + lpData, + NULL, + 0); + if (Result == FALSE) + { + DPRINT("MoveFileWithProgressW : Fails\n"); + break; + } + /* delete file */ DPRINT("MoveFileWithProgressW : Delete file : %S : %S\n",lpDeleteFile, lpNewFileName2);

1 0

[navaraf] 18107: Revert r18070.
by navaraf＠svn.reactos.com 26 Sep '05

26 Sep '05

Revert r18070. Modified: trunk/reactos/ntoskrnl/cm/regfile.c _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-09-26 20:08:11 UTC (rev 18106) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-09-26 20:29:08 UTC (rev 18107) @@ -3033,7 +3033,6 @@ else { ASSERT(SubKeyCount <= 0xffff); /* should really be USHORT_MAX or similar */ - NewHashBlock->CellSize = -NewHashSize; NewHashBlock->Id = REG_HASH_TABLE_CELL_ID; NewHashBlock->HashTableSize = (USHORT)SubKeyCount; *HashBlock = NewHashBlock;

1 0

[ion] 18106: Add NDEBUG back and call LdrLoadDll correctly on Windows.
by ion＠svn.reactos.com 26 Sep '05

26 Sep '05

Add NDEBUG back and call LdrLoadDll correctly on Windows. Modified: trunk/reactos/lib/kernel32/misc/dllmain.c Modified: trunk/reactos/lib/kernel32/misc/ldr.c Modified: trunk/reactos/lib/kernel32/misc/nls.c Modified: trunk/reactos/lib/kernel32/misc/stubs.c _____ Modified: trunk/reactos/lib/kernel32/misc/dllmain.c --- trunk/reactos/lib/kernel32/misc/dllmain.c 2005-09-26 20:06:49 UTC (rev 18105) +++ trunk/reactos/lib/kernel32/misc/dllmain.c 2005-09-26 20:08:11 UTC (rev 18106) @@ -13,7 +13,7 @@ #include <k32.h> -//#define NDEBUG +#define NDEBUG #include "../include/debug.h" /* GLOBALS *******************************************************************/ @@ -378,7 +378,7 @@ /* Insert more dll attach stuff here! */ DllInitialized = TRUE; - DPRINT1("Initialization complete\n"); + DPRINT("Initialization complete\n"); break; case DLL_PROCESS_DETACH: _____ Modified: trunk/reactos/lib/kernel32/misc/ldr.c --- trunk/reactos/lib/kernel32/misc/ldr.c 2005-09-26 20:06:49 UTC (rev 18105) +++ trunk/reactos/lib/kernel32/misc/ldr.c 2005-09-26 20:08:11 UTC (rev 18106) @@ -19,6 +19,8 @@ DWORD dwReserved; } LOADPARMS32; +extern BOOLEAN InWindows; + /* FUNCTIONS ****************************************************************/ /** @@ -167,12 +169,20 @@ HINSTANCE hInst; NTSTATUS Status; PWSTR SearchPath; + ULONG DllCharacteristics; (void)hFile; if ( lpLibFileName == NULL ) return NULL; + /* Check for any flags LdrLoadDll might be interested in */ + if (dwFlags & DONT_RESOLVE_DLL_REFERENCES) + { + /* Tell LDR to treat it as an EXE */ + DllCharacteristics = IMAGE_FILE_EXECUTABLE_IMAGE; + } + dwFlags &= DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE | @@ -182,7 +192,19 @@ dwFlags & LOAD_WITH_ALTERED_SEARCH_PATH ? lpLibFileName : NULL); RtlInitUnicodeString(&DllName, (LPWSTR)lpLibFileName); - Status = LdrLoadDll(SearchPath, dwFlags, &DllName, (PVOID*)&hInst); + if (InWindows) + { + /* Call the API Properly */ + Status = LdrLoadDll(SearchPath, + (ULONG)&DllCharacteristics, // Silence compiler + &DllName, + (PVOID*)&hInst); + } + else + { + /* Call the ROS API. NOTE: Don't fix this, I have a patch to merge later. */ + Status = LdrLoadDll(SearchPath, dwFlags, &DllName, (PVOID*)&hInst); + } RtlFreeHeap(RtlGetProcessHeap(), 0, SearchPath); if ( !NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/lib/kernel32/misc/nls.c --- trunk/reactos/lib/kernel32/misc/nls.c 2005-09-26 20:06:49 UTC (rev 18105) +++ trunk/reactos/lib/kernel32/misc/nls.c 2005-09-26 20:08:11 UTC (rev 18106) @@ -987,13 +987,4 @@ return IntIsLeadByte(&AnsiCodePage.CodePageTable, TestByte); } -ULONG -WINAPI -NlsGetCacheUpdateCount(VOID) -{ - /* FIXME: */ - UNIMPLEMENTED; - return 0; -} - /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/misc/stubs.c --- trunk/reactos/lib/kernel32/misc/stubs.c 2005-09-26 20:06:49 UTC (rev 18105) +++ trunk/reactos/lib/kernel32/misc/stubs.c 2005-09-26 20:08:11 UTC (rev 18106) @@ -1633,3 +1633,11 @@ STUB; return 0; } + +ULONG +WINAPI +NlsGetCacheUpdateCount(VOID) +{ + STUB; + return 0; +}

1 0

[hbirr] 18105: Don't wait after the flush command for a non busy hd.
by hbirr＠svn.reactos.com 26 Sep '05

26 Sep '05

Don't wait after the flush command for a non busy hd. Modified: trunk/reactos/drivers/storage/atapi/atapi.c _____ Modified: trunk/reactos/drivers/storage/atapi/atapi.c --- trunk/reactos/drivers/storage/atapi/atapi.c 2005-09-26 20:00:48 UTC (rev 18104) +++ trunk/reactos/drivers/storage/atapi/atapi.c 2005-09-26 20:06:49 UTC (rev 18105) @@ -947,7 +947,6 @@ if (Result != SRB_STATUS_PENDING) { DevExt->CurrentSrb = NULL; - Srb->SrbStatus = (UCHAR)Result; ScsiPortNotification(RequestComplete, DeviceExtension, @@ -2350,22 +2349,6 @@ DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS ? IDE_CMD_FLUSH_CACHE_EXT : IDE_CMD_FLUSH_CACHE, AtapiNoDataInterrupt); - /* Wait for controller ready */ - for (Retries = 0; Retries < IDE_MAX_WRITE_RETRIES; Retries++) - { - Status = IDEReadStatus(DeviceExtension->CommandPortBase); - if (!(Status & IDE_SR_BUSY) || (Status & IDE_SR_ERR)) - { - break; - } - ScsiPortStallExecution(10); - } - if (Retries >= IDE_MAX_WRITE_RETRIES) - { - DPRINT1("Drive is BUSY for too long after sending write command\n"); - DeviceExtension->Handler = NULL; - return(SRB_STATUS_BUSY); - } DPRINT("AtapiFlushCache() done!\n");

1 0

[hbirr] 18104: Fixed the reinitialisation if the miniport driver returns SRB_STATUS_BUSY.
by hbirr＠svn.reactos.com 26 Sep '05

26 Sep '05

Fixed the reinitialisation if the miniport driver returns SRB_STATUS_BUSY. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c --- trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-09-26 19:16:43 UTC (rev 18103) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-09-26 20:00:48 UTC (rev 18104) @@ -2888,8 +2888,15 @@ if (Srb->SrbStatus == SRB_STATUS_BUSY) { + CompleteThisRequest = FALSE; + Irp->Tail.Overlay.DriverContext[3] = Srb; + SpiRemoveActiveIrp(DeviceExtension, Irp, PrevIrp); SpiFreeSrbExtension(DeviceExtension, OriginalSrb); + + Srb->OriginalRequest = LunExtension; + Irp->Tail.Overlay.DriverContext[2] = 0; + InsertHeadList(&DeviceExtension->PendingIrpListHead, (PLIST_ENTRY)&Irp->Tail.Overlay.DriverContext[0]); DeviceExtension->PendingIrpCount++; LunExtension->PendingIrpCount++; @@ -2915,6 +2922,7 @@ SenseInfoBuffer, sizeof(SENSE_DATA)); OriginalSrb->SrbStatus |= SRB_STATUS_AUTOSENSE_VALID; + OriginalSrb->SrbExtension = Srb->SrbExtension; ExFreePool(Srb); CompleteThisRequest = TRUE; } @@ -2933,7 +2941,7 @@ CompleteThisRequest = FALSE; Irp->Tail.Overlay.DriverContext[3] = Srb; SpiRemoveActiveIrp(DeviceExtension, Irp, PrevIrp); - SpiFreeSrbExtension(DeviceExtension, Srb); + SpiFreeSrbExtension(DeviceExtension, OriginalSrb); Srb->OriginalRequest = LunExtension; Irp->Tail.Overlay.DriverContext[2] = 0;

1 0

[weiden] 18103: also compile the resource file...
by weiden＠svn.reactos.com 26 Sep '05

26 Sep '05

also compile the resource file... Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.xml _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.xml --- trunk/reactos/subsys/system/sndvol32/sndvol32.xml 2005-09-26 19:15:27 UTC (rev 18102) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.xml 2005-09-26 19:16:43 UTC (rev 18103) @@ -16,4 +16,5 @@ <file>misc.c</file> <file>mixer.c</file> <file>sndvol32.c</file> + <file>sndvol32.rc</file> </module>

1 0

[weiden] 18102: add sndvol32 to the build system and reformat the code
by weiden＠svn.reactos.com 26 Sep '05

26 Sep '05

add sndvol32 to the build system and reformat the code Modified: trunk/reactos/subsys/system/directory.xml Modified: trunk/reactos/subsys/system/sndvol32/En.rc Added: trunk/reactos/subsys/system/sndvol32/misc.c Modified: trunk/reactos/subsys/system/sndvol32/mixer.c Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.c Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.h Added: trunk/reactos/subsys/system/sndvol32/sndvol32.xml _____ Modified: trunk/reactos/subsys/system/directory.xml --- trunk/reactos/subsys/system/directory.xml 2005-09-26 19:09:32 UTC (rev 18101) +++ trunk/reactos/subsys/system/directory.xml 2005-09-26 19:15:27 UTC (rev 18102) @@ -55,6 +55,9 @@ <directory name="sm"> <xi:include href="sm/sm.xml" /> </directory> +<directory name="sndvol32"> + <xi:include href="sndvol32/sndvol32.xml" /> +</directory> <directory name="taskmgr"> <xi:include href="taskmgr/taskmgr.xml" /> </directory> Property changes on: trunk/reactos/subsys/system/sndvol32 ___________________________________________________________________ Name: svn:ignore - *.o *.d *.exe *.coff *.sym *.map + *.o *.a *.d *.exe *.coff *.sym *.map GNUmakefile _____ Modified: trunk/reactos/subsys/system/sndvol32/En.rc --- trunk/reactos/subsys/system/sndvol32/En.rc 2005-09-26 19:09:32 UTC (rev 18101) +++ trunk/reactos/subsys/system/sndvol32/En.rc 2005-09-26 19:15:27 UTC (rev 18102) @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Help Topics", IDC_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "&About ...", IDC_ABOUT + MENUITEM "&About Volume Control", IDC_ABOUT END END _____ Added: trunk/reactos/subsys/system/sndvol32/misc.c --- trunk/reactos/subsys/system/sndvol32/misc.c 2005-09-26 19:09:32 UTC (rev 18101) +++ trunk/reactos/subsys/system/sndvol32/misc.c 2005-09-26 19:15:27 UTC (rev 18102) @@ -0,0 +1,129 @@ +/* + * ReactOS Sound Volume Control + * Copyright (C) 2004-2005 Thomas Weidenmueller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * VMware is a registered trademark of VMware, Inc. + */ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Sound Volume Control + * FILE: subsys/system/sndvol32/misc.c + * PROGRAMMERS: Thomas Weidenmueller <w3seek(a)reactos.com> + */ +#include <sndvol32.h> + +static INT +LengthOfStrResource(IN HINSTANCE hInst, + IN UINT uID) +{ + HRSRC hrSrc; + HGLOBAL hRes; + LPWSTR lpName, lpStr; + + if (hInst == NULL) + { + return -1; + } + + /* There are always blocks of 16 strings */ + lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1); + + /* Find the string table block */ + if ((hrSrc = FindResourceW(hInst, + lpName, + (LPWSTR)RT_STRING)) && + (hRes = LoadResource(hInst, + hrSrc)) && + (lpStr = LockResource(hRes))) + { + UINT x; + + /* Find the string we're looking for */ + uID &= 0xF; /* position in the block, same as % 16 */ + for (x = 0; x < uID; x++) + { + lpStr += (*lpStr) + 1; + } + + /* Found the string */ + return (int)(*lpStr); + } + return -1; +} + +INT +AllocAndLoadString(OUT LPWSTR *lpTarget, + IN HINSTANCE hInst, + IN UINT uID) +{ + INT ln; + + ln = LengthOfStrResource(hInst, + uID); + if (ln++ > 0) + { + (*lpTarget) = (LPWSTR)LocalAlloc(LMEM_FIXED, + ln * sizeof(WCHAR)); + if ((*lpTarget) != NULL) + { + INT Ret; + if (!(Ret = LoadStringW(hInst, + uID, + *lpTarget, + ln))) + { + LocalFree((HLOCAL)(*lpTarget)); + } + return Ret; + } + } + return 0; +} + +DWORD +LoadAndFormatString(IN HINSTANCE hInstance, + IN UINT uID, + OUT LPWSTR *lpTarget, + ...) +{ + DWORD Ret = 0; + LPWSTR lpFormat; + va_list lArgs; + + if (AllocAndLoadString(&lpFormat, + hInstance, + uID) > 0) + { + va_start(lArgs, lpTarget); + /* let's use FormatMessage to format it because it has the ability to + allocate memory automatically */ + Ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + lpFormat, + 0, + 0, + (LPWSTR)lpTarget, + 0, + &lArgs); + va_end(lArgs); + + LocalFree((HLOCAL)lpFormat); + } + + return Ret; +} + Property changes on: trunk/reactos/subsys/system/sndvol32/misc.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/sndvol32/mixer.c --- trunk/reactos/subsys/system/sndvol32/mixer.c 2005-09-26 19:09:32 UTC (rev 18101) +++ trunk/reactos/subsys/system/sndvol32/mixer.c 2005-09-26 19:15:27 UTC (rev 18102) @@ -1,6 +1,6 @@ /* * ReactOS Sound Volume Control - * Copyright (C) 2004 Thomas Weidenmueller + * Copyright (C) 2004-2005 Thomas Weidenmueller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,354 +25,423 @@ * FILE: subsys/system/sndvol32/mixer.c * PROGRAMMERS: Thomas Weidenmueller <w3seek(a)reactos.com> */ -#include "sndvol32.h" +#include <sndvol32.h> #define NO_MIXER_SELECTED (~0) static VOID ClearMixerCache(PSND_MIXER Mixer) { - PSND_MIXER_DESTINATION Line, NextLine; - PSND_MIXER_CONNECTION Con, NextCon; + PSND_MIXER_DESTINATION Line, NextLine; + PSND_MIXER_CONNECTION Con, NextCon; - for(Line = Mixer->Lines; Line != NULL; Line = NextLine) - { - if(Line->Controls != NULL) + for (Line = Mixer->Lines; Line != NULL; Line = NextLine) { - HeapFree(GetProcessHeap(), 0, Line->Controls); - } + if (Line->Controls != NULL) + { + HeapFree(GetProcessHeap(), + 0, + Line->Controls); + } - for(Con = Line->Connections; Con != NULL; Con = NextCon) - { - if(Con->Controls != NULL) - { - HeapFree(GetProcessHeap(), 0, Con->Controls); - } + for (Con = Line->Connections; Con != NULL; Con = NextCon) + { + if (Con->Controls != NULL) + { + HeapFree(GetProcessHeap(), + 0, + Con->Controls); + } - NextCon = Con->Next; - HeapFree(GetProcessHeap(), 0, Con); + NextCon = Con->Next; + HeapFree(GetProcessHeap(), + 0, + Con); + } + + NextLine = Line->Next; + HeapFree(GetProcessHeap(), + 0, + Line); } - - NextLine = Line->Next; - HeapFree(GetProcessHeap(), 0, Line); - } - Mixer->Lines = NULL; + Mixer->Lines = NULL; } PSND_MIXER SndMixerCreate(HWND hWndNotification) { - PSND_MIXER Mixer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SND_MIXER)); - if(Mixer != NULL) - { - Mixer->hWndNotification = hWndNotification; - Mixer->MixersCount = mixerGetNumDevs(); - Mixer->MixerId = NO_MIXER_SELECTED; + PSND_MIXER Mixer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SND_MIXER)); + if (Mixer != NULL) + { + Mixer->hWndNotification = hWndNotification; + Mixer->MixersCount = mixerGetNumDevs(); + Mixer->MixerId = NO_MIXER_SELECTED; - if(Mixer->MixersCount > 0) - { - /* select the first mixer by default */ - SndMixerSelect(Mixer, 0); + if (Mixer->MixersCount > 0) + { + /* select the first mixer by default */ + SndMixerSelect(Mixer, 0); + } } - } - return Mixer; + return Mixer; } VOID SndMixerDestroy(PSND_MIXER Mixer) { - SndMixerClose(Mixer); - HeapFree(GetProcessHeap(), 0, Mixer); + SndMixerClose(Mixer); + HeapFree(GetProcessHeap(), + 0, + Mixer); } VOID SndMixerClose(PSND_MIXER Mixer) { - if(Mixer->hmx != NULL) - { - mixerClose(Mixer->hmx); - Mixer->hmx = NULL; - Mixer->MixerId = NO_MIXER_SELECTED; - } + if (Mixer->hmx != NULL) + { + mixerClose(Mixer->hmx); + Mixer->hmx = NULL; + Mixer->MixerId = NO_MIXER_SELECTED; + } } static BOOL -SndMixerQueryControls(PSND_MIXER Mixer, LPMIXERLINE LineInfo, LPMIXERCONTROL *Controls) +SndMixerQueryControls(PSND_MIXER Mixer, + LPMIXERLINE LineInfo, + LPMIXERCONTROL *Controls) { - if(LineInfo->cControls > 0) - { - *Controls = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, LineInfo->cControls * sizeof(MIXERCONTROL)); - if(*Controls != NULL) + if (LineInfo->cControls > 0) { - MIXERLINECONTROLS LineControls; - UINT j; + *Controls = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + LineInfo->cControls * sizeof(MIXERCONTROL)); + if (*Controls != NULL) + { + MIXERLINECONTROLS LineControls; + UINT j; - LineControls.cbStruct = sizeof(LineControls); - LineControls.dwLineID = LineInfo->dwLineID; - LineControls.cControls = LineInfo->cControls; - LineControls.cbmxctrl = sizeof(MIXERCONTROL); - LineControls.pamxctrl = (PVOID)(*Controls); + LineControls.cbStruct = sizeof(LineControls); + LineControls.dwLineID = LineInfo->dwLineID; + LineControls.cControls = LineInfo->cControls; + LineControls.cbmxctrl = sizeof(MIXERCONTROL); + LineControls.pamxctrl = (PVOID)(*Controls); - for(j = 0; j < LineInfo->cControls; j++) - { - (*Controls)[j].cbStruct = sizeof(MIXERCONTROL); - } + for (j = 0; j < LineInfo->cControls; j++) + { + (*Controls)[j].cbStruct = sizeof(MIXERCONTROL); + } - if(mixerGetLineControls((HMIXEROBJ)Mixer->hmx, &LineControls, MIXER_GETLINECONTROLSF_ALL) == MMSYSERR_NOERROR) - { - for(j = 0; j < LineInfo->cControls; j++) + if (mixerGetLineControls((HMIXEROBJ)Mixer->hmx, + &LineControls, + MIXER_GETLINECONTROLSF_ALL) == MMSYSERR_NOERROR) + { + for (j = 0; j < LineInfo->cControls; j++) + { + DPRINT("Line control: %ws", (*Controls)[j].szName); + } + + return TRUE; + } + else + { + HeapFree(GetProcessHeap(), + 0, + *Controls); + *Controls = NULL; + DPRINT("Failed to get line controls!\n"); + } + } + else { - DBG("Line control: %ws", (*Controls)[j].szName); + DPRINT("Failed to allocate memory for %d line controls!\n", LineInfo->cControls); } - return TRUE; - } - else - { - HeapFree(GetProcessHeap(), 0, *Controls); - *Controls = NULL; - DBG("Failed to get line controls!\n"); - } + return FALSE; } else { - DBG("Failed to allocate memory for %d line controls!\n", LineInfo->cControls); + return TRUE; } - - return FALSE; - } - else - { - return TRUE; - } } static BOOL -SndMixerQueryConnections(PSND_MIXER Mixer, PSND_MIXER_DESTINATION Line) +SndMixerQueryConnections(PSND_MIXER Mixer, + PSND_MIXER_DESTINATION Line) { - UINT i; - MIXERLINE LineInfo; - BOOL Ret = TRUE; + UINT i; + MIXERLINE LineInfo; + BOOL Ret = TRUE; - LineInfo.cbStruct = sizeof(LineInfo); - LineInfo.dwDestination = Line->Info.dwDestination; - for(i = Line->Info.cConnections; i > 0; i--) - { - LineInfo.dwSource = i - 1; - if(mixerGetLineInfo((HMIXEROBJ)Mixer->hmx, &LineInfo, MIXER_GETLINEINFOF_SOURCE) == MMSYSERR_NOERROR) + LineInfo.cbStruct = sizeof(LineInfo); + LineInfo.dwDestination = Line->Info.dwDestination; + for (i = Line->Info.cConnections; i > 0; i--) { - LPMIXERCONTROL Controls; - PSND_MIXER_CONNECTION Con; + LineInfo.dwSource = i - 1; + if (mixerGetLineInfo((HMIXEROBJ)Mixer->hmx, + &LineInfo, + MIXER_GETLINEINFOF_SOURCE) == MMSYSERR_NOERROR) + { + LPMIXERCONTROL Controls; + PSND_MIXER_CONNECTION Con; - if(!SndMixerQueryControls(Mixer, &LineInfo, &Controls)) - { - DBG("Failed to query connection controls\n"); - Ret = FALSE; - break; - } + if (!SndMixerQueryControls(Mixer, + &LineInfo, + &Controls)) + { + DPRINT("Failed to query connection controls\n"); + Ret = FALSE; + break; + } - Con = HeapAlloc(GetProcessHeap(), 0, sizeof(SND_MIXER_CONNECTION)); - if(Con != NULL) - { - Con->Info = LineInfo; - Con->Controls = Controls; - Con->Next = Line->Connections; - Line->Connections = Con; - } - else - { - HeapFree(GetProcessHeap(), 0, Controls); - } + Con = HeapAlloc(GetProcessHeap(), + 0, + sizeof(SND_MIXER_CONNECTION)); + if (Con != NULL) + { + Con->Info = LineInfo; + Con->Controls = Controls; + Con->Next = Line->Connections; + Line->Connections = Con; + } + else + { + HeapFree(GetProcessHeap(), + 0, + Controls); + } + } + else + { + DPRINT("Failed to get connection information!\n"); + Ret = FALSE; + break; + } } - else - { - DBG("Failed to get connection information!\n"); - Ret = FALSE; - break; - } - } - return Ret; + return Ret; } static BOOL SndMixerQueryDestinations(PSND_MIXER Mixer) { - UINT i; - BOOL Ret = TRUE; + UINT i; + BOOL Ret = TRUE; - for(i = Mixer->Caps.cDestinations; i > 0; i--) - { - PSND_MIXER_DESTINATION Line; + for (i = Mixer->Caps.cDestinations; i > 0; i--) + { + PSND_MIXER_DESTINATION Line; - Line = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SND_MIXER_DESTINATION)); - if(Line != NULL) - { - Line->Info.cbStruct = sizeof(Line->Info); - Line->Info.dwDestination = i - 1; - if(mixerGetLineInfo((HMIXEROBJ)Mixer->hmx, &Line->Info, MIXER_GETLINEINFOF_DESTINATION) == MMSYSERR_NOERROR) - { - if(!SndMixerQueryConnections(Mixer, Line)) + Line = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SND_MIXER_DESTINATION)); + if (Line != NULL) { - DBG("Failed to query mixer connections!\n"); - Ret = FALSE; - break; + Line->Info.cbStruct = sizeof(Line->Info); + Line->Info.dwDestination = i - 1; + if (mixerGetLineInfo((HMIXEROBJ)Mixer->hmx, + &Line->Info, + MIXER_GETLINEINFOF_DESTINATION) == MMSYSERR_NOERROR) + { + if (!SndMixerQueryConnections(Mixer, Line)) + { + DPRINT("Failed to query mixer connections!\n"); + Ret = FALSE; + break; + } + if (!SndMixerQueryControls(Mixer, + &Line->Info, + &Line->Controls)) + { + DPRINT("Failed to query mixer controls!\n"); + Ret = FALSE; + break; + } + + Line->Next = Mixer->Lines; + Mixer->Lines = Line; + } + else + { + DPRINT("Failed to get line information for id %d!\n", i); + HeapFree(GetProcessHeap(), + 0, + Line); + Ret = FALSE; + break; + } } - if(!SndMixerQueryControls(Mixer, &Line->Info, &Line->Controls)) + else { - DBG("Failed to query mixer controls!\n"); - Ret = FALSE; - break; + DPRINT("Allocation of SND_MIXER_DEST structure for id %d failed!\n", i); + Ret = FALSE; + break; } - - Line->Next = Mixer->Lines; - Mixer->Lines = Line; - } - else - { - DBG("Failed to get line information for id %d!\n", i); - HeapFree(GetProcessHeap(), 0, Line); - Ret = FALSE; - break; - } } - else - { - DBG("Allocation of SND_MIXER_DEST structure for id %d failed!\n", i); - Ret = FALSE; - break; - } - } - return Ret; + return Ret; } BOOL -SndMixerSelect(PSND_MIXER Mixer, UINT MixerId) +SndMixerSelect(PSND_MIXER Mixer, + UINT MixerId) { - if(MixerId >= Mixer->MixersCount) - { - return FALSE; - } + if (MixerId >= Mixer->MixersCount) + { + return FALSE; + } - SndMixerClose(Mixer); + SndMixerClose(Mixer); - if(mixerOpen(&Mixer->hmx, MixerId, (DWORD_PTR)Mixer->hWndNotification, 0, CALLBACK_WINDOW | MIXER_OBJECTF_MIXER) == MMSYSERR_NOERROR || - mixerOpen(&Mixer->hmx, MixerId, (DWORD_PTR)Mixer->hWndNotification, 0, CALLBACK_WINDOW) == MMSYSERR_NOERROR || - mixerOpen(&Mixer->hmx, MixerId, 0, 0, 0) == MMSYSERR_NOERROR) - { - if(mixerGetDevCaps(MixerId, &Mixer->Caps, sizeof(Mixer->Caps)) == MMSYSERR_NOERROR) + if (mixerOpen(&Mixer->hmx, + MixerId, + (DWORD_PTR)Mixer->hWndNotification, + 0, + CALLBACK_WINDOW | MIXER_OBJECTF_MIXER) == MMSYSERR_NOERROR || + mixerOpen(&Mixer->hmx, + MixerId, + (DWORD_PTR)Mixer->hWndNotification, + 0, + CALLBACK_WINDOW) == MMSYSERR_NOERROR || + mixerOpen(&Mixer->hmx, + MixerId, + 0, + 0, + 0) == MMSYSERR_NOERROR) { - BOOL Ret = FALSE; + if (mixerGetDevCaps(MixerId, + &Mixer->Caps, + sizeof(Mixer->Caps)) == MMSYSERR_NOERROR) + { + BOOL Ret = FALSE; - Mixer->MixerId = MixerId; + Mixer->MixerId = MixerId; - ClearMixerCache(Mixer); + ClearMixerCache(Mixer); - Ret = SndMixerQueryDestinations(Mixer); + Ret = SndMixerQueryDestinations(Mixer); - if(!Ret) - { - ClearMixerCache(Mixer); - } + if (!Ret) + { + ClearMixerCache(Mixer); + } - return Ret; + return Ret; + } + else + { + mixerClose(Mixer->hmx); + } } - else - { - mixerClose(Mixer->hmx); - } - } - Mixer->hmx = NULL; - Mixer->MixerId = NO_MIXER_SELECTED; - return FALSE; + Mixer->hmx = NULL; + Mixer->MixerId = NO_MIXER_SELECTED; + return FALSE; } UINT SndMixerGetSelection(PSND_MIXER Mixer) { - return Mixer->MixerId; + return Mixer->MixerId; } INT -SndMixerGetProductName(PSND_MIXER Mixer, LPTSTR lpBuffer, UINT uSize) +SndMixerGetProductName(PSND_MIXER Mixer, + LPTSTR lpBuffer, + UINT uSize) { - if(Mixer->hmx) - { - int lnsz = lstrlen(Mixer->Caps.szPname); - if(lnsz + 1 > uSize) + if (Mixer->hmx) { - return lnsz + 1; + int lnsz = lstrlen(Mixer->Caps.szPname); + if(lnsz + 1 > uSize) + { + return lnsz + 1; + } + else + { + memcpy(lpBuffer, Mixer->Caps.szPname, lnsz * sizeof(TCHAR)); + lpBuffer[lnsz] = _T('\0'); + return lnsz; + } } - else - { - memcpy(lpBuffer, Mixer->Caps.szPname, lnsz * sizeof(TCHAR)); - lpBuffer[lnsz] = _T('\0'); - return lnsz; - } - } - return -1; + return -1; } BOOL -SndMixerEnumProducts(PSND_MIXER Mixer, PFNSNDMIXENUMPRODUCTS EnumProc, PVOID Context) +SndMixerEnumProducts(PSND_MIXER Mixer, + PFNSNDMIXENUMPRODUCTS EnumProc, + PVOID Context) { - MIXERCAPS Caps; - HMIXER hMixer; - UINT i; - BOOL Ret = TRUE; + MIXERCAPS Caps; + HMIXER hMixer; + UINT i; + BOOL Ret = TRUE; - for(i = 0; i < Mixer->MixersCount; i++) - { - if(mixerOpen(&hMixer, i, 0, 0, 0) == MMSYSERR_NOERROR) + for (i = 0; i < Mixer->MixersCount; i++) { - if(mixerGetDevCaps(i, &Caps, sizeof(Caps)) == MMSYSERR_NOERROR) - { - if(!EnumProc(Mixer, i, Caps.szPname, Context)) + if (mixerOpen(&hMixer, + i, + 0, + 0, + 0) == MMSYSERR_NOERROR) { - mixerClose(hMixer); - Ret = FALSE; - break; + if (mixerGetDevCaps(i, + &Caps, + sizeof(Caps)) == MMSYSERR_NOERROR) + { + if (!EnumProc(Mixer, + i, + Caps.szPname, + Context)) + { + mixerClose(hMixer); + Ret = FALSE; + break; + } + } + else + { + DPRINT("Failed to get device capabilities for mixer id %d!\n", i); + } + mixerClose(hMixer); } - } - else - { - DBG("Failed to get device capabilities for mixer id %d!\n", i); - } - mixerClose(hMixer); } - } - return Ret; + return Ret; } INT SndMixerGetDestinationCount(PSND_MIXER Mixer) { - return (Mixer->hmx ? Mixer->Caps.cDestinations : -1); + return (Mixer->hmx ? Mixer->Caps.cDestinations : -1); } BOOL -SndMixerEnumLines(PSND_MIXER Mixer, PFNSNDMIXENUMLINES EnumProc, PVOID Context) +SndMixerEnumLines(PSND_MIXER Mixer, + PFNSNDMIXENUMLINES EnumProc, + PVOID Context) { - if(Mixer->hmx) - { - PSND_MIXER_DESTINATION Line; + if (Mixer->hmx) + { + PSND_MIXER_DESTINATION Line; - for(Line = Mixer->Lines; Line != NULL; Line = Line->Next) - { - if(!EnumProc(Mixer, &Line->Info, Context)) - { - return FALSE; - } + for (Line = Mixer->Lines; Line != NULL; Line = Line->Next) + { + if (!EnumProc(Mixer, + &Line->Info, + Context)) + { + return FALSE; + } + } + + return TRUE; } - return TRUE; - } - - return FALSE; + return FALSE; } _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.c --- trunk/reactos/subsys/system/sndvol32/sndvol32.c 2005-09-26 19:09:32 UTC (rev 18101) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.c 2005-09-26 19:15:27 UTC (rev 18102) @@ -1,6 +1,6 @@ /* * ReactOS Sound Volume Control - * Copyright (C) 2004 Thomas Weidenmueller + * Copyright (C) 2004-2005 Thomas Weidenmueller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,7 +25,7 @@ * FILE: subsys/system/sndvol32/sndvol32.c * PROGRAMMERS: Thomas Weidenmueller <w3seek(a)reactos.com> */ -#include "sndvol32.h" +#include <sndvol32.h> HINSTANCE hAppInstance; ATOM MainWindowClass; @@ -33,116 +33,137 @@ HANDLE hAppHeap; #define GetDialogData(hwndDlg, type) \ - ( P##type )GetWindowLongPtr((hwndDlg), DWLP_USER) + ( P##type )GetWindowLongPtr((hwndDlg), DWLP_USER) #define GetWindowData(hwnd, type) \ - ( P##type )GetWindowLongPtr((hwnd), GWL_USERDATA) + ( P##type )GetWindowLongPtr((hwnd), GWL_USERDATA) /*********************************************************************** *******/ typedef struct _PREFERENCES_CONTEXT { - PMIXER_WINDOW MixerWindow; - PSND_MIXER Mixer; - HWND hwndDlg; + PMIXER_WINDOW MixerWindow; + PSND_MIXER Mixer; + HWND hwndDlg; } PREFERENCES_CONTEXT, *PPREFERENCES_CONTEXT; typedef struct _PREFERENCES_FILL_DEVICES { - PPREFERENCES_CONTEXT PrefContext; - HWND hComboBox; - UINT Selected; + PPREFERENCES_CONTEXT PrefContext; + HWND hComboBox; + UINT Selected; } PREFERENCES_FILL_DEVICES, *PPREFERENCES_FILL_DEVICES; static BOOL CALLBACK -FillDeviceComboBox(PSND_MIXER Mixer, UINT Id, LPCTSTR ProductName, PVOID Context) +FillDeviceComboBox(PSND_MIXER Mixer, + UINT Id, + LPCTSTR ProductName, + PVOID Context) { - LRESULT lres; - PPREFERENCES_FILL_DEVICES FillContext = (PPREFERENCES_FILL_DEVICES)Context; + LRESULT lres; + PPREFERENCES_FILL_DEVICES FillContext = (PPREFERENCES_FILL_DEVICES)Context; - lres = SendMessage(FillContext->hComboBox, CB_ADDSTRING, 0, (LPARAM)ProductName); - if(lres != CB_ERR) - { - /* save the index so we don't screw stuff when the combobox is sorted... */ - SendMessage(FillContext->hComboBox, CB_SETITEMDATA, (WPARAM)lres, Id); + lres = SendMessage(FillContext->hComboBox, + CB_ADDSTRING, + 0, + (LPARAM)ProductName); + if (lres != CB_ERR) + { + /* save the index so we don't screw stuff when the combobox is sorted... */ + SendMessage(FillContext->hComboBox, + CB_SETITEMDATA, + (WPARAM)lres, + Id); - if(Id == FillContext->Selected) - { - SendMessage(FillContext->hComboBox, CB_SETCURSEL, (WPARAM)lres, 0); + if (Id == FillContext->Selected) + { + SendMessage(FillContext->hComboBox, + CB_SETCURSEL, + (WPARAM)lres, + 0); + } } - } - return TRUE; + return TRUE; } static INT_PTR CALLBACK -DlgPreferencesProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +DlgPreferencesProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { - PPREFERENCES_CONTEXT Context; + PPREFERENCES_CONTEXT Context; - switch(uMsg) - { - case WM_COMMAND: + switch (uMsg) { - switch(LOWORD(wParam)) - { - case IDOK: - case IDCANCEL: + case WM_COMMAND: { - EndDialog(hwndDlg, LOWORD(wParam)); - break; + switch (LOWORD(wParam)) + { + case IDOK: + case IDCANCEL: + { + EndDialog(hwndDlg, + LOWORD(wParam)); + break; + } + } + break; } - } - break; - } - case MM_MIXM_LINE_CHANGE: - { - DBG("MM_MIXM_LINE_CHANGE\n"); - break; - } + case MM_MIXM_LINE_CHANGE: + { + DPRINT("MM_MIXM_LINE_CHANGE\n"); [truncated at 1000 lines; 617 more skipped]

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
59
Older →

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 September 2005