August 2006 - Wine-commits - list.winehq.org

Jan Zerebecki : wined3d: Use a common function for all D3DCMPFUNC -> GLenum conversions.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: fd15b8d0643caee864d7fff5c0d557e220237881 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fd15b8d0643caee864d7fff… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Fri Aug 25 16:28:34 2006 +0200 wined3d: Use a common function for all D3DCMPFUNC -> GLenum conversions. --- dlls/wined3d/device.c | 40 ++++++++++------------------------------ dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 13 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3c2f9ea..c6a2af5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3325,9 +3325,11 @@ static void renderstate_stencil(IWineD3D if( This->stateBlock->set.renderState[WINED3DRS_TWOSIDEDSTENCILMODE] ) twosided_enable = This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]; if( This->stateBlock->set.renderState[WINED3DRS_STENCILFUNC] ) - func = StencilFunc(This->stateBlock->renderState[WINED3DRS_STENCILFUNC]); + if( !( func = CompareFunc(This->stateBlock->renderState[WINED3DRS_STENCILFUNC]) ) ) + func = GL_ALWAYS; if( This->stateBlock->set.renderState[WINED3DRS_CCW_STENCILFUNC] ) - func_ccw = StencilFunc(This->stateBlock->renderState[WINED3DRS_CCW_STENCILFUNC]); + if( !( func_ccw = CompareFunc(This->stateBlock->renderState[WINED3DRS_CCW_STENCILFUNC]) ) ) + func = GL_ALWAYS; if( This->stateBlock->set.renderState[WINED3DRS_STENCILREF] ) ref = This->stateBlock->renderState[WINED3DRS_STENCILREF]; if( This->stateBlock->set.renderState[WINED3DRS_STENCILMASK] ) @@ -3353,10 +3355,12 @@ static void renderstate_stencil(IWineD3D twosided_enable = Value; break; case WINED3DRS_STENCILFUNC : - func = StencilFunc(Value); + if( !( func = CompareFunc(Value) ) ) + func = GL_ALWAYS; break; case WINED3DRS_CCW_STENCILFUNC : - func_ccw = StencilFunc(Value); + if( !( func_ccw = CompareFunc(Value) ) ) + func_ccw = GL_ALWAYS; break; case WINED3DRS_STENCILREF : ref = Value; @@ -3560,20 +3564,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_ZFUNC : { - int glParm = 0; + int glParm = CompareFunc(Value); - switch ((D3DCMPFUNC) Value) { - case D3DCMP_NEVER: glParm=GL_NEVER; break; - case D3DCMP_LESS: glParm=GL_LESS; break; - case D3DCMP_EQUAL: glParm=GL_EQUAL; break; - case D3DCMP_LESSEQUAL: glParm=GL_LEQUAL; break; - case D3DCMP_GREATER: glParm=GL_GREATER; break; - case D3DCMP_NOTEQUAL: glParm=GL_NOTEQUAL; break; - case D3DCMP_GREATEREQUAL: glParm=GL_GEQUAL; break; - case D3DCMP_ALWAYS: glParm=GL_ALWAYS; break; - default: - FIXME("Unrecognized/Unhandled D3DCMPFUNC value %ld\n", Value); - } if(glParm) { glDepthFunc(glParm); checkGLcall("glDepthFunc"); @@ -3676,19 +3668,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl ref = 0.0; } else { ref = ((float) This->stateBlock->renderState[WINED3DRS_ALPHAREF]) / 255.0f; - - switch ((D3DCMPFUNC) This->stateBlock->renderState[WINED3DRS_ALPHAFUNC]) { - case D3DCMP_NEVER: glParm = GL_NEVER; break; - case D3DCMP_LESS: glParm = GL_LESS; break; - case D3DCMP_EQUAL: glParm = GL_EQUAL; break; - case D3DCMP_LESSEQUAL: glParm = GL_LEQUAL; break; - case D3DCMP_GREATER: glParm = GL_GREATER; break; - case D3DCMP_NOTEQUAL: glParm = GL_NOTEQUAL; break; - case D3DCMP_GREATEREQUAL: glParm = GL_GEQUAL; break; - case D3DCMP_ALWAYS: glParm = GL_ALWAYS; break; - default: - FIXME("Unrecognized/Unhandled D3DCMPFUNC value %ld\n", This->stateBlock->renderState[WINED3DRS_ALPHAFUNC]); - } + glParm = CompareFunc(This->stateBlock->renderState[WINED3DRS_ALPHAFUNC]); } if(glParm) { This->alphafunc = glParm; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index debd8a3..48b18bd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -665,7 +665,7 @@ GLenum StencilOp(DWORD op) { } } -GLenum StencilFunc(DWORD func) { +GLenum CompareFunc(DWORD func) { switch ((D3DCMPFUNC)func) { case D3DCMP_NEVER : return GL_NEVER; case D3DCMP_LESS : return GL_LESS; @@ -677,7 +677,7 @@ GLenum StencilFunc(DWORD func) { case D3DCMP_ALWAYS : return GL_ALWAYS; default: FIXME("Unrecognized D3DCMPFUNC value %ld\n", func); - return GL_ALWAYS; + return 0; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cfb8a7d..bc8a9b5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1244,7 +1244,7 @@ const char* debug_d3dpool(WINED3DPOOL po /* Routines for GL <-> D3D values */ GLenum StencilOp(DWORD op); -GLenum StencilFunc(DWORD func); +GLenum CompareFunc(DWORD func); void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, D3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3); void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, D3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx); void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords);

1 0

Mike McCormack : msi: Set the ALLUSERS property to 1 always.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: c8548fb88d569f63f43fb009072ff8f03e562cb0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8548fb88d569f63f43fb00… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Aug 25 22:35:29 2006 +0900 msi: Set the ALLUSERS property to 1 always. --- dlls/msi/package.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 227be6c..5a22957 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -212,6 +212,7 @@ static VOID set_installer_properties(MSI static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; static const WCHAR szScreenFormat[] = {'%','d',0}; static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; + static const WCHAR szAllUsers[] = { 'A','L','L','U','S','E','R','S',0 }; SYSTEM_INFO sys_info; /* @@ -315,6 +316,7 @@ static VOID set_installer_properties(MSI /* in a wine environment the user is always admin and privileged */ MSI_SetPropertyW(package,szAdminUser,szOne); MSI_SetPropertyW(package,szPriv,szOne); + MSI_SetPropertyW(package, szAllUsers, szOne); /* set the os things */ OSVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA);

1 0

Mike McCormack : msi: Use msi_get_property_int rather than MSI_GetPropertyW .
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: 99338f48b59ebd99803d07f1f03d9ae001cf12a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=99338f48b59ebd99803d07f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Aug 25 20:24:02 2006 +0900 msi: Use msi_get_property_int rather than MSI_GetPropertyW. --- dlls/msi/dialog.c | 22 ++++------------------ 1 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 5a1f550..6293fc8 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2170,27 +2170,11 @@ static MSIRECORD *msi_get_dialog_record( return rec; } -static void msi_get_screen_resolution( msi_dialog *dialog, UINT *xres, UINT *yres ) +static void msi_dialog_adjust_dialog_pos( msi_dialog *dialog, MSIRECORD *rec, LPRECT pos ) { - WCHAR num[10]; - DWORD sz = 10; - static const WCHAR szScreenX[] = {'S','c','r','e','e','n','X',0}; static const WCHAR szScreenY[] = {'S','c','r','e','e','n','Y',0}; - *xres = 0; - *yres = 0; - - MSI_GetPropertyW( dialog->package, szScreenX, num, &sz ); - *xres = atolW( num ); - - sz = 10; - MSI_GetPropertyW( dialog->package, szScreenY, num, &sz ); - *yres = atolW( num ); -} - -static void msi_dialog_adjust_dialog_pos( msi_dialog *dialog, MSIRECORD *rec, LPRECT pos ) -{ UINT xres, yres; POINT center; SIZE sz; @@ -2205,7 +2189,9 @@ static void msi_dialog_adjust_dialog_pos sz.cx = msi_dialog_scale_unit( dialog, sz.cx ); sz.cy = msi_dialog_scale_unit( dialog, sz.cy ); - msi_get_screen_resolution( dialog, &xres, &yres ); + xres = msi_get_property_int( dialog->package, szScreenX, 0 ); + yres = msi_get_property_int( dialog->package, szScreenY, 0 ); + center.x = MulDiv( center.x, xres, 100 ); center.y = MulDiv( center.y, yres, 100 );

1 0

Mike McCormack : msi: Fix a memory leak.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: e2a0a35423d762b255629138bef4e19d06304b3d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e2a0a35423d762b25562913… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Aug 25 22:34:49 2006 +0900 msi: Fix a memory leak. --- dlls/msi/alter.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 98a6243..396354c 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -128,6 +128,7 @@ static UINT ALTER_delete( struct tagMSIV MSIALTERVIEW *av = (MSIALTERVIEW*)view; TRACE("%p\n", av ); + msi_free( av ); return ERROR_SUCCESS; }

1 0

Alexandre Julliard : configure: Set rpath on all executables that link to libwine.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: 13a93b4a94512fd6829d9884eb4bb0aba7abac16 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13a93b4a94512fd6829d988… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 17:23:44 2006 +0200 configure: Set rpath on all executables that link to libwine. Also add the -multiply_defined suppress option for executables on MacOS. --- Make.rules.in | 1 + configure | 10 ++++++---- configure.ac | 4 +++- loader/Makefile.in | 7 +++---- server/Makefile.in | 4 +--- tools/wmc/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 18cfd5c..f77ae49 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -84,6 +84,7 @@ DLLDIR = $(TOPOBJDIR)/dlls LIBPORT = $(TOPOBJDIR)/libs/port/libwine_port.a LIBWPP = $(TOPOBJDIR)/libs/wpp/libwpp.a LIBWINE = -L$(TOPOBJDIR)/libs/wine -lwine +LIBWINE_LDFLAGS = @LIBWINE_LDFLAGS@ $(LIBWINE) @SET_MAKE@ diff --git a/configure b/configure index ca41210..78210e8 100755 --- a/configure +++ b/configure @@ -738,13 +738,13 @@ LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT +LIBWINE_LDFLAGS DLLTOOL DLLWRAP COREFOUNDATIONLIB IOKITLIB LDEXECFLAGS COREAUDIO -LDEXERPATH CROSSTEST CROSSCC CROSSWINDRES @@ -15224,6 +15224,8 @@ LIBEXT="so" IMPLIBEXT="def" +LIBWINE_LDFLAGS="" + case $host_os in cygwin*|mingw32*) @@ -15433,6 +15435,7 @@ fi LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-bundle -multiply_defined suppress" + LIBWINE_LDFLAGS="-multiply_defined suppress" LDSHARED="\$(CC) -dynamiclib -install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME)" STRIP="$STRIP -u -r" COREFOUNDATIONLIB="-framework CoreFoundation" @@ -16042,8 +16045,7 @@ ac_res=`eval echo '${'$as_ac_var'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then - LDEXERPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`" - + LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`" fi @@ -25170,13 +25172,13 @@ LDSHARED!$LDSHARED$ac_delim LDDLLFLAGS!$LDDLLFLAGS$ac_delim LIBEXT!$LIBEXT$ac_delim IMPLIBEXT!$IMPLIBEXT$ac_delim +LIBWINE_LDFLAGS!$LIBWINE_LDFLAGS$ac_delim DLLTOOL!$DLLTOOL$ac_delim DLLWRAP!$DLLWRAP$ac_delim COREFOUNDATIONLIB!$COREFOUNDATIONLIB$ac_delim IOKITLIB!$IOKITLIB$ac_delim LDEXECFLAGS!$LDEXECFLAGS$ac_delim COREAUDIO!$COREAUDIO$ac_delim -LDEXERPATH!$LDEXERPATH$ac_delim CROSSTEST!$CROSSTEST$ac_delim CROSSCC!$CROSSCC$ac_delim CROSSWINDRES!$CROSSWINDRES$ac_delim diff --git a/configure.ac b/configure.ac index 1ed3b1e..f6125e5 100644 --- a/configure.ac +++ b/configure.ac @@ -999,6 +999,7 @@ AC_SUBST(LDSHARED,"") AC_SUBST(LDDLLFLAGS,"") AC_SUBST(LIBEXT,"so") AC_SUBST(IMPLIBEXT,"def") +AC_SUBST(LIBWINE_LDFLAGS,"") case $host_os in cygwin*|mingw32*) @@ -1020,6 +1021,7 @@ case $host_os in LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-bundle -multiply_defined suppress" + LIBWINE_LDFLAGS="-multiply_defined suppress" LDSHARED="\$(CC) -dynamiclib -install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME)" STRIP="$STRIP -u -r" dnl declare needed frameworks @@ -1066,7 +1068,7 @@ case $host_os in [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])]) WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], - [AC_SUBST(LDEXERPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])]) + [LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"]) case $host_cpu in *i[[3456789]]86* | x86_64) diff --git a/loader/Makefile.in b/loader/Makefile.in index abf4a5f..51f190d 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -28,19 +28,18 @@ all: $(WINE_BINARIES) $(MODULE) $(MANPAG LIBPTHREAD = @LIBPTHREAD@ LDEXECFLAGS = @LDEXECFLAGS@ -LDRPATH = @LDEXERPATH@ wine-glibc: glibc.o Makefile.in - $(CC) -o $@ glibc.o $(LDRPATH) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) + $(CC) -o $@ glibc.o $(LIBWINE_LDFLAGS) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) wine-preloader: preloader.o Makefile.in $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS) wine-kthread: $(KTHREAD_OBJS) Makefile.in - $(CC) -o $@ $(LDEXECFLAGS) $(LDRPATH) $(KTHREAD_OBJS) $(LIBWINE) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) + $(CC) -o $@ $(LDEXECFLAGS) $(KTHREAD_OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) wine-pthread: $(PTHREAD_OBJS) Makefile.in - $(CC) -o $@ $(LDEXECFLAGS) $(LDRPATH) $(PTHREAD_OBJS) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) + $(CC) -o $@ $(LDEXECFLAGS) $(PTHREAD_OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(MODULE): $(MAIN_BINARY) $(RM) $(MODULE) && $(LN_S) $(MAIN_BINARY) $(MODULE) diff --git a/server/Makefile.in b/server/Makefile.in index afa6539..05f92aa 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -60,10 +60,8 @@ all: $(PROGRAMS) $(MANPAGES) @MAKE_RULES@ -LDEXERPATH = @LDEXERPATH@ - wineserver: $(OBJS) - $(CC) -o $@ $(LDEXERPATH) $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(LIBS) + $(CC) -o $@ $(OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(LDFLAGS) $(LIBS) install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) $(INSTALL_PROGRAM) wineserver $(DESTDIR)$(bindir)/wineserver diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index 4584a97..5c99710 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -27,7 +27,7 @@ mcl.o: mcy.tab.h @MAKE_RULES@ wmc$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWINE) $(LIBPORT) $(LEXLIB) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(LEXLIB) $(LDFLAGS) mcy.tab.c mcy.tab.h: mcy.y $(BISON) -d -t $(SRCDIR)/mcy.y -o mcy.tab.c diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 4e40df5..dd2ca82 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -29,7 +29,7 @@ all: $(PROGRAMS) $(MANPAGES) @MAKE_RULES@ wrc$(EXEEXT): $(OBJS) $(LIBWPP) - $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBWINE) $(LIBPORT) $(LEXLIB) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBWINE_LDFLAGS) $(LIBPORT) $(LEXLIB) $(LDFLAGS) parser.tab.c parser.tab.h: parser.y $(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c

1 0

Alexandre Julliard : crypt32/tests: Avoid sizeof in traces.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: 4bbcaad249f302d726436cd22d27955e9971a883 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4bbcaad249f302d726436cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 18:37:38 2006 +0200 crypt32/tests: Avoid sizeof in traces. --- dlls/crypt32/tests/encode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 6576f6c..50e3725 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1064,7 +1064,7 @@ static void test_decodeUnicodeName(DWORD if (buf) { ok(bufSize == sizeof(CERT_NAME_INFO), - "Expected bufSize %d, got %ld\n", sizeof(CERT_NAME_INFO), bufSize); + "Got wrong bufSize %ld\n", bufSize); ok(((CERT_NAME_INFO *)buf)->cRDN == 0, "Expected 0 RDNs in empty info, got %ld\n", ((CERT_NAME_INFO *)buf)->cRDN);

1 0

Alexandre Julliard : winex11.drv: Fix a compiler warning when OpenGL is missing.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: 383e0242f75f50909bc2b2306674d99a028e07b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=383e0242f75f50909bc2b23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 18:37:52 2006 +0200 winex11.drv: Fix a compiler warning when OpenGL is missing. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 22930ac..2fb2011 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -31,7 +31,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wgl); WINE_DECLARE_DEBUG_CHANNEL(opengl); -WINE_DECLARE_DEBUG_CHANNEL(fps); #if defined(HAVE_GL_GL_H) && defined(HAVE_GL_GLX_H) @@ -58,6 +57,7 @@ #define CALLBACK __stdcall #define WINAPI __stdcall #define APIENTRY WINAPI +WINE_DECLARE_DEBUG_CHANNEL(fps); static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { TRACE(" - size / version : %d / %d\n", ppfd->nSize, ppfd->nVersion);

1 0

Alexandre Julliard : configure: Move cache handling into the WINE_TRY_CFLAGS macro.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: 182d150aa92bce04cee3140bc8a59b2bd997e7ce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=182d150aa92bce04cee3140… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 13:22:33 2006 +0200 configure: Move cache handling into the WINE_TRY_CFLAGS macro. --- aclocal.m4 | 9 ++ configure | 291 +++++++++++++++++++++++++++++----------------------------- configure.ac | 124 +++++-------------------- 3 files changed, 178 insertions(+), 246 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=182d150aa92bce04cee…

1 0

Alexandre Julliard : configure: Make sure timezone and daylight are variables.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: ff2bd66137889b25dd959293c80fef3dd31b3d0e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff2bd66137889b25dd95929… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 13:23:29 2006 +0200 configure: Make sure timezone and daylight are variables. --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index b2d5370..ca41210 100755 --- a/configure +++ b/configure @@ -23652,7 +23652,7 @@ #include <time.h> int main () { -timezone; +timezone = 1 ; return 0; } @@ -23727,7 +23727,7 @@ #include <time.h> int main () { -daylight; +daylight = 1 ; return 0; } diff --git a/configure.ac b/configure.ac index 426a087..1ed3b1e 100644 --- a/configure.ac +++ b/configure.ac @@ -1435,14 +1435,14 @@ #endif]) dnl Check for the external timezone variables timezone and daylight AC_CACHE_CHECK([for timezone variable], ac_cv_have_timezone, - AC_TRY_LINK([#include <time.h>],[timezone;], + AC_TRY_LINK([#include <time.h>],[timezone = 1], ac_cv_have_timezone="yes", ac_cv_have_timezone="no")) if test "$ac_cv_have_timezone" = "yes" then AC_DEFINE(HAVE_TIMEZONE, 1, [Define if you have the timezone variable]) fi AC_CACHE_CHECK([for daylight variable], ac_cv_have_daylight, - AC_TRY_LINK([#include <time.h>],[daylight;], + AC_TRY_LINK([#include <time.h>],[daylight = 1], ac_cv_have_daylight="yes", ac_cv_have_daylight="no")) if test "$ac_cv_have_daylight" = "yes" then

1 0

lostwages/templates/en status_ui.template
by Jeremy Newman 25 Aug '06

25 Aug '06

ChangeSet ID: 27649 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/08/25 09:16:52 Modified files: templates/en : status_ui.template Log message: Mike McCormack <mike(a)codeweavers.com> Fix the UI status page html and links Patch: http://cvs.winehq.org/patch.py?id=27649 Old revision New revision Changes Path 1.22 1.23 +19 -18 lostwages/templates/en/status_ui.template Index: lostwages/templates/en/status_ui.template diff -u -p lostwages/templates/en/status_ui.template:1.22 lostwages/templates/en/status_ui.template:1.23 --- lostwages/templates/en/status_ui.template:1.22 25 Aug 2006 14:16:52 -0000 +++ lostwages/templates/en/status_ui.template 25 Aug 2006 14:16:52 -0000 @@ -23,6 +23,7 @@ <td colspan="5">Fundamentals</td> </tr> + <tr> <td>Visible Region</td> <td></td> <td></td> @@ -30,7 +31,7 @@ <td class="pct100">100%: Complete</td> </tr> - </tr> + <tr> <td>Window Management</td> <td></td> @@ -39,7 +40,7 @@ <td class="pct90">90%: Optimization of repainting on window moves, port some hacks from CrossOver tree</td> </tr> - </tr> + <tr> <td>MDI Support</td> <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/user/mdi.c">Git</a> @@ -49,7 +50,7 @@ <td class="pct80">80%: Various problems still exist</td> </tr> - </tr> + <tr> <td><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/WinU…">DefWndProc</a></td> <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/user/defwnd.c">Git</a> @@ -59,7 +60,7 @@ <td class="pct100">100%: Complete</td> </tr> - </tr> + <tr> <td><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/WinU…">DefDlgProc</a></td> <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/user/defdlg.c">Git</a> @@ -235,7 +236,7 @@ </tr> <tr> - <td><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/pl…"Native Font</td> + <td><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/pl…">Native Font</a></td> <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/comctl32/nativefont.c">Git</a> <a class="srclink" href="http://source.winehq.org/source/dlls/comctl32/nativefont.c">LXR</a></td> <td></td> @@ -367,7 +368,7 @@ <tr> <td><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/m…">MCIWnd</a></td> - <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/msvideo/mciwnd.c">Git</a> + <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/msvfw32/mciwnd.c">Git</a> <a class="srclink" href="http://source.winehq.org/source/dlls/msvideo/mciwnd.c">LXR</a></td> <td></td> <td></td> @@ -376,7 +377,7 @@ <tr> <td><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/pl…">Rich Edit</a></td> - <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=tree;f=dlls/richedit">Git</a> + <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=tree;f=dlls/riched20">Git</a> <a class="srclink" href="http://source.winehq.org/source/dlls/richedit/">LXR</a></td> <td></td> <td></td> @@ -399,8 +400,8 @@ <tr> <td><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winu…">Color</a></td> - <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/commdlg/colordlg.c">Git</a> - <a class="srclink" href="http://source.winehq.org/source/dlls/commdlg/colordlg.c">LXR</a></td> + <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/comdlg32/colordlg.c">Git</a> + <a class="srclink" href="http://source.winehq.org/source/dlls/comdlg32/colordlg.c">LXR</a></td> <td class="needed"></td> <td class="needed"></td> <td class="pct95">95%: Refresh bugs</td> @@ -408,8 +409,8 @@ <tr> <td><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/WinU…">Find/Replace</a></td> - <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/commdlg/finddlg.c">Git</a> - <a class="srclink" href="http://source.winehq.org/source/dlls/commdlg/finddlg.c">LXR</a></td> + <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/comdlg32/finddlg.c">Git</a> + <a class="srclink" href="http://source.winehq.org/source/dlls/comdlg32/finddlg.c">LXR</a></td> <td class="needed"></td> <td class="needed"></td> <td class="pct90">90%: missing help and context menu handling</td> @@ -417,8 +418,8 @@ <tr> <td><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/WinU…">Font</a></td> - <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/commdlg/fontdlg.c">Git</a> - <a class="srclink" href="http://source.winehq.org/source/dlls/commdlg/fontdlg.c">LXR</a></td> + <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/comdlg32/fontdlg.c">Git</a> + <a class="srclink" href="http://source.winehq.org/source/dlls/comdlg32/fontdlg.c">LXR</a></td> <td class="needed"></td> <td class="needed"></td> <td class="pct90">90%: missing script selection</td> @@ -426,8 +427,8 @@ <tr> <td><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/WinU…">Open/Save As</a></td> - <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/commdlg/filedlg.c">Git</a> - <a class="srclink" href="http://source.winehq.org/source/dlls/commdlg/filedlg.c">LXR</a></td> + <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/comdlg32/filedlg.c">Git</a> + <a class="srclink" href="http://source.winehq.org/source/dlls/comdlg32/filedlg.c">LXR</a></td> <td class="needed"></td> <td class="needed"></td> <td class="pct60">60%: Unicode handling, hook messages, various styles not implemented</td> @@ -443,8 +444,8 @@ <tr> <td><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/WinU…">Print</a></td> - <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/commdlg/printdlg.c">Git</a> - <a class="srclink" href="http://source.winehq.org/source/dlls/commdlg/printdlg.c">LXR</a></td> + <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=blob;f=dlls/comdlg32/printdlg.c">Git</a> + <a class="srclink" href="http://source.winehq.org/source/dlls/comdlg32/printdlg.c">LXR</a></td> <td class="needed"></td> <td class="needed"></td> <td class="pct60">60%: verify how windows handles printer stats, implement printer help</td> @@ -471,7 +472,7 @@ </tr> <tr> - <td><a href="http://source.winehq.org/git/?p=wine.git;a=tree;f=dlls/winex11drv">winex11drv</td> + <td><a href="http://source.winehq.org/git/?p=wine.git;a=tree;f=dlls/winex11drv">winex11drv</a></td> <td><a class="srclink" href="http://source.winehq.org/git/?p=wine.git;a=tree;f=dlls/winex11.drv">Git</a> <a class="srclink" href="http://source.winehq.org/source/dlls/x11drv/">LXR</a></td> <td></td>

1 0