wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Henri Verbeet : wined3d: Get resource info from the texture in surface_private_setup().
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: fcbe8b7a791805435dd7906d054b1dcf03dc9ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcbe8b7a791805435dd7906d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 17:02:13 2016 +0100 wined3d: Get resource info from the texture in surface_private_setup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 090bbb1..99a2649 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -534,7 +534,8 @@ static BOOL surface_use_pbo(const struct wined3d_surface *surface) static HRESULT surface_private_setup(struct wined3d_surface *surface) { /* TODO: Check against the maximum texture sizes supported by the video card. */ - const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; + struct wined3d_texture *texture = surface->container; + const struct wined3d_gl_info *gl_info = &texture->resource.device->adapter->gl_info; unsigned int pow2Width, pow2Height; TRACE("surface %p.\n", surface); @@ -561,7 +562,7 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) if (pow2Width > surface->resource.width || pow2Height > surface->resource.height) { /* TODO: Add support for non power two compressed textures. */ - if (surface->container->resource.format_flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE)) + if (texture->resource.format_flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE)) { FIXME("(%p) Compressed or height scaled non-power-two textures are not supported w(%d) h(%d)\n", surface, surface->resource.width, surface->resource.height); @@ -570,7 +571,7 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) } if ((surface->pow2Width > gl_info->limits.texture_size || surface->pow2Height > gl_info->limits.texture_size) - && !(surface->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) + && !(texture->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) { /* One of three options: * 1: Do the same as we do with NPOT and scale the texture, (any @@ -582,7 +583,7 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) * Blts. Some apps (e.g. Swat 3) create textures with a Height of * 16 and a Width > 3000 and blt 16x16 letter areas from them to * the render target. */ - if (surface->resource.pool == WINED3D_POOL_DEFAULT || surface->resource.pool == WINED3D_POOL_MANAGED) + if (texture->resource.pool == WINED3D_POOL_DEFAULT || texture->resource.pool == WINED3D_POOL_MANAGED) { WARN("Unable to allocate a surface which exceeds the maximum OpenGL texture size.\n"); return WINED3DERR_NOTAVAILABLE; @@ -593,7 +594,7 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) surface->pow2Width, surface->pow2Height); } - if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) surface->locations = WINED3D_LOCATION_DISCARDED; if (surface_use_pbo(surface))

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_create_dib_section().
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: fc868cb908125d94e00f47162070437ac5b2ad60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc868cb908125d94e00f47162… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 17:02:12 2016 +0100 wined3d: Get resource info from the texture in surface_create_dib_section(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a19098f..090bbb1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -351,8 +351,9 @@ static void get_color_masks(const struct wined3d_format *format, DWORD *masks) HRESULT surface_create_dib_section(struct wined3d_surface *surface) { - const struct wined3d_format *format = surface->resource.format; - unsigned int format_flags = surface->container->resource.format_flags; + struct wined3d_texture *texture = surface->container; + const struct wined3d_format *format = texture->resource.format; + unsigned int format_flags = texture->resource.format_flags; unsigned int row_pitch, slice_pitch; BITMAPINFO *b_info; DWORD *masks; @@ -388,7 +389,7 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) return E_OUTOFMEMORY; b_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - wined3d_texture_get_pitch(surface->container, surface->texture_level, &row_pitch, &slice_pitch); + wined3d_texture_get_pitch(texture, surface->texture_level, &row_pitch, &slice_pitch); b_info->bmiHeader.biWidth = row_pitch / format->byte_count; b_info->bmiHeader.biHeight = 0 - surface->resource.height; b_info->bmiHeader.biSizeImage = slice_pitch; @@ -402,7 +403,7 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) /* Get the bit masks */ masks = (DWORD *)b_info->bmiColors; - switch (surface->resource.format->id) + switch (format->id) { case WINED3DFMT_B8G8R8_UNORM: b_info->bmiHeader.biCompression = BI_RGB;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_surface_cleanup().
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: 724463d66661558bfb9f99931b2c17d129b7ad63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724463d66661558bfb9f99931… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 17:02:11 2016 +0100 wined3d: Get resource info from the texture in wined3d_surface_cleanup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 574069b..a19098f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -53,10 +53,10 @@ void wined3d_surface_cleanup(struct wined3d_surface *surface) if (surface->rb_multisample || surface->rb_resolved || !list_empty(&surface->renderbuffers)) { + struct wined3d_device *device = surface->container->resource.device; struct wined3d_renderbuffer_entry *entry, *entry2; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - struct wined3d_device *device = surface->resource.device; context = context_acquire(device, NULL); gl_info = context->gl_info;

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.5
by Jeremy Newman 14 Mar '16

14 Mar '16

Module: website Branch: master Commit: 1b2551c4c84d5f16c1c359be12ee7f894b1ec6c4 URL: http://source.winehq.org/git/website.git/?a=commit;h=1b2551c4c84d5f16c1c359… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Mar 13 17:16:41 2016 +0100 Polish translation for release 1.9.5 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016030501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2016030501.xml b/news/pl/2016030501.xml new file mode 100644 index 0000000..33e9630 --- /dev/null +++ b/news/pl/2016030501.xml @@ -0,0 +1,16 @@ +<news> +<date>Marzec 5, 2016</date> +<title>Wydano Wine 1.9.5</title> +<body> + Wydanie rozwojowe Wine 1.9.5 jest już dostępne. + <a href="{$root}/announce/1.9.5">Co nowego</a> w tym wydaniu: +<ul> + <li>Nowa wersja silnika Mono, ze 64-bitowym wsparciem.</li> + <li>Początki strumienia poleceń WineD3D.</li> + <li>Wsparcie dla stanów efektów w Direct3DX.</li> + <li>Ulepszenia w przeciąganiu i upuszczaniu.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.5.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

Michael Stefaniuc : d3drm: Use debugstr_a to print a string that can be NULL.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 62277fb7779f76341efc71999d59242055be5c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62277fb7779f76341efc71999… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 14 11:54:50 2016 +0100 d3drm: Use debugstr_a to print a string that can be NULL. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 8bd5131..6d0b55b 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1069,7 +1069,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, return hr; } - TRACE("Mesh name is '%s'\n", This->name ? This->name : ""); + TRACE("Mesh name is %s\n", debugstr_a(This->name)); This->nb_normals = 0;

1 0

Józef Kucia : d3d11/tests: Trace feature level.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 37954777d5d7c92ae7860ecd00bd76f19609f37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=37954777d5d7c92ae7860ecd0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 14 00:03:09 2016 +0100 d3d11/tests: Trace feature level. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2238380..65173f3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -438,6 +438,7 @@ static void test_create_device(void) } supported_feature_level = ID3D11Device_GetFeatureLevel(device); + trace("Feature level %#x.\n", supported_feature_level); ID3D11Device_Release(device); hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, NULL);

