December 2013 - Wine-Commits

Alexandre Julliard : makefiles: Explicitly specify source directory in spec file dependencies.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

Module: wine Branch: master Commit: 180bc4b878c4151a6dba8706f6a213a0120c1089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=180bc4b878c4151a6dba8706f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 13:23:57 2013 +0100 makefiles: Explicitly specify source directory in spec file dependencies. --- Make.rules.in | 4 ++-- aclocal.m4 | 8 ++++---- configure | 12 ++++++------ configure.ac | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index dff13b8..6b9a996 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -69,10 +69,10 @@ $(IMPORTLIB:%=lib%.def.a): $(IMPLIB_SRCS:.c=.o) $(RANLIB) $@ $(IMPORTLIB:%=lib%.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.o) - $(WINEBUILD) $(TARGETFLAGS) -w --implib -o $@ --export $(srcdir)/$(MAINSPEC) $(IMPLIB_SRCS:.c=.o) + $(WINEBUILD) $(TARGETFLAGS) -w --implib -o $@ --export $(MAINSPEC) $(IMPLIB_SRCS:.c=.o) $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) - $(WINEBUILD) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(srcdir)/$(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) + $(WINEBUILD) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) # Rules for dependencies diff --git a/aclocal.m4 b/aclocal.m4 index 6231772..f186ce1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -432,7 +432,7 @@ $ac_dir/uninstall:: wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps -$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT @@ -465,9 +465,9 @@ $ac_file.cross.a: $ac_dir/Makefile dummy then wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT -$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec -$ac_file.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec .PHONY: $ac_dir/install-dev $ac_dir/uninstall $ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) @@ -480,7 +480,7 @@ __uninstall__: $ac_dir/uninstall" then wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a -$ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.cross.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec" fi diff --git a/configure b/configure index 9953777..95058cf 100755 --- a/configure +++ b/configure @@ -16137,9 +16137,9 @@ fi MAKE_DLL_RULES=" DLLFLAGS = $DLLFLAGS -MAINSPEC = \$(MODULE:%.dll=%).spec +MAINSPEC = \$(srcdir)/\$(MODULE:%.dll=%).spec IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res) -MODULEFLAGS = -shared \$(srcdir)/\$(MAINSPEC) \$(EXTRADLLFLAGS) +MODULEFLAGS = -shared \$(MAINSPEC) \$(EXTRADLLFLAGS) all: $deps @@ -16439,7 +16439,7 @@ fi wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps -$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT @@ -16472,9 +16472,9 @@ $ac_file.cross.a: $ac_dir/Makefile dummy then wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT -$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec -$ac_file.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec .PHONY: $ac_dir/install-dev $ac_dir/uninstall $ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) @@ -16487,7 +16487,7 @@ __uninstall__: $ac_dir/uninstall" then wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a -$ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.cross.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec" fi diff --git a/configure.ac b/configure.ac index aa17064..c2c7460 100644 --- a/configure.ac +++ b/configure.ac @@ -2610,9 +2610,9 @@ fi AC_SUBST(MAKE_DLL_RULES," DLLFLAGS = $DLLFLAGS -MAINSPEC = \$(MODULE:%.dll=%).spec +MAINSPEC = \$(srcdir)/\$(MODULE:%.dll=%).spec IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res) -MODULEFLAGS = -shared \$(srcdir)/\$(MAINSPEC) \$(EXTRADLLFLAGS) +MODULEFLAGS = -shared \$(MAINSPEC) \$(EXTRADLLFLAGS) all: $deps

1 0

Alexandre Julliard : make_xftmpl: Report errors in standard format.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

