May 2011 - Wine-commits - list.winehq.org

Jacek Caban : kernel32: Moved GetModuleFileNameEx[AW] to kernel32.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 9bbf3f90752afe127f69bb89d62bd5849d2774d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bbf3f90752afe127f69bb89d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 12:23:22 2011 +0000 kernel32: Moved GetModuleFileNameEx[AW] to kernel32. --- dlls/kernel32/kernel32.spec | 2 + dlls/kernel32/module.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/psapi/psapi.spec | 4 +- dlls/psapi/psapi_main.c | 56 ------------------------------------------- 4 files changed, 59 insertions(+), 58 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 4da6f06..3f85557 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -774,6 +774,8 @@ @ stdcall K32EnumProcesses(ptr long ptr) @ stdcall K32GetModuleBaseNameA(long long ptr long) @ stdcall K32GetModuleBaseNameW(long long ptr long) +@ stdcall K32GetModuleFileNameExA(long long ptr long) +@ stdcall K32GetModuleFileNameExW(long long ptr long) @ stdcall K32GetProcessMemoryInfo(long ptr long) @ stdcall K32QueryWorkingSet(long ptr long) @ stdcall K32QueryWorkingSetEx(long ptr long) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 4e2c098..94d20c3 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1228,6 +1228,61 @@ DWORD WINAPI K32GetModuleBaseNameA(HANDLE process, HMODULE module, return ret; } +/*********************************************************************** + * K32GetModuleFileNameExW (KERNEL32.@) + */ +DWORD WINAPI K32GetModuleFileNameExW(HANDLE process, HMODULE module, + LPWSTR file_name, DWORD size) +{ + LDR_MODULE ldr_module; + + if(!get_ldr_module(process, module, &ldr_module)) + return 0; + + size = min(ldr_module.FullDllName.Length / sizeof(WCHAR), size); + if (!ReadProcessMemory(process, ldr_module.FullDllName.Buffer, + file_name, size * sizeof(WCHAR), NULL)) + return 0; + + file_name[size] = 0; + return size; +} + +/*********************************************************************** + * K32GetModuleFileNameExA (KERNEL32.@) + */ +DWORD WINAPI K32GetModuleFileNameExA(HANDLE process, HMODULE module, + LPSTR file_name, DWORD size) +{ + WCHAR *ptr; + + TRACE("(hProcess=%p, hModule=%p, %p, %d)\n", process, module, file_name, size); + + if (!file_name || !size) return 0; + + if ( process == GetCurrentProcess() ) + { + DWORD len = GetModuleFileNameA( module, file_name, size ); + if (size) file_name[size - 1] = '\0'; + return len; + } + + if (!(ptr = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)))) return 0; + + if (!K32GetModuleFileNameExW(process, module, ptr, size)) + { + file_name[0] = '\0'; + } + else + { + if (!WideCharToMultiByte( CP_ACP, 0, ptr, -1, file_name, size, NULL, NULL )) + file_name[size - 1] = 0; + } + + HeapFree(GetProcessHeap(), 0, ptr); + return strlen(file_name); +} + #ifdef __i386__ /*********************************************************************** diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index 07e0cb5..0427891 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -12,8 +12,8 @@ @ stdcall GetMappedFileNameW(long ptr ptr long) @ stdcall GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA @ stdcall GetModuleBaseNameW(long long ptr long) kernel32.K32GetModuleBaseNameW -@ stdcall GetModuleFileNameExA(long long ptr long) -@ stdcall GetModuleFileNameExW(long long ptr long) +@ stdcall GetModuleFileNameExA(long long ptr long) kernel32.K32GetModuleFileNameExA +@ stdcall GetModuleFileNameExW(long long ptr long) kernel32.K32GetModuleFileNameExW @ stdcall GetModuleInformation(long long ptr long) @ stdcall GetPerformanceInfo(ptr long) @ stdcall GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index a2d7ac4..b4cabca 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -263,62 +263,6 @@ DWORD WINAPI GetMappedFileNameW(HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename, } /*********************************************************************** - * GetModuleFileNameExA (PSAPI.@) - */ -DWORD WINAPI GetModuleFileNameExA(HANDLE hProcess, HMODULE hModule, - LPSTR lpFileName, DWORD nSize) -{ - WCHAR *ptr; - - TRACE("(hProcess=%p, hModule=%p, %p, %d)\n", - hProcess, hModule, lpFileName, nSize); - - if (!lpFileName || !nSize) return 0; - - if ( hProcess == GetCurrentProcess() ) - { - DWORD len = GetModuleFileNameA( hModule, lpFileName, nSize ); - if (nSize) lpFileName[nSize - 1] = '\0'; - return len; - } - - if (!(ptr = HeapAlloc(GetProcessHeap(), 0, nSize * sizeof(WCHAR)))) return 0; - - if (!GetModuleFileNameExW(hProcess, hModule, ptr, nSize)) - { - lpFileName[0] = '\0'; - } - else - { - if (!WideCharToMultiByte( CP_ACP, 0, ptr, -1, lpFileName, nSize, NULL, NULL )) - lpFileName[nSize - 1] = 0; - } - - HeapFree(GetProcessHeap(), 0, ptr); - return strlen(lpFileName); -} - -/*********************************************************************** - * GetModuleFileNameExW (PSAPI.@) - */ -DWORD WINAPI GetModuleFileNameExW(HANDLE hProcess, HMODULE hModule, - LPWSTR lpFileName, DWORD nSize) -{ - LDR_MODULE LdrModule; - - if(!PSAPI_GetLdrModule(hProcess, hModule, &LdrModule)) - return 0; - - nSize = min(LdrModule.FullDllName.Length / sizeof(WCHAR), nSize); - if (!ReadProcessMemory(hProcess, LdrModule.FullDllName.Buffer, - lpFileName, nSize * sizeof(WCHAR), NULL)) - return 0; - - lpFileName[nSize] = 0; - return nSize; -} - -/*********************************************************************** * GetModuleInformation (PSAPI.@) */ BOOL WINAPI GetModuleInformation(HANDLE hProcess, HMODULE hModule,

