wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Rob Shearman : widl: Don't pre-calculate buffer size for arrays that aren' t treated as reference pointers.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: f6b53be0d9c051265846c92ef480bd74dde0a03d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b53be0d9c051265846c92ef… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:01 2010 +0000 widl: Don't pre-calculate buffer size for arrays that aren't treated as reference pointers. --- tools/widl/typegen.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index ca0faf1..c9f9549 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3069,9 +3069,10 @@ static unsigned int get_required_buffer_size_type( break; case TGT_ARRAY: - /* FIXME: depends on pointer type */ - return type_array_get_dim(type) * - get_required_buffer_size_type(type_array_get_element(type), name, NULL, FALSE, alignment); + if (get_pointer_fc(type, attrs, toplevel_param) == RPC_FC_RP) + return type_array_get_dim(type) * + get_required_buffer_size_type(type_array_get_element(type), name, + NULL, FALSE, alignment); default: break;

1 0

Huw Davies : dispex: Check whether the server function changes the type of the arguments.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: f1ebd2d8948243afc2e2f2a0d4222c8093112e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ebd2d8948243afc2e2f2a0d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 22 14:44:52 2010 +0000 dispex: Check whether the server function changes the type of the arguments. --- dlls/dispex/tests/marshal.c | 1 - dlls/dispex/usrmarshal.c | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index b277719..4380621 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -405,7 +405,6 @@ static void test_dispex(void) /* change one of the argument vts */ i = 0xbeef; hr = IDispatchEx_InvokeEx(dispex, 3, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL); -todo_wine ok(hr == DISP_E_BADCALLEE, "got %08x\n", hr); hr = IDispatchEx_InvokeEx(dispex, 4, LOCALE_SYSTEM_DEFAULT, 0xffff, &params, NULL, NULL, NULL); diff --git a/dlls/dispex/usrmarshal.c b/dlls/dispex/usrmarshal.c index 915e5bc..cc72469 100644 --- a/dlls/dispex/usrmarshal.c +++ b/dlls/dispex/usrmarshal.c @@ -118,6 +118,7 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID { HRESULT hr; UINT arg; + VARTYPE *vt_list = NULL; TRACE("(%p)->(%08x, %04x, %08x, %p, %p, %p, %p, %d, %p, %p)\n", This, id, lcid, dwFlags, pdp, result, pei, pspCaller, byref_args, ref_idx, ref_arg); @@ -131,8 +132,30 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID if(dwFlags & NULL_RESULT) result = NULL; if(dwFlags & NULL_EXCEPINFO) pei = NULL; + /* Create an array of the original VTs to check that the function doesn't change + any on return. */ + if(byref_args) + { + vt_list = HeapAlloc(GetProcessHeap(), 0, pdp->cArgs * sizeof(vt_list[0])); + if(!vt_list) return E_OUTOFMEMORY; + for(arg = 0; arg < pdp->cArgs; arg++) + vt_list[arg] = V_VT(pdp->rgvarg + arg); + } + hr = IDispatchEx_InvokeEx(This, id, lcid, dwFlags & 0xffff, pdp, result, pei, pspCaller); + if(SUCCEEDED(hr) && byref_args) + { + for(arg = 0; arg < pdp->cArgs; arg++) + { + if(vt_list[arg] != V_VT(pdp->rgvarg + arg)) + { + hr = DISP_E_BADCALLEE; + break; + } + } + } + if(hr == DISP_E_EXCEPTION) { if(pei && pei->pfnDeferredFillIn) @@ -145,5 +168,6 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID for(arg = 0; arg < byref_args; arg++) VariantInit(pdp->rgvarg + ref_idx[arg]); + HeapFree(GetProcessHeap(), 0, vt_list); return hr; }

1 0

Huw Davies : dispex: Call the deferred fill in function before returning from the server.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 56e625b0daa21f7425b0e3489d7087e2137bd228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e625b0daa21f7425b0e3489… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 22 13:35:56 2010 +0000 dispex: Call the deferred fill in function before returning from the server. --- dlls/dispex/tests/marshal.c | 20 ++++++++++++++++++++ dlls/dispex/usrmarshal.c | 9 +++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index 847f54e..b277719 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -232,6 +232,12 @@ static HRESULT WINAPI dispex_GetDispID(IDispatchEx* iface, return E_NOTIMPL; } +static HRESULT WINAPI defer_fn(EXCEPINFO *except) +{ + except->scode = E_OUTOFMEMORY; + return S_OK; +} + static HRESULT WINAPI dispex_InvokeEx(IDispatchEx* iface, DISPID id, LCID lcid, @@ -266,6 +272,11 @@ static HRESULT WINAPI dispex_InvokeEx(IDispatchEx* iface, { ok(wFlags == 0xf, "got %04x\n", wFlags); } + else if(id == 5) + { + if(pei) pei->pfnDeferredFillIn = defer_fn; + return DISP_E_EXCEPTION; + } return S_OK; } @@ -354,6 +365,7 @@ static void test_dispex(void) DISPPARAMS params; VARIANTARG args[10]; INT i; + EXCEPINFO excepinfo; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got %08x\n", hr); @@ -399,6 +411,14 @@ todo_wine hr = IDispatchEx_InvokeEx(dispex, 4, LOCALE_SYSTEM_DEFAULT, 0xffff, &params, NULL, NULL, NULL); ok(hr == S_OK, "got %08x\n", hr); + params.cArgs = 0; + hr = IDispatchEx_InvokeEx(dispex, 5, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL); + ok(hr == DISP_E_EXCEPTION, "got %08x\n", hr); + hr = IDispatchEx_InvokeEx(dispex, 5, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, &excepinfo, NULL); + ok(hr == DISP_E_EXCEPTION, "got %08x\n", hr); + ok(excepinfo.scode == E_OUTOFMEMORY, "got scode %08x\n", excepinfo.scode); + ok(excepinfo.pfnDeferredFillIn == NULL, "got non-NULL pfnDeferredFillIn\n"); + IDispatchEx_Release(dispex); end_host_object(tid, thread); } diff --git a/dlls/dispex/usrmarshal.c b/dlls/dispex/usrmarshal.c index c8c3563..915e5bc 100644 --- a/dlls/dispex/usrmarshal.c +++ b/dlls/dispex/usrmarshal.c @@ -133,6 +133,15 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID hr = IDispatchEx_InvokeEx(This, id, lcid, dwFlags & 0xffff, pdp, result, pei, pspCaller); + if(hr == DISP_E_EXCEPTION) + { + if(pei && pei->pfnDeferredFillIn) + { + pei->pfnDeferredFillIn(pei); + pei->pfnDeferredFillIn = NULL; + } + } + for(arg = 0; arg < byref_args; arg++) VariantInit(pdp->rgvarg + ref_idx[arg]);

1 0

Alexandre Julliard : user32/tests: Fix a couple of race conditions.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: ce31f2da0a18e30007d313a258cbf56c265678bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce31f2da0a18e30007d313a25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 23 13:16:04 2010 +0100 user32/tests: Fix a couple of race conditions. --- dlls/user32/tests/win.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index af0fa49..96033a2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3010,7 +3010,7 @@ static void test_mouse_input(HWND hwnd) BOOL ret; LRESULT res; - ShowWindow(hwnd, SW_SHOW); + ShowWindow(hwnd, SW_SHOWNORMAL); UpdateWindow(hwnd); SetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); @@ -5218,6 +5218,7 @@ static void run_NCRedrawLoop(UINT flags) NULL, NULL, 0, &flags); ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); + flush_events( FALSE ); while(PeekMessage(&msg, hwnd, 0, 0, PM_REMOVE) != 0) { if (msg.message == WM_PAINT) loopcount++;

1 0

Hans Leidekker : msi: Search network sources in addition to disk sources.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 1d453a1ff08ea3bbc8a519f19a94dcf4f215d874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d453a1ff08ea3bbc8a519f19… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 11:48:46 2010 +0100 msi: Search network sources in addition to disk sources. --- dlls/msi/media.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 5e70d50..5c53027 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -686,7 +686,7 @@ static UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO return ERROR_SUCCESS; } -/* FIXME: search NETWORK and URL sources as well */ +/* FIXME: search URL sources as well */ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) { WCHAR source[MAX_PATH]; @@ -694,8 +694,16 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) WCHAR prompt[MAX_PATH]; DWORD volumesz, promptsz; DWORD index, size, id; + WCHAR last_type[2]; UINT r; + size = 2; + r = MsiSourceListGetInfoW(package->ProductCode, NULL, + package->Context, MSICODE_PRODUCT, + INSTALLPROPERTY_LASTUSEDTYPEW, last_type, &size); + if (r != ERROR_SUCCESS) + return r; + size = MAX_PATH; r = MsiSourceListGetInfoW(package->ProductCode, NULL, package->Context, MSICODE_PRODUCT, @@ -706,6 +714,27 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) index = 0; volumesz = MAX_PATH; promptsz = MAX_PATH; + + if (last_type[0] == 'n') + { + while (MsiSourceListEnumSourcesW(package->ProductCode, NULL, + package->Context, + MSISOURCETYPE_NETWORK, index++, + volume, &volumesz) == ERROR_SUCCESS) + { + if (!strncmpiW(source, volume, strlenW(source))) + { + lstrcpyW(mi->source, source); + lstrcatW(mi->source, mi->cabinet); + TRACE("Found network source %s\n", debugstr_w(mi->source)); + return ERROR_SUCCESS; + } + } + } + + index = 0; + volumesz = MAX_PATH; + promptsz = MAX_PATH; while (MsiSourceListEnumMediaDisksW(package->ProductCode, NULL, package->Context, MSICODE_PRODUCT, index++, &id, @@ -721,6 +750,7 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) { /* FIXME: what about SourceDir */ lstrcpyW(mi->source, source); + TRACE("Found disk source %s\n", debugstr_w(mi->source)); return ERROR_SUCCESS; } }

