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

Rob Shearman : rpcrt4: Add test for [out] non-conformant array.
by Alexandre Julliard March 23, 2010

March 23, 2010

Module: wine Branch: master Commit: 1ff4bfe69abe7a212ff9500f3ba54567adfd1752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff4bfe69abe7a212ff9500f3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:13 2010 +0000 rpcrt4: Add test for [out] non-conformant array. --- dlls/rpcrt4/tests/server.c | 14 ++++++++++++++ dlls/rpcrt4/tests/server.idl | 1 + 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index e792170..f07fad4 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -297,6 +297,14 @@ s_dot_two_vectors(vector_t vs[2]) return vs[0].x * vs[1].x + vs[0].y * vs[1].y + vs[0].z * vs[1].z; } +void +s_get_number_array(int x[20], int *n) +{ + int c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + memcpy(x, c, sizeof(c)); + *n = sizeof(c)/sizeof(c[0]); +} + int s_sum_cs(cs_t *cs) { @@ -1212,6 +1220,7 @@ array_tests(void) }; int c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; int c2[] = {10, 100, 200}; + int c3[20]; vector_t vs[2] = {{1, -2, 3}, {4, -5, -6}}; cps_t cps; cpsc_t cpsc; @@ -1246,6 +1255,11 @@ array_tests(void) ok(sum_unique_conf_ptr(ca, 5) == 3, "RPC sum_unique_conf_array\n"); ok(sum_unique_conf_ptr(NULL, 10) == 0, "RPC sum_unique_conf_array\n"); + get_number_array(c3, &n); + ok(n == 10, "RPC get_num_array\n"); + for (; n > 0; n--) + ok(c3[n-1] == c[n-1], "get_num_array returned wrong value %d @ %d\n", + c3[n-1], n); ok(sum_var_array(c, 10) == 45, "RPC sum_conf_array\n"); ok(sum_var_array(&c[5], 2) == 11, "RPC sum_conf_array\n"); ok(sum_var_array(&c[7], 1) == 7, "RPC sum_conf_array\n"); diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 6899675..89f9930 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -130,6 +130,7 @@ cpp_quote("#endif") int sum_unique_conf_ptr([size_is(n), unique] int *x, int n); int sum_var_array([length_is(n)] int x[20], int n); int dot_two_vectors(vector_t vs[2]); + void get_number_array([out, length_is(*n)] int x[20], [out] int *n); typedef struct {

1 0

Rob Shearman : widl: Convert assign_stub_out_args to using typegen_detect_type and fix the non-conformant array case .
by Alexandre Julliard March 23, 2010

March 23, 2010

Module: wine Branch: master Commit: 0ec617e01d3b2d7ef89e099fe5a3fa08b666bc6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec617e01d3b2d7ef89e099fe… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:08 2010 +0000 widl: Convert assign_stub_out_args to using typegen_detect_type and fix the non-conformant array case. --- tools/widl/typegen.c | 46 ++++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c9f9549..155e01b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3900,33 +3900,36 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char { print_file(file, indent, "%s%s", local_var_prefix, var->name); - if (is_context_handle(var->type)) + switch (typegen_detect_type(var->type, var->attrs, TDT_IGNORE_STRINGS)) { + case TGT_CTXT_HANDLE_POINTER: fprintf(file, " = NdrContextHandleInitialize(\n"); print_file(file, indent + 1, "&__frame->_StubMsg,\n"); print_file(file, indent + 1, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]);\n", var->type->typestring_offset); - } - else if (is_array(var->type) && - type_array_has_conformance(var->type)) - { - unsigned int size, align = 0; - type_t *type = var->type; - - fprintf(file, " = NdrAllocate(&__frame->_StubMsg, "); - for ( ; - is_array(type) && type_array_has_conformance(type); - type = type_array_get_element(type)) + break; + case TGT_ARRAY: + if (type_array_has_conformance(var->type)) { - write_expr(file, type_array_get_conformance(type), TRUE, - TRUE, NULL, NULL, local_var_prefix); - fprintf(file, " * "); + unsigned int size, align = 0; + type_t *type = var->type; + + fprintf(file, " = NdrAllocate(&__frame->_StubMsg, "); + for ( ; + is_array(type) && type_array_has_conformance(type); + type = type_array_get_element(type)) + { + write_expr(file, type_array_get_conformance(type), TRUE, + TRUE, NULL, NULL, local_var_prefix); + fprintf(file, " * "); + } + size = type_memsize(type, &align); + fprintf(file, "%u);\n", size); } - size = type_memsize(type, &align); - fprintf(file, "%u);\n", size); - } - else - { + else + fprintf(file, " = &%s_W%u;\n", local_var_prefix, i++); + break; + case TGT_POINTER: fprintf(file, " = &%s_W%u;\n", local_var_prefix, i); switch (typegen_detect_type(type_pointer_get_ref(var->type), var->attrs, TDT_IGNORE_STRINGS)) { @@ -3949,6 +3952,9 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char break; } i++; + break; + default: + break; } sep = 1;

1 0

Huw Davies : dispex: Call the deferred fill in function before returning from the server.
by Alexandre Julliard March 23, 2010

March 23, 2010

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 March 23, 2010

March 23, 2010

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: Remove stream from streams cache before destroying it .
by Alexandre Julliard March 23, 2010

March 23, 2010

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: Display REG_EXPAND_SZ values too in the WriteRegistryValues action.
by Alexandre Julliard March 23, 2010

March 23, 2010

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: Set the action taken in the ProcessComponents and InstallFiles actions.
by Alexandre Julliard March 23, 2010

March 23, 2010

Module: wine Branch: master Commit: 27e90274b52fa560994614b84075a2dab17f8cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27e90274b52fa560994614b84… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 11:46:24 2010 +0100 msi: Set the action taken in the ProcessComponents and InstallFiles actions. --- dlls/msi/action.c | 1 + dlls/msi/files.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0d0e333..028b4f0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2993,6 +2993,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) else MSIREG_DeleteUserDataComponentKey(comp->ComponentId, NULL); } + comp->Action = comp->ActionRequest; /* UI stuff */ uirow = MSI_CreateRecord(3); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 4050163..bb5b197 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -98,6 +98,8 @@ static void schedule_install_files(MSIPACKAGE *package) ui_progress(package,2,file->FileSize,0,0); file->state = msifs_skipped; } + else + file->Component->Action = INSTALLSTATE_LOCAL; } }

1 0

Hans Leidekker : msi: Update the UI in the UnpublishFeatures action.
by Alexandre Julliard March 23, 2010

March 23, 2010

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 March 23, 2010

March 23, 2010

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

Hans Leidekker : msi: Search network sources in addition to disk sources.
by Alexandre Julliard March 23, 2010

March 23, 2010

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