wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Francois Gouget : cmd: Use FormatMessage() for better internationalization support.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 8ef901fa323ffdee12cc3d72d8f575bdfa7abfa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef901fa323ffdee12cc3d72d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 6 17:40:42 2011 +0100 cmd: Use FormatMessage() for better internationalization support. This makes it possible to reorder the format string placeholders in message translations. --- po/ar.po | 47 ++++++++++------------- po/bg.po | 47 ++++++++++------------- po/ca.po | 54 ++++++++++++++------------ po/cs.po | 46 ++++++++++------------- po/da.po | 54 ++++++++++++++------------ po/de.po | 54 ++++++++++++++------------ po/el.po | 44 +++++++++------------- po/en.po | 68 +++++++++++++++------------------ po/en_US.po | 68 +++++++++++++++------------------ po/eo.po | 47 ++++++++++------------- po/es.po | 54 ++++++++++++++------------ po/fa.po | 47 ++++++++++------------- po/fi.po | 47 ++++++++++------------- po/fr.po | 54 ++++++++++++++------------ po/he.po | 54 ++++++++++++++------------ po/hi.po | 40 ++++++++------------ po/hu.po | 53 ++++++++++++-------------- po/it.po | 54 ++++++++++++++------------ po/ja.po | 54 ++++++++++++++------------ po/ko.po | 54 ++++++++++++++------------ po/lt.po | 54 ++++++++++++++------------ po/ml.po | 40 ++++++++------------ po/nb_NO.po | 62 +++++++++++++++--------------- po/nl.po | 54 ++++++++++++++------------ po/or.po | 40 ++++++++------------ po/pa.po | 40 ++++++++------------ po/pl.po | 54 ++++++++++++++------------ po/pt_BR.po | 54 ++++++++++++++------------ po/pt_PT.po | 60 ++++++++++++++--------------- po/rm.po | 43 +++++++++------------ po/ro.po | 54 ++++++++++++++------------ po/ru.po | 54 ++++++++++++++------------ po/sk.po | 49 +++++++++++------------- po/sl.po | 55 ++++++++++++++------------- po/sr_RS(a)cyrillic.po | 55 ++++++++++++--------------- po/sr_RS(a)latin.po | 55 ++++++++++++--------------- po/sv.po | 54 ++++++++++++++------------ po/te.po | 40 ++++++++------------ po/th.po | 47 ++++++++++------------- po/tr.po | 46 ++++++++++------------- po/uk.po | 54 ++++++++++++++------------ po/wa.po | 44 +++++++++------------- po/wine.pot | 40 ++++++++------------ po/zh_CN.po | 50 +++++++++++-------------- po/zh_TW.po | 50 +++++++++++-------------- programs/cmd/builtins.c | 27 ++++++------- programs/cmd/cmd.rc | 28 +++++++------- programs/cmd/directory.c | 59 +++++++++++------------------ programs/cmd/wcmd.h | 5 +- programs/cmd/wcmdmain.c | 94 +++++++++++++++++++++++++++++++--------------- 50 files changed, 1208 insertions(+), 1293 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ef901fa323ffdee12cc3…

1 0

