October 2011 - Wine-commits

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_software_vertex_processing () const.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 652d80d9d859a0261d45862761cb2904384cad60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=652d80d9d859a0261d4586276… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 11 17:24:55 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_software_vertex_processing() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6e8eb2d..ec9126f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4553,7 +4553,7 @@ HRESULT CDECL wined3d_device_set_software_vertex_processing(struct wined3d_devic return WINED3D_OK; } -BOOL CDECL wined3d_device_get_software_vertex_processing(struct wined3d_device *device) +BOOL CDECL wined3d_device_get_software_vertex_processing(const struct wined3d_device *device) { static BOOL warned; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3dec8ba..c6949bd 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2243,7 +2243,7 @@ HRESULT __cdecl wined3d_device_get_render_target(struct wined3d_device *device, HRESULT __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, UINT sampler_idx, WINED3DSAMPLERSTATETYPE state, DWORD *value); HRESULT __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect); -BOOL __cdecl wined3d_device_get_software_vertex_processing(struct wined3d_device *device); +BOOL __cdecl wined3d_device_get_software_vertex_processing(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride); HRESULT __cdecl wined3d_device_get_stream_source_freq(const struct wined3d_device *device,

1 0

Frédéric Delanoy : cmd/tests: Add MOVE tests.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 212949f1086c2f492b98fad7770d33ab7f3a4661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=212949f1086c2f492b98fad77… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 11 19:04:31 2011 +0200 cmd/tests: Add MOVE tests. --- programs/cmd/tests/test_builtins.cmd | 70 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 15 ++++++ 2 files changed, 85 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 35ab181..49e3fde 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -909,6 +909,76 @@ if not exist baz\abc ( ) cd .. & rd /s/q foobar +echo ------------ Testing move ------------ +mkdir foobar & cd foobar +echo ... file move ... +echo >foo +move foo bar > nul 2>&1 +if not exist foo ( + if exist bar ( + echo file move succeeded + ) +) +echo bar>bar +echo baz> baz +move /Y bar baz > nul 2>&1 +if not exist bar ( + if exist baz ( + echo file move with overwrite succeeded + ) +) else ( + echo file overwrite impossible! + del bar +) +type baz + +mkdir rep +move baz rep > nul 2>&1 +if not exist baz ( + if exist rep\baz ( + echo file moved in subdirectory + ) +) +call :setError 0 +move rep\baz . > nul 2>&1 +move /Y baz baz > nul 2>&1 +if errorlevel 1 ( + echo moving a file to itself should be a no-op! +) else ( + echo moving a file to itself is a no-op +) +echo ErrorLevel: %ErrorLevel% +call :setError 0 +del baz +echo ... directory move ... +mkdir foo\bar +mkdir baz +echo baz2>baz\baz2 +move baz foo\bar > nul 2>&1 +if not exist baz ( + if exist foo\bar\baz\baz2 ( + echo simple directory move succeeded + ) +) +call :setError 0 +mkdir baz +move baz baz > nul 2>&1 +echo moving a directory to itself gives error; errlevel %ErrorLevel% +echo ...... dir in dir move ...... +rd /s/q foo +mkdir foo bar +echo foo2>foo\foo2 +echo bar2>bar\bar2 +move foo bar > nul 2>&1 +if not exist foo ( + if exist bar ( + dir /b /ad bar + dir /b /a-d bar + dir /b bar\foo + ) +) +cd .. & rd /s/q foobar + echo ------------ Testing mkdir ------------ call :setError 0 echo ... md and mkdir are synonymous ... diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 31b1780..33a8113 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -604,6 +604,21 @@ bar ... rename in other directory ... @todo_wine(a)rename impossible in other directory @todo_wine(a)original file still present +------------ Testing move ------------ +... file move ... +file move succeeded +(a)todo_wine@file move with overwrite succeeded(a)or_broken@file overwrite impossible! +(a)todo_wine@bar(a)or_broken@baz +file moved in subdirectory +(a)todo_wine@moving a file to itself is a no-op(a)or_broken@moving a file to itself should be a no-op! +(a)todo_wine@ErrorLevel: 0(a)or_broken@ErrorLevel: 1 +... directory move ... +simple directory move succeeded +moving a directory to itself gives error; errlevel 1 +...... dir in dir move ...... +foo +bar2 +foo2 ------------ Testing mkdir ------------ ... md and mkdir are synonymous ... 0

1 0

André Hentschel : dbghelp: Remove superfluous PATH_MAX defines.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: bfdc93cdc5e03798e484986400bcfd0948db0e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfdc93cdc5e03798e48498640… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 11 19:13:40 2011 +0200 dbghelp: Remove superfluous PATH_MAX defines. --- dlls/dbghelp/coff.c | 4 +--- dlls/dbghelp/dwarf.c | 3 --- dlls/dbghelp/elf_module.c | 3 --- dlls/dbghelp/msc.c | 4 +--- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index 9fc3ec9..54bd278 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -42,9 +42,7 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifndef PATH_MAX -#define PATH_MAX MAX_PATH -#endif + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 20bd080..2a16650 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -39,9 +39,6 @@ # include <unistd.h> #endif #include <stdio.h> -#ifndef PATH_MAX -#define PATH_MAX MAX_PATH -#endif #include <assert.h> #include <stdarg.h> diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 969e8c0..e4c6e44 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -42,9 +42,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifndef PATH_MAX -#define PATH_MAX MAX_PATH -#endif #include "dbghelp_private.h" diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 9f9a53e..53bf6bf 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -45,9 +45,7 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifndef PATH_MAX -#define PATH_MAX MAX_PATH -#endif + #include <stdarg.h> #include "windef.h" #include "winbase.h"

1 0

Alexander Morozov : kernel32/tests: Shared lock can overlap exclusive if handles are equal.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: b2a302b667579fd22157be07a8e21673c038b092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a302b667579fd22157be07a… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Oct 7 21:01:27 2011 +0400 kernel32/tests: Shared lock can overlap exclusive if handles are equal. --- dlls/kernel32/tests/file.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 772e439..f607cfd 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1591,7 +1591,7 @@ static void test_offset_in_overlapped_structure(void) static void test_LockFile(void) { - HANDLE handle; + HANDLE handle, handle2; DWORD written; OVERLAPPED overlapped; int limited_LockFile; @@ -1606,6 +1606,14 @@ static void test_LockFile(void) ok(0,"couldn't create file \"%s\" (err=%d)\n",filename,GetLastError()); return; } + handle2 = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (handle2 == INVALID_HANDLE_VALUE) + { + ok( 0, "couldn't open file \"%s\" (err=%d)\n", filename, GetLastError() ); + goto cleanup; + } ok( WriteFile( handle, sillytext, strlen(sillytext), &written, NULL ), "write failed\n" ); ok( LockFile( handle, 0, 0, 0, 0 ), "LockFile failed\n" ); @@ -1656,6 +1664,23 @@ static void test_LockFile(void) "UnlockFileEx 150,100 again succeeded\n" ); } + /* shared lock can overlap exclusive if handles are equal */ + S(U(overlapped)).Offset = 300; + ok( LockFileEx( handle, LOCKFILE_EXCLUSIVE_LOCK, 0, 100, 0, &overlapped ), + "LockFileEx exclusive 300,100 failed\n" ); + ok( !LockFileEx( handle2, LOCKFILE_FAIL_IMMEDIATELY, 0, 100, 0, &overlapped ), + "LockFileEx handle2 300,100 succeeded\n" ); + ret = LockFileEx( handle, LOCKFILE_FAIL_IMMEDIATELY, 0, 100, 0, &overlapped ); + todo_wine + ok( ret, "LockFileEx 300,100 failed\n" ); + ok( UnlockFileEx( handle, 0, 100, 0, &overlapped ), "UnlockFileEx 300,100 failed\n" ); + /* exclusive lock is removed first */ + ok( LockFileEx( handle2, LOCKFILE_FAIL_IMMEDIATELY, 0, 100, 0, &overlapped ), + "LockFileEx handle2 300,100 failed\n" ); + ok( UnlockFileEx( handle2, 0, 100, 0, &overlapped ), "UnlockFileEx 300,100 failed\n" ); + if (ret) + ok( UnlockFileEx( handle, 0, 100, 0, &overlapped ), "UnlockFileEx 300,100 failed\n" ); + ret = LockFile( handle, 0, 0x10000000, 0, 0xf0000000 ); if (ret) { @@ -1689,6 +1714,8 @@ static void test_LockFile(void) ok( UnlockFile( handle, 100, 0, 0, 0 ), "UnlockFile 100,0 failed\n" ); + CloseHandle( handle2 ); +cleanup: CloseHandle( handle ); DeleteFileA( filename ); }

