Ros-diffs February 2019

ros-diffs@reactos.org

23 participants
208 discussions

[reactos] 01/01: [NTOSKRNL] Simplify object type name printing
by Pierre Schweitzer 11 Feb '19

11 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63b13ad939df6b869d4c9… commit 63b13ad939df6b869d4c92b340dfb950459ae3f1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Feb 11 09:03:15 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Feb 11 09:03:58 2019 +0100 [NTOSKRNL] Simplify object type name printing --- ntoskrnl/ex/handle.c | 55 +--------------------------------------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/ntoskrnl/ex/handle.c b/ntoskrnl/ex/handle.c index f75f0363f7..76dcbfcff9 100644 --- a/ntoskrnl/ex/handle.c +++ b/ntoskrnl/ex/handle.c @@ -1368,60 +1368,7 @@ BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[]) ObjectHeader = ObpGetHandleObject(TableEntry); KdbpPrint("%p: Object: %p GrantedAccess: %x Entry: %p\n", ExHandle.Value, &ObjectHeader->Body, TableEntry->GrantedAccess, TableEntry); - KdbpPrint("Object: %p Type: (%x) ", &ObjectHeader->Body, ObjectHeader->Type); - if (ObjectHeader->Type == IoFileObjectType) - { - KdbpPrint("File"); - } - else if (ObjectHeader->Type == ExEventObjectType) - { - KdbpPrint("Event"); - } - else if (ObjectHeader->Type == ExEventPairObjectType) - { - KdbpPrint("EventPair"); - } - else if (ObjectHeader->Type == ExMutantObjectType) - { - KdbpPrint("Mutant"); - } - else if (ObjectHeader->Type == ExSemaphoreObjectType) - { - KdbpPrint("Semaphore"); - } - else if (ObjectHeader->Type == ExTimerType) - { - KdbpPrint("Timer"); - } - else if (ObjectHeader->Type == ExWindowStationObjectType) - { - KdbpPrint("WindowStation"); - } - else if (ObjectHeader->Type == ExDesktopObjectType) - { - KdbpPrint("Desktop"); - } - else if (ObjectHeader->Type == ObpDirectoryObjectType) - { - KdbpPrint("Directory"); - } - else if (ObjectHeader->Type == CmpKeyObjectType) - { - KdbpPrint("Key"); - } - else if (ObjectHeader->Type == MmSectionObjectType) - { - KdbpPrint("Section"); - } - else if (ObjectHeader->Type == PsThreadType) - { - KdbpPrint("Thread"); - } - else if (ObjectHeader->Type == LpcPortObjectType) - { - KdbpPrint("ALPC Port"); - } - KdbpPrint("\n"); + KdbpPrint("Object: %p Type: (%x) %wZ\n", &ObjectHeader->Body, ObjectHeader->Type, &ObjectHeader->Type->Name); KdbpPrint("\tObjectHeader: %p\n", ObjectHeader); KdbpPrint("\t\tHandleCount: %u PointerCount: %u\n", ObjectHeader->HandleCount, ObjectHeader->PointerCount);

1 0

[reactos] 02/02: [WIN32SS:NTUSER] Bugcheck in case two mandatory initialization steps are not fulfilled.
by Hermès Bélusca-Maïto 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bbf8ae688a59f6512cfc… commit 7bbf8ae688a59f6512cfcb03966da408623bf644 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 5 16:50:32 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 10 22:44:24 2019 +0100 [WIN32SS:NTUSER] Bugcheck in case two mandatory initialization steps are not fulfilled. - Bugcheck VIDEO_DRIVER_INIT_FAILURE in case initializing video fails. - Bugcheck WIN32K_INIT_OR_RIT_FAILURE (Windows-compatible) in case the USER subsystem version does not match. --- win32ss/user/ntuser/ntuser.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/ntuser.c b/win32ss/user/ntuser/ntuser.c index e44feb8db0..d433855ae8 100644 --- a/win32ss/user/ntuser/ntuser.c +++ b/win32ss/user/ntuser/ntuser.c @@ -132,9 +132,13 @@ UserInitialize(VOID) Status = UserCreateWinstaDirectory(); if (!NT_SUCCESS(Status)) return Status; - /* Initialize Video */ + /* Initialize the Video */ Status = InitVideo(); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + /* We failed, bugcheck */ + KeBugCheckEx(VIDEO_DRIVER_INIT_FAILURE, Status, 0, 0, USER_VERSION); + } // { // DrvInitConsole. @@ -185,8 +189,8 @@ NtUserInitialize( /* Check Windows USER subsystem version */ if (dwWinVersion != USER_VERSION) { - // FIXME: Should bugcheck! - return STATUS_UNSUCCESSFUL; + /* No match, bugcheck */ + KeBugCheckEx(WIN32K_INIT_OR_RIT_FAILURE, 0, 0, dwWinVersion, USER_VERSION); } /* Acquire exclusive lock */

1 0

[reactos] 01/02: [BUGCODES] Add WIN32K_INIT_OR_RIT_FAILURE to the list.
by Hermès Bélusca-Maïto 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e74ca507590fc6c80f55… commit 1e74ca507590fc6c80f55ae60ea89278bc2af09b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jan 3 15:50:06 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 10 22:44:23 2019 +0100 [BUGCODES] Add WIN32K_INIT_OR_RIT_FAILURE to the list. --- sdk/include/reactos/mc/bugcodes.mc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sdk/include/reactos/mc/bugcodes.mc b/sdk/include/reactos/mc/bugcodes.mc index 52e18cbf06..329b75a2e4 100644 --- a/sdk/include/reactos/mc/bugcodes.mc +++ b/sdk/include/reactos/mc/bugcodes.mc @@ -1171,6 +1171,14 @@ Language=English PP1_INITIALIZATION_FAILED . +MessageId=0x91 +Severity=Success +Facility=System +SymbolicName=WIN32K_INIT_OR_RIT_FAILURE +Language=English +WIN32K_INIT_OR_RIT_FAILURE +. + MessageId=0x93 Severity=Success Facility=System @@ -1271,7 +1279,7 @@ Severity=Success Facility=System SymbolicName=VIDEO_DRIVER_INIT_FAILURE Language=English -The video driver failed to initialize +The video driver failed to initialize. . MessageId=0xB7

1 0

