wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

Qian Hong : riched20/tests: Added UTF8 BOM test.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 01ebba0fc4c28c3a64a8daa96a18755233057dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ebba0fc4c28c3a64a8daa96… Author: Qian Hong <fracting(a)gmail.com> Date: Thu Aug 16 19:00:08 2012 +0800 riched20/tests: Added UTF8 BOM test. --- dlls/riched20/tests/editor.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1ca221d..6a20b19 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5011,6 +5011,8 @@ static void test_EM_STREAMIN(void) const char * streamText3 = "RichEdit1"; + const char * streamTextUTF8BOM = "\xef\xbb\xbfTestUTF8WithBOM"; + const char * streamText4 = "This text just needs to be long enough to cause run to be split onto " "two separate lines and make sure the null terminating character is " @@ -5111,6 +5113,20 @@ static void test_EM_STREAMIN(void) "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); ok(es.dwError == -16, "EM_STREAMIN: Test 3 set error %d, expected %d\n", es.dwError, -16); + es.dwCookie = (DWORD_PTR)&streamTextUTF8BOM; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); + ok(result == 18, "got %ld, expected %d\n", result, 18); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + todo_wine ok(result == 15, + "EM_STREAMIN: Test UTF8WithBOM returned %ld, expected 15\n", result); + result = strcmp (buffer,"TestUTF8WithBOM"); + todo_wine ok(result == 0, + "EM_STREAMIN: Test UTF8WithBOM set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test UTF8WithBOM set error %d, expected %d\n", es.dwError, 0); + es.dwCookie = (DWORD_PTR)&cookieForStream4; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback2;

1 0

Alistair Leslie-Hughes : scrrun: Correct FileExists for directories.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 50fe9b87eda4de4aa2f03172f6e0f83ec89a93dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=50fe9b87eda4de4aa2f03172f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 6 08:38:17 2012 +1000 scrrun: Correct FileExists for directories. --- dlls/scrrun/filesystem.c | 4 +++- dlls/scrrun/tests/filesystem.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index a4e6f26..ade3310 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -215,11 +215,13 @@ static HRESULT WINAPI filesys_DriveExists(IFileSystem3 *iface, BSTR DriveSpec, static HRESULT WINAPI filesys_FileExists(IFileSystem3 *iface, BSTR path, VARIANT_BOOL *ret) { + DWORD attrs; TRACE("%p %s %p\n", iface, debugstr_w(path), ret); if (!ret) return E_POINTER; - *ret = GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES ? VARIANT_TRUE : VARIANT_FALSE; + attrs = GetFileAttributesW(path); + *ret = attrs != INVALID_FILE_ATTRIBUTES && !(attrs & FILE_ATTRIBUTE_DIRECTORY) ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index a19a835..d557acf 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -82,6 +82,20 @@ static void test_interfaces(void) ok(b == VARIANT_FALSE, "got %x\n", b); SysFreeString(path); + path = SysAllocString(file_path); + b = VARIANT_FALSE; + hr = IFileSystem3_FileExists(fs3, path, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_TRUE, "got %x\n", b); + SysFreeString(path); + + path = SysAllocString(windows_path); + b = VARIANT_TRUE; + hr = IFileSystem3_FileExists(fs3, path, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_FALSE, "got %x\n", b); + SysFreeString(path); + /* Folder Exists */ hr = IFileSystem3_FolderExists(fs3, NULL, NULL); ok(hr == E_POINTER, "got 0x%08x, expected 0x%08x\n", hr, E_POINTER);

1 0

Eric Pouech : msacm32: In acmFormatChoose, added support for template.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 3d845b1242f5aa823c1be59811aeb537a26eea6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d845b1242f5aa823c1be5981… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Aug 12 10:03:46 2012 +0200 msacm32: In acmFormatChoose, added support for template. --- dlls/msacm32/format.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index c81b5dc..963daf7 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -210,7 +210,9 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, MSACM_FillFormatTags(hWnd); MSACM_FillFormat(hWnd); if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP| - ACMFORMATCHOOSE_STYLEF_SHOWHELP)) != 0) + ACMFORMATCHOOSE_STYLEF_SHOWHELP| + ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE| + ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)) != 0) FIXME("Unsupported style %08x\n", afc->fdwStyle); if (!(afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP)) ShowWindow(GetDlgItem(hWnd, IDD_ACMFORMATCHOOSE_BTN_HELP), SW_HIDE); @@ -352,6 +354,14 @@ done: */ MMRESULT WINAPI acmFormatChooseW(PACMFORMATCHOOSEW pafmtc) { + if (pafmtc->fdwStyle & ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE) + return DialogBoxIndirectParamW(MSACM_hInstance32, (LPCDLGTEMPLATEW)pafmtc->hInstance, + pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc); + + if (pafmtc->fdwStyle & ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE) + return DialogBoxParamW(pafmtc->hInstance, pafmtc->pszTemplateName, + pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc); + return DialogBoxParamW(MSACM_hInstance32, MAKEINTRESOURCEW(DLG_ACMFORMATCHOOSE_ID), pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc); }

