Ros-diffs July 2023

ros-diffs@reactos.org

26 participants
189 discussions

[reactos] 06/11: [WINESYNC][WINMM] Allow new sounds to interrupt previous PlaySound invocations

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41874cccc5452f94b1159… commit 41874cccc5452f94b1159c5ca0dd9d17822245fb Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Wed Jun 14 08:49:32 2023 +0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 13:36:21 2023 +0300 [WINESYNC][WINMM] Allow new sounds to interrupt previous PlaySound invocations Wine commit: 197607db2e06f28b666da9ce88b69c9994c1bb65 author: Jörg Höhle <hoehle(a)users.sourceforge.net> Tue, 14 Feb 2012 18:27:30 +0000 (19:27 +0100) committer: Alexandre Julliard <julliard(a)winehq.org> Thu, 16 Feb 2012 17:51:56 +0000 (18:51 +0100) --- dll/win32/winmm/playsound.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/dll/win32/winmm/playsound.c b/dll/win32/winmm/playsound.c index c41479d187f..1a13a020008 100644 --- a/dll/win32/winmm/playsound.c +++ b/dll/win32/winmm/playsound.c @@ -31,10 +31,10 @@ typedef struct tagWINE_PLAYSOUND { unsigned bLoop : 1; HMMIO hmmio; - struct tagWINE_PLAYSOUND* lpNext; + HWAVEOUT hWave; } WINE_PLAYSOUND; -static WINE_PLAYSOUND *PlaySoundList; +static WINE_PLAYSOUND *PlaySoundCurrent; static BOOL bPlaySoundStop; static HMMIO get_mmioFromFile(LPCWSTR lpszName) @@ -369,12 +369,9 @@ static BOOL PlaySound_IsString(DWORD fdwSound, const void* psz) static void PlaySound_Free(WINE_PLAYSOUND* wps) { - WINE_PLAYSOUND** p; - EnterCriticalSection(&WINMM_cs); - for (p = &PlaySoundList; *p && *p != wps; p = &((*p)->lpNext)); - if (*p) *p = (*p)->lpNext; - if (PlaySoundList == NULL) SetEvent(psLastEvent); + PlaySoundCurrent = NULL; + SetEvent(psLastEvent); LeaveCriticalSection(&WINMM_cs); if (wps->hmmio) mmioClose(wps->hmmio, 0); HeapFree(GetProcessHeap(), 0, wps); @@ -475,7 +472,7 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (!s.hEvent) + if (!s.hEvent || bPlaySoundStop) goto errCleanUp; if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, @@ -499,6 +496,7 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) goto errCleanUp; } + wps->hWave = hWave; s.dwEventCount = 1L; /* for first buffer */ index = 0; @@ -510,7 +508,6 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) { if (bPlaySoundStop) { - waveOutReset(hWave); wps->bLoop = FALSE; break; } @@ -540,7 +537,15 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) errCleanUp: TRACE("Done playing sound => %s!\n", bRet ? "ok" : "ko"); HeapFree(GetProcessHeap(), 0, lpWaveFormat); - if (hWave) while (waveOutClose(hWave) == WAVERR_STILLPLAYING) Sleep(100); + if (hWave) + { + EnterCriticalSection(&WINMM_cs); + /* the CS prevents a concurrent waveOutReset */ + wps->hWave = 0; + LeaveCriticalSection(&WINMM_cs); + while (waveOutClose(hWave) == WAVERR_STILLPLAYING) + Sleep(100); + } CloseHandle(s.hEvent); HeapFree(GetProcessHeap(), 0, waveHdr); @@ -585,7 +590,7 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo pszSound, hmod, fdwSound); /* SND_NOWAIT is ignored in w95/2k/xp. */ - if ((fdwSound & SND_NOSTOP) && PlaySoundList != NULL) + if ((fdwSound & SND_NOSTOP) && PlaySoundCurrent != NULL) return FALSE; /* alloc internal structure, if we need to play something */ @@ -599,12 +604,14 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo /* since several threads can enter PlaySound in parallel, we're not * sure, at this point, that another thread didn't start a new playsound */ - while (PlaySoundList != NULL) + while (PlaySoundCurrent != NULL) { ResetEvent(psLastEvent); /* FIXME: doc says we have to stop all instances of pszSound if it's non * NULL... as of today, we stop all playing instances */ bPlaySoundStop = TRUE; + if (PlaySoundCurrent->hWave) + waveOutReset(PlaySoundCurrent->hWave); LeaveCriticalSection(&WINMM_cs); WaitForSingleObject(psLastEvent, INFINITE); @@ -613,8 +620,7 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo bPlaySoundStop = FALSE; } - if (wps) wps->lpNext = PlaySoundList; - PlaySoundList = wps; + PlaySoundCurrent = wps; LeaveCriticalSection(&WINMM_cs); if (!wps) return TRUE;

