August 2008 - Wine-Commits - list.winehq.org

Stefan Leichter : rasapi: Fix test failure on platforms vista, w2k8.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: 3ad8b7ea1a119d88c849d0862300a78248805508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad8b7ea1a119d88c849d0862… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Aug 21 22:44:32 2008 +0200 rasapi: Fix test failure on platforms vista, w2k8. --- dlls/rasapi32/tests/rasapi.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index da733a1..bcd4310 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -106,8 +106,9 @@ static void test_rasenum(void) rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = 0; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - ok(result == ERROR_BUFFER_TOO_SMALL, - "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); + ok(result == ERROR_BUFFER_TOO_SMALL || + result == ERROR_INVALID_SIZE, /* vista, 2k8 */ + "Expected ERROR_BUFFER_TOO_SMALL/ERROR_INVALID_SIZE, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = bufsize -1;

1 0

Roderick Colenbrander : wined3d: Fix window rewrite regression.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: fd0e60180a1979e3dd8730bd4922556a73353ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0e60180a1979e3dd8730bd4… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Aug 21 20:51:18 2008 +0000 wined3d: Fix window rewrite regression. --- dlls/wined3d/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0efe88f..d247d65 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1319,8 +1319,7 @@ static void WINAPI IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *ifac /* Inform the window about the update. */ SetWindowPos(window, HWND_TOP, 0, 0, - w, h, SWP_FRAMECHANGED); - ShowWindow(window, SW_NORMAL); + w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW); } /*****************************************************************************

1 0

H. Verbeet : wined3d: Track FBOs per-context.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: 05931f4a5a2838ba6c867b29c7172a8d33b0a8b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05931f4a5a2838ba6c867b29c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Aug 21 18:34:55 2008 +0200 wined3d: Track FBOs per-context. Although sharing FBOs across contexts is allowed by EXT_framebuffer_object (issue 76), it causes issues with nVidia drivers. Considering the GL 3 spec explicitly disallows sharing of FBOs accross contexts (Appendix D), this patch is probably the right thing to do. --- dlls/wined3d/context.c | 28 ++++++++++- dlls/wined3d/device.c | 102 ++++++++++++---------------------------- dlls/wined3d/surface.c | 6 +- dlls/wined3d/wined3d_private.h | 13 +++-- 4 files changed, 67 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05931f4a5a2838ba6c867…

1 0

H. Verbeet : wined3d: Remove useless hash_table_entry_t typedef.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: b917bdaa5221391f3ccb5fdaa1cd0d1caf241e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b917bdaa5221391f3ccb5fdaa… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Aug 21 18:35:34 2008 +0200 wined3d: Remove useless hash_table_entry_t typedef. It doesn't add much. --- dlls/wined3d/utils.c | 26 +++++++++++++------------- dlls/wined3d/wined3d_private.h | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index df291ea..8b3be3f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5,7 +5,7 @@ * Copyright 2003-2004 Raphael Junqueira * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber - * Copyright 2006-2007 Henri Verbeet + * Copyright 2006-2008 Henri Verbeet * Copyright 2007-2008 Stefan D�singer for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -1581,7 +1581,7 @@ hash_table_t *hash_table_create(hash_function_t *hash_function, compare_function } table->bucket_count = initial_size; - table->entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, table->grow_size * sizeof(hash_table_entry_t)); + table->entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, table->grow_size * sizeof(struct hash_table_entry_t)); if (!table->entries) { ERR("Failed to allocate table entries, returning NULL.\n"); @@ -1614,12 +1614,12 @@ void hash_table_destroy(hash_table_t *table, void (*free_value)(void *value, voi HeapFree(GetProcessHeap(), 0, table); } -static inline hash_table_entry_t *hash_table_get_by_idx(hash_table_t *table, void *key, unsigned int idx) +static inline struct hash_table_entry_t *hash_table_get_by_idx(hash_table_t *table, void *key, unsigned int idx) { - hash_table_entry_t *entry; + struct hash_table_entry_t *entry; if (table->buckets[idx].next) - LIST_FOR_EACH_ENTRY(entry, &(table->buckets[idx]), hash_table_entry_t, entry) + LIST_FOR_EACH_ENTRY(entry, &(table->buckets[idx]), struct hash_table_entry_t, entry) if (table->compare_function(entry->key, key)) return entry; return NULL; @@ -1628,7 +1628,7 @@ static inline hash_table_entry_t *hash_table_get_by_idx(hash_table_t *table, voi static BOOL hash_table_resize(hash_table_t *table, unsigned int new_bucket_count) { unsigned int new_entry_count = 0; - hash_table_entry_t *new_entries; + struct hash_table_entry_t *new_entries; struct list *new_buckets; unsigned int grow_size = new_bucket_count - (new_bucket_count >> 2); unsigned int i; @@ -1640,7 +1640,7 @@ static BOOL hash_table_resize(hash_table_t *table, unsigned int new_bucket_count return FALSE; } - new_entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, grow_size * sizeof(hash_table_entry_t)); + new_entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, grow_size * sizeof(struct hash_table_entry_t)); if (!new_entries) { ERR("Failed to allocate new entries, returning FALSE.\n"); @@ -1652,12 +1652,12 @@ static BOOL hash_table_resize(hash_table_t *table, unsigned int new_bucket_count { if (table->buckets[i].next) { - hash_table_entry_t *entry, *entry2; + struct hash_table_entry_t *entry, *entry2; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &table->buckets[i], hash_table_entry_t, entry) + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &table->buckets[i], struct hash_table_entry_t, entry) { int j; - hash_table_entry_t *new_entry = new_entries + (new_entry_count++); + struct hash_table_entry_t *new_entry = new_entries + (new_entry_count++); *new_entry = *entry; j = new_entry->hash & (new_bucket_count - 1); @@ -1688,7 +1688,7 @@ void hash_table_put(hash_table_t *table, void *key, void *value) { unsigned int idx; unsigned int hash; - hash_table_entry_t *entry; + struct hash_table_entry_t *entry; hash = table->hash_function(key); idx = hash & (table->bucket_count - 1); @@ -1742,7 +1742,7 @@ void hash_table_put(hash_table_t *table, void *key, void *value) struct list *elem = list_head(&table->free_entries); list_remove(elem); - entry = LIST_ENTRY(elem, hash_table_entry_t, entry); + entry = LIST_ENTRY(elem, struct hash_table_entry_t, entry); } else { entry = table->entries + (table->entry_count++); } @@ -1765,7 +1765,7 @@ void hash_table_remove(hash_table_t *table, void *key) void *hash_table_get(hash_table_t *table, void *key) { unsigned int idx; - hash_table_entry_t *entry; + struct hash_table_entry_t *entry; idx = table->hash_function(key) & (table->bucket_count - 1); entry = hash_table_get_by_idx(table, key, idx); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index db9b10b..e67ec38 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -47,19 +47,19 @@ typedef unsigned int (hash_function_t)(void *key); typedef BOOL (compare_function_t)(void *keya, void *keyb); -typedef struct { +struct hash_table_entry_t { void *key; void *value; unsigned int hash; struct list entry; -} hash_table_entry_t; +}; typedef struct { hash_function_t *hash_function; compare_function_t *compare_function; struct list *buckets; unsigned int bucket_count; - hash_table_entry_t *entries; + struct hash_table_entry_t *entries; unsigned int entry_count; struct list free_entries; unsigned int count;

1 0

Huw Davies : crypt32: Don't decrease the size of the buffer, since we' re already counting the characters that we're adding to it.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: e71406451503086c1b6bd65f007cc4a457d60ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71406451503086c1b6bd65f0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 21 18:03:11 2008 +0100 crypt32: Don't decrease the size of the buffer, since we're already counting the characters that we're adding to it. --- dlls/crypt32/str.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 699779f..b0b0990 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -249,7 +249,6 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, chars = CRYPT_AddPrefixA(prefix, psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; - csz -= chars; } /* FIXME: handle quoting */ chars = CertRDNValueToStrA( @@ -277,7 +276,6 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, if (psz && csz) { *(psz + ret) = '\0'; - csz--; ret++; } else @@ -406,7 +404,6 @@ DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, chars = CRYPT_AddPrefixW(prefixW, psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; - csz -= chars; } else if (prefixA) { @@ -414,7 +411,6 @@ DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, chars = CRYPT_AddPrefixAToW(prefixA, psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; - csz -= chars; } /* FIXME: handle quoting */ chars = CertRDNValueToStrW( @@ -442,7 +438,6 @@ DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, if (psz && csz) { *(psz + ret) = '\0'; - csz--; ret++; } else

1 0

Damjan Jovanovic : oleaut32: Add a failing VarFormat test.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: 1cbd1c2bf322ae4d78a7051ac69b0462278c8f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cbd1c2bf322ae4d78a7051ac… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Aug 21 16:30:56 2008 +0200 oleaut32: Add a failing VarFormat test. --- dlls/oleaut32/tests/varformat.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 228ad1c..2895408 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -368,6 +368,10 @@ static void test_VarFormat(void) VARFMT(VT_R8,V_R8,1.0001e-27,"##00.0000e-0",S_OK,"1000.1000e-30"); VARFMT(VT_R8,V_R8,47.11,".0000E+0",S_OK,".4711E+2"); VARFMT(VT_R8,V_R8,3.0401e-13,"#####.####e-0%",S_OK,"30401.e-15%"); + VARFMT(VT_R8,V_R8,1.57,"0.00",S_OK,"1.57"); + todo_wine { + VARFMT(VT_R8,V_R8,-1.57,"0.00",S_OK,"-1.57"); + } /* 'out' is not cleared */

1 0

H. Verbeet : wined3d: Move depth stencil location handling code up a couple of lines.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: 2f99bcdde2e3f8dd9e763bff650c3cc28055f401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f99bcdde2e3f8dd9e763bff6… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Aug 21 18:23:32 2008 +0200 wined3d: Move depth stencil location handling code up a couple of lines. This is just for clarity, so that render targets and the depth stencil are handled in the same place. --- dlls/wined3d/drawprim.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 59e1f64..b0f6a53 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -5,7 +5,7 @@ * Copyright 2002-2004 Raphael Junqueira * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber - * Copyright 2006 Henri Verbeet + * Copyright 2006, 2008 Henri Verbeet * Copyright 2007-2008 Stefan D�singer for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -936,6 +936,12 @@ void drawPrimitive(IWineD3DDevice *iface, } } + if (This->stencilBufferTarget) { + DWORD location = This->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; + surface_load_ds_location(This->stencilBufferTarget, location); + surface_modify_ds_location(This->stencilBufferTarget, location); + } + /* Signals other modules that a drawing is in progress and the stateblock finalized */ This->isInDraw = TRUE; @@ -944,12 +950,6 @@ void drawPrimitive(IWineD3DDevice *iface, ActivateContext(This, This->render_targets[0], CTXUSAGE_DRAWPRIM); ENTER_GL(); - if (This->stencilBufferTarget) { - DWORD location = This->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; - surface_load_ds_location(This->stencilBufferTarget, location); - surface_modify_ds_location(This->stencilBufferTarget, location); - } - { GLenum glPrimType; BOOL emulation = FALSE;

1 0

Alexandre Julliard : Avoid some size_t printf format warnings.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: 5d900bb0f625f7870170c1a5ae570872664aba5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d900bb0f625f7870170c1a5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 21 16:05:15 2008 +0200 Avoid some size_t printf format warnings. --- dlls/dplayx/tests/dplayx.c | 2 +- dlls/quartz/avisplit.c | 2 +- dlls/winhttp/tests/winhttp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 4fdc494..19c42b4 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -27,7 +27,7 @@ #define check(expected, result) \ ok( (expected) == (result), \ "expected=%d got=%d\n", \ - expected, result ); + (int)(expected), (int)(result) ); #define checkLP(expected, result) \ ok( (expected) == (result), \ "expected=%p got=%p\n", \ diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 3f1625c..e93d1d1 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -549,7 +549,7 @@ static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, AVISTDINDEX **ind { FIXME("Invalid index chunk encountered: %u/%u, %u/%u, %u/%u, %u/%u\n", pIndex->bIndexType, AVI_INDEX_OF_CHUNKS, pIndex->wLongsPerEntry, 2, - rest, (pIndex->nEntriesInUse * sizeof(DWORD) * pIndex->wLongsPerEntry), + rest, (DWORD)(pIndex->nEntriesInUse * sizeof(DWORD) * pIndex->wLongsPerEntry), pIndex->bIndexSubType, AVI_INDEX_SUB_DEFAULT); *index = NULL; return E_INVALIDARG; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 527794d..d77dcc0 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -129,7 +129,7 @@ static void test_SendRequest (void) todo_wine ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); todo_wine ok(bytes_rw == strlen(test_post), "Read %u bytes instead of %d.\n", - bytes_rw, strlen(test_post)); + bytes_rw, lstrlen(test_post)); todo_wine ok(strncmp(buffer, test_post, bytes_rw) == 0, "Data read did not match, got '%s'.\n", buffer);

1 0

Alexandre Julliard : kernel32: Fix a compiler warning on Mac OS.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: 49421014b79bdf21027c640a143d8b28b6eaab47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49421014b79bdf21027c640a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 21 16:04:58 2008 +0200 kernel32: Fix a compiler warning on Mac OS. --- dlls/kernel32/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 0366894..8aedacb 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2875,7 +2875,7 @@ void LOCALE_Init(void) CFStringGetCString( user_locale_string_ref, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); CFRelease( user_locale_ref ); /* Strip modifiers because setlocale() can't parse them. */ - if (p = strchr( user_locale, '@' )) *p = 0; + if ((p = strchr( user_locale, '@' ))) *p = 0; if (!strchr( user_locale, '.' )) strcat( user_locale, ".UTF-8" ); unix_cp = CP_UTF8; /* default to utf-8 even if we don't get a valid locale */ setenv( "LANG", user_locale, 0 );

1 0

Vladimir Pankratov : taskmgr: Converted some functions and variables to Unicode.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: 91227d913850bd6a2554b77a4b36a05664dfe26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91227d913850bd6a2554b77a4… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Aug 20 08:35:51 2008 +0000 taskmgr: Converted some functions and variables to Unicode. --- programs/taskmgr/perfpage.c | 61 +++++++++++++++++++++++------------------- 1 files changed, 33 insertions(+), 28 deletions(-) diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 11220e6..4bf69c6 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -4,6 +4,7 @@ * perfpage.c * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> + * Copyright (C) 2008 Vladimir Pankratov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,10 +27,10 @@ #include <stdlib.h> #include <malloc.h> #include <memory.h> -#include <tchar.h> #include <stdio.h> #include <winnt.h> +#include "wine/unicode.h" #include "taskmgr.h" #include "perfdata.h" #include "graphctl.h" @@ -138,7 +139,11 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) ULONG TotalThreads; ULONG TotalProcesses; - TCHAR Text[260]; + WCHAR Text[256]; + + static const WCHAR wszFormatDigit[] = {'%','d',0}; + static const WCHAR wszMemUsage[] = {'M','e','m',' ','U','s','a','g','e',':',' ', + '%','d','K',' ','/',' ','%','d','K',0}; /* Create the event */ hPerformancePageEvent = CreateEvent(NULL, TRUE, TRUE, NULL); @@ -175,14 +180,14 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) CommitChargeTotal = PerfDataGetCommitChargeTotalK(); CommitChargeLimit = PerfDataGetCommitChargeLimitK(); CommitChargePeak = PerfDataGetCommitChargePeakK(); - _ultoa(CommitChargeTotal, Text, 10); - SetWindowText(hPerformancePageCommitChargeTotalEdit, Text); - _ultoa(CommitChargeLimit, Text, 10); - SetWindowText(hPerformancePageCommitChargeLimitEdit, Text); - _ultoa(CommitChargePeak, Text, 10); - SetWindowText(hPerformancePageCommitChargePeakEdit, Text); - wsprintf(Text, _T("Mem Usage: %dK / %dK"), CommitChargeTotal, CommitChargeLimit); - SendMessage(hStatusWnd, SB_SETTEXT, 2, (LPARAM)Text); + wsprintfW(Text, wszFormatDigit, CommitChargeTotal); + SetWindowTextW(hPerformancePageCommitChargeTotalEdit, Text); + wsprintfW(Text, wszFormatDigit, CommitChargeLimit); + SetWindowTextW(hPerformancePageCommitChargeLimitEdit, Text); + wsprintfW(Text, wszFormatDigit, CommitChargePeak); + SetWindowTextW(hPerformancePageCommitChargePeakEdit, Text); + wsprintfW(Text, wszMemUsage, CommitChargeTotal, CommitChargeLimit); + SendMessageW(hStatusWnd, SB_SETTEXTW, 2, (LPARAM)Text); /* * Update the kernel memory info @@ -190,12 +195,12 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) KernelMemoryTotal = PerfDataGetKernelMemoryTotalK(); KernelMemoryPaged = PerfDataGetKernelMemoryPagedK(); KernelMemoryNonPaged = PerfDataGetKernelMemoryNonPagedK(); - _ultoa(KernelMemoryTotal, Text, 10); - SetWindowText(hPerformancePageKernelMemoryTotalEdit, Text); - _ultoa(KernelMemoryPaged, Text, 10); - SetWindowText(hPerformancePageKernelMemoryPagedEdit, Text); - _ultoa(KernelMemoryNonPaged, Text, 10); - SetWindowText(hPerformancePageKernelMemoryNonPagedEdit, Text); + wsprintfW(Text, wszFormatDigit, KernelMemoryTotal); + SetWindowTextW(hPerformancePageKernelMemoryTotalEdit, Text); + wsprintfW(Text, wszFormatDigit, KernelMemoryPaged); + SetWindowTextW(hPerformancePageKernelMemoryPagedEdit, Text); + wsprintfW(Text, wszFormatDigit, KernelMemoryNonPaged); + SetWindowTextW(hPerformancePageKernelMemoryNonPagedEdit, Text); /* * Update the physical memory info @@ -203,12 +208,12 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) PhysicalMemoryTotal = PerfDataGetPhysicalMemoryTotalK(); PhysicalMemoryAvailable = PerfDataGetPhysicalMemoryAvailableK(); PhysicalMemorySystemCache = PerfDataGetPhysicalMemorySystemCacheK(); - _ultoa(PhysicalMemoryTotal, Text, 10); - SetWindowText(hPerformancePagePhysicalMemoryTotalEdit, Text); - _ultoa(PhysicalMemoryAvailable, Text, 10); - SetWindowText(hPerformancePagePhysicalMemoryAvailableEdit, Text); - _ultoa(PhysicalMemorySystemCache, Text, 10); - SetWindowText(hPerformancePagePhysicalMemorySystemCacheEdit, Text); + wsprintfW(Text, wszFormatDigit, PhysicalMemoryTotal); + SetWindowTextW(hPerformancePagePhysicalMemoryTotalEdit, Text); + wsprintfW(Text, wszFormatDigit, PhysicalMemoryAvailable); + SetWindowTextW(hPerformancePagePhysicalMemoryAvailableEdit, Text); + wsprintfW(Text, wszFormatDigit, PhysicalMemorySystemCache); + SetWindowTextW(hPerformancePagePhysicalMemorySystemCacheEdit, Text); /* * Update the totals info @@ -216,12 +221,12 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) TotalHandles = PerfDataGetSystemHandleCount(); TotalThreads = PerfDataGetTotalThreadCount(); TotalProcesses = PerfDataGetProcessCount(); - _ultoa(TotalHandles, Text, 10); - SetWindowText(hPerformancePageTotalsHandleCountEdit, Text); - _ultoa(TotalThreads, Text, 10); - SetWindowText(hPerformancePageTotalsThreadCountEdit, Text); - _ultoa(TotalProcesses, Text, 10); - SetWindowText(hPerformancePageTotalsProcessCountEdit, Text); + wsprintfW(Text, wszFormatDigit, TotalHandles); + SetWindowTextW(hPerformancePageTotalsHandleCountEdit, Text); + wsprintfW(Text, wszFormatDigit, TotalThreads); + SetWindowTextW(hPerformancePageTotalsThreadCountEdit, Text); + wsprintfW(Text, wszFormatDigit, TotalProcesses); + SetWindowTextW(hPerformancePageTotalsProcessCountEdit, Text); /* * Redraw the graphs

1 0