1 0

Jacek Caban : kernel32: Moved GetModuleInformation implementation to kernel32.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 0d0f2fa4a95050292d7c7ed92b477c03231925b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0f2fa4a95050292d7c7ed92… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 12:23:45 2011 +0000 kernel32: Moved GetModuleInformation implementation to kernel32. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/module.c | 24 ++++++++ dlls/psapi/psapi.spec | 2 +- dlls/psapi/psapi_main.c | 136 ------------------------------------------- 4 files changed, 26 insertions(+), 137 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3f85557..31680fe 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -776,6 +776,7 @@ @ stdcall K32GetModuleBaseNameW(long long ptr long) @ stdcall K32GetModuleFileNameExA(long long ptr long) @ stdcall K32GetModuleFileNameExW(long long ptr long) +@ stdcall K32GetModuleInformation(long long ptr long) @ stdcall K32GetProcessMemoryInfo(long ptr long) @ stdcall K32QueryWorkingSet(long ptr long) @ stdcall K32QueryWorkingSetEx(long ptr long) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 94d20c3..8ee0fcd 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -37,6 +37,7 @@ #include "winbase.h" #include "winternl.h" #include "kernel_private.h" +#include "psapi.h" #include "wine/exception.h" #include "wine/debug.h" @@ -1283,6 +1284,29 @@ DWORD WINAPI K32GetModuleFileNameExA(HANDLE process, HMODULE module, return strlen(file_name); } +/*********************************************************************** + * K32GetModuleInformation (KERNEL32.@) + */ +BOOL WINAPI K32GetModuleInformation(HANDLE process, HMODULE module, + MODULEINFO *modinfo, DWORD cb) +{ + LDR_MODULE ldr_module; + + if (cb < sizeof(MODULEINFO)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + if (!get_ldr_module(process, module, &ldr_module)) + return FALSE; + + modinfo->lpBaseOfDll = ldr_module.BaseAddress; + modinfo->SizeOfImage = ldr_module.SizeOfImage; + modinfo->EntryPoint = ldr_module.EntryPoint; + return TRUE; +} + #ifdef __i386__ /*********************************************************************** diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index 0427891..aaf2931 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -14,7 +14,7 @@ @ stdcall GetModuleBaseNameW(long long ptr long) kernel32.K32GetModuleBaseNameW @ stdcall GetModuleFileNameExA(long long ptr long) kernel32.K32GetModuleFileNameExA @ stdcall GetModuleFileNameExW(long long ptr long) kernel32.K32GetModuleFileNameExW -@ stdcall GetModuleInformation(long long ptr long) +@ stdcall GetModuleInformation(long long ptr long) kernel32.K32GetModuleInformation @ stdcall GetPerformanceInfo(ptr long) @ stdcall GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA @ stdcall GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index b4cabca..b297b7b 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -34,119 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(psapi); -typedef struct -{ - HANDLE hProcess; - PLIST_ENTRY pHead, pCurrent; - LDR_MODULE LdrModule; -} MODULE_ITERATOR; - -/*********************************************************************** - * PSAPI_ModuleIteratorInit [internal] - * - * Prepares to iterate through the loaded modules of the given process. - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -static BOOL PSAPI_ModuleIteratorInit(MODULE_ITERATOR *iter, HANDLE hProcess) -{ - PROCESS_BASIC_INFORMATION pbi; - PPEB_LDR_DATA pLdrData; - NTSTATUS status; - - /* Get address of PEB */ - status = NtQueryInformationProcess(hProcess, ProcessBasicInformation, - &pbi, sizeof(pbi), NULL); - if (status != STATUS_SUCCESS) - { - SetLastError(RtlNtStatusToDosError(status)); - return FALSE; - } - - /* Read address of LdrData from PEB */ - if (!ReadProcessMemory(hProcess, &pbi.PebBaseAddress->LdrData, - &pLdrData, sizeof(pLdrData), NULL)) - return FALSE; - - /* Read address of first module from LdrData */ - if (!ReadProcessMemory(hProcess, - &pLdrData->InLoadOrderModuleList.Flink, - &iter->pCurrent, sizeof(iter->pCurrent), NULL)) - return FALSE; - - iter->pHead = &pLdrData->InLoadOrderModuleList; - iter->hProcess = hProcess; - - return TRUE; -} - -/*********************************************************************** - * PSAPI_ModuleIteratorNext [internal] - * - * Iterates to the next module. - * - * RETURNS - * 1 : Success - * 0 : No more modules - * -1 : Failure - * - * NOTES - * Every function which uses this routine suffers from a race condition - * when a module is unloaded during the enumeration which can cause the - * function to fail. As there is no way to lock the loader of another - * process we can't avoid that. - */ -static INT PSAPI_ModuleIteratorNext(MODULE_ITERATOR *iter) -{ - if (iter->pCurrent == iter->pHead) - return 0; - - if (!ReadProcessMemory(iter->hProcess, CONTAINING_RECORD(iter->pCurrent, - LDR_MODULE, InLoadOrderModuleList), - &iter->LdrModule, sizeof(iter->LdrModule), NULL)) - return -1; - else - iter->pCurrent = iter->LdrModule.InLoadOrderModuleList.Flink; - - return 1; -} - -/*********************************************************************** - * PSAPI_GetLdrModule [internal] - * - * Reads the LDR_MODULE structure of the given module. - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ - -static BOOL PSAPI_GetLdrModule(HANDLE hProcess, HMODULE hModule, - LDR_MODULE *pLdrModule) -{ - MODULE_ITERATOR iter; - INT ret; - - if (!PSAPI_ModuleIteratorInit(&iter, hProcess)) - return FALSE; - - while ((ret = PSAPI_ModuleIteratorNext(&iter)) > 0) - /* When hModule is NULL we return the process image - which will be - * the first module since our iterator uses InLoadOrderModuleList */ - if (!hModule || hModule == iter.LdrModule.BaseAddress) - { - *pLdrModule = iter.LdrModule; - return TRUE; - } - - if (ret == 0) - SetLastError(ERROR_INVALID_HANDLE); - - return FALSE; -} - /*********************************************************************** * EnumDeviceDrivers (PSAPI.@) */ @@ -263,29 +150,6 @@ DWORD WINAPI GetMappedFileNameW(HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename, } /*********************************************************************** - * GetModuleInformation (PSAPI.@) - */ -BOOL WINAPI GetModuleInformation(HANDLE hProcess, HMODULE hModule, - LPMODULEINFO lpmodinfo, DWORD cb) -{ - LDR_MODULE LdrModule; - - if (cb < sizeof(MODULEINFO)) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - if (!PSAPI_GetLdrModule(hProcess, hModule, &LdrModule)) - return FALSE; - - lpmodinfo->lpBaseOfDll = LdrModule.BaseAddress; - lpmodinfo->SizeOfImage = LdrModule.SizeOfImage; - lpmodinfo->EntryPoint = LdrModule.EntryPoint; - return TRUE; -} - -/*********************************************************************** * GetPerformanceInfo (PSAPI.@) */ BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size )

