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

Piotr Caban : wininet: Skip some urlcache Unicode tests if ANSI version of URL is not known.
by Alexandre Julliard 08 Apr '13

08 Apr '13

Module: wine Branch: master Commit: b0ef7b401c5b83418e0d1c2d5f92a0862678f564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ef7b401c5b83418e0d1c2d5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:45:35 2013 +0200 wininet: Skip some urlcache Unicode tests if ANSI version of URL is not known. --- dlls/wininet/tests/urlcache.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 724da88..c9acea2 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -893,6 +893,10 @@ static void test_urlcacheW(void) ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, NULL, &size); ok(!ret && GetLastError()==ERROR_INSUFFICIENT_BUFFER, "%d) GetLastError() = %d\n", i, GetLastError()); + if(!ret && GetLastError()!=ERROR_INSUFFICIENT_BUFFER) { + win_skip("ANSI version of url is incorrect\n"); + continue; + } entry_infoA = HeapAlloc(GetProcessHeap(), 0, size); ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, entry_infoA, &size); ok(ret, "%d) GetUrlCacheEntryInfoA failed: %d\n", i, GetLastError());

1 0

Jacek Caban : wininet: Don' t bother reconnecting to server for compat secure mode if we don' t have compat cred handle.
by Alexandre Julliard 08 Apr '13

08 Apr '13

Module: wine Branch: master Commit: 77ed56cffbdb51311ccaa52e2752eca6defa7d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ed56cffbdb51311ccaa52e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 16:58:28 2013 +0200 wininet: Don't bother reconnecting to server for compat secure mode if we don't have compat cred handle. --- dlls/wininet/netconnection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c3d700c..b1368bf 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -659,7 +659,7 @@ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) /* FIXME: when got version alert and FIN from server */ /* fallback to connect without TLSv1.1/TLSv1.2 */ - if (res == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) + if (res == ERROR_INTERNET_SECURITY_CHANNEL_ERROR && have_compat_cred_handle) { closesocket(connection->socket); res = create_netconn_socket(connection->server, connection, 500);

1 0

Tatyana Fokina : winspool.drv: Fix DocumentProperties with empty device name.
by Alexandre Julliard 05 Apr '13

05 Apr '13

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

Huw Davies : wineps: Add a helper to return the rgb to grayscale scaling factors.
by Alexandre Julliard 05 Apr '13

05 Apr '13

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

Huw Davies : wineps: Send grayscale images to monochrome printers.
by Alexandre Julliard 05 Apr '13

05 Apr '13

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

Piotr Caban : server: Don' t debug children when debugger is attached with DebugActiveProcess function .
by Alexandre Julliard 05 Apr '13

05 Apr '13

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

Piotr Caban : msvcrt: Fixed debug message in strncpy_s.
by Alexandre Julliard 05 Apr '13

05 Apr '13

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

Piotr Caban : tapi32: Add more Unicode functions stubs.
by Alexandre Julliard 05 Apr '13

05 Apr '13

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

Ken Thomases : winemac: Tell Cocoa to preserve our window content during live resizing.
by Alexandre Julliard 05 Apr '13

05 Apr '13

Module: wine Branch: master Commit: 26a74c664d6d4d16224f1ecc7461fd02e09645d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26a74c664d6d4d16224f1ecc7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Apr 4 14:26:01 2013 -0500 winemac: Tell Cocoa to preserve our window content during live resizing. --- dlls/winemac.drv/cocoa_window.m | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 43be348..9911195 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -277,6 +277,18 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) return YES; } + - (BOOL) preservesContentDuringLiveResize + { + // Returning YES from this tells Cocoa to keep our view's content during + // a Cocoa-driven resize. In theory, we're also supposed to override + // -setFrameSize: to mark exposed sections as needing redisplay, but + // user32 will take care of that in a roundabout way. This way, we don't + // redraw until the window surface is flushed. + // + // This doesn't do anything when we resize the window ourselves. + return YES; + } + @end

1 0

Ken Thomases : winemac: Initialize window surface to Mac-standard window background color instead of black .
by Alexandre Julliard 05 Apr '13

05 Apr '13

Module: wine Branch: master Commit: f37153ac7d43d1ebb157c193b7ca2c61084b8923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37153ac7d43d1ebb157c193b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Apr 4 14:26:08 2013 -0500 winemac: Initialize window surface to Mac-standard window background color instead of black. --- dlls/winemac.drv/cocoa_window.m | 42 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/surface.c | 5 +++- 3 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 9911195..6a85d74 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1796,3 +1796,45 @@ void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) [pool release]; } + +/*********************************************************************** + * macdrv_window_background_color + * + * Returns the standard Mac window background color as a 32-bit value of + * the form 0x00rrggbb. + */ +uint32_t macdrv_window_background_color(void) +{ + static uint32_t result; + static dispatch_once_t once; + + // Annoyingly, [NSColor windowBackgroundColor] refuses to convert to other + // color spaces (RGB or grayscale). So, the only way to get RGB values out + // of it is to draw with it. + dispatch_once(&once, ^{ + OnMainThread(^{ + unsigned char rgbx[4]; + unsigned char *planes = rgbx; + NSBitmapImageRep *bitmap = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:&planes + pixelsWide:1 + pixelsHigh:1 + bitsPerSample:8 + samplesPerPixel:3 + hasAlpha:NO + isPlanar:NO + colorSpaceName:NSCalibratedRGBColorSpace + bitmapFormat:0 + bytesPerRow:4 + bitsPerPixel:32]; + [NSGraphicsContext saveGraphicsState]; + [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]]; + [[NSColor windowBackgroundColor] set]; + NSRectFill(NSMakeRect(0, 0, 1, 1)); + [NSGraphicsContext restoreGraphicsState]; + [bitmap release]; + result = rgbx[0] << 16 | rgbx[1] << 8 | rgbx[2]; + }); + }); + + return result; +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 46d13a9..c4819c3 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -347,6 +347,7 @@ extern void macdrv_dispose_view(macdrv_view v) DECLSPEC_HIDDEN; extern void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; +extern uint32_t macdrv_window_background_color(void) DECLSPEC_HIDDEN; /* keyboard */ diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 564d004..a27ff24 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -236,6 +236,7 @@ struct window_surface *create_surface(macdrv_window window, const RECT *rect, DWORD *colors; pthread_mutexattr_t attr; int err; + DWORD window_background; surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(struct macdrv_window_surface, info.bmiColors[3])); @@ -286,8 +287,10 @@ struct window_surface *create_surface(macdrv_window window, const RECT *rect, } update_blit_data(surface); surface->use_alpha = use_alpha; - surface->bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, surface->info.bmiHeader.biSizeImage); + surface->bits = HeapAlloc(GetProcessHeap(), 0, surface->info.bmiHeader.biSizeImage); if (!surface->bits) goto failed; + window_background = macdrv_window_background_color(); + memset_pattern4(surface->bits, &window_background, surface->info.bmiHeader.biSizeImage); TRACE("created %p for %p %s bits %p-%p\n", surface, window, wine_dbgstr_rect(rect), surface->bits, surface->bits + surface->info.bmiHeader.biSizeImage);

1 0