July 2009 - Wine-Commits - list.winehq.org

Hib Eris : msi/tests: Add tests for MsiViewModify ASSIGN mode.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: eaea537f0f0cbefc55b5fb8bb023e2cd779f810d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaea537f0f0cbefc55b5fb8bb… Author: Hib Eris <hib(a)hiberis.nl> Date: Mon Jul 6 12:24:48 2009 +0200 msi/tests: Add tests for MsiViewModify ASSIGN mode. --- dlls/msi/tests/db.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 122 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 43b5648..e694ea3 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4763,6 +4763,127 @@ static void test_viewmodify_update(void) ok(r == ERROR_SUCCESS, "MsiOpenDatabase close failed\n"); } +static void test_viewmodify_assign(void) +{ + MSIHANDLE hdb = 0, hview = 0, hrec = 0; + const char *query; + UINT r; + + /* setup database */ + DeleteFile(msifile); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + query = "CREATE TABLE `table` (`A` INT, `B` INT PRIMARY KEY `A`)"; + r = run_query( hdb, 0, query ); + ok(r == ERROR_SUCCESS, "query failed\n"); + + /* assign to view, new primary key */ + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + hrec = MsiCreateRecord(2); + ok(hrec != 0, "MsiCreateRecord failed\n"); + + r = MsiRecordSetInteger(hrec, 1, 1); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + r = MsiRecordSetInteger(hrec, 2, 2); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + + r = MsiViewModify(hview, MSIMODIFY_ASSIGN, hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview, &hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + todo_wine ok(r == 1, "Expected 1, got %d\n", r); + r = MsiRecordGetInteger(hrec, 2); + todo_wine ok(r == 2, "Expected 2, got %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + /* assign to view, primary key matches */ + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + hrec = MsiCreateRecord(2); + ok(hrec != 0, "MsiCreateRecord failed\n"); + + r = MsiRecordSetInteger(hrec, 1, 1); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + r = MsiRecordSetInteger(hrec, 2, 4); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + + r = MsiViewModify(hview, MSIMODIFY_ASSIGN, hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview, &hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + todo_wine ok(r == 1, "Expected 1, got %d\n", r); + r = MsiRecordGetInteger(hrec, 2); + todo_wine ok(r == 4, "Expected 4, got %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + /* close database */ + r = MsiCloseHandle( hdb ); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase close failed\n"); +} + static const WCHAR data10[] = { /* MOO */ 0x8001, 0x000b, }; @@ -8099,6 +8220,7 @@ START_TEST(db) test_tables_order(); test_select_markers(); test_viewmodify_update(); + test_viewmodify_assign(); test_stringtable(); test_viewmodify_delete(); test_defaultdatabase();

1 0

Piotr Caban : jscript: Added Bool_valueOf implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 4725b5698ceb7023879772f888e5cc1f8cf2df29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4725b5698ceb7023879772f88… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:45 2009 +0200 jscript: Added Bool_valueOf implementation. --- dlls/jscript/bool.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index e7cf22f..c1cf297 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -74,11 +74,25 @@ static HRESULT Bool_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DI return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.6.4.3 */ static HRESULT Bool_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_BOOLEAN)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + BoolInstance *bool = (BoolInstance*)dispex; + + V_VT(retv) = VT_BOOL; + V_BOOL(retv) = bool->val; + } + + return S_OK; } static HRESULT Bool_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c789cc0..2e7f2d4 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1084,5 +1084,6 @@ var bool = new Boolean(); ok(bool.toString() === "false", "bool.toString() = " + bool.toString()); var bool = new Boolean("false"); ok(bool.toString() === "true", "bool.toString() = " + bool.toString()); +ok(bool.valueOf() === Boolean(1), "bool.valueOf() = " + bool.valueOf()); reportSuccess();

1 0

