October 2006 - Wine-commits

Eric Pouech : advapi32: Plug a couple of memory leaks.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 4dfd319dbf65537a4c58dc62eef0c7e58828edf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dfd319dbf65537a4c58dc62e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Oct 17 21:32:00 2006 +0200 advapi32: Plug a couple of memory leaks. --- dlls/advapi32/lsa.c | 72 ++++++++++++++++++++++------------------ dlls/advapi32/registry.c | 24 +++++++++---- dlls/advapi32/tests/security.c | 4 ++ 3 files changed, 60 insertions(+), 40 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 1d4323f..8c58334 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -56,15 +56,22 @@ static void dumpLsaAttributes(PLSA_OBJEC } } -static void ADVAPI_GetDomainName(UNICODE_STRING * name) +static void* ADVAPI_GetDomainName(unsigned sz, unsigned ofs) { HKEY key; BOOL useDefault = TRUE; LONG ret; + BYTE* ptr; + UNICODE_STRING* ustr; - if ((ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "System\\CurrentControlSet\\Services\\VxD\\VNETSUP", 0, - KEY_READ, &key)) == ERROR_SUCCESS) + static const WCHAR wVNETSUP[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'S','e','r','v','i','c','e','s','\\', + 'V','x','D','\\','V','N','E','T','S','U','P','\0'}; + + ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wVNETSUP, 0, KEY_READ, &key); + if (ret == ERROR_SUCCESS) { DWORD size = 0; static const WCHAR wg[] = { 'W','o','r','k','g','r','o','u','p',0 }; @@ -72,26 +79,34 @@ static void ADVAPI_GetDomainName(UNICODE ret = RegQueryValueExW(key, wg, NULL, NULL, NULL, &size); if (ret == ERROR_MORE_DATA || ret == ERROR_SUCCESS) { - name->Buffer = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, size); - + ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz + size); + if (!ptr) return NULL; + ustr = (UNICODE_STRING*)(ptr + ofs); + ustr->MaximumLength = size; + ustr->Buffer = (WCHAR*)(ptr + sz); if ((ret = RegQueryValueExW(key, wg, NULL, NULL, - (LPBYTE)name->Buffer, &size)) == ERROR_SUCCESS) + (LPBYTE)ustr->Buffer, &size)) == ERROR_SUCCESS) { - name->Length = (USHORT)(size - sizeof(WCHAR)); - name->MaximumLength = (USHORT)size; + ustr->Length = (USHORT)(size - sizeof(WCHAR)); useDefault = FALSE; } else - { - HeapFree(GetProcessHeap(), 0, name->Buffer); - name->Buffer = NULL; - } + HeapFree(GetProcessHeap(), 0, ptr); } RegCloseKey(key); } if (useDefault) - RtlCreateUnicodeStringFromAsciiz(name, "DOMAIN"); + { + static const WCHAR wDomain[] = {'D','O','M','A','I','N','\0'}; + ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sz + sizeof(wDomain)); + ustr = (UNICODE_STRING*)(ptr + ofs); + ustr->MaximumLength = sizeof(wDomain); + ustr->Buffer = (WCHAR*)(ptr + sz); + ustr->Length = (USHORT)(sizeof(wDomain) - sizeof(WCHAR)); + memcpy(ustr->Buffer, wDomain, sizeof(wDomain)); + } + return ptr; } /****************************************************************************** @@ -431,10 +446,8 @@ NTSTATUS WINAPI LsaQueryInformationPolic /* Only the domain name is valid for the local computer. * All other fields are zero. */ - PPOLICY_PRIMARY_DOMAIN_INFO pinfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(POLICY_PRIMARY_DOMAIN_INFO)); - - ADVAPI_GetDomainName(&pinfo->Name); + PPOLICY_PRIMARY_DOMAIN_INFO pinfo; + pinfo = ADVAPI_GetDomainName(sizeof(*pinfo), (char*)&pinfo->Name - (char*)pinfo); TRACE("setting domain to %s\n", debugstr_w(pinfo->Name.Buffer)); @@ -448,28 +461,24 @@ NTSTATUS WINAPI LsaQueryInformationPolic POLICY_ACCOUNT_DOMAIN_INFO info; SID sid; DWORD padding[3]; + WCHAR domain[MAX_COMPUTERNAME_LENGTH + 1]; }; - struct di * xdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*xdi)); DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1; - LPWSTR buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize * sizeof(WCHAR)); + struct di * xdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*xdi)); xdi->info.DomainName.MaximumLength = dwSize * sizeof(WCHAR); - - if (GetComputerNameW(buf, &dwSize)) - { - xdi->info.DomainName.Buffer = buf; + xdi->info.DomainName.Buffer = xdi->domain; + if (GetComputerNameW(xdi->info.DomainName.Buffer, &dwSize)) xdi->info.DomainName.Length = dwSize * sizeof(WCHAR); - } TRACE("setting name to %s\n", debugstr_w(xdi->info.DomainName.Buffer)); - xdi->info.DomainSid = &(xdi->sid); + xdi->info.DomainSid = &xdi->sid; /* read the computer SID from the registry */ - if (!ADVAPI_GetComputerSid(&(xdi->sid))) + if (!ADVAPI_GetComputerSid(&xdi->sid)) { - HeapFree(GetProcessHeap(), 0, buf); HeapFree(GetProcessHeap(), 0, xdi); WARN("Computer SID not found\n"); @@ -487,10 +496,9 @@ NTSTATUS WINAPI LsaQueryInformationPolic /* Only the domain name is valid for the local computer. * All other fields are zero. */ - PPOLICY_DNS_DOMAIN_INFO pinfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(POLICY_DNS_DOMAIN_INFO)); + PPOLICY_DNS_DOMAIN_INFO pinfo; - ADVAPI_GetDomainName(&pinfo->Name); + pinfo = ADVAPI_GetDomainName(sizeof(*pinfo), (char*)&pinfo->Name - (char*)pinfo); TRACE("setting domain to %s\n", debugstr_w(pinfo->Name.Buffer)); diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 74b3f77..162a9c3 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1887,6 +1887,7 @@ LONG WINAPI RegLoadKeyW( HKEY hkey, LPCW { OBJECT_ATTRIBUTES destkey, file; UNICODE_STRING subkeyW, filenameW; + NTSTATUS status; if (!(hkey = get_special_root_hkey(hkey))) return ERROR_INVALID_HANDLE; @@ -1906,7 +1907,9 @@ LONG WINAPI RegLoadKeyW( HKEY hkey, LPCW file.SecurityQualityOfService = NULL; RtlDosPathNameToNtPathName_U(filename, &filenameW, NULL, NULL); - return RtlNtStatusToDosError( NtLoadKey(&destkey, &file) ); + status = NtLoadKey(&destkey, &file); + RtlFreeUnicodeString(&filenameW); + return RtlNtStatusToDosError( status ); } @@ -1920,17 +1923,22 @@ LONG WINAPI RegLoadKeyA( HKEY hkey, LPCS UNICODE_STRING subkeyW, filenameW; STRING subkeyA, filenameA; NTSTATUS status; + LONG ret; RtlInitAnsiString(&subkeyA, subkey); RtlInitAnsiString(&filenameA, filename); - if ((status = RtlAnsiStringToUnicodeString(&subkeyW, &subkeyA, TRUE))) - return RtlNtStatusToDosError(status); - - if ((status = RtlAnsiStringToUnicodeString(&filenameW, &filenameA, TRUE))) - return RtlNtStatusToDosError(status); - - return RegLoadKeyW(hkey, subkeyW.Buffer, filenameW.Buffer); + RtlInitUnicodeString(&subkeyW, NULL); + RtlInitUnicodeString(&filenameW, NULL); + if (!(status = RtlAnsiStringToUnicodeString(&subkeyW, &subkeyA, TRUE)) && + !(status = RtlAnsiStringToUnicodeString(&filenameW, &filenameA, TRUE))) + { + ret = RegLoadKeyW(hkey, subkeyW.Buffer, filenameW.Buffer); + } + else ret = RtlNtStatusToDosError(status); + RtlFreeUnicodeString(&subkeyW); + RtlFreeUnicodeString(&filenameW); + return ret; } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e0891ad..54112d2 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -100,6 +100,7 @@ static void test_str_sid(const char *str trace(" %s: %s\n", str_sid, temp); LocalFree(temp); } + LocalFree(psid); } else { @@ -833,6 +834,7 @@ static void test_token_attr(void) pConvertSidToStringSidA(User->User.Sid, &SidString); trace("TokenUser: %s attr: 0x%08x\n", SidString, User->User.Attributes); LocalFree(SidString); + HeapFree(GetProcessHeap(), 0, User); /* privileges */ ret = GetTokenInformation(Token, TokenPrivileges, NULL, 0, &Size); @@ -1044,6 +1046,8 @@ static void test_LookupAccountSid(void) "LookupAccountSidW() Expected dom_size = %u, got %u\n", real_dom_sizeW + 1, dom_sizeW); + FreeSid(pUsersSid); + pCreateWellKnownSid = (fnCreateWellKnownSid)GetProcAddress( hmod, "CreateWellKnownSid" ); if (pCreateWellKnownSid && pConvertSidToStringSidA)

1 0

Mikołaj Zalewski : wineconsole: Make most keys cancel the selection.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: bf42a3414243fbb5dd2b569f53b6809abf8133b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf42a3414243fbb5dd2b569f5… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Oct 19 19:36:30 2006 +0200 wineconsole: Make most keys cancel the selection. --- programs/wineconsole/user.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 0726ea6..7477ce4 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -944,31 +944,31 @@ static void WCUSER_HandleSelectionKey(st PRIVATE(data)->has_selection = FALSE; WCUSER_SetSelection(data, 0); WCUSER_CopySelectionToClipboard(data); - break; + return; case VK_RIGHT: c1 = PRIVATE(data)->selectPt1; c2 = PRIVATE(data)->selectPt2; c1.X++; c2.X++; WCUSER_MoveSelection(data, c1, c2); - break; + return; case VK_LEFT: c1 = PRIVATE(data)->selectPt1; c2 = PRIVATE(data)->selectPt2; c1.X--; c2.X--; WCUSER_MoveSelection(data, c1, c2); - break; + return; case VK_UP: c1 = PRIVATE(data)->selectPt1; c2 = PRIVATE(data)->selectPt2; c1.Y--; c2.Y--; WCUSER_MoveSelection(data, c1, c2); - break; + return; case VK_DOWN: c1 = PRIVATE(data)->selectPt1; c2 = PRIVATE(data)->selectPt2; c1.Y++; c2.Y++; WCUSER_MoveSelection(data, c1, c2); - break; + return; } break; case SHIFT_PRESSED: @@ -979,28 +979,34 @@ static void WCUSER_HandleSelectionKey(st c2 = PRIVATE(data)->selectPt2; c2.X++; WCUSER_MoveSelection(data, c1, c2); - break; + return; case VK_LEFT: c1 = PRIVATE(data)->selectPt1; c2 = PRIVATE(data)->selectPt2; c2.X--; WCUSER_MoveSelection(data, c1, c2); - break; + return; case VK_UP: c1 = PRIVATE(data)->selectPt1; c2 = PRIVATE(data)->selectPt2; c2.Y--; WCUSER_MoveSelection(data, c1, c2); - break; + return; case VK_DOWN: c1 = PRIVATE(data)->selectPt1; c2 = PRIVATE(data)->selectPt2; c2.Y++; WCUSER_MoveSelection(data, c1, c2); - break; + return; } break; } + + if (wParam < VK_SPACE) /* Shift, Alt, Ctrl, Num Lock etc. */ + return; + + WCUSER_SetSelection(data, 0); + PRIVATE(data)->has_selection = FALSE; } /******************************************************************

1 0

Mikołaj Zalewski : wineconsole: Remove spaces from the ends of lines while copying to the clipboard.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: c52238d69bc63f52f14815dc804b846c10265685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52238d69bc63f52f14815dc8… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Oct 19 19:25:08 2006 +0200 wineconsole: Remove spaces from the ends of lines while copying to the clipboard. --- programs/wineconsole/user.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index e1efda2..557ccfc 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -689,8 +689,15 @@ static void WCUSER_CopySelectionToClipbo for (y = 0; y < h; y++, c.Y++) { - ReadConsoleOutputCharacter(data->hConOut, &p[y * w], w - 1, c, NULL); - p[y * w + w - 1] = (y < h - 1) ? '\n' : '\0'; + LPWSTR end; + ReadConsoleOutputCharacter(data->hConOut, p, w - 1, c, NULL); + + /* strip spaces from the end of the line */ + end = p + w - 1; + while (end > p && *(end - 1) == ' ') + end--; + *end = (y < h - 1) ? '\n' : '\0'; + p = end + 1; } GlobalUnlock(hMem); SetClipboardData(CF_UNICODETEXT, hMem);

