February 2016 - Wine-Commits

Frédéric Delanoy : shell32/tests: Get rid of redundant lok_todo_N macros.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 9f23eae55f45a71fc181ade62208715af7c3df88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f23eae55f45a71fc181ade62… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 20 14:04:31 2016 +0100 shell32/tests: Get rid of redundant lok_todo_N macros. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 48 ++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index f22cb36..f7c091e 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -351,8 +351,6 @@ static void test_get_set(void) */ #define lok ok_(__FILE__, line) -#define lok_todo_4(todo_flag,a,b,c,d) todo_wine_if ((todo & todo_flag) != 0) lok((a), (b), (c), (d)); -#define lok_todo_2(todo_flag,a,b) todo_wine_if ((todo & todo_flag) != 0) lok((a), (b)); #define check_lnk(a,b,c) check_lnk_(__LINE__, (a), (b), (c)) void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) @@ -521,44 +519,44 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) strcpy(buffer,"garbage"); r = IShellLinkA_GetDescription(sl, buffer, sizeof(buffer)); lok(r == S_OK, "GetDescription failed (0x%08x)\n", r); - lok_todo_4(0x1, strcmp(buffer, desc->description)==0, - "GetDescription returned '%s' instead of '%s'\n", - buffer, desc->description); + todo_wine_if ((todo & 0x1) != 0) + lok(strcmp(buffer, desc->description)==0, "GetDescription returned '%s' instead of '%s'\n", + buffer, desc->description); } if (desc->workdir) { strcpy(buffer,"garbage"); r = IShellLinkA_GetWorkingDirectory(sl, buffer, sizeof(buffer)); lok(r == S_OK, "GetWorkingDirectory failed (0x%08x)\n", r); - lok_todo_4(0x2, lstrcmpiA(buffer, desc->workdir)==0, - "GetWorkingDirectory returned '%s' instead of '%s'\n", - buffer, desc->workdir); + todo_wine_if ((todo & 0x2) != 0) + lok(lstrcmpiA(buffer, desc->workdir)==0, "GetWorkingDirectory returned '%s' instead of '%s'\n", + buffer, desc->workdir); } if (desc->path) { strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); lok(SUCCEEDED(r), "GetPath failed (0x%08x)\n", r); - lok_todo_4(0x4, lstrcmpiA(buffer, desc->path)==0, - "GetPath returned '%s' instead of '%s'\n", - buffer, desc->path); + todo_wine_if ((todo & 0x4) != 0) + lok(lstrcmpiA(buffer, desc->path)==0, "GetPath returned '%s' instead of '%s'\n", + buffer, desc->path); } if (desc->pidl) { LPITEMIDLIST pidl=NULL; r = IShellLinkA_GetIDList(sl, &pidl); lok(r == S_OK, "GetIDList failed (0x%08x)\n", r); - lok_todo_2(0x8, pILIsEqual(pidl, desc->pidl), - "GetIDList returned an incorrect pidl\n"); + todo_wine_if ((todo & 0x8) != 0) + lok(pILIsEqual(pidl, desc->pidl), "GetIDList returned an incorrect pidl\n"); } if (desc->showcmd) { int i=0xdeadbeef; r = IShellLinkA_GetShowCmd(sl, &i); lok(r == S_OK, "GetShowCmd failed (0x%08x)\n", r); - lok_todo_4(0x10, i==desc->showcmd, - "GetShowCmd returned 0x%0x instead of 0x%0x\n", - i, desc->showcmd); + todo_wine_if ((todo & 0x10) != 0) + lok(i==desc->showcmd, "GetShowCmd returned 0x%0x instead of 0x%0x\n", + i, desc->showcmd); } if (desc->icon) { @@ -566,21 +564,21 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) strcpy(buffer,"garbage"); r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i); lok(r == S_OK, "GetIconLocation failed (0x%08x)\n", r); - lok_todo_4(0x20, lstrcmpiA(buffer, desc->icon)==0, - "GetIconLocation returned '%s' instead of '%s'\n", - buffer, desc->icon); - lok_todo_4(0x20, i==desc->icon_id, - "GetIconLocation returned 0x%0x instead of 0x%0x\n", - i, desc->icon_id); + todo_wine_if ((todo & 0x20) != 0) { + lok(lstrcmpiA(buffer, desc->icon)==0, "GetIconLocation returned '%s' instead of '%s'\n", + buffer, desc->icon); + lok(i==desc->icon_id, "GetIconLocation returned 0x%0x instead of 0x%0x\n", + i, desc->icon_id); + } } if (desc->hotkey) { WORD i=0xbeef; r = IShellLinkA_GetHotkey(sl, &i); lok(r == S_OK, "GetHotkey failed (0x%08x)\n", r); - lok_todo_4(0x40, i==desc->hotkey, - "GetHotkey returned 0x%04x instead of 0x%04x\n", - i, desc->hotkey); + todo_wine_if ((todo & 0x40) != 0) + lok(i==desc->hotkey, "GetHotkey returned 0x%04x instead of 0x%04x\n", + i, desc->hotkey); } IShellLinkA_Release(sl);

