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

Jacek Caban : kernel32: Moved GetModuleBaseName[AW] implementation to kernel32.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: e6dd213d52cc807e76d8309257de3a4937297e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6dd213d52cc807e76d830925… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 12:22:59 2011 +0000 kernel32: Moved GetModuleBaseName[AW] implementation to kernel32. --- dlls/kernel32/kernel32.spec | 2 + dlls/kernel32/module.c | 72 +++++++++++++++++++++++++++++++++++++++++++ dlls/psapi/psapi.spec | 4 +- dlls/psapi/psapi_main.c | 46 --------------------------- 4 files changed, 76 insertions(+), 48 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 458b425..4da6f06 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -772,6 +772,8 @@ @ stdcall K32GetProcessImageFileNameW(long ptr long) @ stdcall K32EnumProcessModules(long ptr long ptr) @ stdcall K32EnumProcesses(ptr long ptr) +@ stdcall K32GetModuleBaseNameA(long long ptr long) +@ stdcall K32GetModuleBaseNameW(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 347d4aa..4e2c098 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1125,6 +1125,29 @@ static int module_iterator_next(MODULE_ITERATOR *iter) return 1; } +static BOOL get_ldr_module(HANDLE process, HMODULE module, LDR_MODULE *ldr_module) +{ + MODULE_ITERATOR iter; + INT ret; + + if (!init_module_iterator(&iter, process)) + return FALSE; + + while ((ret = module_iterator_next(&iter)) > 0) + /* When hModule is NULL we return the process image - which will be + * the first module since our iterator uses InLoadOrderModuleList */ + if (!module || module == iter.ldr_module.BaseAddress) + { + *ldr_module = iter.ldr_module; + return TRUE; + } + + if (ret == 0) + SetLastError(ERROR_INVALID_HANDLE); + + return FALSE; +} + /*********************************************************************** * K32EnumProcessModules (KERNEL32.@) * @@ -1155,6 +1178,55 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, return ret == 0; } +/*********************************************************************** + * K32GetModuleBaseNameW (KERNEL32.@) + */ +DWORD WINAPI K32GetModuleBaseNameW(HANDLE process, HMODULE module, + LPWSTR base_name, DWORD size) +{ + LDR_MODULE ldr_module; + + if (!get_ldr_module(process, module, &ldr_module)) + return 0; + + size = min(ldr_module.BaseDllName.Length / sizeof(WCHAR), size); + if (!ReadProcessMemory(process, ldr_module.BaseDllName.Buffer, + base_name, size * sizeof(WCHAR), NULL)) + return 0; + + base_name[size] = 0; + return size; +} + +/*********************************************************************** + * K32GetModuleBaseNameA (KERNEL32.@) + */ +DWORD WINAPI K32GetModuleBaseNameA(HANDLE process, HMODULE module, + LPSTR base_name, DWORD size) +{ + WCHAR *base_name_w; + DWORD len, ret = 0; + + if(!base_name || !size) { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + base_name_w = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * size); + if(!base_name_w) + return 0; + + len = K32GetModuleBaseNameW(process, module, base_name_w, size); + TRACE("%d, %s\n", len, debugstr_w(base_name_w)); + if (len) + { + ret = WideCharToMultiByte(CP_ACP, 0, base_name_w, len, + base_name, size, NULL, NULL); + if (ret < size) base_name[ret] = 0; + } + HeapFree(GetProcessHeap(), 0, base_name_w); + return ret; +} #ifdef __i386__ diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index ad03716..07e0cb5 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -10,8 +10,8 @@ @ stdcall GetDeviceDriverFileNameW(ptr ptr long) @ stdcall GetMappedFileNameA(long ptr ptr long) @ stdcall GetMappedFileNameW(long ptr ptr long) -@ stdcall GetModuleBaseNameA(long long ptr long) -@ stdcall GetModuleBaseNameW(long long 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 GetModuleInformation(long long ptr long) diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 0b8e5b0..a2d7ac4 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -263,52 +263,6 @@ DWORD WINAPI GetMappedFileNameW(HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename, } /*********************************************************************** - * GetModuleBaseNameA (PSAPI.@) - */ -DWORD WINAPI GetModuleBaseNameA(HANDLE hProcess, HMODULE hModule, - LPSTR lpBaseName, DWORD nSize) -{ - WCHAR *lpBaseNameW; - DWORD buflenW, ret = 0; - - if(!lpBaseName || !nSize) { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - lpBaseNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * nSize); - buflenW = GetModuleBaseNameW(hProcess, hModule, lpBaseNameW, nSize); - TRACE("%d, %s\n", buflenW, debugstr_w(lpBaseNameW)); - if (buflenW) - { - ret = WideCharToMultiByte(CP_ACP, 0, lpBaseNameW, buflenW, - lpBaseName, nSize, NULL, NULL); - if (ret < nSize) lpBaseName[ret] = 0; - } - HeapFree(GetProcessHeap(), 0, lpBaseNameW); - return ret; -} - -/*********************************************************************** - * GetModuleBaseNameW (PSAPI.@) - */ -DWORD WINAPI GetModuleBaseNameW(HANDLE hProcess, HMODULE hModule, - LPWSTR lpBaseName, DWORD nSize) -{ - LDR_MODULE LdrModule; - - if (!PSAPI_GetLdrModule(hProcess, hModule, &LdrModule)) - return 0; - - nSize = min(LdrModule.BaseDllName.Length / sizeof(WCHAR), nSize); - if (!ReadProcessMemory(hProcess, LdrModule.BaseDllName.Buffer, - lpBaseName, nSize * sizeof(WCHAR), NULL)) - return 0; - - lpBaseName[nSize] = 0; - return nSize; -} - -/*********************************************************************** * GetModuleFileNameExA (PSAPI.@) */ DWORD WINAPI GetModuleFileNameExA(HANDLE hProcess, HMODULE hModule,

