July 2012 - Wine-Commits - list.winehq.org

Matteo Bruni : d3dcompiler: Carry around both shader major and minor version.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 29ba39face037c5c71d6d81ce826715382e44d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ba39face037c5c71d6d81ce… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 10 15:39:43 2012 +0200 d3dcompiler: Carry around both shader major and minor version. --- dlls/d3dcompiler_43/compiler.c | 2 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- dlls/d3dcompiler_43/hlsl.l | 7 ++++--- dlls/d3dcompiler_43/hlsl.y | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 27d6504..f3ba03f 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -503,7 +503,7 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co TRACE("Preprocessed shader source: %s\n", debugstr_a(preproc_shader)); FIXME("Parse compilation target.\n"); - shader = parse_hlsl_shader(preproc_shader, ST_VERTEX, 2, entrypoint, &messages); + shader = parse_hlsl_shader(preproc_shader, ST_VERTEX, 2, 0, entrypoint, &messages); if (messages) { diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index d7fcfea..ccac936 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -874,7 +874,7 @@ struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var) DECLSPEC_HIDDEN; void push_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; BOOL pop_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; struct hlsl_ir_function_decl *new_func_decl(const char *name, struct hlsl_type *return_type, struct list *parameters) DECLSPEC_HIDDEN; -struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, +struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD major, DWORD minor, const char *entrypoint, char **messages) DECLSPEC_HIDDEN; const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l index 84cf573..55b6b63 100644 --- a/dlls/d3dcompiler_43/hlsl.l +++ b/dlls/d3dcompiler_43/hlsl.l @@ -266,9 +266,10 @@ row_major {return KW_ROW_MAJOR; } %% -struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD version, const char *entrypoint, char **messages); +struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD minor, + const char *entrypoint, char **messages); -struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, +struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD major, DWORD minor, const char *entrypoint, char **messages) { struct bwriter_shader *ret = NULL; @@ -277,7 +278,7 @@ struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type buffer = hlsl__scan_string(text); hlsl__switch_to_buffer(buffer); - ret = parse_hlsl(type, version, entrypoint, messages); + ret = parse_hlsl(type, major, minor, entrypoint, messages); hlsl__delete_buffer(buffer); return ret; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 5223189..183f436 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -918,7 +918,8 @@ expr: assignment_expr %% -struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD version, const char *entrypoint, char **messages) +struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD minor, + const char *entrypoint, char **messages) { struct hlsl_ir_function_decl *function; struct hlsl_scope *scope, *next_scope;

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetMatrixTransposePointerArray().
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 942831733651f8ec75d6a71269be4a61184a537a URL: http://source.winehq.org/git/wine.git/?a=commit;h=942831733651f8ec75d6a7126… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 9 22:11:42 2012 +0200 d3dx9: Implement ID3DXBaseEffect::GetMatrixTransposePointerArray(). --- dlls/d3dx9_36/effect.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5c90283..80f7549 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2660,10 +2660,43 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposePointerArray(ID3DXBa static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposePointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, matrix %p, count %u stub\n", This, parameter, matrix, count); + TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); - return E_NOTIMPL; + if (!count) return D3D_OK; + + if (matrix && param && count <= param->element_count) + { + UINT i; + D3DXMATRIX m; + + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + { + get_matrix(get_parameter_struct(param->member_handles[i]), &m); + D3DXMatrixTranspose(matrix[i], &m); + } + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetString(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPCSTR string)

1 0

Matteo Bruni : d3dcompiler: Fix line info update.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 0d34c9dab78c35f5b041e4138357da063611dc79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d34c9dab78c35f5b041e4138… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 10 15:39:41 2012 +0200 d3dcompiler: Fix line info update. --- dlls/d3dcompiler_43/hlsl.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index a3e5f6e..ea6bb12 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -307,7 +307,7 @@ hlsl_prog: /* empty */ preproc_directive: PRE_LINE STRING { TRACE("Updating line information to file %s, line %u\n", debugstr_a($2), $1); - hlsl_ctx.line_no = $1 - 1; + hlsl_ctx.line_no = $1; d3dcompiler_free(hlsl_ctx.source_file); hlsl_ctx.source_file = $2; }

1 0

Henri Verbeet : winex11: Remove some unused includes from xrandr.c.
by Alexandre Julliard July 11, 2012

July 11, 2012

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: Get rid of the "discard" parameter to device_parent_create_depth_stencil().
by Alexandre Julliard July 11, 2012

July 11, 2012

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

Austin English : kernel32: Add a stub for GetLocaleInfoEx.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: b22de982c0561269a61c90ed5b6d1197662fb7cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22de982c0561269a61c90ed5… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 10 07:43:50 2012 -0500 kernel32: Add a stub for GetLocaleInfoEx. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a619f81..7c8f9e2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -552,6 +552,7 @@ @ stdcall GetLocalTime(ptr) @ stdcall GetLocaleInfoA(long long ptr long) @ stdcall GetLocaleInfoW(long long ptr long) +@ stdcall GetLocaleInfoEx(wstr long ptr long) @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @ stdcall GetLogicalDrives() diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index e467735..748969e 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1406,6 +1406,17 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len ) return ret; } +/****************************************************************************** + * GetLocaleInfoEx (KERNEL32.@) + * + * FIXME: Should probably be a wrapper around GetLocaleInfo() (or vice-versa). + */ +INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len) +{ + FIXME("(locale=%s,info=0x%x,%p,%d): stub!\n", debugstr_w(locale), info, buffer, len); + SetLastError(ERROR_INVALID_PARAMETER); + return 0; +} /****************************************************************************** * SetLocaleInfoA [KERNEL32.@]

1 0

Matteo Bruni : d3dcompiler: Parse compilation target.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 45e8a644ebac3da966f5f4945fad1afcd72696f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e8a644ebac3da966f5f4945… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 10 15:39:44 2012 +0200 d3dcompiler: Parse compilation target. --- dlls/d3dcompiler_43/compiler.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index f3ba03f..a977315 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -496,14 +496,43 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co struct bwriter_shader *shader; char *messages = NULL; HRESULT hr; - DWORD *res, size; + DWORD *res, size, major, minor; ID3DBlob *buffer; char *pos; + enum shader_type shader_type; TRACE("Preprocessed shader source: %s\n", debugstr_a(preproc_shader)); - FIXME("Parse compilation target.\n"); - shader = parse_hlsl_shader(preproc_shader, ST_VERTEX, 2, 0, entrypoint, &messages); + TRACE("Parsing compilation target %s.\n", debugstr_a(target)); + if (strlen(target) != 6 || target[1] != 's' || target[2] != '_' || target[4] != '_') + { + FIXME("Unknown compilation target %s.\n", debugstr_a(target)); + return D3DERR_INVALIDCALL; + } + + if (target[0] == 'v') + shader_type = ST_VERTEX; + else if (target[0] == 'p') + shader_type = ST_PIXEL; + else + { + FIXME("Unsupported shader target type %s.\n", debugstr_a(target)); + return D3DERR_INVALIDCALL; + } + + major = target[3] - '0'; + if (major == 0 || major > 5) + { + FIXME("Unsupported shader target major version %d.\n", major); + return D3DERR_INVALIDCALL; + } + minor = target[5] - '0'; + if (minor > 1 || (minor == 1 && (shader_type != ST_VERTEX || major > 1))) + { + FIXME("Unsupported shader target minor version %d.\n", minor); + return D3DERR_INVALIDCALL; + } + shader = parse_hlsl_shader(preproc_shader, shader_type, major, minor, entrypoint, &messages); if (messages) {

1 0

Henri Verbeet : winex11: Introduce a separate function for initializing the list of XRandR display modes .
by Alexandre Julliard July 11, 2012

July 11, 2012

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

Andrew Eikum : mpr: Don' t succeed if drive is not remote in WNetGetUniversalName.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 76880ff93320c4c0827de12254afb9adbd3e5250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76880ff93320c4c0827de1225… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jul 10 09:56:33 2012 -0500 mpr: Don't succeed if drive is not remote in WNetGetUniversalName. --- configure | 1 + configure.ac | 1 + dlls/mpr/tests/Makefile.in | 7 +++++ dlls/mpr/tests/mpr.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mpr/wnet.c | 14 ++++++++- 5 files changed, 86 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 2646b0b..5f8b931 100755 --- a/configure +++ b/configure @@ -15288,6 +15288,7 @@ wine_fn_config_dll monodebg.vxd enable_win16 wine_fn_config_dll mountmgr.sys enable_mountmgr_sys wine_fn_config_dll mouse.drv16 enable_win16 wine_fn_config_dll mpr enable_mpr implib,po +wine_fn_config_test dlls/mpr/tests mpr_test wine_fn_config_dll mprapi enable_mprapi implib wine_fn_config_dll msacm.dll16 enable_win16 wine_fn_config_dll msacm32.drv enable_msacm32_drv diff --git a/configure.ac b/configure.ac index a85459d..67a0af6 100644 --- a/configure.ac +++ b/configure.ac @@ -2704,6 +2704,7 @@ WINE_CONFIG_DLL(monodebg.vxd,enable_win16) WINE_CONFIG_DLL(mountmgr.sys) WINE_CONFIG_DLL(mouse.drv16,enable_win16) WINE_CONFIG_DLL(mpr,,[implib,po]) +WINE_CONFIG_TEST(dlls/mpr/tests) WINE_CONFIG_DLL(mprapi,,[implib]) WINE_CONFIG_DLL(msacm.dll16,enable_win16) WINE_CONFIG_DLL(msacm32.drv) diff --git a/dlls/mpr/tests/Makefile.in b/dlls/mpr/tests/Makefile.in new file mode 100644 index 0000000..655c49b --- /dev/null +++ b/dlls/mpr/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = mpr.dll +IMPORTS = mpr + +C_SRCS = \ + mpr.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c new file mode 100644 index 0000000..d54d80d --- /dev/null +++ b/dlls/mpr/tests/mpr.c @@ -0,0 +1,65 @@ +/* + * Copyright 2012 Andrew Eikum for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdio.h> + +#include "windows.h" +#include "winnetwk.h" +#include "wine/test.h" + +static void test_WNetGetUniversalName(void) +{ + DWORD ret; + char buffer[1024]; + DWORD drive_type, info_size; + char driveA[] = "A:\\"; + WCHAR driveW[] = {'A',':','\\',0}; + + for(; *driveA <= 'Z'; ++*driveA, ++*driveW){ + drive_type = GetDriveTypeW(driveW); + + info_size = sizeof(buffer); + ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, + buffer, &info_size); + + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + else + ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret); + + ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + + info_size = sizeof(buffer); + ret = WNetGetUniversalNameW(driveW, UNIVERSAL_NAME_INFO_LEVEL, + buffer, &info_size); + + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); + else + ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameW gave wrong error: %08x\n", ret); + + ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + } +} + +START_TEST(mpr) +{ + test_WNetGetUniversalName(); +} diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 946f47e..bdc7ad0 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1892,6 +1892,12 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel, { LPUNIVERSAL_NAME_INFOA info = lpBuffer; + if (GetDriveTypeA(lpLocalPath) != DRIVE_REMOTE) + { + err = ERROR_NOT_CONNECTED; + break; + } + size = sizeof(*info) + lstrlenA(lpLocalPath) + 1; if (*lpBufferSize < size) { @@ -1900,7 +1906,6 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel, } info->lpUniversalName = (char *)info + sizeof(*info); lstrcpyA(info->lpUniversalName, lpLocalPath); - *lpBufferSize = size; err = WN_NO_ERROR; break; } @@ -1934,6 +1939,12 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, { LPUNIVERSAL_NAME_INFOW info = lpBuffer; + if (GetDriveTypeW(lpLocalPath) != DRIVE_REMOTE) + { + err = ERROR_NOT_CONNECTED; + break; + } + size = sizeof(*info) + (lstrlenW(lpLocalPath) + 1) * sizeof(WCHAR); if (*lpBufferSize < size) { @@ -1942,7 +1953,6 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, } info->lpUniversalName = (LPWSTR)((char *)info + sizeof(*info)); lstrcpyW(info->lpUniversalName, lpLocalPath); - *lpBufferSize = size; err = WN_NO_ERROR; break; }

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetMatrixPointerArray().
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: d0fd8f4d88dd109685cf286dfd61916966785308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0fd8f4d88dd109685cf286df… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 9 22:11:27 2012 +0200 d3dx9: Implement ID3DXBaseEffect::GetMatrixPointerArray(). --- dlls/d3dx9_36/effect.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 877df29..5c90283 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2425,10 +2425,41 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixPointerArray(ID3DXBaseEffect static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixPointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, matrix %p, count %u stub\n", This, parameter, matrix, count); + TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); - return E_NOTIMPL; + if (!count) return D3D_OK; + + if (param && matrix && count <= param->element_count) + { + UINT i; + + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + { + get_matrix(get_parameter_struct(param->member_handles[i]), matrix[i]); + } + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTranspose(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix)

1 0