October 2008 - Wine-commits

James Hawkins : msi: Replace lengthy calls to MSI_DatabaseOpenView with MSI_OpenQuery.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 8128d97fd44a3fa15eaf91201a4fde0cf1f12133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8128d97fd44a3fa15eaf91201… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Oct 8 22:42:50 2008 -0500 msi: Replace lengthy calls to MSI_DatabaseOpenView with MSI_OpenQuery. --- dlls/msi/database.c | 32 +++++++------------------------- 1 files changed, 7 insertions(+), 25 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 7dc1c06..8aa2c5f 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -557,25 +557,16 @@ static UINT msi_add_records_to_table(MSIDATABASE *db, LPWSTR *columns, LPWSTR *t int num_columns, int num_records) { UINT r; - DWORD i, size; + DWORD i; MSIQUERY *view; MSIRECORD *rec; - LPWSTR query; static const WCHAR select[] = { 'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ','`','%','s','`',0 }; - size = lstrlenW(select) + lstrlenW(labels[0]) - 1; - query = msi_alloc(size * sizeof(WCHAR)); - if (!query) - return ERROR_OUTOFMEMORY; - - sprintfW(query, select, labels[0]); - - r = MSI_DatabaseOpenViewW(db, query, &view); - msi_free(query); + r = MSI_OpenQuery(db, &view, select, labels[0]); if (r != ERROR_SUCCESS) return r; @@ -1268,29 +1259,21 @@ static UINT merge_diff_tables(MSIRECORD *rec, LPVOID param) { MERGEDATA *data = (MERGEDATA *)param; MERGETABLE *table; - MSIQUERY *dbview = NULL; + MSIQUERY *dbview; MSIQUERY *mergeview = NULL; LPCWSTR name; - LPWSTR query; - DWORD size; UINT r; - static const WCHAR fmt[] = {'S','E','L','E','C','T',' ','*',' ', + static const WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ','`','%','s','`',0}; name = MSI_RecordGetString(rec, 1); - size = lstrlenW(fmt) + lstrlenW(name) - 1; - query = msi_alloc(size * sizeof(WCHAR)); - if (!query) - return ERROR_OUTOFMEMORY; - sprintfW(query, fmt, name); - - r = MSI_DatabaseOpenViewW(data->db, query, &dbview); + r = MSI_OpenQuery(data->db, &dbview, query, name); if (r != ERROR_SUCCESS) - goto done; + return r; - r = MSI_DatabaseOpenViewW(data->merge, query, &mergeview); + r = MSI_OpenQuery(data->merge, &mergeview, query, name); if (r != ERROR_SUCCESS) goto done; @@ -1326,7 +1309,6 @@ static UINT merge_diff_tables(MSIRECORD *rec, LPVOID param) list_add_tail(data->tabledata, &table->entry); done: - msi_free(query); msiobj_release(&dbview->hdr); msiobj_release(&mergeview->hdr); return r;

1 0

James Hawkins : msi: Add a stub implementation of MsiDetermineApplicablePatches.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 1484c6272da3a014f92ba429b2bf61b9c6bbb3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1484c6272da3a014f92ba429b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Oct 8 23:07:19 2008 -0500 msi: Add a stub implementation of MsiDetermineApplicablePatches. --- dlls/msi/msi.c | 18 ++++++++++++++++++ dlls/msi/msi.spec | 4 ++-- include/msi.h | 27 +++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index a35f460..c233411 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -372,6 +372,24 @@ done: return r; } +UINT WINAPI MsiDetermineApplicablePatchesA(LPCSTR szProductPackagePath, + DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOA pPatchInfo) +{ + FIXME("(%s, %d, %p): stub!\n", debugstr_a(szProductPackagePath), + cPatchInfo, pPatchInfo); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + +UINT WINAPI MsiDetermineApplicablePatchesW(LPCWSTR szProductPackagePath, + DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOW pPatchInfo) +{ + FIXME("(%s, %d, %p): stub!\n", debugstr_w(szProductPackagePath), + cPatchInfo, pPatchInfo); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + static UINT msi_open_package(LPCWSTR product, MSIINSTALLCONTEXT context, MSIPACKAGE **package) { diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 925cfde..db7aa90 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -270,8 +270,8 @@ 274 stdcall MsiSourceListAddMediaDiskW(wstr wstr long long long wstr wstr) 275 stub MsiSourceListClearMediaDiskA 276 stub MsiSourceListClearMediaDiskW -277 stub MsiDetermineApplicablePatchesA -278 stub MsiDetermineApplicablePatchesW +277 stdcall MsiDetermineApplicablePatchesA(str long ptr) +278 stdcall MsiDetermineApplicablePatchesW(wstr long ptr) 279 stub MsiMessageBoxExA 280 stub MsiMessageBoxExW 281 stdcall MsiSetExternalUIRecord(ptr long ptr ptr) diff --git a/include/msi.h b/include/msi.h index cf125ef..0def6cb 100644 --- a/include/msi.h +++ b/include/msi.h @@ -201,6 +201,29 @@ typedef struct _MSIFILEHASHINFO { ULONG dwData[4]; } MSIFILEHASHINFO, *PMSIFILEHASHINFO; +typedef enum tagMSIPATCHDATATYPE +{ + MSIPATCH_DATATYPE_PATCHFILE = 0, + MSIPATCH_DATATYPE_XMLPATH = 1, + MSIPATCH_DATATYPE_XMLBLOB = 2, +} MSIPATCHDATATYPE, *PMSIPATCHDATATYPE; + +typedef struct tagMSIPATCHSEQUENCEINFOA +{ + LPCSTR szPatchData; + MSIPATCHDATATYPE ePatchDataType; + DWORD dwOrder; + UINT uStatus; +} MSIPATCHSEQUENCEINFOA, *PMSIPATCHSEQUENCEINFOA; + +typedef struct tagMSIPATCHSEQUENCEINFOW +{ + LPCWSTR szPatchData; + MSIPATCHDATATYPE ePatchDataType; + DWORD dwOrder; + UINT uStatus; +} MSIPATCHSEQUENCEINFOW, *PMSIPATCHSEQUENCEINFOW; + #define MAX_FEATURE_CHARS 38 /* Strings defined in msi.h */ @@ -607,6 +630,10 @@ UINT WINAPI MsiInstallMissingComponentA(LPCSTR, LPCSTR, INSTALLSTATE); UINT WINAPI MsiInstallMissingComponentW(LPCWSTR, LPCWSTR, INSTALLSTATE); #define MsiInstallMissingComponent WINELIB_NAME_AW(MsiInstallMissingComponent) +UINT WINAPI MsiDetermineApplicablePatchesA(LPCSTR, DWORD, PMSIPATCHSEQUENCEINFOA); +UINT WINAPI MsiDetermineApplicablePatchesW(LPCWSTR, DWORD, PMSIPATCHSEQUENCEINFOW); +#define MsiDetermineApplicablePatches WINELIB_NAME_AW(MsiDetermineApplicablePatches) + /* Non Unicode */ UINT WINAPI MsiCloseHandle(MSIHANDLE); UINT WINAPI MsiCloseAllHandles(void);

1 0

James Hawkins : msi: Add tests for converting record fields between strings and ints.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: c9ec69db02e99a7e513ed8d54efc8afa843f6c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ec69db02e99a7e513ed8d54… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Oct 8 22:42:22 2008 -0500 msi: Add tests for converting record fields between strings and ints. --- dlls/msi/tests/record.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 471fc9c..f211318 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -376,10 +376,66 @@ static void test_MsiRecordGetString(void) ok(sz == 0, "Expected 0, got %d\n", sz); MsiCloseHandle(rec); + + rec = MsiCreateRecord(1); + ok(rec != 0, "Expected a valid handle\n"); + + r = MsiRecordSetInteger(rec, 1, 5); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + sz = MAX_PATH; + lstrcpyA(buf, "apple"); + r = MsiRecordGetString(rec, 1, buf, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "5"), "Expected \"5\", got \"%s\"\n", buf); + ok(sz == 1, "Expectd 1, got %d\n", sz); + + r = MsiRecordSetInteger(rec, 1, -5); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + sz = MAX_PATH; + lstrcpyA(buf, "apple"); + r = MsiRecordGetString(rec, 1, buf, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "-5"), "Expected \"-5\", got \"%s\"\n", buf); + ok(sz == 2, "Expectd 2, got %d\n", sz); + + MsiCloseHandle(rec); +} + +static void test_MsiRecordGetInteger(void) +{ + MSIHANDLE rec; + INT val; + UINT r; + + rec = MsiCreateRecord(1); + ok(rec != 0, "Expected a valid handle\n"); + + r = MsiRecordSetString(rec, 1, "5"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(rec, 1); + ok(val == 5, "Expected 5, got %d\n", val); + + r = MsiRecordSetString(rec, 1, "-5"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(rec, 1); + ok(val == -5, "Expected -5, got %d\n", val); + + r = MsiRecordSetString(rec, 1, "5apple"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + val = MsiRecordGetInteger(rec, 1); + ok(val == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", val); + + MsiCloseHandle(rec); } START_TEST(record) { test_msirecord(); test_MsiRecordGetString(); + test_MsiRecordGetInteger(); }

1 0

James Hawkins : msi: Add initial implementation of MsiDatabaseMerge, with tests.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: f03889ae823635027b342089641ba1538b928038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f03889ae823635027b3420896… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Oct 8 22:42:33 2008 -0500 msi: Add initial implementation of MsiDatabaseMerge, with tests. --- dlls/msi/database.c | 497 ++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/msipriv.h | 2 + dlls/msi/record.c | 71 ++++++++ dlls/msi/tests/db.c | 449 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 1014 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f03889ae823635027b342…

1 0

James Hawkins : msi: Remove a part of a debugging statement that was accidentally left in.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: b18700834523dc69c0dce2bc26d19be856b93fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18700834523dc69c0dce2bc2… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Oct 8 22:42:05 2008 -0500 msi: Remove a part of a debugging statement that was accidentally left in. --- dlls/msi/table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 0309165..f54f6b2 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -944,7 +944,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, UINT r, i, n=0, table_id, count, maxcount = *sz; MSITABLE *table = NULL; - TRACE("%s %d\n", debugstr_w(szTableName), *sz); + TRACE("%s\n", debugstr_w(szTableName)); /* first check if there is a default table with that name */ r = get_defaulttablecolumns( db, szTableName, colinfo, sz );

1 0

Dmitry Timoshkov : gdi32: Revert incorrect fix introduced in a5d288f08c08dc19d217093fdf8622605c92a4e0 .
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 7c1397412b1a178287a6f35d1480a2f8b4c38e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1397412b1a178287a6f35d1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Oct 9 14:30:00 2008 +0900 gdi32: Revert incorrect fix introduced in a5d288f08c08dc19d217093fdf8622605c92a4e0. The real fix has been provided in 41aad2dce28ca0dd9d23fa6234ad8523302d6054. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d4cecb3..0ab4c7a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3433,7 +3433,7 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) /* If requested charset was DEFAULT_CHARSET then try using charset corresponding to the current ansi codepage */ - if (!csi.fs.fsCsb[0] || lf.lfWeight == FW_DONTCARE) + if (!csi.fs.fsCsb[0]) { INT acp = GetACP(); if(!TranslateCharsetInfo((DWORD*)(INT_PTR)acp, &csi, TCI_SRCCODEPAGE)) {

1 0

Dmitry Timoshkov : gdi32: Remove the code which bypasses the DC transformation checks.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: f898547b77a091132aefa1967887f5e640819bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f898547b77a091132aefa1967… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Oct 9 10:23:46 2008 +0900 gdi32: Remove the code which bypasses the DC transformation checks. If it's absolutely required to check the child list first, that should be done inside of find_in_cache using the same comparisons as done there. --- dlls/gdi32/freetype.c | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 145be9b..d4cecb3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3286,24 +3286,7 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) FMAT2 dcmat; FontSubst *psub = NULL; - EnterCriticalSection( &freetype_cs ); - - LIST_FOR_EACH_ENTRY(ret, &child_font_list, struct tagGdiFont, entry) - { - struct list *first_hfont = list_head(&ret->hfontlist); - hflist = LIST_ENTRY(first_hfont, HFONTLIST, entry); - if(hflist->hfont == hfont) - { - LeaveCriticalSection( &freetype_cs ); - return ret; - } - } - - if (!GetObjectW( hfont, sizeof(lf), &lf )) - { - LeaveCriticalSection( &freetype_cs ); - return NULL; - } + if (!GetObjectW( hfont, sizeof(lf), &lf )) return NULL; lf.lfWidth = abs(lf.lfWidth); can_use_bitmap = GetDeviceCaps(dc->hSelf, TEXTCAPS) & TC_RA_ABLE; @@ -3326,6 +3309,8 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) TRACE("DC transform %f %f %f %f\n", dcmat.eM11, dcmat.eM12, dcmat.eM21, dcmat.eM22); + EnterCriticalSection( &freetype_cs ); + /* check the cache first */ if((ret = find_in_cache(hfont, &lf, &dcmat, can_use_bitmap)) != NULL) { TRACE("returning cached gdiFont(%p) for hFont %p\n", ret, hfont);

1 0

Alexandre Julliard : server: Follow symlink even with OBJ_OPENLINK unless it is the last element of the path .
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: c928aa67fbeab2c24fe7574b32f91c024fc1d5a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c928aa67fbeab2c24fe7574b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 9 12:43:36 2008 +0200 server: Follow symlink even with OBJ_OPENLINK unless it is the last element of the path. --- server/symlink.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/symlink.c b/server/symlink.c index 9769c83..2ec7ed5 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -99,7 +99,7 @@ static struct object *symlink_lookup_name( struct object *obj, struct unicode_st struct object *target; assert( obj->ops == &symlink_ops ); - if (attr & OBJ_OPENLINK) return NULL; + if (!name->len && (attr & OBJ_OPENLINK)) return NULL; target_str.str = symlink->target; target_str.len = symlink->len;

1 0

Alexandre Julliard : ws2_32: Allow arbitrary-sized iovecs again in WSASendTo and WSARecvFrom.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: fe7c5d86e7d9e06872c2fb6ddf7ebe8d92525d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7c5d86e7d9e06872c2fb6dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 9 12:57:33 2008 +0200 ws2_32: Allow arbitrary-sized iovecs again in WSASendTo and WSARecvFrom. --- dlls/ws2_32/socket.c | 159 +++++++++++++++++++++---------------------------- 1 files changed, 68 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe7c5d86e7d9e06872c2f…

1 0

Jacek Caban : jscript: Added '%' expression implementation.
by Alexandre Julliard 09 Oct '08

09 Oct '08

Module: wine Branch: master Commit: 065581b236396ba79c29d428cecd3e698f9c7e32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=065581b236396ba79c29d428c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 18:09:17 2008 -0500 jscript: Added '%' expression implementation. --- dlls/jscript/engine.c | 29 ++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 12 ++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d84e65b..b09136c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #include "jscript.h" #include "engine.h" @@ -2046,10 +2048,31 @@ HRESULT div_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j } /* ECMA-262 3rd Edition 11.5.3 */ -HRESULT mod_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT mod_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT lnum, rnum; + HRESULT hres; + + hres = to_number(ctx->parser->script, lval, ei, &lnum); + if(FAILED(hres)) + return hres; + + hres = to_number(ctx->parser->script, rval, ei, &rnum); + if(FAILED(hres)) + return hres; + + num_set_val(retv, fmod(num_val(&lnum), num_val(&rnum))); + return S_OK; +} + +/* ECMA-262 3rd Edition 11.5.3 */ +HRESULT mod_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +{ + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return binary_expr_eval(ctx, expr, mod_eval, ei, ret); } /* ECMA-262 3rd Edition 11.4.2 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 82e865f..39f8a29 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -248,6 +248,18 @@ tmp = 3/2; ok(tmp === 1.5, "3/2 !== 1.5"); ok(getVT(tmp) === "VT_R8", "getVT(3/2) !== VT_R8"); +tmp = 3%2; +ok(tmp === 1, "3%2 = " + tmp); + +tmp = 4%2; +ok(tmp ===0, "4%2 = " + tmp); + +tmp = 3.5%1.5; +ok(tmp === 0.5, "3.5%1.5 = " + tmp); + +tmp = 3%true; +ok(tmp === 0, "3%true = " + tmp); + tmp = "ab" + "cd"; ok(tmp === "abcd", "\"ab\" + \"cd\" !== \"abcd\"");

1 0