June 2010 - Wine-Commits - list.winehq.org

Francois Gouget : ntdll: Fix a typo in a parameter name.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 4c8b3b0f3db867957df46371796c58752297778c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8b3b0f3db867957df463717… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:51:43 2010 +0200 ntdll: Fix a typo in a parameter name. --- dlls/ntdll/error.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index 5537c87..80bf787 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -132,7 +132,7 @@ DWORD WINAPI RtlGetLastWin32Error(void) * NtRaiseHardError (NTDLL.@) */ NTSTATUS WINAPI NtRaiseHardError( NTSTATUS ErrorStatus, ULONG NumberOfParameters, - PUNICODE_STRING UnicodeStringParameterMask, PVOID *Paramaters, + PUNICODE_STRING UnicodeStringParameterMask, PVOID *Parameters, HARDERROR_RESPONSE_OPTION ResponseOption, PHARDERROR_RESPONSE Response ) { FIXME(": stub. Errorstatus was %08x\n", ErrorStatus);

1 0

Francois Gouget : msvcr100: The msvcr100 debug channel is unused so remove it.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 7735f024eabd6fa0f32df8fce2a0efdc4451cdcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7735f024eabd6fa0f32df8fce… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:54:19 2010 +0200 msvcr100: The msvcr100 debug channel is unused so remove it. --- dlls/msvcr100/msvcr100.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 735092e..274d4c7 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -23,9 +23,7 @@ #include "stdlib.h" #include "windef.h" #include "winbase.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcr100); /********************************************************************* * DllMain (MSVCR100.@)

1 0

Francois Gouget : winemenubuilder: Add a trailing '\n' to a FIXME() call.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 4a9b52549e3d7dcb1de8ea7b97a30cf8b04d979f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9b52549e3d7dcb1de8ea7b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:54:28 2010 +0200 winemenubuilder: Add a trailing '\n' to a FIXME() call. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 3abfc39..c027dad 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -514,7 +514,7 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, case 32: return SaveTrueColorIconResAsPNG(pIcon, png_filename, commentW); default: - WINE_FIXME("unsupported bpp %d, please report", pIcon->bmiHeader.biBitCount); + WINE_FIXME("unsupported bpp %d, please report\n", pIcon->bmiHeader.biBitCount); return FALSE; } }

1 0

Francois Gouget : ws2_32/tests: Fix a typo in a variable name.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 1a1f1aa58865c19882b308083292f93c7c907523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1f1aa58865c19882b308083… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:52:12 2010 +0200 ws2_32/tests: Fix a typo in a variable name. --- dlls/ws2_32/tests/sock.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c405053..9217913 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2564,7 +2564,7 @@ typedef struct async_message struct async_message *next; } async_message; -static struct async_message *messages_recieved; +static struct async_message *messages_received; #define WM_SOCKET (WM_USER+100) static LRESULT CALLBACK ws2_test_WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -2579,14 +2579,14 @@ static LRESULT CALLBACK ws2_test_WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPA message->lparam = lparam; message->next = NULL; - if (messages_recieved) + if (messages_received) { - struct async_message *last = messages_recieved; + struct async_message *last = messages_received; while (last->next) last = last->next; last->next = message; } else - messages_recieved = message; + messages_received = message; return 0; } @@ -2650,7 +2650,7 @@ static char *dbgstr_event_seq(const LPARAM *seq) static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents) { static char message[1024]; - struct async_message *curr = messages_recieved; + struct async_message *curr = messages_received; int index, error, bit = 0; char name[10]; @@ -2693,7 +2693,7 @@ static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents) static void flush_events(SOCKET s, HANDLE hEvent) { WSANETWORKEVENTS netEvents; - struct async_message *prev = NULL, *curr = messages_recieved; + struct async_message *prev = NULL, *curr = messages_received; int ret; DWORD dwRet; @@ -2714,12 +2714,12 @@ static void flush_events(SOCKET s, HANDLE hEvent) if (curr->socket == s) { if (prev) prev->next = curr->next; - else messages_recieved = curr->next; + else messages_received = curr->next; HeapFree(GetProcessHeap(), 0, curr); if (prev) curr = prev->next; - else curr = messages_recieved; + else curr = messages_received; } else { @@ -2759,7 +2759,7 @@ static int match_event_sequence(SOCKET s, WSANETWORKEVENTS *netEvents, const LPA } else { - curr = messages_recieved; + curr = messages_received; while (curr) { if (curr->socket == s)

