January 2019 - Wine-Commits

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

Jan. 28, 2019

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: Factor out int_to_table_storage().
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 99425f272f7807aea068629ef3e5fda6640b2845 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99425f272f7807aea068629e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 26 16:58:57 2019 -0600 msi: Factor out int_to_table_storage(). 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/table.c | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index b507268..e4f6b56 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1201,6 +1201,26 @@ static UINT TABLE_set_int( MSITABLEVIEW *tv, UINT row, UINT col, UINT val ) return ERROR_SUCCESS; } +static UINT int_to_table_storage( const MSITABLEVIEW *tv, UINT col, int val, UINT *ret ) +{ + if ((tv->columns[col-1].type & MSI_DATASIZEMASK) == 2) + { + if (val == MSI_NULL_INTEGER) + *ret = 0; + else if ((val + 0x8000) & 0xffff0000) + { + ERR("value %d out of range\n", val); + return ERROR_FUNCTION_FAILED; + } + else + *ret = val + 0x8000; + } + else + *ret = val ^ 0x80000000; + + return ERROR_SUCCESS; +} + static UINT TABLE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) { MSITABLEVIEW *tv = (MSITABLEVIEW *)view; @@ -1276,7 +1296,6 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT { MSICOLUMNINFO columninfo; UINT r; - int ival; if (!iField || iField > tv->num_cols || MSI_RecordIsNull( rec, iField )) return ERROR_FUNCTION_FAILED; @@ -1299,25 +1318,8 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT } else *pvalue = 0; } - else if ( bytes_per_column( tv->db, &columninfo, LONG_STR_BYTES ) == 2 ) - { - ival = MSI_RecordGetInteger( rec, iField ); - if (ival == 0x80000000) *pvalue = 0x8000; - else - { - *pvalue = 0x8000 + MSI_RecordGetInteger( rec, iField ); - if (*pvalue & 0xffff0000) - { - ERR("field %u value %d out of range\n", iField, *pvalue - 0x8000); - return ERROR_FUNCTION_FAILED; - } - } - } else - { - ival = MSI_RecordGetInteger( rec, iField ); - *pvalue = ival ^ 0x80000000; - } + return int_to_table_storage( tv, iField, MSI_RecordGetInteger( rec, iField ), pvalue ); return ERROR_SUCCESS; } @@ -2370,14 +2372,11 @@ static UINT* msi_record_to_row( const MSITABLEVIEW *tv, MSIRECORD *rec ) } else { - data[i] = MSI_RecordGetInteger( rec, i+1 ); - - if (data[i] == MSI_NULL_INTEGER) - data[i] = 0; - else if ((tv->columns[i].type&0xff) == 2) - data[i] += 0x8000; - else - data[i] += 0x80000000; + if (int_to_table_storage( tv, i + 1, MSI_RecordGetInteger( rec, i + 1 ), &data[i] )) + { + msi_free( data ); + return NULL; + } } } return data;

1 0

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

Jan. 28, 2019

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

Zebediah Figura : msi: Set table values directly in msi_select_update().
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: f45a7b04a6caca4eed1d08f4e69884b119f3aa17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f45a7b04a6caca4eed1d08f4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 26 16:58:58 2019 -0600 msi: Set table values directly in msi_select_update(). In order to avoid the need to create a temporary record and copy values back and forth. 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 | 2 ++ dlls/msi/create.c | 2 ++ dlls/msi/delete.c | 2 ++ dlls/msi/distinct.c | 2 ++ dlls/msi/drop.c | 2 ++ dlls/msi/insert.c | 2 ++ dlls/msi/msipriv.h | 14 +++++++++++ dlls/msi/select.c | 26 +++++++------------- dlls/msi/storages.c | 8 ++++++ dlls/msi/streams.c | 8 ++++++ dlls/msi/table.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msi/update.c | 2 ++ dlls/msi/where.c | 42 +++++++++++++++++++++++++++++++ 13 files changed, 164 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f45a7b04a6caca4eed1d…

1 0

Nikolay Sivov : dwrite: Use a helper for design advances.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: ddd7c8c51f64b8f7d9ff2ee03ce7803430d71100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd7c8c51f64b8f7d9ff2ee0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 25 14:56:41 2019 +0300 dwrite: Use a helper for design advances. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 229 +++++++++++++++++++++++++++-------------------------- 1 file changed, 116 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddd7c8c51f64b8f7d9ff…

1 0

