wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Rob Shearman : Revert "widl: A structure that contains an embedded interface ptr in an array is a BOGUS_STRUCT .".
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: d59ff2007d67e150eb85511c2c522b9bb39d51e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d59ff2007d67e150eb85511c2… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 13:29:19 2009 +0100 Revert "widl: A structure that contains an embedded interface ptr in an array is a BOGUS_STRUCT.". This reverts commit e4e21193c049085dffe9475c9c9bdf9ae6807401. The IDBProperties test shows that this special case is not needed to for these types to be marshalled correctly. --- tools/widl/typegen.c | 62 +------------------------------------------------- 1 files changed, 1 insertions(+), 61 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b41dcbe..1f8e4fe 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -229,64 +229,6 @@ enum typegen_type typegen_detect_type(const type_t *type, const attr_list_t *att return TGT_INVALID; } -static type_t *get_user_type(const type_t *t, const char **pname); - -static int type_contains_iface(const type_t *type) -{ - enum typegen_type typegen_type; - var_list_t *fields; - const var_t *field; - - typegen_type = typegen_detect_type(type, type->attrs, TDT_IGNORE_STRINGS); - - switch(typegen_type) - { - case TGT_USER_TYPE: - return type_contains_iface(get_user_type(type, NULL)); - - case TGT_BASIC: - case TGT_ENUM: - return FALSE; - - case TGT_POINTER: - return type_contains_iface(type_pointer_get_ref(type)); - - case TGT_ARRAY: - return type_contains_iface(type_array_get_element(type)); - - case TGT_IFACE_POINTER: - return TRUE; - - case TGT_STRUCT: - fields = type_struct_get_fields(type); - if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) - { - if(type_contains_iface(field->type)) - return TRUE; - } - return FALSE; - - case TGT_UNION: - fields = type_union_get_cases(type); - if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) - { - if(field->type && type_contains_iface(field->type)) - return TRUE; - } - return FALSE; - - case TGT_STRING: - /* shouldn't get here because of TDT_IGNORE_STRINGS above. fall through */ - case TGT_INVALID: - case TGT_CTXT_HANDLE: - case TGT_CTXT_HANDLE_POINTER: - /* checking after parsing should mean that we don't get here. if we do, - * it's a checker bug */ - assert(0); - } - return FALSE; -} - unsigned char get_struct_fc(const type_t *type) { int has_pointer = 0; @@ -345,10 +287,8 @@ unsigned char get_struct_fc(const type_t *type) if (get_enum_fc(t) == RPC_FC_ENUM16) return RPC_FC_BOGUS_STRUCT; break; - case TGT_ARRAY: - if(type_contains_iface(type_array_get_element(t))) - return RPC_FC_BOGUS_STRUCT; case TGT_POINTER: + case TGT_ARRAY: if (get_pointer_fc(t, field->attrs, FALSE) == RPC_FC_RP || pointer_size != 4) return RPC_FC_BOGUS_STRUCT; has_pointer = 1;

1 0

Rob Shearman : oledb32: Add test for marshalling IDBProperties.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: d5ef09409d202eb9f4437e33bea5ae2242d85ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ef09409d202eb9f4437e33b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 13:29:11 2009 +0100 oledb32: Add test for marshalling IDBProperties. --- dlls/oledb32/tests/Makefile.in | 5 +- dlls/oledb32/tests/marshal.c | 271 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 274 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5ef09409d202eb9f4437…

1 0

Rob Shearman : msdaps: Implement IDBProperties_GetProperties_Proxy and IDBProperties_GetProperties_Stub .
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: da4f7a5dc128dfa55c6f4e038c7e6c2bd3d4196f URL: http://source.winehq.org/git/wine.git/?a=commit;h=da4f7a5dc128dfa55c6f4e038… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 13:29:04 2009 +0100 msdaps: Implement IDBProperties_GetProperties_Proxy and IDBProperties_GetProperties_Stub. --- dlls/msdaps/usrmarshal.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 5752404..2337b5e 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -100,17 +100,34 @@ HRESULT __RPC_STUB IDBCreateSession_CreateSession_Stub(IDBCreateSession* This, I HRESULT CALLBACK IDBProperties_GetProperties_Proxy(IDBProperties* This, ULONG cPropertyIDSets, const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertySets, DBPROPSET **prgPropertySets) { - FIXME("(%p, %d, %p, %p, %p): stub\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, + HRESULT hr; + IErrorInfo *error; + + TRACE("(%p, %d, %p, %p, %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); - return E_NOTIMPL; + hr = IDBProperties_RemoteGetProperties_Proxy(This, cPropertyIDSets, rgPropertyIDSets, + pcPropertySets, prgPropertySets, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + return hr; } HRESULT __RPC_STUB IDBProperties_GetProperties_Stub(IDBProperties* This, ULONG cPropertyIDSets, const DBPROPIDSET *rgPropertyIDSets, ULONG *pcPropertySets, DBPROPSET **prgPropertySets, IErrorInfo **ppErrorInfoRem) { - FIXME("(%p, %d, %p, %p, %p, %p): stub\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, + HRESULT hr; + + TRACE("(%p, %d, %p, %p, %p, %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets, ppErrorInfoRem); - return E_NOTIMPL; + *ppErrorInfoRem = NULL; + hr = IDBProperties_GetProperties(This, cPropertyIDSets, rgPropertyIDSets, + pcPropertySets, prgPropertySets); + if(FAILED(hr)) GetErrorInfo(0, ppErrorInfoRem); + + return hr; } HRESULT CALLBACK IDBProperties_GetPropertyInfo_Proxy(IDBProperties* This, ULONG cPropertyIDSets, const DBPROPIDSET rgPropertyIDSets[],

1 0

Marcus Meissner : crypt32: Pass the correct pointer into CertificateFindStore.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: c25753ece29f8b65fa49a80f983735ddf0a9c3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25753ece29f8b65fa49a80f9… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Nov 9 13:44:22 2009 +0100 crypt32: Pass the correct pointer into CertificateFindStore. --- dlls/crypt32/tests/cert.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 4dc8846..e1c8262 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1089,7 +1089,7 @@ static void testFindCert(void) * the issuer, not the subject */ context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, - CERT_FIND_SUBJECT_CERT, &certInfo.Subject, NULL); + CERT_FIND_SUBJECT_CERT, &certInfo, NULL); ok(context == NULL, "Expected no certificate\n"); certInfo.Subject.pbData = NULL; certInfo.Subject.cbData = 0; @@ -1102,7 +1102,7 @@ static void testFindCert(void) if (context) { context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, - CERT_FIND_SUBJECT_CERT, &certInfo.Subject, context); + CERT_FIND_SUBJECT_CERT, &certInfo, context); ok(context == NULL, "Expected one cert only\n"); } /* A non-matching serial number will not match. */

