wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Vitaliy Margolen : dinput: Don't mask buffer overflow error.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: d7db5d539998e3528f6435d76874a77336058075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7db5d539998e3528f6435d76… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Oct 16 12:36:48 2011 -0600 dinput: Don't mask buffer overflow error. --- dlls/dinput/device.c | 2 +- dlls/dinput/mouse.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a9c7b87..75b3cb5 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1307,7 +1307,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W ifac } *entries = len; - if (This->overflow) + if (This->overflow && This->dinput->dwVersion == 0x0800) ret = DI_BUFFEROVERFLOW; if (!(flags & DIGDD_PEEK)) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 011deb0..4b65e89 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -419,7 +419,7 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM return ret; } -static HRESULT warp_check( SysMouseImpl* This, BOOL force ) +static void warp_check( SysMouseImpl* This, BOOL force ) { DWORD now = GetCurrentTime(); const DWORD interval = This->clipped ? 500 : 10; @@ -430,7 +430,7 @@ static HRESULT warp_check( SysMouseImpl* This, BOOL force ) This->last_warped = now; This->need_warp = FALSE; - if (!GetWindowRect(This->base.win, &rect)) return DIERR_GENERIC; + if (!GetWindowRect(This->base.win, &rect)) return; This->mapped_center.x = (rect.left + rect.right) / 2; This->mapped_center.y = (rect.top + rect.bottom) / 2; if (!This->clipped) @@ -447,7 +447,6 @@ static HRESULT warp_check( SysMouseImpl* This, BOOL force ) This->clipped = GetClipCursor( &new_rect ) && EqualRect( &rect, &new_rect ); } } - return DI_OK; } @@ -569,7 +568,8 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, } LeaveCriticalSection(&This->base.crit); - return warp_check( This, FALSE ); + warp_check( This, FALSE ); + return DI_OK; } static HRESULT WINAPI SysMouseAImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) @@ -588,7 +588,7 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, HRESULT res; res = IDirectInputDevice2WImpl_GetDeviceData(iface, dodsize, dod, entries, flags); - if (SUCCEEDED(res)) res = warp_check( This, FALSE ); + if (SUCCEEDED(res)) warp_check( This, FALSE ); return res; }

1 0

Vitaliy Margolen : dinput: Add buffer overflow check.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: db6780806e939f3b31504243aedc4392fb5dad41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6780806e939f3b31504243a… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Oct 16 12:36:46 2011 -0600 dinput: Add buffer overflow check. --- dlls/dinput/tests/mouse.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index db96a15..0d6b88a 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -75,6 +75,7 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) DIPROPDWORD di_op; DIDEVICEOBJECTDATA mouse_state; DWORD cnt; + int i; if (! SetForegroundWindow(hwnd)) { @@ -90,7 +91,7 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) ok(hr == S_OK, "SetCooperativeLevel: %08x\n", hr); memset(&di_op, 0, sizeof(di_op)); - di_op.dwData = 20; + di_op.dwData = 5; di_op.diph.dwHow = DIPH_DEVICE; di_op.diph.dwSize = sizeof(DIPROPDWORD); di_op.diph.dwHeaderSize = sizeof(DIPROPHEADER); @@ -143,6 +144,17 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + /* Check for buffer owerflow */ + for (i = 0; i < 6; i++) + mouse_event(MOUSEEVENTF_MOVE, 10 + i, 10 + i, 0, 0); + + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); + ok(hr == DI_OK && cnt == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + if (pMouse) IUnknown_Release(pMouse); DestroyWindow( hwnd2 );

1 0

Vitaliy Margolen : dinput: Fix buffer size in test.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: e93998002728b58cbf1097c515fd09cc1d22cd59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e93998002728b58cbf1097c51… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Oct 16 12:36:43 2011 -0600 dinput: Fix buffer size in test. --- dlls/dinput/tests/device.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 2e4e4f8..7171bb8 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -127,7 +127,7 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); cnt = 5; - hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer), buffer, &cnt, 0); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); ok(hr == DI_OK && cnt == 5, "GetDeviceData() failed: %08x cnt: %d\n", hr, cnt); dp.dwData = 20; @@ -135,15 +135,17 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); cnt = 1; - hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer), buffer, &cnt, 0); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); /* Cannot change mode while acquired */ hr = IDirectInputDevice_Acquire(device); ok(hr == DI_OK, "Acquire() failed: %08x\n", hr); cnt = 1; - hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer), buffer, &cnt, 0); + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); + + hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); ok(hr == DIERR_ACQUIRED, "SetProperty() returned: %08x\n", hr); hr = IDirectInputDevice_Unacquire(device);

