June 2007 - Wine-commits - list.winehq.org

Dmitry Timoshkov : user32: Insert menu item only after contents of the passed in menu item info have been verified .
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: 79de98f9823ce93e5b292ce43f2ced6c29777cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79de98f9823ce93e5b292ce43… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Jun 17 21:45:55 2007 +0900 user32: Insert menu item only after contents of the passed in menu item info have been verified. --- dlls/user32/menu.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 692a70c..6706e16 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4639,6 +4639,9 @@ BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, const MENUITEMINFOA *lpmii) { MENUITEMINFOA mii; + + TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); + if( lpmii->cbSize != sizeof( mii) && lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) { SetLastError( ERROR_INVALID_PARAMETER); @@ -4660,6 +4663,9 @@ BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT item, BOOL bypos, const MENUITEMINFOW *lpmii) { MENUITEMINFOW mii; + + TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); + if( lpmii->cbSize != sizeof( mii) && lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) { SetLastError( ERROR_INVALID_PARAMETER); @@ -4771,8 +4777,11 @@ UINT WINAPI GetMenuDefaultItem(HMENU hmenu, UINT bypos, UINT flags) BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, const MENUITEMINFOA *lpmii) { - MENUITEM *item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); + MENUITEM *item; MENUITEMINFOA mii; + + TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); + if( lpmii->cbSize != sizeof( mii) && lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) { SetLastError( ERROR_INVALID_PARAMETER); @@ -4783,6 +4792,8 @@ BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, mii.cbSize = sizeof( mii); mii.hbmpItem = NULL; } + + item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); return SetMenuItemInfo_common(item, (const MENUITEMINFOW *)&mii, FALSE); } @@ -4793,8 +4804,11 @@ BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, const MENUITEMINFOW *lpmii) { - MENUITEM *item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); + MENUITEM *item; MENUITEMINFOW mii; + + TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); + if( lpmii->cbSize != sizeof( mii) && lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) { SetLastError( ERROR_INVALID_PARAMETER); @@ -4805,6 +4819,8 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, mii.cbSize = sizeof( mii); mii.hbmpItem = NULL; } + + item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); return SetMenuItemInfo_common(item, &mii, TRUE); }

1 0