1 0

Huw Davies : gdi32: Keep track of changes to the brush rop, so that we can perform lazy realisation of the brush.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 735657d1b87db431c301bb5def1c30121389ec8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=735657d1b87db431c301bb5de… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 12 10:22:28 2011 +0100 gdi32: Keep track of changes to the brush rop, so that we can perform lazy realisation of the brush. --- dlls/gdi32/dibdrv/objects.c | 1 + dlls/gdi32/gdi_private.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index a0e238e..52aab44 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -958,6 +958,7 @@ static BOOL solid_brush(dibdrv_physdev *pdev, int num, RECT *rects) void update_brush_rop( dibdrv_physdev *pdev, INT rop ) { + pdev->brush_rop = rop; if(pdev->brush_style == BS_SOLID) calc_and_xor_masks(rop, pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7b4c585..9cb528c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -122,6 +122,7 @@ typedef struct dibdrv_physdev /* brush */ UINT brush_style; + INT brush_rop; /* PatBlt, for example, can override the DC's rop2 */ DWORD brush_color, brush_and, brush_xor; BOOL (* brush_rects)(struct dibdrv_physdev *pdev, int num, RECT *rects);

1 0

Huw Davies : gdi32: Add helpers to clear and free dib_info structures.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 5ac51cd24f386d5bb7136f09e1448ffb5cc1b943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac51cd24f386d5bb7136f09e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 12 11:27:35 2011 +0100 gdi32: Add helpers to clear and free dib_info structures. --- dlls/gdi32/dibdrv/dc.c | 48 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index e43ec15..a9a53ad 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -27,17 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); -/*********************************************************************** - * dibdrv_DeleteDC - */ -static BOOL CDECL dibdrv_DeleteDC( PHYSDEV dev ) -{ - dibdrv_physdev *pdev = get_dibdrv_pdev(dev); - TRACE("(%p)\n", dev); - DeleteObject(pdev->clip); - return 0; -} - static void calc_shift_and_len(DWORD mask, int *shift, int *len) { int s, l; @@ -74,7 +63,7 @@ static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) calc_shift_and_len(dib->blue_mask, &dib->blue_shift, &dib->blue_len); } -static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, void *bits) +static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, void *bits) { static const DWORD bit_fields_888[3] = {0xff0000, 0x00ff00, 0x0000ff}; @@ -119,6 +108,37 @@ static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit return TRUE; } +static void clear_dib_info(dib_info *dib) +{ + dib->bits = NULL; +} + +/********************************************************************** + * free_dib_info + * + * Free the resources associated with a dib and optionally the bits + */ +static void free_dib_info(dib_info *dib, BOOL free_bits) +{ + if(free_bits) + { + HeapFree(GetProcessHeap(), 0, dib->bits); + dib->bits = NULL; + } +} + +/*********************************************************************** + * dibdrv_DeleteDC + */ +static BOOL CDECL dibdrv_DeleteDC( PHYSDEV dev ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + TRACE("(%p)\n", dev); + DeleteObject(pdev->clip); + free_dib_info(&pdev->dib, FALSE); + return 0; +} + /*********************************************************************** * dibdrv_SelectBitmap */ @@ -135,7 +155,9 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) pdev->clip = CreateRectRgn(0, 0, 0, 0); pdev->defer = 0; - if(!init_dib(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->dib->dsBm.bmBits)) + clear_dib_info(&pdev->dib); + + if(!init_dib_info(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->dib->dsBm.bmBits)) pdev->defer |= DEFER_FORMAT; GDI_ReleaseObj( bitmap );

