November 2011 - Wine-commits

Alexandre Julliard : server: Cope with stdio file descriptors being closed on startup.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 3acc2068a00e3de505373c75656e3816a6c05710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3acc2068a00e3de505373c756… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 15 11:39:42 2011 +0100 server: Cope with stdio file descriptors being closed on startup. --- server/request.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server/request.c b/server/request.c index cea23ef..05c7464 100644 --- a/server/request.c +++ b/server/request.c @@ -758,6 +758,10 @@ void open_master_socket(void) assert( sizeof(union generic_request) == sizeof(struct request_max_size) ); assert( sizeof(union generic_reply) == sizeof(struct request_max_size) ); + /* make sure the stdio fds are open */ + fd = open( "/dev/null", O_RDWR ); + while (fd >= 0 && fd <= 2) fd = dup( fd ); + if (!server_dir) fatal_error( "directory %s cannot be accessed\n", config_dir ); if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s", config_dir ); if ((config_dir_fd = open( ".", O_RDONLY )) == -1) fatal_perror( "open %s", config_dir ); @@ -777,12 +781,8 @@ void open_master_socket(void) acquire_lock(); /* close stdin and stdout */ - if ((fd = open( "/dev/null", O_RDWR )) != -1) - { - dup2( fd, 0 ); - dup2( fd, 1 ); - close( fd ); - } + dup2( fd, 0 ); + dup2( fd, 1 ); /* signal parent */ dummy = 0; @@ -813,6 +813,7 @@ void open_master_socket(void) /* init the process tracing mechanism */ init_tracing_mechanism(); + close( fd ); } /* master socket timer expiration handler */

1 0

