March 2018 - Wine-commits - list.winehq.org

Sebastian Lackner : configure: Support for recent versions of OSMesa.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 42d017be9282231e3ed49f7536f1f63ef233e216 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42d017be9282231e3ed49f75… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 24 01:20:15 2017 +0200 configure: Support for recent versions of OSMesa. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f625707ffc38c58cc296c8a27ac6c2b3e1c38249) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- dlls/gdi32/dibdrv/opengl.c | 17 +++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/configure b/configure index b77245f..1c5c2c9 100755 --- a/configure +++ b/configure @@ -10806,11 +10806,11 @@ LIBS="-lOSMesa $X_LIBS -lm $X_EXTRA_LIBS $LIBS" #ifdef __cplusplus extern "C" #endif -char glAccum (); +char OSMesaGetProcAddress (); int main () { -return glAccum (); +return OSMesaGetProcAddress (); ; return 0; } diff --git a/configure.ac b/configure.ac index 9b75b4f..8c57db9 100644 --- a/configure.ac +++ b/configure.ac @@ -1149,7 +1149,7 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c if test "x$with_osmesa" != "xno" then - WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS -lm $X_EXTRA_LIBS]) + WINE_CHECK_SONAME(OSMesa,OSMesaGetProcAddress,,,[$X_LIBS -lm $X_EXTRA_LIBS]) WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"], [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.]) fi diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 4133116..77d6320 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -113,14 +113,6 @@ static BOOL init_opengl(void) return FALSE; } - for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) - { - if (!(((void **)&opengl_funcs.gl)[i] = wine_dlsym( osmesa_handle, opengl_func_names[i], buffer, sizeof(buffer) ))) - { - ERR( "%s not found in %s (%s), disabling.\n", opengl_func_names[i], SONAME_LIBOSMESA, buffer ); - goto failed; - } - } #define LOAD_FUNCPTR(f) do if (!(p##f = wine_dlsym( osmesa_handle, #f, buffer, sizeof(buffer) ))) \ { \ ERR( "%s not found in %s (%s), disabling.\n", #f, SONAME_LIBOSMESA, buffer ); \ @@ -134,6 +126,15 @@ static BOOL init_opengl(void) LOAD_FUNCPTR(OSMesaPixelStore); #undef LOAD_FUNCPTR + for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) + { + if (!(((void **)&opengl_funcs.gl)[i] = pOSMesaGetProcAddress( opengl_func_names[i] ))) + { + ERR( "%s not found in %s, disabling.\n", opengl_func_names[i], SONAME_LIBOSMESA ); + goto failed; + } + } + return TRUE; failed:

1 0

Michael Stefaniuc : Release 2.0.5
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 89bd18ab6f23e05e013bc12b5bc862a172e6eacb URL: https://source.winehq.org/git/wine.git/?a=commit;h=89bd18ab6f23e05e013bc12b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Feb 18 23:40:58 2018 +0100 Release 2.0.5 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 375 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +-- 4 files changed, 190 insertions(+), 209 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=89bd18ab6f23e05e013b…

1 0

Tag wine-2.0.5 : Alexandre Julliard : Release 2.0.5
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: refs/tags/wine-2.0.5 Tag: dc253d6b7e758e684083ccaa1422197fd99da550 URL: https://source.winehq.org/git/wine.git/?a=tag;h=dc253d6b7e758e684083ccaa142… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 18 15:00:00 2018 +0100 Release 2.0.5

1 0