Module: wine Branch: master Commit: 31ad5fe6a2cdd738a13b30d279c8b7ee6c53f655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ad5fe6a2cdd738a13b30d27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 20:44:45 2013 +0100 make_xftmpl: Report errors in standard format. --- tools/make_xftmpl.c | 89 ++++++++++++++++++++++---------------------------- 1 files changed, 39 insertions(+), 50 deletions(-) diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c index b5751ce..0409453 100644 --- a/tools/make_xftmpl.c +++ b/tools/make_xftmpl.c @@ -22,6 +22,7 @@ #include "wine/port.h" #include <signal.h> +#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #ifdef HAVE_GETOPT_H @@ -75,7 +76,6 @@ struct parser int line_no; UINT bytes_output; BOOL(*write_bytes)(struct parser *parser, const BYTE *data, DWORD size); - BOOL error; }; struct keyword @@ -102,16 +102,41 @@ static const struct keyword reserved_words[] = { }; static char *program_name; +static const char *infile_name; + +#ifndef __GNUC__ +#define __attribute__(x) +#endif + +static void fatal_error( struct parser *parser, const char *msg, ... ) __attribute__ ((__format__ (__printf__, 2, 3))); + +static void fatal_error( struct parser *parser, const char *msg, ... ) +{ + va_list valist; + va_start( valist, msg ); + if (infile_name) + { + fprintf( stderr, "%s:%d:", infile_name, parser->line_no ); + fprintf( stderr, " error: " ); + } + else fprintf( stderr, "%s: error: ", program_name ); + vfprintf( stderr, msg, valist ); + va_end( valist ); + exit( 1 ); +} + static inline BOOL read_byte(struct parser *parser, char *byte) { int c = fgetc(parser->infile); *byte = c; + if (c == '\n') parser->line_no++; return c != EOF; } static inline BOOL unread_byte(struct parser *parser, char last_byte) { + if (last_byte == '\n') parser->line_no--; return ungetc(last_byte, parser->infile) != EOF; } @@ -183,21 +208,11 @@ static BOOL parse_guid(struct parser *parser) static const char *guidfmt = "<%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X>"; buf[0] = '<'; - if (!read_bytes(parser, buf + 1, 37)) { - fprintf(stderr, "%s: Truncated GUID (line %d)\n", - program_name, parser->line_no); - parser->error = TRUE; - return FALSE; - } + if (!read_bytes(parser, buf + 1, 37)) fatal_error( parser, "truncated GUID\n" ); buf[38] = 0; ret = sscanf(buf, guidfmt, &guid.Data1, tab, tab+1, tab+2, tab+3, tab+4, tab+5, tab+6, tab+7, tab+8, tab+9); - if (ret != 11) { - fprintf(stderr, "%s: Invalid GUID '%s' (line %d)\n", - program_name, buf, parser->line_no); - parser->error = TRUE; - return FALSE; - } + if (ret != 11) fatal_error( parser, "invalid GUID '%s'\n", buf ); guid.Data2 = tab[0]; guid.Data3 = tab[1]; @@ -260,25 +275,15 @@ static BOOL parse_number(struct parser *parser) if (dot) { float value; ret = sscanf(buffer, "%f", &value); - if (!ret) { - fprintf(stderr, "%s: Invalid float token (line %d).\n", - program_name, parser->line_no); - parser->error = TRUE; - } else { - ret = write_word(parser, TOKEN_FLOAT) && - write_bytes(parser, &value, sizeof(value)); - } + if (!ret) fatal_error( parser, "invalid float token\n" ); + ret = write_word(parser, TOKEN_FLOAT) && + write_bytes(parser, &value, sizeof(value)); } else { int value; ret = sscanf(buffer, "%d", &value); - if (!ret) { - fprintf(stderr, "%s: Invalid integer token (line %d).\n", - program_name, parser->line_no); - parser->error = TRUE; - } else { - ret = write_word(parser, TOKEN_INTEGER) && - write_dword(parser, value); - } + if (!ret) fatal_error( parser, "invalid integer token\n" ); + ret = write_word(parser, TOKEN_INTEGER) && + write_dword(parser, value); } return ret; @@ -294,8 +299,6 @@ static BOOL parse_token(struct parser *parser) switch (c) { case '\n': - parser->line_no++; - /* fall through */ case '\r': case ' ': case '\t': @@ -312,12 +315,8 @@ static BOOL parse_token(struct parser *parser) case '.': return write_word(parser, TOKEN_DOT); case '/': - if (!read_byte(parser, &c) || c != '/') { - fprintf(stderr, "%s: Invalid single '/' comment token (line %d).\n", - program_name, parser->line_no); - parser->error = TRUE; - return FALSE; - } + if (!read_byte(parser, &c) || c != '/') + fatal_error( parser, "invalid single '/' comment token\n" ); /* fall through */ case '#': while (read_byte(parser, &c) && c != '\n'); @@ -336,12 +335,7 @@ static BOOL parse_token(struct parser *parser) if (len + 1 < sizeof(buffer)) buffer[len++] = c; } - if (c != '"') { - fprintf(stderr, "%s: Unterminated string (line %d).\n", - program_name, parser->line_no); - parser->error = TRUE; - return FALSE; - } + if (c != '"') fatal_error( parser, "unterminated string\n" ); return write_word(parser, TOKEN_STRING) && write_dword(parser, len) && write_bytes(parser, buffer, len); @@ -353,10 +347,7 @@ static BOOL parse_token(struct parser *parser) return parse_number(parser); if (isalpha(c) || c == '_') return parse_name(parser); - fprintf(stderr, "%s: Invalid character (%d) to start token (line %d).\n", - program_name, c, parser->line_no); - parser->error = TRUE; - return FALSE; + fatal_error( parser, "invalid character '%c' to start token\n", c ); } return TRUE; @@ -415,7 +406,6 @@ static char **parse_options(int argc, char **argv) int main(int argc, char **argv) { - const char *infile_name; char header[16]; struct parser parser; char **args; @@ -433,7 +423,6 @@ int main(int argc, char **argv) parser.infile = stdin; parser.outfile = NULL; - parser.error = FALSE; if (!strcmp(infile_name, "-")) { infile_name = "stdin"; @@ -533,7 +522,7 @@ int main(int argc, char **argv) parser.line_no = 1; while (parse_token(&parser)); - if (parser.error || ferror(parser.outfile) || ferror(parser.infile)) + if (ferror(parser.outfile) || ferror(parser.infile)) goto error; if (option_inc_var_name)

