January 2014 - Wine-commits

Frédéric Delanoy : include: Make wine_dbgstr_guid available in test.h for all tests.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 9134a24e87b4b024311e8749f147e400dbe25a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9134a24e87b4b024311e8749f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:22 2014 +0100 include: Make wine_dbgstr_guid available in test.h for all tests. --- include/wine/test.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index ab10399..f8b608f 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -65,6 +65,7 @@ extern void winetest_add_failures( LONG new_failures ); extern void winetest_wait_child_process( HANDLE process ); extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); +extern const char *wine_dbgstr_guid( const GUID *guid ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } /* strcmpW is available for tests compiled under Wine, but not in standalone @@ -523,6 +524,19 @@ const char *wine_dbgstr_wn( const WCHAR *str, int n ) return res; } +const char *wine_dbgstr_guid( const GUID *guid ) +{ + char *res; + + if (!guid) return "(null)"; + res = get_temp_buffer( 39 ); /* CHARS_IN_GUID */ + sprintf( res, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], + guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], + guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + return res; +} + /* Find a test by name */ static const struct test *find_test( const char *name ) {

1 0

Frédéric Delanoy : apphelp/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 1b27173579dbbd8c9a2677a3d779cdc2612eaba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b27173579dbbd8c9a2677a3d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:23 2014 +0100 apphelp/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/apphelp/tests/apphelp.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/apphelp/tests/apphelp.c b/dlls/apphelp/tests/apphelp.c index fb2e3a3..8b264e9 100644 --- a/dlls/apphelp/tests/apphelp.c +++ b/dlls/apphelp/tests/apphelp.c @@ -47,18 +47,6 @@ static const CLSID * objects[] = { &test_UserAssist, NULL,}; -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static void test_ApphelpCheckShellObject(void) { ULONGLONG flags; @@ -77,20 +65,20 @@ static void test_ApphelpCheckShellObject(void) SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(objects[i], FALSE, &flags); ok(res && (flags == 0), "%s 0: got %d and 0x%x%08x with 0x%x (expected TRUE and 0)\n", - debugstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + wine_dbgstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); flags = 0xdeadbeef; SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(objects[i], TRUE, &flags); ok(res && (flags == 0), "%s 1: got %d and 0x%x%08x with 0x%x (expected TRUE and 0)\n", - debugstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); + wine_dbgstr_guid(objects[i]), res, (ULONG)(flags >> 32), (ULONG)flags, GetLastError()); } /* NULL as pointer to flags is checked */ SetLastError(0xdeadbeef); res = pApphelpCheckShellObject(&GUID_NULL, FALSE, NULL); - ok(res, "%s 0: got %d with 0x%x (expected != FALSE)\n", debugstr_guid(&GUID_NULL), res, GetLastError()); + ok(res, "%s 0: got %d with 0x%x (expected != FALSE)\n", wine_dbgstr_guid(&GUID_NULL), res, GetLastError()); /* NULL as CLSID* crash on Windows */ if (0)

1 0

Frédéric Delanoy : atl100/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 0bdd0465c12b84b6b524bba37a005806ecbec8a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bdd0465c12b84b6b524bba37… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:24 2014 +0100 atl100/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/atl100/tests/atl.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 4cf4a62..383dbe4 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -43,21 +43,6 @@ static const GUID CATID_CatTest2 = {0x178fc163,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x46}}; #define CATID_CATTEST2_STR "178fc163-0000-0000-0000-000000000246" -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - if(!riid) - return "(null)"; - - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static void test_winmodule(void) { _AtlCreateWndData create_data[3]; @@ -469,7 +454,7 @@ static HRESULT WINAPI Dispatch_QueryInterface(IDispatch *iface, REFIID riid, voi return S_OK; } - ok(0, "unexpected riid: %s\n", debugstr_guid(riid)); + ok(0, "unexpected riid: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -548,8 +533,8 @@ static void test_source_iface(void) maj_ver = min_ver = 0xdead; hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); - ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); - ok(IsEqualGUID(&iid, &DIID_DispHTMLBody), "iid = %s\n", debugstr_guid(&iid)); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", wine_dbgstr_guid(&libid)); + ok(IsEqualGUID(&iid, &DIID_DispHTMLBody), "iid = %s\n", wine_dbgstr_guid(&iid)); ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); support_classinfo2 = FALSE; @@ -558,8 +543,8 @@ static void test_source_iface(void) maj_ver = min_ver = 0xdead; hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); - ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); - ok(IsEqualGUID(&iid, &DIID_HTMLDocumentEvents), "iid = %s\n", debugstr_guid(&iid)); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", wine_dbgstr_guid(&libid)); + ok(IsEqualGUID(&iid, &DIID_HTMLDocumentEvents), "iid = %s\n", wine_dbgstr_guid(&iid)); ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); persist_clsid = CLSID_HTMLStyle; @@ -567,8 +552,8 @@ static void test_source_iface(void) maj_ver = min_ver = 0xdead; hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); - ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); - ok(IsEqualGUID(&iid, &IID_NULL), "iid = %s\n", debugstr_guid(&iid)); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", wine_dbgstr_guid(&libid)); + ok(IsEqualGUID(&iid, &IID_NULL), "iid = %s\n", wine_dbgstr_guid(&iid)); ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); }