[reactos] 02/02: [USBSTOR][USBSTOR_NEW] Fix a comparison made for assigning the ScsiInquiryData->RemovableMedia flag.
by Hermès Bélusca-Maïto 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38be848f68cff71200a0f… commit 38be848f68cff71200a0fb57d7674a0401994e69 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 10 22:33:43 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 10 22:40:59 2019 +0100 [USBSTOR][USBSTOR_NEW] Fix a comparison made for assigning the ScsiInquiryData->RemovableMedia flag. Now removable drives are really reported as such. See https://github.com/reactos/reactos/pull/308/files#r163224294 for more details. --- drivers/usb/usbstor/disk.c | 2 +- drivers/usb/usbstor_new/disk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/usbstor/disk.c b/drivers/usb/usbstor/disk.c index 604f621c91..7dc4438cdc 100644 --- a/drivers/usb/usbstor/disk.c +++ b/drivers/usb/usbstor/disk.c @@ -649,7 +649,7 @@ USBSTOR_HandleDeviceControl( ScsiInquiryData->DeviceTypeQualifier = (UFIInquiryResponse->RMB & 0x7F); /* Hack for IoReadPartitionTable call in disk.sys */ - ScsiInquiryData->RemovableMedia = ((ScsiInquiryData->DeviceType != DIRECT_ACCESS_DEVICE) ? ((UFIInquiryResponse->RMB & 0x80) ? 1 : 0) : 0); + ScsiInquiryData->RemovableMedia = ((ScsiInquiryData->DeviceType == DIRECT_ACCESS_DEVICE) ? ((UFIInquiryResponse->RMB & 0x80) ? 1 : 0) : 0); ScsiInquiryData->Versions = 0x04; ScsiInquiryData->ResponseDataFormat = 0x02; diff --git a/drivers/usb/usbstor_new/disk.c b/drivers/usb/usbstor_new/disk.c index 604f621c91..7dc4438cdc 100644 --- a/drivers/usb/usbstor_new/disk.c +++ b/drivers/usb/usbstor_new/disk.c @@ -649,7 +649,7 @@ USBSTOR_HandleDeviceControl( ScsiInquiryData->DeviceTypeQualifier = (UFIInquiryResponse->RMB & 0x7F); /* Hack for IoReadPartitionTable call in disk.sys */ - ScsiInquiryData->RemovableMedia = ((ScsiInquiryData->DeviceType != DIRECT_ACCESS_DEVICE) ? ((UFIInquiryResponse->RMB & 0x80) ? 1 : 0) : 0); + ScsiInquiryData->RemovableMedia = ((ScsiInquiryData->DeviceType == DIRECT_ACCESS_DEVICE) ? ((UFIInquiryResponse->RMB & 0x80) ? 1 : 0) : 0); ScsiInquiryData->Versions = 0x04; ScsiInquiryData->ResponseDataFormat = 0x02;

1 0

[reactos] 01/02: [DISK.SYS] Add a HACK so that we can use NT5+ NTOS functions with this NT4 driver for removable devices.
by Hermès Bélusca-Maïto 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a56a2e95a2f7d3ced5d21… commit a56a2e95a2f7d3ced5d210acbe3385aa145fb785 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jan 2 20:28:21 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 10 22:39:12 2019 +0100 [DISK.SYS] Add a HACK so that we can use NT5+ NTOS functions with this NT4 driver for removable devices. This is needed in order to avoid an infinite recursive loop between disk!UpdateRemovableGeometry() and ntos!IoReadPartitionTable(). This does not happen with NT5+ disk_new.sys because it doesn't call IoReadPartitionTable() in that situation. --- drivers/storage/class/disk/disk.c | 42 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/storage/class/disk/disk.c b/drivers/storage/class/disk/disk.c index cb84565691..b91e88e04d 100644 --- a/drivers/storage/class/disk/disk.c +++ b/drivers/storage/class/disk/disk.c @@ -116,6 +116,15 @@ typedef struct _DISK_DATA { PARTITION_LIST_STATE PartitionListState; +#ifdef __REACTOS__ + // + // HACK so that we can use NT5+ NTOS functions with this NT4 driver + // for removable devices and avoid an infinite recursive loop between + // disk!UpdateRemovableGeometry() and ntos!IoReadPartitionTable(). + // + ULONG UpdateRemovableGeometryCount; +#endif + } DISK_DATA, *PDISK_DATA; // @@ -1147,6 +1156,15 @@ CreatePartitionDeviceObjects( } +#ifdef __REACTOS__ + // + // HACK so that we can use NT5+ NTOS functions with this NT4 driver + // for removable devices and avoid an infinite recursive loop between + // disk!UpdateRemovableGeometry() and ntos!IoReadPartitionTable(). + // + diskData->UpdateRemovableGeometryCount = 0; +#endif + // // Create objects for all the partitions on the device. // @@ -4456,6 +4474,21 @@ Return Value: return(status); } +#ifdef __REACTOS__ + // + // HACK so that we can use NT5+ NTOS functions with this NT4 driver + // for removable devices and avoid an infinite recursive loop between + // disk!UpdateRemovableGeometry() and ntos!IoReadPartitionTable(). + // + // Check whether the update-count is greater or equal than one + // (and increase it) and if so, reset it and return success. + if (diskData->UpdateRemovableGeometryCount++ >= 1) + { + diskData->UpdateRemovableGeometryCount = 0; + return(STATUS_SUCCESS); + } +#endif + // // Read the partition table again. // @@ -4465,6 +4498,15 @@ Return Value: TRUE, &partitionList); +#ifdef __REACTOS__ + // + // HACK so that we can use NT5+ NTOS functions with this NT4 driver + // for removable devices and avoid an infinite recursive loop between + // disk!UpdateRemovableGeometry() and ntos!IoReadPartitionTable(). + // + // Inconditionally reset the update-count. + diskData->UpdateRemovableGeometryCount = 0; +#endif if (!NT_SUCCESS(status)) {

1 0