Matteo Bruni : d3dx9: Improve D3DXMatrixTransformation() implementation.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: f54260a789387ab40de3d80291ad9000176dabe1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f54260a789387ab40de3d802… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:00 2019 +0100 d3dx9: Improve D3DXMatrixTransformation() implementation. Inspired by a patch from David Adam. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33456 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/math.c | 104 +++++++++++++++++++++++---------------------------- 1 file changed, 46 insertions(+), 58 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 8909c3c..02e917d 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -744,82 +744,70 @@ D3DXMATRIX* WINAPI D3DXMatrixShadow(D3DXMATRIX *pout, const D3DXVECTOR4 *plight, return pout; } -D3DXMATRIX* WINAPI D3DXMatrixTransformation(D3DXMATRIX *pout, const D3DXVECTOR3 *pscalingcenter, const D3DXQUATERNION *pscalingrotation, const D3DXVECTOR3 *pscaling, const D3DXVECTOR3 *protationcenter, const D3DXQUATERNION *protation, const D3DXVECTOR3 *ptranslation) +D3DXMATRIX * WINAPI D3DXMatrixTransformation(D3DXMATRIX *out, const D3DXVECTOR3 *scaling_center, + const D3DXQUATERNION *scaling_rotation, const D3DXVECTOR3 *scaling, + const D3DXVECTOR3 *rotation_center, const D3DXQUATERNION *rotation, + const D3DXVECTOR3 *translation) { - D3DXMATRIX m1, m2, m3, m4, m5, m6, m7; - D3DXQUATERNION prc; - D3DXVECTOR3 psc, pt; + static const D3DXVECTOR3 zero_vector; + D3DXMATRIX m1, msr1, ms, msr, msc, mrc1, mr, mrc, mt; + D3DXVECTOR3 sc, rc; + D3DXQUATERNION q; - TRACE("pout %p, pscalingcenter %p, pscalingrotation %p, pscaling %p, protationcentr %p, protation %p, ptranslation %p\n", - pout, pscalingcenter, pscalingrotation, pscaling, protationcenter, protation, ptranslation); + TRACE("out %p, scaling_center %p, scaling_rotation %p, scaling %p, rotation_center %p," + " rotation %p, translation %p.\n", + out, scaling_center, scaling_rotation, scaling, rotation_center, rotation, translation); - if ( !pscalingcenter ) + if (scaling) { - psc.x = 0.0f; - psc.y = 0.0f; - psc.z = 0.0f; - } - else - { - psc.x = pscalingcenter->x; - psc.y = pscalingcenter->y; - psc.z = pscalingcenter->z; - } - - if ( !protationcenter ) - { - prc.x = 0.0f; - prc.y = 0.0f; - prc.z = 0.0f; + sc = scaling_center ? *scaling_center : zero_vector; + D3DXMatrixTranslation(&m1, -sc.x, -sc.y, -sc.z); + if (scaling_rotation) + { + q.x = -scaling_rotation->x; + q.y = -scaling_rotation->y; + q.z = -scaling_rotation->z; + q.w = scaling_rotation->w; + D3DXMatrixRotationQuaternion(&msr1, &q); + D3DXMatrixMultiply(&m1, &m1, &msr1); + } + D3DXMatrixScaling(&ms, scaling->x, scaling->y, scaling->z); + D3DXMatrixMultiply(&m1, &m1, &ms); + if (scaling_rotation) + { + D3DXMatrixRotationQuaternion(&msr, scaling_rotation); + D3DXMatrixMultiply(&m1, &m1, &msr); + } + D3DXMatrixTranslation(&msc, sc.x, sc.y, sc.z); + D3DXMatrixMultiply(&m1, &m1, &msc); } else { - prc.x = protationcenter->x; - prc.y = protationcenter->y; - prc.z = protationcenter->z; + D3DXMatrixIdentity(&m1); } - if ( !ptranslation ) - { - pt.x = 0.0f; - pt.y = 0.0f; - pt.z = 0.0f; - } - else + if (rotation) { - pt.x = ptranslation->x; - pt.y = ptranslation->y; - pt.z = ptranslation->z; + rc = rotation_center ? *rotation_center : zero_vector; + D3DXMatrixTranslation(&mrc1, -rc.x, -rc.y, -rc.z); + D3DXMatrixMultiply(&m1, &m1, &mrc1); + D3DXMatrixRotationQuaternion(&mr, rotation); + D3DXMatrixMultiply(&m1, &m1, &mr); + D3DXMatrixTranslation(&mrc, rc.x, rc.y, rc.z); + D3DXMatrixMultiply(&m1, &m1, &mrc); } - D3DXMatrixTranslation(&m1, -psc.x, -psc.y, -psc.z); - - if ( !pscalingrotation ) + if (translation) { - D3DXMatrixIdentity(&m2); - D3DXMatrixIdentity(&m4); + D3DXMatrixTranslation(&mt, translation->x, translation->y, translation->z); + D3DXMatrixMultiply(out, &m1, &mt); } else { - D3DXMatrixRotationQuaternion(&m4, pscalingrotation); - D3DXMatrixInverse(&m2, NULL, &m4); + *out = m1; } - if ( !pscaling ) D3DXMatrixIdentity(&m3); - else D3DXMatrixScaling(&m3, pscaling->x, pscaling->y, pscaling->z); - - if ( !protation ) D3DXMatrixIdentity(&m6); - else D3DXMatrixRotationQuaternion(&m6, protation); - - D3DXMatrixTranslation(&m5, psc.x - prc.x, psc.y - prc.y, psc.z - prc.z); - D3DXMatrixTranslation(&m7, prc.x + pt.x, prc.y + pt.y, prc.z + pt.z); - D3DXMatrixMultiply(&m1, &m1, &m2); - D3DXMatrixMultiply(&m1, &m1, &m3); - D3DXMatrixMultiply(&m1, &m1, &m4); - D3DXMatrixMultiply(&m1, &m1, &m5); - D3DXMatrixMultiply(&m1, &m1, &m6); - D3DXMatrixMultiply(pout, &m1, &m7); - return pout; + return out; } D3DXMATRIX* WINAPI D3DXMatrixTransformation2D(D3DXMATRIX *pout, const D3DXVECTOR2 *pscalingcenter, FLOAT scalingrotation, const D3DXVECTOR2 *pscaling, const D3DXVECTOR2 *protationcenter, FLOAT rotation, const D3DXVECTOR2 *ptranslation)