Stefan Dösinger : d3d9: Hold the lock in query methods .
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: c0cc0f1062ad1c871e34fff94cadf7ac1565e298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cc0f1062ad1c871e34fff94… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jun 12 10:16:23 2007 +0200 d3d9: Hold the lock in query methods. --- dlls/d3d9/query.c | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 75ff13d..a11aace 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -71,6 +71,7 @@ static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(LPDIRECT3DQUERY9 iface, IDir TRACE("(%p) Relay\n", This); + EnterCriticalSection(&d3d9_cs); hr = IWineD3DQuery_GetDevice(This->wineD3DQuery, &pDevice); if(hr != D3D_OK){ *ppDevice = NULL; @@ -78,31 +79,52 @@ static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(LPDIRECT3DQUERY9 iface, IDir hr = IWineD3DDevice_GetParent(pDevice, (IUnknown **)ppDevice); IWineD3DDevice_Release(pDevice); } + LeaveCriticalSection(&d3d9_cs); return hr; } static D3DQUERYTYPE WINAPI IDirect3DQuery9Impl_GetType(LPDIRECT3DQUERY9 iface) { IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DQuery_GetType(This->wineD3DQuery); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DQuery_GetType(This->wineD3DQuery); + LeaveCriticalSection(&d3d9_cs); + return hr; } static DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(LPDIRECT3DQUERY9 iface) { IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DQuery_GetDataSize(This->wineD3DQuery); + + EnterCriticalSection(&d3d9_cs); + ret = IWineD3DQuery_GetDataSize(This->wineD3DQuery); + LeaveCriticalSection(&d3d9_cs); + return ret; } static HRESULT WINAPI IDirect3DQuery9Impl_Issue(LPDIRECT3DQUERY9 iface, DWORD dwIssueFlags) { IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DQuery_Issue(This->wineD3DQuery, dwIssueFlags); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DQuery_Issue(This->wineD3DQuery, dwIssueFlags); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3DQuery9Impl_GetData(LPDIRECT3DQUERY9 iface, void* pData, DWORD dwSize, DWORD dwGetDataFlags) { IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DQuery_GetData(This->wineD3DQuery, pData, dwSize, dwGetDataFlags); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DQuery_GetData(This->wineD3DQuery, pData, dwSize, dwGetDataFlags); + LeaveCriticalSection(&d3d9_cs); + return hr; } @@ -128,7 +150,12 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(LPDIRECT3DDEVICE9 iface, D3DQUER TRACE("(%p) Relay\n", This); if (!ppQuery) - return IWineD3DDevice_CreateQuery(This->WineD3DDevice, Type, NULL, NULL); + { + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_CreateQuery(This->WineD3DDevice, Type, NULL, NULL); + LeaveCriticalSection(&d3d9_cs); + return hr; + } /* Allocate the storage for the device */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DQuery9Impl)); @@ -139,7 +166,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(LPDIRECT3DDEVICE9 iface, D3DQUER object->lpVtbl = &Direct3DQuery9_Vtbl; object->ref = 1; + EnterCriticalSection(&d3d9_cs); hr = IWineD3DDevice_CreateQuery(This->WineD3DDevice, Type, &object->wineD3DQuery, (IUnknown *)object); + LeaveCriticalSection(&d3d9_cs); if (FAILED(hr)) {

1 0

Misha Koshelev : gdi32: Fix ArcTo to use proper starting and ending points.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: 1dbe178f5ea44a13cdb5134817c0de4e1bbd0ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dbe178f5ea44a13cdb513481… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Tue Jun 19 01:44:26 2007 -0500 gdi32: Fix ArcTo to use proper starting and ending points. --- dlls/gdi32/painting.c | 52 ++++++++++++++++++++++++++++++---------------- dlls/gdi32/tests/path.c | 4 +- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index ba7f451..807fee4 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -118,28 +118,44 @@ BOOL WINAPI ArcTo( HDC hdc, if(!dc) return FALSE; if(dc->funcs->pArcTo) - { result = dc->funcs->pArcTo( dc->physDev, left, top, right, bottom, xstart, ystart, xend, yend ); - GDI_ReleaseObj( hdc ); - return result; + else + { + double width = fabs(right-left), + height = fabs(bottom-top), + xradius = width/2, + yradius = height/2, + xcenter = right > left ? left+xradius : right+xradius, + ycenter = bottom > top ? top+yradius : bottom+yradius; + /* + * Else emulate it. + * According to the documentation, a line is drawn from the current + * position to the starting point of the arc. + */ + double angle = atan2( + ((ystart-ycenter)/height), + ((xstart-xcenter)/width)); + LineTo(hdc, GDI_ROUND(xcenter+(cos(angle)*xradius)), + GDI_ROUND(ycenter+(sin(angle)*yradius))); + /* + * Then the arc is drawn. + */ + result = Arc(hdc, left, top, right, bottom, xstart, ystart, xend, yend); + /* + * If no error occurred, the current position is moved to the ending + * point of the arc. + */ + if (result) + { + angle = atan2( + ((yend-ycenter)/height), + ((xend-xcenter)/width)); + MoveToEx(hdc, GDI_ROUND(xcenter+(cos(angle)*xradius)), + GDI_ROUND(ycenter+(sin(angle)*yradius)), NULL); + } } GDI_ReleaseObj( hdc ); - /* - * Else emulate it. - * According to the documentation, a line is drawn from the current - * position to the starting point of the arc. - */ - LineTo(hdc, xstart, ystart); - /* - * Then the arc is drawn. - */ - result = Arc(hdc, left, top, right, bottom, xstart, ystart, xend, yend); - /* - * If no error occurred, the current position is moved to the ending - * point of the arc. - */ - if (result) MoveToEx(hdc, xend, yend, NULL); return result; } diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index a9fab4b..bd7c12c 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -193,7 +193,7 @@ static void ok_path(HDC hdc, const path_test_t *expected, int expected_size, BOO static const path_test_t arcto_path[] = { {0, 0, PT_MOVETO, 0, 0}, /* 0 */ - {229, 215, PT_LINETO, 0, 1}, /* 1 */ + {229, 215, PT_LINETO, 0, 0}, /* 1 */ {248, 205, PT_BEZIERTO, 1, 0}, /* 2 */ {273, 200, PT_BEZIERTO, 0, 0}, /* 3 */ {300, 200, PT_BEZIERTO, 0, 0}, /* 4 */ @@ -203,7 +203,7 @@ static const path_test_t arcto_path[] = { {399, 263, PT_BEZIERTO, 0, 0}, /* 8 */ {389, 275, PT_BEZIERTO, 0, 0}, /* 9 */ {370, 285, PT_BEZIERTO, 0, 0}, /* 10 */ - {363, 277, PT_LINETO, 1, 1}, /* 11 */ + {363, 277, PT_LINETO, 1, 0}, /* 11 */ {380, 270, PT_BEZIERTO, 1, 0}, /* 12 */ {389, 260, PT_BEZIERTO, 0, 0}, /* 13 */ {389, 250, PT_BEZIERTO, 0, 0}, /* 14 */

1 0

Misha Koshelev : gdi32/tests: Add framework for tests of drawing functions in paths, add test for ArcTo in paths.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: 2c9c761b5607b19544a22caa1e5449ba0382a48d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9c761b5607b19544a22caa1… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Tue Jun 19 01:44:22 2007 -0500 gdi32/tests: Add framework for tests of drawing functions in paths, add test for ArcTo in paths. --- dlls/gdi32/tests/path.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 145 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index e9a6d39..a9fab4b 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -93,7 +94,151 @@ static void test_widenpath(void) return; } +/* + * Tests for GDI drawing functions in paths + */ + +typedef struct +{ + int x, y; + BYTE type; + + /* How many extra entries before this one only on wine + * but not on native? */ + int wine_only_entries_preceding; + + /* Does this entry itself not match on wine? */ + int todo; +} path_test_t; + +/* Helper function to verify that the current path in the given DC matches the expected path. + * + * We use a "smart" matching algorithm that allows us to detect partial improvements + * in conformance. Specifically, two running indices are kept, one through the actual + * path and one through the expected path. The actual path index always increases, + * whereas, if the wine_entries_preceding field of the appropriate path_test_t element is + * non-zero, the expected path index does not increase for that many elements as long as + * there is no match. This allows us to todo_wine extra path elements that are present only + * in wine but not on native. + * + * Note that if expected_size is zero and the WINETEST_DEBUG environment variable is + * greater than 2, the trace() output is a C path_test_t array structure, useful for making + * new tests that use this function. + */ +static void ok_path(HDC hdc, const path_test_t *expected, int expected_size, BOOL todo_size) +{ + static const char *type_string[8] = { "Unknown (0)", "PT_CLOSEFIGURE", "PT_LINETO", + "PT_LINETO | PT_CLOSEFIGURE", "PT_BEZIERTO", + "PT_BEZIERTO | PT_CLOSEFIGURE", "PT_MOVETO", "PT_MOVETO | PT_CLOSEFIGURE"}; + POINT *pnt = NULL; + BYTE *types = NULL; + int size, numskip, + idx, eidx = 0; + + /* Get the path */ + assert(hdc != 0); + size = GetPath(hdc, NULL, NULL, 0); + ok(size > 0, "GetPath returned size %d, last error %d\n", size, GetLastError()); + if (size <= 0) + { + skip("Cannot perform path comparisons due to failure to retrieve path.\n"); + return; + } + pnt = HeapAlloc(GetProcessHeap(), 0, size*sizeof(POINT)); + assert(pnt != 0); + types = HeapAlloc(GetProcessHeap(), 0, size*sizeof(BYTE)); + assert(types != 0); + size = GetPath(hdc, pnt, types, size); + assert(size > 0); + + if (todo_size) todo_wine + ok(size == expected_size, "Path size %d does not match expected size %d\n", size, expected_size); + else + ok(size == expected_size, "Path size %d does not match expected size %d\n", size, expected_size); + + if (expected_size) numskip = expected[eidx].wine_only_entries_preceding; + for (idx = 0; idx < size && eidx < expected_size; idx++) + { + /* We allow a few pixels fudge in matching X and Y coordinates to account for imprecision in + * floating point to integer conversion */ + BOOL match = (types[idx] == expected[eidx].type) && + (pnt[idx].x >= expected[eidx].x-1 && pnt[idx].x <= expected[eidx].x+1) && + (pnt[idx].y >= expected[eidx].y-1 && pnt[idx].y <= expected[eidx].y+1); + + if (winetest_debug > 2) + trace("{%d, %d, %s, 0, 0}, /* %d */\n", pnt[idx].x, pnt[idx].y, type_string[types[idx]], idx); + + if (expected[eidx].todo || numskip) todo_wine + ok(match, "Expected #%d: %s (%d,%d) but got %s (%d,%d)\n", eidx, + type_string[expected[eidx].type], expected[eidx].x, expected[eidx].y, + type_string[types[idx]], pnt[idx].x, pnt[idx].y); + else + ok(match, "Expected #%d: %s (%d,%d) but got %s (%d,%d)\n", eidx, + type_string[expected[eidx].type], expected[eidx].x, expected[eidx].y, + type_string[types[idx]], pnt[idx].x, pnt[idx].y); + + if (match || !numskip--) + numskip = expected[++eidx].wine_only_entries_preceding; + } + + /* If we are debugging and the actual path is longer than the expected path, make + * sure to display the entire path */ + if (winetest_debug > 2 && idx < size) + for (; idx < size; idx++) + trace("{%d, %d, %s, 0, 0}, /* %d */\n", pnt[idx].x, pnt[idx].y, type_string[types[idx]], idx); + + HeapFree(GetProcessHeap(), 0, types); + HeapFree(GetProcessHeap(), 0, pnt); +} + +static const path_test_t arcto_path[] = { + {0, 0, PT_MOVETO, 0, 0}, /* 0 */ + {229, 215, PT_LINETO, 0, 1}, /* 1 */ + {248, 205, PT_BEZIERTO, 1, 0}, /* 2 */ + {273, 200, PT_BEZIERTO, 0, 0}, /* 3 */ + {300, 200, PT_BEZIERTO, 0, 0}, /* 4 */ + {355, 200, PT_BEZIERTO, 0, 0}, /* 5 */ + {399, 222, PT_BEZIERTO, 0, 0}, /* 6 */ + {399, 250, PT_BEZIERTO, 0, 0}, /* 7 */ + {399, 263, PT_BEZIERTO, 0, 0}, /* 8 */ + {389, 275, PT_BEZIERTO, 0, 0}, /* 9 */ + {370, 285, PT_BEZIERTO, 0, 0}, /* 10 */ + {363, 277, PT_LINETO, 1, 1}, /* 11 */ + {380, 270, PT_BEZIERTO, 1, 0}, /* 12 */ + {389, 260, PT_BEZIERTO, 0, 0}, /* 13 */ + {389, 250, PT_BEZIERTO, 0, 0}, /* 14 */ + {389, 228, PT_BEZIERTO, 0, 0}, /* 15 */ + {349, 210, PT_BEZIERTO, 0, 0}, /* 16 */ + {300, 210, PT_BEZIERTO, 0, 0}, /* 17 */ + {276, 210, PT_BEZIERTO, 0, 0}, /* 18 */ + {253, 214, PT_BEZIERTO, 0, 0}, /* 19 */ + {236, 222, PT_BEZIERTO | PT_CLOSEFIGURE, 0, 0}}; /* 20 */ + +static void test_arcto(void) +{ + HDC hdc = GetDC(0); + + BeginPath(hdc); + SetArcDirection(hdc, AD_CLOCKWISE); + if (!ArcTo(hdc, 200, 200, 400, 300, 200, 200, 400, 300) && + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + /* ArcTo is only available on Win2k and later */ + skip("ArcTo is not available\n"); + goto done; + } + SetArcDirection(hdc, AD_COUNTERCLOCKWISE); + ArcTo(hdc, 210, 210, 390, 290, 390, 290, 210, 210); + CloseFigure(hdc); + EndPath(hdc); + + ok_path(hdc, arcto_path, sizeof(arcto_path)/sizeof(path_test_t), 1); +done: + ReleaseDC(0, hdc); +} + START_TEST(path) { test_widenpath(); + test_arcto(); }

1 0

Dan Hipschman : rpcrt4: Fix bug calculating union switch type.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: 6fd05b1dc7c83743bae5fb1e04941ec3bd560490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd05b1dc7c83743bae5fb1e0… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jun 18 18:40:08 2007 -0700 rpcrt4: Fix bug calculating union switch type. --- dlls/rpcrt4/ndr_marshall.c | 10 +++++----- dlls/rpcrt4/tests/server.c | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 62ff179..3f8742c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4301,7 +4301,7 @@ unsigned char * WINAPI NdrEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg pFormat++; switch_type = *pFormat & 0xf; - increment = *pFormat & 0xf0 >> 4; + increment = (*pFormat & 0xf0) >> 4; pFormat++; ALIGN_POINTER(pStubMsg->Buffer, increment); @@ -4333,7 +4333,7 @@ unsigned char * WINAPI NdrEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubM pFormat++; switch_type = *pFormat & 0xf; - increment = *pFormat & 0xf0 >> 4; + increment = (*pFormat & 0xf0) >> 4; pFormat++; ALIGN_POINTER(pStubMsg->Buffer, increment); @@ -4365,7 +4365,7 @@ void WINAPI NdrEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, pFormat++; switch_type = *pFormat & 0xf; - increment = *pFormat & 0xf0 >> 4; + increment = (*pFormat & 0xf0) >> 4; pFormat++; ALIGN_LENGTH(pStubMsg->BufferLength, increment); @@ -4390,7 +4390,7 @@ ULONG WINAPI NdrEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, ULONG switch_value; switch_type = *pFormat & 0xf; - increment = *pFormat & 0xf0 >> 4; + increment = (*pFormat & 0xf0) >> 4; pFormat++; ALIGN_POINTER(pStubMsg->Buffer, increment); @@ -4417,7 +4417,7 @@ void WINAPI NdrEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg, pFormat++; switch_type = *pFormat & 0xf; - increment = *pFormat & 0xf0 >> 4; + increment = (*pFormat & 0xf0) >> 4; pFormat++; switch_value = get_discriminant(switch_type, pMemory); diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 44040df..65226db 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -396,7 +396,6 @@ union_tests(void) i = 11; ok(square_sun(&su) == 121.0, "RPC square_sun\n"); -todo_wine { eu.t = ENCU_I; eu.tagged_union.i = 7; ok(square_encu(&eu) == 49.0, "RPC square_encu\n"); @@ -405,7 +404,6 @@ todo_wine { eu.tagged_union.f = 3.0; ok(square_encu(&eu) == 9.0, "RPC square_encu\n"); } -} static test_list_t * null_list(void)

1 0

Dan Hipschman : rpcrt4: Fix typo in union buffer size calculation.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: d2c15ed01bd0a0766b0b4f6e364a1ad58b333141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c15ed01bd0a0766b0b4f6e3… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jun 18 18:41:04 2007 -0700 rpcrt4: Fix typo in union buffer size calculation. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3f8742c..adf7aba 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4369,7 +4369,7 @@ void WINAPI NdrEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, pFormat++; ALIGN_LENGTH(pStubMsg->BufferLength, increment); - switch_value = get_discriminant(switch_value, pMemory); + switch_value = get_discriminant(switch_type, pMemory); TRACE("got switch value 0x%x\n", switch_value); /* Add discriminant size */

1 0

Evan Stade : gdiplus: Implemented GdipDrawPie/GdipFillPie.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: 72ab72c50c370372b214bb72814109637db88733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ab72c50c370372b214bb728… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jun 18 16:55:51 2007 -0700 gdiplus: Implemented GdipDrawPie/GdipFillPie. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/graphics.c | 65 +++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 483c3f4..4916853 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -179,7 +179,7 @@ @ stub GdipDrawLines @ stub GdipDrawLinesI @ stub GdipDrawPath -@ stub GdipDrawPie +@ stdcall GdipDrawPie(ptr ptr long long long long long long) @ stub GdipDrawPieI @ stub GdipDrawPolygon @ stub GdipDrawPolygonI @@ -209,7 +209,7 @@ @ stub GdipFillEllipse @ stub GdipFillEllipseI @ stub GdipFillPath -@ stub GdipFillPie +@ stdcall GdipFillPie(ptr ptr long long long long long long) @ stub GdipFillPieI @ stub GdipFillPolygon2 @ stub GdipFillPolygon2I diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b45293f..b455cc4 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -32,6 +32,51 @@ static inline INT roundr(REAL x) return (INT) floor(x+0.5); } +static inline REAL deg2rad(REAL degrees) +{ + return (M_PI*2.0) * degrees / 360.0; +} + +/* Converts angle (in degrees) to x/y coordinates */ +static void deg2xy(REAL angle, REAL x_0, REAL y_0, REAL *x, REAL *y) +{ + REAL radAngle, hypotenuse; + + radAngle = deg2rad(angle); + hypotenuse = 50.0; /* arbitrary */ + + *x = x_0 + cos(radAngle) * hypotenuse; + *y = y_0 + sin(radAngle) * hypotenuse; +} + +/* GdipDrawPie/GdipFillPie helper function */ +static GpStatus draw_pie(GpGraphics *graphics, HBRUSH gdibrush, HPEN gdipen, + REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) +{ + HGDIOBJ old_pen, old_brush; + REAL x_0, y_0, x_1, y_1, x_2, y_2; + + if(!graphics) + return InvalidParameter; + + old_pen = SelectObject(graphics->hdc, gdipen); + old_brush = SelectObject(graphics->hdc, gdibrush); + + x_0 = x + (width/2.0); + y_0 = y + (height/2.0); + + deg2xy(startAngle+sweepAngle, x_0, y_0, &x_1, &y_1); + deg2xy(startAngle, x_0, y_0, &x_2, &y_2); + + Pie(graphics->hdc, roundr(x), roundr(y), roundr(x+width), roundr(y+height), + roundr(x_1), roundr(y_1), roundr(x_2), roundr(y_2)); + + SelectObject(graphics->hdc, old_pen); + SelectObject(graphics->hdc, old_brush); + + return Ok; +} + GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) { if(hdc == NULL) @@ -106,6 +151,16 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, return Ok; } +GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, + REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) +{ + if(!pen) + return InvalidParameter; + + return draw_pie(graphics, GetStockObject(NULL_BRUSH), pen->gdipen, x, y, + width, height, startAngle, sweepAngle); +} + GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, INT y, INT width, INT height) { @@ -137,3 +192,13 @@ GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, return Ok; } + +GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, + REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) +{ + if(!brush) + return InvalidParameter; + + return draw_pie(graphics, brush->gdibrush, GetStockObject(NULL_PEN), x, y, + width, height, startAngle, sweepAngle); +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 3220cb2..e949301 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -34,6 +34,7 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *); GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL, REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics*,GpPen*,INT,INT,INT,INT); +GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL);