[reactos] 01/01: [SNDVOL32] Implement the volume and balance trackbar for mono and stereo lines.
by Eric Kohl 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=397fe9c8173bee56a480e… commit 397fe9c8173bee56a480e1f10b2055a4f37b59c2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 10 22:17:15 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 10 22:17:15 2019 +0100 [SNDVOL32] Implement the volume and balance trackbar for mono and stereo lines. --- base/applications/sndvol32/sndvol32.c | 95 ++++++++++++++++++++++++++++++----- 1 file changed, 83 insertions(+), 12 deletions(-) diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index 864228e47e..29e6dcf367 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -632,7 +632,7 @@ SetVolumeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Ctx) { UINT ControlCount = 0, Index; LPMIXERCONTROL Control = NULL; - MIXERCONTROLDETAILS_UNSIGNED uDetails; + PMIXERCONTROLDETAILS_UNSIGNED puDetails = NULL; MIXERCONTROLDETAILS_BOOLEAN bDetails; PSET_VOLUME_CONTEXT Context = (PSET_VOLUME_CONTEXT)Ctx; @@ -650,6 +650,10 @@ SetVolumeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Ctx) return FALSE; } + puDetails = HeapAlloc(GetProcessHeap(), 0, Line->cChannels * sizeof(MIXERCONTROLDETAILS_UNSIGNED)); + if (puDetails == NULL) + return FALSE; + /* now go through all controls and compare control ids */ for (Index = 0; Index < ControlCount; Index++) { @@ -657,13 +661,63 @@ SetVolumeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Ctx) { if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_FADER) { - DWORD Step = (Control[Index].Bounds.dwMaximum - Control[Index].Bounds.dwMinimum) / (VOLUME_MAX - VOLUME_MIN); + DWORD LineOffset, volumePosition, balancePosition; + DWORD volumeStep, balanceStep; - /* set up details */ - uDetails.dwValue = ((VOLUME_MAX - Context->SliderPos) * Step) + Control[Index].Bounds.dwMinimum; + LineOffset = Context->SliderPos; + + volumePosition = (DWORD)SendDlgItemMessage(Preferences.MixerWindow->hWnd, LineOffset * IDC_LINE_SLIDER_VERT, TBM_GETPOS, 0, 0); + volumeStep = (Control[Index].Bounds.dwMaximum - Control[Index].Bounds.dwMinimum) / (VOLUME_MAX - VOLUME_MIN); + + if (Line->cChannels == 1) + { + /* set up details */ + puDetails[0].dwValue = ((VOLUME_MAX - volumePosition) * volumeStep) + Control[Index].Bounds.dwMinimum; + } + else if (Line->cChannels == 2) + { + balancePosition = (DWORD)SendDlgItemMessage(Preferences.MixerWindow->hWnd, LineOffset * IDC_LINE_SLIDER_HORZ, TBM_GETPOS, 0, 0); + if (balancePosition == BALANCE_CENTER) + { + puDetails[0].dwValue = ((VOLUME_MAX - volumePosition) * volumeStep) + Control[Index].Bounds.dwMinimum; + puDetails[1].dwValue = ((VOLUME_MAX - volumePosition) * volumeStep) + Control[Index].Bounds.dwMinimum; + } + else if (balancePosition == BALANCE_LEFT) + { + puDetails[0].dwValue = ((VOLUME_MAX - volumePosition) * volumeStep) + Control[Index].Bounds.dwMinimum; + puDetails[1].dwValue = Control[Index].Bounds.dwMinimum; + } + else if (balancePosition == BALANCE_RIGHT) + { + puDetails[0].dwValue = Control[Index].Bounds.dwMinimum; + puDetails[1].dwValue = ((VOLUME_MAX - volumePosition) * volumeStep) + Control[Index].Bounds.dwMinimum; + } + else if (balancePosition < BALANCE_CENTER) // Left + { + puDetails[0].dwValue = ((VOLUME_MAX - volumePosition) * volumeStep) + Control[Index].Bounds.dwMinimum; + + balanceStep = (puDetails[0].dwValue - Control[Index].Bounds.dwMinimum) / (BALANCE_STEPS / 2); + + puDetails[1].dwValue = (balancePosition * balanceStep) + Control[Index].Bounds.dwMinimum; + } + else if (balancePosition > BALANCE_CENTER) // Right + { + puDetails[1].dwValue = ((VOLUME_MAX - volumePosition) * volumeStep) + Control[Index].Bounds.dwMinimum; + + balanceStep = (puDetails[1].dwValue - Control[Index].Bounds.dwMinimum) / (BALANCE_STEPS / 2); + + puDetails[0].dwValue = ((BALANCE_RIGHT - balancePosition) * balanceStep) + Control[Index].Bounds.dwMinimum; + } + } + else + { + SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, Line->cChannels, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)puDetails); + + /* FIXME */ + } /* set volume */ - SndMixerSetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, 1, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&uDetails); + SndMixerSetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, Line->cChannels, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)puDetails); /* done */ break; @@ -683,13 +737,11 @@ SetVolumeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Ctx) break; } } - else - { - /* FIXME: implement left - right channel switch support */ - assert(0); - } } + if (puDetails != NULL) + HeapFree(GetProcessHeap(), 0, puDetails); + /* free controls */ HeapFree(GetProcessHeap(), 0, Control); @@ -997,7 +1049,7 @@ MainWindowProc(HWND hwnd, if (GetDlgItemTextW(hwnd, CtrlID, Context.LineName, MIXER_LONG_NAME_CHARS) != 0) { /* setup context */ - Context.SliderPos = HIWORD(wParam); + Context.SliderPos = LineOffset; Context.bVertical = TRUE; Context.bSwitch = FALSE; @@ -1029,7 +1081,26 @@ MainWindowProc(HWND hwnd, switch (LOWORD(wParam)) { case TB_THUMBTRACK: - /* FIXME */ + /* get dialog item ctrl */ + CtrlID = GetDlgCtrlID((HWND)lParam); + + /* get line index */ + LineOffset = CtrlID / IDC_LINE_SLIDER_HORZ; + + /* compute window id of line name static control */ + CtrlID = LineOffset * IDC_LINE_NAME; + + /* get line name */ + if (GetDlgItemTextW(hwnd, CtrlID, Context.LineName, MIXER_LONG_NAME_CHARS) != 0) + { + /* setup context */ + Context.SliderPos = LineOffset; + Context.bVertical = TRUE; + Context.bSwitch = FALSE; + + /* set volume */ + SndMixerEnumConnections(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, SetVolumeCallback, (LPVOID)&Context); + } break; case TB_ENDTRACK:

1 0

[reactos] 01/01: [OOPS] That was not meant to be pushed/commited
by Pierre Schweitzer 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6295cc506eec92b92cfd2… commit 6295cc506eec92b92cfd2947d6bcc29293545b00 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Feb 10 20:52:55 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Feb 10 20:52:55 2019 +0100 [OOPS] That was not meant to be pushed/commited --- base/services/nfsd/nfs41_daemon.c | 17 +---------------- base/services/nfsd/service.c | 19 ------------------- dll/win32/ole32/rpc.c | 2 -- drivers/filesystems/ntfs/fsctl.c | 4 ++-- modules/rosapps/applications/devutils/CMakeLists.txt | 1 - 5 files changed, 3 insertions(+), 40 deletions(-) diff --git a/base/services/nfsd/nfs41_daemon.c b/base/services/nfsd/nfs41_daemon.c index c2f5df2b1b..1a8f2dfbbe 100644 --- a/base/services/nfsd/nfs41_daemon.c +++ b/base/services/nfsd/nfs41_daemon.c @@ -38,8 +38,7 @@ #include "upcall.h" #include "util.h" -//#define MAX_NUM_THREADS 128 -#define MAX_NUM_THREADS 1 +#define MAX_NUM_THREADS 128 DWORD NFS41D_VERSION = 0; #ifndef __REACTOS__ @@ -124,7 +123,6 @@ static unsigned int WINAPI thread_main(void *args) } if (upcall.opcode == NFS41_SHUTDOWN) { - DbgPrint("Shutdown\n"); printf("Shutting down..\n"); exit(0); } @@ -157,7 +155,6 @@ write_downcall: #ifndef STANDALONE_NFSD VOID ServiceStop() { - DbgPrint("Setting stop event\n"); if (stop_event) SetEvent(stop_event); } @@ -336,17 +333,8 @@ static int getdomainname() (socklen_t)ptr->ai_addrlen, hostname, NI_MAXHOST, servInfo, NI_MAXSERV, NI_NAMEREQD); if (status) -#if 0 dprintf(1, "getnameinfo failed %d\n", WSAGetLastError()); else { -#else - { - dprintf(1, "getnameinfo failed %d, forcing name\n", WSAGetLastError()); - memcpy(hostname, "reactos.home", sizeof("reactos.home")); - status = 0; - } - { -#endif size_t i, len = strlen(hostname); char *p = hostname; dprintf(1, "getdomainname: hostname %s %d\n", hostname, len); @@ -498,8 +486,6 @@ VOID ServiceStart(DWORD argc, LPTSTR *argv) } #ifndef STANDALONE_NFSD - DbgPrint("WaitEvent\n"); - stop_event = CreateEvent(NULL, TRUE, FALSE, NULL); if (stop_event == NULL) goto out_pipe; @@ -518,7 +504,6 @@ VOID ServiceStart(DWORD argc, LPTSTR *argv) // report the status to the service control manager. if (!ReportStatusToSCMgr(SERVICE_RUNNING, NO_ERROR, 0)) goto out_pipe; - DbgPrint("Starting wait\n"); WaitForSingleObject(stop_event, INFINITE); #else //This can be changed to waiting on an array of handles and using waitformultipleobjects diff --git a/base/services/nfsd/service.c b/base/services/nfsd/service.c index 05e83117a8..51da1a00c7 100644 --- a/base/services/nfsd/service.c +++ b/base/services/nfsd/service.c @@ -139,8 +139,6 @@ void WINAPI service_main(DWORD dwArgc, LPTSTR *lpszArgv) if (!sshStatusHandle) goto cleanup; - DbgPrint("Starting service\n"); - // SERVICE_STATUS members that don't change in example // ssStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; @@ -155,14 +153,8 @@ void WINAPI service_main(DWORD dwArgc, LPTSTR *lpszArgv) 3000)) // wait hint goto cleanup; - DbgPrint("Starting service 2\n"); - - SetConsoleCtrlHandler( ControlHandler, TRUE ); - ServiceStart( dwArgc, lpszArgv ); - DbgPrint("Done\n"); - cleanup: // try to report the stopped status to the service control manager. @@ -197,8 +189,6 @@ VOID WINAPI service_ctrl(DWORD dwCtrlCode) // Handle the requested control code. // - DbgPrint("service_ctrl called\n"); - switch (dwCtrlCode) { // Stop the service. @@ -208,14 +198,9 @@ VOID WINAPI service_ctrl(DWORD dwCtrlCode) // ServiceStop(). This avoids a race condition // which may result in a 1053 - The Service did not respond... // error. -#ifdef __REACTOS__ - case SERVICE_CONTROL_SHUTDOWN: -#endif case SERVICE_CONTROL_STOP: - DbgPrint("for stop\n"); ReportStatusToSCMgr(SERVICE_STOP_PENDING, NO_ERROR, 0); ServiceStop(); - DbgPrint("Done\n"); return; // Update the service status. @@ -265,11 +250,7 @@ BOOL ReportStatusToSCMgr(DWORD dwCurrentState, if (dwCurrentState == SERVICE_START_PENDING) ssStatus.dwControlsAccepted = 0; else -#ifndef __REACTOS__ ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP; -#else - ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; -#endif ssStatus.dwCurrentState = dwCurrentState; ssStatus.dwWin32ExitCode = dwWin32ExitCode; diff --git a/dll/win32/ole32/rpc.c b/dll/win32/ole32/rpc.c index d53287e4cb..bd4611d7d5 100644 --- a/dll/win32/ole32/rpc.c +++ b/dll/win32/ole32/rpc.c @@ -1633,8 +1633,6 @@ HRESULT RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) * IRemUnknown object */ void RPC_StartRemoting(struct apartment *apt) { - ERR("Starting remoting: %d %p %p\n", apt->remoting_started, GetCurrentProcessId(), GetCurrentThreadId()); - if (!InterlockedExchange(&apt->remoting_started, TRUE)) { WCHAR endpoint[200]; diff --git a/drivers/filesystems/ntfs/fsctl.c b/drivers/filesystems/ntfs/fsctl.c index ad3213588e..c85f1bfb9f 100644 --- a/drivers/filesystems/ntfs/fsctl.c +++ b/drivers/filesystems/ntfs/fsctl.c @@ -904,7 +904,7 @@ NtfsUserFsRequest(PDEVICE_OBJECT DeviceObject, PIO_STACK_LOCATION Stack; PDEVICE_EXTENSION DeviceExt; - DPRINT("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp); + DPRINT1("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp); Stack = IoGetCurrentIrpStackLocation(Irp); DeviceExt = DeviceObject->DeviceExtension; @@ -966,7 +966,7 @@ NtfsFileSystemControl(PNTFS_IRP_CONTEXT IrpContext) PIRP Irp; PDEVICE_OBJECT DeviceObject; - DPRINT("NtfsFileSystemControl() called\n"); + DPRINT1("NtfsFileSystemControl() called\n"); DeviceObject = IrpContext->DeviceObject; Irp = IrpContext->Irp; diff --git a/modules/rosapps/applications/devutils/CMakeLists.txt b/modules/rosapps/applications/devutils/CMakeLists.txt index 0f289ef3b6..5ea4b089d6 100644 --- a/modules/rosapps/applications/devutils/CMakeLists.txt +++ b/modules/rosapps/applications/devutils/CMakeLists.txt @@ -3,7 +3,6 @@ add_subdirectory(createspec) add_subdirectory(gdb2) add_subdirectory(gdihv) add_subdirectory(genguid) -add_subdirectory(ioctlbf) add_subdirectory(nls2txt) add_subdirectory(shimdbg) add_subdirectory(shlextdbg)

1 0

[reactos] 01/01: [CRYPTEX] Add French translation
by Pierre Schweitzer 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2c71d761e8c1bef18aaf… commit d2c71d761e8c1bef18aafdebc58377c19018bd06 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Feb 10 20:42:32 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Feb 10 20:43:14 2019 +0100 [CRYPTEX] Add French translation --- base/services/nfsd/nfs41_daemon.c | 17 ++++++++++++++++- base/services/nfsd/service.c | 19 +++++++++++++++++++ dll/shellext/cryptext/cryptext.rc | 3 +++ dll/shellext/cryptext/lang/fr-FR.rc | 14 ++++++++++++++ dll/win32/ole32/rpc.c | 2 ++ drivers/filesystems/ntfs/fsctl.c | 4 ++-- modules/rosapps/applications/devutils/CMakeLists.txt | 1 + 7 files changed, 57 insertions(+), 3 deletions(-) diff --git a/base/services/nfsd/nfs41_daemon.c b/base/services/nfsd/nfs41_daemon.c index 1a8f2dfbbe..c2f5df2b1b 100644 --- a/base/services/nfsd/nfs41_daemon.c +++ b/base/services/nfsd/nfs41_daemon.c @@ -38,7 +38,8 @@ #include "upcall.h" #include "util.h" -#define MAX_NUM_THREADS 128 +//#define MAX_NUM_THREADS 128 +#define MAX_NUM_THREADS 1 DWORD NFS41D_VERSION = 0; #ifndef __REACTOS__ @@ -123,6 +124,7 @@ static unsigned int WINAPI thread_main(void *args) } if (upcall.opcode == NFS41_SHUTDOWN) { + DbgPrint("Shutdown\n"); printf("Shutting down..\n"); exit(0); } @@ -155,6 +157,7 @@ write_downcall: #ifndef STANDALONE_NFSD VOID ServiceStop() { + DbgPrint("Setting stop event\n"); if (stop_event) SetEvent(stop_event); } @@ -333,8 +336,17 @@ static int getdomainname() (socklen_t)ptr->ai_addrlen, hostname, NI_MAXHOST, servInfo, NI_MAXSERV, NI_NAMEREQD); if (status) +#if 0 dprintf(1, "getnameinfo failed %d\n", WSAGetLastError()); else { +#else + { + dprintf(1, "getnameinfo failed %d, forcing name\n", WSAGetLastError()); + memcpy(hostname, "reactos.home", sizeof("reactos.home")); + status = 0; + } + { +#endif size_t i, len = strlen(hostname); char *p = hostname; dprintf(1, "getdomainname: hostname %s %d\n", hostname, len); @@ -486,6 +498,8 @@ VOID ServiceStart(DWORD argc, LPTSTR *argv) } #ifndef STANDALONE_NFSD + DbgPrint("WaitEvent\n"); + stop_event = CreateEvent(NULL, TRUE, FALSE, NULL); if (stop_event == NULL) goto out_pipe; @@ -504,6 +518,7 @@ VOID ServiceStart(DWORD argc, LPTSTR *argv) // report the status to the service control manager. if (!ReportStatusToSCMgr(SERVICE_RUNNING, NO_ERROR, 0)) goto out_pipe; + DbgPrint("Starting wait\n"); WaitForSingleObject(stop_event, INFINITE); #else //This can be changed to waiting on an array of handles and using waitformultipleobjects diff --git a/base/services/nfsd/service.c b/base/services/nfsd/service.c index c31fd143d6..05e83117a8 100644 --- a/base/services/nfsd/service.c +++ b/base/services/nfsd/service.c @@ -139,6 +139,8 @@ void WINAPI service_main(DWORD dwArgc, LPTSTR *lpszArgv) if (!sshStatusHandle) goto cleanup; + DbgPrint("Starting service\n"); + // SERVICE_STATUS members that don't change in example // ssStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; @@ -153,9 +155,14 @@ void WINAPI service_main(DWORD dwArgc, LPTSTR *lpszArgv) 3000)) // wait hint goto cleanup; + DbgPrint("Starting service 2\n"); + + SetConsoleCtrlHandler( ControlHandler, TRUE ); ServiceStart( dwArgc, lpszArgv ); + DbgPrint("Done\n"); + cleanup: // try to report the stopped status to the service control manager. @@ -189,6 +196,9 @@ VOID WINAPI service_ctrl(DWORD dwCtrlCode) { // Handle the requested control code. // + + DbgPrint("service_ctrl called\n"); + switch (dwCtrlCode) { // Stop the service. @@ -198,9 +208,14 @@ VOID WINAPI service_ctrl(DWORD dwCtrlCode) // ServiceStop(). This avoids a race condition // which may result in a 1053 - The Service did not respond... // error. +#ifdef __REACTOS__ + case SERVICE_CONTROL_SHUTDOWN: +#endif case SERVICE_CONTROL_STOP: + DbgPrint("for stop\n"); ReportStatusToSCMgr(SERVICE_STOP_PENDING, NO_ERROR, 0); ServiceStop(); + DbgPrint("Done\n"); return; // Update the service status. @@ -250,7 +265,11 @@ BOOL ReportStatusToSCMgr(DWORD dwCurrentState, if (dwCurrentState == SERVICE_START_PENDING) ssStatus.dwControlsAccepted = 0; else +#ifndef __REACTOS__ ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP; +#else + ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; +#endif ssStatus.dwCurrentState = dwCurrentState; ssStatus.dwWin32ExitCode = dwWin32ExitCode; diff --git a/dll/shellext/cryptext/cryptext.rc b/dll/shellext/cryptext/cryptext.rc index a2caedc6f0..9dc9c22e7d 100644 --- a/dll/shellext/cryptext/cryptext.rc +++ b/dll/shellext/cryptext/cryptext.rc @@ -17,6 +17,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif diff --git a/dll/shellext/cryptext/lang/fr-FR.rc b/dll/shellext/cryptext/lang/fr-FR.rc new file mode 100644 index 0000000000..9700706a83 --- /dev/null +++ b/dll/shellext/cryptext/lang/fr-FR.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS CryptExt Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: French (Neutral) resource translation + * COPYRIGHT: Copyright 2019 Pierre Schweitzer (pierre(a)reactos.org) + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_INVALIDFILE "Ce n'est pas un fichier de certificat valide." + IDS_CER_FILE "Fichier de certificat" +END diff --git a/dll/win32/ole32/rpc.c b/dll/win32/ole32/rpc.c index bd4611d7d5..d53287e4cb 100644 --- a/dll/win32/ole32/rpc.c +++ b/dll/win32/ole32/rpc.c @@ -1633,6 +1633,8 @@ HRESULT RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info) * IRemUnknown object */ void RPC_StartRemoting(struct apartment *apt) { + ERR("Starting remoting: %d %p %p\n", apt->remoting_started, GetCurrentProcessId(), GetCurrentThreadId()); + if (!InterlockedExchange(&apt->remoting_started, TRUE)) { WCHAR endpoint[200]; diff --git a/drivers/filesystems/ntfs/fsctl.c b/drivers/filesystems/ntfs/fsctl.c index c85f1bfb9f..ad3213588e 100644 --- a/drivers/filesystems/ntfs/fsctl.c +++ b/drivers/filesystems/ntfs/fsctl.c @@ -904,7 +904,7 @@ NtfsUserFsRequest(PDEVICE_OBJECT DeviceObject, PIO_STACK_LOCATION Stack; PDEVICE_EXTENSION DeviceExt; - DPRINT1("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp); + DPRINT("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp); Stack = IoGetCurrentIrpStackLocation(Irp); DeviceExt = DeviceObject->DeviceExtension; @@ -966,7 +966,7 @@ NtfsFileSystemControl(PNTFS_IRP_CONTEXT IrpContext) PIRP Irp; PDEVICE_OBJECT DeviceObject; - DPRINT1("NtfsFileSystemControl() called\n"); + DPRINT("NtfsFileSystemControl() called\n"); DeviceObject = IrpContext->DeviceObject; Irp = IrpContext->Irp; diff --git a/modules/rosapps/applications/devutils/CMakeLists.txt b/modules/rosapps/applications/devutils/CMakeLists.txt index 5ea4b089d6..0f289ef3b6 100644 --- a/modules/rosapps/applications/devutils/CMakeLists.txt +++ b/modules/rosapps/applications/devutils/CMakeLists.txt @@ -3,6 +3,7 @@ add_subdirectory(createspec) add_subdirectory(gdb2) add_subdirectory(gdihv) add_subdirectory(genguid) +add_subdirectory(ioctlbf) add_subdirectory(nls2txt) add_subdirectory(shimdbg) add_subdirectory(shlextdbg)

1 0

[reactos] 01/01: [CRYPTEXT] Add russian translation
by Stanislav Motylkov 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=718ced9f3adf34a92288b… commit 718ced9f3adf34a92288be55abe31479bc0362a7 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Feb 10 22:26:09 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 10 20:41:35 2019 +0100 [CRYPTEXT] Add russian translation Addendum to d56d9c1. --- dll/shellext/cryptext/cryptext.rc | 3 +++ dll/shellext/cryptext/lang/ru-RU.rc | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dll/shellext/cryptext/cryptext.rc b/dll/shellext/cryptext/cryptext.rc index e12afbdb4e..a2caedc6f0 100644 --- a/dll/shellext/cryptext/cryptext.rc +++ b/dll/shellext/cryptext/cryptext.rc @@ -20,3 +20,6 @@ #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif diff --git a/dll/shellext/cryptext/lang/ru-RU.rc b/dll/shellext/cryptext/lang/ru-RU.rc new file mode 100644 index 0000000000..b445e4fecd --- /dev/null +++ b/dll/shellext/cryptext/lang/ru-RU.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS CryptExt Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Russian resource translation + * COPYRIGHT: Copyright 2019 Stanislav Motylkov (binarymaster(a)mail.ru) + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_INVALIDFILE "Этот файл не является корректным файлом сертификата." + IDS_CER_FILE "Файл сертификата" +END

1 0

[reactos] 01/01: [SNDVOL32] Initialize and update the volume and balance trackbars. Moving the trackbars has no effect yet.
by Eric Kohl 10 Feb '19

10 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ac1512259d6db2815114… commit 4ac1512259d6db2815114c419501b199ce5aced3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 10 19:34:22 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 10 19:34:22 2019 +0100 [SNDVOL32] Initialize and update the volume and balance trackbars. Moving the trackbars has no effect yet. --- base/applications/sndvol32/dialog.c | 127 ++++++++++++++++++++++++++-------- base/applications/sndvol32/mixer.c | 8 +-- base/applications/sndvol32/sndvol32.c | 79 ++++++++++++++++++--- base/applications/sndvol32/sndvol32.h | 14 ++-- 4 files changed, 180 insertions(+), 48 deletions(-) diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c index 564a88b8ea..8ff9a490b4 100644 --- a/base/applications/sndvol32/dialog.c +++ b/base/applications/sndvol32/dialog.c @@ -414,23 +414,31 @@ EnumConnectionsCallback( UINT ControlCount = 0, Index; LPMIXERCONTROL Control = NULL; HWND hDlgCtrl; + PMIXERCONTROLDETAILS_UNSIGNED pVolumeDetails = NULL; PPREFERENCES_CONTEXT PrefContext = (PPREFERENCES_CONTEXT)Context; - if (Line->cControls != 0) + if (Line->cControls == 0) + return TRUE; + + /* get line name */ + if (SndMixerGetLineName(PrefContext->MixerWindow->Mixer, PrefContext->SelectedLine, LineName, MIXER_LONG_NAME_CHARS, TRUE) == -1) + { + /* failed to get line name */ + LineName[0] = L'\0'; + } + + pVolumeDetails = HeapAlloc(GetProcessHeap(), + 0, + Line->cChannels * sizeof(MIXERCONTROLDETAILS_UNSIGNED)); + if (pVolumeDetails == NULL) + goto done; + + /* check if line is found in registry settings */ + if (ReadLineConfig(PrefContext->DeviceName, + LineName, + Line->szName, + &Flags)) { - /* get line name */ - if (SndMixerGetLineName(PrefContext->MixerWindow->Mixer, PrefContext->SelectedLine, LineName, MIXER_LONG_NAME_CHARS, TRUE) == -1) - { - /* failed to get line name */ - LineName[0] = L'\0'; - } - - /* check if line is found in registry settings */ - if (ReadLineConfig(PrefContext->DeviceName, - LineName, - Line->szName, - &Flags)) - { /* is it selected */ if (Flags != 0x4) { @@ -462,7 +470,7 @@ EnumConnectionsCallback( MIXERCONTROLDETAILS_BOOLEAN Details; /* get volume control details */ - if (SndMixerGetVolumeControlDetails(Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&Details) != -1) + if (SndMixerGetVolumeControlDetails(Mixer, Control[Index].dwControlID, 1, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&Details) != -1) { /* update dialog control */ wID = (PrefContext->Count + 1) * IDC_LINE_SWITCH; @@ -483,18 +491,60 @@ EnumConnectionsCallback( } else if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_FADER) { - MIXERCONTROLDETAILS_UNSIGNED Details; - /* get volume control details */ - if (SndMixerGetVolumeControlDetails(Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&Details) != -1) + if (SndMixerGetVolumeControlDetails(Mixer, Control[Index].dwControlID, Line->cChannels, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)pVolumeDetails) != -1) { /* update dialog control */ - DWORD Position, Step; + DWORD volumePosition, volumeStep, maxVolume, i; + DWORD balancePosition, balanceStep; - Step = (Control[Index].Bounds.dwMaximum - Control[Index].Bounds.dwMinimum) / (VOLUME_MAX - VOLUME_MIN); - Position = (Details.dwValue - Control[Index].Bounds.dwMinimum) / Step; + volumeStep = (Control[Index].Bounds.dwMaximum - Control[Index].Bounds.dwMinimum) / (VOLUME_MAX - VOLUME_MIN); - /* FIXME support left - right slider */ + maxVolume = 0; + for (i = 0; i < Line->cChannels; i++) + { + if (pVolumeDetails[i].dwValue > maxVolume) + maxVolume = pVolumeDetails[i].dwValue; + } + + volumePosition = (maxVolume - Control[Index].Bounds.dwMinimum) / volumeStep; + + if (Line->cChannels == 1) + { + balancePosition = BALANCE_CENTER; + } + else if (Line->cChannels == 2) + { + if (pVolumeDetails[0].dwValue == pVolumeDetails[1].dwValue) + { + balancePosition = BALANCE_CENTER; + } + else if (pVolumeDetails[0].dwValue == Control[Index].Bounds.dwMinimum) + { + balancePosition = BALANCE_RIGHT; + } + else if (pVolumeDetails[1].dwValue == Control[Index].Bounds.dwMinimum) + { + balancePosition = BALANCE_LEFT; + } + else + { + balanceStep = (maxVolume - Control[Index].Bounds.dwMinimum) / (BALANCE_STEPS / 2); + + if (pVolumeDetails[0].dwValue < pVolumeDetails[1].dwValue) + { + balancePosition = (pVolumeDetails[0].dwValue - Control[Index].Bounds.dwMinimum) / balanceStep; + balancePosition = BALANCE_RIGHT - balancePosition; + } + else if (pVolumeDetails[1].dwValue < pVolumeDetails[0].dwValue) + { + balancePosition = (pVolumeDetails[1].dwValue - Control[Index].Bounds.dwMinimum) / balanceStep; + balancePosition = BALANCE_LEFT + balancePosition; + } + } + } + + /* Set the volume trackbar */ wID = (PrefContext->Count + 1) * IDC_LINE_SLIDER_VERT; /* get dialog control */ @@ -504,10 +554,29 @@ EnumConnectionsCallback( { /* check state */ LRESULT OldPosition = SendMessageW(hDlgCtrl, TBM_GETPOS, 0, 0); - if (OldPosition != Position) + + if (OldPosition != (VOLUME_MAX - volumePosition)) { /* update control state */ - SendMessageW(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, VOLUME_MAX - Position); + SendMessageW(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, VOLUME_MAX - volumePosition); + } + } + + /* Set the balance trackbar */ + wID = (PrefContext->Count + 1) * IDC_LINE_SLIDER_HORZ; + + /* get dialog control */ + hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, wID); + + if (hDlgCtrl != NULL) + { + /* check state */ + LRESULT OldPosition = SendMessageW(hDlgCtrl, TBM_GETPOS, 0, 0); + + if (OldPosition != balancePosition) + { + /* update control state */ + SendMessageW(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, balancePosition); } } } @@ -521,8 +590,13 @@ EnumConnectionsCallback( /* increment dialog count */ PrefContext->Count++; } - } } + +done: + /* Free the volume details */ + if (pVolumeDetails) + HeapFree(GetProcessHeap(), 0, pVolumeDetails); + return TRUE; } @@ -611,7 +685,6 @@ VOID UpdateDialogLineSliderControl( PPREFERENCES_CONTEXT PrefContext, LPMIXERLINE Line, - DWORD dwControlID, DWORD dwDialogID, DWORD Position) { @@ -648,7 +721,7 @@ UpdateDialogLineSliderControl( if (OldPosition != Position) { /* update control state */ - SendMessageW(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, Position + Index); + SendMessageW(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, Position); } } break; diff --git a/base/applications/sndvol32/mixer.c b/base/applications/sndvol32/mixer.c index 768aa658f5..147d3c4f58 100644 --- a/base/applications/sndvol32/mixer.c +++ b/base/applications/sndvol32/mixer.c @@ -471,7 +471,7 @@ SndMixerEnumProducts(PSND_MIXER Mixer, } INT -SndMixerSetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cbDetails, LPVOID paDetails) +SndMixerSetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cChannels, DWORD cbDetails, LPVOID paDetails) { MIXERCONTROLDETAILS MixerDetails; @@ -479,7 +479,7 @@ SndMixerSetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cbDet { MixerDetails.cbStruct = sizeof(MIXERCONTROLDETAILS); MixerDetails.dwControlID = dwControlID; - MixerDetails.cChannels = 1; //FIXME + MixerDetails.cChannels = cChannels; MixerDetails.cMultipleItems = 0; MixerDetails.cbDetails = cbDetails; MixerDetails.paDetails = paDetails; @@ -495,7 +495,7 @@ SndMixerSetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cbDet INT -SndMixerGetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cbDetails, LPVOID paDetails) +SndMixerGetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cChannels, DWORD cbDetails, LPVOID paDetails) { MIXERCONTROLDETAILS MixerDetails; @@ -503,7 +503,7 @@ SndMixerGetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cbDet { MixerDetails.cbStruct = sizeof(MIXERCONTROLDETAILS); MixerDetails.dwControlID = dwControlID; - MixerDetails.cChannels = 1; //FIXME + MixerDetails.cChannels = cChannels; MixerDetails.cMultipleItems = 0; MixerDetails.cbDetails = cbDetails; MixerDetails.paDetails = paDetails; diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index 592323e51b..864228e47e 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -663,7 +663,7 @@ SetVolumeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Ctx) uDetails.dwValue = ((VOLUME_MAX - Context->SliderPos) * Step) + Control[Index].Bounds.dwMinimum; /* set volume */ - SndMixerSetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&uDetails); + SndMixerSetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, 1, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&uDetails); /* done */ break; @@ -677,7 +677,7 @@ SetVolumeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Ctx) bDetails.fValue = Context->SliderPos; /* set volume */ - SndMixerSetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&bDetails); + SndMixerSetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, 1, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&bDetails); /* done */ break; @@ -703,6 +703,7 @@ BOOL CALLBACK MixerControlChangeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Context) { + PMIXERCONTROLDETAILS_UNSIGNED pVolumeDetails = NULL; UINT ControlCount = 0, Index; LPMIXERCONTROL Control = NULL; @@ -720,6 +721,12 @@ MixerControlChangeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVO return FALSE; } + pVolumeDetails = HeapAlloc(GetProcessHeap(), + 0, + Line->cChannels * sizeof(MIXERCONTROLDETAILS_UNSIGNED)); + if (pVolumeDetails == NULL) + goto done; + /* now go through all controls and compare control ids */ for (Index = 0; Index < ControlCount; Index++) { @@ -730,7 +737,7 @@ MixerControlChangeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVO MIXERCONTROLDETAILS_BOOLEAN Details; /* get volume control details */ - if (SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&Details) != -1) + if (SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, 1, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&Details) != -1) { /* update dialog control */ UpdateDialogLineSwitchControl(&Preferences, Line, Details.fValue); @@ -738,25 +745,75 @@ MixerControlChangeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVO } else if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_FADER) { - MIXERCONTROLDETAILS_UNSIGNED Details; - /* get volume control details */ - if (SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&Details) != -1) + if (SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, Line->cChannels, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)pVolumeDetails) != -1) { /* update dialog control */ - DWORD Position, Step; + DWORD volumePosition, volumeStep, maxVolume, i; + DWORD balancePosition, balanceStep; + + volumeStep = (Control[Index].Bounds.dwMaximum - Control[Index].Bounds.dwMinimum) / (VOLUME_MAX - VOLUME_MIN); + + maxVolume = 0; + for (i = 0; i < Line->cChannels; i++) + { + if (pVolumeDetails[i].dwValue > maxVolume) + maxVolume = pVolumeDetails[i].dwValue; + } + + volumePosition = (maxVolume - Control[Index].Bounds.dwMinimum) / volumeStep; + + if (Line->cChannels == 1) + { + balancePosition = BALANCE_CENTER; + } + else if (Line->cChannels == 2) + { + if (pVolumeDetails[0].dwValue == pVolumeDetails[1].dwValue) + { + balancePosition = BALANCE_CENTER; + } + else if (pVolumeDetails[0].dwValue == Control[Index].Bounds.dwMinimum) + { + balancePosition = BALANCE_RIGHT; + } + else if (pVolumeDetails[1].dwValue == Control[Index].Bounds.dwMinimum) + { + balancePosition = BALANCE_LEFT; + } + else + { + balanceStep = (maxVolume - Control[Index].Bounds.dwMinimum) / (BALANCE_STEPS / 2); + + if (pVolumeDetails[0].dwValue < pVolumeDetails[1].dwValue) + { + balancePosition = (pVolumeDetails[0].dwValue - Control[Index].Bounds.dwMinimum) / balanceStep; + balancePosition = BALANCE_RIGHT - balancePosition; + } + else if (pVolumeDetails[1].dwValue < pVolumeDetails[0].dwValue) + { + balancePosition = (pVolumeDetails[1].dwValue - Control[Index].Bounds.dwMinimum) / balanceStep; + balancePosition = BALANCE_LEFT + balancePosition; + } + } + } - Step = (Control[Index].Bounds.dwMaximum - Control[Index].Bounds.dwMinimum) / (VOLUME_MAX - VOLUME_MIN); - Position = (Details.dwValue - Control[Index].Bounds.dwMinimum) / Step; + /* Update the volume control slider */ + UpdateDialogLineSliderControl(&Preferences, Line, IDC_LINE_SLIDER_VERT, VOLUME_MAX - volumePosition); - /* update volume control slider */ - UpdateDialogLineSliderControl(&Preferences, Line, Control[Index].dwControlID, IDC_LINE_SLIDER_VERT, VOLUME_MAX - Position); + /* Update the balance control slider */ + UpdateDialogLineSliderControl(&Preferences, Line, IDC_LINE_SLIDER_HORZ, balancePosition); } } break; } } +done: + /* Free the volume details */ + if (pVolumeDetails) + HeapFree(GetProcessHeap(), 0, pVolumeDetails); + /* free controls */ HeapFree(GetProcessHeap(), 0, Control); diff --git a/base/applications/sndvol32/sndvol32.h b/base/applications/sndvol32/sndvol32.h index a68cb37778..cf20366480 100644 --- a/base/applications/sndvol32/sndvol32.h +++ b/base/applications/sndvol32/sndvol32.h @@ -18,6 +18,9 @@ #define VOLUME_MAX 500 #define VOLUME_TICKS 5 #define VOLUME_PAGE_SIZE 100 +#define BALANCE_LEFT 0 +#define BALANCE_CENTER 32 +#define BALANCE_RIGHT 64 #define BALANCE_STEPS 64 #define BALANCE_TICKS 1 #define BALANCE_PAGE_SIZE 12 @@ -104,14 +107,13 @@ typedef struct _PREFERENCES_CONTEXT DWORD tmp; } PREFERENCES_CONTEXT, *PPREFERENCES_CONTEXT; -typedef struct +typedef struct _SET_VOLUME_CONTEXT { WCHAR LineName[MIXER_LONG_NAME_CHARS]; UINT SliderPos; BOOL bVertical; BOOL bSwitch; - -}SET_VOLUME_CONTEXT, *PSET_VOLUME_CONTEXT; +} SET_VOLUME_CONTEXT, *PSET_VOLUME_CONTEXT; /* NOTE: do NOT modify SNDVOL_REG_LINESTATE for binary compatibility with XP! */ typedef struct _SNDVOL_REG_LINESTATE @@ -130,8 +132,8 @@ VOID SndMixerDestroy(PSND_MIXER Mixer); VOID SndMixerClose(PSND_MIXER Mixer); BOOL SndMixerSelect(PSND_MIXER Mixer, UINT MixerId); UINT SndMixerGetSelection(PSND_MIXER Mixer); -INT SndMixerSetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cbDetails, LPVOID paDetails); -INT SndMixerGetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cbDetails, LPVOID paDetails); +INT SndMixerSetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cChannels, DWORD cbDetails, LPVOID paDetails); +INT SndMixerGetVolumeControlDetails(PSND_MIXER Mixer, DWORD dwControlID, DWORD cChannels, DWORD cbDetails, LPVOID paDetails); INT SndMixerGetProductName(PSND_MIXER Mixer, LPTSTR lpBuffer, UINT uSize); INT SndMixerGetLineName(PSND_MIXER Mixer, DWORD LineID, LPTSTR lpBuffer, UINT uSize, BOOL LongName); BOOL SndMixerEnumProducts(PSND_MIXER Mixer, PFNSNDMIXENUMPRODUCTS EnumProc, PVOID Context); @@ -145,7 +147,7 @@ BOOL SndMixerQueryControls(PSND_MIXER Mixer, PUINT DisplayControls, LPMIXERLINE * dialog.c */ VOID LoadDialogCtrls(PPREFERENCES_CONTEXT PrefContext); -VOID UpdateDialogLineSliderControl(PPREFERENCES_CONTEXT PrefContext, LPMIXERLINE Line, DWORD dwControlID, DWORD DialogID, DWORD Position); +VOID UpdateDialogLineSliderControl(PPREFERENCES_CONTEXT PrefContext, LPMIXERLINE Line, DWORD DialogID, DWORD Position); VOID UpdateDialogLineSwitchControl(PPREFERENCES_CONTEXT PrefContext, LPMIXERLINE Line, LONG fValue); /*

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
21
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 February 2019