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

Stefan Dösinger : wined3d: Remove the FVF codepath from drawprim.
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: 030b92a2f6206fb7586f031c750fe6c263fb7a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=030b92a2f6206fb7586f031c7… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jun 4 14:16:32 2007 +0200 wined3d: Remove the FVF codepath from drawprim. --- dlls/wined3d/device.c | 6 +- dlls/wined3d/drawprim.c | 164 ---------------------------------------- dlls/wined3d/state.c | 15 +--- dlls/wined3d/wined3d_private.h | 9 -- 4 files changed, 3 insertions(+), 191 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=030b92a2f6206fb7586f0…

1 0

Stefan Dösinger : d3d8: Convert fvfs to vertex declarations.
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: 527295e57f70358fd9dd6b5004da8bf3cd716ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=527295e57f70358fd9dd6b500… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jun 19 22:20:26 2007 +0200 d3d8: Convert fvfs to vertex declarations. --- dlls/d3d8/d3d8_private.h | 10 +++++++ dlls/d3d8/device.c | 64 +++++++++++++++++++++++++++++++++++++++++++-- dlls/d3d8/directx.c | 9 ++++++ 3 files changed, 80 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 3182427..229762b 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -167,6 +167,12 @@ extern const IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl; typedef void * shader_handle; +struct FvfToDecl +{ + DWORD fvf; + IWineD3DVertexDeclaration *decl; +}; + struct IDirect3DDevice8Impl { /* IUnknown fields */ @@ -179,6 +185,10 @@ struct IDirect3DDevice8Impl shader_handle *shader_handles; shader_handle *free_shader_handles; + /* FVF management */ + struct FvfToDecl *decls; + UINT numConvertedDecls, declArraySize; + /* Avoids recursion with nested ReleaseRef to 0 */ BOOL inDestruction; }; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f7bc68f..0b2436d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -97,9 +97,16 @@ static ULONG WINAPI IDirect3DDevice8Impl_Release(LPDIRECT3DDEVICE8 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + int i; + TRACE("Releasing wined3d device %p\n", This->WineD3DDevice); EnterCriticalSection(&d3d8_cs); This->inDestruction = TRUE; + + for(i = 0; i < This->numConvertedDecls; i++) { + IWineD3DVertexDeclaration_Release(This->decls[i].decl); + } + IWineD3DDevice_Uninit3D(This->WineD3DDevice, D3D8CB_DestroyDepthStencilSurface, D3D8CB_DestroySwapChain); IWineD3DDevice_Release(This->WineD3DDevice); HeapFree(GetProcessHeap(), 0, This->shader_handles); @@ -1566,6 +1573,59 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 return hrc; } +IWineD3DVertexDeclaration *IDirect3DDevice8Impl_FindDecl(IDirect3DDevice8Impl *This, DWORD fvf) +{ + HRESULT hr; + IWineD3DVertexDeclaration* pDecl = NULL; + int p, low, high; /* deliberately signed */ + struct FvfToDecl *convertedDecls = This->decls; + + TRACE("Searching for declaration for fvf %08x... ", fvf); + + low = 0; + high = This->numConvertedDecls - 1; + while(low <= high) { + p = (low + high) >> 1; + TRACE("%d ", p); + if(convertedDecls[p].fvf == fvf) { + TRACE("found %p\n", convertedDecls[p].decl); + return convertedDecls[p].decl; + } else if(convertedDecls[p].fvf < fvf) { + low = p + 1; + } else { + high = p - 1; + } + } + TRACE("not found. Creating and inserting at position %d.\n", low); + + hr = IWineD3DDevice_CreateVertexDeclarationFromFVF(This->WineD3DDevice, + &pDecl, + (IUnknown *) This, + fvf); + if (FAILED(hr)) return NULL; + + if(This->declArraySize == This->numConvertedDecls) { + int grow = This->declArraySize / 2; + convertedDecls = HeapReAlloc(GetProcessHeap(), 0, convertedDecls, + sizeof(convertedDecls[0]) * (This->numConvertedDecls + grow)); + if(!convertedDecls) { + /* This will destroy it */ + IWineD3DVertexDeclaration_Release(pDecl); + return NULL; + } + This->decls = convertedDecls; + This->declArraySize += grow; + } + + memmove(convertedDecls + low + 1, convertedDecls + low, sizeof(convertedDecls[0]) * (This->numConvertedDecls - low)); + convertedDecls[low].decl = pDecl; + convertedDecls[low].fvf = fvf; + This->numConvertedDecls++; + + TRACE("Returning %p. %d decls in array\n", pDecl, This->numConvertedDecls); + return pDecl; +} + static HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShader(LPDIRECT3DDEVICE8 iface, DWORD pShader) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hrc = D3D_OK; @@ -1575,9 +1635,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShader(LPDIRECT3DDEVICE8 ifa if (VS_HIGHESTFIXEDFXF >= pShader) { TRACE("Setting FVF, %d %d\n", VS_HIGHESTFIXEDFXF, pShader); IWineD3DDevice_SetFVF(This->WineD3DDevice, pShader); - - /* Call SetVertexShader with a NULL shader to set the vertexshader in the stateblock to NULL. */ - IWineD3DDevice_SetVertexDeclaration(This->WineD3DDevice, NULL); + IWineD3DDevice_SetVertexDeclaration(This->WineD3DDevice, IDirect3DDevice8Impl_FindDecl(This, pShader)); IWineD3DDevice_SetVertexShader(This->WineD3DDevice, NULL); } else { TRACE("Setting shader\n"); diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 62d833a..54c87e6 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -472,6 +472,15 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte *ppReturnedDeviceInterface = NULL; } + object->declArraySize = 16; + object->decls = HeapAlloc(GetProcessHeap(), 0, object->declArraySize * sizeof(*object->decls)); + if(!object->decls) { + ERR("Out of memory\n"); + IWineD3DDevice_Release(object->WineD3DDevice); + HeapFree(GetProcessHeap(), 0, object); + *ppReturnedDeviceInterface = NULL; + hr = E_OUTOFMEMORY; + } return hr; }

