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

Aric Stewart : mlang: A very basic implementation of the IMLangLineBreakConsole interface and IMLangString interface .
by Alexandre Julliard July 22, 2008

July 22, 2008

Module: wine Branch: master Commit: 75d44fe46d51a03271ba71f1e0d7fd001a56a6d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d44fe46d51a03271ba71f1e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 22 10:01:49 2008 +0900 mlang: A very basic implementation of the IMLangLineBreakConsole interface and IMLangString interface. --- dlls/mlang/mlang.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mlang.idl | 88 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 180 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 0920178..ad3ae9f 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -962,6 +962,7 @@ typedef struct tagMLang_impl const IMultiLanguageVtbl *vtbl_IMultiLanguage; const IMultiLanguage3Vtbl *vtbl_IMultiLanguage3; const IMLangFontLink2Vtbl *vtbl_IMLangFontLink2; + const IMLangLineBreakConsoleVtbl *vtbl_IMLangLineBreakConsole; LONG ref; DWORD total_cp, total_scripts; } MLang_impl; @@ -1035,6 +1036,15 @@ static HRESULT WINAPI MLang_QueryInterface( return S_OK; } + if (IsEqualGUID(riid, &IID_IMLangLineBreakConsole)) + { + MLang_AddRef(This); + TRACE("Returning IID_IMLangLineBreakConsole %p ref = %d\n", This, This->ref); + *ppvObject = &(This->vtbl_IMLangLineBreakConsole); + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); return E_NOINTERFACE; } @@ -2696,6 +2706,87 @@ static const IMLangFontLink2Vtbl IMLangFontLink2_vtbl = fnIMLangFontLink2_CodePageToScriptID }; +/******************************************************************************/ + +static HRESULT WINAPI fnIMLangLineBreakConsole_QueryInterface( + IMLangLineBreakConsole* iface, + REFIID riid, + void** ppvObject) +{ + ICOM_THIS_MULTI(MLang_impl, vtbl_IMLangLineBreakConsole, iface); + return MLang_QueryInterface( This, riid, ppvObject ); +} + +static ULONG WINAPI fnIMLangLineBreakConsole_AddRef( + IMLangLineBreakConsole* iface ) +{ + ICOM_THIS_MULTI(MLang_impl, vtbl_IMLangLineBreakConsole, iface); + return MLang_AddRef( This ); +} + +static ULONG WINAPI fnIMLangLineBreakConsole_Release( + IMLangLineBreakConsole* iface ) +{ + ICOM_THIS_MULTI(MLang_impl, vtbl_IMLangLineBreakConsole, iface); + return MLang_Release( This ); +} + +static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineML( + IMLangLineBreakConsole* iface, + IMLangString* pSrcMLStr, + long lSrcPos, + long lSrcLen, + long cMinColumns, + long cMaxColumns, + long* plLineLen, + long* plSkipLen) +{ + FIXME("(%p)->%p %li %li %li %li %p %p\n", iface, pSrcMLStr, lSrcPos, lSrcLen, cMinColumns, cMaxColumns, plLineLen, plSkipLen); + return E_NOTIMPL; +} + +static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineW( + IMLangLineBreakConsole* iface, + LCID locale, + const WCHAR* pszSrc, + long cchSrc, + long cMaxColumns, + long* pcchLine, + long* pcchSkip ) +{ + FIXME("(%p)->%i %s %li %li %p %p\n", iface, locale, debugstr_wn(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); + + *pcchLine = cchSrc; + *pcchSkip = 0; + return S_OK; +} + +static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineA( + IMLangLineBreakConsole* iface, + LCID locale, + UINT uCodePage, + const CHAR* pszSrc, + long cchSrc, + long cMaxColumns, + long* pcchLine, + long* pcchSkip) +{ + FIXME("(%p)->%i %i %s %li %li %p %p\n", iface, locale, uCodePage, debugstr_an(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); + + *pcchLine = cchSrc; + *pcchSkip = 0; + return S_OK; +} + +static const IMLangLineBreakConsoleVtbl IMLangLineBreakConsole_vtbl = +{ + fnIMLangLineBreakConsole_QueryInterface, + fnIMLangLineBreakConsole_AddRef, + fnIMLangLineBreakConsole_Release, + fnIMLangLineBreakConsole_BreakLineML, + fnIMLangLineBreakConsole_BreakLineW, + fnIMLangLineBreakConsole_BreakLineA +}; static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) { @@ -2712,6 +2803,7 @@ static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) mlang->vtbl_IMultiLanguage = &IMultiLanguage_vtbl; mlang->vtbl_IMultiLanguage3 = &IMultiLanguage3_vtbl; mlang->vtbl_IMLangFontLink2 = &IMLangFontLink2_vtbl; + mlang->vtbl_IMLangLineBreakConsole = &IMLangLineBreakConsole_vtbl; mlang->total_cp = 0; for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) diff --git a/include/mlang.idl b/include/mlang.idl index fabcc59..2b236c7 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -222,6 +222,94 @@ interface IMLangFontLink2 : IMLangCodePages } [ + object, + uuid(c04d65ce-b70d-11d0-b188-00aa0038c969), + pointer_default(unique) +] +interface IMLangString : IUnknown +{ +#ifdef NEWMLSTR + HRESULT LockMLStr( + [in] long lPos, + [in] DWORD dwFlags, + [out] DWORD* pdwCookie, + [out] long* plActualPos, + [out] long* plActualLen); + + HRESULT UnlockMLStr( + [in] DWORD dwCookie); +#else + HRESULT Sync( + [in] BOOL fNoAccess); +#endif + HRESULT GetLength( + [out, retval] long* plLen); + HRESULT SetMLStr( + [in] long lDestPos, + [in] long lDestLen, + [in] IUnknown *pSrcMLStr, + [in] long lSrcPos, + [in] long lSrcLen); +#ifdef NEWMLSTR + HRESULT RegisterAttr( + [in] IUnknown *pUnk, + [out] DWORD* pdwCookie); + HRESULT UnregisterAttr( + [in] DWORD dwCookie); + HRESULT EnumAttr( + [out] IEnumUnknown **ppEnumUnk); + HRESULT FindAttr( + [in] REFIID riid, + [in] LPARAM lParam, + [out] IUnknown **ppUnk); +#else + HRESULT GetMLStr( + [in] long lSrcPos, + [in] long lSrcLen, + [in] IUnknown *pUnkOuter, + [in] DWORD dwClsContext, + [in] const IID* piid, + [out] IUnknown** ppDestMLStr, + [out] long* plDestPos, + [out] long* plDestLen); +#endif +} + +[ + object, + uuid(f5be2ee1-bfd7-11d0-b188-00aa0038c969), + pointer_default(unique) +] +interface IMLangLineBreakConsole : IUnknown +{ + HRESULT BreakLineML( + [in] IMLangString* pSrcMLStr, + [in] long lSrcPos, + [in] long lSrcLen, + [in] long cMinColumns, + [in] long cMaxColumns, + [out] long* plLineLen, + [out] long* plSkipLen); + + HRESULT BreakLineW( + [in] LCID locale, + [in, size_is(cchSrc)] const WCHAR* pszSrc, + [in] long cchSrc, + [in] long cMaxColumns, + [out] long* pcchLine, + [out] long* pcchSkip ); + + HRESULT BreakLineA( + [in] LCID locale, + [in] UINT uCodePage, + [in, size_is(cchSrc)] const CHAR* pszSrc, + [in] long cchSrc, + [in] long cMaxColumns, + [out] long* pcchLine, + [out] long* pcchSkip); +} + +[ object, uuid(275c23e3-3747-11d0-9fea-00aa003f8646), pointer_default(unique)

1 0

Alexander Nicolaysen Sørnes : dpnet: Register DirectPlay8ThreadPool object.
by Alexandre Julliard July 22, 2008

July 22, 2008

Module: wine Branch: master Commit: 0b728a0bb0808dfe4acb8b1a8f0cc210231830f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b728a0bb0808dfe4acb8b1a8… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jul 21 17:34:26 2008 +0200 dpnet: Register DirectPlay8ThreadPool object. --- dlls/dpnet/regsvr.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/dpnet/regsvr.c b/dlls/dpnet/regsvr.c index 12b52f8..578d1ea 100644 --- a/dlls/dpnet/regsvr.c +++ b/dlls/dpnet/regsvr.c @@ -491,6 +491,16 @@ static struct regsvr_coclass const coclass_list[] = { "DirectPlay8.LobbiedApplication", NULL }, + { + &CLSID_DirectPlay8ThreadPool, + "DirectPlay8 Thread Pool Object", + NULL, + "dpnet.dll", + "Both", + "DirectPlay8.ThreadPool.1", + "DirectPlay8.ThreadPool", + NULL + }, { NULL } /* list terminator */ };

