January 2014 - Wine-commits

Stefan Dösinger : d3dx9_36/tests: Fix calling convention specification.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 9e3ef4abc63e967e01a5c5aed32b5334ed30840f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3ef4abc63e967e01a5c5aed… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 2 15:23:52 2014 +0100 d3dx9_36/tests: Fix calling convention specification. Msvc wants __stdcall after the type, otherwise it generates an error. --- dlls/d3dx9_36/tests/mesh.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index c700e43..3a876e5 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1785,7 +1785,7 @@ static char *strdupA(const char *p) return ret; } -static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyFrame(ID3DXAllocateHierarchy *iface, LPD3DXFRAME frame) +static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_DestroyFrame(ID3DXAllocateHierarchy *iface, LPD3DXFRAME frame) { TRACECALLBACK("ID3DXAllocateHierarchyImpl_DestroyFrame(%p, %p)\n", iface, frame); if (frame) { @@ -1795,7 +1795,7 @@ static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyFrame(ID3DXAllocateHie return D3D_OK; } -static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_CreateFrame(ID3DXAllocateHierarchy *iface, +static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_CreateFrame(ID3DXAllocateHierarchy *iface, const char *name, D3DXFRAME **new_frame) { D3DXFRAME *frame; @@ -1850,13 +1850,13 @@ static HRESULT destroy_mesh_container(LPD3DXMESHCONTAINER mesh_container) return D3D_OK; } -static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyMeshContainer(ID3DXAllocateHierarchy *iface, LPD3DXMESHCONTAINER mesh_container) +static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_DestroyMeshContainer(ID3DXAllocateHierarchy *iface, LPD3DXMESHCONTAINER mesh_container) { TRACECALLBACK("ID3DXAllocateHierarchyImpl_DestroyMeshContainer(%p, %p)\n", iface, mesh_container); return destroy_mesh_container(mesh_container); } -static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_CreateMeshContainer(ID3DXAllocateHierarchy *iface, +static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_CreateMeshContainer(ID3DXAllocateHierarchy *iface, const char *name, const D3DXMESHDATA *mesh_data, const D3DXMATERIAL *materials, const D3DXEFFECTINSTANCE *effects, DWORD num_materials, const DWORD *adjacency, ID3DXSkinInfo *skin_info, D3DXMESHCONTAINER **new_mesh_container)

1 0

Stefan Dösinger : d3dx9_36/tests: Use NAN.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 95317c33a969cb41c6dc5ecc68c0a8712662dc23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95317c33a969cb41c6dc5ecc6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 2 15:23:53 2014 +0100 d3dx9_36/tests: Use NAN. --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 3a876e5..21c3b41 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4800,7 +4800,7 @@ static void test_create_skin_info(void) exp_vertices[0] = 0; exp_vertices[1] = 0x87654321; exp_weights[0] = 0.5; - exp_weights[1] = 0.0f / 0.0f; /* NAN */ + exp_weights[1] = NAN; num_influences = 2; hr = skininfo->lpVtbl->SetBoneInfluence(skininfo, 1, num_influences, vertices, weights);

1 0

Michael Müller : quartz: Return increasing monitor GUID on VMR7 monitor enumeration.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 6e373aa6956c8bc267c0051cb04f6a34574cca5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e373aa6956c8bc267c0051cb… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Dec 31 03:23:19 2013 +0100 quartz: Return increasing monitor GUID on VMR7 monitor enumeration. --- dlls/quartz/vmr9.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 31f3f8e..53e4942 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1314,7 +1314,14 @@ static BOOL CALLBACK get_available_monitors_proc(HMONITOR hmon, HDC hdc, LPRECT VMRMONITORINFO *info = args->info7++; memset(info, 0, sizeof(*info)); - info->guid.pGUID = NULL; /* FIXME */ + if (args->numdev > 0) + { + info->guid.pGUID = &info->guid.GUID; + info->guid.GUID.Data4[7] = args->numdev; + } + else + info->guid.pGUID = NULL; + CopyRect(&info->rcMonitor, &mi.rcMonitor); info->hMon = hmon; info->dwFlags = mi.dwFlags;

1 0

Zhenbo Li : kernel32/tests: Add one more test for FindFirstFileA.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 767c09f16f1e02912a21fbe3863a24380b08a07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=767c09f16f1e02912a21fbe38… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Dec 31 13:05:41 2013 +0800 kernel32/tests: Add one more test for FindFirstFileA. --- dlls/kernel32/tests/file.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3ac4be8..7101e7b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2430,6 +2430,14 @@ static void test_FindFirstFileA(void) ok ( err == ERROR_PATH_NOT_FOUND, "Bad Error number %d\n", err ); } + /* try FindFirstFileA without trailing backslash */ + SetLastError( 0xdeadbeaf ); + strcpy(buffer2, nonexistent); + handle = FindFirstFileA(buffer2, &data); + err = GetLastError(); + ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should Fail\n", buffer2 ); + ok ( err == ERROR_FILE_NOT_FOUND, "Bad Error number %d\n", err ); + /* try FindFirstFileA on "C:\foo\bar.txt" */ SetLastError( 0xdeadbeaf ); strcpy(buffer2, nonexistent);

1 0

Zhenbo Li : wineps.drv: Constify a few pointers.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: c3bb460d686ea653acf78a586bdbbbb16cbe506b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3bb460d686ea653acf78a586… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun Dec 29 13:31:33 2013 +0800 wineps.drv: Constify a few pointers. --- dlls/wineps.drv/type1.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index 316bece..58fe11f 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -63,11 +63,11 @@ enum t1_cmds { (DWORD)_x1 ) #ifdef WORDS_BIGENDIAN -static inline WORD get_be_word(const void *p) { return *(WORD*)p; } -static inline DWORD get_be_dword(const void *p) { return *(DWORD*)p; } +static inline WORD get_be_word(const void *p) { return *(const WORD*)p; } +static inline DWORD get_be_dword(const void *p) { return *(const DWORD*)p; } #else -static inline WORD get_be_word(const void *p) { return RtlUshortByteSwap(*(WORD*)p); } -static inline DWORD get_be_dword(const void *p) { return RtlUlongByteSwap(*(DWORD*)p); } +static inline WORD get_be_word(const void *p) { return RtlUshortByteSwap(*(const WORD*)p); } +static inline DWORD get_be_dword(const void *p) { return RtlUlongByteSwap(*(const DWORD*)p); } #endif TYPE1 *T1_download_header(PHYSDEV dev, char *ps_name, RECT *bbox, UINT emsize) @@ -442,8 +442,8 @@ static BOOL append_complex_glyph(HDC hdc, const BYTE *data, glyph_outline *outli } else { - arg1 = *(char*)ptr++; - arg2 = *(char*)ptr++; + arg1 = *(const char*)ptr++; + arg2 = *(const char*)ptr++; } if(flags & WE_HAVE_A_SCALE) {

1 0

Nikolay Sivov : scrrun: Store folder path.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 2ca39611e1e6261771613f3ee312604ff774c014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca39611e1e6261771613f3ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 2 21:27:16 2014 +0400 scrrun: Store folder path. --- dlls/scrrun/filesystem.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 0236492..2753ecc 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -39,6 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrrun); struct folder { IFolder IFolder_iface; LONG ref; + BSTR path; }; struct file { @@ -371,7 +372,10 @@ static ULONG WINAPI folder_Release(IFolder *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + SysFreeString(This->path); heap_free(This); + } return ref; } @@ -614,15 +618,23 @@ static const IFolderVtbl foldervtbl = { folder_CreateTextFile }; -static HRESULT create_folder(IFolder **folder) +static HRESULT create_folder(BSTR path, IFolder **folder) { struct folder *This; + *folder = NULL; + This = heap_alloc(sizeof(struct folder)); if (!This) return E_OUTOFMEMORY; This->IFolder_iface.lpVtbl = &foldervtbl; This->ref = 1; + This->path = SysAllocString(path); + if (!This->path) + { + heap_free(This); + return E_OUTOFMEMORY; + } *folder = &This->IFolder_iface; @@ -1790,7 +1802,7 @@ static HRESULT WINAPI filesys_CreateFolder(IFileSystem3 *iface, BSTR path, return HRESULT_FROM_WIN32(GetLastError()); } - return create_folder(folder); + return create_folder(path, folder); } static HRESULT WINAPI filesys_CreateTextFile(IFileSystem3 *iface, BSTR FileName,

1 0

Nikolay Sivov : scrrun: Implement GetFolder().
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: f76f34ca23990f02ba20e5957609ee0c2335b124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76f34ca23990f02ba20e5957… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 2 21:27:45 2014 +0400 scrrun: Implement GetFolder(). --- dlls/scrrun/filesystem.c | 19 ++++++++++++++++--- dlls/scrrun/tests/filesystem.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 2753ecc..1254532 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1410,11 +1410,24 @@ static HRESULT WINAPI filesys_GetFile(IFileSystem3 *iface, BSTR FilePath, } static HRESULT WINAPI filesys_GetFolder(IFileSystem3 *iface, BSTR FolderPath, - IFolder **ppfolder) + IFolder **folder) { - FIXME("%p %s %p\n", iface, debugstr_w(FolderPath), ppfolder); + DWORD attrs; - return E_NOTIMPL; + TRACE("%p %s %p\n", iface, debugstr_w(FolderPath), folder); + + if(!folder) + return E_POINTER; + + *folder = NULL; + if(!FolderPath) + return E_INVALIDARG; + + attrs = GetFileAttributesW(FolderPath); + if((attrs == INVALID_FILE_ATTRIBUTES) || !(attrs & FILE_ATTRIBUTE_DIRECTORY)) + return CTL_E_PATHNOTFOUND; + + return create_folder(FolderPath, folder); } static HRESULT WINAPI filesys_GetSpecialFolder(IFileSystem3 *iface, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index ba0ff37..a6c5980 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -739,6 +739,42 @@ static void test_BuildPath(void) } } +static void test_GetFolder(void) +{ + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + WCHAR buffW[MAX_PATH]; + IFolder *folder; + HRESULT hr; + BSTR str; + + folder = (void*)0xdeadbeef; + hr = IFileSystem3_GetFolder(fs3, NULL, &folder); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(folder == NULL, "got %p\n", folder); + + hr = IFileSystem3_GetFolder(fs3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + /* something that doesn't exist */ + str = SysAllocString(dummyW); + + hr = IFileSystem3_GetFolder(fs3, str, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + folder = (void*)0xdeadbeef; + hr = IFileSystem3_GetFolder(fs3, str, &folder); + ok(hr == CTL_E_PATHNOTFOUND, "got 0x%08x\n", hr); + ok(folder == NULL, "got %p\n", folder); + SysFreeString(str); + + GetWindowsDirectoryW(buffW, MAX_PATH); + str = SysAllocString(buffW); + hr = IFileSystem3_GetFolder(fs3, str, &folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + IFolder_Release(folder); +} + START_TEST(filesystem) { HRESULT hr; @@ -763,6 +799,7 @@ START_TEST(filesystem) test_GetFile(); test_CopyFolder(); test_BuildPath(); + test_GetFolder(); IFileSystem3_Release(fs3);

1 0

Alexandre Julliard : makefiles: Generate cross-compile rules automatically when supported.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 1cd2786f926eb8904c7d5601519269f9d75c6943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd2786f926eb8904c7d56015… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 1 21:27:22 2014 +0100 makefiles: Generate cross-compile rules automatically when supported. --- configure | 11 --------- configure.ac | 11 --------- dlls/adsiid/Makefile.in | 2 +- dlls/dxerr8/Makefile.in | 2 +- dlls/dxerr9/Makefile.in | 2 +- dlls/dxguid/Makefile.in | 2 +- dlls/strmbase/Makefile.in | 2 +- dlls/strmiids/Makefile.in | 2 +- dlls/uuid/Makefile.in | 2 +- dlls/winecrt0/Makefile.in | 2 +- tools/makedep.c | 53 ++++++++++++-------------------------------- 11 files changed, 23 insertions(+), 68 deletions(-) diff --git a/configure b/configure index 71ff42b..c0eff26 100755 --- a/configure +++ b/configure @@ -16533,11 +16533,6 @@ $as_echo_n "creating Makefile rules..." >&6 MAKE_IMPLIB_RULES="DLLFLAGS = $DLLFLAGS " -if test -n "$CROSSTARGET" -then - as_fn_append MAKE_IMPLIB_RULES "MAKEDEPFLAGS = -xo -xcross.o -" -fi MAKE_DLL_RULES=" @@ -16556,12 +16551,6 @@ DLLFLAGS = $DLLFLAGS RUNTESTFLAGS = -q -P wine " -if test -n "$CROSSTARGET" -then - as_fn_append MAKE_TEST_RULES " -MAKEDEPFLAGS = -xo -xcross.o -" -fi wine_fn_append_rule " diff --git a/configure.ac b/configure.ac index bbae5b0..801527d 100644 --- a/configure.ac +++ b/configure.ac @@ -2595,11 +2595,6 @@ dnl Import library rules AC_SUBST(MAKE_IMPLIB_RULES,"DLLFLAGS = $DLLFLAGS ") -if test -n "$CROSSTARGET" -then - AS_VAR_APPEND([MAKE_IMPLIB_RULES],"MAKEDEPFLAGS = -xo -xcross.o -") -fi dnl Dll and program rules @@ -2617,12 +2612,6 @@ AC_SUBST(MAKE_TEST_RULES," DLLFLAGS = $DLLFLAGS RUNTESTFLAGS = -q -P wine ") -if test -n "$CROSSTARGET" -then - AS_VAR_APPEND([MAKE_TEST_RULES]," -MAKEDEPFLAGS = -xo -xcross.o -") -fi dnl Main makefile diff --git a/dlls/adsiid/Makefile.in b/dlls/adsiid/Makefile.in index 221f19a..a5b27d5 100644 --- a/dlls/adsiid/Makefile.in +++ b/dlls/adsiid/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libadsiid.a +MODULE = libadsiid.a C_SRCS = \ adsiid.c diff --git a/dlls/dxerr8/Makefile.in b/dlls/dxerr8/Makefile.in index dbd9b02..aa46a26 100644 --- a/dlls/dxerr8/Makefile.in +++ b/dlls/dxerr8/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libdxerr8.a +MODULE = libdxerr8.a C_SRCS = \ dxerr8.c diff --git a/dlls/dxerr9/Makefile.in b/dlls/dxerr9/Makefile.in index c85f648..57edb14 100644 --- a/dlls/dxerr9/Makefile.in +++ b/dlls/dxerr9/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libdxerr9.a +MODULE = libdxerr9.a C_SRCS = \ dxerr9.c diff --git a/dlls/dxguid/Makefile.in b/dlls/dxguid/Makefile.in index 261e0d0..a47a51f 100644 --- a/dlls/dxguid/Makefile.in +++ b/dlls/dxguid/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libdxguid.a +MODULE = libdxguid.a C_SRCS = \ dx10guid.c \ diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 473cbdd..3ac7c56 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libstrmbase.a +MODULE = libstrmbase.a C_SRCS = \ audio.c \ diff --git a/dlls/strmiids/Makefile.in b/dlls/strmiids/Makefile.in index 3ed9247..744682e 100644 --- a/dlls/strmiids/Makefile.in +++ b/dlls/strmiids/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libstrmiids.a +MODULE = libstrmiids.a C_SRCS = \ strmiids.c diff --git a/dlls/uuid/Makefile.in b/dlls/uuid/Makefile.in index 904c354..bc35e69 100644 --- a/dlls/uuid/Makefile.in +++ b/dlls/uuid/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libuuid.a +MODULE = libuuid.a C_SRCS = \ uuid.c diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 99cd65f..23dca02 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libwinecrt0.a +MODULE = libwinecrt0.a C_SRCS = \ delay_load.c \ diff --git a/tools/makedep.c b/tools/makedep.c index fba15ed..c84cc59 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -93,7 +93,6 @@ struct strarray static const struct strarray empty_strarray; static struct strarray include_args; -static struct strarray object_extensions; static struct strarray make_vars; static struct strarray cmdline_vars; @@ -475,9 +474,6 @@ static void init_paths(void) if (top_src_dir) strarray_insert( &include_args, 0, strmake( "-I%s/include", top_src_dir )); else if (top_obj_dir) strarray_insert( &include_args, 0, strmake( "-I%s/include", top_obj_dir )); - - /* set the default extension list for object files */ - if (!object_extensions.count) strarray_add( &object_extensions, "o" ); } @@ -1391,6 +1387,7 @@ static struct strarray output_sources(void) char *crosstarget = get_expanded_make_variable( "CROSSTARGET" ); if (exeext && !strcmp( exeext, ".exe" )) dllext = ""; + if (module && strendswith( module, ".a" )) staticlib = module; strarray_add( &includes, "-I." ); if (src_dir) strarray_add( &includes, strmake( "-I%s", src_dir )); @@ -1573,29 +1570,17 @@ static struct strarray output_sources(void) } else { + int need_cross = testdll || (source->flags & FLAG_C_IMPLIB) || (module && staticlib); + if (source->flags & FLAG_GENERATED) strarray_add( &clean_files, source->filename ); if (source->flags & FLAG_C_IMPLIB) strarray_add( &implib_objs, strmake( "%s.o", obj )); - for (i = 0; i < object_extensions.count; i++) - { - output( "%s.%s: %s\n", obj, object_extensions.str[i], sourcedep ); - if (strstr( object_extensions.str[i], "cross" )) - { - strarray_add( &crossobj_files, strmake( "%s.%s", obj, object_extensions.str[i] )); - output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); - output_filenames( includes ); - output_filename( "$(ALLCROSSCFLAGS)" ); - output( "\n" ); - } - else - { - strarray_add( &object_files, strmake( "%s.%s", obj, object_extensions.str[i] )); - output( "\t$(CC) -c -o $@ %s", source->filename ); - output_filenames( includes ); - output_filename( "$(ALLCFLAGS)" ); - output( "\n" ); - } - } - if (crosstarget && (source->flags & FLAG_C_IMPLIB)) + strarray_add( &object_files, strmake( "%s.o", obj )); + output( "%s.o: %s\n", obj, sourcedep ); + output( "\t$(CC) -c -o $@ %s", source->filename ); + output_filenames( includes ); + output_filename( "$(ALLCFLAGS)" ); + output( "\n" ); + if (crosstarget && need_cross) { strarray_add( &crossobj_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj, sourcedep ); @@ -1613,9 +1598,8 @@ static struct strarray output_sources(void) } if (!strcmp( ext, "c" ) && !(source->flags & FLAG_GENERATED)) strarray_add( &c2man_files, source->filename ); - for (i = 0; i < object_extensions.count; i++) - output( "%s.%s ", obj, object_extensions.str[i] ); - if (source->flags & FLAG_C_IMPLIB) output( "%s.cross.o", obj ); + output( "%s.o", obj ); + if (crosstarget && need_cross) output( " %s.cross.o", obj ); output( ":" ); } free( obj ); @@ -1660,7 +1644,7 @@ static struct strarray output_sources(void) output( "\n" ); } - if (module) + if (module && !staticlib) { int is_win16 = strendswith( module, "16" ); char *importlib = get_expanded_make_variable( "IMPORTLIB" ); @@ -1802,7 +1786,7 @@ static struct strarray output_sources(void) output( "\t$(AR) $(ARFLAGS) $@" ); output_filenames( object_files ); output( "\n\t$(RANLIB) $@\n" ); - if (crosstarget && object_extensions.count > 1) + if (crosstarget && module) { char *name = replace_extension( staticlib, ".a", ".cross.a" ); @@ -2076,12 +2060,6 @@ static void update_makefile( const char *path ) top_obj_dir = get_expanded_make_variable( "top_builddir" ); parent_dir = get_expanded_make_variable( "PARENTSRC" ); - object_extensions = empty_strarray; - value = get_expanded_make_var_array( "MAKEDEPFLAGS" ); - for (i = 0; i < value.count; i++) - if (!strncmp( value.str[i], "-x", 2 )) - strarray_add( &object_extensions, value.str[i] + 2 ); - include_args = empty_strarray; value = get_expanded_make_var_array( "EXTRAINCL" ); for (i = 0; i < value.count; i++) @@ -2181,8 +2159,7 @@ static int parse_option( const char *opt ) else Separator = NULL; break; case 'x': - if (opt[2]) strarray_add( &object_extensions, xstrdup( opt + 2 )); - break; + break; /* ignored */ default: fprintf( stderr, "Unknown option '%s'\n%s", opt, Usage ); exit(1);

1 0

Alexandre Julliard : makefiles: Automatically add dll flags where necessary .
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: e9afeb2a5066d18867e9f37fb9611b772cd5a7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9afeb2a5066d18867e9f37fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 1 21:33:06 2014 +0100 makefiles: Automatically add dll flags where necessary. --- Make.rules.in | 2 +- Make.vars.in | 1 + configure | 12 +++--------- configure.ac | 12 +++--------- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 - libs/wpp/Makefile.in | 1 - tools/makedep.c | 2 ++ 8 files changed, 10 insertions(+), 22 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 8d2c0cf..f400109 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -12,7 +12,7 @@ # First some useful definitions DEFS = -D__WINESRC__ $(EXTRADEFS) -ALLCFLAGS = $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) +ALLCFLAGS = $(DEFS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) IDLFLAGS = $(DEFS) $(EXTRAIDLFLAGS) RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(DEFS) $(EXTRARCFLAGS) diff --git a/Make.vars.in b/Make.vars.in index bc19456..d4b346a 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -39,6 +39,7 @@ LN_S = @LN_S@ MKDIR_P = @MKDIR_P@ TOOLSDIR = @TOOLSDIR@ LDFLAGS = @LDFLAGS@ +DLLFLAGS = @DLLFLAGS@ PRELINK = @PRELINK@ FONTFORGE = @FONTFORGE@ RSVG = @RSVG@ diff --git a/configure b/configure index c0eff26..ad6a0dc 100755 --- a/configure +++ b/configure @@ -16530,24 +16530,18 @@ ac_config_commands="$ac_config_commands include/stamp-h" $as_echo_n "creating Makefile rules..." >&6 -MAKE_IMPLIB_RULES="DLLFLAGS = $DLLFLAGS -" +MAKE_IMPLIB_RULES="" -MAKE_DLL_RULES=" -DLLFLAGS = $DLLFLAGS -" +MAKE_DLL_RULES="" -MAKE_PROG_RULES=" -DLLFLAGS = $DLLFLAGS -" +MAKE_PROG_RULES="" MAKE_TEST_RULES=" -DLLFLAGS = $DLLFLAGS RUNTESTFLAGS = -q -P wine " diff --git a/configure.ac b/configure.ac index 801527d..89c50c8 100644 --- a/configure.ac +++ b/configure.ac @@ -2593,23 +2593,17 @@ AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD dnl Import library rules -AC_SUBST(MAKE_IMPLIB_RULES,"DLLFLAGS = $DLLFLAGS -") +AC_SUBST(MAKE_IMPLIB_RULES,"") dnl Dll and program rules -AC_SUBST(MAKE_DLL_RULES," -DLLFLAGS = $DLLFLAGS -") +AC_SUBST(MAKE_DLL_RULES,"") -AC_SUBST(MAKE_PROG_RULES," -DLLFLAGS = $DLLFLAGS -") +AC_SUBST(MAKE_PROG_RULES,"") dnl Test rules AC_SUBST(MAKE_TEST_RULES," -DLLFLAGS = $DLLFLAGS RUNTESTFLAGS = -q -P wine ") diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index f59862c..31d6773 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,4 +1,3 @@ -DLLFLAGS = @DLLFLAGS@ STATICLIB = libwine_port.a C_SRCS = \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index d087bc7..5286e85 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,4 +1,3 @@ -DLLFLAGS = @DLLFLAGS@ EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@ EXTRADEFS = -DWINE_UNICODE_API="" \ -DBINDIR='"$(bindir)"' \ diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index 668c137..4855d98 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -1,4 +1,3 @@ -DLLFLAGS = @DLLFLAGS@ STATICLIB = libwpp.a C_SRCS = \ diff --git a/tools/makedep.c b/tools/makedep.c index c84cc59..3b6b84a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1376,6 +1376,7 @@ static struct strarray output_sources(void) struct strarray includes = empty_strarray; struct strarray subdirs = empty_strarray; struct strarray phony_targets = empty_strarray; + struct strarray dllflags = get_expanded_make_var_array( "DLLFLAGS" ); struct strarray imports = get_expanded_make_var_array( "IMPORTS" ); struct strarray all_targets = get_expanded_make_var_array( "PROGRAMS" ); struct strarray delayimports = get_expanded_make_var_array( "DELAYIMPORTS" ); @@ -1578,6 +1579,7 @@ static struct strarray output_sources(void) output( "%s.o: %s\n", obj, sourcedep ); output( "\t$(CC) -c -o $@ %s", source->filename ); output_filenames( includes ); + if (module || staticlib || testdll) output_filenames( dllflags ); output_filename( "$(ALLCFLAGS)" ); output( "\n" ); if (crosstarget && need_cross)

1 0

Alexandre Julliard : makefiles: Automatically output appropriate target flags.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: b1928795974788c4beacff5fbd5c05b80127140a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1928795974788c4beacff5fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 1 21:38:30 2014 +0100 makefiles: Automatically output appropriate target flags. --- Make.rules.in | 2 +- Make.vars.in | 4 ++-- dlls/display.drv16/Makefile.in | 1 - dlls/gdi.exe16/Makefile.in | 1 - dlls/krnl386.exe16/Makefile.in | 1 - dlls/mouse.drv16/Makefile.in | 1 - dlls/ole2nls.dll16/Makefile.in | 1 - dlls/shell.dll16/Makefile.in | 1 - dlls/user.exe16/Makefile.in | 1 - tools/makedep.c | 30 +++++++++++++++++++++--------- 10 files changed, 24 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1928795974788c4beacf…

1 0