January 2019 - Wine-commits

Zebediah Figura : msi: Get rid of the get_row() view operation.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 7c28a1dbddc012d497988f638b7ecb70e75b17c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c28a1dbddc012d497988f63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 26 16:58:59 2019 -0600 msi: Get rid of the get_row() view operation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/alter.c | 10 ---------- dlls/msi/create.c | 1 - dlls/msi/delete.c | 1 - dlls/msi/distinct.c | 1 - dlls/msi/drop.c | 1 - dlls/msi/insert.c | 1 - dlls/msi/msipriv.h | 6 ------ dlls/msi/select.c | 13 ------------- dlls/msi/storages.c | 10 ---------- dlls/msi/streams.c | 10 ---------- dlls/msi/table.c | 1 - dlls/msi/update.c | 1 - dlls/msi/where.c | 13 ------------- 13 files changed, 69 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 96ff284..d1a481e 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -61,15 +61,6 @@ static UINT ALTER_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt return ERROR_FUNCTION_FAILED; } -static UINT ALTER_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) -{ - MSIALTERVIEW *av = (MSIALTERVIEW*)view; - - TRACE("%p %d %p\n", av, row, rec ); - - return av->table->ops->get_row(av->table, row, rec); -} - static UINT ITERATE_columns(MSIRECORD *row, LPVOID param) { (*(UINT *)param)++; @@ -225,7 +216,6 @@ static const MSIVIEWOPS alter_ops = { ALTER_fetch_int, ALTER_fetch_stream, - ALTER_get_row, NULL, NULL, NULL, diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 2777954..3c00b70 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -131,7 +131,6 @@ static const MSIVIEWOPS create_ops = NULL, NULL, NULL, - NULL, CREATE_execute, CREATE_close, CREATE_get_dimensions, diff --git a/dlls/msi/delete.c b/dlls/msi/delete.c index 81bd9d7..e2e0e34 100644 --- a/dlls/msi/delete.c +++ b/dlls/msi/delete.c @@ -173,7 +173,6 @@ static const MSIVIEWOPS delete_ops = NULL, NULL, NULL, - NULL, DELETE_execute, DELETE_close, DELETE_get_dimensions, diff --git a/dlls/msi/distinct.c b/dlls/msi/distinct.c index e102adb..5bd5bf8 100644 --- a/dlls/msi/distinct.c +++ b/dlls/msi/distinct.c @@ -256,7 +256,6 @@ static const MSIVIEWOPS distinct_ops = NULL, NULL, NULL, - NULL, DISTINCT_execute, DISTINCT_close, DISTINCT_get_dimensions, diff --git a/dlls/msi/drop.c b/dlls/msi/drop.c index 89fac9d..60a9202 100644 --- a/dlls/msi/drop.c +++ b/dlls/msi/drop.c @@ -101,7 +101,6 @@ static const MSIVIEWOPS drop_ops = NULL, NULL, NULL, - NULL, DROP_execute, DROP_close, DROP_get_dimensions, diff --git a/dlls/msi/insert.c b/dlls/msi/insert.c index f1185ee..ed913c0 100644 --- a/dlls/msi/insert.c +++ b/dlls/msi/insert.c @@ -327,7 +327,6 @@ static const MSIVIEWOPS insert_ops = NULL, NULL, NULL, - NULL, INSERT_execute, INSERT_close, INSERT_get_dimensions, diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index e9c000d..3ff5ac2 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -243,12 +243,6 @@ typedef struct tagMSIVIEWOPS UINT (*fetch_stream)( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm ); /* - * get_row - gets values from a row - * - */ - UINT (*get_row)( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ); - - /* * set_int - set the integer value at {row, col} * This function has undefined behaviour if the column does not contain * integers. diff --git a/dlls/msi/select.c b/dlls/msi/select.c index 91765c8..99339c2 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -90,18 +90,6 @@ static UINT SELECT_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IS return sv->table->ops->fetch_stream( sv->table, row, col, stm ); } -static UINT SELECT_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) -{ - MSISELECTVIEW *sv = (MSISELECTVIEW *)view; - - TRACE("%p %d %p\n", sv, row, rec ); - - if( !sv->table ) - return ERROR_FUNCTION_FAILED; - - return msi_view_get_row(sv->db, view, row, rec); -} - static UINT SELECT_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) { MSISELECTVIEW *sv = (MSISELECTVIEW*)view; @@ -325,7 +313,6 @@ static const MSIVIEWOPS select_ops = { SELECT_fetch_int, SELECT_fetch_stream, - SELECT_get_row, NULL, NULL, SELECT_set_row, diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index ad020de..9e161c9 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -115,15 +115,6 @@ static UINT STORAGES_fetch_stream(struct tagMSIVIEW *view, UINT row, UINT col, I return ERROR_INVALID_DATA; } -static UINT STORAGES_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) -{ - MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; - - FIXME("%p %d %p\n", sv, row, rec); - - return ERROR_CALL_NOT_IMPLEMENTED; -} - static UINT STORAGES_set_string( struct tagMSIVIEW *view, UINT row, UINT col, const WCHAR *val, int len ) { ERR("Cannot modify primary key.\n"); @@ -425,7 +416,6 @@ static const MSIVIEWOPS storages_ops = { STORAGES_fetch_int, STORAGES_fetch_stream, - STORAGES_get_row, NULL, STORAGES_set_string, STORAGES_set_row, diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index ae45c1d..2d458ad 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -110,15 +110,6 @@ static UINT STREAMS_set_string( struct tagMSIVIEW *view, UINT row, UINT col, con return ERROR_FUNCTION_FAILED; } -static UINT STREAMS_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) -{ - MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; - - TRACE("%p %d %p\n", sv, row, rec); - - return msi_view_get_row( sv->db, view, row, rec ); -} - static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask) { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; @@ -347,7 +338,6 @@ static const MSIVIEWOPS streams_ops = { STREAMS_fetch_int, STREAMS_fetch_stream, - STREAMS_get_row, NULL, STREAMS_set_string, STREAMS_set_row, diff --git a/dlls/msi/table.c b/dlls/msi/table.c index a5de8cc..f26ab9f 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2124,7 +2124,6 @@ static const MSIVIEWOPS table_ops = { TABLE_fetch_int, TABLE_fetch_stream, - TABLE_get_row, TABLE_set_int, TABLE_set_string, TABLE_set_row, diff --git a/dlls/msi/update.c b/dlls/msi/update.c index e61342d..af629d2 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -204,7 +204,6 @@ static const MSIVIEWOPS update_ops = NULL, NULL, NULL, - NULL, UPDATE_execute, UPDATE_close, UPDATE_get_dimensions, diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 6a10a04..eaadac4 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -259,18 +259,6 @@ static UINT WHERE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt return table->view->ops->fetch_stream( table->view, rows[table->table_index], col, stm ); } -static UINT WHERE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) -{ - MSIWHEREVIEW *wv = (MSIWHEREVIEW *)view; - - TRACE("%p %d %p\n", wv, row, rec ); - - if (!wv->tables) - return ERROR_FUNCTION_FAILED; - - return msi_view_get_row( wv->db, view, row, rec ); -} - static UINT WHERE_set_int(struct tagMSIVIEW *view, UINT row, UINT col, int val) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; @@ -1108,7 +1096,6 @@ static const MSIVIEWOPS where_ops = { WHERE_fetch_int, WHERE_fetch_stream, - WHERE_get_row, WHERE_set_int, WHERE_set_string, WHERE_set_row,

1 0

Zebediah Figura : msi: Remove an unnecessary call to SELECT_get_dimensions ().
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 7728acd1b6994c553a046e3ff9ee1aebc20c38b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7728acd1b6994c553a046e3f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 26 16:59:00 2019 -0600 msi: Remove an unnecessary call to SELECT_get_dimensions(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/select.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msi/select.c b/dlls/msi/select.c index 99339c2..c6e7b20 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -233,14 +233,10 @@ static UINT SELECT_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *na static UINT msi_select_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) { MSISELECTVIEW *sv = (MSISELECTVIEW*)view; - UINT r, i, num_columns, col, type, val; + UINT r, i, col, type, val; LPCWSTR str; - r = SELECT_get_dimensions(view, NULL, &num_columns); - if (r != ERROR_SUCCESS) - return r; - - for (i = 0; i < num_columns; i++) + for (i = 0; i < sv->num_cols; i++) { col = sv->cols[i];

1 0

Zebediah Figura : msi: Store the IStorage list as an array of STORAGE structures.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 33045101ca657b2b09a53e14711b3f6bcacbafe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33045101ca657b2b09a53e14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 26 16:59:01 2019 -0600 msi: Store the IStorage list as an array of STORAGE structures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/storages.c | 62 +++++++++++++++++------------------------------------ 1 file changed, 20 insertions(+), 42 deletions(-) diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 9e161c9..76a0e2e 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -50,7 +50,7 @@ typedef struct tagMSISTORAGESVIEW { MSIVIEW view; MSIDATABASE *db; - STORAGE **storages; + STORAGE *storages; UINT max_storages; UINT num_rows; UINT row_size; @@ -61,7 +61,7 @@ static BOOL storages_set_table_size(MSISTORAGESVIEW *sv, UINT size) if (size >= sv->max_storages) { sv->max_storages *= 2; - sv->storages = msi_realloc(sv->storages, sv->max_storages * sizeof(STORAGE *)); + sv->storages = msi_realloc(sv->storages, sv->max_storages * sizeof(*sv->storages)); if (!sv->storages) return FALSE; } @@ -69,23 +69,6 @@ static BOOL storages_set_table_size(MSISTORAGESVIEW *sv, UINT size) return TRUE; } -static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPCWSTR name, IStorage *stg) -{ - STORAGE *storage; - - storage = msi_alloc(sizeof(STORAGE)); - if (!storage) - return NULL; - - storage->str_index = msi_add_string(sv->db->strings, name, -1, FALSE); - storage->storage = stg; - - if (storage->storage) - IStorage_AddRef(storage->storage); - - return storage; -} - static UINT STORAGES_fetch_int(struct tagMSIVIEW *view, UINT row, UINT col, UINT *val) { MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; @@ -98,7 +81,7 @@ static UINT STORAGES_fetch_int(struct tagMSIVIEW *view, UINT row, UINT col, UINT if (row >= sv->num_rows) return ERROR_NO_MORE_ITEMS; - *val = sv->storages[row]->str_index; + *val = sv->storages[row].str_index; return ERROR_SUCCESS; } @@ -173,7 +156,7 @@ done: static UINT STORAGES_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask) { MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; - IStorage *stg, *substg = NULL; + IStorage *stg, *substg = NULL, *prev; IStream *stm; LPWSTR name = NULL; HRESULT hr; @@ -181,7 +164,7 @@ static UINT STORAGES_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, TRACE("(%p, %p)\n", view, rec); - if (row > sv->num_rows) + if (row >= sv->num_rows) return ERROR_FUNCTION_FAILED; r = MSI_RecordGetIStream(rec, 2, &stm); @@ -218,9 +201,11 @@ static UINT STORAGES_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, goto done; } - sv->storages[row] = create_storage(sv, name, stg); - if (!sv->storages[row]) - r = ERROR_FUNCTION_FAILED; + prev = sv->storages[row].storage; + sv->storages[row].str_index = msi_add_string(sv->db->strings, name, -1, FALSE); + IStorage_AddRef(stg); + sv->storages[row].storage = stg; + if (prev) IStorage_Release(prev); done: msi_free(name); @@ -242,6 +227,8 @@ static UINT STORAGES_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, UINT ro if (row == -1) row = sv->num_rows - 1; + memset(&sv->storages[row], 0, sizeof(sv->storages[row])); + /* FIXME have to readjust rows */ return STORAGES_set_row(view, row, rec, 0); @@ -400,9 +387,8 @@ static UINT STORAGES_delete(struct tagMSIVIEW *view) for (i = 0; i < sv->num_rows; i++) { - if (sv->storages[i]->storage) - IStorage_Release(sv->storages[i]->storage); - msi_free(sv->storages[i]); + if (sv->storages[i].storage) + IStorage_Release(sv->storages[i].storage); } msi_free(sv->storages); @@ -436,7 +422,6 @@ static const MSIVIEWOPS storages_ops = static INT add_storages_to_table(MSISTORAGESVIEW *sv) { - STORAGE *storage = NULL; IEnumSTATSTG *stgenum = NULL; STATSTG stat; HRESULT hr; @@ -447,7 +432,7 @@ static INT add_storages_to_table(MSISTORAGESVIEW *sv) return -1; sv->max_storages = 1; - sv->storages = msi_alloc(sizeof(STORAGE *)); + sv->storages = msi_alloc(sizeof(*sv->storages)); if (!sv->storages) return -1; @@ -466,26 +451,19 @@ static INT add_storages_to_table(MSISTORAGESVIEW *sv) TRACE("enumerated storage %s\n", debugstr_w(stat.pwcsName)); - storage = create_storage(sv, stat.pwcsName, NULL); - if (!storage) + if (!storages_set_table_size(sv, ++count)) { count = -1; - CoTaskMemFree(stat.pwcsName); break; } + sv->storages[count - 1].str_index = msi_add_string(sv->db->strings, stat.pwcsName, -1, FALSE); + sv->storages[count - 1].storage = NULL; + IStorage_OpenStorage(sv->db->storage, stat.pwcsName, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, NULL, 0, - &storage->storage); + &sv->storages[count - 1].storage); CoTaskMemFree(stat.pwcsName); - - if (!storages_set_table_size(sv, ++count)) - { - count = -1; - break; - } - - sv->storages[count - 1] = storage; } IEnumSTATSTG_Release(stgenum);

1 0

Nikolay Sivov : dwrite/analyzer: Preserve inter-cluster spacing when apply spacing properties.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: efb1aef93f4c7e756c59b62e17006007440e1333 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efb1aef93f4c7e756c59b62e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 08:55:23 2019 +0300 dwrite/analyzer: Preserve inter-cluster spacing when apply spacing properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 209 +++++++++++++++++++------------------------ dlls/dwrite/tests/analyzer.c | 158 ++++++++++++++++++++++++-------- 2 files changed, 215 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=efb1aef93f4c7e756c59…

1 0

Jacek Caban : rpcrt4: Fix context handle return value marshaling.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: b6c48de699a11097b9557d045c0aa78758d615a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c48de699a11097b9557d04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:01:16 2019 +0100 rpcrt4: Fix context handle return value marshaling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index c2f260c..813d7e8 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1232,6 +1232,7 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, { NDR_SCONTEXT ctxt = NdrContextHandleInitialize(pStubMsg, pTypeFormat); *(void **)pArg = NDRSContextValue(ctxt); + if (params[i].attr.IsReturn) retval_ptr = (LONG_PTR *)NDRSContextValue(ctxt); } else { @@ -1243,6 +1244,7 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, } } } + if (!retval_ptr && params[i].attr.IsReturn) retval_ptr = (LONG_PTR *)pArg; break; case STUBLESS_UNMARSHAL: if (params[i].attr.ServerAllocSize) @@ -1260,9 +1262,6 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, RpcRaiseException(RPC_S_INTERNAL_ERROR); } TRACE("\tmemory addr (after): %p -> %p\n", pArg, *(unsigned char **)pArg); - - /* make a note of the address of the return value parameter for later */ - if (params[i].attr.IsReturn) retval_ptr = (LONG_PTR *)pArg; } return retval_ptr; }

