wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Andrew Eikum : winmm/tests: Don' t test MCI output if no output devices are available.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: f78af0e04689e2faf2cc66e29899598d89b4a174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78af0e04689e2faf2cc66e29… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jun 30 15:05:08 2011 -0500 winmm/tests: Don't test MCI output if no output devices are available. --- dlls/winmm/tests/mci.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 91a3e47..1cbcc68 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1271,9 +1271,12 @@ START_TEST(mci) test_mciParser(hwnd); test_openCloseWAVE(hwnd); test_recordWAVE(hwnd); - test_playWAVE(hwnd); - test_asyncWAVE(hwnd); - test_AutoOpenWAVE(hwnd); + if(waveOutGetNumDevs()){ + test_playWAVE(hwnd); + test_asyncWAVE(hwnd); + test_AutoOpenWAVE(hwnd); + }else + skip("No output devices available, skipping all output tests\n"); /* Win9X hangs when exiting with something still open. */ err = mciSendString("close all", NULL, 0, hwnd); ok(!err,"final close all returned %s\n", dbg_mcierr(err));

1 0

Michał Ziętek : wscript: Implemented Host_get_BuildVersion.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: e244222c65306cd4750ee70675e949b327369adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e244222c65306cd4750ee7067… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Mon Jul 4 23:28:52 2011 +0200 wscript: Implemented Host_get_BuildVersion. --- programs/wscript/host.c | 8 ++++++-- programs/wscript/tests/run.js | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index f6dfaa0..c0d73a5 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -29,6 +29,8 @@ #include <wine/debug.h> +#define BUILDVERSION 16535 + static const WCHAR wshNameW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; static const WCHAR wshVersionW[] = {'5','.','8'}; @@ -169,8 +171,10 @@ static HRESULT WINAPI Host_get_Version(IHost *iface, BSTR *out_Version) static HRESULT WINAPI Host_get_BuildVersion(IHost *iface, int *out_Build) { - WINE_FIXME("(%p)\n", out_Build); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_Build); + + *out_Build = BUILDVERSION; + return S_OK; } static HRESULT WINAPI Host_get_Timeout(IHost *iface, LONG *out_Timeout) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 8b43ce7..fda62f6 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -27,5 +27,6 @@ ok(typeof(WSH) === "object", "typeof(WSH) = " + typeof(WSH)); ok(WScript === WSH, "WScript !== WSH"); ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name); ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(WScript.Version)); +ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuldVersion) = " + typeof(WScript.BuldVersion)); winetest.reportSuccess();

1 0