1 0

Piotr Caban : msvcrt: Added _strupr_s_l implementation.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 3db957e39e73b3b7f98c4087a754461096a41a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db957e39e73b3b7f98c4087a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:38:52 2011 +0200 msvcrt: Added _strupr_s_l implementation. --- dlls/msvcrt/msvcrt.spec | 8 +++--- dlls/msvcrt/string.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 678a2c9..1766dbf 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -954,10 +954,10 @@ @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l # stub _strtoul_l(str ptr long ptr) -@ cdecl _strupr(str) ntdll._strupr -# stub _strupr_l(str ptr) -# stub _strupr_s(str long) -# stub _strupr_s_l(str long ptr) +@ cdecl _strupr(str) +@ cdecl _strupr_l(str ptr) +@ cdecl _strupr_s(str long) +@ cdecl _strupr_s_l(str long ptr) # stub _strxfrm_l(ptr str long ptr) @ cdecl _swab(str str long) MSVCRT__swab @ varargs _swprintf(ptr wstr) MSVCRT_swprintf diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 10a86c5..8316ff7 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -113,6 +113,68 @@ int CDECL _strlwr(char *str) } /********************************************************************* + * _strupr_s_l (MSVCRT.@) + */ +int CDECL _strupr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale) +{ + char *ptr = str; + + if(!locale) + locale = get_locale(); + + if (!str || !len) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + while (len && *ptr) + { + len--; + ptr++; + } + + if (!len) + { + str[0] = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + while (*str) + { + *str = MSVCRT__toupper_l(*str, locale); + str++; + } + + return 0; +} + +/********************************************************************* + * _strupr_s (MSVCRT.@) + */ +int CDECL _strupr_s(char *str, MSVCRT_size_t len) +{ + return _strupr_s_l(str, len, NULL); +} + +/********************************************************************* + * _strupr_l (MSVCRT.@) + */ +int CDECL _strupr_l(char *str, MSVCRT__locale_t locale) +{ + return _strupr_s_l(str, -1, locale); +} + +/********************************************************************* + * _strupr (MSVCRT.@) + */ +int CDECL _strupr(char *str) +{ + return _strupr_s_l(str, -1, NULL); +} + +/********************************************************************* * _strnset (MSVCRT.@) */ char* CDECL MSVCRT__strnset(char* str, int value, MSVCRT_size_t len)