Huw Davies : gdi32/tests: Add tests for text rendering.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: d43d17e24857fafcb7964c91d8a7a05520964df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d43d17e24857fafcb7964c91d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 14 12:49:08 2011 +0000 gdi32/tests: Add tests for text rendering. --- dlls/gdi32/tests/dib.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 195 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index c358196..bd33df7 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -2021,6 +2021,187 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh DeleteObject(solid_pen); } +static const BYTE ramp[17] = +{ + 0, 0x4d, 0x68, 0x7c, + 0x8c, 0x9a, 0xa7, 0xb2, + 0xbd, 0xc7, 0xd0, 0xd9, + 0xe1, 0xe9, 0xf0, 0xf8, + 0xff +}; + +static inline void get_range(BYTE alpha, DWORD text_comp, BYTE *min_comp, BYTE *max_comp) +{ + *min_comp = (ramp[alpha] * text_comp) / 0xff; + *max_comp = ramp[16 - alpha] + ((0xff - ramp[16 - alpha]) * text_comp) / 0xff; +} + +static inline BYTE aa_comp(BYTE dst, BYTE text, BYTE alpha) +{ + BYTE min_comp, max_comp; + + if (alpha == 16) return text; + if (alpha <= 1) return dst; + if (text == dst) return dst; + + get_range( alpha, text, &min_comp, &max_comp ); + + if (dst > text) + { + DWORD diff = dst - text; + DWORD range = max_comp - text; + dst = text + (diff * range ) / (0xff - text); + return dst; + } + else + { + DWORD diff = text - dst; + DWORD range = text - min_comp ; + dst = text - (diff * range) / text; + return dst; + } +} + +static inline COLORREF aa_colorref( COLORREF dst, COLORREF text, BYTE glyph ) +{ + COLORREF ret; + + ret = RGB( aa_comp( GetRValue(dst), GetRValue(text), glyph ), + aa_comp( GetGValue(dst), GetGValue(text), glyph ), + aa_comp( GetBValue(dst), GetBValue(text), glyph ) ); + return ret; +} + +static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; + +static void draw_text_2( HDC hdc, BITMAPINFO *bmi, BYTE *bits, BOOL aa ) +{ + DWORD dib_size = get_dib_size(bmi), ret; + LOGFONT lf; + HFONT font; + GLYPHMETRICS gm; + BYTE g_buf[10000]; + int i, stride, x, y; + static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; + char *eto_hash = NULL, *diy_hash = NULL; + static const char *str = "Hello Wine"; + POINT origin, g_org; + static const BYTE vals[4] = { 0x00, 0x00, 0x00, 0x00 }; + TEXTMETRIC tm; + COLORREF text_color; + + for(i = 0; i < dib_size; i++) + bits[i] = vals[i % 4]; + + memset( &lf, 0, sizeof(lf) ); + strcpy( lf.lfFaceName, "Tahoma" ); + lf.lfHeight = 24; + lf.lfQuality = aa ? ANTIALIASED_QUALITY : NONANTIALIASED_QUALITY; + + font = CreateFontIndirect( &lf ); + font = SelectObject( hdc, font ); + + GetTextMetrics( hdc, &tm ); + if (!(tm.tmPitchAndFamily & TMPF_VECTOR)) + { + skip( "skipping as a bitmap font has been selected for Tahoma.\n" ); + DeleteObject( SelectObject( hdc, font ) ); + return; + } + + SetTextColor( hdc, RGB(0xff, 0x00, 0x00) ); + SetTextAlign( hdc, TA_BASELINE ); + SetBkMode( hdc, TRANSPARENT ); + origin.x = 10; + origin.y = 100; + + ExtTextOut( hdc, origin.x, origin.y, 0, NULL, str, strlen(str), NULL ); + eto_hash = hash_dib( bmi, bits ); + + for(i = 0; i < dib_size; i++) + bits[i] = vals[i % 4]; + + if (bmi->bmiHeader.biBitCount <= 8) aa = FALSE; + + text_color = GetTextColor( hdc ); + for (i = 0; i < strlen(str); i++) + { + DWORD ggo_flags = aa ? GGO_GRAY4_BITMAP : GGO_BITMAP; + + ret = GetGlyphOutline( hdc, str[i], ggo_flags, &gm, 0, NULL, &identity ); + + if (ret == GDI_ERROR) continue; + + if (ret) GetGlyphOutline( hdc, str[i], ggo_flags, &gm, sizeof(g_buf), g_buf, &identity ); + + g_org.x = origin.x + gm.gmptGlyphOrigin.x; + g_org.y = origin.y - gm.gmptGlyphOrigin.y; + + origin.x += gm.gmCellIncX; + origin.y += gm.gmCellIncY; + + if (!ret) continue; + + if (aa) + { + stride = (gm.gmBlackBoxX + 3) & ~3; + + for (y = 0; y < gm.gmBlackBoxY; y++) + { + BYTE *g_ptr = g_buf + y * stride; + COLORREF val; + + for (x = 0; x < gm.gmBlackBoxX; x++) + { + if (g_ptr[x] <= 1) continue; + if (g_ptr[x] >= 16) val = text_color; + else + { + val = GetPixel( hdc, g_org.x + x, g_org.y + y ); + val = aa_colorref( val, text_color, g_ptr[x] ); + } + SetPixel( hdc, g_org.x + x, g_org.y + y, val ); + } + } + } + else + { + stride = ((gm.gmBlackBoxX + 31) >> 3) & ~3; + + for (y = 0; y < gm.gmBlackBoxY; y++) + { + BYTE *g_ptr = g_buf + y * stride; + for (x = 0; x < gm.gmBlackBoxX; x++) + { + if (g_ptr[x / 8] & masks[x % 8]) + SetPixel( hdc, g_org.x + x, g_org.y + y, text_color ); + } + } + } + } + + diy_hash = hash_dib( bmi, bits ); + ok( !strcmp( eto_hash, diy_hash ), "hash mismatch - aa %d\n", aa ); + + HeapFree( GetProcessHeap(), 0, diy_hash ); + HeapFree( GetProcessHeap(), 0, eto_hash ); + + font = SelectObject( hdc, font ); + DeleteObject( font ); +} + +static void draw_text( HDC hdc, BITMAPINFO *bmi, BYTE *bits ) +{ + draw_text_2( hdc, bmi, bits, FALSE ); + + /* Rounding errors make these cases hard to test */ + if ((bmi->bmiHeader.biCompression == BI_BITFIELDS && ((DWORD*)bmi->bmiColors)[0] == 0x3f000) || + (bmi->bmiHeader.biBitCount == 16)) + return; + + draw_text_2( hdc, bmi, bits, TRUE ); +} + static void test_simple_graphics(void) { char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; @@ -2061,6 +2242,7 @@ static void test_simple_graphics(void) dst_format = "8888"; sha1 = sha1_graphics_a8r8g8b8; draw_graphics(mem_dc, bmi, bits, &sha1); + draw_text(mem_dc, bmi, bits); SelectObject(mem_dc, orig_bm); DeleteObject(dib); @@ -2086,6 +2268,7 @@ static void test_simple_graphics(void) dst_format = "8888 - bitfields"; sha1 = sha1_graphics_a8r8g8b8; draw_graphics(mem_dc, bmi, bits, &sha1); + draw_text(mem_dc, bmi, bits); SelectObject(mem_dc, orig_bm); DeleteObject(dib); @@ -2111,6 +2294,7 @@ static void test_simple_graphics(void) dst_format = "a8b8g8r8"; sha1 = sha1_graphics_a8b8g8r8; draw_graphics(mem_dc, bmi, bits, &sha1); + draw_text(mem_dc, bmi, bits); SelectObject(mem_dc, orig_bm); DeleteObject(dib); @@ -2136,6 +2320,7 @@ static void test_simple_graphics(void) dst_format = "r10g10b10"; sha1 = sha1_graphics_r10g10b10; draw_graphics(mem_dc, bmi, bits, &sha1); + draw_text(mem_dc, bmi, bits); SelectObject(mem_dc, orig_bm); DeleteObject(dib); @@ -2161,6 +2346,7 @@ static void test_simple_graphics(void) dst_format = "r6g6b6"; sha1 = sha1_graphics_r6g6b6; draw_graphics(mem_dc, bmi, bits, &sha1); + draw_text(mem_dc, bmi, bits); SelectObject(mem_dc, orig_bm); DeleteObject(dib); @@ -2177,6 +2363,7 @@ static void test_simple_graphics(void) dst_format = "24"; sha1 = sha1_graphics_24; draw_graphics(mem_dc, bmi, bits, &sha1); + draw_text(mem_dc, bmi, bits); SelectObject(mem_dc, orig_bm); DeleteObject(dib); @@ -2199,6 +2386,7 @@ static void test_simple_graphics(void) dst_format = "r5g5b5"; sha1 = sha1_graphics_r5g5b5; draw_graphics(mem_dc, bmi, bits, &sha1); + draw_text(mem_dc, bmi, bits); SelectObject(mem_dc, orig_bm); DeleteObject(dib); @@ -2223,6 +2411,7 @@ static void test_simple_graphics(void) dst_format = "r4g4b4"; sha1 = sha1_graphics_r4g4b4; draw_graphics(mem_dc, bmi, bits, &sha1); + draw_text(mem_dc, bmi, bits); SelectObject(mem_dc, orig_bm); DeleteObject(dib); @@ -2246,6 +2435,7 @@ static void test_simple_graphics(void) dst_format = "8 color"; sha1 = sha1_graphics_8_color; draw_graphics(mem_dc, bmi, bits, &sha1); + draw_text(mem_dc, bmi, bits); SelectObject(mem_dc, orig_bm); DeleteObject(dib); @@ -2265,6 +2455,7 @@ static void test_simple_graphics(void) dst_format = "8 grayscale"; sha1 = sha1_graphics_8_grayscale; draw_graphics(mem_dc, bmi, bits, &sha1); + draw_text(mem_dc, bmi, bits); SelectObject(mem_dc, orig_bm); DeleteObject(dib); @@ -2298,6 +2489,7 @@ static void test_simple_graphics(void) dst_format = "8"; sha1 = sha1_graphics_8; draw_graphics(mem_dc, bmi, bits, &sha1); + draw_text(mem_dc, bmi, bits); SelectObject(mem_dc, orig_bm); DeleteObject(dib); @@ -2314,6 +2506,7 @@ static void test_simple_graphics(void) dst_format = "4"; sha1 = sha1_graphics_4; draw_graphics(mem_dc, bmi, bits, &sha1); + draw_text(mem_dc, bmi, bits); SelectObject(mem_dc, orig_bm); DeleteObject(dib); @@ -2331,6 +2524,7 @@ static void test_simple_graphics(void) dst_format = "4 grayscale"; sha1 = sha1_graphics_4_grayscale; draw_graphics(mem_dc, bmi, bits, &sha1); + draw_text(mem_dc, bmi, bits); SelectObject(mem_dc, orig_bm); DeleteObject(dib); @@ -2355,6 +2549,7 @@ static void test_simple_graphics(void) dst_format = "1"; sha1 = sha1_graphics_1; draw_graphics(mem_dc, bmi, bits, &sha1); + draw_text(mem_dc, bmi, bits); SelectObject(mem_dc, orig_bm); DeleteObject(dib);

1 0

Jacek Caban : urlmon: Fixed misc. c tests on IE9 and make image_tiff_filter behave like IE9.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 75dd4123117e4e8ecfea5ade87a56b5c9de2d33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75dd4123117e4e8ecfea5ade8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 14 17:07:02 2011 +0100 urlmon: Fixed misc.c tests on IE9 and make image_tiff_filter behave like IE9. --- dlls/urlmon/tests/misc.c | 17 ++++++++++++----- dlls/urlmon/urlmon_main.c | 5 ++++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index cc69c72..c45428c 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -515,7 +515,7 @@ static BYTE data35[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,'x','x','x','x',0}; static BYTE data36[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,'x','x'}; static BYTE data37[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,'<','h','t','m','l','>'}; static BYTE data38[] = {0x00,0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,'x'}; -static BYTE data39[] = {0x4d,0x4d,0x00,0x2a}; +static BYTE data39[] = {0x4d,0x4d,0x00,0x2a,0xff}; static BYTE data40[] = {0x4d,0x4d,0x00,0x2a,'<','h','t','m','l','>',0}; static BYTE data41[] = {0x4d,0x4d,0xff}; static BYTE data42[] = {0x4d,0x4d}; @@ -562,11 +562,12 @@ static BYTE data82[] = {'.','s','n','d',0}; static BYTE data83[] = {'.','s','n','d'}; static BYTE data84[] = {'.','s','n','d',0,'<','h','t','m','l','>',1,1}; static BYTE data85[] = {'.','S','N','D',0}; +static BYTE data86[] = {0x49,0x49,0x2a,0xff}; static const struct { BYTE *data; DWORD size; - LPCWSTR mime, mime_alt; + LPCWSTR mime, mime_alt, broken_mime; } mime_tests2[] = { {data1, sizeof(data1), mimeTextPlain}, {data2, sizeof(data2), mimeAppOctetStream}, @@ -608,7 +609,7 @@ static const struct { {data38, sizeof(data38), mimeAppOctetStream}, {data39, sizeof(data39), mimeImageTiff}, {data40, sizeof(data40), mimeTextHtml, mimeImageTiff /* IE8 */}, - {data41, sizeof(data41), mimeImageTiff}, + {data41, sizeof(data41), mimeTextPlain, NULL, mimeImageTiff}, {data42, sizeof(data42), mimeTextPlain}, {data43, sizeof(data43), mimeAppOctetStream}, {data44, sizeof(data44), mimeVideoAvi}, @@ -652,13 +653,15 @@ static const struct { {data82, sizeof(data82), mimeAudioBasic}, {data83, sizeof(data83), mimeTextPlain}, {data84, sizeof(data84), mimeTextHtml, mimeAudioBasic /* IE8 */}, - {data85, sizeof(data85), mimeTextPlain} + {data85, sizeof(data85), mimeTextPlain}, + {data86, sizeof(data86), mimeImageTiff, NULL, mimeTextPlain} }; static void test_FindMimeFromData(void) { HRESULT hres; LPWSTR mime; + BYTE b; int i; for(i=0; i<sizeof(mime_tests)/sizeof(mime_tests[0]); i++) { @@ -692,8 +695,12 @@ static void test_FindMimeFromData(void) hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, NULL, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + b = !lstrcmpW(mime, mime_tests2[i].mime); + ok(b || broken(mime_tests2[i].broken_mime && !lstrcmpW(mime, mime_tests2[i].broken_mime)), + "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); + if(!b) + continue; hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, mimeTextHtml, 0, &mime, 0); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 4d60977..0911127 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -602,7 +602,10 @@ static BOOL image_pjpeg_filter(const BYTE *b, DWORD size) static BOOL image_tiff_filter(const BYTE *b, DWORD size) { - return size > 2 && b[0] == 0x4d && b[1] == 0x4d; + static const BYTE magic1[] = {0x4d,0x4d,0x00,0x2a}; + static const BYTE magic2[] = {0x49,0x49,0x2a,0xff}; + + return size >= 4 && (!memcmp(b, magic1, 4) || !memcmp(b, magic2, 4)); } static BOOL image_xpng_filter(const BYTE *b, DWORD size)

1 0

Jörg Höhle : mmdevapi/tests: Prevent crash when device is in use.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 7480dc0af1f032c3939d1fa3adc46d5eaf5bbbb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7480dc0af1f032c3939d1fa3a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Nov 8 19:40:59 2011 +0100 mmdevapi/tests: Prevent crash when device is in use. --- dlls/mmdevapi/tests/capture.c | 8 ++++++++ dlls/mmdevapi/tests/render.c | 4 ++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index ed88020..eed56dd 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -330,6 +330,8 @@ static void test_streamvolume(void) hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, fmt, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); + if(hr != S_OK) + return; hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); ok(hr == S_OK, "GetService failed: %08x\n", hr); @@ -430,6 +432,8 @@ static void test_channelvolume(void) hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&acv); ok(hr == S_OK, "GetService failed: %08x\n", hr); + if(hr != S_OK) + return; hr = IChannelAudioVolume_GetChannelCount(acv, NULL); ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); @@ -530,6 +534,8 @@ static void test_simplevolume(void) hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); ok(hr == S_OK, "GetService failed: %08x\n", hr); + if(hr != S_OK) + return; hr = ISimpleAudioVolume_GetMasterVolume(sav, NULL); ok(hr == NULL_PTR_ERR, "GetMasterVolume gave wrong error: %08x\n", hr); @@ -621,6 +627,8 @@ static void test_volume_dependence(void) hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); ok(hr == S_OK, "GetService (AudioStreamVolume) failed: %08x\n", hr); + if(hr != S_OK) + return; hr = IAudioStreamVolume_SetChannelVolume(asv, 0, 0.2f); ok(hr == S_OK, "ASV_SetChannelVolume failed: %08x\n", hr); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index d55f2ae..7108815 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -530,6 +530,8 @@ static void test_padding(void) hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); + if(hr != S_OK) + return; hr = IAudioClient_GetDevicePeriod(ac, &defp, &minp); ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); @@ -1396,6 +1398,8 @@ static void test_session_creation(void) NULL, (void**)&ac); ok((hr == S_OK)^(ac == NULL), "Activate %08x &out pointer\n", hr); ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; hr = IAudioClient_GetMixFormat(ac, &fmt); ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr);