1 0

Vijay Kiran Kamuju : atl80: Implement AtlGetVersion.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 50199423fbd0462ca274b801350a27c2073bc7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50199423fbd0462ca274b8013… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Jul 22 03:18:33 2012 +0200 atl80: Implement AtlGetVersion. --- dlls/atl80/atl80.c | 5 +++++ dlls/atl80/atl80.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index ab1a5ab..1c31fe9 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -29,3 +29,8 @@ HRESULT WINAPI AtlCreateRegistrar(IRegistrar** ppReg) FIXME("(%p) stub\n", ppReg); return E_NOTIMPL; } + +DWORD WINAPI AtlGetVersion(void *pReserved) +{ + return 0x0800; +} diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 7035991..7f8cfc2 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -21,7 +21,7 @@ 30 stdcall AtlComPtrAssign(ptr ptr) atl.AtlComPtrAssign 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl.AtlInternalQueryInterface -34 stub AtlGetVersion +34 stdcall AtlGetVersion(ptr) 35 stub AtlAxDialogBoxW 36 stub AtlAxDialogBoxA 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl.AtlAxCreateDialogW

1 0

Erich Hoover : hhctrl.ocx: Centralize merging HH_WINTYPE data.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 494936452a1719e5a293e3cbae3b9535dbfcfa23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=494936452a1719e5a293e3cba… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jul 25 10:01:13 2012 -0600 hhctrl.ocx: Centralize merging HH_WINTYPE data. --- dlls/hhctrl.ocx/chm.c | 189 ++++++++++++++++++++++++++++++++------------- dlls/hhctrl.ocx/hhctrl.h | 1 + 2 files changed, 135 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=494936452a1719e5a293e…

1 0