1 0

Octavian Voicu : ddraw/tests: Test detachment of attached surfaces on Release.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 9cff895a69dfad2e4e987c1da48a59274e4e48d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cff895a69dfad2e4e987c1da… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Mon Oct 10 13:15:21 2011 +0300 ddraw/tests: Test detachment of attached surfaces on Release. --- dlls/ddraw/tests/refcount.c | 98 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 95 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index 970865e..736ce8d 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -47,11 +47,11 @@ static void test_ddraw_objects(void) IDirectDraw2 *DDraw2; IDirectDraw *DDraw1; IDirectDrawPalette *palette; - IDirectDrawSurface7 *surface = NULL; - IDirectDrawSurface *surface1; + IDirectDrawSurface7 *surface = NULL, *stencil; + IDirectDrawSurface *surface1, *stencil1; IDirectDrawSurface4 *surface4; PALETTEENTRY Table[256]; - DDSURFACEDESC2 ddsd; + DDSURFACEDESC2 ddsd, ddsd_stencil; hr = pDirectDrawCreateEx(NULL, (void **) &DDraw7, &IID_IDirectDraw7, NULL); ok(hr == DD_OK || hr==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreateEx returned: %x\n", hr); @@ -92,6 +92,17 @@ static void test_ddraw_objects(void) U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_PALETTEINDEXED8 | DDPF_RGB; U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 8; + memset(&ddsd_stencil, 0, sizeof(ddsd_stencil)); + ddsd_stencil.dwSize = sizeof(ddsd_stencil); + ddsd_stencil.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd_stencil.dwWidth = ddsd.dwWidth; + ddsd_stencil.dwHeight = ddsd.dwHeight; + ddsd_stencil.ddsCaps.dwCaps = DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER; + U4(ddsd_stencil).ddpfPixelFormat.dwSize = sizeof(U4(ddsd_stencil).ddpfPixelFormat); + U4(ddsd_stencil).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(U4(ddsd_stencil).ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(U4(ddsd_stencil).ddpfPixelFormat).dwZBitMask = 0x0000FFFF; + hr = IDirectDraw7_CreateSurface(DDraw7, &ddsd, &surface, NULL); if (!surface) { @@ -186,6 +197,87 @@ static void test_ddraw_objects(void) ok(ref == 1, "Got refcount %d, expected 1\n", ref); IDirectDrawSurface_Release(surface1); + /* AddAttachedSurface with IDirectDrawSurface7 */ + ddsd.dwSize = sizeof(DDSURFACEDESC2); + ddsd.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE; + hr = IDirectDraw7_CreateSurface(DDraw7, &ddsd, &surface, NULL); + ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + ddsd_stencil.dwSize = sizeof(DDSURFACEDESC2); + hr = IDirectDraw7_CreateSurface(DDraw7, &ddsd_stencil, &stencil, NULL); + ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + /* AddAttachedSurface with DeleteAttachedSurface */ + hr = IDirectDrawSurface7_AddAttachedSurface(surface, stencil); + ok(hr == DD_OK, "AddAttachedSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + ref = getRefcount( (IUnknown *) stencil); + ok(ref == 2, "Got refcount %d, expected 2\n", ref); + hr = IDirectDrawSurface7_DeleteAttachedSurface(surface, 0, stencil); + ok(hr == DD_OK, "DeleteAttachedSurface returned %08x\n", hr); + ref = getRefcount( (IUnknown *) stencil); + ok(ref == 1, "Got refcount %d, expected 1\n", ref); + } + + /* Releasing a surface should detach any attached surfaces */ + hr = IDirectDrawSurface7_AddAttachedSurface(surface, stencil); + ok(hr == DD_OK, "AddAttachedSurface returned %08x\n", hr); + ref = getRefcount( (IUnknown *) stencil); + ok(ref == 2, "Got refcount %d, expected 2\n", ref); + ref = IDirectDrawSurface7_Release(surface); + ok(!ref, "Got refcount %d, expected 0\n", ref); + ref = getRefcount( (IUnknown *) stencil); + ok(ref == 1, "Got refcount %d, expected 1\n", ref); + ref = IDirectDrawSurface7_Release(stencil); + ok(!ref, "Got refcount %d, expected 0\n", ref); + } + else + IDirectDrawSurface7_Release(surface); + } + + /* AddAttachedSurface with IDirectDrawSurface */ + ddsd.dwSize = sizeof(DDSURFACEDESC); + hr = IDirectDraw_CreateSurface(DDraw1, (DDSURFACEDESC *) &ddsd, &surface1, NULL); + ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + ddsd_stencil.dwSize = sizeof(DDSURFACEDESC); + hr = IDirectDraw_CreateSurface(DDraw1, (DDSURFACEDESC *) &ddsd_stencil, &stencil1, NULL); + ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + /* AddAttachedSurface with DeleteAttachedSurface */ + hr = IDirectDrawSurface_AddAttachedSurface(surface1, stencil1); + ok(hr == DD_OK, "AddAttachedSurface returned %08x\n", hr); + if (SUCCEEDED(hr)) + { + ref = getRefcount( (IUnknown *) stencil1); + ok(ref == 2, "Got refcount %d, expected 2\n", ref); + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, stencil1); + ok(hr == DD_OK, "DeleteAttachedSurface returned %08x\n", hr); + ref = getRefcount( (IUnknown *) stencil1); + ok(ref == 1, "Got refcount %d, expected 1\n", ref); + } + + /* Releasing a surface should detach any attached surfaces */ + hr = IDirectDrawSurface_AddAttachedSurface(surface1, stencil1); + ok(hr == DD_OK, "AddAttachedSurface returned %08x\n", hr); + ref = getRefcount( (IUnknown *) stencil1); + ok(ref == 2, "Got refcount %d, expected 2\n", ref); + ref = IDirectDrawSurface_Release(surface1); + ok(!ref, "Got refcount %d, expected 0\n", ref); + ref = getRefcount( (IUnknown *) stencil1); + todo_wine ok(ref == 1, "Got refcount %d, expected 1\n", ref); + ref = IDirectDrawSurface_Release(stencil1); + todo_wine ok(!ref, "Got refcount %d, expected 0\n", ref); + } + else + IDirectDrawSurface_Release(surface1); + } + IDirectDraw7_Release(DDraw7); IDirectDraw4_Release(DDraw4); IDirectDraw2_Release(DDraw2);