1 0

Francois Gouget : browseui: Give a name and delete the critical sections.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 51ab24dd66ed4b2f46078b6422615c67228852a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ab24dd66ed4b2f46078b642… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 15:08:39 2011 +0100 browseui: Give a name and delete the critical sections. --- dlls/browseui/compcatcachedaemon.c | 2 ++ dlls/browseui/progressdlg.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index f480d35..0acb4ec 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -57,6 +57,7 @@ static inline CompCatCacheDaemon *impl_from_IRunnableTask(IRunnableTask *iface) static void CompCatCacheDaemon_Destructor(CompCatCacheDaemon *This) { TRACE("destroying %p\n", This); + This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); heap_free(This); BROWSEUI_refCount--; @@ -154,6 +155,7 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->IRunnableTask_iface.lpVtbl = &CompCatCacheDaemonVtbl; This->refCount = 1; InitializeCriticalSection(&This->cs); + This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CompCatCacheDaemon.cs"); TRACE("returning %p\n", This); *ppOut = (IUnknown *)This; diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 11ebb7b..2de858c 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -260,6 +260,8 @@ static void ProgressDialog_Destructor(ProgressDialog *This) heap_free(This->cancelMsg); heap_free(This->title); heap_free(This); + This->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->cs); BROWSEUI_refCount--; } @@ -503,6 +505,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->IProgressDialog_iface.lpVtbl = &ProgressDialogVtbl; This->refCount = 1; InitializeCriticalSection(&This->cs); + This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ProgressDialog.cs"); TRACE("returning %p\n", This); *ppOut = (IUnknown *)This;

