March 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : winebuild: Make sure main module is properly initialized.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: e9ef9911d0f348f4af34dd517e3fabc3276ff333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ef9911d0f348f4af34dd517… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 11:50:13 2009 +0100 winebuild: Make sure main module is properly initialized. --- tools/winebuild/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 3a29a4b..ffe44ec 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -465,6 +465,7 @@ DLLSPEC *alloc_dll_spec(void) spec->file_name = NULL; spec->dll_name = NULL; spec->init_func = NULL; + spec->main_module = NULL; spec->type = SPEC_WIN32; spec->base = MAX_ORDINALS; spec->limit = 0;

1 0

Nikolay Sivov : comctl32/tab: Fix button background filling on TCS_BUTTONS.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: b896b92061d1b0f98fe526065e49992e2e9dac60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b896b92061d1b0f98fe526065… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 23 15:47:16 2009 -0400 comctl32/tab: Fix button background filling on TCS_BUTTONS. --- dlls/comctl32/tab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index ae4f035..b8f638d 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1433,7 +1433,6 @@ TAB_EraseTabInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect BOOL deleteBrush = TRUE; RECT rTemp = *drawRect; - InflateRect(&rTemp, -2, -2); if (lStyle & TCS_BUTTONS) { if (iItem == infoPtr->iSelected) @@ -1473,6 +1472,7 @@ TAB_EraseTabInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect } else /* !TCS_BUTTONS */ { + InflateRect(&rTemp, -2, -2); if (!GetWindowTheme (infoPtr->hwnd)) FillRect(hdc, &rTemp, hbr); }

1 0

Nikolay Sivov : comctl32/listview: Some tests for LVM_GETSUBITEMRECT.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: bdd1206ca5ea4e73e73df3f876dd07c37f94f255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd1206ca5ea4e73e73df3f87… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 23 16:12:51 2009 -0400 comctl32/listview: Some tests for LVM_GETSUBITEMRECT. --- dlls/comctl32/tests/listview.c | 57 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4562f2e..813d9bb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1222,6 +1222,62 @@ static void test_multiselect(void) DestroyWindow(hwnd); } +static void test_subitem_rect(void) +{ + HWND hwnd; + DWORD r; + LVCOLUMN col; + RECT rect; + + /* test LVM_GETSUBITEMRECT for header */ + hwnd = create_listview_control(); + ok(hwnd != NULL, "failed to create a listview window\n"); + /* add some columns */ + memset(&col, 0, sizeof(LVCOLUMN)); + col.mask = LVCF_WIDTH; + col.cx = 100; + r = -1; + r = SendMessage(hwnd, LVM_INSERTCOLUMN, 0, (LPARAM)&col); + expect(0, r); + col.cx = 150; + r = -1; + r = SendMessage(hwnd, LVM_INSERTCOLUMN, 1, (LPARAM)&col); + expect(1, r); + col.cx = 200; + r = -1; + r = SendMessage(hwnd, LVM_INSERTCOLUMN, 2, (LPARAM)&col); + expect(2, r); + /* item = -1 means header, subitem index is 1 based */ + rect.left = LVIR_BOUNDS; + rect.top = 0; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); + expect(0, r); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); +todo_wine{ + ok(r != 0, "Expected not-null LRESULT\n"); + expect(100, rect.left); + expect(250, rect.right); + expect(3, rect.top); +} + rect.left = LVIR_BOUNDS; + rect.top = 2; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); +todo_wine{ + ok(r != 0, "Expected not-null LRESULT\n"); + expect(250, rect.left); + expect(450, rect.right); + expect(3, rect.top); +} + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -1259,4 +1315,5 @@ START_TEST(listview) test_columns(); test_getorigin(); test_multiselect(); + test_subitem_rect(); }

1 0

