November 2011 - Wine-commits

Hans Leidekker : ws2_32: Pass NULL nodename on to native getaddrinfo.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: 8e5d5bf58aa4ad9ac638f0b6e6473b4b8e2dbe83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5d5bf58aa4ad9ac638f0b6e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 24 11:31:35 2011 +0100 ws2_32: Pass NULL nodename on to native getaddrinfo. --- dlls/ws2_32/socket.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 72e2a5f..cf33400 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4824,14 +4824,15 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr if (!nodename && !servname) return WSAHOST_NOT_FOUND; if (!nodename) - node = "localhost"; + node = NULL; else if (!nodename[0]) + { node = hostname = get_hostname(); + if (!node) return WSA_NOT_ENOUGH_MEMORY; + } else node = nodename; - if (!node) return WSA_NOT_ENOUGH_MEMORY; - if (hints) { punixhints = &unixhints;

1 0

Frédéric Delanoy : cmd: Avoid dead assignment ( clang).
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: 3d028ab67c6e3f53009bc57513e34a68d834f835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d028ab67c6e3f53009bc5751… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 24 12:02:40 2011 +0100 cmd: Avoid dead assignment (clang). --- programs/cmd/builtins.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 56961a3..6703cef 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -517,7 +517,6 @@ void WCMD_copy (void) { } while (FindNextFileW(hff, &fd) != 0); FindClose (hff); } else { - status = ERROR_FILE_NOT_FOUND; WCMD_print_error (); } }

1 0

Alexandre Julliard : windowscodecs/tests: Avoid size_t in a trace.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: f69968bb4ae0264fb31f3b98db5590d98bd1077d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69968bb4ae0264fb31f3b98d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 23:28:26 2011 +0100 windowscodecs/tests: Avoid size_t in a trace. --- dlls/windowscodecs/tests/metadata.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index e3a51e5..e3c3325 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -31,7 +31,7 @@ #define expect_blob(propvar, data, length) do { \ ok((propvar).vt == VT_BLOB, "unexpected vt: %i\n", (propvar).vt); \ if ((propvar).vt == VT_BLOB) { \ - ok(U(propvar).blob.cbSize == (length), "expected size %i, got %i\n", (length), U(propvar).blob.cbSize); \ + ok(U(propvar).blob.cbSize == (length), "expected size %u, got %u\n", (ULONG)(length), U(propvar).blob.cbSize); \ if (U(propvar).blob.cbSize == (length)) { \ ok(!memcmp(U(propvar).blob.pBlobData, (data), (length)), "unexpected data\n"); \ } \

1 0

Henri Verbeet : ddraw: Set the render target to the wined3d frontbuffer on D3D device cleanup.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: 21bd722c46b406151c4b327b50ca56fa8afcfd00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21bd722c46b406151c4b327b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 21:14:53 2011 +0100 ddraw: Set the render target to the wined3d frontbuffer on D3D device cleanup. We don't need any specific render target here, since without a D3D device we can't do any rendering anyway. We just want to avoid pointing to something that was free'd. --- dlls/ddraw/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e678e90..ccbdb1a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -304,7 +304,7 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) /* Set the device up to render to the front buffer since the back * buffer will vanish soon. */ wined3d_device_set_render_target(This->wined3d_device, 0, - This->ddraw->d3d_target->wined3d_surface, TRUE); + This->ddraw->wined3d_frontbuffer, TRUE); /* Release the WineD3DDevice. This won't destroy it. */ if (!wined3d_device_decref(This->wined3d_device))

1 0

Henri Verbeet : ddraw: Fail surface creation if the cooperative level isn' t set yet.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: bca0ec81828837f39fd69ef8d24cc68b7f7d99a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca0ec81828837f39fd69ef8d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 21:14:54 2011 +0100 ddraw: Fail surface creation if the cooperative level isn't set yet. --- dlls/ddraw/ddraw.c | 75 ++++++++++++++++++++++++++++++----------------- dlls/ddraw/tests/d3d.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bca0ec81828837f39fd69…

1 0

