April 2013 - Wine-Commits - list.winehq.org

Nikolay Sivov : oledb32: Implement GetConversionSize for DBTYPE_VARIANT -> DBTYPE_STR case.
by Alexandre Julliard April 8, 2013

April 8, 2013

Module: wine Branch: master Commit: 960852f44780742b9bc1099a4b13222ef076cd8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=960852f44780742b9bc1099a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 6 15:52:31 2013 +0400 oledb32: Implement GetConversionSize for DBTYPE_VARIANT -> DBTYPE_STR case. --- dlls/oledb32/convert.c | 54 ++++++++++++++++++++++++++++++++++++++---- dlls/oledb32/tests/convert.c | 30 +++++++++++++++++++++++ 2 files changed, 79 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f56601b..f2c46b0 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -996,14 +996,58 @@ static HRESULT WINAPI convert_CanConvert(IDataConvert* iface, } static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, - DBTYPE wSrcType, DBTYPE wDstType, - DBLENGTH *pcbSrcLength, DBLENGTH *pcbDstLength, - void *pSrc) + DBTYPE src_type, DBTYPE dst_type, + DBLENGTH *src_len, DBLENGTH *dst_len, + void *src) { convert *This = impl_from_IDataConvert(iface); - FIXME("(%p)->(%d, %d, %p, %p, %p): stub\n", This, wSrcType, wDstType, pcbSrcLength, pcbDstLength, pSrc); + HRESULT hr; + + TRACE("(%p)->(%d, %d, %p, %p, %p)\n", This, src_type, dst_type, src_len, dst_len, src); + + hr = IDataConvert_CanConvert(iface, src_type, dst_type); + if (hr != S_OK) + return DB_E_UNSUPPORTEDCONVERSION; + + if (!dst_len) + return E_INVALIDARG; + + /* for some types we don't need to look into source data */ + if ((*dst_len = get_length(dst_type))) + return S_OK; + + switch (dst_type) + { + case DBTYPE_STR: + { + switch (src_type) + { + case DBTYPE_VARIANT: + { + VARIANT v; - return E_NOTIMPL; + VariantInit(&v); + if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK) + { + *dst_len = WideCharToMultiByte(CP_ACP, 0, V_BSTR(&v), -1, NULL, 0, NULL, NULL); + VariantClear(&v); + } + else + return hr; + } + break; + default: + FIXME("unimplemented for %04x -> DBTYPE_STR\n", src_type); + return E_NOTIMPL; + } + } + break; + default: + FIXME("unimplemented for destination type %d\n", dst_type); + return E_NOTIMPL; + } + + return S_OK; } static const struct IDataConvertVtbl convert_vtbl = diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index dd80fe4..400ea3d 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2435,6 +2435,35 @@ todo_wine IDataConvert_Release(convert); } +static void test_getconversionsize(void) +{ + IDataConvert *convert; + DBLENGTH dst_len; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + /* same way as CanConvert fails here */ + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_NULL, DBTYPE_BSTR, NULL, &dst_len, NULL); + ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got 0x%08x\n", hr); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_I2, DBTYPE_I4, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 4, "got %ld\n", dst_len); + + hr = IDataConvert_GetConversionSize(convert, DBTYPE_I2, DBTYPE_I4, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + IDataConvert_Release(convert); +} + START_TEST(convert) { OleInitialize(NULL); @@ -2453,5 +2482,6 @@ START_TEST(convert) test_converttofiletime(); test_converttocy(); test_converttoui8(); + test_getconversionsize(); OleUninitialize(); }

1 0

Nikolay Sivov : gameux: Fix release/free of uninitialized pointers ( Coverity).
by Alexandre Julliard April 8, 2013

April 8, 2013