1 0

Francois Gouget : winhttp: Give a name to the critical sections.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: ea93b27c34a9c881aa413ba44c069e64fec01968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea93b27c34a9c881aa413ba44… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 15:09:35 2011 +0100 winhttp: Give a name to the critical sections. --- dlls/winhttp/net.c | 12 ++++++++++-- dlls/winhttp/request.c | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index ecaba3d..4d2df07 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -539,7 +539,11 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LeaveCriticalSection( &init_ssl_cs ); return FALSE; } - for (i = 0; i < num_ssl_locks; i++) InitializeCriticalSection( &ssl_locks[i] ); + for (i = 0; i < num_ssl_locks; i++) + { + InitializeCriticalSection( &ssl_locks[i] ); + ssl_locks[i].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ssl_locks"); + } pCRYPTO_set_locking_callback(ssl_lock_callback); LeaveCriticalSection( &init_ssl_cs ); @@ -568,7 +572,11 @@ void netconn_unload( void ) if (ssl_locks) { int i; - for (i = 0; i < num_ssl_locks; i++) DeleteCriticalSection( &ssl_locks[i] ); + for (i = 0; i < num_ssl_locks; i++) + { + ssl_locks[i].DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &ssl_locks[i] ); + } HeapFree( GetProcessHeap(), 0, ssl_locks ); } #endif diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e0c68e6..e86cdf1 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2233,6 +2233,7 @@ static ULONG WINAPI winhttp_request_Release( cancel_request( request ); free_request( request ); LeaveCriticalSection( &request->cs ); + request->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &request->cs ); heap_free( request ); } @@ -3387,6 +3388,7 @@ HRESULT WinHttpRequest_create( IUnknown *unknown, void **obj ) request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; InitializeCriticalSection( &request->cs ); + request->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": winhttp_request.cs"); *obj = &request->IWinHttpRequest_iface; TRACE("returning iface %p\n", *obj);

1 0

Francois Gouget : urlmon: Give a name to the critical sections.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 3e16622a456ae0869399c6faa155e0843f010d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e16622a456ae0869399c6faa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 15:09:42 2011 +0100 urlmon: Give a name to the critical sections. --- dlls/urlmon/bindprot.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 45cf14c..cfb5cec 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -346,6 +346,7 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface) if(This->notif_hwnd) release_notif_hwnd(This->notif_hwnd); + This->section.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->section); heap_free(This->mime); @@ -1314,6 +1315,7 @@ HRESULT create_binding_protocol(BOOL from_urlmon, BindProtocol **protocol) ret->notif_hwnd = get_notif_hwnd(); ret->protocol_handler = &ret->default_protocol_handler.IInternetProtocol_iface; InitializeCriticalSection(&ret->section); + ret->section.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BindProtocol.section"); URLMON_LockModule();

