January 2006 - Wine-commits

Robert Shearman : widl: Simplify write_typeformatstring_type.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: fce01e6920e2d7878d1b1017af95565272e721d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fce01e6920e2d7878d1b101… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:06:32 2006 +0100 widl: Simplify write_typeformatstring_type. Simplify handling of types in write_typeformatstring_type by only writing non-pointer types out when ptr_level is 0. Add stubs for functions that will write out the type format string for strings and arrays. --- tools/widl/typegen.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 65aadf5..0c8a3b0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -211,6 +211,21 @@ void write_procformatstring(FILE *file, print_file(file, indent, "\n"); } +static size_t write_string_tfs(FILE *file, const attr_t *attr, + const type_t *type, const expr_t *array, + const char *name) +{ + error("write_string_tfs: Unimplemented. name: %s\n", name); + return 0; +} + +static size_t write_array_tfs(FILE *file, const attr_t *attr, + const type_t *type, const expr_t *array, + const char *name) +{ + error("write_array_tfs: Unimplemented. name: %s\n", name); + return 0; +} static size_t write_typeformatstring_var(FILE *file, int indent, const var_t *var) @@ -220,19 +235,29 @@ static size_t write_typeformatstring_var while (TRUE) { - if (ptr_level == 0 && type_has_ref(type)) + if (ptr_level == 0) { - type = type->ref; - continue; - } + /* follow reference if the type has one */ + if (type_has_ref(type)) + { + type = type->ref; + /* FIXME: get new ptr_level from type */ + continue; + } - /* basic types don't need a type format string */ - if (ptr_level == 0 && !var->array && is_base_type(type->type)) - return 0; + /* basic types don't need a type format string */ + if (!var->array && is_base_type(type->type)) + return 0; + + if (is_attr(var->attrs, ATTR_STRING)) + return write_string_tfs(file, var->attrs, type, var->array, var->name); - if ((ptr_level == 1 && !type_has_ref(type)) || - (ptr_level == 0 && var->array && !NEXT_LINK(var->array))) + if (var->array) + return write_array_tfs(file, var->attrs, type, var->array, var->name); + } + else if (ptr_level == 1 && !type_has_ref(type)) { + /* special case for pointers to base types */ switch (type->type) { #define CASE_BASETYPE(fctype) \

1 0

Robert Shearman : widl: Don't use recursion for write_typeformatstring_type.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 479be2e6af91d5ef06ac0c312e1c78588ae768e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=479be2e6af91d5ef06ac0c3… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:06:10 2006 +0100 widl: Don't use recursion for write_typeformatstring_type. Since a var_t can now be passed in, rename to write_typeformatstring_var. Simplifies the code. --- tools/widl/typegen.c | 89 +++++++++++++++++++++++++++----------------------- 1 files changed, 48 insertions(+), 41 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 905f8ad..65aadf5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -212,50 +212,59 @@ void write_procformatstring(FILE *file, } -static size_t write_typeformatstring_type(FILE *file, int indent, - const type_t *type, int ptr_level, const expr_t *array, const char *name) +static size_t write_typeformatstring_var(FILE *file, int indent, + const var_t *var) { - if (ptr_level == 0 && type_has_ref(type)) - return write_typeformatstring_type(file, indent, - type->ref, 0 /* FIXME */, array, name); - - /* basic types don't need a type format string */ - if (ptr_level == 0 && !array && is_base_type(type->type)) - return 0; + const type_t *type = var->type; + int ptr_level = var->ptr_level; - if ((ptr_level == 1 && !type_has_ref(type)) || - (ptr_level == 0 && array && !NEXT_LINK(array))) + while (TRUE) { - switch (type->type) + if (ptr_level == 0 && type_has_ref(type)) { + type = type->ref; + continue; + } + + /* basic types don't need a type format string */ + if (ptr_level == 0 && !var->array && is_base_type(type->type)) + return 0; + + if ((ptr_level == 1 && !type_has_ref(type)) || + (ptr_level == 0 && var->array && !NEXT_LINK(var->array))) + { + switch (type->type) + { #define CASE_BASETYPE(fctype) \ - case RPC_##fctype: \ - print_file(file, indent, "0x11, 0x08, /* FC_RP [simple_pointer] */\n"); \ - print_file(file, indent, "0x%02x, /* " #fctype " */\n", RPC_##fctype); \ - print_file(file, indent, "0x5c, /* FC_PAD */\n"); \ - return 4 - CASE_BASETYPE(FC_BYTE); - CASE_BASETYPE(FC_CHAR); - CASE_BASETYPE(FC_SMALL); - CASE_BASETYPE(FC_USMALL); - CASE_BASETYPE(FC_WCHAR); - CASE_BASETYPE(FC_SHORT); - CASE_BASETYPE(FC_USHORT); - CASE_BASETYPE(FC_LONG); - CASE_BASETYPE(FC_ULONG); - CASE_BASETYPE(FC_FLOAT); - CASE_BASETYPE(FC_HYPER); - CASE_BASETYPE(FC_DOUBLE); - CASE_BASETYPE(FC_ENUM16); - CASE_BASETYPE(FC_ENUM32); - CASE_BASETYPE(FC_IGNORE); - CASE_BASETYPE(FC_ERROR_STATUS_T); - default: - error("write_typeformatstring_var: Unknown/unsupported type: %s (0x%02x)\n", name, type->type); + case RPC_##fctype: \ + print_file(file, indent, "0x11, 0x08, /* FC_RP [simple_pointer] */\n"); \ + print_file(file, indent, "0x%02x, /* " #fctype " */\n", RPC_##fctype); \ + print_file(file, indent, "0x5c, /* FC_PAD */\n"); \ + return 4 + CASE_BASETYPE(FC_BYTE); + CASE_BASETYPE(FC_CHAR); + CASE_BASETYPE(FC_SMALL); + CASE_BASETYPE(FC_USMALL); + CASE_BASETYPE(FC_WCHAR); + CASE_BASETYPE(FC_SHORT); + CASE_BASETYPE(FC_USHORT); + CASE_BASETYPE(FC_LONG); + CASE_BASETYPE(FC_ULONG); + CASE_BASETYPE(FC_FLOAT); + CASE_BASETYPE(FC_HYPER); + CASE_BASETYPE(FC_DOUBLE); + CASE_BASETYPE(FC_ENUM16); + CASE_BASETYPE(FC_ENUM32); + CASE_BASETYPE(FC_IGNORE); + CASE_BASETYPE(FC_ERROR_STATUS_T); + default: + error("write_typeformatstring_var: Unknown/unsupported type: %s (0x%02x)\n", var->name, type->type); + return 0; + } } + error("write_typeformatstring_var: Pointer level %d not supported for variable %s\n", ptr_level, var->name); + return 0; } - error("write_typeformatstring_var: Pointer level %d not supported for variable %s\n", ptr_level, name); - return 0; } @@ -284,8 +293,7 @@ void write_typeformatstring(FILE *file, while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - write_typeformatstring_type(file, indent, var->type, - var->ptr_level, var->array, var->name); + write_typeformatstring_var(file, indent, var); var = PREV_LINK(var); } } @@ -740,6 +748,5 @@ size_t get_size_procformatstring_var(con size_t get_size_typeformatstring_var(const var_t *var) { - return write_typeformatstring_type(NULL, 0, var->type, var->ptr_level, - var->array, var->name); + return write_typeformatstring_var(NULL, 0, var); }

1 0

Robert Shearman : widl: Don't use recursion to implement write_procformatstring_type.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 6d76ad87c661ea2f56567869db73d34a0c5c3cf0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d76ad87c661ea2f5656786… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:05:51 2006 +0100 widl: Don't use recursion to implement write_procformatstring_type. Renamed to write_procformatstring_var now since we can pass a var_t in again. This results in simpler code. --- tools/widl/typegen.c | 53 +++++++++++++++++++------------------------------- tools/widl/typegen.h | 4 ++-- 2 files changed, 22 insertions(+), 35 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3688505..905f8ad 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -41,9 +41,6 @@ #include "widl.h" #include "typegen.h" -static size_t get_size_typeformatstring_type(const type_t *type, int ptr_level, - const expr_t *array, const char *name); - static int print_file(FILE *file, int indent, const char *format, ...) { va_list va; @@ -91,18 +88,22 @@ static inline int is_base_type(unsigned } } -static size_t write_procformatstring_type(FILE *file, int indent, - const type_t *type, int ptr_level, const expr_t *array, const char *name, - int is_in, int is_out, int is_return, unsigned int *type_offset) +static size_t write_procformatstring_var(FILE *file, int indent, + const var_t *var, int is_return, unsigned int *type_offset) { size_t size; + int ptr_level = var->ptr_level; + const type_t *type = var->type; + + int is_in = is_attr(var->attrs, ATTR_IN); + int is_out = is_attr(var->attrs, ATTR_OUT); + + if (!is_in && !is_out) is_in = TRUE; if (ptr_level == 0 && type_has_ref(type)) - return write_procformatstring_type(file, indent, type->ref, ptr_level, - array, name, is_in, is_out, - is_return, type_offset); + type = type->ref; - if (ptr_level == 0 && !array && is_base_type(type->type)) + if (ptr_level == 0 && !var->array && is_base_type(type->type)) { if (is_return) print_file(file, indent, "0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); @@ -133,7 +134,7 @@ static size_t write_procformatstring_typ CASE_BASETYPE(FC_ERROR_STATUS_T); #undef CASE_BASETYPE default: - error("Unknown/unsupported type: %s (0x%02x)\n", name, type->type); + error("Unknown/unsupported type: %s (0x%02x)\n", var->name, type->type); size = 0; } } @@ -152,7 +153,7 @@ static size_t write_procformatstring_typ print_file(file, indent, "NdrFcShort(0x%x),\n", *type_offset); size = 4; /* includes param type prefix */ } - *type_offset += get_size_typeformatstring_type(type, ptr_level, array, name); + *type_offset += get_size_typeformatstring_var(var); return size; } @@ -182,13 +183,8 @@ void write_procformatstring(FILE *file, while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - int is_in = is_attr(var->attrs, ATTR_IN); - int is_out = is_attr(var->attrs, ATTR_OUT); - - if (!is_in && !is_out) is_in = TRUE; - write_procformatstring_type(file, indent, var->type, - var->ptr_level, var->array, var->name, - is_in, is_out, FALSE, &type_offset); + write_procformatstring_var(file, indent, var, FALSE, + &type_offset); var = PREV_LINK(var); } @@ -202,9 +198,8 @@ void write_procformatstring(FILE *file, print_file(file, indent, "0x5c, /* FC_PAD */\n"); } else - write_procformatstring_type(file, indent, var->type, - var->ptr_level, var->array, var->name, FALSE, FALSE, TRUE, - &type_offset); + write_procformatstring_var(file, indent, var, TRUE, + &type_offset); } } @@ -736,22 +731,14 @@ void unmarshall_arguments(FILE *file, in } -static size_t get_size_typeformatstring_type(const type_t *type, int ptr_level, - const expr_t *array, const char *name) -{ - return write_typeformatstring_type(NULL, 0, type, ptr_level, array, name); -} - - -size_t get_size_procformatstring_var(var_t *var) +size_t get_size_procformatstring_var(const var_t *var) { unsigned int type_offset = 2; - return write_procformatstring_type(NULL, 0, var->type, - var->ptr_level, var->array, var->name, FALSE, FALSE, FALSE, &type_offset); + return write_procformatstring_var(NULL, 0, var, FALSE, &type_offset); } -size_t get_size_typeformatstring_var(var_t *var) +size_t get_size_typeformatstring_var(const var_t *var) { return write_typeformatstring_type(NULL, 0, var->type, var->ptr_level, var->array, var->name); diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 2660400..93a6ce7 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -32,5 +32,5 @@ void write_typeformatstring(FILE *file, unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment); void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset, enum pass pass); void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset, enum pass pass); -size_t get_size_procformatstring_var(var_t *var); -size_t get_size_typeformatstring_var(var_t *var); +size_t get_size_procformatstring_var(const var_t *var); +size_t get_size_typeformatstring_var(const var_t *var);

1 0

Alexandre Julliard : kernel: Fail more gracefully when loading a builtin exe didn't work.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: a2a29e22a0868490ee1259810051af43610a1e1a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2a29e22a0868490ee12598… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 11:05:11 2006 +0100 kernel: Fail more gracefully when loading a builtin exe didn't work. --- dlls/kernel/process.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 4bfbbc9..bf2b392 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -1088,9 +1088,10 @@ void __wine_kernel_init(void) if (!main_exe_file) /* no file handle -> Winelib app */ { TRACE( "starting Winelib app %s\n", debugstr_w(main_exe_name) ); - if (open_builtin_exe_file( main_exe_name, error, sizeof(error), 0, &file_exists )) + if (open_builtin_exe_file( main_exe_name, error, sizeof(error), 0, &file_exists ) && + NtCurrentTeb()->Peb->ImageBaseAddress) goto found; - MESSAGE( "wine: cannot open builtin library for %s: %s\n", + MESSAGE( "wine: cannot open builtin exe for %s: %s\n", debugstr_w(main_exe_name), error ); ExitProcess(1); }

1 0

Dmitry Timoshkov : comctl32: Make listview use standard wine_dbg_sprintf and wine_dbgstr_xxx.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 6d32c42ced93af50dd72625c6c8d0c2e5d302f1a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d32c42ced93af50dd72625… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jan 24 11:04:32 2006 +0100 comctl32: Make listview use standard wine_dbg_sprintf and wine_dbgstr_xxx. --- dlls/comctl32/listview.c | 101 ++++++++++++++++------------------------------ 1 files changed, 35 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6d32c42ced93af50dd7…

1 0

Jacek Caban : Added mshtmcid.h.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: ea6e5b969a255733fefc4e37eeaf6a39245ab7e4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea6e5b969a255733fefc4e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 24 10:57:59 2006 +0100 Added mshtmcid.h. --- include/Makefile.in | 1 include/mshtmcid.h | 425 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/mshtml.idl | 2 3 files changed, 427 insertions(+), 1 deletions(-) create mode 100644 include/mshtmcid.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ea6e5b969a255733fef…

1 0

Huw Davies : gdi: Fixes to preempt freetype 2.2.0.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 0458a5e38dcf7d03a0eedd1e63922c1eb4e37cb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0458a5e38dcf7d03a0eedd1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 24 11:04:20 2006 +0100 gdi: Fixes to preempt freetype 2.2.0. --- dlls/gdi/freetype.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 314afd8..c4af124 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -90,6 +90,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); #define SONAME_LIBFREETYPE "libfreetype.so" #endif +#ifndef FT_MODULE_DRIVER_HAS_HINTER +#define FT_MODULE_DRIVER_HAS_HINTER 0x400 +#endif + static FT_Library library = 0; typedef struct { @@ -122,6 +126,7 @@ MAKE_FUNCPTR(FT_Vector_Transform); static void (*pFT_Library_Version)(FT_Library,FT_Int*,FT_Int*,FT_Int*); static FT_Error (*pFT_Load_Sfnt_Table)(FT_Face,FT_ULong,FT_Long,FT_Byte*,FT_ULong*); static FT_ULong (*pFT_Get_First_Char)(FT_Face,FT_UInt*); +static FT_Error (*pFT_Module_Get_Flags)(FT_Module,FT_ULong*); #ifdef HAVE_FREETYPE_FTWINFNT_H MAKE_FUNCPTR(FT_Get_WinFNT_Header); #endif @@ -1499,6 +1504,7 @@ BOOL WineEngInit(void) pFT_Library_Version = wine_dlsym(ft_handle, "FT_Library_Version", NULL, 0); pFT_Load_Sfnt_Table = wine_dlsym(ft_handle, "FT_Load_Sfnt_Table", NULL, 0); pFT_Get_First_Char = wine_dlsym(ft_handle, "FT_Get_First_Char", NULL, 0); + pFT_Module_Get_Flags = wine_dlsym(ft_handle, "FT_Module_Get_Flags", NULL, 0); #ifdef HAVE_FREETYPE_FTWINFNT_H pFT_Get_WinFNT_Header = wine_dlsym(ft_handle, "FT_Get_WinFNT_Header", NULL, 0); #endif @@ -3727,7 +3733,9 @@ DWORD WineEngGetFontData(GdiFont font, D if( !err && needed < len) len = needed; } err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len); - } else { /* Do it the hard way */ + } +#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H + else { /* Do it the hard way */ TT_Face tt_face = (TT_Face) ft_face; SFNT_Interface *sfnt; if (FT_Version.major==2 && FT_Version.minor==0) @@ -3748,6 +3756,18 @@ DWORD WineEngGetFontData(GdiFont font, D } err = sfnt->load_any(tt_face, table, offset, buf, &len); } +#else + else { + static int msg; + if(!msg) { + MESSAGE("This version of Wine was compiled with freetype headers later than 2.2.0\n" + "but is being run with a freetype library without the FT_Load_Sfnt_Table function.\n" + "Please upgrade your freetype library.\n"); + msg++; + } + err = FT_Err_Unimplemented_Feature; + } +#endif if(err) { TRACE("Can't find table %08lx.\n", table); return GDI_ERROR; @@ -3813,8 +3833,21 @@ BOOL WINAPI FontIsLinked(HDC hdc) static BOOL is_hinting_enabled(void) { FT_Module mod = pFT_Get_Module(library, "truetype"); + + /* Use the >= 2.2.0 function if available */ + if(pFT_Module_Get_Flags) + { + FT_ULong flags; + pFT_Module_Get_Flags(mod, &flags); + return flags & FT_MODULE_DRIVER_HAS_HINTER; + } + + /* otherwise if we've been compiled with < 2.2.0 headers + use the internal macro */ +#ifdef FT_DRIVER_HAS_HINTER if(mod && FT_DRIVER_HAS_HINTER(mod)) return TRUE; +#endif return FALSE; }

1 0

Huw Davies : gdi: Use correct include file for FT_Get_Module.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 603d21cbc4fc8b915248cd3a6f90b02f721980c4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=603d21cbc4fc8b915248cd3… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 24 10:57:35 2006 +0100 gdi: Use correct include file for FT_Get_Module. --- configure | 2 ++ configure.ac | 1 + dlls/gdi/freetype.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 9 insertions(+), 0 deletions(-) diff --git a/configure b/configure index c95d335..31005df 100755 --- a/configure +++ b/configure @@ -10042,6 +10042,7 @@ fi + for ac_header in ft2build.h \ freetype/freetype.h \ freetype/ftglyph.h \ @@ -10051,6 +10052,7 @@ for ac_header in ft2build.h \ freetype/ttnameid.h \ freetype/ftoutln.h \ freetype/ftwinfnt.h \ + freetype/ftmodapi.h \ freetype/internal/sfnt.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index ca5eb8a..761f528 100644 --- a/configure.ac +++ b/configure.ac @@ -596,6 +596,7 @@ else freetype/ttnameid.h \ freetype/ftoutln.h \ freetype/ftwinfnt.h \ + freetype/ftmodapi.h \ freetype/internal/sfnt.h,,, [#if HAVE_FT2BUILD_H #include <ft2build.h> diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 3023ab3..314afd8 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -82,6 +82,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); #ifdef HAVE_FREETYPE_FTWINFNT_H #include <freetype/ftwinfnt.h> #endif +#ifdef HAVE_FREETYPE_FTMODAPI_H +#include <freetype/ftmodapi.h> +#endif #ifndef SONAME_LIBFREETYPE #define SONAME_LIBFREETYPE "libfreetype.so" diff --git a/include/config.h.in b/include/config.h.in index 51ecdc5..421a5eb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -101,6 +101,9 @@ /* Define to 1 if you have the <freetype/ftglyph.h> header file. */ #undef HAVE_FREETYPE_FTGLYPH_H +/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */ +#undef HAVE_FREETYPE_FTMODAPI_H + /* Define to 1 if you have the <freetype/ftnames.h> header file. */ #undef HAVE_FREETYPE_FTNAMES_H

1 0

lostwages/templates/en documentation.template ...
by Jeremy Newman 23 Jan '06

23 Jan '06

ChangeSet ID: 22487 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/23 16:20:02 Modified files: templates/en : documentation.template howto.template Removed files: templates/en : helping-applications.template Log message: Tom Wickline <twickline(a)gmail.com> Combine howto and helping-applications pages. Remove out of date and redundant information. Patch: http://cvs.winehq.org/patch.py?id=22487 Old revision New revision Changes Path 1.17 1.18 +1 -1 lostwages/templates/en/documentation.template 1.22 1.23 +125 -20 lostwages/templates/en/howto.template 1.7 Removed +0 -0 lostwages/templates/en/helping-applications.template

1 0

lostwages/templates/en cvs.template
by Jeremy Newman 23 Jan '06

23 Jan '06

ChangeSet ID: 22486 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/23 16:14:06 Modified files: templates/en : cvs.template Log message: Tom Wickline <twickline(a)gmail.com> cvs page update Patch: http://cvs.winehq.org/patch.py?id=22486 Old revision New revision Changes Path 1.21 1.22 +25 -43 lostwages/templates/en/cvs.template Index: lostwages/templates/en/cvs.template diff -u -p lostwages/templates/en/cvs.template:1.21 lostwages/templates/en/cvs.template:1.22 --- lostwages/templates/en/cvs.template:1.21 23 Jan 2006 22:14: 6 -0000 +++ lostwages/templates/en/cvs.template 23 Jan 2006 22:14: 6 -0000 @@ -12,8 +12,7 @@ branching, intelligent merging, high qua href="http://ximbiot.com/cvs/wiki/index.php">documentation</a> and client/server access with a wide choice of clients. Current Wine sources are available via anonymous client/server CVS. -You will need CVS 1.9 or above. -If you are coming from behind a firewall, you will either +You will need CVS 1.9 or above. If you are coming from behind a firewall, you will either need a hole in the firewall for the CVS port (2401) or use SOCKS. </p> @@ -66,27 +65,23 @@ Use "cvs" as the password (wit <code>/home/wine</code> is a path on the <b>server</b>, not on your machine. <p> -To check out the entire Wine source tree -(but read the next section before actually doing this!), do +To check out the entire Wine source tree (but read the next section before actually doing this!), do <table width="300" border=0 cellpadding=10><tr><td class=black> <span class=inverse> - cvs -z 0 checkout wine + cvs -z 3 checkout wine </span> </td></tr> </table> -If you're using a slow internet connection, like a 56k modem, -you may want to compress the traffic with -z3. However, there -are known bugs in CVS with this compressed communication mode, -make sure you use cvs version 1.11.5 or later. +Make sure your cvs version is 1.11.5 or later if you use -z 3. <p> Or if you just want a subtree, or individual file, you can do that too: <table width="500" border=0 cellpadding=10><tr><td class=black> <span class=inverse> - cvs -z 0 checkout wine/ANNOUNCE + cvs -z 3 checkout wine/ANNOUNCE </span> </td></tr> </table> @@ -100,8 +95,7 @@ Or if you just want a subtree, or indivi <h1>Wine CVS Servers</h1> <p> -Just do a traceroute and a ping on all servers below to find out which are -closest to you. +Just do a traceroute and a ping on all servers below to find out which are closest to you. <p> <div align=center><table border="0" cellpadding="0" cellspacing=0><tr><td bgcolor="#e0e0e0"> @@ -177,16 +171,16 @@ FTP mirror near you. It's possible to co sandbox, just like you would get by checking out the entire source via CVS. Here's how to do it: <ul> - <li>Get the latest Wine snapshot: Wine-<i>YYMMDD</i>.tar.gz - <li>Get wine-cvsdirs-<i>YYMMDD</i>.tar.gz from + <li>Get the latest Wine snapshot: Wine-<i>x.x.x</i>.tar.gz + <li>Get wine-cvsdirs-<i>x.x.x</i>.tar.gz from <a href="ftp://ftp.winehq.org/pub/wine/">ftp://ftp.winehq.org/pub/wine</a> <li>Untar them on top of each other: <table width="300" border=0 cellpadding=10><tr><td class=black> <span class=inverse> - tar xzf Wine-<i>YYMMDD</i>.tar.gz<br> - mv wine-<i>YYMMDD</i> wine<br> - tar xzf wine-cvsdirs-<i>YYMMDD</i>.tar.gz<br> + tar xzf Wine-<i>x.x.x</i>.tar.gz<br> + mv wine-<i>x.x.x</i> wine<br> + tar xzf wine-cvsdirs-<i>x.x.x</i>.tar.gz<br> </span> </td></tr> </table> @@ -203,8 +197,7 @@ via CVS. Here's how to do it: </table> </ul> -You will now be completely up to date. -The <code>-A</code> is required to get the latest version in the tree. +You will now be completely up to date. The <code>-A</code> is required to get the latest version in the tree. <p> <p><img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> @@ -213,19 +206,17 @@ The <code>-A</code> is required to get t <h1>Cleaning up your existing tree</h1> -A quick way to clean up your tree after you've been modifying it - and want a clean copy of Wine again is this: +A quick way to clean up your tree after you've been modifying it and want a clean copy of Wine again is this: <table width="300" border=0 cellpadding=10><tr><td class=black> <span class=inverse> cd wine<br> cvs update -PAd<br> - cvs diff > total-<i>YYMMDD</i>.diff<br> - patch -p0 -R < total-<i>YYMMDD</i>.diff + cvs diff > total-<i>x.x.x</i>.diff<br> + patch -p0 -R < total-<i>x.x.x</i>.diff </span> </td></tr> </table> -By using the current date in <i>YYMMDD</i>, you can keep a history - of changes that were in your Wine tree. +By using the current x.x.x tags, you can keep a history of changes that were in your Wine tree. <p> <h1>Staying Up-To-Date</h1> @@ -241,9 +232,8 @@ Run </table> to merge changes from the tree with the current directory. (Local changes will -not be lost.) Do this from the top Wine -directory to update the entire tree. When a new directory is added to Wine, -you will need to do a +not be lost.) Do this from the top Wine directory to update the entire tree. +When a new directory is added to Wine, you will need to do a <table width="300" border=0 cellpadding=10><tr><td class=black> <span class=inverse> @@ -267,7 +257,7 @@ Some options are so useful you may want <table width="300" border=0 cellpadding=10><tr><td class=black> <span class=inverse> - cvs -z 0<br> + cvs -z 3<br> update -PAd<br> diff -u </span> @@ -279,18 +269,13 @@ Some options are so useful you may want (Levels higher than 3 will probably not result in faster downloading unless you have a fast machine and a slow network connection.) <code>-Pd</code> will delete empty directories and create newly added ones. -<code>-u</code> will create the easiest to read patches. Please -do not submit patches with diff -w. +<code>-u</code> will create the easiest to read patches. Please do not submit patches with diff -w. Examples of other useful options (see the CVS documentation for details): <ul> - <li><code>cvs update -A</code> (update from the head of the tree, - and ignore tags) + <li><code>cvs update -A</code> (update from the head of the tree, and ignore tags) <li><code>cvs -n update </code> (test only, don't make changes) - <li><code>cvs update -r Wine-<i>YYMMDD</i></code> (get the revision with - the tag for a Wine snapshot) - <li><code>cvs update -D <i>date</i></code> (get the revision associated -with an arbitrary date) + <li><code>cvs update -r Wine-<i>x.x.x</i></code> (get the revision with the tag for a Wine snapshot) </ul> <p><img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> @@ -302,10 +287,8 @@ with an arbitrary date) <p> The WineHQ CVS server makes a couple of other things available as well. -To get these, log in anonymously -as above and do <code>cvs co <i>modulename</i></code> where -<code><i>modulename</i></code> -is one of: +To get these, log in anonymously as above and do <code>cvs co <i>modulename</i></code> where +<code><i>modulename</i></code> is one of: <ul> <li><tt>c2man</tt> -- automatic documentation system, specially modified for Wine</li> <li><tt>lostwages</tt> -- source for the WineHQ web site</li> @@ -330,8 +313,7 @@ To get the docs in a terminal run: </span> </td></tr> </table> -When prompted for a password press the enter key. -A subdirectory named docs will be created. +When prompted for a password press the enter key. A subdirectory named docs will be created. <p><img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> </p>

1 0