July 2008 - Wine-Commits - list.winehq.org

Francois Gouget : wined3d: Move float_32_to_16() to surface_base. c which is the only place where it's used, and because it needs port. h for isinf().
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: 8320d214d470876efb4a7377fa88e5ba91776ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8320d214d470876efb4a7377f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 10 00:23:07 2008 +0200 wined3d: Move float_32_to_16() to surface_base.c which is the only place where it's used, and because it needs port.h for isinf(). --- dlls/wined3d/surface_base.c | 51 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 51 +-------------------------------------- 2 files changed, 53 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 7536706..183cd2b 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -34,6 +34,57 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); +/* See also float_16_to_32() in wined3d_private.h */ +static inline unsigned short float_32_to_16(const float *in) +{ + int exp = 0; + float tmp = fabs(*in); + unsigned int mantissa; + unsigned short ret; + + /* Deal with special numbers */ + if(*in == 0.0) return 0x0000; + if(isnan(*in)) return 0x7C01; + if(isinf(*in)) return (*in < 0.0 ? 0xFC00 : 0x7c00); + + if(tmp < pow(2, 10)) { + do + { + tmp = tmp * 2.0; + exp--; + }while(tmp < pow(2, 10)); + } else if(tmp >= pow(2, 11)) { + do + { + tmp /= 2.0; + exp++; + }while(tmp >= pow(2, 11)); + } + + mantissa = (unsigned int) tmp; + if(tmp - mantissa >= 0.5) mantissa++; /* round to nearest, away from zero */ + + exp += 10; /* Normalize the mantissa */ + exp += 15; /* Exponent is encoded with excess 15 */ + + if(exp > 30) { /* too big */ + ret = 0x7c00; /* INF */ + } else if(exp <= 0) { + /* exp == 0: Non-normalized mantissa. Returns 0x0000 (=0.0) for too small numbers */ + while(exp <= 0) { + mantissa = mantissa >> 1; + exp++; + } + ret = mantissa & 0x3ff; + } else { + ret = (exp << 10) | (mantissa & 0x3ff); + } + + ret |= ((*in < 0.0 ? 1 : 0) << 15); /* Add the sign */ + return ret; +} + + /* Do NOT define GLINFO_LOCATION in this file. THIS CODE MUST NOT USE IT */ /* ******************************************* diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 808d9bf..b11a3f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -126,7 +126,8 @@ void init_type_lookup(WineD3D_GL_Info *gl_info); #define WINED3D_ATR_NORMALIZED(type) GLINFO_LOCATION.glTypeLookup[type].normalized #define WINED3D_ATR_TYPESIZE(type) GLINFO_LOCATION.glTypeLookup[type].typesize -/* The following functions convert 16 bit floats in the FLOAT16 data type +/* float_16_to_32() and float_32_to_16() (see implementation in + * surface_base.c) convert 16 bit floats in the FLOAT16 data type * to standard C floats and vice versa. They do not depend on the encoding * of the C float, so they are platform independent, but slow. On x86 and * other IEEE 754 compliant platforms the conversion can be accelerated by @@ -152,54 +153,6 @@ static inline float float_16_to_32(const unsigned short *in) { } } -static inline unsigned short float_32_to_16(const float *in) { - int exp = 0; - float tmp = fabs(*in); - unsigned int mantissa; - unsigned short ret; - - /* Deal with special numbers */ - if(*in == 0.0) return 0x0000; - if(isnan(*in)) return 0x7C01; - if(isinf(*in)) return (*in < 0.0 ? 0xFC00 : 0x7c00); - - if(tmp < pow(2, 10)) { - do - { - tmp = tmp * 2.0; - exp--; - }while(tmp < pow(2, 10)); - } else if(tmp >= pow(2, 11)) { - do - { - tmp /= 2.0; - exp++; - }while(tmp >= pow(2, 11)); - } - - mantissa = (unsigned int) tmp; - if(tmp - mantissa >= 0.5) mantissa++; /* round to nearest, away from zero */ - - exp += 10; /* Normalize the mantissa */ - exp += 15; /* Exponent is encoded with excess 15 */ - - if(exp > 30) { /* too big */ - ret = 0x7c00; /* INF */ - } else if(exp <= 0) { - /* exp == 0: Non-normalized mantissa. Returns 0x0000 (=0.0) for too small numbers */ - while(exp <= 0) { - mantissa = mantissa >> 1; - exp++; - } - ret = mantissa & 0x3ff; - } else { - ret = (exp << 10) | (mantissa & 0x3ff); - } - - ret |= ((*in < 0.0 ? 1 : 0) << 15); /* Add the sign */ - return ret; -} - /** * Settings */