Henri Verbeet : d3d8: Properly handle unsetting the pixelshader in SetPixelShader().
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 3f559f26d64f251ed1fb4df92afd04c11aa7dd3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f559f26d64f251ed1fb4df92… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 10:09:21 2009 +0100 d3d8: Properly handle unsetting the pixelshader in SetPixelShader(). --- dlls/d3d8/device.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 119d33d..be6bce7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2171,14 +2171,23 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShader(LPDIRECT3DDEVICE8 ifac EnterCriticalSection(&d3d8_cs); + if (!pShader) + { + hr = IWineD3DDevice_SetPixelShader(This->WineD3DDevice, NULL); + LeaveCriticalSection(&d3d8_cs); + return hr; + } + shader = d3d8_get_object(&This->handle_table, pShader - (VS_HIGHESTFIXEDFXF + 1)); if (!shader) { WARN("Invalid handle (%#x) passed.\n", pShader); + LeaveCriticalSection(&d3d8_cs); + return D3DERR_INVALIDCALL; } TRACE("(%p) : Setting shader %p\n", This, shader); - hr = IWineD3DDevice_SetPixelShader(This->WineD3DDevice, shader == NULL ? NULL :shader->wineD3DPixelShader); + hr = IWineD3DDevice_SetPixelShader(This->WineD3DDevice, shader->wineD3DPixelShader); LeaveCriticalSection(&d3d8_cs); return hr; }

1 0

