Ros-diffs January 2019

ros-diffs@reactos.org

31 participants
300 discussions

[reactos] 01/01: [NTOS/KE] Add diagnosis DPRINT for CORE-15642

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d6c2869819684df9cc2b… commit 5d6c2869819684df9cc2bd069d0419b3ab9dbff5 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Jan 21 09:35:20 2019 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Jan 21 09:38:29 2019 +0100 [NTOS/KE] Add diagnosis DPRINT for CORE-15642 --- ntoskrnl/ke/i386/v86vdm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ke/i386/v86vdm.c b/ntoskrnl/ke/i386/v86vdm.c index 09405e8bde..d1c030acc0 100644 --- a/ntoskrnl/ke/i386/v86vdm.c +++ b/ntoskrnl/ke/i386/v86vdm.c @@ -429,7 +429,9 @@ KiVdmHandleOpcode(IN PKTRAP_FRAME TrapFrame, case 0xF4: return KiCallVdmHandler(HLT); case 0xFA: return KiCallVdmHandler(CLI); case 0xFB: return KiCallVdmHandler(STI); - default: return KiCallVdmHandler(INV); + default: + DPRINT1("Unhandled instruction: 0x%02x.\n", *(PUCHAR)Eip); + return KiCallVdmHandler(INV); } }

6 years, 3 months