1 0

Alexandre Julliard : user32: Don' t check for comctl32 class for integer atoms.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

Module: wine Branch: master Commit: fb4441df73dc0a1974515aa98831fdda3250dab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4441df73dc0a1974515aa98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 12:05:36 2013 +0100 user32: Don't check for comctl32 class for integer atoms. --- dlls/user32/class.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 349aedf..d40d22e 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -311,6 +311,8 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ + if (!name) return NULL; + for (;;) { USER_Lock(); @@ -324,7 +326,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) } else { - if (!name || strcmpiW( class->name, name )) continue; + if (strcmpiW( class->name, name )) continue; } if (!class->local || class->hInstance == hinstance) { @@ -334,6 +336,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) } USER_Unlock(); + if (atom) break; if (!is_comctl32_class( name )) break; if (GetModuleHandleW( comctl32W )) break; if (!LoadLibraryW( comctl32W )) break;

1 0

Alexandre Julliard : make_xftmpl: Allow the C define names to be specified in the source file with pragmas.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

Module: wine Branch: master Commit: 166ad9696c6b671936c0929bfcda683704d6f471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=166ad9696c6b671936c0929bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 21:13:40 2013 +0100 make_xftmpl: Allow the C define names to be specified in the source file with pragmas. --- include/Makefile.in | 2 +- include/rmxftmpl.x | 3 + tools/make_xftmpl.c | 115 +++++++++++++++++++++++++++++++------------------- 3 files changed, 75 insertions(+), 45 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 1f25159..e250444 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -643,7 +643,7 @@ OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) $(XTEMPLATE_SRCS:.x=.h) all: $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) $(XTEMPLATE_SRCS:.x=.h) rmxftmpl.h: rmxftmpl.x $(MAKEXFTMPL) - $(MAKEXFTMPL) -i D3DRM_XTEMPLATES -s D3DRM_XTEMPLATE_BYTES -o $@ $(srcdir)/rmxftmpl.x + $(MAKEXFTMPL) -H -o $@ $(srcdir)/rmxftmpl.x install install-dev:: $(OBJDIR_INCLUDES) $(INSTALLDIRS) for f in $(SRCDIR_INCLUDES); do case $$f in \ diff --git a/include/rmxftmpl.x b/include/rmxftmpl.x index e7144b0..61b9516 100644 --- a/include/rmxftmpl.x +++ b/include/rmxftmpl.x @@ -15,6 +15,9 @@ xof 0302txt 0064 // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +#pragma xftmpl name D3DRM_XTEMPLATES +#pragma xftmpl size D3DRM_XTEMPLATE_BYTES + template Header { <3D82AB43-62DA-11CF-AB39-0020AF71E433> diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c index 0409453..1d83498 100644 --- a/tools/make_xftmpl.c +++ b/tools/make_xftmpl.c @@ -74,8 +74,6 @@ struct parser FILE *infile; FILE *outfile; int line_no; - UINT bytes_output; - BOOL(*write_bytes)(struct parser *parser, const BYTE *data, DWORD size); }; struct keyword @@ -101,8 +99,14 @@ static const struct keyword reserved_words[] = { {"WORD", TOKEN_WORD} }; +static BOOL option_header; +static char *option_inc_var_name = NULL; +static char *option_inc_size_name = NULL; +static const char *option_outfile_name = "-"; static char *program_name; static const char *infile_name; +static BYTE *output_data; +static UINT output_pos, output_size; #ifndef __GNUC__ #define __attribute__(x) @@ -145,26 +149,34 @@ static inline BOOL read_bytes(struct parser *parser, void *data, DWORD size) return fread(data, size, 1, parser->infile) > 0; } -static BOOL write_c_hex_bytes(struct parser *parser, const BYTE *data, DWORD size) +static BOOL write_c_hex_bytes(struct parser *parser) { - while (size--) + UINT i; + for (i = 0; i < output_pos; i++) { - if (parser->bytes_output % 12 == 0) + if (i % 12 == 0) fprintf(parser->outfile, "\n "); - fprintf(parser->outfile, " 0x%02x,", *data++); - parser->bytes_output++; + fprintf(parser->outfile, " 0x%02x,", output_data[i]); } return TRUE; } -static BOOL write_raw_bytes(struct parser *parser, const BYTE *data, DWORD size) +static BOOL write_raw_bytes(struct parser *parser) { - return fwrite(data, size, 1, parser->outfile) > 0; + return fwrite(output_data, output_pos, 1, parser->outfile) > 0; } static inline BOOL write_bytes(struct parser *parser, const void *data, DWORD size) { - return parser->write_bytes(parser, data, size); + if (output_pos + size > output_size) + { + output_size = max( output_size * 2, size ); + output_data = realloc( output_data, output_size ); + if (!output_data) return FALSE; + } + memcpy( output_data + output_pos, data, size ); + output_pos += size; + return TRUE; } static inline BOOL write_byte(struct parser *parser, BYTE value) @@ -292,6 +304,8 @@ static BOOL parse_number(struct parser *parser) static BOOL parse_token(struct parser *parser) { char c; + int len; + char *tok, buffer[512]; if (!read_byte(parser, &c)) return FALSE; @@ -317,18 +331,38 @@ static BOOL parse_token(struct parser *parser) case '/': if (!read_byte(parser, &c) || c != '/') fatal_error( parser, "invalid single '/' comment token\n" ); - /* fall through */ - case '#': while (read_byte(parser, &c) && c != '\n'); return c == '\n'; + case '#': + len = 0; + while (read_byte(parser, &c) && c != '\n') + if (len + 1 < sizeof(buffer)) buffer[len++] = c; + if (c != '\n') fatal_error( parser, "line too long\n" ); + buffer[len] = 0; + tok = strtok( buffer, " \t" ); + if (!tok || strcmp( tok, "pragma" )) return TRUE; + tok = strtok( NULL, " \t" ); + if (!tok || strcmp( tok, "xftmpl" )) return TRUE; + tok = strtok( NULL, " \t" ); + if (!tok) return TRUE; + if (!strcmp( tok, "name" )) + { + tok = strtok( NULL, " \t" ); + if (tok && !option_inc_var_name) option_inc_var_name = strdup( tok ); + } + else if (!strcmp( tok, "size" )) + { + tok = strtok( NULL, " \t" ); + if (tok && !option_inc_size_name) option_inc_size_name = strdup( tok ); + } + return TRUE; + case '<': return parse_guid(parser); case '"': - { - int len = 0; - char buffer[512]; + len = 0; /* FIXME: Handle '\' (e.g. "valid\"string") */ while (read_byte(parser, &c) && c != '"') { @@ -339,7 +373,6 @@ static BOOL parse_token(struct parser *parser) return write_word(parser, TOKEN_STRING) && write_dword(parser, len) && write_bytes(parser, buffer, len); - } default: unread_byte(parser, c); @@ -369,28 +402,29 @@ static void usage(void) { fprintf(stderr, "Usage: %s [OPTIONS] INFILE\n" "Options:\n" + " -H Output to a c header file instead of a binary file\n" " -i NAME Output to a c header file, data in variable NAME\n" " -s NAME In a c header file, define NAME to be the data size\n" " -o FILE Write output to FILE\n", program_name); } -static char *option_inc_var_name = NULL; -static char *option_inc_size_name = NULL; -static const char *option_outfile_name = "-"; - static char **parse_options(int argc, char **argv) { int optc; - while ((optc = getopt(argc, argv, "hi:o:s:")) != -1) + while ((optc = getopt(argc, argv, "hHi:o:s:")) != -1) { switch (optc) { case 'h': usage(); exit(0); + case 'H': + option_header = TRUE; + break; case 'i': + option_header = TRUE; option_inc_var_name = strdup(optarg); break; case 'o': @@ -475,10 +509,22 @@ int main(int argc, char **argv) } } - if (option_inc_var_name) + if (!write_bytes(&parser, "xof 0302bin 0064", 16)) + goto error; + + parser.line_no = 1; + while (parse_token(&parser)); + + if (ferror(parser.outfile) || ferror(parser.infile)) + goto error; + + if (option_header) { char *str_ptr; + if (!option_inc_var_name) + fatal_error( &parser, "variable name must be specified with -i or #pragma name\n" ); + header_name = strrchr(option_outfile_name, '/'); if (header_name) header_name = strdup(header_name + 1); @@ -506,34 +552,15 @@ int main(int argc, char **argv) "\n" "unsigned char %s[] = {", infile_name, header_name, header_name, option_inc_var_name); - - if (ferror(parser.outfile)) - goto error; - - parser.write_bytes = &write_c_hex_bytes; - } else { - parser.write_bytes = &write_raw_bytes; - } - - parser.bytes_output = 0; - if (!write_bytes(&parser, "xof 0302bin 0064", 16)) - goto error; - - parser.line_no = 1; - while (parse_token(&parser)); - - if (ferror(parser.outfile) || ferror(parser.infile)) - goto error; - - if (option_inc_var_name) - { + write_c_hex_bytes( &parser ); fprintf(parser.outfile, "\n};\n\n"); if (option_inc_size_name) - fprintf(parser.outfile, "#define %s %u\n\n", option_inc_size_name, parser.bytes_output); + fprintf(parser.outfile, "#define %s %u\n\n", option_inc_size_name, output_pos); fprintf(parser.outfile, "#endif /* __WINE_%s */\n", header_name); if (ferror(parser.outfile)) goto error; } + else write_raw_bytes( &parser ); fclose(parser.infile); fclose(parser.outfile);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.8
by Jeremy Newman Dec. 12, 2013