1 0

Piotr Caban : kernel32/tests: Add locale specific CompareString test.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: b88c8518203149d37f6e5c5b9f58c4a623946a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88c8518203149d37f6e5c5b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:39:01 2011 +0200 kernel32/tests: Add locale specific CompareString test. --- dlls/kernel32/tests/locale.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 3774342..19f630b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1343,6 +1343,14 @@ static void test_CompareStringA(void) ret = lstrcmpi("#", "."); todo_wine ok(ret == -1, "\"#\" vs \".\" expected -1, got %d\n", ret); + + lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT); + + /* \xB9 character lies between a and b */ + ret = CompareStringA(lcid, 0, "a", 1, "\xB9", 1); + todo_wine ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be grater than \'a\'\n"); + ret = CompareStringA(lcid, 0, "\xB9", 1, "b", 1); + ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be smaller than \'b\'\n"); } static void test_LCMapStringA(void)

1 0

Piotr Caban : msvcrt: Added _strcoll_l implementation.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: e07dbe2c0a179c4143422d30c475867a1d452c70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e07dbe2c0a179c4143422d30c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:39:10 2011 +0200 msvcrt: Added _strcoll_l implementation. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1766dbf..605997c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -919,7 +919,7 @@ @ cdecl _stati64(str ptr) MSVCRT_stati64 @ cdecl _statusfp() @ cdecl _strcmpi(str str) ntdll._strcmpi -# stub _strcoll_l(str str ptr) +@ cdecl _strcoll_l(str str ptr) MSVCRT_strcoll_l @ cdecl _strdate(ptr) @ cdecl _strdate_s(ptr long) @ cdecl _strdup(str) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 8316ff7..a3d8d57 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -31,6 +31,7 @@ #include <limits.h> #include <errno.h> #include "msvcrt.h" +#include "winnls.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -527,12 +528,22 @@ int CDECL MSVCRT__atoflt_l( MSVCRT__CRT_FLOAT *value, char *str, MSVCRT__locale_ } /********************************************************************* + * _strcoll_l (MSVCRT.@) + */ +int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, MSVCRT__locale_t locale ) +{ + if(!locale) + locale = get_locale(); + + return CompareStringA(locale->locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, -1, str2, -1)-2; +} + +/********************************************************************* * strcoll (MSVCRT.@) */ int CDECL MSVCRT_strcoll( const char* str1, const char* str2 ) { - /* FIXME: handle Windows locale */ - return strcoll( str1, str2 ); + return MSVCRT_strcoll_l(str1, str2, NULL); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Added _stricoll_l implementation.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: ff7cf637df2b3dc3d58f6a320a855f4b8212c48c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7cf637df2b3dc3d58f6a320… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:39:22 2011 +0200 msvcrt: Added _stricoll_l implementation. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 30 ++++++++++++++++++++---------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 605997c..958c6cb 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -929,7 +929,7 @@ @ cdecl _stricmp(str str) ntdll._stricmp # stub _stricmp_l(str str ptr) @ cdecl _stricoll(str str) MSVCRT__stricoll -# stub _stricoll_l(str str ptr) +@ cdecl _stricoll_l(str str ptr) MSVCRT__stricoll_l @ cdecl _strlwr(str) @ cdecl _strlwr_l(str ptr) @ cdecl _strlwr_s(ptr long) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a3d8d57..1e7e890 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -547,6 +547,26 @@ int CDECL MSVCRT_strcoll( const char* str1, const char* str2 ) } /********************************************************************* + * _stricoll_l (MSVCRT.@) + */ +int CDECL MSVCRT__stricoll_l( const char* str1, const char* str2, MSVCRT__locale_t locale ) +{ + if(!locale) + locale = get_locale(); + + return CompareStringA(locale->locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE, + str1, -1, str2, -1)-2; +} + +/********************************************************************* + * _stricoll (MSVCRT.@) + */ +int CDECL MSVCRT__stricoll( const char* str1, const char* str2 ) +{ + return MSVCRT__stricoll_l(str1, str2, NULL); +} + +/********************************************************************* * strcpy_s (MSVCRT.@) */ int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src ) @@ -644,16 +664,6 @@ MSVCRT_size_t CDECL MSVCRT_strxfrm( char *dest, const char *src, MSVCRT_size_t l return strxfrm( dest, src, len ); } -/********************************************************************* - * _stricoll (MSVCRT.@) - */ -int CDECL MSVCRT__stricoll( const char* str1, const char* str2 ) -{ - /* FIXME: handle collates */ - TRACE("str1 %s str2 %s\n", debugstr_a(str1), debugstr_a(str2)); - return lstrcmpiA( str1, str2 ); -} - /******************************************************************** * _atoldbl (MSVCRT.@) */