1 0

Alexandre Julliard : makefiles: Build programs that link against libwine twice with appropriate rpaths.
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: 1f11333c7beaf36987f06d5bb60186598b2bebf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f11333c7beaf36987f06d5bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 20 20:03:30 2007 +0200 makefiles: Build programs that link against libwine twice with appropriate rpaths. One rpath is for installing and one is for running inside the build tree. --- .gitignore | 7 +++++++ Make.rules.in | 3 ++- configure | 19 +++++++++++++------ configure.ac | 10 +++++++--- loader/Makefile.in | 31 ++++++++++++++++++++++--------- server/Makefile.in | 11 +++++++---- tools/Makefile.in | 6 ++++-- tools/wmc/Makefile.in | 11 +++++++---- tools/wrc/Makefile.in | 11 +++++++---- 9 files changed, 76 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f11333c7beaf36987f06…

1 0

Tim Schwartz : net.exe: Add missing CloseServiceHandle().
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: a13340d4a0164aa3592b97210e591d89ae088a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a13340d4a0164aa3592b97210… Author: Tim Schwartz <tim(a)sanityinternet.com> Date: Wed Jun 20 10:57:51 2007 -0500 net.exe: Add missing CloseServiceHandle(). --- programs/net/net.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 4af72ae..0fd85e9 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -44,6 +44,7 @@ static BOOL StopService(SC_HANDLE SCManager, SC_HANDLE serviceHandle) printf("Stopping dependent service: %s\n", dependencies[counter].lpDisplayName); dependent_serviceHandle = OpenService(SCManager, dependencies[counter].lpServiceName, SC_MANAGER_ALL_ACCESS); if(dependent_serviceHandle) result = StopService(SCManager, dependent_serviceHandle); + CloseServiceHandle(dependent_serviceHandle); if(!result) printf("Could not stop service %s\n", dependencies[counter].lpDisplayName); } }

1 0

Ken Thomases : winecoreaudio: Make wodReset fail if called on a closed device.
by Alexandre Julliard June 20, 2007

June 20, 2007