1 0

Andrew Talbot : dmband: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: 32a21e2e7165ef6849a06147e542dd6f14514bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a21e2e7165ef6849a06147e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 9 20:36:51 2008 +0100 dmband: Remove unneeded address-of operators from array names. --- dlls/dmband/dmutils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index a126513..bfec1f1 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -180,13 +180,13 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* p case DMUS_FOURCC_NAME_CHUNK: { TRACE_(dmfile)(": name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, &pDesc->wszName, pChunk->dwSize, NULL); + IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_FILE_CHUNK: { TRACE_(dmfile)(": file name chunk\n"); pDesc->dwValidData |= DMUS_OBJ_FILENAME; - IStream_Read (pStm, &pDesc->wszFileName, pChunk->dwSize, NULL); + IStream_Read (pStm, pDesc->wszFileName, pChunk->dwSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: {

1 0

Andrew Talbot : dinput: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: 0993244b08df3edbc849fadd35b120c2c9526fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0993244b08df3edbc849fadd3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 9 20:36:48 2008 +0100 dinput: Remove unneeded address-of operators from array names. --- dlls/dinput/effect_linuxinput.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 1fef4cd..9b1cb1b 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -875,7 +875,7 @@ HRESULT linuxinput_get_info_A( info->dwDynamicParams = info->dwStaticParams; /* yes, this is windows behavior (print the GUID_Name for name) */ - strcpy((char*)&(info->tszName), _dump_dinput_GUID(rguid)); + strcpy((char*)info->tszName, _dump_dinput_GUID(rguid)); return DI_OK; } @@ -910,7 +910,7 @@ HRESULT linuxinput_get_info_W( /* yes, this is windows behavior (print the GUID_Name for name) */ MultiByteToWideChar(CP_ACP, 0, _dump_dinput_GUID(rguid), -1, - (WCHAR*)&(info->tszName), MAX_PATH); + (WCHAR*)info->tszName, MAX_PATH); return DI_OK; }

1 0

Francois Gouget : gdiplus/tests: Spelling fix.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: 4b1f6310d96c6da4e6a13d117fa4ed247f63c6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1f6310d96c6da4e6a13d117… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 10 00:24:46 2008 +0200 gdiplus/tests: Spelling fix. --- dlls/gdiplus/tests/font.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 8bf1289..96ed64c 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -25,7 +25,7 @@ #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) static const WCHAR arial[] = {'A','r','i','a','l','\0'}; -static const WCHAR nonexistant[] = {'T','h','i','s','F','o','n','t','s','h','o','u','l','d','N','o','t','E','x','i','s','t','\0'}; +static const WCHAR nonexistent[] = {'T','h','i','s','F','o','n','t','s','h','o','u','l','d','N','o','t','E','x','i','s','t','\0'}; static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; @@ -48,7 +48,7 @@ static void test_createfont(void) UINT i; REAL size; - stat = GdipCreateFontFamilyFromName(nonexistant, NULL, &fontfamily); + stat = GdipCreateFontFamilyFromName(nonexistent, NULL, &fontfamily); expect (FontFamilyNotFound, stat); stat = GdipDeleteFont(font); expect (InvalidParameter, stat); @@ -161,10 +161,10 @@ static void test_fontfamily (void) /* FontFamily must be able to actually find the family. * If it can't, any subsequent calls should fail. */ - stat = GdipCreateFontFamilyFromName (nonexistant, NULL, &family); + stat = GdipCreateFontFamilyFromName (nonexistent, NULL, &family); expect (FontFamilyNotFound, stat); - ok ((lstrcmpiW(itsName, nonexistant) != 0), - "Expected a non-zero value for nonexistant font!\n"); + ok ((lstrcmpiW(itsName, nonexistent) != 0), + "Expected a non-zero value for nonexistent font!\n"); /* Bitmap fonts are not found */ todo_wine

1 0

Francois Gouget : msxml3/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: c3a952eb485597541736ba0e75880f9449b7e43a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a952eb485597541736ba0e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 10 00:23:43 2008 +0200 msxml3/tests: Add a trailing '\n' to ok() calls. --- dlls/msxml3/tests/domdoc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f914e09..3745fca 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1170,17 +1170,17 @@ todo_wine ok( r == E_INVALIDARG, "ret %08x\n", r ); r = IXMLDOMNodeList_get_item(list, 0, NULL); - ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x", r); + ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x\n", r); r = IXMLDOMNodeList_get_length(list, NULL); - ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x", r); + ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x\n", r); r = IXMLDOMNodeList_get_length( list, &count ); ok( r == S_OK, "get_length returns %08x\n", r ); ok( count == 4, "get_length got %ld\n", count ); r = IXMLDOMNodeList_nextNode(list, NULL); - ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x", r); + ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x\n", r); r = IXMLDOMNodeList_nextNode( list, &node ); ok( r == S_OK, "nextNode returned wrong code\n");