1 0

Frédéric Delanoy : comdlg32/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: a5f20b31731c943ba7c345673469aa7bd313135b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f20b31731c943ba7c345673… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:25 2014 +0100 comdlg32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/comdlg32/tests/printdlg.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 9dec1e2..871807b 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -52,18 +52,6 @@ static HRESULT (WINAPI * pPrintDlgExW)(LPPRINTDLGEXW); static const CHAR emptyA[] = ""; static const CHAR PrinterPortsA[] = "PrinterPorts"; -static const char *debugstr_guid(const GUID *guid) -{ - static char buf[50]; - - if (!guid) return "(null)"; - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], - guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], - guid->Data4[5], guid->Data4[6], guid->Data4[7]); - return buf; -} - /* ########################### */ static void test_PageSetupDlgA(void) @@ -289,7 +277,7 @@ static void test_PrintDlgA(void) static HRESULT WINAPI callback_QueryInterface(IPrintDialogCallback *iface, REFIID riid, void **ppv) { - ok(0, "callback_QueryInterface(%s): unexpected call\n", debugstr_guid(riid)); + ok(0, "callback_QueryInterface(%s): unexpected call\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -339,7 +327,7 @@ static IPrintDialogCallback callback = { &callback_Vtbl }; static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - trace("unknown_QueryInterface %s\n", debugstr_guid(riid)); + trace("unknown_QueryInterface %s\n", wine_dbgstr_guid(riid)); if (IsEqualGUID(riid, &IID_IPrintDialogCallback)) { @@ -352,7 +340,7 @@ static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID riid, void return E_NOINTERFACE; } - ok(0, "unexpected IID %s\n", debugstr_guid(riid)); + ok(0, "unexpected IID %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; }

1 0

Nikolay Sivov : widl: Uuid attribute is allowed for 'struct'.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: cbf55d82519e8e69c2cf4581e4029204c6425e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf55d82519e8e69c2cf4581e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 09:49:25 2014 +0400 widl: Uuid attribute is allowed for 'struct'. --- dlls/oleaut32/tests/test_tlb.idl | 6 +++ dlls/oleaut32/tests/typelib.c | 84 +++++++++++++++++++++++++------------- include/objbase.h | 3 +- tools/widl/parser.y | 2 +- 4 files changed, 65 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbf55d82519e8e69c2cf4…

1 0

Nikolay Sivov : dlls: Print HRESULT as 32bit value.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: acea0eea5d96bdf9f119fdea65b1a1295f1ac71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=acea0eea5d96bdf9f119fdea6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 09:46:35 2014 +0400 dlls: Print HRESULT as 32bit value. --- dlls/dispex/tests/marshal.c | 2 +- dlls/dplayx/dplayx_global.c | 2 +- dlls/oleaut32/tests/tmarshal.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index 1b2ef61..0211cd7 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -31,7 +31,7 @@ #include "wine/test.h" -#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08lx\n", (unsigned long int)hr) +#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) #define RELEASEMARSHALDATA WM_USER diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index d7f3cca..64c4bc3 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -1200,7 +1200,7 @@ LPCSTR DPLAYX_HresultToString(HRESULT hr) /* For errors not in the list, return HRESULT as a string This part is not thread safe */ WARN( "Unknown error 0x%08x\n", hr ); - wsprintfA( szTempStr, "0x%08lx", hr ); + wsprintfA( szTempStr, "0x%08x", hr ); return szTempStr; } } diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 1a3effe..5753871 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -32,7 +32,7 @@ static HRESULT (WINAPI *pVarAdd)(LPVARIANT,LPVARIANT,LPVARIANT); -#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08lx\n", (unsigned long int)hr) +#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) /* ULL suffix is not portable */ #define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2)

1 0

Nikolay Sivov : oleaut32/tests: Use local IDispatch test impl instead of global variable.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: dd89dd1932172e0f22c0470169f0122ab75798e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd89dd1932172e0f22c047016… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 09:49:52 2014 +0400 oleaut32/tests: Use local IDispatch test impl instead of global variable. --- dlls/oleaut32/tests/vartype.c | 64 ++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index bc74e2e..035502a 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -537,8 +537,6 @@ typedef struct BOOL bFailInvoke; } DummyDispatch; -static DummyDispatch dispatch; - static inline DummyDispatch *impl_from_IDispatch(IDispatch *iface) { return CONTAINING_RECORD(iface, DummyDispatch, IDispatch_iface); @@ -599,6 +597,8 @@ static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, EXCEPINFO *ei, UINT *arg_err) { + DummyDispatch *This = impl_from_IDispatch(iface); + CHECK_EXPECT(dispatch_invoke); ok(dispid == DISPID_VALUE, "got dispid %d\n", dispid); @@ -614,11 +614,11 @@ static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, ok(ei == NULL, "got %p\n", ei); ok(arg_err == NULL, "got %p\n", arg_err); - if (dispatch.bFailInvoke) + if (This->bFailInvoke) return E_OUTOFMEMORY; - V_VT(res) = dispatch.vt; - if (dispatch.vt == VT_UI1) + V_VT(res) = This->vt; + if (This->vt == VT_UI1) V_UI1(res) = 1; else memset(res, 0, sizeof(*res)); @@ -637,7 +637,13 @@ static const IDispatchVtbl DummyDispatch_VTable = DummyDispatch_Invoke }; -static DummyDispatch dispatch = { { &DummyDispatch_VTable }, 1, 0, 0 }; +static void init_test_dispatch(LONG ref, VARTYPE vt, DummyDispatch *dispatch) +{ + dispatch->IDispatch_iface.lpVtbl = &DummyDispatch_VTable; + dispatch->ref = ref; + dispatch->vt = vt; + dispatch->bFailInvoke = FALSE; +} /* * VT_I1/VT_UI1 @@ -1111,6 +1117,7 @@ static void test_VarUI1FromStr(void) static void test_VarUI1FromDisp(void) { + DummyDispatch dispatch; CONVVARS(LCID); VARIANTARG vSrc, vDst; @@ -1133,10 +1140,9 @@ static void test_VarUI1FromDisp(void) VariantInit(&vSrc); VariantInit(&vDst); + init_test_dispatch(1, VT_UI1, &dispatch); V_VT(&vSrc) = VT_DISPATCH; V_DISPATCH(&vSrc) = &dispatch.IDispatch_iface; - dispatch.vt = VT_UI1; - dispatch.bFailInvoke = FALSE; SET_EXPECT(dispatch_invoke); out = 10; @@ -5693,8 +5699,11 @@ static void test_IUnknownClear(void) { HRESULT hres; VARIANTARG v; - DummyDispatch u = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IUnknown* pu = (IUnknown*)&u.IDispatch_iface; + DummyDispatch u; + IUnknown* pu; + + init_test_dispatch(1, VT_UI1, &u); + pu = (IUnknown*)&u.IDispatch_iface; /* Test that IUnknown_Release is called on by-value */ V_VT(&v) = VT_UNKNOWN; @@ -5718,8 +5727,11 @@ static void test_IUnknownCopy(void) { HRESULT hres; VARIANTARG vSrc, vDst; - DummyDispatch u = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IUnknown* pu = (IUnknown*)&u.IDispatch_iface; + DummyDispatch u; + IUnknown* pu; + + init_test_dispatch(1, VT_UI1, &u); + pu = (IUnknown*)&u.IDispatch_iface; /* AddRef is called on by-value copy */ VariantInit(&vDst); @@ -5766,8 +5778,11 @@ static void test_IUnknownChangeTypeEx(void) VARIANTARG vSrc, vDst; LCID lcid; VARTYPE vt; - DummyDispatch u = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IUnknown* pu = (IUnknown*)&u.IDispatch_iface; + DummyDispatch u; + IUnknown* pu; + + init_test_dispatch(1, VT_UI1, &u); + pu = (IUnknown*)&u.IDispatch_iface; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); @@ -5831,8 +5846,11 @@ static void test_IDispatchClear(void) { HRESULT hres; VARIANTARG v; - DummyDispatch d = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IDispatch* pd = &d.IDispatch_iface; + DummyDispatch d; + IDispatch* pd; + + init_test_dispatch(1, VT_UI1, &d); + pd = &d.IDispatch_iface; /* As per IUnknown */ @@ -5856,8 +5874,11 @@ static void test_IDispatchCopy(void) { HRESULT hres; VARIANTARG vSrc, vDst; - DummyDispatch d = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IDispatch* pd = &d.IDispatch_iface; + DummyDispatch d; + IDispatch* pd; + + init_test_dispatch(1, VT_UI1, &d); + pd = &d.IDispatch_iface; /* As per IUnknown */ @@ -5901,8 +5922,11 @@ static void test_IDispatchChangeTypeEx(void) HRESULT hres; VARIANTARG vSrc, vDst; LCID lcid; - DummyDispatch d = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IDispatch* pd = &d.IDispatch_iface; + DummyDispatch d; + IDispatch* pd; + + init_test_dispatch(1, VT_UI1, &d); + pd = &d.IDispatch_iface; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);

1 0

Piotr Caban : msvcrt: Support _IOSTRG flag in _filbuf function.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: e16059113cf717a0422c4ff6e0d0d64e5a60355b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16059113cf717a0422c4ff6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 10:08:17 2014 +0100 msvcrt: Support _IOSTRG flag in _filbuf function. --- dlls/msvcrt/file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 04651fb..908ba26 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3280,6 +3280,11 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) unsigned char c; MSVCRT__lock_file(file); + if(file->_flag & MSVCRT__IOSTRG) { + MSVCRT__unlock_file(file); + return MSVCRT_EOF; + } + /* Allocate buffer if needed */ if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) msvcrt_alloc_buffer(file);