1 0

Alexandre Julliard : gdi32/tests: Add test cases for DIB blending.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 78d50cafb28ac4345daaf33e08b7252a8428e9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d50cafb28ac4345daaf33e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 14:02:43 2011 +0200 gdi32/tests: Add test cases for DIB blending. --- dlls/gdi32/tests/dib.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 151 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78d50cafb28ac4345daaf…

1 0

Alexandre Julliard : gdi32: Implement a BlendImage entry point in the DIB driver.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: a3a574fae03a069f0837cbfc1e5f6d38965ee00b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a574fae03a069f0837cbfc1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 12:30:28 2011 +0200 gdi32: Implement a BlendImage entry point in the DIB driver. --- dlls/gdi32/dibdrv/bitblt.c | 72 ++++++++++++ dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 4 + dlls/gdi32/dibdrv/primitives.c | 238 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 315 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3a574fae03a069f0837c…

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.30
by Jeremy Newman 14 Oct '11

14 Oct '11

Module: website Branch: master Commit: 2b943bcc0f2ac86b90cf3656b965f23a1e97beb7 URL: http://source.winehq.org/git/website.git/?a=commit;h=2b943bcc0f2ac86b90cf36… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Oct 14 19:03:40 2011 +0200 Polish translation for release 1.3.30 --- news/pl/2011101001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2011101001.xml b/news/pl/2011101001.xml new file mode 100644 index 0000000..4befb95 --- /dev/null +++ b/news/pl/2011101001.xml @@ -0,0 +1,17 @@ +<news> +<date>Październik 10, 2011</date> +<title>Wydano Wine 1.3.30</title> +<body> + Wydanie rozwojowe Wine 1.3.30 jest już dostępne. + <a href="{$root}/announce/1.3.30">Co nowego</a> w tym wydaniu: +<ul> + <li>DirectSound ponownie zaimplementowane w oparciu o MMDevAPI.</li> + <li>Wsparcie dla StretchBlt w silniku DIB.</li> + <li>Ulepszenia interfejsu użytkownika w pomocy HTML.</li> + <li>Pewne poprawki w MSXML.</li> + <li>Ulepszenia wydajności w cmd.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.30.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Daniel Santos : gdi32: Remove PS_USERSTYLE FIXME and workarounds.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 7a4349bb99a3c54863e03a3dcc82f4ef2de51dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a4349bb99a3c54863e03a3dc… Author: Daniel Santos <danielfsantos(a)att.net> Date: Fri Oct 14 00:32:11 2011 -0500 gdi32: Remove PS_USERSTYLE FIXME and workarounds. --- dlls/gdi32/pen.c | 10 +--------- dlls/gdi32/tests/pen.c | 6 ------ 2 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 425b5aa..1f92b87 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -115,8 +115,6 @@ HPEN WINAPI CreatePenIndirect( const LOGPEN * pen ) /*********************************************************************** * ExtCreatePen (GDI32.@) - * - * FIXME: PS_USERSTYLE not handled */ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, @@ -137,13 +135,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, return 0; } - if ((style & PS_TYPE_MASK) == PS_COSMETIC) - { - /* FIXME: PS_USERSTYLE workaround */ - FIXME("PS_COSMETIC | PS_USERSTYLE not handled\n"); - style = (style & ~PS_STYLE_MASK) | PS_SOLID; - } - else + if ((style & PS_TYPE_MASK) == PS_GEOMETRIC) { UINT i; BOOL has_neg = FALSE, all_zero = TRUE; diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index df13f6e..86250a0 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -311,12 +311,6 @@ static void test_logpen(void) break; } -if (pen[i].style == PS_USERSTYLE) -{ - todo_wine - ok(ext_pen.elp.elpPenStyle == pen[i].style, "expected %x, got %x\n", pen[i].style, ext_pen.elp.elpPenStyle); -} -else ok(ext_pen.elp.elpPenStyle == pen[i].style, "expected %x, got %x\n", pen[i].style, ext_pen.elp.elpPenStyle); ok(ext_pen.elp.elpWidth == 1, "expected 1, got %x\n", ext_pen.elp.elpWidth); ok(ext_pen.elp.elpColor == pen[i].ret_color, "expected %08x, got %08x\n", pen[i].ret_color, ext_pen.elp.elpColor);

