March 2012 - Wine-commits - list.winehq.org

Michael Stefaniuc : dpnet: Print the debug string and not the pointer to it .
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: b7d5543f93da9d51dee37a81163bbab6e104060e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7d5543f93da9d51dee37a811… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:35:02 2012 +0100 dpnet: Print the debug string and not the pointer to it. --- dlls/dpnet/dpnet_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 9b328b9..29cbb79 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -141,7 +141,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { int i = 0; - TRACE("(%p,%p,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); /* if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) { *ppv = (LPVOID)&DPNET_CF; @@ -158,7 +158,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) ++i; } - FIXME("(%p,%p,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Michael Stefaniuc : qedit: Print the debug string and not the pointer to it .
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 454110ee34d18b5485ee2e17c8ac9df627fc6564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454110ee34d18b5485ee2e17c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:38:46 2012 +0100 qedit: Print the debug string and not the pointer to it. --- dlls/qedit/mediadet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index edb7be5..a88dc9d 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -243,7 +243,7 @@ static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal) static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet* iface, GUID *pVal) { MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p)->(%p): not implemented!\n", This, debugstr_guid(pVal)); + FIXME("(%p)->(%s): not implemented!\n", This, debugstr_guid(pVal)); return E_NOTIMPL; }

1 0

Michael Stefaniuc : setupapi: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 8f6801fdc02ff8307d81368be5d231505c78a35a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6801fdc02ff8307d81368be… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:39:39 2012 +0100 setupapi: Print the debug string and not the pointer to it. --- dlls/setupapi/stubs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index ba437b7..f4e6959 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -441,7 +441,7 @@ BOOL WINAPI SetupLogFileW( PCWSTR OtherInfo, DWORD Flags ) { - FIXME("(%p, %p, '%s', '%s', %d, %p, %p, %p, %d): stub\n", FileLogHandle, + FIXME("(%p, %s, '%s', '%s', %d, %s, %s, %s, %d): stub\n", FileLogHandle, debugstr_w(LogSectionName), debugstr_w(SourceFileName), debugstr_w(TargetFileName), Checksum, debugstr_w(DiskTagfile), debugstr_w(DiskDescription), debugstr_w(OtherInfo), Flags);

1 0

Michael Stefaniuc : strmbase: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: b485f6c056c8808b43381e6af7a018946dd437fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b485f6c056c8808b43381e6af… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:40:16 2012 +0100 strmbase: Print the debug string and not the pointer to it. --- dlls/strmbase/transform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 981a201..012f68a 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -377,7 +377,7 @@ HRESULT WINAPI TransformFilterImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin { TransformFilter *This = (TransformFilter *)iface; - TRACE("(%p/%p)->(%p,%p)\n", This, iface, debugstr_w(Id), ppPin); + TRACE("(%p/%p)->(%s,%p)\n", This, iface, debugstr_w(Id), ppPin); return E_NOTIMPL; }

1 0

Michael Stefaniuc : pstorec: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 7e34aec1a0cd6db767a5aa005e709e9c4d77737a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e34aec1a0cd6db767a5aa005… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:38:32 2012 +0100 pstorec: Print the debug string and not the pointer to it. --- dlls/pstorec/pstorec.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index b2e729b..0a6a6c1 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -298,9 +298,8 @@ static HRESULT WINAPI PStore_fnOpenItem( IPStore* This, PST_KEY Key, const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, PST_ACCESSMODE ModeFlags, PPST_PROMPTINFO pProomptInfo, DWORD dwFlags ) { - FIXME("%p %08x %s %s %p %08x %p %08x\n", This, Key, - debugstr_guid(pItemType), debugstr_guid(pItemSubtype), - debugstr_w(szItemName), ModeFlags, pProomptInfo, dwFlags); + FIXME("(%p,%08x,%s,%s,%s,%08x,%p,%08x) stub\n", This, Key, debugstr_guid(pItemType), + debugstr_guid(pItemSubtype), debugstr_w(szItemName), ModeFlags, pProomptInfo, dwFlags); return E_NOTIMPL; }

1 0

Akihiro Sagawa : msvcrt: Add test for _mbbtombc.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: d3e9665001aa89c1cbc2ed6f34f5df1565958e73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e9665001aa89c1cbc2ed6f3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 21 23:02:08 2012 +0900 msvcrt: Add test for _mbbtombc. --- dlls/msvcrt/tests/string.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c40451c..e65b274 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -908,6 +908,36 @@ static void test_mbcjmsjis(void) _setmbcp(prev_cp); } +static void test_mbbtombc(void) +{ + static const unsigned int mbbmbc[][2] = { + {0x1f, 0x1f}, {0x20, 0x8140}, {0x39, 0x8258}, {0x40, 0x8197}, + {0x41, 0x8260}, {0x5e, 0x814f}, {0x7e, 0x8150}, {0x7f, 0x7f}, + {0x80, 0x80}, {0x81, 0x81}, {0xa0, 0xa0}, {0xa7, 0x8340}, + {0xb0, 0x815b}, {0xd1, 0x8380}, {0xff, 0xff}, {0,0}}; + int cp[] = { 932, 936, 939, 950, 1361, _MB_CP_SBCS }; + int i, j; + int prev_cp = _getmbcp(); + + for (i = 0; i < sizeof(cp)/sizeof(cp[0]); i++) + { + _setmbcp(cp[i]); + for (j = 0; mbbmbc[j][0] != 0; j++) + { + unsigned int exp, ret; + ret = _mbbtombc(mbbmbc[j][0]); + exp = (cp[i] == 932) ? mbbmbc[j][1] : mbbmbc[j][0]; + if (cp[i] == 932 && exp > 255) + todo_wine ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage %d)\n", + exp, ret, mbbmbc[j][0], cp[i]); + else + ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage %d)\n", + exp, ret, mbbmbc[j][0], cp[i]); + } + } + _setmbcp(prev_cp); +} + static void test_mbctombb(void) { static const unsigned int mbcmbb_932[][2] = { @@ -2134,6 +2164,7 @@ START_TEST(string) test__mbsnbcpy_s(); test_mbcjisjms(); test_mbcjmsjis(); + test_mbbtombc(); test_mbctombb(); test_ismbclegal(); test_strtok();

1 0

Akihiro Sagawa : msvcrt: Improve _mbbtombc to handle Japanese characters.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 578d85f320e04608200abd80440c2ff605461a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=578d85f320e04608200abd804… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 21 23:02:10 2012 +0900 msvcrt: Improve _mbbtombc to handle Japanese characters. --- dlls/msvcrt/mbcs.c | 33 +++++++++++++++++++++++++++------ dlls/msvcrt/tests/string.c | 8 ++------ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 6d3e3fb..c61311b 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -52,6 +52,19 @@ static struct cp_extra_info_t g_cpextrainfo[] = {0, {1, 255, 0, 0}} /* match all with FIXME */ }; +/* Maps cp932 single byte character to multi byte character */ +static const unsigned char mbbtombc_932[] = { + 0x40,0x49,0x68,0x94,0x90,0x93,0x95,0x66,0x69,0x6a,0x96,0x7b,0x43,0x7c,0x44,0x5e, + 0x4f,0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x46,0x47,0x83,0x81,0x84,0x48, + 0x97,0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e, + 0x6f,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x6d,0x8f,0x6e,0x4f,0x76, + 0x77,0x78,0x79,0x6d,0x8f,0x6e,0x4f,0x51,0x65,0x81,0x82,0x83,0x84,0x85,0x86,0x87, + 0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,0x95,0x50, + 0x42,0x75,0x76,0x41,0x45,0x92,0x40,0x42,0x44,0x46,0x48,0x83,0x85,0x87,0x62, + 0x5b,0x41,0x43,0x45,0x47,0x49,0x4a,0x4c,0x4e,0x50,0x52,0x54,0x56,0x58,0x5a,0x5c, + 0x5e,0x60,0x63,0x65,0x67,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x71,0x74,0x77,0x7a,0x7d, + 0x7e,0x80,0x81,0x82,0x84,0x86,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8f,0x93,0x4a,0x4b }; + /* Maps multibyte cp932 punctuation marks to single byte equivalents */ static const unsigned char mbctombb_932_punct[] = { 0x20,0xa4,0xa1,0x2c,0x2e,0xa5,0x3a,0x3b,0x3f,0x21,0xde,0xdf,0x00,0x00,0x00,0x5e, @@ -1080,14 +1093,22 @@ unsigned char* CDECL _mbstok(unsigned char *str, const unsigned char *delim) */ unsigned int CDECL _mbbtombc(unsigned int c) { - if(get_mbcinfo()->ismbcodepage && - ((c >= 0x20 && c <=0x7e) ||(c >= 0xa1 && c <= 0xdf))) + if(get_mbcinfo()->mbcodepage == 932) { - /* FIXME: I can't get this function to return anything - * different from what I pass it... - */ + if(c >= 0x20 && c <= 0x7e) { + if((c >= 0x41 && c <= 0x5a) || (c >= 0x61 && c <= 0x7a) || (c >= 0x30 && c <= 0x39)) + return mbbtombc_932[c - 0x20] | 0x8200; + else + return mbbtombc_932[c - 0x20] | 0x8100; + } + else if(c >= 0xa1 && c <= 0xdf) { + if(c >= 0xa6 && c <= 0xdd && c != 0xb0) + return mbbtombc_932[c - 0xa1 + 0x5f] | 0x8300; + else + return mbbtombc_932[c - 0xa1 + 0x5f] | 0x8100; + } } - return c; /* ASCII CP or no MB char */ + return c; /* not Japanese or no MB char */ } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index e65b274..f3fb243 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -927,12 +927,8 @@ static void test_mbbtombc(void) unsigned int exp, ret; ret = _mbbtombc(mbbmbc[j][0]); exp = (cp[i] == 932) ? mbbmbc[j][1] : mbbmbc[j][0]; - if (cp[i] == 932 && exp > 255) - todo_wine ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage %d)\n", - exp, ret, mbbmbc[j][0], cp[i]); - else - ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage %d)\n", - exp, ret, mbbmbc[j][0], cp[i]); + ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage %d)\n", + exp, ret, mbbmbc[j][0], cp[i]); } } _setmbcp(prev_cp);

