← Back to branch summary

~ubuntu-branches/ubuntu/precise/wine1.3/precise

« back to all changes in this revision

Viewing changes to programs/taskmgr/perfpage.c

  • Committer: Package Import Robot
  • Author(s): Scott Ritchie
  • Date: 2012-01-17 09:00:34 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120117090034-eyhpp02jawlvrrkc
Tags: 1.3.37-0ubuntu1
* New upstream release
  - Many changes
* Convert to 3.0 source format
* debian/control:
  - Remove pre-multiarch amd64 build depends
  - Remove quilt build depends
  - Recommend proper gecko versions
* debian/rules:
  - Remove manual dh_quilt patch and unpatch
  - No need to uuencode/uudecode anymore with new source format

Show diffs side-by-side

added added

removed removed

Lines of Context:
programs/taskmgr/perfpage.c
98
98
    } else {
99
99
        cx = rc.left + nXDifference;
100
100
        cy = rc.top + nYDifference;
101
 
        sx = sy = 0;
102
101
        SetWindowPos(hCntrl, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER);
103
102
    }
104
103
    InvalidateRect(hCntrl, NULL, TRUE);
140
139
 
141
140
        WCHAR   Text[256];
142
141
 
143
 
        static const WCHAR    wszFormatDigit[] = {'%','d',0};
 
142
        static const WCHAR    wszFormatDigit[] = {'%','u',0};
144
143
        WCHAR    wszMemUsage[255];
145
144
 
146
145
        LoadStringW(hInst, IDS_STATUS_BAR_MEMORY_USAGE, wszMemUsage, sizeof(wszMemUsage)/sizeof(WCHAR));
168
167
                {
169
168
                        ULONG CpuUsage;
170
169
                        ULONG CpuKernelUsage;
171
 
                        int nBarsUsed1;
172
 
                        int nBarsUsed2;
 
170
                        int nBarsUsed1, nBarsUsed2;
 
171
                        DWORD_PTR args[2];
173
172
 
174
173
                        /*  Reset our event */
175
174
                        ResetEvent(hPerformancePageEvent);
185
184
                        wsprintfW(Text, wszFormatDigit, CommitChargeLimit);
186
185
                        SetWindowTextW(hPerformancePageCommitChargeLimitEdit, Text);
187
186
                        wsprintfW(Text, wszFormatDigit, CommitChargePeak);
 
187
 
188
188
                        SetWindowTextW(hPerformancePageCommitChargePeakEdit, Text);
189
 
                        wsprintfW(Text, wszMemUsage, CommitChargeTotal, CommitChargeLimit);
 
189
 
 
190
                        args[0] = CommitChargeTotal;
 
191
                        args[1] = CommitChargeLimit;
 
192
                        FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
 
193
                                       wszMemUsage, 0, 0, Text,
 
194
                                       sizeof(Text)/sizeof(*Text), (__ms_va_list*)args);
190
195
                        SendMessageW(hStatusWnd, SB_SETTEXTW, 2, (LPARAM)Text);
191
196
 
192
197
                        /* 
338
343
        GraphCtrl_SetPlotColor(&PerformancePageMemUsageHistoryGraph, 0, RGB(255, 255, 0)) ;
339
344
                /*  Start our refresh thread */
340
345
#ifdef RUN_PERF_PAGE
341
 
        CreateThread(NULL, 0, PerformancePageRefreshThread, NULL, 0, NULL);
 
346
        CloseHandle( CreateThread(NULL, 0, PerformancePageRefreshThread, NULL, 0, NULL));
342
347
#endif
343
348
 
344
349
                /*