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

Zhiyi Zhang : winecfg: Fix a crash when inputting non-ASCII dll override name.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 0ce94877dd2339c293cf759417a1c8d1703acd8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ce94877dd2339c293cf7594… Author: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Date: Mon Dec 18 22:33:08 2017 +0800 winecfg: Fix a crash when inputting non-ASCII dll override name. Signed-off-by: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit eee8131d3ba53daa85303602046e7523a04a3a10) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/winecfg.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index dbac929..ba317c7 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -571,7 +571,7 @@ char **enumerate_values(HKEY root, char *path) WCHAR *wpath; WCHAR **wret; char **ret=NULL; - int i=0, len=0; + int i=0, len=0, size; wpath = HeapAlloc(GetProcessHeap(), 0, (strlen(path)+1)*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, strlen(path)+1); @@ -586,11 +586,13 @@ char **enumerate_values(HKEY root, char *path) /* convert WCHAR ** to char ** and HeapFree each WCHAR * element on our way */ for (i=0; i<len; i++) { - ret[i] = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(wret[i]) + 1) * sizeof(char)); - WideCharToMultiByte(CP_ACP, 0, wret[i], -1, ret[i], - lstrlenW(wret[i]) + 1, NULL, NULL); - HeapFree(GetProcessHeap(), 0, wret[i]); + size = WideCharToMultiByte(CP_ACP, 0, wret[i], -1, NULL, 0, NULL, NULL); + if(size) + { + ret[i] = HeapAlloc(GetProcessHeap(), 0, size); + WideCharToMultiByte(CP_ACP, 0, wret[i], -1, ret[i], size, NULL, NULL); + HeapFree(GetProcessHeap(), 0, wret[i]); + } } ret[len] = NULL; }

1 0

Henri Verbeet : wined3d: Ignore WINED3D_MAP_DISCARD when used together with WINED3D_MAP_NOOVERWRITE.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: ab74b3c012bbf38675228e81fd6a245ac5152c9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab74b3c012bbf38675228e81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 3 16:06:55 2018 +0100 wined3d: Ignore WINED3D_MAP_DISCARD when used together with WINED3D_MAP_NOOVERWRITE. This fixes a performance issue exposed by commit afb2aa2512d4c5ffa7256ce5137bc2c142a5d065. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 63ed42ac39440cc914397c70ed0c43aa747ceb4e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/resource.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 611c61f..6534b94 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -328,17 +328,19 @@ static DWORD wined3d_resource_sanitise_map_flags(const struct wined3d_resource * return 0; } } - else if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) { - WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, ignoring.\n"); - return 0; - } - else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE) - && !(resource->usage & WINED3DUSAGE_DYNAMIC)) - { - WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); - return 0; + if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + { + WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); + return 0; + } + if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + { + WARN("WINED3D_MAP_NOOVERWRITE used with WINED3D_MAP_DISCARD, ignoring WINED3D_MAP_DISCARD.\n"); + flags &= ~WINED3D_MAP_DISCARD; + } } return flags;

1 0

Zebediah Figura : winedbg/gdbproxy: Replace memory read over a breakpoint with the real value.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: e46cfd0fbec434a7258f56c7780016f6b3123567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e46cfd0fbec434a7258f56c7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 14 19:01:15 2018 -0600 winedbg/gdbproxy: Replace memory read over a breakpoint with the real value. Normally, when we hit a breakpoint, we remove it before stopping and add it after continuing. gdb, however, reads the process memory before requesting that the breakpoint be removed, and apparently caches it until the `stepi` instruction is executed; as a result, it thinks that the interrupt byte that is present in the code is an actual interrupt and not a breakpoint, and so tries to step over it as one byte instead of executing the real instruction at that location. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit eb63a5f3c3c1851f212bd14f91da329bf3166e42) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winedbg/gdbproxy.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index f94fef5..400f6de 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1499,6 +1499,28 @@ static enum packet_return packet_thread(struct gdb_context* gdbctx) } } +static BOOL read_memory(struct gdb_context *gdbctx, char *addr, char *buffer, SIZE_T blk_len, SIZE_T *r) +{ + /* Wrapper around process_io->read() that replaces values displaced by breakpoints. */ + + BOOL ret; + + ret = gdbctx->process->process_io->read(gdbctx->process->handle, addr, buffer, blk_len, r); + if (ret) + { + struct gdb_ctx_Xpoint *xpt; + + for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) + { + char *xpt_addr = xpt->addr; + + if (xpt->type != -1 && xpt_addr >= addr && xpt_addr < addr + blk_len) + buffer[xpt_addr - addr] = xpt->val; + } + } + return ret; +} + static enum packet_return packet_read_memory(struct gdb_context* gdbctx) { char *addr; @@ -1515,8 +1537,7 @@ static enum packet_return packet_read_memory(struct gdb_context* gdbctx) for (nread = 0; nread < len; nread += r, addr += r) { blk_len = min(sizeof(buffer), len - nread); - if (!gdbctx->process->process_io->read(gdbctx->process->handle, addr, buffer, blk_len, &r) || - r == 0) + if (!read_memory(gdbctx, addr, buffer, blk_len, &r) || r == 0) { /* fail at first address, return error */ if (nread == 0) return packet_reply_error(gdbctx, EFAULT);

1 0

Nikolay Sivov : mshtml: Avoid potential moniker instance leak.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 1a6c8f4f7d2a00c764554a4fd59a002c3e1599bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a6c8f4f7d2a00c764554a4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 4 14:56:15 2017 +0300 mshtml: Avoid potential moniker instance leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2b37b97d0c6356f8b89401183295222123e4b619) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/persist.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 2735ab5..408bc00 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -892,10 +892,9 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, TRUE); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + hres = channelbsc_load_stream(This->window->pending_window, mon, pStm); - hres = channelbsc_load_stream(This->window->pending_window, mon, pStm); IMoniker_Release(mon); return hres; } @@ -950,10 +949,9 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, FALSE); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + hres = channelbsc_load_stream(This->window->pending_window, mon, NULL); - hres = channelbsc_load_stream(This->window->pending_window, mon, NULL); IMoniker_Release(mon); return hres; }