1 0

Mikołaj Zalewski : wineconsole: Allow making selections with a mouse also when not in the QuickEdit mode.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 4a94d09a3ecca8ebf1aa1e781e0760552a531bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a94d09a3ecca8ebf1aa1e781… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Oct 19 19:35:02 2006 +0200 wineconsole: Allow making selections with a mouse also when not in the QuickEdit mode. --- programs/wineconsole/user.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 557ccfc..0726ea6 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1116,12 +1116,14 @@ static LRESULT CALLBACK WCUSER_Proc(HWND WCUSER_GenerateKeyInputRecord(data, uMsg == WM_SYSKEYDOWN, wParam, lParam, TRUE); break; case WM_LBUTTONDOWN: - if (data->curcfg.quick_edit) + if (data->curcfg.quick_edit || PRIVATE(data)->has_selection) { if (PRIVATE(data)->has_selection) + WCUSER_SetSelection(data, 0); + + if (data->curcfg.quick_edit && PRIVATE(data)->has_selection) { PRIVATE(data)->has_selection = FALSE; - WCUSER_SetSelection(data, 0); } else { @@ -1137,7 +1139,7 @@ static LRESULT CALLBACK WCUSER_Proc(HWND } break; case WM_MOUSEMOVE: - if (data->curcfg.quick_edit) + if (data->curcfg.quick_edit || PRIVATE(data)->has_selection) { if (GetCapture() == PRIVATE(data)->hWnd && PRIVATE(data)->has_selection && (wParam & MK_LBUTTON)) @@ -1151,14 +1153,12 @@ static LRESULT CALLBACK WCUSER_Proc(HWND } break; case WM_LBUTTONUP: - if (data->curcfg.quick_edit) + if (data->curcfg.quick_edit || PRIVATE(data)->has_selection) { - if (GetCapture() == PRIVATE(data)->hWnd && PRIVATE(data)->has_selection && - (wParam& MK_LBUTTON)) + if (GetCapture() == PRIVATE(data)->hWnd && PRIVATE(data)->has_selection) { WCUSER_MoveSelection(data, PRIVATE(data)->selectPt1, WCUSER_GetCell(data, lParam)); ReleaseCapture(); - PRIVATE(data)->has_selection = FALSE; } } else

1 0

Mikołaj Zalewski : wineconsole: Add usage message and more specific error messages.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 9d6761bd0c9d5b0d306cadf85a991fdeef8920b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6761bd0c9d5b0d306cadf85… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Oct 19 19:21:17 2006 +0200 wineconsole: Add usage message and more specific error messages. --- programs/wineconsole/wineconsole.c | 58 +++++++++++++++++++++++++++----- programs/wineconsole/wineconsole_En.rc | 14 ++++++++ programs/wineconsole/wineconsole_Pl.rc | 14 ++++++++ programs/wineconsole/wineconsole_res.h | 11 ++++++ 4 files changed, 88 insertions(+), 9 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index edf0fa8..434bac5 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -22,9 +22,11 @@ #include "config.h" #include "wine/port.h" #include <stdio.h> +#include <stdarg.h> #include "wine/server.h" #include "winecon_private.h" #include "winnls.h" +#include "winuser.h" #include "wine/debug.h" @@ -36,6 +38,27 @@ void WINECON_Fatal(const char* msg) ExitProcess(0); } +static void printf_res(UINT uResId, ...) +{ + WCHAR buffer[1024]; + CHAR ansi[1024]; + va_list args; + + va_start(args, uResId); + LoadStringW(GetModuleHandle(NULL), uResId, buffer, sizeof(buffer)/sizeof(WCHAR)); + WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, ansi, sizeof(ansi), NULL, NULL); + vprintf(ansi, args); + va_end(args); +} + +static void WINECON_Usage() +{ + printf_res(IDS_USAGE_HEADER); + printf_res(IDS_USAGE_BACKEND); + printf_res(IDS_USAGE_COMMAND); + printf_res(IDS_USAGE_FOOTER); +} + /****************************************************************** * WINECON_FetchCells * @@ -729,12 +752,16 @@ struct wc_init { HANDLE event; }; +#define WINECON_CMD_SHOW_USAGE 0x10000 + /****************************************************************** * WINECON_ParseOptions * - * + * RETURNS + * On success: 0 + * On error: error string id optionaly with the CMD_SHOW_USAGE flag */ -static BOOL WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci) +static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci) { memset(wci, 0, sizeof(*wci)); wci->ptr = lpCmdLine; @@ -749,7 +776,7 @@ static BOOL WINECON_ParseOptions(const c { char* end; wci->event = (HANDLE)strtol(wci->ptr + 12, &end, 10); - if (end == wci->ptr + 12) return FALSE; + if (end == wci->ptr + 12) return IDS_CMD_INVALID_EVENT_ID; wci->mode = from_event; wci->ptr = end; wci->backend = WCUSER_InitBackend; @@ -766,13 +793,20 @@ static BOOL WINECON_ParseOptions(const c wci->ptr += 16; } else - return FALSE; + return IDS_CMD_INVALID_BACKEND; } else - return FALSE; + return IDS_CMD_INVALID_OPTION|WINECON_CMD_SHOW_USAGE; } - return TRUE; + if (wci->mode == from_event) + return 0; + + while (*wci->ptr == ' ' || *wci->ptr == '\t') wci->ptr++; + if (*wci->ptr == 0) + return IDS_CMD_ABOUT|WINECON_CMD_SHOW_USAGE; + + return 0; } /****************************************************************** @@ -790,9 +824,11 @@ int PASCAL WinMain(HINSTANCE hInst, HINS int ret = 1; struct wc_init wci; - if (!WINECON_ParseOptions(lpCmdLine, &wci)) + if ((ret = WINECON_ParseOptions(lpCmdLine, &wci)) != 0) { - WINE_ERR("Wrong command line options\n"); + printf_res(ret & 0xffff); + if (ret & WINECON_CMD_SHOW_USAGE) + WINECON_Usage(); return 0; } @@ -814,7 +850,11 @@ int PASCAL WinMain(HINSTANCE hInst, HINS return 0; ret = WINECON_Spawn(data, buffer); if (!ret) - WINE_MESSAGE("wineconsole: spawning client program failed (%s), invalid/missing command line arguments ?\n", wine_dbgstr_w(buffer)); + { + WINECON_Delete(data); + printf_res(IDS_CMD_LAUNCH_FAILED, wine_dbgstr_a(wci.ptr)); + return 0; + } } break; default: diff --git a/programs/wineconsole/wineconsole_En.rc b/programs/wineconsole/wineconsole_En.rc index 7ecbf7c..2b159f7 100644 --- a/programs/wineconsole/wineconsole_En.rc +++ b/programs/wineconsole/wineconsole_En.rc @@ -36,6 +36,20 @@ IDS_DLG_TIT_DEFAULT, "Setup - Default IDS_DLG_TIT_CURRENT, "Setup - Current settings" IDS_DLG_TIT_ERROR, "Configuration error" IDS_DLG_ERR_SBWINSIZE, "Screen buffer size must be greater or equal to the window's one" + +IDS_CMD_INVALID_EVENT_ID "wineconsole: Couldn't parse event id\n" +IDS_CMD_INVALID_BACKEND "wineconsole: Invalid backend\n" +IDS_CMD_INVALID_OPTION "wineconsole: Unrecognized command line option\n" +IDS_CMD_ABOUT "Starts a program in a Wine console\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: Starting program %s failed.\n"\ + "The command is invalid.\n" + +IDS_USAGE_HEADER "\nUsage:\n wineconsole [options] <command>\n\nOptions:\n" +IDS_USAGE_BACKEND " --backend={user|ncurses} Choosing user will spawn a new window, ncurses will\n"\ + " try to setup the current terminal as a Wine console\n" +IDS_USAGE_COMMAND " <command> The Wine program to launch in the console\n" +IDS_USAGE_FOOTER "\nExample:\n wineconsole cmd\nStarts the Wine command prompt in a Wine console\n\n" + END IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 diff --git a/programs/wineconsole/wineconsole_Pl.rc b/programs/wineconsole/wineconsole_Pl.rc index 693ee73..2ca4e48 100644 --- a/programs/wineconsole/wineconsole_Pl.rc +++ b/programs/wineconsole/wineconsole_Pl.rc @@ -37,6 +37,20 @@ IDS_DLG_TIT_DEFAULT, "Setup - Domy�ln IDS_DLG_TIT_CURRENT, "Setup - Wybrane ustawienia" IDS_DLG_TIT_ERROR, "B��d konfiguracji" IDS_DLG_ERR_SBWINSIZE, "Wielko�� bufora ekranu musi by� wi�ksza ni� wielko�� bufora okna." + +IDS_CMD_INVALID_EVENT_ID "wineconsole: Z�y format 'event id'\n" +IDS_CMD_INVALID_BACKEND "wineconsole: Niew�a�ciwa warto�� opcji 'backend'\n" +IDS_CMD_INVALID_OPTION "wineconsole: Nieznana opcja na linii polece�\n" +IDS_CMD_ABOUT "Uruchamia program w konsoli Wine\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: Nie uda�o si� uruchomi� programu %s.\n"\ + "Polecenie jest niew�a�ciwe.\n" + +IDS_USAGE_HEADER "\nU�ycie:\n wineconsole [opcje] <polecenie>\n\nOpcje:\n" +IDS_USAGE_BACKEND " --backend={user|ncurses} Wyb�r 'user' spowoduje wy�wietlenie nowego okna, 'ncurses'\n"\ + " spr�buje przerobi� aktualnie u�ywany terminal na konsol� Wine\n" +IDS_USAGE_COMMAND " <command> Program Wine kt�ry nale�y uruchomi�\n" +IDS_USAGE_FOOTER "\nPrzyk�ad:\n wineconsole cmd\nUruchamia wiersz polece� Wine w konsoli Wine\n\n" + END IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 diff --git a/programs/wineconsole/wineconsole_res.h b/programs/wineconsole/wineconsole_res.h index beef81d..b5518fc 100644 --- a/programs/wineconsole/wineconsole_res.h +++ b/programs/wineconsole/wineconsole_res.h @@ -40,6 +40,17 @@ #define IDS_FNT_DISPLAY 0x200 #define IDS_FNT_PREVIEW_1 0x201 #define IDS_FNT_PREVIEW_2 0x202 +#define IDS_CMD_INVALID_EVENT_ID 0x300 +#define IDS_CMD_INVALID_BACKEND 0x301 +#define IDS_CMD_INVALID_OPTION 0x302 +#define IDS_CMD_ABOUT 0x303 +#define IDS_CMD_LAUNCH_FAILED 0x304 + +#define IDS_USAGE_HEADER 0x310 +#define IDS_USAGE_BACKEND 0x311 +#define IDS_USAGE_COMMAND 0x312 +#define IDS_USAGE_FOOTER 0x313 + /* dialog boxes */ #define IDD_OPTION 0x0100 #define IDD_FONT 0x0200

1 0

Mikołaj Zalewski : wineconsole: Change selection on WM_KEYDOWN not WM_KEYUP.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 2750a74f189802bd03c042c423957f455896931d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2750a74f189802bd03c042c42… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Oct 19 19:22:24 2006 +0200 wineconsole: Change selection on WM_KEYDOWN not WM_KEYUP. --- programs/wineconsole/user.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index fffd40f..e1efda2 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -926,7 +926,7 @@ static void WCUSER_HandleSelectionKey(st DWORD state = WCUSER_GetCtrlKeyState(keyState) & ~(CAPSLOCK_ON|NUMLOCK_ON|SCROLLLOCK_ON); COORD c1, c2; - if (down) return; + if (!down) return; switch (state) {

1 0

Alexandre Julliard : wineaudioio.drv: Win64 printf format fixes.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 18aafc27d04d9868b45dd03ba89a16dbe69786cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=18aafc27d04d9868b45dd03ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 12:59:02 2006 +0200 wineaudioio.drv: Win64 printf format fixes. --- dlls/winmm/wineaudioio/Makefile.in | 1 - dlls/winmm/wineaudioio/audio.c | 112 +++++++++++++++++------------------- 2 files changed, 53 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18aafc27d04d9868b45dd…

1 0

Alexandre Julliard : winecoreaudio.drv: Win64 printf format fixes.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 6f4d2f8dc423542e15fc383abd3364afb31bd33d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4d2f8dc423542e15fc383ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 12:36:38 2006 +0200 winecoreaudio.drv: Win64 printf format fixes. --- dlls/winmm/winecoreaudio/Makefile.in | 1 - dlls/winmm/winecoreaudio/audio.c | 38 +++++++++++++++++----------------- dlls/winmm/winecoreaudio/coreaudio.c | 2 +- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/winmm/winecoreaudio/Makefile.in b/dlls/winmm/winecoreaudio/Makefile.in index a8a8948..46dfdd0 100644 --- a/dlls/winmm/winecoreaudio/Makefile.in +++ b/dlls/winmm/winecoreaudio/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = winecoreaudio.drv IMPORTS = winmm user32 kernel32 EXTRALIBS = $(LIBUUID) @COREAUDIO@ -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ audio.c \ diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index e7d2ce1..181e502 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -328,19 +328,19 @@ static DWORD wodSendDriverCallbackMessag static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position, PCMWAVEFORMAT* format) { - TRACE("wType=%04X wBitsPerSample=%u nSamplesPerSec=%lu nChannels=%u nAvgBytesPerSec=%lu\n", + TRACE("wType=%04X wBitsPerSample=%u nSamplesPerSec=%u nChannels=%u nAvgBytesPerSec=%u\n", lpTime->wType, format->wBitsPerSample, format->wf.nSamplesPerSec, format->wf.nChannels, format->wf.nAvgBytesPerSec); - TRACE("Position in bytes=%lu\n", position); + TRACE("Position in bytes=%u\n", position); switch (lpTime->wType) { case TIME_SAMPLES: lpTime->u.sample = position / (format->wBitsPerSample / 8 * format->wf.nChannels); - TRACE("TIME_SAMPLES=%lu\n", lpTime->u.sample); + TRACE("TIME_SAMPLES=%u\n", lpTime->u.sample); break; case TIME_MS: lpTime->u.ms = 1000.0 * position / (format->wBitsPerSample / 8 * format->wf.nChannels * format->wf.nSamplesPerSec); - TRACE("TIME_MS=%lu\n", lpTime->u.ms); + TRACE("TIME_MS=%u\n", lpTime->u.ms); break; case TIME_SMPTE: lpTime->u.smpte.fps = 30; @@ -364,7 +364,7 @@ static DWORD bytes_to_mmtime(LPMMTIME lp /* fall through */ case TIME_BYTES: lpTime->u.cb = position; - TRACE("TIME_BYTES=%lu\n", lpTime->u.cb); + TRACE("TIME_BYTES=%u\n", lpTime->u.cb); break; } return MMSYSERR_NOERROR; @@ -600,7 +600,7 @@ static DWORD wodNotifyClient(WINE_WAVEOU */ static DWORD wodGetDevCaps(WORD wDevID, LPWAVEOUTCAPSW lpCaps, DWORD dwSize) { - TRACE("(%u, %p, %lu);\n", wDevID, lpCaps, dwSize); + TRACE("(%u, %p, %u);\n", wDevID, lpCaps, dwSize); if (lpCaps == NULL) return MMSYSERR_NOTENABLED; @@ -610,7 +610,7 @@ static DWORD wodGetDevCaps(WORD wDevID, return MMSYSERR_BADDEVICEID; } - TRACE("dwSupport=(0x%lx), dwFormats=(0x%lx)\n", WOutDev[wDevID].caps.dwSupport, WOutDev[wDevID].caps.dwFormats); + TRACE("dwSupport=(0x%x), dwFormats=(0x%x)\n", WOutDev[wDevID].caps.dwSupport, WOutDev[wDevID].caps.dwFormats); memcpy(lpCaps, &WOutDev[wDevID].caps, min(dwSize, sizeof(*lpCaps))); return MMSYSERR_NOERROR; } @@ -625,7 +625,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVE DWORD ret; AudioStreamBasicDescription streamFormat; - TRACE("(%u, %p, %08lX);\n", wDevID, lpDesc, dwFlags); + TRACE("(%u, %p, %08x);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { WARN("Invalid Parameter !\n"); @@ -636,7 +636,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVE return MMSYSERR_BADDEVICEID; } - TRACE("Format: tag=%04X nChannels=%d nSamplesPerSec=%ld wBitsPerSample=%d !\n", + TRACE("Format: tag=%04X nChannels=%d nSamplesPerSec=%d wBitsPerSample=%d !\n", lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels, lpDesc->lpFormat->nSamplesPerSec, lpDesc->lpFormat->wBitsPerSample); @@ -645,7 +645,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVE lpDesc->lpFormat->nSamplesPerSec == 0 ) { - WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%ld wBitsPerSample=%d !\n", + WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%d wBitsPerSample=%d !\n", lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels, lpDesc->lpFormat->nSamplesPerSec, lpDesc->lpFormat->wBitsPerSample); return WAVERR_BADFORMAT; @@ -653,7 +653,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVE if (dwFlags & WAVE_FORMAT_QUERY) { - TRACE("Query format: tag=%04X nChannels=%d nSamplesPerSec=%ld !\n", + TRACE("Query format: tag=%04X nChannels=%d nSamplesPerSec=%d !\n", lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels, lpDesc->lpFormat->nSamplesPerSec); return MMSYSERR_NOERROR; @@ -789,7 +789,7 @@ static DWORD wodClose(WORD wDevID) */ static DWORD wodPrepare(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) { - TRACE("(%u, %p, %08lX);\n", wDevID, lpWaveHdr, dwSize); + TRACE("(%u, %p, %08x);\n", wDevID, lpWaveHdr, dwSize); if (wDevID >= MAX_WAVEOUTDRV) { WARN("bad device ID !\n"); @@ -810,7 +810,7 @@ static DWORD wodPrepare(WORD wDevID, LPW */ static DWORD wodUnprepare(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) { - TRACE("(%u, %p, %08lX);\n", wDevID, lpWaveHdr, dwSize); + TRACE("(%u, %p, %08x);\n", wDevID, lpWaveHdr, dwSize); if (wDevID >= MAX_WAVEOUTDRV) { WARN("bad device ID !\n"); @@ -870,7 +870,7 @@ static void wodHelper_BeginWaveHdr(WINE_ fprintf(stderr, "trace:winecoreaudio:wodHelper_BeginWaveHdr Already in a loop. Discarding loop on this header (%p)\n", lpWaveHdr); } else { - fprintf(stderr, "trace:winecoreaudio:wodHelper_BeginWaveHdr Starting loop (%ldx) with %p\n", lpWaveHdr->dwLoops, lpWaveHdr); + fprintf(stderr, "trace:winecoreaudio:wodHelper_BeginWaveHdr Starting loop (%dx) with %p\n", lpWaveHdr->dwLoops, lpWaveHdr); wwo->lpLoopPtr = lpWaveHdr; /* Windows does not touch WAVEHDR.dwLoops, @@ -1050,7 +1050,7 @@ static DWORD wodWrite(WORD wDevID, LPWAV LPWAVEHDR*wh; WINE_WAVEOUT *wwo; - TRACE("(%u, %p, %08lX);\n", wDevID, lpWaveHdr, dwSize); + TRACE("(%u, %p, %08X);\n", wDevID, lpWaveHdr, dwSize); /* first, do the sanity checks... */ if (wDevID >= MAX_WAVEOUTDRV) @@ -1181,7 +1181,7 @@ static DWORD wodGetPosition(WORD wDevID, DWORD val; WINE_WAVEOUT* wwo; - TRACE("(%u, %p, %lu);\n", wDevID, lpTime, uSize); + TRACE("(%u, %p, %u);\n", wDevID, lpTime, uSize); if (wDevID >= MAX_WAVEOUTDRV) { @@ -1245,7 +1245,7 @@ static DWORD wodSetVolume(WORD wDevID, D left = LOWORD(dwParam) / 65535.0f; right = HIWORD(dwParam) / 65535.0f; - TRACE("(%u, %08lX);\n", wDevID, dwParam); + TRACE("(%u, %08x);\n", wDevID, dwParam); pthread_mutex_lock(&WOutDev[wDevID].lock); @@ -1299,7 +1299,7 @@ static DWORD wodDevInterface(UINT wDevID DWORD WINAPI CoreAudio_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) { - TRACE("(%u, %s, %08lX, %08lX, %08lX);\n", + TRACE("(%u, %s, %08x, %08x, %08x);\n", wDevID, getMessage(wMsg), dwUser, dwParam1, dwParam2); switch (wMsg) { @@ -1454,7 +1454,7 @@ #else DWORD WINAPI CoreAudio_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) { - FIXME("(%u, %04X, %08lX, %08lX, %08lX): CoreAudio support not compiled into wine\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + FIXME("(%u, %04X, %08X, %08X, %08X): CoreAudio support not compiled into wine\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); return MMSYSERR_NOTENABLED; } diff --git a/dlls/winmm/winecoreaudio/coreaudio.c b/dlls/winmm/winecoreaudio/coreaudio.c index 1b815f0..6fd21d7 100644 --- a/dlls/winmm/winecoreaudio/coreaudio.c +++ b/dlls/winmm/winecoreaudio/coreaudio.c @@ -70,7 +70,7 @@ static LRESULT CoreAudio_drvOpen(LPSTR s */ static DWORD CoreAudio_drvClose(DWORD dwDevID) { - TRACE("(%08lx)\n", dwDevID); + TRACE("(%08x)\n", dwDevID); return 1; } #endif /* HAVE_COREAUDIO_COREAUDIO_H */

1 0

Alexandre Julliard : gdi32: Renamed the gdi directory to gdi32.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: 7dfc447741d5604d3698d71599f192264208dd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dfc447741d5604d3698d7159… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 12:25:29 2006 +0200 gdi32: Renamed the gdi directory to gdi32. --- Makefile.in | 8 ++++---- configure | 22 +++++++++++----------- configure.ac | 8 ++++---- dlls/.gitignore | 3 +-- dlls/Makefile.in | 19 +++++-------------- dlls/{gdi => gdi32}/Makefile.in | 0 dlls/{gdi => gdi32}/bidi.c | 0 dlls/{gdi => gdi32}/bidi16.c | 0 dlls/{gdi => gdi32}/bitblt.c | 0 dlls/{gdi => gdi32}/bitmap.c | 0 dlls/{gdi => gdi32}/brush.c | 0 dlls/{gdi => gdi32}/clipping.c | 0 dlls/{gdi => gdi32}/dc.c | 0 dlls/{gdi => gdi32}/dib.c | 0 dlls/{gdi => gdi32}/dispdib.c | 0 dlls/{gdi => gdi32}/dispdib.spec | 0 dlls/{gdi => gdi32}/driver.c | 0 dlls/{gdi => gdi32}/enhmetafile.c | 0 dlls/{gdi => gdi32}/enhmfdrv/bitblt.c | 0 dlls/{gdi => gdi32}/enhmfdrv/dc.c | 0 dlls/{gdi => gdi32}/enhmfdrv/enhmetafiledrv.h | 0 dlls/{gdi => gdi32}/enhmfdrv/graphics.c | 0 dlls/{gdi => gdi32}/enhmfdrv/init.c | 0 dlls/{gdi => gdi32}/enhmfdrv/mapping.c | 0 dlls/{gdi => gdi32}/enhmfdrv/objects.c | 0 dlls/{gdi => gdi32}/env.c | 0 dlls/{gdi => gdi32}/font.c | 0 dlls/{gdi => gdi32}/freetype.c | 0 dlls/{gdi => gdi32}/gdi.exe.spec | 0 dlls/{gdi => gdi32}/gdi16.c | 0 dlls/{gdi => gdi32}/gdi32.spec | 0 dlls/{gdi => gdi32}/gdi_main.c | 0 dlls/{gdi => gdi32}/gdi_private.h | 0 dlls/{gdi => gdi32}/gdiobj.c | 0 dlls/{gdi => gdi32}/icm.c | 0 dlls/{gdi => gdi32}/mapping.c | 0 dlls/{gdi => gdi32}/metafile.c | 0 dlls/{gdi => gdi32}/metafile16.c | 0 dlls/{gdi => gdi32}/mfdrv/bitblt.c | 0 dlls/{gdi => gdi32}/mfdrv/dc.c | 0 dlls/{gdi => gdi32}/mfdrv/graphics.c | 0 dlls/{gdi => gdi32}/mfdrv/init.c | 0 dlls/{gdi => gdi32}/mfdrv/mapping.c | 0 dlls/{gdi => gdi32}/mfdrv/metafiledrv.h | 0 dlls/{gdi => gdi32}/mfdrv/objects.c | 0 dlls/{gdi => gdi32}/mfdrv/text.c | 0 dlls/{gdi => gdi32}/opengl.c | 0 dlls/{gdi => gdi32}/painting.c | 0 dlls/{gdi => gdi32}/palette.c | 0 dlls/{gdi => gdi32}/path.c | 0 dlls/{gdi => gdi32}/pen.c | 0 dlls/{gdi => gdi32}/printdrv.c | 0 dlls/{gdi => gdi32}/region.c | 0 dlls/{gdi => gdi32}/tests/Makefile.in | 0 dlls/{gdi => gdi32}/tests/bitmap.c | 0 dlls/{gdi => gdi32}/tests/brush.c | 0 dlls/{gdi => gdi32}/tests/clipping.c | 0 dlls/{gdi => gdi32}/tests/dc.c | 0 dlls/{gdi => gdi32}/tests/font.c | 0 dlls/{gdi => gdi32}/tests/gdiobj.c | 0 dlls/{gdi => gdi32}/tests/generated.c | 0 dlls/{gdi => gdi32}/tests/mapping.c | 0 dlls/{gdi => gdi32}/tests/metafile.c | 0 dlls/{gdi => gdi32}/tests/palette.c | 0 dlls/{gdi => gdi32}/tests/pen.c | 0 dlls/{gdi => gdi32}/version.rc | 0 dlls/{gdi => gdi32}/version16.rc | 0 dlls/{gdi => gdi32}/wing.c | 0 dlls/{gdi => gdi32}/wing.spec | 0 programs/winetest/Makefile.in | 4 ++-- tools/make_makefiles | 2 +- tools/winapi/msvcmaker | 2 +- tools/winapi/tests.dat | 2 +- 73 files changed, 30 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7dfc447741d5604d3698d…

1 0

Alexandre Julliard : Avoid usage of sizeof in traces that causes warnings on MacOSX.
by Alexandre Julliard 20 Oct '06

20 Oct '06

Module: wine Branch: master Commit: b0ea577ae50574e09baa585c9e719810af705575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ea577ae50574e09baa585c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 12:16:45 2006 +0200 Avoid usage of sizeof in traces that causes warnings on MacOSX. --- dlls/dmstyle/style.c | 4 ++-- dlls/imm32/imm.c | 9 +++------ dlls/kernel32/computername.c | 2 +- dlls/ole32/stg_prop.c | 12 ++++++------ dlls/winspool.drv/info.c | 18 +++++++----------- 5 files changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 6bdcd72..0aaaa8c 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -598,7 +598,7 @@ static HRESULT IDirectMusicStyle8Impl_IP IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); TRACE_(dmfile)(" - dwSize: %u\n", dwSize); - TRACE_(dmfile)(" - cnt: %u (%u / %u)\n", cnt / dwSize, (Chunk.dwSize - sizeof(DWORD)), dwSize); + TRACE_(dmfile)(" - cnt: %u (%u / %u)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize); if (cnt % dwSize != 0) { ERR("Invalid Array Size\n"); return E_FAIL; @@ -614,7 +614,7 @@ static HRESULT IDirectMusicStyle8Impl_IP IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); TRACE_(dmfile)(" - dwSize: %u\n", dwSize); - TRACE_(dmfile)(" - cnt: %u (%u / %u)\n", cnt / dwSize, (Chunk.dwSize - sizeof(DWORD)), dwSize); + TRACE_(dmfile)(" - cnt: %u (%u / %u)\n", cnt / dwSize, (DWORD)(Chunk.dwSize - sizeof(DWORD)), dwSize); if (cnt % dwSize != 0) { ERR("Invalid Array Size\n"); return E_FAIL; diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index f975b2c..22cd75c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -520,8 +520,7 @@ LONG WINAPI ImmGetCompositionStringA( } else if (dwIndex == GCS_COMPSTR) { - TRACE("GSC_COMPSTR %p %i\n",data->CompositionString, - data->dwCompStringLength/ sizeof(WCHAR)); + TRACE("GSC_COMPSTR %p %i\n", data->CompositionString, data->dwCompStringLength); buf = HeapAlloc( GetProcessHeap(), 0, data->dwCompStringLength * 3 ); rc = WideCharToMultiByte(CP_ACP, 0,(LPWSTR)data->CompositionString, @@ -533,8 +532,7 @@ LONG WINAPI ImmGetCompositionStringA( } else if (dwIndex == GCS_COMPATTR) { - TRACE("GSC_COMPATTR %p %i\n",data->CompositionString, - data->dwCompStringLength/ sizeof(WCHAR)); + TRACE("GSC_COMPATTR %p %i\n", data->CompositionString, data->dwCompStringLength); rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)data->CompositionString, data->dwCompStringLength/ sizeof(WCHAR), NULL, @@ -549,8 +547,7 @@ LONG WINAPI ImmGetCompositionStringA( } else if (dwIndex == GCS_COMPCLAUSE) { - TRACE("GSC_COMPCLAUSE %p %i\n",data->CompositionString, - data->dwCompStringLength/ sizeof(WCHAR)); + TRACE("GSC_COMPCLAUSE %p %i\n", data->CompositionString, data->dwCompStringLength); rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)data->CompositionString, data->dwCompStringLength/ sizeof(WCHAR), NULL, diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index 737da9d..4683f11 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -276,7 +276,7 @@ void COMPUTERNAME_Init (void) } NtClose( hsubkey ); - TRACE(" ComputerName: %s (%u)\n", debugstr_w ( computer_name ), len / sizeof(WCHAR)); + TRACE(" ComputerName: %s (%u)\n", debugstr_w (computer_name), len); RtlInitUnicodeString( &nameW, ActiveComputerNameW ); if ( ( st = NtCreateKey( &hsubkey, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, NULL ) ) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index ec613b1..039d168 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1603,9 +1603,9 @@ static HRESULT PropertyStorage_WriteDict *sectionOffset += closure.bytesWritten; if (closure.bytesWritten % sizeof(DWORD)) { - TRACE("adding %d bytes of padding\n", sizeof(DWORD) - - closure.bytesWritten % sizeof(DWORD)); - *sectionOffset += sizeof(DWORD) - closure.bytesWritten % sizeof(DWORD); + DWORD padding = sizeof(DWORD) - closure.bytesWritten % sizeof(DWORD); + TRACE("adding %d bytes of padding\n", padding); + *sectionOffset += padding; } end: @@ -1744,9 +1744,9 @@ static HRESULT PropertyStorage_WriteProp *sectionOffset += bytesWritten; if (bytesWritten % sizeof(DWORD)) { - TRACE("adding %d bytes of padding\n", sizeof(DWORD) - - bytesWritten % sizeof(DWORD)); - *sectionOffset += sizeof(DWORD) - bytesWritten % sizeof(DWORD); + DWORD padding = sizeof(DWORD) - bytesWritten % sizeof(DWORD); + TRACE("adding %d bytes of padding\n", padding); + *sectionOffset += padding; } } diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f8374fd..ced6498 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -954,9 +954,8 @@ static monitor_t * monitor_load(LPWSTR n pm->monitorUI = pInitializePrintMonitorUI(); TRACE("%p: MONITORUI from %s,InitializePrintMonitorUI()\n", pm->monitorUI, debugstr_w(driver)); if (pm->monitorUI) { - TRACE( "0x%08x: dwMonitorSize (%d) => %d Functions\n", - pm->monitorUI->dwMonitorUISize, pm->monitorUI->dwMonitorUISize, - (pm->monitorUI->dwMonitorUISize - sizeof(DWORD) ) / sizeof(VOID *)); + TRACE( "0x%08x: dwMonitorSize (%d)\n", + pm->monitorUI->dwMonitorUISize, pm->monitorUI->dwMonitorUISize ); } } @@ -973,9 +972,7 @@ static monitor_t * monitor_load(LPWSTR n } if (pm->monitor) { - TRACE( "0x%08x: dwMonitorSize (%d) => %d Functions\n", - pm->dwMonitorSize, pm->dwMonitorSize, - (pm->dwMonitorSize) / sizeof(VOID *) ); + TRACE( "0x%08x: dwMonitorSize (%d)\n", pm->dwMonitorSize, pm->dwMonitorSize ); } @@ -5078,8 +5075,7 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE h lpValueName = HeapAlloc (hHeap, 0, cbMaxValueNameLen * sizeof (WCHAR)); if (lpValueName == NULL) { - ERR ("Failed to allocate %i bytes from process heap\n", - cbMaxValueNameLen * sizeof (WCHAR)); + ERR ("Failed to allocate %i WCHARs from process heap\n", cbMaxValueNameLen); r = RegCloseKey (hkSubKey); if (r != ERROR_SUCCESS) WARN ("RegCloseKey returned %i\n", r); @@ -5122,9 +5118,9 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE h return ret; } - TRACE ("%s [%i]: name needs %i bytes, data needs %i bytes\n", + TRACE ("%s [%i]: name needs %i WCHARs, data needs %i bytes\n", debugstr_w (lpValueName), dwIndex, - (cbValueNameLen + 1) * sizeof (WCHAR), cbValueLen); + cbValueNameLen + 1, cbValueLen); cbBufSize += (cbValueNameLen + 1) * sizeof (WCHAR); cbBufSize += cbValueLen; @@ -5265,7 +5261,7 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE h if (pKeyNameW == NULL) { ERR ("Failed to allocate %i bytes from process heap\n", - (LONG) len * sizeof (WCHAR)); + (LONG)(len * sizeof (WCHAR))); return ERROR_OUTOFMEMORY; }

1 0