1 year, 5 months

[reactos] 05/11: [WINESYNC][WINMM] PlaySound concurrency cleanup

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c5cacf8a0970ee2423b3… commit 8c5cacf8a0970ee2423b3504a123d5a06bc09ea4 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Wed Jun 14 08:31:05 2023 +0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 13:36:20 2023 +0300 [WINESYNC][WINMM] PlaySound concurrency cleanup Wine commit: e0dcc2cd7d4495b7056a47ada1af74cc7c318ef2 author: Jörg Höhle <hoehle(a)users.sourceforge.net> Mon, 28 Mar 2011 20:34:02 +0000 (22:34 +0200) committer: Alexandre Julliard <julliard(a)winehq.org> Wed, 30 Mar 2011 11:28:04 +0000 (13:28 +0200) --- dll/win32/winmm/playsound.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dll/win32/winmm/playsound.c b/dll/win32/winmm/playsound.c index d0819b65f9b..c41479d187f 100644 --- a/dll/win32/winmm/playsound.c +++ b/dll/win32/winmm/playsound.c @@ -452,6 +452,8 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); + if (!lpWaveFormat) + goto errCleanUp; if (mmioRead(wps->hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(PCMWAVEFORMAT)) goto errCleanUp; @@ -473,6 +475,8 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!s.hEvent) + goto errCleanUp; if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, (DWORD_PTR)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) @@ -482,6 +486,8 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) bufsize = (((lpWaveFormat->nAvgBytesPerSec / 3) - 1) / lpWaveFormat->nBlockAlign + 1) * lpWaveFormat->nBlockAlign; waveHdr = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(WAVEHDR) + 2 * bufsize); + if (!waveHdr) + goto errCleanUp; waveHdr[0].lpData = (char*)waveHdr + 2 * sizeof(WAVEHDR); waveHdr[1].lpData = (char*)waveHdr + 2 * sizeof(WAVEHDR) + bufsize; waveHdr[0].dwUser = waveHdr[1].dwUser = 0L; @@ -533,10 +539,10 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) errCleanUp: TRACE("Done playing sound => %s!\n", bRet ? "ok" : "ko"); - CloseHandle(s.hEvent); - HeapFree(GetProcessHeap(), 0, waveHdr); HeapFree(GetProcessHeap(), 0, lpWaveFormat); if (hWave) while (waveOutClose(hWave) == WAVERR_STILLPLAYING) Sleep(100); + CloseHandle(s.hEvent); + HeapFree(GetProcessHeap(), 0, waveHdr); PlaySound_Free(wps); @@ -611,7 +617,7 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo PlaySoundList = wps; LeaveCriticalSection(&WINMM_cs); - if (!pszSound || (fdwSound & SND_PURGE)) return TRUE; + if (!wps) return TRUE; if (fdwSound & SND_ASYNC) {

1 year, 5 months

[reactos] 04/11: [WINESYNC][WINMM] Get rid of psStopEvent which was never used like an event

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ede1cf426407603f1b645… commit ede1cf426407603f1b645bd7bdf10e0ec0937bc0 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Wed Jun 14 08:11:01 2023 +0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 13:36:20 2023 +0300 [WINESYNC][WINMM] Get rid of psStopEvent which was never used like an event Wine commit: a0dbd846c6cf111d20718170e9de2f7681d8fadf author: Jörg Höhle <hoehle(a)users.sourceforge.net> Sat, 26 Mar 2011 11:36:49 +0000 (12:36 +0100) committer: Alexandre Julliard <julliard(a)winehq.org> Wed, 30 Mar 2011 11:28:04 +0000 (13:28 +0200) --- dll/win32/winmm/playsound.c | 7 ++++--- dll/win32/winmm/winmm.c | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dll/win32/winmm/playsound.c b/dll/win32/winmm/playsound.c index 425b50d1603..d0819b65f9b 100644 --- a/dll/win32/winmm/playsound.c +++ b/dll/win32/winmm/playsound.c @@ -35,6 +35,7 @@ typedef struct tagWINE_PLAYSOUND } WINE_PLAYSOUND; static WINE_PLAYSOUND *PlaySoundList; +static BOOL bPlaySoundStop; static HMMIO get_mmioFromFile(LPCWSTR lpszName) { @@ -501,7 +502,7 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) mmioSeek(wps->hmmio, mmckInfo.dwDataOffset, SEEK_SET); while (left) { - if (WaitForSingleObject(psStopEvent, 0) == WAIT_OBJECT_0) + if (bPlaySoundStop) { waveOutReset(hWave); wps->bLoop = FALSE; @@ -597,13 +598,13 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo ResetEvent(psLastEvent); /* FIXME: doc says we have to stop all instances of pszSound if it's non * NULL... as of today, we stop all playing instances */ - SetEvent(psStopEvent); + bPlaySoundStop = TRUE; LeaveCriticalSection(&WINMM_cs); WaitForSingleObject(psLastEvent, INFINITE); EnterCriticalSection(&WINMM_cs); - ResetEvent(psStopEvent); + bPlaySoundStop = FALSE; } if (wps) wps->lpNext = PlaySoundList; diff --git a/dll/win32/winmm/winmm.c b/dll/win32/winmm/winmm.c index e055a2da031..1ecf53b5385 100644 --- a/dll/win32/winmm/winmm.c +++ b/dll/win32/winmm/winmm.c @@ -49,7 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm); HINSTANCE hWinMM32Instance; HANDLE psLastEvent; -HANDLE psStopEvent; CRITICAL_SECTION WINMM_cs; @@ -59,7 +58,6 @@ CRITICAL_SECTION WINMM_cs; static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) { hWinMM32Instance = hInstDLL; - psStopEvent = CreateEventW(NULL, TRUE, FALSE, NULL); psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); InitializeCriticalSection(&WINMM_cs); return TRUE; @@ -74,7 +72,6 @@ static void WINMM_DeleteIData(void) /* FIXME: should also free content and resources allocated * inside WINMM_IData */ - CloseHandle(psStopEvent); CloseHandle(psLastEvent); DeleteCriticalSection(&WINMM_cs); }