Alex Henrie : user32: Correct dialog focus behavior.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 4b67e6c778a8b8dcd74b56e866c13687345cfed4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b67e6c778a8b8dcd74b56e86… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 6 17:13:15 2012 -0600 user32: Correct dialog focus behavior. --- dlls/user32/defdlg.c | 21 ++++++++++++++------- dlls/user32/tests/dialog.c | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index fecd417..e4b55f3 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -55,9 +55,9 @@ static DLGPROC DEFDLG_GetDlgProc( HWND hwnd ) * DEFDLG_SetFocus * * Set the focus to a control of the dialog, selecting the text if - * the control is an edit dialog. + * the control is an edit dialog that has DLGC_HASSETSEL. */ -static void DEFDLG_SetFocus( HWND hwndDlg, HWND hwndCtrl ) +static void DEFDLG_SetFocus( HWND hwndCtrl ) { if (SendMessageW( hwndCtrl, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) SendMessageW( hwndCtrl, EM_SETSEL, 0, -1 ); @@ -83,7 +83,7 @@ static void DEFDLG_SaveFocus( HWND hwnd ) /*********************************************************************** * DEFDLG_RestoreFocus */ -static void DEFDLG_RestoreFocus( HWND hwnd ) +static void DEFDLG_RestoreFocus( HWND hwnd, BOOL justActivate ) { DIALOGINFO *infoPtr; @@ -92,12 +92,19 @@ static void DEFDLG_RestoreFocus( HWND hwnd ) /* Don't set the focus back to controls if EndDialog is already called.*/ if (infoPtr->flags & DF_END) return; if (!IsWindow(infoPtr->hwndFocus) || infoPtr->hwndFocus == hwnd) { + if (justActivate) return; /* If no saved focus control exists, set focus to the first visible, non-disabled, WS_TABSTOP control in the dialog */ infoPtr->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); + /* If there are no WS_TABSTOP controls, set focus to the first visible, + non-disabled control in the dialog */ + if (!infoPtr->hwndFocus) infoPtr->hwndFocus = GetNextDlgGroupItem( hwnd, 0, FALSE ); if (!IsWindow( infoPtr->hwndFocus )) return; } - DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus ); + if (justActivate) + SetFocus( infoPtr->hwndFocus ); + else + DEFDLG_SetFocus( infoPtr->hwndFocus ); /* This used to set infoPtr->hwndFocus to NULL for no apparent reason, sometimes losing focus when receiving WM_SETFOCUS messages. */ @@ -250,12 +257,12 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, return DefWindowProcA( hwnd, msg, wParam, lParam ); case WM_ACTIVATE: - if (wParam) DEFDLG_RestoreFocus( hwnd ); + if (wParam) DEFDLG_RestoreFocus( hwnd, TRUE ); else DEFDLG_SaveFocus( hwnd ); return 0; case WM_SETFOCUS: - DEFDLG_RestoreFocus( hwnd ); + DEFDLG_RestoreFocus( hwnd, FALSE ); return 0; case DM_SETDEFID: @@ -280,7 +287,7 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, HWND hwndDest = (HWND)wParam; if (!lParam) hwndDest = GetNextDlgTabItem(hwnd, GetFocus(), wParam); - if (hwndDest) DEFDLG_SetFocus( hwnd, hwndDest ); + if (hwndDest) DEFDLG_SetFocus( hwndDest ); DEFDLG_SetDefButton( hwnd, dlgInfo, hwndDest ); } return 0; diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 6bd34b3..0ebab4c 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -828,7 +828,7 @@ static const char * GetHwndString(HWND hw) return "unknown handle"; } -static void test_initial_focus(void) +static void test_focus(void) { /* Test 1: * This test intentionally returns FALSE in response to WM_INITDIALOG @@ -900,6 +900,8 @@ static void test_initial_focus(void) HRSRC hResource; HANDLE hTemplate; DLGTEMPLATE* pTemplate; + HWND hTextbox; + DWORD selectionStart = 0xdead, selectionEnd = 0xbeef; hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG", RT_DIALOG); hTemplate = LoadResource(g_hinst, hResource); @@ -912,6 +914,20 @@ static void test_initial_focus(void) ok ((g_hwndInitialFocusT1 == 0), "Focus should not be set for an invisible DS_CONTROL dialog %p.\n", g_hwndInitialFocusT1); + /* Also make sure that WM_SETFOCUS selects the textbox's text */ + hTextbox = GetDlgItem(hDlg, 200); + SendMessage(hTextbox, WM_SETTEXT, 0, (LPARAM)"Hello world"); + + SendMessage(hDlg, WM_SETFOCUS, 0, 0); + SendMessage(hTextbox, EM_GETSEL, (WPARAM)&selectionStart, (LPARAM)&selectionEnd); + ok(selectionStart == 0 && selectionEnd == 11, "Text selection after WM_SETFOCUS is [%i, %i) expected [0, 11)\n", selectionStart, selectionEnd); + + /* but WM_ACTIVATE does not */ + SendMessage(hTextbox, EM_SETSEL, 0, 0); + SendMessage(hDlg, WM_ACTIVATE, WA_ACTIVE, 0); + SendMessage(hTextbox, EM_GETSEL, (WPARAM)&selectionStart, (LPARAM)&selectionEnd); + ok(selectionStart == 0 && selectionEnd == 0, "Text selection after WM_ACTIVATE is [%i, %i) expected [0, 0)\n", selectionStart, selectionEnd); + DestroyWindow(hDlg); } @@ -929,13 +945,25 @@ static void test_initial_focus(void) pTemplate = LockResource(hTemplate); hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusDlgWinProc, 0); - g_hwndInitialFocusT1 = GetFocus(); + ok(hDlg != 0, "Failed to create test dialog.\n"); hLabel = GetDlgItem(hDlg, 200); - ok (hDlg != 0, "Failed to create test dialog.\n"); - ok ((g_hwndInitialFocusT1 == hLabel), - "Focus should have been set to the first control, expected (%p) got (%p).\n", - hLabel, g_hwndInitialFocusT1); + ok(GetFocus() == hLabel, "Focus not set to label, focus=%p dialog=%p label=%p\n", GetFocus(), hDlg, hLabel); + + DestroyWindow(hDlg); + + /* Also check focus after WM_ACTIVATE and WM_SETFOCUS */ + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, NULL, 0); + ok(hDlg != 0, "Failed to create test dialog.\n"); + hLabel = GetDlgItem(hDlg, 200); + + SetFocus(NULL); + SendMessage(hDlg, WM_ACTIVATE, WA_ACTIVE, 0); + ok(GetFocus() == NULL, "Focus set on WM_ACTIVATE, focus=%p dialog=%p label=%p\n", GetFocus(), hDlg, hLabel); + + SetFocus(NULL); + SendMessage(hDlg, WM_SETFOCUS, 0, 0); + ok(GetFocus() == hLabel, "Focus not set to label on WM_SETFOCUS, focus=%p dialog=%p label=%p\n", GetFocus(), hDlg, hLabel); DestroyWindow(hDlg); } @@ -1404,7 +1432,7 @@ START_TEST(dialog) test_GetNextDlgItem(); test_IsDialogMessage(); test_WM_NEXTDLGCTL(); - test_initial_focus(); + test_focus(); test_GetDlgItem(); test_GetDlgItemText(); test_DialogBoxParamA();