Module: wine Branch: master Commit: 4906ffaa5b93de471411ade2bad856fd7a0e4a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4906ffaa5b93de471411ade2b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 20 07:01:11 2007 -0500 winecoreaudio: Make wodReset fail if called on a closed device. --- dlls/winecoreaudio.drv/audio.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 5a3e82b..bc7482c 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1278,7 +1278,14 @@ static DWORD wodReset(WORD wDevID) wwo = &WOutDev[wDevID]; OSSpinLockLock(&wwo->lock); - + + if (wwo->state == WINE_WS_CLOSED) + { + OSSpinLockUnlock(&wwo->lock); + WARN("resetting a closed device\n"); + return MMSYSERR_INVALHANDLE; + } + lpSavedQueuePtr = wwo->lpQueuePtr; wwo->lpPlayPtr = wwo->lpQueuePtr = wwo->lpLoopPtr = NULL; wwo->state = WINE_WS_STOPPED;

1 0

Ken Thomases : winecoreaudio: Move notify of completed WAVEHDRs to end of wodReset.
by Alexandre Julliard June 20, 2007

June 20, 2007

Module: wine Branch: master Commit: ed10114b12b23b809c4e08c77fb2b1386eed391b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed10114b12b23b809c4e08c77… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 20 07:01:07 2007 -0500 winecoreaudio: Move notify of completed WAVEHDRs to end of wodReset. --- dlls/winecoreaudio.drv/audio.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index e5b3e7d..5a3e82b 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1265,6 +1265,7 @@ static DWORD wodReset(WORD wDevID) { WINE_WAVEOUT* wwo; OSStatus status; + LPWAVEHDR lpSavedQueuePtr; TRACE("(%u);\n", wDevID); @@ -1276,12 +1277,9 @@ static DWORD wodReset(WORD wDevID) wwo = &WOutDev[wDevID]; - /* updates current notify list */ - /* if resetting, remove all wave headers and notify client that all headers were completed */ - wodHelper_NotifyCompletions(wwo, TRUE); - OSSpinLockLock(&wwo->lock); + lpSavedQueuePtr = wwo->lpQueuePtr; wwo->lpPlayPtr = wwo->lpQueuePtr = wwo->lpLoopPtr = NULL; wwo->state = WINE_WS_STOPPED; wwo->dwPlayedTotal = wwo->dwWrittenTotal = 0; @@ -1298,6 +1296,11 @@ static DWORD wodReset(WORD wDevID) return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ } + /* Now, send the "done" notification for each header in our list. */ + /* Do this last so the reset operation is effectively complete before the + * app does whatever it's going to do in response to these notifications. */ + wodHelper_NotifyDoneForList(wwo, lpSavedQueuePtr); + return MMSYSERR_NOERROR; }

1 0

Ken Thomases : winecoreaudio: Extract loop, wodNotifyClient for WAVEHDRs in list, to separate function.
by Alexandre Julliard June 20, 2007

June 20, 2007

Module: wine Branch: master Commit: de480f0b6e24f31132d19ccb83a1e27de7ab2d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de480f0b6e24f31132d19ccb8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 20 07:00:55 2007 -0500 winecoreaudio: Extract loop, wodNotifyClient for WAVEHDRs in list, to separate function. --- dlls/winecoreaudio.drv/audio.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index fcd84db..dec3832 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -211,6 +211,7 @@ static HANDLE hThread = NULL; /* Track the thread we create so we can clean it u static CFMessagePortRef Port_SendToMessageThread; static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo); +static void wodHelper_NotifyDoneForList(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr); static void wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force); static void widHelper_NotifyCompletions(WINE_WAVEIN* wwi); @@ -1049,6 +1050,24 @@ static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo) } } +/* Send the "done" notification for each WAVEHDR in a list. The list must be + * free-standing. It should not be part of a device's queue. + * This function must be called with the WAVEOUT lock *not* held. Furthermore, + * it does not lock it, itself. That's because the callback to the application + * may prompt the application to operate on the device, and we don't want to + * deadlock. + */ +static void wodHelper_NotifyDoneForList(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr) +{ + for ( ; lpWaveHdr; lpWaveHdr = lpWaveHdr->lpNext) + { + lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; + lpWaveHdr->dwFlags |= WHDR_DONE; + + wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); + } +} + /* if force is TRUE then notify the client that all the headers were completed */ static void wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) @@ -1097,13 +1116,7 @@ static void wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) OSSpinLockUnlock(&wwo->lock); /* Now, send the "done" notification for each header in our list. */ - for (lpWaveHdr = lpFirstDoneWaveHdr; lpWaveHdr; lpWaveHdr = lpWaveHdr->lpNext) - { - lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; - lpWaveHdr->dwFlags |= WHDR_DONE; - - wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); - } + wodHelper_NotifyDoneForList(wwo, lpFirstDoneWaveHdr); }