1 0

Francois Gouget : rpcrt4: Give a name to the critical sections.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 86d8217aeaa761a098652d321e23fe4d05611319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d8217aeaa761a098652d321… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 15:10:01 2011 +0100 rpcrt4: Give a name to the critical sections. --- dlls/rpcrt4/rpc_assoc.c | 2 ++ dlls/rpcrt4/rpc_server.c | 2 ++ dlls/rpcrt4/rpc_transport.c | 2 ++ dlls/rpcrt4/rpcrt4_main.c | 2 ++ 4 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 8364a9a..bcaa1c2 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -74,6 +74,7 @@ static RPC_STATUS RpcAssoc_Alloc(LPCSTR Protseq, LPCSTR NetworkAddr, list_init(&assoc->free_connection_pool); list_init(&assoc->context_handle_list); InitializeCriticalSection(&assoc->cs); + assoc->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcAssoc.cs"); assoc->Protseq = RPCRT4_strdupA(Protseq); assoc->NetworkAddr = RPCRT4_strdupA(NetworkAddr); assoc->Endpoint = RPCRT4_strdupA(Endpoint); @@ -213,6 +214,7 @@ ULONG RpcAssoc_Release(RpcAssoc *assoc) HeapFree(GetProcessHeap(), 0, assoc->NetworkAddr); HeapFree(GetProcessHeap(), 0, assoc->Protseq); + assoc->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&assoc->cs); HeapFree(GetProcessHeap(), 0, assoc); diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 438338b..558fbd8 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -931,6 +931,7 @@ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, const char *Protseq, RpcSe (*ps)->MaxCalls = 0; (*ps)->conn = NULL; InitializeCriticalSection(&(*ps)->cs); + (*ps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcServerProtseq.cs"); (*ps)->is_listening = FALSE; (*ps)->mgr_mutex = NULL; (*ps)->server_ready_event = NULL; @@ -946,6 +947,7 @@ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, const char *Protseq, RpcSe static void destroy_serverprotoseq(RpcServerProtseq *ps) { RPCRT4_strfree(ps->Protseq); + ps->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&ps->cs); CloseHandle(ps->mgr_mutex); CloseHandle(ps->server_ready_event); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4632f4a..6568683 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1863,6 +1863,7 @@ static ULONG RpcHttpAsyncData_Release(RpcHttpAsyncData *data) TRACE("destroying async data %p\n", data); CloseHandle(data->completion_event); HeapFree(GetProcessHeap(), 0, data->inet_buffers.lpvBuffer); + data->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&data->cs); HeapFree(GetProcessHeap(), 0, data); } @@ -1906,6 +1907,7 @@ static RpcConnection *rpcrt4_ncacn_http_alloc(void) httpc->async_data->inet_buffers.lpvBuffer = NULL; httpc->async_data->destination_buffer = NULL; InitializeCriticalSection(&httpc->async_data->cs); + httpc->async_data->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcHttpAsyncData.cs"); return &httpc->common; } diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 2d7a754..5976948 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -127,6 +127,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) list_remove(&tdata->entry); LeaveCriticalSection(&threaddata_cs); + tdata->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&tdata->cs); if (tdata->connection) ERR("tdata->connection should be NULL but is still set to %p\n", tdata->connection); @@ -888,6 +889,7 @@ static struct threaddata *get_or_create_threaddata(void) if (!tdata) return NULL; InitializeCriticalSection(&tdata->cs); + tdata->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": threaddata.cs"); tdata->thread_id = GetCurrentThreadId(); EnterCriticalSection(&threaddata_cs);