1 0

Fabian Maurer : msvcrt: Don' t crash if _vsnwprintf gets NULL as format string and add test.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 1f2bfe7520a9295710d28e04f0173e5a677b98b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f2bfe7520a9295710d28e04… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Dec 1 18:19:31 2017 +0100 msvcrt: Don't crash if _vsnwprintf gets NULL as format string and add test. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 058be4304eb0c0e5f264e166b68991808a21001a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 31 +++++++++++++++++++++++++++++++ dlls/msvcrt/printf.h | 3 +++ 2 files changed, 34 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 2fde843..237bf68 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -133,6 +133,7 @@ static char* (__cdecl *p_setlocale)(int, const char*); static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *handler)(_FPIEEE_RECORD*)); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); +static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); /* make sure we use the correct errno */ #undef errno @@ -401,6 +402,7 @@ static BOOL init(void) SET(p__fpieee_flt, "_fpieee_flt"); SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); + SET(p__vsnwprintf, "_vsnwprintf"); if (sizeof(void *) == 8) { @@ -1864,6 +1866,34 @@ static void test__memicmp_l(void) ok(ret == -1, "got %d\n", ret); } +static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vsnwprintf(str, len, format, valist); + __ms_va_end(valist); + return ret; +} + +void test__vsnwprintf(void) +{ + int ret; + WCHAR str[2] = {0}; + + _invalid_parameter_handler old_handler = p_set_invalid_parameter_handler(test_invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + str[0] = 'x'; + ret = _vsnwprintf_wrapper(str, 0, NULL); + ok(ret == -1, "got %d, expected -1\n", ret); + ok(str[0] == 'x', "Expected string to be unchanged.\n"); + CHECK_CALLED(invalid_parameter_handler, EINVAL); + + ok(p_set_invalid_parameter_handler(old_handler) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); +} + START_TEST(msvcr90) { if(!init()) @@ -1897,6 +1927,7 @@ START_TEST(msvcr90) test__mbstok_s(); test__memicmp(); test__memicmp_l(); + test__vsnwprintf(); #ifdef __i386__ test__fpieee_flt(); #endif diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 392ead8..51a52a5 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -367,6 +367,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); + if (!MSVCRT_CHECK_PMT(fmt != NULL)) + return -1; + if(!locale) locinfo = get_locinfo(); else

