July 2008 - Wine-commits - list.winehq.org

Adam Petaccia : gdiplus: Stub GdipGetFontCollectionFamilyList.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 70c747d9f7e2bfbb4b8281893ea863937e50b1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c747d9f7e2bfbb4b8281893… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Tue Jul 22 23:07:45 2008 -0400 gdiplus: Stub GdipGetFontCollectionFamilyList. --- dlls/gdiplus/font.c | 13 +++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 2 ++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 401c161..65e379f 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -675,3 +675,16 @@ GpStatus WINGDIPAPI GdipGetFontCollectionFamilyCount( return NotImplemented; } + +GpStatus WINGDIPAPI GdipGetFontCollectionFamilyList( + GpFontCollection* fontCollection, INT numSought, + GpFontFamily* gpfamilies[], INT* numFound) +{ + FIXME("stub: %p, %d, %p, %p\n", fontCollection, numSought, gpfamilies, + numFound); + + if (!(fontCollection && gpfamilies && numFound)) + return InvalidParameter; + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ccb147e..a04e550 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -266,7 +266,7 @@ @ stub GdipGetFamily @ stdcall GdipGetFamilyName(ptr ptr long) @ stdcall GdipGetFontCollectionFamilyCount(ptr ptr) -@ stub GdipGetFontCollectionFamilyList +@ stdcall GdipGetFontCollectionFamilyList(ptr long ptr ptr) @ stub GdipGetFontHeight @ stdcall GdipGetFontHeightGivenDPI(ptr long ptr) @ stdcall GdipGetFontSize(ptr ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0c60f60..22b6efc 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -424,6 +424,8 @@ GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection*, GDIPCONST WCHAR*); GpStatus WINGDIPAPI GdipGetFontCollectionFamilyCount(GpFontCollection*, INT*); +GpStatus WINGDIPAPI GdipGetFontCollectionFamilyList(GpFontCollection*, INT, + GpFontFamily*[], INT*); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*);

1 0

Zac Brown : include/winhttp.h: Add remaining flags.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 34a17650f32ee977a340121511e3baf6df33e0fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a17650f32ee977a34012151… Author: Zac Brown <zac(a)zacbrown.org> Date: Mon Jul 21 12:30:08 2008 -0700 include/winhttp.h: Add remaining flags. --- include/winhttp.h | 301 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 267 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34a17650f32ee977a3401…

1 0

Adam Petaccia : gdiplus: Stub GdipGetFontCollectionFamilyCount.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 6966c690b9517f8b220369764aeb1491ad1ed30f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6966c690b9517f8b220369764… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Tue Jul 22 23:07:41 2008 -0400 gdiplus: Stub GdipGetFontCollectionFamilyCount. --- dlls/gdiplus/font.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 1f7b187..401c161 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -664,3 +664,14 @@ GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection* fontCollection, return NotImplemented; } + +GpStatus WINGDIPAPI GdipGetFontCollectionFamilyCount( + GpFontCollection* fontCollection, INT* numFound) +{ + FIXME("stub: %p, %p\n", fontCollection, numFound); + + if (!(fontCollection && numFound)) + return InvalidParameter; + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 6b4773a..ccb147e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -265,7 +265,7 @@ @ stub GdipGetEncoderParameterListSize @ stub GdipGetFamily @ stdcall GdipGetFamilyName(ptr ptr long) -@ stub GdipGetFontCollectionFamilyCount +@ stdcall GdipGetFontCollectionFamilyCount(ptr ptr) @ stub GdipGetFontCollectionFamilyList @ stub GdipGetFontHeight @ stdcall GdipGetFontHeightGivenDPI(ptr long ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 9e998c5..0c60f60 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -423,6 +423,7 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily**); GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection*, GDIPCONST WCHAR*); +GpStatus WINGDIPAPI GdipGetFontCollectionFamilyCount(GpFontCollection*, INT*); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*);

1 0

Adam Petaccia : gdiplus: Stub GdipPrivateAddFontFile.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 01d607dcebc02deed28f20b6a73f9f5a50ac27c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01d607dcebc02deed28f20b6a… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Tue Jul 22 23:07:37 2008 -0400 gdiplus: Stub GdipPrivateAddFontFile. --- dlls/gdiplus/font.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index a61699d..1f7b187 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -653,3 +653,14 @@ GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection **fontColle return NotImplemented; } + +GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection* fontCollection, + GDIPCONST WCHAR* filename) +{ + FIXME("stub: %p, %s\n", fontCollection, debugstr_w(filename)); + + if (!(fontCollection && filename)) + return InvalidParameter; + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d410bcb..6b4773a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -464,7 +464,7 @@ @ stdcall GdipPathIterRewind(ptr) @ stub GdipPlayMetafileRecord @ stub GdipPlayTSClientRecord -@ stub GdipPrivateAddFontFile +@ stdcall GdipPrivateAddFontFile(ptr wstr) @ stub GdipPrivateAddMemoryFont @ stub GdipRecordMetafile @ stub GdipRecordMetafileFileName diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index e3888dc..9e998c5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -422,6 +422,7 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily**); GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection**); +GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection*, GDIPCONST WCHAR*); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*);