1 0

Dmitry Timoshkov : gdiplus: Make GdipSetPropertyItem return Ok.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: e3d27c42d94e39f49c817066cd3af7097f4a12b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3d27c42d94e39f49c817066c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 15 12:12:28 2012 +0900 gdiplus: Make GdipSetPropertyItem return Ok. --- dlls/gdiplus/image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 64ce8b6..1ee5cbc 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3459,7 +3459,7 @@ GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage *image, GDIPCONST PropertyItem* if(!(calls++)) FIXME("not implemented\n"); - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filename,

1 0

Dmitry Timoshkov : gdiplus: Dump the matrix passed to GdipSetWorldTransform .
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 7c8e8fc5e2ea09b26a3e1956779ff3d12b008e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8e8fc5e2ea09b26a3e19567… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 15 12:11:38 2012 +0900 gdiplus: Dump the matrix passed to GdipSetWorldTransform. --- dlls/gdiplus/graphics.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 85234c8..2b7a87b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5587,6 +5587,10 @@ GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics *graphics, GpMatrix *matrix if(graphics->busy) return ObjectBusy; + TRACE("%f,%f,%f,%f,%f,%f\n", + matrix->matrix[0], matrix->matrix[1], matrix->matrix[2], + matrix->matrix[3], matrix->matrix[4], matrix->matrix[5]); + GdipDeleteMatrix(graphics->worldtrans); return GdipCloneMatrix(matrix, &graphics->worldtrans); }

1 0