[reactos] 01/01: [MMSYS] Set the tab title, implement the 'restore defaults' button and the synchronized trackbar movement.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f41824321eb54161190e… commit 9f41824321eb54161190ec8c14dfdf12ce8cf21f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Jan 21 00:25:17 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Jan 21 00:25:17 2019 +0100 [MMSYS] Set the tab title, implement the 'restore defaults' button and the synchronized trackbar movement. --- dll/cpl/mmsys/speakervolume.c | 72 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 4 deletions(-) diff --git a/dll/cpl/mmsys/speakervolume.c b/dll/cpl/mmsys/speakervolume.c index 4acb5a82c5..63eb9d4e38 100644 --- a/dll/cpl/mmsys/speakervolume.c +++ b/dll/cpl/mmsys/speakervolume.c @@ -16,6 +16,7 @@ typedef struct _PAGE_DATA DWORD volumeMaximum; DWORD volumeStep; PMIXERCONTROLDETAILS_UNSIGNED volumeValues; + BOOL volumeSync; } PAGE_DATA, *PPAGE_DATA; @@ -132,7 +133,7 @@ OnMixerControlChange( if (mixerGetControlDetails((HMIXEROBJ)pPageData->hMixer, &mxcd, MIXER_OBJECTF_HMIXER | MIXER_GETCONTROLDETAILSF_VALUE) != MMSYSERR_NOERROR) return; - for (i = 0; i < min(pPageData->volumeChannels, 5); i++) + for (i = 0; i < pPageData->volumeChannels; i++) { j = i * 4; @@ -150,7 +151,8 @@ OnHScroll( LPARAM lParam) { MIXERCONTROLDETAILS mxcd; - INT id, idx; + DWORD dwValue, dwPos; + INT id, idx, i, j; id = (INT)GetWindowLongPtr((HWND)lParam, GWLP_ID); if (id < 9475 && id > 9503) @@ -159,9 +161,51 @@ OnHScroll( if ((id - 9475) % 4 != 0) return; - idx = (id - 9475) / 4; + dwPos = (DWORD)SendDlgItemMessage(hwndDlg, id, TBM_GETPOS, 0, 0); + dwValue = (dwPos * pPageData->volumeStep) + pPageData->volumeMinimum; - pPageData->volumeValues[idx].dwValue = ((DWORD)SendDlgItemMessage(hwndDlg, id, TBM_GETPOS, 0, 0) * pPageData->volumeStep) + pPageData->volumeMinimum; + if (pPageData->volumeSync) + { + for (i = 0; i < pPageData->volumeChannels; i++) + { + j = 9475 + (i * 4); + if (j != id) + SendDlgItemMessage(hwndDlg, j, TBM_SETPOS, (WPARAM)TRUE, dwPos); + + pPageData->volumeValues[i].dwValue = dwValue; + } + } + else + { + idx = (id - 9475) / 4; + pPageData->volumeValues[idx].dwValue = dwValue; + } + + mxcd.cbStruct = sizeof(MIXERCONTROLDETAILS); + mxcd.dwControlID = pPageData->volumeControlID; + mxcd.cChannels = pPageData->volumeChannels; + mxcd.cMultipleItems = 0; + mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED); + mxcd.paDetails = pPageData->volumeValues; + + if (mixerSetControlDetails((HMIXEROBJ)pPageData->hMixer, &mxcd, MIXER_OBJECTF_HMIXER | MIXER_SETCONTROLDETAILSF_VALUE) != MMSYSERR_NOERROR) + return; +} + + +static +VOID +OnSetDefaults( + PPAGE_DATA pPageData, + HWND hwndDlg) +{ + MIXERCONTROLDETAILS mxcd; + DWORD dwValue, i; + + dwValue = ((VOLUME_MAX - VOLUME_MIN) / 2 * pPageData->volumeStep) + pPageData->volumeMinimum; + + for (i = 0; i < pPageData->volumeChannels; i++) + pPageData->volumeValues[i].dwValue = dwValue; mxcd.cbStruct = sizeof(MIXERCONTROLDETAILS); mxcd.dwControlID = pPageData->volumeControlID; @@ -218,7 +262,25 @@ SpeakerVolumeDlgProc( case WM_HSCROLL: if (pPageData) + { OnHScroll(pPageData, hwndDlg, wParam, lParam); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case 9504: + if (HIWORD(wParam) == BN_CLICKED) + pPageData->volumeSync = (SendDlgItemMessage(hwndDlg, 9504, BM_GETCHECK, 0, 0) == BST_CHECKED); + break; + + case 9505: + OnSetDefaults(pPageData, hwndDlg); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } break; case WM_NOTIFY: @@ -255,6 +317,8 @@ SpeakerVolume( psh.ppsp = psp; InitPropSheetPage(&psp[0], IDD_MULTICHANNEL, SpeakerVolumeDlgProc); + psp[0].dwFlags |= PSP_USETITLE; + psp[0].pszTitle = Caption; return (LONG)(PropertySheet(&psh) != -1); }

6 years, 3 months

[reactos] 01/01: [MMSYS] Improvements to the speaker volume property page

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=431f9bf3110b6868ab2d0… commit 431f9bf3110b6868ab2d08fab0812841bc0a7f6e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 20 21:59:45 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 20 22:00:42 2019 +0100 [MMSYS] Improvements to the speaker volume property page - Open a separate mixer instance for the page, so that MM_MIXM_CONTROL_CHANGE notifications can be received. - Keep line and channel configurations in a global struct. - Handle MM_MIXM_CONTROL_CHANGE and WM_HSCROLL notifications. --- dll/cpl/mmsys/mmsys.c | 14 ++-- dll/cpl/mmsys/mmsys.h | 6 +- dll/cpl/mmsys/speakervolume.c | 169 +++++++++++++++++++++++++++++++++++------- dll/cpl/mmsys/volume.c | 2 +- 4 files changed, 153 insertions(+), 38 deletions(-) diff --git a/dll/cpl/mmsys/mmsys.c b/dll/cpl/mmsys/mmsys.c index c7c1ca9a6e..e2d7c8e539 100644 --- a/dll/cpl/mmsys/mmsys.c +++ b/dll/cpl/mmsys/mmsys.c @@ -733,11 +733,11 @@ MmSysApplet(HWND hwnd, psh.ppsp = psp; psh.pfnCallback = PropSheetProc; - InitPropSheetPage(&psp[0], IDD_VOLUME,VolumeDlgProc, 0); - InitPropSheetPage(&psp[1], IDD_SOUNDS,SoundsDlgProc, 0); - InitPropSheetPage(&psp[2], IDD_AUDIO,AudioDlgProc, 0); - InitPropSheetPage(&psp[3], IDD_VOICE,VoiceDlgProc, 0); - InitPropSheetPage(&psp[4], IDD_HARDWARE,HardwareDlgProc, 0); + InitPropSheetPage(&psp[0], IDD_VOLUME,VolumeDlgProc); + InitPropSheetPage(&psp[1], IDD_SOUNDS,SoundsDlgProc); + InitPropSheetPage(&psp[2], IDD_AUDIO,AudioDlgProc); + InitPropSheetPage(&psp[3], IDD_VOICE,VoiceDlgProc); + InitPropSheetPage(&psp[4], IDD_HARDWARE,HardwareDlgProc); return (LONG)(PropertySheet(&psh) != -1); } @@ -745,8 +745,7 @@ MmSysApplet(HWND hwnd, VOID InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, - DLGPROC DlgProc, - LPARAM lParam) + DLGPROC DlgProc) { ZeroMemory(psp, sizeof(PROPSHEETPAGE)); psp->dwSize = sizeof(PROPSHEETPAGE); @@ -754,7 +753,6 @@ InitPropSheetPage(PROPSHEETPAGE *psp, psp->hInstance = hApplet; psp->pszTemplate = MAKEINTRESOURCE(idDlg); psp->pfnDlgProc = DlgProc; - psp->lParam = lParam; } diff --git a/dll/cpl/mmsys/mmsys.h b/dll/cpl/mmsys/mmsys.h index 63d6b2d900..0fdae63c8c 100644 --- a/dll/cpl/mmsys/mmsys.h +++ b/dll/cpl/mmsys/mmsys.h @@ -48,8 +48,7 @@ VOID InitPropSheetPage( PROPSHEETPAGE *psp, WORD idDlg, - DLGPROC DlgProc, - LPARAM lParam); + DLGPROC DlgProc); LONG APIENTRY MmSysApplet(HWND hwnd, @@ -93,7 +92,6 @@ AudioDlgProc(HWND hwndDlg, /* speakervolume.c */ INT_PTR -SpeakerVolume(HWND hwndDlg, - HMIXER hMixer); +SpeakerVolume(HWND hwndDlg); #endif /* _MMSYS_H */ diff --git a/dll/cpl/mmsys/speakervolume.c b/dll/cpl/mmsys/speakervolume.c index 270cdfcd02..4acb5a82c5 100644 --- a/dll/cpl/mmsys/speakervolume.c +++ b/dll/cpl/mmsys/speakervolume.c @@ -7,30 +7,48 @@ #include "mmsys.h" +typedef struct _PAGE_DATA +{ + HMIXER hMixer; + DWORD volumeControlID; + DWORD volumeChannels; + DWORD volumeMinimum; + DWORD volumeMaximum; + DWORD volumeStep; + PMIXERCONTROLDETAILS_UNSIGNED volumeValues; +} PAGE_DATA, *PPAGE_DATA; + + static BOOL OnInitDialog( - HWND hwndDlg, - LPARAM lParam) + PPAGE_DATA pPageData, + HWND hwndDlg) { TCHAR szBuffer[256]; MIXERLINE mxln; MIXERCONTROL mxc; MIXERLINECONTROLS mxlctrl; MIXERCONTROLDETAILS mxcd; - MIXERCONTROLDETAILS_UNSIGNED mxcdVolume[8]; INT i, j; - DWORD dwStep; - HMIXER hMixer; - hMixer = (HMIXER)((LPPROPSHEETPAGE)lParam)->lParam; + /* Open the mixer */ + if (mixerOpen(&pPageData->hMixer, 0, PtrToUlong(hwndDlg), 0, MIXER_OBJECTF_MIXER | CALLBACK_WINDOW) != MMSYSERR_NOERROR) + { + MessageBox(hwndDlg, _T("Cannot open mixer"), NULL, MB_OK); + return FALSE; + } + /* Retrieve the mixer information */ mxln.cbStruct = sizeof(MIXERLINE); mxln.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_SPEAKERS; - if (mixerGetLineInfo((HMIXEROBJ)hMixer, &mxln, MIXER_OBJECTF_HMIXER | MIXER_GETLINEINFOF_COMPONENTTYPE) != MMSYSERR_NOERROR) + if (mixerGetLineInfo((HMIXEROBJ)pPageData->hMixer, &mxln, MIXER_OBJECTF_HMIXER | MIXER_GETLINEINFOF_COMPONENTTYPE) != MMSYSERR_NOERROR) return FALSE; + pPageData->volumeChannels = mxln.cChannels; + + /* Retrieve the line information */ mxlctrl.cbStruct = sizeof(MIXERLINECONTROLS); mxlctrl.dwLineID = mxln.dwLineID; mxlctrl.dwControlType = MIXERCONTROL_CONTROLTYPE_VOLUME; @@ -38,39 +56,46 @@ OnInitDialog( mxlctrl.cbmxctrl = sizeof(MIXERCONTROL); mxlctrl.pamxctrl = &mxc; - if (mixerGetLineControls((HMIXEROBJ)hMixer, &mxlctrl, MIXER_OBJECTF_HMIXER | MIXER_GETLINECONTROLSF_ONEBYTYPE) != MMSYSERR_NOERROR) + if (mixerGetLineControls((HMIXEROBJ)pPageData->hMixer, &mxlctrl, MIXER_OBJECTF_HMIXER | MIXER_GETLINECONTROLSF_ONEBYTYPE) != MMSYSERR_NOERROR) return FALSE; -// pGlobalData->volumeMinimum = mxc.Bounds.dwMinimum; -// pGlobalData->volumeMaximum = mxc.Bounds.dwMaximum; -// pGlobalData->volumeControlID = mxc.dwControlID; -// pGlobalData->volumeStep = (pGlobalData->volumeMaximum - pGlobalData->volumeMinimum) / (VOLUME_MAX - VOLUME_MIN); - dwStep = (mxc.Bounds.dwMaximum - mxc.Bounds.dwMinimum) / (VOLUME_MAX - VOLUME_MIN); + pPageData->volumeControlID = mxc.dwControlID; + pPageData->volumeMinimum = mxc.Bounds.dwMinimum; + pPageData->volumeMaximum = mxc.Bounds.dwMaximum; + pPageData->volumeStep = (pPageData->volumeMaximum - pPageData->volumeMinimum) / (VOLUME_MAX - VOLUME_MIN); + /* Allocate a buffer for all channel volume values */ + pPageData->volumeValues = HeapAlloc(GetProcessHeap(), + 0, + mxln.cChannels * sizeof(MIXERCONTROLDETAILS_UNSIGNED)); + if (pPageData->volumeValues == NULL) + return FALSE; + + /* Retrieve the channel volume values */ mxcd.cbStruct = sizeof(MIXERCONTROLDETAILS); mxcd.dwControlID = mxc.dwControlID; mxcd.cChannels = mxln.cChannels; mxcd.cMultipleItems = 0; mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED); - mxcd.paDetails = &mxcdVolume; + mxcd.paDetails = pPageData->volumeValues; - if (mixerGetControlDetails((HMIXEROBJ)hMixer, &mxcd, MIXER_OBJECTF_HMIXER | MIXER_GETCONTROLDETAILSF_VALUE) != MMSYSERR_NOERROR) + if (mixerGetControlDetails((HMIXEROBJ)pPageData->hMixer, &mxcd, MIXER_OBJECTF_HMIXER | MIXER_GETCONTROLDETAILSF_VALUE) != MMSYSERR_NOERROR) return FALSE; -// pGlobalData->volumeValue[i] = mxcdVolume[i].dwValue; - /* Initialize the channels */ for (i = 0; i < min(mxln.cChannels, 5); i++) { j = i * 4; - LoadString(hApplet, 5792 + i, szBuffer, _countof(szBuffer)); + + /* Set the channel name */ + LoadString(hApplet, IDS_SPEAKER_LEFT + i, szBuffer, _countof(szBuffer)); SetWindowText(GetDlgItem(hwndDlg, 9472 + j), szBuffer); + /* Initialize the channel trackbar */ SendDlgItemMessage(hwndDlg, 9475 + j, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(VOLUME_MIN, VOLUME_MAX)); SendDlgItemMessage(hwndDlg, 9475 + j, TBM_SETTICFREQ, VOLUME_TICFREQ, 0); SendDlgItemMessage(hwndDlg, 9475 + j, TBM_SETPAGESIZE, 0, VOLUME_PAGESIZE); -// SendDlgItemMessage(hwndDlg, 9475 + j, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)(pGlobalData->volumeValue - pGlobalData->volumeMinimum) / pGlobalData->volumeStep); - SendDlgItemMessage(hwndDlg, 9475 + j, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)(mxcdVolume[i].dwValue - mxc.Bounds.dwMinimum) / dwStep); + SendDlgItemMessage(hwndDlg, 9475 + j, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)(pPageData->volumeValues[i].dwValue - pPageData->volumeMinimum) / pPageData->volumeStep); } /* Hide the unused controls */ @@ -87,6 +112,69 @@ OnInitDialog( } +static +VOID +OnMixerControlChange( + PPAGE_DATA pPageData, + HWND hwndDlg) +{ + MIXERCONTROLDETAILS mxcd; + INT i, j; + + /* Retrieve the channel volume values */ + mxcd.cbStruct = sizeof(MIXERCONTROLDETAILS); + mxcd.dwControlID = pPageData->volumeControlID; + mxcd.cChannels = pPageData->volumeChannels; + mxcd.cMultipleItems = 0; + mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED); + mxcd.paDetails = pPageData->volumeValues; + + if (mixerGetControlDetails((HMIXEROBJ)pPageData->hMixer, &mxcd, MIXER_OBJECTF_HMIXER | MIXER_GETCONTROLDETAILSF_VALUE) != MMSYSERR_NOERROR) + return; + + for (i = 0; i < min(pPageData->volumeChannels, 5); i++) + { + j = i * 4; + + SendDlgItemMessage(hwndDlg, 9475 + j, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)(pPageData->volumeValues[i].dwValue - pPageData->volumeMinimum) / pPageData->volumeStep); + } +} + + +static +VOID +OnHScroll( + PPAGE_DATA pPageData, + HWND hwndDlg, + WPARAM wParam, + LPARAM lParam) +{ + MIXERCONTROLDETAILS mxcd; + INT id, idx; + + id = (INT)GetWindowLongPtr((HWND)lParam, GWLP_ID); + if (id < 9475 && id > 9503) + return; + + if ((id - 9475) % 4 != 0) + return; + + idx = (id - 9475) / 4; + + pPageData->volumeValues[idx].dwValue = ((DWORD)SendDlgItemMessage(hwndDlg, id, TBM_GETPOS, 0, 0) * pPageData->volumeStep) + pPageData->volumeMinimum; + + mxcd.cbStruct = sizeof(MIXERCONTROLDETAILS); + mxcd.dwControlID = pPageData->volumeControlID; + mxcd.cChannels = pPageData->volumeChannels; + mxcd.cMultipleItems = 0; + mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED); + mxcd.paDetails = pPageData->volumeValues; + + if (mixerSetControlDetails((HMIXEROBJ)pPageData->hMixer, &mxcd, MIXER_OBJECTF_HMIXER | MIXER_SETCONTROLDETAILSF_VALUE) != MMSYSERR_NOERROR) + return; +} + + INT_PTR CALLBACK SpeakerVolumeDlgProc( @@ -95,19 +183,51 @@ SpeakerVolumeDlgProc( WPARAM wParam, LPARAM lParam) { + PPAGE_DATA pPageData; + UNREFERENCED_PARAMETER(wParam); + pPageData = (PPAGE_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch(uMsg) { case WM_INITDIALOG: - OnInitDialog(hwndDlg, lParam); + pPageData = (PPAGE_DATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PAGE_DATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pPageData); + + if (pPageData) + { + OnInitDialog(pPageData, hwndDlg); + } break; case WM_DESTROY: + if (pPageData) + { + if (pPageData->volumeValues) + HeapFree(GetProcessHeap(), 0, pPageData->volumeValues); + + if (pPageData->hMixer) + mixerClose(pPageData->hMixer); + + HeapFree(GetProcessHeap(), 0, pPageData); + pPageData = NULL; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)NULL); + } + break; + + case WM_HSCROLL: + if (pPageData) + OnHScroll(pPageData, hwndDlg, wParam, lParam); break; case WM_NOTIFY: return TRUE; + + case MM_MIXM_CONTROL_CHANGE: + if (pPageData) + OnMixerControlChange(pPageData, hwndDlg); + break; } return FALSE; @@ -116,8 +236,7 @@ SpeakerVolumeDlgProc( INT_PTR SpeakerVolume( - HWND hwnd, - HMIXER hMixer) + HWND hwndDlg) { PROPSHEETPAGE psp[1]; PROPSHEETHEADER psh; @@ -128,14 +247,14 @@ SpeakerVolume( ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPSHEETPAGE; - psh.hwndParent = hwnd; + psh.hwndParent = hwndDlg; psh.hInstance = hApplet; psh.pszCaption = Caption; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_MULTICHANNEL, SpeakerVolumeDlgProc, (LPARAM)hMixer); + InitPropSheetPage(&psp[0], IDD_MULTICHANNEL, SpeakerVolumeDlgProc); return (LONG)(PropertySheet(&psh) != -1); } diff --git a/dll/cpl/mmsys/volume.c b/dll/cpl/mmsys/volume.c index e5cda69108..2d08037484 100644 --- a/dll/cpl/mmsys/volume.c +++ b/dll/cpl/mmsys/volume.c @@ -443,7 +443,7 @@ VolumeDlgProc(HWND hwndDlg, break; case IDC_SPEAKER_VOL_BTN: - SpeakerVolume(hwndDlg, pGlobalData->hMixer); + SpeakerVolume(hwndDlg); break; } break;

6 years, 3 months

[reactos] 01/01: [NOTEPAD] Fix "Save As" dialog resource (#1272)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c09a7b5bd70a8a3926b43… commit c09a7b5bd70a8a3926b434316e431a9acd5dab15 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Jan 20 19:58:26 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 20 19:58:26 2019 +0100 [NOTEPAD] Fix "Save As" dialog resource (#1272) Fix the placement of the "Encoding" and "Endlines" selection controls. CORE-15596 --- base/applications/notepad/lang/bg-BG.rc | 8 ++++---- base/applications/notepad/lang/cs-CZ.rc | 8 ++++---- base/applications/notepad/lang/da-DK.rc | 8 ++++---- base/applications/notepad/lang/de-DE.rc | 8 ++++---- base/applications/notepad/lang/el-GR.rc | 8 ++++---- base/applications/notepad/lang/en-US.rc | 8 ++++---- base/applications/notepad/lang/es-ES.rc | 8 ++++---- base/applications/notepad/lang/et-EE.rc | 8 ++++---- base/applications/notepad/lang/eu-ES.rc | 8 ++++---- base/applications/notepad/lang/fi-FI.rc | 8 ++++---- base/applications/notepad/lang/fr-FR.rc | 8 ++++---- base/applications/notepad/lang/he-IL.rc | 8 ++++---- base/applications/notepad/lang/hi-IN.rc | 8 ++++---- base/applications/notepad/lang/hu-HU.rc | 8 ++++---- base/applications/notepad/lang/hy-AM.rc | 8 ++++---- base/applications/notepad/lang/id-ID.rc | 8 ++++---- base/applications/notepad/lang/it-IT.rc | 8 ++++---- base/applications/notepad/lang/ja-JP.rc | 8 ++++---- base/applications/notepad/lang/lt-LT.rc | 8 ++++---- base/applications/notepad/lang/ms-MY.rc | 8 ++++---- base/applications/notepad/lang/nl-NL.rc | 8 ++++---- base/applications/notepad/lang/no-NO.rc | 8 ++++---- base/applications/notepad/lang/pl-PL.rc | 8 ++++---- base/applications/notepad/lang/pt-BR.rc | 8 ++++---- base/applications/notepad/lang/pt-PT.rc | 8 ++++---- base/applications/notepad/lang/ro-RO.rc | 8 ++++---- base/applications/notepad/lang/ru-RU.rc | 8 ++++---- base/applications/notepad/lang/sk-SK.rc | 8 ++++---- base/applications/notepad/lang/sl-SI.rc | 8 ++++---- base/applications/notepad/lang/sq-AL.rc | 8 ++++---- base/applications/notepad/lang/sv-SE.rc | 8 ++++---- base/applications/notepad/lang/th-TH.rc | 8 ++++---- base/applications/notepad/lang/tr-TR.rc | 8 ++++---- base/applications/notepad/lang/uk-UA.rc | 8 ++++---- base/applications/notepad/lang/uz-UZ.rc | 8 ++++---- base/applications/notepad/lang/zh-CN.rc | 8 ++++---- base/applications/notepad/lang/zh-TW.rc | 8 ++++---- 37 files changed, 148 insertions(+), 148 deletions(-) diff --git a/base/applications/notepad/lang/bg-BG.rc b/base/applications/notepad/lang/bg-BG.rc index 7d63a030e0..5f1726abd0 100644 --- a/base/applications/notepad/lang/bg-BG.rc +++ b/base/applications/notepad/lang/bg-BG.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Знаков набор" BEGIN - COMBOBOX ID_ENCODING, 65, 0, 145, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Знаков набор:", 0x155, 5, 2, 60, 12 - COMBOBOX ID_EOLN, 65, 18, 145, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Знак за нов ред:", 0x156, 5, 20, 60, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Знаков набор:", 0x155, 65, 2, 60, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Знак за нов ред:", 0x156, 65, 20, 60, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/cs-CZ.rc b/base/applications/notepad/lang/cs-CZ.rc index d148ca7381..aa6c5da542 100644 --- a/base/applications/notepad/lang/cs-CZ.rc +++ b/base/applications/notepad/lang/cs-CZ.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Kódování" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Kódování:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Odřádkování:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Kódování:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Odřádkování:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/da-DK.rc b/base/applications/notepad/lang/da-DK.rc index b9609eeddf..79709a5a5d 100644 --- a/base/applications/notepad/lang/da-DK.rc +++ b/base/applications/notepad/lang/da-DK.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Encoding" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Encoding:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Endlines:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Encoding:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Endlines:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/de-DE.rc b/base/applications/notepad/lang/de-DE.rc index 1577a11998..4b8b5b0c9f 100644 --- a/base/applications/notepad/lang/de-DE.rc +++ b/base/applications/notepad/lang/de-DE.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Zeichenkodierung" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Kodierung:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Zeilenenden:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Kodierung:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Zeilenenden:", 0x156, 65, 20, 41, 12 END /* Dialog 'Gehe zu...' */ diff --git a/base/applications/notepad/lang/el-GR.rc b/base/applications/notepad/lang/el-GR.rc index 41d48606d5..84e03398e8 100644 --- a/base/applications/notepad/lang/el-GR.rc +++ b/base/applications/notepad/lang/el-GR.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Κωδικοποίηση" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Κωδικοποίηση:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Endlines:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Κωδικοποίηση:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Endlines:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/en-US.rc b/base/applications/notepad/lang/en-US.rc index 96650ae710..178497600b 100644 --- a/base/applications/notepad/lang/en-US.rc +++ b/base/applications/notepad/lang/en-US.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Encoding" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Encoding:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Endlines:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Encoding:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Endlines:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc index 6c573df297..7181be7e72 100644 --- a/base/applications/notepad/lang/es-ES.rc +++ b/base/applications/notepad/lang/es-ES.rc @@ -111,10 +111,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Codificación" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Codificación:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Fin de línea:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Codificación:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Fin de línea:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/et-EE.rc b/base/applications/notepad/lang/et-EE.rc index f302044f19..2cd36e7425 100644 --- a/base/applications/notepad/lang/et-EE.rc +++ b/base/applications/notepad/lang/et-EE.rc @@ -117,10 +117,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Kodeering" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Kodeering:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Endlines:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Kodeering:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Endlines:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/eu-ES.rc b/base/applications/notepad/lang/eu-ES.rc index 8b5f5eb30c..60c0eaf8eb 100644 --- a/base/applications/notepad/lang/eu-ES.rc +++ b/base/applications/notepad/lang/eu-ES.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Kodifikazioa" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 136, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Kodifikazioa:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 136, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Lerro amaiera:", 0x156, 5, 20, 48, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Kodifikazioa:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Lerro amaiera:", 0x156, 65, 20, 48, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/fi-FI.rc b/base/applications/notepad/lang/fi-FI.rc index 7f678c1c04..f4ed7a58c1 100644 --- a/base/applications/notepad/lang/fi-FI.rc +++ b/base/applications/notepad/lang/fi-FI.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Encoding" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Encoding:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Endlines:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Encoding:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Endlines:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/fr-FR.rc b/base/applications/notepad/lang/fr-FR.rc index 8efefc2714..bc1ac253ac 100644 --- a/base/applications/notepad/lang/fr-FR.rc +++ b/base/applications/notepad/lang/fr-FR.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Encodage" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Encodage :", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Fin de lignes :", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Encodage :", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Fin de lignes :", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/he-IL.rc b/base/applications/notepad/lang/he-IL.rc index e2dda2e80d..3570e4f0bd 100644 --- a/base/applications/notepad/lang/he-IL.rc +++ b/base/applications/notepad/lang/he-IL.rc @@ -111,10 +111,10 @@ EXSTYLE WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" CAPTION "קידוד" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "קידוד:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "סופי שורות:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "קידוד:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "סופי שורות:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/hi-IN.rc b/base/applications/notepad/lang/hi-IN.rc index 6faffaf3f3..e62c07ff49 100644 --- a/base/applications/notepad/lang/hi-IN.rc +++ b/base/applications/notepad/lang/hi-IN.rc @@ -116,10 +116,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "एन्कोडिंग" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "एन्कोडिंग:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "लाइन का अंत:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "एन्कोडिंग:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "लाइन का अंत:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index 1b3949dee0..c3703c0cf0 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Encoding" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Encoding:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Endlines:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Encoding:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Endlines:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/hy-AM.rc b/base/applications/notepad/lang/hy-AM.rc index 2c5b06c90a..c5038f07dc 100644 --- a/base/applications/notepad/lang/hy-AM.rc +++ b/base/applications/notepad/lang/hy-AM.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Սիմվոլների կոդավորում" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Կոդավորում:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Տարբերակներ:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Կոդավորում:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Տարբերակներ:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/id-ID.rc b/base/applications/notepad/lang/id-ID.rc index cc0c13eb07..150b29f5dc 100644 --- a/base/applications/notepad/lang/id-ID.rc +++ b/base/applications/notepad/lang/id-ID.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Enkoding" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Enkoding:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Akhirbaris:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Enkoding:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Akhirbaris:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/it-IT.rc b/base/applications/notepad/lang/it-IT.rc index 3e7fdafd53..3756270434 100644 --- a/base/applications/notepad/lang/it-IT.rc +++ b/base/applications/notepad/lang/it-IT.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Codifica" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Codifica:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Fine linea:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Codifica:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Fine linea:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index 44c353b559..d703d40077 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 9, "MS UI Gothic" CAPTION "エンコーディング" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "文字コード:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "改行コード:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "文字コード:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "改行コード:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/lt-LT.rc b/base/applications/notepad/lang/lt-LT.rc index 5d6b68ae63..22d34185f7 100644 --- a/base/applications/notepad/lang/lt-LT.rc +++ b/base/applications/notepad/lang/lt-LT.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Koduotė" BEGIN - COMBOBOX ID_ENCODING, 73, 0, 138, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Koduotė:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 73, 18, 138, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Eilutės pabaiga:", 0x156, 5, 20, 53, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Koduotė:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Eilutės pabaiga:", 0x156, 65, 20, 53, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/ms-MY.rc b/base/applications/notepad/lang/ms-MY.rc index ac3968794a..8de3469a77 100644 --- a/base/applications/notepad/lang/ms-MY.rc +++ b/base/applications/notepad/lang/ms-MY.rc @@ -111,10 +111,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Pengekodan" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Pengekodan:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Tamat garisan:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Pengekodan:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Tamat garisan:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/nl-NL.rc b/base/applications/notepad/lang/nl-NL.rc index d2ef396f29..bfcd60dfac 100644 --- a/base/applications/notepad/lang/nl-NL.rc +++ b/base/applications/notepad/lang/nl-NL.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Encoding" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Encoding:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Endlines:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Encoding:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Endlines:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/no-NO.rc b/base/applications/notepad/lang/no-NO.rc index 3d33461bcd..21f732b2a4 100644 --- a/base/applications/notepad/lang/no-NO.rc +++ b/base/applications/notepad/lang/no-NO.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Koding" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Koding:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Sluttlinje:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Koding:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Sluttlinje:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/pl-PL.rc b/base/applications/notepad/lang/pl-PL.rc index 7569701a57..dd86d2a081 100644 --- a/base/applications/notepad/lang/pl-PL.rc +++ b/base/applications/notepad/lang/pl-PL.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Kodowanie" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Kodowanie:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Linie końca:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Kodowanie:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Linie końca:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/pt-BR.rc b/base/applications/notepad/lang/pt-BR.rc index 4e4c487c85..e7d5789132 100644 --- a/base/applications/notepad/lang/pt-BR.rc +++ b/base/applications/notepad/lang/pt-BR.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Codificação" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Codificação:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Fim de linha:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Codificação:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Fim de linha:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/pt-PT.rc b/base/applications/notepad/lang/pt-PT.rc index c53be7640f..d5756d3d62 100644 --- a/base/applications/notepad/lang/pt-PT.rc +++ b/base/applications/notepad/lang/pt-PT.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Codificação" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Codificação:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Fim de linha:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Codificação:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Fim de linha:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc index 6d47346207..6a496d83b1 100644 --- a/base/applications/notepad/lang/ro-RO.rc +++ b/base/applications/notepad/lang/ro-RO.rc @@ -114,10 +114,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Codificare" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Codificare:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Terminație:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Codificare:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Terminație:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/ru-RU.rc b/base/applications/notepad/lang/ru-RU.rc index 731ade335a..553c0b27d3 100644 --- a/base/applications/notepad/lang/ru-RU.rc +++ b/base/applications/notepad/lang/ru-RU.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Кодировка символов" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Кодировка:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Формат конца строки:", 0x156, 5, 20, 50, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Кодировка:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Формат конца строки:", 0x156, 65, 20, 50, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/sk-SK.rc b/base/applications/notepad/lang/sk-SK.rc index 87718194d1..861f655027 100644 --- a/base/applications/notepad/lang/sk-SK.rc +++ b/base/applications/notepad/lang/sk-SK.rc @@ -117,10 +117,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Kódovanie" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Kódovanie:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Koniec riadka:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Kódovanie:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Koniec riadka:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/sl-SI.rc b/base/applications/notepad/lang/sl-SI.rc index 412ccad46a..a2738a307c 100644 --- a/base/applications/notepad/lang/sl-SI.rc +++ b/base/applications/notepad/lang/sl-SI.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Encoding" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Encoding:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Endlines:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Encoding:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Endlines:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/sq-AL.rc b/base/applications/notepad/lang/sq-AL.rc index 222d9a3b7a..1b9fba183e 100644 --- a/base/applications/notepad/lang/sq-AL.rc +++ b/base/applications/notepad/lang/sq-AL.rc @@ -113,10 +113,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Encoding" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Encoding:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Endlines:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Encoding:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Endlines:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/sv-SE.rc b/base/applications/notepad/lang/sv-SE.rc index d9806ccd2e..4346e624bb 100644 --- a/base/applications/notepad/lang/sv-SE.rc +++ b/base/applications/notepad/lang/sv-SE.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Kodning" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Kodning:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Slutrader:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Kodning:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Slutrader:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/th-TH.rc b/base/applications/notepad/lang/th-TH.rc index a87748ffe7..4a8ee16beb 100644 --- a/base/applications/notepad/lang/th-TH.rc +++ b/base/applications/notepad/lang/th-TH.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Encoding" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Encoding:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Endlines:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Encoding:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Endlines:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 9f2cd4c00b..e0df9f1ade 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -111,10 +111,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Kodlama" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Kodlama:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Sonlanma:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Kodlama:", 0x155, 64, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Sonlanma:", 0x156, 64, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc index 2fde8230b6..a1ebedb050 100644 --- a/base/applications/notepad/lang/uk-UA.rc +++ b/base/applications/notepad/lang/uk-UA.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Кодування" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Кодування:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Кінець рядка:", 0x156, 5, 20, 47, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Кодування:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Кінець рядка:", 0x156, 65, 20, 47, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/uz-UZ.rc b/base/applications/notepad/lang/uz-UZ.rc index afeee56ac6..9c5753a04c 100644 --- a/base/applications/notepad/lang/uz-UZ.rc +++ b/base/applications/notepad/lang/uz-UZ.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 8, "MS Shell Dlg" CAPTION "Кодировка символов" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Kodlash:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Конец строки:", 0x156, 5, 20, 50, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Kodlash:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Конец строки:", 0x156, 65, 20, 50, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/zh-CN.rc b/base/applications/notepad/lang/zh-CN.rc index 759f70e152..ae9ac1eb1e 100644 --- a/base/applications/notepad/lang/zh-CN.rc +++ b/base/applications/notepad/lang/zh-CN.rc @@ -111,10 +111,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 9, "宋体" CAPTION "编码" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "编码:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "换行:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "编码:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "换行:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */ diff --git a/base/applications/notepad/lang/zh-TW.rc b/base/applications/notepad/lang/zh-TW.rc index 5a75df2e6f..975e1a82de 100644 --- a/base/applications/notepad/lang/zh-TW.rc +++ b/base/applications/notepad/lang/zh-TW.rc @@ -109,10 +109,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_S FONT 9, "新細明體" CAPTION "編碼" BEGIN - COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "編碼:", 0x155, 5, 2, 41, 12 - COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "換行格式:", 0x156, 5, 20, 41, 12 + COMBOBOX ID_ENCODING, 124, 0, 125, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "編碼:", 0x155, 65, 2, 41, 12 + COMBOBOX ID_EOLN, 124, 18, 125, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "換行格式:", 0x156, 65, 20, 41, 12 END /* Dialog 'Go To' */

6 years, 3 months

[reactos] 01/01: [WINMM] Load Wave/MIDI mapper drivers only after actual device drivers (#1241)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=677edc637c76abd45d6d9… commit 677edc637c76abd45d6d9b1afcb266ce1cfe4dfc Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Jan 20 19:55:45 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 20 17:55:45 2019 +0100 [WINMM] Load Wave/MIDI mapper drivers only after actual device drivers (#1241) CORE-15620 --- dll/win32/winmm/registry.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dll/win32/winmm/registry.c b/dll/win32/winmm/registry.c index 57f6605b32..563c63f84b 100644 --- a/dll/win32/winmm/registry.c +++ b/dll/win32/winmm/registry.c @@ -32,6 +32,9 @@ BOOL LoadRegistryMMEDrivers(char* key) DWORD value_data_length = 256; char value_data[256]; + char wavemapper[256] = { 0 }; + char midimapper[256] = { 0 }; + DWORD value_type; if ( RegOpenKeyA(HKEY_LOCAL_MACHINE, key, &drivers_key) != ERROR_SUCCESS ) @@ -60,14 +63,16 @@ BOOL LoadRegistryMMEDrivers(char* key) if ( ! stricmp("wavemapper", value_name) ) { TRACE("Found a Wave-mapper: %s\n", value_data); - valid_driver = TRUE; + /* Delay loading Wave mapper driver */ + strcpy(wavemapper, value_data); is_mapper = TRUE; driver_count ++; } else if ( ! stricmp("midimapper", value_name) ) { TRACE("Found a MIDI-mapper: %s\n", value_data); - valid_driver = TRUE; + /* Delay loading MIDI mapper driver */ + strcpy(midimapper, value_data); is_mapper = TRUE; driver_count ++; } @@ -125,6 +130,23 @@ BOOL LoadRegistryMMEDrivers(char* key) driver_index ++; } + /* Finally load mapper drivers, since they expect device drivers already loaded */ + if (*wavemapper) + { + if (!MMDRV_Install("wavemapper", wavemapper, TRUE)) + { + TRACE("FAILED when initializing %s\n", wavemapper); + } + } + + if (*midimapper) + { + if (!MMDRV_Install("midimapper", midimapper, TRUE)) + { + TRACE("FAILED when initializing %s\n", midimapper); + } + } + TRACE("Found a total of %d drivers\n", driver_count); return driver_count;

6 years, 3 months

[reactos] 01/01: [MOUNTMGR] Misc. fixes to QueryDeviceInformation: - Simplify failure path for DeviceName query failure - Don't make stable query failure fail the whole function call

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=20ddde0a97bb927a3ccfe… commit 20ddde0a97bb927a3ccfe331a9b3bd30d0c5922d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jan 20 17:32:48 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jan 20 17:38:29 2019 +0100 [MOUNTMGR] Misc. fixes to QueryDeviceInformation: - Simplify failure path for DeviceName query failure - Don't make stable query failure fail the whole function call Based on a patch by Vadim Galiant CORE-15550 --- drivers/filters/mountmgr/mountmgr.c | 57 +++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/drivers/filters/mountmgr/mountmgr.c b/drivers/filters/mountmgr/mountmgr.c index 1852dfc17f..0e273b3957 100644 --- a/drivers/filters/mountmgr/mountmgr.c +++ b/drivers/filters/mountmgr/mountmgr.c @@ -213,12 +213,12 @@ QueryDeviceInformation(IN PUNICODE_STRING SymbolicName, PIRP Irp; USHORT Size; KEVENT Event; - NTSTATUS Status; BOOLEAN IsRemovable; PMOUNTDEV_NAME Name; PMOUNTDEV_UNIQUE_ID Id; PFILE_OBJECT FileObject; PIO_STACK_LOCATION Stack; + NTSTATUS Status, IntStatus; PDEVICE_OBJECT DeviceObject; IO_STATUS_BLOCK IoStatusBlock; PARTITION_INFORMATION_EX PartitionInfo; @@ -282,7 +282,7 @@ QueryDeviceInformation(IN PUNICODE_STRING SymbolicName, if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatusBlock.Status; + Status = IoStatusBlock.Status; } /* In case of failure, don't fail, that's no vital */ @@ -329,7 +329,7 @@ QueryDeviceInformation(IN PUNICODE_STRING SymbolicName, if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatusBlock.Status; + Status = IoStatusBlock.Status; } /* Once again here, failure isn't major */ @@ -368,7 +368,7 @@ QueryDeviceInformation(IN PUNICODE_STRING SymbolicName, if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatusBlock.Status; + Status = IoStatusBlock.Status; } if (!NT_SUCCESS(Status)) @@ -470,32 +470,33 @@ QueryDeviceInformation(IN PUNICODE_STRING SymbolicName, } } - /* Here we can't fail and assume default value */ - if (!NT_SUCCESS(Status)) - { - FreePool(Name); - ObDereferenceObject(DeviceObject); - ObDereferenceObject(FileObject); - return Status; - } - - /* Copy back found name to the caller */ - DeviceName->Length = Name->NameLength; - DeviceName->MaximumLength = Name->NameLength + sizeof(WCHAR); - DeviceName->Buffer = AllocatePool(DeviceName->MaximumLength); - if (!DeviceName->Buffer) + if (NT_SUCCESS(Status)) { - FreePool(Name); - ObDereferenceObject(DeviceObject); - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; + /* Copy back found name to the caller */ + DeviceName->Length = Name->NameLength; + DeviceName->MaximumLength = Name->NameLength + sizeof(WCHAR); + DeviceName->Buffer = AllocatePool(DeviceName->MaximumLength); + if (!DeviceName->Buffer) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + else + { + RtlCopyMemory(DeviceName->Buffer, Name->Name, Name->NameLength); + DeviceName->Buffer[Name->NameLength / sizeof(WCHAR)] = UNICODE_NULL; + } } - RtlCopyMemory(DeviceName->Buffer, Name->Name, Name->NameLength); - DeviceName->Buffer[Name->NameLength / sizeof(WCHAR)] = UNICODE_NULL; FreePool(Name); } + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(DeviceObject); + ObDereferenceObject(FileObject); + return Status; + } + /* If caller wants device unique ID */ if (UniqueId) { @@ -628,14 +629,14 @@ QueryDeviceInformation(IN PUNICODE_STRING SymbolicName, Stack = IoGetNextIrpStackLocation(Irp); Stack->FileObject = FileObject; - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) + IntStatus = IoCallDriver(DeviceObject, Irp); + if (IntStatus == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatusBlock.Status; + IntStatus = IoStatusBlock.Status; } - *HasGuid = NT_SUCCESS(Status); + *HasGuid = NT_SUCCESS(IntStatus); } ObDereferenceObject(DeviceObject);

6 years, 3 months

[reactos] 01/01: [MMSYS] Replaces some magic values

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ae86a245dc3d9c64be69… commit 3ae86a245dc3d9c64be69b7196b76bd1e6d0eab9 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 20 16:35:52 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 20 16:35:52 2019 +0100 [MMSYS] Replaces some magic values --- dll/cpl/mmsys/lang/bg-BG.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/cs-CZ.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/el-GR.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/en-US.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/es-ES.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/fr-FR.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/he-IL.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/id-ID.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/it-IT.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/ja-JP.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/nl-NL.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/no-NO.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/pl-PL.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/pt-BR.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/ro-RO.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/ru-RU.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/sk-SK.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/sq-AL.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/tr-TR.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/uk-UA.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/zh-CN.rc | 16 ++++++++-------- dll/cpl/mmsys/lang/zh-TW.rc | 16 ++++++++-------- 22 files changed, 176 insertions(+), 176 deletions(-) diff --git a/dll/cpl/mmsys/lang/bg-BG.rc b/dll/cpl/mmsys/lang/bg-BG.rc index eae4099f57..c7017f8bc5 100644 --- a/dll/cpl/mmsys/lang/bg-BG.rc +++ b/dll/cpl/mmsys/lang/bg-BG.rc @@ -182,35 +182,35 @@ BEGIN LTEXT "Description goes here.", 9506, 8, 4, 212, 24 LTEXT "Слабо", 9473, 65, 31, 25, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "Силно", 9474, 202, 31, 25, 8 LTEXT "Слабо", 9477, 65, 50, 25, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "Силно", 9478, 202, 50, 25, 8 LTEXT "Слабо", 9481, 65, 69, 25, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "Силно", 9482, 202, 69, 25, 8 LTEXT "Слабо", 9485, 65, 88, 25, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "Силно", 9486, 202, 88, 25, 8 LTEXT "Слабо", 9489, 65, 107, 25, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "Силно", 9490, 202, 107, 25, 8 LTEXT "Слабо", 9493, 65, 126, 25, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "Силно", 9494, 202, 126, 25, 8 LTEXT "Слабо", 9497, 65, 145, 25, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "Силно", 9498, 202, 145, 25, 8 LTEXT "Слабо", 9501, 65, 164, 25, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "Силно", 9502, 202, 164, 25, 8 AUTOCHECKBOX "&Едновременно местене на всички плъзгачи", 9504, 5, 185, 216, 9 PUSHBUTTON "Връшане към под&разбираните", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/cs-CZ.rc b/dll/cpl/mmsys/lang/cs-CZ.rc index c106c3d100..118e05a85e 100644 --- a/dll/cpl/mmsys/lang/cs-CZ.rc +++ b/dll/cpl/mmsys/lang/cs-CZ.rc @@ -187,35 +187,35 @@ BEGIN LTEXT "Tady bude popis.", 9506, 8, 4, 212, 24 LTEXT "Nízká", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "Vysoká", 9474, 202, 31, 17, 8 LTEXT "Nízká", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "Vysoká", 9478, 202, 50, 17, 8 LTEXT "Nízká", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "Vysoká", 9482, 202, 69, 17, 8 LTEXT "Nízká", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "Vysoká", 9486, 202, 88, 17, 8 LTEXT "Nízká", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "Vysoká", 9490, 202, 107, 17, 8 LTEXT "Nízká", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "Vysoká", 9494, 202, 126, 17, 8 LTEXT "Nízká", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "Vysoká", 9498, 202, 145, 17, 8 LTEXT "Nízká", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "Vysoká", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Pohybovat všemi posuvníky najednou", 9504, 5, 185, 216, 9 PUSHBUTTON "&Obnovit výchozí", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/el-GR.rc b/dll/cpl/mmsys/lang/el-GR.rc index a5fe8585ea..1daa5ee295 100644 --- a/dll/cpl/mmsys/lang/el-GR.rc +++ b/dll/cpl/mmsys/lang/el-GR.rc @@ -182,35 +182,35 @@ BEGIN LTEXT "Description goes here.", 9506, 8, 4, 212, 24 LTEXT "Low", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "High", 9474, 202, 31, 17, 8 LTEXT "Low", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "High", 9478, 202, 50, 17, 8 LTEXT "Low", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "High", 9482, 202, 69, 17, 8 LTEXT "Low", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "High", 9486, 202, 88, 17, 8 LTEXT "Low", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "High", 9490, 202, 107, 17, 8 LTEXT "Low", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "High", 9494, 202, 126, 17, 8 LTEXT "Low", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "High", 9498, 202, 145, 17, 8 LTEXT "Low", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "High", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Move all slide indicators at the same time", 9504, 5, 185, 216, 9 PUSHBUTTON "Restore &Defaults", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/en-US.rc b/dll/cpl/mmsys/lang/en-US.rc index 706ba52c64..a0aa0d70e0 100644 --- a/dll/cpl/mmsys/lang/en-US.rc +++ b/dll/cpl/mmsys/lang/en-US.rc @@ -182,35 +182,35 @@ BEGIN LTEXT "Description goes here.", 9506, 8, 4, 212, 24 LTEXT "Low", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "High", 9474, 202, 31, 17, 8 LTEXT "Low", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "High", 9478, 202, 50, 17, 8 LTEXT "Low", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "High", 9482, 202, 69, 17, 8 LTEXT "Low", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "High", 9486, 202, 88, 17, 8 LTEXT "Low", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "High", 9490, 202, 107, 17, 8 LTEXT "Low", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "High", 9494, 202, 126, 17, 8 LTEXT "Low", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "High", 9498, 202, 145, 17, 8 LTEXT "Low", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "High", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Move all slide indicators at the same time", 9504, 5, 185, 216, 9 PUSHBUTTON "Restore &Defaults", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/es-ES.rc b/dll/cpl/mmsys/lang/es-ES.rc index c44ea433b5..6bc31ec353 100644 --- a/dll/cpl/mmsys/lang/es-ES.rc +++ b/dll/cpl/mmsys/lang/es-ES.rc @@ -182,35 +182,35 @@ BEGIN LTEXT "Description goes here.", 9506, 8, 4, 212, 24 LTEXT "Bajo", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "Alto", 9474, 202, 31, 17, 8 LTEXT "Bajo", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "Alto", 9478, 202, 50, 17, 8 LTEXT "Bajo", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "Alto", 9482, 202, 69, 17, 8 LTEXT "Bajo", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "Alto", 9486, 202, 88, 17, 8 LTEXT "Bajo", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "Alto", 9490, 202, 107, 17, 8 LTEXT "Bajo", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "Alto", 9494, 202, 126, 17, 8 LTEXT "Bajo", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "Alto", 9498, 202, 145, 17, 8 LTEXT "Bajo", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "Alto", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Mover todos los indicadores al mismo tiempo", 9504, 5, 185, 216, 9 PUSHBUTTON "Restaurar &valores predeterminados", 9505, 110, 199, 150, 14 diff --git a/dll/cpl/mmsys/lang/fr-FR.rc b/dll/cpl/mmsys/lang/fr-FR.rc index 9e054c5128..101d756664 100644 --- a/dll/cpl/mmsys/lang/fr-FR.rc +++ b/dll/cpl/mmsys/lang/fr-FR.rc @@ -182,35 +182,35 @@ BEGIN LTEXT "La description prend place ici.", 9506, 8, 4, 212, 24 LTEXT "Faible", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "Élevé", 9474, 202, 31, 17, 8 LTEXT "Faible", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "Élevé", 9478, 202, 50, 17, 8 LTEXT "Faible", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "Élevé", 9482, 202, 69, 17, 8 LTEXT "Faible", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "Élevé", 9486, 202, 88, 17, 8 LTEXT "Faible", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "Élevé", 9490, 202, 107, 17, 8 LTEXT "Faible", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "Élevé", 9494, 202, 126, 17, 8 LTEXT "Faible", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "Élevé", 9498, 202, 145, 17, 8 LTEXT "Faible", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "Élevé", 9502, 202, 164, 17, 8 AUTOCHECKBOX "Déplacer toutes les barres en &même temps", 9504, 5, 185, 216, 9 PUSHBUTTON "Paramètres par &défaut", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/he-IL.rc b/dll/cpl/mmsys/lang/he-IL.rc index e11c91debb..60415bd885 100644 --- a/dll/cpl/mmsys/lang/he-IL.rc +++ b/dll/cpl/mmsys/lang/he-IL.rc @@ -184,35 +184,35 @@ BEGIN LTEXT "Description goes here.", 9506, 8, 4, 212, 24 //? what goes here? LTEXT "נמוך", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "גבוה", 9474, 202, 31, 17, 8 LTEXT "נמוך", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "גבוה", 9478, 202, 50, 17, 8 LTEXT "נמוך", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "גבוה", 9482, 202, 69, 17, 8 LTEXT "נמוך", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "גבוה", 9486, 202, 88, 17, 8 LTEXT "נמוך", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "גבוה", 9490, 202, 107, 17, 8 LTEXT "נמוך", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "גבוה", 9494, 202, 126, 17, 8 LTEXT "נמוך", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "גבוה", 9498, 202, 145, 17, 8 LTEXT "נמוך", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "גבוה", 9502, 202, 164, 17, 8 AUTOCHECKBOX "הזז את כל הסמנים באותו רגע", 9504, 5, 185, 216, 9 PUSHBUTTON "שחזר ברירות מחדל", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/id-ID.rc b/dll/cpl/mmsys/lang/id-ID.rc index f82339ae46..d25e780f29 100644 --- a/dll/cpl/mmsys/lang/id-ID.rc +++ b/dll/cpl/mmsys/lang/id-ID.rc @@ -182,35 +182,35 @@ BEGIN LTEXT "Description goes here.", 9506, 8, 4, 212, 24 LTEXT "Low", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "High", 9474, 202, 31, 17, 8 LTEXT "Low", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "High", 9478, 202, 50, 17, 8 LTEXT "Low", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "High", 9482, 202, 69, 17, 8 LTEXT "Low", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "High", 9486, 202, 88, 17, 8 LTEXT "Low", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "High", 9490, 202, 107, 17, 8 LTEXT "Low", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "High", 9494, 202, 126, 17, 8 LTEXT "Low", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "High", 9498, 202, 145, 17, 8 LTEXT "Low", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "High", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Move all slide indicators at the same time", 9504, 5, 185, 216, 9 PUSHBUTTON "Restore &Defaults", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/it-IT.rc b/dll/cpl/mmsys/lang/it-IT.rc index ca68071359..e4d7b300ef 100644 --- a/dll/cpl/mmsys/lang/it-IT.rc +++ b/dll/cpl/mmsys/lang/it-IT.rc @@ -182,35 +182,35 @@ BEGIN LTEXT "Description goes here.", 9506, 8, 4, 212, 24 LTEXT "Basso", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "Alto", 9474, 202, 31, 17, 8 LTEXT "Basso", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "Alto", 9478, 202, 50, 17, 8 LTEXT "Basso", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "Alto", 9482, 202, 69, 17, 8 LTEXT "Basso", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "Alto", 9486, 202, 88, 17, 8 LTEXT "Basso", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "Alto", 9490, 202, 107, 17, 8 LTEXT "Basso", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "Alto", 9494, 202, 126, 17, 8 LTEXT "Basso", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "Alto", 9498, 202, 145, 17, 8 LTEXT "Basso", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "Alto", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Muovere tutti i cursori contemporaneamente", 9504, 5, 185, 216, 9 PUSHBUTTON "&Ripristinare i valori predefiniti", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/ja-JP.rc b/dll/cpl/mmsys/lang/ja-JP.rc index 6761945992..dcd71bb0f9 100644 --- a/dll/cpl/mmsys/lang/ja-JP.rc +++ b/dll/cpl/mmsys/lang/ja-JP.rc @@ -182,35 +182,35 @@ BEGIN LTEXT "記述はここから始まります。", 9506, 8, 4, 212, 24 LTEXT "低", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "スライダー1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "スライダー1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "高", 9474, 202, 31, 17, 8 LTEXT "低", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "スライダー1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "スライダー1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "高", 9478, 202, 50, 17, 8 LTEXT "低", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "スライダー1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "スライダー1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "高", 9482, 202, 69, 17, 8 LTEXT "低", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "スライダー1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "スライダー1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "高", 9486, 202, 88, 17, 8 LTEXT "低", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "スライダー1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "スライダー1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "高", 9490, 202, 107, 17, 8 LTEXT "低", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "スライダー1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "スライダー1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "高", 9494, 202, 126, 17, 8 LTEXT "低", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "スライダー1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "スライダー1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "高", 9498, 202, 145, 17, 8 LTEXT "低", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "スライダー1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "スライダー1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "高", 9502, 202, 164, 17, 8 AUTOCHECKBOX "同時にすべてのスライダーを動かす(&M)", 9504, 5, 185, 216, 9 PUSHBUTTON "既定値を復元する(&D)", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/nl-NL.rc b/dll/cpl/mmsys/lang/nl-NL.rc index 5cce5c978a..984bd00f91 100644 --- a/dll/cpl/mmsys/lang/nl-NL.rc +++ b/dll/cpl/mmsys/lang/nl-NL.rc @@ -182,35 +182,35 @@ BEGIN LTEXT "Description goes here.", 9506, 8, 4, 212, 24 LTEXT "Low", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "High", 9474, 202, 31, 17, 8 LTEXT "Low", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "High", 9478, 202, 50, 17, 8 LTEXT "Low", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "High", 9482, 202, 69, 17, 8 LTEXT "Low", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "High", 9486, 202, 88, 17, 8 LTEXT "Low", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "High", 9490, 202, 107, 17, 8 LTEXT "Low", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "High", 9494, 202, 126, 17, 8 LTEXT "Low", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "High", 9498, 202, 145, 17, 8 LTEXT "Low", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "High", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Move all slide indicators at the same time", 9504, 5, 185, 216, 9 PUSHBUTTON "Restore &Defaults", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/no-NO.rc b/dll/cpl/mmsys/lang/no-NO.rc index bcc81dcbd2..adf79f292e 100644 --- a/dll/cpl/mmsys/lang/no-NO.rc +++ b/dll/cpl/mmsys/lang/no-NO.rc @@ -182,35 +182,35 @@ BEGIN LTEXT "Beskrivelse får du her.", 9506, 8, 4, 212, 24 LTEXT "Lav", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "Høyt", 9474, 202, 31, 17, 8 LTEXT "Lav", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "Høyt", 9478, 202, 50, 17, 8 LTEXT "Lav", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "Høyt", 9482, 202, 69, 17, 8 LTEXT "Lav", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "Høyt", 9486, 202, 88, 17, 8 LTEXT "Lav", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "Høyt", 9490, 202, 107, 17, 8 LTEXT "Lav", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "Høyt", 9494, 202, 126, 17, 8 LTEXT "Lav", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "Høyt", 9498, 202, 145, 17, 8 LTEXT "Lav", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "Høyt", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Flytt alle slide indicators av gangen", 9504, 5, 185, 216, 9 PUSHBUTTON "Gjenopprett &standard", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/pl-PL.rc b/dll/cpl/mmsys/lang/pl-PL.rc index b359e86906..1d28cacf29 100644 --- a/dll/cpl/mmsys/lang/pl-PL.rc +++ b/dll/cpl/mmsys/lang/pl-PL.rc @@ -195,35 +195,35 @@ BEGIN LTEXT "Opis ma być tutaj.", 9506, 8, 4, 212, 24 LTEXT "Mała", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "Duża", 9474, 202, 31, 17, 8 LTEXT "Mała", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "Duża", 9478, 202, 50, 17, 8 LTEXT "Mała", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "Duża", 9482, 202, 69, 17, 8 LTEXT "Mała", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "Duża", 9486, 202, 88, 17, 8 LTEXT "Mała", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "Duża", 9490, 202, 107, 17, 8 LTEXT "Mała", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "Duża", 9494, 202, 126, 17, 8 LTEXT "Mała", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "Duża", 9498, 202, 145, 17, 8 LTEXT "Mała", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "Duża", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Połącz wszystkie suwaki", 9504, 5, 185, 216, 9 PUSHBUTTON "Odtwórz &domyślne", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/pt-BR.rc b/dll/cpl/mmsys/lang/pt-BR.rc index 2c70fa49c0..b315614767 100644 --- a/dll/cpl/mmsys/lang/pt-BR.rc +++ b/dll/cpl/mmsys/lang/pt-BR.rc @@ -182,35 +182,35 @@ BEGIN LTEXT "Description goes here.", 9506, 8, 4, 212, 24 LTEXT "Low", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "High", 9474, 202, 31, 17, 8 LTEXT "Low", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "High", 9478, 202, 50, 17, 8 LTEXT "Low", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "High", 9482, 202, 69, 17, 8 LTEXT "Low", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "High", 9486, 202, 88, 17, 8 LTEXT "Low", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "High", 9490, 202, 107, 17, 8 LTEXT "Low", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "High", 9494, 202, 126, 17, 8 LTEXT "Low", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "High", 9498, 202, 145, 17, 8 LTEXT "Low", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "High", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Move all slide indicators at the same time", 9504, 5, 185, 216, 9 PUSHBUTTON "Restore &Defaults", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/ro-RO.rc b/dll/cpl/mmsys/lang/ro-RO.rc index b7cfedcc8d..fafa6ae9d6 100644 --- a/dll/cpl/mmsys/lang/ro-RO.rc +++ b/dll/cpl/mmsys/lang/ro-RO.rc @@ -187,35 +187,35 @@ BEGIN LTEXT "Descriere…", 9506, 8, 4, 212, 24 LTEXT "Redus", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "Ridicat", 9474, 202, 31, 17, 8 LTEXT "Redus", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "Ridicat", 9478, 202, 50, 17, 8 LTEXT "Redus", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "Ridicat", 9482, 202, 69, 17, 8 LTEXT "Redus", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "Ridicat", 9486, 202, 88, 17, 8 LTEXT "Redus", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "Ridicat", 9490, 202, 107, 17, 8 LTEXT "Redus", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "Ridicat", 9494, 202, 126, 17, 8 LTEXT "Redus", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "Ridicat", 9498, 202, 145, 17, 8 LTEXT "Redus", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "Ridicat", 9502, 202, 164, 17, 8 AUTOCHECKBOX "Sinc&ronizează mișcarea indicatorilor", 9504, 5, 185, 216, 9 PUSHBUTTON "Restabilește i&mplicite", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/ru-RU.rc b/dll/cpl/mmsys/lang/ru-RU.rc index 74308791fb..cc9c8f1ff4 100644 --- a/dll/cpl/mmsys/lang/ru-RU.rc +++ b/dll/cpl/mmsys/lang/ru-RU.rc @@ -182,35 +182,35 @@ BEGIN LTEXT "Описание.", 9506, 8, 4, 212, 24 LTEXT "Мин.", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "Макс.", 9474, 202, 31, 17, 8 LTEXT "Мин.", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "Макс.", 9478, 202, 50, 17, 8 LTEXT "Мин.", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "Макс.", 9482, 202, 69, 17, 8 LTEXT "Мин.", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "Макс.", 9486, 202, 88, 17, 8 LTEXT "Мин.", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "Макс.", 9490, 202, 107, 17, 8 LTEXT "Мин.", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "Макс.", 9494, 202, 126, 17, 8 LTEXT "Мин.", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "Макс.", 9498, 202, 145, 17, 8 LTEXT "Мин.", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "Макс.", 9502, 202, 164, 17, 8 AUTOCHECKBOX "П&ередвигать все регуляторы одновременно", 9504, 5, 185, 216, 9 PUSHBUTTON "&Востановить умолчания", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/sk-SK.rc b/dll/cpl/mmsys/lang/sk-SK.rc index 9f40f1282e..c5d72f5cb0 100644 --- a/dll/cpl/mmsys/lang/sk-SK.rc +++ b/dll/cpl/mmsys/lang/sk-SK.rc @@ -187,35 +187,35 @@ BEGIN LTEXT "Description goes here.", 9506, 8, 4, 212, 24 LTEXT "Low", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "High", 9474, 202, 31, 17, 8 LTEXT "Low", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "High", 9478, 202, 50, 17, 8 LTEXT "Low", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "High", 9482, 202, 69, 17, 8 LTEXT "Low", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "High", 9486, 202, 88, 17, 8 LTEXT "Low", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "High", 9490, 202, 107, 17, 8 LTEXT "Low", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "High", 9494, 202, 126, 17, 8 LTEXT "Low", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "High", 9498, 202, 145, 17, 8 LTEXT "Low", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "High", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Move all slide indicators at the same time", 9504, 5, 185, 216, 9 PUSHBUTTON "Restore &Defaults", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/sq-AL.rc b/dll/cpl/mmsys/lang/sq-AL.rc index 0cf2a12875..af13ec1c20 100644 --- a/dll/cpl/mmsys/lang/sq-AL.rc +++ b/dll/cpl/mmsys/lang/sq-AL.rc @@ -186,35 +186,35 @@ BEGIN LTEXT "Përshkrimi shkon këtu.", 9506, 8, 4, 212, 24 LTEXT "Posht", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "Lart", 9474, 202, 31, 17, 8 LTEXT "Posht", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "Lart", 9478, 202, 50, 17, 8 LTEXT "Posht", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "Lart", 9482, 202, 69, 17, 8 LTEXT "Posht", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "Lart", 9486, 202, 88, 17, 8 LTEXT "Posht", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "Lart", 9490, 202, 107, 17, 8 LTEXT "Posht", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "Lart", 9494, 202, 126, 17, 8 LTEXT "Posht", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "Lart", 9498, 202, 145, 17, 8 LTEXT "Posht", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "Lart", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Leviz të gjitha treguesit e rrëshqitje në të njëjtën kohë", 9504, 5, 185, 216, 9 PUSHBUTTON "Kthe &Parazgjedhjen", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/tr-TR.rc b/dll/cpl/mmsys/lang/tr-TR.rc index 4758085e65..9c2095e5a1 100644 --- a/dll/cpl/mmsys/lang/tr-TR.rc +++ b/dll/cpl/mmsys/lang/tr-TR.rc @@ -184,35 +184,35 @@ BEGIN LTEXT "Buraya tanım gelecek.", 9506, 8, 4, 212, 24 LTEXT "Düşük", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "Yüksek", 9474, 202, 31, 17, 8 LTEXT "Düşük", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "Yüksek", 9478, 202, 50, 17, 8 LTEXT "Düşük", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "Yüksek", 9482, 202, 69, 17, 8 LTEXT "Düşük", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "Yüksek", 9486, 202, 88, 17, 8 LTEXT "Düşük", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "Yüksek", 9490, 202, 107, 17, 8 LTEXT "Düşük", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "Yüksek", 9494, 202, 126, 17, 8 LTEXT "Düşük", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "Yüksek", 9498, 202, 145, 17, 8 LTEXT "Düşük", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "Yüksek", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Tüm sürgüleri aynı anda devindir.", 9504, 5, 185, 216, 9 PUSHBUTTON "&Ön Tanımlıları Geri Getir", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/uk-UA.rc b/dll/cpl/mmsys/lang/uk-UA.rc index c0fa7bacc1..bbb15e8bab 100644 --- a/dll/cpl/mmsys/lang/uk-UA.rc +++ b/dll/cpl/mmsys/lang/uk-UA.rc @@ -190,35 +190,35 @@ BEGIN LTEXT "Опис.", 9506, 8, 4, 212, 24 LTEXT "Мін.", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "Макс.", 9474, 202, 31, 17, 8 LTEXT "Мін.", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "Макс.", 9478, 202, 50, 17, 8 LTEXT "Мін.", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "Макс.", 9482, 202, 69, 17, 8 LTEXT "Мін.", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "Макс.", 9486, 202, 88, 17, 8 LTEXT "Мін.", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "Макс.", 9490, 202, 107, 17, 8 LTEXT "Мін.", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "Макс.", 9494, 202, 126, 17, 8 LTEXT "Мін.", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "Макс.", 9498, 202, 145, 17, 8 LTEXT "Мін.", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "Макс.", 9502, 202, 164, 17, 8 AUTOCHECKBOX "П&ереміщати всі повзунки одночасно", 9504, 5, 185, 216, 9 PUSHBUTTON "&Відновити", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/zh-CN.rc b/dll/cpl/mmsys/lang/zh-CN.rc index 9ec9e99349..6a89bf8d2d 100644 --- a/dll/cpl/mmsys/lang/zh-CN.rc +++ b/dll/cpl/mmsys/lang/zh-CN.rc @@ -190,35 +190,35 @@ BEGIN LTEXT "这里是说明。", 9506, 8, 4, 212, 24 LTEXT "低", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "高", 9474, 202, 31, 17, 8 LTEXT "低", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "高", 9478, 202, 50, 17, 8 LTEXT "低", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "高", 9482, 202, 69, 17, 8 LTEXT "低", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "高", 9486, 202, 88, 17, 8 LTEXT "低", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "高", 9490, 202, 107, 17, 8 LTEXT "低", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "高", 9494, 202, 126, 17, 8 LTEXT "低", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "高", 9498, 202, 145, 17, 8 LTEXT "低", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "高", 9502, 202, 164, 17, 8 AUTOCHECKBOX "同时移动所有滑动指示器(&M)", 9504, 5, 185, 216, 9 PUSHBUTTON "恢复默认值(&D)", 9505, 110, 199, 110, 14 diff --git a/dll/cpl/mmsys/lang/zh-TW.rc b/dll/cpl/mmsys/lang/zh-TW.rc index dd148e7224..6f84319978 100644 --- a/dll/cpl/mmsys/lang/zh-TW.rc +++ b/dll/cpl/mmsys/lang/zh-TW.rc @@ -188,35 +188,35 @@ BEGIN LTEXT "這裡是說明。", 9506, 8, 4, 212, 24 LTEXT "低", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "高", 9474, 202, 31, 17, 8 LTEXT "低", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "高", 9478, 202, 50, 17, 8 LTEXT "低", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "高", 9482, 202, 69, 17, 8 LTEXT "低", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "高", 9486, 202, 88, 17, 8 LTEXT "低", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "高", 9490, 202, 107, 17, 8 LTEXT "低", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "高", 9494, 202, 126, 17, 8 LTEXT "低", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "高", 9498, 202, 145, 17, 8 LTEXT "低", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "高", 9502, 202, 164, 17, 8 AUTOCHECKBOX "同時移動所有滑動指示器(&M)", 9504, 5, 185, 216, 9 PUSHBUTTON "恢復預設值(&D)", 9505, 110, 199, 110, 14

6 years, 3 months

[reactos] 01/01: [MMSYS] Add the speaker volume dialog.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d301d6a3780b485ab9a7e… commit d301d6a3780b485ab9a7e958916e7b6480071291 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 20 15:57:34 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 20 15:59:30 2019 +0100 [MMSYS] Add the speaker volume dialog. Retrieve information on the channels and initialize the trackbars accordingly. --- dll/cpl/mmsys/CMakeLists.txt | 1 + dll/cpl/mmsys/lang/bg-BG.rc | 7 +++ dll/cpl/mmsys/lang/cs-CZ.rc | 7 +++ dll/cpl/mmsys/lang/de-DE.rc | 23 ++++--- dll/cpl/mmsys/lang/el-GR.rc | 7 +++ dll/cpl/mmsys/lang/en-US.rc | 7 +++ dll/cpl/mmsys/lang/es-ES.rc | 7 +++ dll/cpl/mmsys/lang/fr-FR.rc | 7 +++ dll/cpl/mmsys/lang/he-IL.rc | 7 +++ dll/cpl/mmsys/lang/id-ID.rc | 7 +++ dll/cpl/mmsys/lang/it-IT.rc | 7 +++ dll/cpl/mmsys/lang/ja-JP.rc | 7 +++ dll/cpl/mmsys/lang/nl-NL.rc | 7 +++ dll/cpl/mmsys/lang/no-NO.rc | 7 +++ dll/cpl/mmsys/lang/pl-PL.rc | 7 +++ dll/cpl/mmsys/lang/pt-BR.rc | 7 +++ dll/cpl/mmsys/lang/ro-RO.rc | 7 +++ dll/cpl/mmsys/lang/ru-RU.rc | 7 +++ dll/cpl/mmsys/lang/sk-SK.rc | 7 +++ dll/cpl/mmsys/lang/sq-AL.rc | 7 +++ dll/cpl/mmsys/lang/tr-TR.rc | 7 +++ dll/cpl/mmsys/lang/uk-UA.rc | 7 +++ dll/cpl/mmsys/lang/zh-CN.rc | 7 +++ dll/cpl/mmsys/lang/zh-TW.rc | 7 +++ dll/cpl/mmsys/mmsys.c | 14 +++-- dll/cpl/mmsys/mmsys.h | 19 +++++- dll/cpl/mmsys/resource.h | 8 +++ dll/cpl/mmsys/speakervolume.c | 141 ++++++++++++++++++++++++++++++++++++++++++ dll/cpl/mmsys/volume.c | 8 +-- 29 files changed, 347 insertions(+), 21 deletions(-) diff --git a/dll/cpl/mmsys/CMakeLists.txt b/dll/cpl/mmsys/CMakeLists.txt index 5d1665ba07..885b40621f 100644 --- a/dll/cpl/mmsys/CMakeLists.txt +++ b/dll/cpl/mmsys/CMakeLists.txt @@ -4,6 +4,7 @@ spec2def(mmsys.cpl mmsys.spec) list(APPEND SOURCE mmsys.c sounds.c + speakervolume.c volume.c audio.c voice.c diff --git a/dll/cpl/mmsys/lang/bg-BG.rc b/dll/cpl/mmsys/lang/bg-BG.rc index 68401bf7f2..eae4099f57 100644 --- a/dll/cpl/mmsys/lang/bg-BG.rc +++ b/dll/cpl/mmsys/lang/bg-BG.rc @@ -234,6 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "Променя звуковата наредба за компютъра ви или настройките за говорителите и записващите устройства." IDS_NO_SOUND "(Няма)" IDS_NO_DEVICES "No Devices" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Програмна грешка" 5826 "Затваряне на прозоред" 5827 "Опасно слаба батерия" diff --git a/dll/cpl/mmsys/lang/cs-CZ.rc b/dll/cpl/mmsys/lang/cs-CZ.rc index 54083af812..c106c3d100 100644 --- a/dll/cpl/mmsys/lang/cs-CZ.rc +++ b/dll/cpl/mmsys/lang/cs-CZ.rc @@ -239,6 +239,13 @@ BEGIN IDS_CPLDESCRIPTION "Upraví zvukové schéma Vašeho počítače, nebo nastaví reproduktory a nahrávací zařízení." IDS_NO_SOUND "(Není)" IDS_NO_DEVICES "No Devices" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Chyba programu" 5826 "Ukončení programu" 5827 "Varování při kritickém stavu baterie" diff --git a/dll/cpl/mmsys/lang/de-DE.rc b/dll/cpl/mmsys/lang/de-DE.rc index 4aec9627c8..50e9f76a34 100644 --- a/dll/cpl/mmsys/lang/de-DE.rc +++ b/dll/cpl/mmsys/lang/de-DE.rc @@ -182,35 +182,35 @@ BEGIN LTEXT "Bezeichnung erscheint hier.", 9506, 8, 4, 212, 24 LTEXT "Niedrig", 9473, 65, 31, 22, 8 LTEXT "", 9472, 5, 31, 55, 8 - CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 + CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17 LTEXT "Hoch", 9474, 202, 31, 17, 8 LTEXT "Niedrig", 9477, 65, 50, 22, 8 LTEXT "", 9476, 5, 50, 55, 8 - CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 + CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 48, 108, 17 LTEXT "Hoch", 9478, 202, 50, 17, 8 LTEXT "Niedrig", 9481, 65, 69, 22, 8 LTEXT "", 9480, 5, 69, 55, 8 - CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 + CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 67, 108, 17 LTEXT "Hoch", 9482, 202, 69, 17, 8 LTEXT "Niedrig", 9485, 65, 88, 22, 8 LTEXT "", 9484, 5, 88, 55, 8 - CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 + CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 86, 108, 17 LTEXT "Hoch", 9486, 202, 88, 17, 8 LTEXT "Niedrig", 9489, 65, 107, 22, 8 LTEXT "", 9488, 5, 107, 55, 8 - CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 + CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 105, 108, 17 LTEXT "Hoch", 9490, 202, 107, 17, 8 LTEXT "Niedrig", 9493, 65, 126, 22, 8 LTEXT "", 9492, 5, 126, 55, 8 - CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 + CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 124, 108, 17 LTEXT "Hoch", 9494, 202, 126, 17, 8 LTEXT "Niedrig", 9497, 65, 145, 22, 8 LTEXT "", 9496, 5, 145, 55, 8 - CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 + CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 143, 108, 17 LTEXT "Hoch", 9498, 202, 145, 17, 8 LTEXT "Niedrig", 9501, 65, 164, 22, 8 LTEXT "", 9500, 5, 164, 55, 8 - CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 + CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 162, 108, 17 LTEXT "Hoch", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Alle Regler auf einmal betätigen", 9504, 5, 185, 216, 9 PUSHBUTTON "Standard &wiederherstellen", 9505, 110, 199, 110, 14 @@ -234,6 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "Ändert das Klangschema Ihres Computers oder konfiguriert die Einstellungen für Ihre Lautsprecher und Aufnahmegeräte." IDS_NO_SOUND "(Kein)" IDS_NO_DEVICES "Keine Geräte" + IDS_SPEAKER_VOLUME "Lautsprecherlautstärke" + IDS_SPEAKER_LEFT "&Links:" + IDS_SPEAKER_RIGHT "&Rechts:" + IDS_SPEAKER_CENTER "&Zentriert:" + IDS_SPEAKER_BACK_LEFT "&Hinten links:" + IDS_SPEAKER_BACK_RIGHT "H&inten rechts:" + IDS_SPEAKER_LOW_FREQUENCY "Niedrige Frequenz:" 5825 "Programmfehler" 5826 "Programm schließen" 5827 "Alarm bei kritischem Batteriestand" diff --git a/dll/cpl/mmsys/lang/el-GR.rc b/dll/cpl/mmsys/lang/el-GR.rc index bbb48d7302..a5fe8585ea 100644 --- a/dll/cpl/mmsys/lang/el-GR.rc +++ b/dll/cpl/mmsys/lang/el-GR.rc @@ -234,6 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "Αλλάζει το σχήμα ήχου του υπολογιστή ή τροποποιεί τις ρυθμίσεις για τα ηχεία και τις συσκευές εγγραφής ήχου." IDS_NO_SOUND "(None)" IDS_NO_DEVICES "No Devices" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Program error" 5826 "Close program" 5827 "Critical Battery Alarm" diff --git a/dll/cpl/mmsys/lang/en-US.rc b/dll/cpl/mmsys/lang/en-US.rc index dee8b78851..706ba52c64 100644 --- a/dll/cpl/mmsys/lang/en-US.rc +++ b/dll/cpl/mmsys/lang/en-US.rc @@ -234,6 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "Changes the sound scheme for your computer, or configure the settings for your speakers and recording devices." IDS_NO_SOUND "(None)" IDS_NO_DEVICES "No Devices" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Program error" 5826 "Close program" 5827 "Critical Battery Alarm" diff --git a/dll/cpl/mmsys/lang/es-ES.rc b/dll/cpl/mmsys/lang/es-ES.rc index e5f2df82f6..c44ea433b5 100644 --- a/dll/cpl/mmsys/lang/es-ES.rc +++ b/dll/cpl/mmsys/lang/es-ES.rc @@ -234,6 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "Cambie la combinación de sonidos del equipo, o configure sus altavoces y dispositivos de grabación." IDS_NO_SOUND "(Ninguno)" IDS_NO_DEVICES "Sin dispositivos" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Error del programa" 5826 "Cerrar programa" 5827 "Alarma de nivel crítico de carga de batería" diff --git a/dll/cpl/mmsys/lang/fr-FR.rc b/dll/cpl/mmsys/lang/fr-FR.rc index 9eb336404f..9e054c5128 100644 --- a/dll/cpl/mmsys/lang/fr-FR.rc +++ b/dll/cpl/mmsys/lang/fr-FR.rc @@ -234,6 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "Change le modèle de sons de votre ordinateur, ou configure les paramètres de vos hauts-parleurs et de vos périphériques d'enregistrement." IDS_NO_SOUND "(Aucun)" IDS_NO_DEVICES "Aucun périphérique" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Erreur programme" 5826 "Fermeture programme" 5827 "Alarme batterie critique" diff --git a/dll/cpl/mmsys/lang/he-IL.rc b/dll/cpl/mmsys/lang/he-IL.rc index 893e207e6b..e11c91debb 100644 --- a/dll/cpl/mmsys/lang/he-IL.rc +++ b/dll/cpl/mmsys/lang/he-IL.rc @@ -236,6 +236,13 @@ BEGIN IDS_CPLDESCRIPTION "Changes the sound scheme for your computer, or configure the settings for your speakers and recording devices." IDS_NO_SOUND "(ללא)" IDS_NO_DEVICES "אין התקנים" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "שגיאת תכנית" 5826 "סגירת תכנית" 5827 "רמת סוללה קריטית" diff --git a/dll/cpl/mmsys/lang/id-ID.rc b/dll/cpl/mmsys/lang/id-ID.rc index 13619732a3..f82339ae46 100644 --- a/dll/cpl/mmsys/lang/id-ID.rc +++ b/dll/cpl/mmsys/lang/id-ID.rc @@ -234,6 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "Mengubah skema suara untuk komputer anda, atau mengkonfigurasi setelan untuk speaker dan device perekaman anda." IDS_NO_SOUND "(None)" IDS_NO_DEVICES "No Devices" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Program error" 5826 "Close program" 5827 "Critical Battery Alarm" diff --git a/dll/cpl/mmsys/lang/it-IT.rc b/dll/cpl/mmsys/lang/it-IT.rc index 9ad8e067a2..ca68071359 100644 --- a/dll/cpl/mmsys/lang/it-IT.rc +++ b/dll/cpl/mmsys/lang/it-IT.rc @@ -234,6 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "Cambia lo schema dei suoni per il tuo computer o configura le impostazioni per gli altoparlanti e i dispositivi di registrazione." IDS_NO_SOUND "(nessuno)" IDS_NO_DEVICES "No Devices" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Errore del programma" 5826 "Chiudere il programma" 5827 "Allarme di batteria critica" diff --git a/dll/cpl/mmsys/lang/ja-JP.rc b/dll/cpl/mmsys/lang/ja-JP.rc index d7e045dde5..6761945992 100644 --- a/dll/cpl/mmsys/lang/ja-JP.rc +++ b/dll/cpl/mmsys/lang/ja-JP.rc @@ -234,6 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "コンピューターの音声スキームを変更するか、スピーカーと録音デバイスの設定を変更します。" IDS_NO_SOUND "(なし)" IDS_NO_DEVICES "デバイスがありません" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "プログラムエラー" 5826 "プログラムを閉じる" 5827 "重大なバッテリー警告音" diff --git a/dll/cpl/mmsys/lang/nl-NL.rc b/dll/cpl/mmsys/lang/nl-NL.rc index a2e5164de0..5cce5c978a 100644 --- a/dll/cpl/mmsys/lang/nl-NL.rc +++ b/dll/cpl/mmsys/lang/nl-NL.rc @@ -234,6 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "Verander het geluidsschema van uw computer of configureer de aanwezige geluidsapparatuur." IDS_NO_SOUND "(Geen)" IDS_NO_DEVICES "No Devices" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Program error" 5826 "Close program" 5827 "Critical Battery Alarm" diff --git a/dll/cpl/mmsys/lang/no-NO.rc b/dll/cpl/mmsys/lang/no-NO.rc index e89585fba4..bcc81dcbd2 100644 --- a/dll/cpl/mmsys/lang/no-NO.rc +++ b/dll/cpl/mmsys/lang/no-NO.rc @@ -234,6 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "Endre lydenheten for din datamaskin, eller konfigurer innstillinger for dine høytaller og opptak enheter." IDS_NO_SOUND "(Ingen)" IDS_NO_DEVICES "Ingen enheter" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Programfeil" 5826 "Avslutt program" 5827 "Kritisk batteri Alarm" diff --git a/dll/cpl/mmsys/lang/pl-PL.rc b/dll/cpl/mmsys/lang/pl-PL.rc index 1388a788e1..b359e86906 100644 --- a/dll/cpl/mmsys/lang/pl-PL.rc +++ b/dll/cpl/mmsys/lang/pl-PL.rc @@ -247,6 +247,13 @@ BEGIN IDS_CPLDESCRIPTION "Zmień schemat dźwiękowy dla tego komputera lub skonfiguruj ustawienia głośników i urządzeń nagrywających." IDS_NO_SOUND "(Brak)" IDS_NO_DEVICES "Brak urządzeń" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Błąd programu" 5826 "Zamknij program" 5827 "Krytyczny stan baterii" diff --git a/dll/cpl/mmsys/lang/pt-BR.rc b/dll/cpl/mmsys/lang/pt-BR.rc index fcd4bea426..2c70fa49c0 100644 --- a/dll/cpl/mmsys/lang/pt-BR.rc +++ b/dll/cpl/mmsys/lang/pt-BR.rc @@ -234,6 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "Altera o esquema de som para o seu computador ou define as configurações para os auto-falantes e dispositivos de gravação." IDS_NO_SOUND "(None)" IDS_NO_DEVICES "No Devices" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Program error" 5826 "Close program" 5827 "Critical Battery Alarm" diff --git a/dll/cpl/mmsys/lang/ro-RO.rc b/dll/cpl/mmsys/lang/ro-RO.rc index 97a78fc4a0..b7cfedcc8d 100644 --- a/dll/cpl/mmsys/lang/ro-RO.rc +++ b/dll/cpl/mmsys/lang/ro-RO.rc @@ -239,6 +239,13 @@ BEGIN IDS_CPLDESCRIPTION "Schimbarea colecției de sunete a calculatorului și modificarea opțiunilor pentru dispozitivele de lectură și înregistrare de sunet." IDS_NO_SOUND "(nespecificat)" IDS_NO_DEVICES "lipsă dispozitive" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Eroare program" 5826 "Închidere program" 5827 "Alarmă baterie descărcată" diff --git a/dll/cpl/mmsys/lang/ru-RU.rc b/dll/cpl/mmsys/lang/ru-RU.rc index 4a6be2ec09..74308791fb 100644 --- a/dll/cpl/mmsys/lang/ru-RU.rc +++ b/dll/cpl/mmsys/lang/ru-RU.rc @@ -234,6 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "Изменение звуковых схем вашего компьютера, настройка колонок и записывающих устройств." IDS_NO_SOUND "(Нет)" IDS_NO_DEVICES "Нет устройств" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Ошибка программы" 5826 "Закрытие программы" 5827 "Сигнал почти полной разрядки батарей" diff --git a/dll/cpl/mmsys/lang/sk-SK.rc b/dll/cpl/mmsys/lang/sk-SK.rc index f843795c1b..9f40f1282e 100644 --- a/dll/cpl/mmsys/lang/sk-SK.rc +++ b/dll/cpl/mmsys/lang/sk-SK.rc @@ -239,6 +239,13 @@ BEGIN IDS_CPLDESCRIPTION "Changes the sound scheme for your computer, or configure the settings for your speakers and recording devices." IDS_NO_SOUND "(Žiadne)" IDS_NO_DEVICES "Žiadne zariadenia" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Chyba programu" 5826 "Zavrieť program" 5827 "Critical Battery Alarm" diff --git a/dll/cpl/mmsys/lang/sq-AL.rc b/dll/cpl/mmsys/lang/sq-AL.rc index 981d5819eb..0cf2a12875 100644 --- a/dll/cpl/mmsys/lang/sq-AL.rc +++ b/dll/cpl/mmsys/lang/sq-AL.rc @@ -238,6 +238,13 @@ BEGIN IDS_CPLDESCRIPTION "Ndryshon skema e zërit për kompjuterin tuaj, ose konfiguron cilësimet për boxet tuaja dhe pajisjet e regjistrimit." IDS_NO_SOUND "(Asnje)" IDS_NO_DEVICES "Ska Pajisje" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Gabim programi" 5826 "Mbyll programin" 5827 "Alarm Baterie Kritike" diff --git a/dll/cpl/mmsys/lang/tr-TR.rc b/dll/cpl/mmsys/lang/tr-TR.rc index 7c8a9b4dae..4758085e65 100644 --- a/dll/cpl/mmsys/lang/tr-TR.rc +++ b/dll/cpl/mmsys/lang/tr-TR.rc @@ -236,6 +236,13 @@ BEGIN IDS_CPLDESCRIPTION "Bilgisayarınız için ses düzenini değiştirir, hoparlörleriniz ve saklama aygıtlarınız için ayarları yapılandırır." IDS_NO_SOUND "(Yok)" IDS_NO_DEVICES "Aygıt Yok" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "İzlence Yanlışlığı" 5826 "İzlenceyi Kapat" 5827 "Çok Azalmış Pil Uyarısı" diff --git a/dll/cpl/mmsys/lang/uk-UA.rc b/dll/cpl/mmsys/lang/uk-UA.rc index cdab3fb8db..c0fa7bacc1 100644 --- a/dll/cpl/mmsys/lang/uk-UA.rc +++ b/dll/cpl/mmsys/lang/uk-UA.rc @@ -242,6 +242,13 @@ BEGIN IDS_CPLDESCRIPTION "Зміна звукових схем вашого комп'ютера, настроювання колонок і записуючих пристроїв." IDS_NO_SOUND "(немає)" IDS_NO_DEVICES "No Devices" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "Помилка програми" 5826 "Закрити програму" 5827 "Сигнал критичної розрядки батарей" diff --git a/dll/cpl/mmsys/lang/zh-CN.rc b/dll/cpl/mmsys/lang/zh-CN.rc index 7fb7a74bea..9ec9e99349 100644 --- a/dll/cpl/mmsys/lang/zh-CN.rc +++ b/dll/cpl/mmsys/lang/zh-CN.rc @@ -242,6 +242,13 @@ BEGIN IDS_CPLDESCRIPTION "更改计算机的声音方案，或配置扬声器和录音设备的设置。" IDS_NO_SOUND "(无)" IDS_NO_DEVICES "没有设备" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "程序出错" 5826 "关闭程序" 5827 "电池严重短缺警报" diff --git a/dll/cpl/mmsys/lang/zh-TW.rc b/dll/cpl/mmsys/lang/zh-TW.rc index 1e3a06e696..dd148e7224 100644 --- a/dll/cpl/mmsys/lang/zh-TW.rc +++ b/dll/cpl/mmsys/lang/zh-TW.rc @@ -240,6 +240,13 @@ BEGIN IDS_CPLDESCRIPTION "更改電腦的聲音方案，或者配置揚聲器和錄音裝置的設定" IDS_NO_SOUND "(無)" IDS_NO_DEVICES "沒有裝置" + IDS_SPEAKER_VOLUME "Speaker Volume" + IDS_SPEAKER_LEFT "&Left:" + IDS_SPEAKER_RIGHT "&Right:" + IDS_SPEAKER_CENTER "&Center:" + IDS_SPEAKER_BACK_LEFT "&Back left:" + IDS_SPEAKER_BACK_RIGHT "B&ack right:" + IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" 5825 "程式出錯" 5826 "關閉程式" 5827 "電池嚴重短缺警報" diff --git a/dll/cpl/mmsys/mmsys.c b/dll/cpl/mmsys/mmsys.c index e2d7c8e539..c7c1ca9a6e 100644 --- a/dll/cpl/mmsys/mmsys.c +++ b/dll/cpl/mmsys/mmsys.c @@ -733,11 +733,11 @@ MmSysApplet(HWND hwnd, psh.ppsp = psp; psh.pfnCallback = PropSheetProc; - InitPropSheetPage(&psp[0], IDD_VOLUME,VolumeDlgProc); - InitPropSheetPage(&psp[1], IDD_SOUNDS,SoundsDlgProc); - InitPropSheetPage(&psp[2], IDD_AUDIO,AudioDlgProc); - InitPropSheetPage(&psp[3], IDD_VOICE,VoiceDlgProc); - InitPropSheetPage(&psp[4], IDD_HARDWARE,HardwareDlgProc); + InitPropSheetPage(&psp[0], IDD_VOLUME,VolumeDlgProc, 0); + InitPropSheetPage(&psp[1], IDD_SOUNDS,SoundsDlgProc, 0); + InitPropSheetPage(&psp[2], IDD_AUDIO,AudioDlgProc, 0); + InitPropSheetPage(&psp[3], IDD_VOICE,VoiceDlgProc, 0); + InitPropSheetPage(&psp[4], IDD_HARDWARE,HardwareDlgProc, 0); return (LONG)(PropertySheet(&psh) != -1); } @@ -745,7 +745,8 @@ MmSysApplet(HWND hwnd, VOID InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, - DLGPROC DlgProc) + DLGPROC DlgProc, + LPARAM lParam) { ZeroMemory(psp, sizeof(PROPSHEETPAGE)); psp->dwSize = sizeof(PROPSHEETPAGE); @@ -753,6 +754,7 @@ InitPropSheetPage(PROPSHEETPAGE *psp, psp->hInstance = hApplet; psp->pszTemplate = MAKEINTRESOURCE(idDlg); psp->pfnDlgProc = DlgProc; + psp->lParam = lParam; } diff --git a/dll/cpl/mmsys/mmsys.h b/dll/cpl/mmsys/mmsys.h index 63495d8328..63d6b2d900 100644 --- a/dll/cpl/mmsys/mmsys.h +++ b/dll/cpl/mmsys/mmsys.h @@ -37,12 +37,19 @@ extern HINSTANCE hApplet; #define DRVM_MAPPER_PREFERRED_GET (DRVM_MAPPER+21) #define DRVM_MAPPER_PREFERRED_SET (DRVM_MAPPER+22) +#define VOLUME_MIN 0 +#define VOLUME_MAX 500 +#define VOLUME_TICFREQ 50 +#define VOLUME_PAGESIZE 100 + /* main.c */ VOID -InitPropSheetPage(PROPSHEETPAGE *psp, - WORD idDlg, - DLGPROC DlgProc); +InitPropSheetPage( + PROPSHEETPAGE *psp, + WORD idDlg, + DLGPROC DlgProc, + LPARAM lParam); LONG APIENTRY MmSysApplet(HWND hwnd, @@ -83,4 +90,10 @@ AudioDlgProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam); +/* speakervolume.c */ + +INT_PTR +SpeakerVolume(HWND hwndDlg, + HMIXER hMixer); + #endif /* _MMSYS_H */ diff --git a/dll/cpl/mmsys/resource.h b/dll/cpl/mmsys/resource.h index e5aff82484..d1a85a59b6 100644 --- a/dll/cpl/mmsys/resource.h +++ b/dll/cpl/mmsys/resource.h @@ -68,6 +68,14 @@ #define IDC_SPEAKIMG 4625 #define IDC_MUTE_ICON 4626 +#define IDS_SPEAKER_VOLUME 5779 +#define IDS_SPEAKER_LEFT 5792 +#define IDS_SPEAKER_RIGHT 5793 +#define IDS_SPEAKER_CENTER 5794 +#define IDS_SPEAKER_BACK_LEFT 5795 +#define IDS_SPEAKER_BACK_RIGHT 5796 +#define IDS_SPEAKER_LOW_FREQUENCY 5797 + #define IDS_REACTOS_LOGOFF 5852 #define IDS_REACTOS_LOGON 5853 #define IDS_REACTOS_DEFAULT_SCHEME 5856 diff --git a/dll/cpl/mmsys/speakervolume.c b/dll/cpl/mmsys/speakervolume.c new file mode 100644 index 0000000000..270cdfcd02 --- /dev/null +++ b/dll/cpl/mmsys/speakervolume.c @@ -0,0 +1,141 @@ +/* + * PROJECT: ReactOS Multimedia Control Panel + * FILE: dll/cpl/mmsys/speakervolume.c + * PURPOSE: ReactOS Multimedia Control Panel + * PROGRAMMER: Eric Kohl <eric.kohl(a)reactos.com> + */ + +#include "mmsys.h" + +static +BOOL +OnInitDialog( + HWND hwndDlg, + LPARAM lParam) +{ + TCHAR szBuffer[256]; + MIXERLINE mxln; + MIXERCONTROL mxc; + MIXERLINECONTROLS mxlctrl; + MIXERCONTROLDETAILS mxcd; + MIXERCONTROLDETAILS_UNSIGNED mxcdVolume[8]; + INT i, j; + DWORD dwStep; + HMIXER hMixer; + + hMixer = (HMIXER)((LPPROPSHEETPAGE)lParam)->lParam; + + mxln.cbStruct = sizeof(MIXERLINE); + mxln.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_SPEAKERS; + + if (mixerGetLineInfo((HMIXEROBJ)hMixer, &mxln, MIXER_OBJECTF_HMIXER | MIXER_GETLINEINFOF_COMPONENTTYPE) != MMSYSERR_NOERROR) + return FALSE; + + mxlctrl.cbStruct = sizeof(MIXERLINECONTROLS); + mxlctrl.dwLineID = mxln.dwLineID; + mxlctrl.dwControlType = MIXERCONTROL_CONTROLTYPE_VOLUME; + mxlctrl.cControls = 1; + mxlctrl.cbmxctrl = sizeof(MIXERCONTROL); + mxlctrl.pamxctrl = &mxc; + + if (mixerGetLineControls((HMIXEROBJ)hMixer, &mxlctrl, MIXER_OBJECTF_HMIXER | MIXER_GETLINECONTROLSF_ONEBYTYPE) != MMSYSERR_NOERROR) + return FALSE; + +// pGlobalData->volumeMinimum = mxc.Bounds.dwMinimum; +// pGlobalData->volumeMaximum = mxc.Bounds.dwMaximum; +// pGlobalData->volumeControlID = mxc.dwControlID; +// pGlobalData->volumeStep = (pGlobalData->volumeMaximum - pGlobalData->volumeMinimum) / (VOLUME_MAX - VOLUME_MIN); + dwStep = (mxc.Bounds.dwMaximum - mxc.Bounds.dwMinimum) / (VOLUME_MAX - VOLUME_MIN); + + mxcd.cbStruct = sizeof(MIXERCONTROLDETAILS); + mxcd.dwControlID = mxc.dwControlID; + mxcd.cChannels = mxln.cChannels; + mxcd.cMultipleItems = 0; + mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED); + mxcd.paDetails = &mxcdVolume; + + if (mixerGetControlDetails((HMIXEROBJ)hMixer, &mxcd, MIXER_OBJECTF_HMIXER | MIXER_GETCONTROLDETAILSF_VALUE) != MMSYSERR_NOERROR) + return FALSE; + +// pGlobalData->volumeValue[i] = mxcdVolume[i].dwValue; + + /* Initialize the channels */ + for (i = 0; i < min(mxln.cChannels, 5); i++) + { + j = i * 4; + LoadString(hApplet, 5792 + i, szBuffer, _countof(szBuffer)); + SetWindowText(GetDlgItem(hwndDlg, 9472 + j), szBuffer); + + SendDlgItemMessage(hwndDlg, 9475 + j, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(VOLUME_MIN, VOLUME_MAX)); + SendDlgItemMessage(hwndDlg, 9475 + j, TBM_SETTICFREQ, VOLUME_TICFREQ, 0); + SendDlgItemMessage(hwndDlg, 9475 + j, TBM_SETPAGESIZE, 0, VOLUME_PAGESIZE); +// SendDlgItemMessage(hwndDlg, 9475 + j, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)(pGlobalData->volumeValue - pGlobalData->volumeMinimum) / pGlobalData->volumeStep); + SendDlgItemMessage(hwndDlg, 9475 + j, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)(mxcdVolume[i].dwValue - mxc.Bounds.dwMinimum) / dwStep); + } + + /* Hide the unused controls */ + for (i = mxln.cChannels; i < 8; i++) + { + j = i * 4; + ShowWindow(GetDlgItem(hwndDlg, 9472 + j), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, 9473 + j), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, 9474 + j), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, 9475 + j), SW_HIDE); + } + + return TRUE; +} + + +INT_PTR +CALLBACK +SpeakerVolumeDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(wParam); + + switch(uMsg) + { + case WM_INITDIALOG: + OnInitDialog(hwndDlg, lParam); + break; + + case WM_DESTROY: + break; + + case WM_NOTIFY: + return TRUE; + } + + return FALSE; +} + + +INT_PTR +SpeakerVolume( + HWND hwnd, + HMIXER hMixer) +{ + PROPSHEETPAGE psp[1]; + PROPSHEETHEADER psh; + TCHAR Caption[256]; + + LoadString(hApplet, IDS_SPEAKER_VOLUME, Caption, _countof(Caption)); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE; + psh.hwndParent = hwnd; + psh.hInstance = hApplet; + psh.pszCaption = Caption; + psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nStartPage = 0; + psh.ppsp = psp; + + InitPropSheetPage(&psp[0], IDD_MULTICHANNEL, SpeakerVolumeDlgProc, (LPARAM)hMixer); + + return (LONG)(PropertySheet(&psh) != -1); +} diff --git a/dll/cpl/mmsys/volume.c b/dll/cpl/mmsys/volume.c index 98f1d0150d..e5cda69108 100644 --- a/dll/cpl/mmsys/volume.c +++ b/dll/cpl/mmsys/volume.c @@ -11,10 +11,6 @@ #include <shellapi.h> -#define VOLUME_MIN 0 -#define VOLUME_MAX 500 -#define VOLUME_TICFREQ 50 -#define VOLUME_PAGESIZE 100 typedef struct _IMGINFO { @@ -445,6 +441,10 @@ VolumeDlgProc(HWND hwndDlg, case IDC_ADVANCED_BTN: LaunchSoundControl(hwndDlg); break; + + case IDC_SPEAKER_VOL_BTN: + SpeakerVolume(hwndDlg, pGlobalData->hMixer); + break; } break; }

6 years, 3 months

[reactos] 01/01: [ROSTESTS] Fix 64bit issues (#1261)

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb9a5f6046fd387598920… commit bb9a5f6046fd3875989203618a569874cd97546f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 20 15:58:32 2019 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 20 15:58:32 2019 +0100 [ROSTESTS] Fix 64bit issues (#1261) --- .../applications/net/tditest/tditest/tditest.c | 8 +++---- .../rostests/apitests/advapi32/ServiceNetwork.c | 4 ++-- modules/rostests/apitests/gdi32/CreateDIBitmap.c | 28 ++++++++++++---------- modules/rostests/apitests/gdi32/DPtoLP.c | 6 +++-- modules/rostests/apitests/gdi32/ExtCreatePen.c | 2 +- modules/rostests/apitests/gdi32/GetDIBits.c | 6 ++--- modules/rostests/apitests/gdi32/GetObject.c | 12 ++++++---- modules/rostests/apitests/gdi32/RealizePalette.c | 4 ++-- .../rostests/apitests/msgina/ShellDimScreen.cpp | 23 +++++++++--------- modules/rostests/apitests/shell32/CMyComputer.cpp | 4 +++- .../apitests/shell32/CUserNotification.cpp | 2 +- modules/rostests/apitests/shell32/menu.cpp | 4 ++-- .../apitests/spoolss/MarshallDownStructuresArray.c | 10 ++++---- .../apitests/spoolss/MarshallUpStructuresArray.c | 6 +++-- modules/rostests/apitests/user32/CreateWindowEx.c | 2 +- .../apitests/user32/GetUserObjectInformation.c | 22 ++++++++--------- .../rostests/apitests/user32/PrivateExtractIcons.c | 6 ++--- .../rostests/apitests/user32/SendMessageTimeout.c | 4 ++-- .../apitests/user32/SystemParametersInfo.c | 10 ++++---- modules/rostests/tests/mmixer_test/test.c | 8 +++---- modules/rostests/winetests/CMakeLists.txt | 4 ++++ modules/rostests/winetests/ntdll/CMakeLists.txt | 5 ++-- modules/rostests/winetests/ntdll/testlist.c | 2 ++ 23 files changed, 101 insertions(+), 81 deletions(-) diff --git a/modules/rosapps/applications/net/tditest/tditest/tditest.c b/modules/rosapps/applications/net/tditest/tditest/tditest.c index 38ab0d7a85..f6f8caceb0 100644 --- a/modules/rosapps/applications/net/tditest/tditest/tditest.c +++ b/modules/rosapps/applications/net/tditest/tditest/tditest.c @@ -442,7 +442,7 @@ NTSTATUS TdiQueryAddress( if (SnmpInfo.NumAddr != 1) { /* Skip loopback address */ - *Address = DN2H(((PIPADDR_ENTRY)((ULONG)IpAddress + sizeof(IPADDR_ENTRY)))->Addr); + *Address = DN2H(((PIPADDR_ENTRY)((PUCHAR)IpAddress + sizeof(IPADDR_ENTRY)))->Addr); } else { @@ -507,7 +507,7 @@ NTSTATUS TdiSendDatagram( RtlZeroMemory(ConnectInfo, sizeof(TDI_CONNECTION_INFORMATION) + sizeof(TA_IP_ADDRESS)); ConnectInfo->RemoteAddressLength = sizeof(TA_IP_ADDRESS); - ConnectInfo->RemoteAddress = (PUCHAR) ((ULONG)ConnectInfo + sizeof(TDI_CONNECTION_INFORMATION)); + ConnectInfo->RemoteAddress = ((PUCHAR)ConnectInfo + sizeof(TDI_CONNECTION_INFORMATION)); TA = (PTA_IP_ADDRESS)(ConnectInfo->RemoteAddress); TA->TAAddressCount = 1; @@ -630,9 +630,9 @@ NTSTATUS TdiReceiveDatagram( ReceiveInfo->RemoteAddressLength = 0; ReceiveInfo->RemoteAddress = NULL; - ReturnInfo = (PTDI_CONNECTION_INFORMATION) ((ULONG)ReceiveInfo + sizeof(TDI_CONNECTION_INFORMATION)); + ReturnInfo = (PTDI_CONNECTION_INFORMATION) ((PUCHAR)ReceiveInfo + sizeof(TDI_CONNECTION_INFORMATION)); ReturnInfo->RemoteAddressLength = sizeof(TA_IP_ADDRESS); - ReturnInfo->RemoteAddress = (PUCHAR) ((ULONG)ReturnInfo + sizeof(TDI_CONNECTION_INFORMATION)); + ReturnInfo->RemoteAddress = ((PUCHAR)ReturnInfo + sizeof(TDI_CONNECTION_INFORMATION)); ReturnAddress = (PTA_IP_ADDRESS)(ReturnInfo->RemoteAddress); ReturnAddress->TAAddressCount = 1; diff --git a/modules/rostests/apitests/advapi32/ServiceNetwork.c b/modules/rostests/apitests/advapi32/ServiceNetwork.c index 6b5a5676ac..f71105bc9b 100644 --- a/modules/rostests/apitests/advapi32/ServiceNetwork.c +++ b/modules/rostests/apitests/advapi32/ServiceNetwork.c @@ -288,8 +288,8 @@ service_main(DWORD dwArgc, LPWSTR* lpszArgv) goto quit; } - test_tcp(lpszArgv[0], (DWORD)Teb->SubProcessTag); - test_udp(lpszArgv[0], (DWORD)Teb->SubProcessTag); + test_tcp(lpszArgv[0], PtrToUlong(Teb->SubProcessTag)); + test_udp(lpszArgv[0], PtrToUlong(Teb->SubProcessTag)); WSACleanup(); quit: diff --git a/modules/rostests/apitests/gdi32/CreateDIBitmap.c b/modules/rostests/apitests/gdi32/CreateDIBitmap.c index 1e302618d5..f8faf5b7d5 100644 --- a/modules/rostests/apitests/gdi32/CreateDIBitmap.c +++ b/modules/rostests/apitests/gdi32/CreateDIBitmap.c @@ -11,6 +11,8 @@ #define CBM_CREATDIB 2 +#define INVALID_POINTER ((PVOID)(ULONG_PTR)0xC0000000C0000000ULL) + BOOL GetExpected( DWORD *pdwError, @@ -39,14 +41,14 @@ GetExpected( { if (!lpbmih) { - if (!lpbInit || (lpbInit == (PVOID)0xC0000000)) return FALSE; + if (!lpbInit || (lpbInit == INVALID_POINTER)) return FALSE; } else { if (lpbInit) { - if (lpbInit == (PVOID)0xC0000000) return FALSE; - if (!lpbmi || (lpbmi == (PVOID)0xC0000000)) return FALSE; + if (lpbInit == INVALID_POINTER) return FALSE; + if (!lpbmi || (lpbmi == INVALID_POINTER)) return FALSE; if (lpbmi->bmiHeader.biSize == 0) return FALSE; if (fuUsage == 2) return FALSE; } @@ -64,10 +66,10 @@ GetExpected( if (fdwInit & CBM_INIT) { - if (!lpbInit || (lpbInit == (PVOID)0xC0000000)) return FALSE; + if (!lpbInit || (lpbInit == INVALID_POINTER)) return FALSE; } - if ((!lpbmi) || (lpbmi == (PVOID)0xc0000000) || (lpbmi->bmiHeader.biSize == 0)) + if ((!lpbmi) || (lpbmi == INVALID_POINTER) || (lpbmi->bmiHeader.biSize == 0)) { return FALSE; } @@ -76,7 +78,7 @@ GetExpected( { if ((lpbmih == NULL) || - (lpbmih == (PVOID)0xC0000000) || + (lpbmih == INVALID_POINTER) || (lpbmih->biSize == 0)) { return FALSE; @@ -89,7 +91,7 @@ GetExpected( } - if (lpbmi == (PVOID)0xc0000000) return FALSE; + if (lpbmi == INVALID_POINTER) return FALSE; } return TRUE; @@ -119,7 +121,7 @@ Test_CreateDIBitmap_Params(void) hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, NULL, NULL, DIB_PAL_COLORS); ok(hbmp != 0, "\n"); - hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, 0, (PVOID)0xc0000000, &bmi, DIB_PAL_COLORS); + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, 0, INVALID_POINTER, &bmi, DIB_PAL_COLORS); ok(hbmp != 0, "\n"); hbmp = CreateDIBitmap(NULL, &bmi.bmiHeader, CBM_INIT, NULL, &bmi, DIB_PAL_COLORS); @@ -152,14 +154,14 @@ Test_CreateDIBitmap_Params(void) ok_err(0xbadbad00); SetLastError(0xbadbad00); - hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, (PVOID)0xc0000000, &bmi, DIB_PAL_COLORS); + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, INVALID_POINTER, &bmi, DIB_PAL_COLORS); ok(hbmp == 0, "\n"); ok_err(0xbadbad00); SetLastError(0xbadbad00); _SEH2_TRY { - hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, 0, ajBits, (PVOID)0xc0000000, DIB_PAL_COLORS); + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, 0, ajBits, INVALID_POINTER, DIB_PAL_COLORS); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -188,10 +190,10 @@ Test_CreateDIBitmap_Params(void) { ULONG i1, i2, i3, i4, i5, i6; HDC ahdc[3] = {0, hdc, (HDC)-1}; - PBITMAPINFOHEADER apbih[4] = {NULL, &bmi.bmiHeader, &bmiBroken.bmiHeader, (PVOID)0xC0000000}; + PBITMAPINFOHEADER apbih[4] = {NULL, &bmi.bmiHeader, &bmiBroken.bmiHeader, INVALID_POINTER}; ULONG afInitf[12] = {0, 1, 2, 3, CBM_INIT, 4, 5, 6, 7, 8, 0x10, 0x20}; - PVOID apvBits[3] = {NULL, ajBits, (PVOID)0xc0000000}; - PBITMAPINFO apbmi[4] = {NULL, &bmi, &bmiBroken, (PVOID)0xC0000000}; + PVOID apvBits[3] = {NULL, ajBits, INVALID_POINTER}; + PBITMAPINFO apbmi[4] = {NULL, &bmi, &bmiBroken, INVALID_POINTER}; ULONG aiUsage[5] = {0, 1, 2, 3, 23}; DWORD dwExpError; BOOL bExpSuccess; diff --git a/modules/rostests/apitests/gdi32/DPtoLP.c b/modules/rostests/apitests/gdi32/DPtoLP.c index dd2a6f9900..d06b3754a7 100644 --- a/modules/rostests/apitests/gdi32/DPtoLP.c +++ b/modules/rostests/apitests/gdi32/DPtoLP.c @@ -7,6 +7,8 @@ #include "precomp.h" +#define INVALID_POINTER ((PVOID)(ULONG_PTR)0xdeadbeefdeadbeefULL) + void Test_DPtoLP_Params() { HDC hdc; @@ -24,7 +26,7 @@ void Test_DPtoLP_Params() ok_int(DPtoLP(NULL, NULL, -1), 1); ok_err(ERROR_SUCCESS); - ok_int(DPtoLP(NULL, (PVOID)0x80000000, -1), 1); + ok_int(DPtoLP(NULL, INVALID_POINTER, -1), 1); ok_err(ERROR_SUCCESS); ok_int(DPtoLP(NULL, NULL, 2), 0); @@ -53,7 +55,7 @@ void Test_DPtoLP_Params() hdc = GetDC(0); SetLastError(ERROR_SUCCESS); - ok_int(DPtoLP(hdc, (PVOID)0x80000000, 2), 1); + ok_int(DPtoLP(hdc, INVALID_POINTER, 2), 1); ok_err(ERROR_SUCCESS); diff --git a/modules/rostests/apitests/gdi32/ExtCreatePen.c b/modules/rostests/apitests/gdi32/ExtCreatePen.c index c8370bd5cb..d565ad9306 100644 --- a/modules/rostests/apitests/gdi32/ExtCreatePen.c +++ b/modules/rostests/apitests/gdi32/ExtCreatePen.c @@ -173,7 +173,7 @@ void Test_ExtCreatePen_Params() ok(pelp->elpWidth == 0, "Wrong elpWidth, expected 0, got %lu\n", pelp->elpWidth); ok(pelp->elpBrushStyle == BS_SOLID, "Wrong elpBrushStyle, expected BS_SOLID, got 0x%x\n", pelp->elpBrushStyle); ok(pelp->elpColor == 0, "Wrong elpColor, expected 0, got 0x%lx\n", pelp->elpColor); - ok(pelp->elpHatch == 0, "Wrong elpHatch, expected 0, got 0x%p\n", (PVOID)pelp->elpColor); + ok(pelp->elpHatch == 0, "Wrong elpHatch, expected 0, got 0x%lx\n", pelp->elpHatch); ok(pelp->elpNumEntries == 0, "Wrong elpNumEntries, expected %u got %lu\n", 0, pelp->elpNumEntries); /* Test PS_NULL with styles */ diff --git a/modules/rostests/apitests/gdi32/GetDIBits.c b/modules/rostests/apitests/gdi32/GetDIBits.c index 3b13adadbd..f06b11fe2d 100644 --- a/modules/rostests/apitests/gdi32/GetDIBits.c +++ b/modules/rostests/apitests/gdi32/GetDIBits.c @@ -360,13 +360,13 @@ void Test_GetDIBits() ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); ok_int(pbi->bmiHeader.biPlanes, 1); SetLastError(0xdeadbabe); - ok_int(GetDIBits((HDC)0xff00ff00, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + ok_int(GetDIBits((HDC)UlongToHandle(0xff00ff00), hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); ok_err(0x57); SetLastError(0xdeadbabe); - ok_int(GetDIBits(hdcScreen, (HBITMAP)0xff00ff00, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + ok_int(GetDIBits(hdcScreen, (HBITMAP)UlongToHandle(0xff00ff00), 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); ok_err(0xdeadbabe); SetLastError(0xdeadbabe); - ok_int(GetDIBits((HDC)0xff00ff00, (HBITMAP)0xff00ff00, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + ok_int(GetDIBits((HDC)UlongToHandle(0xff00ff00), (HBITMAP)UlongToHandle(0xff00ff00), 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); ok_err(0x57); SetLastError(0xdeadbabe); ok_int(GetDIBits(NULL, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); diff --git a/modules/rostests/apitests/gdi32/GetObject.c b/modules/rostests/apitests/gdi32/GetObject.c index a11241ea20..f9f24bda03 100644 --- a/modules/rostests/apitests/gdi32/GetObject.c +++ b/modules/rostests/apitests/gdi32/GetObject.c @@ -7,6 +7,8 @@ #include "precomp.h" +#define INVALID_POINTER ((PVOID)(ULONG_PTR)0xdeadbeefdeadbeefULL) + void Test_General(void) { @@ -124,21 +126,21 @@ Test_General(void) /* Test invalid buffer */ SetLastError(0xbadbad00); - ok(GetObjectA(GetStockObject(WHITE_BRUSH), sizeof(LOGBRUSH), (PVOID)0xc0000000) == 0, "\n"); + ok(GetObjectA(GetStockObject(WHITE_BRUSH), sizeof(LOGBRUSH), INVALID_POINTER) == 0, "\n"); ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(0xbadbad00); - ok(GetObjectW(GetStockObject(BLACK_PEN), sizeof(LOGPEN), (PVOID)0xc0000000) == 0, "\n"); + ok(GetObjectW(GetStockObject(BLACK_PEN), sizeof(LOGPEN), INVALID_POINTER) == 0, "\n"); ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(0xbadbad00); - ok(GetObjectW(GetStockObject(21), sizeof(BITMAP), (PVOID)0xc0000000) == 0, "\n"); + ok(GetObjectW(GetStockObject(21), sizeof(BITMAP), INVALID_POINTER) == 0, "\n"); ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(0xbadbad00); - ok(GetObjectW(GetStockObject(SYSTEM_FONT), sizeof(LOGFONT), (PVOID)0xc0000000) == 0, "\n"); + ok(GetObjectW(GetStockObject(SYSTEM_FONT), sizeof(LOGFONT), INVALID_POINTER) == 0, "\n"); ok(GetLastError() == 0xbadbad00, "wrong error: %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); _SEH2_TRY { - ret = GetObjectA(GetStockObject(SYSTEM_FONT), sizeof(LOGFONT), (PVOID)0xc0000000); + ret = GetObjectA(GetStockObject(SYSTEM_FONT), sizeof(LOGFONT), INVALID_POINTER); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { diff --git a/modules/rostests/apitests/gdi32/RealizePalette.c b/modules/rostests/apitests/gdi32/RealizePalette.c index d3c20c0b26..d97dc5430f 100644 --- a/modules/rostests/apitests/gdi32/RealizePalette.c +++ b/modules/rostests/apitests/gdi32/RealizePalette.c @@ -13,8 +13,8 @@ START_TEST(RealizePalette) { InitStuff(); ok_int(RealizePalette(NULL), GDI_ERROR); - ok_int(RealizePalette((HDC)0xdeadc0de), GDI_ERROR); - ok_int(RealizePalette((HDC)0x00010001), 0); + ok_int(RealizePalette((HDC)UlongToHandle(0xdeadc0de)), GDI_ERROR); + ok_int(RealizePalette((HDC)UlongToHandle(0x00010001)), 0); ok_int(RealizePalette(ghdcDIB32), 0); } diff --git a/modules/rostests/apitests/msgina/ShellDimScreen.cpp b/modules/rostests/apitests/msgina/ShellDimScreen.cpp index d1ecdcb6fb..da4618cdaa 100644 --- a/modules/rostests/apitests/msgina/ShellDimScreen.cpp +++ b/modules/rostests/apitests/msgina/ShellDimScreen.cpp @@ -14,6 +14,7 @@ // stolen from com_apitest.h DEFINE_GUID(CLSID_FadeTask, 0x7EB5FBE4, 0x2100, 0x49E6, 0x85, 0x93, 0x17, 0xE1, 0x30, 0x12, 0x2F, 0x91); +#define INVALID_POINTER ((PVOID)(ULONG_PTR)0xdeadbeefdeadbeefULL) typedef HRESULT (__stdcall *tShellDimScreen) (IUnknown** Unknown, HWND* hWindow); @@ -21,8 +22,8 @@ tShellDimScreen ShellDimScreen; static void Test_Dim() { - IUnknown* unk = (IUnknown*)0xdeadbeef; - HWND wnd = (HWND)0xdeadbeef; + IUnknown* unk = (IUnknown*)INVALID_POINTER; + HWND wnd = (HWND)INVALID_POINTER; ULONG count; HRESULT hr = ShellDimScreen(NULL, NULL); @@ -30,24 +31,24 @@ static void Test_Dim() hr = ShellDimScreen(&unk, &wnd); ok_hex(hr, S_OK); - ok(unk != ((IUnknown*)0xdeadbeef), "Expected a valid object\n"); - ok(wnd != ((HWND)0xdeadbeef), "Expected a valid window ptr\n"); + ok(unk != INVALID_POINTER, "Expected a valid object\n"); + ok(wnd != INVALID_POINTER, "Expected a valid window ptr\n"); ok(IsWindow(wnd), "Expected a valid window\n"); ok(IsWindowVisible(wnd), "Expected the window to be visible\n"); - if (unk != ((IUnknown*)0xdeadbeef) && unk) + if (unk != ((IUnknown*)INVALID_POINTER) && unk) { count = unk->Release(); ok(count == 0, "Expected count to be 0, was: %lu\n", count); ok(!IsWindow(wnd), "Expected the window to be destroyed\n"); } - unk = (IUnknown*)0xdeadbeef; - wnd = (HWND)0xdeadbeef; + unk = (IUnknown*)INVALID_POINTER; + wnd = (HWND)INVALID_POINTER; hr = ShellDimScreen(&unk, &wnd); ok_hex(hr, S_OK); - ok(unk != ((IUnknown*)0xdeadbeef), "Expected a valid object\n"); - ok(wnd != ((HWND)0xdeadbeef), "Expected a valid window ptr\n"); + ok(unk != ((IUnknown*)INVALID_POINTER), "Expected a valid object\n"); + ok(wnd != ((HWND)INVALID_POINTER), "Expected a valid window ptr\n"); ok(IsWindow(wnd), "Expected a valid window\n"); ok(IsWindowVisible(wnd), "Expected the window to be visible\n"); char classname[100] = {0}; @@ -60,7 +61,7 @@ static void Test_Dim() style = GetWindowLong(wnd, GWL_EXSTYLE); ok(style == WS_EX_TOPMOST, "Expected exstyle to be %x, was %lx\n", WS_EX_TOPMOST, style); - if (unk != ((IUnknown*)0xdeadbeef) && unk) + if (unk != ((IUnknown*)INVALID_POINTER) && unk) { count = unk->AddRef(); ok(count == 2, "Expected count to be 2, was: %lu\n", count); @@ -92,7 +93,7 @@ static void Test_Dim() ok((rc.right - rc.left) == GetSystemMetrics(SM_CXVIRTUALSCREEN), "Expected rc.left to be %u, was %lu\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), (rc.right - rc.left)); ok((rc.bottom - rc.top) == GetSystemMetrics(SM_CYVIRTUALSCREEN), "Expected rc.top to be %u, was %lu\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), (rc.bottom - rc.top)); - if (unk != ((IUnknown*)0xdeadbeef) && unk) + if (unk != ((IUnknown*)INVALID_POINTER) && unk) { count = unk->Release(); ok(count == 0, "Expected count to be 0, was: %lu\n", count); diff --git a/modules/rostests/apitests/shell32/CMyComputer.cpp b/modules/rostests/apitests/shell32/CMyComputer.cpp index 712cf4dcd0..85f04fc738 100644 --- a/modules/rostests/apitests/shell32/CMyComputer.cpp +++ b/modules/rostests/apitests/shell32/CMyComputer.cpp @@ -11,6 +11,8 @@ #include <debug.h> #include <shellutils.h> +#define INVALID_POINTER ((PVOID)(ULONG_PTR)0xdeadbeefdeadbeefULL) + static VOID TestShellFolder( @@ -55,7 +57,7 @@ VOID TestInitialize(_In_ IShellFolder2 *psf2) hr = ppf2->Initialize(NULL); ok(hr == S_OK, "hr = %lx\n", hr); - hr = ppf2->Initialize((LPCITEMIDLIST)0xdeaddead); + hr = ppf2->Initialize((LPCITEMIDLIST)INVALID_POINTER); ok(hr == S_OK, "hr = %lx\n", hr); //crashes in xp diff --git a/modules/rostests/apitests/shell32/CUserNotification.cpp b/modules/rostests/apitests/shell32/CUserNotification.cpp index ec40f42584..1cb3dff45e 100644 --- a/modules/rostests/apitests/shell32/CUserNotification.cpp +++ b/modules/rostests/apitests/shell32/CUserNotification.cpp @@ -88,7 +88,7 @@ TestNotification(void) } /* Set an invalid icon for the notification icon */ - hr = pUserNotif->SetIconInfo((HICON)0xdeadbeef, L"Tooltip text"); + hr = pUserNotif->SetIconInfo((HICON)UlongToHandle(0xdeadbeef), L"Tooltip text"); ok_hr(hr, S_OK); #if 0 diff --git a/modules/rostests/apitests/shell32/menu.cpp b/modules/rostests/apitests/shell32/menu.cpp index b10fef0013..49efa1e7d0 100644 --- a/modules/rostests/apitests/shell32/menu.cpp +++ b/modules/rostests/apitests/shell32/menu.cpp @@ -120,7 +120,7 @@ void test_CShellMenu_params() hResult = shellMenu->SetMenu(hmenu, NULL, 0); test_S_OK(hResult, "SetMenu failed"); - hwndToolbar = (HWND)0xdeadbeef; + hwndToolbar = (HWND)UlongToPtr(0xdeadbeef); hResult = dockingMenu->GetWindow(&hwndToolbar); test_S_OK(hResult, "GetWindow failed"); ok (hwndToolbar == NULL, "Expected NULL window\n"); @@ -144,7 +144,7 @@ void test_CShellMenu_params() hResult = shellMenu->SetShellFolder(NULL, NULL, 0, 0); test_HRES(hResult, E_INVALIDARG, "SetShellFolder should fail"); - hwndToolbar = (HWND)0xdeadbeef; + hwndToolbar = (HWND)UlongToHandle(0xdeadbeef); hResult = dockingMenu->GetWindow(&hwndToolbar); test_S_OK(hResult, "GetWindow failed"); ok (hwndToolbar == NULL, "Expected NULL window\n"); diff --git a/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c b/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c index e4033b0ac4..7f37a11709 100644 --- a/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c +++ b/modules/rostests/apitests/spoolss/MarshallDownStructuresArray.c @@ -18,6 +18,8 @@ #include <marshalling/marshalling.h> #include <marshalling/ports.h> +#define INVALID_POINTER ((PVOID)(ULONG_PTR)0xdeadbeefdeadbeefULL) + START_TEST(MarshallDownStructuresArray) { const DWORD cElements = 2; @@ -49,11 +51,11 @@ START_TEST(MarshallDownStructuresArray) // This is triggered by both pStructuresArray and pInfo. SetLastError(0xDEADBEEF); - ok(!MarshallDownStructuresArray((PVOID)0xDEADDEAD, 1, NULL, 0, FALSE), "MarshallDownStructuresArray returns TRUE!\n"); + ok(!MarshallDownStructuresArray(INVALID_POINTER, 1, NULL, 0, FALSE), "MarshallDownStructuresArray returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError returns %lu!\n", GetLastError()); SetLastError(0xDEADBEEF); - ok(!MarshallDownStructuresArray(NULL, 1, (const MARSHALLING_INFO*)0xDEADDEAD, 0, FALSE), "MarshallDownStructuresArray returns TRUE!\n"); + ok(!MarshallDownStructuresArray(NULL, 1, (const MARSHALLING_INFO*)INVALID_POINTER, 0, FALSE), "MarshallDownStructuresArray returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError returns %lu!\n", GetLastError()); // Now create two PORT_INFO_2W structures. @@ -99,13 +101,13 @@ START_TEST(MarshallDownStructuresArray) // Due to the implementation of PackStrings, (&pPortInfo2[0])->pPortName contains the highest offset. // Show that MarshallUpStructuresArray checks the offsets and bails out with ERROR_INVALID_DATA if cbSize <= highest offset. SetLastError(0xDEADBEEF); - ok(!MarshallUpStructuresArray((DWORD)(&pPortInfo2[0])->pPortName, pPortInfo2Test, cElements, pPortInfoMarshalling[2]->pInfo, pPortInfoMarshalling[2]->cbStructureSize, TRUE), "MarshallUpStructuresArray returns TRUE!\n"); + ok(!MarshallUpStructuresArray((DWORD_PTR)(&pPortInfo2[0])->pPortName, pPortInfo2Test, cElements, pPortInfoMarshalling[2]->pInfo, pPortInfoMarshalling[2]->cbStructureSize, TRUE), "MarshallUpStructuresArray returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_DATA, "GetLastError returns %lu!\n", GetLastError()); // It works with cbSize > highest offset. // In real world cases, we would use cbPortInfo2Size for cbSize. SetLastError(0xDEADBEEF); - ok(MarshallUpStructuresArray((DWORD)(&pPortInfo2[0])->pPortName + 1, pPortInfo2, cElements, pPortInfoMarshalling[2]->pInfo, pPortInfoMarshalling[2]->cbStructureSize, TRUE), "MarshallUpStructuresArray returns FALSE!\n"); + ok(MarshallUpStructuresArray((DWORD_PTR)(&pPortInfo2[0])->pPortName + 1, pPortInfo2, cElements, pPortInfoMarshalling[2]->pInfo, pPortInfoMarshalling[2]->cbStructureSize, TRUE), "MarshallUpStructuresArray returns FALSE!\n"); ok(GetLastError() == 0xDEADBEEF, "GetLastError returns %lu!\n", GetLastError()); // pPortInfo2 should now be identical to the copy again. diff --git a/modules/rostests/apitests/spoolss/MarshallUpStructuresArray.c b/modules/rostests/apitests/spoolss/MarshallUpStructuresArray.c index d47c8b21dd..17515c0b62 100644 --- a/modules/rostests/apitests/spoolss/MarshallUpStructuresArray.c +++ b/modules/rostests/apitests/spoolss/MarshallUpStructuresArray.c @@ -12,6 +12,8 @@ #include <winbase.h> #include <marshalling/marshalling.h> +#define INVALID_POINTER ((PVOID)(ULONG_PTR)0xdeadbeefdeadbeefULL) + START_TEST(MarshallUpStructuresArray) { // Setting cElements to zero should yield success. @@ -26,11 +28,11 @@ START_TEST(MarshallUpStructuresArray) // This is triggered by both pStructuresArray and pInfo. SetLastError(0xDEADBEEF); - ok(!MarshallUpStructuresArray(0, (PVOID)0xDEADDEAD, 1, NULL, 0, FALSE), "MarshallUpStructuresArray returns TRUE!\n"); + ok(!MarshallUpStructuresArray(0, INVALID_POINTER, 1, NULL, 0, FALSE), "MarshallUpStructuresArray returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError returns %lu!\n", GetLastError()); SetLastError(0xDEADBEEF); - ok(!MarshallUpStructuresArray(0, NULL, 1, (const MARSHALLING_INFO*)0xDEADDEAD, 0, FALSE), "MarshallUpStructuresArray returns TRUE!\n"); + ok(!MarshallUpStructuresArray(0, NULL, 1, (const MARSHALLING_INFO*)INVALID_POINTER, 0, FALSE), "MarshallUpStructuresArray returns TRUE!\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError returns %lu!\n", GetLastError()); // More testing is conducted in the MarshallDownStructuresArray test. diff --git a/modules/rostests/apitests/user32/CreateWindowEx.c b/modules/rostests/apitests/user32/CreateWindowEx.c index 24ac64d26f..068dbc5208 100644 --- a/modules/rostests/apitests/user32/CreateWindowEx.c +++ b/modules/rostests/apitests/user32/CreateWindowEx.c @@ -805,7 +805,7 @@ static LRESULT CALLBACK MSGTestProcMDI2(HWND hWnd, UINT message, WPARAM wParam, mcs.style = WS_MAXIMIZE; hchild = (HWND) SendMessage (g_hwndMDIClient, WM_MDICREATE, 0, - (LONG)(LPMDICREATESTRUCT) &mcs); + (LPARAM)&mcs); ok(hchild == g_ChildWindow, "We are testing with %p instead of %p\n", g_ChildWindow, hchild); } diff --git a/modules/rostests/apitests/user32/GetUserObjectInformation.c b/modules/rostests/apitests/user32/GetUserObjectInformation.c index 31ad447288..71c441fc85 100644 --- a/modules/rostests/apitests/user32/GetUserObjectInformation.c +++ b/modules/rostests/apitests/user32/GetUserObjectInformation.c @@ -121,11 +121,11 @@ FreeGuarded( #define TestUserObjectInfoWithString(Handle, Index, Buffer, BufferSize, String) do \ { \ BOOLEAN _Check; \ - ULONG SizeOfString = wcslen(String) * sizeof(WCHAR) + sizeof(UNICODE_NULL); \ + SIZE_T SizeOfString = wcslen(String) * sizeof(WCHAR) + sizeof(UNICODE_NULL); \ TestUserObjectInfo(Handle, Index, NULL, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, SizeOfString); \ - TestUserObjectInfo(Handle, Index, (PVOID)1, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, SizeOfString); \ + TestUserObjectInfo(Handle, Index, UlongToPtr(1), 0, FALSE, ERROR_INSUFFICIENT_BUFFER, SizeOfString); \ TestUserObjectInfo(Handle, Index, NULL, 1, FALSE, ERROR_NOACCESS, NOTSET); \ - TestUserObjectInfo(Handle, Index, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); \ + TestUserObjectInfo(Handle, Index, UlongToPtr(1), 1, FALSE, ERROR_NOACCESS, NOTSET); \ RtlFillMemory(Buffer, BufferSize, 0x55); \ TestUserObjectInfo(Handle, Index, Buffer, SizeOfString - 2, FALSE, ERROR_INSUFFICIENT_BUFFER, SizeOfString); \ _Check = CheckBuffer(Buffer, BufferSize, 0x55); \ @@ -168,21 +168,21 @@ TestGetUserObjectInfoW(void) TestUserObjectInfo(NULL, 5, NULL, 0, FALSE, ERROR_INVALID_HANDLE, 0); TestUserObjectInfo(NULL, UOI_FLAGS, NULL, 0, FALSE, ERROR_INVALID_HANDLE, 0); - TestUserObjectInfo(NULL, UOI_FLAGS, (PVOID)1, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_FLAGS, UlongToPtr(1), 0, FALSE, ERROR_INVALID_HANDLE, 0); TestUserObjectInfo(NULL, UOI_FLAGS, NULL, 1, FALSE, ERROR_NOACCESS, NOTSET); - TestUserObjectInfo(NULL, UOI_FLAGS, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(NULL, UOI_FLAGS, UlongToPtr(1), 1, FALSE, ERROR_NOACCESS, NOTSET); TestUserObjectInfo(NULL, UOI_FLAGS, &UserObjectFlags, sizeof(UserObjectFlags), FALSE, ERROR_INVALID_HANDLE, 0); TestUserObjectInfo(NULL, UOI_TYPE, NULL, 0, FALSE, ERROR_INVALID_HANDLE, 0); - TestUserObjectInfo(NULL, UOI_TYPE, (PVOID)1, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_TYPE, UlongToPtr(1), 0, FALSE, ERROR_INVALID_HANDLE, 0); TestUserObjectInfo(NULL, UOI_TYPE, NULL, 1, FALSE, ERROR_NOACCESS, NOTSET); - TestUserObjectInfo(NULL, UOI_TYPE, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(NULL, UOI_TYPE, UlongToPtr(1), 1, FALSE, ERROR_NOACCESS, NOTSET); TestUserObjectInfo(NULL, UOI_TYPE, Buffer, BufferSize, FALSE, ERROR_INVALID_HANDLE, 0); TestUserObjectInfo(NULL, UOI_NAME, NULL, 0, FALSE, ERROR_INVALID_HANDLE, 0); - TestUserObjectInfo(NULL, UOI_NAME, (PVOID)1, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_NAME, UlongToPtr(1), 0, FALSE, ERROR_INVALID_HANDLE, 0); TestUserObjectInfo(NULL, UOI_NAME, NULL, 1, FALSE, ERROR_NOACCESS, NOTSET); - TestUserObjectInfo(NULL, UOI_NAME, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(NULL, UOI_NAME, UlongToPtr(1), 1, FALSE, ERROR_NOACCESS, NOTSET); TestUserObjectInfo(NULL, UOI_NAME, Buffer, BufferSize, FALSE, ERROR_INVALID_HANDLE, 0); Desktop = GetThreadDesktop(GetCurrentThreadId()); @@ -203,9 +203,9 @@ TestGetUserObjectInfoW(void) TestUserObjectInfo(Desktop, 5, NULL, 0, FALSE, ERROR_INVALID_PARAMETER, 0); TestUserObjectInfo(Desktop, UOI_FLAGS, NULL, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(USEROBJECTFLAGS)); - TestUserObjectInfo(Desktop, UOI_FLAGS, (PVOID)1, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(USEROBJECTFLAGS)); + TestUserObjectInfo(Desktop, UOI_FLAGS, UlongToPtr(1), 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(USEROBJECTFLAGS)); TestUserObjectInfo(Desktop, UOI_FLAGS, NULL, 1, FALSE, ERROR_NOACCESS, NOTSET); - TestUserObjectInfo(Desktop, UOI_FLAGS, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(Desktop, UOI_FLAGS, UlongToPtr(1), 1, FALSE, ERROR_NOACCESS, NOTSET); TestUserObjectInfo(Desktop, UOI_FLAGS, &UserObjectFlags, sizeof(UserObjectFlags), TRUE, 0xdeadbeef, sizeof(USEROBJECTFLAGS)); TestUserObjectInfoWithString(Desktop, UOI_TYPE, Buffer, BufferSize, L"Desktop"); diff --git a/modules/rostests/apitests/user32/PrivateExtractIcons.c b/modules/rostests/apitests/user32/PrivateExtractIcons.c index b2b3ef33de..339e3923ac 100644 --- a/modules/rostests/apitests/user32/PrivateExtractIcons.c +++ b/modules/rostests/apitests/user32/PrivateExtractIcons.c @@ -36,16 +36,16 @@ START_TEST(PrivateExtractIcons) for (i = 0; i < _countof(IconTests); ++i) { /* Always test extraction of the FIRST icon (index 0) */ - ahIcon = (HICON)0xdeadbeef; + ahIcon = (HICON)UlongToHandle(0xdeadbeef); aIconId = 0xdeadbeef; cIcons = PrivateExtractIconsW(IconTests[i].FilePath, 0, 16, 16, &ahIcon, &aIconId, 1, 0); ok(cIcons == IconTests[i].cIcons, "PrivateExtractIconsW(%u): got %u, expected %u\n", i, cIcons, IconTests[i].cIcons); - ok(ahIcon != (HICON)0xdeadbeef, "PrivateExtractIconsW(%u): icon not set\n", i); + ok(ahIcon != (HICON)UlongToHandle(0xdeadbeef), "PrivateExtractIconsW(%u): icon not set\n", i); ok((IconTests[i].bhIconValid && ahIcon) || (!IconTests[i].bhIconValid && !ahIcon), "PrivateExtractIconsW(%u): icon expected to be %s, but got 0x%p\n", i, IconTests[i].bhIconValid ? "valid" : "not valid", ahIcon); ok(aIconId != 0xdeadbeef, "PrivateExtractIconsW(%u): id not set\n", i); - if (ahIcon && ahIcon != (HICON)0xdeadbeef) + if (ahIcon && ahIcon != (HICON)UlongToHandle(0xdeadbeef)) DestroyIcon(ahIcon); } } diff --git a/modules/rostests/apitests/user32/SendMessageTimeout.c b/modules/rostests/apitests/user32/SendMessageTimeout.c index e633168732..858d9384cc 100644 --- a/modules/rostests/apitests/user32/SendMessageTimeout.c +++ b/modules/rostests/apitests/user32/SendMessageTimeout.c @@ -193,8 +193,8 @@ TestRecursiveInterThreadMessages( BOOL Ret; DWORD ExitCode; - Parameter = (PVOID)((KillThread1 ? KILL_THREAD1_FLAG : 0) | - (KillThread2 ? KILL_THREAD2_FLAG : 0)); + Parameter = UlongToPtr((KillThread1 ? KILL_THREAD1_FLAG : 0) | + (KillThread2 ? KILL_THREAD2_FLAG : 0)); hThread1 = CreateThread(NULL, 0, Thread1, Parameter, CREATE_SUSPENDED, &dwThread1); hThread2 = CreateThread(NULL, 0, Thread2, Parameter, CREATE_SUSPENDED, &dwThread2); diff --git a/modules/rostests/apitests/user32/SystemParametersInfo.c b/modules/rostests/apitests/user32/SystemParametersInfo.c index 64330bc79b..9872909474 100644 --- a/modules/rostests/apitests/user32/SystemParametersInfo.c +++ b/modules/rostests/apitests/user32/SystemParametersInfo.c @@ -140,34 +140,34 @@ static void Test_MouseSpeed() ok(ulMouseSpeed >= 1 && ulMouseSpeed <=20, "Wrong mouse speed (%d)\n", (int)ulMouseSpeed); temp = 1; - ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)temp, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, UlongToPtr(temp), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); ok(ret, "SystemParametersInfo failed\n"); ret = SystemParametersInfo(SPI_GETMOUSESPEED, 0, &temp, 0); ok(ret, "SystemParametersInfo failed\n"); ok(temp == 1, "SPI_GETMOUSESPEED did not get value set by SPI_SETMOUSESPEED (%d instead of 1)\n", (int)temp); temp = 20; - ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)temp, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, UlongToPtr(temp), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); ok(ret, "SystemParametersInfo failed\n"); ret = SystemParametersInfo(SPI_GETMOUSESPEED, 0, &temp, 0); ok(ret, "SystemParametersInfo failed\n"); ok(temp == 20, "SPI_GETMOUSESPEED did not get value set by SPI_SETMOUSESPEED (%d instead of 20)\n", (int)temp); temp = 21; - ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)temp, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, UlongToPtr(temp), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); ok(!ret, "expected SystemParametersInfo to fail\n"); ret = SystemParametersInfo(SPI_GETMOUSESPEED, 0, &temp, 0); ok(ret, "SystemParametersInfo failed\n"); ok(temp == 20, "SPI_GETMOUSESPEED got unexpected value (%d instead of 20)\n", (int)temp); temp = 0; - ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)temp, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, UlongToPtr(temp), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); ok(!ret, "expected SystemParametersInfo to fail\n"); ret = SystemParametersInfo(SPI_GETMOUSESPEED, 0, &temp, 0); ok(ret, "SystemParametersInfo failed\n"); ok(temp == 20, "SPI_GETMOUSESPEED got unexpected value (%d instead of 20)\n", (int)temp); - ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)ulMouseSpeed, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, UlongToPtr(ulMouseSpeed), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); ok(ret, "SystemParametersInfo failed\n"); } diff --git a/modules/rostests/tests/mmixer_test/test.c b/modules/rostests/tests/mmixer_test/test.c index 6aaf1bd9ca..b44feeba94 100644 --- a/modules/rostests/tests/mmixer_test/test.c +++ b/modules/rostests/tests/mmixer_test/test.c @@ -100,7 +100,7 @@ printMixerLine(LPMIXERLINEW MixerLine, IN ULONG MixerIndex) MixerLineControls.cbmxctrl= sizeof(MIXERCONTROLW); MixerLineControls.pamxctrl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MixerLineControls.cControls * sizeof(MIXERCONTROLW)); - Result = mixerGetLineControlsW((HMIXEROBJ)MixerIndex, &MixerLineControls, MIXER_GETLINECONTROLSF_ALL | MIXER_OBJECTF_MIXER); + Result = mixerGetLineControlsW((HMIXEROBJ)UlongToHandle(MixerIndex), &MixerLineControls, MIXER_GETLINECONTROLSF_ALL | MIXER_OBJECTF_MIXER); printf("Result %u\n", Result); @@ -136,7 +136,7 @@ printMixerLine(LPMIXERLINEW MixerLine, IN ULONG MixerIndex) MixerControlDetails.dwControlID = MixerLineControls.pamxctrl[Index].dwControlID; MixerControlDetails.paDetails = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MixerControlDetails.cbDetails * MixerControlDetails.cChannels * MixerControlDetails.cMultipleItems); - Result = mixerGetControlDetailsW((HMIXEROBJ)MixerIndex, &MixerControlDetails, MIXER_GETCONTROLDETAILSF_LISTTEXT | MIXER_OBJECTF_MIXER); + Result = mixerGetControlDetailsW((HMIXEROBJ)UlongToHandle(MixerIndex), &MixerControlDetails, MIXER_GETCONTROLDETAILSF_LISTTEXT | MIXER_OBJECTF_MIXER); printf("Result %x\n", Result); ListText = (LPMIXERCONTROLDETAILS_LISTTEXTW)MixerControlDetails.paDetails; @@ -190,7 +190,7 @@ test(); DstMixerLine.dwDestination = DestinationIndex; DstMixerLine.cbStruct = sizeof(DstMixerLine); - Result = mixerGetLineInfoW((HMIXEROBJ)MixerIndex, &DstMixerLine, MIXER_GETLINEINFOF_DESTINATION | MIXER_OBJECTF_MIXER); + Result = mixerGetLineInfoW((HMIXEROBJ)UlongToHandle(MixerIndex), &DstMixerLine, MIXER_GETLINEINFOF_DESTINATION | MIXER_OBJECTF_MIXER); printf("\n"); printf("Destination Index %lu\n", DestinationIndex); printMixerLine(&DstMixerLine, MixerIndex); @@ -201,7 +201,7 @@ test(); SrcLine.dwSource = SrcIndex; SrcLine.cbStruct = sizeof(SrcLine); - Result = mixerGetLineInfoW((HMIXEROBJ)MixerIndex, &SrcLine, MIXER_GETLINEINFOF_SOURCE | MIXER_OBJECTF_MIXER); + Result = mixerGetLineInfoW((HMIXEROBJ)UlongToHandle(MixerIndex), &SrcLine, MIXER_GETLINEINFOF_SOURCE | MIXER_OBJECTF_MIXER); if (Result == MMSYSERR_NOERROR) { diff --git a/modules/rostests/winetests/CMakeLists.txt b/modules/rostests/winetests/CMakeLists.txt index 959db2b927..0e70ccb1cc 100644 --- a/modules/rostests/winetests/CMakeLists.txt +++ b/modules/rostests/winetests/CMakeLists.txt @@ -1,6 +1,10 @@ add_definitions(-D__ROS_LONG64__) +if (MSVC AND ARCH STREQUAL "amd64") + add_compile_flags("/wd4312") +endif() + add_subdirectory(advapi32) add_subdirectory(advpack) add_subdirectory(amstream) diff --git a/modules/rostests/winetests/ntdll/CMakeLists.txt b/modules/rostests/winetests/ntdll/CMakeLists.txt index 7baff0b38e..c0e90fe99d 100644 --- a/modules/rostests/winetests/ntdll/CMakeLists.txt +++ b/modules/rostests/winetests/ntdll/CMakeLists.txt @@ -8,7 +8,6 @@ list(APPEND SOURCE directory.c env.c error.c - exception.c file.c info.c large_int.c @@ -26,7 +25,9 @@ list(APPEND SOURCE precomp.h) if(ARCH STREQUAL "i386") - list(APPEND SOURCE generated.c) + list(APPEND SOURCE + exception.c + generated.c) endif() add_executable(ntdll_winetest ${SOURCE} testlist.c) diff --git a/modules/rostests/winetests/ntdll/testlist.c b/modules/rostests/winetests/ntdll/testlist.c index 989040c562..fb64074ac4 100644 --- a/modules/rostests/winetests/ntdll/testlist.c +++ b/modules/rostests/winetests/ntdll/testlist.c @@ -32,7 +32,9 @@ const struct test winetest_testlist[] = { "directory", func_directory }, { "env", func_env }, { "error", func_error }, +#ifdef _M_IX86 { "exception", func_exception }, +#endif { "file", func_file }, #ifdef _M_IX86 { "generated", func_generated },

6 years, 3 months

[reactos] 01/01: [WIN32SS][NTUSER] Fix caret position of Ghostscript (#1271)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=efe4605177345910532d7… commit efe4605177345910532d73bcd910318b45f8e63d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 20 23:11:54 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 20 23:11:54 2019 +0900 [WIN32SS][NTUSER] Fix caret position of Ghostscript (#1271) CORE-13934, CORE-15656 --- win32ss/user/ntuser/caret.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/caret.c b/win32ss/user/ntuser/caret.c index a7549e752d..9ab590c0b8 100644 --- a/win32ss/user/ntuser/caret.c +++ b/win32ss/user/ntuser/caret.c @@ -3,7 +3,8 @@ * PROJECT: ReactOS Win32k subsystem * PURPOSE: Caret functions * FILE: win32ss/user/ntuser/caret.c - * PROGRAMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * PROGRAMERS: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include <win32k.h> @@ -21,6 +22,7 @@ co_IntDrawCaret(PWND pWnd, PTHRDCARETINFO CaretInfo) { HDC hdc, hdcMem; HBITMAP hbmOld; + RECT rcClient; BOOL bDone = FALSE; if (pWnd == NULL) @@ -29,7 +31,7 @@ co_IntDrawCaret(PWND pWnd, PTHRDCARETINFO CaretInfo) return; } - hdc = UserGetDCEx(pWnd, 0, DCX_USESTYLE | DCX_WINDOW); + hdc = UserGetDCEx(pWnd, NULL, DCX_USESTYLE); if (!hdc) { ERR("GetDC failed\n"); @@ -41,6 +43,13 @@ co_IntDrawCaret(PWND pWnd, PTHRDCARETINFO CaretInfo) NtGdiSaveDC(hdc); } + IntGetClientRect(pWnd, &rcClient); + NtGdiIntersectClipRect(hdc, + rcClient.left, + rcClient.top, + rcClient.right, + rcClient.bottom); + if (CaretInfo->Bitmap) { if (!GreGetBitmapDimension(CaretInfo->Bitmap, &CaretInfo->Size))

6 years, 3 months

← Newer
1
...
13
14
15
16
17
18
19
...
30
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 January 2019