wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

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

12 Dec '13

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 : makedep: Generate rules for .x template files.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 52e19da50d6cee6389ecd4ccaa9a1428b0e292af URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e19da50d6cee6389ecd4cca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 21:18:53 2013 +0100 makedep: Generate rules for .x template files. --- Make.rules.in | 4 ++-- include/Makefile.in | 3 --- tools/makedep.c | 13 +++++++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 0617611..dff13b8 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -20,7 +20,7 @@ IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c -CLEAN_TARGETS = $(MODULE) $(IMPORTLIB:%=lib%.@IMPLIBEXT@) $(XTEMPLATE_SRCS:.x=.h) \ +CLEAN_TARGETS = $(MODULE) $(IMPORTLIB:%=lib%.@IMPLIBEXT@) \ $(TESTMODULE) $(TESTMODULE_STRIPPED) $(CROSSTESTMODULE) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(OBJC_SRCS:.m=.o) \ @@ -78,7 +78,7 @@ $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) $(IDL_R_SRCS) $(IDL_TLB_SRCS) \ - $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_OBJS) $(MANPAGES) + $(BISON_SRCS) $(LEX_SRCS) $(XTEMPLATE_SRCS) $(EXTRA_OBJS) $(MANPAGES) depend: dummy $(MAKEDEP) $(MAKEDEPFLAGS) -C$(srcdir) -S$(top_srcdir) -T$(top_builddir) $(PARENTSRC:%=-P%) $(EXTRAINCL) $(DEPEND_SRCS) diff --git a/include/Makefile.in b/include/Makefile.in index e250444..a6d149d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -642,9 +642,6 @@ 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) -H -o $@ $(srcdir)/rmxftmpl.x - install install-dev:: $(OBJDIR_INCLUDES) $(INSTALLDIRS) for f in $(SRCDIR_INCLUDES); do case $$f in \ wine/*) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/`expr $$f : 'wine/$.*$'` ;; \ diff --git a/tools/makedep.c b/tools/makedep.c index 1d99762..f8415c6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -990,8 +990,7 @@ static void parse_file( struct incl_file *source, int src ) FILE *file; /* don't try to open certain types of files */ - if (strendswith( source->name, ".tlb" ) || - strendswith( source->name, ".x" )) + if (strendswith( source->name, ".tlb" )) { source->filename = xstrdup( source->name ); return; @@ -1067,8 +1066,7 @@ static struct incl_file *add_src_file( const char *name ) if (strendswith( file->name, ".tlb" ) || strendswith( file->name, ".res" ) || - strendswith( file->name, ".pot" ) || - strendswith( file->name, ".x" )) + strendswith( file->name, ".pot" )) { file->filename = xstrdup( file->name ); return file; @@ -1207,6 +1205,13 @@ static void output_sources(void) column += output( "%s.tab.o:", obj ); free( header ); } + else if (!strcmp( ext, "x" )) /* template file */ + { + output( "%s.h: $(MAKEXFTMPL) %s\n", obj, source->filename ); + output( "\t$(MAKEXFTMPL) -H -o $@ %s\n", source->filename ); + strarray_add( &clean_files, strmake( "%s.h", obj )); + continue; + } else if (!strcmp( ext, "l" )) /* lex file */ { output( "%s.yy.c: %s\n", obj, source->filename );

1 0

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

12 Dec '13

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

Alexandre Julliard : make_xftmpl: Report errors in standard format.
by Alexandre Julliard 12 Dec '13

12 Dec '13

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

Łukasz Wojniłowicz : Polish translation for release 1.7.8
by Jeremy Newman 12 Dec '13

12 Dec '13

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 11 Dec '13

11 Dec '13

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: Rename surface_load_pbo to surface_create_pbo.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 78fda5cea083ce62c28fceb873f4372863ca0fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78fda5cea083ce62c28fceb87… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 12:22:21 2013 +0100 wined3d: Rename surface_load_pbo to surface_create_pbo. --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0c3df16..ec9ac6c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -545,7 +545,7 @@ static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct return TRUE; } -static void surface_load_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) +static void surface_create_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { struct wined3d_context *context; GLenum error; @@ -586,7 +586,7 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) - surface_load_pbo(surface, gl_info); + surface_create_pbo(surface, gl_info); else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO)) { /* Whatever surface we have, make sure that there is memory allocated @@ -5244,7 +5244,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) if (location == SFLAG_INSYSMEM && !(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) - surface_load_pbo(surface, gl_info); + surface_create_pbo(surface, gl_info); return WINED3D_OK; }

1 0

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

11 Dec '13

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

Stefan Dösinger : wined3d: Use surface_get_memory in surface_download_data.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 800571c015ae02d8d5854ee56116f6b2b3975b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=800571c015ae02d8d5854ee56… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 12:22:19 2013 +0100 wined3d: Use surface_get_memory in surface_download_data. --- dlls/wined3d/surface.c | 50 ++++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6270d0a..c65d7c1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -517,6 +517,20 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) return WINED3D_OK; } +static void surface_get_memory(const struct wined3d_surface *surface, struct wined3d_bo_address *data) +{ + if (surface->flags & SFLAG_PBO) + { + data->addr = NULL; + data->buffer_object = surface->pbo; + } + else + { + data->addr = surface->resource.allocatedMemory; + data->buffer_object = 0; + } +} + static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { if (surface->resource.pool == WINED3D_POOL_SYSTEM_MEM) @@ -1523,6 +1537,7 @@ void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, static void surface_download_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { const struct wined3d_format *format = surface->resource.format; + struct wined3d_bo_address data; /* Only support read back of converted P8 surfaces. */ if (surface->flags & SFLAG_CONVERTED && format->id != WINED3DFMT_P8_UINT) @@ -1531,15 +1546,16 @@ static void surface_download_data(struct wined3d_surface *surface, const struct return; } + surface_get_memory(surface, &data); + if (format->flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p.\n", - surface, surface->texture_level, format->glFormat, format->glType, - surface->resource.allocatedMemory); + surface, surface->texture_level, format->glFormat, format->glType, data.addr); - if (surface->flags & SFLAG_PBO) + if (data.buffer_object) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, surface->pbo)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data.buffer_object)); checkGLcall("glBindBufferARB"); GL_EXTCALL(glGetCompressedTexImageARB(surface->texture_target, surface->texture_level, NULL)); checkGLcall("glGetCompressedTexImageARB"); @@ -1549,7 +1565,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct else { GL_EXTCALL(glGetCompressedTexImageARB(surface->texture_target, - surface->texture_level, surface->resource.allocatedMemory)); + surface->texture_level, data.addr)); checkGLcall("glGetCompressedTexImageARB"); } } @@ -1578,15 +1594,15 @@ static void surface_download_data(struct wined3d_surface *surface, const struct } else { - mem = surface->resource.allocatedMemory; + mem = data.addr; } TRACE("(%p) : Calling glGetTexImage level %d, format %#x, type %#x, data %p\n", surface, surface->texture_level, gl_format, gl_type, mem); - if (surface->flags & SFLAG_PBO) + if (data.buffer_object) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, surface->pbo)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data.buffer_object)); checkGLcall("glBindBufferARB"); gl_info->gl_ops.gl.p_glGetTexImage(surface->texture_target, surface->texture_level, @@ -1648,7 +1664,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * |444444444444444444| \/ * -------------------- * - * this also means that any references to allocatedMemory should work with the data as if were a + * this also means that any references to surface memory should work with the data as if were a * standard texture with a non-power2 width instead of texture boxed up to be a power2 texture. * * internally the texture is still stored in a boxed format so any references to textureName will @@ -1658,7 +1674,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * rendering. If an app does, the SFLAG_DYNLOCK flag will kick in and the memory copy won't be released, * and doesn't have to be re-read. */ src_data = mem; - dst_data = surface->resource.allocatedMemory; + dst_data = data.addr; TRACE("(%p) : Repacking the surface data from pitch %d to pitch %d\n", surface, src_pitch, dst_pitch); for (y = 0; y < surface->resource.height; ++y) { @@ -1934,20 +1950,6 @@ static BOOL surface_check_block_align(struct wined3d_surface *surface, const REC return FALSE; } -static void surface_get_memory(const struct wined3d_surface *surface, struct wined3d_bo_address *data) -{ - if (surface->flags & SFLAG_PBO) - { - data->addr = NULL; - data->buffer_object = surface->pbo; - } - else - { - data->addr = surface->resource.allocatedMemory; - data->buffer_object = 0; - } -} - HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) {

1 0

Stefan Dösinger : ddraw/tests: Test user memory and getdc interaction.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 5a656dead64915e3221f393d238db8a574424b64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a656dead64915e3221f393d2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 12:22:17 2013 +0100 ddraw/tests: Test user memory and getdc interaction. Some Windows Media Player 9 visualization plugins used ddraw in this way to get a dc for their custom memory allocations. --- dlls/ddraw/tests/ddraw2.c | 66 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 61 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 61 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 3728723..ccf228e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4862,6 +4862,71 @@ done: DestroyWindow(window); } +static void test_user_memory_getdc(void) +{ + IDirectDraw2 *ddraw; + HWND window; + HRESULT hr; + DDSURFACEDESC ddsd; + IDirectDrawSurface *surface; + IDirectDrawSurface3 *surface3; + DWORD data[16][16]; + ULONG ref; + HDC dc; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **)&surface3); + ok(SUCCEEDED(hr), "Failed to get IDirectDrawSurface3 interface, hr %#x.\n", hr); + IDirectDrawSurface_Release(surface); + + memset(data, 0xaa, sizeof(data)); + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_LPSURFACE; + ddsd.lpSurface = data; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + hr = IDirectDrawSurface3_GetDC(surface3, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 16, 8, NULL, 0, 0, WHITENESS); + BitBlt(dc, 0, 8, 16, 8, NULL, 0, 0, BLACKNESS); + hr = IDirectDrawSurface3_ReleaseDC(surface3, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); + ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + + IDirectDrawSurface3_Release(surface3); + ref = IDirectDraw2_Release(ddraw); + ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); + DestroyWindow(window); +} + START_TEST(ddraw2) { test_coop_level_create_device_window(); @@ -4896,4 +4961,5 @@ START_TEST(ddraw2) test_surface_discard(); test_flip(); test_set_surface_desc(); + test_user_memory_getdc(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1793052..1689562 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5464,6 +5464,66 @@ done: DestroyWindow(window); } +static void test_user_memory_getdc(void) +{ + IDirectDraw4 *ddraw; + HWND window; + HRESULT hr; + DDSURFACEDESC2 ddsd; + IDirectDrawSurface4 *surface; + DWORD data[16][16]; + ULONG ref; + HDC dc; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(data, 0xaa, sizeof(data)); + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_LPSURFACE; + ddsd.lpSurface = data; + hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + hr = IDirectDrawSurface4_GetDC(surface, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 16, 8, NULL, 0, 0, WHITENESS); + BitBlt(dc, 0, 8, 16, 8, NULL, 0, 0, BLACKNESS); + hr = IDirectDrawSurface4_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); + ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + + IDirectDrawSurface4_Release(surface); + ref = IDirectDraw4_Release(ddraw); + ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); + DestroyWindow(window); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -5503,4 +5563,5 @@ START_TEST(ddraw4) test_surface_discard(); test_flip(); test_set_surface_desc(); + test_user_memory_getdc(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0a7eb7d..41f1b9b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5352,6 +5352,66 @@ done: DestroyWindow(window); } +static void test_user_memory_getdc(void) +{ + IDirectDraw7 *ddraw; + HWND window; + HRESULT hr; + DDSURFACEDESC2 ddsd; + IDirectDrawSurface7 *surface; + DWORD data[16][16]; + ULONG ref; + HDC dc; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(data, 0xaa, sizeof(data)); + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_LPSURFACE; + ddsd.lpSurface = data; + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_GetDC(surface, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 16, 8, NULL, 0, 0, WHITENESS); + BitBlt(dc, 0, 8, 16, 8, NULL, 0, 0, BLACKNESS); + hr = IDirectDrawSurface7_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); + ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + + IDirectDrawSurface7_Release(surface); + ref = IDirectDraw7_Release(ddraw); + ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -5399,4 +5459,5 @@ START_TEST(ddraw7) test_surface_discard(); test_flip(); test_set_surface_desc(); + test_user_memory_getdc(); }

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2013