1 0

Francois Gouget : msvcrt/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: eb8ce091cb7b1e94726f47f30c31723cbb5471ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8ce091cb7b1e94726f47f30… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:49:41 2010 +0200 msvcrt/tests: Add a trailing '\n' to an ok() call. --- dlls/msvcrt/tests/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 1a362a1..b70d777 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -975,7 +975,7 @@ static void test__strtoi64(void) ok(res == 123, "res != 123\n"); ok(endpos == oct+strlen(oct), "Incorrect endpos (%p-%p)\n", oct, endpos); res = p_strtoi64(blanks, &endpos, 10); - ok(res == 12, "res != 12"); + ok(res == 12, "res != 12\n"); ok(endpos == blanks+10, "Incorrect endpos (%p-%p)\n", blanks, endpos); ok(errno == 0xdeadbeef, "errno = %x\n", errno);

1 0

Francois Gouget : d3d10/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 7d66375fba780ae43c03720363f95bf6f0ff82ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d66375fba780ae43c0372036… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:49:15 2010 +0200 d3d10/tests: Add a trailing '\n' to ok() calls. --- dlls/d3d10/tests/effect.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a8c5886..eab6d6d 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3536,7 +3536,7 @@ static void test_effect_get_variable_by(ID3D10Device *device) /* variable f1 */ variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 0); - ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index); variable = effect->lpVtbl->GetVariableByName(effect, "f1"); ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); @@ -3546,7 +3546,7 @@ static void test_effect_get_variable_by(ID3D10Device *device) /* variable f2 */ variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 1); - ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index); variable = effect->lpVtbl->GetVariableByName(effect, "f2"); ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); @@ -3556,18 +3556,18 @@ static void test_effect_get_variable_by(ID3D10Device *device) /* variable f3 */ variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 2); - ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index); variable = effect->lpVtbl->GetVariableByName(effect, "f3"); ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); variable = effect->lpVtbl->GetVariableBySemantic(effect, "SV_POSITION"); - ok(variable != null_variable, "GetVariableBySemantic failed %p", variable); - ok(variable != variable_by_index, "GetVariableBySemantic failed %p", variable); + ok(variable != null_variable, "GetVariableBySemantic failed %p\n", variable); + ok(variable != variable_by_index, "GetVariableBySemantic failed %p\n", variable); /* variable f4 */ variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 3); - ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index); variable = effect->lpVtbl->GetVariableByName(effect, "f4"); ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); @@ -3577,7 +3577,7 @@ static void test_effect_get_variable_by(ID3D10Device *device) /* variable tex1 */ variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 4); - ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index); variable = effect->lpVtbl->GetVariableByName(effect, "tex1"); ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); @@ -3587,14 +3587,14 @@ static void test_effect_get_variable_by(ID3D10Device *device) /* variable tex2 */ variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 5); - ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index); variable = effect->lpVtbl->GetVariableByName(effect, "tex2"); ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR1"); - ok(variable != null_variable, "GetVariableBySemantic failed %p", variable); - ok(variable != variable_by_index, "GetVariableBySemantic failed %p", variable); + ok(variable != null_variable, "GetVariableBySemantic failed %p\n", variable); + ok(variable != variable_by_index, "GetVariableBySemantic failed %p\n", variable); effect->lpVtbl->Release(effect); }

1 0

