wine-commits March 2008

wine-commits@winehq.org

4 participants
1001 discussions

Lei Zhang : shell32: Use xdg well known directories for desktop folder symbolic link.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: b8cbd8bd87e85d07f1d134a712b1c452c90fc3a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8cbd8bd87e85d07f1d134a71… Author: Lei Zhang <thestig(a)google.com> Date: Tue Mar 11 13:53:49 2008 -0700 shell32: Use xdg well known directories for desktop folder symbolic link. --- dlls/shell32/shellpath.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index dd7eb0c..738e9e3 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1997,15 +1997,16 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { * 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 fo 'My Pictures' and 'My Video'. - * - The Desktop shell folder is symlinked to '$HOME/Desktop', if that does - * exists and left alone if not. + * - 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) { UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEO, IDS_MYMUSIC }, i; int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; - static const char * xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC" }; + static const char * xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC", "DESKTOP" }; WCHAR wszTempPath[MAX_PATH]; char szPersonalTarget[FILENAME_MAX], *pszPersonal; char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; @@ -2015,6 +2016,7 @@ static void _SHCreateSymbolicLinks(void) HRESULT hr; const unsigned int num = sizeof(xdg_dirs) / sizeof(xdg_dirs[0]); char ** xdg_results = NULL; + char * xdg_desktop_dir; /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, @@ -2102,15 +2104,20 @@ static void _SHCreateSymbolicLinks(void) strcpy(szDesktopTarget, pszPersonal); HeapFree(GetProcessHeap(), 0, pszPersonal); - if (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && - !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) + xdg_desktop_dir = xdg_results ? xdg_results[num - 1] : NULL; + if (xdg_desktop_dir || + (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && + !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode))) { hr = SHGetFolderPathW(NULL, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_DEFAULT, wszTempPath); if (SUCCEEDED(hr) && (pszDesktop = wine_get_unix_file_name(wszTempPath))) { rmdir(pszDesktop); - symlink(szDesktopTarget, pszDesktop); + if (xdg_desktop_dir) + symlink(xdg_desktop_dir, pszDesktop); + else + symlink(szDesktopTarget, pszDesktop); HeapFree(GetProcessHeap(), 0, pszDesktop); } }

1 0

Lei Zhang : shell32: Use xdg well known directories for my_xxx folder symbolic links.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: 78f5db2b511cb8b558f1198dbf640781e929de8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=78f5db2b511cb8b558f1198db… Author: Lei Zhang <thestig(a)google.com> Date: Tue Mar 11 13:51:43 2008 -0700 shell32: Use xdg well known directories for my_xxx folder symbolic links. --- dlls/shell32/shellpath.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d3d3b75..dd7eb0c 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -46,6 +46,7 @@ #include "pidl.h" #include "wine/unicode.h" #include "shlwapi.h" +#include "xdg.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -1993,8 +1994,9 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { * 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, we symlink it to $HOME directly. The same - * holds fo 'My Pictures' and 'My Video'. + * 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 fo 'My Pictures' and 'My Video'. * - The Desktop shell folder is symlinked to '$HOME/Desktop', if that does * exists and left alone if not. * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) @@ -2003,6 +2005,7 @@ static void _SHCreateSymbolicLinks(void) { UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEO, IDS_MYMUSIC }, i; int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; + static const char * xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC" }; WCHAR wszTempPath[MAX_PATH]; char szPersonalTarget[FILENAME_MAX], *pszPersonal; char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; @@ -2010,6 +2013,8 @@ static void _SHCreateSymbolicLinks(void) struct stat statFolder; const char *pszHome; HRESULT hr; + const unsigned int num = sizeof(xdg_dirs) / sizeof(xdg_dirs[0]); + char ** xdg_results = NULL; /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, @@ -2018,6 +2023,8 @@ static void _SHCreateSymbolicLinks(void) pszPersonal = wine_get_unix_file_name(wszTempPath); if (!pszPersonal) return; + XDG_UserDirLookup(xdg_dirs, num, &xdg_results); + pszHome = getenv("HOME"); if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) { strcpy(szPersonalTarget, pszHome); @@ -2073,9 +2080,17 @@ static void _SHCreateSymbolicLinks(void) } else { - /* Else link to where 'My Documents' itself links to. */ rmdir(pszMyStuff); - symlink(szPersonalTarget, pszMyStuff); + if (xdg_results && xdg_results[i]) + { + /* the folder specified by XDG_XXX_DIR exists, link to it. */ + symlink(xdg_results[i], pszMyStuff); + } + else + { + /* Else link to where 'My Documents' itself links to. */ + symlink(szPersonalTarget, pszMyStuff); + } } HeapFree(GetProcessHeap(), 0, pszMyStuff); } @@ -2099,6 +2114,14 @@ static void _SHCreateSymbolicLinks(void) HeapFree(GetProcessHeap(), 0, pszDesktop); } } + + /* Free resources allocated by XDG_UserDirLookup() */ + if (xdg_results) + { + for (i = 0; i < num; i++) + HeapFree(GetProcessHeap(), 0, xdg_results[i]); + HeapFree(GetProcessHeap(), 0, xdg_results); + } } /* Register the default values in the registry, as some apps seem to depend

