wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Eric Pouech : winedbg: When printing with default format an integer (in hex ), keep printed value in sync with integer size.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 637b5da94a4d6808acecbeee662c09d504d54af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=637b5da94a4d6808acecbeee6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 26 15:21:11 2010 +0100 winedbg: When printing with default format an integer (in hex), keep printed value in sync with integer size. --- programs/winedbg/memory.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index de7bef9..1c1567b 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -342,18 +342,14 @@ static void dbg_print_longlong(LONGLONG sv, BOOL is_signed) dbg_printf("%s", ptr); } -static void dbg_print_hex(ULONGLONG sv) +static void dbg_print_hex(DWORD size, ULONGLONG sv) { if (!sv) - { dbg_printf("0"); - return; - } - - if (sv >> 32) - dbg_printf("0x%lx%08lx", (unsigned long)(sv >> 32), (unsigned long)sv); + else if (size > 4 && (sv >> 32)) + dbg_printf("0x%x%08x", (DWORD)(sv >> 32), (DWORD)sv); else - dbg_printf("0x%04lx", (unsigned long)sv); + dbg_printf("0x%x", (DWORD)sv); } static void print_typed_basic(const struct dbg_lvalue* lvalue) @@ -385,12 +381,12 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) case btLong: if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return; if (size == 1) goto print_char; - dbg_print_hex(val_int); + dbg_print_hex(size, val_int); break; case btUInt: case btULong: if (!be_cpu->fetch_integer(lvalue, size, FALSE, &val_int)) return; - dbg_print_hex(val_int); + dbg_print_hex(size, val_int); break; case btFloat: if (!be_cpu->fetch_float(lvalue, size, &val_real)) return; @@ -530,18 +526,12 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) { unsigned size; LONGLONG res = types_extract_as_longlong(lvalue, &size); - DWORD hi; WCHAR wch; - /* FIXME: this implies i386 byte ordering */ switch (format) { case 'x': - hi = (ULONG64)res >> 32; - if (size == 8 && hi) - dbg_printf("0x%x%08x", hi, (DWORD)res); - else - dbg_printf("0x%x", (DWORD)res); + dbg_print_hex(size, (ULONGLONG)res); return; case 'd':

1 0

Eric Pouech : winedbg: Don't print extra \n in print_basic.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: dc6b9c2a58c504e8bf54e34dcbe181e0a7137988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc6b9c2a58c504e8bf54e34dc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 26 15:21:05 2010 +0100 winedbg: Don't print extra \n in print_basic. --- programs/winedbg/memory.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 1c8388c..de7bef9 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -546,7 +546,6 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) case 'd': dbg_print_longlong(res, TRUE); - dbg_printf("\n"); return; case 'c': @@ -570,7 +569,6 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) if (lvalue->type.id == dbg_itype_segptr) { dbg_print_longlong(types_extract_as_longlong(lvalue, NULL), TRUE); - dbg_printf("\n"); } else print_typed_basic(lvalue); }

1 0