Nikolay Sivov : comctl32/trackbar: Fix reverting to default value for TBM_SETPAGESIZE with lParam = -1.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: b7d7d589782d49c0285b278d0386162429a610be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7d7d589782d49c0285b278d0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 23 16:05:49 2009 -0400 comctl32/trackbar: Fix reverting to default value for TBM_SETPAGESIZE with lParam = -1. --- dlls/comctl32/tests/trackbar.c | 20 +++++++++++++++++--- dlls/comctl32/trackbar.c | 9 +++++++-- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index d57e28d..e2a3c76 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -588,12 +588,26 @@ static void test_page_size(HWND hWndTrackbar){ /* test TBM_GETPAGESIZE */ r = SendMessage(hWndTrackbar, TBM_GETPAGESIZE, 0,0); - todo_wine{ - expect(20, r); - } + expect(20, r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, page_size_test_seq, "page size test sequence", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent page size test sequence", FALSE); + + /* check for zero page size */ + r = SendMessage(hWndTrackbar, TBM_SETPAGESIZE, 0, 0); + expect(20, r); + r = SendMessage(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + expect(0, r); + /* revert to default */ + r = SendMessage(hWndTrackbar, TBM_SETPAGESIZE, 0, -1); + expect(0, r); + r = SendMessage(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + expect(20, r); + /* < -1 */ + r = SendMessage(hWndTrackbar, TBM_SETPAGESIZE, 0, -2); + expect(20, r); + r = SendMessage(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + expect(-2, r); } static void test_position(HWND hWndTrackbar){ diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 3424333..849ebcd 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -81,6 +81,8 @@ typedef struct #define TOOLTIP_OFFSET 2 /* distance from ctrl edge to tooltip */ +#define TB_DEFAULTPAGESIZE 20 + /* Used by TRACKBAR_Refresh to find out which parts of the control need to be recalculated */ @@ -1128,7 +1130,10 @@ TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) { LONG lTemp = infoPtr->lPageSize; - infoPtr->lPageSize = lPageSize; + if (lPageSize != -1) + infoPtr->lPageSize = lPageSize; + else + infoPtr->lPageSize = TB_DEFAULTPAGESIZE; return lTemp; } @@ -1405,7 +1410,7 @@ TRACKBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->lRangeMin = 0; infoPtr->lRangeMax = 100; infoPtr->lLineSize = 1; - infoPtr->lPageSize = 20; + infoPtr->lPageSize = TB_DEFAULTPAGESIZE; infoPtr->lSelMin = 0; infoPtr->lSelMax = 0; infoPtr->lPos = 0;

1 0

Nikolay Sivov : comctl32/tab: Implement TCM_[G, S] ETEXTENDEDSTYLE and TCS_EX_FLATSEPARATORS style.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 92b0ad98e128a7281120c3cc92b38e2f11bf3645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b0ad98e128a7281120c3cc9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 23 16:00:04 2009 -0400 comctl32/tab: Implement TCM_[G,S]ETEXTENDEDSTYLE and TCS_EX_FLATSEPARATORS style. --- dlls/comctl32/tab.c | 49 +++++++++++++++++++++++++++++++++++++------- dlls/comctl32/tests/tab.c | 6 +--- 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index b8f638d..3a0e477 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -40,7 +40,6 @@ * TCIF_RTLREADING * * Extended Styles: - * TCS_EX_FLATSEPARATORS * TCS_EX_REGISTERDROP * * States: @@ -54,8 +53,6 @@ * * Messages: * TCM_DESELECTALL - * TCM_GETEXTENDEDSTYLE - * TCM_SETEXTENDEDSTYLE * * Macros: * TabCtrl_AdjustRect @@ -126,6 +123,9 @@ typedef struct BOOL bUnicode; /* Unicode control? */ HWND hwndUpDown; /* Updown control used for scrolling */ INT cbInfo; /* Number of bytes of caller supplied info per tab */ + + DWORD exStyle; /* Extended style used, currently: + TCS_EX_FLATSEPARATORS, TCS_EX_REGISTERDROP */ } TAB_INFO; /****************************************************************************** @@ -1947,7 +1947,7 @@ static void TAB_DrawItem(const TAB_INFO *infoPtr, HDC hdc, INT iItem) r = itemRect; /* Separators between flat buttons */ - if (lStyle & TCS_FLATBUTTONS) + if ((lStyle & TCS_FLATBUTTONS) && (infoPtr->exStyle & TCS_EX_FLATSEPARATORS)) { r1 = r; r1.right += (FLAT_BTN_SPACINGX -2); @@ -2978,6 +2978,8 @@ static LRESULT TAB_Create (HWND hwnd, LPARAM lParam) dwStyle = GetWindowLongW(hwnd, GWL_STYLE); SetWindowLongW(hwnd, GWL_STYLE, dwStyle|WS_CLIPSIBLINGS); + infoPtr->exStyle = (dwStyle & TCS_FLATBUTTONS) ? TCS_EX_FLATSEPARATORS : 0; + if (dwStyle & TCS_TOOLTIPS) { /* Create tooltip control */ infoPtr->hwndToolTip = @@ -3129,6 +3131,39 @@ static LRESULT TAB_RemoveImage (TAB_INFO *infoPtr, INT image) return 0; } +static LRESULT +TAB_SetExtendedStyle (TAB_INFO *infoPtr, DWORD exMask, DWORD exStyle) +{ + DWORD prevstyle = infoPtr->exStyle; + + /* zero mask means all styles */ + if (exMask == 0) exMask = ~0; + + if (exMask & TCS_EX_REGISTERDROP) + { + FIXME("TCS_EX_REGISTERDROP style unimplemented\n"); + exMask &= ~TCS_EX_REGISTERDROP; + exStyle &= ~TCS_EX_REGISTERDROP; + } + + if (exMask & TCS_EX_FLATSEPARATORS) + { + if ((prevstyle ^ exStyle) & TCS_EX_FLATSEPARATORS) + { + infoPtr->exStyle ^= TCS_EX_FLATSEPARATORS; + TAB_InvalidateTabArea(infoPtr); + } + } + + return prevstyle; +} + +static inline LRESULT +TAB_GetExtendedStyle (TAB_INFO *infoPtr) +{ + return infoPtr->exStyle; +} + static LRESULT WINAPI TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -3226,12 +3261,10 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; case TCM_GETEXTENDEDSTYLE: - FIXME("Unimplemented msg TCM_GETEXTENDEDSTYLE\n"); - return 0; + return TAB_GetExtendedStyle (infoPtr); case TCM_SETEXTENDEDSTYLE: - FIXME("Unimplemented msg TCM_SETEXTENDEDSTYLE\n"); - return 0; + return TAB_SetExtendedStyle (infoPtr, wParam, lParam); case WM_GETFONT: return TAB_GetFont (infoPtr); diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index daef97f..d24d097 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -768,12 +768,10 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) /* Testing Flat Separators */ extendedStyle = SendMessage(hTab, TCM_GETEXTENDEDSTYLE, 0, 0); prevExtendedStyle = SendMessage(hTab, TCM_SETEXTENDEDSTYLE, 0, TCS_EX_FLATSEPARATORS); - expect(extendedStyle, prevExtendedStyle); + expect(extendedStyle, prevExtendedStyle); extendedStyle = SendMessage(hTab, TCM_GETEXTENDEDSTYLE, 0, 0); - todo_wine{ - expect(TCS_EX_FLATSEPARATORS, extendedStyle); - } + expect(TCS_EX_FLATSEPARATORS, extendedStyle); /* Testing Register Drop */ prevExtendedStyle = SendMessage(hTab, TCM_SETEXTENDEDSTYLE, 0, TCS_EX_REGISTERDROP);

1 0

Nikolay Sivov : comctl32/tab: Implement TCM_REMOVEIMAGE.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 45851485476096c99ee21a43a5eeecfb64abc400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45851485476096c99ee21a43a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 23 15:45:44 2009 -0400 comctl32/tab: Implement TCM_REMOVEIMAGE. --- dlls/comctl32/tab.c | 35 ++++++++++++++++++++++-- dlls/comctl32/tests/tab.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 3880ceb..ae4f035 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -53,7 +53,6 @@ * TCN_KEYDOWN * * Messages: - * TCM_REMOVEIMAGE * TCM_DESELECTALL * TCM_GETEXTENDEDSTYLE * TCM_SETEXTENDEDSTYLE @@ -3099,6 +3098,37 @@ TAB_SetItemExtra (TAB_INFO *infoPtr, INT cbInfo) return TRUE; } +static LRESULT TAB_RemoveImage (TAB_INFO *infoPtr, INT image) +{ + if (!infoPtr) + return 0; + + if (ImageList_Remove (infoPtr->himl, image)) + { + INT i, *idx; + RECT r; + + /* shift indices, repaint items if needed */ + for (i = 0; i < infoPtr->uNumItem; i++) + { + idx = &infoPtr->items[i].iImage; + if (*idx >= image) + { + if (*idx == image) + *idx = -1; + else + (*idx)--; + + /* repaint item */ + if (TAB_InternalGetItemRect (infoPtr, i, &r, NULL)) + InvalidateRect (infoPtr->hwnd, &r, TRUE); + } + } + } + + return 0; +} + static LRESULT WINAPI TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -3159,8 +3189,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TAB_SetItemSize (infoPtr, lParam); case TCM_REMOVEIMAGE: - FIXME("Unimplemented msg TCM_REMOVEIMAGE\n"); - return 0; + return TAB_RemoveImage (infoPtr, wParam); case TCM_SETPADDING: return TAB_SetPadding (infoPtr, lParam); diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 4b1c7f4..daef97f 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -984,6 +984,69 @@ static void test_delete_focus(HWND parent_wnd) DestroyWindow(hTab); } +static void test_removeimage(HWND parent_wnd) +{ + static const BYTE bits[32]; + HWND hwTab; + INT i; + TCITEM item; + HICON hicon; + HIMAGELIST himl = ImageList_Create(16, 16, ILC_COLOR, 3, 4); + + hicon = CreateIcon(NULL, 16, 16, 1, 1, bits, bits); + ImageList_AddIcon(himl, hicon); + ImageList_AddIcon(himl, hicon); + ImageList_AddIcon(himl, hicon); + + hwTab = create_tabcontrol(TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE); + SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); + + memset(&item, 0, sizeof(TCITEM)); + item.mask = TCIF_IMAGE; + + for(i = 0; i < 3; i++) { + SendMessage(hwTab, TCM_GETITEM, i, (LPARAM)&item); + expect(i, item.iImage); + } + + /* remove image middle image */ + SendMessage(hwTab, TCM_REMOVEIMAGE, 1, 0); + expect(2, ImageList_GetImageCount(himl)); + item.iImage = -1; + SendMessage(hwTab, TCM_GETITEM, 0, (LPARAM)&item); + expect(0, item.iImage); + item.iImage = 0; + SendMessage(hwTab, TCM_GETITEM, 1, (LPARAM)&item); + expect(-1, item.iImage); + item.iImage = 0; + SendMessage(hwTab, TCM_GETITEM, 2, (LPARAM)&item); + expect(1, item.iImage); + /* remove first image */ + SendMessage(hwTab, TCM_REMOVEIMAGE, 0, 0); + expect(1, ImageList_GetImageCount(himl)); + item.iImage = 0; + SendMessage(hwTab, TCM_GETITEM, 0, (LPARAM)&item); + expect(-1, item.iImage); + item.iImage = 0; + SendMessage(hwTab, TCM_GETITEM, 1, (LPARAM)&item); + expect(-1, item.iImage); + item.iImage = -1; + SendMessage(hwTab, TCM_GETITEM, 2, (LPARAM)&item); + expect(0, item.iImage); + /* remove the last one */ + SendMessage(hwTab, TCM_REMOVEIMAGE, 0, 0); + expect(0, ImageList_GetImageCount(himl)); + for(i = 0; i < 3; i++) { + item.iImage = 0; + SendMessage(hwTab, TCM_GETITEM, i, (LPARAM)&item); + expect(-1, item.iImage); + } + + DestroyWindow(hwTab); + ImageList_Destroy(himl); + DestroyIcon(hicon); +} + START_TEST(tab) { HWND parent_wnd; @@ -1021,6 +1084,7 @@ START_TEST(tab) test_insert_focus(parent_wnd); test_delete_focus(parent_wnd); + test_removeimage(parent_wnd); DestroyWindow(parent_wnd); }