1 year, 5 months

[reactos] 03/11: [WINESYNC][WINMM] Revert "winmm: Fix PlaySound so it doesn't block when another sound is already playing."

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aae34dc82735838019cdd… commit aae34dc82735838019cdd2ab45561eac3d71ab5a Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Wed Jun 14 07:57:04 2023 +0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 13:36:20 2023 +0300 [WINESYNC][WINMM] Revert "winmm: Fix PlaySound so it doesn't block when another sound is already playing." Let the player thread call waveOutReset itself instead. Wine commit: 15ad749eced53e0c33454970bfc2bdb58b64f92b author: Jörg Höhle <hoehle(a)users.sourceforge.net> Sat, 26 Mar 2011 06:44:22 +0000 (07:44 +0100) committer: Alexandre Julliard <julliard(a)winehq.org> Wed, 30 Mar 2011 11:28:04 +0000 (13:28 +0200) --- dll/win32/winmm/playsound.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/winmm/playsound.c b/dll/win32/winmm/playsound.c index f6b2813d34d..425b50d1603 100644 --- a/dll/win32/winmm/playsound.c +++ b/dll/win32/winmm/playsound.c @@ -31,7 +31,6 @@ typedef struct tagWINE_PLAYSOUND { unsigned bLoop : 1; HMMIO hmmio; - HWAVEOUT hWave; struct tagWINE_PLAYSOUND* lpNext; } WINE_PLAYSOUND; @@ -427,6 +426,7 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) MMCKINFO ckMainRIFF; MMCKINFO mmckInfo; LPWAVEFORMATEX lpWaveFormat = NULL; + HWAVEOUT hWave = 0; LPWAVEHDR waveHdr = NULL; INT count, bufsize, left, index; struct playsound_data s; @@ -473,7 +473,7 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (waveOutOpen(&wps->hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, + if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, (DWORD_PTR)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) goto errCleanUp; @@ -487,8 +487,8 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) waveHdr[0].dwLoops = waveHdr[1].dwLoops = 0L; waveHdr[0].dwFlags = waveHdr[1].dwFlags = 0L; waveHdr[0].dwBufferLength = waveHdr[1].dwBufferLength = bufsize; - if (waveOutPrepareHeader(wps->hWave, &waveHdr[0], sizeof(WAVEHDR)) || - waveOutPrepareHeader(wps->hWave, &waveHdr[1], sizeof(WAVEHDR))) { + if (waveOutPrepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR)) || + waveOutPrepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR))) { goto errCleanUp; } @@ -503,6 +503,7 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) { if (WaitForSingleObject(psStopEvent, 0) == WAIT_OBJECT_0) { + waveOutReset(hWave); wps->bLoop = FALSE; break; } @@ -510,7 +511,7 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) if (count < 1) break; left -= count; waveHdr[index].dwBufferLength = count; - if (waveOutWrite(wps->hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) { + if (waveOutWrite(hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) { index ^= 1; PlaySound_WaitDone(&s); } @@ -524,17 +525,17 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) } while (wps->bLoop); PlaySound_WaitDone(&s); /* to balance first buffer */ - waveOutReset(wps->hWave); + waveOutReset(hWave); - waveOutUnprepareHeader(wps->hWave, &waveHdr[0], sizeof(WAVEHDR)); - waveOutUnprepareHeader(wps->hWave, &waveHdr[1], sizeof(WAVEHDR)); + waveOutUnprepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR)); + waveOutUnprepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR)); errCleanUp: TRACE("Done playing sound => %s!\n", bRet ? "ok" : "ko"); CloseHandle(s.hEvent); HeapFree(GetProcessHeap(), 0, waveHdr); HeapFree(GetProcessHeap(), 0, lpWaveFormat); - if (wps->hWave) while (waveOutClose(wps->hWave) == WAVERR_STILLPLAYING) Sleep(100); + if (hWave) while (waveOutClose(hWave) == WAVERR_STILLPLAYING) Sleep(100); PlaySound_Free(wps); @@ -598,7 +599,6 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo * NULL... as of today, we stop all playing instances */ SetEvent(psStopEvent); - waveOutReset(PlaySoundList->hWave); LeaveCriticalSection(&WINMM_cs); WaitForSingleObject(psLastEvent, INFINITE); EnterCriticalSection(&WINMM_cs);

