January 2007 - Wine-commits

Christoph Bumiller : wined3d: Sampler variables wrongly named 'shader'.
by Alexandre Julliard 03 Jan '07

03 Jan '07

Module: wine Branch: master Commit: d905795503f28f8725c0f41bfb27479818bb5468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d905795503f28f8725c0f41bf… Author: Christoph Bumiller <e0425955(a)stud3.tuwien.ac.at> Date: Tue Jan 2 11:01:51 2007 +0100 wined3d: Sampler variables wrongly named 'shader'. --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4aed644..fd44111 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -843,13 +843,13 @@ static void shader_glsl_sample(SHADER_OP /* Note that there's no such thing as a projected cube texture. */ switch(sampler_type) { case WINED3DSTT_2D: - shader_addline(buffer, "%s = texture2DProj(%cshader%u, %s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); + shader_addline(buffer, "%s = texture2DProj(%csampler%u, %s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); break; case WINED3DSTT_VOLUME: - shader_addline(buffer, "%s = texture3DProj(%cshader%u, %s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); + shader_addline(buffer, "%s = texture3DProj(%csampler%u, %s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); break; default: - shader_addline(buffer, "%s = unrecognized_stype(%cshader%u, %s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); + shader_addline(buffer, "%s = unrecognized_stype(%csampler%u, %s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); FIXME("Unrecognized sampler type: %#x;\n", sampler_type); break; }

1 0

Robert Reif : dmusic: Implement just enough of IDirectMusicPortImpl_GetFormat
by Alexandre Julliard 03 Jan '07

03 Jan '07

Module: wine Branch: master Commit: 0b0b72ec35be1655247cf7128835138f58420b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b0b72ec35be1655247cf7128… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Jan 2 20:03:33 2007 -0500 dmusic: Implement just enough of IDirectMusicPortImpl_GetFormat to keep Direct Sound from crashing from unitialized data. --- dlls/dmusic/port.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 7329a87..63ee351 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -171,7 +171,45 @@ static HRESULT WINAPI IDirectMusicPortIm static HRESULT WINAPI IDirectMusicPortImpl_GetFormat (LPDIRECTMUSICPORT iface, LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSize, LPDWORD pdwBufferSize) { IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface; + WAVEFORMATEX format; FIXME("(%p, %p, %p, %p): stub\n", This, pWaveFormatEx, pdwWaveFormatExSize, pdwBufferSize); + + if (pWaveFormatEx == NULL) + { + if (pdwWaveFormatExSize) + *pdwWaveFormatExSize = sizeof(format); + else + return E_POINTER; + } + else + { + if (pdwWaveFormatExSize == NULL) + return E_POINTER; + + /* Just fill this in with something that will not crash Direct Sound for now. */ + /* It won't be used anyway until Performances are completed */ + format.wFormatTag = WAVE_FORMAT_PCM; + format.nChannels = 2; /* This->params.dwAudioChannels; */ + format.nSamplesPerSec = 44100; /* This->params.dwSampleRate; */ + format.wBitsPerSample = 16; /* FIXME: check this */ + format.nBlockAlign = (format.wBitsPerSample * format.nChannels) / 8; + format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign; + format.cbSize = 0; + + if (*pdwWaveFormatExSize >= sizeof(format)) + { + CopyMemory(pWaveFormatEx, &format, min(sizeof(format), *pdwWaveFormatExSize)); + *pdwWaveFormatExSize = sizeof(format); /* FIXME check if this is set */ + } + else + return E_POINTER; /* FIXME find right error */ + } + + if (pdwBufferSize) + *pdwBufferSize = 44100 * 2 * 2; + else + return E_POINTER; + return S_OK; }

1 0

Rob Shearman : oleaut32: Fix _nroffuncs to return the correct number of functions by taking into account inherited interfaces .
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: ecfe54df4637c2f0845c1d24c3f9bf8a5b624057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfe54df4637c2f0845c1d24c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 2 15:39:48 2007 +0000 oleaut32: Fix _nroffuncs to return the correct number of functions by taking into account inherited interfaces. --- dlls/oleaut32/tmarshal.c | 50 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index f3e93a7..6a5a6d3 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -324,18 +324,41 @@ _get_typeinfo_for_iid(REFIID riid, IType * the inheritance tree I think. */ static int _nroffuncs(ITypeInfo *tinfo) { - int n, max = 0; + int n, i, j; const FUNCDESC *fdesc; HRESULT hres; + TYPEATTR *attr; + ITypeInfo *tinfo2; n=0; + hres = ITypeInfo_GetTypeAttr(tinfo, &attr); + if (hres) { + ERR("GetTypeAttr failed with %x\n",hres); + return hres; + } + /* look in inherited ifaces. */ + for (j=0;j<attr->cImplTypes;j++) { + HREFTYPE href; + hres = ITypeInfo_GetRefTypeOfImplType(tinfo, j, &href); + if (hres) { + ERR("Did not find a reftype for interface offset %d?\n",j); + break; + } + hres = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); + if (hres) { + ERR("Did not find a typeinfo for reftype %d?\n",href); + continue; + } + n += _nroffuncs(tinfo2); + ITypeInfo_Release(tinfo2); + } + i = 0; while (1) { - hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo,n,&fdesc); + hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo,i,&fdesc); if (hres) - return max+1; - if (fdesc->oVft/4 > max) - max = fdesc->oVft/4; + return n; n++; + i++; } /*NOTREACHED*/ } @@ -1517,6 +1540,12 @@ PSFacBuf_CreateProxy( CoTaskMemFree(proxy); return E_OUTOFMEMORY; } + proxy->lpvtbl2 = &tmproxyvtable; + /* one reference for the proxy */ + proxy->ref = 1; + proxy->tinfo = tinfo; + memcpy(&proxy->iid,riid,sizeof(*riid)); + proxy->chanbuf = 0; InitializeCriticalSection(&proxy->crit); @@ -1598,6 +1627,11 @@ PSFacBuf_CreateProxy( (void **)&proxy->dispatch); IPSFactoryBuffer_Release(factory_buffer); } + if ((hres == S_OK) && (nroffuncs < 7)) + { + ERR("nroffuncs calculated incorrectly (%d)\n", nroffuncs); + hres = E_UNEXPECTED; + } if (hres == S_OK) { proxy->lpvtbl[3] = ProxyIDispatch_GetTypeInfoCount; @@ -1609,12 +1643,6 @@ PSFacBuf_CreateProxy( ITypeInfo_ReleaseTypeAttr(tinfo, typeattr); } - proxy->lpvtbl2 = &tmproxyvtable; - /* one reference for the proxy */ - proxy->ref = 1; - proxy->tinfo = tinfo; - memcpy(&proxy->iid,riid,sizeof(*riid)); - proxy->chanbuf = 0; if (hres == S_OK) { *ppv = (LPVOID)proxy;

1 0

Rob Shearman : rpcrt4: A NULL IfSpec in RpcServerUnregisterIf should remove all interfaces, not crash.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 776f81b3beb24cd9f36620722872f8ee5909502e URL: http://source.winehq.org/git/wine.git/?a=commit;h=776f81b3beb24cd9f36620722… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 2 15:39:54 2007 +0000 rpcrt4: A NULL IfSpec in RpcServerUnregisterIf should remove all interfaces, not crash. --- dlls/rpcrt4/rpc_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 50549ea..285ef09 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -831,7 +831,7 @@ RPC_STATUS WINAPI RpcServerUnregisterIf( EnterCriticalSection(&server_cs); LIST_FOR_EACH_ENTRY(cif, &server_interfaces, RpcServerInterface, entry) { - if (!memcmp(&If->InterfaceId, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER)) && + if ((!IfSpec || !memcmp(&If->InterfaceId, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER))) && UuidEqual(MgrTypeUuid, &cif->MgrTypeUuid, &status)) { list_remove(&cif->entry); if (cif->CurrentCalls) {

1 0

Rob Shearman : ole32: Fix the calculation of message_state-> prefix_data_len in two places where it would come out negative.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 7a5d5c5503362349c21a515c6de4d7752d0c4d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5d5c5503362349c21a515c6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 2 18:08:49 2007 +0000 ole32: Fix the calculation of message_state->prefix_data_len in two places where it would come out negative. --- dlls/ole32/rpc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index c52f6a3..c45e34e 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -856,7 +856,7 @@ static HRESULT WINAPI ClientRpcChannelBu if (FAILED(hr2)) hr = hr2; - message_state->prefix_data_len = original_buffer - (char *)msg->Buffer; + message_state->prefix_data_len = (char *)msg->Buffer - original_buffer; msg->BufferLength -= message_state->prefix_data_len; } else @@ -1237,7 +1237,7 @@ void RPC_ExecuteCall(struct dispatch_par goto exit; } - message_state->prefix_data_len = original_buffer - (char *)msg->Buffer; + message_state->prefix_data_len = (char *)msg->Buffer - original_buffer; message_state->binding_handle = msg->Handle; message_state->channel_hook_info.iid = params->iid;

1 0

Hans Leidekker : usp10: Downgrade some more FIXME's to TRACE's.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 21987d3dec23cd5cefa4e740e22de4b07eb4cf01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21987d3dec23cd5cefa4e740e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jan 2 15:31:34 2007 +0100 usp10: Downgrade some more FIXME's to TRACE's. --- dlls/usp10/usp10.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index e0fb917..8562c53 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -916,7 +916,7 @@ HRESULT WINAPI ScriptBreak(const WCHAR * { unsigned int i; - TRACE("(%p, %d, %p, %p)\n", chars, count, sa, la); + TRACE("(%s, %d, %p, %p)\n", debugstr_wn(chars, count), count, sa, la); if (!la) return S_FALSE; @@ -1244,8 +1244,8 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SC int cnt; HRESULT hr; - FIXME("(%p,%p,%s,%d,0x%x,%p): semi-stub\n", hdc, psc, debugstr_wn(pwcInChars,cChars), - cChars, dwFlags, pwOutGlyphs); + TRACE("(%p,%p,%s,%d,0x%x,%p)\n", hdc, psc, debugstr_wn(pwcInChars, cChars), + cChars, dwFlags, pwOutGlyphs); if ((hr = get_script_cache(hdc, psc))) return hr; @@ -1276,7 +1276,7 @@ HRESULT WINAPI ScriptTextOut(const HDC h { HRESULT hr; - TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p): stub\n", + TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, piAdvance, piJustify, pGoffset); @@ -1377,7 +1377,7 @@ HRESULT WINAPI ScriptLayout(int runs, co { int i, j = runs - 1, k = 0; - FIXME("(%d, %p, %p, %p): stub\n", runs, level, vistolog, logtovis); + TRACE("(%d, %p, %p, %p)\n", runs, level, vistolog, logtovis); if (!level || (!vistolog && !logtovis)) return E_INVALIDARG;

1 0

Hans Leidekker : usp10: Document ScriptFreeCache, ScriptGetFontProperties, ScriptStringFree and ScriptGetCMap.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 44fd9a2705e36cd069cf3787ef55585d3bf243a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fd9a2705e36cd069cf3787e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jan 2 16:11:10 2007 +0100 usp10: Document ScriptFreeCache, ScriptGetFontProperties, ScriptStringFree and ScriptGetCMap. --- dlls/usp10/usp10.c | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8562c53..68110e5 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -201,16 +201,25 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, /*********************************************************************** * ScriptFreeCache (USP10.@) * + * Free a script cache. + * + * PARAMS + * psc [I/O] Script cache. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. */ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) { TRACE("%p\n", psc); - if (psc) { - HeapFree ( GetProcessHeap(), 0, *psc); + if (psc) + { + HeapFree(GetProcessHeap(), 0, *psc); *psc = NULL; } - return 0; + return S_OK; } /*********************************************************************** @@ -244,6 +253,12 @@ HRESULT WINAPI ScriptGetProperties(const /*********************************************************************** * ScriptGetFontProperties (USP10.@) * + * Get information on special glyphs. + * + * PARAMS + * hdc [I] Device context. + * psc [I/O] Opaque pointer to a script cache. + * sfp [O] Font properties structure. */ HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPROPERTIES *sfp) { @@ -776,12 +791,21 @@ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_ /*********************************************************************** * ScriptStringFree (USP10.@) * + * Free a string analysis. + * + * PARAMS + * pssa [I] string analysis. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. */ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) { StringAnalysis* analysis; BOOL invalid; int i; + TRACE("(%p)\n",pssa); if(!pssa) @@ -1237,9 +1261,22 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRI /*********************************************************************** * ScriptGetCMap (USP10.@) * + * Retrieve glyph indices. + * + * PARAMS + * hdc [I] Device context. + * psc [I/O] Opaque pointer to a script cache. + * pwcInChars [I] Array of Unicode characters. + * cChars [I] Number of characters in pwcInChars. + * dwFlags [I] Flags. + * pwOutGlyphs [O] Buffer to receive the array of glyph indices. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. */ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars, - int cChars, DWORD dwFlags, WORD *pwOutGlyphs) + int cChars, DWORD dwFlags, WORD *pwOutGlyphs) { int cnt; HRESULT hr;

1 0

Dmitry Timoshkov : kernel32: Remove a line that was supposed to be deleted by the previous patch.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 361ea6e4dc305ffe79f3a911edbcb098b22d0de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=361ea6e4dc305ffe79f3a911e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jan 2 21:23:54 2007 +0800 kernel32: Remove a line that was supposed to be deleted by the previous patch. --- dlls/kernel32/tests/locale.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index fd80797..d2158be 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -180,7 +180,6 @@ static void test_GetTimeFormatA(void) curtime.wMilliseconds = 22; STRINGSA("tt HH':'mm'@'ss", "AM 08:56(a)13"); /* Valid time */ SetLastError(0xdeadbeef); - ret = GetTimeFormatA(lcid, NUO|TIME_FORCE24HOURFORMAT, &curtime, input, buffer, COUNTOF(buffer)); ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_VALID; EXPECT_LENA; EXPECT_EQA;

1 0

Eric Pouech : msvcrt: execl fix when no args are given ( reported by Louis Lenders).
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 262cf1547e1eb11176665354b4579b3e6d212063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=262cf1547e1eb11176665354b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Jan 2 14:31:27 2007 +0100 msvcrt: execl fix when no args are given (reported by Louis Lenders). --- dlls/msvcrt/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index ac44065..b6497b4 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -147,7 +147,7 @@ static char* msvcrt_valisttos(const char # endif #endif - if (!arg0 && !delim) + if (!arg0) { /* Return NULL for an empty environment list */ return NULL;

1 0

Hans Leidekker : kernel32: Add a stub implementation for TermsrvAppInstallMode.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: a2705da37860d25b4946d9b686f7318815219ae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2705da37860d25b4946d9b68… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jan 2 15:22:44 2007 +0100 kernel32: Add a stub implementation for TermsrvAppInstallMode. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/version.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9eba016..903557f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1057,7 +1057,7 @@ @ stub TerminateJobObject @ stdcall TerminateProcess(long long) @ stdcall TerminateThread(long long) -@ stub TermsrvAppInstallMode +@ stdcall TermsrvAppInstallMode() @ stdcall Thread32First(long ptr) @ stdcall Thread32Next(long ptr) @ stdcall ThunkConnect32(ptr str str str ptr ptr) diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index 494e41d..811c426 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -363,3 +363,14 @@ void WINAPI DiagOutput16(LPCSTR str) /* FIXME */ TRACE("DIAGOUTPUT:%s\n", debugstr_a(str)); } + +/*********************************************************************** + * TermsrvAppInstallMode (KERNEL32.@) + * + * Find out whether the terminal server is in INSTALL or EXECUTE mode. + */ +BOOL WINAPI TermsrvAppInstallMode(void) +{ + FIXME("stub\n"); + return FALSE; +}

1 0