March 2007 - Wine-Commits - list.winehq.org

Andrew Talbot : msi: Replace const pointer parameters with correct pointers to const.
by Alexandre Julliard March 6, 2007

March 6, 2007

Module: wine Branch: master Commit: 7a9b2183d4f17a825421d510773d583f60f4f648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9b2183d4f17a825421d5107… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Mar 5 18:58:55 2007 +0000 msi: Replace const pointer parameters with correct pointers to const. --- dlls/msi/custom.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index fc86691..1e3a866 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -457,7 +457,7 @@ static UINT wait_thread_handle( msi_custom_action_info *info ) return rc; } -static msi_custom_action_info *find_action_by_guid( const LPGUID guid ) +static msi_custom_action_info *find_action_by_guid( const GUID *guid ) { msi_custom_action_info *info; BOOL found = FALSE; @@ -481,7 +481,7 @@ static msi_custom_action_info *find_action_by_guid( const LPGUID guid ) return info; } -static DWORD WINAPI ACTION_CallDllFunction( const LPGUID guid ) +static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) { msi_custom_action_info *info; MsiCustomActionEntryPoint fn;

1 0

Mike Schaadt : snmpapi: Changed %llu to %x%08lx.
by Alexandre Julliard March 6, 2007

March 6, 2007

Module: wine Branch: master Commit: 26390a47c78e63677325496e05d0da42f4a5fb71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26390a47c78e63677325496e0… Author: Mike Schaadt <mschaadt(a)gmail.com> Date: Mon Mar 5 11:50:23 2007 -0600 snmpapi: Changed %llu to %x%08lx. --- dlls/snmpapi/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index b512d41..11a7b31 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -564,7 +564,7 @@ VOID WINAPI SnmpUtilPrintAsnAny(AsnAny *any) case ASN_TIMETICKS: TRACE("Timeticks %u\n", any->asnValue.ticks); return; case ASN_COUNTER64: { - TRACE("Counter64 %llu\n", any->asnValue.counter64.QuadPart); + TRACE("Counter64 %lx%08lx\n", (DWORD)(any->asnValue.counter64.QuadPart>>32),(DWORD)any->asnValue.counter64.QuadPart); return; } case ASN_OCTETSTRING:

1 0

Aric Stewart : gdi32: Set FontSubstitute values by locale.
by Alexandre Julliard March 6, 2007

March 6, 2007

Module: wine Branch: master Commit: 3744cd8874f864a7837c0244405d46dd603020b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3744cd8874f864a7837c02444… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 5 12:43:00 2007 +0900 gdi32: Set FontSubstitute values by locale. --- dlls/gdi32/freetype.c | 25 +++++++++++++++++++++++++ tools/wine.inf | 2 -- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0e3ecb5..3c35edb 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1732,67 +1732,84 @@ static const struct nls_update_font_list UINT ansi_cp, oem_cp; const char *oem, *fixed, *system; const char *courier, *serif, *small, *sserif; + /* these are for font substitute */ + const char *shelldlg, *tmsrmn; } nls_update_font_list[] = { /* Latin 1 (United States) */ { 1252, 437, "vgaoem.fon", "vgafix.fon", "vgasys.fon", "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", + "Tahoma","Times New Roman", }, /* Latin 1 (Multilingual) */ { 1252, 850, "vga850.fon", "vgafix.fon", "vgasys.fon", "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", + "Tahoma","Times New Roman", /* FIXME unverified */ }, /* Eastern Europe */ { 1250, 852, "vga852.fon", "vgafixe.fon", "vgasyse.fon", "couree.fon", "serifee.fon", "smallee.fon", "sserifee.fon", + "Tahoma","Times New Roman", /* FIXME unverified */ }, /* Cyrillic */ { 1251, 866, "vga866.fon", "vgafixr.fon", "vgasysr.fon", "courer.fon", "serifer.fon", "smaller.fon", "sserifer.fon", + "Tahoma","Times New Roman", /* FIXME unverified */ }, /* Greek */ { 1253, 737, "vga869.fon", "vgafixg.fon", "vgasysg.fon", "coureg.fon", "serifeg.fon", "smalleg.fon", "sserifeg.fon", + "Tahoma","Times New Roman", /* FIXME unverified */ }, /* Turkish */ { 1254, 857, "vga857.fon", "vgafixt.fon", "vgasyst.fon", "couret.fon", "serifet.fon", "smallet.fon", "sserifet.fon", + "Tahoma","Times New Roman", /* FIXME unverified */ }, /* Hebrew */ { 1255, 862, "vgaoem.fon", "vgaf1255.fon", "vgas1255.fon", "coue1255.fon", "sere1255.fon", "smae1255.fon", "ssee1255.fon", + "Tahoma","Times New Roman", /* FIXME unverified */ }, /* Arabic */ { 1256, 720, "vgaoem.fon", "vgaf1256.fon", "vgas1256.fon", "coue1256.fon", "sere1256.fon", "smae1256.fon", "ssee1256.fon", + "Tahoma","Times New Roman", /* FIXME unverified */ }, /* Baltic */ { 1257, 775, "vga775.fon", "vgaf1257.fon", "vgas1257.fon", "coue1257.fon", "sere1257.fon", "smae1257.fon", "ssee1257.fon", + "Tahoma","Times New Roman", /* FIXME unverified */ }, /* Vietnamese */ { 1258, 1258, "vga850.fon", "vgafix.fon", "vgasys.fon", "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", + "Tahoma","Times New Roman", /* FIXME unverified */ }, /* Thai */ { 874, 874, "vga850.fon", "vgaf874.fon", "vgas874.fon", "coure.fon", "serife.fon", "smalle.fon", "ssee874.fon", + "Tahoma","Times New Roman", /* FIXME unverified */ }, /* Japanese */ { 932, 932, "vga932.fon", "jvgafix.fon", "jvgasys.fon", "coure.fon", "serife.fon", "jsmalle.fon", "sserife.fon", + "MS UI Gothic","MS Serif", }, /* Chinese Simplified */ { 936, 936, "vga936.fon", "svgafix.fon", "svgasys.fon", "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", + "Tahoma", "Times New Roman", /* FIXME unverified */ }, /* Korean */ { 949, 949, "vga949.fon", "hvgafix.fon", "hvgasys.fon", "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", + "Tahoma", "Times New Roman", /* FIXME unverified */ }, /* Chinese Traditional */ { 950, 950, "vga950.fon", "cvgafix.fon", "cvgasys.fon", "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", + "Tahoma", "Times New Roman", /* FIXME unverified */ } }; @@ -1883,6 +1900,14 @@ static void update_font_info(void) add_font_list(hkey, &nls_update_font_list[i]); RegCloseKey(hkey); + if (!RegCreateKeyA( HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes", &hkey )) + { + RegSetValueExA(hkey, "MS Shell Dlg", 0, REG_SZ, (const BYTE *)nls_update_font_list[i].shelldlg, + strlen(nls_update_font_list[i].shelldlg)+1); + RegSetValueExA(hkey, "Tms Rmn", 0, REG_SZ, (const BYTE *)nls_update_font_list[i].tmsrmn, + strlen(nls_update_font_list[i].tmsrmn)+1); + RegCloseKey(hkey); + } return; } } diff --git a/tools/wine.inf b/tools/wine.inf index 7127629..6a878f6 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -251,14 +251,12 @@ HKLM,%FontSubStr%,"Courier New Greek,161",,"Courier New,161" HKLM,%FontSubStr%,"Courier New TUR,162",,"Courier New,162" HKLM,%FontSubStr%,"Helv",,"MS Sans Serif" HKLM,%FontSubStr%,"Helvetica",,"Arial" -HKLM,%FontSubStr%,"MS Shell Dlg",,"Tahoma" HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Tahoma" HKLM,%FontSubStr%,"Times",,"Times New Roman" HKLM,%FontSubStr%,"Times New Roman CE,238",,"Times New Roman,238" HKLM,%FontSubStr%,"Times New Roman CYR,204",,"Times New Roman,204" HKLM,%FontSubStr%,"Times New Roman Greek,161",,"Times New Roman,161" HKLM,%FontSubStr%,"Times New Roman TUR,162",,"Times New Roman,162" -HKLM,%FontSubStr%,"Tms Rmn",,"Times New Roman" HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixels",0x10003,0x00000060 [MCI]

1 0

Paul Vriens : gdi32/tests: Use skip where appropriate.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: a105c6b1de0d21c94332bbaf5c0005a08524ff57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a105c6b1de0d21c94332bbaf5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Mar 5 17:29:12 2007 +0100 gdi32/tests: Use skip where appropriate. --- dlls/gdi32/tests/font.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 44586bc..ce8d2fa 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -386,7 +386,12 @@ static void test_GdiGetCharDimensions(void) SIZE size; LONG avgwidth, height; static const char szAlphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - if (!pGdiGetCharDimensions) return; + + if (!pGdiGetCharDimensions) + { + skip("GetFontUnicodeRanges not available on this platform\n"); + return; + } hdc = CreateCompatibleDC(NULL); @@ -506,13 +511,13 @@ static void test_GetGlyphIndices() TEXTMETRIC textm; if (!pGetGlyphIndicesW) { - trace("GetGlyphIndices not available on platform\n"); + skip("GetGlyphIndices not available on platform\n"); return; } if(!is_font_installed("Symbol")) { - trace("Symbol is not installed so skipping this test\n"); + skip("Symbol is not installed so skipping this test\n"); return; }

1 0

Paul Vriens : gdi32/tests: Make sure we can run on win9x and NT again.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 37cba3a9f9214400ed5846195ac577642751d337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37cba3a9f9214400ed5846195… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Mar 5 17:29:04 2007 +0100 gdi32/tests: Make sure we can run on win9x and NT again. --- dlls/gdi32/tests/font.c | 60 +++++++++++++++++++++++++++++------------------ 1 files changed, 37 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 405d4bd..44586bc 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -30,9 +30,25 @@ #include "wine/test.h" +LONG (WINAPI *pGdiGetCharDimensions)(HDC hdc, LPTEXTMETRICW lptm, LONG *height); +BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); +DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); +static HMODULE hgdi32 = 0; + +static void init(void) +{ + hgdi32 = GetModuleHandleA("gdi32.dll"); + + pGdiGetCharDimensions = (void *)GetProcAddress(hgdi32, "GdiGetCharDimensions"); + pGetCharABCWidthsW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsW"); + pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); + pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); + pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW"); +} + static INT CALLBACK is_font_installed_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) { return 0; @@ -370,27 +386,25 @@ static void test_GdiGetCharDimensions(void) SIZE size; LONG avgwidth, height; static const char szAlphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - typedef LONG (WINAPI *fnGdiGetCharDimensions)(HDC hdc, LPTEXTMETRICW lptm, LONG *height); - fnGdiGetCharDimensions GdiGetCharDimensions = (fnGdiGetCharDimensions)GetProcAddress(LoadLibrary("gdi32"), "GdiGetCharDimensions"); - if (!GdiGetCharDimensions) return; + if (!pGdiGetCharDimensions) return; hdc = CreateCompatibleDC(NULL); GetTextExtentPoint(hdc, szAlphabet, strlen(szAlphabet), &size); avgwidth = ((size.cx / 26) + 1) / 2; - ret = GdiGetCharDimensions(hdc, &tm, &height); + ret = pGdiGetCharDimensions(hdc, &tm, &height); ok(ret == avgwidth, "GdiGetCharDimensions should have returned width of %d instead of %d\n", avgwidth, ret); ok(height == tm.tmHeight, "GdiGetCharDimensions should have set height to %d instead of %d\n", tm.tmHeight, height); - ret = GdiGetCharDimensions(hdc, &tm, NULL); + ret = pGdiGetCharDimensions(hdc, &tm, NULL); ok(ret == avgwidth, "GdiGetCharDimensions should have returned width of %d instead of %d\n", avgwidth, ret); - ret = GdiGetCharDimensions(hdc, NULL, NULL); + ret = pGdiGetCharDimensions(hdc, NULL, NULL); ok(ret == avgwidth, "GdiGetCharDimensions should have returned width of %d instead of %d\n", avgwidth, ret); height = 0; - ret = GdiGetCharDimensions(hdc, NULL, &height); + ret = pGdiGetCharDimensions(hdc, NULL, &height); ok(ret == avgwidth, "GdiGetCharDimensions should have returned width of %d instead of %d\n", avgwidth, ret); ok(height == size.cy, "GdiGetCharDimensions should have set height to %d instead of %d\n", size.cy, height); @@ -401,11 +415,9 @@ static void test_GetCharABCWidthsW(void) { BOOL ret; ABC abc[1]; - typedef BOOL (WINAPI *fnGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); - fnGetCharABCWidthsW GetCharABCWidthsW = (fnGetCharABCWidthsW)GetProcAddress(LoadLibrary("gdi32"), "GetCharABCWidthsW"); - if (!GetCharABCWidthsW) return; + if (!pGetCharABCWidthsW) return; - ret = GetCharABCWidthsW(NULL, 'a', 'a', abc); + ret = pGetCharABCWidthsW(NULL, 'a', 'a', abc); ok(!ret, "GetCharABCWidthsW should have returned FALSE\n"); } @@ -493,10 +505,7 @@ static void test_GetGlyphIndices() WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRIC textm; - typedef BOOL (WINAPI *fnGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); - fnGetGlyphIndicesW GetGlyphIndicesW = (fnGetGlyphIndicesW)GetProcAddress(LoadLibrary("gdi32"), - "GetGlyphIndicesW"); - if (!GetGlyphIndicesW) { + if (!pGetGlyphIndicesW) { trace("GetGlyphIndices not available on platform\n"); return; } @@ -516,11 +525,11 @@ static void test_GetGlyphIndices() ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); flags |= GGI_MARK_NONEXISTING_GLYPHS; - charcount = GetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); ok(glyphs[4] == 0x001f, "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]); flags = 0; - charcount = GetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndices should have returned a %04x not %04x\n", textm.tmDefaultChar, glyphs[4]); @@ -1048,9 +1057,6 @@ static void test_font_charset(void) }; int i; - pGetGlyphIndicesA = (void *)GetProcAddress(GetModuleHandle("gdi32.dll"), "GetGlyphIndicesA"); - pGetGlyphIndicesW = (void *)GetProcAddress(GetModuleHandle("gdi32.dll"), "GetGlyphIndicesW"); - if (!pGetGlyphIndicesA || !pGetGlyphIndicesW) { skip("Skipping the font charset test on a Win9x platform\n"); @@ -1096,6 +1102,12 @@ static void test_GetFontUnicodeRanges(void) DWORD size, i; GLYPHSET *gs; + if (!pGetFontUnicodeRanges) + { + skip("GetFontUnicodeRanges not available before W2K\n"); + return; + } + memset(&lf, 0, sizeof(lf)); lstrcpyA(lf.lfFaceName, "Arial"); hfont = create_font("Arial", &lf); @@ -1103,15 +1115,15 @@ static void test_GetFontUnicodeRanges(void) hdc = GetDC(0); hfont_old = SelectObject(hdc, hfont); - size = GetFontUnicodeRanges(NULL, NULL); + size = pGetFontUnicodeRanges(NULL, NULL); ok(!size, "GetFontUnicodeRanges succeeded unexpectedly\n"); - size = GetFontUnicodeRanges(hdc, NULL); + size = pGetFontUnicodeRanges(hdc, NULL); ok(size, "GetFontUnicodeRanges failed unexpectedly\n"); gs = HeapAlloc(GetProcessHeap(), 0, size); - size = GetFontUnicodeRanges(hdc, gs); + size = pGetFontUnicodeRanges(hdc, gs); ok(size, "GetFontUnicodeRanges failed\n"); for (i = 0; i < gs->cRanges; i++) @@ -1127,6 +1139,8 @@ static void test_GetFontUnicodeRanges(void) START_TEST(font) { + init(); + test_logfont(); test_bitmap_font(); test_bitmap_font_metrics();

1 0

Chris Robinson : quartz: Improve reference traces.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 0717c9619243a5169cfd369753b33b0040db4056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0717c9619243a5169cfd36975… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Mar 5 06:11:37 2007 -0800 quartz: Improve reference traces. --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/enumpins.c | 6 ++++-- dlls/quartz/filesource.c | 6 +++--- dlls/quartz/filtermapper.c | 4 ++-- dlls/quartz/parser.c | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 32c807c..9c03443 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -394,7 +394,7 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) DSoundRenderImpl *This = (DSoundRenderImpl *)iface; ULONG refCount = InterlockedDecrement(&This->refCount); - TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1); + TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (!refCount) { diff --git a/dlls/quartz/enumpins.c b/dlls/quartz/enumpins.c index 2a4b8f9..65e6759 100644 --- a/dlls/quartz/enumpins.c +++ b/dlls/quartz/enumpins.c @@ -47,6 +47,8 @@ HRESULT IEnumPinsImpl_Construct(const ENUMPINDETAILS * pDetails, IEnumPins ** pp pEnumPins->uIndex = 0; CopyMemory(&pEnumPins->enumPinDetails, pDetails, sizeof(ENUMPINDETAILS)); *ppEnum = (IEnumPins *)(&pEnumPins->lpVtbl); + + TRACE("Created new enumerator (%p)\n", *ppEnum); return S_OK; } @@ -77,7 +79,7 @@ static ULONG WINAPI IEnumPinsImpl_AddRef(IEnumPins * iface) IEnumPinsImpl *This = (IEnumPinsImpl *)iface; ULONG refCount = InterlockedIncrement(&This->refCount); - TRACE("()\n"); + TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); return refCount; } @@ -87,7 +89,7 @@ static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) IEnumPinsImpl *This = (IEnumPinsImpl *)iface; ULONG refCount = InterlockedDecrement(&This->refCount); - TRACE("()\n"); + TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (!refCount) { diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 01b9955..66a753f 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -362,7 +362,7 @@ static ULONG WINAPI AsyncReader_AddRef(IBaseFilter * iface) AsyncReader *This = (AsyncReader *)iface; ULONG refCount = InterlockedIncrement(&This->refCount); - TRACE("(%p/%p)->() AddRef from %d\n", This, iface, refCount - 1); + TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); return refCount; } @@ -372,7 +372,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) AsyncReader *This = (AsyncReader *)iface; ULONG refCount = InterlockedDecrement(&This->refCount); - TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1); + TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (!refCount) { @@ -751,7 +751,7 @@ static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) FileAsyncReader *This = (FileAsyncReader *)iface; ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); - TRACE("()\n"); + TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (!refCount) { diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index c7ac20a..e4c70a7 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -228,7 +228,7 @@ static ULONG WINAPI FilterMapper2_AddRef(IFilterMapper2 * iface) FilterMapper2Impl *This = (FilterMapper2Impl *)iface; ULONG refCount = InterlockedIncrement(&This->refCount); - TRACE("(%p)->()\n", iface); + TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); return refCount; } @@ -238,7 +238,7 @@ static ULONG WINAPI FilterMapper2_Release(IFilterMapper2 * iface) FilterMapper2Impl *This = (FilterMapper2Impl *)iface; ULONG refCount = InterlockedDecrement(&This->refCount); - TRACE("(%p)->()\n", iface); + TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (refCount == 0) { diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 13fa2bc..edcb9c7 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -179,7 +179,7 @@ static ULONG WINAPI Parser_Release(IBaseFilter * iface) ParserImpl *This = (ParserImpl *)iface; ULONG refCount = InterlockedDecrement(&This->refCount); - TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1); + TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (!refCount) { @@ -195,7 +195,7 @@ static ULONG WINAPI Parser_Release(IBaseFilter * iface) HeapFree(GetProcessHeap(), 0, This->ppPins); This->lpVtbl = NULL; - TRACE("Destroying AVI splitter\n"); + TRACE("Destroying parser\n"); CoTaskMemFree(This); return 0;

1 0

Alexandre Julliard : server: Replace use of internal __pthread_kill() function by a system call.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: b3fb3a67395959e9fe5e86d28cf5eb918e6ee86b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3fb3a67395959e9fe5e86d28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 5 17:09:54 2007 +0100 server: Replace use of internal __pthread_kill() function by a system call. --- server/mach.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/server/mach.c b/server/mach.c index 111953c..5996ba4 100644 --- a/server/mach.c +++ b/server/mach.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <errno.h> @@ -46,7 +47,20 @@ #include <mach/thread_act.h> #include <servers/bootstrap.h> -extern int __pthread_kill(mach_port_t, int); +#if defined(__APPLE__) && defined(__i386__) +extern int pthread_kill_syscall( mach_port_t, int ); +__ASM_GLOBAL_FUNC( pthread_kill_syscall, + "movl $328,%eax\n\t" /* SYS___pthread_kill */ + "int $0x80\n\t" + "jae 1f\n\t" + "negl %eax\n" + "1:\tret" ); +#else +static inline int pthread_kill_syscall( mach_port_t, int ) +{ + return -ENOSYS; +} +#endif static mach_port_t server_mach_port; @@ -232,7 +246,11 @@ int send_thread_signal( struct thread *thread, int sig ) if (!mach_port_extract_right( process_port, thread->unix_tid, MACH_MSG_TYPE_COPY_SEND, &port, &type )) { - ret = __pthread_kill( port, sig ); + if ((ret = pthread_kill_syscall( port, sig )) < 0) + { + errno = -ret; + ret = -1; + } mach_port_deallocate( mach_task_self(), port ); } else errno = ESRCH;

1 0

Paul Vriens : advapi32/tests: Move skip to a more appropriate place.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 69299c77387e7c3f26998f78a76be2a360ec4000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69299c77387e7c3f26998f78a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Mar 5 14:11:22 2007 +0100 advapi32/tests: Move skip to a more appropriate place. --- dlls/advapi32/tests/lsa.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 07dd611..8502e17 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -54,8 +54,6 @@ static BOOL init(void) if (pLsaClose && pLsaFreeMemory && pLsaOpenPolicy && pLsaQueryInformationPolicy && pConvertSidToStringSidA) return TRUE; - else - skip("Needed functions are not available\n"); } return FALSE; @@ -180,8 +178,10 @@ static void test_lsa(void) START_TEST(lsa) { - if (!init()) + if (!init()) { + skip("Needed functions are not available\n"); return; + } test_lsa(); }

