wine-commits December 2020

wine-commits@winehq.org

1 participants
414 discussions

Alexandre Julliard : libport: Remove the statvfs() function replacements.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: d9a58b6013e4c8af22de0c2a494441068cbee8ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9a58b6013e4c8af22de0c2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:18:13 2020 +0100 libport: Remove the statvfs() function replacements. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 171 -------------------------------------------------- configure.ac | 27 -------- include/config.h.in | 36 ----------- include/wine/port.h | 39 ------------ libs/port/Makefile.in | 2 - libs/port/fstatvfs.c | 96 ---------------------------- libs/port/statvfs.c | 96 ---------------------------- 7 files changed, 467 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9a58b6013e4c8af22de…

1 0

Alexandre Julliard : libport: Remove the ffs() function replacement.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: c4e45400533f5d361fa56cb372f60c8fee627ef3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4e45400533f5d361fa56cb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:16:59 2020 +0100 libport: Remove the ffs() function replacement. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 5 ---- libs/port/Makefile.in | 1 - libs/port/ffs.c | 64 --------------------------------------------------- 6 files changed, 75 deletions(-) diff --git a/configure b/configure index e6596361ff1..0e3ef007a84 100755 --- a/configure +++ b/configure @@ -17754,7 +17754,6 @@ for ac_func in \ __res_getservers \ _spawnvp \ epoll_create \ - ffs \ fnmatch \ fork \ fstatfs \ diff --git a/configure.ac b/configure.ac index 705ab04295d..2b6ab1543cf 100644 --- a/configure.ac +++ b/configure.ac @@ -2163,7 +2163,6 @@ AC_CHECK_FUNCS(\ __res_getservers \ _spawnvp \ epoll_create \ - ffs \ fnmatch \ fork \ fstatfs \ diff --git a/include/config.h.in b/include/config.h.in index 7367a5ac8dd..c047fb471b4 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -162,9 +162,6 @@ /* Define to 1 if you have the <FAudio.h> header file. */ #undef HAVE_FAUDIO_H -/* Define to 1 if you have the `ffs' function. */ -#undef HAVE_FFS - /* Define to 1 if you have the <float.h> header file. */ #undef HAVE_FLOAT_H diff --git a/include/wine/port.h b/include/wine/port.h index 993cf483c15..c963abbd4e0 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -274,10 +274,6 @@ extern int getopt_long_only (int ___argc, char *const *___argv, const struct option *__longopts, int *__longind); #endif /* HAVE_GETOPT_LONG_ONLY */ -#ifndef HAVE_FFS -int ffs( int x ); -#endif - #ifndef HAVE_LSTAT int lstat(const char *file_name, struct stat *buf); #endif /* HAVE_LSTAT */ @@ -332,7 +328,6 @@ extern int mkstemps(char *template, int suffix_len); #define __WINE_NOT_PORTABLE(func) func##_is_not_portable func##_is_not_portable -#define ffs __WINE_NOT_PORTABLE(ffs) #define fstatvfs __WINE_NOT_PORTABLE(fstatvfs) #define getopt_long __WINE_NOT_PORTABLE(getopt_long) #define getopt_long_only __WINE_NOT_PORTABLE(getopt_long_only) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 435598c2856..7c9c27da1fe 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,7 +1,6 @@ STATICLIB = libwine_port.a C_SRCS = \ - ffs.c \ fstatvfs.c \ getopt.c \ isfinite.c \ diff --git a/libs/port/ffs.c b/libs/port/ffs.c deleted file mode 100644 index 76330559b5a..00000000000 --- a/libs/port/ffs.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * ffs function - * - * Copyright 2004 Hans Leidekker - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#ifndef HAVE_FFS -int ffs( int x ) -{ - unsigned int y = (unsigned int)x; - - if (y & 0x00000001) return 1; - if (y & 0x00000002) return 2; - if (y & 0x00000004) return 3; - if (y & 0x00000008) return 4; - if (y & 0x00000010) return 5; - if (y & 0x00000020) return 6; - if (y & 0x00000040) return 7; - if (y & 0x00000080) return 8; - if (y & 0x00000100) return 9; - if (y & 0x00000200) return 10; - if (y & 0x00000400) return 11; - if (y & 0x00000800) return 12; - if (y & 0x00001000) return 13; - if (y & 0x00002000) return 14; - if (y & 0x00004000) return 15; - if (y & 0x00008000) return 16; - if (y & 0x00010000) return 17; - if (y & 0x00020000) return 18; - if (y & 0x00040000) return 19; - if (y & 0x00080000) return 20; - if (y & 0x00100000) return 21; - if (y & 0x00200000) return 22; - if (y & 0x00400000) return 23; - if (y & 0x00800000) return 24; - if (y & 0x01000000) return 25; - if (y & 0x02000000) return 26; - if (y & 0x04000000) return 27; - if (y & 0x08000000) return 28; - if (y & 0x10000000) return 29; - if (y & 0x20000000) return 30; - if (y & 0x40000000) return 31; - if (y & 0x80000000) return 32; - - return 0; -} -#endif /* HAVE_FFS */

1 0

Alexandre Julliard : libport: Remove the rint() function replacements.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 335b05ac90cd2349b99e7547acd7c1df89650c57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=335b05ac90cd2349b99e7547… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:15:49 2020 +0100 libport: Remove the rint() function replacements. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/unixlib.c | 24 +++++++++++++++++++ include/wine/port.h | 24 ------------------- libs/port/Makefile.in | 1 - libs/port/rint.c | 66 --------------------------------------------------- 4 files changed, 24 insertions(+), 91 deletions(-) diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 3913d61048a..b08663f387a 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -479,7 +479,11 @@ static float CDECL unix_lgammaf(float x) */ static __int64 CDECL unix_llrint(double x) { +#ifdef HAVE_LLRINT return llrint(x); +#else + return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); +#endif } /********************************************************************* @@ -487,7 +491,11 @@ static __int64 CDECL unix_llrint(double x) */ static __int64 CDECL unix_llrintf(float x) { +#ifdef HAVE_LLRINTF return llrintf(x); +#else + return x >= 0 ? floorf(x + 0.5) : ceilf(x - 0.5); +#endif } /********************************************************************* @@ -591,7 +599,11 @@ static float CDECL unix_logbf( float x ) */ static int CDECL unix_lrint(double x) { +#ifdef HAVE_LRINT return lrint(x); +#else + return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); +#endif } /********************************************************************* @@ -599,7 +611,11 @@ static int CDECL unix_lrint(double x) */ static int CDECL unix_lrintf(float x) { +#ifdef HAVE_LRINTF return lrintf(x); +#else + return x >= 0 ? floorf(x + 0.5) : ceilf(x - 0.5); +#endif } /********************************************************************* @@ -757,7 +773,11 @@ static float CDECL unix_remquof(float x, float y, int *quo) */ static double CDECL unix_rint(double x) { +#ifdef HAVE_RINT return rint(x); +#else + return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); +#endif } /********************************************************************* @@ -765,7 +785,11 @@ static double CDECL unix_rint(double x) */ static float CDECL unix_rintf(float x) { +#ifdef HAVE_RINTF return rintf(x); +#else + return x >= 0 ? floorf(x + 0.5) : ceilf(x - 0.5); +#endif } /********************************************************************* diff --git a/include/wine/port.h b/include/wine/port.h index 928730a41d7..993cf483c15 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -278,22 +278,6 @@ extern int getopt_long_only (int ___argc, char *const *___argv, int ffs( int x ); #endif -#ifndef HAVE_LLRINT -__int64 llrint(double x); -#endif - -#ifndef HAVE_LLRINTF -__int64 llrintf(float x); -#endif - -#ifndef HAVE_LRINT -long lrint(double x); -#endif - -#ifndef HAVE_LRINTF -long lrintf(float x); -#endif - #ifndef HAVE_LSTAT int lstat(const char *file_name, struct stat *buf); #endif /* HAVE_LSTAT */ @@ -326,14 +310,6 @@ ssize_t pwrite( int fd, const void *buf, size_t count, off_t offset ); int readlink( const char *path, char *buf, size_t size ); #endif /* HAVE_READLINK */ -#ifndef HAVE_RINT -double rint(double x); -#endif - -#ifndef HAVE_RINTF -float rintf(float x); -#endif - #ifndef HAVE_STATVFS int statvfs( const char *path, struct statvfs *buf ); #endif diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 51cfdb4df54..435598c2856 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -13,7 +13,6 @@ C_SRCS = \ pread.c \ pwrite.c \ readlink.c \ - rint.c \ spawn.c \ statvfs.c \ strnlen.c \ diff --git a/libs/port/rint.c b/libs/port/rint.c deleted file mode 100644 index 2c0d22294c2..00000000000 --- a/libs/port/rint.c +++ /dev/null @@ -1,66 +0,0 @@ -/* - * rint family - * - * Copyright 2017 Alex Henrie - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <math.h> - -#ifndef HAVE_RINT -double rint(double x) -{ - return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); -} -#endif - -#ifndef HAVE_RINTF -float rintf(float x) -{ - return rint(x); -} -#endif - -#ifndef HAVE_LRINT -long lrint(double x) -{ - return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); -} -#endif - -#ifndef HAVE_LRINTF -long lrintf(float x) -{ - return lrint(x); -} -#endif - -#ifndef HAVE_LLRINT -__int64 llrint(double x) -{ - return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); -} -#endif - -#ifndef HAVE_LLRINTF -__int64 llrintf(float x) -{ - return llrint(x); -} -#endif

1 0

Zebediah Figura : qedit/nullrenderer: Don't drop csRenderLock in NullRenderer_DoRenderSample().
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 8a75411ec5349be62ff8c7abd8d7841a533e01ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a75411ec5349be62ff8c7ab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 30 23:51:36 2020 -0600 qedit/nullrenderer: Don't drop csRenderLock in NullRenderer_DoRenderSample(). We don't grab stream_cs to change any variables checked here, except to reset flush_event, and that cannot result in a deadlock. The only possible deadlocks here are: (1) between this function and EndOfStream(), which is correct, as the two should presumably be serialized; (2) between this function and EndFlush(); however, in that case we expect BeginFlush() first, which will unblock the streaming thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index a8594eade8b..97e3cdbb202 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -46,9 +46,7 @@ static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *ifac const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; SetEvent(filter->renderer.state_event); - LeaveCriticalSection(&filter->renderer.csRenderLock); WaitForMultipleObjects(2, events, FALSE, INFINITE); - EnterCriticalSection(&filter->renderer.csRenderLock); } return S_OK;

1 0

Zebediah Figura : strmbase: Don't drop csRenderLock in BaseRenderer_Receive().
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 6f05c692107b35681944d6ef5c6cf7c1c057a97d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f05c692107b35681944d6ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 30 23:51:35 2020 -0600 strmbase: Don't drop csRenderLock in BaseRenderer_Receive(). We don't grab stream_cs to change any variables checked here, except to reset flush_event, and that cannot result in a deadlock. The only possible deadlocks here are: (1) between this function and EndOfStream(), which is correct, as the two should presumably be serialized; (2) between this function and EndFlush(); however, in that case we expect BeginFlush() first, which will unblock the streaming thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index dde56b7a346..24d209703ca 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -224,18 +224,15 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp IReferenceClock_AdviseTime(filter->filter.clock, filter->stream_start, start, (HEVENT)filter->advise_event, &cookie); - LeaveCriticalSection(&filter->csRenderLock); - ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); IReferenceClock_Unadvise(filter->filter.clock, cookie); if (ret == 1) { + LeaveCriticalSection(&filter->csRenderLock); TRACE("Flush signaled; discarding current sample.\n"); return S_OK; } - - EnterCriticalSection(&filter->csRenderLock); } }