Francois Gouget : crypt32/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: fea384cea4be337d9c86a3f5f57114d28c583c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea384cea4be337d9c86a3f5f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:48:34 2010 +0200 crypt32/tests: Add a trailing '\n' to ok() calls. --- dlls/crypt32/tests/encode.c | 4 ++-- dlls/crypt32/tests/store.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index d60843a..cc59a59 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7962,7 +7962,7 @@ static void testPortPublicKeyInfo(void) CRYPT_DELETEKEYSET); ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(ret,"CryptAcquireContextA failed"); + ok(ret,"CryptAcquireContextA failed\n"); testExportPublicKey(csp, &info); testImportPublicKey(csp, info); @@ -7971,7 +7971,7 @@ static void testPortPublicKeyInfo(void) CryptReleaseContext(csp, 0); ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - ok(ret,"CryptAcquireContextA failed"); + ok(ret,"CryptAcquireContextA failed\n"); } START_TEST(encode) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 3d55935..10a85a3 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2228,7 +2228,7 @@ static void testAddCertificateLink(void) ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { - ok(linked->hCertStore == store1, "unexpected store"); + ok(linked->hCertStore == store1, "unexpected store\n"); ret = CertSerializeCertificateStoreElement(linked, 0, NULL, &size); ok(ret, "CertSerializeCertificateStoreElement failed: %08x\n", GetLastError()); @@ -2300,7 +2300,7 @@ static void testAddCertificateLink(void) ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { - ok(linked->hCertStore == store2, "unexpected store"); + ok(linked->hCertStore == store2, "unexpected store\n"); ret = CertSerializeCertificateStoreElement(linked, 0, NULL, &size); ok(ret, "CertSerializeCertificateStoreElement failed: %08x\n", GetLastError()); @@ -2360,7 +2360,7 @@ static void testAddCertificateLink(void) ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { - ok(linked->hCertStore == store2, "unexpected store"); + ok(linked->hCertStore == store2, "unexpected store\n"); ret = CertSerializeCertificateStoreElement(linked, 0, NULL, &size); ok(ret, "CertSerializeCertificateStoreElement failed: %08x\n", GetLastError()); @@ -2429,7 +2429,7 @@ static void testAddCertificateLink(void) ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { - ok(linked->hCertStore == store2, "unexpected store"); + ok(linked->hCertStore == store2, "unexpected store\n"); ret = pCertControlStore(store2, 0, CERT_STORE_CTRL_COMMIT, NULL); ok(ret, "CertControlStore failed: %d\n", ret); compareStore(store2, "file store -> system store", @@ -2452,7 +2452,7 @@ static void testAddCertificateLink(void) ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { - ok(linked->hCertStore == store2, "unexpected store"); + ok(linked->hCertStore == store2, "unexpected store\n"); CertDeleteCertificateFromStore(linked); } CertCloseStore(store2, 0);

1 0

André Hentschel : winedev: Update installing sources of mingw32 for deb and rpm systems.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: docs Branch: master Commit: 85929c15831cfa63989e397295da69bb991aac8a URL: http://source.winehq.org/git/docs.git/?a=commit;h=85929c15831cfa63989e39729… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 22 21:54:04 2010 +0200 winedev: Update installing sources of mingw32 for deb and rpm systems. --- en/winedev-testing.sgml | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index 31f15f4..ccd1020 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -188,32 +188,24 @@ thread.c: 86 tests executed, 5 marked as todo, 0 failures. distributions and *BSD. </para> <sect3> - <title>Debian GNU/Linux</title> + <title>Debian GNU/Linux like deb systems</title> <para> - On Debian do <command>apt-get install mingw32</>. + This includes Debian GNU/Linux, Ubuntu, etc. + The following step should probably work on any deb based system. </para> <para> - The standard MinGW libraries will probably be incomplete, causing - 'undefined symbol' errors. So get the latest - <ulink url="http://mirzam.it.vu.nl/mingw/">mingw-w32api RPM</> - and use <command>alien</> to either convert it to a .tar.gz file - from which to extract just the relevant files, or to convert it - to a Debian package that you will install. + Run <command>apt-get install mingw32</>. </para> </sect3> <sect3> <title>Red Hat Linux like rpm systems</title> <para> - This includes Fedora Core, Red Hat Enterprise Linux, Mandrake, + This includes Fedora, Red Hat Enterprise Linux, Mandrake, most probably SuSE Linux too, etc. But this list isn't exhaustive; - the following steps should probably work on any rpm based system. + The following step should probably work on any rpm based system. </para> <para> - Download and install the latest rpm's from - <ulink url="http://mirzam.it.vu.nl/mingw/">MinGW RPM packages</>. - Alternatively you can follow the instructions on that page and - build your own packages from the source rpm's listed there as well. - </para> + Run <command>yum install mingw32-gcc</>. </sect3> <sect3> <title>*BSD</title>

1 0

Alexandre Julliard : kernel32: Add the TlsAlloc/FreeInternal entry points.
by Alexandre Julliard June 22, 2010

June 22, 2010

Module: wine Branch: master Commit: 79b6351c9c886e563a0ac6c6575bb0203f4c24c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b6351c9c886e563a0ac6c65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 22 16:58:02 2010 +0200 kernel32: Add the TlsAlloc/FreeInternal entry points. --- dlls/kernel32/kernel32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f08e752..dbcb179 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1095,9 +1095,9 @@ @ stdcall Thread32Next(long ptr) @ stdcall -i386 -private ThunkConnect32(ptr str str str ptr ptr) krnl386.exe16.ThunkConnect32 @ stdcall TlsAlloc() -@ stub TlsAllocInternal +@ stdcall TlsAllocInternal() TlsAlloc @ stdcall TlsFree(long) -@ stub TlsFreeInternal +@ stdcall TlsFreeInternal(long) TlsFree @ stdcall TlsGetValue(long) @ stdcall TlsSetValue(long ptr) @ stdcall Toolhelp32ReadProcessMemory(long ptr ptr long ptr)

1 0

Piotr Caban : msvcrt: Added __crtLCMapStringW partial implementation.
by Alexandre Julliard June 22, 2010

June 22, 2010

Module: wine Branch: master Commit: c0637edda20fe5206db534fd50e783996a4ad463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0637edda20fe5206db534fd5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 22 12:26:23 2010 +0200 msvcrt: Added __crtLCMapStringW partial implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/locale.c | 12 ++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0d05c28..99730e5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -344,7 +344,7 @@ @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub __daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 7c84705..97783fb 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -110,7 +110,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ cdecl __fpecode() msvcrt.__fpecode diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 8599efa..dfa04f8 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -105,7 +105,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ cdecl __fpecode() msvcrt.__fpecode diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b4c168a..8f3769e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -150,7 +150,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub __daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a2bed36..e00a331 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -147,7 +147,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA -@ stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub __daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 5a27de0..393a23d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -466,6 +466,18 @@ int CDECL __crtLCMapStringA( } /********************************************************************* + * __crtLCMapStringW (MSVCRT.@) + */ +int CDECL __crtLCMapStringW(LCID lcid, DWORD mapflags, const MSVCRT_wchar_t *src, + int srclen, MSVCRT_wchar_t *dst, int dstlen, unsigned int codepage, int xflag) +{ + FIXME("(lcid %x, flags %x, %s(%d), %p(%d), %x, %d), partial stub!\n", + lcid, mapflags, debugstr_w(src), srclen, dst, dstlen, codepage, xflag); + + return LCMapStringW(lcid, mapflags, src, srclen, dst, dstlen); +} + +/********************************************************************* * __crtCompareStringA (MSVCRT.@) */ int CDECL __crtCompareStringA( LCID lcid, DWORD flags, const char *src1, int len1, diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index bba06d6..e39253e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -140,7 +140,7 @@ @ cdecl __crtGetLocaleInfoW(long long ptr long) @ cdecl __crtGetStringTypeW(long long wstr long ptr) @ cdecl __crtLCMapStringA(long long str long ptr long long long) -# stub __crtLCMapStringW +@ cdecl __crtLCMapStringW(long long wstr long ptr long long long) # stub __daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno

1 0