November 2012 - Wine-commits

Henri Verbeet : winex11: Detect broken NVIDIA RandR setups.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 8776e1c0e1597fec169d169888660deb5bb08c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8776e1c0e1597fec169d16988… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:09 2012 +0100 winex11: Detect broken NVIDIA RandR setups. --- dlls/winex11.drv/xrandr.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 1093541..5b2dede 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -24,6 +24,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xrandr); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifdef SONAME_LIBXRANDR @@ -419,6 +420,21 @@ static int xrandr12_init_modes(void) goto done; } + /* Recent (304.64, possibly earlier) versions of the nvidia driver only + * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes + * are only listed through RandR 1.0 / 1.1. This is completely useless, + * but NVIDIA considers this a feature, so it's unlikely to change. The + * best we can do is to fall back to RandR 1.0 and encourage users to + * consider more cooperative driver vendors when we detect such a + * configuration. */ + if (output_info->nmode == 1 && XQueryExtension( gdi_display, "NV-CONTROL", &i, &j, &ret )) + { + ERR_(winediag)("Broken NVIDIA RandR detected, falling back to RandR 1.0. " + "Please consider using the Nouveau driver instead.\n"); + ret = -1; + goto done; + } + if (!(xrandr12_modes = HeapAlloc( GetProcessHeap(), 0, sizeof(*xrandr12_modes) * output_info->nmode ))) { ERR("Failed to allocate xrandr mode info array.\n");

1 0

André Hentschel : Wine 1.5.18 freigegeben
by Jeremy Newman 26 Nov '12

26 Nov '12

Module: website Branch: master Commit: 6c9371547461d6e370e2447167d4e314c4ad8b44 URL: http://source.winehq.org/git/website.git/?a=commit;h=6c9371547461d6e370e244… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 23 22:55:31 2012 +0100 Wine 1.5.18 freigegeben --- news/de/2012112301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012112301.xml b/news/de/2012112301.xml new file mode 100644 index 0000000..0566b31 --- /dev/null +++ b/news/de/2012112301.xml @@ -0,0 +1,17 @@ +<news> +<date>23. November 2012</date> +<title>Wine 1.5.18 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verschiedene Windows Codecs Verbesserungen.</li> + <li>Fehlerbehebungen für die OLE Datenbank Unterstützung.</li> + <li>Verbesserungen am System Parameter Management.</li> + <li>Einige Fehlerbehebungen am eigenen Webbrowser.</li> + <li>Fehlerbehebungen für die XML Unterstützung.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.18.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.18
by Jeremy Newman 26 Nov '12

26 Nov '12

Module: website Branch: master Commit: 36ce3bcb80fa1aa2589adc84dd580f20159a27ec URL: http://source.winehq.org/git/website.git/?a=commit;h=36ce3bcb80fa1aa2589adc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 24 00:57:31 2012 +0100 French translation for release 1.5.18 --- news/fr/2012112301.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2012112301.xml b/news/fr/2012112301.xml new file mode 100644 index 0000000..9f8c085 --- /dev/null +++ b/news/fr/2012112301.xml @@ -0,0 +1,16 @@ +<news> +<date>23 novembre 2012</date> +<title>Sortie de Wine 1.5.18</title> +<body> + La version de développement 1.5.18 de Wine est disponible. + <a href="{$root}/announce/1.5.18">Nouveautés</a> de cette version : +<ul> + <li>Diverses améliorations aux codecs Windows.</li> + <li>Correctifs pour la prise en charge des bases de données OLE.</li> + <li>Améliorations à la gestion des paramètres système.</li> + <li>Quelques correctifs au navigateur Web intégré.</li> + <li>Correctifs dans la prise en charge de XML.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.18.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.18
by Jeremy Newman 26 Nov '12

26 Nov '12

Module: website Branch: master Commit: dd6f1364451259e6f0259568a824e9a773dc5760 URL: http://source.winehq.org/git/website.git/?a=commit;h=dd6f1364451259e6f02595… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Nov 24 09:00:19 2012 +0100 Polish translation for release 1.5.18 --- news/pl/2012112301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2012112301.xml b/news/pl/2012112301.xml new file mode 100644 index 0000000..c73a607 --- /dev/null +++ b/news/pl/2012112301.xml @@ -0,0 +1,17 @@ +<news> +<date>Listopad 23, 2012</date> +<title>Wydano Wine 1.5.18</title> +<body> + Wydanie rozwojowe Wine 1.5.18 jest już dostępne. + <a href="{$root}/announce/1.5.18">Co nowego</a> w tym wydaniu: +<ul> + <li>Rozmaite ulepszenia do kodeków Windowsa.</li> + <li>Poprawki do wsparcia baz danych OLE.</li> + <li>Ulepszenia w zarządzaniu parametrami systemowymi.</li> + <li>Kilka poprawek do wbudowanej przeglądarki sieciowej.</li> + <li>Poprawki we wsparciu XML.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.18.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

Alexandre Julliard : Wine release 1.5.18
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: website Branch: master Commit: 9c4c8117b615ff0c4fca13ef5eede8d8890ee53e URL: http://source.winehq.org/git/website.git/?a=commit;h=9c4c8117b615ff0c4fca13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 23 21:29:08 2012 +0100 Wine release 1.5.18 --- news/en/2012112301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012112301.xml b/news/en/2012112301.xml new file mode 100644 index 0000000..eef8dda --- /dev/null +++ b/news/en/2012112301.xml @@ -0,0 +1,17 @@ +<news> +<date>November 23, 2012</date> +<title>Wine 1.5.18 Released</title> +<body> + The Wine development release 1.5.18 is now available. + <a href="{$root}/announce/1.5.18">What's new</a> in this release: +<ul> + <li>Various Windows Codecs improvements.</li> + <li>Fixes for OLE database support.</li> + <li>Improvements to system parameters management.</li> + <li>Some fixes to the built-in Web browser.</li> + <li>Fixes for XML support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.18.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.5.18.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: abbf827178843d3b5988b463b129dc3379f28d7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbf827178843d3b5988b463b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 23 21:16:51 2012 +0100 Release 1.5.18. --- ANNOUNCE | 854 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 422 insertions(+), 452 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abbf827178843d3b5988b…

1 0

Tag wine-1.5.18 : Alexandre Julliard : Release 1.5.18
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: refs/tags/wine-1.5.18 Tag: a98e8da63f7501ae1bb16a0de9a2ea38a30eaa95 URL: http://source.winehq.org/git/wine.git/?a=tag;h=a98e8da63f7501ae1bb16a0de9a2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 23 21:16:53 2012 +0100 Release 1.5.18

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXFILE.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 7ecfb2e52dcdc3f54bfbf34b49735f689ffcfc1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ecfb2e52dcdc3f54bfbf34b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 21:13:35 2012 +0100 d3dx9: Avoid LPD3DXFILE. --- include/d3dx9anim.h | 2 +- include/d3dx9xof.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index c8378e2..975f1df 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -198,7 +198,7 @@ DECLARE_INTERFACE(ID3DXSaveUserData) ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE; STDMETHOD(AddTopLevelDataObjectsPre)(ID3DXFileSaveObject *save_obj) PURE; STDMETHOD(AddTopLevelDataObjectsPost)(ID3DXFileSaveObject *save_obj) PURE; - STDMETHOD(RegisterTemplates)(LPD3DXFILE xfile) PURE; + STDMETHOD(RegisterTemplates)(ID3DXFile *file) PURE; STDMETHOD(SaveTemplates)(ID3DXFileSaveObject *save_obj) PURE; }; #undef INTERFACE diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index 593fca5..4bcb769 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -66,7 +66,7 @@ typedef interface ID3DXFileSaveData *LPD3DXFILESAVEDATA, **LPLPD3DXFILESAVEDATA; typedef interface ID3DXFileEnumObject *LPD3DXFILEENUMOBJECT, **LPLPD3DXFILEENUMOBJECT; typedef interface ID3DXFileData *LPD3DXFILEDATA, **LPLPD3DXFILEDATA; -STDAPI D3DXFileCreate(LPD3DXFILE*); +STDAPI D3DXFileCreate(struct ID3DXFile **file); #define INTERFACE ID3DXFile DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201") @@ -93,7 +93,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveObject,IUnknown,"cef08cfa-7b4f-4429-9624-2a6 STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileSaveObject methods ***/ - STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; + STDMETHOD(GetFile)(THIS_ ID3DXFile **file) PURE; STDMETHOD(AddDataObject)(THIS_ REFGUID template_guid, const char *name, const GUID *guid, SIZE_T data_size, const void *data, struct ID3DXFileSaveData **obj) PURE; STDMETHOD(Save)(THIS) PURE; @@ -127,7 +127,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileEnumObject,IUnknown,"cef08cfc-7b4f-4429-9624-2a6 STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileEnumObject methods ***/ - STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; + STDMETHOD(GetFile)(THIS_ ID3DXFile **file) PURE; STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE; STDMETHOD(GetChild)(THIS_ SIZE_T id, struct ID3DXFileData **child) PURE; STDMETHOD(GetDataObjectById)(THIS_ REFGUID guid, struct ID3DXFileData **obj) PURE;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXCONSTANTTABLE.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 63acbcbf8a4ba7dd98cfed92b8ad96924d5fe062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63acbcbf8a4ba7dd98cfed92b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 21:13:36 2012 +0100 d3dx9: Avoid LPD3DXCONSTANTTABLE. --- dlls/d3dx9_36/effect.c | 3 +- dlls/d3dx9_36/shader.c | 70 ++++++++++------------------------------- dlls/d3dx9_36/tests/shader.c | 2 +- include/d3dx9effect.h | 4 +- include/d3dx9shader.h | 72 ++++++++++------------------------------- 5 files changed, 40 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63acbcbf8a4ba7dd98cfe…

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_SOSetTargets().
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 5b781d709d40aa3b706a072807b1e4a903f96442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b781d709d40aa3b706a07280… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 21:13:37 2012 +0100 d3d10core: Implement d3d10_device_SOSetTargets(). --- dlls/d3d10core/device.c | 19 +++++++++++++++++- dlls/wined3d/device.c | 41 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 8 +++++++ include/wine/wined3d.h | 2 + 5 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 78c9d1b..3b09a04 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -347,7 +347,24 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device * static void STDMETHODCALLTYPE d3d10_device_SOSetTargets(ID3D10Device *iface, UINT target_count, ID3D10Buffer *const *targets, const UINT *offsets) { - FIXME("iface %p, target_count %u, targets %p, offsets %p stub!\n", iface, target_count, targets, offsets); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int count, i; + + TRACE("iface %p, target_count %u, targets %p, offsets %p.\n", iface, target_count, targets, offsets); + + count = min(target_count, 4); + for (i = 0; i < count; ++i) + { + struct d3d10_buffer *buffer = unsafe_impl_from_ID3D10Buffer(targets[i]); + + wined3d_device_set_stream_output(device->wined3d_device, i, + buffer ? buffer->wined3d_buffer : NULL, offsets[i]); + } + + for (i = count; i < 4; ++i) + { + wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + } } static void STDMETHODCALLTYPE d3d10_device_DrawAuto(ID3D10Device *iface) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3211038..b0e7ac2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1559,6 +1559,47 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device return device->adapter->TextureRam - device->adapter->UsedTextureRam; } +void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, + struct wined3d_buffer *buffer, UINT offset) +{ + struct wined3d_buffer *prev_buffer; + + TRACE("device %p, idx %u, buffer %p, offset %u.\n", device, idx, buffer, offset); + + if (idx >= MAX_STREAM_OUT) + { + WARN("Invalid stream output %u.\n", idx); + return; + } + + prev_buffer = device->updateStateBlock->state.stream_output[idx].buffer; + device->updateStateBlock->state.stream_output[idx].buffer = buffer; + device->updateStateBlock->state.stream_output[idx].offset = offset; + + if (device->isRecordingState) + { + if (buffer) + wined3d_buffer_incref(buffer); + if (prev_buffer) + wined3d_buffer_decref(buffer); + return; + } + + if (prev_buffer != buffer) + { + if (buffer) + { + InterlockedIncrement(&buffer->resource.bind_count); + wined3d_buffer_incref(buffer); + } + if (prev_buffer) + { + InterlockedDecrement(&prev_buffer->resource.bind_count); + wined3d_buffer_decref(prev_buffer); + } + } +} + HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index cb8304a..56e73e9 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -129,6 +129,7 @@ @ cdecl wined3d_device_set_sampler_state(ptr long long long) @ cdecl wined3d_device_set_scissor_rect(ptr ptr) @ cdecl wined3d_device_set_software_vertex_processing(ptr long) +@ cdecl wined3d_device_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_set_stream_source_freq(ptr long long) @ cdecl wined3d_device_set_texture(ptr long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ec7c3bf..ea3010f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -154,6 +154,7 @@ void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; /* Device caps */ #define MAX_PALETTES 65536 +#define MAX_STREAM_OUT 4 #define MAX_STREAMS 16 #define MAX_TEXTURES 8 #define MAX_FRAGMENT_SAMPLERS 16 @@ -2273,6 +2274,12 @@ struct StageState { DWORD state; }; +struct wined3d_stream_output +{ + struct wined3d_buffer *buffer; + UINT offset; +}; + struct wined3d_stream_state { struct wined3d_buffer *buffer; @@ -2287,6 +2294,7 @@ struct wined3d_state const struct wined3d_fb_state *fb; struct wined3d_vertex_declaration *vertex_declaration; + struct wined3d_stream_output stream_output[MAX_STREAM_OUT]; struct wined3d_stream_state streams[MAX_STREAMS + 1 /* tesselated pseudo-stream */]; BOOL user_stream; struct wined3d_buffer *index_buffer; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cf86df6..76e44f1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2226,6 +2226,8 @@ void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); void __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect); void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software); +void __cdecl wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, + struct wined3d_buffer *buffer, UINT offset); HRESULT __cdecl wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride); HRESULT __cdecl wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider);

1 0