Vincent Povirk : windowscodecs: Fix 32bppGrayFloat to 8bppGray conversion.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 0491ab2f1281bee645c656109e9415b6923d1b1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0491ab2f1281bee645c65610… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 14 14:58:59 2017 -0500 windowscodecs: Fix 32bppGrayFloat to 8bppGray conversion. Based on Dmitry Timoshkov's patch. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8bae21302f88bd6b3360334355d9d7a5c6a1ad38) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/converter.c | 37 ++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/converter.c | 1 + 2 files changed, 38 insertions(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index e5d61e1..42ba260 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1149,6 +1149,43 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec return S_OK; } + if (source_format == format_32bppGrayFloat) + { + hr = S_OK; + + if (prc) + { + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + if (SUCCEEDED(hr)) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y=0; y < prc->Height; y++) + { + float *srcpixel = (float*)src; + BYTE *dstpixel = dst; + + for (x=0; x < prc->Width; x++) + *dstpixel++ = (BYTE)floorf(to_sRGB_component(*srcpixel++) * 255.0f + 0.51f); + + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + } + + return hr; + } + srcstride = 3 * prc->Width; srcdatasize = srcstride * prc->Height; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 2af9857..e88810d 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -804,6 +804,7 @@ START_TEST(converter) test_conversion(&testdata_24bppBGR, &testdata_8bppGray, "24bppBGR -> 8bppGray", FALSE); test_conversion(&testdata_32bppBGR, &testdata_8bppGray, "32bppBGR -> 8bppGray", FALSE); test_conversion(&testdata_32bppGrayFloat, &testdata_24bppBGR_gray, "32bppGrayFloat -> 24bppBGR gray", FALSE); + test_conversion(&testdata_32bppGrayFloat, &testdata_8bppGray, "32bppGrayFloat -> 8bppGray", FALSE); test_invalid_conversion(); test_default_converter();

1 0

Alexandre Julliard : libport: Add a replacement implementation for strnlen.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 322f430f2d6eaf2e731a25cd7d16ea052029acf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=322f430f2d6eaf2e731a25cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 10:48:48 2017 +0100 libport: Add a replacement implementation for strnlen. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9d36aad4571b288f5208d35425e1720c6f145376) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ include/wine/port.h | 5 +++++ libs/port/Makefile.in | 1 + libs/port/strnlen.c | 31 +++++++++++++++++++++++++++++++ 6 files changed, 42 insertions(+) diff --git a/configure b/configure index 9ae516f..caa68be 100755 --- a/configure +++ b/configure @@ -15280,6 +15280,7 @@ for ac_func in \ strdup \ strerror \ strncasecmp \ + strnlen \ strtold \ strtoll \ strtoull \ diff --git a/configure.ac b/configure.ac index acf9349..c507d7d 100644 --- a/configure.ac +++ b/configure.ac @@ -2050,6 +2050,7 @@ AC_CHECK_FUNCS(\ strdup \ strerror \ strncasecmp \ + strnlen \ strtold \ strtoll \ strtoull \ diff --git a/include/config.h.in b/include/config.h.in index 99906bd..76664df 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -906,6 +906,9 @@ /* Define to 1 if you have the `strncasecmp' function. */ #undef HAVE_STRNCASECMP +/* Define to 1 if you have the `strnlen' function. */ +#undef HAVE_STRNLEN + /* Define to 1 if you have the <stropts.h> header file. */ #undef HAVE_STROPTS_H diff --git a/include/wine/port.h b/include/wine/port.h index addece0..fb7251e 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -344,6 +344,10 @@ int strncasecmp(const char *str1, const char *str2, size_t n); # endif #endif /* !defined(HAVE_STRNCASECMP) */ +#ifndef HAVE_STRNLEN +size_t strnlen( const char *str, size_t maxlen ); +#endif /* !defined(HAVE_STRNLEN) */ + #ifndef HAVE_STRERROR const char *strerror(int err); #endif /* !defined(HAVE_STRERROR) */ @@ -538,6 +542,7 @@ extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compa #define strcasecmp __WINE_NOT_PORTABLE(strcasecmp) #define strerror __WINE_NOT_PORTABLE(strerror) #define strncasecmp __WINE_NOT_PORTABLE(strncasecmp) +#define strnlen __WINE_NOT_PORTABLE(strnlen) #define usleep __WINE_NOT_PORTABLE(usleep) #endif /* NO_LIBWINE_PORT */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 7fefda1..c87b99de 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -102,6 +102,7 @@ C_SRCS = \ strcasecmp.c \ strerror.c \ strncasecmp.c \ + strnlen.c \ symlink.c \ usleep.c \ utf8.c \ diff --git a/libs/port/strnlen.c b/libs/port/strnlen.c new file mode 100644 index 0000000..ab6668d --- /dev/null +++ b/libs/port/strnlen.c @@ -0,0 +1,31 @@ +/* + * strnlen function + * + * Copyright 2017 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#ifndef HAVE_STRNLEN +size_t strnlen( const char *str, size_t maxlen ) +{ + const char *ptr = memchr( str, 0, maxlen ); + if (!ptr) return maxlen; + return ptr - str; +} +#endif /* HAVE_STRNLEN */

1 0

Zebediah Figura : winegstreamer: Hold a reference to the filter in push_data().
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: c4cf5980220c8624bb80de926ab210cb0ff70429 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4cf5980220c8624bb80de92… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 19 20:49:20 2017 -0600 winegstreamer: Hold a reference to the filter in push_data(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 079d63e66c9f00030c94a5cc5e821ea898e83c98) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 759a5db..eb6fca5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -510,6 +510,8 @@ static DWORD CALLBACK push_data(LPVOID iface) DWORD_PTR user; HRESULT hr; + IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); + if (!This->stop) IAsyncReader_Length(This->pInputPin.pReader, &maxlen, &curlen); else @@ -589,6 +591,9 @@ static DWORD CALLBACK push_data(LPVOID iface) } while (buf); TRACE("Stopping.. %08x\n", hr); + + IBaseFilter_Release(&This->filter.IBaseFilter_iface); + return 0; }