Dec. 12, 2013

Module: website Branch: master Commit: 4e6158a1ff4a5c5be3d9e3549fda8a25b1c239a4 URL: http://source.winehq.org/git/website.git/?a=commit;h=4e6158a1ff4a5c5be3d9e3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Wed Dec 11 16:17:20 2013 +0100 Polish translation for release 1.7.8 --- news/pl/2013120601.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2013120601.xml b/news/pl/2013120601.xml new file mode 100644 index 0000000..e22cd44 --- /dev/null +++ b/news/pl/2013120601.xml @@ -0,0 +1,16 @@ +<news> +<date>Grudzień 6, 2013</date> +<title>Wydano Wine 1.7.8</title> +<body> + Wydanie rozwojowe Wine 1.7.8 jest już dostępne. + <a href="{$root}/announce/1.7.8">Co nowego</a> w tym wydaniu: +<ul> + <li>Uaktualniona wersja pakietu Mono.</li> + <li>Ulepszenia w implementacji usługi BITS.</li> + <li>Lepsze tabele danych we wsparciu japońskich pionowych czcionek.</li> + <li>Ulepszone ślady wykonywania na nowych wersjach Mac OS X.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.8.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Jacek Caban : oleaut32: Check OANOCACHE variable only on process attach.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: f50ead6358f0b8fc271dba05360ce866a16cacce URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50ead6358f0b8fc271dba053… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 11 16:15:02 2013 +0100 oleaut32: Check OANOCACHE variable only on process attach. --- dlls/oleaut32/oleaut.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 60ff191..4cd5135 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -875,7 +875,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) { static const WCHAR oanocacheW[] = {'o','a','n','o','c','a','c','h','e',0}; - bstr_cache_enabled = !GetEnvironmentVariableW(oanocacheW, NULL, 0); + if(fdwReason == DLL_PROCESS_ATTACH) + bstr_cache_enabled = !GetEnvironmentVariableW(oanocacheW, NULL, 0); return OLEAUTPS_DllMain( hInstDll, fdwReason, lpvReserved ); }