1 0

Andrew Talbot : wineps.drv: Remove order-of-evaluation dependencies.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 92bfdeb5915abeba9875bbaef3162b737c222a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92bfdeb5915abeba9875bbaef… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 19 22:40:07 2009 +0000 wineps.drv: Remove order-of-evaluation dependencies. --- dlls/wineps.drv/builtin.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index b8c5349..c8c3f9b 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -424,10 +424,11 @@ BOOL CDECL PSDRV_EnumDeviceFonts( PSDRV_PDEVICE *physDev, LPLOGFONTW plf, } if(family) { for(afmle = family->afmlist; afmle; afmle = afmle->next) { + UINT fm; + TRACE("Got '%s'\n", afmle->afm->FontName); - if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, - PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf ), - lp )) ) + fm = PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf ); + if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp )) ) bRet = b; else break; } @@ -436,11 +437,12 @@ BOOL CDECL PSDRV_EnumDeviceFonts( PSDRV_PDEVICE *physDev, LPLOGFONTW plf, TRACE("lfFaceName = NULL\n"); for(family = physDev->pi->Fonts; family; family = family->next) { + UINT fm; + afmle = family->afmlist; TRACE("Got '%s'\n", afmle->afm->FontName); - if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, - PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf ), - lp )) ) + fm = PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf ); + if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp )) ) bRet = b; else break; }