1 0

Martin Storsjo : configure: Check for -Wno-pragma-pack.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: a31315fe07e90711fec794b64991728db11a30cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a31315fe07e90711fec794b6… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 22 00:05:35 2018 +0200 configure: Check for -Wno-pragma-pack. Recent clang versions warn if an include file changes the pragma pack level without restoring it before the end of the include file. This avoids warnings for each include of pshpack*.h/poppack.h. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 51e2966b4b00cd128c44b413803d8e430a15d021) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+) diff --git a/configure b/configure index 848e4c2..c6e876b 100755 --- a/configure +++ b/configure @@ -14452,6 +14452,31 @@ $as_echo "$ac_cv_cflags__Wno_packed_not_aligned" >&6; } if test "x$ac_cv_cflags__Wno_packed_not_aligned" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-pragma-pack" >&5 +$as_echo_n "checking whether the compiler supports -Wno-pragma-pack... " >&6; } +if ${ac_cv_cflags__Wno_pragma_pack+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wno-pragma-pack" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wno_pragma_pack=yes +else + ac_cv_cflags__Wno_pragma_pack=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_pragma_pack" >&5 +$as_echo "$ac_cv_cflags__Wno_pragma_pack" >&6; } +if test "x$ac_cv_cflags__Wno_pragma_pack" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wno-pragma-pack" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wshift-overflow=2" >&5 $as_echo_n "checking whether the compiler supports -Wshift-overflow=2... " >&6; } if ${ac_cv_cflags__Wshift_overflow_2+:} false; then : diff --git a/configure.ac b/configure.ac index 62f5aa9..b768d05 100644 --- a/configure.ac +++ b/configure.ac @@ -1768,6 +1768,7 @@ then WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) WINE_TRY_CFLAGS([-Wno-packed-not-aligned]) + WINE_TRY_CFLAGS([-Wno-pragma-pack]) WINE_TRY_CFLAGS([-Wshift-overflow=2]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits])

1 0

Alex Henrie : libport: Fix typo in rintf.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: a7841d4c71de034adf062a9979eb8ddeb6d45b79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7841d4c71de034adf062a99… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 13 14:16:48 2017 -0700 libport: Fix typo in rintf. Spotted by Joris Huizer. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ef104c3a336661b72a7485adb3d98477e755f6c7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- libs/port/rint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/port/rint.c b/libs/port/rint.c index a99c00b..2c0d222 100644 --- a/libs/port/rint.c +++ b/libs/port/rint.c @@ -33,7 +33,7 @@ double rint(double x) #ifndef HAVE_RINTF float rintf(float x) { - return rintf(x); + return rint(x); } #endif

1 0

Michael Stefaniuc : Release 2.0.5
by Alexandre Julliard March 18, 2018

March 18, 2018

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

Sebastian Lackner : configure: Support for recent versions of OSMesa.
by Alexandre Julliard March 18, 2018

March 18, 2018

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 : make_announce: Don't hardcode the 'stable' branch.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 0a05fe63974c47780e7720c2eb23178585e0429c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a05fe63974c47780e7720c2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 20 23:45:44 2018 +0100 make_announce: Don't hardcode the 'stable' branch. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_announce b/tools/make_announce index 9e44a13..b38b7b0 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -70,7 +70,7 @@ sub get_bugs($) { my %bugs; - open QUERY, "-|" or exec "git", "log", "--notes=stable-notes", "--format=%N", "wine-" . get_current_version() . "..stable" + open QUERY, "-|" or exec "git", "log", "--notes=stable-notes", "--format=%N", "wine-" . get_current_version() . ".." or die "cannot query bug list"; while (<QUERY>) {

1 0