wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Piotr Caban : msvcp90: Added wctrans and towctrans tests.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: a497d36a62637cb022ed02e36e1bc4a09c2947da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a497d36a62637cb022ed02e36… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 10:53:47 2012 +0100 msvcp90: Added wctrans and towctrans tests. --- dlls/msvcp90/tests/misc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 5188fd5..2cb7380 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -18,6 +18,7 @@ #include <stdio.h> #include <locale.h> +#include <wctype.h> #include <windef.h> #include <winbase.h> @@ -66,6 +67,8 @@ static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); static /*MSVCP__Collvec*/ULONGLONG (__cdecl *p__Getcoll)(void); +static wctrans_t (__cdecl *p_wctrans)(const char*); +static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); #undef __thiscall #ifdef __i386__ @@ -188,6 +191,8 @@ static BOOL init(void) SET(p_wctype, "wctype"); SET(p__Getctype, "_Getctype"); SET(p__Getcoll, "_Getcoll"); + SET(p_wctrans, "wctrans"); + SET(p_towctrans, "towctrans"); SET(basic_ostringstream_char_vbtable, "??_8?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAEADAEBD@Z"); @@ -440,6 +445,37 @@ static void test__Getcoll(void) ok(ret.collvec.page == 0, "ret.page = %x\n", ret.collvec.page); } +static void test_towctrans(void) +{ + wchar_t ret; + + ret = p_wctrans("tolower"); + ok(ret == 2, "wctrans returned %d, expected 2\n", ret); + ret = p_wctrans("toupper"); + ok(ret == 1, "wctrans returned %d, expected 1\n", ret); + ret = p_wctrans("toLower"); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + ret = p_wctrans(""); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + if(0) { /* crashes on windows */ + ret = p_wctrans(NULL); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + } + + ret = p_towctrans('t', 2); + ok(ret == 't', "towctrans('t', 2) returned %c, expected t\n", ret); + ret = p_towctrans('T', 2); + ok(ret == 't', "towctrans('T', 2) returned %c, expected t\n", ret); + ret = p_towctrans('T', 0); + ok(ret == 't', "towctrans('T', 0) returned %c, expected t\n", ret); + ret = p_towctrans('T', 3); + ok(ret == 't', "towctrans('T', 3) returned %c, expected t\n", ret); + ret = p_towctrans('t', 1); + ok(ret == 'T', "towctrans('t', 1) returned %c, expected T\n", ret); + ret = p_towctrans('T', 1); + ok(ret == 'T', "towctrans('T', 1) returned %c, expected T\n", ret); +} + static void test_allocator_char(void) { void *allocator = (void*)0xdeadbeef; @@ -525,6 +561,7 @@ START_TEST(misc) test_wctype(); test__Getctype(); test__Getcoll(); + test_towctrans(); test_virtual_call(); test_virtual_base_dtors();

1 0

Piotr Caban : msvcp90: Added wctrans and towctrans implementation.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: a71acb30764077e376d7c489994f2245308fe9ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71acb30764077e376d7c4899… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 10:53:37 2012 +0100 msvcp90: Added wctrans and towctrans implementation. --- dlls/msvcp90/locale.c | 22 ++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- include/msvcrt/wctype.h | 5 +++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 31beeee..c3f48d9 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -26,6 +26,7 @@ #include "limits.h" #include "math.h" #include "stdio.h" +#include "wctype.h" #include "wine/list.h" @@ -8541,6 +8542,27 @@ locale* __cdecl locale_global(locale *ret, const locale *loc) return ret; } +/* wctrans */ +wctrans_t __cdecl wctrans(const char *property) +{ + static const char str_tolower[] = "tolower"; + static const char str_toupper[] = "toupper"; + + if(!strcmp(property, str_tolower)) + return 2; + if(!strcmp(property, str_toupper)) + return 1; + return 0; +} + +/* towctrans */ +wint_t __cdecl towctrans(wint_t c, wctrans_t category) +{ + if(category == 1) + return towupper(c); + return towlower(c); +} + DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet@locale@std@@"); DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate@D@std@@"); DEFINE_RTTI_DATA1(collate_wchar, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate@_W@std@@"); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 742f162..e512acb 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5807,8 +5807,8 @@ @ stub _Wcsxfrm # extern _Xbig @ stub __Wcrtomb_lk -@ stub towctrans -@ stub wctrans +@ cdecl towctrans(long long) +@ cdecl wctrans(str) @ cdecl wctype(str) #Functions not exported in native dll: diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h index d6bed60..81c2e22 100644 --- a/include/msvcrt/wctype.h +++ b/include/msvcrt/wctype.h @@ -68,6 +68,11 @@ wchar_t __cdecl towlower(wchar_t); wchar_t __cdecl towupper(wchar_t); #endif /* _WCTYPE_DEFINED */ +typedef wchar_t wctrans_t; +wint_t __cdecl towctrans(wint_t,wctrans_t); +wctrans_t __cdecl wctrans(const char *); +wctype_t __cdecl wctype(const char *); + #ifdef __cplusplus } #endif