1 0

Dmitry Timoshkov : user32: Make MDI get_client_info checks more strict.
by Alexandre Julliard June 20, 2007

June 20, 2007

Module: wine Branch: master Commit: ea2613fe6195fb4ac50a029204720a9bb1fa57f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2613fe6195fb4ac50a02920… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 20 19:37:05 2007 +0900 user32: Make MDI get_client_info checks more strict. --- dlls/user32/mdi.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 0b488d2..51dd405 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -202,13 +202,15 @@ static MDICLIENTINFO *get_client_info( HWND client ) WND *win = WIN_GetPtr( client ); if (win) { - if (win == WND_OTHER_PROCESS) + if (win == WND_OTHER_PROCESS || win == WND_DESKTOP) { - if (IsWindow(client)) ERR( "client %p belongs to other process\n", client ); + if (IsWindow(client)) WARN( "client %p belongs to other process\n", client ); return NULL; } - if (win->cbWndExtra < sizeof(MDICLIENTINFO)) WARN( "%p is not an MDI client\n", client ); - else ret = (MDICLIENTINFO *)win->wExtra; + if (win->flags & WIN_ISMDICLIENT) + ret = (MDICLIENTINFO *)win->wExtra; + else + WARN( "%p is not an MDI client\n", client ); WIN_ReleasePtr( win ); } return ret; @@ -1040,7 +1042,17 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); - if (!(ci = get_client_info( hwnd ))) return 0; + if (!(ci = get_client_info( hwnd ))) + { + if (message == WM_NCCREATE) + { + WND *wndPtr = WIN_GetPtr( hwnd ); + wndPtr->flags |= WIN_ISMDICLIENT; + WIN_ReleasePtr( wndPtr ); + } + return unicode ? DefWindowProcW( hwnd, message, wParam, lParam ) : + DefWindowProcA( hwnd, message, wParam, lParam ); + } switch (message) { @@ -1051,8 +1063,6 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam; WND *wndPtr = WIN_GetPtr( hwnd ); - wndPtr->flags |= WIN_ISMDICLIENT; - /* Translation layer doesn't know what's in the cs->lpCreateParams * so we have to keep track of what environment we're in. */

1 0

Ken Thomases : winecoreaudio: Move a variable declaration to narrower scope , reduce whitespace.
by Alexandre Julliard June 20, 2007

June 20, 2007

Module: wine Branch: master Commit: 58e37cbebf1957de0ae4481bf0a0f0d1d42950bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=58e37cbebf1957de0ae4481bf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 20 07:01:04 2007 -0500 winecoreaudio: Move a variable declaration to narrower scope, reduce whitespace. --- dlls/winecoreaudio.drv/audio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index dec3832..e5b3e7d 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1072,8 +1072,7 @@ static void wodHelper_NotifyDoneForList(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr) */ static void wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) { - LPWAVEHDR lpWaveHdr; - LPWAVEHDR lpFirstDoneWaveHdr = NULL; + LPWAVEHDR lpFirstDoneWaveHdr = NULL; OSSpinLockLock(&wwo->lock); @@ -1086,6 +1085,7 @@ static void wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) } else { + LPWAVEHDR lpWaveHdr; LPWAVEHDR lpLastDoneWaveHdr = NULL; /* Start from lpQueuePtr and keep notifying until:

1 0

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

June 20, 2007

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