wine-commits August 2017

wine-commits@winehq.org

2 participants
351 discussions

Andrey Gusev : api-ms-win-core-kernel32-legacy-l1-1-1: Update spec file.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: 3ba77b956d7e39b14aee72b6dd1f2cebcb372c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba77b956d7e39b14aee72b6d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Aug 30 17:49:23 2017 +0300 api-ms-win-core-kernel32-legacy-l1-1-1: Update spec file. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec index 579e254..2850919 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec @@ -1,15 +1,69 @@ +@ stub AddLocalAlternateComputerNameW +@ stdcall BackupRead(ptr ptr long ptr long long ptr) kernel32.BackupRead +@ stdcall BackupWrite(ptr ptr long ptr long long ptr) kernel32.BackupWrite +@ stdcall BindIoCompletionCallback(long ptr long) kernel32.BindIoCompletionCallback +@ stdcall CopyFileA(str str long) kernel32.CopyFileA +@ stdcall CopyFileW(wstr wstr long) kernel32.CopyFileW +@ stdcall CreateFileMappingA(long ptr long long long str) kernel32.CreateFileMappingA +@ stub CreateFileTransactedW +@ stdcall CreateMailslotA(str long long ptr) kernel32.CreateMailslotA +@ stdcall CreateNamedPipeA(str long long long long long long ptr) kernel32.CreateNamedPipeA +@ stdcall CreateSemaphoreW(ptr long long wstr) kernel32.CreateSemaphoreW +@ stdcall DnsHostnameToComputerNameW(wstr ptr ptr) kernel32.DnsHostnameToComputerNameW +@ stdcall DosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime +@ stdcall FatalAppExitA(long str) kernel32.FatalAppExitA +@ stdcall FatalAppExitW(long wstr) kernel32.FatalAppExitW +@ stdcall FileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime @ stdcall FindFirstVolumeMountPointW(wstr ptr long) kernel32.FindFirstVolumeMountPointW @ stub FindNextVolumeMountPointW +@ stdcall FindResourceA(long str str) kernel32.FindResourceA +@ stdcall FindResourceExA(long str str long) kernel32.FindResourceExA +@ stdcall FindResourceW(long wstr wstr) kernel32.FindResourceW @ stdcall FindVolumeMountPointClose(ptr) kernel32.FindVolumeMountPointClose +@ stdcall GetComputerNameA(ptr ptr) kernel32.GetComputerNameA +@ stdcall GetComputerNameW(ptr ptr) kernel32.GetComputerNameW +@ stdcall GetConsoleWindow() kernel32.GetConsoleWindow +@ stub GetDurationFormatEx @ stub GetFileAttributesTransactedW @ stub GetFirmwareType +@ stub GetMaximumProcessorGroupCount +@ stub GetNamedPipeClientProcessId +@ stub GetNamedPipeServerProcessId @ stub GetNumaAvailableMemoryNodeEx @ stdcall GetNumaNodeProcessorMask(long ptr) kernel32.GetNumaNodeProcessorMask @ stub GetNumaProcessorNodeEx +@ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA +@ stdcall GetStartupInfoA(ptr) kernel32.GetStartupInfoA +@ stdcall GetStringTypeExA(long long str long ptr) kernel32.GetStringTypeExA +@ stdcall GetSystemPowerStatus(ptr) kernel32.GetSystemPowerStatus +@ stdcall GetSystemWow64DirectoryA(ptr long) kernel32.GetSystemWow64DirectoryA +@ stdcall GetSystemWow64DirectoryW(ptr long) kernel32.GetSystemWow64DirectoryW +@ stdcall GetTapeParameters(ptr long ptr ptr) kernel32.GetTapeParameters +@ stdcall GetTempPathA(long ptr) kernel32.GetTempPathA +@ stdcall GetThreadSelectorEntry(long long ptr) kernel32.GetThreadSelectorEntry +@ stdcall GlobalMemoryStatus(ptr) kernel32.GlobalMemoryStatus +@ stdcall LoadLibraryA(str) kernel32.LoadLibraryA +@ stdcall LoadLibraryW(wstr) kernel32.LoadLibraryW +@ stdcall MoveFileA(str str) kernel32.MoveFileA +@ stdcall MoveFileExA(str str long) kernel32.MoveFileExA +@ stdcall MoveFileW(wstr wstr) kernel32.MoveFileW +@ stdcall MulDiv(long long long) kernel32.MulDiv +@ stdcall OpenFile(str ptr long) kernel32.OpenFile @ stdcall PowerClearRequest(long long) kernel32.PowerClearRequest @ stdcall PowerCreateRequest(ptr) kernel32.PowerCreateRequest @ stdcall PowerSetRequest(long long) kernel32.PowerSetRequest +@ stdcall PulseEvent(long) kernel32.PulseEvent +@ stub RaiseFailFastException +@ stdcall RegisterWaitForSingleObject(ptr long ptr ptr long long) kernel32.RegisterWaitForSingleObject +@ stdcall SetConsoleTitleA(str) kernel32.SetConsoleTitleA @ stdcall SetDllDirectoryW(wstr) kernel32.SetDllDirectoryW +@ stdcall SetFileCompletionNotificationModes(long long) kernel32.SetFileCompletionNotificationModes +@ stdcall SetHandleCount(long) kernel32.SetHandleCount +@ stdcall SetMailslotInfo(long long) kernel32.SetMailslotInfo @ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor +@ stdcall SetVolumeLabelW(wstr wstr) kernel32.SetVolumeLabelW @ stdcall SetVolumeMountPointW(wstr wstr) kernel32.SetVolumeMountPointW +@ stdcall UnregisterWait(long) kernel32.UnregisterWait @ stdcall VerifyVersionInfoW(long long int64) kernel32.VerifyVersionInfoW +@ stdcall WaitForMultipleObjects(long ptr long long) kernel32.WaitForMultipleObjects +@ stdcall WTSGetActiveConsoleSessionId() kernel32.WTSGetActiveConsoleSessionId