1 0

Dan Hipschman : rpcrt4: Add encapsulated union tests.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: 08c846a9da942656f2f463154e141e91f03f1112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c846a9da942656f2f463154… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jun 18 18:36:14 2007 -0700 rpcrt4: Add encapsulated union tests. --- dlls/rpcrt4/tests/server.c | 23 +++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 8 ++++++++ dlls/rpcrt4/tests/server_defines.h | 4 ++++ 3 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index aa5f3fc..44040df 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -245,6 +245,18 @@ s_square_test_us(test_us_t *tus) return n * n; } +double +s_square_encu(encu_t *eu) +{ + switch (eu->t) + { + case ENCU_I: return eu->tagged_union.i * eu->tagged_union.i; + case ENCU_F: return eu->tagged_union.f * eu->tagged_union.f; + default: + return 0.0; + } +} + void s_stop(void) { @@ -363,6 +375,7 @@ basic_tests(void) static void union_tests(void) { + encu_t eu; sun_t su; int i; @@ -382,6 +395,16 @@ union_tests(void) su.u.pi = &i; i = 11; ok(square_sun(&su) == 121.0, "RPC square_sun\n"); + +todo_wine { + eu.t = ENCU_I; + eu.tagged_union.i = 7; + ok(square_encu(&eu) == 49.0, "RPC square_encu\n"); + + eu.t = ENCU_F; + eu.tagged_union.f = 3.0; + ok(square_encu(&eu) == 9.0, "RPC square_encu\n"); +} } static test_list_t * diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index e3c3877..e7873f5 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -150,5 +150,13 @@ interface IServer } test_us_t; int square_test_us(test_us_t *tus); + + typedef union encu switch (int t) + { + case ENCU_I: int i; + case ENCU_F: float f; + } encu_t; + + double square_encu(encu_t *eu); void stop(void); } diff --git a/dlls/rpcrt4/tests/server_defines.h b/dlls/rpcrt4/tests/server_defines.h index 5794af2..51f934f 100644 --- a/dlls/rpcrt4/tests/server_defines.h +++ b/dlls/rpcrt4/tests/server_defines.h @@ -27,3 +27,7 @@ /* test_list_t case values */ #define TL_NULL 0 #define TL_LIST 1 + +/* encu_t case values */ +#define ENCU_I 27 +#define ENCU_F 0