Module: wine Branch: master Commit: 0bbd6cb0506bbd820dd9486e24518f81ed02c883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bbd6cb0506bbd820dd9486e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 2 21:47:32 2013 +0400 gameux: Fix release/free of uninitialized pointers (Coverity). --- dlls/gameux/gameexplorer.c | 4 +++- dlls/gameux/gamestatistics.c | 15 ++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 8f30601..8400c9e 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -681,7 +681,7 @@ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) { HRESULT hr; GAME_INSTALL_SCOPE installScope; LPWSTR lpRegistryPath; - LPWSTR lpGDFBinaryPath, lpGameInstallDirectory; + LPWSTR lpGDFBinaryPath; TRACE("(%s)\n", debugstr_guid(InstanceID)); @@ -702,6 +702,8 @@ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) { if(SUCCEEDED(hr)) { + WCHAR *lpGameInstallDirectory = NULL; + /* game found, it's registry path is in lpRegistryPath and install * scope in installScope */ TRACE("game found in registry (path %s), updating\n", debugstr_w(lpRegistryPath)); diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 619c616..54115f1 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -112,7 +112,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) HRESULT hr = S_OK; IXMLDOMDocument *document; - IXMLDOMElement *root, *categoryElement, *statisticsElement; + IXMLDOMElement *root, *statisticsElement; IXMLDOMNode *categoryNode, *statisticsNode; VARIANT vStatsFilePath, vValue; BSTR bstrStatistics = NULL, bstrCategory = NULL, bstrIndex = NULL, @@ -178,6 +178,8 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) for(i=0; i<MAX_CATEGORIES; ++i) { + IXMLDOMElement *categoryElement = NULL; + if(lstrlenW(stats->categories[i].sName)==0) continue; @@ -187,7 +189,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) hr = IXMLDOMDocument_createNode(document, vValue, bstrCategory, NULL, &categoryNode); if(SUCCEEDED(hr)) - hr = IXMLDOMNode_QueryInterface(categoryNode, &IID_IXMLDOMElement, (LPVOID*)&categoryElement); + hr = IXMLDOMNode_QueryInterface(categoryNode, &IID_IXMLDOMElement, (void**)&categoryElement); V_INT(&vValue) = i; if(SUCCEEDED(hr)) @@ -207,6 +209,9 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) hr = IXMLDOMElement_setAttribute(categoryElement, bstrName, vValue); } + if (categoryElement) + IXMLDOMElement_Release(categoryElement); + SysFreeString(V_BSTR(&vValue)); if(SUCCEEDED(hr)) @@ -269,7 +274,6 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMElement_appendChild(root, categoryNode, &categoryNode); - IXMLDOMElement_Release(categoryElement); IXMLDOMNode_Release(categoryNode); if(FAILED(hr)) @@ -939,16 +943,13 @@ static HRESULT WINAPI GameStatisticsImpl_Save( BOOL trackChanges) { GameStatisticsImpl *This = impl_from_IGameStatistics(iface); - HRESULT hr = S_OK; TRACE("(%p, %d)\n", This, trackChanges); if(trackChanges) FIXME("tracking changes not yet implemented\n"); - hr = GAMEUX_updateStatisticsFile(&This->stats); - - return hr; + return GAMEUX_updateStatisticsFile(&This->stats); } static HRESULT WINAPI GameStatisticsImpl_SetLastPlayedCategory(

1 0

Piotr Caban : tapi32: Add more Unicode functions stubs.
by Alexandre Julliard April 5, 2013

April 5, 2013

Module: wine Branch: master Commit: e2b88dcc146b238d90f2edb9e92827899d039370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2b88dcc146b238d90f2edb9e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 5 16:53:43 2013 +0200 tapi32: Add more Unicode functions stubs. --- dlls/tapi32/line.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/tapi32/tapi32.spec | 5 ++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 756adf6..264e07b 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -134,6 +134,15 @@ DWORD WINAPI lineConfigDialogA(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDevi } /*********************************************************************** + * lineConfigDialogW (TAPI32.@) + */ +DWORD WINAPI lineConfigDialogW(DWORD dwDeviceID, HWND hwndOwner, LPCWSTR lpszDeviceClass) +{ + FIXME("(%08x, %p, %s): stub.\n", dwDeviceID, hwndOwner, debugstr_w(lpszDeviceClass)); + return 0; +} + +/*********************************************************************** * lineConfigDialogEdit (TAPI32.@) */ DWORD WINAPI lineConfigDialogEditA(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDeviceClass, LPVOID const lpDeviceConfigIn, DWORD dwSize, LPVARSTRING lpDeviceConfigOut) @@ -188,6 +197,15 @@ DWORD WINAPI lineDialA(HCALL hCall, LPCSTR lpszDestAddress, DWORD dwCountryCode) } /*********************************************************************** + * lineDialW (TAPI32.@) + */ +DWORD WINAPI lineDialW(HCALL hCall, LPCWSTR lpszDestAddress, DWORD dwCountryCode) +{ + FIXME("(%p, %s, %08x): stub.\n", hCall, debugstr_w(lpszDestAddress), dwCountryCode); + return 1; +} + +/*********************************************************************** * lineDrop (TAPI32.@) */ DWORD WINAPI lineDrop(HCALL hCall, LPCSTR lpsUserUserInfo, DWORD dwSize) @@ -466,6 +484,14 @@ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTR } /*********************************************************************** + * lineGetCountry (TAPI32.@) + */ +DWORD WINAPI lineGetCountryW(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTRYLIST lpLineCountryList) +{ + return lineGetCountryA(dwCountryID, dwAPIVersion, lpLineCountryList); +} + +/*********************************************************************** * lineGetDevCapsW (TAPI32.@) */ DWORD WINAPI lineGetDevCapsW(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, @@ -1390,6 +1416,18 @@ DWORD WINAPI lineTranslateAddressA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dw } /*********************************************************************** + * lineTranslateAddressW (TAPI32.@) + */ +DWORD WINAPI lineTranslateAddressW(HLINEAPP hLineApp, DWORD dwDeviceID, + DWORD dwAPIVersion, LPCWSTR lpszAddressIn, DWORD dwCard, + DWORD dwTranslateOptions, LPLINETRANSLATEOUTPUT lpTranslateOutput) +{ + FIXME("(%p, %08x, %08x, %s, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + debugstr_w(lpszAddressIn), dwCard, dwTranslateOptions, lpTranslateOutput); + return 0; +} + +/*********************************************************************** * lineTranslateDialog (TAPI32.@) */ DWORD WINAPI lineTranslateDialogA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, HWND hwndOwner, LPCSTR lpszAddressIn) @@ -1399,6 +1437,17 @@ DWORD WINAPI lineTranslateDialogA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwA } /*********************************************************************** + * lineTranslateDialogW (TAPI32.@) + */ +DWORD WINAPI lineTranslateDialogW(HLINEAPP hLineApp, DWORD dwDeviceID, + DWORD dwAPIVersion, HWND hwndOwner, LPCWSTR lpszAddressIn) +{ + FIXME("(%p, %08x, %08x, %p, %s): stub.\n", hLineApp, dwDeviceID, + dwAPIVersion, hwndOwner, debugstr_w(lpszAddressIn)); + return 0; +} + +/*********************************************************************** * lineUncompleteCall (TAPI32.@) */ DWORD WINAPI lineUncompleteCall(HLINE hLine, DWORD dwCompletionID) diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 6d20bf3..d4f2ae7 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -11,6 +11,7 @@ @ stdcall lineCompleteTransfer(long long ptr long) @ stdcall lineConfigDialog(long long str) lineConfigDialogA @ stdcall lineConfigDialogA(long long str) +@ stdcall lineConfigDialogW(long long wstr) @ stdcall lineConfigDialogEdit(long long str ptr long ptr) lineConfigDialogEditA @ stdcall lineConfigDialogEditA(long long str ptr long ptr) @ stdcall lineConfigProvider(long long) @@ -19,6 +20,7 @@ @ stdcall lineDevSpecificFeature(long long ptr long) @ stdcall lineDial(long str long) lineDialA @ stdcall lineDialA(long str long) +@ stdcall lineDialW(long wstr long) @ stdcall lineDrop(long str long) @ stdcall lineForward(long long long ptr long ptr ptr) lineForwardA @ stdcall lineForwardA(long long long ptr long ptr ptr) @@ -41,6 +43,7 @@ @ stdcall lineGetConfRelatedCalls(long ptr) @ stdcall lineGetCountry(long long ptr) lineGetCountryA @ stdcall lineGetCountryA(long long ptr) +@ stdcall lineGetCountryW(long long ptr) @ stdcall lineGetDevCaps(long long long long ptr) lineGetDevCapsA @ stdcall lineGetDevCapsA(long long long long ptr) @ stdcall lineGetDevCapsW(long long long long ptr) @@ -117,8 +120,10 @@ @ stdcall lineSwapHold(long long) @ stdcall lineTranslateAddress(long long long str long long ptr) lineTranslateAddressA @ stdcall lineTranslateAddressA(long long long str long long ptr) +@ stdcall lineTranslateAddressW(long long long wstr long long ptr) @ stdcall lineTranslateDialog(long long long long str) lineTranslateDialogA @ stdcall lineTranslateDialogA(long long long long str) +@ stdcall lineTranslateDialogW(long long long long wstr) @ stdcall lineUncompleteCall(long long) @ stdcall lineUnhold(long) @ stdcall lineUnpark(long long ptr str) lineUnparkA

1 0

Piotr Caban : msvcrt: Fixed debug message in strncpy_s.
by Alexandre Julliard April 5, 2013

April 5, 2013

Module: wine Branch: master Commit: 4716cd37eee8f7e9f5deb65db785005956920b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4716cd37eee8f7e9f5deb65db… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 5 15:18:18 2013 +0200 msvcrt: Fixed debug message in strncpy_s. --- dlls/msvcrt/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index e8c3765..bd914a7 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -596,7 +596,7 @@ int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements, { MSVCRT_size_t i, end; - TRACE("(%s %lu %s %lu)\n", dest, numberOfElements, src, count); + TRACE("(%p %lu %s %lu)\n", dest, numberOfElements, debugstr_a(src), count); if(!count) { if(dest && numberOfElements)

1 0

Huw Davies : wineps: Add a helper to return the rgb to grayscale scaling factors.
by Alexandre Julliard April 5, 2013

April 5, 2013

Module: wine Branch: master Commit: 30162ab39d1dd599b65cd1024e3a2c3c71da16ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=30162ab39d1dd599b65cd1024… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 5 11:59:06 2013 +0100 wineps: Add a helper to return the rgb to grayscale scaling factors. --- dlls/wineps.drv/color.c | 10 ++++++++-- dlls/wineps.drv/psdrv.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/color.c b/dlls/wineps.drv/color.c index 1f82253..867260a 100644 --- a/dlls/wineps.drv/color.c +++ b/dlls/wineps.drv/color.c @@ -52,6 +52,12 @@ BOOL PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2) return TRUE; } +PSRGB rgb_to_grayscale_scale( void ) +{ + static const PSRGB scale = {0.3, 0.59, 0.11}; + /* FIXME configurable */ + return scale; +} /********************************************************************** * PSDRV_CreateColor @@ -79,9 +85,9 @@ void PSDRV_CreateColor( PHYSDEV dev, PSCOLOR *pscolor, COLORREF wincolor ) pscolor->value.rgb.g = g; pscolor->value.rgb.b = b; } else { + PSRGB scale = rgb_to_grayscale_scale(); pscolor->type = PSCOLOR_GRAY; - /* FIXME configurable */ - pscolor->value.gray.i = r * 0.3 + g * 0.59 + b * 0.11; + pscolor->value.gray.i = r * scale.r + g * scale.g + b * scale.b; } return; } diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 42acdcb..e7584fa 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -485,6 +485,7 @@ extern void PSDRV_ResetClip( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2) DECLSPEC_HIDDEN; extern void PSDRV_CreateColor( PHYSDEV dev, PSCOLOR *pscolor, COLORREF wincolor ) DECLSPEC_HIDDEN; +extern PSRGB rgb_to_grayscale_scale( void ) DECLSPEC_HIDDEN; extern char PSDRV_UnicodeToANSI(int u) DECLSPEC_HIDDEN; extern INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) DECLSPEC_HIDDEN;