1 0

Adam Petaccia : gdiplus: Stub GdipDeletePrivateFontCollection.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: cfde278584214f771d9c6e26675000da2ecf6c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfde278584214f771d9c6e266… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Tue Jul 22 23:07:31 2008 -0400 gdiplus: Stub GdipDeletePrivateFontCollection. --- dlls/gdiplus/font.c | 10 ++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6a706e4..a61699d 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -643,3 +643,13 @@ GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection** fontCollecti return NotImplemented; } + +GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection **fontCollection) +{ + FIXME("stub %p\n", fontCollection); + + if (!fontCollection) + return InvalidParameter; + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f8b0b71..d410bcb 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -147,7 +147,7 @@ @ stdcall GdipDeletePath(ptr) @ stdcall GdipDeletePathIter(ptr) @ stdcall GdipDeletePen(ptr) -@ stub GdipDeletePrivateFontCollection +@ stdcall GdipDeletePrivateFontCollection(ptr) @ stdcall GdipDeleteRegion(ptr) @ stdcall GdipDeleteStringFormat(ptr) @ stdcall GdipDisposeImage(ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 13d06f1..e3888dc 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -421,6 +421,7 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily**); GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily**); GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection**); +GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*);

1 0

Adam Petaccia : gdiplus: Stub GdipNewPrivateFontCollection.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 8d06fb4f9fae95650590b92ad19570069054a184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d06fb4f9fae95650590b92ad… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Tue Jul 22 23:07:20 2008 -0400 gdiplus: Stub GdipNewPrivateFontCollection. --- dlls/gdiplus/font.c | 10 ++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 3526b2e..6a706e4 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -633,3 +633,13 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily **nativeFamil return GdipCreateFontFamilyFromName(MSSansSerif, NULL, nativeFamily); } + +GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection** fontCollection) +{ + FIXME("stub %p\n", fontCollection); + + if (!fontCollection) + return InvalidParameter; + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index cbbc9c3..f8b0b71 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -449,7 +449,7 @@ @ stub GdipMultiplyTextureTransform @ stdcall GdipMultiplyWorldTransform(ptr ptr long) @ stub GdipNewInstalledFontCollection -@ stub GdipNewPrivateFontCollection +@ stdcall GdipNewPrivateFontCollection(ptr) @ stdcall GdipPathIterCopyData(ptr ptr ptr ptr long long) @ stdcall GdipPathIterEnumerate(ptr ptr ptr ptr long) @ stdcall GdipPathIterGetCount(ptr ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 841a46e..13d06f1 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -420,6 +420,8 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily**); GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily**); GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily**); +GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection**); + GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*); GpStatus WINGDIPAPI GdipStringFormatGetGenericDefault(GpStringFormat **);

1 0