1 0

Lei Zhang : shell32: Add xdg-user-dirs lookup code.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: f5ba1c21bea6a66455a478910575fcad9c9024a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ba1c21bea6a66455a478910… Author: Lei Zhang <thestig(a)google.com> Date: Mon Mar 10 17:59:48 2008 -0700 shell32: Add xdg-user-dirs lookup code. --- dlls/shell32/xdg.c | 255 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/xdg.h | 1 + 2 files changed, 256 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 3b1a1bc..b541aa7 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -16,10 +16,38 @@ * 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 + * + * + * XDG_UserDirLookup() and helper functions are based on code from: + * http://www.freedesktop.org/wiki/Software/xdg-user-dirs + * + * Copyright (c) 2007 Red Hat, inc + * + * From the xdg-user-dirs license: + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation files + * (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include "config.h" +#include <stdio.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> @@ -712,3 +740,230 @@ char *XDG_GetStringValue(XDG_PARSED_FILE *file, const char *group_name, const ch return NULL; } + +/* Get the name of the xdg configuration file. + * + * [in] home_dir - $HOME + * [out] config_file - the name of the configuration file + */ +static HRESULT get_xdg_config_file(char * home_dir, char ** config_file) +{ + char *config_home; + + config_home = getenv("XDG_CONFIG_HOME"); + if (!config_home || !config_home[0]) + { + *config_file = HeapAlloc(GetProcessHeap(), 0, strlen(home_dir) + strlen("/.config/user-dirs.dirs") + 1); + if (!*config_file) + return E_OUTOFMEMORY; + + strcpy(*config_file, home_dir); + strcat(*config_file, "/.config/user-dirs.dirs"); + } + else + { + *config_file = HeapAlloc(GetProcessHeap(), 0, strlen(config_home) + strlen("/user-dirs.dirs") + 1); + if (!*config_file) + return E_OUTOFMEMORY; + + strcpy(*config_file, config_home); + strcat(*config_file, "/user-dirs.dirs"); + } + return S_OK; +} + +/* Parse the key in a line in the xdg-user-dir config file. + * i.e. XDG_PICTURES_DIR="$HOME/Pictures" + * ^ ^ + * + * [in] xdg_dirs - array of xdg directories to look for + * [in] num_dirs - number of elements in xdg_dirs + * [in/out] p_ptr - pointer to where we are in the buffer + * Returns the index to xdg_dirs if we find the key, or -1 on error. + */ +static int parse_config1(const char ** xdg_dirs, const unsigned int num_dirs, char ** p_ptr) +{ + char *p; + int i; + + p = *p_ptr; + while (*p == ' ' || *p == '\t') + p++; + if (strncmp(p, "XDG_", 4)) + return -1; + + p += 4; + for (i = 0; i < num_dirs; i++) + { + if (!strncmp(p, xdg_dirs[i], strlen(xdg_dirs[i]))) + { + p += strlen(xdg_dirs[i]); + break; + } + } + if (i == num_dirs) + return -1; + if (strncmp(p, "_DIR", 4)) + return -1; + p += 4; + while (*p == ' ' || *p == '\t') + p++; + if (*p != '=') + return -1; + p++; + while (*p == ' ' || *p == '\t') + p++; + if (*p != '"') + return -1; + p++; + + *p_ptr = p; + return i; +} + +/* Parse the value in a line in the xdg-user-dir config file. + * i.e. XDG_PICTURES_DIR="$HOME/Pictures" + * ^ ^ + * + * [in] p - pointer to the buffer + * [in] home_dir - $HOME + * [out] out_ptr - the directory name + */ +static HRESULT parse_config2(char * p, const char * home_dir, char ** out_ptr) +{ + BOOL relative; + char *out, *d; + + relative = FALSE; + + if (!strncmp(p, "$HOME/", 6)) + { + p += 6; + relative = TRUE; + } + else if (*p != '/') + return E_FAIL; + + if (relative) + { + out = HeapAlloc(GetProcessHeap(), 0, strlen(home_dir) + strlen(p) + 2); + if (!out) + return E_OUTOFMEMORY; + + strcpy(out, home_dir); + strcat(out, "/"); + } + else + { + out = HeapAlloc(GetProcessHeap(), 0, strlen(p) + 1); + if (!out) + return E_OUTOFMEMORY; + *out = 0; + } + + d = out + strlen(out); + while (*p && *p != '"') + { + if ((*p == '\\') && (*(p + 1) != 0)) + p++; + *d++ = *p++; + } + *d = 0; + *out_ptr = out; + return S_OK; +} + +/* Parse part of a line in the xdg-user-dir config file. + * i.e. XDG_PICTURES_DIR="$HOME/Pictures" + * ^ ^ + * + * The calling function is responsible for freeing all elements of out_ptr as + * well as out_ptr itself. + * + * [in] xdg_dirs - array of xdg directories to look for + * [in] num_dirs - number of elements in xdg_dirs + * [out] out_ptr - an array of the xdg directories names + */ +HRESULT XDG_UserDirLookup(const char ** xdg_dirs, const unsigned int num_dirs, char *** out_ptr) +{ + FILE *file; + char **out; + char *home_dir, *config_file; + char buffer[512]; + int i, len; + HRESULT hr; + + *out_ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, num_dirs * sizeof(char *)); + out = *out_ptr; + if (!out) + return E_OUTOFMEMORY; + + home_dir = getenv("HOME"); + if (!home_dir) + { + hr = E_FAIL; + goto xdg_user_dir_lookup_error; + } + + hr = get_xdg_config_file(home_dir, &config_file); + if (FAILED(hr)) + goto xdg_user_dir_lookup_error; + + file = fopen(config_file, "r"); + HeapFree(GetProcessHeap(), 0, config_file); + if (!file) + { + hr = E_HANDLE; + goto xdg_user_dir_lookup_error; + } + + while (fgets(buffer, sizeof(buffer), file)) + { + int idx; + char *p; + + /* Remove newline at end */ + len = strlen(buffer); + if (len > 0 && buffer[len-1] == '\n') + buffer[len-1] = 0; + + /* Parse the key */ + p = buffer; + idx = parse_config1(xdg_dirs, num_dirs, &p); + if (idx < 0) + continue; + if (out[idx]) + continue; + + /* Parse the value */ + hr = parse_config2(p, home_dir, &out[idx]); + if (FAILED(hr)) + { + if (hr == E_OUTOFMEMORY) + goto xdg_user_dir_lookup_error; + continue; + } + } + hr = S_OK; + + /* Remove entries for directories that do no exist */ + for (i = 0; i < num_dirs; i++) + { + struct stat statFolder; + + if (!out[i]) + continue; + if (!stat(out[i], &statFolder) && S_ISDIR(statFolder.st_mode)) + continue; + HeapFree(GetProcessHeap(), 0, out[i]); + out[i] = NULL; + } + +xdg_user_dir_lookup_error: + if (FAILED(hr)) + { + for (i = 0; i < num_dirs; i++) HeapFree(GetProcessHeap(), 0, out[i]); + HeapFree(GetProcessHeap(), 0, out_ptr); + } + return hr; +} diff --git a/dlls/shell32/xdg.h b/dlls/shell32/xdg.h index 6c083c6..9ae2872 100644 --- a/dlls/shell32/xdg.h +++ b/dlls/shell32/xdg.h @@ -47,5 +47,6 @@ HRESULT TRASH_UnpackItemID(LPCSHITEMID id, TRASH_ELEMENT *element, WIN32_FIND_DA HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count); void TRASH_DisposeElement(TRASH_ELEMENT *element); +HRESULT XDG_UserDirLookup(const char ** xdg_dirs, const unsigned int num_dirs, char *** out_ptr); #endif /* ndef __XDG_H__ */