1 0

Alexandre Julliard : kernel32: Properly detect ELF binaries that are position independent executables.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 5fd469171f29422e30b48ca4f60d63231e6940f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fd469171f29422e30b48ca4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 18 11:16:13 2017 +0100 kernel32: Properly detect ELF binaries that are position independent executables. Based on a patch by Sebastian Lackner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 21149e63313797a1603ca496a4c876418605d495) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/module.c | 64 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 3179b67..ebe6d43 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -238,13 +238,29 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) unsigned char magic[4]; unsigned char class; unsigned char data; - unsigned char version; - unsigned char ignored[9]; + unsigned char ignored1[10]; unsigned short type; unsigned short machine; + unsigned char ignored2[8]; + unsigned int phoff; + unsigned char ignored3[12]; + unsigned short phnum; } elf; struct { + unsigned char magic[4]; + unsigned char class; + unsigned char data; + unsigned char ignored1[10]; + unsigned short type; + unsigned short machine; + unsigned char ignored2[12]; + unsigned __int64 phoff; + unsigned char ignored3[16]; + unsigned short phnum; + } elf64; + struct + { unsigned int magic; unsigned int cputype; unsigned int cpusubtype; @@ -263,20 +279,54 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) if (!memcmp( header.elf.magic, "\177ELF", 4 )) { - if (header.elf.class == 2) info->flags |= BINARY_FLAG_64BIT; #ifdef WORDS_BIGENDIAN - if (header.elf.data == 1) + BOOL byteswap = (header.elf.data == 1); #else - if (header.elf.data == 2) + BOOL byteswap = (header.elf.data == 2); #endif + if (header.elf.class == 2) info->flags |= BINARY_FLAG_64BIT; + if (byteswap) { header.elf.type = RtlUshortByteSwap( header.elf.type ); header.elf.machine = RtlUshortByteSwap( header.elf.machine ); } switch(header.elf.type) { - case 2: info->type = BINARY_UNIX_EXE; break; - case 3: info->type = BINARY_UNIX_LIB; break; + case 2: + info->type = BINARY_UNIX_EXE; + break; + case 3: + { + LARGE_INTEGER phoff; + unsigned short phnum; + unsigned int type; + if (header.elf.class == 2) + { + phoff.QuadPart = byteswap ? RtlUlonglongByteSwap( header.elf64.phoff ) : header.elf64.phoff; + phnum = byteswap ? RtlUshortByteSwap( header.elf64.phnum ) : header.elf64.phnum; + } + else + { + phoff.QuadPart = byteswap ? RtlUlongByteSwap( header.elf.phoff ) : header.elf.phoff; + phnum = byteswap ? RtlUshortByteSwap( header.elf.phnum ) : header.elf.phnum; + } + while (phnum--) + { + if (SetFilePointerEx( hfile, phoff, NULL, FILE_BEGIN ) == -1) return; + if (!ReadFile( hfile, &type, sizeof(type), &len, NULL ) || len < sizeof(type)) return; + if (byteswap) type = RtlUlongByteSwap( type ); + if (type == 3) + { + info->type = BINARY_UNIX_EXE; + break; + } + phoff.QuadPart += (header.elf.class == 2) ? 56 : 32; + } + if (!info->type) info->type = BINARY_UNIX_LIB; + break; + } + default: + return; } switch(header.elf.machine) {

1 0

Zebediah Figura : compobj.dll16: Implement CoGetClassObject16().
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 412d7c8699f7cdb168b3397a209e58c9ded47d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=412d7c8699f7cdb168b3397a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 17 16:32:12 2017 -0600 compobj.dll16: Implement CoGetClassObject16(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6c2a5ee9172511ed26e5512bd3104771f46a0672) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 69 ++++++++++++++++++++++++++++++++--- dlls/compobj.dll16/compobj.dll16.spec | 2 +- 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index b934a06..af69bf8 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -714,15 +714,74 @@ HRESULT WINAPI CoFileTimeNow16( FILETIME *lpFileTime ) * */ HRESULT WINAPI CoGetClassObject16( - REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, - REFIID iid, LPVOID *ppv) + SEGPTR rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, + SEGPTR riid, SEGPTR ppv) { - FIXME(", stub!\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); + LPVOID *ppvl = MapSL(ppv); + + TRACE("CLSID: %s, IID: %s\n", debugstr_guid(MapSL(rclsid)), debugstr_guid(MapSL(riid))); + + *ppvl = NULL; if (pServerInfo) { - FIXME("\tpServerInfo: name=%s\n",debugstr_w(pServerInfo->pwszName)); - FIXME("\t\tpAuthInfo=%p\n",pServerInfo->pAuthInfo); + FIXME("pServerInfo->name=%s pAuthInfo=%p\n", + debugstr_w(pServerInfo->pwszName), pServerInfo->pAuthInfo); + } + + if (CLSCTX_INPROC_SERVER & dwClsContext) + { + char idstr[CHARS_IN_GUID]; + char buf_key[CHARS_IN_GUID+19], dllpath[MAX_PATH+1]; + LONG dllpath_len = sizeof(dllpath); + + HMODULE16 dll; + FARPROC16 DllGetClassObject; + + WORD args[6]; + DWORD dwRet; + + StringFromGUID216(MapSL(rclsid), idstr, CHARS_IN_GUID); + sprintf(buf_key, "CLSID\\%s\\InprocServer", idstr); + if (RegQueryValueA(HKEY_CLASSES_ROOT, buf_key, dllpath, &dllpath_len)) + { + ERR("class %s not registered\n", debugstr_guid(MapSL(rclsid))); + return REGDB_E_CLASSNOTREG; + } + + dll = LoadLibrary16(dllpath); + if (!dll) + { + ERR("couldn't load in-process dll %s\n", debugstr_a(dllpath)); + return E_ACCESSDENIED; /* FIXME: or should this be CO_E_DLLNOTFOUND? */ + } + + DllGetClassObject = GetProcAddress16(dll, "DllGetClassObject"); + if (!DllGetClassObject) + { + ERR("couldn't find function DllGetClassObject in %s\n", debugstr_a(dllpath)); + FreeLibrary16(dll); + return CO_E_DLLNOTFOUND; + } + + TRACE("calling DllGetClassObject %p\n", DllGetClassObject); + args[5] = SELECTOROF(rclsid); + args[4] = OFFSETOF(rclsid); + args[3] = SELECTOROF(riid); + args[2] = OFFSETOF(riid); + args[1] = SELECTOROF(ppv); + args[0] = OFFSETOF(ppv); + WOWCallback16Ex((DWORD) DllGetClassObject, WCB16_PASCAL, sizeof(args), args, &dwRet); + if (dwRet != S_OK) + { + ERR("DllGetClassObject returned error 0x%08x\n", dwRet); + FreeLibrary16(dll); + return dwRet; + } + + return S_OK; } + + FIXME("semi-stub\n"); return E_NOTIMPL; } diff --git a/dlls/compobj.dll16/compobj.dll16.spec b/dlls/compobj.dll16/compobj.dll16.spec index 85dfc42..71dba80 100644 --- a/dlls/compobj.dll16/compobj.dll16.spec +++ b/dlls/compobj.dll16/compobj.dll16.spec @@ -4,7 +4,7 @@ 4 pascal CoGetMalloc(long ptr) CoGetMalloc16 5 pascal CoRegisterClassObject(ptr ptr long long ptr) CoRegisterClassObject16 6 pascal CoRevokeClassObject(long) CoRevokeClassObject16 -7 pascal CoGetClassObject(ptr long ptr ptr ptr) CoGetClassObject16 +7 pascal CoGetClassObject(segptr long ptr segptr segptr) CoGetClassObject16 8 stub COMARSHALINTERFACE 9 stub COUNMARSHALINTERFACE 10 stub COLOADLIBRARY

1 0

Zebediah Figura : imaadp32.acm: Fix nibble ordering.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: d6ae6df9a4530beb2ad5261db1bcab0f0450650b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6ae6df9a4530beb2ad5261d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 8 10:15:21 2017 -0500 imaadp32.acm: Fix nibble ordering. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0f0fb984985aa08146996e04baf2b3d6e58abf46) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 78a0ac4..aafd114 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -445,7 +445,7 @@ static void cvtSS16imaK(PACMDRVSTREAMINSTANCE adsi, &stepIndexL, &sampleL); code2 = generate_nibble(R16(src + (4 * i + 2) * 2), &stepIndexL, &sampleL); - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } for (i = 0; i < 4; i++) { @@ -453,7 +453,7 @@ static void cvtSS16imaK(PACMDRVSTREAMINSTANCE adsi, &stepIndexR, &sampleR); code2 = generate_nibble(R16(src + (4 * i + 3) * 2), &stepIndexR, &sampleR); - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } src += 32; } @@ -509,7 +509,7 @@ static void cvtMM16imaK(PACMDRVSTREAMINSTANCE adsi, src += 2; code2 = generate_nibble(R16(src), &stepIndex, &sample); src += 2; - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } dst = in_dst + adsi->pwfxDst->nBlockAlign; }