Henri Verbeet : wined3d: Trace the minimum buffer map alignment in wined3d_adapter_init_gl_caps().
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: 0acd48d89fd83f57567ab0bb024d16de2521032a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0acd48d89fd83f57567ab0bb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 21:14:55 2011 +0100 wined3d: Trace the minimum buffer map alignment in wined3d_adapter_init_gl_caps(). There's not much else we need to do for ARB_map_buffer_alignment. There's still a pretty decent chance that we'll get lucky with alignment even on drivers that don't support the extension, since mmap is going to return page aligned memory. Tiny buffers might get packed together in a page though. --- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/wined3d_gl.h | 7 +++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 272ae4f..574c406 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -101,6 +101,7 @@ EXTENSION_MAP[] = {"GL_ARB_geometry_shader4", ARB_GEOMETRY_SHADER4, 0 }, {"GL_ARB_half_float_pixel", ARB_HALF_FLOAT_PIXEL, 0 }, {"GL_ARB_half_float_vertex", ARB_HALF_FLOAT_VERTEX, 0 }, + {"GL_ARB_map_buffer_alignment", ARB_MAP_BUFFER_ALIGNMENT, 0 }, {"GL_ARB_map_buffer_range", ARB_MAP_BUFFER_RANGE, 0 }, {"GL_ARB_multisample", ARB_MULTISAMPLE, 0 }, /* needs GLX_ARB_MULTISAMPLE as well */ {"GL_ARB_multitexture", ARB_MULTITEXTURE, 0 }, @@ -2474,6 +2475,15 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) } } + if (gl_info->supported[ARB_MAP_BUFFER_ALIGNMENT]) + { + glGetIntegerv(GL_MIN_MAP_BUFFER_ALIGNMENT, &gl_max); + TRACE_(d3d_caps)("Minimum buffer map alignment: %d.\n", gl_max); + } + else + { + WARN_(d3d_caps)("Driver doesn't guarantee a minimum buffer map alignment.\n"); + } if (gl_info->supported[NV_REGISTER_COMBINERS]) { glGetIntegerv(GL_MAX_GENERAL_COMBINERS_NV, &gl_max); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 5088782..d9a88db 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1745,6 +1745,7 @@ enum wined3d_gl_extension ARB_GEOMETRY_SHADER4, ARB_HALF_FLOAT_PIXEL, ARB_HALF_FLOAT_VERTEX, + ARB_MAP_BUFFER_ALIGNMENT, ARB_MAP_BUFFER_RANGE, ARB_MULTISAMPLE, ARB_MULTITEXTURE, @@ -2161,6 +2162,12 @@ typedef void (WINE_GLAPI *PGLFNFRAMEBUFFERTEXTUREFACEARBPROC)(GLenum target, GLe #define GL_HALF_FLOAT 0x140b #endif +/* GL_ARB_map_buffer_alignment */ +#ifndef GL_ARB_map_buffer_alignment +#define GL_ARB_map_buffer_alignment 1 +#define GL_MIN_MAP_BUFFER_ALIGNMENT 0x90bc +#endif + /* GL_ARB_map_buffer_range */ #ifndef GL_ARB_map_buffer_range #define GL_ARB_map_buffer_range 1

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DTRIPATCH_INFO typedef.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: 2fb21e0a2e5cc7092370e8d13c8fe5840f1b8f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb21e0a2e5cc7092370e8d13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 21:14:56 2011 +0100 wined3d: Get rid of the WINED3DTRIPATCH_INFO typedef. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f8c6f92..eb398ab 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2615,7 +2615,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DrawTriPatch(IDirect3DDevice8 *iface, wined3d_mutex_lock(); hr = wined3d_device_draw_tri_patch(This->wined3d_device, Handle, - pNumSegs, (const WINED3DTRIPATCH_INFO *)pTriPatchInfo); + pNumSegs, (const struct wined3d_tri_patch_info *)pTriPatchInfo); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3532b57..32215c5 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2701,7 +2701,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_DrawTriPatch(IDirect3DDevice9Ex *ifac wined3d_mutex_lock(); hr = wined3d_device_draw_tri_patch(This->wined3d_device, Handle, - pNumSegs, (const WINED3DTRIPATCH_INFO *)pTriPatchInfo); + pNumSegs, (const struct wined3d_tri_patch_info *)pTriPatchInfo); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dbefa63..3737abb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4745,7 +4745,7 @@ HRESULT CDECL wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT } HRESULT CDECL wined3d_device_draw_tri_patch(struct wined3d_device *device, UINT handle, - const float *segment_count, const WINED3DTRIPATCH_INFO *patch_info) + const float *segment_count, const struct wined3d_tri_patch_info *patch_info) { FIXME("device %p, handle %#x, segment_count %p, patch_info %p stub!\n", device, handle, segment_count, patch_info); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b755b74..6585800 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1607,13 +1607,13 @@ struct wined3d_rect_patch_info WINED3DDEGREETYPE degree; }; -typedef struct _WINED3DTRIPATCH_INFO +struct wined3d_tri_patch_info { - UINT StartVertexOffset; - UINT NumVertices; - WINED3DBASISTYPE Basis; - WINED3DDEGREETYPE Degree; -} WINED3DTRIPATCH_INFO; + UINT start_vertex_offset; + UINT vertex_count; + WINED3DBASISTYPE basis; + WINED3DDEGREETYPE degree; +}; typedef struct _WINED3DADAPTER_IDENTIFIER { @@ -2191,7 +2191,7 @@ HRESULT __cdecl wined3d_device_draw_primitive_up(struct wined3d_device *device, HRESULT __cdecl wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT handle, const float *num_segs, const struct wined3d_rect_patch_info *rect_patch_info); HRESULT __cdecl wined3d_device_draw_tri_patch(struct wined3d_device *device, UINT handle, - const float *num_segs, const WINED3DTRIPATCH_INFO *tri_patch_info); + const float *num_segs, const struct wined3d_tri_patch_info *tri_patch_info); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device);

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DADAPTER_IDENTIFIER typedef.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: 376ffdf3d52b022dbb655d18f58d0bb90028a440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=376ffdf3d52b022dbb655d18f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 21:14:57 2011 +0100 wined3d: Get rid of the WINED3DADAPTER_IDENTIFIER typedef. --- dlls/d3d8/directx.c | 2 +- dlls/d3d9/directx.c | 4 ++-- dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/adapter.c | 2 +- dlls/wined3d/directx.c | 2 +- include/wine/wined3d.h | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 657eacd..379c911 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -123,7 +123,7 @@ static HRESULT WINAPI IDirect3D8Impl_GetAdapterIdentifier(LPDIRECT3D8 iface, UIN DWORD Flags, D3DADAPTER_IDENTIFIER8 *pIdentifier) { IDirect3D8Impl *This = impl_from_IDirect3D8(iface); - WINED3DADAPTER_IDENTIFIER adapter_id; + struct wined3d_adapter_identifier adapter_id; HRESULT hr; TRACE("iface %p, adapter %u, flags %#x, identifier %p.\n", diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 4e202a5..144cad5 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -121,7 +121,7 @@ static HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(IDirect3D9Ex *iface, U DWORD Flags, D3DADAPTER_IDENTIFIER9 *pIdentifier) { IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface); - WINED3DADAPTER_IDENTIFIER adapter_id; + struct wined3d_adapter_identifier adapter_id; HRESULT hr; TRACE("iface %p, adapter %u, flags %#x, identifier %p.\n", @@ -529,7 +529,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3 static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUID *luid) { IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface); - WINED3DADAPTER_IDENTIFIER adapter_id; + struct wined3d_adapter_identifier adapter_id; HRESULT hr; TRACE("iface %p, adapter %u, luid %p.\n", iface, adapter, luid); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b5ff3fc..d7aad8f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1551,7 +1551,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C *free = wined3d_device_get_available_texture_mem(This->wined3d_device); if (total) { - WINED3DADAPTER_IDENTIFIER desc = {0}; + struct wined3d_adapter_identifier desc = {0}; hr = wined3d_get_adapter_identifier(This->wineD3D, WINED3DADAPTER_DEFAULT, 0, &desc); *total = desc.video_memory; diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index bf27a60..87d886b 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -138,7 +138,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) { struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); - WINED3DADAPTER_IDENTIFIER adapter_id; + struct wined3d_adapter_identifier adapter_id; char description[128]; struct wined3d *wined3d; HRESULT hr; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 574c406..e8cce94 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3031,7 +3031,7 @@ HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UI /* NOTE: due to structure differences between dx8 and dx9 D3DADAPTER_IDENTIFIER, and fields being inserted in the middle, a new structure is used in place */ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, - UINT adapter_idx, DWORD flags, WINED3DADAPTER_IDENTIFIER *identifier) + UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier) { const struct wined3d_adapter *adapter; size_t len; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6585800..5bcc35b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1615,7 +1615,7 @@ struct wined3d_tri_patch_info WINED3DDEGREETYPE degree; }; -typedef struct _WINED3DADAPTER_IDENTIFIER +struct wined3d_adapter_identifier { char *driver; UINT driver_size; @@ -1632,7 +1632,7 @@ typedef struct _WINED3DADAPTER_IDENTIFIER DWORD whql_level; LUID adapter_luid; SIZE_T video_memory; -} WINED3DADAPTER_IDENTIFIER; +}; typedef struct _WINED3DPRESENT_PARAMETERS { @@ -2126,7 +2126,7 @@ UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, - DWORD flags, WINED3DADAPTER_IDENTIFIER *identifier); + DWORD flags, struct wined3d_adapter_identifier *identifier); UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id); HMONITOR __cdecl wined3d_get_adapter_monitor(const struct wined3d *wined3d, UINT adapter_idx);