Dylan Smith : richedit: Fix incorrect GUID values for ITextHost and ITextHost2.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 82da77c0a6903a414591f77621a41e1460f02310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82da77c0a6903a414591f7762… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 4 00:44:00 2011 -0400 richedit: Fix incorrect GUID values for ITextHost and ITextHost2. --- dlls/msftedit/msftedit.spec | 6 +++--- dlls/riched20/richole.c | 10 +++------- dlls/riched20/tests/txtsrv.c | 4 ++-- include/textserv.h | 5 ++--- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/msftedit/msftedit.spec b/dlls/msftedit/msftedit.spec index 0dd878d..5f71886 100644 --- a/dlls/msftedit/msftedit.spec +++ b/dlls/msftedit/msftedit.spec @@ -1,9 +1,9 @@ 2 extern IID_IRichEditOle 3 extern IID_IRichEditOleCallback 4 stdcall CreateTextServices(ptr ptr ptr) riched20.CreateTextServices -5 extern IID_ITextServices -6 extern IID_ITextHost -7 extern IID_ITextHost2 +5 extern IID_ITextServices riched20.IID_ITextServices +6 extern IID_ITextHost riched20.IID_ITextHost +7 extern IID_ITextHost2 riched20.IID_ITextHost2 8 stdcall REExtendedRegisterClass() riched20.REExtendedRegisterClass 9 stdcall RichEdit10ANSIWndProc(ptr long long long) riched20.RichEdit10ANSIWndProc 10 stdcall RichEditANSIWndProc(ptr long long long) riched20.RichEditANSIWndProc diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index ce6d308..840678d 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -39,14 +39,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); /* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/ -/* FIXME: the next 6 lines should be in textserv.h */ #include "initguid.h" -#define TEXTSERV_GUID(name, l, w1, w2, b1, b2) \ - DEFINE_GUID(name, l, w1, w2, b1, b2, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5) - -TEXTSERV_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d); -TEXTSERV_GUID(IID_ITextHost, 0xc5bdd8d0, 0xd26e, 0x11ce, 0xa8, 0x9e); -TEXTSERV_GUID(IID_ITextHost2, 0xc5bdd8d0, 0xd26e, 0x11ce, 0xa8, 0x9e); +DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5); +DEFINE_GUID(IID_ITextHost, 0x13e670f4,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); +DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); DEFINE_GUID(IID_ITextRange, 0x8cc497c2, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index efeffc1..a6c53ce 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -806,9 +806,9 @@ static void test_IIDs(void) { ok(IsEqualIID(pIID_ITextServices, &expected_iid_itextservices), "unexpected value for IID_ITextServices: %s\n", debugstr_guid(pIID_ITextServices)); - todo_wine ok(IsEqualIID(pIID_ITextHost, &expected_iid_itexthost), + ok(IsEqualIID(pIID_ITextHost, &expected_iid_itexthost), "unexpected value for IID_ITextHost: %s\n", debugstr_guid(pIID_ITextHost)); - todo_wine ok(IsEqualIID(pIID_ITextHost2, &expected_iid_itexthost2), + ok(IsEqualIID(pIID_ITextHost2, &expected_iid_itexthost2), "unexpected value for IID_ITextHost2: %s\n", debugstr_guid(pIID_ITextHost2)); } diff --git a/include/textserv.h b/include/textserv.h index 7a0cfbf..0d509a6 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -23,9 +23,8 @@ extern "C" { #endif -DEFINE_GUID(IID_ITextServices,0x8d33f740,0xcf58,0x11ce,0xa8,0x9d,0x00,0xaa,0x00,0x6c,0xad,0xc5); -DEFINE_GUID(IID_ITextHost, 0xc5bdd8d0,0xd26e,0x11ce,0xa8,0x9e,0x00,0xaa,0x00,0x6c,0xad,0xc5); -DEFINE_GUID(IID_ITextHost2, 0xc5bdd8d0,0xd26e,0x11ce,0xa8,0x9e,0x00,0xaa,0x00,0x6c,0xad,0xc5); +EXTERN_C const IID IID_ITextServices; +EXTERN_C const IID IID_ITextHost; /***************************************************************************** * ITextServices interface

1 0

Dylan Smith : riched20/tests: Test the text services IIDs.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 819e1a899aa78a4fded93d04ee6ed659e4c09743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=819e1a899aa78a4fded93d04e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 4 00:43:52 2011 -0400 riched20/tests: Test the text services IIDs. --- dlls/riched20/tests/txtsrv.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 1ed9836..efeffc1 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -35,6 +35,24 @@ #include <limits.h> static HMODULE hmoduleRichEdit; +static IID *pIID_ITextServices; +static IID *pIID_ITextHost; +static IID *pIID_ITextHost2; + +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; +} /* Define C Macros for ITextServices calls. */ @@ -90,7 +108,7 @@ static HRESULT WINAPI ITextHostImpl_QueryInterface(ITextHost *iface, { ITextHostTestImpl *This = impl_from_ITextHost(iface); - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextHost)) { + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, pIID_ITextHost)) { *ppvObject = This; ITextHost_AddRef((ITextHost *)*ppvObject); return S_OK; @@ -624,7 +642,7 @@ static BOOL init_texthost(void) return FALSE; } - result = IUnknown_QueryInterface(init, &IID_ITextServices, + result = IUnknown_QueryInterface(init, pIID_ITextServices, (void **)&txtserv); ok((result == S_OK) && (txtserv != NULL), "Querying interface failed (result = %x, txtserv = %p)\n", result, txtserv); IUnknown_Release(init); @@ -780,6 +798,21 @@ static void test_TxDraw(void) } +DEFINE_GUID(expected_iid_itextservices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5); +DEFINE_GUID(expected_iid_itexthost, 0x13e670f4,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); +DEFINE_GUID(expected_iid_itexthost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); + +static void test_IIDs(void) +{ + ok(IsEqualIID(pIID_ITextServices, &expected_iid_itextservices), + "unexpected value for IID_ITextServices: %s\n", debugstr_guid(pIID_ITextServices)); + todo_wine ok(IsEqualIID(pIID_ITextHost, &expected_iid_itexthost), + "unexpected value for IID_ITextHost: %s\n", debugstr_guid(pIID_ITextHost)); + todo_wine ok(IsEqualIID(pIID_ITextHost2, &expected_iid_itexthost2), + "unexpected value for IID_ITextHost2: %s\n", debugstr_guid(pIID_ITextHost2)); +} + + START_TEST( txtsrv ) { setup_thiscall_wrappers(); @@ -789,6 +822,11 @@ START_TEST( txtsrv ) hmoduleRichEdit = LoadLibrary("RICHED20.DLL"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + pIID_ITextServices = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextServices"); + pIID_ITextHost = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextHost"); + pIID_ITextHost2 = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextHost2"); + test_IIDs(); + if (init_texthost()) { free_texthost();