1 0

Hans Leidekker : msi: Remove stream from streams cache before destroying it .
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: faf750f2f7247ffb74bc151c2ceab0d2c0ee479f URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf750f2f7247ffb74bc151c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 11:48:23 2010 +0100 msi: Remove stream from streams cache before destroying it. --- dlls/msi/database.c | 31 +++++++++++++++++++++++++++++++ dlls/msi/msipriv.h | 1 + dlls/msi/streams.c | 2 +- 3 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index b780b0e..fb614db 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -176,6 +176,37 @@ static void free_transforms( MSIDATABASE *db ) } } +void db_destroy_stream( MSIDATABASE *db, LPCWSTR stname ) +{ + MSISTREAM *stream, *stream2; + + LIST_FOR_EACH_ENTRY_SAFE( stream, stream2, &db->streams, MSISTREAM, entry ) + { + HRESULT r; + STATSTG stat; + + r = IStream_Stat( stream->stm, &stat, 0 ); + if (FAILED(r)) + { + WARN("failed to stat stream r = %08x\n", r); + continue; + } + + if (!strcmpW( stname, stat.pwcsName )) + { + TRACE("destroying %s\n", debugstr_w(stname)); + + list_remove( &stream->entry ); + IStream_Release( stream->stm ); + msi_free( stream ); + IStorage_DestroyElement( db->storage, stname ); + CoTaskMemFree( stat.pwcsName ); + break; + } + CoTaskMemFree( stat.pwcsName ); + } +} + static void free_streams( MSIDATABASE *db ) { while( !list_empty( &db->streams ) ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 55a0135..4546f5c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -722,6 +722,7 @@ extern BOOL decode_streamname(LPCWSTR in, LPWSTR out); /* database internals */ extern UINT db_get_raw_stream( MSIDATABASE *, LPCWSTR, IStream ** ); +void db_destroy_stream( MSIDATABASE *, LPCWSTR ); extern UINT MSI_OpenDatabaseW( LPCWSTR, LPCWSTR, MSIDATABASE ** ); extern UINT MSI_DatabaseOpenViewW(MSIDATABASE *, LPCWSTR, MSIQUERY ** ); extern UINT MSI_OpenQuery( MSIDATABASE *, MSIQUERY **, LPCWSTR, ... ); diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 66bda76..fc660c8 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -183,7 +183,7 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U } encname = encode_streamname(FALSE, name); - IStorage_DestroyElement(sv->db->storage, encname); + db_destroy_stream(sv->db, encname); r = write_stream_data(sv->db->storage, name, data, count, FALSE); if (r != ERROR_SUCCESS)

1 0

Hans Leidekker : msi: Don' t crash on null last parameter in MsiDecomposeDescriptor.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 367c2048a19a1f5e19bc6166f98b6c95f8215da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=367c2048a19a1f5e19bc6166f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 11:48:02 2010 +0100 msi: Don't crash on null last parameter in MsiDecomposeDescriptor. --- dlls/msi/registry.c | 2 +- dlls/msi/tests/db.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 1cbdcc9..e0a50a3 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1156,7 +1156,7 @@ UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR szDescriptor, LPWSTR szProduct, len = ( &p[21] - szDescriptor ); TRACE("length = %d\n", len); - *pUsed = len; + if (pUsed) *pUsed = len; return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 8df17e8..5571a71 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -479,6 +479,9 @@ static void test_msidecomposedesc(void) r = pMsiDecomposeDescriptorA(NULL, NULL, NULL, NULL, &len); ok(r == ERROR_INVALID_PARAMETER, "returned wrong error\n"); ok(len == 0, "length wrong\n"); + + r = pMsiDecomposeDescriptorA(desc, NULL, NULL, NULL, NULL); + ok(r == ERROR_SUCCESS, "returned wrong error\n"); } static UINT try_query_param( MSIHANDLE hdb, LPCSTR szQuery, MSIHANDLE hrec )