1 0

Piotr Caban : msvcrt: Added _strncoll_l implementation.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: d32bc75a2f985f1e5c4186cbb56de10c47c68639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d32bc75a2f985f1e5c4186cbb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:39:31 2011 +0200 msvcrt: Added _strncoll_l implementation. --- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/string.c | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 958c6cb..e7294a5 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -934,8 +934,8 @@ @ cdecl _strlwr_l(str ptr) @ cdecl _strlwr_s(ptr long) @ cdecl _strlwr_s_l(ptr long ptr) -@ stub _strncoll(str str long) -# stub _strncoll_l(str str long ptr) +@ cdecl _strncoll(str str long) MSVCRT_strncoll_l +@ cdecl _strncoll_l(str str long ptr) MSVCRT_strncoll @ cdecl _strnicmp(str str long) ntdll._strnicmp # stub _strnicmp_l(str str long ptr) @ stub _strnicoll(str str long) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 1e7e890..b6fe68b 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -567,6 +567,25 @@ int CDECL MSVCRT__stricoll( const char* str1, const char* str2 ) } /********************************************************************* + * _strncoll_l (MSVCRT.@) + */ +int CDECL MSVCRT_strncoll_l( const char* str1, const char* str2, MSVCRT_size_t count, MSVCRT__locale_t locale ) +{ + if(!locale) + locale = get_locale(); + + return CompareStringA(locale->locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, count, str2, count)-2; +} + +/********************************************************************* + * strncoll (MSVCRT.@) + */ +int CDECL MSVCRT_strncoll( const char* str1, const char* str2, MSVCRT_size_t count ) +{ + return MSVCRT_strncoll_l(str1, str2, count, NULL); +} + +/********************************************************************* * strcpy_s (MSVCRT.@) */ int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src )

