wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Francois Gouget : msvcp140_1: Remove __cdecl on static functions where not needed.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: ec6ce2ce53b91bbb5bc8eaaec01c7f2fa6f892eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec6ce2ce53b91bbb5bc8eaae… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 3 11:50:39 2021 +0200 msvcp140_1: Remove __cdecl on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_1/msvcp140_1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140_1/msvcp140_1.c b/dlls/msvcp140_1/msvcp140_1.c index 823adedf3ac..c6a6ff19f13 100644 --- a/dlls/msvcp140_1/msvcp140_1.c +++ b/dlls/msvcp140_1/msvcp140_1.c @@ -64,7 +64,7 @@ void __cdecl MSVCRT_operator_delete(void *mem) free(mem); } -static void* __cdecl MSVCRT_operator_new_aligned(size_t size, size_t alignment) +static void* MSVCRT_operator_new_aligned(size_t size, size_t alignment) { void *retval; int freed; @@ -85,7 +85,7 @@ static void* __cdecl MSVCRT_operator_new_aligned(size_t size, size_t alignment) return NULL; } -static void __cdecl MSVCRT_operator_delete_aligned(void *mem, size_t alignment) +static void MSVCRT_operator_delete_aligned(void *mem, size_t alignment) { _aligned_free(mem); }

1 0

Francois Gouget : msvcrt: Remove CDECL on static functions where not needed.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: a6b1e97eb694731fcbf7238dc4a5bce3c7091d86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6b1e97eb694731fcbf7238d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 3 11:50:32 2021 +0200 msvcrt: Remove CDECL on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 4 ++-- dlls/msvcrt/math.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 5a4a701dfc6..4c0fce194bd 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -556,7 +556,7 @@ void CDECL _unlock_locales(void) _unlock(_SETLOCALE_LOCK); } -static void CDECL grab_locinfo(pthreadlocinfo locinfo) +static void grab_locinfo(pthreadlocinfo locinfo) { int i; @@ -578,7 +578,7 @@ static void CDECL grab_locinfo(pthreadlocinfo locinfo) InterlockedIncrement(&locinfo->lc_time_curr->refcount); } -static void CDECL update_thread_locale(thread_data_t *data) +static void update_thread_locale(thread_data_t *data) { if((data->locale_flags & LOCALE_FREE) && ((data->locale_flags & LOCALE_THREAD) || (data->locinfo == MSVCRT_locale->locinfo && data->mbcinfo == MSVCRT_locale->mbcinfo))) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index efdde8e4afb..7f59a4d20d4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -90,7 +90,7 @@ static inline double fp_barrier(double x) return y; } -static inline double CDECL ret_nan( BOOL update_sw ) +static inline double ret_nan( BOOL update_sw ) { double x = 1.0; if (!update_sw) return -NAN; @@ -2663,7 +2663,7 @@ double CDECL cos( double x ) } /* Copied from musl: src/math/expm1.c */ -static double CDECL __expm1(double x) +static double __expm1(double x) { static const double o_threshold = 7.09782712893383973096e+02, ln2_hi = 6.93147180369123816490e-01,

1 0

Esme Povirk : sppc: Stub SLClose.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: 8b886cdc5d6097de7ba800674288def0a1825009 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b886cdc5d6097de7ba80067… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Sep 4 12:50:19 2021 -0500 sppc: Stub SLClose. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slc/slc.spec | 2 +- dlls/sppc/sppc.c | 7 +++++++ dlls/sppc/sppc.spec | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index 19895041a32..a5250df23b9 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -6,7 +6,7 @@ @ stub SLpGetLicenseAcquisitionInfo @ stub SLpGetMachineUGUID @ stub SLpVLActivateProduct -@ stub SLClose +@ stdcall SLClose(ptr) sppc.SLClose @ stub SLConsumeRight @ stub SLConsumeWindowsRight @ stub SLDepositOfflineConfirmationId diff --git a/dlls/sppc/sppc.c b/dlls/sppc/sppc.c index c05f15a28db..ce3183f39bd 100644 --- a/dlls/sppc/sppc.c +++ b/dlls/sppc/sppc.c @@ -51,6 +51,13 @@ HRESULT WINAPI SLOpen(HSLC *handle) return S_OK; } +HRESULT WINAPI SLClose(HSLC handle) +{ + FIXME("(%p) stub\n", handle ); + + return S_OK; +} + HRESULT WINAPI SLPersistApplicationPolicies(const SLID *app, const SLID *product, DWORD flags) { FIXME("(%s,%s,%x) stub\n", wine_dbgstr_guid(app), wine_dbgstr_guid(product), flags); diff --git a/dlls/sppc/sppc.spec b/dlls/sppc/sppc.spec index 3ac40c23972..6926d4d8b6d 100644 --- a/dlls/sppc/sppc.spec +++ b/dlls/sppc/sppc.spec @@ -17,7 +17,7 @@ @ stub SLpSetActivationInProgress @ stub SLpTriggerServiceWorker @ stub SLpVLActivateProduct -@ stub SLClose +@ stdcall SLClose(ptr) @ stub SLConsumeRight @ stub SLDepositMigrationBlob @ stub SLDepositOfflineConfirmationId

1 0

Alex Henrie : cmd: Fix capitalization of WCMD_ReadFile in comment.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: 14bbccf756a5be3ce3029d0149e7b8d7e465fd4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=14bbccf756a5be3ce3029d01… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 5 14:55:41 2021 -0600 cmd: Fix capitalization of WCMD_ReadFile in comment. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index acf8f63b1f1..8c6ed1c057c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -212,7 +212,7 @@ void WCMD_leave_paged_mode(void) } /*************************************************************************** - * WCMD_Readfile + * WCMD_ReadFile * * Read characters in from a console/file, returning result in Unicode */