1 0

Piotr Caban : msvcp80: Forward functions that are using String_iterators to msvcp90.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 965543acff6ec3c939385561589e95bd802eada5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965543acff6ec3c9393855615… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 10:53:09 2012 +0100 msvcp80: Forward functions that are using String_iterators to msvcp90. --- dlls/msvcp80/msvcp80.spec | 132 ++++++++++++++++++++++---------------------- 1 files changed, 66 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=965543acff6ec3c939385…

1 0

Huw Davies : winspool: Pre-1. 6 versions of CUPS can leave behind a file when cupsGetPDD3 fails, so clear up afterwards.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 02d41b7b1a605dfbb42f2d13225dc05549bf61f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d41b7b1a605dfbb42f2d132… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 16 09:53:14 2012 +0000 winspool: Pre-1.6 versions of CUPS can leave behind a file when cupsGetPDD3 fails, so clear up afterwards. --- dlls/winspool.drv/info.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index af336cb..172f892 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -833,11 +833,14 @@ static BOOL get_cups_ppd( const char *printer_name, const WCHAR *ppd ) http_status = cupsGetPPD3_wrapper( 0, printer_name, &modtime, unix_name, strlen( unix_name ) + 1 ); + + if (http_status != HTTP_OK) unlink( unix_name ); HeapFree( GetProcessHeap(), 0, unix_name ); if (http_status == HTTP_OK) return TRUE; - TRACE( "failed to get ppd for printer %s from cups, calling fallback\n", debugstr_a(printer_name) ); + TRACE( "failed to get ppd for printer %s from cups (status %d), calling fallback\n", + debugstr_a(printer_name), http_status ); return get_fallback_ppd( printer_name, ppd ); }

1 0

Jacek Caban : cmd: Added HeapFree wrapper.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 08c17ada571c359d018079eae560b731495bbfdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c17ada571c359d018079eae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 16 10:37:39 2012 +0100 cmd: Added HeapFree wrapper. --- programs/cmd/batch.c | 6 +++--- programs/cmd/builtins.c | 38 +++++++++++++++++++------------------- programs/cmd/directory.c | 20 ++++++++++---------- programs/cmd/wcmd.h | 5 +++++ programs/cmd/wcmdmain.c | 36 ++++++++++++++++++------------------ 5 files changed, 55 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08c17ada571c359d01807…

1 0

Austin English : secur32: Get rid of deprecated types.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 62e77128c57d33d0d42a956e87b8ee251a31848d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e77128c57d33d0d42a956e8… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 15 19:53:36 2012 -0800 secur32: Get rid of deprecated types. --- dlls/secur32/schannel_gnutls.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 16ce0de..bb481b7 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -129,7 +129,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, } err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, - (gnutls_certificate_credentials)cred); + (gnutls_certificate_credentials_t)cred); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -409,7 +409,7 @@ BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credential void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) { - pgnutls_certificate_free_credentials((gnutls_certificate_credentials)c); + pgnutls_certificate_free_credentials((gnutls_certificate_credentials_t)c); } static void schan_gnutls_log(int level, const char *msg)

1 0