1 0

Paul Vriens : kernel32/tests: Add a few skips instead of just returning.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: 371afffd355eeeaf1117d2be23c93730956a11d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=371afffd355eeeaf1117d2be2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Mar 12 09:59:45 2008 +0100 kernel32/tests: Add a few skips instead of just returning. --- dlls/kernel32/tests/locale.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 6388b9f..863134b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1796,7 +1796,10 @@ static void test_FoldStringW(void) }; if (!pFoldStringW) + { + skip("FoldStringW is not available\n"); return; /* FoldString is present in NT v3.1+, but not 95/98/Me */ + } /* Invalid flag combinations */ for (i = 0; i < sizeof(badFlags)/sizeof(badFlags[0]); i++) @@ -1805,7 +1808,10 @@ static void test_FoldStringW(void) SetLastError(0); ret = pFoldStringW(badFlags[i], src, 256, dst, 256); if (GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + { + skip("FoldStringW is not implemented\n"); return; + } EXPECT_LEN(0); EXPECT_FLAGS; }

1 0

Paul Vriens : kernel32/tests: DATE_YEARMONTH is only present on W2K and later.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: a558bfad99428517d27cf3ffb686979f6affef8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a558bfad99428517d27cf3ffb… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Mar 12 09:50:37 2008 +0100 kernel32/tests: DATE_YEARMONTH is only present on W2K and later. --- dlls/kernel32/tests/locale.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9f1d7d7..6388b9f 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2214,7 +2214,13 @@ static void test_EnumDateFormatsA(void) trace("EnumDateFormatsA DATE_YEARMONTH\n"); date_fmt_buf[0] = 0; + SetLastError(0xdeadbeef); ret = EnumDateFormatsA(enum_datetime_procA, lcid, DATE_YEARMONTH); + if (!ret && (GetLastError() == ERROR_INVALID_FLAGS)) + { + skip("DATE_YEARMONTH is only present on W2K and later\n"); + return; + } ok(ret, "EnumDateFormatsA(DATE_YEARMONTH) error %d\n", GetLastError()); trace("%s\n", date_fmt_buf); /* test the 1st enumerated format */