Dmitry Timoshkov : gdiplus: Properly convert source coordinates to device units in GdipDrawImagePointsRect .
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: e7b5e6984338b741c33dca240b016a7edc9bc27a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b5e6984338b741c33dca240… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 15 12:10:45 2012 +0900 gdiplus: Properly convert source coordinates to device units in GdipDrawImagePointsRect. --- dlls/gdiplus/graphics.c | 43 +++++++++++++++---------------------------- 1 files changed, 15 insertions(+), 28 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index dfa37eb..85234c8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3040,7 +3040,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image { GpPointF ptf[4]; POINT pti[4]; - REAL dx, dy; GpStatus stat; TRACE("(%p, %p, %p, %d, %f, %f, %f, %f, %d, %p, %p, %p)\n", graphics, image, points, @@ -3063,6 +3062,15 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image return Ok; transform_and_round_points(graphics, pti, ptf, 4); + TRACE("%s %s %s %s\n", wine_dbgstr_point(&pti[0]), wine_dbgstr_point(&pti[1]), + wine_dbgstr_point(&pti[2]), wine_dbgstr_point(&pti[3])); + + srcx = units_to_pixels(srcx, srcUnit, image->xres); + srcy = units_to_pixels(srcy, srcUnit, image->yres); + srcwidth = units_to_pixels(srcwidth, srcUnit, image->xres); + srcheight = units_to_pixels(srcheight, srcUnit, image->yres); + TRACE("src pixels: %f,%f %fx%f\n", srcx, srcy, srcwidth, srcheight); + if (image->picture) { if (!graphics->hdc) @@ -3070,23 +3078,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image FIXME("graphics object has no HDC\n"); } - /* FIXME: partially implemented (only works for rectangular parallelograms) */ - if(srcUnit == UnitInch) - dx = dy = (REAL) INCH_HIMETRIC; - else if(srcUnit == UnitPixel){ - dx = ((REAL) INCH_HIMETRIC) / - ((REAL) GetDeviceCaps(graphics->hdc, LOGPIXELSX)); - dy = ((REAL) INCH_HIMETRIC) / - ((REAL) GetDeviceCaps(graphics->hdc, LOGPIXELSY)); - } - else - return NotImplemented; - if(IPicture_Render(image->picture, graphics->hdc, pti[0].x, pti[0].y, pti[1].x - pti[0].x, pti[2].y - pti[0].y, - srcx * dx, srcy * dy, - srcwidth * dx, srcheight * dy, - NULL) != S_OK){ + srcx, srcy, srcwidth, srcheight, NULL) != S_OK) + { if(callback) callback(callbackData); return GenericError; @@ -3097,18 +3092,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image GpBitmap* bitmap = (GpBitmap*)image; int use_software=0; - if (srcUnit == UnitInch) - dx = dy = 96.0; /* FIXME: use the image resolution */ - else if (srcUnit == UnitPixel) - dx = dy = 1.0; - else - return NotImplemented; - - srcx = srcx * dx; - srcy = srcy * dy; - srcwidth = srcwidth * dx; - srcheight = srcheight * dy; - if (imageAttributes || (graphics->image && graphics->image->type == ImageTypeBitmap) || !((GpBitmap*)image)->hbitmap || @@ -3145,6 +3128,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (dst_area.bottom < pti[i].y) dst_area.bottom = pti[i].y; } + TRACE("dst_area: %s\n", wine_dbgstr_rect(&dst_area)); + m11 = (ptf[1].X - ptf[0].X) / srcwidth; m21 = (ptf[2].X - ptf[0].X) / srcheight; mdx = ptf[0].X - m11 * srcx - m21 * srcy; @@ -3174,6 +3159,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image get_bitmap_sample_size(interpolation, imageAttributes->wrap, bitmap, srcx, srcy, srcwidth, srcheight, &src_area); + TRACE("src_area: %d x %d\n", src_area.Width, src_area.Height); + src_data = GdipAlloc(sizeof(ARGB) * src_area.Width * src_area.Height); if (!src_data) {

1 0

Dmitry Timoshkov : gdiplus: When there is no target rectangle specified DrawImage should scale image to device dpi .
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 938d42c1480fbc7c80a4db187a29148a7742e219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=938d42c1480fbc7c80a4db187… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 15 12:10:08 2012 +0900 gdiplus: When there is no target rectangle specified DrawImage should scale image to device dpi. --- dlls/gdiplus/graphics.c | 2 ++ dlls/gdiplus/tests/image.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4606074..dfa37eb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2974,7 +2974,9 @@ GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics *graphics, GpImage *image, TRACE("(%p, %p, %f, %f, %f, %f, %f, %f, %d)\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); scale_x = units_scale(srcUnit, graphics->unit, graphics->xres); + scale_x *= graphics->xres / image->xres; scale_y = units_scale(srcUnit, graphics->unit, graphics->yres); + scale_y *= graphics->yres / image->yres; width = srcwidth * scale_x; height = srcheight * scale_y; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 24cb434..9e90cca 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3642,7 +3642,6 @@ static void test_DrawImage(void) expect(Ok, status); match = memcmp(white_2x2, black_2x2, sizeof(black_2x2)) == 0; -todo_wine ok(match, "data should match\n"); if (!match) { @@ -3695,7 +3694,6 @@ static void test_GdipDrawImagePointRect(void) expect(Ok, status); match = memcmp(white_2x2, black_2x2, sizeof(black_2x2)) == 0; -todo_wine ok(match, "data should match\n"); if (!match) {

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
55
Older →

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 August 2012