1 0

Nikolay Sivov : d2d1: Fix rounding when setting scissor rectangle.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: 0a315ba0653f8de70386b2424c595621f76bd453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a315ba0653f8de70386b2424… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 29 15:13:38 2017 +0300 d2d1: Fix rounding when setting scissor rectangle. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 8 +++--- dlls/d2d1/tests/d2d1.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0428245..f37565d 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -166,10 +166,10 @@ static void d2d_rt_draw(struct d2d_d3d_render_target *render_target, enum d2d_sh const D2D1_RECT_F *clip_rect; clip_rect = &render_target->clip_stack.stack[render_target->clip_stack.count - 1]; - scissor_rect.left = clip_rect->left + 0.5f; - scissor_rect.top = clip_rect->top + 0.5f; - scissor_rect.right = clip_rect->right + 0.5f; - scissor_rect.bottom = clip_rect->bottom + 0.5f; + scissor_rect.left = ceilf(clip_rect->left - 0.5f); + scissor_rect.top = ceilf(clip_rect->top - 0.5f); + scissor_rect.right = ceilf(clip_rect->right - 0.5f); + scissor_rect.bottom = ceilf(clip_rect->bottom - 0.5f); } else { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index c1ca98d..f626129 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1059,6 +1059,72 @@ static void test_clip(void) match = compare_surface(surface, "035a44d4198d6e422e9de6185b5b2c2bac5e33c9"); ok(match, "Surface does not match.\n"); + /* Fractional clip rectangle coordinates, aliased mode. */ + set_matrix_identity(&matrix); + ID2D1RenderTarget_SetTransform(rt, &matrix); + ID2D1RenderTarget_SetDpi(rt, 96.0f, 96.0f); + + ID2D1RenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 0.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + scale_matrix(&matrix, 2.0f, 2.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_rect(&rect, 0.0f, 0.5f, 200.0f, 100.5f); + set_color(&color, 1.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + set_matrix_identity(&matrix); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_rect(&rect, 0.0f, 0.5f, 100.0f, 200.5f); + set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_rect(&rect, 0.5f, 250.0f, 100.5f, 300.0f); + set_color(&color, 1.0f, 1.0f, 0.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + translate_matrix(&matrix, 0.1f, 0.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_rect(&rect, 110.0f, 250.25f, 150.0f, 300.25f); + set_color(&color, 0.0f, 0.5f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + set_rect(&rect, 160.0f, 250.75f, 200.0f, 300.75f); + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + ID2D1RenderTarget_SetDpi(rt, 48.0f, 192.0f); + set_rect(&rect, 160.25f, 0.0f, 200.25f, 100.0f); + set_color(&color, 1.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + set_rect(&rect, 160.75f, 100.0f, 200.75f, 120.0f); + set_color(&color, 0.0f, 1.0f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "a958d1fe69ee880200d47b206948e4c1ef382748"); + ok(match, "Surface does not match.\n"); + ID2D1RenderTarget_Release(rt); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain);

1 0

Alexandre Julliard : kernel32/tests: Use function pointers to avoid gcc warnings for invalid parameter tests.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: ff8af74189086ae2dc29a6ebbd364cee369f1178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8af74189086ae2dc29a6ebb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 30 09:45:29 2017 +0200 kernel32/tests: Use function pointers to avoid gcc warnings for invalid parameter tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 0acf109..2c91bb9 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -89,6 +89,12 @@ static void test_heap(void) HGLOBAL hsecond; SIZE_T size, size2; const SIZE_T max_size = 1024, init_size = 10; + /* use function pointers to avoid warnings for invalid parameter tests */ + LPVOID (WINAPI *pHeapAlloc)(HANDLE,DWORD,SIZE_T); + LPVOID (WINAPI *pHeapReAlloc)(HANDLE,DWORD,LPVOID,SIZE_T); + + pHeapAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapAlloc" ); + pHeapReAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapReAlloc" ); /* Heap*() functions */ mem = HeapAlloc(GetProcessHeap(), 0, 0); @@ -111,12 +117,12 @@ static void test_heap(void) /* test some border cases of HeapAlloc and HeapReAlloc */ mem = HeapAlloc(GetProcessHeap(), 0, 0); ok(mem != NULL, "memory not allocated for size 0\n"); - msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0 - 7); + msecond = pHeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0 - 7); ok(msecond == NULL, "HeapReAlloc(~0 - 7) should have failed\n"); - msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0); + msecond = pHeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0); ok(msecond == NULL, "HeapReAlloc(~0) should have failed\n"); HeapFree(GetProcessHeap(), 0, mem); - mem = HeapAlloc(GetProcessHeap(), 0, ~(SIZE_T)0); + mem = pHeapAlloc(GetProcessHeap(), 0, ~(SIZE_T)0); ok(mem == NULL, "memory allocated for size ~0\n"); mem = HeapAlloc(GetProcessHeap(), 0, 17); msecond = HeapReAlloc(GetProcessHeap(), 0, mem, 0);

1 0

Alexandre Julliard : crypt32: Increase buffer size to silence a gcc warning.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: 8738b038a41f5d7ca051d7ce6bfa921c5bd4b849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8738b038a41f5d7ca051d7ce6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 30 09:42:17 2017 +0200 crypt32: Increase buffer size to silence a gcc warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/encode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 29b3a66..6f9f595 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3534,11 +3534,11 @@ static BOOL WINAPI CRYPT_AsnEncodeUtcTime(DWORD dwCertEncodingType, __TRY { SYSTEMTIME sysTime; - /* sorry, magic number: enough for tag, len, YYMMDDHHMMSSZ\0. I use a + /* sorry, magic number: enough for tag, len, YYMMDDHHMMSSZ. I use a * temporary buffer because the output buffer is not NULL-terminated. */ - char buf[16]; - static const DWORD bytesNeeded = sizeof(buf) - 1; + static const DWORD bytesNeeded = 15; + char buf[40]; if (!pbEncoded) { @@ -3591,11 +3591,11 @@ static BOOL CRYPT_AsnEncodeGeneralizedTime(DWORD dwCertEncodingType, __TRY { SYSTEMTIME sysTime; - /* sorry, magic number: enough for tag, len, YYYYMMDDHHMMSSZ\0. I use a + /* sorry, magic number: enough for tag, len, YYYYMMDDHHMMSSZ. I use a * temporary buffer because the output buffer is not NULL-terminated. */ - char buf[18]; - static const DWORD bytesNeeded = sizeof(buf) - 1; + static const DWORD bytesNeeded = 17; + char buf[40]; if (!pbEncoded) {

1 0

Fabian Maurer : winecfg: Use proper size for combobox controls.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: 9944b97a89b98f05495977b54827b8d50e3dfe9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9944b97a89b98f05495977b54… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Aug 29 19:06:37 2017 +0200 winecfg: Use proper size for combobox controls. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/winecfg.rc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 72c3e1b..5908b49 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -191,7 +191,7 @@ BEGIN LTEXT "Dynamic Link Libraries can be specified individually to be either builtin (provided by Wine) or native (taken from Windows or provided by the application)." ,IDC_STATIC,16,16,228,32 LTEXT "&New override for library:",IDC_STATIC,16,58,220,8 - COMBOBOX IDC_DLLCOMBO,16,68,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE + COMBOBOX IDC_DLLCOMBO,16,68,140,60,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE PUSHBUTTON "A&dd",IDC_DLLS_ADDDLL, 164,68,82,13 LTEXT "Existing &overrides:",IDC_STATIC,16,86,100,8 LISTBOX IDC_DLLS_LIST,16,96,140,112,WS_BORDER | WS_TABSTOP | WS_VSCROLL @@ -268,16 +268,16 @@ BEGIN LTEXT "Voice output device:",IDC_STATIC,18,61,230,8 LTEXT "Input device:",IDC_STATIC,18,77,230,8 LTEXT "Voice input device:",IDC_STATIC,18,93,230,8 - COMBOBOX IDC_AUDIOOUT_DEVICE,110,43,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_VOICEOUT_DEVICE,110,59,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_AUDIOIN_DEVICE,110,75,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_VOICEIN_DEVICE,110,91,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_AUDIOOUT_DEVICE,110,43,135,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_VOICEOUT_DEVICE,110,59,135,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_AUDIOIN_DEVICE,110,75,135,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_VOICEIN_DEVICE,110,91,135,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,8,113,69,14 GROUPBOX "Speaker configuration",IDC_STATIC,8,132,244,86 CONTROL "",IDC_LIST_AUDIO_DEVICES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | LVS_NOSORTHEADER, 15,146,230,52 LTEXT "Speakers:",IDC_STATIC,18,202,230,8 - COMBOBOX IDC_SPEAKERCONFIG_SPEAKERS,110,200,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SPEAKERCONFIG_SPEAKERS,110,200,135,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 @@ -286,12 +286,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Appearance",IDC_STATIC,8,4,244,106 LTEXT "&Theme:",IDC_STATIC,15,16,130,8 - COMBOBOX IDC_THEME_THEMECOMBO,15,26,130,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_THEME_THEMECOMBO,15,26,130,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Install theme...",IDC_THEME_INSTALL,152,26,93,14 LTEXT "&Color:",IDC_THEME_COLORTEXT,15,48,105,8 - COMBOBOX IDC_THEME_COLORCOMBO,15,58,105,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_THEME_COLORCOMBO,15,58,105,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&Size:",IDC_THEME_SIZETEXT,126,48,120,8 - COMBOBOX IDC_THEME_SIZECOMBO,126,58,120,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_THEME_SIZECOMBO,126,58,120,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "It&em:",IDC_STATIC,15,80,105,8 COMBOBOX IDC_SYSPARAM_COMBO,15,90,105,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "C&olor:",IDC_SYSPARAM_COLOR_TEXT,126,80,25,8,WS_DISABLED

1 0

Stefan Dösinger : ws2_32: Also check the FQDN when injecting the local IP.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: a2053597cc326e2305c44e1c1a954c2e0ee2853e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2053597cc326e2305c44e1c1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 29 16:15:21 2017 +0200 ws2_32: Also check the FQDN when injecting the local IP. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 06f1c26..681f340 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6539,15 +6539,15 @@ static int convert_eai_u2w(int unixret) { return unixret; } -static char *get_hostname(void) +static char *get_fqdn(void) { char *ret; DWORD size = 0; - GetComputerNameExA( ComputerNamePhysicalDnsHostname, NULL, &size ); + GetComputerNameExA( ComputerNamePhysicalDnsFullyQualified, NULL, &size ); if (GetLastError() != ERROR_MORE_DATA) return NULL; if (!(ret = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; - if (!GetComputerNameExA( ComputerNamePhysicalDnsHostname, ret, &size )) + if (!GetComputerNameExA( ComputerNamePhysicalDnsFullyQualified, ret, &size )) { HeapFree( GetProcessHeap(), 0, ret ); return NULL; @@ -6564,8 +6564,9 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr struct addrinfo *unixaires = NULL; int result; struct addrinfo unixhints, *punixhints = NULL; - char *hostname, *nodeV6 = NULL; + char *dot, *nodeV6 = NULL, *fqdn; const char *node; + size_t hostname_len = 0; *res = NULL; if (!nodename && !servname) @@ -6574,13 +6575,16 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr return WSAHOST_NOT_FOUND; } - hostname = get_hostname(); - if (!hostname) return WSA_NOT_ENOUGH_MEMORY; + fqdn = get_fqdn(); + if (!fqdn) return WSA_NOT_ENOUGH_MEMORY; + dot = strchr(fqdn, '.'); + if (dot) + hostname_len = dot - fqdn; if (!nodename) node = NULL; else if (!nodename[0]) - node = hostname; + node = fqdn; else { node = nodename; @@ -6595,7 +6599,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr nodeV6 = HeapAlloc(GetProcessHeap(), 0, close_bracket - node); if (!nodeV6) { - HeapFree(GetProcessHeap(), 0, hostname); + HeapFree(GetProcessHeap(), 0, fqdn); return WSA_NOT_ENOUGH_MEMORY; } lstrcpynA(nodeV6, node + 1, close_bracket - node); @@ -6624,7 +6628,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr if (punixhints->ai_socktype < 0) { SetLastError(WSAESOCKTNOSUPPORT); - HeapFree(GetProcessHeap(), 0, hostname); + HeapFree(GetProcessHeap(), 0, fqdn); HeapFree(GetProcessHeap(), 0, nodeV6); return SOCKET_ERROR; } @@ -6648,7 +6652,8 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr /* getaddrinfo(3) is thread safe, no need to wrap in CS */ result = getaddrinfo(node, servname, punixhints, &unixaires); - if (result && (!hints || !(hints->ai_flags & WS_AI_NUMERICHOST)) && !strcmp(hostname, node)) + if (result && (!hints || !(hints->ai_flags & WS_AI_NUMERICHOST)) + && (!strcmp(fqdn, node) || (!strncmp(fqdn, node, hostname_len) && !node[hostname_len]))) { /* If it didn't work it means the host name IP is not in /etc/hosts, try again * by sending a NULL host and avoid sending a NULL servname too because that @@ -6657,7 +6662,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr result = getaddrinfo(NULL, servname ? servname : "0", punixhints, &unixaires); } TRACE("%s, %s %p -> %p %d\n", debugstr_a(nodename), debugstr_a(servname), hints, res, result); - HeapFree(GetProcessHeap(), 0, hostname); + HeapFree(GetProcessHeap(), 0, fqdn); HeapFree(GetProcessHeap(), 0, nodeV6); if (!result) {

1 0

Paul Gofman : d3dx9: Get rid of constants modification bitmasks.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: 72b926568056c19f85860ce5e73317101ea62d63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72b926568056c19f85860ce5e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Aug 29 17:54:02 2017 +0300 d3dx9: Get rid of constants modification bitmasks. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 3 +- dlls/d3dx9_36/preshader.c | 325 +++++++++++++++++++----------------------- 2 files changed, 148 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=72b926568056c19f85860…

1 0

Paul Gofman : d3dx9: Factor out set_constants_device() function.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: c579a81a6353dd7c843270561cd5763ff895de40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c579a81a6353dd7c843270561… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Aug 10 13:02:50 2017 +0300 d3dx9: Factor out set_constants_device() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 84 +++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 29846a0..f38f875 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1419,6 +1419,47 @@ static void regstore_set_data(struct d3dx_regstore *rs, unsigned int table, regstore_set_modified(rs, table, offset, count); } +static HRESULT set_constants_device(ID3DXEffectStateManager *manager, struct IDirect3DDevice9 *device, + D3DXPARAMETER_TYPE type, enum pres_reg_tables table, void *ptr, + unsigned int start, unsigned int count) +{ + if (type == D3DXPT_VERTEXSHADER) + { + switch(table) + { + case PRES_REGTAB_OCONST: + return SET_D3D_STATE_(manager, device, SetVertexShaderConstantF, start, ptr, count); + case PRES_REGTAB_OICONST: + return SET_D3D_STATE_(manager, device, SetVertexShaderConstantI, start, ptr, count); + case PRES_REGTAB_OBCONST: + return SET_D3D_STATE_(manager, device, SetVertexShaderConstantB, start, ptr, count); + default: + FIXME("Unexpected register table %u.\n", table); + return D3DERR_INVALIDCALL; + } + } + else if (type == D3DXPT_PIXELSHADER) + { + switch(table) + { + case PRES_REGTAB_OCONST: + return SET_D3D_STATE_(manager, device, SetPixelShaderConstantF, start, ptr, count); + case PRES_REGTAB_OICONST: + return SET_D3D_STATE_(manager, device, SetPixelShaderConstantI, start, ptr, count); + case PRES_REGTAB_OBCONST: + return SET_D3D_STATE_(manager, device, SetPixelShaderConstantB, start, ptr, count); + default: + FIXME("Unexpected register table %u.\n", table); + return D3DERR_INVALIDCALL; + } + } + else + { + FIXME("Unexpected parameter type %u.\n", type); + return D3DERR_INVALIDCALL; + } +} + static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab, ULONG64 new_update_version) { @@ -1686,49 +1727,8 @@ static HRESULT set_shader_constants_device(ID3DXEffectStateManager *manager, str TRACE("Setting %u constants at %u.\n", count, start); ptr = (BYTE *)rs->tables[table] + get_offset_reg(table, start) * table_info[table].component_size; - if (type == D3DXPT_VERTEXSHADER) - { - switch(table) - { - case PRES_REGTAB_OCONST: - hr = SET_D3D_STATE_(manager, device, SetVertexShaderConstantF, start, (const float *)ptr, count); - break; - case PRES_REGTAB_OICONST: - hr = SET_D3D_STATE_(manager, device, SetVertexShaderConstantI, start, (const int *)ptr, count); - break; - case PRES_REGTAB_OBCONST: - hr = SET_D3D_STATE_(manager, device, SetVertexShaderConstantB, start, (const BOOL *)ptr, count); - break; - default: - FIXME("Unexpected register table %u.\n", table); - return D3DERR_INVALIDCALL; - } - } - else if (type == D3DXPT_PIXELSHADER) - { - switch(table) - { - case PRES_REGTAB_OCONST: - hr = SET_D3D_STATE_(manager, device, SetPixelShaderConstantF, start, (const float *)ptr, count); - break; - case PRES_REGTAB_OICONST: - hr = SET_D3D_STATE_(manager, device, SetPixelShaderConstantI, start, (const int *)ptr, count); - break; - case PRES_REGTAB_OBCONST: - hr = SET_D3D_STATE_(manager, device, SetPixelShaderConstantB, start, (const BOOL *)ptr, count); - break; - default: - FIXME("Unexpected register table %u.\n", table); - return D3DERR_INVALIDCALL; - } - } - else - { - FIXME("Unexpected parameter type %u.\n", type); - return D3DERR_INVALIDCALL; - } - if (FAILED(hr)) + if (FAILED(hr = set_constants_device(manager, device, type, table, ptr, start, count))) { ERR("Setting constants failed, type %u, table %u, hr %#x.\n", type, table, hr); result = hr;

1 0

Changhui Liu : gdiplus/tests: Add test for hdc with window origin point changed.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: cbaa358d6def2f66879d406fdbeba909f1e41494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbaa358d6def2f66879d406fd… Author: Changhui Liu <liuchanghui(a)linuxdeepin.com> Date: Mon Aug 28 11:42:15 2017 -0500 gdiplus/tests: Add test for hdc with window origin point changed. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 90 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 9a6dd1b..74d85d1 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6188,6 +6188,95 @@ static void test_GdipGraphicsSetAbort(void) ReleaseDC(hwnd, hdc); } +#define BLUE_COLOR (0xff0000ff) +#define is_blue_color(color) ( ((color) & 0x00ffffff) == 0xff ) +#define get_bitmap_pixel(x,y) pixel[(y)*(width) + (x)] +static DWORD* GetBitmapPixelBuffer(HDC hdc, HBITMAP hbmp, int width, int height) +{ + BITMAPINFOHEADER bi; + UINT lines = 0; + DWORD *buffer = (DWORD *)GdipAlloc(width*height*4); + + bi.biSize = sizeof(BITMAPINFOHEADER); + bi.biWidth = width; + bi.biHeight = -height; /*very Important, set negative, indicating a top-down DIB*/ + bi.biPlanes = 1; + bi.biBitCount = 32; + bi.biCompression = BI_RGB; + bi.biSizeImage = 0; + bi.biXPelsPerMeter = 0; + bi.biYPelsPerMeter = 0; + bi.biClrUsed = 0; + bi.biClrImportant = 0; + + lines = GetDIBits(hdc, hbmp, 0, height, buffer, (BITMAPINFO *)&bi, DIB_RGB_COLORS); + ok(lines == height, "Expected GetDIBits:%p,%d->%d,%d\n", buffer, height, lines, GetLastError()); + + return buffer; +} + +static void ReleaseBitmapPixelBuffer(DWORD* buffer) +{ + if (buffer) GdipFree(buffer); +} + +static void test_GdipFillRectanglesOnMemoryDCSolidBrush(void) +{ + ARGB color[6] = {0,0,0,0,0,0}; + POINT pt = {0,0}; + RECT rect = {100, 100, 180, 180}; + UINT width = rect.right - rect.left; + UINT height = rect.bottom - rect.top; + GpStatus status = 0; + GpSolidFill *brush = NULL; + GpGraphics *graphics = NULL; + HDC dc = GetDC( hwnd); + HDC hdc = CreateCompatibleDC(dc); + HBITMAP bmp = CreateCompatibleBitmap(dc, width, height); + HGDIOBJ old = SelectObject(hdc, bmp); + DWORD* pixel = NULL; + + /*Change the window origin is the key test point*/ + SetWindowOrgEx(hdc, rect.left, rect.top, &pt); + + status = GdipCreateSolidFill(BLUE_COLOR, &brush); + expect(Ok, status); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipSetClipRectI(graphics, rect.left+width/2, rect.top+height/2, + width, height, CombineModeReplace); + expect(Ok, status); + + status = GdipFillRectangleI(graphics, (GpBrush*)brush, 0, 0, rect.right, rect.bottom); + expect(Ok, status); + + GdipDeleteBrush((GpBrush*)brush); + GdipDeleteGraphics(graphics); + + pixel = GetBitmapPixelBuffer(hdc, bmp, width, height); + if (pixel) + { + color[0] = get_bitmap_pixel(width/2, height/2); + color[1] = get_bitmap_pixel(width/2+1, height/2); + color[2] = get_bitmap_pixel(width/2, height/2+1); + color[3] = get_bitmap_pixel(width/2-1, height/2-1); + color[4] = get_bitmap_pixel(width/2-1, height-1); + color[5] = get_bitmap_pixel(width-1, height/2-1); + } + + todo_wine ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && + color[3] == 0 && color[4] == 0 && color[5] == 0, + "Expected GdipFillRectangleI take effect!\n" ); + ReleaseBitmapPixelBuffer(pixel); + + SelectObject(hdc, old); + DeleteObject(bmp); + DeleteDC(hdc); + ReleaseDC(hwnd, dc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -6271,6 +6360,7 @@ START_TEST(graphics) test_bitmapfromgraphics(); test_GdipFillRectangles(); test_GdipGetVisibleClipBounds_memoryDC(); + test_GdipFillRectanglesOnMemoryDCSolidBrush(); test_container_rects(); test_GdipGraphicsSetAbort();

1 0

Vincent Povirk : gdiplus: Replace DPtoLP with an internal coordinate space constant.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: cfa4f088ee10861a0d3ec2d1cd8c84cfb8c036d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfa4f088ee10861a0d3ec2d1c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 28 11:42:14 2017 -0500 gdiplus: Replace DPtoLP with an internal coordinate space constant. This will allow us to temporarily remove gdi transforms later, without affecting internal logic that accounts for them. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 4 ++ dlls/gdiplus/graphics.c | 131 +++++++++++++++++++++++++++++------------ 2 files changed, 98 insertions(+), 37 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e1169c6..9980afc 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -79,8 +79,12 @@ extern REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi) DECLSPEC_HIDDEN; extern REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) DECLSPEC_HIDDEN; extern REAL units_scale(GpUnit from, GpUnit to, REAL dpi) DECLSPEC_HIDDEN; +#define WineCoordinateSpaceGdiDevice ((GpCoordinateSpace)4) + extern GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpMatrix *matrix) DECLSPEC_HIDDEN; +extern GpStatus gdip_transform_points(GpGraphics *graphics, GpCoordinateSpace dst_space, + GpCoordinateSpace src_space, GpPointF *points, INT count) DECLSPEC_HIDDEN; extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) DECLSPEC_HIDDEN; extern GpStatus encode_image_png(GpImage *image, IStream* stream, GDIPCONST EncoderParameters* params) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ce223aa..a250678 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2067,19 +2067,30 @@ static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) if (graphics->hdc) { - POINT points[2]; + GpPointF points[4], min_point, max_point; + int i; + + points[0].X = points[2].X = rect->X; + points[0].Y = points[1].Y = rect->Y; + points[1].X = points[3].X = rect->X + rect->Width; + points[2].Y = points[3].Y = rect->Y + rect->Height; - points[0].x = rect->X; - points[0].y = rect->Y; - points[1].x = rect->X + rect->Width; - points[1].y = rect->Y + rect->Height; + gdip_transform_points(graphics, CoordinateSpaceDevice, WineCoordinateSpaceGdiDevice, points, 4); - DPtoLP(graphics->hdc, points, sizeof(points)/sizeof(points[0])); + min_point = max_point = points[0]; - rect->X = min(points[0].x, points[1].x); - rect->Y = min(points[0].y, points[1].y); - rect->Width = abs(points[1].x - points[0].x); - rect->Height = abs(points[1].y - points[0].y); + for (i=1; i<4; i++) + { + if (points[i].X < min_point.X) min_point.X = points[i].X; + if (points[i].Y < min_point.Y) min_point.Y = points[i].Y; + if (points[i].X > max_point.X) max_point.X = points[i].X; + if (points[i].Y > max_point.Y) max_point.Y = points[i].Y; + } + + rect->X = min_point.X; + rect->Y = min_point.Y; + rect->Width = max_point.X - min_point.X; + rect->Height = max_point.Y - min_point.Y; } return stat; @@ -6547,6 +6558,20 @@ GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) return Ok; } +static void get_gdi_transform(GpGraphics *graphics, GpMatrix *matrix) +{ + XFORM xform; + + if (graphics->hdc == NULL) + { + GdipSetMatrixElements(matrix, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + return; + } + + GetTransform(graphics->hdc, 0x204, &xform); + GdipSetMatrixElements(matrix, xform.eM11, xform.eM12, xform.eM21, xform.eM22, xform.eDx, xform.eDy); +} + GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpMatrix *matrix) { @@ -6566,23 +6591,29 @@ GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_spac scale_y *= graphics->scale; } - /* transform from src_space to CoordinateSpacePage */ - switch (src_space) + if (dst_space < src_space) { - case CoordinateSpaceWorld: - GdipMultiplyMatrix(matrix, &graphics->worldtrans, MatrixOrderAppend); - break; - case CoordinateSpacePage: - break; - case CoordinateSpaceDevice: - GdipScaleMatrix(matrix, 1.0/scale_x, 1.0/scale_y, MatrixOrderAppend); - break; - } - - /* transform from CoordinateSpacePage to dst_space */ - switch (dst_space) - { - case CoordinateSpaceWorld: + /* transform towards world space */ + switch ((int)src_space) + { + case WineCoordinateSpaceGdiDevice: + { + GpMatrix gdixform; + get_gdi_transform(graphics, &gdixform); + stat = GdipInvertMatrix(&gdixform); + if (stat != Ok) + break; + GdipMultiplyMatrix(matrix, &gdixform, MatrixOrderAppend); + if (dst_space == CoordinateSpaceDevice) + break; + /* else fall-through */ + } + case CoordinateSpaceDevice: + GdipScaleMatrix(matrix, 1.0/scale_x, 1.0/scale_y, MatrixOrderAppend); + if (dst_space == CoordinateSpacePage) + break; + /* else fall-through */ + case CoordinateSpacePage: { GpMatrix inverted_transform = graphics->worldtrans; stat = GdipInvertMatrix(&inverted_transform); @@ -6590,22 +6621,51 @@ GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_spac GdipMultiplyMatrix(matrix, &inverted_transform, MatrixOrderAppend); break; } - case CoordinateSpacePage: - break; - case CoordinateSpaceDevice: - GdipScaleMatrix(matrix, scale_x, scale_y, MatrixOrderAppend); - break; + } + } + else + { + /* transform towards device space */ + switch ((int)src_space) + { + case CoordinateSpaceWorld: + GdipMultiplyMatrix(matrix, &graphics->worldtrans, MatrixOrderAppend); + if (dst_space == CoordinateSpacePage) + break; + /* else fall-through */ + case CoordinateSpacePage: + GdipScaleMatrix(matrix, scale_x, scale_y, MatrixOrderAppend); + if (dst_space == CoordinateSpaceDevice) + break; + /* else fall-through */ + case CoordinateSpaceDevice: + { + GpMatrix gdixform; + get_gdi_transform(graphics, &gdixform); + GdipMultiplyMatrix(matrix, &gdixform, MatrixOrderAppend); + break; + } + } } } return stat; } -GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace dst_space, - GpCoordinateSpace src_space, GpPointF *points, INT count) +GpStatus gdip_transform_points(GpGraphics *graphics, GpCoordinateSpace dst_space, + GpCoordinateSpace src_space, GpPointF *points, INT count) { GpMatrix matrix; GpStatus stat; + stat = get_graphics_transform(graphics, dst_space, src_space, &matrix); + if (stat != Ok) return stat; + + return GdipTransformMatrixPoints(&matrix, points, count); +} + +GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace dst_space, + GpCoordinateSpace src_space, GpPointF *points, INT count) +{ if(!graphics || !points || count <= 0 || dst_space < 0 || dst_space > CoordinateSpaceDevice || src_space < 0 || src_space > CoordinateSpaceDevice) @@ -6618,10 +6678,7 @@ GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace if (src_space == dst_space) return Ok; - stat = get_graphics_transform(graphics, dst_space, src_space, &matrix); - if (stat != Ok) return stat; - - return GdipTransformMatrixPoints(&matrix, points, count); + return gdip_transform_points(graphics, dst_space, src_space, points, count); } GpStatus WINGDIPAPI GdipTransformPointsI(GpGraphics *graphics, GpCoordinateSpace dst_space,

1 0

← Newer
1
2
3
4
5
6
7
...
36
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 2017