1 0

Eric Pouech : mmsystem.dll16: Correctly send messages up to winmm.dll.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 8575935f610bafd3b3529d4243ca36b9a7fc6deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8575935f610bafd3b3529d424… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 8 15:09:46 2009 +0100 mmsystem.dll16: Correctly send messages up to winmm.dll. Spotted by Christian Costa. --- dlls/mmsystem.dll16/message16.c | 40 +++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c index af1c6c9..ce25b9c 100644 --- a/dlls/mmsystem.dll16/message16.c +++ b/dlls/mmsystem.dll16/message16.c @@ -979,10 +979,42 @@ DWORD MMSYSTDRV_Message(void* h, UINT msg, DWORD_PTR param1, DWORD_PTR param2) switch (thunk->kind) { case MMSYSTDRV_MIXER: ret = mixerMessage (h, msg, param1, param2); break; - case MMSYSTDRV_MIDIIN: ret = midiInMessage (h, msg, param1, param2); break; - case MMSYSTDRV_MIDIOUT: ret = midiOutMessage(h, msg, param1, param2); break; - case MMSYSTDRV_WAVEIN: ret = waveInMessage (h, msg, param1, param2); break; - case MMSYSTDRV_WAVEOUT: ret = waveOutMessage(h, msg, param1, param2); break; + case MMSYSTDRV_MIDIIN: + switch (msg) + { + case MIDM_ADDBUFFER: ret = midiInAddBuffer(h, (LPMIDIHDR)param1, param2); break; + case MIDM_PREPARE: ret = midiInPrepareHeader(h, (LPMIDIHDR)param1, param2); break; + case MIDM_UNPREPARE: ret = midiInUnprepareHeader(h, (LPMIDIHDR)param1, param2); break; + default: ret = midiInMessage(h, msg, param1, param2); break; + } + break; + case MMSYSTDRV_MIDIOUT: + switch (msg) + { + case MODM_PREPARE: ret = midiOutPrepareHeader(h, (LPMIDIHDR)param1, param2); break; + case MODM_UNPREPARE: ret = midiOutUnprepareHeader(h, (LPMIDIHDR)param1, param2); break; + case MODM_LONGDATA: ret = midiOutLongMsg(h, (LPMIDIHDR)param1, param2); break; + default: ret = midiOutMessage(h, msg, param1, param2); break; + } + break; + case MMSYSTDRV_WAVEIN: + switch (msg) + { + case WIDM_ADDBUFFER: ret = waveInAddBuffer(h, (LPWAVEHDR)param1, param2); break; + case WIDM_PREPARE: ret = waveInPrepareHeader(h, (LPWAVEHDR)param1, param2); break; + case WIDM_UNPREPARE: ret = waveInUnprepareHeader(h, (LPWAVEHDR)param1, param2); break; + default: ret = waveInMessage(h, msg, param1, param2); break; + } + break; + case MMSYSTDRV_WAVEOUT: + switch (msg) + { + case WODM_PREPARE: ret = waveOutPrepareHeader(h, (LPWAVEHDR)param1, param2); break; + case WODM_UNPREPARE: ret = waveOutUnprepareHeader(h, (LPWAVEHDR)param1, param2); break; + case WODM_WRITE: ret = waveOutWrite(h, (LPWAVEHDR)param1, param2); break; + default: ret = waveOutMessage(h, msg, param1, param2); break; + } + break; default: ret = MMSYSERR_INVALHANDLE; break; /* should never be reached */ } if (map == MMSYSTEM_MAP_OKMEM)