1 0

Tatyana Fokina : winspool.drv: Fix DocumentProperties with empty device name.
by Alexandre Julliard April 5, 2013

April 5, 2013

Module: wine Branch: master Commit: f63d59d640f48f5c734e09c5f0c4e322e9a6b3ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63d59d640f48f5c734e09c5f… Author: Tatyana Fokina <tatyana(a)etersoft.ru> Date: Fri Apr 5 11:41:29 2013 +0400 winspool.drv: Fix DocumentProperties with empty device name. --- dlls/winspool.drv/info.c | 2 +- dlls/winspool.drv/tests/info.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 141b2f4..fc74e76 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2358,7 +2358,7 @@ LONG WINAPI DocumentPropertiesA(HWND hWnd,HANDLE hPrinter, hWnd,hPrinter,pDeviceName,pDevModeOutput,pDevModeInput,fMode ); - if(!pDeviceName) { + if(!pDeviceName || !*pDeviceName) { LPCWSTR lpNameW = get_opened_printer_name(hPrinter); if(!lpNameW) { ERR("no name from hPrinter?\n"); diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 1c98d4d..3990fb8 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2653,6 +2653,7 @@ static void test_DocumentProperties(void) HANDLE hprn; LONG dm_size, ret; DEVMODE *dm; + char empty_str[] = ""; if (!default_printer) { @@ -2678,6 +2679,9 @@ static void test_DocumentProperties(void) ret = DocumentProperties(0, hprn, NULL, dm, dm, DM_OUT_BUFFER); ok(ret == IDOK, "DocumentProperties ret value %d != expected IDOK\n", ret); + ret = DocumentProperties(0, hprn, empty_str, dm, dm, DM_OUT_BUFFER); + ok(ret == IDOK, "DocumentProperties ret value %d != expected IDOK\n", ret); + test_DEVMODE(dm, dm_size, default_printer); HeapFree(GetProcessHeap(), 0, dm);

1 0

Piotr Caban : server: Don' t debug children when debugger is attached with DebugActiveProcess function .
by Alexandre Julliard April 5, 2013

April 5, 2013

Module: wine Branch: master Commit: 23191a4355c16febe4d26722de27d7a14f11872a URL: http://source.winehq.org/git/wine.git/?a=commit;h=23191a4355c16febe4d26722d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 5 14:08:02 2013 +0200 server: Don't debug children when debugger is attached with DebugActiveProcess function. --- dlls/kernel32/tests/debugger.c | 151 ++++++++++++++++++++++++++++++++++++++++ server/process.c | 2 +- 2 files changed, 152 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 22f7190..e578cdd 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -666,6 +666,150 @@ static void test_debug_loop(int argc, char **argv) ok(ret, "DeleteFileA failed, last error %#x.\n", GetLastError()); } +static void doChildren(int argc, char **argv) +{ + const char *arguments = "debugger children last"; + struct child_blackbox blackbox; + const char *blackbox_file, *p; + char event_name[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si; + HANDLE event; + char *cmd; + BOOL ret; + + if (!strcmp(argv[3], "last")) return; + + blackbox_file = argv[3]; + + p = strrchr(blackbox_file, '\\'); + p = p ? p+1 : blackbox_file; + strcpy(event_name, p); + strcat(event_name, "_init"); + event = OpenEvent(EVENT_ALL_ACCESS, FALSE, event_name); + child_ok(event != NULL, "OpenEvent failed, last error %d.\n", GetLastError()); + SetEvent(event); + CloseHandle(event); + + p = strrchr(blackbox_file, '\\'); + p = p ? p+1 : blackbox_file; + strcpy(event_name, p); + strcat(event_name, "_attach"); + event = OpenEvent(EVENT_ALL_ACCESS, FALSE, event_name); + child_ok(event != NULL, "OpenEvent failed, last error %d.\n", GetLastError()); + WaitForSingleObject(event, INFINITE); + CloseHandle(event); + + cmd = HeapAlloc(GetProcessHeap(), 0, strlen(argv[0]) + strlen(arguments) + 2); + sprintf(cmd, "%s %s", argv[0], arguments); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + ret = CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + child_ok(ret, "CreateProcess failed, last error %d.\n", GetLastError()); + + child_ok(WaitForSingleObject(pi.hProcess, 10000) == WAIT_OBJECT_0, + "Timed out waiting for the child to exit\n"); + + ret = CloseHandle(pi.hThread); + child_ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + ret = CloseHandle(pi.hProcess); + child_ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + + blackbox.failures = child_failures; + save_blackbox(blackbox_file, &blackbox, sizeof(blackbox)); +} + +static void test_debug_children(char *name, DWORD flag, BOOL debug_child) +{ + const char *arguments = "debugger children"; + struct child_blackbox blackbox; + char blackbox_file[MAX_PATH], *p; + char event_name[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si; + HANDLE event_init, event_attach; + char *cmd; + BOOL debug, ret; + BOOL got_child_event = FALSE; + + if (!pDebugActiveProcessStop || !pCheckRemoteDebuggerPresent) + { + win_skip("DebugActiveProcessStop or CheckRemoteDebuggerPresent not available, skipping test.\n"); + return; + } + + get_file_name(blackbox_file); + cmd = HeapAlloc(GetProcessHeap(), 0, strlen(name) + strlen(arguments) + strlen(blackbox_file) + 5); + sprintf(cmd, "%s %s \"%s\"", name, arguments, blackbox_file); + + p = strrchr(blackbox_file, '\\'); + p = p ? p+1 : blackbox_file; + strcpy(event_name, p); + strcat(event_name, "_init"); + event_init = CreateEvent(NULL, FALSE, FALSE, event_name); + ok(event_init != NULL, "OpenEvent failed, last error %d.\n", GetLastError()); + + p = strrchr(blackbox_file, '\\'); + p = p ? p+1 : blackbox_file; + strcpy(event_name, p); + strcat(event_name, "_attach"); + event_attach = CreateEvent(NULL, FALSE, flag!=0, event_name); + ok(event_attach != NULL, "CreateEvent failed, last error %d.\n", GetLastError()); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + + ret = CreateProcessA(NULL, cmd, NULL, NULL, FALSE, flag, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed, last error %d.\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, cmd); + if (!flag) + { + WaitForSingleObject(event_init, INFINITE); + ret = DebugActiveProcess(pi.dwProcessId); + ok(ret, "DebugActiveProcess failed, last error %d.\n", GetLastError()); + ret = SetEvent(event_attach); + ok(ret, "SetEvent failed, last error %d.\n", GetLastError()); + } + + ret = pCheckRemoteDebuggerPresent(pi.hProcess, &debug); + ok(ret, "CheckRemoteDebuggerPresent failed, last error %d.\n", GetLastError()); + ok(debug, "Expected debug != 0, got %x.\n", debug); + + for (;;) + { + DEBUG_EVENT ev; + + ret = WaitForDebugEvent(&ev, INFINITE); + ok(ret, "WaitForDebugEvent failed, last error %d.\n", GetLastError()); + if (!ret) break; + + if (ev.dwDebugEventCode==EXIT_PROCESS_DEBUG_EVENT && ev.dwProcessId==pi.dwProcessId) break; + else if (ev.dwProcessId != pi.dwProcessId) got_child_event = TRUE; + + ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); + ok(ret, "ContinueDebugEvent failed, last error %d.\n", GetLastError()); + if (!ret) break; + } + if(debug_child) + ok(got_child_event, "didn't get any child events (flag: %x).\n", flag); + else + ok(!got_child_event, "got child event (flag: %x).\n", flag); + CloseHandle(event_init); + CloseHandle(event_attach); + + ret = CloseHandle(pi.hThread); + ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + ret = CloseHandle(pi.hProcess); + ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + + load_blackbox(blackbox_file, &blackbox, sizeof(blackbox)); + ok(!blackbox.failures, "Got %d failures from child process.\n", blackbox.failures); + + ret = DeleteFileA(blackbox_file); + ok(ret, "DeleteFileA failed, last error %d.\n", GetLastError()); +} + START_TEST(debugger) { HMODULE hdll; @@ -691,10 +835,17 @@ START_TEST(debugger) { doChild(myARGC, myARGV); } + else if (myARGC >= 4 && !strcmp(myARGV[2], "children")) + { + doChildren(myARGC, myARGV); + } else { test_ExitCode(); test_RemoteDebugger(); test_debug_loop(myARGC, myARGV); + test_debug_children(myARGV[0], DEBUG_PROCESS, TRUE); + test_debug_children(myARGV[0], DEBUG_ONLY_THIS_PROCESS, FALSE); + test_debug_children(myARGV[0], 0, FALSE); } } diff --git a/server/process.c b/server/process.c index 058538f..4f04a23 100644 --- a/server/process.c +++ b/server/process.c @@ -947,7 +947,7 @@ DECL_HANDLER(new_process) if (!(thread = create_process( socket_fd, current, req->inherit_all ))) goto done; process = thread->process; - process->debug_children = !(req->create_flags & DEBUG_ONLY_THIS_PROCESS); + process->debug_children = !!(req->create_flags & DEBUG_PROCESS); process->startup_info = (struct startup_info *)grab_object( info ); /* connect to the window station */

1 0

Huw Davies : wineps: Send grayscale images to monochrome printers.
by Alexandre Julliard April 5, 2013

April 5, 2013

Module: wine Branch: master Commit: 8c9ca2f7047287a429ee4f94e61bb613eb7f4b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9ca2f7047287a429ee4f94e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 5 11:59:07 2013 +0100 wineps: Send grayscale images to monochrome printers. --- dlls/wineps.drv/bitmap.c | 38 ++++++++++++++++++++++++++++---------- dlls/wineps.drv/ps.c | 13 ++++++++----- dlls/wineps.drv/psdrv.h | 2 +- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index e7fcba3..f5a5547 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -44,7 +44,7 @@ static inline int get_dib_width_bytes( int width, int depth ) * Uses level 2 PostScript */ -static BOOL PSDRV_WriteImageHeader(PHYSDEV dev, const BITMAPINFO *info, INT xDst, +static BOOL PSDRV_WriteImageHeader(PHYSDEV dev, const BITMAPINFO *info, BOOL grayscale, INT xDst, INT yDst, INT widthDst, INT heightDst, INT widthSrc, INT heightSrc) { @@ -63,14 +63,22 @@ static BOOL PSDRV_WriteImageHeader(PHYSDEV dev, const BITMAPINFO *info, INT xDst case 32: { PSCOLOR pscol; - pscol.type = PSCOLOR_RGB; - pscol.value.rgb.r = pscol.value.rgb.g = pscol.value.rgb.b = 0.0; + if (grayscale) + { + pscol.type = PSCOLOR_GRAY; + pscol.value.gray.i = 0; + } + else + { + pscol.type = PSCOLOR_RGB; + pscol.value.rgb.r = pscol.value.rgb.g = pscol.value.rgb.b = 0.0; + } PSDRV_WriteSetColor(dev, &pscol); break; } } - PSDRV_WriteImage(dev, info->bmiHeader.biBitCount, xDst, yDst, + PSDRV_WriteImage(dev, info->bmiHeader.biBitCount, grayscale, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc, FALSE, info->bmiHeader.biHeight < 0); return TRUE; } @@ -115,7 +123,7 @@ static BOOL PSDRV_WriteImageMaskHeader(PHYSDEV dev, const BITMAPINFO *info, INT PSDRV_WriteGRestore(dev); PSDRV_WriteSetColor(dev, &foregnd); - PSDRV_WriteImage(dev, 1, xDst, yDst, widthDst, heightDst, + PSDRV_WriteImage(dev, 1, FALSE, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc, TRUE, info->bmiHeader.biHeight < 0); return TRUE; @@ -139,7 +147,7 @@ static void free_heap_bits( struct gdi_image_bits *bits ) /*************************************************************************** * PSDRV_WriteImageBits */ -static void PSDRV_WriteImageBits( PHYSDEV dev, const BITMAPINFO *info, INT xDst, INT yDst, +static void PSDRV_WriteImageBits( PHYSDEV dev, const BITMAPINFO *info, BOOL grayscale, INT xDst, INT yDst, INT widthDst, INT heightDst, INT widthSrc, INT heightSrc, void *bits, DWORD size ) { @@ -151,7 +159,7 @@ static void PSDRV_WriteImageBits( PHYSDEV dev, const BITMAPINFO *info, INT xDst, PSDRV_WriteImageMaskHeader(dev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); else - PSDRV_WriteImageHeader(dev, info, xDst, yDst, widthDst, heightDst, + PSDRV_WriteImageHeader(dev, info, grayscale, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); rle = HeapAlloc(GetProcessHeap(), 0, max_rle_size(size)); @@ -175,6 +183,8 @@ DWORD PSDRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, int dst_x, dst_y, dst_width, dst_height; unsigned char *src_ptr, *dst_ptr; struct gdi_image_bits dst_bits; + PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + BOOL grayscale = info->bmiHeader.biBitCount == 24 && physDev->pi->ppd->ColorDevice == CD_False; if (info->bmiHeader.biPlanes != 1) goto update_format; if (info->bmiHeader.biCompression != BI_RGB) goto update_format; @@ -187,7 +197,8 @@ DWORD PSDRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, width = src->visrect.right - src->visrect.left; height = src->visrect.bottom - src->visrect.top; src_stride = get_dib_width_bytes( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); - dst_stride = (width * info->bmiHeader.biBitCount + 7) / 8; + if (grayscale) dst_stride = width; + else dst_stride = (width * info->bmiHeader.biBitCount + 7) / 8; src_ptr = bits->ptr; if (info->bmiHeader.biHeight > 0) @@ -224,7 +235,14 @@ DWORD PSDRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, memcpy( dst_ptr, src_ptr, dst_stride ); break; case 24: - if (dst_ptr != src_ptr) + if (grayscale) + { + PSRGB scale = rgb_to_grayscale_scale(); + for (y = 0; y < height; y++, src_ptr += src_stride, dst_ptr += dst_stride) + for (x = 0; x < width; x++) + dst_ptr[x] = src_ptr[x * 3 + 2] * scale.r + src_ptr[x * 3 + 1] * scale.g + src_ptr[x * 3] * scale.b; + } + else if (dst_ptr != src_ptr) for (y = 0; y < height; y++, src_ptr += src_stride, dst_ptr += dst_stride) for (x = 0; x < width; x++) { @@ -261,7 +279,7 @@ DWORD PSDRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, PSDRV_SetClip(dev); PSDRV_WriteGSave(dev); if (clip) PSDRV_AddClip( dev, clip ); - PSDRV_WriteImageBits( dev, info, dst_x, dst_y, dst_width, dst_height, + PSDRV_WriteImageBits( dev, info, grayscale, dst_x, dst_y, dst_width, dst_height, width, height, dst_bits.ptr, size ); PSDRV_WriteGRestore(dev); PSDRV_ResetClip(dev); diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 2f482d4..6187223 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -772,7 +772,7 @@ BOOL PSDRV_WriteRGBQUAD(PHYSDEV dev, const RGBQUAD *rgb, int number) return TRUE; } -static BOOL PSDRV_WriteImageDict(PHYSDEV dev, WORD depth, +static BOOL PSDRV_WriteImageDict(PHYSDEV dev, WORD depth, BOOL grayscale, INT widthSrc, INT heightSrc, char *bits, BOOL top_down) { static const char start[] = "<<\n" @@ -809,7 +809,10 @@ static BOOL PSDRV_WriteImageDict(PHYSDEV dev, WORD depth, break; default: - strcpy(buf, decode3); + if (grayscale) + sprintf(buf, decode1, 1); + else + strcpy(buf, decode3); break; } @@ -825,7 +828,7 @@ static BOOL PSDRV_WriteImageDict(PHYSDEV dev, WORD depth, return TRUE; } -BOOL PSDRV_WriteImage(PHYSDEV dev, WORD depth, INT xDst, INT yDst, +BOOL PSDRV_WriteImage(PHYSDEV dev, WORD depth, BOOL grayscale, INT xDst, INT yDst, INT widthDst, INT heightDst, INT widthSrc, INT heightSrc, BOOL mask, BOOL top_down) { @@ -836,7 +839,7 @@ BOOL PSDRV_WriteImage(PHYSDEV dev, WORD depth, INT xDst, INT yDst, sprintf(buf, start, xDst, yDst, widthDst, heightDst); PSDRV_WriteSpool(dev, buf, strlen(buf)); - PSDRV_WriteImageDict(dev, depth, widthSrc, heightSrc, NULL, top_down); + PSDRV_WriteImageDict(dev, depth, grayscale, widthSrc, heightSrc, NULL, top_down); if(mask) PSDRV_WriteSpool(dev, imagemask, sizeof(imagemask) - 1); else @@ -945,7 +948,7 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U } } PSDRV_WriteSpool(dev, mypat, sizeof(mypat) - 1); - PSDRV_WriteImageDict(dev, 1, 8, 8, buf, bmi->bmiHeader.biHeight < 0); + PSDRV_WriteImageDict(dev, 1, FALSE, 8, 8, buf, bmi->bmiHeader.biHeight < 0); PSDRV_WriteSpool(dev, "def\n", 4); PSDRV_WriteIndexColorSpaceBegin(dev, 1); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index e7584fa..16fa977 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -521,7 +521,7 @@ extern BOOL PSDRV_WriteRotate(PHYSDEV dev, float ang) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteIndexColorSpaceBegin(PHYSDEV dev, int size) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteIndexColorSpaceEnd(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteRGBQUAD(PHYSDEV dev, const RGBQUAD *rgb, int number) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteImage(PHYSDEV dev, WORD depth, INT xDst, INT yDst, +extern BOOL PSDRV_WriteImage(PHYSDEV dev, WORD depth, BOOL grayscale, INT xDst, INT yDst, INT widthDst, INT heightDst, INT widthSrc, INT heightSrc, BOOL mask, BOOL top_down) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteBytes(PHYSDEV dev, const BYTE *bytes, DWORD number) DECLSPEC_HIDDEN;

1 0

Ken Thomases : winemac: Scale large system tray icons down to fit status bar.
by Alexandre Julliard April 5, 2013

April 5, 2013

Module: wine Branch: master Commit: 401b75e3e9619ad80a95c5ff30d8d8f1b94b7831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=401b75e3e9619ad80a95c5ff3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Apr 5 03:34:20 2013 -0500 winemac: Scale large system tray icons down to fit status bar. --- dlls/winemac.drv/cocoa_status_item.m | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_status_item.m b/dlls/winemac.drv/cocoa_status_item.m index 27908ab..5b4ee94 100644 --- a/dlls/winemac.drv/cocoa_status_item.m +++ b/dlls/winemac.drv/cocoa_status_item.m @@ -149,8 +149,21 @@ void macdrv_set_status_item_image(macdrv_status_item s, CGImageRef cgimage) NSImage* image = nil; if (cgimage) { + NSSize size; + CGFloat maxSize = [[NSStatusBar systemStatusBar] thickness]; + BOOL changed = FALSE; + image = [[NSImage alloc] initWithCGImage:cgimage size:NSZeroSize]; CGImageRelease(cgimage); + size = [image size]; + while (size.width > maxSize || size.height > maxSize) + { + size.width /= 2.0; + size.height /= 2.0; + changed = TRUE; + } + if (changed) + [image setSize:size]; } [statusItem.item setImage:image]; [image release];

1 0

Ken Thomases : winemac: Add debug tracing for queried icon size.
by Alexandre Julliard April 5, 2013

April 5, 2013

Module: wine Branch: master Commit: 787a937ed86f6f0e0975af663d5590b33da4e01e URL: http://source.winehq.org/git/wine.git/?a=commit;h=787a937ed86f6f0e0975af663… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Apr 5 03:34:16 2013 -0500 winemac: Add debug tracing for queried icon size. --- dlls/winemac.drv/image.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/image.c b/dlls/winemac.drv/image.c index 4228265..a39564a 100644 --- a/dlls/winemac.drv/image.c +++ b/dlls/winemac.drv/image.c @@ -205,6 +205,7 @@ CGImageRef create_cgimage_from_icon(HANDLE icon, int width, int height) if (!info.hbmColor) bm.bmHeight = max(1, bm.bmHeight / 2); width = bm.bmWidth; height = bm.bmHeight; + TRACE("new width %d height %d\n", width, height); DeleteObject(info.hbmColor); DeleteObject(info.hbmMask);

1 0