1 0

Dan Hipschman : rpcrt4: Remove inaccurate comments.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: b09b917a5c2c3f7f615d224500501318b994150b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09b917a5c2c3f7f615d22450… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jun 18 18:37:16 2007 -0700 rpcrt4: Remove inaccurate comments. --- dlls/rpcrt4/ndr_marshall.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 1369619..62ff179 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4157,9 +4157,6 @@ static unsigned char *union_arm_unmarshall(PMIDL_STUB_MESSAGE pStubMsg, return NULL; } -/*********************************************************************** - * NdrEncapsulatedUnionBufferSize [RPCRT4.@] - */ static void union_arm_buffer_size(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, ULONG discriminant, @@ -4203,9 +4200,6 @@ static void union_arm_buffer_size(PMIDL_STUB_MESSAGE pStubMsg, } } -/*********************************************************************** - * NdrEncapsulatedUnionMemorySize [RPCRT4.@] - */ static ULONG union_arm_memory_size(PMIDL_STUB_MESSAGE pStubMsg, ULONG discriminant, PFORMAT_STRING pFormat) @@ -4256,9 +4250,6 @@ static ULONG union_arm_memory_size(PMIDL_STUB_MESSAGE pStubMsg, return size; } -/*********************************************************************** - * NdrEncapsulatedUnionFree [RPCRT4.@] - */ static void union_arm_free(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, ULONG discriminant,

1 0

Detlef Riekenberg : ntprint: Add version resource.
by Alexandre Julliard 19 Jun '07

19 Jun '07

Module: wine Branch: master Commit: 8a9f817fa814a3ca2cfa62ad03fedb739a888433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9f817fa814a3ca2cfa62ad0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 19 00:08:28 2007 +0200 ntprint: Add version resource. --- .gitignore | 1 + dlls/ntprint/Makefile.in | 2 ++ dlls/ntprint/ntprint.rc | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index a2e2c37..07e4bd2 100644 --- a/.gitignore +++ b/.gitignore @@ -383,6 +383,7 @@ dlls/ntdll/tests/testlist.c dlls/ntdll/version.res dlls/ntdsapi/libntdsapi.def dlls/ntoskrnl.exe/libntoskrnl.exe.def +dlls/ntprint/ntprint.res dlls/objsel/objsel.res dlls/odbc32/libodbc32.def dlls/odbccp32/libodbccp32.def diff --git a/dlls/ntprint/Makefile.in b/dlls/ntprint/Makefile.in index 93fbcf6..b60b06b 100644 --- a/dlls/ntprint/Makefile.in +++ b/dlls/ntprint/Makefile.in @@ -8,6 +8,8 @@ IMPORTS = kernel32 C_SRCS = \ ntprint.c +RC_SRCS = ntprint.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/ntprint/ntprint.rc b/dlls/ntprint/ntprint.rc new file mode 100644 index 0000000..ca56d3f --- /dev/null +++ b/dlls/ntprint/ntprint.rc @@ -0,0 +1,37 @@ +/* + * Top level resource file for ntprint.dll + * + * Copyright 2007 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winver.h" + +#define WINE_FILENAME_STR "ntprint.dll" +#define WINE_FILEDESCRIPTION_STR "Spooler Setup API (Printing)" + +/* Same Version as WinXP_sp2 */ +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" + +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc"

1 0