Eric Pouech : dbghelp: Fix ELF file computation on 64bit systems.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: cf06ef640d11798510c6e497999a219147f60600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf06ef640d11798510c6e4979… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 26 15:20:33 2010 +0100 dbghelp: Fix ELF file computation on 64bit systems. --- dlls/dbghelp/elf_module.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index a0acb8f..b3502ca 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -102,8 +102,8 @@ const char* elf_map_section(struct image_section_map* ism) { struct elf_file_map* fmap = &ism->fmap->u.elf; - unsigned pgsz = getpagesize(); - unsigned ofst, size; + unsigned long pgsz = getpagesize(); + unsigned long ofst, size; assert(ism->fmap->modtype == DMT_ELF); if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.elf.elfhdr.e_shnum || @@ -168,8 +168,8 @@ void elf_unmap_section(struct image_section_map* ism) if (ism->sidx >= 0 && ism->sidx < fmap->elfhdr.e_shnum && fmap->sect[ism->sidx].mapped != IMAGE_NO_MAP) { - unsigned pgsz = getpagesize(); - unsigned ofst, size; + unsigned long pgsz = getpagesize(); + unsigned long ofst, size; ofst = fmap->sect[ism->sidx].shdr.sh_offset & ~(pgsz - 1); size = ((fmap->sect[ism->sidx].shdr.sh_offset + @@ -236,7 +236,7 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) struct stat statbuf; int i; Elf_Phdr phdr; - unsigned tmp, page_mask = getpagesize() - 1; + unsigned long tmp, page_mask = getpagesize() - 1; char* filename; unsigned len; BOOL ret = FALSE;

1 0

Marcus Meissner : winealsa.drv: Re-add capcontrols initialization.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 4b5641add1d8d2184945a91d2c899164d59f8093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b5641add1d8d2184945a91d2… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Dec 26 14:36:47 2010 +0100 winealsa.drv: Re-add capcontrols initialization. --- dlls/winealsa.drv/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 93c8927..90760eb 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -431,7 +431,7 @@ static void ALSA_MixerInit(void) info = HeapAlloc( GetProcessHeap(), 0, snd_ctl_card_info_sizeof()); for (x = 0; x < MAX_MIXERS; ++x) { - int card, err, capcontrols, total_elems = 0; + int card, err, capcontrols = 0, total_elems = 0; char cardind[6], cardname[10]; snd_ctl_t *ctl;

1 0

Jacek Caban : urlmon: Fixed a race in tests causing unexpected Switch call failures.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 87f0ba49e06719751f00ffed363e157509bb33ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f0ba49e06719751f00ffed3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 25 21:32:11 2010 +0100 urlmon: Fixed a race in tests causing unexpected Switch call failures. --- dlls/urlmon/tests/protocol.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index e463737..dd8cbf9 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -41,7 +41,6 @@ static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); #define CHECK_EXPECT2(func) \ do { \ - trace(#func "\n"); /* temporary debug traces */ \ ok(expect_ ##func, "unexpected call " #func "\n"); \ called_ ## func = TRUE; \ }while(0) @@ -864,12 +863,16 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR else SET_EXPECT(ReportData2); SET_EXPECT(ReportResult); + if(!emulate_prot) + SET_EXPECT(Switch); hres = IInternetProtocol_Read(binding_test ? binding_protocol : async_protocol, expect_pv = buf, sizeof(buf), &read); + ok(hres == E_PENDING || hres == S_FALSE || hres == S_OK, "Read failed: %08x\n", hres); if(hres == S_OK) ok(read, "read == 0\n"); - if(reported_all_data) { + if(reported_all_data) ok(hres == S_FALSE, "Read failed: %08x, expected S_FALSE\n", hres); - } + if(!emulate_prot && hres != E_PENDING) + CHECK_NOT_CALLED(Switch); /* otherwise checked in wait_for_switch loop */ if(emulate_prot) CHECK_CALLED(Read); if(!reported_all_data && called_ReportData2) { @@ -2763,10 +2766,10 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym expect_hrResult = test_abort ? E_ABORT : S_OK; if(direct_read) { + SET_EXPECT(Switch); while(wait_for_switch) { - SET_EXPECT(Switch); WaitForSingleObject(event_continue, INFINITE); - CHECK_CALLED(Switch); + CHECK_CALLED(Switch); /* Set in ReportData */ call_continue(&continue_protdata); SetEvent(event_continue_done); }

1 0

Sven Baars : wininet: Update the Dutch translation.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: a529c4a83555b8b3d554518cdd4298ee7bb2ef2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a529c4a83555b8b3d554518cd… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Dec 25 14:35:19 2010 +0100 wininet: Update the Dutch translation. --- dlls/wininet/wininet_Nl.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Nl.rc b/dlls/wininet/wininet_Nl.rc index 1925c65..31f75cc 100644 --- a/dlls/wininet/wininet_Nl.rc +++ b/dlls/wininet/wininet_Nl.rc @@ -22,6 +22,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + IDD_PROXYDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Netwerkwachtwoord invoeren" @@ -62,7 +64,23 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Annuleren", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_INVCERTDLG DIALOG 3, 24, 250, 86 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Veiligheidswaarschuwing" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Er is een probleem met het certificaat voor deze site.", -1, 40, 6, 200, 20 + LTEXT "", IDC_CERT_ERROR, 40, 26, 200, 20 + LTEXT "Wilt u toch doorgaan?", -1, 40, 46, 200, 20 + PUSHBUTTON "Ja", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Nee", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE { IDS_LANCONNECTION "LAN Verbinding" + IDS_CERT_CA_INVALID "Het certificaat is uitgegeven door een onbekende on onbetrouwbare uitgever." + IDS_CERT_DATE_INVALID "De datum op het certificaat is ongeldig." + IDS_CERT_CN_INVALID "De naam op het certificaat komt niet overeen met de site." + IDS_CERT_ERRORS "Er is tenminste één ongespecificeerd veiligheidsprobleem met dit certificaat." }

1 0

Sven Baars : cmd: Update the Dutch translation.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 4552cda4e8be1a7bf1a08418365cb2f242b6f7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4552cda4e8be1a7bf1a084183… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Dec 25 14:35:12 2010 +0100 cmd: Update the Dutch translation. --- programs/cmd/Nl.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/cmd/Nl.rc b/programs/cmd/Nl.rc index 531a6a5..bf3b3ca 100644 --- a/programs/cmd/Nl.rc +++ b/programs/cmd/Nl.rc @@ -226,6 +226,11 @@ op de stapel werd gezet met PUSHD.\n" WCMD_MORE, "MORE toont de uitvoer van programma's of herleidde invoer\n\ per bladzijde.\n" + WCMD_CHOICE, "CHOICE laat een tekst zien en wacht tot de Gebruiker\n\ +op een toegestane Toets uit een selecteerbare lijst drukt.\n\ +CHOICE wordt hoofdzakelijk gebruikt om een selectie uit een menu te maken\n\ +in een batch bestand.\n" + WCMD_EXIT, "EXIT beëindigt de lopende sessie en keert terug\n\ naar het besturingssysteem of de schil van waaruit cmd werd gestart.\n"

1 0

Sven Baars : cmd: Fix a typo in the English resource.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 03159ff8e265a0d38427bc2b919fb171e36cb191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03159ff8e265a0d38427bc2b9… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Dec 25 14:35:04 2010 +0100 cmd: Fix a typo in the English resource. --- programs/cmd/En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/En.rc b/programs/cmd/En.rc index 87b0780..02a6c24 100644 --- a/programs/cmd/En.rc +++ b/programs/cmd/En.rc @@ -212,7 +212,7 @@ PUSHD.\n" WCMD_MORE, "MORE displays output of files or piped input in pages.\n" WCMD_CHOICE, "CHOICE displays a text and waits, until the User\n\ -press an allowed Key from a selectable list.\n\ +presses an allowed Key from a selectable list.\n\ CHOICE is mainly used to build a menu selection in a batch file.\n" WCMD_EXIT,

1 0

Hwang YunSong : msacm32: Update Korean resource.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 6835fba305f9797add88374008cf2068fe860fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6835fba305f9797add8837400… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Dec 25 16:45:34 2010 +0900 msacm32: Update Korean resource. --- dlls/msacm32/msacm_Ko.rc | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msacm32/msacm_Ko.rc b/dlls/msacm32/msacm_Ko.rc index dad8a47..3a96e9d 100644 --- a/dlls/msacm32/msacm_Ko.rc +++ b/dlls/msacm32/msacm_Ko.rc @@ -1,7 +1,7 @@ /* * Korean resource file for MS ACM * - * Copyright 2005,2007 YunSong Hwang + * Copyright 2005,2007,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,34 +20,36 @@ #include "wineacm.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "사운드 선택" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "�̸�(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP + LTEXT "이름(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 97, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "�ٸ� �̸�� (&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 103, 14, 70, 14 - PUSHBUTTON "��(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "다른 이름 저장(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 103, 14, 70, 14 + PUSHBUTTON "제거(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - LTEXT "��(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "형식(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "�Ӽ�(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "속성(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Ȯ��", IDOK, 48, 80, 40, 14 - PUSHBUTTON "��", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "��(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + DEFPUSHBUTTON "확인", IDOK, 48, 80, 40, 14 + PUSHBUTTON "취소", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "도움말(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END

1 0

Hwang YunSong : mpr: Update Korean resource.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: ebea4cbc38673d4cfe1901c68164920d700d8222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebea4cbc38673d4cfe1901c68… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Dec 25 16:44:07 2010 +0900 mpr: Update Korean resource. --- dlls/mpr/mpr_Ko.rc | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/mpr/mpr_Ko.rc b/dlls/mpr/mpr_Ko.rc index 13bc0b8..43eab87 100644 --- a/dlls/mpr/mpr_Ko.rc +++ b/dlls/mpr/mpr_Ko.rc @@ -2,7 +2,7 @@ * MPR dll resources * * Copyright (C) 2004 Juan Lang - * Copyright 2005,2007 YunSong Hwang + * Copyright 2005,2007.2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,29 +21,31 @@ #include "mprres.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_ENTIRENETWORK "��ü ��Ʈ��ũ" + IDS_ENTIRENETWORK "전체 네트워크" } IDD_PROXYDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "��Ʈ��ũ ��ȣ �Է�" +CAPTION "네트워크 암호 입력" FONT 9, "MS Shell Dlg" { - LTEXT "�� ̸�� ȣ�� Է��Ͻÿ�:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "��Ͻ�", -1, 40, 26, 50, 10 + LTEXT "당신의 사용자이름과 암호를 입력하시오:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "프록시", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "��", -1, 40, 66, 50, 10 - LTEXT "��ȣ", -1, 40, 86, 50, 10 + LTEXT "사용자", -1, 40, 66, 50, 10 + LTEXT "암호", -1, 40, 86, 50, 10 LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "��ȣ ��(&S) (��ȿ� ��)", IDC_SAVEPASSWORD, + CHECKBOX "암호 저장(&S) (보안에 주의)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ȯ��", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "확인", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "취소", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010