diff --git a/configure b/configure index 793fd21eb7544757c0c40e813bbc35859567cb24..7ed320b78f848f7f19d219f00e87f4faa8d9351c 100755 --- a/configure +++ b/configure @@ -15,7 +15,7 @@ ac_default_prefix=/usr/local ac_help="$ac_help --disable-debug compile out all debugging messages" ac_help="$ac_help - --enable-opengl force usage of OpenGL even if the latter is thread-safe" + --enable-opengl force usage of OpenGL even if the latter is thread-safe via pthread" ac_help="$ac_help --disable-trace compile out TRACE messages" ac_help="$ac_help @@ -7394,7 +7394,7 @@ then echo echo "*** Warning: the OpenGL version you have installed relies on libpthread for" echo "*** thread-safety. To prevent crashes, OpenGL support has been removed." - echo "*** A fix for glibc 2.1.3 that seem to work is included in this version of Wine," + echo "*** A fix for glibc 2.1.3 that seems to work is included in this version of Wine," echo "*** start configure with '--enable-opengl' to force OpenGL support." fi diff --git a/configure.in b/configure.in index a6e01981b5cfa625475d1cb6229c87954223c6c7..14b465f448f505726a643bc723fec1c3f2ed8713 100644 --- a/configure.in +++ b/configure.in @@ -20,7 +20,7 @@ AC_ARG_ENABLE(debug, [if test "$enableval" = "no"; then DEBUG_MSGS="no"; fi]) AC_ARG_ENABLE(opengl, -[ --enable-opengl force usage of OpenGL even if the latter is thread-safe], +[ --enable-opengl force usage of OpenGL even if the latter is thread-safe via pthread], [if test "$enableval" = "no"; then OPENGL="no"; elif test "$enableval" = "yes"; then OPENGL="yes"; fi]) AC_ARG_ENABLE(trace, @@ -1267,7 +1267,7 @@ then echo echo "*** Warning: the OpenGL version you have installed relies on libpthread for" echo "*** thread-safety. To prevent crashes, OpenGL support has been removed." - echo "*** A fix for glibc 2.1.3 that seem to work is included in this version of Wine," + echo "*** A fix for glibc 2.1.3 that seems to work is included in this version of Wine," echo "*** start configure with '--enable-opengl' to force OpenGL support." fi diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 66002eb873be9e8d433ac3152aa6bd79922cdb82..0164370dca9c1be7e050c412463bb6b652cdc01b 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -613,6 +613,7 @@ StartServiceW( SC_HANDLE hService, DWORD dwNumServiceArgs, if( r == WAIT_FAILED) return FALSE; + FIXME("problematic because of address space separation.\n"); start_dwNumServiceArgs = dwNumServiceArgs; start_lpServiceArgVectors = (LPWSTR *)lpServiceArgVectors; diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index 2c54e570dd5dff5b8f745b86e7592db1eab5a771..93ece946444ff8eb4b5a15f76898a0c9096fe3ac 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -419,7 +419,7 @@ HDRVR WINAPI OpenDriverA(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lPara goto the_end; if (!(lpDrv = DRIVER_TryOpenDriver16(lpDriverName, lpSectionName, lParam2))) - TRACE("Failed to open driver %s from section %s\n", lpDriverName, lpSectionName); + TRACE("Failed to open driver %s from system.ini file, section %s\n", lpDriverName, lpSectionName); the_end: if (lpDrv) TRACE("=> %08lx\n", (DWORD)lpDrv); return (DWORD)lpDrv;