1 0

Charles Davis : kernel32: Use setprogname(3) to set the program name if available.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 5a4576ee09cff4a886c2d502bde7d1d6418a0ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a4576ee09cff4a886c2d502b… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 19 15:33:33 2016 -0700 kernel32: Use setprogname(3) to set the program name if available. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/kernel32/process.c | 17 ++++++++++++++--- include/config.h.in | 3 +++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 8529306..8200927 100755 --- a/configure +++ b/configure @@ -15047,6 +15047,7 @@ for ac_func in \ sched_yield \ select \ setproctitle \ + setprogname \ setrlimit \ settimeofday \ sigaltstack \ diff --git a/configure.ac b/configure.ac index c9445e7..2ebbb10 100644 --- a/configure.ac +++ b/configure.ac @@ -2026,6 +2026,7 @@ AC_CHECK_FUNCS(\ sched_yield \ select \ setproctitle \ + setprogname \ setrlimit \ settimeofday \ sigaltstack \ diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 86333be..4771108 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1118,9 +1118,20 @@ static void set_process_name( int argc, char *argv[] ) { #ifdef HAVE_SETPROCTITLE setproctitle("-%s", argv[1]); -#endif + /* remove argv[0] */ + memmove( argv, argv + 1, argc * sizeof(argv[0]) ); +#elif defined(HAVE_SETPROGNAME) + int i, offset; + char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; -#ifdef HAVE_PRCTL + offset = argv[1] - argv[0]; + memmove( argv[1] - offset, argv[1], end - argv[1] ); + memset( end - offset, 0, offset ); + for (i = 1; i < argc; i++) argv[i-1] = argv[i] - offset; + argv[i-1] = NULL; + + setprogname( argv[0] ); +#elif defined(HAVE_PRCTL) int i, offset; char *p, *prctl_name = argv[1]; char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; @@ -1141,11 +1152,11 @@ static void set_process_name( int argc, char *argv[] ) argv[i-1] = NULL; } else -#endif /* HAVE_PRCTL */ { /* remove argv[0] */ memmove( argv, argv + 1, argc * sizeof(argv[0]) ); } +#endif /* HAVE_PRCTL */ } diff --git a/include/config.h.in b/include/config.h.in index 86318c5..86da1a5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -774,6 +774,9 @@ /* Define to 1 if you have the `setproctitle' function. */ #undef HAVE_SETPROCTITLE +/* Define to 1 if you have the `setprogname' function. */ +#undef HAVE_SETPROGNAME + /* Define to 1 if you have the `setrlimit' function. */ #undef HAVE_SETRLIMIT

1 0

Frédéric Delanoy : ntdll/tests: Use todo_wine_if () in tests.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 06b39c982d86777f408805967992a57a6811be2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b39c982d86777f408805967… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 19 22:10:55 2016 +0100 ntdll/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 7b1002a..f93c623 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -148,12 +148,8 @@ static void tally_test_file(FILE_BOTH_DIRECTORY_INFORMATION *dir_info) if (namelen != len || memcmp(nameW, testfiles[i].nameW, len*sizeof(WCHAR))) continue; if (!testfiles[i].attr_done) { - if (testfiles[i].todo) { - todo_wine + todo_wine_if (testfiles[i].todo) ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); - } else { - ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); - } testfiles[i].attr_done = TRUE; } testfiles[i].nfound++;

1 0

Alexandre Julliard : wrc: Remove no longer needed use of libwine_static.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

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