1 0

Gerald Pfeifer : winedbg: Fix the type of four loop variables and reduce scope of one.
by Alexandre Julliard July 22, 2008

July 22, 2008

Module: wine Branch: master Commit: b15bcddeac3bf5035aca7dba338f1db0300629ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15bcddeac3bf5035aca7dba3… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Jul 21 21:19:07 2008 +0200 winedbg: Fix the type of four loop variables and reduce scope of one. --- programs/winedbg/display.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/display.c b/programs/winedbg/display.c index a1fa89e..0901961 100644 --- a/programs/winedbg/display.c +++ b/programs/winedbg/display.c @@ -56,7 +56,7 @@ static inline BOOL cmp_symbol(const SYMBOL_INFO* si1, const SYMBOL_INFO* si2) int display_add(struct expr *exp, int count, char format) { - int i; + unsigned i; BOOL local_binding = FALSE; for (i = 0; i < ndisplays; i++) @@ -98,7 +98,7 @@ int display_add(struct expr *exp, int count, char format) int display_info(void) { - int i; + unsigned i; char buffer[sizeof(SYMBOL_INFO) + 256]; SYMBOL_INFO* func; const char* info; @@ -163,7 +163,7 @@ static void print_one_display(int i) int display_print(void) { - int i; + unsigned i; char buffer[sizeof(SYMBOL_INFO) + 256]; SYMBOL_INFO* func; @@ -187,8 +187,6 @@ int display_print(void) int display_delete(int displaynum) { - int i; - if (displaynum > ndisplays || displaynum == 0 || displaynum < -1 || displaypoints[displaynum - 1].exp == NULL) { @@ -198,6 +196,8 @@ int display_delete(int displaynum) if (displaynum == -1) { + unsigned i; + for (i = 0; i < ndisplays; i++) { if (displaypoints[i].exp != NULL)

1 0

Gerald Pfeifer : comctl32: datetime: Simplify by shedding off unused parameters.
by Alexandre Julliard July 22, 2008

July 22, 2008

Module: wine Branch: master Commit: ec351ad16f79a38a46505749856b6a0b5fd698a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec351ad16f79a38a465057498… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Jul 21 21:11:56 2008 +0200 comctl32: datetime: Simplify by shedding off unused parameters. --- dlls/comctl32/datetime.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index e73faf6..fddaf21 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -707,7 +707,7 @@ DATETIME_HitTest (const DATETIME_INFO *infoPtr, POINT pt) static LRESULT -DATETIME_LButtonDown (DATETIME_INFO *infoPtr, WORD wKey, INT x, INT y) +DATETIME_LButtonDown (DATETIME_INFO *infoPtr, INT x, INT y) { POINT pt; int old, new; @@ -769,7 +769,7 @@ DATETIME_LButtonDown (DATETIME_INFO *infoPtr, WORD wKey, INT x, INT y) static LRESULT -DATETIME_LButtonUp (DATETIME_INFO *infoPtr, WORD wKey) +DATETIME_LButtonUp (DATETIME_INFO *infoPtr) { if(infoPtr->bCalDepressed) { infoPtr->bCalDepressed = FALSE; @@ -865,7 +865,7 @@ DATETIME_EraseBackground (const DATETIME_INFO *infoPtr, HDC hdc) static LRESULT -DATETIME_Notify (DATETIME_INFO *infoPtr, int idCtrl, LPNMHDR lpnmh) +DATETIME_Notify (DATETIME_INFO *infoPtr, LPNMHDR lpnmh) { TRACE ("Got notification %x from %p\n", lpnmh->code, lpnmh->hwndFrom); TRACE ("info: %p %p %p\n", infoPtr->hwndSelf, infoPtr->hMonthCal, infoPtr->hUpdown); @@ -890,7 +890,7 @@ DATETIME_Notify (DATETIME_INFO *infoPtr, int idCtrl, LPNMHDR lpnmh) static LRESULT -DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode, LPARAM flags) +DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode) { int fieldNum = infoPtr->select & DTHT_DATEFIELD; int wrap = 0; @@ -1138,7 +1138,7 @@ DATETIME_SendSimpleNotify (const DATETIME_INFO *infoPtr, UINT code) } static LRESULT -DATETIME_Size (DATETIME_INFO *infoPtr, WORD flags, INT width, INT height) +DATETIME_Size (DATETIME_INFO *infoPtr, INT width, INT height) { /* set size */ infoPtr->rcClient.bottom = height; @@ -1323,7 +1323,7 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return SendMessageW (infoPtr->hMonthCal, WM_GETFONT, wParam, lParam); case WM_NOTIFY: - return DATETIME_Notify (infoPtr, (int)wParam, (LPNMHDR)lParam); + return DATETIME_Notify (infoPtr, (LPNMHDR)lParam); case WM_ENABLE: return DATETIME_Enable (infoPtr, (BOOL)wParam); @@ -1339,7 +1339,7 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return DATETIME_Paint (infoPtr, (HDC)wParam); case WM_KEYDOWN: - return DATETIME_KeyDown (infoPtr, wParam, lParam); + return DATETIME_KeyDown (infoPtr, wParam); case WM_KILLFOCUS: return DATETIME_KillFocus (infoPtr, (HWND)wParam); @@ -1351,13 +1351,13 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return DATETIME_SetFocus (infoPtr, (HWND)wParam); case WM_SIZE: - return DATETIME_Size (infoPtr, wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + return DATETIME_Size (infoPtr, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); case WM_LBUTTONDOWN: - return DATETIME_LButtonDown (infoPtr, (WORD)wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + return DATETIME_LButtonDown (infoPtr, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); case WM_LBUTTONUP: - return DATETIME_LButtonUp (infoPtr, (WORD)wParam); + return DATETIME_LButtonUp (infoPtr); case WM_VSCROLL: return DATETIME_VScroll (infoPtr, (WORD)wParam);

1 0

Gerald Pfeifer : avifil32: Make size parameter of AVIFILE_ReadBlock DWORD instead of LONG.
by Alexandre Julliard July 22, 2008

July 22, 2008

Module: wine Branch: master Commit: 61de0f4118afdc25cb08883cf92c10d18fb62abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=61de0f4118afdc25cb08883cf… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Jul 21 21:05:13 2008 +0200 avifil32: Make size parameter of AVIFILE_ReadBlock DWORD instead of LONG. --- dlls/avifil32/avifile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index b0ef1cb..7a7b194 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -217,7 +217,7 @@ static HRESULT AVIFILE_LoadIndex(const IAVIFileImpl *This, DWORD size, DWORD off static HRESULT AVIFILE_ParseIndex(const IAVIFileImpl *This, AVIINDEXENTRY *lp, LONG count, DWORD pos, BOOL *bAbsolute); static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD start, - LPVOID buffer, LONG size); + LPVOID buffer, DWORD size); static void AVIFILE_SamplesToBlock(const IAVIStreamImpl *This, LPLONG pos, LPLONG offset); static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This); @@ -2008,7 +2008,7 @@ static HRESULT AVIFILE_ParseIndex(const IAVIFileImpl *This, AVIINDEXENTRY *lp, } static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD pos, - LPVOID buffer, LONG size) + LPVOID buffer, DWORD size) { /* pre-conditions */ assert(This != NULL);

1 0

Nikolay Sivov : gdiplus: Implement GdipGetPathGradientBlend with basic tests.
by Alexandre Julliard July 22, 2008

July 22, 2008

Module: wine Branch: master Commit: 48e914b51916d310a35793467c1b102308198512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e914b51916d310a35793467… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jul 21 23:30:50 2008 +0400 gdiplus: Implement GdipGetPathGradientBlend with basic tests. --- dlls/gdiplus/brush.c | 17 +++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/tests/brush.c | 37 +++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 86740fe..7e4ac9e 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -549,6 +549,23 @@ GpStatus WINGDIPAPI GdipGetLineWrapMode(GpLineGradient *brush, GpWrapMode *wrapm return Ok; } +GpStatus WINGDIPAPI GdipGetPathGradientBlend(GpPathGradient *brush, REAL *blend, + REAL *positions, INT count) +{ + if(!brush || !blend || !positions || count <= 0) + return InvalidParameter; + + if(count < brush->blendcount) + return InsufficientBuffer; + + memcpy(blend, brush->blendfac, count*sizeof(REAL)); + if(brush->blendcount > 1){ + memcpy(positions, brush->blendpos, count*sizeof(REAL)); + } + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPathGradientBlendCount(GpPathGradient *brush, INT *count) { if(!brush || !count) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9d609fa..4bfc93a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -325,7 +325,7 @@ @ stdcall GdipGetPageUnit(ptr ptr) @ stdcall GdipGetPathData(ptr ptr) @ stdcall GdipGetPathFillMode(ptr ptr) -@ stub GdipGetPathGradientBlend +@ stdcall GdipGetPathGradientBlend(ptr ptr ptr long) @ stdcall GdipGetPathGradientBlendCount(ptr ptr) @ stub GdipGetPathGradientCenterColor @ stdcall GdipGetPathGradientCenterPoint(ptr ptr) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index b8e91fc..1f79744 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -21,8 +21,10 @@ #include "windows.h" #include "gdiplus.h" #include "wine/test.h" +#include <math.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) static void test_constructor_destructor(void) { @@ -79,6 +81,40 @@ static void test_gradientblendcount(void) GdipDeleteBrush((GpBrush*) brush); } +static GpPointF getblend_ptf[] = {{0.0, 0.0}, + {50.0, 50.0}}; +static void test_getblend(void) +{ + GpStatus status; + GpPathGradient *brush; + REAL blends[4]; + REAL pos[4]; + + status = GdipCreatePathGradient(getblend_ptf, 2, WrapModeClamp, &brush); + expect(Ok, status); + + /* check some invalid parameters combinations */ + status = GdipGetPathGradientBlend(NULL, NULL, NULL, -1); + expect(InvalidParameter, status); + status = GdipGetPathGradientBlend(brush,NULL, NULL, -1); + expect(InvalidParameter, status); + status = GdipGetPathGradientBlend(NULL, blends,NULL, -1); + expect(InvalidParameter, status); + status = GdipGetPathGradientBlend(NULL, NULL, pos, -1); + expect(InvalidParameter, status); + status = GdipGetPathGradientBlend(NULL, NULL, NULL, 1); + expect(InvalidParameter, status); + + blends[0] = (REAL)0xdeadbeef; + pos[0] = (REAL)0xdeadbeef; + status = GdipGetPathGradientBlend(brush, blends, pos, 1); + expect(Ok, status); + expectf(1.0, blends[0]); + expectf((REAL)0xdeadbeef, pos[0]); + + GdipDeleteBrush((GpBrush*) brush); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -94,6 +130,7 @@ START_TEST(brush) test_constructor_destructor(); test_type(); test_gradientblendcount(); + test_getblend(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 98d687a..8a683b7 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -199,6 +199,7 @@ GpStatus WINGDIPAPI GdipGetLineWrapMode(GpLineGradient*,GpWrapMode*); GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient*,GpRectF*); GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient*,GpRect*); GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient*,ARGB*); +GpStatus WINGDIPAPI GdipGetPathGradientBlend(GpPathGradient*,REAL*,REAL*,INT); GpStatus WINGDIPAPI GdipGetPathGradientBlendCount(GpPathGradient*,INT*); GpStatus WINGDIPAPI GdipGetPathGradientCenterColor(GpPathGradient*,ARGB*); GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient*,GpPointF*);

1 0

Nikolay Sivov : gdiplus: implemeted GdipGetPathGradientBlendCount with test .
by Alexandre Julliard July 22, 2008

July 22, 2008

Module: wine Branch: master Commit: 01abb3d1dc6dbc30a5e84a25eb5dba4545ab2e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01abb3d1dc6dbc30a5e84a25e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jul 21 23:30:39 2008 +0400 gdiplus: implemeted GdipGetPathGradientBlendCount with test. --- dlls/gdiplus/brush.c | 48 ++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 3 ++ dlls/gdiplus/tests/brush.c | 25 ++++++++++++++++++++ include/gdiplusflat.h | 1 + 5 files changed, 78 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index ba7663e..86740fe 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -75,6 +75,24 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) memcpy(dest->pathdata.Points, src->pathdata.Points, count * sizeof(PointF)); memcpy(dest->pathdata.Types, src->pathdata.Types, count); + /* blending */ + count = src->blendcount; + dest->blendcount = count; + dest->blendfac = GdipAlloc(count * sizeof(REAL)); + dest->blendpos = GdipAlloc(count * sizeof(REAL)); + + if(!dest->blendfac || !dest->blendpos){ + GdipFree(dest->pathdata.Points); + GdipFree(dest->pathdata.Types); + GdipFree(dest->blendfac); + GdipFree(dest->blendpos); + GdipFree(dest); + return OutOfMemory; + } + + memcpy(dest->blendfac, src->blendfac, count * sizeof(REAL)); + memcpy(dest->blendpos, src->blendpos, count * sizeof(REAL)); + break; } case BrushTypeLinearGradient: @@ -213,6 +231,15 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, *grad = GdipAlloc(sizeof(GpPathGradient)); if (!*grad) return OutOfMemory; + (*grad)->blendfac = GdipAlloc(sizeof(REAL)); + if(!(*grad)->blendfac){ + GdipFree(*grad); + return OutOfMemory; + } + (*grad)->blendfac[0] = 1.0; + (*grad)->blendpos = NULL; + (*grad)->blendcount = 1; + (*grad)->pathdata.Count = count; (*grad)->pathdata.Points = GdipAlloc(count * sizeof(PointF)); (*grad)->pathdata.Types = GdipAlloc(count); @@ -284,6 +311,15 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, *grad = GdipAlloc(sizeof(GpPathGradient)); if (!*grad) return OutOfMemory; + (*grad)->blendfac = GdipAlloc(sizeof(REAL)); + if(!(*grad)->blendfac){ + GdipFree(*grad); + return OutOfMemory; + } + (*grad)->blendfac[0] = 1.0; + (*grad)->blendpos = NULL; + (*grad)->blendcount = 1; + (*grad)->pathdata.Count = path->pathdata.Count; (*grad)->pathdata.Points = GdipAlloc(path->pathdata.Count * sizeof(PointF)); (*grad)->pathdata.Types = GdipAlloc(path->pathdata.Count); @@ -476,6 +512,8 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) case BrushTypePathGradient: GdipFree(((GpPathGradient*) brush)->pathdata.Points); GdipFree(((GpPathGradient*) brush)->pathdata.Types); + GdipFree(((GpPathGradient*) brush)->blendfac); + GdipFree(((GpPathGradient*) brush)->blendpos); break; case BrushTypeSolidColor: case BrushTypeLinearGradient: @@ -511,6 +549,16 @@ GpStatus WINGDIPAPI GdipGetLineWrapMode(GpLineGradient *brush, GpWrapMode *wrapm return Ok; } +GpStatus WINGDIPAPI GdipGetPathGradientBlendCount(GpPathGradient *brush, INT *count) +{ + if(!brush || !count) + return InvalidParameter; + + *count = brush->blendcount; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient *grad, GpPointF *point) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 07bd6ed..9d609fa 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -326,7 +326,7 @@ @ stdcall GdipGetPathData(ptr ptr) @ stdcall GdipGetPathFillMode(ptr ptr) @ stub GdipGetPathGradientBlend -@ stub GdipGetPathGradientBlendCount +@ stdcall GdipGetPathGradientBlendCount(ptr ptr) @ stub GdipGetPathGradientCenterColor @ stdcall GdipGetPathGradientCenterPoint(ptr ptr) @ stdcall GdipGetPathGradientCenterPointI(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e7ca874..1b806cd 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -105,6 +105,9 @@ struct GpPathGradient{ BOOL gamma; GpPointF center; GpPointF focus; + REAL* blendfac; /* blend factors */ + REAL* blendpos; /* blend positions */ + INT blendcount; }; struct GpLineGradient{ diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 70eac03..b8e91fc 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -54,6 +54,30 @@ static void test_type(void) GdipDeleteBrush((GpBrush*) brush); } +static GpPointF blendcount_ptf[] = {{0.0, 0.0}, + {50.0, 50.0}}; +static void test_gradientblendcount(void) +{ + GpStatus status; + GpPathGradient *brush; + INT count; + + status = GdipCreatePathGradient(blendcount_ptf, 2, WrapModeClamp, &brush); + expect(Ok, status); + + status = GdipGetPathGradientBlendCount(NULL, NULL); + expect(InvalidParameter, status); + status = GdipGetPathGradientBlendCount(NULL, &count); + expect(InvalidParameter, status); + status = GdipGetPathGradientBlendCount(brush, NULL); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlendCount(brush, &count); + expect(Ok, status); + expect(1, count); + + GdipDeleteBrush((GpBrush*) brush); +} START_TEST(brush) { @@ -69,6 +93,7 @@ START_TEST(brush) test_constructor_destructor(); test_type(); + test_gradientblendcount(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b2ca34b..98d687a 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -199,6 +199,7 @@ GpStatus WINGDIPAPI GdipGetLineWrapMode(GpLineGradient*,GpWrapMode*); GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient*,GpRectF*); GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient*,GpRect*); GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient*,ARGB*); +GpStatus WINGDIPAPI GdipGetPathGradientBlendCount(GpPathGradient*,INT*); GpStatus WINGDIPAPI GdipGetPathGradientCenterColor(GpPathGradient*,ARGB*); GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipGetPathGradientCenterPointI(GpPathGradient*,GpPoint*);

1 0

Owen Rudge : shell32: Use wide functions when creating control panel.
by Alexandre Julliard July 22, 2008

July 22, 2008

Module: wine Branch: master Commit: 5e3786f8da916fb3880ccee072779ee049114a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3786f8da916fb3880ccee07… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jul 21 19:22:54 2008 +0100 shell32: Use wide functions when creating control panel. --- dlls/shell32/control.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 292df5b..e0718ab 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -159,11 +159,11 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) return NULL; } -static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTA* cs) +static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) { CPanel* panel = (CPanel*)cs->lpCreateParams; - SetWindowLongPtrA(hWnd, 0, (LONG_PTR)panel); + SetWindowLongPtrW(hWnd, 0, (LONG_PTR)panel); panel->status = 0; panel->hWnd = hWnd; } @@ -254,12 +254,12 @@ static LRESULT Control_WndProc_LButton(CPanel* panel, LPARAM lParam, BOOL up) static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, WPARAM lParam1, LPARAM lParam2) { - CPanel* panel = (CPanel*)GetWindowLongPtrA(hWnd, 0); + CPanel* panel = (CPanel*)GetWindowLongPtrW(hWnd, 0); if (panel || wMsg == WM_CREATE) { switch (wMsg) { case WM_CREATE: - Control_WndProc_Create(hWnd, (CREATESTRUCTA*)lParam2); + Control_WndProc_Create(hWnd, (CREATESTRUCTW*)lParam2); return 0; case WM_DESTROY: { @@ -280,14 +280,18 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, } } - return DefWindowProcA(hWnd, wMsg, lParam1, lParam2); + return DefWindowProcW(hWnd, wMsg, lParam1, lParam2); } static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) { - WNDCLASSA wc; + WNDCLASSW wc; MSG msg; - const CHAR* appName = "Wine Control Panel"; + const WCHAR appName[] = {'W','i','n','e',' ','C','o','n','t','r','o','l', + ' ','P','a','n','e','l',0}; + const WCHAR className[] = {'S','h','e','l','l','_','C','o','n','t','r','o', + 'l','_','W','n','d','C','l','a','s','s',0}; + wc.style = CS_HREDRAW|CS_VREDRAW; wc.lpfnWndProc = Control_WndProc; wc.cbClsExtra = 0; @@ -297,20 +301,20 @@ static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) wc.hCursor = 0; wc.hbrBackground = GetStockObject(WHITE_BRUSH); wc.lpszMenuName = NULL; - wc.lpszClassName = "Shell_Control_WndClass"; + wc.lpszClassName = className; - if (!RegisterClassA(&wc)) return; + if (!RegisterClassW(&wc)) return; - CreateWindowExA(0, wc.lpszClassName, appName, + CreateWindowExW(0, wc.lpszClassName, appName, WS_OVERLAPPEDWINDOW | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hWnd, NULL, hInst, panel); if (!panel->hWnd) return; - while (GetMessageA(&msg, panel->hWnd, 0, 0)) { + while (GetMessageW(&msg, panel->hWnd, 0, 0)) { TranslateMessage(&msg); - DispatchMessageA(&msg); + DispatchMessageW(&msg); } }

1 0

Owen Rudge : shell32: Remove "no control panels" found message.
by Alexandre Julliard July 22, 2008

July 22, 2008

Module: wine Branch: master Commit: 4ae7a87e746dc153050c8d49c8216dc7ee97e883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae7a87e746dc153050c8d49c… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jul 21 19:22:32 2008 +0100 shell32: Remove "no control panels" found message. --- dlls/shell32/control.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index dbebbd2..292df5b 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -308,12 +308,6 @@ static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) hWnd, NULL, hInst, panel); if (!panel->hWnd) return; - if (!panel->first) { - /* FIXME appName & message should be localized */ - MessageBoxA(panel->hWnd, "Cannot load any applets", appName, MB_OK); - return; - } - while (GetMessageA(&msg, panel->hWnd, 0, 0)) { TranslateMessage(&msg); DispatchMessageA(&msg);

1 0

Alexander Dorofeyev : ddraw: Improve IDirect3DDevice7_Load implementation.
by Alexandre Julliard July 22, 2008

July 22, 2008

Module: wine Branch: master Commit: e2ff077697ce0f7eb9b60e88895349effa4e979b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2ff077697ce0f7eb9b60e888… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jul 20 23:28:44 2008 +0300 ddraw: Improve IDirect3DDevice7_Load implementation. Copies palette and colorkey earlier in the helper function, before copying image, also skips UpdateSurface when palette is missing. This prevents unnecessary surface (re)loads in wined3d, and gets rid of some wined3d palette error messages in Sacrifice. --- dlls/ddraw/device.c | 69 +++++++++++++++++++++++++++++--------------------- 1 files changed, 40 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 15bb6ca..6a3ecfc 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6244,6 +6244,39 @@ static void copy_mipmap_chain(IDirect3DDeviceImpl *device, IDirectDrawPalette *pal = NULL, *pal_src = NULL; DWORD ckeyflag; DDCOLORKEY ddckey; + BOOL palette_missing = FALSE; + + /* Copy palette, if possible. */ + IDirectDrawSurface7_GetPalette(ICOM_INTERFACE(src, IDirectDrawSurface7), &pal_src); + IDirectDrawSurface7_GetPalette(ICOM_INTERFACE(dest, IDirectDrawSurface7), &pal); + + if (pal_src != NULL && pal != NULL) + { + PALETTEENTRY palent[256]; + + IDirectDrawPalette_GetEntries(pal_src, 0, 0, 256, palent); + IDirectDrawPalette_SetEntries(pal, 0, 0, 256, palent); + } + + if (dest->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 | + DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8) && !pal) + { + palette_missing = TRUE; + } + + if (pal) IDirectDrawPalette_Release(pal); + if (pal_src) IDirectDrawPalette_Release(pal_src); + + /* Copy colorkeys, if present. */ + for (ckeyflag = DDCKEY_DESTBLT; ckeyflag <= DDCKEY_SRCOVERLAY; ckeyflag <<= 1) + { + hr = IDirectDrawSurface7_GetColorKey(ICOM_INTERFACE(src, IDirectDrawSurface7), ckeyflag, &ddckey); + + if (SUCCEEDED(hr)) + { + IDirectDrawSurface7_SetColorKey(ICOM_INTERFACE(dest, IDirectDrawSurface7), ckeyflag, &ddckey); + } + } src_level = src; dest_level = dest; @@ -6256,10 +6289,14 @@ static void copy_mipmap_chain(IDirect3DDeviceImpl *device, if (src_level->surface_desc.dwWidth == dest_level->surface_desc.dwWidth && src_level->surface_desc.dwHeight == dest_level->surface_desc.dwHeight) { - /* Try UpdateSurface that may perform a more direct opengl loading. */ - hr = IWineD3DDevice_UpdateSurface(device->wineD3DDevice, src_level->WineD3DSurface, &rect, dest_level->WineD3DSurface, + /* Try UpdateSurface that may perform a more direct opengl loading. But skip this is destination is paletted texture and has no palette. + * Some games like Sacrifice set palette after Load, and it is a waste of effort to try to load texture without palette and generates + * warnings in wined3d. */ + if (!palette_missing) + hr = IWineD3DDevice_UpdateSurface(device->wineD3DDevice, src_level->WineD3DSurface, &rect, dest_level->WineD3DSurface, &point); - if (FAILED(hr)) + + if (palette_missing || FAILED(hr)) { /* UpdateSurface may fail e.g. if dest is in system memory. Fall back to BltFast that is less strict. */ IWineD3DSurface_BltFast(dest_level->WineD3DSurface, @@ -6295,32 +6332,6 @@ static void copy_mipmap_chain(IDirect3DDeviceImpl *device, if (src_level && src_level != src) IDirectDrawSurface7_Release(ICOM_INTERFACE(src_level, IDirectDrawSurface7)); if (dest_level && dest_level != dest) IDirectDrawSurface7_Release(ICOM_INTERFACE(dest_level, IDirectDrawSurface7)); - - /* Copy palette, if possible. */ - IDirectDrawSurface7_GetPalette(ICOM_INTERFACE(src, IDirectDrawSurface7), &pal_src); - IDirectDrawSurface7_GetPalette(ICOM_INTERFACE(dest, IDirectDrawSurface7), &pal); - - if (pal_src != NULL && pal != NULL) - { - PALETTEENTRY palent[256]; - - IDirectDrawPalette_GetEntries(pal_src, 0, 0, 256, palent); - IDirectDrawPalette_SetEntries(pal, 0, 0, 256, palent); - } - - if (pal) IDirectDrawPalette_Release(pal); - if (pal_src) IDirectDrawPalette_Release(pal_src); - - /* Copy colorkeys, if present. */ - for (ckeyflag = DDCKEY_DESTBLT; ckeyflag <= DDCKEY_SRCOVERLAY; ckeyflag <<= 1) - { - hr = IDirectDrawSurface7_GetColorKey(ICOM_INTERFACE(src, IDirectDrawSurface7), ckeyflag, &ddckey); - - if (SUCCEEDED(hr)) - { - IDirectDrawSurface7_SetColorKey(ICOM_INTERFACE(dest, IDirectDrawSurface7), ckeyflag, &ddckey); - } - } } /*****************************************************************************

1 0