1 0

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

Jan. 25, 2019

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

Matteo Bruni : d3dx9/tests: Avoid some 64-bit test failures.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

Module: wine Branch: master Commit: 699eb8cdba8fe236f038550e2bd68a4cd2cab055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=699eb8cdba8fe236f038550e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:02 2019 +0100 d3dx9/tests: Avoid some 64-bit test failures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index e433b1f..1bca945 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1093,16 +1093,16 @@ static void D3DXQuaternionTest(void) expectedquat.x = 7.121285f; expectedquat.y = 2.159964f; expectedquat.z = -3.855094f; expectedquat.w = 5.362844f; expect_quaternion(&expectedquat, &gotquat, 2); expectedquat.x = -1113.492920f; expectedquat.y = 82.679260f; expectedquat.z = -6.696645f; expectedquat.w = -4.090050f; - expect_quaternion(&expectedquat, &Nq, 2); + expect_quaternion(&expectedquat, &Nq, 4); expectedquat.x = -1111.0f; expectedquat.y = 111.0f; expectedquat.z = -11.0f; expectedquat.w = 1.0f; expect_quaternion(&expectedquat, &Nq1, 0); gotquat = s; D3DXQuaternionSquadSetup(&gotquat, &Nq, &Nq1, &r, &gotquat, &t, &u); expectedquat.x = -1113.492920f; expectedquat.y = 82.679260f; expectedquat.z = -6.696645f; expectedquat.w = -4.090050f; - expect_quaternion(&expectedquat, &Nq, 2); + expect_quaternion(&expectedquat, &Nq, 4); Nq1 = u; D3DXQuaternionSquadSetup(&gotquat, &Nq, &Nq1, &r, &s, &t, &Nq1); - expect_quaternion(&expectedquat, &Nq, 2); + expect_quaternion(&expectedquat, &Nq, 4); r.x = 0.2f; r.y = 0.3f; r.z = 1.3f; r.w = -0.6f; s.x = -3.0f; s.y =-2.0f; s.z = 4.0f; s.w = 0.2f; t.x = 0.4f; t.y = 8.3f; t.z = -3.1f; t.w = -2.7f;

1 0

Jacek Caban : mshtml: Add IDOMCustomEvent::initCustomEvent implementation.
by Alexandre Julliard Jan. 25, 2019

Jan. 25, 2019

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 Jan. 25, 2019

Jan. 25, 2019

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