October 2013 - Wine-Commits

Alexandre Julliard : makedep: Add a helper function to replace a file name extension.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: c9a4cc6ab7a3d2728bbc7fa19ebbf6a73f72aa6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a4cc6ab7a3d2728bbc7fa19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 15 20:29:09 2013 +0200 makedep: Add a helper function to replace a file name extension. --- tools/makedep.c | 47 ++++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 23 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index fb6b929..ea23318 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -250,6 +250,18 @@ static char *get_extension( char *filename ) /******************************************************************* + * replace_extension + */ +static char *replace_extension( const char *name, unsigned int old_len, const char *new_ext ) +{ + char *ret = xmalloc( strlen( name ) + strlen( new_ext ) + 1 ); + strcpy( ret, name ); + strcpy( ret + strlen( ret ) - old_len, new_ext ); + return ret; +} + + +/******************************************************************* * get_line */ static char *get_line( FILE *file ) @@ -452,10 +464,8 @@ static FILE *open_include_file( struct incl_file *pFile ) if (strendswith( pFile->name, ".tab.h" )) { - if (src_dir) - filename = strmake( "%s/%.*s.y", src_dir, strlen(pFile->name) - 6, pFile->name ); - else - filename = strmake( "%.*s.y", strlen(pFile->name) - 6, pFile->name ); + filename = replace_extension( pFile->name, 6, ".y" ); + if (src_dir) filename = strmake( "%s/%s", src_dir, filename ); if ((file = fopen( filename, "r" ))) { @@ -472,10 +482,8 @@ static FILE *open_include_file( struct incl_file *pFile ) if (strendswith( pFile->name, ".h" )) { - if (src_dir) - filename = strmake( "%s/%.*s.idl", src_dir, strlen(pFile->name) - 2, pFile->name ); - else - filename = strmake( "%.*s.idl", strlen(pFile->name) - 2, pFile->name ); + filename = replace_extension( pFile->name, 2, ".idl" ); + if (src_dir) filename = strmake( "%s/%s", src_dir, filename ); if ((file = fopen( filename, "r" ))) { @@ -505,12 +513,11 @@ static FILE *open_include_file( struct incl_file *pFile ) if (strendswith( pFile->name, ".h" )) { + filename = replace_extension( pFile->name, 2, ".idl" ); if (top_src_dir) - filename = strmake( "%s/include/%.*s.idl", - top_src_dir, strlen(pFile->name) - 2, pFile->name ); + filename = strmake( "%s/include/%s", top_src_dir, filename ); else if (top_obj_dir) - filename = strmake( "%s/include/%.*s.idl", - top_obj_dir, strlen(pFile->name) - 2, pFile->name ); + filename = strmake( "%s/include/%s", top_obj_dir, filename ); else filename = NULL; @@ -527,12 +534,11 @@ static FILE *open_include_file( struct incl_file *pFile ) if (strendswith( pFile->name, "tmpl.h" )) { + filename = replace_extension( pFile->name, 2, ".x" ); if (top_src_dir) - filename = strmake( "%s/include/%.*s.x", - top_src_dir, strlen(pFile->name) - 2, pFile->name ); + filename = strmake( "%s/include/%s", top_src_dir, filename ); else if (top_obj_dir) - filename = strmake( "%s/include/%.*s.x", - top_obj_dir, strlen(pFile->name) - 2, pFile->name ); + filename = strmake( "%s/include/%s", top_obj_dir, filename ); else filename = NULL; @@ -778,11 +784,8 @@ static void parse_rc_file( struct incl_file *pFile, FILE *file ) */ static void parse_generated_idl( struct incl_file *source ) { - char *header, *basename; + char *header = replace_extension( source->name, 4, ".h" ); - basename = xstrdup( source->name ); - basename[strlen(basename) - 4] = 0; - header = strmake( "%s.h", basename ); source->filename = xstrdup( source->name ); if (strendswith( source->name, "_c.c" )) @@ -809,7 +812,6 @@ static void parse_generated_idl( struct incl_file *source ) } free( header ); - free( basename ); } /******************************************************************* @@ -855,8 +857,7 @@ static void parse_file( struct incl_file *source, int src ) if (strendswith( source->name, ".o" )) { /* default to .c for unknown extra object files */ - source->filename = xstrdup( source->name ); - source->filename[strlen(source->filename) - 1] = 'c'; + source->filename = replace_extension( source->name, 2, ".c" ); return; }

1 0

Dmitry Timoshkov : gdi32/tests: Fix brush tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: dd579e4c786f5c328f60b03b4a9de60058f4fdfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd579e4c786f5c328f60b03b4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 16 14:31:17 2013 +0900 gdi32/tests: Fix brush tests compilation with __WINESRC__ defined. --- dlls/gdi32/tests/brush.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index 76e158d..9026a4a 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -49,7 +49,7 @@ static void test_solidbrush(void) for(i=0; i<sizeof(stock)/sizeof(stock[0]); i++) { solidBrush = CreateSolidBrush(stock[i].color); - + if(stock[i].stockobj != -1) { stockBrush = GetStockObject(stock[i].stockobj); ok(stockBrush!=solidBrush || @@ -59,20 +59,20 @@ static void test_solidbrush(void) else stockBrush = NULL; memset(&br, 0, sizeof(br)); - ret = GetObject(solidBrush, sizeof(br), &br); + ret = GetObjectW(solidBrush, sizeof(br), &br); ok( ret !=0, "GetObject on solid %s brush failed, error=%d\n", stock[i].name, GetLastError()); ok(br.lbStyle==BS_SOLID, "%s brush has wrong style, got %d expected %d\n", stock[i].name, br.lbStyle, BS_SOLID); ok(br.lbColor==stock[i].color, "%s brush has wrong color, got 0x%08x expected 0x%08x\n", stock[i].name, br.lbColor, stock[i].color); - + if(stockBrush) { /* Sanity check, make sure the colors being compared do in fact have a stock brush */ - ret = GetObject(stockBrush, sizeof(br), &br); + ret = GetObjectW(stockBrush, sizeof(br), &br); ok( ret !=0, "GetObject on stock %s brush failed, error=%d\n", stock[i].name, GetLastError()); ok(br.lbColor==stock[i].color, "stock %s brush unexpected color, got 0x%08x expected 0x%08x\n", stock[i].name, br.lbColor, stock[i].color); } DeleteObject(solidBrush); - ret = GetObject(solidBrush, sizeof(br), &br); + ret = GetObjectW(solidBrush, sizeof(br), &br); ok(ret==0 || broken(ret!=0), /* win9x */ "GetObject succeeded on a deleted %s brush\n", stock[i].name); @@ -92,7 +92,7 @@ static void test_hatch_brush(void) if (i < HS_API_MAX) { ok( brush != 0, "%u: CreateHatchBrush failed err %u\n", i, GetLastError() ); - size = GetObject( brush, sizeof(lb), &lb ); + size = GetObjectW( brush, sizeof(lb), &lb ); ok( size == sizeof(lb), "wrong size %u\n", size ); ok( lb.lbColor == RGB(12,34,56), "wrong color %08x\n", lb.lbColor ); if (i <= HS_DIAGCROSS)

1 0

Michael Stefaniuc : services/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: ba3f11023f5b0218f37e5cddd9720088fceea631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba3f11023f5b0218f37e5cddd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 15 22:08:39 2013 +0200 services/tests: Compile with -D__WINESRC__. --- programs/services/tests/Makefile.in | 1 - programs/services/tests/service.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/services/tests/Makefile.in b/programs/services/tests/Makefile.in index 2facc32..8a49219 100644 --- a/programs/services/tests/Makefile.in +++ b/programs/services/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = services.exe IMPORTS = advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ service.c diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index a2cd0b5..8511b92 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winsvc.h> #include <stdio.h> #include "wine/test.h"

1 0

Nikolay Sivov : imagehlp/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 94c0604e81ec6ef1d4fd03b50b5364bfae9df396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c0604e81ec6ef1d4fd03b50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 23:26:22 2013 +0400 imagehlp/tests: Compile with -D__WINESRC__. --- dlls/imagehlp/tests/Makefile.in | 1 - dlls/imagehlp/tests/integrity.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/imagehlp/tests/Makefile.in b/dlls/imagehlp/tests/Makefile.in index 8731a08..83a118f 100644 --- a/dlls/imagehlp/tests/Makefile.in +++ b/dlls/imagehlp/tests/Makefile.in @@ -1,5 +1,4 @@ TESTDLL = imagehlp.dll -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ image.c \ diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index 0785c2a..c29eea8 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -107,10 +107,10 @@ static BOOL copy_dll_file(void) lstrcatA(sys_dir, "imagehlp.dll"); /* Copy DLL to a temp file */ - GetTempPath(MAX_PATH, temp_path); - GetTempFileName(temp_path, "img", 0, test_dll_path); + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "img", 0, test_dll_path); - if (CopyFile(sys_dir, test_dll_path, FALSE) == 0) + if (CopyFileA(sys_dir, test_dll_path, FALSE) == 0) { skip("Unable to create copy of imagehlp.dll for tests.\n"); return FALSE; @@ -295,5 +295,5 @@ START_TEST(integrity) ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size); FreeLibrary(hImageHlp); - DeleteFile(test_dll_path); + DeleteFileA(test_dll_path); }

1 0

Dmitry Timoshkov : gdi32/tests: Fix bitmap tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: c99b264300c72eaea3909cc252bfe4bf2f9ec3f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99b264300c72eaea3909cc25… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 16 14:31:12 2013 +0900 gdi32/tests: Fix bitmap tests compilation with __WINESRC__ defined. --- dlls/gdi32/tests/bitmap.c | 82 ++++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c99b264300c72eaea3909…

1 0

Dmitry Timoshkov : gdiplus/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 1c8d4aaa4b31c2cb041a05c83e14250515d6760a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8d4aaa4b31c2cb041a05c83… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 16 12:49:40 2013 +0900 gdiplus/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/gdiplus/tests/Makefile.in | 1 - dlls/gdiplus/tests/brush.c | 5 +++-- dlls/gdiplus/tests/customlinecap.c | 2 +- dlls/gdiplus/tests/font.c | 28 ++++++++++++++-------------- dlls/gdiplus/tests/graphics.c | 7 +++---- dlls/gdiplus/tests/graphicspath.c | 2 +- dlls/gdiplus/tests/image.c | 4 ++-- dlls/gdiplus/tests/matrix.c | 3 +-- dlls/gdiplus/tests/metafile.c | 3 +-- dlls/gdiplus/tests/pathiterator.c | 2 +- dlls/gdiplus/tests/pen.c | 2 +- dlls/gdiplus/tests/region.c | 6 +++--- dlls/gdiplus/tests/stringformat.c | 2 +- 13 files changed, 32 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c8d4aaa4b31c2cb041a0…

1 0

Nikolay Sivov : shlwapi/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: b70a5d52f1666203cae699322cbff3dc7c98ec9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b70a5d52f1666203cae699322… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 23:41:10 2013 +0400 shlwapi/tests: Compile with -D__WINESRC__. --- dlls/shlwapi/tests/Makefile.in | 1 - dlls/shlwapi/tests/ordinal.c | 48 +++--- dlls/shlwapi/tests/path.c | 390 ++++++++++++++++++++-------------------- dlls/shlwapi/tests/shreg.c | 6 +- dlls/shlwapi/tests/string.c | 10 +- dlls/shlwapi/tests/url.c | 4 +- 6 files changed, 229 insertions(+), 230 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b70a5d52f1666203cae69…

1 0

Nikolay Sivov : ole32/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 026b711483cd389ac1240682e528a88dd2efbadd URL: http://source.winehq.org/git/wine.git/?a=commit;h=026b711483cd389ac1240682e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 22:37:46 2013 +0400 ole32/tests: Compile with -D__WINESRC__. --- dlls/ole32/tests/Makefile.in | 1 - dlls/ole32/tests/compobj.c | 38 +++++++------- dlls/ole32/tests/defaulthandler.c | 2 +- dlls/ole32/tests/dragdrop.c | 12 ++-- dlls/ole32/tests/marshal.c | 106 ++++++++++++++++++------------------ dlls/ole32/tests/ole2.c | 4 +- dlls/ole32/tests/ole_server.c | 32 ++++++------ dlls/ole32/tests/propvariant.c | 2 + dlls/ole32/tests/storage32.c | 2 +- dlls/ole32/tests/usrmarshal.c | 8 ++-- 10 files changed, 104 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=026b711483cd389ac1240…

1 0

Alexandre Julliard : makedep: Automatically add the source idl for generated sources to the dependencies list .
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: b9cb6d4f956dc8ff0c74dc38d43e12d5a8cda5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9cb6d4f956dc8ff0c74dc38d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 15 13:15:06 2013 +0200 makedep: Automatically add the source idl for generated sources to the dependencies list. --- Make.rules.in | 3 +- tools/makedep.c | 85 +++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 55 insertions(+), 33 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index cc04821..94c2e83 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -100,8 +100,7 @@ $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) # Rules for dependencies DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) $(PO_SRCS:.rc=.pot) \ - $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_R_SRCS) $(IDL_S_SRCS) \ - $(IDL_GEN_C_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) \ + $(IDL_H_SRCS) $(IDL_GEN_C_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS:.idl=.tlb) \ $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_OBJS) depend: dummy diff --git a/tools/makedep.c b/tools/makedep.c index ea23318..982d827 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -832,39 +832,8 @@ static void parse_file( struct incl_file *source, int src ) { FILE *file; - /* special case for source files generated from idl */ - if (is_generated_idl( source )) - { - parse_generated_idl( source ); - return; - } - - if (!strcmp( source->name, "dlldata.o" )) - { - source->filename = xstrdup( "dlldata.c" ); - add_include( source, "objbase.h", 1 ); - add_include( source, "rpcproxy.h", 1 ); - return; - } - - if (!strcmp( source->name, "testlist.o" )) - { - source->filename = xstrdup( "testlist.c" ); - add_include( source, "wine/test.h", 1 ); - return; - } - - if (strendswith( source->name, ".o" )) - { - /* default to .c for unknown extra object files */ - source->filename = replace_extension( source->name, 2, ".c" ); - return; - } - /* don't try to open certain types of files */ if (strendswith( source->name, ".tlb" ) || - strendswith( source->name, ".res" ) || - strendswith( source->name, ".pot" ) || strendswith( source->name, ".x" )) { source->filename = xstrdup( source->name ); @@ -900,14 +869,68 @@ static void parse_file( struct incl_file *source, int src ) static struct incl_file *add_src_file( const char *name ) { struct incl_file *file; + char *idl; if (find_src_file( name )) return NULL; /* we already have it */ file = xmalloc( sizeof(*file) ); memset( file, 0, sizeof(*file) ); file->name = xstrdup(name); list_add_tail( &sources, &file->entry ); + + /* special cases for generated files */ + + if (is_generated_idl( file )) + { + parse_generated_idl( file ); + goto add_idl_source; + } + + if (!strcmp( file->name, "dlldata.o" )) + { + file->filename = xstrdup( "dlldata.c" ); + add_include( file, "objbase.h", 1 ); + add_include( file, "rpcproxy.h", 1 ); + return file; + } + + if (!strcmp( file->name, "testlist.o" )) + { + file->filename = xstrdup( "testlist.c" ); + add_include( file, "wine/test.h", 1 ); + return file; + } + + if (strendswith( file->name, ".o" )) + { + /* default to .c for unknown extra object files */ + file->filename = replace_extension( file->name, 2, ".c" ); + return file; + } + + if (strendswith( file->name, ".tlb" ) || + strendswith( file->name, "_r.res" ) || + strendswith( file->name, "_t.res" )) + { + file->filename = xstrdup( file->name ); + goto add_idl_source; + } + + if (strendswith( file->name, ".res" ) || + strendswith( file->name, ".pot" ) || + strendswith( file->name, ".x" )) + { + file->filename = xstrdup( file->name ); + return file; + } + parse_file( file, 1 ); return file; + +add_idl_source: + idl = replace_extension( name, strendswith( name, ".res" ) ? 6 : 4, ".idl" ); + add_src_file( idl ); + free( idl ); + return file; }

1 0

Alexandre Julliard : makedep: Remove support for no longer used .mc. rc files.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: b1d4807fc2d404ff23b98d4d09cda3512d3b994b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d4807fc2d404ff23b98d4d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 15 20:29:34 2013 +0200 makedep: Remove support for no longer used .mc.rc files. --- tools/makedep.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index e41fa77..fb6b929 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -468,28 +468,6 @@ static FILE *open_include_file( struct incl_file *pFile ) free( filename ); } - /* check for generated message resource */ - - if (strendswith( pFile->name, ".mc.rc" )) - { - if (src_dir) - filename = strmake( "%s/%s", src_dir, pFile->name ); - else - filename = xstrdup( pFile->name ); - - filename[strlen(filename) - 3] = 0; - - if ((file = fopen( filename, "r" ))) - { - pFile->sourcename = filename; - pFile->filename = xstrdup( pFile->name ); - /* don't bother to parse it */ - fclose( file ); - return NULL; - } - free( filename ); - } - /* check for corresponding idl file in source dir */ if (strendswith( pFile->name, ".h" ))

1 0