1 0

刘涛 : website: Simplified Chinese translation for wine 1.7.11 release
by Jeremy Newman 27 Jan '14

27 Jan '14

Module: website Branch: master Commit: 190e3a9e4f8f0f237e15ec3e509f83626d07ae72 URL: http://source.winehq.org/git/website.git/?a=commit;h=190e3a9e4f8f0f237e15ec… Author: 刘涛 <wendaotao(a)163.com> Date: Mon Jan 27 15:49:09 2014 +0800 website: Simplified Chinese translation for wine 1.7.11 release --- news/zh-cn/2014011701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/zh-cn/2014011701.xml b/news/zh-cn/2014011701.xml new file mode 100644 index 0000000..7cf5912 --- /dev/null +++ b/news/zh-cn/2014011701.xml @@ -0,0 +1,17 @@ +<news> +<date>一月 17, 2014</date> +<title>Wine 1.7.11 发布</title> +<body> + Wine 开发版 1.7.11 现在可以使用了。 + 本次<a href="{$root}/announce/1.7.11">更新</a> : +<ul> + <li>在 RichEdit 控件中加入对 Uniscribe 的支持。</li> + <li>支持条件变量和 Slim 读写锁。</li> + <li>更多 Direct3D 指令流的准备工作。</li> + <li>在桌面模式中增加可选的开始菜单。</li> + <li>改进对竖排字体规格的支持。</li> + <li>各种 bug 的修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.7.11.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Jactry Zeng : riched20: Use codepage in ME_ToUnicode.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: eb8f47518eae395ea10cd5defd744dfe54e83fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8f47518eae395ea10cd5def… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Tue Jan 21 08:42:58 2014 +0800 riched20: Use codepage in ME_ToUnicode. --- dlls/riched20/editor.c | 21 +++++++++++---------- dlls/riched20/editor.h | 4 ++-- dlls/riched20/string.c | 12 ++++++------ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 119061f..85848bc 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3364,10 +3364,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, len = lParam ? strlen((char *)lParam) : 0; } } else { - /* FIXME: make use of pStruct->codepage in the to unicode translation */ - wszText = ME_ToUnicode(bUnicode, (void *)lParam, &len); + wszText = ME_ToUnicode(pStruct->codepage, (void *)lParam, &len); ME_InsertTextFromCursor(editor, 0, wszText, len, style); - ME_EndToUnicode(bUnicode, wszText); + ME_EndToUnicode(pStruct->codepage, wszText); } if (bSelection) { @@ -3555,7 +3554,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int from, to, nStartCursor; ME_Style *style; int len = 0; - LPWSTR wszText = ME_ToUnicode(unicode, (void *)lParam, &len); + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + LPWSTR wszText = ME_ToUnicode(codepage, (void *)lParam, &len); TRACE("EM_REPLACESEL - %s\n", debugstr_w(wszText)); nStartCursor = ME_GetSelectionOfs(editor, &from, &to); @@ -3570,7 +3570,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, */ if (len>0 && wszText[len-1] == '\n') ME_ClearTempStyle(editor); - ME_EndToUnicode(unicode, wszText); + ME_EndToUnicode(codepage, wszText); ME_CommitUndo(editor); ME_UpdateSelectionLinkAttribute(editor); if (!wParam) @@ -3626,7 +3626,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, else { int textLen; - LPWSTR wszText = ME_ToUnicode(unicode, (void *)lParam, &textLen); + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + LPWSTR wszText = ME_ToUnicode(codepage, (void *)lParam, &textLen); TRACE("WM_SETTEXT - %s\n", debugstr_w(wszText)); /* debugstr_w() */ if (textLen > 0) { @@ -3643,7 +3644,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); } - ME_EndToUnicode(unicode, wszText); + ME_EndToUnicode(codepage, wszText); } } else @@ -4035,8 +4036,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { WCHAR *textW; int len; - - textW = ME_ToUnicode(unicode, text, &len); + LONG codepage = unicode ? CP_UNICODE : CP_ACP; + textW = ME_ToUnicode(codepage, text, &len); if (!(editor->styleFlags & ES_MULTILINE)) { len = 0; @@ -4044,7 +4045,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, len++; } ME_InsertTextFromCursor(editor, 0, textW, len, editor->pBuffer->pDefaultStyle); - ME_EndToUnicode(unicode, textW); + ME_EndToUnicode(codepage, textW); ME_SetCursorToStart(editor, &editor->pCursors[0]); ME_SetCursorToStart(editor, &editor->pCursors[1]); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index ae8b81a..af7291f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -110,8 +110,8 @@ BOOL ME_InsertString(ME_String *s, int ofs, const WCHAR *insert, int len) DECLSP #define CP_UNICODE 1200 /* smart helpers for A<->W conversions, they reserve/free memory and call MultiByte<->WideChar functions */ -LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz, INT *len) DECLSPEC_HIDDEN; -void ME_EndToUnicode(BOOL unicode, LPVOID psz) DECLSPEC_HIDDEN; +LPWSTR ME_ToUnicode(LONG codepage, LPVOID psz, INT *len) DECLSPEC_HIDDEN; +void ME_EndToUnicode(LONG codepage, LPVOID psz) DECLSPEC_HIDDEN; static inline int ME_IsWSpace(WCHAR ch) { diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index f4cd320..12e4ad7 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -172,30 +172,30 @@ ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT } } -LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz, INT *len) +LPWSTR ME_ToUnicode(LONG codepage, LPVOID psz, INT *len) { *len = 0; if (!psz) return NULL; - if (unicode) + if (codepage == CP_UNICODE) { *len = lstrlenW(psz); return psz; } else { WCHAR *tmp; - int nChars = MultiByteToWideChar(CP_ACP, 0, psz, -1, NULL, 0); + int nChars = MultiByteToWideChar(codepage, 0, psz, -1, NULL, 0); if(!nChars) return NULL; if((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) - *len = MultiByteToWideChar(CP_ACP, 0, psz, -1, tmp, nChars) - 1; + *len = MultiByteToWideChar(codepage, 0, psz, -1, tmp, nChars) - 1; return tmp; } } -void ME_EndToUnicode(BOOL unicode, LPVOID psz) +void ME_EndToUnicode(LONG codepage, LPVOID psz) { - if (!unicode) + if (codepage != CP_UNICODE) FREE_OBJ(psz); }

1 0