wine-commits January 2009

wine-commits@winehq.org

3 participants
1348 discussions

Michael Stefaniuc : ddraw: Remove superfluous pointer casts.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 5ee7a104c908581fdfe9bd398d9dc44d29dc29c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ee7a104c908581fdfe9bd398… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 23:31:09 2009 +0100 ddraw: Remove superfluous pointer casts. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/executebuffer.c | 4 ++-- dlls/ddraw/main.c | 4 ++-- dlls/ddraw/surface.c | 2 +- dlls/ddraw/viewport.c | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5a24ddb..8ed06b2 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3047,7 +3047,7 @@ findRenderTarget(IDirectDrawSurface7 *surface, void *ctx) { IDirectDrawSurfaceImpl *surf = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, surface); - IDirectDrawSurfaceImpl **target = (IDirectDrawSurfaceImpl **) ctx; + IDirectDrawSurfaceImpl **target = ctx; if(!surf->isRenderTarget) { *target = surf; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 819b07b..c4f5861 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -381,7 +381,7 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) { case DDrawHandle_Texture: { - IDirectDrawSurfaceImpl *surf = (IDirectDrawSurfaceImpl *) This->Handles[i].ptr; + IDirectDrawSurfaceImpl *surf = This->Handles[i].ptr; FIXME("Texture Handle %d not unset properly\n", i + 1); surf->Handle = 0; } @@ -389,7 +389,7 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) case DDrawHandle_Material: { - IDirect3DMaterialImpl *mat = (IDirect3DMaterialImpl *) This->Handles[i].ptr; + IDirect3DMaterialImpl *mat = This->Handles[i].ptr; FIXME("Material handle %d not unset properly\n", i + 1); mat->Handle = 0; } @@ -2868,7 +2868,7 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, } else { - IDirectDrawSurfaceImpl *surf = (IDirectDrawSurfaceImpl *) This->Handles[Value - 1].ptr; + IDirectDrawSurfaceImpl *surf = This->Handles[Value - 1].ptr; hr = IDirect3DDevice3_SetTexture(iface, 0, ICOM_INTERFACE(surf, IDirect3DTexture2)); break; } @@ -3041,7 +3041,7 @@ IDirect3DDeviceImpl_3_SetLightState(IDirect3DDevice3 *iface, } else { - mat = (IDirect3DMaterialImpl *) This->Handles[Value - 1].ptr; + mat = This->Handles[Value - 1].ptr; } if (mat != NULL) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index f862d53..4dfc679 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -131,7 +131,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, case D3DOP_TRIANGLE: { int i; - D3DTLVERTEX *tl_vx = (D3DTLVERTEX *) This->vertex_data; + D3DTLVERTEX *tl_vx = This->vertex_data; TRACE("TRIANGLE (%d)\n", count); if (count*3>This->nb_indices) { @@ -262,7 +262,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, WARN("Handle %d is not a material handle\n", matHandle); } else { IDirect3DMaterialImpl *mat = - (IDirect3DMaterialImpl *)lpDevice->Handles[matHandle - 1].ptr; + lpDevice->Handles[matHandle - 1].ptr; mat->activate(mat); } diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 4bd08c8..6768736 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -751,7 +751,7 @@ DestroyCallback(IDirectDrawSurface7 *surf, void *context) { IDirectDrawSurfaceImpl *Impl = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, surf); - IDirectDrawImpl *ddraw = (IDirectDrawImpl *) context; + IDirectDrawImpl *ddraw = context; ULONG ref; ref = IDirectDrawSurface7_Release(surf); /* For the EnumSurfaces */ @@ -927,7 +927,7 @@ DllMain(HINSTANCE hInstDLL, hr = IDirectDraw7_EnumSurfaces(ICOM_INTERFACE(ddraw, IDirectDraw7), DDENUMSURFACES_ALL, &desc, - (void *) ddraw, + ddraw, DestroyCallback); if(hr != D3D_OK) ERR("(%p) EnumSurfaces failed, prepare for trouble\n", ddraw); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b0b7437..df4257c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2521,7 +2521,7 @@ IDirectDrawSurfaceImpl_SetColorKey(IDirectDrawSurface7 *iface, Flags, ctx.CKey); IDirectDrawSurface7_EnumAttachedSurfaces(iface, - (void *) &ctx, + &ctx, SetColorKeyEnum); LeaveCriticalSection(&ddraw_cs); switch(ctx.ret) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 4da988d..7ee6ded 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -399,8 +399,8 @@ IDirect3DViewportImpl_TransformVertices(IDirect3DViewport3 *iface, multiply_matrix(&mat,&view_mat,&world_mat); multiply_matrix(&mat,&proj_mat,&mat); - in = (float *) lpData->lpIn; - out = (float *) lpData->lpOut; + in = lpData->lpIn; + out = lpData->lpOut; outH = lpData->lpHOut; for(i = 0; i < dwVertexCount; i++) { @@ -537,7 +537,7 @@ IDirect3DViewportImpl_SetBackground(IDirect3DViewport3 *iface, if(hMat) { - This->background = (IDirect3DMaterialImpl *) This->ddraw->d3ddevice->Handles[hMat - 1].ptr; + This->background = This->ddraw->d3ddevice->Handles[hMat - 1].ptr; TRACE(" setting background color : %f %f %f %f\n", This->background->mat.u.diffuse.u1.r, This->background->mat.u.diffuse.u2.g,

1 0

Michael Stefaniuc : comdlg32: Remove superfluous pointer casts.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: a04ed94580c50dcc35204008eea3281353593488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04ed94580c50dcc35204008e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 23:30:08 2009 +0100 comdlg32: Remove superfluous pointer casts. --- dlls/comdlg32/filedlg.c | 14 +++++++------- dlls/comdlg32/filedlg31.c | 2 +- dlls/comdlg32/filedlgbrowser.c | 20 ++++++++++---------- dlls/comdlg32/finddlg32.c | 2 +- dlls/comdlg32/fontdlg.c | 6 +++--- dlls/comdlg32/printdlg.c | 2 +- dlls/comdlg32/tests/filedlg.c | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 386a201..a2826c8 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -292,7 +292,7 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) (LPARAM) fodInfos); else lRes = DialogBoxIndirectParamA(COMDLG32_hInstance, - (LPCDLGTEMPLATEA) template, + template, fodInfos->ofnInfos->hwndOwner, FileOpenDlgProc95, (LPARAM) fodInfos); @@ -998,7 +998,7 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l /* Adds the FileOpenDlgInfos in the property list of the dialog so it will be easily accessible through a GetPropA(...) */ - SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos); + SetPropA(hwnd, FileOpenDlgInfosStr, fodInfos); FILEDLG95_InitControls(hwnd); @@ -1971,7 +1971,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) DWORD len; /* replace the current filter */ - MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter); + MemFree(fodInfos->ShellInfos.lpstrCurrentFilter); len = lstrlenW(lpszTemp)+1; fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc(len * sizeof(WCHAR)); lstrcpyW( fodInfos->ShellInfos.lpstrCurrentFilter, lpszTemp); @@ -2484,7 +2484,7 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode) (fodInfos->customfilter == NULL ? 1 : 0); /* Set the current filter with the current selection */ - MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter); + MemFree(fodInfos->ShellInfos.lpstrCurrentFilter); lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, iItem); @@ -2592,7 +2592,7 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) liInfos->iMaxIndentation = 0; - SetPropA(hwndCombo, LookInInfosStr, (HANDLE) liInfos); + SetPropA(hwndCombo, LookInInfosStr, liInfos); /* set item height for both text field and listbox */ CBSetItemHeight(hwndCombo,-1,GetSystemMetrics(SM_CYSMICON)); @@ -2901,7 +2901,7 @@ static int FILEDLG95_LOOKIN_InsertItemAfterParent(HWND hwnd,LPITEMIDLIST pidl) } /* Free pidlParent memory */ - COMDLG32_SHFree((LPVOID)pidlParent); + COMDLG32_SHFree(pidlParent); return FILEDLG95_LOOKIN_AddItem(hwnd,pidl,iParentPos + 1); } @@ -3114,7 +3114,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) lstrcpyW( lpstrAllFile, lpstrTemp ); } } - COMDLG32_SHFree( (LPVOID) pidl ); + COMDLG32_SHFree( pidl ); } } SetWindowTextW( fodInfos->DlgInfos.hwndFileName, lpstrAllFile ); diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 6b2a379..3e43178 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -822,7 +822,7 @@ LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) PFD31_DATA lfs = (PFD31_DATA) lParam; if (!lfs) return FALSE; - SetPropA(hWnd, FD31_OFN_PROP, (HANDLE)lfs); + SetPropA(hWnd, FD31_OFN_PROP, lfs); lfs->hwnd = hWnd; ofn = lfs->ofnW; diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index f933f15..d485d73 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -156,12 +156,12 @@ static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPC switch (src->uType) { case STRRET_WSTR: - lstrcpynW((LPWSTR)dest, src->u.pOleStr, len); + lstrcpynW(dest, src->u.pOleStr, len); COMDLG32_SHFree(src->u.pOleStr); break; case STRRET_CSTR: - if (len && !MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, (LPWSTR)dest, len )) + if (len && !MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len )) ((LPWSTR)dest)[len-1] = 0; break; @@ -169,7 +169,7 @@ static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPC if (pidl) { if (len && !MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset, - -1, (LPWSTR)dest, len )) + -1, dest, len )) ((LPWSTR)dest)[len-1] = 0; } break; @@ -196,7 +196,7 @@ IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner) IShellBrowserImpl *sb; FileOpenDlgInfos *fodInfos = GetPropA(hwndOwner,FileOpenDlgInfosStr); - sb=(IShellBrowserImpl*)COMDLG32_SHAlloc(sizeof(IShellBrowserImpl)); + sb = COMDLG32_SHAlloc(sizeof(IShellBrowserImpl)); /* Initialisation of the member variables */ sb->ref=1; @@ -231,19 +231,19 @@ static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, { *ppvObj = This; } else if(IsEqualIID(riid, &IID_IOleWindow)) /*IOleWindow*/ - { *ppvObj = (IOleWindow*)This; + { *ppvObj = This; } else if(IsEqualIID(riid, &IID_IShellBrowser)) /*IShellBrowser*/ - { *ppvObj = (IShellBrowser*)This; + { *ppvObj = This; } else if(IsEqualIID(riid, &IID_ICommDlgBrowser)) /*ICommDlgBrowser*/ - { *ppvObj = (ICommDlgBrowser*) &(This->lpVtblCommDlgBrowser); + { *ppvObj = &(This->lpVtblCommDlgBrowser); } else if(IsEqualIID(riid, &IID_IServiceProvider)) /* IServiceProvider */ - { *ppvObj = (ICommDlgBrowser*) &(This->lpVtblServiceProvider); + { *ppvObj = &(This->lpVtblServiceProvider); } if(*ppvObj) @@ -442,7 +442,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, fodInfos->Shell.FOIShellFolder = psfTmp; /* Release old pidlAbsCurrent and update its value */ - COMDLG32_SHFree((LPVOID)fodInfos->ShellInfos.pidlAbsCurrent); + COMDLG32_SHFree(fodInfos->ShellInfos.pidlAbsCurrent); fodInfos->ShellInfos.pidlAbsCurrent = pidlTmp; COMDLG32_UpdateCurrentDir(fodInfos); @@ -795,7 +795,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand(ICommDl } /* Free memory used by pidl */ - COMDLG32_SHFree((LPVOID)pidl); + COMDLG32_SHFree(pidl); return hRes; } diff --git a/dlls/comdlg32/finddlg32.c b/dlls/comdlg32/finddlg32.c index 80c8e8b..2a7d7e3 100644 --- a/dlls/comdlg32/finddlg32.c +++ b/dlls/comdlg32/finddlg32.c @@ -408,7 +408,7 @@ static HWND COMDLG32_FR_DoFindReplace( } else { - loadrc = (HGLOBAL)pdata->fr.hInstance; + loadrc = pdata->fr.hInstance; } if(!loadrc) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 470b7d3..f61de36 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -182,7 +182,7 @@ BOOL WINAPI ChooseFontW(LPCHOOSEFONTW lpChFont) if ( (lpChFont->Flags&CF_ENABLETEMPLATEHANDLE)!=0 ) { - template=(LPCVOID)lpChFont->hInstance; + template=lpChFont->hInstance; } else { if ( (lpChFont->Flags&CF_ENABLETEMPLATE)!=0 ) @@ -236,7 +236,7 @@ BOOL WINAPI ChooseFontA(LPCHOOSEFONTA lpChFont) if ( (lpChFont->Flags&CF_ENABLETEMPLATEHANDLE)!=0 ) { - template=(LPCVOID)lpChFont->hInstance; + template=lpChFont->hInstance; } else { if ( (lpChFont->Flags&CF_ENABLETEMPLATE)!=0 ) @@ -601,7 +601,7 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam, HCURSOR hcursor=SetCursor(LoadCursorW(0,(LPWSTR)IDC_WAIT)); static const WCHAR strColorName[] = {'[','c','o','l','o','r',' ','n','a','m','e',']',0}; - SetPropW(hDlg, strWineFontData, (HANDLE)lpcf); + SetPropW(hDlg, strWineFontData, lpcf); lpxx=lpcf->lpLogFont; TRACE("WM_INITDIALOG lParam=%08lX\n", lParam); diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 6515700..4a07f04 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -736,7 +736,7 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, NrOfEntries = DeviceCapabilitiesW(PrinterName, PortName, fwCapability_Names, Names, dm); NrOfEntries = DeviceCapabilitiesW(PrinterName, PortName, - fwCapability_Words, (LPWSTR)Words, dm); + fwCapability_Words, Words, dm); /* reset any current content in the combobox */ SendDlgItemMessageW(hDlg, nIDComboBox, CB_RESETCONTENT, 0, 0); diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index c3d56ea..9c3487f 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -74,7 +74,7 @@ static void test_DialogCancel(void) ofn.nMaxFile = MAX_PATH; ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLEHOOK; ofn.lpstrDefExt = "txt"; - ofn.lpfnHook = (LPOFNHOOKPROC) OFNHookProc; + ofn.lpfnHook = OFNHookProc; ofn.lpstrInitialDir = szInitialDir; PrintDlgA(NULL);

1 0

Michael Stefaniuc : setupapi: Add the Romanian translation.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: ea885c13937b555340c964eb42d790170fa3c4f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea885c13937b555340c964eb4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 14 09:59:47 2009 +0100 setupapi: Add the Romanian translation. --- dlls/setupapi/Ro.rc | 37 +++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.rc | 1 + 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Ro.rc b/dlls/setupapi/Ro.rc new file mode 100644 index 0000000..8a4cb3e --- /dev/null +++ b/dlls/setupapi/Ro.rc @@ -0,0 +1,37 @@ +/* + * Copyright 2001 Andreas Mohr + * Copyright 2009 Michael Stefaniuc + * + * 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Copiez fișiere..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Renunță", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Sursă:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destinație:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +#pragma code_page(default) diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc index 9aaeeac..3bdf7de 100644 --- a/dlls/setupapi/setupapi.rc +++ b/dlls/setupapi/setupapi.rc @@ -41,6 +41,7 @@ #include "No.rc" #include "Pl.rc" #include "Pt.rc" +#include "Ro.rc" #include "Ru.rc" #include "Si.rc" #include "Sv.rc"

1 0

Michael Stefaniuc : wineps.drv: Add the Romanian translation.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 790e7c465ffe00cd46a4ee2725a853228300c6f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=790e7c465ffe00cd46a4ee272… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 23:28:07 2009 +0100 wineps.drv: Add the Romanian translation. --- dlls/wineps.drv/rsrc.rc | 1 + dlls/wineps.drv/wps_Ro.rc | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/rsrc.rc b/dlls/wineps.drv/rsrc.rc index 47df046..4475e92 100644 --- a/dlls/wineps.drv/rsrc.rc +++ b/dlls/wineps.drv/rsrc.rc @@ -46,6 +46,7 @@ #include "wps_Nl.rc" #include "wps_No.rc" #include "wps_Pt.rc" +#include "wps_Ro.rc" #include "wps_Ru.rc" #include "wps_Si.rc" #include "wps_Sk.rc" diff --git a/dlls/wineps.drv/wps_Ro.rc b/dlls/wineps.drv/wps_Ro.rc new file mode 100644 index 0000000..a9f7d1e --- /dev/null +++ b/dlls/wineps.drv/wps_Ro.rc @@ -0,0 +1,42 @@ +/* + * Copyright 2000 Huw D M Davies + * Copyright 2009 Michael Stefaniuc + * + * 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "Hârtie" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Mărimea foii:", -1, 10, 6, 100, 8 + LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | + WS_TABSTOP + GROUPBOX "Orientare", -1, 10, 80, 200, 50 + CONTROL "P&ortret", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + WS_TABSTOP, 20, 90, 60, 10 + CONTROL "&Peisaj", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + 20, 110, 60, 10 + LTEXT "Duplex:", IDD_DUPLEX_NAME, 10, 140, 100, 8 + COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | + WS_TABSTOP +} + +#pragma code_page(default)

1 0

Michael Stefaniuc : comdlg32: Fix typo in #pragma line in cdlg_Ro.rc.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: fe794a36b144d81604597e89749a8efeb448a5d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe794a36b144d81604597e897… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 23:27:52 2009 +0100 comdlg32: Fix typo in #pragma line in cdlg_Ro.rc. --- dlls/comdlg32/cdlg_Ro.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ro.rc b/dlls/comdlg32/cdlg_Ro.rc index 9b888a5..ba00b3f 100644 --- a/dlls/comdlg32/cdlg_Ro.rc +++ b/dlls/comdlg32/cdlg_Ro.rc @@ -477,4 +477,4 @@ STRINGTABLE DISCARDABLE IDS_OPEN_FILE "Deschide fișier" } -#pragma code_page(default){ +#pragma code_page(default)

1 0

Nikolay Sivov : ntdll: Check pointers in NtAccessCheck to prevent access violation.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 800b05c4b58ad64168c42444918da0e0a6b19f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=800b05c4b58ad64168c424449… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jan 13 22:54:32 2009 +0300 ntdll: Check pointers in NtAccessCheck to prevent access violation. --- dlls/advapi32/tests/security.c | 97 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/sec.c | 3 + 2 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8682cc9..8e8728a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -107,6 +107,8 @@ static BOOL (WINAPI *pSetSecurityDescriptorControl)(PSECURITY_DESCRIPTOR, SECURI SECURITY_DESCRIPTOR_CONTROL); static DWORD (WINAPI *pGetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); +static NTSTATUS (WINAPI *pNtAccessCheck)(PSECURITY_DESCRIPTOR, HANDLE, ACCESS_MASK, PGENERIC_MAPPING, + PPRIVILEGE_SET, PULONG, PULONG, NTSTATUS*); static HMODULE hmod; static int myARGC; @@ -142,6 +144,7 @@ static void init(void) hntdll = GetModuleHandleA("ntdll.dll"); pNtQueryObject = (void *)GetProcAddress( hntdll, "NtQueryObject" ); + pNtAccessCheck = (void *)GetProcAddress( hntdll, "NtAccessCheck" ); hmod = GetModuleHandle("advapi32.dll"); pAddAccessAllowedAceEx = (void *)GetProcAddress(hmod, "AddAccessAllowedAceEx"); @@ -842,6 +845,7 @@ static void test_AccessCheck(void) HMODULE NtDllModule; BOOLEAN Enabled; DWORD err; + NTSTATUS ntret, ntAccessStatus; NtDllModule = GetModuleHandle("ntdll.dll"); if (!NtDllModule) @@ -917,6 +921,7 @@ static void test_AccessCheck(void) /* Generic access mask */ SetLastError(0xdeadbeef); + Access = AccessStatus = 0xdeadbeef; ret = AccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); @@ -925,7 +930,41 @@ static void test_AccessCheck(void) ok(Access == 0xdeadbeef && AccessStatus == 0xdeadbeef, "Access and/or AccessStatus were changed!\n"); + /* Generic access mask - no privilegeset buffer */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0xdeadbeef; + ret = AccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + NULL, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have failed " + "with ERROR_NOACCESS, instead of %d\n", err); + ok(Access == 0xdeadbeef && AccessStatus == 0xdeadbeef, + "Access and/or AccessStatus were changed!\n"); + + /* Generic access mask - no returnlength */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0xdeadbeef; + ret = AccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + PrivSet, NULL, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have failed " + "with ERROR_NOACCESS, instead of %d\n", err); + ok(Access == 0xdeadbeef && AccessStatus == 0xdeadbeef, + "Access and/or AccessStatus were changed!\n"); + + /* Generic access mask - no privilegeset buffer, no returnlength */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0xdeadbeef; + ret = AccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + NULL, NULL, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have failed " + "with ERROR_NOACCESS, instead of %d\n", err); + ok(Access == 0xdeadbeef && AccessStatus == 0xdeadbeef, + "Access and/or AccessStatus were changed!\n"); + /* sd with no dacl present */ + Access = AccessStatus = 0xdeadbeef; ret = SetSecurityDescriptorDacl(SecurityDescriptor, FALSE, NULL, FALSE); ok(ret, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, @@ -935,7 +974,63 @@ static void test_AccessCheck(void) "AccessCheck failed to grant access with error %d\n", GetLastError()); + /* sd with no dacl present - no privilegeset buffer */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0xdeadbeef; + ret = AccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + NULL, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have failed " + "with ERROR_NOACCESS, instead of %d\n", err); + ok(Access == 0xdeadbeef && AccessStatus == 0xdeadbeef, + "Access and/or AccessStatus were changed!\n"); + + if(pNtAccessCheck) + { + /* Generic access mask - no privilegeset buffer */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0xdeadbeef; + ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + NULL, &PrivSetLen, &Access, &ntAccessStatus); + err = GetLastError(); + ok(ntret == STATUS_ACCESS_VIOLATION, + "NtAccessCheck should have failed with STATUS_ACCESS_VIOLATION, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + ok(Access == 0xdeadbeef && ntAccessStatus == 0xdeadbeef, + "Access and/or AccessStatus were changed!\n"); + + /* Generic access mask - no returnlength */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0xdeadbeef; + ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + PrivSet, NULL, &Access, &ntAccessStatus); + err = GetLastError(); + ok(ntret == STATUS_ACCESS_VIOLATION, + "NtAccessCheck should have failed with STATUS_ACCESS_VIOLATION, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + ok(Access == 0xdeadbeef && ntAccessStatus == 0xdeadbeef, + "Access and/or AccessStatus were changed!\n"); + + /* Generic access mask - no privilegeset buffer, no returnlength */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0xdeadbeef; + ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + NULL, NULL, &Access, &ntAccessStatus); + err = GetLastError(); + ok(ntret == STATUS_ACCESS_VIOLATION, + "NtAccessCheck should have failed with STATUS_ACCESS_VIOLATION, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + ok(Access == 0xdeadbeef && ntAccessStatus == 0xdeadbeef, + "Access and/or AccessStatus were changed!\n"); + } + else + win_skip("NtAccessCheck unavailable. Skipping.\n"); + /* sd with NULL dacl */ + Access = AccessStatus = 0xdeadbeef; ret = SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, NULL, FALSE); ok(ret, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, @@ -963,6 +1058,7 @@ static void test_AccessCheck(void) ok(res, "AddAccessDeniedAce failed with error %d\n", GetLastError()); /* sd with dacl */ + Access = AccessStatus = 0xdeadbeef; ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); ok(ret, "AccessCheck failed with error %d\n", GetLastError()); @@ -980,6 +1076,7 @@ static void test_AccessCheck(void) /* Access denied by SD */ SetLastError(0xdeadbeef); + Access = AccessStatus = 0xdeadbeef; ret = AccessCheck(SecurityDescriptor, Token, KEY_WRITE, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); ok(ret, "AccessCheck failed with error %d\n", GetLastError()); diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index a764e21..6a8a0ce 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1562,6 +1562,9 @@ NtAccessCheck( SecurityDescriptor, ClientToken, DesiredAccess, GenericMapping, PrivilegeSet, ReturnLength, GrantedAccess, AccessStatus); + if (!PrivilegeSet || !ReturnLength) + return STATUS_ACCESS_VIOLATION; + SERVER_START_REQ( access_check ) { struct security_descriptor sd;

1 0

André Hentschel : comctl32/tests: Fix wrong comment-headline in toolbar.c.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: eda4872c45b208f716ff81b839e48fcbc7603660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda4872c45b208f716ff81b83… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 13 20:47:09 2009 +0100 comctl32/tests: Fix wrong comment-headline in toolbar.c. --- dlls/comctl32/tests/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index c92f3f2..ee86c1c 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1,4 +1,4 @@ -/* Unit tests for treeview. +/* Unit tests for toolbar. * * Copyright 2005 Krzysztof Foltman * Copyright 2007 Mikolaj Zalewski

1 0

Hans Leidekker : setupapi: Fix resolving target path when given a section. Default to the system directory.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: d92e738f4a87a97162ea6b6356db4983398c179b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92e738f4a87a97162ea6b635… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 13 17:22:11 2009 +0100 setupapi: Fix resolving target path when given a section. Default to the system directory. --- dlls/setupapi/query.c | 22 ++++++--- dlls/setupapi/tests/query.c | 104 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index f44826d..d6320a3 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -579,18 +579,24 @@ BOOL WINAPI SetupGetTargetPathW( HINF hinf, PINFCONTEXT context, PCWSTR section, {'D','e','f','a','u','l','t','D','e','s','t','D','i','r',0}; INFCONTEXT ctx; - WCHAR *dir; + WCHAR *dir, systemdir[MAX_PATH]; unsigned int size; + BOOL ret = FALSE; TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_w(section), buffer, buffer_size, required_size); - if (context && !SetupFindFirstLineW( hinf, destination_dirs, NULL, context )) return FALSE; - else if (section && !SetupFindFirstLineW( hinf, section, NULL, &ctx )) return FALSE; - else if (!SetupFindFirstLineW( hinf, destination_dirs, default_dest_dir, &ctx )) return FALSE; - - if (!(dir = PARSER_get_dest_dir( context ? context : &ctx ))) return FALSE; - + if (context) ret = SetupFindFirstLineW( hinf, destination_dirs, NULL, context ); + else if (section) + { + if (!(ret = SetupFindFirstLineW( hinf, destination_dirs, section, &ctx ))) + ret = SetupFindFirstLineW( hinf, destination_dirs, default_dest_dir, &ctx ); + } + if (!ret || !(dir = PARSER_get_dest_dir( context ? context : &ctx ))) + { + GetSystemDirectoryW( systemdir, MAX_PATH ); + dir = systemdir; + } size = strlenW( dir ) + 1; if (required_size) *required_size = size; @@ -605,7 +611,7 @@ BOOL WINAPI SetupGetTargetPathW( HINF hinf, PINFCONTEXT context, PCWSTR section, return FALSE; } } - HeapFree( GetProcessHeap(), 0, dir ); + if (dir != systemdir) HeapFree( GetProcessHeap(), 0, dir ); return TRUE; } diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 932ff30..97be1a2 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -68,6 +68,37 @@ static const char inf_data2[] = "sp1qfe\\winhttp.dll=3EC6F518114606CA59D4160322077437,000500010A280615,331776,SP1QFE\n" "sp1qfe\\xpob2res.dll=DB83156B9F496F20D1EA70E4ABEC0166,000500010A280622,158720,SP1QFE\n"; +static const char inf_data3[] = + "[Version]\n" + "Signature = \"$Windows NT$\"\n" + "[DestinationDirs]\n" + "CopyAlways.Windir.files = 10\n" + "[CopyAlways.Windir.Files]\n" + "WindowsCodecs.dll\n"; + +static const char inf_data4[] = + "[Version]\n" + "Signature = \"$Windows NT$\"\n" + "[CopyAlways.System32.Files]\n" + "WindowsCodecs.dll\n"; + +static const char inf_data5[] = + "[Version]\n" + "Signature = \"$Windows NT$\"\n" + "[DestinationDirs]\n" + "DefaultDestDir = 11\n" + "CopyAlways.Windir.files = 10\n" + "[CopyAlways.Windir.Files]\n" + "WindowsCodecs.dll\n"; + +static const char inf_data6[] = + "[Version]\n" + "Signature = \"$Windows NT$\"\n" + "[DestinationDirs]\n" + "DefaultDestDir = 10\n" + "[CopyAlways.Windir.Files]\n" + "WindowsCodecs.dll\n"; + static void create_inf_file(LPSTR filename, const char *data, DWORD size) { DWORD dwNumberOfBytesWritten; @@ -398,6 +429,79 @@ static void test_SetupGetTargetPath(void) SetupCloseInfFile(hinf); DeleteFileA(inf_filename); + + create_inf_file(inf_filename, inf_data3, sizeof(inf_data3) - 1); + + hinf = SetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "could not open inf file\n"); + + required = 0; + + ret = SetupGetTargetPathA(hinf, NULL, "CopyAlways.Windir.Files", buffer, sizeof(buffer), &required); + ok(ret, "SetupGetTargetPathA failed\n"); + + lstrcpyA(destfile, WIN_DIR); + + ok(required == lstrlenA(destfile) + 1, "unexpected required size: %d\n", required); + ok(!lstrcmpiA(buffer, destfile), "unexpected path: %s\n", buffer); + + SetupCloseInfFile(hinf); + DeleteFileA(inf_filename); + + create_inf_file(inf_filename, inf_data4, sizeof(inf_data4) - 1); + + hinf = SetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "could not open inf file\n"); + + required = 0; + + ret = SetupGetTargetPathA(hinf, NULL, "CopyAlways.System32.Files", buffer, sizeof(buffer), &required); + ok(ret, "SetupGetTargetPathA failed\n"); + + lstrcpyA(destfile, WIN_DIR); + lstrcatA(destfile, "\\system32"); + + ok(required == lstrlenA(destfile) + 1, "unexpected required size: %d\n", required); + ok(!lstrcmpiA(buffer, destfile), "unexpected path: %s\n", buffer); + + SetupCloseInfFile(hinf); + DeleteFileA(inf_filename); + + create_inf_file(inf_filename, inf_data5, sizeof(inf_data5) - 1); + + hinf = SetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "could not open inf file\n"); + + required = 0; + + ret = SetupGetTargetPathA(hinf, NULL, "CopyAlways.Windir.Files", buffer, sizeof(buffer), &required); + ok(ret, "SetupGetTargetPathA failed\n"); + + lstrcpyA(destfile, WIN_DIR); + + ok(required == lstrlenA(destfile) + 1, "unexpected required size: %d\n", required); + ok(!lstrcmpiA(buffer, destfile), "unexpected path: %s\n", buffer); + + SetupCloseInfFile(hinf); + DeleteFileA(inf_filename); + + create_inf_file(inf_filename, inf_data6, sizeof(inf_data6) - 1); + + hinf = SetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "could not open inf file\n"); + + required = 0; + + ret = SetupGetTargetPathA(hinf, NULL, "CopyAlways.Windir.Files", buffer, sizeof(buffer), &required); + ok(ret, "SetupGetTargetPathA failed\n"); + + lstrcpyA(destfile, WIN_DIR); + + ok(required == lstrlenA(destfile) + 1, "unexpected required size: %d\n", required); + ok(!lstrcmpiA(buffer, destfile), "unexpected path: %s\n", buffer); + + SetupCloseInfFile(hinf); + DeleteFileA(inf_filename); } START_TEST(query)

1 0

Alexandre Julliard : user32/tests: Fix the layered window tests for some Vista versions.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: c6144893b61edc928994d271d061626dd062ed44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6144893b61edc928994d271d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 13 17:06:31 2009 +0100 user32/tests: Fix the layered window tests for some Vista versions. --- dlls/user32/tests/win.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 7f6f88b..9d6ba7f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4958,7 +4958,7 @@ static void test_layered_window(void) ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" ); - ok( key == 0x123456, "wrong color key %x\n", key ); + ok( key == 0x123456 || key == 0, "wrong color key %x\n", key ); ok( alpha == 44, "wrong alpha %u\n", alpha ); ok( flags == LWA_ALPHA, "wrong flags %x\n", flags ); @@ -4987,24 +4987,24 @@ static void test_layered_window(void) ok( alpha == 22 || alpha == 33, "wrong alpha %u\n", alpha ); ok( flags == LWA_COLORKEY, "wrong flags %x\n", flags ); - /* color key always changed */ + /* color key may or may not be changed without LWA_COLORKEY */ ret = pSetLayeredWindowAttributes( hwnd, 0x999999, 44, 0 ); ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); alpha = 0; ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" ); - ok( key == 0x999999, "wrong color key %x\n", key ); + ok( key == 0x888888 || key == 0x999999, "wrong color key %x\n", key ); ok( alpha == 22 || alpha == 44, "wrong alpha %u\n", alpha ); ok( flags == 0, "wrong flags %x\n", flags ); - /* default alpha is 0 */ + /* default alpha and color key is 0 */ SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) & ~WS_EX_LAYERED ); SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED ); ret = pSetLayeredWindowAttributes( hwnd, 0x222222, 55, 0 ); ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" ); - ok( key == 0x222222, "wrong color key %x\n", key ); + ok( key == 0 || key == 0x222222, "wrong color key %x\n", key ); ok( alpha == 0 || alpha == 55, "wrong alpha %u\n", alpha ); ok( flags == 0, "wrong flags %x\n", flags );