1 0

Zebediah Figura : quartz/dsoundrender: Don't drop stream_cs in DSoundRender_SendSampleData().
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: cf366488f6076859fdbd75a3570711ea51c0cc21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf366488f6076859fdbd75a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 30 23:51:34 2020 -0600 quartz/dsoundrender: Don't drop stream_cs in DSoundRender_SendSampleData(). We don't grab stream_cs to change any variables checked here, except to reset flush_event, and that cannot result in a deadlock. The only possible deadlocks here are: (1) between this function and EndOfStream(), which is correct, as the two should presumably be serialized; (2) between this function and EndFlush(); however, in that case we expect BeginFlush() first, which will unblock the streaming thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 98ff21c0da1..099af2c4e21 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -257,9 +257,7 @@ static HRESULT DSoundRender_SendSampleData(struct dsound_render *This, hr = S_FALSE; if (hr != S_OK) { - LeaveCriticalSection(&This->stream_cs); ret = WaitForSingleObject(This->flush_event, 10); - EnterCriticalSection(&This->stream_cs); if (This->sink.flushing || This->filter.state == State_Stopped) return This->filter.state == State_Paused ? S_OK : VFW_E_WRONG_STATE; if (ret != WAIT_TIMEOUT)

1 0

Zebediah Figura : quartz/dsoundrender: Don't drop stream_cs in DSoundRender_HandleEndOfStream().
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 2d6043eb4f2f1b104416137ff7f5caecfcf62d66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d6043eb4f2f1b104416137f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 30 23:51:33 2020 -0600 quartz/dsoundrender: Don't drop stream_cs in DSoundRender_HandleEndOfStream(). We don't grab stream_cs to change any variables checked here, except to reset flush_event, and that cannot result in a deadlock. The only possible deadlocks here are: (1) between this function and Receive(), which is correct, as the two should presumably be serialized; (2) between this function and EndFlush(); however, in that case we expect BeginFlush() first, which will unblock the streaming thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 788643af372..98ff21c0da1 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -236,9 +236,7 @@ static HRESULT DSoundRender_HandleEndOfStream(struct dsound_render *This) if (pos1 == pos2) break; - LeaveCriticalSection(&This->stream_cs); WaitForSingleObject(This->flush_event, 10); - EnterCriticalSection(&This->stream_cs); } return S_OK;

1 0

Zebediah Figura : quartz/dsoundrender: Remove the unused "in_loop" field.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 3933ceca582ecc84f6bb92eb397a8eb8a0d1834a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3933ceca582ecc84f6bb92eb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 30 23:51:32 2020 -0600 quartz/dsoundrender: Remove the unused "in_loop" field. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 1c6b28512b0..788643af372 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -63,7 +63,6 @@ struct dsound_render IDirectSound8 *dsound; LPDIRECTSOUNDBUFFER dsbuffer; DWORD buf_size; - DWORD in_loop; DWORD last_playpos, writepos; REFERENCE_TIME play_time; @@ -237,11 +236,9 @@ static HRESULT DSoundRender_HandleEndOfStream(struct dsound_render *This) if (pos1 == pos2) break; - This->in_loop = 1; LeaveCriticalSection(&This->stream_cs); WaitForSingleObject(This->flush_event, 10); EnterCriticalSection(&This->stream_cs); - This->in_loop = 0; } return S_OK; @@ -262,11 +259,9 @@ static HRESULT DSoundRender_SendSampleData(struct dsound_render *This, hr = S_FALSE; if (hr != S_OK) { - This->in_loop = 1; LeaveCriticalSection(&This->stream_cs); ret = WaitForSingleObject(This->flush_event, 10); EnterCriticalSection(&This->stream_cs); - This->in_loop = 0; if (This->sink.flushing || This->filter.state == State_Stopped) return This->filter.state == State_Paused ? S_OK : VFW_E_WRONG_STATE; if (ret != WAIT_TIMEOUT)

1 0

Michael Stefaniuc : sti: Use wide-char string literals.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: bfab815a60a25ce01537d3c7957b991882f12e90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfab815a60a25ce01537d3c7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 1 00:58:25 2020 +0100 sti: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sti/sti.c | 17 ++++------------- dlls/sti/tests/sti.c | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/sti/sti.c b/dlls/sti/sti.c index 962371f92d2..0bb60382979 100644 --- a/dlls/sti/sti.c +++ b/dlls/sti/sti.c @@ -32,14 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(sti); -static const WCHAR registeredAppsLaunchPath[] = { - 'S','O','F','T','W','A','R','E','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'S','t','i','l','l','I','m','a','g','e','\\', - 'R','e','g','i','s','t','e','r','e','d',' ','A','p','p','l','i','c','a','t','i','o','n','s',0 -}; +static const WCHAR registeredAppsLaunchPath[] = + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\StillImage\\Registered Applications"; typedef struct _stillimage { @@ -134,10 +128,7 @@ static HRESULT WINAPI stillimagew_GetSTILaunchInformation(IStillImageW *iface, L static HRESULT WINAPI stillimagew_RegisterLaunchApplication(IStillImageW *iface, LPWSTR pwszAppName, LPWSTR pwszCommandLine) { - static const WCHAR format[] = {'%','s',' ','%','s',0}; - static const WCHAR commandLineSuffix[] = { - '/','S','t','i','D','e','v','i','c','e',':','%','1',' ', - '/','S','t','i','E','v','e','n','t',':','%','2',0}; + static const WCHAR commandLineSuffix[] = L"/StiDevice:%1 /StiEvent:%2"; HKEY registeredAppsKey = NULL; DWORD ret; HRESULT hr = S_OK; @@ -152,7 +143,7 @@ static HRESULT WINAPI stillimagew_RegisterLaunchApplication(IStillImageW *iface, WCHAR *value = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (value) { - swprintf(value, len, format, pwszCommandLine, commandLineSuffix); + swprintf(value, len, L"%s %s", pwszCommandLine, commandLineSuffix); ret = RegSetValueExW(registeredAppsKey, pwszAppName, 0, REG_SZ, (BYTE*)value, (lstrlenW(value)+1)*sizeof(WCHAR)); if (ret != ERROR_SUCCESS) diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index bd8b7b6b171..a87ab9fe47e 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -230,7 +230,7 @@ static void test_stillimage_aggregation(void) static void test_launch_app_registry(void) { - static WCHAR appName[] = {'w','i','n','e','s','t','i','t','e','s','t','a','p','p',0}; + static WCHAR appName[] = L"winestitestapp"; IStillImageW *pStiW = NULL; HRESULT hr;

1 0

Michael Stefaniuc : cryptdlg: Use wide-char string literals.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: b3e684826fb653983e4189de482eb4e2783cd50f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3e684826fb653983e4189de… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 1 00:58:24 2020 +0100 cryptdlg: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptdlg/main.c | 91 +++++++++++++++++++--------------------------------- 1 file changed, 33 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b3e684826fb653983e41…

1 0

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

2003

2002

2001

wine-commits December 2020