1 0

Piotr Caban : msvcrt: Added _strnicoll_l implementation.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: b5d1d8e2b520a2703d97f51e77e9626a84081c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d1d8e2b520a2703d97f51e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:39:43 2011 +0200 msvcrt: Added _strnicoll_l implementation. --- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/string.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e7294a5..8957e42 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -938,8 +938,8 @@ @ cdecl _strncoll_l(str str long ptr) MSVCRT_strncoll @ cdecl _strnicmp(str str long) ntdll._strnicmp # stub _strnicmp_l(str str long ptr) -@ stub _strnicoll(str str long) -# stub _strnicoll_l(str str long ptr) +@ cdecl _strnicoll(str str long) MSVCRT__strnicoll +@ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l @ cdecl _strnset(str long long) MSVCRT__strnset # stub _strnset_s(str long long long) @ cdecl _strrev(str) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index b6fe68b..0e7da1e 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -586,6 +586,26 @@ int CDECL MSVCRT_strncoll( const char* str1, const char* str2, MSVCRT_size_t cou } /********************************************************************* + * _strnicoll_l (MSVCRT.@) + */ +int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, MSVCRT_size_t count, MSVCRT__locale_t locale ) +{ + if(!locale) + locale = get_locale(); + + return CompareStringA(locale->locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE, + str1, count, str2, count)-2; +} + +/********************************************************************* + * _strnicoll (MSVCRT.@) + */ +int CDECL MSVCRT__strnicoll( const char* str1, const char* str2, MSVCRT_size_t count ) +{ + return MSVCRT__strnicoll_l(str1, str2, count, NULL); +} + +/********************************************************************* * strcpy_s (MSVCRT.@) */ int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src )

1 0