Piotr Caban : jscript: Fixed to_boolean implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: b6549fa743675b9d58f57ec0bbfac0c08fefd9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6549fa743675b9d58f57ec0b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:56 2009 +0200 jscript: Fixed to_boolean implementation. --- dlls/jscript/jsutils.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 73bac94..eab850b 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -211,7 +211,8 @@ HRESULT to_boolean(VARIANT *v, VARIANT_BOOL *b) *b = V_I4(v) ? VARIANT_TRUE : VARIANT_FALSE; break; case VT_R8: - *b = V_R8(v) ? VARIANT_TRUE : VARIANT_FALSE; + if(isnan(V_R8(v))) *b = VARIANT_FALSE; + else *b = V_R8(v) ? VARIANT_TRUE : VARIANT_FALSE; break; case VT_BSTR: *b = V_BSTR(v) && *V_BSTR(v) ? VARIANT_TRUE : VARIANT_FALSE;

1 0

Piotr Caban : jscript: Added Boolean constructor implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 4b341bfdd4300d840800be1e7a62ecd0f3de3dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b341bfdd4300d840800be1e7… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:36 2009 +0200 jscript: Added Boolean constructor implementation. --- dlls/jscript/bool.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index 7e3bf7a..be36787 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -106,8 +106,41 @@ static const builtin_info_t Bool_info = { static HRESULT BoolConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + VARIANT_BOOL value = VARIANT_FALSE; + + if(arg_cnt(dp)) { + hres = to_boolean(get_arg(dp,0), &value); + if(FAILED(hres)) + return hres; + } + + switch(flags) { + case DISPATCH_CONSTRUCT: { + DispatchEx *bool; + + hres = create_bool(dispex->ctx, value, &bool); + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(bool); + return S_OK; + } + + case INVOKE_FUNC: + if(retv) { + V_VT(retv) = VT_BOOL; + V_BOOL(retv) = value; + } + return S_OK; + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT alloc_bool(script_ctx_t *ctx, BOOL use_constr, BoolInstance **ret)

1 0

Piotr Caban : jscript: Added Date_valueOf implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 9a30d39b350088cee62eaafac4d4ca711667b069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a30d39b350088cee62eaafac… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:31 2009 +0200 jscript: Added Date_valueOf implementation. --- dlls/jscript/date.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index fe65702..525a3a2 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -676,8 +676,18 @@ static HRESULT Date_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DIS static HRESULT Date_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + num_set_val(retv, date->time); + } + return S_OK; } /* ECMA-262 3rd Edition 15.9.5.42 */

1 0