1 0

Alexandre Julliard : libwine: Don' t include backwards compatibility functions on Android.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 877a4a733f26c724c919c9ba49d68e97e9e969d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=877a4a733f26c724c919c9ba4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 19:28:51 2016 +0900 libwine: Don't include backwards compatibility functions on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/port.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index e05e166..d5ce07a 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -28,7 +28,9 @@ #include "wine/unicode.h" #include "wine/library.h" -/* functions from libwine_port that are also exported from libwine for backwards compatibility */ +/* functions from libwine_port that are also exported from libwine for backwards compatibility, + * on platforms that require it */ +#ifndef __ANDROID__ const void *libwine_port_functions[] = { wine_cp_enum_table, @@ -41,6 +43,7 @@ const void *libwine_port_functions[] = wine_utf8_mbstowcs, wine_utf8_wcstombs }; +#endif /* no longer used, for backwards compatibility only */ struct wine_pthread_functions;

1 0

Nikolay Sivov : ole32: Use CoGetApartmentType() to implement IComThreadingInfo.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 6fd208b41ca33da5192fefae27172ac2793bccfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd208b41ca33da5192fefae2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 08:09:59 2016 +0300 ole32: Use CoGetApartmentType() to implement IComThreadingInfo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a7fe650..b095aeb 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4631,7 +4631,6 @@ typedef struct Context IContextCallback IContextCallback_iface; IObjContext IObjContext_iface; LONG refs; - APTTYPE apttype; } Context; static inline Context *impl_from_IComThreadingInfo( IComThreadingInfo *iface ) @@ -4710,21 +4709,26 @@ static ULONG WINAPI Context_CTI_Release(IComThreadingInfo *iface) static HRESULT WINAPI Context_CTI_GetCurrentApartmentType(IComThreadingInfo *iface, APTTYPE *apttype) { - Context *This = impl_from_IComThreadingInfo(iface); + APTTYPEQUALIFIER qualifier; TRACE("(%p)\n", apttype); - *apttype = This->apttype; - return S_OK; + return CoGetApartmentType(apttype, &qualifier); } static HRESULT WINAPI Context_CTI_GetCurrentThreadType(IComThreadingInfo *iface, THDTYPE *thdtype) { - Context *This = impl_from_IComThreadingInfo(iface); + APTTYPEQUALIFIER qualifier; + APTTYPE apttype; + HRESULT hr; + + hr = CoGetApartmentType(&apttype, &qualifier); + if (FAILED(hr)) + return hr; TRACE("(%p)\n", thdtype); - switch (This->apttype) + switch (apttype) { case APTTYPE_STA: case APTTYPE_MAINSTA: @@ -4945,12 +4949,6 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; context->refs = 1; - if (apt->multi_threaded) - context->apttype = APTTYPE_MTA; - else if (apt->main) - context->apttype = APTTYPE_MAINSTA; - else - context->apttype = APTTYPE_STA; hr = IComThreadingInfo_QueryInterface(&context->IComThreadingInfo_iface, riid, ppv); IComThreadingInfo_Release(&context->IComThreadingInfo_iface);

1 0

Nikolay Sivov : comctl32/monthcal: MCM_GETRANGE does not return BOOL values.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: c075d5aafda9308ec88ec8b640976fb73ec210d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c075d5aafda9308ec88ec8b64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 12:59:17 2016 +0300 comctl32/monthcal: MCM_GETRANGE does not return BOOL values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/tests/monthcal.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5accbe6..c68a073 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1503,7 +1503,7 @@ MONTHCAL_GetRange(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) { TRACE("%p\n", range); - if(!range) return FALSE; + if (!range) return 0; range[1] = infoPtr->maxDate; range[0] = infoPtr->minDate; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index c0d296a..792f66e 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -304,6 +304,9 @@ static void test_monthcal(void) expect(0, st[1].wSecond); expect(0, st[1].wMilliseconds); + limits = SendMessageA(hwnd, MCM_GETRANGE, 0, 0); + ok(limits == 0, "got %u\n", limits); + GetSystemTime(&st[0]); st[1] = st[0];

1 0

Michael Stefaniuc : winex11: Use debugstr_a to print strings that can be NULL.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 17169816cde37e1624892fc464edd190bdecb767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17169816cde37e1624892fc46… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 14 10:38:02 2016 +0100 winex11: Use debugstr_a to print strings that can be NULL. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 3642a47..bb3fcb8 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -565,7 +565,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) WTI_CURSORS_INFO cursor; TRACE("Device %i: [id %d|name %s|type %s|num_classes %d|use %d]\n", - loop, (int) devices[loop].id, devices[loop].name, device_type ? device_type : "", + loop, (int) devices[loop].id, devices[loop].name, debugstr_a(device_type), devices[loop].num_classes, devices[loop].use ); switch (devices[loop].use) @@ -620,7 +620,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) if (! is_tablet_cursor(target->name, device_type)) { WARN("Skipping device %d [name %s|type %s]; not apparently a tablet cursor type device. If this is wrong, please report it to wine-devel(a)winehq.org\n", - loop, devices[loop].name, device_type ? device_type : ""); + loop, devices[loop].name, debugstr_a(device_type)); break; }

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
73
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 March 2016