1 0

Francois Gouget : quartz/tests: Give a name to the critical sections.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 8560a654a8af20b4a9097816507ea71990d37615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8560a654a8af20b4a90978165… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 15:10:27 2011 +0100 quartz/tests: Give a name to the critical sections. --- dlls/quartz/tests/filtergraph.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e08f6c4..967a4ac 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1094,6 +1094,7 @@ static HRESULT createtestfilter(const CLSID* pClsid, const TestFilterPinData *pi pTestFilter->IBaseFilter_iface.lpVtbl = &TestFilter_Vtbl; pTestFilter->refCount = 1; InitializeCriticalSection(&pTestFilter->csFilter); + pTestFilter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TestFilterImpl.csFilter"); pTestFilter->state = State_Stopped; ZeroMemory(&pTestFilter->filterInfo, sizeof(FILTER_INFO)); @@ -1148,6 +1149,7 @@ static HRESULT createtestfilter(const CLSID* pClsid, const TestFilterPinData *pi } } CoTaskMemFree(pTestFilter->ppPins); + pTestFilter->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pTestFilter->csFilter); CoTaskMemFree(pTestFilter); @@ -1211,6 +1213,7 @@ static ULONG WINAPI TestFilter_Release(IBaseFilter * iface) CoTaskMemFree(This->ppPins); + This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); CoTaskMemFree(This);

1 0

Francois Gouget : qmgr: Give a name to the critical sections.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 7a30fbdcbfac8c7b13c76497af7c36561c72b909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a30fbdcbfac8c7b13c76497a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 15:10:44 2011 +0100 qmgr: Give a name to the critical sections. --- dlls/qmgr/job.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 09693a3..9d8d928 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); static void BackgroundCopyJobDestructor(BackgroundCopyJobImpl *This) { + This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); HeapFree(GetProcessHeap(), 0, This->displayName); HeapFree(GetProcessHeap(), 0, This); @@ -577,6 +578,8 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, This->lpVtbl = &BITS_IBackgroundCopyJob_Vtbl; InitializeCriticalSection(&This->cs); + This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BackgroundCopyJobImpl.cs"); + This->ref = 1; This->type = type; @@ -584,6 +587,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, This->displayName = HeapAlloc(GetProcessHeap(), 0, n); if (!This->displayName) { + This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; @@ -593,6 +597,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, hr = CoCreateGuid(&This->jobId); if (FAILED(hr)) { + This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); HeapFree(GetProcessHeap(), 0, This->displayName); HeapFree(GetProcessHeap(), 0, This);

1 0