1 0

James Hawkins : kernel32: Add tests for WritePrivateProfileString.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 287b07fddcff046018f9f56a30687409c1f7e3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287b07fddcff046018f9f56a3… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:36:54 2009 -0700 kernel32: Add tests for WritePrivateProfileString. --- dlls/kernel32/tests/profile.c | 227 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 227 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 2e5678c..6000ffb 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -802,6 +802,232 @@ static void test_GetPrivateProfileString(const char *content, const char *descri DeleteFileA(filename); } +static BOOL check_file_data(LPCSTR path, LPCSTR data) +{ + HANDLE file; + CHAR buf[MAX_PATH]; + DWORD size; + BOOL ret; + + file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + size = GetFileSize(file, NULL); + buf[size] = '\0'; + ret = ReadFile(file, buf, size, &size, NULL); + CloseHandle(file); + if (!ret) + return FALSE; + + if (!*data && size != 0) + return FALSE; + + return !lstrcmpA(buf, data); +} + +static void test_WritePrivateProfileString(void) +{ + BOOL ret; + LPCSTR data; + CHAR path[MAX_PATH]; + CHAR temp[MAX_PATH]; + + GetTempPathA(MAX_PATH, temp); + GetTempFileNameA(temp, "wine", 0, path); + DeleteFileA(path); + + /* path is not created yet */ + + /* NULL lpAppName */ + SetLastError(0xdeadbeef); + ret = WritePrivateProfileStringA(NULL, "key", "string", path); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES, + "Expected path to not exist\n"); + + GetTempFileNameA(temp, "wine", 0, path); + + /* NULL lpAppName, path exists */ + data = ""; + SetLastError(0xdeadbeef); + ret = WritePrivateProfileStringA(NULL, "key", "string", path); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + todo_wine + { + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + } + ok(check_file_data(path, data), "File doesn't match\n"); + DeleteFileA(path); + + /* empty lpAppName */ + data = "[]\r\n" + "key=string\r\n"; + ret = WritePrivateProfileStringA("", "key", "string", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + DeleteFileA(path); + + /* NULL lpKeyName */ + data = ""; + ret = WritePrivateProfileStringA("App", NULL, "string", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + DeleteFileA(path); + + /* empty lpKeyName */ + data = "[App]\r\n" + "=string\r\n"; + ret = WritePrivateProfileStringA("App", "", "string", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + DeleteFileA(path); + + /* NULL lpString */ + data = ""; + ret = WritePrivateProfileStringA("App", "key", NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + DeleteFileA(path); + + /* empty lpString */ + data = "[App]\r\n" + "key=\r\n"; + ret = WritePrivateProfileStringA("App", "key", "", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + DeleteFileA(path); + + /* empty lpFileName */ + SetLastError(0xdeadbeef); + ret = WritePrivateProfileStringA("App", "key", "string", ""); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_ACCESS_DENIED, + "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + + /* The resulting file will be X:\\%WINDIR%\\win1.tmp */ + GetWindowsDirectoryA(temp, MAX_PATH); + GetTempFileNameA(temp, "win", 1, path); + DeleteFileA(path); + + /* relative path in lpFileName */ + data = "[App]\r\n" + "key=string\r\n"; + ret = WritePrivateProfileStringA("App", "key", "string", "win1.tmp"); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + DeleteFileA(path); + + GetTempPathA(MAX_PATH, temp); + GetTempFileNameA(temp, "wine", 0, path); + + /* build up an INI file */ + WritePrivateProfileStringA("App1", "key1", "string1", path); + WritePrivateProfileStringA("App1", "key2", "string2", path); + WritePrivateProfileStringA("App1", "key3", "string3", path); + WritePrivateProfileStringA("App2", "key4", "string4", path); + + /* make an addition and verify the INI */ + data = "[App1]\r\n" + "key1=string1\r\n" + "key2=string2\r\n" + "key3=string3\r\n" + "[App2]\r\n" + "key4=string4\r\n" + "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App3", "key5", "string5", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + + /* lpString is NULL, key2 key is deleted */ + data = "[App1]\r\n" + "key1=string1\r\n" + "key3=string3\r\n" + "[App2]\r\n" + "key4=string4\r\n" + "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App1", "key2", NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + + /* try to delete key2 again */ + data = "[App1]\r\n" + "key1=string1\r\n" + "key3=string3\r\n" + "[App2]\r\n" + "key4=string4\r\n" + "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App1", "key2", NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + + /* lpKeyName is NULL, App1 section is deleted */ + data = "[App2]\r\n" + "key4=string4\r\n" + "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App1", NULL, "string1", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + + /* lpString is not needed to delete a section */ + data = "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App2", NULL, NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + + /* leave just the section */ + data = "[App3]\r\n"; + ret = WritePrivateProfileStringA("App3", "key5", NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + + DeleteFileA(path); +} + START_TEST(profile) { test_profile_int(); @@ -827,4 +1053,5 @@ START_TEST(profile) "name4=a\r" "[section2]\r", "CR only"); + test_WritePrivateProfileString(); }

1 0

Andrew Talbot : winex11.drv: Remove order-of-evaluation dependencies.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 2024592b4188f199c236c4294930f3bfb178a813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2024592b4188f199c236c4294… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 19 22:40:14 2009 +0000 winex11.drv: Remove order-of-evaluation dependencies. --- dlls/winex11.drv/xfont.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 16409c5..d3d3e8c 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -3318,11 +3318,11 @@ BOOL CDECL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf, /* Note: XFONT_GetFontMetric() will have to release the crit section, font list will have to be retraversed on return */ - if(plf->lfCharSet == DEFAULT_CHARSET || plf->lfCharSet == pfi->df.dfCharSet) { - if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, - XFONT_GetFontMetric( pfi, &lf, &tm ), lp )) ) + UINT xfm = XFONT_GetFontMetric( pfi, &lf, &tm ); + + if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, xfm, lp )) ) bRet = b; else break; } @@ -3334,8 +3334,9 @@ BOOL CDECL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf, { if(pfr->fi) { - if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, - XFONT_GetFontMetric( pfr->fi, &lf, &tm ), lp )) ) + UINT xfm = XFONT_GetFontMetric( pfr->fi, &lf, &tm ); + + if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, xfm, lp )) ) bRet = b; else break; }

1 0