1 0

Paul Vriens : kernel32/tests: Skip some tests on win95.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: b0f7dcdf88433857ba69e15ca7544ba270979f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f7dcdf88433857ba69e15ca… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Mar 12 09:27:56 2008 +0100 kernel32/tests: Skip some tests on win95. --- dlls/kernel32/tests/codepage.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index bde9f82..201603f 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -152,7 +152,13 @@ static void test_overlapped_buffers(void) char buf[256]; int ret; + SetLastError(0xdeadbeef); lstrcpyW((WCHAR *)(buf + 1), strW); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("lstrcypW is not implemented\n"); + return; + } ret = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)(buf + 1), -1, buf, sizeof(buf), NULL, NULL); ok(ret == sizeof(strA), "unexpected ret %d\n", ret); ok(!memcmp(buf, strA, sizeof(strA)), "conversion failed: %s\n", buf);

1 0

Ken Thomases : coreaudio: Signal driver load failure if any component fails to initialize.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: c885d053787632d9301572c37bcd4cdee44f3a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c885d053787632d9301572c37… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 12 02:06:37 2008 -0500 coreaudio: Signal driver load failure if any component fails to initialize. --- dlls/winecoreaudio.drv/coreaudio.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 5452d3b..0690afd 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -42,9 +42,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); static LRESULT CoreAudio_drvLoad(void) { TRACE("()\n"); - CoreAudio_WaveInit(); - CoreAudio_MIDIInit(); - CoreAudio_MixerInit(); + + if (CoreAudio_WaveInit() != DRV_SUCCESS || + CoreAudio_MIDIInit() != DRV_SUCCESS || + CoreAudio_MixerInit() != DRV_SUCCESS) + return DRV_FAILURE; + return DRV_SUCCESS; }

