wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Jacek Caban : vbscript: Ignore version flags in GetDispID.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: edab5d85c771648cdf798f75bda729edaac917aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=edab5d85c771648cdf798f75b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 10 12:17:32 2012 +0200 vbscript: Ignore version flags in GetDispID. --- dlls/vbscript/tests/run.c | 5 +++++ dlls/vbscript/vbdisp.c | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 0e6d6ed..91c45e6 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -333,6 +333,11 @@ static void test_disp(IDispatch *disp) ok(id == -1, "id = %d\n", id); SysFreeString(str); + str = a2bstr("publicProp"); + hres = IDispatchEx_GetDispID(dispex, str, 0x80000000|fdexNameCaseInsensitive, &public_prop_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID(publicProp) failed: %08x\n", hres); + IDispatchEx_Release(dispex); } diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 9005aa8..5f9d70a 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -24,6 +24,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +#define FDEX_VERSION_MASK 0xf0000000 + static inline BOOL is_func_id(vbdisp_t *This, DISPID id) { return id < This->desc->func_cnt; @@ -326,6 +328,8 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + grfdex &= ~FDEX_VERSION_MASK; + if(!This->desc) return E_UNEXPECTED;

1 0

Henri Verbeet : winex11: Introduce a separate function for initializing the list of XRandR display modes .
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 3e5c76bd09341fa95ea98f37f1351b63c4314107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5c76bd09341fa95ea98f37f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 9 23:16:41 2012 +0200 winex11: Introduce a separate function for initializing the list of XRandR display modes. --- dlls/winex11.drv/xrandr.c | 142 ++++++++++++++++++++++---------------------- 1 files changed, 71 insertions(+), 71 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 6e1987e..f818a61 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -96,32 +96,6 @@ static int XRandRErrorHandler(Display *dpy, XErrorEvent *event, void *arg) return 1; } - -/* create the mode structures */ -static void make_modes(void) -{ - int i, j; - - for (i=0; i<real_xrandr_sizes_count; i++) - { - if (real_xrandr_rates_count[i]) - { - for (j=0; j < real_xrandr_rates_count[i]; j++) - { - X11DRV_Settings_AddOneMode(real_xrandr_sizes[i].width, - real_xrandr_sizes[i].height, - 0, real_xrandr_rates[i][j]); - } - } - else - { - X11DRV_Settings_AddOneMode(real_xrandr_sizes[i].width, - real_xrandr_sizes[i].height, - 0, 0); - } - } -} - static int X11DRV_XRandR_GetCurrentMode(void) { SizeID size; @@ -221,10 +195,79 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode) return DISP_CHANGE_FAILED; } +static void xrandr_init_modes(void) +{ + int i, j, nmodes = 0; + + real_xrandr_sizes = pXRRSizes( gdi_display, DefaultScreen(gdi_display), &real_xrandr_sizes_count); + if (real_xrandr_sizes_count <= 0) return; + + TRACE("XRandR: found %u sizes.\n", real_xrandr_sizes_count); + real_xrandr_rates = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(short *) * real_xrandr_sizes_count ); + real_xrandr_rates_count = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(int) * real_xrandr_sizes_count ); + for (i = 0; i < real_xrandr_sizes_count; ++i) + { + real_xrandr_rates[i] = pXRRRates( gdi_display, DefaultScreen(gdi_display), + i, &real_xrandr_rates_count[i] ); + TRACE("- at %d: %dx%d (%d rates):", i, real_xrandr_sizes[i].width, + real_xrandr_sizes[i].height, real_xrandr_rates_count[i]); + if (real_xrandr_rates_count[i]) + { + nmodes += real_xrandr_rates_count[i]; + for (j = 0; j < real_xrandr_rates_count[i]; ++j) + { + if (j > 0) + TRACE(","); + TRACE(" %d", real_xrandr_rates[i][j]); + } + } + else + { + ++nmodes; + TRACE(" <default>"); + } + TRACE(" Hz\n"); + } + + real_xrandr_modes_count = nmodes; + TRACE("XRandR modes: count=%d\n", nmodes); + + dd_modes = X11DRV_Settings_SetHandlers( "XRandR", + X11DRV_XRandR_GetCurrentMode, + X11DRV_XRandR_SetCurrentMode, + nmodes, 1 ); + + for (i = 0; i < real_xrandr_sizes_count; ++i) + { + if (real_xrandr_rates_count[i]) + { + for (j = 0; j < real_xrandr_rates_count[i]; ++j) + { + X11DRV_Settings_AddOneMode( real_xrandr_sizes[i].width, + real_xrandr_sizes[i].height, + 0, real_xrandr_rates[i][j] ); + } + } + else + { + X11DRV_Settings_AddOneMode( real_xrandr_sizes[i].width, + real_xrandr_sizes[i].height, + 0, 0 ); + } + } + + X11DRV_Settings_AddDepthModes(); + dd_mode_count = X11DRV_Settings_GetModeCount(); + + TRACE("Available DD modes: count=%d\n", dd_mode_count); + TRACE("Enabling XRandR\n"); +} + void X11DRV_XRandR_Init(void) { Bool ok; - int i, nmodes = 0; if (xrandr_major) return; /* already initialized? */ if (!usexrandr) return; /* disabled in config */ @@ -243,52 +286,9 @@ void X11DRV_XRandR_Init(void) if (ok) { TRACE("Found XRandR - major: %d, minor: %d\n", xrandr_major, xrandr_minor); - /* retrieve modes */ - real_xrandr_sizes = pXRRSizes(gdi_display, DefaultScreen(gdi_display), &real_xrandr_sizes_count); - ok = (real_xrandr_sizes_count>0); - } - if (ok) - { - TRACE("XRandR: found %u resolutions sizes\n", real_xrandr_sizes_count); - real_xrandr_rates = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(short *) * real_xrandr_sizes_count); - real_xrandr_rates_count = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(int) * real_xrandr_sizes_count); - for (i=0; i < real_xrandr_sizes_count; i++) - { - real_xrandr_rates[i] = pXRRRates (gdi_display, DefaultScreen(gdi_display), i, &(real_xrandr_rates_count[i])); - TRACE("- at %d: %dx%d (%d rates):", i, real_xrandr_sizes[i].width, real_xrandr_sizes[i].height, real_xrandr_rates_count[i]); - if (real_xrandr_rates_count[i]) - { - int j; - nmodes += real_xrandr_rates_count[i]; - for (j = 0; j < real_xrandr_rates_count[i]; ++j) { - if (j > 0) TRACE(","); - TRACE(" %d", real_xrandr_rates[i][j]); - } - } - else - { - nmodes++; - TRACE(" <default>"); - } - TRACE(" Hz\n"); - } + xrandr_init_modes(); } wine_tsx11_unlock(); - if (!ok) return; - - real_xrandr_modes_count = nmodes; - TRACE("XRandR modes: count=%d\n", nmodes); - - dd_modes = X11DRV_Settings_SetHandlers("XRandR", - X11DRV_XRandR_GetCurrentMode, - X11DRV_XRandR_SetCurrentMode, - nmodes, 1); - make_modes(); - X11DRV_Settings_AddDepthModes(); - dd_mode_count = X11DRV_Settings_GetModeCount(); - - TRACE("Available DD modes: count=%d\n", dd_mode_count); - TRACE("Enabling XRandR\n"); } #else /* SONAME_LIBXRANDR */