1 0

Alexandre Julliard : ntdll: Fix source/destination confusion in vsscanf.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: ddd50786f8a9af3d1dc372af3ab5b63020ff49df URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd50786f8a9af3d1dc372af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 5 16:09:30 2018 +0100 ntdll: Fix source/destination confusion in vsscanf. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 62a1410a07476ac94acceaf2a9e65628d4b06ddc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/string.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index e8d061a..8ab5051 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -1178,19 +1178,19 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) else goto widecharacter; character: { /* read single character into char */ - char *str = suppress ? NULL : va_arg( ap, char * ); - char *pstr = str; + char *sptr = suppress ? NULL : va_arg( ap, char * ); + char *sptr_beg = sptr; unsigned size = UINT_MAX; if (width == -1) width = 1; while (width && nch != '\0') { if (!suppress) { - *str++ = nch; + *sptr++ = nch; if(size) size--; else { - *pstr = 0; + *sptr_beg = 0; return rd; } } @@ -1202,19 +1202,19 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) break; widecharacter: { /* read single character into a WCHAR */ - WCHAR *str = suppress ? NULL : va_arg( ap, WCHAR * ); - WCHAR *pstr = str; + WCHAR *sptr = suppress ? NULL : va_arg( ap, WCHAR * ); + WCHAR *sptr_beg = sptr; unsigned size = UINT_MAX; if (width == -1) width = 1; while (width && nch != '\0') { if (!suppress) { - *str++ = nch; + *sptr++ = nch; if (size) size--; else { - *pstr = 0; + *sptr_beg = 0; return rd; } } @@ -1248,10 +1248,10 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) break; case '[': { - char *str = suppress ? NULL : va_arg( ap, char * ); - char *sptr = str; + char *sptr = suppress ? NULL : va_arg( ap, char * ); + char *sptr_beg = sptr; RTL_BITMAP bitMask; - ULONG Mask[8]; + ULONG Mask[8] = { 0 }; BOOLEAN invert = FALSE; /* Set if we are NOT to find the chars */ unsigned size = UINT_MAX; @@ -1312,7 +1312,7 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) if(size > 1) size--; else { - *str = 0; + if (!suppress) *sptr_beg = 0; return rd; } }

1 0