1 0

Daniel Santos : winex11.drv: Add on-screen PS_USERSTYLE support to pens.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: f2ad9df45d1ca32ac38ea25f860c28bbf88b65b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ad9df45d1ca32ac38ea25f8… Author: Daniel Santos <danielfsantos(a)att.net> Date: Fri Oct 14 00:32:05 2011 -0500 winex11.drv: Add on-screen PS_USERSTYLE support to pens. --- dlls/winex11.drv/pen.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/pen.c b/dlls/winex11.drv/pen.c index 45a1f6f..b677515 100644 --- a/dlls/winex11.drv/pen.c +++ b/dlls/winex11.drv/pen.c @@ -42,11 +42,11 @@ HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); LOGPEN logpen; int i; + EXTLOGPEN *elp = NULL; if (!GetObjectW( hpen, sizeof(logpen), &logpen )) { /* must be an extended pen */ - EXTLOGPEN *elp; INT size = GetObjectW( hpen, 0, NULL ); if (!size) return 0; @@ -55,13 +55,10 @@ HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) elp = HeapAlloc( GetProcessHeap(), 0, size ); GetObjectW( hpen, size, elp ); - /* FIXME: add support for user style pens */ logpen.lopnStyle = elp->elpPenStyle; logpen.lopnWidth.x = elp->elpWidth; logpen.lopnWidth.y = 0; logpen.lopnColor = elp->elpColor; - - HeapFree( GetProcessHeap(), 0, elp ); } else physDev->pen.ext = 0; @@ -109,8 +106,10 @@ HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) memcpy(physDev->pen.dashes, PEN_alternate, physDev->pen.dash_len); break; case PS_USERSTYLE: - FIXME("PS_USERSTYLE is not supported\n"); - /* fall through */ + physDev->pen.dash_len = min(elp->elpNumEntries, MAX_DASHLEN); + for(i = 0; i < physDev->pen.dash_len ; i++) + physDev->pen.dashes[i] = min(elp->elpStyleEntry[i], 255); + break; default: physDev->pen.dash_len = 0; break; @@ -120,6 +119,8 @@ HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) for(i = 0; i < physDev->pen.dash_len; i++) physDev->pen.dashes[i] *= (physDev->pen.width ? physDev->pen.width : 1); + HeapFree( GetProcessHeap(), 0, elp ); + return hpen; }

1 0