Lei Zhang : gdi32: Glyph advances should be measured for unrotated characters.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 9b4f17f630c70c320d7ac5385ec4844d9ea9cb75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4f17f630c70c320d7ac5385… Author: Lei Zhang <thestig(a)google.com> Date: Mon Jul 21 17:54:42 2008 -0700 gdi32: Glyph advances should be measured for unrotated characters. --- dlls/gdi32/freetype.c | 11 ++++++++++- dlls/gdi32/tests/font.c | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 62db9fe..a2110ab 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4300,6 +4300,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; double widthRatio = 1.0; FT_Matrix transMat = identityMat; + FT_Matrix transMatUnrotated; BOOL needsTransform = FALSE; BOOL tategaki = (font->GSUB_Table != NULL); UINT original_index; @@ -4404,6 +4405,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, } /* Rotation transform */ + transMatUnrotated = transMat; if(font->orientation && !tategaki) { FT_Matrix rotationMat; FT_Vector vecAngle; @@ -4427,6 +4429,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, worldMat.yx = FT_FixedFromFloat(font->font_desc.matrix.eM12); worldMat.yy = FT_FixedFromFloat(font->font_desc.matrix.eM22); pFT_Matrix_Multiply(&worldMat, &transMat); + pFT_Matrix_Multiply(&worldMat, &transMatUnrotated); needsTransform = TRUE; } @@ -4439,6 +4442,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, extraMat.yx = FT_FixedFromFIXED(lpmat->eM12); extraMat.yy = FT_FixedFromFIXED(lpmat->eM22); pFT_Matrix_Multiply(&extraMat, &transMat); + pFT_Matrix_Multiply(&extraMat, &transMatUnrotated); needsTransform = TRUE; } @@ -4479,8 +4483,13 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = ft_face->glyph->metrics.horiAdvance; vec.y = 0; pFT_Vector_Transform(&vec, &transMat); - adv = lpgm->gmCellIncX = (vec.x+63) >> 6; + lpgm->gmCellIncX = (vec.x+63) >> 6; lpgm->gmCellIncY = -((vec.y+63) >> 6); + + vec.x = ft_face->glyph->metrics.horiAdvance; + vec.y = 0; + pFT_Vector_Transform(&vec, &transMatUnrotated); + adv = (vec.x+63) >> 6; } lpgm->gmBlackBoxX = (right - left) >> 6; lpgm->gmBlackBoxY = (top - bottom) >> 6; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index e652bfe..9e8f408 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2417,7 +2417,7 @@ static void test_orientation(void) hfont = create_font("orientation", &lf); old_hfont = SelectObject(hdc, hfont); ok(GetTextExtentExPointA(hdc, test_str, sizeof(test_str), 32767, NULL, NULL, &size), "GetTextExtentExPointA failed\n"); - todo_wine ok(near_match(311, size.cx), "cx should be about 311, got %d\n", size.cx); + ok(near_match(311, size.cx), "cx should be about 311, got %d\n", size.cx); ok(near_match(75, size.cy), "cy should be about 75, got %d\n", size.cy); SelectObject(hdc, old_hfont); DeleteObject(hfont);

1 0