Francois Gouget : mscoree: Make CorDebugProcess_Create() static.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 47fdee6e92a6757b0469dce80211ed7c9246d9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47fdee6e92a6757b0469dce80… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 6 17:38:29 2011 +0100 mscoree: Make CorDebugProcess_Create() static. --- dlls/mscoree/cordebug.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/cordebug.c b/dlls/mscoree/cordebug.c index cda35e9..da06f49 100644 --- a/dlls/mscoree/cordebug.c +++ b/dlls/mscoree/cordebug.c @@ -401,7 +401,7 @@ static const ICorDebugProcessVtbl cordebugprocessVtbl = { }; -HRESULT CorDebugProcess_Create(CorDebug *cordebug, IUnknown** ppUnk, LPPROCESS_INFORMATION lpProcessInformation) +static HRESULT CorDebugProcess_Create(CorDebug *cordebug, IUnknown** ppUnk, LPPROCESS_INFORMATION lpProcessInformation) { DebugProcess *This;

1 0

Francois Gouget : jscript: Make interp_expression_eval() static.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 0a065cb4bdd153c4a4f331340ea7a78050c33429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a065cb4bdd153c4a4f331340… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 6 17:38:21 2011 +0100 jscript: Make interp_expression_eval() static. --- dlls/jscript/engine.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8e5e5f1..b40cd75 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3407,7 +3407,7 @@ OP_LIST #undef X }; -HRESULT interp_expression_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_expression_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { exec_ctx_t *exec_ctx = ctx->exec_ctx; unsigned prev_ip, prev_top;

1 0

Francois Gouget : gdi32: Make init_dib_info() static.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 22cb047ed4870eccb6a1a12bdb095f11d88019cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=22cb047ed4870eccb6a1a12bd… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 6 17:38:14 2011 +0100 gdi32: Make init_dib_info() static. --- dlls/gdi32/dibdrv/dc.c | 4 ++-- dlls/gdi32/dibdrv/dibdrv.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index f9b5e7b..2c61d29 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -67,8 +67,8 @@ static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) calc_shift_and_len(dib->blue_mask, &dib->blue_shift, &dib->blue_len); } -BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, - RGBQUAD *color_table, int color_table_size, void *bits, enum dib_info_flags flags) +static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, + RGBQUAD *color_table, int color_table_size, void *bits, enum dib_info_flags flags) { dib->bit_count = bi->biBitCount; dib->width = bi->biWidth; diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index e3782df..28633e0 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -224,9 +224,6 @@ extern void get_rop_codes(INT rop, struct rop_codes *codes) DECLSPEC_HIDDEN; extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; -extern BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, - RGBQUAD *color_table, int color_table_size, void *bits, - enum dib_info_flags flags) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HPALETTE pal) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) DECLSPEC_HIDDEN;

1 0