Uwe Bonnes : ntdll: Generate a single EV_TXEMPTY when the TX buffer turns empty.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 89c2a4c5961e6534ecd017d74fa007aec10e34e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c2a4c5961e6534ecd017d74… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Thu Oct 13 11:30:37 2011 +0200 ntdll: Generate a single EV_TXEMPTY when the TX buffer turns empty. --- dlls/ntdll/serial.c | 54 +++++++++++++++++++++++++++++++------------------- 1 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 1ca2cfa..231466c 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -785,6 +785,7 @@ static NTSTATUS set_XOn(int fd) typedef struct serial_irq_info { int rx , tx, frame, overrun, parity, brk, buf_overrun; + DWORD temt; }serial_irq_info; /*********************************************************************** @@ -806,7 +807,6 @@ typedef struct async_commio */ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) { - NTSTATUS status = STATUS_NOT_IMPLEMENTED; #ifdef TIOCGICOUNT struct serial_icounter_struct einfo; if (!ioctl(fd, TIOCGICOUNT, &einfo)) @@ -818,13 +818,38 @@ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) irq_info->parity = einfo.parity; irq_info->brk = einfo.brk; irq_info->buf_overrun = einfo.buf_overrun; - return STATUS_SUCCESS; } - TRACE("TIOCGICOUNT err %s\n", strerror(errno)); - status = FILE_GetNtStatus(); -#endif + else + { + TRACE("TIOCGICOUNT err %s\n", strerror(errno)); + memset(irq_info,0, sizeof(serial_irq_info)); + return FILE_GetNtStatus(); + } +#else memset(irq_info,0, sizeof(serial_irq_info)); - return status; + return STATUS_NOT_IMPLEMENTED; +#endif + irq_info->temt = 0; + /* Generate a single TX_TXEMPTY event when the TX Buffer turns empty*/ +#ifdef TIOCSERGETLSR /* prefer to log the state TIOCSERGETLSR */ + if (ioctl(fd, TIOCSERGETLSR, &irq_info->temt)) + { + TRACE("TIOCSERGETLSR err %s\n", strerror(errno)); + return FILE_GetNtStatus(); + } +#elif defined(TIOCOUTQ) /* otherwise we log when the out queue gets empty */ + if (ioctl(fd, TIOCOUTQ, &irq_info->temt)) + { + TRACE("TIOCOUTQ err %s\n", strerror(errno)); + return FILE_GetNtStatus(); + } + else + { + if (irq_info->temt == 0) + irq_info->temt = 1; + } +#endif + return STATUS_SUCCESS; } @@ -862,21 +887,8 @@ static DWORD check_events(int fd, DWORD mask, } if (mask & EV_TXEMPTY) { - queue = 0; -/* We really want to know when all characters have gone out of the transmitter */ -#if defined(TIOCSERGETLSR) - if (ioctl(fd, TIOCSERGETLSR, &queue)) - WARN("TIOCSERGETLSR returned error\n"); - if (queue) -/* TIOCOUTQ only checks for an empty buffer */ -#elif defined(TIOCOUTQ) - if (ioctl(fd, TIOCOUTQ, &queue)) - WARN("TIOCOUTQ returned error\n"); - if (!queue) -#endif - ret |= EV_TXEMPTY; - TRACE("OUTQUEUE %d, Transmitter %sempty\n", - queue, (ret & EV_TXEMPTY) ? "" : "not "); + if (!old->temt && new->temt) + ret |= EV_TXEMPTY; } return ret & mask; }

1 0

Dan Kegel : shlwapi/tests: Initialize size parameter in test_SHGetShellKey.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 876d551911f77e6f8bb85cc2d548ac42af86d77c URL: http://source.winehq.org/git/wine.git/?a=commit;h=876d551911f77e6f8bb85cc2d… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Oct 14 08:23:08 2011 -0700 shlwapi/tests: Initialize size parameter in test_SHGetShellKey. --- dlls/shlwapi/tests/ordinal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 593307e..40ee62e 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2873,6 +2873,7 @@ static void test_SHGetShellKey(void) return; } + size = sizeof(data); hres = pSKGetValueW(SHKEY_Root_HKLM, WineTestW, NULL, NULL, &data, &size); ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "hres = %x\n", hres);

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
79
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 October 2011