1 0

Frédéric Delanoy : dbghelp: Remove dead code ( Clang).
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: e35cdaa138146e90cc43836d36efca945e8063a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35cdaa138146e90cc43836d3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 3 20:38:52 2011 +0200 dbghelp: Remove dead code (Clang). --- dlls/dbghelp/elf_module.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 8d06065..625127d 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -991,7 +991,6 @@ static BOOL elf_load_debug_info_from_map(struct module* module, WARN("Couldn't correctly read stabs\n"); ret = ret || lret; } - else lret = FALSE; image_unmap_section(&stab_sect); image_unmap_section(&stabstr_sect); }

1 0

Frédéric Delanoy : dplayx: Remove dead code ( Clang).
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 6ae1bfe20f2fb21241fd1cd20f6968a93fa61baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae1bfe20f2fb21241fd1cd20… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 3 20:28:29 2011 +0200 dplayx: Remove dead code (Clang). --- dlls/dplayx/dplay.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 0c33bb3..501b749 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -3391,8 +3391,6 @@ static void DP_CopySessionDesc( LPDPSESSIONDESC2 lpSessionDest, lstrcpyA( (LPSTR)lpStartOfFreeSpace, lpSessionDest->u2.lpszPasswordA ); lpSessionDest->u2.lpszPasswordA = (LPSTR)lpStartOfFreeSpace; - lpStartOfFreeSpace += - lstrlenA( lpSessionDest->u2.lpszPasswordA ) + 1; } } else /* UNICODE */ @@ -3411,8 +3409,6 @@ static void DP_CopySessionDesc( LPDPSESSIONDESC2 lpSessionDest, lstrcpyW( (LPWSTR)lpStartOfFreeSpace, lpSessionDest->u2.lpszPassword ); lpSessionDest->u2.lpszPassword = (LPWSTR)lpStartOfFreeSpace; - lpStartOfFreeSpace += sizeof(WCHAR) * - ( lstrlenW( lpSessionDest->u2.lpszPassword ) + 1 ); } } } @@ -4593,8 +4589,6 @@ static HRESULT DP_SendEx ( DP_FindPlayer( This, idTo ) != NULL ) ) { - bValidDestination = TRUE; - /* Have the service provider send this message */ /* FIXME: Could optimize for local interface sends */ return DP_SP_SendEx( This, dwFlags, lpData, dwDataSize, dwPriority,

1 0

Frédéric Delanoy : secur32: Remove dead code ( Clang).
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 982e7f96b182363826e18e45a3148b79521c64f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=982e7f96b182363826e18e45a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 3 20:28:28 2011 +0200 secur32: Remove dead code (Clang). --- dlls/secur32/ntlm.c | 1 - dlls/secur32/wrapper.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 7317e91..c842a12 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1255,7 +1255,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( } } pOutput->pBuffers[0].cbBuffer = 0; - ret = SEC_E_OK; TRACE("Getting negotiated flags\n"); lstrcpynA(buffer, "GF", max_len - 1); diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index 590a7da..dabd90f 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -793,7 +793,6 @@ SECURITY_STATUS WINAPI QuerySecurityPackageInfoW(SEC_WCHAR *pszPackageName, { (*ppPackageInfo)->Comment = nextString; lstrcpynW(nextString, package->infoW.Comment, commentLen); - nextString += commentLen; } else (*ppPackageInfo)->Comment = NULL;

1 0

Frédéric Delanoy : crypt32: Remove dead code ( Clang).
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: f73733b8b0fc43188acd4c40bb0bc4f5af75d92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73733b8b0fc43188acd4c40b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 3 19:37:04 2011 +0200 crypt32: Remove dead code (Clang). --- dlls/crypt32/base64.c | 2 -- dlls/crypt32/chain.c | 1 - dlls/crypt32/encode.c | 1 - dlls/crypt32/object.c | 2 -- 4 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 9a3079a..a01a7b6 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -234,7 +234,6 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, strcpy(ptr, trailer); ptr += strlen(ptr); strcpy(ptr, sep); - ptr += strlen(sep); } *pcchString = charsNeeded - 1; } @@ -429,7 +428,6 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, strcpyW(ptr, trailer); ptr += strlenW(ptr); strcpyW(ptr, sep); - ptr += strlenW(sep); } *pcchString = charsNeeded - 1; } diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 8af49f4..4bc2d05 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3302,7 +3302,6 @@ static BOOL match_dns_to_subject_dn(PCCERT_CONTEXT cert, LPCWSTR server_name) { LPCWSTR ptr = server_name; - matches = TRUE; do { LPCWSTR dot = strchrW(ptr, '.'), end; /* 254 is the maximum DNS label length, see RFC 1035 */ diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 6b61337..05a3558 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1841,7 +1841,6 @@ static BOOL WINAPI CRYPT_AsnEncodePolicyQualifierUserNotice( CERT_NAME_VALUE displayTextValue; DWORD cItem = 0; - ret = TRUE; if (notice->pNoticeReference) { items[cItem].encodeFunc = CRYPT_AsnEncodeNoticeReference; diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 2587c4d..cff96f9 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -1111,7 +1111,6 @@ static BOOL WINAPI CRYPT_FormatBasicConstraints2(DWORD dwCertEncodingType, strcpyW(str, pathLengthHeader); str += strlenW(pathLengthHeader); strcpyW(str, pathLength); - str += strlenW(pathLength); } LocalFree(info); } @@ -2468,7 +2467,6 @@ static BOOL WINAPI CRYPT_FormatSpcFinancialCriteria(DWORD dwCertEncodingType, else { strcpyW(str, notAvailable); - str += strlenW(notAvailable); } } }

1 0

Dan Kegel : d3dcompiler_43: Don't crash on long TRACE().
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: b732d428deef72d8c4ec4cea06072b3d1db7b682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b732d428deef72d8c4ec4cea0… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jul 3 00:33:34 2011 +0000 d3dcompiler_43: Don't crash on long TRACE(). --- dlls/d3dcompiler_43/compiler.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 0969ae8..7f4ebdb 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -359,7 +359,7 @@ static HRESULT preprocess_shader(const void *data, SIZE_T data_size, int size; ID3DBlob *buffer; - TRACE("Preprocessor messages:\n%s", wpp_messages); + TRACE("Preprocessor messages:\n%s", debugstr_a(wpp_messages)); if (error_messages) {

1 0

Alex Stanev : advapi32: Set *lpSize properly in GetUserNameA.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 82b7a4166f99e10133bcc4de869ccfb1587933dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b7a4166f99e10133bcc4de8… Author: Alex Stanev <alex(a)stanev.org> Date: Sat Jul 2 11:49:44 2011 +0300 advapi32: Set *lpSize properly in GetUserNameA. --- dlls/advapi32/advapi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index e135fa5..7025a21 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -65,7 +65,7 @@ GetUserNameA( LPSTR lpszName, LPDWORD lpSize ) ret = GetUserNameW( buffer, &sizeW ); if (ret) - WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpszName, *lpSize, NULL, NULL ); + *lpSize = WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpszName, *lpSize, NULL, NULL ); else *lpSize = sizeW;

1 0

← Newer
1
...
70
71
72
73
74
75
76
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2011