1 0

Jacek Caban : kernel32: Moved K32EnumProcessModules to module.c.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: 8379893f967edfd35a890eabd73b9b7e1d736afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=8379893f967edfd35a890eabd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 12:19:52 2011 +0000 kernel32: Moved K32EnumProcessModules to module.c. --- dlls/kernel32/module.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/process.c | 82 ----------------------------------------------- 2 files changed, 82 insertions(+), 82 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index d94850f..347d4aa 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1073,6 +1073,88 @@ FARPROC WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function ) return NULL; } +typedef struct { + HANDLE process; + PLIST_ENTRY head, current; + LDR_MODULE ldr_module; +} MODULE_ITERATOR; + +static BOOL init_module_iterator(MODULE_ITERATOR *iter, HANDLE process) +{ + PROCESS_BASIC_INFORMATION pbi; + PPEB_LDR_DATA ldr_data; + NTSTATUS status; + + /* Get address of PEB */ + status = NtQueryInformationProcess(process, ProcessBasicInformation, + &pbi, sizeof(pbi), NULL); + if (status != STATUS_SUCCESS) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + + /* Read address of LdrData from PEB */ + if (!ReadProcessMemory(process, &pbi.PebBaseAddress->LdrData, + &ldr_data, sizeof(ldr_data), NULL)) + return FALSE; + + /* Read address of first module from LdrData */ + if (!ReadProcessMemory(process, + &ldr_data->InLoadOrderModuleList.Flink, + &iter->current, sizeof(iter->current), NULL)) + return FALSE; + + iter->head = &ldr_data->InLoadOrderModuleList; + iter->process = process; + + return TRUE; +} + +static int module_iterator_next(MODULE_ITERATOR *iter) +{ + if (iter->current == iter->head) + return 0; + + if (!ReadProcessMemory(iter->process, + CONTAINING_RECORD(iter->current, LDR_MODULE, InLoadOrderModuleList), + &iter->ldr_module, sizeof(iter->ldr_module), NULL)) + return -1; + + iter->current = iter->ldr_module.InLoadOrderModuleList.Flink; + return 1; +} + +/*********************************************************************** + * K32EnumProcessModules (KERNEL32.@) + * + * NOTES + * Returned list is in load order. + */ +BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, + DWORD cb, DWORD *needed) +{ + MODULE_ITERATOR iter; + INT ret; + + if (!init_module_iterator(&iter, process)) + return FALSE; + + *needed = 0; + + while ((ret = module_iterator_next(&iter)) > 0) + { + if (cb >= sizeof(HMODULE)) + { + *lphModule++ = iter.ldr_module.BaseAddress; + cb -= sizeof(HMODULE); + } + *needed += sizeof(HMODULE); + } + + return ret == 0; +} + #ifdef __i386__ diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 2ec5905..f043b87 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3502,88 +3502,6 @@ BOOL WINAPI K32EnumProcesses(DWORD *lpdwProcessIDs, DWORD cb, DWORD *lpcbUsed) return TRUE; } -typedef struct { - HANDLE process; - PLIST_ENTRY head, current; - LDR_MODULE ldr_module; -} MODULE_ITERATOR; - -static BOOL init_module_iterator(MODULE_ITERATOR *iter, HANDLE process) -{ - PROCESS_BASIC_INFORMATION pbi; - PPEB_LDR_DATA ldr_data; - NTSTATUS status; - - /* Get address of PEB */ - status = NtQueryInformationProcess(process, ProcessBasicInformation, - &pbi, sizeof(pbi), NULL); - if (status != STATUS_SUCCESS) - { - SetLastError(RtlNtStatusToDosError(status)); - return FALSE; - } - - /* Read address of LdrData from PEB */ - if (!ReadProcessMemory(process, &pbi.PebBaseAddress->LdrData, - &ldr_data, sizeof(ldr_data), NULL)) - return FALSE; - - /* Read address of first module from LdrData */ - if (!ReadProcessMemory(process, - &ldr_data->InLoadOrderModuleList.Flink, - &iter->current, sizeof(iter->current), NULL)) - return FALSE; - - iter->head = &ldr_data->InLoadOrderModuleList; - iter->process = process; - - return TRUE; -} - -static int module_iterator_next(MODULE_ITERATOR *iter) -{ - if (iter->current == iter->head) - return 0; - - if (!ReadProcessMemory(iter->process, - CONTAINING_RECORD(iter->current, LDR_MODULE, InLoadOrderModuleList), - &iter->ldr_module, sizeof(iter->ldr_module), NULL)) - return -1; - - iter->current = iter->ldr_module.InLoadOrderModuleList.Flink; - return 1; -} - -/*********************************************************************** - * K32EnumProcessModules (KERNEL32.@) - * - * NOTES - * Returned list is in load order. - */ -BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, - DWORD cb, DWORD *needed) -{ - MODULE_ITERATOR iter; - INT ret; - - if (!init_module_iterator(&iter, process)) - return FALSE; - - *needed = 0; - - while ((ret = module_iterator_next(&iter)) > 0) - { - if (cb >= sizeof(HMODULE)) - { - *lphModule++ = iter.ldr_module.BaseAddress; - cb -= sizeof(HMODULE); - } - *needed += sizeof(HMODULE); - } - - return ret == 0; -} - /*********************************************************************** * K32QueryWorkingSet (KERNEL32.@) */