1 0

André Hentschel : winemaker: Also detect static libraries when scanning directories.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: 798a91a3dab74d1c5b596e7fda48a9eca54d1170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=798a91a3dab74d1c5b596e7fd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 23 21:36:14 2011 +0100 winemaker: Also detect static libraries when scanning directories. --- tools/winemaker | 34 ++++++++++++++++++++++++++++------ 1 files changed, 28 insertions(+), 6 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index bc8452c..0e5ad18 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -20,7 +20,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.8.0"; +my $version="0.8.1"; use Cwd; use File::Basename; @@ -1288,10 +1288,18 @@ sub source_scan_directory($$$$) if ($dentry =~ /^(Release|Debug)/i) { # These directories are often used to store the object files and the # resulting executable/library. They should not contain anything else. - my @candidates=grep /\.(exe|dll)$/i, @{get_directory_contents("$fullentry")}; - foreach my $candidate (@candidates) { - $targets{$candidate}=1; - } + my @candidates=grep /\.(exe|dll|lib)$/i, @{get_directory_contents("$fullentry")}; + foreach my $candidate (sort @candidates) { + my $dlldup = $candidate; + $dlldup =~ s/\.lib$/.dll/; + if ($candidate =~ /\.lib$/ and $targets{$dlldup}) + { + # Often lib files are created together with dll files, even if the dll file is the + # real target. + next; + } + $targets{$candidate}=1; + } } elsif ($dentry =~ /^include/i) { # This directory must contain headers we're going to need push @{@$project_settings[$T_INCLUDE_PATH]},"-I$dentry"; @@ -1303,7 +1311,7 @@ sub source_scan_directory($$$$) source_scan_directory($project,"$fullentry/","$dentry/",$no_target); } } elsif (-f "$fullentry") { - if ($dentry =~ /\.(exe|dll)$/i) { + if ($dentry =~ /\.(exe|dll|lib)$/i) { $targets{$dentry}=1; } elsif ($dentry =~ /\.c$/i and $dentry !~ /\.(dbg|spec)\.c$/) { push @sources_c,"$dentry"; @@ -1517,6 +1525,7 @@ sub source_scan_directory($$$$) # - Match each target with source files (sort in reverse # alphabetical order to get the longest matches first) my @local_dlls=(); + my @local_libs=(); my @local_depends=(); my @exe_list=(); foreach my $target_name (map (lc, (sort { $b cmp $a } keys %targets))) { @@ -1535,6 +1544,13 @@ sub source_scan_directory($$$$) } else { push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.spec)"); } + } elsif ($target_name =~ /\.lib$/) { + $target_name =~ s/(.*)\.lib/lib$1.a/; + @$target[$T_NAME]=$target_name; + @$target[$T_TYPE]=$TT_LIB; + push @local_depends,"$target_name"; + push @local_libs,$target_name; + push @{@$target[$T_ARFLAGS]},("rc"); } else { @$target[$T_TYPE]=$opt_target_type; push @exe_list,$target; @@ -1694,6 +1710,12 @@ sub source_scan_directory($$$$) push @{@$target[$T_DLLS]},@local_dlls; } } + if (@local_libs > 0 and @exe_list > 0) { + foreach my $target (@exe_list) { + push @{@$target[$T_LIBRARY_PATH]},"-L."; + push @{@$target[$T_LIBRARIES]},@local_libs; + } + } } ##

1 0

Michael Stefaniuc : include: DPL_NOCONFIRMATION is not a long.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: e057be7dfff3858d141249e20636ceb101fe5cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e057be7dfff3858d141249e20… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 23 22:58:40 2011 +0100 include: DPL_NOCONFIRMATION is not a long. --- include/dplobby.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/dplobby.h b/include/dplobby.h index eb49513..9b243fd 100644 --- a/include/dplobby.h +++ b/include/dplobby.h @@ -151,7 +151,7 @@ typedef struct tagDPLMSG_SETPROPERTY DWORD dwPropertyData[1]; /* Buffer containing data */ } DPLMSG_SETPROPERTY, *LPDPLMSG_SETPROPERTY; -#define DPL_NOCONFIRMATION 0L +#define DPL_NOCONFIRMATION 0 /* Reply to DPLMSG_SETPROPERTY */ typedef struct tagDPLMSG_SETPROPERTYRESPONSE

1 0