May 2010 - Wine-Commits - list.winehq.org

Jon Parshall : fonts: 8-pixel strikes for Tahoma font.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 8b8e15d81288027c7cecb8006aac5a4d75304968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8e15d81288027c7cecb8006… Author: Jon Parshall <jparshall(a)codeweavers.com> Date: Thu Apr 29 09:45:28 2010 -0500 fonts: 8-pixel strikes for Tahoma font. --- fonts/tahoma.sfd | 1146 ++++++++++++++++++++++++++++++++++++++++++++++++------ fonts/tahoma.ttf | Bin 89148 -> 94740 bytes 2 files changed, 1022 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b8e15d81288027c7cecb…

1 0

Nikolay Sivov : ole32/marshal: Compare with S_OK instead of keeping in mind that it's zero.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 286c5f8816a79f0fef0f9dd992ef0c61a55500e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=286c5f8816a79f0fef0f9dd99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 3 15:48:29 2010 +0400 ole32/marshal: Compare with S_OK instead of keeping in mind that it's zero. --- dlls/ole32/marshal.c | 45 +++++++++++++++++++++------------------------ 1 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 54a3a87..d14516f 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1214,16 +1214,13 @@ StdMarshalImpl_MarshalInterface( RPC_StartRemoting(apt); hres = marshal_object(apt, &stdobjref, riid, pv, mshlflags); - if (hres) + if (hres != S_OK) { ERR("Failed to create ifstub, hres=0x%x\n", hres); return hres; } - hres = IStream_Write(pStm, &stdobjref, sizeof(stdobjref), &res); - if (hres) return hres; - - return S_OK; + return IStream_Write(pStm, &stdobjref, sizeof(stdobjref), &res); } /* helper for StdMarshalImpl_UnmarshalInterface - does the unmarshaling with @@ -1321,10 +1318,10 @@ StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, v /* read STDOBJREF from wire */ hres = IStream_Read(pStm, &stdobjref, sizeof(stdobjref), &res); - if (hres) return STG_E_READFAULT; + if (hres != S_OK) return STG_E_READFAULT; hres = apartment_getoxid(apt, &oxid); - if (hres) return hres; + if (hres != S_OK) return hres; /* check if we're marshalling back to ourselves */ if ((oxid == stdobjref.oxid) && (stubmgr = get_stub_manager(apt, stdobjref.oid))) @@ -1374,7 +1371,7 @@ StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, v if (stubmgr) stub_manager_int_release(stubmgr); if (stub_apt) apartment_release(stub_apt); - if (hres) WARN("Failed with error 0x%08x\n", hres); + if (hres != S_OK) WARN("Failed with error 0x%08x\n", hres); else TRACE("Successfully created proxy %p\n", *ppv); return hres; @@ -1392,7 +1389,7 @@ StdMarshalImpl_ReleaseMarshalData(LPMARSHAL iface, IStream *pStm) TRACE("iface=%p, pStm=%p\n", iface, pStm); hres = IStream_Read(pStm, &stdobjref, sizeof(stdobjref), &res); - if (hres) return STG_E_READFAULT; + if (hres != S_OK) return STG_E_READFAULT; TRACE("oxid = %s, oid = %s, ipid = %s\n", wine_dbgstr_longlong(stdobjref.oxid), @@ -1516,7 +1513,7 @@ static HRESULT get_marshaler(REFIID riid, IUnknown *pUnk, DWORD dwDestContext, if (!pUnk) return E_POINTER; hr = IUnknown_QueryInterface(pUnk, &IID_IMarshal, (LPVOID*)pMarshal); - if (hr) + if (hr != S_OK) hr = CoGetStandardMarshal(riid, pUnk, dwDestContext, pvDestContext, mshlFlags, pMarshal); return hr; @@ -1537,7 +1534,7 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, /* read common OBJREF header */ hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); - if (hr || (res != FIELD_OFFSET(OBJREF, u_objref))) + if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) { ERR("Failed to read common OBJREF header, 0x%08x\n", hr); return STG_E_READFAULT; @@ -1566,7 +1563,7 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, /* read constant sized OR_CUSTOM data from stream */ hr = IStream_Read(stream, &objref.u_objref.u_custom, custom_header_size, &res); - if (hr || (res != custom_header_size)) + if (hr != S_OK || (res != custom_header_size)) { ERR("Failed to read OR_CUSTOM header, 0x%08x\n", hr); return STG_E_READFAULT; @@ -1583,7 +1580,7 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, return RPC_E_INVALID_OBJREF; } - if (hr) + if (hr != S_OK) ERR("Failed to create marshal, 0x%08x\n", hr); return hr; @@ -1618,12 +1615,12 @@ HRESULT WINAPI CoGetMarshalSizeMax(ULONG *pulSize, REFIID riid, IUnknown *pUnk, CLSID marshaler_clsid; hr = get_marshaler(riid, pUnk, dwDestContext, pvDestContext, mshlFlags, &pMarshal); - if (hr) + if (hr != S_OK) return hr; hr = IMarshal_GetUnmarshalClass(pMarshal, riid, pUnk, dwDestContext, pvDestContext, mshlFlags, &marshaler_clsid); - if (hr) + if (hr != S_OK) { ERR("IMarshal::GetUnmarshalClass failed, 0x%08x\n", hr); IMarshal_Release(pMarshal); @@ -1711,7 +1708,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *pStream, REFIID riid, IUnknown *pUnk, /* get the marshaler for the specified interface */ hr = get_marshaler(riid, pUnk, dwDestContext, pvDestContext, mshlFlags, &pMarshal); - if (hr) + if (hr != S_OK) { ERR("Failed to get marshaller, 0x%08x\n", hr); return hr; @@ -1719,7 +1716,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *pStream, REFIID riid, IUnknown *pUnk, hr = IMarshal_GetUnmarshalClass(pMarshal, riid, pUnk, dwDestContext, pvDestContext, mshlFlags, &marshaler_clsid); - if (hr) + if (hr != S_OK) { ERR("IMarshal::GetUnmarshalClass failed, 0x%08x\n", hr); goto cleanup; @@ -1733,7 +1730,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *pStream, REFIID riid, IUnknown *pUnk, /* write the common OBJREF header to the stream */ hr = IStream_Write(pStream, &objref, FIELD_OFFSET(OBJREF, u_objref), NULL); - if (hr) + if (hr != S_OK) { ERR("Failed to write OBJREF header to stream, 0x%08x\n", hr); goto cleanup; @@ -1749,7 +1746,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *pStream, REFIID riid, IUnknown *pUnk, hr = IMarshal_GetMarshalSizeMax(pMarshal, riid, pUnk, dwDestContext, pvDestContext, mshlFlags, &objref.u_objref.u_custom.size); - if (hr) + if (hr != S_OK) { ERR("Failed to get max size of marshal data, error 0x%08x\n", hr); goto cleanup; @@ -1757,7 +1754,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *pStream, REFIID riid, IUnknown *pUnk, /* write constant sized common header and OR_CUSTOM data into stream */ hr = IStream_Write(pStream, &objref, FIELD_OFFSET(OBJREF, u_objref.u_custom.pData), NULL); - if (hr) + if (hr != S_OK) { ERR("Failed to write OR_CUSTOM header to stream with 0x%08x\n", hr); goto cleanup; @@ -1769,7 +1766,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *pStream, REFIID riid, IUnknown *pUnk, hr = IMarshal_MarshalInterface(pMarshal, pStream, riid, pUnk, dwDestContext, pvDestContext, mshlFlags); - if (hr) + if (hr != S_OK) { ERR("Failed to marshal the interface %s, %x\n", debugstr_guid(riid), hr); goto cleanup; @@ -1821,7 +1818,7 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *pStream, REFIID riid, LPVOID *ppv) /* call the helper object to do the actual unmarshaling */ hr = IMarshal_UnmarshalInterface(pMarshal, pStream, &iid, (LPVOID*)&object); - if (hr) + if (hr != S_OK) ERR("IMarshal::UnmarshalInterface failed, 0x%08x\n", hr); if (hr == S_OK) @@ -1831,7 +1828,7 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *pStream, REFIID riid, LPVOID *ppv) { TRACE("requested interface != marshalled interface, additional QI needed\n"); hr = IUnknown_QueryInterface(object, riid, ppv); - if (hr) + if (hr != S_OK) ERR("Couldn't query for interface %s, hr = 0x%08x\n", debugstr_guid(riid), hr); IUnknown_Release(object); @@ -1885,7 +1882,7 @@ HRESULT WINAPI CoReleaseMarshalData(IStream *pStream) /* call the helper object to do the releasing of marshal data */ hr = IMarshal_ReleaseMarshalData(pMarshal, pStream); - if (hr) + if (hr != S_OK) ERR("IMarshal::ReleaseMarshalData failed with error 0x%08x\n", hr); IMarshal_Release(pMarshal);

1 0

André Hentschel : include: Add some error codes for rsaenh.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 2d08c88fd242254da7ef4c586e005c50b61e0dc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d08c88fd242254da7ef4c586… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 30 18:08:36 2010 +0200 include: Add some error codes for rsaenh. --- include/winerror.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index 8713ecc..516379d 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2219,6 +2219,10 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define NTE_BAD_KEYSET_PARAM _HRESULT_TYPEDEF_(0x8009001FL) #define NTE_FAIL _HRESULT_TYPEDEF_(0x80090020L) #define NTE_SYS_ERR _HRESULT_TYPEDEF_(0x80090021L) +#define NTE_SILENT_CONTEXT _HRESULT_TYPEDEF_(0x80090022L) +#define NTE_TOKEN_KEYSET_STORAGE_FULL _HRESULT_TYPEDEF_(0x80090023L) +#define NTE_TEMPORARY_PROFILE _HRESULT_TYPEDEF_(0x80090024L) +#define NTE_FIXEDPARAMETER _HRESULT_TYPEDEF_(0x80090025L) #define NTE_OP_OK _HRESULT_TYPEDEF_(0) #define SEC_E_INSUFFICIENT_MEMORY _HRESULT_TYPEDEF_(0x80090300L)

1 0

Gerald Pfeifer : comctl32/tests: Remove variable hwndheader which is not really used from test_items.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: a2edb3c55c89d7583ef5ae658f0263cd6b68d6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2edb3c55c89d7583ef5ae658… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon May 3 01:48:00 2010 +0200 comctl32/tests: Remove variable hwndheader which is not really used from test_items. --- dlls/comctl32/tests/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 176f323..a5dae75 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1194,7 +1194,7 @@ static void test_items(void) static void test_columns(void) { - HWND hwnd, hwndheader; + HWND hwnd; LVCOLUMNA column; LVITEMA item; INT order[2]; @@ -1220,7 +1220,7 @@ static void test_columns(void) /* LVM_GETCOLUMNORDERARRAY */ hwnd = create_listview_control(LVS_REPORT); - hwndheader = subclass_header(hwnd); + subclass_header(hwnd); memset(&column, 0, sizeof(column)); column.mask = LVCF_WIDTH;

1 0

Gerald Pfeifer : riched20: Remove variable di which is not really used from ME_InsertEndRowFromCursor .
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: f29514fbece1a0d1ad0323ba20d7718c1f5e18b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f29514fbece1a0d1ad0323ba2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 2 22:21:12 2010 +0200 riched20: Remove variable di which is not really used from ME_InsertEndRowFromCursor. --- dlls/riched20/caret.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 8360f06..29ff5a6 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -489,15 +489,14 @@ void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCur void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) { ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); - ME_DisplayItem *di; WCHAR space = ' '; /* FIXME no no no */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); - di = ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, - MERF_ENDROW); + ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, + MERF_ENDROW); ME_ReleaseStyle(pStyle); }

1 0

Gerald Pfeifer : winmm/tests: Remove variable start which is not really used from wave_out_test_deviceOut .
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 6a6749937bd543aa115d9320cee87d504b2275a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6749937bd543aa115d9320c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 2 22:09:46 2010 +0200 winmm/tests: Remove variable start which is not really used from wave_out_test_deviceOut. --- dlls/winmm/tests/wave.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 98a16f5..03f4af4 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -727,7 +727,6 @@ static void wave_out_test_deviceOut(int device, double duration, } if (interactive && rc==MMSYSERR_NOERROR) { - DWORD start; trace("Playing %g second %s at %5dx%2dx%d %2d header%s %d loop%s %d bytes %s %s\n",duration, sine ? "440Hz tone" : "silence",pwfx->nSamplesPerSec, pwfx->wBitsPerSample,pwfx->nChannels, headers, headers > 1 ? "s": " ", @@ -748,8 +747,6 @@ static void wave_out_test_deviceOut(int device, double duration, ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED, "waveOutSetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - start=GetTickCount(); - rc=waveOutWrite(wout, &frags[0], sizeof(frags[0])); ok(rc==MMSYSERR_NOERROR,"waveOutWrite(%s): rc=%s\n", dev_name(device),wave_out_error(rc));

1 0

André Hentschel : rsaenh: Fix a testfailure on Win7.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 7e1ffa87c3e09d3477b13eca0d05bdf1048cfb0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1ffa87c3e09d3477b13eca0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 30 18:06:13 2010 +0200 rsaenh: Fix a testfailure on Win7. --- dlls/rsaenh/tests/rsaenh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index cb560f2..d2ababf 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1803,8 +1803,8 @@ static void test_rsa_encrypt(void) /* An RSA key doesn't support salt */ result = CryptGetKeyParam(hRSAKey, KP_SALT, NULL, &dwLen, 0); - ok(!result && GetLastError() == NTE_BAD_KEY, - "expected NTE_BAD_KEY, got %08x\n", GetLastError()); + ok(!result && (GetLastError() == NTE_BAD_KEY || GetLastError() == NTE_NOT_FOUND /* Win7 */), + "expected NTE_BAD_KEY or NTE_NOT_FOUND, got %08x\n", GetLastError()); /* The key exchange key's public key may be exported.. */ result = CryptExportKey(hRSAKey, 0, PUBLICKEYBLOB, 0, NULL, &dwLen);

1 0

Gerald Pfeifer : mshtml/tests: Fix return value of ActiveScript_SetScriptState.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 5dac305bab9d29c2f5452e017c1be28821edba0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dac305bab9d29c2f5452e017… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 2 21:16:06 2010 +0200 mshtml/tests: Fix return value of ActiveScript_SetScriptState. --- dlls/mshtml/tests/script.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 56d83ef..dab2047 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1995,7 +1995,7 @@ static HRESULT WINAPI ActiveScript_SetScriptState(IActiveScript *iface, SCRIPTST } hres = IActiveScriptSite_OnStateChange(site, (state = ss)); - return S_OK; + return hres; } static HRESULT WINAPI ActiveScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE *pssState)

1 0

Gerald Pfeifer : widl: Simplify write_struct_tfs and remove an unused variable.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 194fd8744ad9752ffa614f50b35ea153b610e9c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=194fd8744ad9752ffa614f50b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 2 20:48:39 2010 +0200 widl: Simplify write_struct_tfs and remove an unused variable. --- tools/widl/typegen.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 694e98d..8541c5a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2452,7 +2452,6 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, unsigned int total_size; const var_t *array; unsigned int start_offset; - unsigned int array_offset; unsigned int align; unsigned int corroff; var_t *f; @@ -2473,10 +2472,12 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, array = find_array_or_string_in_struct(type); if (array && !processed(array->type)) - array_offset - = is_string_type(array->attrs, array->type) - ? write_string_tfs(file, array->attrs, array->type, FALSE, array->name, tfsoff) - : write_array_tfs(file, array->attrs, array->type, array->name, tfsoff); + { + if(is_string_type(array->attrs, array->type)) + write_string_tfs(file, array->attrs, array->type, FALSE, array->name, tfsoff); + else + write_array_tfs(file, array->attrs, array->type, array->name, tfsoff); + } corroff = *tfsoff; write_descriptors(file, type, tfsoff);

1 0

Gerald Pfeifer : ntoskrnl.exe: Remove variable retX which is not really used from emulate_instruction.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 9c69b23551557580953f0570e907cb86e8d9b1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c69b23551557580953f0570e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 2 21:20:53 2010 +0200 ntoskrnl.exe: Remove variable retX which is not really used from emulate_instruction. --- dlls/ntoskrnl.exe/instr.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 9d04823..e7046f4 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -260,7 +260,7 @@ static BYTE *INSTR_GetOperandAddr( CONTEXT86 *context, BYTE *instr, */ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ) { - int prefix, segprefix, prefixlen, len, repX, long_op, long_addr; + int prefix, segprefix, prefixlen, len, long_op, long_addr; BYTE *instr; long_op = long_addr = 1; @@ -271,7 +271,6 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ) segprefix = -1; /* no prefix */ prefix = 1; - repX = 0; prefixlen = 0; while(prefix) { @@ -304,10 +303,8 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ) case 0xf0: /* lock */ break; case 0xf2: /* repne */ - repX = 1; break; case 0xf3: /* repe */ - repX = 2; break; default: prefix = 0; /* no more prefixes */

1 0