1 0

Jacek Caban : kernel32: Moved GetProcessMemoryInfo implementation to kernel32.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: 4ed94f7939a21c77bc565d0f697b1cd9aa8b4a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed94f7939a21c77bc565d0f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 12:19:40 2011 +0000 kernel32: Moved GetProcessMemoryInfo implementation to kernel32. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/psapi/psapi.spec | 2 +- dlls/psapi/psapi_main.c | 41 ----------------------------------------- 4 files changed, 44 insertions(+), 42 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a4e45d6..458b425 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -772,6 +772,7 @@ @ stdcall K32GetProcessImageFileNameW(long ptr long) @ stdcall K32EnumProcessModules(long ptr long ptr) @ stdcall K32EnumProcesses(ptr long ptr) +@ stdcall K32GetProcessMemoryInfo(long ptr long) @ stdcall K32QueryWorkingSet(long ptr long) @ stdcall K32QueryWorkingSetEx(long ptr long) @ stdcall -i386 -private -register K32Thk1632Epilog() krnl386.exe16.K32Thk1632Epilog diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5436c06..2ec5905 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -46,6 +46,7 @@ #define WIN32_NO_STATUS #include "winternl.h" #include "kernel_private.h" +#include "psapi.h" #include "wine/library.h" #include "wine/server.h" #include "wine/unicode.h" @@ -3622,6 +3623,47 @@ BOOL WINAPI K32QueryWorkingSetEx( HANDLE process, LPVOID buffer, DWORD size ) } /*********************************************************************** + * K32GetProcessMemoryInfo (KERNEL32.@) + * + * Retrieve memory usage information for a given process + * + */ +BOOL WINAPI K32GetProcessMemoryInfo(HANDLE process, + PPROCESS_MEMORY_COUNTERS pmc, DWORD cb) +{ + NTSTATUS status; + VM_COUNTERS vmc; + + if (cb < sizeof(PROCESS_MEMORY_COUNTERS)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + status = NtQueryInformationProcess(process, ProcessVmCounters, + &vmc, sizeof(vmc), NULL); + + if (status) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + + pmc->cb = sizeof(PROCESS_MEMORY_COUNTERS); + pmc->PageFaultCount = vmc.PageFaultCount; + pmc->PeakWorkingSetSize = vmc.PeakWorkingSetSize; + pmc->WorkingSetSize = vmc.WorkingSetSize; + pmc->QuotaPeakPagedPoolUsage = vmc.QuotaPeakPagedPoolUsage; + pmc->QuotaPagedPoolUsage = vmc.QuotaPagedPoolUsage; + pmc->QuotaPeakNonPagedPoolUsage = vmc.QuotaPeakNonPagedPoolUsage; + pmc->QuotaNonPagedPoolUsage = vmc.QuotaNonPagedPoolUsage; + pmc->PagefileUsage = vmc.PagefileUsage; + pmc->PeakPagefileUsage = vmc.PeakPagefileUsage; + + return TRUE; +} + +/*********************************************************************** * ProcessIdToSessionId (KERNEL32.@) * This function is available on Terminal Server 4SP4 and Windows 2000 */ diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index 37d6e80..ad03716 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -18,7 +18,7 @@ @ stdcall GetPerformanceInfo(ptr long) @ stdcall GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA @ stdcall GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW -@ stdcall GetProcessMemoryInfo(long ptr long) +@ stdcall GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo @ stdcall GetWsChanges(long ptr long) @ stdcall InitializeProcessForWsWatch(long) @ stdcall QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 909e7ce..0b8e5b0 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -407,47 +407,6 @@ BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size ) } /*********************************************************************** - * GetProcessMemoryInfo (PSAPI.@) - * - * Retrieve memory usage information for a given process - * - */ -BOOL WINAPI GetProcessMemoryInfo(HANDLE hProcess, - PPROCESS_MEMORY_COUNTERS pmc, DWORD cb) -{ - NTSTATUS status; - VM_COUNTERS vmc; - - if (cb < sizeof(PROCESS_MEMORY_COUNTERS)) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - status = NtQueryInformationProcess(hProcess, ProcessVmCounters, - &vmc, sizeof(vmc), NULL); - - if (status) - { - SetLastError(RtlNtStatusToDosError(status)); - return FALSE; - } - - pmc->cb = sizeof(PROCESS_MEMORY_COUNTERS); - pmc->PageFaultCount = vmc.PageFaultCount; - pmc->PeakWorkingSetSize = vmc.PeakWorkingSetSize; - pmc->WorkingSetSize = vmc.WorkingSetSize; - pmc->QuotaPeakPagedPoolUsage = vmc.QuotaPeakPagedPoolUsage; - pmc->QuotaPagedPoolUsage = vmc.QuotaPagedPoolUsage; - pmc->QuotaPeakNonPagedPoolUsage = vmc.QuotaPeakNonPagedPoolUsage; - pmc->QuotaNonPagedPoolUsage = vmc.QuotaNonPagedPoolUsage; - pmc->PagefileUsage = vmc.PagefileUsage; - pmc->PeakPagefileUsage = vmc.PeakPagefileUsage; - - return TRUE; -} - -/*********************************************************************** * GetWsChanges (PSAPI.@) */ BOOL WINAPI GetWsChanges( HANDLE process, PPSAPI_WS_WATCH_INFORMATION watchinfo, DWORD size )

1 0

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

May 12, 2011

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 : msvcr: Update spec files.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: ed6c309fe5f89682acb6de39293a643d8885ca30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed6c309fe5f89682acb6de392… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:39:54 2011 +0200 msvcr: Update spec files. --- dlls/msvcr100/msvcr100.spec | 50 +++++++++++++++++++++--------------------- dlls/msvcr80/msvcr80.spec | 50 +++++++++++++++++++++--------------------- dlls/msvcr90/msvcr90.spec | 50 +++++++++++++++++++++--------------------- 3 files changed, 75 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed6c309fe5f89682acb6d…

1 0

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

May 12, 2011

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 _strupr_s_l implementation.
by Alexandre Julliard May 12, 2011

May 12, 2011

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 : msvcrt: Added _strncoll_l implementation.
by Alexandre Julliard May 12, 2011

May 12, 2011

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 May 12, 2011

May 12, 2011

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

Piotr Caban : msvcrt: Added _strcoll_l implementation.
by Alexandre Julliard May 12, 2011

May 12, 2011

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