1 0

Paul Vriens : advapi32/tests: Don't use FreeLibrary with GetModuleHandle.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 71697ec1168cb1f4be5b6a0169bc80e5814ad918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71697ec1168cb1f4be5b6a016… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Mar 5 14:11:17 2007 +0100 advapi32/tests: Don't use FreeLibrary with GetModuleHandle. --- dlls/advapi32/tests/crypt_md5.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/crypt_md5.c b/dlls/advapi32/tests/crypt_md5.c index 596184d..e6c1d63 100644 --- a/dlls/advapi32/tests/crypt_md5.c +++ b/dlls/advapi32/tests/crypt_md5.c @@ -86,7 +86,7 @@ static void test_md5_ctx(void) if (!pMD5Init || !pMD5Update || !pMD5Final) { skip("Needed functions are not available\n"); - goto out; + return; } memset( &ctx, 0, sizeof(ctx) ); @@ -102,9 +102,6 @@ static void test_md5_ctx(void) pMD5Final( &ctx ); ok( ctxcmp( &ctx, &ctx_initialized ), "context has changed\n" ); ok( !memcmp( ctx.digest, expect, sizeof(expect) ), "incorrect result\n" ); - -out: - FreeLibrary( module ); } START_TEST(crypt_md5)

1 0

Alexandre Julliard : clock: Make the window round in no title bar mode, to exercise SetWindowRgn.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 366dbd2f814f6619d8e252645ccec154b318f723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=366dbd2f814f6619d8e252645… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 5 16:42:30 2007 +0100 clock: Make the window round in no title bar mode, to exercise SetWindowRgn. --- programs/clock/main.c | 16 +++++++++++++++- programs/clock/winclock.c | 14 +++++++++----- programs/clock/winclock.h | 2 +- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/programs/clock/main.c b/programs/clock/main.c index 4dfef09..e1d2288 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -180,6 +180,7 @@ static VOID CLOCK_ToggleTitle(VOID) else { style = (style & ~(WS_POPUP|WS_THICKFRAME)) | WS_OVERLAPPEDWINDOW; SetMenu(Globals.hMainWnd, Globals.hMainMenu); + SetWindowRgn(Globals.hMainWnd, 0, TRUE); } SetWindowLong(Globals.hMainWnd, GWL_STYLE, style); SetWindowPos(Globals.hMainWnd, 0,0,0,0,0, @@ -311,7 +312,7 @@ static VOID CLOCK_Paint(HWND hWnd) FillRect(dcMem, &ps.rcPaint, GetStockObject(LTGRAY_BRUSH)); if(Globals.bAnalog) - AnalogClock(dcMem, Globals.MaxX, Globals.MaxY, Globals.bSeconds); + AnalogClock(dcMem, Globals.MaxX, Globals.MaxY, Globals.bSeconds, Globals.bWithoutTitle); else DigitalClock(dcMem, Globals.MaxX, Globals.MaxY, Globals.bSeconds, Globals.hFont); @@ -361,6 +362,19 @@ static LRESULT WINAPI CLOCK_WndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM case WM_SIZE: { Globals.MaxX = LOWORD(lParam); Globals.MaxY = HIWORD(lParam); + if (Globals.bAnalog && Globals.bWithoutTitle) + { + RECT rect; + INT diameter = min( Globals.MaxX, Globals.MaxY ); + HRGN hrgn = CreateEllipticRgn( (Globals.MaxX - diameter) / 2, + (Globals.MaxY - diameter) / 2, + (Globals.MaxX + diameter) / 2, + (Globals.MaxY + diameter) / 2 ); + GetWindowRect( hWnd, &rect ); + MapWindowPoints( 0, hWnd, (LPPOINT)&rect, 2 ); + OffsetRgn( hrgn, -rect.left, -rect.top ); + SetWindowRgn( Globals.hMainWnd, hrgn, TRUE ); + } CLOCK_ResetFont(); break; } diff --git a/programs/clock/winclock.c b/programs/clock/winclock.c index d699973..eb31eb1 100644 --- a/programs/clock/winclock.c +++ b/programs/clock/winclock.c @@ -82,7 +82,7 @@ static void DrawTicks(HDC dc, const POINT* centre, int radius) } } -static void DrawFace(HDC dc, const POINT* centre, int radius) +static void DrawFace(HDC dc, const POINT* centre, int radius, int border) { /* Ticks */ SelectObject(dc, CreatePen(PS_SOLID, 2, ShadowColor)); @@ -91,8 +91,12 @@ static void DrawFace(HDC dc, const POINT* centre, int radius) DeleteObject(SelectObject(dc, CreatePen(PS_SOLID, 2, TickColor))); OffsetWindowOrgEx(dc, SHADOW_DEPTH, SHADOW_DEPTH, NULL); DrawTicks(dc, centre, radius); - - DeleteObject(SelectObject(dc, GetStockObject(NULL_BRUSH))); + if (border) + { + SelectObject(dc, GetStockObject(NULL_BRUSH)); + DeleteObject(SelectObject(dc, CreatePen(PS_SOLID, 5, ShadowColor))); + Ellipse(dc, centre->x - radius, centre->y - radius, centre->x + radius, centre->y + radius); + } DeleteObject(SelectObject(dc, GetStockObject(NULL_PEN))); } @@ -159,7 +163,7 @@ static void PositionHands(const POINT* centre, int radius, BOOL bSeconds) PositionHand(centre, radius * 0.79, second/60 * 2*M_PI, &SecondHand); } -void AnalogClock(HDC dc, int x, int y, BOOL bSeconds) +void AnalogClock(HDC dc, int x, int y, BOOL bSeconds, BOOL border) { POINT centre; int radius; @@ -171,7 +175,7 @@ void AnalogClock(HDC dc, int x, int y, BOOL bSeconds) centre.x = x/2; centre.y = y/2; - DrawFace(dc, &centre, radius); + DrawFace(dc, &centre, radius, border); PositionHands(&centre, radius, bSeconds); DrawHands(dc, bSeconds); diff --git a/programs/clock/winclock.h b/programs/clock/winclock.h index 8cc0a85..bcd2637 100644 --- a/programs/clock/winclock.h +++ b/programs/clock/winclock.h @@ -21,6 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -void AnalogClock(HDC dc, int X, int Y, BOOL bSeconds); +void AnalogClock(HDC dc, int X, int Y, BOOL bSeconds, BOOL border); HFONT SizeFont(HDC dc, int x, int y, BOOL bSeconds, const LOGFONT* font); void DigitalClock(HDC dc, int X, int Y, BOOL bSeconds, HFONT font);

1 0