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

Marcus Meissner : wined3d: Fixed pointer casting and additions.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: 332d14953b8119e47d13f3e93005976f0c9bf347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=332d14953b8119e47d13f3e93… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jun 20 08:57:20 2007 +0200 wined3d: Fixed pointer casting and additions. --- dlls/wined3d/vertexbuffer.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 7a79423..5bc32d8 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -104,13 +104,20 @@ static DWORD WINAPI IWineD3DVertexBufferImpl_GetPriority(IWineD3DVertexBuffer return IWineD3DResourceImpl_GetPriority((IWineD3DResource *)iface); } -static void fixup_vertices(BYTE *src, BYTE *dst, int stride, int num, BYTE *pos, BOOL haspos, BYTE *diffuse, BOOL hasdiffuse, BYTE *specular, BOOL hasspecular) { +static void fixup_vertices( + BYTE *src, BYTE *dst, + int stride, + int num, + int pos, BOOL haspos, + int diffuse, BOOL hasdiffuse, + int specular, BOOL hasspecular +) { int i; float x, y, z, w; for(i = num - 1; i >= 0; i--) { if(haspos) { - float *p = (float *) (((int) src + (int) pos) + i * stride); + float *p = (float *) ((src + pos) + i * stride); /* rhw conversion like in drawStridedSlow */ if(p[3] == 1.0 || ((p[3] < eps) && (p[3] > -eps))) { @@ -124,15 +131,15 @@ static void fixup_vertices(BYTE *src, BYTE *dst, int stride, int num, BYTE *pos, y = p[1] * w; z = p[2] * w; } - p = (float *) ((int) dst + i * stride + (int) pos); + p = (float *) (dst + i * stride + pos); p[0] = x; p[1] = y; p[2] = z; p[3] = w; } if(hasdiffuse) { - DWORD srcColor, *dstColor = (DWORD *) (dst + i * stride + (int) diffuse); - srcColor = * (DWORD *) ( ((int) src + (int) diffuse) + i * stride); + DWORD srcColor, *dstColor = (DWORD *) (dst + i * stride + diffuse); + srcColor = * (DWORD *) ( (src + diffuse) + i * stride); /* Color conversion like in drawStridedSlow. watch out for little endianity * If we want that stuff to work on big endian machines too we have to consider more things @@ -149,8 +156,8 @@ static void fixup_vertices(BYTE *src, BYTE *dst, int stride, int num, BYTE *pos, *dstColor |= (srcColor & 0x000000ff) << 16; /* Blue */ } if(hasspecular) { - DWORD srcColor, *dstColor = (DWORD *) (dst + i * stride + (int) specular); - srcColor = * (DWORD *) ( ((int) src + (int) specular) + i * stride); + DWORD srcColor, *dstColor = (DWORD *) (dst + i * stride + specular); + srcColor = * (DWORD *) ( (src + specular) + i * stride); /* Similar to diffuse * TODO: Write the alpha value out for fog coords @@ -365,13 +372,13 @@ static void WINAPI IWineD3DVertexBufferImpl_PreLoad(IWineD3DVertexBuffer *if fixup_vertices(data, data, stride, ( end - start) / stride, /* Position */ - This->strided.u.s.position.lpData, /* Data location */ + (int)This->strided.u.s.position.lpData, /* Data location */ This->strided.u.s.position_transformed, /* Do convert? */ /* Diffuse color */ - This->strided.u.s.diffuse.lpData, /* Location */ + (int)This->strided.u.s.diffuse.lpData, /* Location */ This->strided.u.s.diffuse.dwType == WINED3DDECLTYPE_SHORT4 || This->strided.u.s.diffuse.dwType == WINED3DDECLTYPE_D3DCOLOR, /* Convert? */ /* specular color */ - This->strided.u.s.specular.lpData, /* location */ + (int)This->strided.u.s.specular.lpData, /* location */ This->strided.u.s.specular.dwType == WINED3DDECLTYPE_SHORT4 || This->strided.u.s.specular.dwType == WINED3DDECLTYPE_D3DCOLOR); ENTER_GL();

1 0

Alexandre Julliard : server: Don' t crash when trying to set a file lock on a device.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: 60901b7542e68e466b457cadfe726100f7737387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60901b7542e68e466b457cadf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 20 13:14:55 2007 +0200 server: Don't crash when trying to set a file lock on a device. --- server/fd.c | 12 ++++++------ server/trace.c | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server/fd.c b/server/fd.c index 7a7d572..cf3a306 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1184,12 +1184,6 @@ static struct file_lock *add_lock( struct fd *fd, int shared, file_pos_t start, { struct file_lock *lock; - if (!fd->inode) /* not a regular file */ - { - set_error( STATUS_INVALID_HANDLE ); - return NULL; - } - if (!(lock = alloc_object( &file_lock_ops ))) return NULL; lock->shared = shared; lock->start = start; @@ -1259,6 +1253,12 @@ obj_handle_t lock_fd( struct fd *fd, file_pos_t start, file_pos_t count, int sha struct list *ptr; file_pos_t end = start + count; + if (!fd->inode) /* not a regular file */ + { + set_error( STATUS_INVALID_DEVICE_REQUEST ); + return 0; + } + /* don't allow wrapping locks */ if (end && end < start) { diff --git a/server/trace.c b/server/trace.c index 312b68d..3dd614a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4246,6 +4246,7 @@ static const struct { "ILLEGAL_FUNCTION", STATUS_ILLEGAL_FUNCTION }, { "INSTANCE_NOT_AVAILABLE", STATUS_INSTANCE_NOT_AVAILABLE }, { "INVALID_CID", STATUS_INVALID_CID }, + { "INVALID_DEVICE_REQUEST", STATUS_INVALID_DEVICE_REQUEST }, { "INVALID_FILE_FOR_SECTION", STATUS_INVALID_FILE_FOR_SECTION }, { "INVALID_HANDLE", STATUS_INVALID_HANDLE }, { "INVALID_PARAMETER", STATUS_INVALID_PARAMETER },

1 0

Stefan Dösinger : ddraw: Test for incorrect surface desc sizes in GetSurfaceDesc.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: bf23e5f3f738e80c9cc9873dbfbb6f4d5c33bec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf23e5f3f738e80c9cc9873db… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Jun 8 17:22:16 2007 +0200 ddraw: Test for incorrect surface desc sizes in GetSurfaceDesc. --- dlls/ddraw/surface.c | 7 ++--- dlls/ddraw/surface_thunks.c | 30 +++++++++++++++++++-- dlls/ddraw/tests/dsurface.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 43c8448..934999c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1592,11 +1592,10 @@ IDirectDrawSurfaceImpl_GetSurfaceDesc(IDirectDrawSurface7 *iface, if(!DDSD) return DDERR_INVALIDPARAMS; - if ((DDSD->dwSize < sizeof(DDSURFACEDESC)) || - (DDSD->dwSize > sizeof(DDSURFACEDESC2))) + if (DDSD->dwSize != sizeof(DDSURFACEDESC2)) { - ERR("Impossible/Strange struct size %d.\n",DDSD->dwSize); - return DDERR_GENERIC; + WARN("Incorrect struct size %d, returning DDERR_INVALIDPARAMS\n",DDSD->dwSize); + return DDERR_INVALIDPARAMS; } EnterCriticalSection(&ddraw_cs); diff --git a/dlls/ddraw/surface_thunks.c b/dlls/ddraw/surface_thunks.c index 299e4f6..d8ce9ba 100644 --- a/dlls/ddraw/surface_thunks.c +++ b/dlls/ddraw/surface_thunks.c @@ -20,6 +20,7 @@ #include "wine/port.h" #include "wine/debug.h" #include <stdarg.h> +#include <assert.h> #include "windef.h" #include "winbase.h" @@ -41,6 +42,7 @@ (pdds)) WINE_DEFAULT_DEBUG_CHANNEL(ddraw_thunk); +WINE_DECLARE_DEBUG_CHANNEL(ddraw); static HRESULT WINAPI IDirectDrawSurface3Impl_QueryInterface(LPDIRECTDRAWSURFACE3 This, REFIID iid, @@ -299,11 +301,33 @@ IDirectDrawSurface3Impl_GetPixelFormat(LPDIRECTDRAWSURFACE3 This, } static HRESULT WINAPI -IDirectDrawSurface3Impl_GetSurfaceDesc(LPDIRECTDRAWSURFACE3 This, +IDirectDrawSurface3Impl_GetSurfaceDesc(LPDIRECTDRAWSURFACE3 iface, LPDDSURFACEDESC pDDSD) { - return IDirectDrawSurface7_GetSurfaceDesc(CONVERT(This), - (LPDDSURFACEDESC2)pDDSD); + ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface3, iface); + + TRACE_(ddraw)("(%p)->(%p)\n",This,pDDSD); + + if(!pDDSD) + return DDERR_INVALIDPARAMS; + + if (pDDSD->dwSize != sizeof(DDSURFACEDESC)) + { + WARN("Incorrect struct size %d, returning DDERR_INVALIDPARAMS\n",pDDSD->dwSize); + return DDERR_INVALIDPARAMS; + } + + EnterCriticalSection(&ddraw_cs); + DD_STRUCT_COPY_BYSIZE(pDDSD,(DDSURFACEDESC *) &This->surface_desc); + TRACE("Returning surface desc:\n"); + if (TRACE_ON(ddraw)) + { + /* DDRAW_dump_surface_desc handles the smaller size */ + DDRAW_dump_surface_desc((DDSURFACEDESC2 *) pDDSD); + } + + LeaveCriticalSection(&ddraw_cs); + return DD_OK; } static HRESULT WINAPI diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 449e49f..55d7cbd 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2259,6 +2259,66 @@ static void BltParamTest(void) IDirectDrawSurface_Release(surface2); } +static void StructSizeTest(void) +{ + IDirectDrawSurface *surface1; + IDirectDrawSurface7 *surface7; + union { + DDSURFACEDESC desc1; + DDSURFACEDESC2 desc2; + char blob[1024]; /* To get a buch of writeable memory */ + } desc; + DDSURFACEDESC create; + HRESULT hr; + + memset(&desc, 0, sizeof(desc)); + memset(&create, 0, sizeof(create)); + + memset(&create, 0, sizeof(create)); + create.dwSize = sizeof(create); + create.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + create.ddsCaps.dwCaps |= DDSCAPS_OFFSCREENPLAIN; + create.dwHeight = 128; + create.dwWidth = 128; + hr = IDirectDraw_CreateSurface(lpDD, &create, &surface1, NULL); + ok(hr == DD_OK, "Creating an offscreen plain surface failed with %08x\n", hr); + hr = IDirectDrawSurface_QueryInterface(surface1, &IID_IDirectDrawSurface7, (void **) &surface7); + ok(hr == DD_OK, "IDirectDrawSurface_QueryInterface failed with %08x\n", hr); + + desc.desc1.dwSize = sizeof(DDSURFACEDESC); + hr = IDirectDrawSurface_GetSurfaceDesc(surface1, &desc.desc1); + ok(hr == DD_OK, "IDirectDrawSurface_GetSurfaceDesc with desc size sizeof(DDSURFACEDESC) returned %08x\n", hr); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface7, &desc.desc2); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_GetSurfaceDesc with desc size sizeof(DDSURFACEDESC) returned %08x\n", hr); + + desc.desc2.dwSize = sizeof(DDSURFACEDESC2); + hr = IDirectDrawSurface_GetSurfaceDesc(surface1, &desc.desc1); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface_GetSurfaceDesc with desc size sizeof(DDSURFACEDESC2) returned %08x\n", hr); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface7, &desc.desc2); + ok(hr == DD_OK, "IDirectDrawSurface7_GetSurfaceDesc with desc size sizeof(DDSURFACEDESC2) returned %08x\n", hr); + + desc.desc2.dwSize = 0; + hr = IDirectDrawSurface_GetSurfaceDesc(surface1, &desc.desc1); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface_GetSurfaceDesc with desc size 0 returned %08x\n", hr); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface7, &desc.desc2); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_GetSurfaceDesc with desc size 0 returned %08x\n", hr); + + desc.desc1.dwSize = sizeof(DDSURFACEDESC) + 1; + hr = IDirectDrawSurface_GetSurfaceDesc(surface1, &desc.desc1); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface_GetSurfaceDesc with desc size sizeof(DDSURFACEDESC) + 1 returned %08x\n", hr); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface7, &desc.desc2); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_GetSurfaceDesc with desc size sizeof(DDSURFACEDESC) + 1 returned %08x\n", hr); + + desc.desc2.dwSize = sizeof(DDSURFACEDESC2) + 1; + hr = IDirectDrawSurface_GetSurfaceDesc(surface1, &desc.desc1); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface_GetSurfaceDesc with desc size sizeof(DDSURFACEDESC2) + 1returned %08x\n", hr); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface7, &desc.desc2); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_GetSurfaceDesc with desc size sizeof(DDSURFACEDESC2) + 1returned %08x\n", hr); + + IDirectDrawSurface7_Release(surface7); + IDirectDrawSurface_Release(surface1); +} + START_TEST(dsurface) { if (!CreateDirectDraw()) @@ -2279,5 +2339,6 @@ START_TEST(dsurface) SizeTest(); PrivateDataTest(); BltParamTest(); + StructSizeTest(); ReleaseDirectDraw(); }

1 0

Alex Villacís Lasso : quartz: Fix video rendering sizing/positioning bugs.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: fb8df8ea8289487ada51fb2b126d9ad3d1081ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb8df8ea8289487ada51fb2b1… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Jun 19 11:47:32 2007 -0500 quartz: Fix video rendering sizing/positioning bugs. --- dlls/quartz/videorenderer.c | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index b42338c..9e76fd1 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -126,6 +126,20 @@ static LRESULT CALLBACK VideoWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA /* TRACE("WM_SIZING %d %d %d %d\n", lprect->left, lprect->top, lprect->right, lprect->bottom); */ SetWindowPos(hwnd, NULL, lprect->left, lprect->top, lprect->right - lprect->left, lprect->bottom - lprect->top, SWP_NOZORDER); GetClientRect(hwnd, &pVideoRenderer->DestRect); + TRACE("WM_SIZING: DestRect=(%d,%d),(%d,%d)\n", + pVideoRenderer->DestRect.left, + pVideoRenderer->DestRect.top, + pVideoRenderer->DestRect.right - pVideoRenderer->DestRect.left, + pVideoRenderer->DestRect.bottom - pVideoRenderer->DestRect.top); + return TRUE; + case WM_SIZE: + TRACE("WM_SIZE %d %d\n", LOWORD(lParam), HIWORD(lParam)); + GetClientRect(hwnd, &pVideoRenderer->DestRect); + TRACE("WM_SIZING: DestRect=(%d,%d),(%d,%d)\n", + pVideoRenderer->DestRect.left, + pVideoRenderer->DestRect.top, + pVideoRenderer->DestRect.right - pVideoRenderer->DestRect.left, + pVideoRenderer->DestRect.bottom - pVideoRenderer->DestRect.top); return TRUE; default: return DefWindowProcA(hwnd, uMsg, wParam, lParam); @@ -305,18 +319,14 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, if (!This->init) { - /* Compute the size of the whole window so the client area size matches video one */ - RECT wrect, crect; - int h, v; - GetWindowRect(This->hWnd, &wrect); - GetClientRect(This->hWnd, &crect); - h = (wrect.right - wrect.left) - (crect.right - crect.left); - v = (wrect.bottom - wrect.top) - (crect.bottom - crect.top); - SetWindowPos(This->hWnd, NULL, 0, 0, width + h +20, height + v+20, SWP_NOZORDER|SWP_NOMOVE); - This->WindowPos.left = 0; - This->WindowPos.top = 0; - This->WindowPos.right = width; - This->WindowPos.bottom = abs(height); + /* Honor previously set WindowPos */ + TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); + SetWindowPos(This->hWnd, NULL, + This->WindowPos.left, + This->WindowPos.top, + This->WindowPos.right - This->WindowPos.left, + This->WindowPos.bottom - This->WindowPos.top, + SWP_NOZORDER|SWP_NOMOVE); GetClientRect(This->hWnd, &This->DestRect); This->init = TRUE; }

1 0

Dmitry Timoshkov : user32: When inserting a menu item make sure that MDI system buttons stay on the right side .
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: 4d8f84cbdd388057ac46d1e90b7cdd6ddd2758be URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8f84cbdd388057ac46d1e90… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 20 19:12:53 2007 +0900 user32: When inserting a menu item make sure that MDI system buttons stay on the right side. --- dlls/user32/mdi.c | 10 ++- dlls/user32/menu.c | 11 ++++ dlls/user32/tests/menu.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 167 insertions(+), 4 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 5825220..0b488d2 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -307,7 +307,7 @@ static LRESULT MDISetMenu( HWND hwnd, HMENU hmenuFrame, MDICLIENTINFO *ci; HWND hwndFrame = GetParent(hwnd); - TRACE("%p %p %p\n", hwnd, hmenuFrame, hmenuWindow); + TRACE("%p, frame menu %p, window menu %p\n", hwnd, hmenuFrame, hmenuWindow); if (hmenuFrame && !IsMenu(hmenuFrame)) { @@ -323,6 +323,8 @@ static LRESULT MDISetMenu( HWND hwnd, HMENU hmenuFrame, if (!(ci = get_client_info( hwnd ))) return 0; + TRACE("old frame menu %p, old window menu %p\n", ci->hFrameMenu, ci->hWindowMenu); + if (hmenuFrame) { if (hmenuFrame == ci->hFrameMenu) return (LRESULT)hmenuFrame; @@ -844,12 +846,12 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) } AppendMenuW(menu, MF_HELP | MF_BITMAP, - SC_MINIMIZE, (LPCWSTR)HBMMENU_MBAR_MINIMIZE ) ; + SC_CLOSE, is_close_enabled(hChild, hSysPopup) ? + (LPCWSTR)HBMMENU_MBAR_CLOSE : (LPCWSTR)HBMMENU_MBAR_CLOSE_D ); AppendMenuW(menu, MF_HELP | MF_BITMAP, SC_RESTORE, (LPCWSTR)HBMMENU_MBAR_RESTORE ); AppendMenuW(menu, MF_HELP | MF_BITMAP, - SC_CLOSE, is_close_enabled(hChild, hSysPopup) ? - (LPCWSTR)HBMMENU_MBAR_CLOSE : (LPCWSTR)HBMMENU_MBAR_CLOSE_D ); + SC_MINIMIZE, (LPCWSTR)HBMMENU_MBAR_MINIMIZE ) ; /* The system menu is replaced by the child icon */ hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_SMALL, 0); diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 6706e16..1660c20 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2101,6 +2101,17 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags ) } } + /* Make sure that MDI system buttons stay on the right side. + * Note: XP treats only bitmap handles 1 - 6 as "magic" ones + * regardless of their id. + */ + while (pos > 0 && (menu->items[pos - 1].fType & MFT_BITMAP) && + (INT_PTR)menu->items[pos - 1].hbmpItem >= (INT_PTR)HBMMENU_SYSTEM && + (INT_PTR)menu->items[pos - 1].hbmpItem <= (INT_PTR)HBMMENU_MBAR_CLOSE_D) + pos--; + + TRACE("inserting at %u by pos %u\n", pos, flags & MF_BYPOSITION); + /* Create new items array */ newItems = HeapAlloc( GetProcessHeap(), 0, sizeof(MENUITEM) * (menu->nItems+1) ); diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 3037099..2138fec 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2069,6 +2069,155 @@ static void test_menu_resource_layout(void) DestroyMenu(hmenu); } +struct menu_data +{ + UINT type, id; + const char *str; +}; + +static HMENU create_menu_from_data(const struct menu_data *item, INT item_count) +{ + HMENU hmenu; + INT i; + BOOL ret; + + hmenu = CreateMenu(); + assert(hmenu != 0); + + for (i = 0; i < item_count; i++) + { + SetLastError(0xdeadbeef); + ret = AppendMenu(hmenu, item[i].type, item[i].id, item[i].str); + ok(ret, "%d: AppendMenu(%04x, %04x, %p) error %u\n", + i, item[i].type, item[i].id, item[i].str, GetLastError()); + } + return hmenu; +} + +static void compare_menu_data(HMENU hmenu, const struct menu_data *item, INT item_count) +{ + INT count, i; + BOOL ret; + + count = GetMenuItemCount(hmenu); + ok(count == item_count, "expected %d, got %d menu items\n", count, item_count); + + for (i = 0; i < count; i++) + { + char buf[20]; + MENUITEMINFO mii; + + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.dwTypeData = buf; + mii.cch = sizeof(buf); + mii.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_BITMAP; + ret = GetMenuItemInfo(hmenu, i, TRUE, &mii); + ok(ret, "GetMenuItemInfo(%u) failed\n", i); +#if 0 + trace("item #%u: fType %04x, fState %04x, wID %04x, hbmp %p\n", + i, mii.fType, mii.fState, mii.wID, mii.hbmpItem); +#endif + ok(mii.fType == item[i].type, + "%u: expected fType %04x, got %04x\n", i, item[i].type, mii.fType); + ok(mii.wID == item[i].id, + "%u: expected wID %04x, got %04x\n", i, item[i].id, mii.wID); + if (item[i].type & (MF_BITMAP | MF_SEPARATOR)) + { + /* For some reason Windows sets high word to not 0 for + * not "magic" ids. + */ + ok(LOWORD(mii.hbmpItem) == LOWORD(item[i].str), + "%u: expected hbmpItem %p, got %p\n", i, item[i].str, mii.hbmpItem); + } + else + { + ok(mii.cch == strlen(item[i].str), + "%u: expected cch %u, got %u\n", i, (UINT)strlen(item[i].str), mii.cch); + ok(!strcmp((LPCSTR)mii.dwTypeData, item[i].str), + "%u: expected dwTypeData %s, got %s\n", i, item[i].str, (LPCSTR)mii.dwTypeData); + } + } +} + +static void test_InsertMenu(void) +{ + /* Note: XP treats only bitmap handles 1 - 6 as "magic" ones + * regardless of their id. + */ + static const struct menu_data in1[] = + { + { MF_STRING, 1, "File" }, + { MF_BITMAP|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(1) }, + { MF_STRING|MF_HELP, 2, "Help" } + }; + static const struct menu_data out1[] = + { + { MF_STRING, 1, "File" }, + { MF_STRING|MF_HELP, 2, "Help" }, + { MF_BITMAP|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(1) } + }; + static const struct menu_data in2[] = + { + { MF_STRING, 1, "File" }, + { MF_BITMAP|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(100) }, + { MF_STRING|MF_HELP, 2, "Help" } + }; + static const struct menu_data out2[] = + { + { MF_STRING, 1, "File" }, + { MF_BITMAP|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(100) }, + { MF_STRING|MF_HELP, 2, "Help" } + }; + static const struct menu_data in3[] = + { + { MF_STRING, 1, "File" }, + { MF_SEPARATOR|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(1) }, + { MF_STRING|MF_HELP, 2, "Help" } + }; + static const struct menu_data out3[] = + { + { MF_STRING, 1, "File" }, + { MF_SEPARATOR|MF_HELP, SC_CLOSE, MAKEINTRESOURCE(0) }, + { MF_STRING|MF_HELP, 2, "Help" }, + }; + static const struct menu_data in4[] = + { + { MF_STRING, 1, "File" }, + { MF_BITMAP|MF_HELP, 1, MAKEINTRESOURCE(1) }, + { MF_STRING|MF_HELP, 2, "Help" } + }; + static const struct menu_data out4[] = + { + { MF_STRING, 1, "File" }, + { MF_STRING|MF_HELP, 2, "Help" }, + { MF_BITMAP|MF_HELP, 1, MAKEINTRESOURCE(1) } + }; + HMENU hmenu; + +#define create_menu(a) create_menu_from_data((a), sizeof(a)/sizeof((a)[0])) +#define compare_menu(h, a) compare_menu_data((h), (a), sizeof(a)/sizeof((a)[0])) + + hmenu = create_menu(in1); + compare_menu(hmenu, out1); + DestroyMenu(hmenu); + + hmenu = create_menu(in2); + compare_menu(hmenu, out2); + DestroyMenu(hmenu); + + hmenu = create_menu(in3); + compare_menu(hmenu, out3); + DestroyMenu(hmenu); + + hmenu = create_menu(in4); + compare_menu(hmenu, out4); + DestroyMenu(hmenu); + +#undef create_menu +#undef compare_menu +} + START_TEST(menu) { pSetMenuInfo = @@ -2089,4 +2238,5 @@ START_TEST(menu) test_menu_hilitemenuitem(); test_CheckMenuRadioItem(); test_menu_resource_layout(); + test_InsertMenu(); }

1 0

Andrew Talbot : netapi32: Constify some variables.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: 2a2a3b4ea450baca299f60886ff243c19f61a036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2a3b4ea450baca299f60886… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Jun 19 22:06:48 2007 +0100 netapi32: Constify some variables. --- dlls/netapi32/access.c | 2 +- dlls/netapi32/nbt.c | 8 ++++---- dlls/netapi32/netbios.c | 4 ++-- dlls/netapi32/netbios.h | 4 ++-- dlls/netapi32/wksta.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 467c124..fb630fc 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -512,7 +512,7 @@ static void ACCESS_QueryGuestDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD p /************************************************************ * Copies NET_DISPLAY_USER record. */ -static void ACCESS_CopyDisplayUser(PNET_DISPLAY_USER dest, LPWSTR *dest_buf, +static void ACCESS_CopyDisplayUser(const NET_DISPLAY_USER *dest, LPWSTR *dest_buf, PNET_DISPLAY_USER src) { LPWSTR str = *dest_buf; diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 27dba60..a3e38ba 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -288,7 +288,7 @@ typedef BOOL (*NetBTAnswerCallback)(void *data, WORD answerCount, * Returns NRC_GOODRET on timeout or a valid response received, something else * on error. */ -static UCHAR NetBTWaitForNameResponse(NetBTAdapter *adapter, SOCKET fd, +static UCHAR NetBTWaitForNameResponse(const NetBTAdapter *adapter, SOCKET fd, DWORD waitUntil, NetBTAnswerCallback answerCallback, void *data) { BOOL found = FALSE; @@ -424,7 +424,7 @@ static BOOL NetBTFindNameAnswerCallback(void *pVoid, WORD answerCount, queryData->cacheEntry->numAddresses < answerCount) { queryData->cacheEntry->addresses[queryData->cacheEntry-> - numAddresses++] = *(PDWORD)(rData + 2); + numAddresses++] = *(const DWORD *)(rData + 2); ret = queryData->cacheEntry->numAddresses < answerCount; } else @@ -444,7 +444,7 @@ static BOOL NetBTFindNameAnswerCallback(void *pVoid, WORD answerCount, * Returns NRC_GOODRET on success, though this may not mean the name was * resolved--check whether *cacheEntry is NULL. */ -static UCHAR NetBTNameWaitLoop(NetBTAdapter *adapter, SOCKET fd, PNCB ncb, +static UCHAR NetBTNameWaitLoop(const NetBTAdapter *adapter, SOCKET fd, const NCB *ncb, DWORD sendTo, BOOL broadcast, DWORD timeout, DWORD maxQueries, NBNameCacheEntry **cacheEntry) { @@ -1274,7 +1274,7 @@ static void NetBTCleanup(void) } } -static UCHAR NetBTRegisterAdapter(PMIB_IPADDRROW ipRow) +static UCHAR NetBTRegisterAdapter(const MIB_IPADDRROW *ipRow) { UCHAR ret; NetBTAdapter *adapter; diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c index 3362f03..a55f556 100644 --- a/dlls/netapi32/netbios.c +++ b/dlls/netapi32/netbios.c @@ -640,7 +640,7 @@ static UCHAR nbInternalHangup(NetBIOSAdapter *adapter, NetBIOSSession *session) return NRC_GOODRET; } -static UCHAR nbHangup(NetBIOSAdapter *adapter, PNCB ncb) +static UCHAR nbHangup(NetBIOSAdapter *adapter, const NCB *ncb) { UCHAR ret; NetBIOSSession *session; @@ -661,7 +661,7 @@ static UCHAR nbHangup(NetBIOSAdapter *adapter, PNCB ncb) return ret; } -void NetBIOSHangupSession(PNCB ncb) +void NetBIOSHangupSession(const NCB *ncb) { NetBIOSAdapter *adapter; diff --git a/dlls/netapi32/netbios.h b/dlls/netapi32/netbios.h index 7477410..1279a5a 100644 --- a/dlls/netapi32/netbios.h +++ b/dlls/netapi32/netbios.h @@ -92,7 +92,7 @@ void NetBIOSEnumAdapters(ULONG transport, NetBIOSEnumAdaptersCallback cb, * This function is intended for use by a transport, if the session is closed * by some error in the transport layer. */ -void NetBIOSHangupSession(PNCB ncb); +void NetBIOSHangupSession(const NCB *ncb); /** * Functions a transport implementation must implement @@ -132,7 +132,7 @@ typedef void (*NetBIOSCleanup)(void); * some calls (recv) will block indefinitely, so a reset, shutdown, etc. will * never occur. */ -#define NCB_CANCELLED(pncb) *(PBOOL)((pncb)->ncb_reserve) +#define NCB_CANCELLED(pncb) *(const BOOL *)((pncb)->ncb_reserve) typedef UCHAR (*NetBIOSAstat)(void *adapter, PNCB ncb); typedef UCHAR (*NetBIOSFindName)(void *adapter, PNCB ncb); diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index fbc4670..c51ef02 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -71,7 +71,7 @@ BOOL NETAPI_IsLocalComputer(LPCWSTR ServerName) } } -static void wprint_mac(WCHAR* buffer, int len, PMIB_IFROW ifRow) +static void wprint_mac(WCHAR* buffer, int len, const MIB_IFROW *ifRow) { int i; unsigned char val;

1 0

Evan Stade : gdiplus: Implemented GdipDrawArc.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: c42f8794a1519ac0dba46c7c638372ba3310b121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c42f8794a1519ac0dba46c7c6… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jun 19 19:31:19 2007 -0700 gdiplus: Implemented GdipDrawArc. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 25 +++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4916853..3036155 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -142,7 +142,7 @@ @ stub GdipDeleteStringFormat @ stub GdipDisposeImage @ stub GdipDisposeImageAttributes -@ stub GdipDrawArc +@ stdcall GdipDrawArc(ptr ptr long long long long long long) @ stub GdipDrawArcI @ stdcall GdipDrawBezier(ptr ptr long long long long long long long long) @ stub GdipDrawBezierI diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b455cc4..a4ba0ca 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -116,6 +116,31 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) return Ok; } +GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, + REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) +{ + HGDIOBJ old_pen; + REAL x_0, y_0, x_1, y_1, x_2, y_2; + + if(!graphics || !pen) + return InvalidParameter; + + old_pen = SelectObject(graphics->hdc, pen->gdipen); + + 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); + + Arc(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); + + return Ok; +} + GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index e949301..538f1f4 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -31,6 +31,7 @@ GpStatus WINGDIPAPI GdipDeletePen(GpPen*); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**); GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *); +GpStatus WINGDIPAPI GdipDrawArc(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL, REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics*,GpPen*,INT,INT,INT,INT);

1 0

Rob Shearman : rpcrt4: Use the offset to array data in embedded pointer format descriptions.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: 0f826e7cc17f5ec4bf263c1a1e9ddb65b9d369d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f826e7cc17f5ec4bf263c1a1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 19 12:12:00 2007 +0100 rpcrt4: Use the offset to array data in embedded pointer format descriptions. --- dlls/rpcrt4/ndr_marshall.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index adf7aba..de6f509 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1137,10 +1137,10 @@ static unsigned char * EmbeddedPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, } for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; - unsigned char *membase = pMemory + (i * stride); - unsigned char *bufbase = Mark + (i * stride); + unsigned char *membase = pMemory + ofs + (i * stride); + unsigned char *bufbase = Mark + ofs + (i * stride); unsigned u; - /* ofs doesn't seem to matter in this context */ + for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; @@ -1210,9 +1210,10 @@ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, /* ofs doesn't seem to matter in this context */ for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; - unsigned char *membase = *ppMemory + (i * stride); - unsigned char *bufbase = Mark + (i * stride); + unsigned char *membase = *ppMemory + ofs + (i * stride); + unsigned char *bufbase = Mark + ofs + (i * stride); unsigned u; + for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; @@ -1272,11 +1273,11 @@ static void EmbeddedPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, pFormat += 8; break; } - /* ofs doesn't seem to matter in this context */ for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; - unsigned char *membase = pMemory + (i * stride); + unsigned char *membase = pMemory + ofs + (i * stride); unsigned u; + for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *saved_memory = pStubMsg->Memory; @@ -1338,7 +1339,7 @@ static unsigned long EmbeddedPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, /* ofs doesn't seem to matter in this context */ for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; - unsigned char *bufbase = Mark + (i * stride); + unsigned char *bufbase = Mark + ofs + (i * stride); unsigned u; for (u=0; u<count; u++,info+=8) { unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; @@ -1395,11 +1396,11 @@ static void EmbeddedPointerFree(PMIDL_STUB_MESSAGE pStubMsg, pFormat += 8; break; } - /* ofs doesn't seem to matter in this context */ for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; unsigned char *membase = pMemory + (i * stride); unsigned u; + for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *saved_memory = pStubMsg->Memory;

1 0

Rob Shearman : rpcss: Remove lazy timeout mechanism and use __wine_make_system_process instead.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: b9a68259271da3b2e3c03e71445799ea5f84542e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a68259271da3b2e3c03e714… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 19 13:12:07 2007 +0100 rpcss: Remove lazy timeout mechanism and use __wine_make_system_process instead. --- programs/rpcss/Makefile.in | 2 +- programs/rpcss/np_server.c | 65 ++++---------- programs/rpcss/rpcss.h | 7 +-- programs/rpcss/rpcss_main.c | 200 +++--------------------------------------- 4 files changed, 34 insertions(+), 240 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9a68259271da3b2e3c03…

1 0

Jason Green : winscard: Add extended stub for SCardEstablishContext.
by Alexandre Julliard 20 Jun '07

20 Jun '07

Module: wine Branch: master Commit: 832c43f9a736aa1e19e03bacc450f99b86ed4465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=832c43f9a736aa1e19e03bacc… Author: Jason Green <jave27(a)gmail.com> Date: Tue Jun 19 11:00:35 2007 -0400 winscard: Add extended stub for SCardEstablishContext. --- dlls/winscard/winscard.c | 8 ++++++++ dlls/winscard/winscard.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index d24e0f9..01b731d 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -50,3 +50,11 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +LONG WINAPI SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1, + LPCVOID pvReserved2, LPSCARDCONTEXT phContext) +{ + FIXME("(%x,%p,%p,%p) stub\n", dwScope, pvReserved1, pvReserved2, phContext); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index 6dd83d8..f223415 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -12,7 +12,7 @@ @ stub SCardControl @ stub SCardDisconnect @ stub SCardEndTransaction -@ stub SCardEstablishContext +@ stdcall SCardEstablishContext(long ptr ptr ptr) @ stub SCardForgetCardTypeA @ stub SCardForgetCardTypeW @ stub SCardForgetReaderA

1 0