Piotr Caban : jscript: Fix do while loop parsing.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 60748ebf515ba25b5e7506c54ecaa86486f9d009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60748ebf515ba25b5e7506c54… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:23 2009 +0200 jscript: Fix do while loop parsing. --- dlls/jscript/parser.y | 2 +- dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 52a31c8..d47d40d 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -386,7 +386,7 @@ IfStatement /* ECMA-262 3rd Edition 12.6 */ IterationStatement - : kDO Statement kWHILE '(' Expression ')' ';' + : kDO Statement kWHILE '(' Expression ')' semicolon_opt { $$ = new_while_statement(ctx, TRUE, $5, $2); } | kWHILE '(' Expression ')' Statement { $$ = new_while_statement(ctx, FALSE, $3, $5); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 86eba86..cf04f9e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -672,6 +672,13 @@ do { ok(tmp === 1, "tmp !== 1"); tmp = 0; +do { + ok(tmp < 4, "tmp >= 4"); + tmp++; +} while(tmp < 4) +ok(tmp === 4, "tmp !== 4") + +tmp = 0; while(tmp < 4) { tmp++; if(tmp === 2) {

1 0

Piotr Caban : jscript: Added Bool_toLocaleString implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 2ed3903f0f3fb9080abe113014de3955a1f5413b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed3903f0f3fb9080abe11301… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:51 2009 +0200 jscript: Added Bool_toLocaleString implementation. --- dlls/jscript/bool.c | 5 +++-- dlls/jscript/tests/api.js | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index c1cf297..ab9ef43 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -1,5 +1,6 @@ /* * Copyright 2008 Jacek Caban for CodeWeavers + * Copyright 2009 Piotr Caban * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -70,8 +71,8 @@ static HRESULT Bool_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA static HRESULT Bool_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return Bool_toString(dispex, lcid, flags, dp, retv, ei, sp); } /* ECMA-262 3rd Edition 15.6.4.3 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2e7f2d4..23a4ad5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1085,5 +1085,6 @@ ok(bool.toString() === "false", "bool.toString() = " + bool.toString()); var bool = new Boolean("false"); ok(bool.toString() === "true", "bool.toString() = " + bool.toString()); ok(bool.valueOf() === Boolean(1), "bool.valueOf() = " + bool.valueOf()); +ok(bool.toLocaleString() === bool.toString(), "bool.toLocaleString() = " + bool.toLocaleString()); reportSuccess();

1 0

Piotr Caban : jscript: Added Bool_toString implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 1e72bc8718ae35867b8ecdbdb7ac3efbb52a3ad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e72bc8718ae35867b8ecdbdb… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:41 2009 +0200 jscript: Added Bool_toString implementation. --- dlls/jscript/bool.c | 28 ++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index be36787..e7cf22f 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -36,11 +36,35 @@ static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; +/* ECMA-262 3rd Edition 15.6.4.2 */ static HRESULT Bool_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR trueW[] = {'t','r','u','e',0}; + static const WCHAR falseW[] = {'f','a','l','s','e',0}; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_BOOLEAN)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + BoolInstance *bool = (BoolInstance*)dispex; + BSTR val; + + if(bool->val) val = SysAllocString(trueW); + else val = SysAllocString(falseW); + + if(!val) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = val; + } + + return S_OK; } static HRESULT Bool_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index b76e94b..c789cc0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1080,4 +1080,9 @@ ok(Math.floor(Math.SQRT1_2*100) === 70, "Math.SQRT1_2 = " + Math.SQRT1_2); Math.SQRT1_2 = "test"; ok(Math.floor(Math.SQRT1_2*100) === 70, "modified Math.SQRT1_2 = " + Math.SQRT1_2); +var bool = new Boolean(); +ok(bool.toString() === "false", "bool.toString() = " + bool.toString()); +var bool = new Boolean("false"); +ok(bool.toString() === "true", "bool.toString() = " + bool.toString()); + reportSuccess();

1 0

Alexander Scott-Johns : notepad: Refactor DoOpenFile to simplify next patch .
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 93b99e0af36fd6290822a13d2e36c88cb8826956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b99e0af36fd6290822a13d2… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jul 3 00:34:45 2009 +0100 notepad: Refactor DoOpenFile to simplify next patch. --- programs/notepad/dialog.c | 70 ++++++++++++++++----------------------------- 1 files changed, 25 insertions(+), 45 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index c1dbb6d..eae0d30 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -337,24 +337,6 @@ static inline ENCODING detect_encoding_of_buffer(const void* buffer, int size) } } -/* Similar to SetWindowTextA, but uses a CP_UTF8 encoded input, not CP_ACP. - * lpTextInUtf8 should be NUL-terminated and not include the BOM. - * - * Returns FALSE on failure, TRUE on success, like SetWindowTextA/W. - */ -static BOOL SetWindowTextUtf8(HWND hwnd, LPCSTR lpTextInUtf8) -{ - BOOL ret; - int lenW = MultiByteToWideChar(CP_UTF8, 0, lpTextInUtf8, -1, NULL, 0); - LPWSTR textW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); - if (!textW) - return FALSE; - MultiByteToWideChar(CP_UTF8, 0, lpTextInUtf8, -1, textW, lenW); - ret = SetWindowTextW(hwnd, textW); - HeapFree(GetProcessHeap(), 0, textW); - return ret; -} - void DoOpenFile(LPCWSTR szFileName, ENCODING enc) { static const WCHAR dotlog[] = { '.','L','O','G',0 }; @@ -362,7 +344,8 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) LPSTR pTemp; DWORD size; DWORD dwNumRead; - BOOL succeeded; + int lenW; + WCHAR* textW; WCHAR log[5]; /* Close any files and prompt to save changes */ @@ -405,8 +388,6 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) CloseHandle(hFile); size = dwNumRead; - pTemp[size] = 0; /* make sure it's (char)'\0'-terminated */ - pTemp[size+1] = 0; /* make sure it's (WCHAR)'\0'-terminated */ if (enc == ENCODING_AUTO) enc = detect_encoding_of_buffer(pTemp, size); @@ -421,9 +402,6 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) enc = ENCODING_UTF16BE; } - /* SetWindowTextUtf8 and SetWindowTextA try to allocate memory, so we - * check if they succeed. - */ switch (enc) { case ENCODING_UTF16BE: @@ -434,33 +412,35 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) /* fall through */ case ENCODING_UTF16LE: - if (size >= 2 && (BYTE)pTemp[0] == 0xff && (BYTE)pTemp[1] == 0xfe) - succeeded = SetWindowTextW(Globals.hEdit, (LPWSTR)pTemp + 1); - else - succeeded = SetWindowTextW(Globals.hEdit, (LPWSTR)pTemp); - break; - - case ENCODING_UTF8: - if (size >= 3 && (BYTE)pTemp[0] == 0xef && (BYTE)pTemp[1] == 0xbb && - (BYTE)pTemp[2] == 0xbf) - succeeded = SetWindowTextUtf8(Globals.hEdit, pTemp+3); - else - succeeded = SetWindowTextUtf8(Globals.hEdit, pTemp); + textW = (LPWSTR)pTemp; + lenW = size/sizeof(WCHAR); break; default: - succeeded = SetWindowTextA(Globals.hEdit, pTemp); - break; + { + int cp = (enc==ENCODING_UTF8) ? CP_UTF8 : CP_ACP; + lenW = MultiByteToWideChar(cp, 0, pTemp, size, NULL, 0); + textW = HeapAlloc(GetProcessHeap(), 0, (lenW+1) * sizeof(WCHAR)); + if (!textW) + { + ShowLastError(); + HeapFree(GetProcessHeap(), 0, pTemp); + return; + } + MultiByteToWideChar(cp, 0, pTemp, size, textW, lenW); + HeapFree(GetProcessHeap(), 0, pTemp); + break; + } } - if (!succeeded) - { - ShowLastError(); - HeapFree(GetProcessHeap(), 0, pTemp); - return; - } + textW[lenW] = '\0'; - HeapFree(GetProcessHeap(), 0, pTemp); + if (lenW >= 1 && textW[0] == 0xfeff) + SetWindowTextW(Globals.hEdit, textW+1); + else + SetWindowTextW(Globals.hEdit, textW); + + HeapFree(GetProcessHeap(), 0, textW); SendMessageW(Globals.hEdit, EM_SETMODIFY, FALSE, 0); SendMessageW(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0);

1 0

Alexander Scott-Johns : notepad: When opening a file, replace \0 characters with spaces, instead of truncating the file at the first \0.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 32c066f12abbf3864ec75b5cb6e9fb08c288c50b URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c066f12abbf3864ec75b5cb… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jul 3 01:04:00 2009 +0100 notepad: When opening a file, replace \0 characters with spaces, instead of truncating the file at the first \0. --- programs/notepad/dialog.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index eae0d30..5594069 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -346,6 +346,7 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) DWORD dwNumRead; int lenW; WCHAR* textW; + int i; WCHAR log[5]; /* Close any files and prompt to save changes */ @@ -433,6 +434,12 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) } } + /* Replace '\0's with spaces. Other than creating a custom control that + * can deal with '\0' characters, it's the best that can be done. + */ + for (i = 0; i < lenW; i++) + if (textW[i] == '\0') + textW[i] = ' '; textW[lenW] = '\0'; if (lenW >= 1 && textW[0] == 0xfeff)

1 0