1 0

Jacek Caban : rpcrt4: Fix context handle return value unmarshaling.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 464ba54b4cc99e1c1903a189f31845352a9faeba URL: https://source.winehq.org/git/wine.git/?a=commit;h=464ba54b4cc99e1c1903a189… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:01:23 2019 +0100 rpcrt4: Fix context handle return value unmarshaling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 77bbf98..d71d2fa 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -7031,10 +7031,15 @@ static unsigned char *WINAPI NdrContextHandleUnmarshall( if (pStubMsg->IsClient) { + NDR_CCONTEXT *ccontext; + if (pFormat[1] & HANDLE_PARAM_IS_VIA_PTR) + ccontext = *(NDR_CCONTEXT **)ppMemory; + else + ccontext = (NDR_CCONTEXT *)ppMemory; /* [out]-only or [ret] param */ if ((pFormat[1] & (HANDLE_PARAM_IS_IN|HANDLE_PARAM_IS_OUT)) == HANDLE_PARAM_IS_OUT) - **(NDR_CCONTEXT **)ppMemory = NULL; - NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); + *ccontext = NULL; + NdrClientContextUnmarshall(pStubMsg, ccontext, pStubMsg->RpcMsg->Handle); } else {

1 0

Jacek Caban : rpcrt4/tests: Add context handle marshaling tests.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 78d75e4a22c089f860b593ede17c1a762ecbdc5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=78d75e4a22c089f860b593ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:01:35 2019 +0100 rpcrt4/tests: Add context handle marshaling tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 41 ++++++++++++++++++++++++++++++++++++++++- dlls/rpcrt4/tests/server.idl | 8 ++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 5c6b216..4f8f043 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -141,6 +141,9 @@ static void (__cdecl *stop_autolisten)(void); static void (__cdecl *ip_test)(ipu_t *a); static int (__cdecl *sum_ptr_array)(int *a[2]); static int (__cdecl *sum_array_ptr)(int (*a)[2]); +static ctx_handle_t __cdecl (*get_handle)(void); +static void (__cdecl *get_handle_by_ptr)(ctx_handle_t *r); +static void (__cdecl *test_handle)(ctx_handle_t ctx_handle); #define SERVER_FUNCTIONS \ X(int_return) \ @@ -228,7 +231,10 @@ static int (__cdecl *sum_array_ptr)(int (*a)[2]); X(stop_autolisten) \ X(ip_test) \ X(sum_ptr_array) \ - X(sum_array_ptr) + X(sum_array_ptr) \ + X(get_handle) \ + X(get_handle_by_ptr) \ + X(test_handle) /* type check statements generated in header file */ fnprintf *p_printf = printf; @@ -1068,6 +1074,26 @@ int __cdecl s_sum_array_ptr(int (*a)[2]) return (*a)[0] + (*a)[1]; } +ctx_handle_t __cdecl s_get_handle(void) +{ + return (ctx_handle_t)0xdeadbeef; +} + +void __cdecl s_get_handle_by_ptr(ctx_handle_t *r) +{ + *r = (ctx_handle_t)0xdeadbeef; +} + +void __cdecl s_test_handle(ctx_handle_t ctx_handle) +{ + ok(ctx_handle == (ctx_handle_t)0xdeadbeef, "Unexpected ctx_handle %p\n", ctx_handle); +} + +void __RPC_USER ctx_handle_t_rundown(ctx_handle_t ctx_handle) +{ + ok(ctx_handle == (ctx_handle_t)0xdeadbeef, "Unexpected ctx_handle %p\n", ctx_handle); +} + static void make_cmdline(char buffer[MAX_PATH], const char *test) { @@ -1809,6 +1835,18 @@ void __cdecl s_authinfo_test(unsigned int protseq, int secure) } } +static void test_handle_return(void) +{ + ctx_handle_t handle, handle2; + + if (!is_interp) return; /* broken in widl */ + + handle = get_handle(); + test_handle(handle); + get_handle_by_ptr(&handle2); + test_handle(handle2); +} + static void run_tests(void) { @@ -1817,6 +1855,7 @@ run_tests(void) pointer_tests(); array_tests(); context_handle_test(); + test_handle_return(); } static void diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 65ba293..143d506 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -446,4 +446,12 @@ cpp_quote("#endif") int sum_ptr_array([in] int *a[2]); int sum_array_ptr([in] int (*a)[2]); + +cpp_quote("#ifndef SKIP_STRUCT_DECLS") + typedef [context_handle] void *ctx_handle_t; +cpp_quote("#endif") + + ctx_handle_t get_handle(); + void get_handle_by_ptr([out] ctx_handle_t *r); + void test_handle(ctx_handle_t ctx_handle); }

