wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Andrew Eikum : dsound: Don't overrun capture buffer.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 508b0c9c44349a5d980e0f1ee0ba4fca871bd2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=508b0c9c44349a5d980e0f1ee… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 16 09:24:31 2013 -0500 dsound: Don't overrun capture buffer. --- dlls/dsound/capture.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 1b004e6..01cf775 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -855,7 +855,7 @@ static void CALLBACK DSOUND_capture_timer(UINT timerID, UINT msg, DWORD_PTR user DWORD_PTR dw1, DWORD_PTR dw2) { DirectSoundCaptureDevice *device = (DirectSoundCaptureDevice*)user; - UINT32 packet_frames, packet_bytes, avail_bytes; + UINT32 packet_frames, packet_bytes, avail_bytes, skip_bytes = 0; DWORD flags; BYTE *buf; HRESULT hr; @@ -888,18 +888,23 @@ static void CALLBACK DSOUND_capture_timer(UINT timerID, UINT msg, DWORD_PTR user } packet_bytes = packet_frames * device->pwfx->nBlockAlign; + if(packet_bytes > device->buflen){ + TRACE("audio glitch: dsound buffer too small for data\n"); + skip_bytes = packet_bytes - device->buflen; + packet_bytes = device->buflen; + } avail_bytes = device->buflen - device->write_pos_bytes; if(avail_bytes > packet_bytes) avail_bytes = packet_bytes; - memcpy(device->buffer + device->write_pos_bytes, buf, avail_bytes); + memcpy(device->buffer + device->write_pos_bytes, buf + skip_bytes, avail_bytes); capture_CheckNotify(device->capture_buffer, device->write_pos_bytes, avail_bytes); packet_bytes -= avail_bytes; if(packet_bytes > 0){ if(device->capture_buffer->flags & DSCBSTART_LOOPING){ - memcpy(device->buffer, buf + avail_bytes, packet_bytes); + memcpy(device->buffer, buf + skip_bytes + avail_bytes, packet_bytes); capture_CheckNotify(device->capture_buffer, 0, packet_bytes); }else{ device->state = STATE_STOPPED;

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_DBDATE-> DBTYPE_VARIANT.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 1527eeb720ef0d42a62a7ccb93b088f2d05c70a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1527eeb720ef0d42a62a7ccb9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 16 15:12:51 2013 +1000 oledb32: Implement DataConvert DBTYPE_DBDATE->DBTYPE_VARIANT. --- dlls/oledb32/convert.c | 17 +++++++++++++++++ dlls/oledb32/tests/convert.c | 9 +++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 78f6c46..19f46f6 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -797,6 +797,23 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, V_DATE(v) = *(DATE*)src; hr = S_OK; break; + case DBTYPE_DBDATE: + { + SYSTEMTIME st; + DBDATE *ts=(DBDATE*)src; + + V_VT(v) = VT_DATE; + + st.wYear = ts->year; + st.wMonth = ts->month; + st.wDay = ts->day; + st.wHour = 0; + st.wMinute = 0; + st.wSecond = 0; + st.wMilliseconds = 0; + hr = (SystemTimeToVariantTime(&st, &V_DATE(v)) ? S_OK : E_FAIL); + break; + } case DBTYPE_DBTIMESTAMP: { SYSTEMTIME st; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 37882b6..90e1658 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2470,6 +2470,7 @@ static void test_converttovar(void) static WCHAR strW[] = {'t','e','s','t',0}; BYTE byte_src[5] = {1, 2, 3, 4, 5}; DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; + DBDATE dbdate = {2013, 5, 15}; double dvalue = 123.56; DBSTATUS dst_status; DBLENGTH dst_len; @@ -2584,6 +2585,14 @@ static void test_converttovar(void) ok(dst_len == sizeof(dst), "got %ld\n", dst_len); ok(V_VT(&dst) == VT_DATE, "got %d\n", V_VT(&dst)); ok( (float)V_DATE(&dst) == 41408.086250f, "got %f\n", V_DATE(&dst)); + + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_DBDATE, DBTYPE_VARIANT, 0, &dst_len, &dbdate, &dst, sizeof(dbdate), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_DATE, "got %d\n", V_VT(&dst)); + ok( (float)V_DATE(&dst) == 41409.0, "got %f\n", V_DATE(&dst)); } START_TEST(convert)

1 0

Alexandre Julliard : configure: Add a pkg-config check for libpng.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: b9921eb3701912b965d1d39b09083c034afced26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9921eb3701912b965d1d39b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 16:47:16 2013 +0200 configure: Add a pkg-config check for libpng. --- aclocal.m4 | 4 +- configure | 171 ++++++++-------------------------------- configure.ac | 46 +++++------ dlls/windowscodecs/Makefile.in | 2 +- 4 files changed, 55 insertions(+), 168 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9921eb3701912b965d1d…

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_DBDATE-> DBTYPE_DBDATE.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 0a5af7162d5d560b1270dcf43e9768595cbb8603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5af7162d5d560b1270dcf43… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 16 13:58:41 2013 +1000 oledb32: Implement DataConvert DBTYPE_DBDATE->DBTYPE_DBDATE. --- dlls/oledb32/convert.c | 12 ++++++++++++ dlls/oledb32/tests/convert.c | 19 +++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 54e17b7..78f6c46 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -131,6 +131,8 @@ static int get_length(DBTYPE type) case DBTYPE_R8: case DBTYPE_DATE: return 8; + case DBTYPE_DBDATE: + return sizeof(DBDATE); case DBTYPE_DBTIMESTAMP: return sizeof(DBTIMESTAMP); case DBTYPE_CY: @@ -413,6 +415,16 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; } + case DBTYPE_DBDATE: + { + DBDATE *d=dst; + switch (src_type) + { + case DBTYPE_DBDATE: memcpy(d, src, sizeof(DBDATE)); hr = S_OK; break; + default: FIXME("Unimplemented conversion %04x -> DBDATE\n", src_type); return E_NOTIMPL; + } + break; + } case DBTYPE_DBTIMESTAMP: { DBTIMESTAMP *d=dst; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 56c9f9b..37882b6 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2447,6 +2447,24 @@ static void test_converttobytes(void) ok(!memcmp(byte_src, dst, 2 ), "bytes differ\n"); } +static void test_converttodbdate(void) +{ + DBLENGTH dst_len; + HRESULT hr; + DBDATE ts = {2013, 5, 14}; + DBDATE dst; + DBSTATUS dst_status; + + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_DBDATE, DBTYPE_DBDATE, sizeof(ts), &dst_len, &ts, &dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n"); + +} + + static void test_converttovar(void) { static WCHAR strW[] = {'t','e','s','t',0}; @@ -2601,6 +2619,7 @@ START_TEST(convert) test_converttoui8(); test_converttovar(); test_converttobytes(); + test_converttodbdate(); test_getconversionsize(); IDataConvert_Release(convert);

1 0

Alistair Leslie-Hughes : include: Add oledb types DBDATE, DBTIME and move DBTIMESTAMP to the correct idl.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: cc2ac078295bff09aac2bf9a3e82340fc1bac646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc2ac078295bff09aac2bf9a3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 16 14:58:10 2013 +1000 include: Add oledb types DBDATE, DBTIME and move DBTIMESTAMP to the correct idl. --- include/dbs.idl | 22 ++++++++++++++++++++++ include/oledb.idl | 9 --------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index d25b227..46d55ad 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -515,3 +515,25 @@ typedef struct tagRMTPACK ULONG cArray; [size_is(cArray)] VARIANT *rgArray; } RMTPACK; + +typedef struct tagDBDATE { + SHORT year; + USHORT month; + USHORT day; +} DBDATE; + +typedef struct tagDBTIME { + USHORT hour; + USHORT minute; + USHORT second; +} DBTIME; + +typedef struct tagDBTIMESTAMP { + SHORT year; + USHORT month; + USHORT day; + USHORT hour; + USHORT minute; + USHORT second; + ULONG fraction; +} DBTIMESTAMP; diff --git a/include/oledb.idl b/include/oledb.idl index 57b404d..eaa49a6 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -42,15 +42,6 @@ typedef ULONG_PTR DBREFCOUNT; typedef ULONG_PTR DB_UPARAMS; typedef LONG_PTR DB_LPARAMS; typedef DWORD_PTR DBHASHVALUE; -typedef struct { - SHORT year; - USHORT month; - USHORT day; - USHORT hour; - USHORT minute; - USHORT second; - ULONG fraction; -} DBTIMESTAMP; #include "dbs.idl"

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_DBTIMESTAMP- >DBTYPE_VARIANT.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: e08a1d5bc1438dfb21988e1a850667e5fe259ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e08a1d5bc1438dfb21988e1a8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 14 14:48:04 2013 +1000 oledb32: Implement DataConvert DBTYPE_DBTIMESTAMP->DBTYPE_VARIANT. --- dlls/oledb32/convert.c | 17 +++++++++++++++++ dlls/oledb32/tests/convert.c | 9 +++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 904f3cc..54e17b7 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -785,6 +785,23 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, V_DATE(v) = *(DATE*)src; hr = S_OK; break; + case DBTYPE_DBTIMESTAMP: + { + SYSTEMTIME st; + DBTIMESTAMP *ts = (DBTIMESTAMP *)src; + + V_VT(v) = VT_DATE; + + st.wYear = ts->year; + st.wMonth = ts->month; + st.wDay = ts->day; + st.wHour = ts->hour; + st.wMinute = ts->minute; + st.wSecond = ts->second; + st.wMilliseconds = ts->fraction/1000000; + hr = SystemTimeToVariantTime(&st, &V_DATE(v)) ? S_OK : E_FAIL; + break; + } case DBTYPE_CY: V_VT(v) = VT_CY; V_CY(v) = *(CY*)src; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index dfd0df1..56c9f9b 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2451,6 +2451,7 @@ static void test_converttovar(void) { static WCHAR strW[] = {'t','e','s','t',0}; BYTE byte_src[5] = {1, 2, 3, 4, 5}; + DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; double dvalue = 123.56; DBSTATUS dst_status; DBLENGTH dst_len; @@ -2557,6 +2558,14 @@ static void test_converttovar(void) ok(dst_len == sizeof(dst), "got %ld\n", dst_len); ok(V_VT(&dst) == (VT_ARRAY|VT_UI1), "got %d\n", V_VT(&dst)); VariantClear(&dst); + + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_DBTIMESTAMP, DBTYPE_VARIANT, 0, &dst_len, &ts, &dst, sizeof(ts), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_DATE, "got %d\n", V_VT(&dst)); + ok( (float)V_DATE(&dst) == 41408.086250f, "got %f\n", V_DATE(&dst)); } START_TEST(convert)