1 0

Alexandre Julliard : user32/tests: Comment out the menu size tests, there' s no consistent behavior to test for.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: 41e6d71757ffdeafcc046d6b8f53aa4d704fe1fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e6d71757ffdeafcc046d6b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 13 17:06:17 2009 +0100 user32/tests: Comment out the menu size tests, there's no consistent behavior to test for. --- dlls/user32/tests/menu.c | 87 ++++++++++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 42 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 45b6c9f..6ee28a3 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -444,53 +444,56 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, DrawMenuBar( hwnd); } ret = GetMenuItemRect( hwnd, hmenu, 0, &rc); - /* check menu width */ - if( ispop) - expect = ( text || hbmp ? - 4 + (mnuopt != 1 ? GetSystemMetrics(SM_CXMENUCHECK) : 0) - : 0) + - arrowwidth + MOD_avec + (hbmp ? bmpsize.cx + 2 : 0) + - (text && hastab ? /* TAB space */ - MOD_avec + ( hastab==2 ? sc_size.cx : 0) : 0) + - (text ? 2 + (text[0] ? size.cx :0): 0) ; - else - expect = !(text || hbmp) ? 0 : - ( hbmp ? (text ? 2:0) + bmpsize.cx : 0 ) + - (text ? 2 * MOD_avec + (text[0] ? size.cx :0): 0) ; - ok( rc.right - rc.left == expect, + if (0) /* comment out menu size checks, behavior is different in almost every Windows version */ + { + /* check menu width */ + if( ispop) + expect = ( text || hbmp ? + 4 + (mnuopt != 1 ? GetSystemMetrics(SM_CXMENUCHECK) : 0) + : 0) + + arrowwidth + MOD_avec + (hbmp ? bmpsize.cx + 2 : 0) + + (text && hastab ? /* TAB space */ + MOD_avec + ( hastab==2 ? sc_size.cx : 0) : 0) + + (text ? 2 + (text[0] ? size.cx :0): 0) ; + else + expect = !(text || hbmp) ? 0 : + ( hbmp ? (text ? 2:0) + bmpsize.cx : 0 ) + + (text ? 2 * MOD_avec + (text[0] ? size.cx :0): 0) ; + ok( rc.right - rc.left == expect, "menu width wrong, got %d expected %d\n", rc.right - rc.left, expect); - failed = failed || !(rc.right - rc.left == expect); - /* check menu height */ - if( ispop) - expect = max( ( !(text || hbmp) ? GetSystemMetrics( SM_CYMENUSIZE)/2 : 0), - max( (text ? max( 2 + size.cy, MOD_hic + 4) : 0), - (hbmp ? bmpsize.cy + 2 : 0))); - else - expect = ( !(text || hbmp) ? GetSystemMetrics( SM_CYMENUSIZE)/2 : - max( GetSystemMetrics( SM_CYMENU) - 1, (hbmp ? bmpsize.cy : 0))); - ok( rc.bottom - rc.top == expect, + failed = failed || !(rc.right - rc.left == expect); + /* check menu height */ + if( ispop) + expect = max( ( !(text || hbmp) ? GetSystemMetrics( SM_CYMENUSIZE)/2 : 0), + max( (text ? max( 2 + size.cy, MOD_hic + 4) : 0), + (hbmp ? bmpsize.cy + 2 : 0))); + else + expect = ( !(text || hbmp) ? GetSystemMetrics( SM_CYMENUSIZE)/2 : + max( GetSystemMetrics( SM_CYMENU) - 1, (hbmp ? bmpsize.cy : 0))); + ok( rc.bottom - rc.top == expect, "menu height wrong, got %d expected %d (%d)\n", rc.bottom - rc.top, expect, GetSystemMetrics( SM_CYMENU)); - failed = failed || !(rc.bottom - rc.top == expect); - if( hbmp == HBMMENU_CALLBACK && MOD_GotDrawItemMsg) { - /* check the position of the bitmap */ - /* horizontal */ - if (!ispop) - expect = 3; - else if (mnuopt == 0) - expect = 4 + GetSystemMetrics(SM_CXMENUCHECK); - else if (mnuopt == 1) - expect = 4; - else /* mnuopt == 2 */ - expect = 2; - ok( expect == MOD_rc[0].left, + failed = failed || !(rc.bottom - rc.top == expect); + if( hbmp == HBMMENU_CALLBACK && MOD_GotDrawItemMsg) { + /* check the position of the bitmap */ + /* horizontal */ + if (!ispop) + expect = 3; + else if (mnuopt == 0) + expect = 4 + GetSystemMetrics(SM_CXMENUCHECK); + else if (mnuopt == 1) + expect = 4; + else /* mnuopt == 2 */ + expect = 2; + ok( expect == MOD_rc[0].left, "bitmap left is %d expected %d\n", MOD_rc[0].left, expect); - failed = failed || !(expect == MOD_rc[0].left); - /* vertical */ - expect = (rc.bottom - rc.top - MOD_rc[0].bottom + MOD_rc[0].top) / 2; - ok( expect == MOD_rc[0].top, + failed = failed || !(expect == MOD_rc[0].left); + /* vertical */ + expect = (rc.bottom - rc.top - MOD_rc[0].bottom + MOD_rc[0].top) / 2; + ok( expect == MOD_rc[0].top, "bitmap top is %d expected %d\n", MOD_rc[0].top, expect); - failed = failed || !(expect == MOD_rc[0].top); + failed = failed || !(expect == MOD_rc[0].top); + } } /* if there was a failure, report details */ if( failed) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2009