1 0

Hans Leidekker : msi: Display REG_EXPAND_SZ values too in the WriteRegistryValues action.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: d0856c0ac5bc59d994c2dec0d64d1e4b43efd6ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0856c0ac5bc59d994c2dec0d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 11:47:42 2010 +0100 msi: Display REG_EXPAND_SZ values too in the WriteRegistryValues action. --- dlls/msi/action.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a03b179..1a483de 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2362,12 +2362,8 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) uirow = MSI_CreateRecord(3); MSI_RecordSetStringW(uirow,2,deformated); MSI_RecordSetStringW(uirow,1,uikey); - - if (type == REG_SZ) + if (type == REG_SZ || type == REG_EXPAND_SZ) MSI_RecordSetStringW(uirow,3,(LPWSTR)value_data); - else - MSI_RecordSetStringW(uirow,3,value); - ui_actiondata(package,szWriteRegistryValues,uirow); msiobj_release( &uirow->hdr );

1 0

Hans Leidekker : msi: Update the UI in the UnpublishFeatures action.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 18a85caa3cff0c70b718fb23dd60b802f1a0d4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a85caa3cff0c70b718fb23d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 11:47:19 2010 +0100 msi: Update the UI in the UnpublishFeatures action. --- dlls/msi/action.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 028b4f0..a03b179 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4373,6 +4373,7 @@ static UINT msi_unpublish_feature(MSIPACKAGE *package, MSIFEATURE *feature) { UINT r; HKEY hkey; + MSIRECORD *uirow; TRACE("unpublishing feature %s\n", debugstr_w(feature->Feature)); @@ -4392,6 +4393,11 @@ static UINT msi_unpublish_feature(MSIPACKAGE *package, MSIFEATURE *feature) RegCloseKey(hkey); } + uirow = MSI_CreateRecord( 1 ); + MSI_RecordSetStringW( uirow, 1, feature->Feature ); + ui_actiondata( package, szUnpublishFeatures, uirow ); + msiobj_release( &uirow->hdr ); + return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Implement a second cabinet extractor on top of IStream and use it to extract embedded cabinets .
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 706c4f77e885c86942f982be522a67af7ef65875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=706c4f77e885c86942f982be5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 11:46:54 2010 +0100 msi: Implement a second cabinet extractor on top of IStream and use it to extract embedded cabinets. Currently a cabinet stream is read into memory and then written to a file, which is then extracted like an external cabinet file. This uses more time and disk space than necessary and fails if the cabinet is too large to fit into memory. --- dlls/msi/database.c | 58 ------------- dlls/msi/media.c | 222 ++++++++++++++++++++++++++++++++++----------------- dlls/msi/msipriv.h | 2 - 3 files changed, 149 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=706c4f77e885c86942f98…

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
92
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 March 2010