1 0

Hans Leidekker : wbemprox: Add support for asynchronous queries.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 46cbc36041278dc19c9ea14223325987e629c4c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46cbc36041278dc19c9ea1422… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 16 12:04:03 2013 +0200 wbemprox: Add support for asynchronous queries. --- dlls/wbemprox/services.c | 216 +++++++++++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 36 +++++++- include/wbemcli.idl | 7 ++ 3 files changed, 248 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46cbc36041278dc19c9ea…

1 0

Alexandre Julliard : wnaspi32: Don' t bother to delete critical sections at process exit.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 633c3cb08639bb2e8bf6945d98d0d8fa037df024 URL: http://source.winehq.org/git/wine.git/?a=commit;h=633c3cb08639bb2e8bf6945d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:55:22 2013 +0200 wnaspi32: Don't bother to delete critical sections at process exit. --- dlls/wnaspi32/winaspi32.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 342fb82..68bda01 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -76,6 +76,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) SCSI_Init(); break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; DeleteCriticalSection( &ASPI_CritSection ); break; }

1 0

Alexandre Julliard : winspool: Don' t bother to delete critical sections at process exit.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 03041b93baa39c4625e3bcd1dd3c6e4cd6fbf996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03041b93baa39c4625e3bcd1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:55:05 2013 +0200 winspool: Don't bother to delete critical sections at process exit. --- dlls/winspool.drv/wspool.c | 18 +++--------------- 1 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c index 1f25129..bbfb0fb 100644 --- a/dlls/winspool.drv/wspool.c +++ b/dlls/winspool.drv/wspool.c @@ -105,20 +105,6 @@ BOOL load_backend(void) } /****************************************************************************** - * unload_backend [internal] - * - */ -static void unload_backend(void) -{ - EnterCriticalSection(&backend_cs); - backend = NULL; - FreeLibrary(hlocalspl); - LeaveCriticalSection(&backend_cs); - DeleteCriticalSection(&backend_cs); -} - - -/****************************************************************************** * DllMain * * Winspool entry point. @@ -135,7 +121,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD reason, LPVOID lpReserved) break; } case DLL_PROCESS_DETACH: - unload_backend(); + if (lpReserved) break; + DeleteCriticalSection(&backend_cs); + FreeLibrary(hlocalspl); break; }

1 0

Alexandre Julliard : winecoreaudio.drv: Don' t bother to delete critical sections at process exit.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: d47d03d26aedd658e6572f285599837e97a3f30f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d47d03d26aedd658e6572f285… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:54:41 2013 +0200 winecoreaudio.drv: Don't bother to delete critical sections at process exit. --- dlls/winecoreaudio.drv/mmdevdrv.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index ee965e7..7264147 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -263,6 +263,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) break; case DLL_PROCESS_DETACH: + if (reserved) break; DeleteCriticalSection(&g_sessions_lock); break; }

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
50
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 May 2013