1 year, 5 months

[reactos] 02/11: [WINESYNC][WINMM] Abort PlaySound in case of audio error

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad1425593334fb740f1ba… commit ad1425593334fb740f1bae75f15cdc4e18976a31 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Wed Jun 14 07:30:42 2023 +0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 13:36:20 2023 +0300 [WINESYNC][WINMM] Abort PlaySound in case of audio error Wine commit: ca37dbcfe6309fd7caad1f53f3b76773cd0278fa author: Jörg Höhle <hoehle(a)users.sourceforge.net> Sat, 26 Mar 2011 06:36:47 +0000 (07:36 +0100) committer: Alexandre Julliard <julliard(a)winehq.org> Wed, 30 Mar 2011 11:28:04 +0000 (13:28 +0200) --- dll/win32/winmm/playsound.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dll/win32/winmm/playsound.c b/dll/win32/winmm/playsound.c index 5bb2c31be4f..f6b2813d34d 100644 --- a/dll/win32/winmm/playsound.c +++ b/dll/win32/winmm/playsound.c @@ -335,7 +335,6 @@ static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg, static void PlaySound_WaitDone(struct playsound_data* s) { for (;;) { - ResetEvent(s->hEvent); if (InterlockedDecrement(&s->dwEventCount) >= 0) break; InterlockedIncrement(&s->dwEventCount); @@ -511,17 +510,20 @@ static BOOL proc_PlaySound(WINE_PLAYSOUND *wps) if (count < 1) break; left -= count; waveHdr[index].dwBufferLength = count; - waveHdr[index].dwFlags &= ~WHDR_DONE; if (waveOutWrite(wps->hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) { index ^= 1; PlaySound_WaitDone(&s); } - else FIXME("Couldn't play header\n"); + else { + ERR("Aborting play loop, waveOutWrite error\n"); + wps->bLoop = FALSE; + break; + } } bRet = TRUE; } while (wps->bLoop); - PlaySound_WaitDone(&s); /* for last buffer */ + PlaySound_WaitDone(&s); /* to balance first buffer */ waveOutReset(wps->hWave); waveOutUnprepareHeader(wps->hWave, &waveHdr[0], sizeof(WAVEHDR));

1 year, 5 months

[reactos] 01/11: [WINESYNC][WINMM] PlaySound ignores SND_NOWAIT

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0cb3b850315da692483dc… commit 0cb3b850315da692483dce1b65e104c867bf3e2b Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Wed Jun 14 07:12:46 2023 +0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 13:36:19 2023 +0300 [WINESYNC][WINMM] PlaySound ignores SND_NOWAIT Wine commit: 0a81f12ce10f88a06e1a95523c1e4da7587fa3e9 author: Jörg Höhle <hoehle(a)users.sourceforge.net> Tue, 11 Jan 2011 22:30:34 +0000 (23:30 +0100) committer: Alexandre Julliard <julliard(a)winehq.org> Fri, 14 Jan 2011 17:26:20 +0000 (18:26 +0100) --- dll/win32/winmm/playsound.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dll/win32/winmm/playsound.c b/dll/win32/winmm/playsound.c index f0b2fe086f9..5bb2c31be4f 100644 --- a/dll/win32/winmm/playsound.c +++ b/dll/win32/winmm/playsound.c @@ -574,11 +574,9 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo TRACE("pszSound='%p' hmod=%p fdwSound=%08X\n", pszSound, hmod, fdwSound); - /* FIXME? I see no difference between SND_NOWAIT and SND_NOSTOP ! - * there could be one if several sounds can be played at once... - */ - if ((fdwSound & (SND_NOWAIT | SND_NOSTOP)) && PlaySoundList != NULL) - return FALSE; + /* SND_NOWAIT is ignored in w95/2k/xp. */ + if ((fdwSound & SND_NOSTOP) && PlaySoundList != NULL) + return FALSE; /* alloc internal structure, if we need to play something */ if (pszSound && !(fdwSound & SND_PURGE))

1 year, 5 months

[reactos] 01/01: [ZIPFLDR] Improve Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=504a122c7ae1fb8575d92… commit 504a122c7ae1fb8575d92817174f543e1de5fa42 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 6 19:32:59 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jul 6 19:32:59 2023 +0900 [ZIPFLDR] Improve Japanese (ja-JP) translation CORE-18706 --- dll/shellext/zipfldr/lang/ja-JP.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/shellext/zipfldr/lang/ja-JP.rc b/dll/shellext/zipfldr/lang/ja-JP.rc index 072a4937160..e6ae111c001 100644 --- a/dll/shellext/zipfldr/lang/ja-JP.rc +++ b/dll/shellext/zipfldr/lang/ja-JP.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL PUSHBUTTON "参照...",IDC_BROWSE,189,42,54,14 PUSHBUTTON "パスワード",IDC_PASSWORD,189,66,54,14 - LTEXT "展開するには '次へ' をクリック",IDC_STATUSTEXT,86,114,80,8 + LTEXT "展開するには '次へ' をクリック",IDC_STATUSTEXT,86,114,156,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END @@ -28,8 +28,8 @@ FONT 9, "MS UI Gothic", 400, 0, 0x0 BEGIN LTEXT "ファイルは次のディレクトリに展開されました:",IDC_STATIC,86,12,157,18 LTEXT "%s",IDC_DESTDIR,86,36,157,8 - CONTROL "展開したファイルを表示",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 - LTEXT "完了をクリックして下さい。",IDC_STATIC,86,84,84,8 + CONTROL "展開したファイルを表示",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,156,10 + LTEXT "完了をクリックして下さい。",IDC_STATIC,86,84,153,8 CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END

1 year, 5 months

[reactos] 01/01: [ATL] atlimage.h: s/IsGuidEqual/::IsEqualGUID/

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ff55ad48e68d7c05a0c4… commit 4ff55ad48e68d7c05a0c44cca808e91d5975a72f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 6 08:29:45 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jul 6 08:29:45 2023 +0900 [ATL] atlimage.h: s/IsGuidEqual/::IsEqualGUID/ CORE-18867 --- sdk/lib/atl/atlimage.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index 5d8eed02029..9765b0e70d5 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -557,7 +557,7 @@ public: // if the file type is null, get the file type from extension const GUID *FileType = &guidFileType; - if (IsGuidEqual(guidFileType, GUID_NULL)) + if (::IsEqualGUID(guidFileType, GUID_NULL)) { LPCWSTR pszExt = GetFileExtension(pszNameW); FileType = FileTypeFromExtension(pszExt); @@ -1074,7 +1074,7 @@ protected: const size_t count = _countof(table); for (size_t i = 0; i < count; ++i) { - if (IsGuidEqual(table[i].guid, *guid)) + if (::IsEqualGUID(table[i].guid, *guid)) { int num = GetEncoderClsid(table[i].mime, clsid); if (num >= 0) @@ -1116,18 +1116,6 @@ protected: return -1; // failure } - bool IsGuidEqual(const GUID& guid1, const GUID& guid2) const - { - RPC_STATUS status; - if (::UuidEqual(const_cast<GUID *>(&guid1), - const_cast<GUID *>(&guid2), &status)) - { - if (status == RPC_S_OK) - return true; - } - return false; - } - void AttachInternal(HBITMAP hBitmap, DIBOrientation eOrientation, LONG iTransColor) {

1 year, 5 months

[reactos] 01/01: [MSPAINT] s/IsGuidEqual/::IsEqualGUID/

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1f7b3f2dddd5249029b5… commit a1f7b3f2dddd5249029b5e3f8a1b4c0cba37f0d5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 6 08:24:46 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jul 6 08:24:46 2023 +0900 [MSPAINT] s/IsGuidEqual/::IsEqualGUID/ CORE-18867 --- base/applications/mspaint/atlimagedx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/atlimagedx.h b/base/applications/mspaint/atlimagedx.h index 0d56b187029..735d4716dc7 100644 --- a/base/applications/mspaint/atlimagedx.h +++ b/base/applications/mspaint/atlimagedx.h @@ -94,7 +94,7 @@ public: // if the file type is null, get the file type from extension const GUID *FileType = &guidFileType; - if (IsGuidEqual(guidFileType, GUID_NULL)) + if (::IsEqualGUID(guidFileType, GUID_NULL)) { LPCWSTR pszExt = GetFileExtension(pszNameW); FileType = FileTypeFromExtension(pszExt);

1 year, 5 months

[reactos] 01/01: [NETSTAT] Fix Traditional Chinese (zh-TW) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=818908d9d3e44e1be9295… commit 818908d9d3e44e1be9295af6aed86b185bb2a985 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Jul 6 01:56:14 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 6 01:56:14 2023 +0300 [NETSTAT] Fix Traditional Chinese (zh-TW) translation Take double-width characters into account. Addendum to 06ca384f78cf. --- base/applications/network/netstat/lang/zh-TW.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/network/netstat/lang/zh-TW.rc b/base/applications/network/netstat/lang/zh-TW.rc index 2b81153605a..618831f044e 100644 --- a/base/applications/network/netstat/lang/zh-TW.rc +++ b/base/applications/network/netstat/lang/zh-TW.rc @@ -58,20 +58,20 @@ END STRINGTABLE BEGIN IDS_ICMP4_STAT_HEADER "\nICMPv4 統計資料\n\n" - IDS_ICMP_THEADER " 已接收已傳送\n" - IDS_ICMP_MSG " 訊息 %-11lu %-10lu\n" - IDS_ICMP_ERROR " 錯誤 %-11lu %-10lu\n" - IDS_ICMP_DEST_UNREACH " 無法與目的地連線 %-11lu %-10lu\n" + IDS_ICMP_THEADER " 已接收已傳送\n" + IDS_ICMP_MSG " 訊息 %-11lu %-10lu\n" + IDS_ICMP_ERROR " 錯誤 %-11lu %-10lu\n" + IDS_ICMP_DEST_UNREACH " 無法與目的地連線 %-11lu %-10lu\n" IDS_ICMP_TIME_EXCEED " 超過時間 %-11lu %-10lu\n" IDS_ICMP_PARAM_PROBLEM " 參數問題 %-11lu %-10lu\n" IDS_ICMP_SRC_QUENCHES " 來源抑制 %-11lu %-10lu\n" IDS_ICMP_REDIRECT " 重新導向 %-11lu %-10lu\n" - IDS_ICMP_ECHO " Echo %-11lu %-10lu\n" - IDS_ICMP_ECHO_REPLY " Echo 回應 %-11lu %-10lu\n" + IDS_ICMP_ECHO " Echo %-11lu %-10lu\n" + IDS_ICMP_ECHO_REPLY " Echo 回應 %-11lu %-10lu\n" IDS_ICMP_TIMESTAMP " 時間戳記 %-11lu %-10lu\n" - IDS_ICMP_TIMESTAMP_REPLY " 時間戳記回應 %-11lu %-10lu\n" + IDS_ICMP_TIMESTAMP_REPLY " 時間戳記回應 %-11lu %-10lu\n" IDS_ICMP_ADDRESSS_MASK " 位址遮罩 %-11lu %-10lu\n" - IDS_ICMP_ADDRESSS_MASK_REPLY " 位址遮罩回應 %-11lu %-10lu\n" + IDS_ICMP_ADDRESSS_MASK_REPLY " 位址遮罩回應 %-11lu %-10lu\n" END STRINGTABLE

1 year, 5 months

← Newer
1
...
11
12
13
14
15
16
17
18
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2023