1 0

Henri Verbeet : winex11: Remove some unused includes from xrandr.c.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 76725f9885653fc9e9e4230179759c1638751d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=76725f9885653fc9e9e423017… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 9 23:16:40 2012 +0200 winex11: Remove some unused includes from xrandr.c. --- dlls/winex11.drv/xrandr.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 4d988ef..6e1987e 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -21,20 +21,14 @@ #include "config.h" #include "wine/port.h" #include "wine/debug.h" -#include <string.h> -#include <stdio.h> WINE_DEFAULT_DEBUG_CHANNEL(xrandr); #ifdef SONAME_LIBXRANDR -#include <X11/Xlib.h> #include <X11/extensions/Xrandr.h> #include "x11drv.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" #include "wine/library.h" static void *xrandr_handle;

1 0

Henri Verbeet : wined3d: Print a more obvious message if a format doesn' t have a corresponding GL internal format.
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 2907913fad3118800b675a8b52ae9dcaea191fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2907913fad3118800b675a8b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 9 23:16:39 2012 +0200 wined3d: Print a more obvious message if a format doesn't have a corresponding GL internal format. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 95a5072..2d37cdf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2661,6 +2661,9 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru internal = format->glInternal; } + if (!internal) + FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); + if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { height *= format->height_scale.numerator;