Nikolay Sivov : dwrite: Trace GetPaletteEntries() failure (Coverity).
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: a8a6f0bd8602ce13de60acf01d9c63f491635777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a6f0bd8602ce13de60acf01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 20 10:51:04 2016 +0300 dwrite: Trace GetPaletteEntries() failure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 292866e..05b5f55 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4792,11 +4792,14 @@ static BOOL colorglyphenum_build_color_run(struct dwrite_colorglyphenum *glyphen if (!got_palette_index) { colorrun->paletteIndex = glyphenum->glyphs[g].palette_index; /* use foreground color or request one from the font */ - if (colorrun->paletteIndex == 0xffff) - memset(&colorrun->runColor, 0, sizeof(colorrun->runColor)); - else - IDWriteFontFace2_GetPaletteEntries(glyphenum->fontface, glyphenum->palette, colorrun->paletteIndex, + memset(&colorrun->runColor, 0, sizeof(colorrun->runColor)); + if (colorrun->paletteIndex != 0xffff) { + HRESULT hr = IDWriteFontFace2_GetPaletteEntries(glyphenum->fontface, glyphenum->palette, colorrun->paletteIndex, 1, &colorrun->runColor); + if (FAILED(hr)) + WARN("failed to get palette entry, fontface %p, palette %u, index %u, 0x%08x\n", glyphenum->fontface, + glyphenum->palette, colorrun->paletteIndex, hr); + } /* found a glyph position new color run starts from, origin is "original origin + distance to this glyph" */ colorrun->baselineOriginX = glyphenum->origin_x + get_glyph_origin(glyphenum, g); colorrun->baselineOriginY = glyphenum->origin_y;

1 0

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

Feb. 22, 2016

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

Frédéric Delanoy : msctf/tests: Use todo_wine_if () in tests.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 430556ae06281cb6c4b23baf91b9c00724f1a58d URL: http://source.winehq.org/git/wine.git/?a=commit;h=430556ae06281cb6c4b23baf9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 19 15:05:52 2016 +0100 msctf/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 58d4d26..a873345 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -117,9 +117,7 @@ static inline void _sink_fire_ok(INT *sink, const CHAR* name) *sink = (*sink & ~SINK_EXPECTED_COUNT_MASK) + (count << 16); return; default: - if (todo) - todo_wine winetest_ok(0, "Unexpected %s sink\n",name); - else + todo_wine_if (todo) winetest_ok(0, "Unexpected %s sink\n",name); } *sink = SINK_FIRED; @@ -147,9 +145,7 @@ static inline void _sink_check_ok(INT *sink, const CHAR* name) winetest_trace("optional sink %s not fired\n",name); break; default: - if (todo) - todo_wine winetest_ok(0, "%s not fired as expected, in state %x\n",name,*sink); - else + todo_wine_if (todo) winetest_ok(0, "%s not fired as expected, in state %x\n",name,*sink); } *sink = SINK_UNEXPECTED;

1 0

Austin English : user32: Add DisplayConfigGetDeviceInfo stub.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: c7a4b0628d7597fb0eff3e5dd589f70dbba04ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a4b0628d7597fb0eff3e5dd… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 19 02:42:05 2016 -0600 user32: Add DisplayConfigGetDeviceInfo stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/wingdi.h | 19 +++++++++++++++++++ include/winuser.h | 1 + 4 files changed, 30 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 55722c1..1787b99 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2817,6 +2817,15 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND /*********************************************************************** + * DisplayConfigGetDeviceInfo (USER32.@) + */ +LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) +{ + FIXME("stub: %p\n", packet); + return ERROR_NOT_SUPPORTED; +} + +/*********************************************************************** * EnumDisplaySettingsW (USER32.@) * * RETURNS diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 9b409df..2f5d36f 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -168,6 +168,7 @@ @ stdcall DisableProcessWindowsGhosting() @ stdcall DispatchMessageA(ptr) @ stdcall DispatchMessageW(ptr) +@ stdcall DisplayConfigGetDeviceInfo(ptr) # @ stub DisplayExitWindowsWarnings @ stdcall DlgDirListA(long str long long long) @ stdcall DlgDirListComboBoxA(long ptr long long long) diff --git a/include/wingdi.h b/include/wingdi.h index f6fd6fe..ff11406 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3278,6 +3278,25 @@ typedef struct _RGNDATA { typedef BOOL (CALLBACK *ABORTPROC)(HDC, INT); +typedef enum { + DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME = 1, + DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME = 2, + DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE = 3, + DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME = 4, + DISPLAYCONFIG_DEVICE_INFO_SET_TARGET_PERSISTENCE = 5, + DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_BASE_TYPE = 6, + DISPLAYCONFIG_DEVICE_INFO_GET_SUPPORT_VIRTUAL_RESOLUTION = 7, + DISPLAYCONFIG_DEVICE_INFO_SET_SUPPORT_VIRTUAL_RESOLUTION = 8, + DISPLAYCONFIG_DEVICE_INFO_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_DEVICE_INFO_TYPE; + +typedef struct DISPLAYCONFIG_DEVICE_INFO_HEADER { + DISPLAYCONFIG_DEVICE_INFO_TYPE type; + UINT32 size; + LUID adapterId; + UINT32 id; +} DISPLAYCONFIG_DEVICE_INFO_HEADER; + typedef struct { DWORD cb; CHAR DeviceName[32]; diff --git a/include/winuser.h b/include/winuser.h index b5f89c1..fa3e661 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3285,6 +3285,7 @@ WINUSERAPI LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,D WINUSERAPI HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES); WINUSERAPI HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES); #define CreateDesktop WINELIB_NAME_AW(CreateDesktop) +WINUSERAPI LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *); WINUSERAPI BOOL WINAPI EnumDisplayDevicesA(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD); WINUSERAPI BOOL WINAPI EnumDisplayDevicesW(LPCWSTR,DWORD,LPDISPLAY_DEVICEW,DWORD); #define EnumDisplayDevices WINELIB_NAME_AW(EnumDisplayDevices)

1 0

Andrew Eikum : winegstreamer: Fix usage of gst_audio_format_build_integer.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

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

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in device_parent_create_swapchain_texture().
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: bd38c16ec201061cbf3d1ae9f429b2c94c16e7f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd38c16ec201061cbf3d1ae9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 17:28:46 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in device_parent_create_swapchain_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7b351c3..bac44b6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3689,7 +3689,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic return hr; } - d3d_surface = wined3d_resource_get_parent(wined3d_texture_get_sub_resource(*texture, 0)); + d3d_surface = wined3d_texture_get_sub_resource_parent(*texture, 0); d3d_surface->parent_device = &device->IDirect3DDevice9Ex_iface; return hr;

1 0