1 0

Francois Gouget : rpcss: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: 888cf5a4af96814d69056f63e41329466af6d2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=888cf5a4af96814d69056f63e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 10 00:26:43 2008 +0200 rpcss: Add a trailing '\n' to a Wine trace. --- programs/rpcss/epmp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/rpcss/epmp.c b/programs/rpcss/epmp.c index cf14be8..e731e06 100644 --- a/programs/rpcss/epmp.c +++ b/programs/rpcss/epmp.c @@ -86,7 +86,7 @@ static struct registered_ept_entry *find_ept_entry( void __RPC_USER ept_lookup_handle_t_rundown(ept_lookup_handle_t entry_handle) { - WINE_FIXME("%p", entry_handle); + WINE_FIXME("%p\n", entry_handle); } void ept_insert(handle_t h,

1 0

Michael Stefaniuc : quartz: Compare a file handle to INVALID_HANDLE_VALUE and not NULL.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: 310b58994cae46289b0b685b276814d68fecec98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=310b58994cae46289b0b685b2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 9 23:54:28 2008 +0200 quartz: Compare a file handle to INVALID_HANDLE_VALUE and not NULL. --- dlls/quartz/tests/avisplitter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 3dd1615..d3cdaac 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -203,7 +203,7 @@ static void test_threads() file = CreateFileW(wfile, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); - if (!file) + if (file == INVALID_HANDLE_VALUE) { skip("Could not read test file \"%s\", skipping test\n", afile); return;

1 0

Maarten Lankhorst : quartz: Fix deadlocks in dsound renderer.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: adcf93aeaf446d657685cee8976365980499fb69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adcf93aeaf446d657685cee89… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jul 9 10:21:30 2008 -0700 quartz: Fix deadlocks in dsound renderer. --- dlls/quartz/dsoundrender.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 618f073..7a6ec3d 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -265,6 +265,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) if (FAILED(hr)) { ERR("Cannot get pointer to sample data (%x)\n", hr); + LeaveCriticalSection(&This->csFilter); return hr; } @@ -281,6 +282,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) if (IMediaSample_IsPreroll(pSample) == S_OK) { TRACE("Preroll!\n"); + LeaveCriticalSection(&This->csFilter); return S_OK; } @@ -298,6 +300,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) if (This->state == State_Paused) { /* Assuming we return because of flushing */ + TRACE("Flushing\n"); LeaveCriticalSection(&This->csFilter); return S_OK; } @@ -887,7 +890,12 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) EnterCriticalSection(This->pin.pCritSec); TRACE("(%p/%p)->()\n", This, iface); - InputPin_EndOfStream(iface); + hr = InputPin_EndOfStream(iface); + if (hr != S_OK) + { + ERR("%08x\n", hr); + return hr; + } hr = IFilterGraph_QueryInterface(me->filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); if (SUCCEEDED(hr))