1 0

Eric Pouech : winhlp32: Added support for macros as hotspots' target.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 3fac812bd9019a98f27aa13f0e84b1ba524845a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fac812bd9019a98f27aa13f0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 8 15:04:59 2009 +0100 winhlp32: Added support for macros as hotspots' target. --- programs/winhlp32/hlpfile.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index f6c1137..2d685ae 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -797,29 +797,35 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file, */ str += strlen(str) + 1; /* skip hotspot name */ + hslink = NULL; switch (start[7 + 15 * i + 0]) /* The next two chars always look like 0x04 0x00 ??? * What are they for ? */ { + case 0xC8: + hslink = (HLPFILE_HOTSPOTLINK*) + HLPFILE_AllocLink(rd, hlp_link_macro, str, -1, 0, 0, 1, -1); + break; + case 0xE6: case 0xE7: hslink = (HLPFILE_HOTSPOTLINK*) HLPFILE_AllocLink(rd, (start[7 + 15 * i + 0] & 1) ? hlp_link_link : hlp_link_popup, file->lpszPath, -1, HLPFILE_Hash(str), 0, 1, -1); - if (hslink) - { - hslink->x = GET_USHORT(start, 7 + 15 * i + 3); - hslink->y = GET_USHORT(start, 7 + 15 * i + 5); - hslink->width = GET_USHORT(start, 7 + 15 * i + 7); - hslink->height = GET_USHORT(start, 7 + 15 * i + 9); - /* target = GET_UINT(start, 7 + 15 * i + 11); */ - } break; default: WINE_FIXME("unknown hotsport target 0x%x\n", start[7 + 15 * i + 0]); } + if (hslink) + { + hslink->x = GET_USHORT(start, 7 + 15 * i + 3); + hslink->y = GET_USHORT(start, 7 + 15 * i + 5); + hslink->width = GET_USHORT(start, 7 + 15 * i + 7); + hslink->height = GET_USHORT(start, 7 + 15 * i + 9); + /* target = GET_UINT(start, 7 + 15 * i + 11); */ + } str += strlen(str) + 1; } }

1 0