1 0

Alexandre Julliard : shell32: Don't put shell folders inside My Documents.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: 5321428f6482aef00c71077a58275f282adad0a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5321428f6482aef00c71077a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 6 13:53:24 2021 +0200 shell32: Don't put shell folders inside My Documents. Put them all at the same level, like recent Windows versions do. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 332 +++++------------------------------------------ 1 file changed, 30 insertions(+), 302 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5321428f6482aef00c71…

1 0

Alexandre Julliard : shell32: Pass the destination Windows path to _SHCreateSymbolicLink().
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: bf811fdcaf70883634691d2c7262c3d80fe32323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf811fdcaf70883634691d2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 6 13:17:14 2021 +0200 shell32: Pass the destination Windows path to _SHCreateSymbolicLink(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index a35f42264ea..f0c692647af 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4202,7 +4202,7 @@ static void _SHCreateMyDocumentsSubDirs(const UINT * aidsMyStuff, const UINT num * aidsMyStuff [I] Array of IDS_* resources to create sub dirs for. * aids_num [I] Number of elements in aidsMyStuff. */ -static void _SHCreateMyDocumentsSymbolicLink(const UINT * aidsMyStuff, const UINT aids_num) +static void _SHCreateMyDocumentsSymbolicLink(const UINT * aidsMyStuff, const UINT aids_num, const WCHAR *path) { static const char * const xdg_dirs[] = { "DOCUMENTS" }; static const unsigned int num = ARRAY_SIZE(xdg_dirs); @@ -4212,7 +4212,7 @@ static void _SHCreateMyDocumentsSymbolicLink(const UINT * aidsMyStuff, const UIN char ** xdg_results; /* Get the unix path of 'My Documents'. */ - pszPersonal = _SHGetFolderUnixPath(CSIDL_PERSONAL|CSIDL_FLAG_DONT_VERIFY); + pszPersonal = wine_get_unix_file_name( path ); if (!pszPersonal) return; _SHGetXDGUserDirs(xdg_dirs, num, &xdg_results); @@ -4284,7 +4284,7 @@ static void _SHCreateMyDocumentsSymbolicLink(const UINT * aidsMyStuff, const UIN * PARAMS * nFolder [I] CSIDL identifying the folder. */ -static void _SHCreateMyStuffSymbolicLink(int nFolder) +static void _SHCreateMyStuffSymbolicLink(int nFolder, const WCHAR *path) { static const UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES @@ -4328,8 +4328,7 @@ static void _SHCreateMyStuffSymbolicLink(int nFolder) while (1) { - /* Get the current 'My Whatever' folder unix path. */ - pszMyStuff = _SHGetFolderUnixPath(acsidlMyStuff[i]|CSIDL_FLAG_DONT_VERIFY); + pszMyStuff = wine_get_unix_file_name( path ); if (!pszMyStuff) break; while (1) @@ -4375,7 +4374,7 @@ static void _SHCreateMyStuffSymbolicLink(int nFolder) * Sets up a symbolic link for the 'Desktop' shell folder to point into the * users home directory. */ -static void _SHCreateDesktopSymbolicLink(void) +static void _SHCreateDesktopSymbolicLink( const WCHAR *path ) { static const char * const xdg_dirs[] = { "DESKTOP" }; static const unsigned int num = ARRAY_SIZE(xdg_dirs); @@ -4405,7 +4404,7 @@ static void _SHCreateDesktopSymbolicLink(void) (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode))) { - pszDesktop = _SHGetFolderUnixPath(CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_DONT_VERIFY); + pszDesktop = wine_get_unix_file_name( path ); if (pszDesktop) { if (xdg_desktop_dir) @@ -4428,7 +4427,7 @@ static void _SHCreateDesktopSymbolicLink(void) * PARAMS * nFolder [I] CSIDL identifying the folder. */ -static void _SHCreateSymbolicLink(int nFolder) +static void _SHCreateSymbolicLink(int nFolder, const WCHAR *path) { static const UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES @@ -4437,17 +4436,17 @@ static void _SHCreateSymbolicLink(int nFolder) switch (folder) { case CSIDL_PERSONAL: - _SHCreateMyDocumentsSymbolicLink(aidsMyStuff, ARRAY_SIZE(aidsMyStuff)); + _SHCreateMyDocumentsSymbolicLink(aidsMyStuff, ARRAY_SIZE(aidsMyStuff), path); break; case CSIDL_MYPICTURES: case CSIDL_MYVIDEO: case CSIDL_MYMUSIC: case CSIDL_DOWNLOADS: case CSIDL_TEMPLATES: - _SHCreateMyStuffSymbolicLink(folder); + _SHCreateMyStuffSymbolicLink(folder, path); break; case CSIDL_DESKTOPDIRECTORY: - _SHCreateDesktopSymbolicLink(); + _SHCreateDesktopSymbolicLink( path ); break; } } @@ -4642,7 +4641,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( /* create symbolic links rather than directories for specific * user shell folders */ - _SHCreateSymbolicLink(folder); + _SHCreateSymbolicLink(folder, szBuildPath); /* create directory/directories */ ret = SHCreateDirectoryExW(hwndOwner, szBuildPath, NULL);

1 0

Alexandre Julliard : shell32: Avoid some code duplication.
by Alexandre Julliard 06 Sep '21

06 Sep '21

Module: wine Branch: master Commit: 0a71ea73810e6a5615d9eeb0eb3d55cc1984d28b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a71ea73810e6a5615d9eeb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 6 13:12:45 2021 +0200 shell32: Avoid some code duplication. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 136 +++-------------------------------------------- 1 file changed, 6 insertions(+), 130 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e438efb9e80..a35f42264ea 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4452,40 +4452,6 @@ static void _SHCreateSymbolicLink(int nFolder) } } -/****************************************************************************** - * _SHCreateSymbolicLinks [Internal] - * - * Sets up symbol links for various shell folders to point into the user's home - * directory. We do an educated guess about what the user would probably want: - * - If there is a 'My Documents' directory in $HOME, the user probably wants - * wine's 'My Documents' to point there. Furthermore, we infer that the user - * is a Windows lover and has no problem with wine creating subfolders for - * 'My Pictures', 'My Music', 'My Videos' etc. under '$HOME/My Documents', if - * those do not already exist. We put appropriate symbolic links in place for - * those, too. - * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' - * point directly to $HOME. We assume the user to be a unix hacker who does not - * want wine to create anything anywhere besides the .wine directory. So, if - * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' - * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known" - * directory, and try to link to that. If that fails, then we symlink to - * $HOME directly. The same holds for 'My Pictures', 'My Videos' etc. - * - The Desktop shell folder is symlinked to XDG_DESKTOP_DIR. If that does not - * exist, then we try '$HOME/Desktop'. If that does not exist, then we leave - * it alone. - * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) - */ -static void _SHCreateSymbolicLinks(void) -{ - static const int acsidlMyStuff[] = { - CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES, CSIDL_PERSONAL, CSIDL_DESKTOPDIRECTORY - }; - UINT i; - - for (i=0; i < ARRAY_SIZE(acsidlMyStuff); i++) - _SHCreateSymbolicLink(acsidlMyStuff[i]); -} - /****************************************************************************** * SHGetFolderPathW [SHELL32.@] * @@ -5197,10 +5163,8 @@ HRESULT WINAPI SHGetSpecialFolderLocation( */ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, WCHAR **ret_path) { - WCHAR pathW[MAX_PATH], tempW[MAX_PATH]; + WCHAR pathW[MAX_PATH]; HRESULT hr; - CSIDL_Type type; - int ret; int folder = csidl_from_id(rfid), shgfp_flags; TRACE("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, ret_path); @@ -5216,93 +5180,16 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t FIXME("flags 0x%08x not supported\n", flags); return E_INVALIDARG; } - + folder |= flags & CSIDL_FLAG_MASK; shgfp_flags = flags & KF_FLAG_DEFAULT_PATH ? SHGFP_TYPE_DEFAULT : SHGFP_TYPE_CURRENT; - type = CSIDL_Data[folder].type; - switch (type) - { - case CSIDL_Type_Disallowed: - hr = E_INVALIDARG; - break; - case CSIDL_Type_NonExistent: - *tempW = 0; - hr = S_FALSE; - break; - case CSIDL_Type_WindowsPath: - GetWindowsDirectoryW(tempW, MAX_PATH); - append_relative_path(folder, tempW); - hr = S_OK; - break; - case CSIDL_Type_SystemPath: - GetSystemDirectoryW(tempW, MAX_PATH); - append_relative_path(folder, tempW); - hr = S_OK; - break; - case CSIDL_Type_SystemX86Path: - if (!GetSystemWow64DirectoryW(tempW, MAX_PATH)) GetSystemDirectoryW(tempW, MAX_PATH); - append_relative_path(folder, tempW); - hr = S_OK; - break; - case CSIDL_Type_CurrVer: - hr = _SHGetCurrentVersionPath(shgfp_flags, folder, tempW); - break; - case CSIDL_Type_User: - hr = _SHGetUserProfilePath(token, shgfp_flags, folder, tempW); - break; - case CSIDL_Type_AllUsers: - case CSIDL_Type_ProgramData: - hr = _SHGetAllUsersProfilePath(shgfp_flags, folder, tempW); - break; - default: - FIXME("bogus type %d, please fix\n", type); - hr = E_INVALIDARG; - break; - } - - if (FAILED(hr)) - goto failed; - - /* Expand environment strings if necessary */ - if (*tempW == '%') + hr = SHGetFolderPathAndSubDirW( 0, folder, token, shgfp_flags, NULL, pathW ); + if (FAILED( hr )) { - hr = _SHExpandEnvironmentStrings(tempW, pathW); - if (FAILED(hr)) - goto failed; - } - else - strcpyW(pathW, tempW); - - /* if we don't care about existing directories we are ready */ - if (flags & KF_FLAG_DONT_VERIFY) goto done; - - if (PathFileExistsW(pathW)) goto done; - - /* Does not exist but we are not allowed to create it. The return value - * is verified against shell32 version 6.0. - */ - if (!(flags & KF_FLAG_CREATE)) - { - hr = HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); - goto failed; - } - - /* create symbolic links rather than directories for specific - * user shell folders */ - _SHCreateSymbolicLink(folder); - - /* create directory/directories */ - ret = SHCreateDirectoryExW(NULL, pathW, NULL); - if (ret && ret != ERROR_ALREADY_EXISTS) - { - ERR("Failed to create directory %s.\n", debugstr_w(pathW)); - hr = E_FAIL; - goto failed; + TRACE("Failed to get folder path, %#x.\n", hr); + return hr; } - TRACE("Created missing system directory %s\n", debugstr_w(pathW)); - -done: TRACE("Final path is %s, %#x\n", debugstr_w(pathW), hr); *ret_path = CoTaskMemAlloc((strlenW(pathW) + 1) * sizeof(WCHAR)); @@ -5310,11 +5197,6 @@ done: return E_OUTOFMEMORY; strcpyW(*ret_path, pathW); - return hr; - -failed: - TRACE("Failed to get folder path, %#x.\n", hr); - return hr; } @@ -6441,12 +6323,6 @@ HRESULT SHELL_RegisterShellFolders(void) { HRESULT hr; - /* Set up '$HOME' targeted symlinks for 'My Documents', 'My Pictures', - * 'My Videos', 'My Music', 'Desktop' etc. in advance, so that the - * _SHRegister*ShellFolders() functions will find everything nice and clean - * and thus will not attempt to create them in the profile directory. */ - _SHCreateSymbolicLinks(); - hr = _SHRegisterUserShellFolders(TRUE); if (SUCCEEDED(hr)) hr = _SHRegisterUserShellFolders(FALSE);

1 0

Francois Gouget : windowscodecs: Make the jpeg_encoder_*() functions static.
by Alexandre Julliard 03 Sep '21

03 Sep '21

Module: wine Branch: master Commit: 8b9f1e12841298591387e2b7590191610a37986e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b9f1e12841298591387e2b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 3 11:50:45 2021 +0200 windowscodecs: Make the jpeg_encoder_*() functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libjpeg.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/libjpeg.c b/dlls/windowscodecs/libjpeg.c index 96a9b79f358..dff13c90db2 100644 --- a/dlls/windowscodecs/libjpeg.c +++ b/dlls/windowscodecs/libjpeg.c @@ -535,7 +535,7 @@ static void dest_mgr_term_destination(j_compress_ptr cinfo) } } -HRESULT CDECL jpeg_encoder_initialize(struct encoder* iface, IStream *stream) +static HRESULT CDECL jpeg_encoder_initialize(struct encoder* iface, IStream *stream) { struct jpeg_encoder *This = impl_from_encoder(iface); jmp_buf jmpbuf; @@ -570,7 +570,7 @@ HRESULT CDECL jpeg_encoder_initialize(struct encoder* iface, IStream *stream) return S_OK; } -HRESULT CDECL jpeg_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, +static HRESULT CDECL jpeg_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, DWORD *bpp, BOOL *indexed) { int i; @@ -590,7 +590,7 @@ HRESULT CDECL jpeg_encoder_get_supported_format(struct encoder* iface, GUID *pix return S_OK; } -HRESULT CDECL jpeg_encoder_create_frame(struct encoder* iface, const struct encoder_frame *frame) +static HRESULT CDECL jpeg_encoder_create_frame(struct encoder* iface, const struct encoder_frame *frame) { struct jpeg_encoder *This = impl_from_encoder(iface); jmp_buf jmpbuf; @@ -629,7 +629,7 @@ HRESULT CDECL jpeg_encoder_create_frame(struct encoder* iface, const struct enco return S_OK; } -HRESULT CDECL jpeg_encoder_write_lines(struct encoder* iface, BYTE *data, +static HRESULT CDECL jpeg_encoder_write_lines(struct encoder* iface, BYTE *data, DWORD line_count, DWORD stride) { struct jpeg_encoder *This = impl_from_encoder(iface); @@ -690,7 +690,7 @@ HRESULT CDECL jpeg_encoder_write_lines(struct encoder* iface, BYTE *data, return S_OK; } -HRESULT CDECL jpeg_encoder_commit_frame(struct encoder* iface) +static HRESULT CDECL jpeg_encoder_commit_frame(struct encoder* iface) { struct jpeg_encoder *This = impl_from_encoder(iface); jmp_buf jmpbuf; @@ -705,12 +705,12 @@ HRESULT CDECL jpeg_encoder_commit_frame(struct encoder* iface) return S_OK; } -HRESULT CDECL jpeg_encoder_commit_file(struct encoder* iface) +static HRESULT CDECL jpeg_encoder_commit_file(struct encoder* iface) { return S_OK; } -void CDECL jpeg_encoder_destroy(struct encoder* iface) +static void CDECL jpeg_encoder_destroy(struct encoder* iface) { struct jpeg_encoder *This = impl_from_encoder(iface); if (This->cinfo_initialized)

1 0

Zebediah Figura : server: Return void from the ioctl callback.
by Alexandre Julliard 03 Sep '21

03 Sep '21

Module: wine Branch: master Commit: b1e4d920c3debb7359dbfa3f3fb50b26c18b41b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1e4d920c3debb7359dbfa3f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 2 19:08:54 2021 -0500 server: Return void from the ioctl callback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 83 ++++++++++++------------ server/device.c | 11 ++-- server/fd.c | 9 ++- server/file.h | 6 +- server/named_pipe.c | 86 ++++++++++++------------ server/serial.c | 21 +++--- server/sock.c | 184 ++++++++++++++++++++++++++-------------------------- 7 files changed, 197 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1e4d920c3debb7359db…

1 0

Zebediah Figura : server: Return void from the flush callback.
by Alexandre Julliard 03 Sep '21

03 Sep '21

Module: wine Branch: master Commit: a36e2769c97a4c54f01cef660dc1714357d9d890 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a36e2769c97a4c54f01cef66… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 2 19:08:53 2021 -0500 server: Return void from the flush callback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 16 ++++++++-------- server/device.c | 6 +++--- server/fd.c | 3 +-- server/file.h | 4 ++-- server/named_pipe.c | 7 +++---- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/server/console.c b/server/console.c index 0080e6ed163..df88b14f609 100644 --- a/server/console.c +++ b/server/console.c @@ -101,7 +101,7 @@ static enum server_fd_type console_get_fd_type( struct fd *fd ); static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); static void console_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); static void console_read( struct fd *fd, struct async *async, file_pos_t pos ); -static int console_flush( struct fd *fd, struct async *async ); +static void console_flush( struct fd *fd, struct async *async ); static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct fd_ops console_fd_ops = @@ -326,7 +326,7 @@ static const struct object_ops console_input_ops = }; static void console_input_read( struct fd *fd, struct async *async, file_pos_t pos ); -static int console_input_flush( struct fd *fd, struct async *async ); +static void console_input_flush( struct fd *fd, struct async *async ); static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct fd_ops console_input_fd_ops = @@ -960,16 +960,16 @@ static void console_read( struct fd *fd, struct async *async, file_pos_t pos ) queue_host_ioctl( console->server, IOCTL_CONDRV_READ_FILE, 0, async, &console->ioctl_q ); } -static int console_flush( struct fd *fd, struct async *async ) +static void console_flush( struct fd *fd, struct async *async ) { struct console *console = get_fd_user( fd ); if (!console->server) { set_error( STATUS_INVALID_HANDLE ); - return 0; + return; } - return queue_host_ioctl( console->server, IOCTL_CONDRV_FLUSH, 0, NULL, NULL ); + queue_host_ioctl( console->server, IOCTL_CONDRV_FLUSH, 0, NULL, NULL ); } static void screen_buffer_write( struct fd *fd, struct async *async, file_pos_t pos ) @@ -1361,16 +1361,16 @@ static void console_input_read( struct fd *fd, struct async *async, file_pos_t p console_read( console->fd, async, pos ); } -static int console_input_flush( struct fd *fd, struct async *async ) +static void console_input_flush( struct fd *fd, struct async *async ) { struct console *console = current->process->console; if (!console) { set_error( STATUS_INVALID_HANDLE ); - return 0; + return; } - return console_flush( console->fd, async ); + console_flush( console->fd, async ); } static void console_output_dump( struct object *obj, int verbose ) diff --git a/server/device.c b/server/device.c index cc3e0466468..7e9954a9305 100644 --- a/server/device.c +++ b/server/device.c @@ -203,7 +203,7 @@ static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); static void device_file_read( struct fd *fd, struct async *async, file_pos_t pos ); static void device_file_write( struct fd *fd, struct async *async, file_pos_t pos ); -static int device_file_flush( struct fd *fd, struct async *async ); +static void device_file_flush( struct fd *fd, struct async *async ); static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static void device_file_reselect_async( struct fd *fd, struct async_queue *queue ); static void device_file_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); @@ -649,14 +649,14 @@ static void device_file_write( struct fd *fd, struct async *async, file_pos_t po queue_irp( file, &params, async ); } -static int device_file_flush( struct fd *fd, struct async *async ) +static void device_file_flush( struct fd *fd, struct async *async ) { struct device_file *file = get_fd_user( fd ); irp_params_t params; memset( &params, 0, sizeof(params) ); params.flush.type = IRP_CALL_FLUSH; - return queue_irp( file, &params, async ); + queue_irp( file, &params, async ); } static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) diff --git a/server/fd.c b/server/fd.c index 6b79585147d..ca91ff724a1 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2304,10 +2304,9 @@ void no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ) } /* default flush() routine */ -int no_fd_flush( struct fd *fd, struct async *async ) +void no_fd_flush( struct fd *fd, struct async *async ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); - return 0; } /* default get_file_info() routine */ diff --git a/server/file.h b/server/file.h index e200281d03b..c4c33fc1e79 100644 --- a/server/file.h +++ b/server/file.h @@ -61,7 +61,7 @@ struct fd_ops /* perform a write on the file */ void (*write)(struct fd *, struct async *, file_pos_t ); /* flush the object buffers */ - int (*flush)(struct fd *, struct async *); + void (*flush)(struct fd *, struct async *); /* query file info */ void (*get_file_info)( struct fd *, obj_handle_t, unsigned int ); /* query volume info */ @@ -111,7 +111,7 @@ extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern void no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); extern void no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); -extern int no_fd_flush( struct fd *fd, struct async *async ); +extern void no_fd_flush( struct fd *fd, struct async *async ); extern void no_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); extern void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); extern void no_fd_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 503dda93931..3d1b2d8b917 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -145,7 +145,7 @@ static int pipe_end_set_sd( struct object *obj, const struct security_descriptor static WCHAR *pipe_end_get_full_name( struct object *obj, data_size_t *len ); static void pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); static void pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); -static int pipe_end_flush( struct fd *fd, struct async *async ); +static void pipe_end_flush( struct fd *fd, struct async *async ); static void pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); @@ -578,14 +578,14 @@ static void named_pipe_device_file_destroy( struct object *obj ) release_object( file->device ); } -static int pipe_end_flush( struct fd *fd, struct async *async ) +static void pipe_end_flush( struct fd *fd, struct async *async ) { struct pipe_end *pipe_end = get_fd_user( fd ); if (!pipe_end->pipe) { set_error( STATUS_PIPE_DISCONNECTED ); - return 0; + return; } if (pipe_end->connection && !list_empty( &pipe_end->connection->message_queue )) @@ -593,7 +593,6 @@ static int pipe_end_flush( struct fd *fd, struct async *async ) fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT ); set_error( STATUS_PENDING ); } - return 1; } static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class )

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 September 2021