Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [WININET] Update Polish (pl-PL) translation (#4811)
by Konrad Dybcio 26 Oct '22

26 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b55658b3966965ad7631b… commit b55658b3966965ad7631bab141451884bee363af Author: Konrad Dybcio <konrad.dybcio(a)somainline.org> AuthorDate: Wed Oct 26 17:30:39 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 26 18:30:39 2022 +0300 [WININET] Update Polish (pl-PL) translation (#4811) Reviewed-by: Adam Słaboń <asaillen(a)protonmail.com> Reviewed-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/win32/wininet/lang/wininet_Pl.rc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dll/win32/wininet/lang/wininet_Pl.rc b/dll/win32/wininet/lang/wininet_Pl.rc index c05c71a7d0f..69d0acffe60 100644 --- a/dll/win32/wininet/lang/wininet_Pl.rc +++ b/dll/win32/wininet/lang/wininet_Pl.rc @@ -27,17 +27,17 @@ STRINGTABLE IDS_CERT_DATE_INVALID "Data certyfikatu jest nieprawidłowa." IDS_CERT_CN_INVALID "Nazwa na certyfikacie nie pasuje do witryny." IDS_CERT_ERRORS "Istnieje co najmniej jeden nieokreślony problem bezpieczeństwa z tym certyfikatem." - IDS_CERT_SUBJECT "Subject" - IDS_CERT_ISSUER "Issuer" - IDS_CERT_EFFECTIVE "Effective Date" - IDS_CERT_EXPIRATION "Expiration Date" - IDS_CERT_PROTOCOL "Security Protocol" - IDS_CERT_SIGNATURE "Signature Type" - IDS_CERT_ENCRYPTION "Encryption Type" - IDS_CERT_PRIVACY "Privacy Strength" - IDS_CERT_HIGH "High" - IDS_CERT_LOW "Low" - IDS_CERT_BITS "bits" + IDS_CERT_SUBJECT "Podmiot" + IDS_CERT_ISSUER "Wydawca" + IDS_CERT_EFFECTIVE "Data obowiązywania" + IDS_CERT_EXPIRATION "Data wygaśnięcia" + IDS_CERT_PROTOCOL "Protokół zabezpieczeń" + IDS_CERT_SIGNATURE "Rodzaj podpisu" + IDS_CERT_ENCRYPTION "Rodzaj szyfrowania" + IDS_CERT_PRIVACY "Poziom prywatności" + IDS_CERT_HIGH "Wysoka" + IDS_CERT_LOW "Niska" + IDS_CERT_BITS "bitów" } IDD_PROXYDLG DIALOGEX 36, 24, 220, 146

1 0

[reactos] 01/01: [BROWSEUI] Update Polish (pl-PL) translation (#4813)
by Konrad Dybcio 26 Oct '22

26 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97a61654c5d8cd986b30f… commit 97a61654c5d8cd986b30ff60b3112d3b28fc9041 Author: Konrad Dybcio <konrad.dybcio(a)somainline.org> AuthorDate: Wed Oct 26 15:22:56 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 26 16:22:56 2022 +0300 [BROWSEUI] Update Polish (pl-PL) translation (#4813) --- dll/win32/browseui/lang/pl-PL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/browseui/lang/pl-PL.rc b/dll/win32/browseui/lang/pl-PL.rc index 152154bcf87..d6c62bf13c1 100644 --- a/dll/win32/browseui/lang/pl-PL.rc +++ b/dll/win32/browseui/lang/pl-PL.rc @@ -307,7 +307,7 @@ END STRINGTABLE BEGIN - IDS_ADDRESSMENUTEXT "&Address" + IDS_ADDRESSMENUTEXT "&Adres" IDS_HISTORYTEXT "&Historia\tCtrl+H" END

1 0

[reactos] 01/01: [RASDLG] Fix typos in Polish (pl-PL) translation (#4812)
by Konrad Dybcio 26 Oct '22

26 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e15490a2b81dc8ae8565e… commit e15490a2b81dc8ae8565e9a9506b253d04faf9dd Author: Konrad Dybcio <konrad.dybcio(a)somainline.org> AuthorDate: Wed Oct 26 15:22:05 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 26 16:22:05 2022 +0300 [RASDLG] Fix typos in Polish (pl-PL) translation (#4812) `tą` and `tę` are very often mistaken for each other by native speakers. --- dll/win32/rasdlg/lang/pl-PL.rc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dll/win32/rasdlg/lang/pl-PL.rc b/dll/win32/rasdlg/lang/pl-PL.rc index a7e35e0e136..2c499d44c0d 100644 --- a/dll/win32/rasdlg/lang/pl-PL.rc +++ b/dll/win32/rasdlg/lang/pl-PL.rc @@ -21,7 +21,7 @@ BEGIN PUSHBUTTON "D&odaj", 1013, 7, 187, 70, 14 PUSHBUTTON "&Edytuj", 1016, 81, 187, 70, 14 PUSHBUTTON "&Usuń", 1014, 154, 187, 70, 14 - AUTOCHECKBOX "&Jeżeli numer nie działa, użyj kolejego", 1011, 8, 210, 243, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Jeżeli numer nie działa, użyj kolejnego", 1011, 8, 210, 243, 10, BS_TOP | BS_MULTILINE AUTOCHECKBOX "&Przenieś sprawdzony numer na początek listy", 1010, 8, 228, 243, 10, BS_TOP | BS_MULTILINE DEFPUSHBUTTON "OK", 1, 122, 245, 60, 14 PUSHBUTTON "Anuluj", 2, 188, 245, 60, 14 @@ -236,7 +236,7 @@ BEGIN LTEXT "&Hasło:", 1112, 8, 79, 88, 8 EDITTEXT 1103, 103, 76, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 8, 97, 248, 1 - AUTOCHECKBOX "&Zapisz tą nazwę użytkownika i hasło dla następujących użytkowników:", 1101, 14, 105, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&Zapisz tę nazwę użytkownika i hasło dla następujących użytkowników:", 1101, 14, 105, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Tylko &ja", 1622, 26, 120, 226, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Każdy kto używa tego komputera", 1623, 26, 134, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 8, 149, 248, 1 @@ -259,7 +259,7 @@ BEGIN LTEXT "&Domena:", 1110, 9, 99, 91, 8 EDITTEXT 1102, 102, 95, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 9, 116, 247, 1 - AUTOCHECKBOX "&Zapisz tą nazwę użytkownika i hasło dla następujących użytkowników:", 1101, 12, 123, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&Zapisz tę nazwę użytkownika i hasło dla następujących użytkowników:", 1101, 12, 123, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Tylko &ja", 1622, 25, 137, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Każdy kto używa tego komputera", 1623, 25, 151, 230, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 9, 167, 247, 1 @@ -282,7 +282,7 @@ BEGIN LTEXT "&Domena:", 1110, 10, 100, 92, 8 EDITTEXT 1102, 104, 95, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 11, 116, 247, 1 - AUTOCHECKBOX "&Zapisz tą nazwę użytkownika i hasło dla następujących użytkowników:", 1101, 16, 124, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&Zapisz tę nazwę użytkownika i hasło dla następujących użytkowników:", 1101, 16, 124, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Tylko &ja", 1622, 29, 139, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Każdy kto używa tego komputera", 1623, 29, 152, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 167, 247, 1 @@ -306,7 +306,7 @@ BEGIN LTEXT "&Hasło:", 1112, 10, 81, 92, 8 EDITTEXT 1103, 104, 77, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 10, 97, 247, 1 - AUTOCHECKBOX "&Zapisz tą nazwę użytkownika i hasło dla następujących użytkowników:", 1101, 12, 103, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&Zapisz tę nazwę użytkownika i hasło dla następujących użytkowników:", 1101, 12, 103, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Tylko &ja", 1622, 24, 117, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Każdy kto używa tego komputera", 1623, 24, 132, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 147, 247, 1 @@ -1280,7 +1280,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Kreator konfiguracji połączenia" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Wprowadź nazwę usługi w pole poniżej. Jeśli zostawisz je puste, ReactOS automagicznie wykryje i skonfiguruje tą usługę podczas łączenia.", -1, 10, 7, 301, 25 + LTEXT "Wprowadź nazwę usługi w pole poniżej. Jeśli zostawisz je puste, ReactOS automagicznie wykryje i skonfiguruje tę usługę podczas łączenia.", -1, 10, 7, 301, 25 LTEXT "&Nazwa Usługi (opcjonalnie):", -1, 22, 32, 229, 8 EDITTEXT 1593, 22, 44, 275, 14, ES_AUTOHSCROLL END @@ -1411,7 +1411,7 @@ BEGIN LTEXT "&Hasło:", 1112, 11, 81, 90, 8 EDITTEXT 1103, 104, 77, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 10, 98, 248, 1 - AUTOCHECKBOX "&Zapisz tą nazwę użytkownika i hasło dla następujących użytkowników:", 1101, 14, 105, 242, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&Zapisz tę nazwę użytkownika i hasło dla następujących użytkowników:", 1101, 14, 105, 242, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Tylko &ja", 1622, 26, 119, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Każdy kto używa tego komputera", 1623, 26, 133, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 149, 248, 1 @@ -1440,7 +1440,7 @@ BEGIN LTEXT "&Domena:", 1110, 10, 104, 92, 8 EDITTEXT 1102, 104, 101, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 10, 121, 248, 1 - AUTOCHECKBOX "&Zapisz tą nazwę użytkownika i hasło dla następujących użytkowników:", 1101, 12, 127, 242, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&Zapisz tę nazwę użytkownika i hasło dla następujących użytkowników:", 1101, 12, 127, 242, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Tylko &ja", 1622, 24, 141, 227, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Każdy kto używa tego komputera", 1623, 24, 155, 230, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 170, 248, 1 @@ -2349,7 +2349,7 @@ BEGIN 7377 "Którego urządzenia chcesz użyć w tym połączeniu?\0" 7378 "Nie ma obecnie żadnych urządzeń zainstalowanych, które byłyby w stanie przyjąć połączenia przychodzące.\0" 7379 "Ostrzeżenie o nowym połączeniu przychodzącym\0" - 7380 "Ponieważ ten Serwer Win 2000 należy do, albo kontroluje domenę, musisz użyć konsoli Routingu i Dostępu Zdalnego by skonfigurować tą maszynę tak by akceptowała połączenia przychodzące. Anulować zmiany i włączyć tą konsolę?\n\0" + 7380 "Ponieważ ten Serwer Win 2000 należy do, albo kontroluje domenę, musisz użyć konsoli Routingu i Dostępu Zdalnego by skonfigurować tę maszynę tak by akceptowała połączenia przychodzące. Anulować zmiany i włączyć tę konsolę?\n\0" 7381 "Przydziel &numer adresu automagicznie\0" 7382 "Przydziel n&umer adresu automagicznie\0" 7383 "Połączenia przychodzące nie mogą używać adresów IPX o numerach 00000000 lub FFFFFFFF. Proszę zmienić przydzielone numery adresów albo ustawić automagiczne przydzielanie numerów.\0"

1 0

[reactos] 01/01: [MMSYS] Fix English string in PL translation
by Konrad Dybcio 26 Oct '22

26 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f3cee73e92b8c89d9964… commit 1f3cee73e92b8c89d996436dceca577df87985a5 Author: Konrad Dybcio <konrad.dybcio(a)somainline.org> AuthorDate: Wed Oct 26 02:27:00 2022 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Wed Oct 26 14:54:53 2022 +0200 [MMSYS] Fix English string in PL translation Signed-off-by: Konrad Dybcio <konrad.dybcio(a)somainline.org> --- dll/cpl/mmsys/lang/pl-PL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/mmsys/lang/pl-PL.rc b/dll/cpl/mmsys/lang/pl-PL.rc index 478e36848bb..36cb6385520 100644 --- a/dll/cpl/mmsys/lang/pl-PL.rc +++ b/dll/cpl/mmsys/lang/pl-PL.rc @@ -193,7 +193,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Dźwięk wielokanałowy" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "By moving the sliders below you can adjust the volume of all speakers connected to this computer.", 9506, 8, 4, 212, 24 + LTEXT "Przesuwając poniższe suwaki, możesz dostosować głośność wszystkich głośników podłączonych do tego komputera.", 9506, 8, 4, 212, 24 LTEXT "Mała", 9473, 65, 31, 16, 8 LTEXT "", 9472, 5, 31, 55, 8 CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", TBS_AUTOTICKS | TBS_DOWNISLEFT | WS_TABSTOP, 87, 29, 108, 17

1 0

[reactos] 01/01: [IMM32] Add reasoning for tracing (#4807)
by Katayama Hirofumi MZ 26 Oct '22

26 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1df4f2d8f6206382b990… commit e1df4f2d8f6206382b9902727d52b2681c672679 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 26 12:01:33 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 26 12:01:33 2022 +0900 [IMM32] Add reasoning for tracing (#4807) Follow-up of c2a9436 (#4798). Improve trace messages. CORE-11700 --- dll/win32/imm32/candidate.c | 18 ++++++++++++------ dll/win32/imm32/compstr.c | 13 ++++++------- dll/win32/imm32/ime.c | 43 +++++++++++++++++++++++++++++++------------ dll/win32/imm32/imm.c | 26 ++++++++++++++------------ dll/win32/imm32/keymsg.c | 17 +++++++---------- dll/win32/imm32/utils.c | 40 ++++++++++++++++++++-------------------- 6 files changed, 90 insertions(+), 67 deletions(-) diff --git a/dll/win32/imm32/candidate.c b/dll/win32/imm32/candidate.c index a1df77e7b33..df976e407c8 100644 --- a/dll/win32/imm32/candidate.c +++ b/dll/win32/imm32/candidate.c @@ -180,9 +180,15 @@ ImmGetCandidateListAW(HIMC hIMC, DWORD dwIndex, LPCANDIDATELIST lpCandList, DWOR return 0; } - if (pCI->dwSize < sizeof(CANDIDATEINFO) || pCI->dwCount <= dwIndex) + if (pCI->dwSize < sizeof(CANDIDATEINFO)) + { + ERR("Too small\n"); + goto Quit; + } + + if (pCI->dwCount <= dwIndex) { - ERR("\n"); + ERR("Out of boundary\n"); goto Quit; } @@ -276,7 +282,7 @@ ImmGetCandidateListCountAW(HIMC hIMC, LPDWORD lpdwListCount, BOOL bAnsi) if (pCI->dwSize < sizeof(CANDIDATEINFO)) { - ERR("\n"); + ERR("Too small\n"); goto Quit; } @@ -378,7 +384,7 @@ ImmGetCandidateWindow(HIMC hIMC, DWORD dwIndex, LPCANDIDATEFORM lpCandidate) if (dwIndex >= MAX_CANDIDATEFORM) /* Windows didn't check but we do for security reason */ { - ERR("\n"); + ERR("Out of boundary\n"); return FALSE; } @@ -394,7 +400,7 @@ ImmGetCandidateWindow(HIMC hIMC, DWORD dwIndex, LPCANDIDATEFORM lpCandidate) } else { - ERR("\n"); + ERR("Out of boundary\n"); } ImmUnlockIMC(hIMC); @@ -414,7 +420,7 @@ BOOL WINAPI ImmSetCandidateWindow(HIMC hIMC, LPCANDIDATEFORM lpCandidate) if (lpCandidate->dwIndex >= MAX_CANDIDATEFORM) { - ERR("\n"); + ERR("Out of boundary\n"); return FALSE; } diff --git a/dll/win32/imm32/compstr.c b/dll/win32/imm32/compstr.c index 980e904e1c6..5486397f3f4 100644 --- a/dll/win32/imm32/compstr.c +++ b/dll/win32/imm32/compstr.c @@ -272,7 +272,7 @@ Imm32GetCompStrA(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex, break; default: - FIXME("\n"); + FIXME("0x%X\n", dwIndex); return IMM_ERROR_GENERAL; } } @@ -357,7 +357,7 @@ Imm32GetCompStrA(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex, break; default: - FIXME("\n"); + FIXME("0x%X\n", dwIndex); return IMM_ERROR_GENERAL; } } @@ -449,7 +449,7 @@ Imm32GetCompStrW(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex, break; default: - FIXME("\n"); + FIXME("0x%X\n", dwIndex); return IMM_ERROR_GENERAL; } } @@ -506,7 +506,7 @@ Imm32GetCompStrW(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex, break; default: - FIXME("\n"); + FIXME("0x%X\n", dwIndex); return IMM_ERROR_GENERAL; } } @@ -532,7 +532,7 @@ ImmSetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwCompLe dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); if (dwThreadId != GetCurrentThreadId()) { - ERR("\n"); + ERR("Thread mismatch\n"); return FALSE; } @@ -554,7 +554,7 @@ ImmSetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwCompLe break; /* FALL THROUGH */ default: - ERR("\n"); + ERR("0x%X\n", dwIndex); ImmUnlockImeDpi(pImeDpi); return FALSE; } @@ -569,7 +569,6 @@ ImmSetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwCompLe if (!Imm32OpenICAndCS(hIMC, &pIC, &pCS)) { - ERR("\n"); ImmUnlockImeDpi(pImeDpi); return FALSE; } diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 9bc3cd6830a..d898c924570 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -125,32 +125,32 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) if (pImeInfo->fdwProperty & ~VALID_IME_PROP) { - ERR("\n"); + ERR("Bad flags\n"); return FALSE; } if (pImeInfo->fdwConversionCaps & ~VALID_CMODE_CAPS) { - ERR("\n"); + ERR("Bad flags\n"); return FALSE; } if (pImeInfo->fdwSentenceCaps & ~VALID_SMODE_CAPS) { - ERR("\n"); + ERR("Bad flags\n"); return FALSE; } if (pImeInfo->fdwUICaps & ~VALID_UI_CAPS) { - ERR("\n"); + ERR("Bad flags\n"); return FALSE; } if (pImeInfo->fdwSCSCaps & ~VALID_SCS_CAPS) { - ERR("\n"); + ERR("Bad flags\n"); return FALSE; } if (pImeInfo->fdwSelectCaps & ~VALID_SELECT_CAPS) { - ERR("\n"); + ERR("Bad flags\n"); return FALSE; } @@ -223,7 +223,7 @@ BOOL APIENTRY Imm32LoadIME(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) fn = GetProcAddress(hIME, #name); \ if (fn) pImeDpi->name = (FN_##name)fn; \ else if (!(optional)) { \ - ERR("'%s' not found in the IME module '%s'.\n", #name, debugstr_w(szPath)); \ + ERR("'%s' not found in IME module '%s'.\n", #name, debugstr_w(szPath)); \ goto Failed; \ } \ } while (0); @@ -236,7 +236,6 @@ BOOL APIENTRY Imm32LoadIME(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) } else { - ERR("Imm32InquireIme failed\n"); Failed: ret = FALSE; FreeLibrary(pImeDpi->hInst); @@ -274,7 +273,10 @@ PIMEDPI APIENTRY Imm32LoadImeDpi(HKL hKL, BOOL bLock) LCID lcid; if (!IS_IME_HKL(hKL)) + { + TRACE("\n"); return NULL; + } if (!ImmGetImeInfoEx(&ImeInfoEx, ImeInfoExKeyboardLayout, &hKL)) { @@ -344,7 +346,7 @@ PIMEDPI APIENTRY Imm32FindOrLoadImeDpi(HKL hKL) if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || IS_16BIT_MODE())) { - ERR("\n"); + TRACE("\n"); return NULL; } @@ -453,7 +455,10 @@ LRESULT WINAPI ImmPutImeMenuItemsIntoMappedFile(HIMC hIMC) hMapping = OpenFileMappingW(FILE_MAP_ALL_ACCESS, FALSE, L"ImmMenuInfo"); pView = MapViewOfFile(hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0); - if (!pView || pView->dwVersion != 1) + if (IS_NULL_UNEXPECTEDLY(pView)) + goto Quit; + + if (pView->dwVersion != 1) { ERR("\n"); goto Quit; @@ -798,7 +803,10 @@ HKL WINAPI ImmInstallIMEW(LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText) if (cLayouts) { pLayouts = ImmLocalAlloc(0, cLayouts * sizeof(REG_IME)); - if (!pLayouts || !Imm32GetImeLayout(pLayouts, cLayouts)) + if (IS_NULL_UNEXPECTEDLY(pLayouts)) + return NULL; + + if (!Imm32GetImeLayout(pLayouts, cLayouts)) { ERR("\n"); ImmLocalFree(pLayouts); @@ -883,7 +891,7 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { if (!IS_IMM_MODE()) { - WARN("\n"); + TRACE("\n"); return NULL; } @@ -1088,7 +1096,10 @@ UINT WINAPI ImmGetDescriptionA(HKL hKL, LPSTR lpszDescription, UINT uBufLen) TRACE("(%p,%p,%d)\n", hKL, lpszDescription, uBufLen); if (!IS_IME_HKL(hKL)) + { + TRACE("\n"); return 0; + } if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL)) { @@ -1115,7 +1126,10 @@ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) TRACE("(%p, %p, %d)\n", hKL, lpszDescription, uBufLen); if (!IS_IME_HKL(hKL)) + { + TRACE("\n"); return 0; + } if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL)) { @@ -1143,6 +1157,7 @@ UINT WINAPI ImmGetIMEFileNameA( HKL hKL, LPSTR lpszFileName, UINT uBufLen) if (!IS_IME_HKL(hKL)) { + TRACE("\n"); if (uBufLen > 0) lpszFileName[0] = 0; return 0; @@ -1182,6 +1197,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) if (!IS_IME_HKL(hKL)) { + TRACE("\n"); if (uBufLen > 0) lpszFileName[0] = 0; return 0; @@ -1221,7 +1237,10 @@ DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex) TRACE("(%p, %lu)\n", hKL, fdwIndex); if (!IS_IME_HKL(hKL)) + { + TRACE("\n"); return FALSE; + } if (!ImmGetImeInfoEx(&ImeInfoEx, ImeInfoExKeyboardLayout, &hKL)) { diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 117384111be..27d80d3a82d 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -90,7 +90,10 @@ BOOL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) pImeInfoEx->fLoadFlag = 0; - if (IS_ERROR_UNEXPECTEDLY(error) || dwType != REG_SZ) + if (IS_ERROR_UNEXPECTEDLY(error)) + return FALSE; + + if (dwType != REG_SZ) { ERR("\n"); return FALSE; @@ -145,7 +148,7 @@ BOOL WINAPI ImmFreeLayout(DWORD dwUnknown) StringCchPrintfW(szKBD, _countof(szKBD), L"%08X", LangID); if (!LoadKeyboardLayoutW(szKBD, KLF_ACTIVATE)) { - WARN("\n"); + WARN("Default to English US\n"); LoadKeyboardLayoutW(L"00000409", KLF_ACTIVATE | 0x200); } } @@ -497,7 +500,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (!IS_IMM_MODE()) { - WARN("\n"); + TRACE("\n"); return NULL; } @@ -546,7 +549,7 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) if (!IS_IMM_MODE()) { - WARN("\n"); + TRACE("\n"); return FALSE; } @@ -594,7 +597,7 @@ HIMC WINAPI ImmCreateContext(void) if (!IS_IMM_MODE()) { - WARN("\n"); + TRACE("\n"); return NULL; } @@ -651,7 +654,7 @@ BOOL APIENTRY Imm32DestroyInputContext(HIMC hIMC, HKL hKL, BOOL bKeep) if (!IS_IMM_MODE()) { - WARN("\n"); + TRACE("\n"); return FALSE; } @@ -661,7 +664,7 @@ BOOL APIENTRY Imm32DestroyInputContext(HIMC hIMC, HKL hKL, BOOL bKeep) if (pIMC->head.pti != Imm32CurrentPti()) { - ERR("\n"); + ERR("Thread mismatch\n"); return FALSE; } @@ -674,7 +677,7 @@ BOOL APIENTRY Imm32DestroyInputContext(HIMC hIMC, HKL hKL, BOOL bKeep) if ((pClientImc->dwFlags & CLIENTIMC_UNKNOWN2) && !bKeep) { - ERR("\n"); + ERR("Can't destroy for CLIENTIMC_UNKNOWN2\n"); return FALSE; } @@ -875,7 +878,7 @@ LPINPUTCONTEXT APIENTRY Imm32InternalLockIMC(HIMC hIMC, BOOL fSelect) if (!NtUserQueryInputContext(hIMC, QIC_DEFAULTWINDOWIME)) { - ERR("\n"); + ERR("No default IME window\n"); goto Failure; } @@ -891,7 +894,6 @@ LPINPUTCONTEXT APIENTRY Imm32InternalLockIMC(HIMC hIMC, BOOL fSelect) hNewKL = GetKeyboardLayout(dwThreadId); if (!Imm32CreateInputContext(hIMC, pIC, pClientImc, hNewKL, fSelect)) { - ERR("\n"); LocalUnlock(hIC); pClientImc->hInputContext = LocalFree(hIC); goto Failure; @@ -920,7 +922,7 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) if (!IS_IMM_MODE()) { - WARN("\n"); + TRACE("\n"); return FALSE; } @@ -1175,7 +1177,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) if (!IS_IMM_MODE()) { - WARN("\n"); + TRACE("\n"); return FALSE; } diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 8e1cac90154..c759176e7d6 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -457,7 +457,7 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA if (dwCommand == 0 || dwCommand > IMR_DOCUMENTFEED) { - ERR("\n"); + ERR("Out of boundary\n"); return 0; /* Out of range */ } @@ -475,7 +475,7 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA pRS = pData; if (pRS && (pRS->dwVersion != 0 || pRS->dwSize < sizeof(RECONVERTSTRING))) { - ERR("\n"); + ERR("Invalid pRS\n"); return 0; } break; @@ -484,17 +484,14 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA pRS = pData; if (!pRS || pRS->dwVersion != 0) { - ERR("\n"); + ERR("Invalid pRS\n"); return 0; } break; default: - if (!pData) - { - ERR("\n"); + if (IS_NULL_UNEXPECTEDLY(pData)) return 0; - } break; } @@ -585,7 +582,7 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA break; default: - WARN("\n"); + WARN("0x%X\n", dwCommand); break; } @@ -634,7 +631,7 @@ DoIt: break; default: - WARN("\n"); + WARN("0x%X\n", dwCommand); break; } @@ -884,7 +881,7 @@ LRESULT WINAPI ImmSystemHandler(HIMC hIMC, WPARAM wParam, LPARAM lParam) return CtfImmSetLangBand((HWND)lParam, (wParam == IMS_SETLANGBAND)); default: - WARN("\n"); + WARN("%p\n", wParam); return 0; } } diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index b98697358e9..cd7cfd56bd2 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -73,7 +73,7 @@ BOOL APIENTRY Imm32IsSystemJapaneseOrKorean(VOID) WORD wPrimary = PRIMARYLANGID(LangID); if (wPrimary != LANG_JAPANESE || wPrimary != LANG_KOREAN) { - WARN("\n"); + TRACE("The country has no special IME support\n"); return FALSE; } return TRUE; @@ -104,7 +104,7 @@ HBITMAP Imm32LoadBitmapFromBytes(const BYTE *pb) hbm = CreateDIBSection(NULL, (LPBITMAPINFO)pbmci, DIB_RGB_COLORS, &pvBits, NULL, 0); if (!hbm || !GetObject(hbm, sizeof(BITMAP), &bm)) { - ERR("\n"); + ERR("Invalid bitmap\n"); return NULL; } @@ -117,7 +117,7 @@ HBITMAP Imm32LoadBitmapFromBytes(const BYTE *pb) cColors = 0; break; default: - ERR("\n"); + ERR("Invalid bitmap\n"); DeleteObject(hbm); return NULL; } @@ -131,7 +131,7 @@ HBITMAP Imm32LoadBitmapFromBytes(const BYTE *pb) ib += bm.bmWidthBytes * bm.bmHeight; if (ib > cbBytes) { - ERR("\n"); + ERR("Invalid bitmap\n"); DeleteObject(hbm); return NULL; } @@ -153,7 +153,7 @@ BOOL Imm32StoreBitmapToBytes(HBITMAP hbm, LPBYTE pbData, DWORD cbDataMax) if (!GetObject(hbm, sizeof(BITMAP), &bm)) { - ERR("\n"); + ERR("Invalid bitmap\n"); return FALSE; } @@ -173,7 +173,7 @@ BOOL Imm32StoreBitmapToBytes(HBITMAP hbm, LPBYTE pbData, DWORD cbDataMax) cColors = 0; break; default: - ERR("\n"); + ERR("Invalid bitmap\n"); return FALSE; } @@ -183,7 +183,7 @@ BOOL Imm32StoreBitmapToBytes(HBITMAP hbm, LPBYTE pbData, DWORD cbDataMax) cbBytes += bm.bmWidthBytes * bm.bmHeight; if (cbBytes > cbDataMax) { - ERR("\n"); + ERR("Too small\n"); return FALSE; } @@ -287,7 +287,7 @@ BOOL Imm32GetSystemLibraryPath(LPWSTR pszPath, DWORD cchPath, LPCWSTR pszFileNam { if (!pszFileName[0] || !GetSystemDirectoryW(pszPath, cchPath)) { - ERR("\n"); + ERR("Invalid filename\n"); return FALSE; } StringCchCatW(pszPath, cchPath, L"\\"); @@ -345,7 +345,7 @@ LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType) if (!NtUserValidateHandleSecure(hObject)) { - WARN("\n"); + WARN("Not a handle\n"); return NULL; } @@ -485,7 +485,7 @@ DWORD APIENTRY Imm32BuildHimcList(DWORD dwThreadId, HIMC **pphList) if (NT_ERROR(Status) || !dwCount) { - ERR("\n"); + ERR("Abnormal status\n"); ImmLocalFree(phNewList); return 0; } @@ -645,7 +645,7 @@ Imm32ReconvertWideFromAnsi(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, if (pDest->dwSize < cbDest) { - ERR("\n"); + ERR("Too small\n"); return 0; } @@ -695,7 +695,10 @@ Imm32ReconvertAnsiFromWide(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, LPSTR pchDest; if (pSrc->dwVersion != 0) + { + ERR("\n"); return 0; + } cchDest = WideCharToMultiByte(uCodePage, 0, pchSrc, pSrc->dwStrLen, NULL, 0, NULL, NULL); @@ -705,7 +708,7 @@ Imm32ReconvertAnsiFromWide(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, if (pDest->dwSize < cbDest) { - ERR("\n"); + ERR("Too small\n"); return 0; } @@ -764,14 +767,14 @@ static BOOL APIENTRY Imm32LoadImeFixedInfo(PIMEINFOEX pInfoEx, LPCVOID pVerInfo) VS_FIXEDFILEINFO *pFixed; if (!s_fnVerQueryValueW(pVerInfo, L"\\", (LPVOID*)&pFixed, &cbFixed) || !cbFixed) { - ERR("\n"); + ERR("Fixed version info not available\n"); return FALSE; } /* NOTE: The IME module must contain a version info of input method driver. */ if (pFixed->dwFileType != VFT_DRV || pFixed->dwFileSubtype != VFT2_DRV_INPUTMETHOD) { - ERR("\n"); + ERR("DLL is not an IME\n"); return FALSE; } @@ -811,7 +814,7 @@ BOOL APIENTRY Imm32LoadImeLangAndDesc(PIMEINFOEX pInfoEx, LPCVOID pVerInfo) ret = s_fnVerQueryValueW(pVerInfo, L"\\VarFileInfo\\Translation", (LPVOID*)&pw, &cbData); if (!ret || !cbData) { - ERR("\n"); + ERR("Translation not available\n"); return FALSE; } @@ -978,10 +981,7 @@ UINT APIENTRY Imm32GetImeLayout(PREG_IME pLayouts, UINT cLayouts) lError = RegOpenKeyW(hkeyLayouts, szImeKey, &hkeyIME); /* Open the IME key */ if (IS_ERROR_UNEXPECTEDLY(lError)) - { - WARN("\n"); continue; - } /* Load the "Ime File" value */ szImeFileName[0] = 0; @@ -1000,7 +1000,7 @@ UINT APIENTRY Imm32GetImeLayout(PREG_IME pLayouts, UINT cLayouts) Imm32StrToUInt(szImeKey, &Value, 16); hKL = (HKL)(DWORD_PTR)Value; - if (!IS_IME_HKL(hKL)) + if (!IS_IME_HKL(hKL)) /* Not an IME */ { WARN("\n"); continue; @@ -1093,7 +1093,7 @@ BOOL APIENTRY Imm32WriteImeLayout(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayou if (iPreload >= MAX_PRELOAD) /* Not found */ { - WARN("\n"); + ERR("\n"); RegCloseKey(hkeyPreload); return FALSE; }

1 0

[reactos] 01/01: [WIN32SS] Use GDI_HANDLE_* macros for readability (#4797)
by Thamatip Chitpong 26 Oct '22

26 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd75ae8eca21320cdf9f5… commit dd75ae8eca21320cdf9f5a225e87c8d187ee4b58 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Wed Oct 26 07:17:01 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 26 02:17:01 2022 +0200 [WIN32SS] Use GDI_HANDLE_* macros for readability (#4797) --- win32ss/gdi/gdi32/misc/misc.c | 2 +- win32ss/gdi/gdi32/objects/gdiobj.c | 2 +- win32ss/gdi/ntgdi/palette.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/win32ss/gdi/gdi32/misc/misc.c b/win32ss/gdi/gdi32/misc/misc.c index f753e9bde0f..a1006c7b832 100644 --- a/win32ss/gdi/gdi32/misc/misc.c +++ b/win32ss/gdi/gdi32/misc/misc.c @@ -735,7 +735,7 @@ GdiFixUpHandle(HGDIOBJ hGdiObj) { PGDI_TABLE_ENTRY Entry; - if (((ULONG_PTR)(hGdiObj)) & GDI_HANDLE_UPPER_MASK ) + if (GDI_HANDLE_GET_UPPER(hGdiObj)) { return hGdiObj; } diff --git a/win32ss/gdi/gdi32/objects/gdiobj.c b/win32ss/gdi/gdi32/objects/gdiobj.c index 5f8d8e1f6c3..c1b6c2abe07 100644 --- a/win32ss/gdi/gdi32/objects/gdiobj.c +++ b/win32ss/gdi/gdi32/objects/gdiobj.c @@ -320,7 +320,7 @@ DeleteObject(HGDIOBJ hObject) return FALSE; /* Check if this is a stock object */ - if ((DWORD_PTR)hObject & GDI_HANDLE_STOCK_MASK) + if (GDI_HANDLE_IS_STOCKOBJ(hObject)) { /* Ignore the attempt to delete a stock object */ DPRINT1("Trying to delete system object 0x%p\n", hObject); diff --git a/win32ss/gdi/ntgdi/palette.c b/win32ss/gdi/ntgdi/palette.c index de0fe9c66c8..ac8b625792f 100644 --- a/win32ss/gdi/ntgdi/palette.c +++ b/win32ss/gdi/ntgdi/palette.c @@ -961,7 +961,7 @@ IntSetPaletteEntries( PPALETTE palGDI; ULONG numEntries; - if ((UINT_PTR)hpal & GDI_HANDLE_STOCK_MASK) + if (GDI_HANDLE_IS_STOCKOBJ(hpal)) { return 0; } @@ -1245,7 +1245,7 @@ NtGdiUnrealizeObject(HGDIOBJ hgdiobj) PPALETTE palGDI; if ( !hgdiobj || - ((UINT_PTR)hgdiobj & GDI_HANDLE_STOCK_MASK) || + GDI_HANDLE_IS_STOCKOBJ(hgdiobj) || !GDI_HANDLE_IS_TYPE(hgdiobj, GDI_OBJECT_TYPE_PALETTE) ) return Ret;

1 0

[reactos] 01/01: [NTOS:MM] MmPurgeSegment: Fix wrong return value (#4801)
by Adam Słaboń 26 Oct '22

26 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23e5d3fe251213bb5aeb7… commit 23e5d3fe251213bb5aeb7cac0637ad2b3864208e Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Wed Oct 26 02:15:16 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 26 02:15:16 2022 +0200 [NTOS:MM] MmPurgeSegment: Fix wrong return value (#4801) Return TRUE instead of NTSTATUS code which has a value of FALSE and may confuse caller. Fixes sporadic 0x7B bugcheck when booting from corrupted NTFS volume using WinXP ntfs.sys. --- ntoskrnl/mm/section.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 0ab7da4a648..1859d5ea6f1 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -4739,7 +4739,7 @@ MmPurgeSegment( if (!Segment) { /* Nothing to purge */ - return STATUS_SUCCESS; + return TRUE; } PurgeStart.QuadPart = Offset ? Offset->QuadPart : 0LL;

1 0

[reactos] 01/01: [NTDLL:CSR] Don't hardcode types in sizeofs; move local variables into code blocks where they are used.
by Hermès Bélusca-Maïto 25 Oct '22

25 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7744236893499fecb422… commit e7744236893499fecb422a6f303657cdcd58d11e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 23 01:48:20 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 26 01:45:26 2022 +0200 [NTDLL:CSR] Don't hardcode types in sizeofs; move local variables into code blocks where they are used. --- dll/ntdll/csr/capture.c | 10 ++++------ dll/ntdll/csr/connect.c | 35 +++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dll/ntdll/csr/capture.c b/dll/ntdll/csr/capture.c index 1a388d467a4..9252a521f0a 100644 --- a/dll/ntdll/csr/capture.c +++ b/dll/ntdll/csr/capture.c @@ -261,7 +261,7 @@ CsrCaptureMessageString(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, /* Null-terminate the string if we don't take up the whole space */ if (CapturedString->Length < CapturedString->MaximumLength) - CapturedString->Buffer[CapturedString->Length] = '\0'; + CapturedString->Buffer[CapturedString->Length] = ANSI_NULL; } static VOID @@ -277,11 +277,9 @@ CsrCaptureMessageUnicodeStringInPlace(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, String->MaximumLength, (PSTRING)String); - /* Null-terminate the string */ - if (String->MaximumLength >= String->Length + sizeof(WCHAR)) - { - String->Buffer[String->Length / sizeof(WCHAR)] = L'\0'; - } + /* Null-terminate the string if we don't take up the whole space */ + if (String->Length + sizeof(WCHAR) <= String->MaximumLength) + String->Buffer[String->Length / sizeof(WCHAR)] = UNICODE_NULL; } /* diff --git a/dll/ntdll/csr/connect.c b/dll/ntdll/csr/connect.c index f9d007b701f..98033274e44 100644 --- a/dll/ntdll/csr/connect.c +++ b/dll/ntdll/csr/connect.c @@ -49,7 +49,7 @@ CsrpConnectToServer(IN PWSTR ObjectDirectory) SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; PSID SystemSid = NULL; CSR_API_CONNECTINFO ConnectionInfo; - ULONG ConnectionInfoLength = sizeof(CSR_API_CONNECTINFO); + ULONG ConnectionInfoLength = sizeof(ConnectionInfo); DPRINT("%s(%S)\n", __FUNCTION__, ObjectDirectory); @@ -100,13 +100,13 @@ CsrpConnectToServer(IN PWSTR ObjectDirectory) } /* Set up the port view structures to match them with the section */ - LpcWrite.Length = sizeof(PORT_VIEW); + LpcWrite.Length = sizeof(LpcWrite); LpcWrite.SectionHandle = CsrSectionHandle; LpcWrite.SectionOffset = 0; LpcWrite.ViewSize = CsrSectionViewSize.u.LowPart; LpcWrite.ViewBase = 0; LpcWrite.ViewRemoteBase = 0; - LpcRead.Length = sizeof(REMOTE_PORT_VIEW); + LpcRead.Length = sizeof(LpcRead); LpcRead.ViewSize = 0; LpcRead.ViewBase = 0; @@ -202,12 +202,6 @@ CsrClientConnectToServer(IN PWSTR ObjectDirectory, { NTSTATUS Status; PIMAGE_NT_HEADERS NtHeader; - UNICODE_STRING CsrSrvName; - HANDLE hCsrSrv; - ANSI_STRING CsrServerRoutineName; - CSR_API_MESSAGE ApiMessage; - PCSR_CLIENT_CONNECT ClientConnect = &ApiMessage.Data.CsrClientConnect; - PCSR_CAPTURE_BUFFER CaptureBuffer; DPRINT("CsrClientConnectToServer: %lx %p\n", ServerId, ConnectionInfo); @@ -241,8 +235,11 @@ CsrClientConnectToServer(IN PWSTR ObjectDirectory, /* Now we can check if we are inside or not */ if (InsideCsrProcess) { + UNICODE_STRING CsrSrvName; + HANDLE hCsrSrv; + ANSI_STRING CsrServerRoutineName; + /* We're inside, so let's find csrsrv */ - DPRINT("Next-GEN CSRSS support\n"); RtlInitUnicodeString(&CsrSrvName, L"csrsrv"); Status = LdrGetDllHandle(NULL, NULL, @@ -267,6 +264,10 @@ CsrClientConnectToServer(IN PWSTR ObjectDirectory, /* Now check if connection info is given */ if (ConnectionInfo) { + CSR_API_MESSAGE ApiMessage; + PCSR_CLIENT_CONNECT ClientConnect = &ApiMessage.Data.CsrClientConnect; + PCSR_CAPTURE_BUFFER CaptureBuffer; + /* Well, we're definitely in a client now */ InsideCsrProcess = FALSE; @@ -307,7 +308,7 @@ CsrClientConnectToServer(IN PWSTR ObjectDirectory, Status = CsrClientCallServer(&ApiMessage, CaptureBuffer, CSR_CREATE_API_NUMBER(CSRSRV_SERVERDLL_INDEX, CsrpClientConnect), - sizeof(CSR_CLIENT_CONNECT)); + sizeof(*ClientConnect)); /* Copy the updated connection info data back into the user buffer */ RtlMoveMemory(ConnectionInfo, @@ -368,8 +369,6 @@ CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, IN ULONG DataLength) { NTSTATUS Status; - ULONG PointerCount; - PULONG_PTR OffsetPointer; /* Make sure the length is valid */ if (DataLength > (MAXSHORT - sizeof(CSR_API_MESSAGE))) @@ -397,6 +396,9 @@ CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, /* Check if we are already inside a CSR Server */ if (!InsideCsrProcess) { + ULONG PointerCount; + PULONG_PTR OffsetPointer; + /* Check if we got a Capture Buffer */ if (CaptureBuffer) { @@ -471,12 +473,13 @@ CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, } else { - /* This is a server-to-server call. Save our CID and do a direct call. */ - DPRINT("Next gen server-to-server call\n"); + /* This is a server-to-server call */ + DPRINT("Server-to-server call\n"); - /* We check this equality inside CsrValidateMessageBuffer */ + /* Save our CID; we check this equality inside CsrValidateMessageBuffer */ ApiMessage->Header.ClientId = NtCurrentTeb()->ClientId; + /* Do a direct call */ Status = CsrServerApiRoutine(&ApiMessage->Header, &ApiMessage->Header);

1 0

[reactos] 04/04: [SMSS] Initial SmpInit() call initializes the *first handle* (index 0) in the array.
by Hermès Bélusca-Maïto 25 Oct '22

25 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb8c8693e0907cbd9be9a… commit cb8c8693e0907cbd9be9a7235ed62c5f77adb5cf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 23 18:38:56 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 26 00:44:41 2022 +0200 [SMSS] Initial SmpInit() call initializes the *first handle* (index 0) in the array. --- base/system/smss/smss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/system/smss/smss.c b/base/system/smss/smss.c index 27b8306b87e..d568becc6dc 100644 --- a/base/system/smss/smss.c +++ b/base/system/smss/smss.c @@ -472,7 +472,7 @@ _main(IN INT argc, _SEH2_TRY { /* Initialize SMSS */ - Status = SmpInit(&InitialCommand, Handles); + Status = SmpInit(&InitialCommand, &Handles[0]); if (!NT_SUCCESS(Status)) { DPRINT1("SMSS: SmpInit return failure - Status == %x\n", Status);

1 0

[reactos] 03/04: [NTDLL] Properly stub out RtlRegisterThreadWithCsrss() in spec file.
by Hermès Bélusca-Maïto 25 Oct '22

25 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cfb71baf86e19dcecfb1… commit 5cfb71baf86e19dcecfb1d663366387a4ad6cb34 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 23 18:03:16 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 26 00:43:57 2022 +0200 [NTDLL] Properly stub out RtlRegisterThreadWithCsrss() in spec file. --- dll/ntdll/def/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 3cd201aa3d4..30f9a4c7a1e 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -1100,7 +1100,7 @@ @ stdcall RtlRealPredecessor(ptr) @ stdcall RtlRealSuccessor(ptr) @ stdcall RtlRegisterSecureMemoryCacheCallback(ptr) -@ stub -version=0x600+ RtlRegisterThreadWithCsrss +@ stdcall -stub -version=0x600+ RtlRegisterThreadWithCsrss() @ stdcall RtlRegisterWait(ptr ptr ptr ptr long long) @ stdcall RtlReleaseActivationContext(ptr) @ stdcall RtlReleaseMemoryStream(ptr)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs