December 2011 - Wine-commits

Piotr Caban : msvcp90: Added _Locinfo:: _Getfalse and _Gettrue implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: dc1a38d38544b05790da6f027a6bcdead3f5536f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1a38d38544b05790da6f027… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:09:15 2011 +0100 msvcp90: Added _Locinfo::_Getfalse and _Gettrue implementation. --- dlls/msvcp90/locale.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index a668d18..ae270ae 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -951,8 +951,8 @@ const char* __thiscall _Locinfo__Getmonths(const _Locinfo *this) DEFINE_THISCALL_WRAPPER(_Locinfo__Getfalse, 4) const char* __thiscall _Locinfo__Getfalse(const _Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return "false"; } /* ?_Gettrue(a)_Locinfo@std@@QBEPBDXZ */ @@ -960,8 +960,8 @@ const char* __thiscall _Locinfo__Getfalse(const _Locinfo *this) DEFINE_THISCALL_WRAPPER(_Locinfo__Gettrue, 4) const char* __thiscall _Locinfo__Gettrue(const _Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return "true"; } /* ?_Getlconv(a)_Locinfo@std@@QBEPBUlconv@@XZ */

1 0

Piotr Caban : msvcp90: Added _Locinfo::_Getlconv implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 81434aabff472dd1797d3ee479f0ad67ef694884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81434aabff472dd1797d3ee47… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:09:28 2011 +0100 msvcp90: Added _Locinfo::_Getlconv implementation. --- dlls/msvcp90/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ae270ae..4e9e5a0 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -969,8 +969,8 @@ const char* __thiscall _Locinfo__Gettrue(const _Locinfo *this) DEFINE_THISCALL_WRAPPER(_Locinfo__Getlconv, 4) const struct lconv* __thiscall _Locinfo__Getlconv(const _Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return localeconv(); } /* ?_Getname(a)_Locinfo@std@@QBE?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */

1 0

Piotr Caban : msvcp90: Added _Locinfo::_Getname implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 91c6a55c2cc7ddc873ed17b1272135d5185a3393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c6a55c2cc7ddc873ed17b12… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:09:41 2011 +0100 msvcp90: Added _Locinfo::_Getname implementation. --- dlls/msvcp90/locale.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 4e9e5a0..1a637c0 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -978,8 +978,11 @@ const struct lconv* __thiscall _Locinfo__Getlconv(const _Locinfo *this) DEFINE_THISCALL_WRAPPER_RETPTR(_Locinfo__Getname, 4) basic_string_char __thiscall _Locinfo__Getname(const _Locinfo *this) { - basic_string_char ret = { 0 }; /* FIXME */ - FIXME("(%p) stub\n", this); + basic_string_char ret; + + TRACE("(%p)\n", this); + + MSVCP_basic_string_char_copy_ctor(&ret, &this->newlocname); return ret; }

1 0

Piotr Caban : msvcp90: Added _Locinfo::_Getdays implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 0c7ed2bdda62ee6da5a7a39f8bc4b826d41b5f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7ed2bdda62ee6da5a7a39f8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:09:54 2011 +0100 msvcp90: Added _Locinfo::_Getdays implementation. --- dlls/msvcp90/locale.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1a637c0..1163b31 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -28,6 +28,8 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +char* __cdecl _Getdays(void); + typedef int category; typedef struct _locale_id { @@ -931,10 +933,20 @@ int __thiscall _Locinfo__Getdateorder(const _Locinfo *this) /* ?_Getdays(a)_Locinfo@std@@QBEPBDXZ */ /* ?_Getdays(a)_Locinfo@std@@QEBAPEBDXZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getdays, 4) -const char* __thiscall _Locinfo__Getdays(const _Locinfo *this) +const char* __thiscall _Locinfo__Getdays(_Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + char *days = _Getdays(); + + TRACE("(%p)\n", this); + + if(days) { + MSVCP_basic_string_char_dtor(&this->days); + MSVCP_basic_string_char_ctor_cstr(&this->days, days); + free(days); + } + + return this->days.size ? MSVCP_basic_string_char_c_str(&this->days) : + ":Sun:Sunday:Mon:Monday:Tue:Tuesday:Wed:Wednesday:Thu:Thursday:Fri:Friday:Sat:Saturday"; } /* ?_Getmonths(a)_Locinfo@std@@QBEPBDXZ */

1 0

Piotr Caban : msvcp90: Added _Locinfo::_Getmonths implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 462fa62c535bf979274382d226110e5e1b6a7249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=462fa62c535bf979274382d22… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:10:12 2011 +0100 msvcp90: Added _Locinfo::_Getmonths implementation. --- dlls/msvcp90/locale.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1163b31..d0e5616 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); char* __cdecl _Getdays(void); +char* __cdecl _Getmonths(void); typedef int category; @@ -952,10 +953,21 @@ const char* __thiscall _Locinfo__Getdays(_Locinfo *this) /* ?_Getmonths(a)_Locinfo@std@@QBEPBDXZ */ /* ?_Getmonths(a)_Locinfo@std@@QEBAPEBDXZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getmonths, 4) -const char* __thiscall _Locinfo__Getmonths(const _Locinfo *this) +const char* __thiscall _Locinfo__Getmonths(_Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + char *months = _Getmonths(); + + TRACE("(%p)\n", this); + + if(months) { + MSVCP_basic_string_char_dtor(&this->months); + MSVCP_basic_string_char_ctor_cstr(&this->months, months); + free(months); + } + + return this->months.size ? MSVCP_basic_string_char_c_str(&this->months) : + ":Jan:January:Feb:February:Mar:March:Apr:April:May:May:Jun:June:Jul:July" + ":Aug:August:Sep:September:Oct:October:Nov:November:Dec:December"; } /* ?_Getfalse(a)_Locinfo@std@@QBEPBDXZ */

1 0

Piotr Caban : msvcp90: Added _Locinfo::_Gettnames implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 451f9b9cc086f5b424523348f816a4b7495580a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451f9b9cc086f5b424523348f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:10:26 2011 +0100 msvcp90: Added _Locinfo::_Gettnames implementation. --- dlls/msvcp90/locale.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index d0e5616..27687ba 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); char* __cdecl _Getdays(void); char* __cdecl _Getmonths(void); +void* __cdecl _Gettnames(void); typedef int category; @@ -692,7 +693,7 @@ DEFINE_THISCALL_WRAPPER(_Timevec_dtor, 4) void __thiscall _Timevec_dtor(_Timevec *this) { TRACE("(%p)\n", this); - MSVCRT_operator_delete(this->timeptr); + free(this->timeptr); } /* ??4_Timevec(a)std@@QAEAAV01(a)ABV01@@Z */ @@ -1015,7 +1016,10 @@ basic_string_char __thiscall _Locinfo__Getname(const _Locinfo *this) DEFINE_THISCALL_WRAPPER(_Locinfo__Gettnames, 4) _Timevec __thiscall _Locinfo__Gettnames(const _Locinfo *this) { - _Timevec ret = { 0 }; /* FIXME */ - FIXME("(%p) stub\n", this); + _Timevec ret; + + TRACE("(%p)\n", this); + + _Timevec_ctor_timeptr(&ret, _Gettnames()); return ret; }

1 0

Stefan Dösinger : ddraw/tests: Make the SetSurfaceDesc test ok messages consistent.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: b2ca7e37f48c0592f063db77f17187fd58f0e4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ca7e37f48c0592f063db77f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 8 00:13:03 2011 +0100 ddraw/tests: Make the SetSurfaceDesc test ok messages consistent. --- dlls/ddraw/tests/dsurface.c | 42 ++++++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 9bf5643..45aa602 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4502,29 +4502,27 @@ static void set_surface_desc_test(void) ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); - ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "CreateSurface failed, hr %#x.\n", hr); hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **) &surface3); - ok(SUCCEEDED(hr), "IDirectDrawSurface_QueryInterface failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); IDirectDrawSurface_Release(surface); reset_ddsd(&ddsd); ddsd.dwFlags = DDSD_LPSURFACE; ddsd.lpSurface = data; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(SUCCEEDED(hr), "IDirectDrawSurface3_SetSurfaceDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetSurfaceDesc failed, hr %#x.\n", hr); /* Redundantly setting the same lpSurface is not an error */ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(SUCCEEDED(hr), "IDirectDrawSurface3_SetSurfaceDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetSurfaceDesc failed, hr %#x.\n", hr); hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 1); - ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface3_SetSurfaceDesc returned %#x, expected" - " DDERR_INVALIDPARAMS(%#x)\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, NULL, 0); - ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface3_SetSurfaceDesc returned %#x, expected" - " DDERR_INVALIDPARAMS(%#x)\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); IDirectDrawSurface_Release(surface3); @@ -4541,12 +4539,12 @@ static void set_surface_desc_test(void) ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); - ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "CreateSurface failed, hr %#x.\n", hr); hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **) &surface3); - ok(SUCCEEDED(hr), "IDirectDrawSurface_QueryInterface failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); IDirectDrawSurface_Release(surface); hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); - ok(SUCCEEDED(hr), "IDirectDrawSurface3_GetSurfaceDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetSurfaceDesc failed, hr %#x.\n", hr); old_pitch = U1(ddsd).lPitch; /* Setting width and height is an error */ @@ -4555,31 +4553,31 @@ static void set_surface_desc_test(void) ddsd.dwWidth = 16; ddsd.dwHeight = 16; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); ddsd.lpSurface = data; ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_LPSURFACE; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); reset_ddsd(&ddsd); hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); - ok(SUCCEEDED(hr), "IDirectDrawSurface3_GetSurfaceDesc failed, hr %#x.\n", hr); - ok(ddsd.dwWidth == 8, "SetSurfaceDesc: Expected width 8, got %u\n", ddsd.dwWidth); - ok(ddsd.dwHeight == 8, "SetSurfaceDesc: Expected height 8, got %u\n", ddsd.dwHeight); + ok(SUCCEEDED(hr), "GetSurfaceDesc failed, hr %#x.\n", hr); + ok(ddsd.dwWidth == 8, "SetSurfaceDesc: Expected width 8, got %u.\n", ddsd.dwWidth); + ok(ddsd.dwHeight == 8, "SetSurfaceDesc: Expected height 8, got %u.\n", ddsd.dwHeight); /* Setting the pitch is an error */ reset_ddsd(&ddsd); ddsd.dwFlags = DDSD_PITCH; U1(ddsd).lPitch = 1024; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); ddsd.dwFlags = DDSD_PITCH | DDSD_LPSURFACE; ddsd.lpSurface = data; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); U1(ddsd).lPitch = old_pitch; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); /* Setting the pixelformat without lpsurface is an error, but with LPSURFACE it works */ reset_ddsd(&ddsd); @@ -4591,11 +4589,11 @@ static void set_surface_desc_test(void) U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_LPSURFACE; ddsd.lpSurface = data; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DD_OK, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DD_OK); + ok(hr == DD_OK, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DD_OK); /* Can't set color keys */ reset_ddsd(&ddsd); @@ -4603,7 +4601,7 @@ static void set_surface_desc_test(void) ddsd.ddckCKSrcBlt.dwColorSpaceLowValue = 0x00ff0000; ddsd.ddckCKSrcBlt.dwColorSpaceHighValue = 0x00ff0000; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); IDirectDrawSurface_Release(surface3); }

1 0

Stefan Dösinger : ddraw: SetSurfaceDesc can set width, height and pitch under certain conditions.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 481e2f336685cdbc6a14b0ebf9274bb98cbe5cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=481e2f336685cdbc6a14b0ebf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 8 15:59:06 2011 +0100 ddraw: SetSurfaceDesc can set width, height and pitch under certain conditions. --- dlls/ddraw/surface.c | 53 +++++++++++++++- dlls/ddraw/tests/dsurface.c | 151 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 190 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=481e2f336685cdbc6a14b…

1 0

Stefan Dösinger : ddraw/tests: Extend the CreateSurface(NULL test), use own function.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 9cf25006adf37387c8dfad25839c1a00aa8b2ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf25006adf37387c8dfad258… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 8 15:59:07 2011 +0100 ddraw/tests: Extend the CreateSurface(NULL test), use own function. --- dlls/ddraw/tests/dsurface.c | 64 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 0aabaad..32af27e 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -29,6 +29,8 @@ #include "d3d.h" #include "unknwn.h" +static HRESULT (WINAPI *pDirectDrawCreateEx)(GUID *, void **, REFIID, IUnknown *); + static LPDIRECTDRAW lpDD = NULL; static DDCAPS ddcaps; @@ -4484,10 +4486,6 @@ static void set_surface_desc_test(void) IDirectDrawSurface3 *surface3; BYTE data[16*16*4]; - hr = IDirectDraw_CreateSurface(lpDD, NULL, &surface, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface with a NULL DDSD returned %#x," - " expected DDERR_INVALIDPARAMS(%#x)\n", hr, DDERR_INVALIDPARAMS); - reset_ddsd(&ddsd); ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; ddsd.dwWidth = 8; @@ -4909,11 +4907,68 @@ static void partial_block_lock_test(void) IDirectDraw7_Release(dd7); } +static void create_surface_test(void) +{ + HRESULT hr; + IDirectDraw2 *ddraw2; + IDirectDraw4 *ddraw4; + IDirectDraw7 *ddraw7; + IDirectDrawSurface *surface; + IDirectDrawSurface4 *surface4; + IDirectDrawSurface7 *surface7; + + hr = IDirectDraw_CreateSurface(lpDD, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," + " expected %#x.\n", hr, DDERR_INVALIDPARAMS); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &ddraw2); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); + + hr = IDirectDraw2_CreateSurface(ddraw2, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," + " expected %#x.\n", hr, DDERR_INVALIDPARAMS); + + IDirectDraw2_Release(ddraw2); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &ddraw4); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); + + hr = IDirectDraw4_CreateSurface(ddraw4, NULL, &surface4, NULL); + ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," + " expected %#x.\n", hr, DDERR_INVALIDPARAMS); + + IDirectDraw4_Release(ddraw4); + + if (!pDirectDrawCreateEx) + { + skip("DirectDrawCreateEx not available, skipping IDirectDraw7 tests.\n"); + return; + } + hr = pDirectDrawCreateEx(NULL, (void **) &ddraw7, &IID_IDirectDraw7, NULL); + ok(SUCCEEDED(hr), "DirectDrawCreateEx failed, hr %#x.\n", hr); + + hr = IDirectDraw7_CreateSurface(ddraw7, NULL, &surface7, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "CreateSurface(ddsd=NULL, pre-SCL) returned %#x," + " expected %#x.\n", hr, DDERR_NOCOOPERATIVELEVELSET); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, NULL, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + + hr = IDirectDraw7_CreateSurface(ddraw7, NULL, &surface7, NULL); + ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," + " expected %#x.\n", hr, DDERR_INVALIDPARAMS); + + IDirectDraw7_Release(ddraw7); +} + START_TEST(dsurface) { HRESULT ret; IDirectDraw4 *dd4; + HMODULE ddraw_mod = GetModuleHandleA("ddraw.dll"); + pDirectDrawCreateEx = (void *) GetProcAddress(ddraw_mod, "DirectDrawCreateEx"); + if (!CreateDirectDraw()) return; @@ -4970,5 +5025,6 @@ START_TEST(dsurface) pixelformat_flag_test(); set_surface_desc_test(); partial_block_lock_test(); + create_surface_test(); ReleaseDirectDraw(); }

1 0

Aric Stewart : usp10: Some Indic scripts, Sinhala, want GDEF to set glyph properties.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 7b95ac82380e49c829f0cd2683376d608e3d5479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b95ac82380e49c829f0cd268… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 8 10:02:08 2011 -0600 usp10: Some Indic scripts, Sinhala, want GDEF to set glyph properties. --- dlls/usp10/shape.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 4ee658e..7a3df27 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3255,7 +3255,7 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS } } -static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp, lexical_function lexical, BOOL use_syllables) +static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp, lexical_function lexical, BOOL use_syllables, BOOL override_gsub) { int i,k; @@ -3274,9 +3274,12 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL } } - /* Indic scripts do not set fDiacritic or fZeroWidth */ - pGlyphProp[i].sva.fDiacritic = FALSE; - pGlyphProp[i].sva.fZeroWidth = FALSE; + if (override_gsub) + { + /* Most indic scripts do not set fDiacritic or fZeroWidth */ + pGlyphProp[i].sva.fDiacritic = FALSE; + pGlyphProp[i].sva.fZeroWidth = FALSE; + } if (char_count == 0) continue; @@ -3344,52 +3347,52 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL static void ShapeCharGlyphProp_Sinhala( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, sinhala_lex, FALSE); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, sinhala_lex, FALSE, FALSE); } static void ShapeCharGlyphProp_Devanagari( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, devanagari_lex, TRUE); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, devanagari_lex, TRUE, TRUE); } static void ShapeCharGlyphProp_Bengali( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, bengali_lex, TRUE); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, bengali_lex, TRUE, TRUE); } static void ShapeCharGlyphProp_Gurmukhi( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, gurmukhi_lex, TRUE); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, gurmukhi_lex, TRUE, TRUE); } static void ShapeCharGlyphProp_Gujarati( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, gujarati_lex, TRUE); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, gujarati_lex, TRUE, TRUE); } static void ShapeCharGlyphProp_Oriya( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, oriya_lex, TRUE); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, oriya_lex, TRUE, TRUE); } static void ShapeCharGlyphProp_Tamil( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, tamil_lex, TRUE); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, tamil_lex, TRUE, TRUE); } static void ShapeCharGlyphProp_Telugu( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, telugu_lex, TRUE); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, telugu_lex, TRUE, TRUE); } static void ShapeCharGlyphProp_Kannada( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, kannada_lex, TRUE); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, kannada_lex, TRUE, TRUE); } static void ShapeCharGlyphProp_Malayalam( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, malayalam_lex, TRUE); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, malayalam_lex, TRUE, TRUE); } void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp)

1 0