1 0

Akihiro Sagawa : msvcrt/tests: Rewrite test_mbcjisjms to test in various codepages.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 9085a2e54cf81cab6bb7e7cc581e4e7e8981c030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9085a2e54cf81cab6bb7e7cc5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 21 23:02:12 2012 +0900 msvcrt/tests: Rewrite test_mbcjisjms to test in various codepages. --- dlls/msvcrt/tests/string.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index f3fb243..5edd86c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -864,20 +864,23 @@ static void test_mbcjisjms(void) unsigned int jisjms[][2] = { {0x2020, 0}, {0x2021, 0}, {0x2120, 0}, {0x2121, 0x8140}, {0x7f7f, 0}, {0x7f7e, 0}, {0x7e7f, 0}, {0x7e7e, 0xeffc}, {0x2121FFFF, 0}, {0x2223, 0x81a1}, {0x237e, 0x829e}, {0, 0}}; - unsigned int ret, exp, i; + int cp[] = { 932, 936, 939, 950, 1361, _MB_CP_SBCS }; + unsigned int i, j; + int prev_cp = _getmbcp(); - i = 0; - do + for (i = 0; i < sizeof(cp)/sizeof(cp[0]); i++) { - ret = _mbcjistojms(jisjms[i][0]); - - if(_getmbcp() == 932) /* Japanese codepage? */ - exp = jisjms[i][1]; - else - exp = jisjms[i][0]; /* If not, no conversion */ - - ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); - } while(jisjms[i++][0] != 0); + _setmbcp(cp[i]); + for (j = 0; jisjms[j][0] != 0; j++) + { + unsigned int ret, exp; + ret = _mbcjistojms(jisjms[j][0]); + exp = (cp[i] == 932) ? jisjms[j][1] : jisjms[j][0]; + ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", + exp, ret, jisjms[j][0], cp[i]); + } + } + _setmbcp(prev_cp); } static void test_mbcjmsjis(void)

1 0

Akihiro Sagawa : msvcrt/tests: Add more tests for _mbcjistojms.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: c1558bb7ef87f2f5898f7cac6d05975e50edc542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1558bb7ef87f2f5898f7cac6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 21 23:02:14 2012 +0900 msvcrt/tests: Add more tests for _mbcjistojms. --- dlls/msvcrt/tests/string.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 5edd86c..6f9ce0f 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -863,6 +863,7 @@ static void test_mbcjisjms(void) /* List of value-pairs to test. The test assumes the last pair to be {0, ..} */ unsigned int jisjms[][2] = { {0x2020, 0}, {0x2021, 0}, {0x2120, 0}, {0x2121, 0x8140}, {0x7f7f, 0}, {0x7f7e, 0}, {0x7e7f, 0}, {0x7e7e, 0xeffc}, + {0x255f, 0x837e}, {0x2560, 0x8380}, {0x2561, 0x8381}, {0x2121FFFF, 0}, {0x2223, 0x81a1}, {0x237e, 0x829e}, {0, 0}}; int cp[] = { 932, 936, 939, 950, 1361, _MB_CP_SBCS }; unsigned int i, j; @@ -876,6 +877,11 @@ static void test_mbcjisjms(void) unsigned int ret, exp; ret = _mbcjistojms(jisjms[j][0]); exp = (cp[i] == 932) ? jisjms[j][1] : jisjms[j][0]; + if (LOBYTE(exp) == 0x80 && cp[i] == 932) { + todo_wine ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", + exp, ret, jisjms[j][0], cp[i]); + continue; + } ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", exp, ret, jisjms[j][0], cp[i]); }