1 0

Alexandre Julliard : winex11: Get rid of the client-side DIB optimization in AlphaBlend.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 125529fabecc0e7a92bd1a41078093f375955080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=125529fabecc0e7a92bd1a410… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 11 15:24:15 2011 +0200 winex11: Get rid of the client-side DIB optimization in AlphaBlend. --- dlls/winex11.drv/xrender.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cb0ec9b..1986fa3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2876,18 +2876,8 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, return FALSE; } - if (physdev_dst != physdev_src) - { - int status = X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_None ); - if (status == DIB_Status_AppMod || status == DIB_Status_InSync) - { - X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); - dst_dev = GET_NEXT_PHYSDEV( dst_dev, pAlphaBlend ); - return dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, blendfn ); - } - X11DRV_CoerceDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); - } X11DRV_LockDIBSection( physdev_dst->x11dev, DIB_Status_GdiMod ); + if (physdev_dst != physdev_src) X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); dst_pict = get_xrender_picture( physdev_dst, 0, &dst->visrect );

1 0

Huw Davies : gdi32: Add a helper to retrieve the bounding rectangle.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: a7b5d8665589059a151da7505bde733a00b3c73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b5d8665589059a151da7505… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 12:49:53 2011 +0100 gdi32: Add a helper to retrieve the bounding rectangle. --- dlls/gdi32/bitblt.c | 16 ++++++---------- dlls/gdi32/gdi_private.h | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index c595a60..a2a7698 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -65,12 +65,10 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, dst->height = rect.bottom - rect.top; if (dst->layout & LAYOUT_RTL && dst->layout & LAYOUT_BITMAPORIENTATIONPRESERVED) { - swap_ints( &rect.left, &rect.right ); - dst->x = rect.left; - dst->width = rect.right - rect.left; + dst->x += dst->width; + dst->width = -dst->width; } - if (rect.left > rect.right) { swap_ints( &rect.left, &rect.right ); rect.left++; rect.right++; } - if (rect.top > rect.bottom) { swap_ints( &rect.top, &rect.bottom ); rect.top++; rect.bottom++; } + get_bounding_rect( &rect, dst->x, dst->y, dst->width, dst->height ); if (get_clip_box( dc_dst, &clip )) intersect_rect( &dst->visrect, &rect, &clip ); @@ -92,12 +90,10 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, src->height = rect.bottom - rect.top; if (src->layout & LAYOUT_RTL && src->layout & LAYOUT_BITMAPORIENTATIONPRESERVED) { - swap_ints( &rect.left, &rect.right ); - src->x = rect.left; - src->width = rect.right - rect.left; + src->x += src->width; + src->width = -src->width; } - if (rect.left > rect.right) { swap_ints( &rect.left, &rect.right ); rect.left++; rect.right++; } - if (rect.top > rect.bottom) { swap_ints( &rect.top, &rect.bottom ); rect.top++; rect.bottom++; } + get_bounding_rect( &rect, src->x, src->y, src->width, src->height ); /* source is not clipped */ if (dc_src->header.type == OBJ_MEMDC) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b3d027a..6a600a4 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -469,6 +469,26 @@ static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) rect->bottom += offset_y; } +static inline void get_bounding_rect( RECT *rect, int x, int y, int width, int height ) +{ + rect->left = x; + rect->right = x + width; + rect->top = y; + rect->bottom = y + height; + if (rect->left > rect->right) + { + int tmp = rect->left; + rect->left = rect->right + 1; + rect->right = tmp + 1; + } + if (rect->top > rect->bottom) + { + int tmp = rect->top; + rect->top = rect->bottom + 1; + rect->bottom = tmp + 1; + } +} + static inline int get_bitmap_stride( int width, int bpp ) { return ((width * bpp + 15) >> 3) & ~1;

1 0

Jacek Caban : vbscript: Pass arguments to 1-arg functions directly if they are VT_VARIANT|VT_BYREF .
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 1c936039ed716fd6fcda3b31262b898c30fff9d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c936039ed716fd6fcda3b312… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 11 14:59:06 2011 +0200 vbscript: Pass arguments to 1-arg functions directly if they are VT_VARIANT|VT_BYREF. --- dlls/vbscript/vbdisp.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index d083d74..e22e060 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -133,6 +133,8 @@ static HRESULT invoke_variant_prop(vbdisp_t *This, VARIANT *v, WORD flags, DISPP static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD flags, DISPPARAMS *dp, VARIANT *res) { + VARIANT *args; + switch(flags) { case DISPATCH_PROPERTYGET: if(!(prop->flags & (BP_GET|BP_GETPUT))) { @@ -166,7 +168,12 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f return E_FAIL; } - return prop->proc(This, dp->rgvarg, dp->cArgs, res); + if(arg_cnt(dp) == 1 && V_VT(dp->rgvarg) == (VT_BYREF|VT_VARIANT)) + args = V_VARIANTREF(dp->rgvarg); + else + args = dp->rgvarg; + + return prop->proc(This, args, dp->cArgs, res); } static BOOL run_terminator(vbdisp_t *This)

1 0

Jacek Caban : vbscript: Added Hex function implementation.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 39e4ef4e1e21e9f2b36b3a1bac0ab3102089991f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e4ef4e1e21e9f2b36b3a1ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 11 14:59:32 2011 +0200 vbscript: Added Hex function implementation. --- dlls/vbscript/global.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 771236d..dad20b9 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -57,6 +57,22 @@ static IInternetHostSecurityManager *get_sec_mgr(script_ctx_t *ctx) return ctx->secmgr = secmgr; } +static HRESULT return_bstr(VARIANT *res, const WCHAR *str) +{ + BSTR ret; + + if(!res) + return S_OK; + + ret = SysAllocString(str); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(res) = VT_BSTR; + V_BSTR(res) = ret; + return S_OK; +} + static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) { IInternetHostSecurityManager *secmgr = NULL; @@ -193,10 +209,51 @@ static HRESULT Global_CStr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI return E_NOTIMPL; } +static inline WCHAR hex_char(unsigned n) +{ + return n < 10 ? '0'+n : 'A'+n-10; +} + static HRESULT Global_Hex(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + WCHAR buf[17], *ptr; + DWORD n; + + TRACE("%s\n", debugstr_variant(arg)); + + switch(V_VT(arg)) { + case VT_I2: + n = (WORD)V_I2(arg); + break; + case VT_I4: + n = V_I4(arg); + break; + case VT_EMPTY: + n = 0; + break; + case VT_NULL: + if(res) + V_VT(res) = VT_NULL; + return S_OK; + default: + FIXME("unsupported type %s\n", debugstr_variant(arg)); + return E_NOTIMPL; + } + + buf[16] = 0; + ptr = buf+15; + + if(n) { + do { + *ptr-- = hex_char(n & 0xf); + n >>= 4; + }while(n); + ptr++; + }else { + *ptr = '0'; + } + + return return_bstr(res, ptr); } static HRESULT Global_Oct(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)

1 0

Jacek Caban : vbscript: Added Hex function tests.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 2b1c639feed78e6c6a9349143e70eecb96aca352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1c639feed78e6c6a9349143… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 11 14:59:45 2011 +0200 vbscript: Added Hex function tests. --- dlls/vbscript/tests/api.vbs | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3b92803..d5653ab 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -34,4 +34,20 @@ Call ok(not isObject(Null), "isObject(Null) is true?") Call ok(getVT(err) = "VT_DISPATCH", "getVT(err) = " & getVT(err)) +Sub TestHex(x, ex) + Call ok(hex(x) = ex, "hex(" & x & ") = " & hex(x) & " expected " & ex) +End Sub + +TestHex 0, "0" +TestHex 6, "6" +TestHex 16, "10" +TestHex &hdeadbeef&, "DEADBEEF" +TestHex -1, "FFFF" +TestHex -16, "FFF0" +TestHex -934859845, "C8472BBB" +TestHex empty, "0" + +Call ok(getVT(hex(null)) = "VT_NULL", "getVT(hex(null)) = " & getVT(hex(null))) +Call ok(getVT(hex(empty)) = "VT_BSTR", "getVT(hex(empty)) = " & getVT(hex(empty))) + Call reportSuccess()

1 0