October 2011 - Wine-commits

Austin English : kernel32: Add a stub for GetProcessDEPPolicy.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: d4ec0a19c05c468532c47312beaf69e67cc4a7a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ec0a19c05c468532c47312b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 19 15:59:05 2011 -0700 kernel32: Add a stub for GetProcessDEPPolicy. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8e0981d..f1ec4f3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -595,6 +595,7 @@ @ stdcall GetPrivateProfileStructW(wstr wstr ptr long wstr) @ stdcall GetProcAddress(long str) @ stdcall GetProcessAffinityMask(long ptr ptr) +@ stdcall GetProcessDEPPolicy(long ptr ptr) @ stdcall GetProcessFlags(long) @ stdcall GetProcessHandleCount(long ptr) @ stdcall GetProcessHeap() diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c540f44..f67e438 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3842,3 +3842,14 @@ BOOL WINAPI GetNumaAvailableMemoryNode(UCHAR node, PULONGLONG available_bytes) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** + * GetProcessDEPPolicy (KERNEL32.@) + */ +BOOL WINAPI GetProcessDEPPolicy(HANDLE process, LPDWORD flags, PBOOL permanent) +{ + FIXME("(%p %p %p): stub\n", process, flags, permanent); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + +}

1 0

Marcus Meissner : ntdll: Avoid shadowing "de" variable.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 811ae03aeb4a6f4f99fb3a272c65a14f59d1cec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=811ae03aeb4a6f4f99fb3a272… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Oct 20 01:53:19 2011 +0200 ntdll: Avoid shadowing "de" variable. --- dlls/ntdll/directory.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 5d6d2cc..e62cc82 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2134,43 +2134,43 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i int fd = open( unix_name, O_RDONLY | O_DIRECTORY ); if (fd != -1) { - KERNEL_DIRENT *de; + KERNEL_DIRENT *kde; RtlEnterCriticalSection( &dir_section ); - if ((de = start_vfat_ioctl( fd ))) + if ((kde = start_vfat_ioctl( fd ))) { unix_name[pos - 1] = '/'; - while (de[0].d_reclen) + while (kde[0].d_reclen) { /* make sure names are null-terminated to work around an x86-64 kernel bug */ - size_t len = min(de[0].d_reclen, sizeof(de[0].d_name) - 1 ); - de[0].d_name[len] = 0; - len = min(de[1].d_reclen, sizeof(de[1].d_name) - 1 ); - de[1].d_name[len] = 0; + size_t len = min(kde[0].d_reclen, sizeof(kde[0].d_name) - 1 ); + kde[0].d_name[len] = 0; + len = min(kde[1].d_reclen, sizeof(kde[1].d_name) - 1 ); + kde[1].d_name[len] = 0; - if (de[1].d_name[0]) + if (kde[1].d_name[0]) { - ret = ntdll_umbstowcs( 0, de[1].d_name, strlen(de[1].d_name), + ret = ntdll_umbstowcs( 0, kde[1].d_name, strlen(kde[1].d_name), buffer, MAX_DIR_ENTRY_LEN ); if (ret == length && !memicmpW( buffer, name, length)) { - strcpy( unix_name + pos, de[1].d_name ); + strcpy( unix_name + pos, kde[1].d_name ); RtlLeaveCriticalSection( &dir_section ); close( fd ); goto success; } } - ret = ntdll_umbstowcs( 0, de[0].d_name, strlen(de[0].d_name), + ret = ntdll_umbstowcs( 0, kde[0].d_name, strlen(kde[0].d_name), buffer, MAX_DIR_ENTRY_LEN ); if (ret == length && !memicmpW( buffer, name, length)) { strcpy( unix_name + pos, - de[1].d_name[0] ? de[1].d_name : de[0].d_name ); + kde[1].d_name[0] ? kde[1].d_name : kde[0].d_name ); RtlLeaveCriticalSection( &dir_section ); close( fd ); goto success; } - if (ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ) == -1) + if (ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)kde ) == -1) { RtlLeaveCriticalSection( &dir_section ); close( fd );

1 0

Stefan Leichter : url: Add stub for OpenURLA.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 9b2132b560590d28be4c022b5a9fb5e17c783562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b2132b560590d28be4c022b5… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Oct 19 20:53:14 2011 +0200 url: Add stub for OpenURLA. --- dlls/url/url.spec | 4 ++-- dlls/url/url_main.c | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/url/url.spec b/dlls/url/url.spec index c2087c4..343d2bf 100644 --- a/dlls/url/url.spec +++ b/dlls/url/url.spec @@ -11,8 +11,8 @@ @ stub MailToProtocolHandlerA @ stub NewsProtocolHandler @ stub NewsProtocolHandlerA -@ stub OpenURL -@ stub OpenURLA +@ stdcall OpenURL(long long str long) OpenURLA +@ stdcall OpenURLA(long long str long) @ stdcall TelnetProtocolHandler(long str) TelnetProtocolHandlerA @ stdcall TelnetProtocolHandlerA(long str) @ stub TranslateURLA diff --git a/dlls/url/url_main.c b/dlls/url/url_main.c index 69b46ea..b65aa02 100644 --- a/dlls/url/url_main.c +++ b/dlls/url/url_main.c @@ -106,6 +106,15 @@ HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, } /*********************************************************************** + * OpenURLA (URL.@) + * + */ +void WINAPI OpenURLA(HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT show) +{ + FIXME("(%p, %p, %s, %d): stub!\n", hwnd, inst, debugstr_a(cmdline), show); +} + +/*********************************************************************** * TelnetProtocolHandlerA (URL.@) * */

1 0

Aric Stewart : usp10/tests: Initialize our SCRIPT_VISATTR array.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 8836da818e66e52b478c369850b8fea0b3688dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8836da818e66e52b478c36985… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 19 12:54:37 2011 -0500 usp10/tests: Initialize our SCRIPT_VISATTR array. Found by Valgrind and Dan Kegel. --- dlls/usp10/tests/usp10.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 180bcfb..1cf1463 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1901,6 +1901,7 @@ static void test_ScriptXtoX(void) HRESULT hr; memset(&sa, 0 , sizeof(SCRIPT_ANALYSIS)); + memset(psva, 0, sizeof(psva)); sa.fRTL = FALSE; hr = ScriptXtoCP(-1, 10, 10, pwLogClust, psva, piAdvance, &sa, &piCP, &piTrailing);

1 0

Aric Stewart : usp10: Correct some reading buffer overruns when parsing indic syllables.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: f0c85ff83d1f014dd9efc5b4af3fa8dc0ca3a7bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c85ff83d1f014dd9efc5b4a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 19 13:11:19 2011 -0500 usp10: Correct some reading buffer overruns when parsing indic syllables. Found with help from Dan Kegel and Valgrind. --- dlls/usp10/indic.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index a25ceec..f8e5b5e 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -86,7 +86,7 @@ static INT consonant_header(LPCWSTR input, INT cChar, INT start, INT next, next++; if ((next < cChar) && lex(input[next]) == lex_Nukta) next++; - if (lex(input[next])==lex_Halant) + if ((next < cChar) && lex(input[next])==lex_Halant) { next++; if((next < cChar) && is_joiner( lex(input[next]) )) @@ -94,7 +94,7 @@ static INT consonant_header(LPCWSTR input, INT cChar, INT start, INT next, if ((next < cChar) && is_consonant( lex(input[next]) )) return next; } - else if (is_joiner( lex(input[next]) ) && lex(input[next+1])==lex_Halant) + else if ((next < cChar) && is_joiner( lex(input[next]) ) && lex(input[next+1])==lex_Halant) { next+=2; if ((next < cChar) && is_consonant( lex(input[next]) )) @@ -163,7 +163,7 @@ static INT parse_vowel_syllable(LPCWSTR input, INT cChar, INT start, else if ((next < cChar) && lex(input[next])==lex_ZWJ && is_consonant( lex(input[next+1]) )) next+=2; - if (is_matra( lex(input[next]) )) + if ((next < cChar) && is_matra( lex(input[next]) )) { while((next < cChar) && is_matra( lex(input[next]) )) next++;

1 0

Henri Verbeet : wined3d: Allow loading multisampled surfaces into sysmem.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 82f067f5cdf00b8b9cf61cf775900ac99a3f0877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f067f5cdf00b8b9cf61cf77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 19 22:03:10 2011 +0200 wined3d: Allow loading multisampled surfaces into sysmem. --- dlls/wined3d/surface.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1f1dc8f..54cacbd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5789,6 +5789,9 @@ static void surface_load_sysmem(struct wined3d_surface *surface, { surface_prepare_system_memory(surface); + if (surface->flags & (SFLAG_INRB_MULTISAMPLE | SFLAG_INRB_RESOLVED)) + surface_load_location(surface, SFLAG_INTEXTURE, NULL); + /* Download the surface to system memory. */ if (surface->flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) { @@ -5945,6 +5948,22 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, return WINED3D_OK; } + if (surface->flags & (SFLAG_INRB_MULTISAMPLE | SFLAG_INRB_RESOLVED) + && (surface->resource.format->flags & attach_flags) == attach_flags + && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, + NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) + { + DWORD src_location = surface->flags & SFLAG_INRB_RESOLVED ? SFLAG_INRB_RESOLVED : SFLAG_INRB_MULTISAMPLE; + DWORD dst_location = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; + RECT rect = {0, 0, surface->resource.width, surface->resource.height}; + + surface_blt_fbo(device, WINED3DTEXF_POINT, surface, src_location, + &rect, surface, dst_location, &rect); + + return WINED3D_OK; + } + /* Upload from system memory */ d3dfmt_get_conv(surface, TRUE /* We need color keying */,

1 0

Henri Verbeet : d3d8/tests: Add a small test for multisampled CopyRects().
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: fd1afd24f4af20646ce0f3a7ac2064e8e49b1e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd1afd24f4af20646ce0f3a7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 19 22:03:11 2011 +0200 d3d8/tests: Add a small test for multisampled CopyRects(). --- dlls/d3d8/tests/visual.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e90553a..c221d47 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2228,6 +2228,74 @@ static void shadow_test(IDirect3DDevice8 *device) IDirect3D8_Release(d3d8); } +static void multisample_copy_rects_test(IDirect3DDevice8 *device) +{ + IDirect3DSurface8 *original_ds, *original_rt, *rt, *readback; + RECT src_rect = {64, 64, 128, 128}; + POINT dst_point = {96, 96}; + D3DLOCKED_RECT locked_rect; + IDirect3D8 *d3d8; + D3DCOLOR color; + HRESULT hr; + + hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); + ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceMultiSampleType(d3d8, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES); + IDirect3D8_Release(d3d8); + if (FAILED(hr)) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisampled CopyRects test.\n"); + return; + } + + hr = IDirect3DDevice8_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_2_SAMPLES, FALSE, &rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateImageSurface(device, 256, 256, D3DFMT_A8R8G8B8, &readback); + ok(SUCCEEDED(hr), "Failed to create readback surface, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetRenderTarget(device, &original_rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &original_ds); + ok(SUCCEEDED(hr), "Failed to get depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CopyRects(device, rt, NULL, 0, readback, NULL); + ok(SUCCEEDED(hr), "Failed to read render target back, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CopyRects(device, rt, &src_rect, 1, readback, &dst_point); + ok(SUCCEEDED(hr), "Failed to read render target back, hr %#x.\n", hr); + + hr = IDirect3DSurface8_LockRect(readback, &locked_rect, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Failed to lock readback surface, hr %#x.\n", hr); + + color = *(DWORD *)((BYTE *)locked_rect.pBits + 31 * locked_rect.Pitch + 31 * 4); + ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); + + color = *(DWORD *)((BYTE *)locked_rect.pBits + 127 * locked_rect.Pitch + 127 * 4); + ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DSurface8_UnlockRect(readback); + ok(SUCCEEDED(hr), "Failed to unlock readback surface, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, original_rt, original_ds); + ok(SUCCEEDED(hr), "Failed to restore original render target, hr %#x.\n", hr); + + IDirect3DSurface8_Release(original_ds); + IDirect3DSurface8_Release(original_rt); + IDirect3DSurface8_Release(readback); + IDirect3DSurface8_Release(rt); +} + START_TEST(visual) { IDirect3DDevice8 *device_ptr; @@ -2306,6 +2374,7 @@ START_TEST(visual) depth_buffer2_test(device_ptr); intz_test(device_ptr); shadow_test(device_ptr); + multisample_copy_rects_test(device_ptr); cleanup: if(device_ptr) {

1 0

Jacek Caban : vbscript: Get rid of no longer needed VB_VARIANT|VT_BYREF in Global_IsObject.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 8a17193d8d4fc4e3259b855b6e5ba525ca333e89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a17193d8d4fc4e3259b855b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 19 19:38:44 2011 +0200 vbscript: Get rid of no longer needed VB_VARIANT|VT_BYREF in Global_IsObject. --- dlls/vbscript/global.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index dad20b9..97fbeb7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #include "vbscript.h" #include "vbscript_defs.h" @@ -302,8 +304,7 @@ static HRESULT Global_IsObject(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, { TRACE("(%s)\n", debugstr_variant(arg)); - if(V_VT(arg) == (VT_VARIANT|VT_BYREF)) - arg = V_VARIANTREF(arg); + assert(args_cnt == 1); if(res) { V_VT(res) = VT_BOOL;

1 0

Jacek Caban : vbscript: Added Global_IsEmpty implementation.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 7fa15c5f4d2cac1e87c1aa87584df336c34f1689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa15c5f4d2cac1e87c1aa875… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 19 19:39:00 2011 +0200 vbscript: Added Global_IsEmpty implementation. --- dlls/vbscript/global.c | 11 +++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 97fbeb7..98f41f2 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -278,8 +278,15 @@ static HRESULT Global_IsDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA static HRESULT Global_IsEmpty(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(res) { + V_VT(res) = VT_BOOL; + V_BOOL(res) = V_VT(arg) == VT_EMPTY ? VARIANT_TRUE : VARIANT_FALSE; + } + return S_OK; } static HRESULT Global_IsNull(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index d5653ab..d5b75db 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -32,6 +32,18 @@ Call ok(not isObject(4), "isObject(4) is true?") Call ok(not isObject("x"), "isObject(""x"") is true?") Call ok(not isObject(Null), "isObject(Null) is true?") +Call ok(not isEmpty(new EmptyClass), "isEmpty(new EmptyClass) is true?") +Set x = new EmptyClass +Call ok(not isEmpty(x), "isEmpty(x) is true?") +x = empty +Call ok(isEmpty(x), "isEmpty(x) is not true?") +Call ok(isEmpty(empty), "isEmpty(empty) is not true?") +Call ok(not isEmpty(Nothing), "isEmpty(Nothing) is not true?") +Call ok(not isEmpty(true), "isEmpty(true) is true?") +Call ok(not isEmpty(4), "isEmpty(4) is true?") +Call ok(not isEmpty("x"), "isEmpty(""x"") is true?") +Call ok(not isEmpty(Null), "isEmpty(Null) is true?") + Call ok(getVT(err) = "VT_DISPATCH", "getVT(err) = " & getVT(err)) Sub TestHex(x, ex)

1 0

Huw Davies : gdi32: Add get_pixel primitives.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 70be58c17d034174fcd5e270b2c3c325a817332a URL: http://source.winehq.org/git/wine.git/?a=commit;h=70be58c17d034174fcd5e270b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 19 12:41:57 2011 +0100 gdi32: Add get_pixel primitives. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/primitives.c | 54 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index c73bc8e..e5f4645 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -145,6 +145,7 @@ typedef struct primitive_funcs const POINT *origin, int rop2, int overlap); void (* blend_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, BLENDFUNCTION blend); + DWORD (* get_pixel)(const dib_info *dib, const POINT *pt); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); COLORREF (* pixel_to_colorref)(const dib_info *dib, DWORD pixel); void (* convert_to)(dib_info *dst, const dib_info *src, const RECT *src_rect); diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 594d05d..0423c43 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -1025,6 +1025,51 @@ static void copy_rect_null(const dib_info *dst, const RECT *rc, return; } +static DWORD get_pixel_32(const dib_info *dib, const POINT *pt) +{ + DWORD *ptr = get_pixel_ptr_32( dib, pt->x, pt->y ); + return *ptr; +} + +static DWORD get_pixel_24(const dib_info *dib, const POINT *pt) +{ + BYTE *ptr = get_pixel_ptr_24( dib, pt->x, pt->y ); + return ptr[0] | ((DWORD)ptr[1] << 8) | ((DWORD)ptr[2] << 16); +} + +static DWORD get_pixel_16(const dib_info *dib, const POINT *pt) +{ + WORD *ptr = get_pixel_ptr_16( dib, pt->x, pt->y ); + return *ptr; +} + +static DWORD get_pixel_8(const dib_info *dib, const POINT *pt) +{ + BYTE *ptr = get_pixel_ptr_8( dib, pt->x, pt->y ); + return *ptr; +} + +static DWORD get_pixel_4(const dib_info *dib, const POINT *pt) +{ + BYTE *ptr = get_pixel_ptr_4( dib, pt->x, pt->y ); + + if (pt->x & 1) + return *ptr & 0x0f; + else + return (*ptr >> 4) & 0x0f; +} + +static DWORD get_pixel_1(const dib_info *dib, const POINT *pt) +{ + BYTE *ptr = get_pixel_ptr_1( dib, pt->x, pt->y ); + return (*ptr & pixel_masks_1[pt->x & 0x7]) ? 1 : 0; +} + +static DWORD get_pixel_null(const dib_info *dib, const POINT *pt) +{ + return 0; +} + static DWORD colorref_to_pixel_888(const dib_info *dib, COLORREF color) { return ( ((color >> 16) & 0xff) | (color & 0xff00) | ((color << 16) & 0xff0000) ); @@ -4350,6 +4395,7 @@ const primitive_funcs funcs_8888 = pattern_rects_32, copy_rect_32, blend_rect_8888, + get_pixel_32, colorref_to_pixel_888, pixel_to_colorref_888, convert_to_8888, @@ -4364,6 +4410,7 @@ const primitive_funcs funcs_32 = pattern_rects_32, copy_rect_32, blend_rect_32, + get_pixel_32, colorref_to_pixel_masks, pixel_to_colorref_masks, convert_to_32, @@ -4378,6 +4425,7 @@ const primitive_funcs funcs_24 = pattern_rects_24, copy_rect_24, blend_rect_24, + get_pixel_24, colorref_to_pixel_888, pixel_to_colorref_888, convert_to_24, @@ -4392,6 +4440,7 @@ const primitive_funcs funcs_555 = pattern_rects_16, copy_rect_16, blend_rect_555, + get_pixel_16, colorref_to_pixel_555, pixel_to_colorref_555, convert_to_555, @@ -4406,6 +4455,7 @@ const primitive_funcs funcs_16 = pattern_rects_16, copy_rect_16, blend_rect_16, + get_pixel_16, colorref_to_pixel_masks, pixel_to_colorref_masks, convert_to_16, @@ -4420,6 +4470,7 @@ const primitive_funcs funcs_8 = pattern_rects_8, copy_rect_8, blend_rect_8, + get_pixel_8, colorref_to_pixel_colortable, pixel_to_colorref_colortable, convert_to_8, @@ -4434,6 +4485,7 @@ const primitive_funcs funcs_4 = pattern_rects_4, copy_rect_4, blend_rect_4, + get_pixel_4, colorref_to_pixel_colortable, pixel_to_colorref_colortable, convert_to_4, @@ -4448,6 +4500,7 @@ const primitive_funcs funcs_1 = pattern_rects_1, copy_rect_1, blend_rect_1, + get_pixel_1, colorref_to_pixel_colortable, pixel_to_colorref_colortable, convert_to_1, @@ -4462,6 +4515,7 @@ const primitive_funcs funcs_null = pattern_rects_null, copy_rect_null, blend_rect_null, + get_pixel_null, colorref_to_pixel_null, pixel_to_colorref_null, convert_to_null,

1 0