1 0

Michael Stefaniuc : d3dx9_36: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 60cf73d6faace79edd3c5c720d745ec05b486a66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60cf73d6faace79edd3c5c720… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:34:10 2012 +0100 d3dx9_36: Print the debug string and not the pointer to it. --- dlls/d3dx9_36/texture.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 20d8880..4fc6eff 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -673,8 +673,9 @@ HRESULT WINAPI D3DXCreateTextureFromFileExW(LPDIRECT3DDEVICE9 device, DWORD size; LPVOID buffer; - TRACE("(%p, %p, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): relay\n", device, debugstr_w(srcfile), width, - height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); + TRACE("(%p, %s, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): relay\n", + device, debugstr_w(srcfile), width, height, miplevels, usage, format, pool, filter, + mipfilter, colorkey, srcinfo, palette, texture); if (!srcfile) return D3DERR_INVALIDCALL; @@ -710,8 +711,9 @@ HRESULT WINAPI D3DXCreateTextureFromFileExA(LPDIRECT3DDEVICE9 device, HRESULT hr; DWORD len; - TRACE("(%p, %p, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): relay\n", device, debugstr_a(srcfile), width, - height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); + TRACE("(%p, %s, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): relay\n", + device, debugstr_a(srcfile), width, height, miplevels, usage, format, pool, filter, + mipfilter, colorkey, srcinfo, palette, texture); if (!device || !srcfile || !texture) return D3DERR_INVALIDCALL;

1 0