Francois Gouget : dsound: Remove mmErr(). It is not used anymore.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: c64ce9d0ffc3342f141a77cbb17d458d726cae7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64ce9d0ffc3342f141a77cbb… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 6 17:37:19 2011 +0100 dsound: Remove mmErr(). It is not used anymore. --- dlls/dsound/dsound_main.c | 27 --------------------------- dlls/dsound/dsound_private.h | 1 - 2 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 81e3627..8bbfb7c 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -101,33 +101,6 @@ static HANDLE g_devenum_thread; WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; -HRESULT mmErr(UINT err) -{ - switch(err) { - case MMSYSERR_NOERROR: - return DS_OK; - case MMSYSERR_ALLOCATED: - return DSERR_ALLOCATED; - case MMSYSERR_ERROR: - case MMSYSERR_INVALHANDLE: - case WAVERR_STILLPLAYING: - return DSERR_GENERIC; /* FIXME */ - case MMSYSERR_NODRIVER: - return DSERR_NODRIVER; - case MMSYSERR_NOMEM: - return DSERR_OUTOFMEMORY; - case MMSYSERR_INVALPARAM: - case WAVERR_BADFORMAT: - case WAVERR_UNPREPARED: - return DSERR_INVALIDPARAM; - case MMSYSERR_NOTSUPPORTED: - return DSERR_UNSUPPORTED; - default: - FIXME("Unknown MMSYS error %d\n",err); - return DSERR_GENERIC; - } -} - /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ int ds_hel_buflen = 32768 * 2; int ds_snd_queue_max = 10; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 3abfb97..77dcf9a 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -383,7 +383,6 @@ extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS] DECLSPEC_HIDDEN; extern WCHAR wine_vxd_drv[] DECLSPEC_HIDDEN; -HRESULT mmErr(UINT err) DECLSPEC_HIDDEN; void setup_dsound_options(void) DECLSPEC_HIDDEN; const char * dumpCooperativeLevel(DWORD level) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : d3d9/tests: Clarify a comment.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: f8dbf97e8d7a58aaafff7a1dd6ce9bc8c6047576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8dbf97e8d7a58aaafff7a1dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 6 00:03:06 2011 +0100 d3d9/tests: Clarify a comment. --- dlls/d3d9/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9395880..abd3685 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1471,7 +1471,7 @@ static void test_scene(void) } /* Now try it in a BeginScene - EndScene pair. Seems to be allowed in a beginScene - Endscene pair - * width normal surfaces, render targets and depth stencil surfaces. + * with normal surfaces and render targets, but not depth stencil surfaces. */ hr = IDirect3DDevice9_BeginScene(pDevice); ok( hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with %08x\n", hr);

1 0

Stefan Dösinger : d3d9/tests: Test StrechRect between depth stencils with different sizes.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 171c18a5bb1abd54bb7dddc5a46614f66458f0d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171c18a5bb1abd54bb7dddc5a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 6 00:03:05 2011 +0100 d3d9/tests: Test StrechRect between depth stencils with different sizes. --- dlls/d3d9/tests/visual.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2d651bf..0d16415 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11249,7 +11249,7 @@ static void depth_blit_test(IDirect3DDevice9 *device) {0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000}, }; - IDirect3DSurface9 *backbuffer, *ds1, *ds2; + IDirect3DSurface9 *backbuffer, *ds1, *ds2, *ds3; RECT src_rect, dst_rect; unsigned int i, j; D3DVIEWPORT9 vp; @@ -11274,6 +11274,8 @@ static void depth_blit_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "CreateDepthStencilSurface failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds2); ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 320, 240, D3DFMT_D24S8, 0, 0, FALSE, &ds3, NULL); + ok(SUCCEEDED(hr), "CreateDepthStencilSurface failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); @@ -11315,6 +11317,11 @@ static void depth_blit_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_StretchRect(device, ds2, NULL, backbuffer, NULL, D3DTEXF_POINT); ok(hr == D3DERR_INVALIDCALL, "StretchRect returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); IDirect3DSurface9_Release(backbuffer); + /* Full surface, different sizes */ + hr = IDirect3DDevice9_StretchRect(device, ds3, NULL, ds1, NULL, D3DTEXF_POINT); + ok(hr == D3DERR_INVALIDCALL, "StretchRect returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + hr = IDirect3DDevice9_StretchRect(device, ds1, NULL, ds3, NULL, D3DTEXF_POINT); + ok(hr == D3DERR_INVALIDCALL, "StretchRect returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds1); ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); @@ -11322,6 +11329,7 @@ static void depth_blit_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); hr = IDirect3DDevice9_StretchRect(device, ds2, NULL, ds1, NULL, D3DTEXF_POINT); ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds3); IDirect3DSurface9_Release(ds2); IDirect3DSurface9_Release(ds1);

1 0

Stefan Dösinger : ddraw/tests: Add a IDirect3DDevice2 GetCaps test.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 7ae81ba378c1633e574f130461bbc7fee16f5592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae81ba378c1633e574f13046… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 6 00:03:04 2011 +0100 ddraw/tests: Add a IDirect3DDevice2 GetCaps test. --- dlls/ddraw/tests/d3d.c | 211 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 211 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 5efe718..f44e31e 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4995,8 +4995,207 @@ static void test_get_caps7(void) /* There's no dwSize in D3DDEVICEDESC7 */ } +struct d3d2_test_context +{ + IDirectDraw *ddraw; + IDirect3D2 *d3d; + IDirectDrawSurface *surface; + IDirect3DDevice2 *device; + IDirect3DViewport2 *viewport; +}; + +static void d3d2_release_objects(struct d3d2_test_context *context) +{ + LONG ref; + HRESULT hr; + + if (context->viewport) + { + hr = IDirect3DDevice2_DeleteViewport(context->device, context->viewport); + ok(hr == D3D_OK, "DeleteViewport returned %08x.\n", hr); + ref = IDirect3DViewport2_Release(context->viewport); + ok(ref == 0, "Viewport has reference count %d, expected 0.\n", ref); + } + if (context->device) + { + ref = IDirect3DDevice2_Release(context->device); + ok(ref == 0, "Device has reference count %d, expected 0.\n", ref); + } + if (context->surface) + { + ref = IDirectDrawSurface_Release(context->surface); + ok(ref == 0, "Surface has reference count %d, expected 0.\n", ref); + } + if (context->d3d) + { + ref = IDirect3D2_Release(context->d3d); + ok(ref == 1, "IDirect3D2 has reference count %d, expected 1.\n", ref); + } + if (context->ddraw) + { + ref = IDirectDraw_Release(context->ddraw); + ok(ref == 0, "DDraw has reference count %d, expected 0.\n", ref); + } +} + +static BOOL d3d2_create_objects(struct d3d2_test_context *context) +{ + HRESULT hr; + DDSURFACEDESC ddsd; + D3DVIEWPORT vp_data; + + memset(context, 0, sizeof(*context)); + + hr = DirectDrawCreate(NULL, &context->ddraw, NULL); + ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreate failed: %08x.\n", hr); + if (!context->ddraw) goto error; + + hr = IDirectDraw_SetCooperativeLevel(context->ddraw, NULL, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel failed: %08x.\n", hr); + if (FAILED(hr)) goto error; + + hr = IDirectDraw_QueryInterface(context->ddraw, &IID_IDirect3D2, (void**) &context->d3d); + ok(hr == DD_OK || hr == E_NOINTERFACE, "QueryInterface failed: %08x.\n", hr); + if (!context->d3d) goto error; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + ddsd.dwWidth = 256; + ddsd.dwHeight = 256; + IDirectDraw_CreateSurface(context->ddraw, &ddsd, &context->surface, NULL); + if (!context->surface) + { + skip("DDSCAPS_3DDEVICE surface not available.\n"); + goto error; + } + + hr = IDirect3D2_CreateDevice(context->d3d, &IID_IDirect3DHALDevice, context->surface, &context->device); + ok(hr == D3D_OK || hr == E_OUTOFMEMORY || hr == E_NOINTERFACE, "CreateDevice failed: %08x.\n", hr); + if (!context->device) goto error; + + hr = IDirect3D2_CreateViewport(context->d3d, &context->viewport, NULL); + ok(hr == D3D_OK, "CreateViewport failed: %08x.\n", hr); + if (!context->viewport) goto error; + + hr = IDirect3DDevice2_AddViewport(context->device, context->viewport); + ok(hr == D3D_OK, "AddViewport returned %08x.\n", hr); + vp_data.dwSize = sizeof(vp_data); + vp_data.dwX = 0; + vp_data.dwY = 0; + vp_data.dwWidth = 256; + vp_data.dwHeight = 256; + vp_data.dvScaleX = 1; + vp_data.dvScaleY = 1; + vp_data.dvMaxX = 256; + vp_data.dvMaxY = 256; + vp_data.dvMinZ = 0; + vp_data.dvMaxZ = 1; + hr = IDirect3DViewport2_SetViewport(context->viewport, &vp_data); + ok(hr == D3D_OK, "SetViewport returned %08x.\n", hr); + + return TRUE; + +error: + d3d2_release_objects(context); + return FALSE; +} + +static void test_get_caps2(const struct d3d2_test_context *context) +{ + D3DDEVICEDESC hw_caps, hel_caps; + HRESULT hr; + unsigned int i; + + memset(&hw_caps, 0, sizeof(hw_caps)); + hw_caps.dwSize = sizeof(hw_caps); + hw_caps.dwFlags = 0xdeadbeef; + memset(&hel_caps, 0, sizeof(hel_caps)); + hel_caps.dwSize = sizeof(hel_caps); + hel_caps.dwFlags = 0xdeadc0de; + + /* NULL pointers */ + hr = IDirect3DDevice2_GetCaps(context->device, &hw_caps, NULL); + ok(hr == DDERR_INVALIDPARAMS, "GetCaps with NULL hel caps returned hr %#x, expected INVALIDPARAMS.\n", hr); + ok(hw_caps.dwFlags == 0xdeadbeef, "hw_caps.dwFlags was modified: %#x.\n", hw_caps.dwFlags); + hr = IDirect3DDevice2_GetCaps(context->device, NULL, &hel_caps); + ok(hr == DDERR_INVALIDPARAMS, "GetCaps with NULL hw caps returned hr %#x, expected INVALIDPARAMS.\n", hr); + ok(hel_caps.dwFlags == 0xdeadc0de, "hel_caps.dwFlags was modified: %#x.\n", hel_caps.dwFlags); + + /* Successful call: Both are modified */ + hr = IDirect3DDevice2_GetCaps(context->device, &hw_caps, &hel_caps); + ok(hr == D3D_OK, "GetCaps with correct size returned hr %#x, expected D3D_OK.\n", hr); + ok(hw_caps.dwFlags != 0xdeadbeef, "hw_caps.dwFlags was not modified: %#x.\n", hw_caps.dwFlags); + ok(hel_caps.dwFlags != 0xdeadc0de, "hel_caps.dwFlags was not modified: %#x.\n", hel_caps.dwFlags); + + memset(&hw_caps, 0, sizeof(hw_caps)); + hw_caps.dwSize = sizeof(hw_caps); + hw_caps.dwFlags = 0xdeadbeef; + memset(&hel_caps, 0, sizeof(hel_caps)); + /* Keep dwSize at 0 */ + hel_caps.dwFlags = 0xdeadc0de; + + /* If one is invalid the call fails */ + hr = IDirect3DDevice2_GetCaps(context->device, &hw_caps, &hel_caps); + ok(hr == DDERR_INVALIDPARAMS, "GetCaps with invalid hel_caps size returned hr %#x, expected INVALIDPARAMS.\n", hr); + ok(hw_caps.dwFlags == 0xdeadbeef, "hw_caps.dwFlags was modified: %#x.\n", hw_caps.dwFlags); + ok(hel_caps.dwFlags == 0xdeadc0de, "hel_caps.dwFlags was modified: %#x.\n", hel_caps.dwFlags); + hel_caps.dwSize = sizeof(hel_caps); + hw_caps.dwSize = sizeof(hw_caps) + 1; + hr = IDirect3DDevice2_GetCaps(context->device, &hw_caps, &hel_caps); + ok(hr == DDERR_INVALIDPARAMS, "GetCaps with invalid hw_caps size returned hr %#x, expected INVALIDPARAMS.\n", hr); + ok(hw_caps.dwFlags == 0xdeadbeef, "hw_caps.dwFlags was modified: %#x.\n", hw_caps.dwFlags); + ok(hel_caps.dwFlags == 0xdeadc0de, "hel_caps.dwFlags was modified: %#x.\n", hel_caps.dwFlags); + + for (i = 0; i < 1024; i++) + { + memset(&hw_caps, 0xfe, sizeof(hw_caps)); + memset(&hel_caps, 0xfe, sizeof(hel_caps)); + hw_caps.dwSize = hel_caps.dwSize = i; + hr = IDirect3DDevice2_GetCaps(context->device, &hw_caps, &hel_caps); + switch (i) + { + /* D3DDEVICEDESCSIZE in old sdk versions */ + case FIELD_OFFSET(D3DDEVICEDESC, dwMinTextureWidth): /* 172, DirectX 3, IDirect3DDevice1 */ + ok(hw_caps.dwMinTextureWidth == 0xfefefefe, "dwMinTextureWidth was modified: %#x.\n", + hw_caps.dwMinTextureWidth); + ok(hel_caps.dwMinTextureWidth == 0xfefefefe, "dwMinTextureWidth was modified: %#x.\n", + hel_caps.dwMinTextureWidth); + /* drop through */ + case FIELD_OFFSET(D3DDEVICEDESC, dwMaxTextureRepeat): /* 204, DirectX 5, IDirect3DDevice2 */ + ok(hw_caps.dwMaxTextureRepeat == 0xfefefefe, "dwMaxTextureRepeat was modified: %#x.\n", + hw_caps.dwMaxTextureRepeat); + ok(hel_caps.dwMaxTextureRepeat == 0xfefefefe, "dwMaxTextureRepeat was modified: %#x.\n", + hel_caps.dwMaxTextureRepeat); + /* drop through */ + case sizeof(D3DDEVICEDESC): /* 252, DirectX 6, IDirect3DDevice3 */ + ok(hr == D3D_OK, "GetCaps with size %u returned hr %#x, expected D3D_OK.\n", i, hr); + break; + + default: + ok(hr == DDERR_INVALIDPARAMS, + "GetCaps with size %u returned hr %#x, expected DDERR_INVALIDPARAMS.\n", i, hr); + break; + } + } + + /* Different valid sizes are OK */ + hw_caps.dwSize = 172; + hel_caps.dwSize = sizeof(D3DDEVICEDESC); + hr = IDirect3DDevice2_GetCaps(context->device, &hw_caps, &hel_caps); + ok(hr == D3D_OK, "GetCaps with different sizes returned hr %#x, expected D3D_OK.\n", hr); +} + START_TEST(d3d) { + struct d3d2_test_context d3d2_context; + void (* const d3d2_tests[])(const struct d3d2_test_context *) = + { + test_get_caps2 + }; + unsigned int i; + init_function_pointers(); if(!pDirectDrawCreateEx) { win_skip("function DirectDrawCreateEx not available\n"); @@ -5026,6 +5225,18 @@ START_TEST(d3d) ReleaseDirect3D(); } + for (i = 0; i < (sizeof(d3d2_tests) / sizeof(*d3d2_tests)); i++) + { + if (!d3d2_create_objects(&d3d2_context)) + { + ok(!i, "Unexpected d3d2 initialization failure.\n"); + skip("Skipping d3d2 tests.\n"); + break; + } + d3d2_tests[i](&d3d2_context); + d3d2_release_objects(&d3d2_context); + } + if (!D3D1_createObjects()) { skip("Skipping d3d1 tests\n"); } else {

1 0

Stefan Dösinger : wined3d: Remove the Apple NV_texture_shader quirk.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 6c423b106f0ac42cd9dab7101728841a54b17726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c423b106f0ac42cd9dab7101… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 6 00:03:03 2011 +0100 wined3d: Remove the Apple NV_texture_shader quirk. --- dlls/wined3d/directx.c | 21 --------------------- 1 files changed, 0 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 43cbc52..ece3b16 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -642,13 +642,6 @@ static BOOL match_allows_spec_alpha(const struct wined3d_gl_info *gl_info, const } } -static BOOL match_apple_nvts(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - if (!match_apple(gl_info, gl_renderer, gl_vendor, card_vendor, device)) return FALSE; - return gl_info->supported[NV_TEXTURE_SHADER]; -} - /* A GL context is provided by the caller */ static BOOL match_broken_nv_clip(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) @@ -876,12 +869,6 @@ static void quirk_allows_specular_alpha(struct wined3d_gl_info *gl_info) gl_info->quirks |= WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA; } -static void quirk_apple_nvts(struct wined3d_gl_info *gl_info) -{ - gl_info->supported[NV_TEXTURE_SHADER] = FALSE; - gl_info->supported[NV_TEXTURE_SHADER2] = FALSE; -} - static void quirk_disable_nvvp_clip(struct wined3d_gl_info *gl_info) { gl_info->quirks |= WINED3D_QUIRK_NV_CLIP_BROKEN; @@ -974,14 +961,6 @@ static const struct driver_quirk quirk_table[] = "Allow specular alpha quirk" }, { - /* The pixel formats provided by GL_NV_texture_shader are broken on OSX - * (rdar://5682521). - */ - match_apple_nvts, - quirk_apple_nvts, - "Apple NV_texture_shader disable" - }, - { match_broken_nv_clip, quirk_disable_nvvp_clip, "Apple NV_vertex_program clip bug quirk"

1 0

Stefan Dösinger : wined3d: Remove fglrx GLSL constant quirks.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: e4f91774ac3a783b3df44c7d47898d8f71b23e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4f91774ac3a783b3df44c7d4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 6 00:03:02 2011 +0100 wined3d: Remove fglrx GLSL constant quirks. Fglrx does not support r500 and earlier GPUs any longer, making those quirks obsolete and a problem for r300g. --- dlls/wined3d/directx.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e8cce94..43cbc52 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -807,8 +807,6 @@ static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) static void quirk_amd_dx9(struct wined3d_gl_info *gl_info) { - quirk_arb_constants(gl_info); - /* MacOS advertises GL_ARB_texture_non_power_of_two on ATI r500 and earlier cards, although * these cards only support GL_ARB_texture_rectangle(D3DPTEXTURECAPS_NONPOW2CONDITIONAL). * If real NP2 textures are used, the driver falls back to software. We could just remove the @@ -826,11 +824,6 @@ static void quirk_amd_dx9(struct wined3d_gl_info *gl_info) gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] = TRUE; } - - /* fglrx has the same structural issues as the one described in quirk_apple_glsl_constants, although - * it is generally more efficient. Reserve just 8 constants. */ - TRACE_(d3d_caps)("Reserving 8 GLSL constants for compiler private use.\n"); - gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 8); } static void quirk_no_np2(struct wined3d_gl_info *gl_info) @@ -932,7 +925,7 @@ static const struct driver_quirk quirk_table[] = { match_amd_r300_to_500, quirk_amd_dx9, - "AMD GLSL constant and normalized texrect quirk" + "AMD normalized texrect quirk" }, /* MacOS advertises more GLSL vertex shader uniforms than supported by the hardware, and if more are * used it falls back to software. While the compiler can detect if the shader uses all declared

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
81
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 December 2011