1 0

Francois Gouget : winhlp32: Remove spaces before '...'.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: bfc133f19b7c7d38bbdcc02803e2f3d832a87f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc133f19b7c7d38bbdcc0280… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 10 00:20:50 2008 +0200 winhlp32: Remove spaces before '...'. --- programs/winhlp32/No.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winhlp32/No.rc b/programs/winhlp32/No.rc index 2301c7c..b31df01 100644 --- a/programs/winhlp32/No.rc +++ b/programs/winhlp32/No.rc @@ -26,17 +26,17 @@ MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL MENUITEM "&�pne", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "Skriv &ut", MNID_FILE_PRINT - MENUITEM "Opp&sett av skriveren ...", MNID_FILE_SETUP + MENUITEM "Opp&sett av skriveren...", MNID_FILE_SETUP MENUITEM SEPARATOR MENUITEM "&Avslutt", MNID_FILE_EXIT } POPUP "R&ediger" { - MENUITEM "&Kopier ...", MNID_EDIT_COPYDLG + MENUITEM "&Kopier...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "K&ommenter ...", MNID_EDIT_ANNOTATE + MENUITEM "K&ommenter...", MNID_EDIT_ANNOTATE } POPUP "&Bokmerke" { - MENUITEM "&Definer ...", MNID_BKMK_DEFINE + MENUITEM "&Definer...", MNID_BKMK_DEFINE } POPUP "&Innstillinger" { POPUP "Synlighet" @@ -58,7 +58,7 @@ MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL MENUITEM "&Hjelp til Hjelp", MNID_HELP_HELPON MENUITEM "All&tid �verst", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Informasjon ...", MNID_HELP_ABOUT + MENUITEM "&Informasjon...", MNID_HELP_ABOUT #ifdef WINELIB MENUITEM "&Om Wine", MNID_HELP_WINE #endif @@ -98,9 +98,9 @@ CONTEXT_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL BEGIN POPUP "" BEGIN - MENUITEM "Kommentar ...", MNID_CTXT_ANNOTATE + MENUITEM "Kommentar...", MNID_CTXT_ANNOTATE MENUITEM "Kopier", MNID_CTXT_COPY - MENUITEM "Skriv ut ...", MNID_CTXT_PRINT + MENUITEM "Skriv ut...", MNID_CTXT_PRINT POPUP "Skriftst�rrelse" BEGIN MENUITEM "Liten", MNID_CTXT_FONTS_SMALL

1 0

Jacek Caban : shlwapi: Fixed UrlCanonicalizeW for URLs without slashes after scheme.
by Alexandre Julliard July 10, 2008

July 10, 2008

Module: wine Branch: master Commit: a4ea1c608a198069147a10dae8ad40d2b0e25a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ea1c608a198069147a10dae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 9 20:01:57 2008 +0200 shlwapi: Fixed UrlCanonicalizeW for URLs without slashes after scheme. --- dlls/shlwapi/tests/url.c | 1 + dlls/shlwapi/url.c | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 3b0633a..4eb581f 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -103,6 +103,7 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"res:///c:\\tests\\foo bar", URL_DONT_SIMPLIFY, S_OK, "res:///c:\\tests\\foo bar", TRUE}, {"A", 0, S_OK, "A", FALSE}, {"/uri-res/N2R?urn:sha1:B3K", URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/, S_OK, "/uri-res/N2R?urn:sha1:B3K", TRUE} /*LimeWire online installer calls this*/, + {"http:www.winehq.org/dir/../index.html", 0, S_OK, "http:www.winehq.org/index.html"}, {"", 0, S_OK, "", FALSE} }; diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 2efe386..00d319d 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -384,7 +384,6 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, if (*wk1++ == ':') state = 2; break; case 2: - if (*wk1 != '/') {state = 3; break;} *wk2++ = *wk1++; if (*wk1 != '/') {state = 6; break;} *wk2++ = *wk1++;

1 0