1 0

Ken Thomases : coreaudio: Standardize on DRV_SUCCESS/ FAILURE status codes for setup functions.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: fa2d39e45fbb3218c3bfe7b87b78a0a30fbf73c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa2d39e45fbb3218c3bfe7b87… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 12 02:06:17 2008 -0500 coreaudio: Standardize on DRV_SUCCESS/FAILURE status codes for setup functions. --- dlls/winecoreaudio.drv/audio.c | 16 ++++++++-------- dlls/winecoreaudio.drv/coreaudio.c | 4 ++-- dlls/winecoreaudio.drv/midi.c | 6 +++--- dlls/winecoreaudio.drv/mixer.c | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index ec5a096..33a5c4f 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -521,15 +521,15 @@ LONG CoreAudio_WaveInit(void) (char) (status >> 16), (char) (status >> 8), (char) status); - return 1; + return DRV_FAILURE; } if (CoreAudio_DefaultDevice.outputDeviceID == kAudioDeviceUnknown) { ERR("AudioHardwareGetProperty: CoreAudio_DefaultDevice.outputDeviceID == kAudioDeviceUnknown\n"); - return 1; + return DRV_FAILURE; } if ( ! CoreAudio_GetDevCaps() ) - return 1; + return DRV_FAILURE; CoreAudio_DefaultDevice.interface_name=HeapAlloc(GetProcessHeap(),0,strlen(CoreAudio_DefaultDevice.dev_name)+1); sprintf(CoreAudio_DefaultDevice.interface_name, "%s", CoreAudio_DefaultDevice.dev_name); @@ -646,7 +646,7 @@ LONG CoreAudio_WaveInit(void) if (!messageThreadPortName) { ERR("Can't create message thread port name\n"); - return 1; + return DRV_FAILURE; } port_ReceiveInMessageThread = CFMessagePortCreateLocal(kCFAllocatorDefault, messageThreadPortName, @@ -655,7 +655,7 @@ LONG CoreAudio_WaveInit(void) { ERR("Can't create message thread local port\n"); CFRelease(messageThreadPortName); - return 1; + return DRV_FAILURE; } Port_SendToMessageThread = CFMessagePortCreateRemote(kCFAllocatorDefault, messageThreadPortName); @@ -664,7 +664,7 @@ LONG CoreAudio_WaveInit(void) { ERR("Can't create port for sending to message thread\n"); CFRelease(port_ReceiveInMessageThread); - return 1; + return DRV_FAILURE; } /* Cannot WAIT for any events because we are called from the loader (which has a lock on loading stuff) */ @@ -681,12 +681,12 @@ LONG CoreAudio_WaveInit(void) CFRelease(port_ReceiveInMessageThread); CFRelease(Port_SendToMessageThread); Port_SendToMessageThread = NULL; - return 1; + return DRV_FAILURE; } /* The message thread is responsible for releasing port_ReceiveInMessageThread. */ - return 0; + return DRV_SUCCESS; } void CoreAudio_WaveRelease(void) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 56a4fd3..5452d3b 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -45,7 +45,7 @@ static LRESULT CoreAudio_drvLoad(void) CoreAudio_WaveInit(); CoreAudio_MIDIInit(); CoreAudio_MixerInit(); - return 1; + return DRV_SUCCESS; } /************************************************************************** @@ -57,7 +57,7 @@ static LRESULT CoreAudio_drvFree(void) CoreAudio_WaveRelease(); CoreAudio_MIDIRelease(); CoreAudio_MixerRelease(); - return 1; + return DRV_SUCCESS; } /************************************************************************** diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 01eb453..a052e05 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -109,7 +109,7 @@ LONG CoreAudio_MIDIInit(void) { CFRelease(name); ERR("can't create wineMIDIClient\n"); - return 0; + return DRV_FAILURE; } CFRelease(name); @@ -193,7 +193,7 @@ LONG CoreAudio_MIDIInit(void) destinations[i].caps.wVoices = 16; destinations[i].caps.wNotes = 16; } - return 1; + return DRV_SUCCESS; } LONG CoreAudio_MIDIRelease(void) @@ -214,7 +214,7 @@ LONG CoreAudio_MIDIRelease(void) HeapFree(GetProcessHeap(), 0, sources); HeapFree(GetProcessHeap(), 0, destinations); - return 1; + return DRV_SUCCESS; } diff --git a/dlls/winecoreaudio.drv/mixer.c b/dlls/winecoreaudio.drv/mixer.c index 66db8cb..a41b29b 100644 --- a/dlls/winecoreaudio.drv/mixer.c +++ b/dlls/winecoreaudio.drv/mixer.c @@ -368,7 +368,7 @@ LONG CoreAudio_MixerInit(void) (char) (status >> 16), (char) (status >> 8), (char) status); - return 0; + return DRV_FAILURE; } numLines = propertySize / sizeof(AudioDeviceID); @@ -495,7 +495,7 @@ LONG CoreAudio_MixerInit(void) MIX_FillControls(); HeapFree(GetProcessHeap(), 0, deviceArray); - return 1; + return DRV_SUCCESS; error: if (mixer.lines) @@ -510,7 +510,7 @@ error: HeapFree(GetProcessHeap(), 0, deviceArray); if (mixer.mixerCtrls) HeapFree(GetProcessHeap(), 0, mixer.mixerCtrls); - return 0; + return DRV_FAILURE; } /**************************************************************************

1 0

Ken Thomases : dsound: Adjust for partial block before prepare-header and add-buffer steps.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: 2de653552c02cd31f00480092583f1561b4180d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de653552c02cd31f00480092… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 12 02:05:56 2008 -0500 dsound: Adjust for partial block before prepare-header and add-buffer steps. Otherwise, the wave-in driver(s) may copy incorrect data to internal structures. --- dlls/dsound/capture.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 0c74ef9..05ab805 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1146,7 +1146,10 @@ IDirectSoundCaptureBufferImpl_Start( for (c = 0; c < device->nrofpwaves; ++c) { device->pwave[c].lpData = (char *)device->buffer + c * blocksize; - device->pwave[c].dwBufferLength = blocksize; + if (c + 1 == device->nrofpwaves) + device->pwave[c].dwBufferLength = device->buflen - c * blocksize; + else + device->pwave[c].dwBufferLength = blocksize; device->pwave[c].dwBytesRecorded = 0; device->pwave[c].dwUser = (DWORD)device; device->pwave[c].dwFlags = 0; @@ -1167,8 +1170,6 @@ IDirectSoundCaptureBufferImpl_Start( break; } } - if (device->buflen % blocksize) - device->pwave[device->nrofpwaves - 1].dwBufferLength = device->buflen % blocksize; FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); }

1 0

Ken Thomases : avifil32: Fix copy/paste error.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: 0bb1eb72b8b50ce3159223f1d34395bd18ab3b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb1eb72b8b50ce3159223f1d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 12 02:05:27 2008 -0500 avifil32: Fix copy/paste error. --- dlls/avifil32/acmstream.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 47013ef..378ff7f 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -467,7 +467,7 @@ static HRESULT WINAPI ACMStream_fnRead(IAVIStream *iface, LONG start, if (This->acmStreamHdr.pbSrc == NULL) This->acmStreamHdr.pbSrc = HeapAlloc(GetProcessHeap(), 0, size); else - This->acmStreamHdr.pbDst = HeapReAlloc(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc, size); + This->acmStreamHdr.pbSrc = HeapReAlloc(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc, size); if (This->acmStreamHdr.pbSrc == NULL) return AVIERR_MEMORY; This->acmStreamHdr.dwSrcUser = size;

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 March 2008