1 0

Stefan Dösinger : wined3d: Call buffer_get_memory in surface_load_pbo.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: 4de7249d2303a23cb803a6e05ee8b5a2d6ba2cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de7249d2303a23cb803a6e05… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 12:22:20 2013 +0100 wined3d: Call buffer_get_memory in surface_load_pbo. --- dlls/wined3d/surface.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c65d7c1..0c3df16 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -549,6 +549,8 @@ static void surface_load_pbo(struct wined3d_surface *surface, const struct wined { struct wined3d_context *context; GLenum error; + struct wined3d_bo_address data; + surface_get_memory(surface, &data); context = context_acquire(surface->resource.device, NULL); @@ -563,7 +565,7 @@ static void surface_load_pbo(struct wined3d_surface *surface, const struct wined checkGLcall("glBindBufferARB"); GL_EXTCALL(glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->resource.size + 4, - surface->resource.allocatedMemory, GL_STREAM_DRAW_ARB)); + data.addr, GL_STREAM_DRAW_ARB)); checkGLcall("glBufferDataARB"); GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0));

1 0

Akihiro Sagawa : gdi32: Return ANSI character code as glyph index for bitmap fonts.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: 882398b0a9f4bae83a2ca1cdf576289c8938fc79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=882398b0a9f4bae83a2ca1cdf… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Dec 11 21:11:15 2013 +0900 gdi32: Return ANSI character code as glyph index for bitmap fonts. --- dlls/gdi32/freetype.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cbaddd2..716c74d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5998,7 +5998,7 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) } else ret = pFT_Get_Char_Index(font->ft_face, (unsigned char)buf); - TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, buf, ret, default_used); + TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, (unsigned char)buf, ret, default_used); return ret; } @@ -6015,6 +6015,34 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) return glyphId; } +/* helper for freetype_GetGlyphIndices */ +static FT_UInt get_gdi_glyph_index(const GdiFont *font, UINT glyph) +{ + WCHAR wc = (WCHAR)glyph; + BOOL default_used = FALSE; + BOOL *default_used_pointer = NULL; + FT_UInt ret; + char buf; + + if(font->ft_face->charmap->encoding != FT_ENCODING_NONE) + return get_glyph_index(font, glyph); + + if (codepage_sets_default_used(font->codepage)) + default_used_pointer = &default_used; + if(!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) + || default_used) + { + if (font->codepage == CP_SYMBOL && wc < 0x100) + ret = (unsigned char)wc; + else + ret = 0; + } + else + ret = (unsigned char)buf; + TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, (unsigned char)buf, ret, default_used); + return ret; +} + static FT_UInt get_default_char_index(GdiFont *font) { FT_UInt default_char; @@ -6061,7 +6089,7 @@ static DWORD freetype_GetGlyphIndices( PHYSDEV dev, LPCWSTR lpstr, INT count, LP for(i = 0; i < count; i++) { - pgi[i] = get_glyph_index(physdev->font, lpstr[i]); + pgi[i] = get_gdi_glyph_index(physdev->font, lpstr[i]); if (pgi[i] == 0) { if (!got_default)

1 0

Henri Verbeet : wined3d: Remove the render target check in x11_copy_to_screen().
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: 38495706b79bc77759aca918ba60d9d226b072ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=38495706b79bc77759aca918b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 11 14:32:03 2013 +0100 wined3d: Remove the render target check in x11_copy_to_screen(). --- dlls/wined3d/swapchain.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6675c35..ff2ac64 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -618,9 +618,6 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r TRACE("swapchain %p, rect %s.\n", swapchain, wine_dbgstr_rect(rect)); front = swapchain->front_buffer; - if (!(front->resource.usage & WINED3DUSAGE_RENDERTARGET)) - return; - if (front->resource.map_count) ERR("Trying to blit a mapped surface.\n");

1 0

Nikolay Sivov : shell32: Don't call comctl32 on unload time if it wasn' t used before.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: b5312b70f5c160b3aa3d374256f71ad4aa1f98e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5312b70f5c160b3aa3d37425… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 11 08:36:59 2013 +0400 shell32: Don't call comctl32 on unload time if it wasn't used before. --- dlls/shell32/iconcache.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index a2373fa..3d54508 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -405,8 +405,10 @@ void SIC_Destroy(void) if (sic_hdpa) DPA_DestroyCallback(sic_hdpa, sic_free, NULL ); - ImageList_Destroy(ShellSmallIconList); - ImageList_Destroy(ShellBigIconList); + if (ShellSmallIconList) + ImageList_Destroy(ShellSmallIconList); + if (ShellBigIconList) + ImageList_Destroy(ShellBigIconList); LeaveCriticalSection(&SHELL32_SicCS); DeleteCriticalSection(&SHELL32_SicCS);

1 0