Henri Verbeet : d3d9/tests: Also test that render states get reset in test_reset().
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: b52118d53dca8da5d64ee211425ca9317692a627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b52118d53dca8da5d64ee2114… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:54 2012 +0100 d3d9/tests: Also test that render states get reset in test_reset(). --- dlls/d3d9/tests/device.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 614538a..fd3fd30 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -876,6 +876,7 @@ static void test_reset(void) IDirect3DDevice9 *device1 = NULL; IDirect3DDevice9 *device2 = NULL; D3DCAPS9 caps; + DWORD value; struct { UINT w; @@ -976,6 +977,12 @@ static void test_reset(void) hr = IDirect3DDevice9_SetViewport(device1, &vp); ok(hr == D3D_OK, "IDirect3DDevice9_SetViewport failed with %08x\n", hr); + hr = IDirect3DDevice9_GetRenderState(device1, D3DRS_LIGHTING, &value); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(!!value, "Got unexpected value %#x for D3DRS_LIGHTING.\n", value); + hr = IDirect3DDevice9_SetRenderState(device1, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; @@ -987,6 +994,10 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(device1); ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); + hr = IDirect3DDevice9_GetRenderState(device1, D3DRS_LIGHTING, &value); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(!!value, "Got unexpected value %#x for D3DRS_LIGHTING.\n", value); + ZeroMemory(&vp, sizeof(vp)); hr = IDirect3DDevice9_GetViewport(device1, &vp); ok(hr == D3D_OK, "IDirect3DDevice9_GetViewport failed with %08x\n", hr);

1 0

Henri Verbeet : d3d8/tests: Also test that render states get reset in test_reset().
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: f94f753e51ffc2362fa013cb46326cdf7a87514f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94f753e51ffc2362fa013cb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:53 2012 +0100 d3d8/tests: Also test that render states get reset in test_reset(). --- dlls/d3d8/tests/device.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b98a84a..e41aeb3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1022,6 +1022,7 @@ static void test_reset(void) D3DVIEWPORT8 vp; D3DCAPS8 caps; DWORD shader; + DWORD value; HRESULT hr; UINT i; @@ -1141,6 +1142,12 @@ static void test_reset(void) hr = IDirect3DDevice8_SetViewport(device1, &vp); ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderState(device1, D3DRS_LIGHTING, &value); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(!!value, "Got unexpected value %#x for D3DRS_LIGHTING.\n", value); + hr = IDirect3DDevice8_SetRenderState(device1, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; @@ -1152,6 +1159,10 @@ static void test_reset(void) hr = IDirect3DDevice8_TestCooperativeLevel(device1); ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderState(device1, D3DRS_LIGHTING, &value); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(!!value, "Got unexpected value %#x for D3DRS_LIGHTING.\n", value); + memset(&vp, 0, sizeof(vp)); hr = IDirect3DDevice8_GetViewport(device1, &vp); ok(SUCCEEDED(hr), "GetViewport failed, hr %#x.\n", hr);

1 0

Henri Verbeet : wined3d: Make state_geometry_shader() static.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: ffd892f6ddf021253e3d01df71a9c9c75a34571b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd892f6ddf021253e3d01df7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:52 2012 +0100 wined3d: Make state_geometry_shader() static. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2376527..9b5d875 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3760,7 +3760,7 @@ void apply_pixelshader(struct wined3d_context *context, const struct wined3d_sta context->load_constants = 1; } -void state_geometry_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void state_geometry_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { context->select_shader = 1; }

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3D3.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: ea4ae09c863264ad82d392cc3b55291a32d58cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4ae09c863264ad82d392cc3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:51 2012 +0100 ddraw: Avoid LPDIRECT3D3. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index d321846..f1b9e2d 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1155,7 +1155,7 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMPIXELFORMATSCALLBACK lpD3DEnumPixelProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; - STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D3 *lplpDirect3D3) PURE; + STDMETHOD(GetDirect3D)(THIS_ IDirect3D3 **d3d) PURE; /*** DrawPrimitive API ***/ STDMETHOD(SetCurrentViewport)(THIS_ IDirect3DViewport3 *viewport) PURE; STDMETHOD(GetCurrentViewport)(THIS_ IDirect3DViewport3 **viewport) PURE;

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
71
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 November 2012