May 2013 - Wine-commits - list.winehq.org

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_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

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

Andrew Eikum : oleaut32: Always initialize PARAMDESCEX's cBytes field.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: c74a9eac9317f5838e847a2439f4e8a575e6b613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74a9eac9317f5838e847a243… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 16 09:30:35 2013 -0500 oleaut32: Always initialize PARAMDESCEX's cBytes field. --- dlls/oleaut32/typelib.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index bb9eaf4..6a2a594 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5291,6 +5291,7 @@ static HRESULT TLB_CopyElemDesc( const ELEMDESC *src, ELEMDESC *dest, char **buf PARAMDESCEX *pparamdescex_dest = dest->u.paramdesc.pparamdescex = (PARAMDESCEX *)*buffer; *buffer += sizeof(PARAMDESCEX); *pparamdescex_dest = *pparamdescex_src; + pparamdescex_dest->cBytes = sizeof(PARAMDESCEX); VariantInit(&pparamdescex_dest->varDefaultValue); return VariantCopy(&pparamdescex_dest->varDefaultValue, (VARIANTARG *)&pparamdescex_src->varDefaultValue);

1 0

Alexandre Julliard : secur32: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: b7cdc0afde7bd592e6a6744e8728e6ca2f152331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7cdc0afde7bd592e6a6744e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:26:18 2013 +0200 secur32: Don't bother to free memory at process exit. --- dlls/secur32/secur32.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index c656dee..acb09cf 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1177,15 +1177,16 @@ BOOLEAN WINAPI TranslateNameW( /*********************************************************************** * DllMain (SECUR32.0) */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) { - if (fdwReason == DLL_PROCESS_ATTACH) + switch (reason) { + case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); SECUR32_initializeProviders(); - } - else if (fdwReason == DLL_PROCESS_DETACH) - { + break; + case DLL_PROCESS_DETACH: + if (reserved) break; SECUR32_freeProviders(); }

1 0

Alexandre Julliard : shell32: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: d92a9264f3e788980aedb7f34d39761b2529f265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92a9264f3e788980aedb7f34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:27:25 2013 +0200 shell32: Don't bother to free memory at process exit. --- dlls/shell32/shell32_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 1507d4a..4c124bd 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1279,7 +1279,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) break; case DLL_PROCESS_DETACH: - shell32_hInstance = 0; + if (fImpLoad) break; SIC_Destroy(); FreeChangeNotifications(); break;

1 0

Alexandre Julliard : spoolss: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: aca523b72009f2eaae43e91900b57e7b02821247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca523b72009f2eaae43e9190… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:28:00 2013 +0200 spoolss: Don't bother to free memory at process exit. --- dlls/spoolss/spoolss_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 9f248f0..61c565d 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -55,6 +55,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; backend_unload_all(); break; }

1 0

Alexandre Julliard : urlmon: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 152ae158ce8a8c513a5566fe890c7351eedad48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=152ae158ce8a8c513a5566fe8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:29:17 2013 +0200 urlmon: Don't bother to free memory at process exit. --- dlls/urlmon/urlmon_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index a9c5a6d..603462b 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -157,6 +157,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; process_detach(); DeleteCriticalSection(&tls_cs); break;

1 0

Alexandre Julliard : vbscript: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 6ac9aa0a523bb81b0dc928d68eec7bc407829340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac9aa0a523bb81b0dc928d68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:30:04 2013 +0200 vbscript: Don't bother to free memory at process exit. --- dlls/vbscript/vbscript_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 1a4c597..a79a1a0 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -332,6 +332,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) vbscript_hinstance = hInstDLL; break; case DLL_PROCESS_DETACH: + if (lpv) break; release_typelib(); release_regexp_typelib(); }

1 0

Alexandre Julliard : wineoss.drv: Don' t bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 8d8d55e1b0f0dbc21f29171273a58c258c97af61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8d55e1b0f0dbc21f2917127… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:30:36 2013 +0200 wineoss.drv: Don't bother to free memory at process exit. --- dlls/wineoss.drv/mmdevdrv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 2c81404..0db7bb7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -243,6 +243,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) break; case DLL_PROCESS_DETACH: + if (!reserved) { OSSDevice *iter, *iter2; @@ -251,9 +252,8 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &g_devices, OSSDevice, entry){ HeapFree(GetProcessHeap(), 0, iter); } - - break; } + break; } return TRUE; }

1 0