Lei Zhang : gdi32: Add a test for font orientation.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 78a1e07c9344fd75eee4a95cfb949764ad8afc05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a1e07c9344fd75eee4a95cf… Author: Lei Zhang <thestig(a)google.com> Date: Mon Jul 21 17:54:01 2008 -0700 gdi32: Add a test for font orientation. --- dlls/gdi32/tests/font.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ad99a4d..e652bfe 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2395,6 +2395,35 @@ static void test_GetTextFace(void) ReleaseDC(NULL, dc); } +static void test_orientation(void) +{ + static const char test_str[11] = "Test String"; + HDC hdc; + LOGFONTA lf; + HFONT hfont, old_hfont; + SIZE size; + + if (!is_truetype_font_installed("Arial")) + { + skip("Arial is not installed\n"); + return; + } + + hdc = CreateCompatibleDC(0); + memset(&lf, 0, sizeof(lf)); + lstrcpyA(lf.lfFaceName, "Arial"); + lf.lfHeight = 72; + lf.lfOrientation = lf.lfEscapement = 900; + hfont = create_font("orientation", &lf); + old_hfont = SelectObject(hdc, hfont); + ok(GetTextExtentExPointA(hdc, test_str, sizeof(test_str), 32767, NULL, NULL, &size), "GetTextExtentExPointA failed\n"); + todo_wine ok(near_match(311, size.cx), "cx should be about 311, got %d\n", size.cx); + ok(near_match(75, size.cy), "cy should be about 75, got %d\n", size.cy); + SelectObject(hdc, old_hfont); + DeleteObject(hfont); + DeleteDC(hdc); +} + START_TEST(font) { init(); @@ -2413,6 +2442,7 @@ START_TEST(font) test_font_charset(); test_GetFontUnicodeRanges(); test_nonexistent_font(); + test_orientation(); /* On Windows Arial has a lot of default charset aliases such as Arial Cyr, * I'd like to avoid them in this test.

1 0

Owen Rudge : shell32: Remove existing painting methods from control panel.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 1bca3c05f109fdbcb7459a8a7f1368aa055a2b6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bca3c05f109fdbcb7459a8a7… Author: Owen Rudge <owen(a)owenrudge.net> Date: Tue Jul 22 17:32:25 2008 +0100 shell32: Remove existing painting methods from control panel. --- dlls/shell32/control.c | 92 ------------------------------------------------ dlls/shell32/cpanel.h | 3 -- 2 files changed, 0 insertions(+), 95 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index ca38edb..29e608d 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -174,7 +174,6 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) CPlItem *item; SetWindowLongPtrW(hWnd, 0, (LONG_PTR)panel); - panel->status = 0; panel->hWnd = hWnd; hMenu = LoadMenuW(shell32_hInstance, MAKEINTRESOURCEW(MENU_CPANEL)); @@ -221,89 +220,6 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) SetMenu(hWnd, hMenu); } -#define XICON 32 -#define XSTEP 128 -#define YICON 32 -#define YSTEP 64 - -static BOOL Control_Localize(const CPanel* panel, int cx, int cy, - CPlApplet** papplet, unsigned* psp) -{ - unsigned i, x = (XSTEP-XICON)/2, y = 0; - CPlApplet* applet; - RECT rc; - - GetClientRect(panel->hWnd, &rc); - for (applet = panel->first; applet; applet = applet->next) { - for (i = 0; i < applet->count; i++) { - if (!applet->info[i].dwSize) continue; - if (x + XSTEP >= rc.right - rc.left) { - x = (XSTEP-XICON)/2; - y += YSTEP; - } - if (cx >= x && cx < x + XICON && cy >= y && cy < y + YSTEP) { - *papplet = applet; - *psp = i; - return TRUE; - } - x += XSTEP; - } - } - return FALSE; -} - -static LRESULT Control_WndProc_Paint(const CPanel* panel, WPARAM wParam) -{ - HDC hdc; - PAINTSTRUCT ps; - RECT rc, txtRect; - unsigned i, x = 0, y = 0; - CPlApplet* applet; - HGDIOBJ hOldFont; - - hdc = (wParam) ? (HDC)wParam : BeginPaint(panel->hWnd, &ps); - hOldFont = SelectObject(hdc, GetStockObject(ANSI_VAR_FONT)); - GetClientRect(panel->hWnd, &rc); - for (applet = panel->first; applet; applet = applet->next) { - for (i = 0; i < applet->count; i++) { - if (x + XSTEP >= rc.right - rc.left) { - x = 0; - y += YSTEP; - } - if (!applet->info[i].dwSize) continue; - DrawIcon(hdc, x + (XSTEP-XICON)/2, y, applet->info[i].hIcon); - txtRect.left = x; - txtRect.right = x + XSTEP; - txtRect.top = y + YICON; - txtRect.bottom = y + YSTEP; - DrawTextW(hdc, applet->info[i].szName, -1, &txtRect, - DT_CENTER | DT_VCENTER); - x += XSTEP; - } - } - SelectObject(hdc, hOldFont); - if (!wParam) EndPaint(panel->hWnd, &ps); - return 0; -} - -static LRESULT Control_WndProc_LButton(CPanel* panel, LPARAM lParam, BOOL up) -{ - unsigned i; - CPlApplet* applet; - - if (Control_Localize(panel, (short)LOWORD(lParam), (short)HIWORD(lParam), &applet, &i)) { - if (up) { - if (panel->clkApplet == applet && panel->clkSP == i) { - applet->proc(applet->hWnd, CPL_DBLCLK, i, applet->info[i].lData); - } - } else { - panel->clkApplet = applet; - panel->clkSP = i; - } - } - return 0; -} - static void Control_FreeCPlItems(HWND hWnd, CPanel *panel) { HMENU hMenu, hSubMenu; @@ -417,14 +333,6 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, } break; - case WM_PAINT: - return Control_WndProc_Paint(panel, lParam1); - case WM_LBUTTONUP: - return Control_WndProc_LButton(panel, lParam2, TRUE); - case WM_LBUTTONDOWN: - return Control_WndProc_LButton(panel, lParam2, FALSE); -/* EPP case WM_COMMAND: */ -/* EPP return Control_WndProc_Command(mwi, lParam1, lParam2); */ } } diff --git a/dlls/shell32/cpanel.h b/dlls/shell32/cpanel.h index 22f94d7..219d7d0 100644 --- a/dlls/shell32/cpanel.h +++ b/dlls/shell32/cpanel.h @@ -36,9 +36,6 @@ typedef struct CPlApplet { typedef struct CPanel { CPlApplet* first; /* linked list */ HWND hWnd; - unsigned status; - CPlApplet* clkApplet; - unsigned clkSP; unsigned total_subprogs; } CPanel;

1 0

Alexandre Julliard : shell32: Define a valid cursor for the control panel window.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: d619640f1bd7035b74607fa99dd75ecf8f3861a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d619640f1bd7035b74607fa99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 23 11:52:12 2008 +0200 shell32: Define a valid cursor for the control panel window. --- dlls/shell32/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 29e608d..58516bb 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -355,7 +355,7 @@ static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) wc.cbWndExtra = sizeof(CPlApplet*); wc.hInstance = hInst; wc.hIcon = 0; - wc.hCursor = 0; + wc.hCursor = LoadCursorW( 0, (LPWSTR)IDC_ARROW ); wc.hbrBackground = GetStockObject(WHITE_BRUSH); wc.lpszMenuName = NULL; wc.lpszClassName = className;

1 0