winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2006
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
651 discussions
Start a n
N
ew thread
Stefan Dösinger : wined3d: Do not bind the 0 vbo when vbos are unsupported.
by Alexandre Julliard
25 Sep '06
25 Sep '06
Module: wine Branch: master Commit: fd65b9b4130b538c8065927c50c7acb30257857c URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=fd65b9b4130b538c8065927…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 20 18:36:49 2006 +0200 wined3d: Do not bind the 0 vbo when vbos are unsupported. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index aa022e2..9078aee 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -827,7 +827,7 @@ static void loadNumberedArrays( WineDirect3DVertexStridedData *strided) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - GLint curVBO = -1; + GLint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? -1 : 0; int i; for (i = 0; i < MAX_ATTRIBS; i++) {
1
0
0
0
Alexandre Julliard : server: Kill the process without SIGTERM when the fd socket is closed.
by Alexandre Julliard
25 Sep '06
25 Sep '06
Module: wine Branch: master Commit: 81977b773bcff2c07f476c5ff3126323145480ae URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=81977b773bcff2c07f476c5…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 21 11:14:45 2006 +0200 server: Kill the process without SIGTERM when the fd socket is closed. --- server/process.c | 40 ++++++++++++++++++++++++++++------------ server/process.h | 2 +- server/request.c | 12 ++++++------ 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/server/process.c b/server/process.c index b36ca37..c50641b 100644 --- a/server/process.c +++ b/server/process.c @@ -408,7 +408,7 @@ static void process_poll_event( struct f process->sigkill_timeout = NULL; process_died( process ); } - else kill_process( process, NULL, 0 ); + else kill_process( process, 0 ); } else if (event & POLLIN) receive_fd( process ); } @@ -512,6 +512,20 @@ static void process_unload_dll( struct p else set_error( STATUS_INVALID_PARAMETER ); } +/* terminate a process with the given exit code */ +static void terminate_process( struct process *process, struct thread *skip, int exit_code ) +{ + struct list *ptr, *next; + + LIST_FOR_EACH_SAFE( ptr, next, &process->thread_list ) + { + struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); + + if (exit_code) thread->exit_code = exit_code; + if (thread != skip) kill_thread( thread, 1 ); + } +} + /* kill all processes */ void kill_all_processes( struct process *skip, int exit_code ) { @@ -525,7 +539,7 @@ void kill_all_processes( struct process if (process->running_threads) break; } if (&process->entry == &process_list) break; /* no process found */ - kill_process( process, NULL, exit_code ); + terminate_process( process, NULL, exit_code ); } } @@ -544,7 +558,7 @@ void kill_console_processes( struct thre if (process->console && process->console->renderer == renderer) break; } if (&process->entry == &process_list) break; /* no process found */ - kill_process( process, NULL, exit_code ); + terminate_process( process, NULL, exit_code ); } } @@ -638,16 +652,18 @@ void resume_process( struct process *pro } /* kill a process on the spot */ -void kill_process( struct process *process, struct thread *skip, int exit_code ) +void kill_process( struct process *process, int violent_death ) { - struct list *ptr, *next; - - LIST_FOR_EACH_SAFE( ptr, next, &process->thread_list ) + if (violent_death) terminate_process( process, NULL, 1 ); + else { - struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); + struct list *ptr, *next; - if (exit_code) thread->exit_code = exit_code; - if (thread != skip) kill_thread( thread, 1 ); + LIST_FOR_EACH_SAFE( ptr, next, &process->thread_list ) + { + struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); + kill_thread( thread, 0 ); + } } } @@ -666,7 +682,7 @@ void kill_debugged_processes( struct thr } if (&process->entry == &process_list) break; /* no process found */ process->debugger = NULL; - kill_process( process, NULL, exit_code ); + terminate_process( process, NULL, exit_code ); } } @@ -960,7 +976,7 @@ DECL_HANDLER(terminate_process) if ((process = get_process_from_handle( req->handle, PROCESS_TERMINATE ))) { reply->self = (current->process == process); - kill_process( process, current, req->exit_code ); + terminate_process( process, current, req->exit_code ); release_object( process ); } } diff --git a/server/process.h b/server/process.h index c447e2f..af84719 100644 --- a/server/process.h +++ b/server/process.h @@ -120,7 +120,7 @@ extern void remove_process_thread( struc extern void suspend_process( struct process *process ); extern void resume_process( struct process *process ); extern void kill_all_processes( struct process *skip, int exit_code ); -extern void kill_process( struct process *process, struct thread *skip, int exit_code ); +extern void kill_process( struct process *process, int violent_death ); extern void kill_console_processes( struct thread *renderer, int exit_code ); extern void kill_debugged_processes( struct thread *debugger, int exit_code ); extern void break_process( struct process *process ); diff --git a/server/request.c b/server/request.c index ac5a696..b0cebd5 100644 --- a/server/request.c +++ b/server/request.c @@ -402,13 +402,13 @@ #endif if (!ret) { - kill_process( process, NULL, 0 ); + kill_process( process, 0 ); } else if (ret > 0) { fprintf( stderr, "Protocol error: process %04x: partial recvmsg %d for fd\n", process->id, ret ); - kill_process( process, NULL, 1 ); + kill_process( process, 1 ); } else { @@ -416,7 +416,7 @@ #endif { fprintf( stderr, "Protocol error: process %04x: ", process->id ); perror( "recvmsg" ); - kill_process( process, NULL, 1 ); + kill_process( process, 1 ); } } return -1; @@ -450,17 +450,17 @@ #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIG if (ret >= 0) { fprintf( stderr, "Protocol error: process %04x: partial sendmsg %d\n", process->id, ret ); - kill_process( process, NULL, 1 ); + kill_process( process, 1 ); } else if (errno == EPIPE) { - kill_process( process, NULL, 0 ); + kill_process( process, 0 ); } else { fprintf( stderr, "Protocol error: process %04x: ", process->id ); perror( "sendmsg" ); - kill_process( process, NULL, 1 ); + kill_process( process, 1 ); } return -1; }
1
0
0
0
Alexandre Julliard : configure: Don' t display any messages when started from the makefile to rebuild config. status.
by Alexandre Julliard
25 Sep '06
25 Sep '06
Module: wine Branch: master Commit: e3bd111b87a831502d3a3f07ae154cb81570b920 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=e3bd111b87a831502d3a3f0…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 21 11:14:38 2006 +0200 configure: Don't display any messages when started from the makefile to rebuild config.status. --- configure | 5 +++++ configure.ac | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3838f92..e684b93 100755 --- a/configure +++ b/configure @@ -25406,6 +25406,11 @@ fi +if test "$no_create" = "yes" +then + exit 0 +fi + if test "$verbose" = "yes" then if test "$ac_cv_header_capi20_h" != "yes" -o "$ac_cv_header_linux_capi_h" != "yes" diff --git a/configure.ac b/configure.ac index 1acebdf..d8cb6f2 100644 --- a/configure.ac +++ b/configure.ac @@ -1818,6 +1818,11 @@ AC_OUTPUT dnl **** Display messages about additional packages *** +if test "$no_create" = "yes" +then + exit 0 +fi + if test "$verbose" = "yes" then dnl **** libcapi20-dev devel package ***
1
0
0
0
Alexandre Julliard : configure: Escape newlines in DEPENDENCIES when using an old autoconf version.
by Alexandre Julliard
25 Sep '06
25 Sep '06
Module: wine Branch: master Commit: 1333ac8d87288062c8b46f29b5ac60948c64f4bc URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=1333ac8d87288062c8b46f2…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 20 21:46:49 2006 +0200 configure: Escape newlines in DEPENDENCIES when using an old autoconf version. --- configure.ac | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0c1322a..1acebdf 100644 --- a/configure.ac +++ b/configure.ac @@ -1457,7 +1457,19 @@ esac dnl **** Generate output files **** -AC_SUBST(DEPENDENCIES,"### Dependencies: +dnl autoconf versions before 2.59d need backslashes to escape newlines in subst variables +AC_SUBST(DEPENDENCIES,m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.59d]), -1, +["### Dependencies:\\ +\\ +.INIT: Makefile\\ +.BEGIN: Makefile\\ +Makefile: dummy\\ + -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)\\ +\\ +\$(ALL_OBJS): \$(IDL_SRCS:.idl=.h)\\ +\$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)\\ +\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"], +["### Dependencies: .INIT: Makefile .BEGIN: Makefile @@ -1466,7 +1478,7 @@ Makefile: dummy \$(ALL_OBJS): \$(IDL_SRCS:.idl=.h) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) -\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)") +\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"])) AH_TOP([#define __WINE_CONFIG_H])
1
0
0
0
Alexandre Julliard : Makefile: Fixed rule for building makedep when cross-compiling.
by Alexandre Julliard
20 Sep '06
20 Sep '06
Module: wine Branch: master Commit: 9cc11a3d53f7a9c99ba89d105e1087923f48368c URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=9cc11a3d53f7a9c99ba89d1…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 20 20:16:19 2006 +0200 Makefile: Fixed rule for building makedep when cross-compiling. --- Makefile.in | 2 +- tools/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index b94782f..4bbcc44 100644 --- a/Makefile.in +++ b/Makefile.in @@ -117,7 +117,7 @@ RECURSE_TARGETS = \ depend $(RECURSE_TARGETS): $(MAKEDEP) $(MAKEDEP): - @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(EXEEXT) + @cd $(TOOLSDIR)/tools && $(MAKE) makedep # Test rules diff --git a/tools/Makefile.in b/tools/Makefile.in index 14ded8a..aa69d97 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -54,7 +54,7 @@ all: $(PROGRAMS) $(MANPAGES) $(SUBDIRS) @MAKE_RULES@ -makedep$(EXEEXT): makedep.o +makedep$(EXEEXT) $(EXEEXT:%=makedep): makedep.o $(CC) $(CFLAGS) -o $@ makedep.o $(LDFLAGS) make_ctests$(EXEEXT): make_ctests.o
1
0
0
0
Paul Vriens : crypt32: Simplify by removing unneeded backslash.
by Alexandre Julliard
20 Sep '06
20 Sep '06
Module: wine Branch: master Commit: 4c32875e9226498fcb9ab821f0a7ae6584934da8 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=4c32875e9226498fcb9ab82…
Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Sep 20 15:51:23 2006 +0200 crypt32: Simplify by removing unneeded backslash. --- dlls/crypt32/sip.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 15ec3f5..3b1e17d 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -41,22 +41,20 @@ static const WCHAR szOID[] = { 'E','n','c','o','d','i','n','g','T','y','p','e',' ','0','\\', 'C','r','y','p','t','S','I','P','D','l','l', 0 }; -static const WCHAR szBackSlash[] = { '\\', 0 }; - static const WCHAR szPutSigned[] = { - 'P','u','t','S','i','g','n','e','d','D','a','t','a','M','s','g',0}; + 'P','u','t','S','i','g','n','e','d','D','a','t','a','M','s','g','\\',0}; static const WCHAR szGetSigned[] = { - 'G','e','t','S','i','g','n','e','d','D','a','t','a','M','s','g',0}; + 'G','e','t','S','i','g','n','e','d','D','a','t','a','M','s','g','\\',0}; static const WCHAR szRemoveSigned[] = { - 'R','e','m','o','v','e','S','i','g','n','e','d','D','a','t','a','M','s','g',0}; + 'R','e','m','o','v','e','S','i','g','n','e','d','D','a','t','a','M','s','g','\\',0}; static const WCHAR szCreate[] = { - 'C','r','e','a','t','e','I','n','d','i','r','e','c','t','D','a','t','a',0}; + 'C','r','e','a','t','e','I','n','d','i','r','e','c','t','D','a','t','a','\\',0}; static const WCHAR szVerify[] = { - 'V','e','r','i','f','y','I','n','d','i','r','e','c','t','D','a','t','a',0}; + 'V','e','r','i','f','y','I','n','d','i','r','e','c','t','D','a','t','a','\\',0}; static const WCHAR szIsMyFile[] = { - 'I','s','M','y','F','i','l','e','T','y','p','e', 0 }; + 'I','s','M','y','F','i','l','e','T','y','p','e','\\',0}; static const WCHAR szIsMyFile2[] = { - 'I','s','M','y','F','i','l','e','T','y','p','e','2', 0}; + 'I','s','M','y','F','i','l','e','T','y','p','e','2','\\',0}; /* convert a guid to a wide character string */ static void CRYPT_guid2wstr( LPGUID guid, LPWSTR wstr ) @@ -83,9 +81,7 @@ static LONG CRYPT_SIPDeleteFunction( LPG /* max length of szFullKey depends on our code only, so we won't overrun */ lstrcpyW( szFullKey, szOID ); lstrcatW( szFullKey, szKey ); - lstrcatW( szFullKey, szBackSlash ); CRYPT_guid2wstr( guid, &szFullKey[ lstrlenW( szFullKey ) ] ); - lstrcatW( szFullKey, szBackSlash ); r = RegDeleteKeyW(HKEY_LOCAL_MACHINE, szFullKey); @@ -166,9 +162,7 @@ static LONG CRYPT_SIPWriteFunction( LPGU /* max length of szFullKey depends on our code only, so we won't overrun */ lstrcpyW( szFullKey, szOID ); lstrcatW( szFullKey, szKey ); - lstrcatW( szFullKey, szBackSlash ); CRYPT_guid2wstr( guid, &szFullKey[ lstrlenW( szFullKey ) ] ); - lstrcatW( szFullKey, szBackSlash ); TRACE("key is %s\n", debugstr_w( szFullKey ) );
1
0
0
0
Huw Davies : gdi32: GetTextExtentPoint and GetTextExtentExPoint behave differently if there' s a \n in the string.
by Alexandre Julliard
20 Sep '06
20 Sep '06
Module: wine Branch: master Commit: 8b368b9cee916e6c803f0fa00744ee47b7259675 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=8b368b9cee916e6c803f0fa…
Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 20 14:02:36 2006 +0100 gdi32: GetTextExtentPoint and GetTextExtentExPoint behave differently if there's a \n in the string. --- dlls/gdi/tests/font.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c index 57d097b..beb7436 100644 --- a/dlls/gdi/tests/font.c +++ b/dlls/gdi/tests/font.c @@ -381,8 +381,13 @@ static void test_text_extents(void) if the extents array is untouched. */ GetTextExtentExPointW(hdc, wt, len, 32767, &fit1, extents, &sz1); GetTextExtentPointW(hdc, wt, len, &sz2); - ok(sz1.cx == sz2.cx && sz1.cy == sz2.cy, - "results from GetTextExtentExPointW and GetTextExtentPointW differ\n"); + ok(sz1.cy == sz2.cy, + "cy from GetTextExtentExPointW (%ld) and GetTextExtentPointW (%ld) differ\n", sz1.cy, sz2.cy); +todo_wine { + /* The \n in the string is apparently handled differently in GetTextExtentPoint and GetTextExtentExPoint */ + ok(sz1.cx != sz2.cx, + "cx from GetTextExtentExPointW (%ld) and GetTextExtentPointW (%ld) are the same\n", sz1.cx, sz2.cx); + } for (i = 1; i < len; ++i) ok(extents[i-1] <= extents[i], "GetTextExtentExPointW generated a non-increasing sequence of partial extents (at position %d)\n",
1
0
0
0
Huw Davies : gdi32: Fix ppem in the case that there isn' t an exact height match in the vdmx table.
by Alexandre Julliard
20 Sep '06
20 Sep '06
Module: wine Branch: master Commit: 7be29570986efe02a3771305a0a63b85fc0a816c URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=7be29570986efe02a377130…
Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 20 11:53:06 2006 +0100 gdi32: Fix ppem in the case that there isn't an exact height match in the vdmx table. --- dlls/gdi/freetype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 10f3f28..d3fcf06 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -2092,6 +2092,7 @@ static LONG load_VDMX(GdiFont font, LONG } font->yMax = GET_BE_WORD(vTable[(i * 3) + 1]); font->yMin = GET_BE_WORD(vTable[(i * 3) + 2]); + ppem = GET_BE_WORD(vTable[i * 3]); TRACE("ppem %ld found; height=%ld yMax=%d yMin=%d\n", ppem, height, font->yMax, font->yMin); break; }
1
0
0
0
Huw Davies : gdi32: Only run the GetGlyphIndices test if Symbol is installed.
by Alexandre Julliard
20 Sep '06
20 Sep '06
Module: wine Branch: master Commit: 0c06ec1bb300a52ad12226e0105c764e733914c6 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=0c06ec1bb300a52ad12226e…
Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 20 12:43:10 2006 +0100 gdi32: Only run the GetGlyphIndices test if Symbol is installed. --- dlls/gdi/tests/font.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c index 699d9b2..57d097b 100644 --- a/dlls/gdi/tests/font.c +++ b/dlls/gdi/tests/font.c @@ -29,6 +29,23 @@ #include "winuser.h" #include "wine/test.h" +static INT CALLBACK is_font_installed_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + return 0; +} + +static BOOL is_font_installed(const char *name) +{ + HDC hdc = GetDC(0); + BOOL ret = FALSE; + + if(!EnumFontFamiliesA(hdc, name, is_font_installed_proc, 0)) + ret = TRUE; + + ReleaseDC(0, hdc); + return ret; +} + static void check_font(const char* test, const LOGFONTA* lf, HFONT hfont) { LOGFONTA getobj_lf; @@ -410,6 +427,12 @@ static void test_GetGlyphIndices() return; } + if(!is_font_installed("Symbol")) + { + trace("Symbol is not installed so skipping this test\n"); + return; + } + memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Symbol"); lf.lfHeight = 20;
1
0
0
0
Benjamin Arai : msi: Adds test to check if "AND" operator returns the correct result for the "WHERE" clause.
by Alexandre Julliard
20 Sep '06
20 Sep '06
Module: wine Branch: master Commit: f84c1463c1325528f6c664f3b369de3861a03cc2 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=f84c1463c1325528f6c664f…
Author: Benjamin Arai <me(a)benjaminarai.com> Date: Tue Sep 19 19:22:22 2006 -0700 msi: Adds test to check if "AND" operator returns the correct result for the "WHERE" clause. --- dlls/msi/tests/db.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 4ea7c35..400e920 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1262,9 +1262,12 @@ static void test_streamtable(void) static void test_where(void) { - MSIHANDLE hdb = 0, rec; + MSIHANDLE hdb = 0, rec, view; LPCSTR query; UINT r; + DWORD size; + CHAR buf[MAX_PATH]; + UINT count; hdb = create_db(); ok( hdb, "failed to create db\n"); @@ -1311,6 +1314,40 @@ static void test_where(void) r = MsiRecordGetInteger(rec, 2); ok( 1 == r, "field wrong\n"); + query = "SELECT `DiskId` FROM `Media` WHERE `LastSequence` >= 1 AND DiskId >= 0"; + r = MsiDatabaseOpenView(hdb, query, &view); + ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); + + r = MsiViewExecute(view, 0); + ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); + + r = MsiViewFetch(view, &rec); + ok( r == ERROR_SUCCESS, "failed to fetch view: %d\n", r ); + + count = MsiRecordGetFieldCount( rec ); + ok( count == 1, "Expected 1 record fields, got %d\n", count ); + + size = MAX_PATH; + r = MsiRecordGetString( rec, 1, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, "2" ), + "For (row %d, column 1) expected '%d', got %s\n", 0, 2, buf ); + + r = MsiViewFetch(view, &rec); + ok( r == ERROR_SUCCESS, "failed to fetch view: %d\n", r ); + + size = MAX_PATH; + r = MsiRecordGetString( rec, 1, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, "3" ), + "For (row %d, column 1) expected '%d', got %s\n", 1, 3, buf ); + + r = MsiViewFetch(view, &rec); + ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); + + MsiViewClose(view); + MsiCloseHandle(view); + MsiCloseHandle( rec ); MsiCloseHandle( hdb );
1
0
0
0
← Newer
1
...
22
23
24
25
26
27
28
...
66
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
Results per page:
10
25
50
100
200