wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Alexandre Julliard : wrc: Remove no longer needed use of libwine_static.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: fabf11c2406159c52919dc100b451a4b2cda8d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabf11c2406159c52919dc100… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:34:09 2016 +0900 wrc: Remove no longer needed use of libwine_static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 2 +- tools/wrc/wrc.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 37dbe03..8c94ead 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -17,6 +17,6 @@ BISON_SRCS = parser.y wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}\"" -EXTRALIBS = $(GETTEXTPO_LIBS) $(LIBWPP) $(LIBWINE_STATIC) +EXTRALIBS = $(GETTEXTPO_LIBS) $(LIBWPP) INSTALL_DEV = $(PROGRAMS) diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 4a0a749..cf8c793 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -21,7 +21,6 @@ #ifndef __WRC_WRC_H #define __WRC_WRC_H -#define WINE_UNICODE_API /* nothing */ #include "wine/unicode.h" #include "wrctypes.h"

1 0

Alexandre Julliard : wrc: Avoid locale- or Unicode-dependent case conversions.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 865f23b5032171cdcd7221fce381c98f5ce6dd36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=865f23b5032171cdcd7221fce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:32:33 2016 +0900 wrc: Avoid locale- or Unicode-dependent case conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 6 ++++-- tools/wrc/parser.l | 2 +- tools/wrc/parser.y | 38 ++++++++++++-------------------------- tools/wrc/utils.c | 29 +++++++++++++++++++++++++++-- tools/wrc/utils.h | 2 ++ 5 files changed, 46 insertions(+), 31 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 336e64e..5b7e24c 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -263,11 +263,13 @@ static void string_to_upper(string_t *str) if(str->type == str_char) { - for (i = 0; i < str->size; i++) str->str.cstr[i] = toupper((unsigned char)str->str.cstr[i]); + for (i = 0; i < str->size; i++) + if (str->str.cstr[i] >= 'a' && str->str.cstr[i] <= 'z') str->str.cstr[i] -= 32; } else if(str->type == str_unicode) { - for (i = 0; i < str->size; i++) str->str.wstr[i] = toupperW(str->str.wstr[i]); + for (i = 0; i < str->size; i++) + if (str->str.wstr[i] >= 'a' && str->str.wstr[i] <= 'z') str->str.wstr[i] -= 32; } else { diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 80072b2..32a231b 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -250,7 +250,7 @@ static struct keyword keywords[] = { static int kw_cmp_func(const void *s1, const void *s2) { int ret; - ret = strcasecmp(KWP(s1)->keyword, KWP(s2)->keyword); + ret = compare_striA(KWP(s1)->keyword, KWP(s2)->keyword); if(!ret && (KWP(s1)->needcase || KWP(s2)->needcase)) return strcmp(KWP(s1)->keyword, KWP(s2)->keyword); else diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index b41e7d7..0f73f90 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -2072,37 +2072,23 @@ static int get_class_idW(const WCHAR *cc) static const WCHAR szSTATIC[] = {'S','T','A','T','I','C',0}; static const WCHAR szSCROLLBAR[] = {'S','C','R','O','L','L','B','A','R',0}; - if(!strcmpiW(szBUTTON, cc)) - return CT_BUTTON; - if(!strcmpiW(szCOMBOBOX, cc)) - return CT_COMBOBOX; - if(!strcmpiW(szLISTBOX, cc)) - return CT_LISTBOX; - if(!strcmpiW(szEDIT, cc)) - return CT_EDIT; - if(!strcmpiW(szSTATIC, cc)) - return CT_STATIC; - if(!strcmpiW(szSCROLLBAR, cc)) - return CT_SCROLLBAR; - + if(!compare_striW(szBUTTON, cc)) return CT_BUTTON; + if(!compare_striW(szCOMBOBOX, cc)) return CT_COMBOBOX; + if(!compare_striW(szLISTBOX, cc)) return CT_LISTBOX; + if(!compare_striW(szEDIT, cc)) return CT_EDIT; + if(!compare_striW(szSTATIC, cc)) return CT_STATIC; + if(!compare_striW(szSCROLLBAR, cc)) return CT_SCROLLBAR; return -1; } static int get_class_idA(const char *cc) { - if(!strcasecmp("BUTTON", cc)) - return CT_BUTTON; - if(!strcasecmp("COMBOBOX", cc)) - return CT_COMBOBOX; - if(!strcasecmp("LISTBOX", cc)) - return CT_LISTBOX; - if(!strcasecmp("EDIT", cc)) - return CT_EDIT; - if(!strcasecmp("STATIC", cc)) - return CT_STATIC; - if(!strcasecmp("SCROLLBAR", cc)) - return CT_SCROLLBAR; - + if(!compare_striA("BUTTON", cc)) return CT_BUTTON; + if(!compare_striA("COMBOBOX", cc)) return CT_COMBOBOX; + if(!compare_striA("LISTBOX", cc)) return CT_LISTBOX; + if(!compare_striA("EDIT", cc)) return CT_EDIT; + if(!compare_striA("STATIC", cc)) return CT_STATIC; + if(!compare_striA("SCROLLBAR", cc)) return CT_SCROLLBAR; return -1; } diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 5360b95..800692a 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -219,6 +219,31 @@ char *xstrdup(const char *str) return strcpy(s, str); } +int compare_striA( const char *str1, const char *str2 ) +{ + for (;;) + { + /* only the A-Z range is case-insensitive */ + char ch1 = (*str1 >= 'a' && *str1 <= 'z') ? *str1 + 'A' - 'a' : *str1; + char ch2 = (*str2 >= 'a' && *str2 <= 'z') ? *str2 + 'A' - 'a' : *str2; + if (!ch1 || ch1 != ch2) return ch1 - ch2; + str1++; + str2++; + } +} + +int compare_striW( const WCHAR *str1, const WCHAR *str2 ) +{ + for (;;) + { + /* only the A-Z range is case-insensitive */ + WCHAR ch1 = (*str1 >= 'a' && *str1 <= 'z') ? *str1 + 'A' - 'a' : *str1; + WCHAR ch2 = (*str2 >= 'a' && *str2 <= 'z') ? *str2 + 'A' - 'a' : *str2; + if (!ch1 || ch1 != ch2) return ch1 - ch2; + str1++; + str2++; + } +} /* ***************************************************************************** @@ -241,12 +266,12 @@ int compare_name_id(const name_id_t *n1, const name_id_t *n2) if(n1->name.s_name->type == str_char && n2->name.s_name->type == str_char) { - return strcasecmp(n1->name.s_name->str.cstr, n2->name.s_name->str.cstr); + return compare_striA(n1->name.s_name->str.cstr, n2->name.s_name->str.cstr); } else if(n1->name.s_name->type == str_unicode && n2->name.s_name->type == str_unicode) { - return strcmpiW(n1->name.s_name->str.wstr, n2->name.s_name->str.wstr); + return compare_striW(n1->name.s_name->str.wstr, n2->name.s_name->str.wstr); } else { diff --git a/tools/wrc/utils.h b/tools/wrc/utils.h index 19daa09..f0e8cd6 100644 --- a/tools/wrc/utils.h +++ b/tools/wrc/utils.h @@ -33,6 +33,8 @@ char *xstrdup(const char *str); #define __attribute__(X) #endif +int compare_striA( const char *str1, const char *str2 ); +int compare_striW( const WCHAR *str1, const WCHAR *str2 ); char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); int parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2)));

1 0

Alexandre Julliard : wrc: Only allow control key characters ^A to ^Z.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: e8076eeced9b49b2e1211dd3f009105b39ed75bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8076eeced9b49b2e1211dd3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:29:45 2016 +0900 wrc: Only allow control key characters ^A to ^Z. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index e23c789..336e64e 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -297,8 +297,11 @@ static int parse_accel_string( const string_t *key, int flags ) } else if(key->str.cstr[0] == '^') { - keycode = toupper((unsigned char)key->str.cstr[1]) - '@'; - if(keycode >= ' ') + if (key->str.cstr[1] >= 'a' && key->str.cstr[1] <= 'z') + keycode = key->str.cstr[1] - 'a' + 1; + else if (key->str.cstr[1] >= 'A' && key->str.cstr[1] <= 'Z') + keycode = key->str.cstr[1] - 'A' + 1; + else { print_location( &key->loc ); error("Control-code out of range\n"); @@ -324,8 +327,11 @@ static int parse_accel_string( const string_t *key, int flags ) } else if(key->str.wstr[0] == '^') { - keycode = toupperW(key->str.wstr[1]) - '@'; - if(keycode >= ' ') + if (key->str.wstr[1] >= 'a' && key->str.wstr[1] <= 'z') + keycode = key->str.wstr[1] - 'a' + 1; + else if (key->str.wstr[1] >= 'A' && key->str.wstr[1] <= 'Z') + keycode = key->str.wstr[1] - 'A' + 1; + else { print_location( &key->loc ); error("Control-code out of range\n");

1 0

Alexandre Julliard : wrc: Don' t convert class and menu names to uppercase in resource data.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 22cb2beb1cefb43928f194e4428bc30858cb34a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22cb2beb1cefb43928f194e44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:28:32 2016 +0900 wrc: Don't convert class and menu names to uppercase in resource data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 8993a87..e23c789 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -657,11 +657,11 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) put_word(res, dlg->width); put_word(res, dlg->height); if(dlg->menu) - put_name_id(res, dlg->menu, TRUE, dlg->lvc.language); + put_name_id(res, dlg->menu, FALSE, dlg->lvc.language); else put_word(res, 0); if(dlg->dlgclass) - put_name_id(res, dlg->dlgclass, TRUE, dlg->lvc.language); + put_name_id(res, dlg->dlgclass, FALSE, dlg->lvc.language); else put_word(res, 0); if(dlg->title) @@ -709,7 +709,7 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) else put_word(res, ctrl->id); if(ctrl->ctlclass) - put_name_id(res, ctrl->ctlclass, TRUE, dlg->lvc.language); + put_name_id(res, ctrl->ctlclass, FALSE, dlg->lvc.language); else internal_error(__FILE__, __LINE__, "Control has no control-class\n"); if(ctrl->title)

1 0

Piotr Caban : msvcrt/tests: Add close tests on file descriptors that use the same HANDLE.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 96d476584e771bb352c8b8a84ff51f67a63f0d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d476584e771bb352c8b8a84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 19 18:43:31 2016 +0100 msvcrt/tests: Add close tests on file descriptors that use the same HANDLE. Based on Qian Hong patch. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/file.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index ba8c3e3..dbb6cef 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2327,6 +2327,64 @@ static void test_write_flush(void) free(tempf); } +static void test_close(void) +{ + ioinfo *stdout_info, stdout_copy, *stderr_info, stderr_copy; + int fd1, fd2, ret1, ret2, ret3, ret4; + DWORD flags; + HANDLE h; + + /* test close on fds that use the same handle */ + h = CreateFileA("fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "error opening fdopen.tst file\n"); + + fd1 = _open_osfhandle((intptr_t)h, 0); + ok(fd1 != -1, "_open_osfhandle failed (%d)\n", errno); + fd2 = _open_osfhandle((intptr_t)h, 0); + ok(fd2 != -1, "_open_osfhandle failed (%d)\n", errno); + ok(fd1 != fd2, "fd1 == fd2\n"); + + ok((HANDLE)_get_osfhandle(fd1) == h, "handles mismatch (%p != %p)\n", + (HANDLE)_get_osfhandle(fd1), h); + ok((HANDLE)_get_osfhandle(fd2) == h, "handles mismatch (%p != %p)\n", + (HANDLE)_get_osfhandle(fd2), h); + ok(!close(fd1), "close(fd1) failed (%d)\n", errno); + ok(!GetHandleInformation(h, &flags), "GetHandleInformation succeeded\n"); + ok(close(fd2), "close(fd2) succeeded\n"); + + /* test close on stdout and stderr that use the same handle */ + h = CreateFileA("fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "error opening fdopen.tst file\n"); + + /* tests output will not be visible from now on */ + stdout_info = &__pioinfo[STDOUT_FILENO/MSVCRT_FD_BLOCK_SIZE][STDOUT_FILENO%MSVCRT_FD_BLOCK_SIZE]; + stderr_info = &__pioinfo[STDERR_FILENO/MSVCRT_FD_BLOCK_SIZE][STDERR_FILENO%MSVCRT_FD_BLOCK_SIZE]; + stdout_copy = *stdout_info; + stderr_copy = *stderr_info; + stdout_info->handle = h; + stderr_info->handle = h; + + ret1 = close(STDOUT_FILENO); + ret2 = GetHandleInformation(h, &flags); + ret3 = close(STDERR_FILENO); + ret4 = GetHandleInformation(h, &flags); + + *stdout_info = stdout_copy; + *stderr_info = stderr_copy; + SetStdHandle(STD_OUTPUT_HANDLE, stdout_info->handle); + SetStdHandle(STD_ERROR_HANDLE, stderr_info->handle); + /* stdout and stderr restored */ + + ok(!ret1, "close(STDOUT_FILENO) failed\n"); + ok(ret2, "GetHandleInformation failed\n"); + ok(!ret3, "close(STDERR_FILENO) failed\n"); + ok(!ret4, "GetHandleInformation succeeded\n"); + + DeleteFileA( "fdopen.tst" ); +} + START_TEST(file) { int arg_c; @@ -2393,6 +2451,7 @@ START_TEST(file) test_mktemp(); test__open_osfhandle(); test_write_flush(); + test_close(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order

1 0

Piotr Caban : msvcrt: Don' t close HANDLE if stdout or stderr is sharing it.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 781b069ed813927d00fb53e84731186eb58d9d3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=781b069ed813927d00fb53e84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 19 18:43:20 2016 +0100 msvcrt: Don't close HANDLE if stdout or stderr is sharing it. Based on Qian Hong patch. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9f35a62..fc9f1ae 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1021,6 +1021,14 @@ int CDECL MSVCRT__close(int fd) TRACE(":fd (%d) handle (%p)\n", fd, info->handle); if (!(info->wxflag & WX_OPEN)) { ret = -1; + } else if (fd == MSVCRT_STDOUT_FILENO && + info->handle == get_ioinfo_nolock(MSVCRT_STDERR_FILENO)->handle) { + msvcrt_free_fd(fd); + ret = 0; + } else if (fd == MSVCRT_STDERR_FILENO && + info->handle == get_ioinfo_nolock(MSVCRT_STDOUT_FILENO)->handle) { + msvcrt_free_fd(fd); + ret = 0; } else { ret = CloseHandle(info->handle) ? 0 : -1; msvcrt_free_fd(fd);

1 0

Andrew Eikum : winegstreamer: Fix usage of gst_audio_format_build_integer.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 3fb8ec59ffcc3e60ae41d364ed9e1f2bd40d4b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fb8ec59ffcc3e60ae41d364e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 19 14:11:53 2016 -0600 winegstreamer: Fix usage of gst_audio_format_build_integer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gsttffilter.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index b8435ba..72eeda2 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -838,12 +838,15 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P inisfloat = IsEqualGUID(&inwfx->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); if (inwfx->Samples.wValidBitsPerSample) indepth = inwfx->Samples.wValidBitsPerSample; - } + } else if (inwfe->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) + inisfloat = TRUE; + + if (inisfloat) + format = inwfe->wBitsPerSample == 64 ? GST_AUDIO_FORMAT_F64LE : GST_AUDIO_FORMAT_F32LE; + else + format = gst_audio_format_build_integer(inwfe->wBitsPerSample == 8 ? FALSE : TRUE, + G_LITTLE_ENDIAN, inwfe->wBitsPerSample, indepth); - format = inisfloat ? (inwfe->wBitsPerSample == 64 ? GST_AUDIO_FORMAT_F64LE : GST_AUDIO_FORMAT_F32LE) - : gst_audio_format_build_integer(inwfe->wBitsPerSample == 8 ? FALSE : TRUE, - inwfe->wBitsPerSample, - indepth, G_LITTLE_ENDIAN); capsin = gst_caps_new_simple("audio/x-raw", "format", G_TYPE_STRING, gst_audio_format_to_string(format), "channels", G_TYPE_INT, inwfe->nChannels,

1 0

Andrew Eikum : mciqtz: Implement MCI_RESUME.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 924c97fe9070c62652c0b19d71469a07a6dd7a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=924c97fe9070c62652c0b19d7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 19 10:48:52 2016 -0600 mciqtz: Implement MCI_RESUME. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index aa257a0..4e559b6 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -584,6 +584,29 @@ static DWORD MCIQTZ_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP } /*************************************************************************** + * MCIQTZ_mciResume [internal] + */ +static DWORD MCIQTZ_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + HRESULT hr; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + hr = IMediaControl_Run(wma->pmctrl); + if (FAILED(hr)) { + TRACE("Cannot run filtergraph (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + return 0; +} + +/*************************************************************************** * MCIQTZ_mciGetDevCaps [internal] */ static DWORD MCIQTZ_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) @@ -1126,6 +1149,9 @@ static DWORD CALLBACK MCIQTZ_taskThread(LPVOID arg) case MCI_PAUSE: task->res = MCIQTZ_mciPause(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); break; + case MCI_RESUME: + task->res = MCIQTZ_mciResume(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); + break; case MCI_GETDEVCAPS: task->res = MCIQTZ_mciGetDevCaps(task->devid, task->flags, (LPMCI_GETDEVCAPS_PARMS)task->parms); break; @@ -1209,6 +1235,7 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_CLOSE_DRIVER: case MCI_STOP: case MCI_PAUSE: + case MCI_RESUME: return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); /* Digital Video specific */ case MCI_SETAUDIO: @@ -1218,7 +1245,6 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, if (!dwParam2) return MCIERR_NULL_PARAMETER_BLOCK; return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); case MCI_RECORD: - case MCI_RESUME: case MCI_INFO: case MCI_LOAD: case MCI_SAVE:

1 0

Andrew Eikum : winepulse.drv: Buffer data locally when needed.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 1245f8335c31a6078ed50fc17cff4d60877c72a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1245f8335c31a6078ed50fc17… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 19 10:48:24 2016 -0600 winepulse.drv: Buffer data locally when needed. PulseAudio doesn't make any buffer size guarantees. With some hardware and some configurations, PulseAudio will fail to allocate the full buffer requested by the application. So, we have to store the data within winepulse until there is enough room in the PulseAudio buffer to accept it. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 274 ++++++++++++++++++++++++++++++++---------- 1 file changed, 212 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1245f8335c31a6078ed50…

1 0

Andrew Eikum : winepulse: Include a period in the stream latency.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 92da5e5d73abad5acc4897c67f35c0cb18f7ab20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92da5e5d73abad5acc4897c67… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 19 10:47:21 2016 -0600 winepulse: Include a period in the stream latency. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 4ba329e..3f5e3d5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1436,9 +1436,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, return hr; } attr = pa_stream_get_buffer_attr(This->stream); - if (This->dataflow == eRender) + if (This->dataflow == eRender){ lat = attr->minreq / pa_frame_size(&This->ss); - else + lat += pulse_def_period[0]; + }else lat = attr->fragsize / pa_frame_size(&This->ss); *latency = 10000000; *latency *= lat;

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
76
Older →

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 February 2016