1 0

Henri Verbeet : wined3d: Get rid of the "discard" parameter to device_parent_create_depth_stencil().
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 8ad98cdbeec665670170c880e1589002567c3a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ad98cdbeec665670170c880e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 9 23:16:38 2012 +0200 wined3d: Get rid of the "discard" parameter to device_parent_create_depth_stencil(). --- dlls/d3d10core/device.c | 6 +++--- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 8 ++++---- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 17 ++++++----------- dlls/wined3d/swapchain.c | 6 ++---- include/wine/wined3d.h | 2 +- 7 files changed, 20 insertions(+), 27 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 60849a3..3fd0c49 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1444,7 +1444,7 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_parent *device_parent, UINT width, UINT height, enum wined3d_format_id format, enum wined3d_multisample_type multisample_type, - DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface) + DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d10_device *device = device_from_wined3d_device_parent(device_parent); struct d3d10_texture2d *texture; @@ -1452,8 +1452,8 @@ static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_pa HRESULT hr; FIXME("device_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, discard %u, surface %p partial stub!\n", - device_parent, width, height, format, multisample_type, multisample_quality, discard, surface); + "\tmultisample_quality %u, surface %p partial stub!\n", + device_parent, width, height, format, multisample_type, multisample_quality, surface); FIXME("Implement DXGI<->wined3d usage conversion\n"); diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 31f0eb2..50a09e9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2888,15 +2888,15 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_parent *device_parent, UINT width, UINT height, enum wined3d_format_id format, enum wined3d_multisample_type multisample_type, - DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface) + DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d8_device *device = device_from_device_parent(device_parent); struct d3d8_surface *d3d_surface; HRESULT hr; TRACE("device_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, discard %u, surface %p.\n", - device_parent, width, height, format, multisample_type, multisample_quality, discard, surface); + "\tmultisample_quality %u, surface %p.\n", + device_parent, width, height, format, multisample_type, multisample_quality, surface); hr = IDirect3DDevice8_CreateDepthStencilSurface(&device->IDirect3DDevice8_iface, width, height, d3dformat_from_wined3dformat(format), multisample_type, (IDirect3DSurface8 **)&d3d_surface); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ef5aa46..1f195d6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3243,19 +3243,19 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_parent *device_parent, UINT width, UINT height, enum wined3d_format_id format, enum wined3d_multisample_type multisample_type, - DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface) + DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d9_device *device = device_from_device_parent(device_parent); struct d3d9_surface *d3d_surface; HRESULT hr; TRACE("device_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, discard %u, surface %p.\n", - device_parent, width, height, format, multisample_type, multisample_quality, discard, surface); + "\tmultisample_quality %u, surface %p.\n", + device_parent, width, height, format, multisample_type, multisample_quality, surface); hr = d3d9_device_CreateDepthStencilSurface(&device->IDirect3DDevice9Ex_iface, width, height, d3dformat_from_wined3dformat(format), multisample_type, multisample_quality, - discard, (IDirect3DSurface9 **)&d3d_surface, NULL); + FALSE, (IDirect3DSurface9 **)&d3d_surface, NULL); if (FAILED(hr)) { WARN("Failed to create depth/stencil surface, hr %#x.\n", hr); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d613d17..4e2be26 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5472,7 +5472,7 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_parent *device_parent, UINT width, UINT height, enum wined3d_format_id format, enum wined3d_multisample_type multisample_type, - DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface) + DWORD multisample_quality, struct wined3d_surface **surface) { ERR("DirectDraw doesn't have and shouldn't try creating implicit depth buffers.\n"); return E_NOTIMPL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0acbded..0b74142 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5230,21 +5230,16 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (swapchain_desc->enable_auto_depth_stencil && !device->auto_depth_stencil) { - HRESULT hrc; + HRESULT hr; TRACE("Creating the depth stencil buffer\n"); - hrc = device->device_parent->ops->create_depth_stencil(device->device_parent, - swapchain_desc->backbuffer_width, - swapchain_desc->backbuffer_height, - swapchain_desc->auto_depth_stencil_format, - swapchain_desc->multisample_type, - swapchain_desc->multisample_quality, - FALSE, - &device->auto_depth_stencil); - if (FAILED(hrc)) + if (FAILED(hr = device->device_parent->ops->create_depth_stencil(device->device_parent, + swapchain_desc->backbuffer_width, swapchain_desc->backbuffer_height, + swapchain_desc->auto_depth_stencil_format, swapchain_desc->multisample_type, + swapchain_desc->multisample_quality, &device->auto_depth_stencil))) { - ERR("Failed to create the depth stencil buffer.\n"); + ERR("Failed to create the depth stencil buffer, hr %#x.\n", hr); wined3d_swapchain_decref(swapchain); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4aeabfb..a389497 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1070,12 +1070,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ TRACE("Creating depth/stencil buffer.\n"); if (!device->auto_depth_stencil) { - hr = device->device_parent->ops->create_depth_stencil(device->device_parent, + if (FAILED(hr = device->device_parent->ops->create_depth_stencil(device->device_parent, swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, swapchain->desc.auto_depth_stencil_format, swapchain->desc.multisample_type, - swapchain->desc.multisample_quality, FALSE /* FIXME: Discard */, - &device->auto_depth_stencil); - if (FAILED(hr)) + swapchain->desc.multisample_quality, &device->auto_depth_stencil))) { WARN("Failed to create the auto depth stencil, hr %#x.\n", hr); goto err; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6709d28..5049360 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2005,7 +2005,7 @@ struct wined3d_device_parent_ops DWORD multisample_quality, struct wined3d_surface **surface); HRESULT (__cdecl *create_depth_stencil)(struct wined3d_device_parent *device_parent, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, - DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface); + DWORD multisample_quality, struct wined3d_surface **surface); HRESULT (__cdecl *create_volume)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, UINT depth, enum wined3d_format_id format_id, enum wined3d_pool pool, DWORD usage, struct wined3d_volume **volume);

1 0

Henri Verbeet : wined3d: Get rid of the "lockable" parameter to device_parent_create_rendertarget().
by Alexandre Julliard 11 Jul '12

11 Jul '12

Module: wine Branch: master Commit: 9b74ebd79404c867aadb723ffa2ab34b3bf741cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b74ebd79404c867aadb723ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 9 23:16:37 2012 +0200 wined3d: Get rid of the "lockable" parameter to device_parent_create_rendertarget(). --- dlls/d3d10core/device.c | 6 +++--- dlls/d3d8/device.c | 8 ++++---- dlls/d3d9/device.c | 8 ++++---- dlls/ddraw/ddraw.c | 12 ++++-------- dlls/wined3d/swapchain.c | 12 ++++-------- include/wine/wined3d.h | 2 +- 6 files changed, 20 insertions(+), 28 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 637109f..60849a3 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1400,7 +1400,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d10_device *device = device_from_wined3d_device_parent(device_parent); @@ -1409,9 +1409,9 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par HRESULT hr; FIXME("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p partial stub!\n", + "\tmultisample_quality %u, surface %p partial stub!\n", device_parent, container_parent, width, height, format, multisample_type, - multisample_quality, lockable, surface); + multisample_quality, surface); FIXME("Implement DXGI<->wined3d usage conversion\n"); diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c135012..31f0eb2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2856,7 +2856,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d8_device *device = device_from_device_parent(device_parent); @@ -2864,12 +2864,12 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p.\n", + "\tmultisample_quality %u, surface %p.\n", device_parent, container_parent, width, height, format, - multisample_type, multisample_quality, lockable, surface); + multisample_type, multisample_quality, surface); hr = IDirect3DDevice8_CreateRenderTarget(&device->IDirect3DDevice8_iface, width, height, - d3dformat_from_wined3dformat(format), multisample_type, lockable, (IDirect3DSurface8 **)&d3d_surface); + d3dformat_from_wined3dformat(format), multisample_type, TRUE, (IDirect3DSurface8 **)&d3d_surface); if (FAILED(hr)) { WARN("Failed to create rendertarget, hr %#x.\n", hr); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 04a073d..ef5aa46 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3210,7 +3210,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d9_device *device = device_from_device_parent(device_parent); @@ -3218,12 +3218,12 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p.\n", + "\tmultisample_quality %u, surface %p.\n", device_parent, container_parent, width, height, format, multisample_type, - multisample_quality, lockable, surface); + multisample_quality, surface); hr = d3d9_device_CreateRenderTarget(&device->IDirect3DDevice9Ex_iface, width, height, - d3dformat_from_wined3dformat(format), multisample_type, multisample_quality, lockable, + d3dformat_from_wined3dformat(format), multisample_type, multisample_quality, TRUE, (IDirect3DSurface9 **)&d3d_surface, NULL); if (FAILED(hr)) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d628629..d613d17 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5444,17 +5444,16 @@ static const struct wined3d_parent_ops ddraw_frontbuffer_parent_ops = static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - DWORD flags = 0; HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p.\n", + "\tmultisample_quality %u, surface %p.\n", device_parent, container_parent, width, height, format, multisample_type, - multisample_quality, lockable, surface); + multisample_quality, surface); if (ddraw->wined3d_frontbuffer) { @@ -5462,12 +5461,9 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par return E_FAIL; } - if (lockable) - flags |= WINED3D_SURFACE_MAPPABLE; - hr = wined3d_surface_create(ddraw->wined3d_device, width, height, format, 0, WINED3DUSAGE_RENDERTARGET, WINED3D_POOL_DEFAULT, multisample_type, multisample_quality, - DefaultSurfaceType, flags, ddraw, &ddraw_frontbuffer_parent_ops, surface); + DefaultSurfaceType, WINED3D_SURFACE_MAPPABLE, ddraw, &ddraw_frontbuffer_parent_ops, surface); if (SUCCEEDED(hr)) ddraw->wined3d_frontbuffer = *surface; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8c69fad..4aeabfb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -943,12 +943,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ swapchain_update_render_to_fbo(swapchain); TRACE("Creating front buffer.\n"); - hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, + if (FAILED(hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, swapchain->desc.backbuffer_format, swapchain->desc.multisample_type, - swapchain->desc.multisample_quality, TRUE /* Lockable */, - &swapchain->front_buffer); - if (FAILED(hr)) + swapchain->desc.multisample_quality, &swapchain->front_buffer))) { WARN("Failed to create front buffer, hr %#x.\n", hr); goto err; @@ -1053,12 +1051,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i); - hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, + if (FAILED(hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, swapchain->desc.backbuffer_format, swapchain->desc.multisample_type, - swapchain->desc.multisample_quality, TRUE /* Lockable */, - &swapchain->back_buffers[i]); - if (FAILED(hr)) + swapchain->desc.multisample_quality, &swapchain->back_buffers[i]))) { WARN("Failed to create back buffer %u, hr %#x.\n", i, hr); goto err; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4576937..6709d28 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2002,7 +2002,7 @@ struct wined3d_device_parent_ops UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface); HRESULT (__cdecl *create_rendertarget)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, - DWORD multisample_quality, BOOL lockable, struct wined3d_surface **surface); + DWORD multisample_quality, struct wined3d_surface **surface); HRESULT (__cdecl *create_depth_stencil)(struct wined3d_device_parent *device_parent, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface);

1 0

Jeremy Newman : forums and mailing list are seperate. misc html cleanup
by Jeremy Newman 10 Jul '12

10 Jul '12

Module: website Branch: master Commit: 6f63d9ca396655fb060dc958f76c4643624e8e83 URL: http://source.winehq.org/git/website.git/?a=commit;h=6f63d9ca396655fb060dc9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 10 09:15:41 2012 -0500 forums and mailing list are seperate. misc html cleanup --- templates/en/forums.template | 48 +++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 21 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 6ce73ec..6b00e99 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -7,24 +7,23 @@ Here are the most useful ones for users: <ul> - <li>The <a href="http://www.winehq.org/mailman/listinfo/wine-users">Wine-Users Mailing List</a> (and <a href="http://www.winehq.org/pipermail/wine-users/">web archive</a>) - best place for Wine user support</li> + <li>The <a href="http://forum.winehq.org">WineHQ Forums</a></li> - <li>The <a href="http://forum.winehq.org">WineHQ Forums</a> - for those of you that prefer a forum interface over mailing lists. The mailing lists and forum are interlinked. Messages sent to one automatically propagate to the other.</li> + <li>The <a href="http://www.winehq.org/mailman/listinfo/wine-users">Wine-Users Mailing List</a> (and <a href="http://www.winehq.org/pipermail/wine-users/">web archive</a>)</li> <li>Ubuntu users may also want to visit the <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Wine area at Ubuntu Forums</a> <li>Users might also want to visit the <a href="http://www.linuxforums.org/forum/wine/">Wine area at Linux Forums</a> <li>If you want to be notified about new releases, subscribe to the <a href="http://www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce mailing list</a></li> - </ul> -Please don't create another English language Wine forum (except perhaps -a Wine area in a popular distro's main forum). - -If you know of another active Wine forum - especially a non-English one -- please let us know so we can add it to the list. -(Email to dank(a)kegel.com would do.) +Please don't create another English language Wine forum (except perhaps +a Wine area in a popular distro's main forum). + +If you know of another active Wine forum - especially a non-English one +- please let us know so we can add it to the list. +(Email to dank(a)kegel.com would do.) <h2>All WineHQ Mailing Lists</h2> @@ -40,7 +39,7 @@ or just use <a href="http://www.winehq.org/mailman/listinfo">the Mailman web int to them, otherwise your posting will be treated as possible spam by the mailing list software. -<ul> +<ul class="roomy"> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-announce">(Un-)Subscribe</a>] [<a href="http://www.winehq.org/pipermail/wine-announce/">Archive 1</a>] @@ -48,16 +47,17 @@ mailing list software. [<a href="news://news.gmane.org/gmane.comp.emulators.wine.announce">via newsreader</a>] <a href="mailto:wine-announce@winehq.org">wine-announce(a)winehq.org</a> A low traffic (2/month) read-only list for announcing releases - and other major Wine or WineHQ news. + and other major Wine or WineHQ news. + </li> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-users">(Un-)Subscribe</a>] [<a href="http://www.winehq.org/pipermail/wine-users/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.user">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.user">via newsreader</a>] - [<a href="http://forum.winehq.org">via web forums</a>] <a href="mailto:wine-users@winehq.org">wine-users(a)winehq.org</a> - A medium traffic (50/day) open list for end-user discussions. + A medium traffic (50/day) open list for end-user discussions. + </li> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-devel">(Un-)Subscribe</a>] @@ -66,7 +66,8 @@ mailing list software. [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via newsreader</a>] <a href="mailto:wine-devel@winehq.org">wine-devel(a)winehq.org</a> A medium traffic (25/day) open list for discussing Wine development, - WineHQ, patches or anything else of interest to Wine developers. + WineHQ, patches or anything else of interest to Wine developers. + </li> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-patches">(Un-)Subscribe</a>] @@ -74,7 +75,8 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] <a href="mailto:wine-patches@winehq.org">wine-patches(a)winehq.org</a> - A medium traffic (45/day) open list for submitting patches only. + A medium traffic (45/day) open list for submitting patches only. + </li> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>] @@ -83,21 +85,24 @@ mailing list software. [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] <a href="mailto:wine-cvs@winehq.org">wine-cvs(a)winehq.org</a> A medium traffic (35/day) read only list which tracks commits to the Git - tree. + tree. + </li> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-releases">(Un-)Subscribe</a>] [<a href="http://www.winehq.org/pipermail/wine-releases/">Archive 1</a>] <a href="mailto:wine-releases@winehq.org">wine-releases(a)winehq.org</a> A low traffic (2/month) read only list for receiving a large diff file - at every Wine official release. + at every Wine official release. + </li> <li> [<a href="http://news.gmane.org/gmane.comp.emulators.wine.license">Archive 1</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.license">via newsreader</a>] Closed list that was for discussing legal issues - related to Wine, including license issues. (Closed 2004-12-16) + related to Wine, including license issues. (Closed 2004-12-16) + </li> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-bugs">(Un-)Subscribe</a>] @@ -106,13 +111,14 @@ mailing list software. [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>] <a href="mailto:wine-bugs@winehq.org">wine-bugs(a)winehq.org</a> A high traffic (150/day) read-only list for monitoring activity on the - <a href="http://bugs.winehq.org/">Bug Tracking Database</a>. + <a href="http://bugs.winehq.org/">Bug Tracking Database</a>. + </li> <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-tests-results">(Un-)Subscribe</a>] [<a href="http://www.winehq.org/pipermail/wine-tests-results/">Archive</a>] <a href="mailto:wine-tests-results@winehq.org">wine-tests-results(a)winehq.org</a> A medium traffic (10/day) open list for submitting test results. -</ul> + </li> -  +</ul>

1 0

Jeremy Newman : add a roomy list define
by Jeremy Newman 10 Jul '12

10 Jul '12

Module: website Branch: master Commit: a48ce0e5c39da482a9a371032e30100f4b1013b1 URL: http://source.winehq.org/git/website.git/?a=commit;h=a48ce0e5c39da482a9a371… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 10 09:14:50 2012 -0500 add a roomy list define --- styles.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/styles.css b/styles.css index cc61d3e..da0d476 100644 --- a/styles.css +++ b/styles.css @@ -188,6 +188,7 @@ DIV.newsblock { margin: 0 5px 25px 10px; padding: 0; } /* stuff */ img { border: 0; } +UL.roomy LI { padding-bottom: 10px; } /* Link Colors */ A { color: #A50D0D; }

1 0

Lucas Zawacki : Portuguese translation for 1.5.8 release
by Jeremy Newman 10 Jul '12

10 Jul '12

Module: website Branch: master Commit: d4d3b2a47348225ef0db53775892de1c5b8a2df5 URL: http://source.winehq.org/git/website.git/?a=commit;h=d4d3b2a47348225ef0db53… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Jul 9 13:53:16 2012 -0300 Portuguese translation for 1.5.8 release --- news/pt/2012070301.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pt/2012070301.xml b/news/pt/2012070301.xml new file mode 100644 index 0000000..69dd6a6 --- /dev/null +++ b/news/pt/2012070301.xml @@ -0,0 +1,18 @@ +<news> +<date>3 de Julho de 2012</date> +<title>Wine 1.5.8 lançado</title> +<body> + A versão de desenvolvmento 1.5.8 já está disponível. + <a href="{$root}/announce/1.5.8">Novidades</a> desta versão: +<ul> + <li>Mais funcionalidades de stream no runtime C++.</li> + <li>Uma série de melhorias dos Windows Codecs.</li> + <li>Mais classes e propriedades WBEM.</li> + <li>Algumas correções no HTML Help.</li> + <li>Suporte a impressão de fontes com falso itálico.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.8.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads.</a>. +</body></news> +

1 0

Austin English : inseng: Add a stub for DllInstall.
by Alexandre Julliard 09 Jul '12

09 Jul '12

Module: wine Branch: master Commit: f8077a5697088147c21bb72ec3bf249ea983d42a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8077a5697088147c21bb72ec… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jul 5 08:46:22 2012 -0500 inseng: Add a stub for DllInstall. --- dlls/inseng/inseng.spec | 2 +- dlls/inseng/inseng_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/inseng/inseng.spec b/dlls/inseng/inseng.spec index b3a2ce2..82c0b4d 100644 --- a/dlls/inseng/inseng.spec +++ b/dlls/inseng/inseng.spec @@ -3,7 +3,7 @@ @ stdcall CheckTrustEx(ptr ptr ptr ptr ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stub DllInstall +@ stdcall DllInstall(long wstr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub DownloadFile diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index 94e1910..42681c2 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -92,3 +92,12 @@ BOOL WINAPI CheckTrustEx( LPVOID a, LPVOID b, LPVOID c, LPVOID d, LPVOID e ) FIXME("%p %p %p %p %p\n", a, b, c, d, e ); return TRUE; } + +/*********************************************************************** + * DllInstall (INSENG.@) + */ +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) +{ + FIXME("(%s, %s): stub\n", bInstall ? "TRUE" : "FALSE", debugstr_w(cmdline)); + return S_OK; +}

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
72
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 July 2012