1 0

Jacek Caban : mshtml: Add IDOMCustomEvent::initCustomEvent implementation.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 7e15e494955d632c52dd10264270ea1cd4dbc00a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e15e494955d632c52dd1026… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:14:09 2019 +0100 mshtml: Add IDOMCustomEvent::initCustomEvent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 62ae8d3..0ec147d 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2116,8 +2116,15 @@ static HRESULT WINAPI DOMCustomEvent_initCustomEvent(IDOMCustomEvent *iface, BST VARIANT_BOOL cancelable, VARIANT *detail) { DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); - FIXME("(%p)->(%s %x %x %p)\n", This, debugstr_w(type), can_bubble, cancelable, debugstr_variant(detail)); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%s %x %x %p)\n", This, debugstr_w(type), can_bubble, cancelable, debugstr_variant(detail)); + + hres = IDOMEvent_initEvent(&This->event.IDOMEvent_iface, type, can_bubble, cancelable); + if(FAILED(hres)) + return hres; + + return VariantCopy(&This->detail, detail); } static const IDOMCustomEventVtbl DOMCustomEventVtbl = {

1 0

Jacek Caban : mshtml: Add IDOMCustomEvent::detail property implementation.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 757c3025c1b1acf588f6ea59f845bba59539c0ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=757c3025c1b1acf588f6ea59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:14:16 2019 +0100 mshtml: Add IDOMCustomEvent::detail property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0ec147d..1403542 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2108,8 +2108,11 @@ static HRESULT WINAPI DOMCustomEvent_Invoke(IDOMCustomEvent *iface, DISPID dispI static HRESULT WINAPI DOMCustomEvent_get_detail(IDOMCustomEvent *iface, VARIANT *p) { DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + V_VT(p) = VT_EMPTY; + return VariantCopy(p, &This->detail); } static HRESULT WINAPI DOMCustomEvent_initCustomEvent(IDOMCustomEvent *iface, BSTR type, VARIANT_BOOL can_bubble,

1 0

Jacek Caban : mshtml: Expose IDOMCustomEvent to scripts.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 7c2ec67d1eea4f5c4bcb71320c89eba940b4c42f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c2ec67d1eea4f5c4bcb7132… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:14:29 2019 +0100 mshtml: Expose IDOMCustomEvent to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 13 +++++++++++++ dlls/mshtml/tests/events.js | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 1403542..c0171c8 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2211,6 +2211,18 @@ static dispex_static_data_t DOMKeyboardEvent_dispex = { DOMKeyboardEvent_iface_tids }; +static const tid_t DOMCustomEvent_iface_tids[] = { + IDOMEvent_tid, + IDOMCustomEvent_tid, + 0 +}; + +static dispex_static_data_t DOMCustomEvent_dispex = { + NULL, + DispDOMCustomEvent_tid, + DOMCustomEvent_iface_tids +}; + static BOOL check_event_iface(nsIDOMEvent *event, REFIID riid) { nsISupports *iface; @@ -2243,6 +2255,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) custom_event->event.query_interface = DOMCustomEvent_query_interface; custom_event->event.destroy = DOMCustomEvent_destroy; event = &custom_event->event; + dispex_data = &DOMCustomEvent_dispex; }else if(!event) { event = heap_alloc_zero(sizeof(*event)); if(!event) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index dc9ce5a..46077b2 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -769,6 +769,20 @@ function test_keyboard_event() { next_test(); } +function test_custom_event() { + var e = document.createEvent("CustomEvent"); + + ok(e.detail === undefined, "detail = " + e.detail); + + e.initCustomEvent("test", true, false, 123); + ok(e.type === "test", "type = " + e.type); + ok(e.bubbles === true, "bubbles = " + e.bubbles); + ok(e.cancelable === false, "cancelable = " + e.cancelable); + ok(e.detail === 123, "detail = " + e.detail); + + next_test(); +} + function test_error_event() { document.body.innerHTML = '<div><img></img></div>'; var div = document.body.firstChild; @@ -822,6 +836,7 @@ var tests = [ test_ui_event, test_mouse_event, test_keyboard_event, + test_custom_event, test_error_event, test_detached_img_error_event, test_time_stamp,

1 0