Eric Pouech : winedbg: In proxy mode, correctly init the wine_segs fields.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: a116f78dedaf05a8b3f44bf5d56a5b76faaccacc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a116f78dedaf05a8b3f44bf5d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 8 15:08:11 2009 +0100 winedbg: In proxy mode, correctly init the wine_segs fields. --- programs/winedbg/gdbproxy.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 8afabe4..4794b06 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1776,10 +1776,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) { char buf[64]; - if (gdbctx->wine_segs[0] == 0 && gdbctx->wine_segs[1] == 0 && - gdbctx->wine_segs[2] == 0) - return packet_error; - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "Text=%08lx;Data=%08lx;Bss=%08lx", gdbctx->wine_segs[0], gdbctx->wine_segs[1], gdbctx->wine_segs[2]); @@ -2284,6 +2281,8 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags) gdbctx->process = NULL; for (i = 0; i < NUM_XPOINT; i++) gdbctx->Xpoints[i].type = -1; + for (i = 0; i < sizeof(gdbctx->wine_segs) / sizeof(gdbctx->wine_segs[0]); i++) + gdbctx->wine_segs[i] = 0; /* wait for first trap */ while (WaitForDebugEvent(&de, INFINITE))

1 0

Eric Pouech : richedit: When inserting an OLE object from an RTF stream, don't force update as the stream is not fully read.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 38df8cfb048c55fe6545ec278f0fe3ff4c0b4c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38df8cfb048c55fe6545ec278… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 8 15:04:53 2009 +0100 richedit: When inserting an OLE object from an RTF stream, don't force update as the stream is not fully read. --- dlls/riched20/editor.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b5ad21c..4bc901e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1149,8 +1149,8 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm reobject.dwFlags = 0; /* FIXME */ reobject.dwUser = 0; - /* FIXME: could be simpler */ - ret = IRichEditOle_InsertObject(info->lpRichEditOle, &reobject) == S_OK; + ME_InsertOLEFromCursor(info->editor, &reobject, 0); + ret = TRUE; } if (lpObject) IOleObject_Release(lpObject);

1 0

Eric Pouech : richedit: Only increment objects' reference by one when inserting an OLE object.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: ab9c51dd6ad9ae455ce43987ec794ad18c69a7e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9c51dd6ad9ae455ce43987e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 8 15:04:47 2009 +0100 richedit: Only increment objects' reference by one when inserting an OLE object. --- dlls/riched20/richole.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 2a9dc01..c7eb5ff 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -388,9 +388,6 @@ IRichEditOle_fnInsertObject(IRichEditOle *me, REOBJECT *reo) TRACE("(%p,%p)\n", This, reo); if (reo->cbStruct < sizeof(*reo)) return STG_E_INVALIDPARAMETER; - if (reo->poleobj) IOleObject_AddRef(reo->poleobj); - if (reo->pstg) IStorage_AddRef(reo->pstg); - if (reo->polesite) IOleClientSite_AddRef(reo->polesite); ME_InsertOLEFromCursor(This->editor, reo, 0); ME_CommitUndo(This->editor);

1 0

Louis Lenders : d3d9: Quiet a few noisy fixme's.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: cdb2ccd2d8d00153de065c5f0ce5504b5bc4a8dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb2ccd2d8d00153de065c5f0… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Nov 8 14:45:57 2009 +0100 d3d9: Quiet a few noisy fixme's. --- dlls/d3d9/d3d9_main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index e8b4a97..c405a57 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -78,7 +78,9 @@ HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex */ void* WINAPI Direct3DShaderValidatorCreate9(void) { - FIXME("stub\n"); + static int once; + + if (!once++) FIXME("stub\n"); return NULL; } @@ -99,7 +101,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) * D3DPERF_BeginEvent (D3D9.@) */ int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, LPCWSTR name) { - FIXME("(color %#x, name %s) : stub\n", color, debugstr_w(name)); + TRACE("(color %#x, name %s) : stub\n", color, debugstr_w(name)); return D3DPERF_event_level++; } @@ -108,7 +110,7 @@ int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, LPCWSTR name) { * D3DPERF_EndEvent (D3D9.@) */ int WINAPI D3DPERF_EndEvent(void) { - FIXME("(void) : stub\n"); + TRACE("(void) : stub\n"); return --D3DPERF_event_level; }

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009