wine-commits February 2012

wine-commits@winehq.org

2 participants
442 discussions

Eric Pouech : dbghelp: In traces for Dwarf/CFA engine, some offset are signed entities.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 0905afd0bc8dfa5cca2270c28a60b6d2dd97248a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0905afd0bc8dfa5cca2270c28… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Feb 13 21:41:54 2012 +0100 dbghelp: In traces for Dwarf/CFA engine, some offset are signed entities. --- dlls/dbghelp/dwarf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 9335db7c..3f3d6df 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2851,7 +2851,7 @@ static void execute_cfa_instructions(dwarf2_traverse_context_t* ctx, ULONG_PTR offset = (op == DW_CFA_def_cfa) ? dwarf2_leb128_as_unsigned(ctx) : dwarf2_leb128_as_signed(ctx) * info->data_align; if (!valid_reg(reg)) break; - TRACE("%lx: DW_CFA_def_cfa %s, %lu\n", + TRACE("%lx: DW_CFA_def_cfa %s, %ld\n", info->ip, dbghelp_current_cpu->fetch_regname(dbghelp_current_cpu->map_dwarf_register(reg)), offset); @@ -2876,7 +2876,7 @@ static void execute_cfa_instructions(dwarf2_traverse_context_t* ctx, { ULONG_PTR offset = (op == DW_CFA_def_cfa_offset) ? dwarf2_leb128_as_unsigned(ctx) : dwarf2_leb128_as_signed(ctx) * info->data_align; - TRACE("%lx: DW_CFA_def_cfa_offset %lu\n", info->ip, offset); + TRACE("%lx: DW_CFA_def_cfa_offset %ld\n", info->ip, offset); info->state.cfa_offset = offset; info->state.cfa_rule = RULE_CFA_OFFSET; break;

1 0

Eric Pouech : dbghelp: In dwarf parser, when looking for FDE/ CIE skip first O-length entries.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 5201415626dba596236f4aa5404de9d1787b0fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5201415626dba596236f4aa54… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Feb 13 21:41:45 2012 +0100 dbghelp: In dwarf parser, when looking for FDE/CIE skip first O-length entries. --- dlls/dbghelp/dwarf.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 6e57346..9335db7c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2632,6 +2632,15 @@ static BOOL dwarf2_get_cie(unsigned long addr, struct module* module, DWORD_PTR const BYTE* start_data = fde_ctx->data; cie_id = in_eh_frame ? 0 : DW_CIE_ID; + /* skip 0-padding at beginning of section (alignment) */ + while (fde_ctx->data + 2 * 4 < fde_ctx->end_data) + { + if (dwarf2_parse_u4(fde_ctx)) + { + fde_ctx->data -= 4; + break; + } + } for (; fde_ctx->data + 2 * 4 < fde_ctx->end_data; fde_ctx->data = ptr_blk) { /* find the FDE for address addr (skip CIE) */ @@ -2659,7 +2668,9 @@ static BOOL dwarf2_get_cie(unsigned long addr, struct module* module, DWORD_PTR cie_ctx->end_data = cie_ptr + 4 + dwarf2_parse_u4(cie_ctx); if (dwarf2_parse_u4(cie_ctx) != cie_id) { - FIXME("wrong CIE pointer\n"); + FIXME("wrong CIE pointer at %x from FDE %x\n", + (unsigned)(cie_ptr - start_data), + (unsigned)(fde_ctx->data - start_data)); return FALSE; } if (!parse_cie_details(cie_ctx, info)) return FALSE;

1 0

Eric Pouech : dbghelp: Correctly initialize module word_size field when only the eh_frame is present (and not compilation unit).
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 611d5e470d79577f6c2c6f255a12b289b03b7d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=611d5e470d79577f6c2c6f255… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Feb 13 21:41:39 2012 +0100 dbghelp: Correctly initialize module word_size field when only the eh_frame is present (and not compilation unit). --- dlls/dbghelp/dwarf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 2a16650..6e57346 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3366,6 +3366,9 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, dwarf2_modfmt->module->module.SourceIndexed = TRUE; dwarf2_modfmt->module->module.Publics = TRUE; + /* set the word_size for eh_frame parsing */ + dwarf2_modfmt->u.dwarf2_info->word_size = fmap->addr_size / 8; + leave: image_unmap_section(&debug_sect); image_unmap_section(&debug_abbrev_sect);

1 0

Eric Pouech : dbghelp: Store the 32/64 bitness in the image structure.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 8328606141e6278063b93aabc84c2a97e12855c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8328606141e6278063b93aabc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Feb 13 21:41:34 2012 +0100 dbghelp: Store the 32/64 bitness in the image structure. --- dlls/dbghelp/elf_module.c | 1 + dlls/dbghelp/image_private.h | 1 + dlls/dbghelp/pe_module.c | 6 ++++++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e4c6e44..e18c9ef 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -324,6 +324,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* #else if (fmap->u.elf.elfhdr.e_ident[EI_CLASS] != ELFCLASS32) goto done; #endif + fmap->addr_size = fmap->u.elf.elfhdr.e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32; fmap->u.elf.sect = HeapAlloc(GetProcessHeap(), 0, fmap->u.elf.elfhdr.e_shnum * sizeof(fmap->u.elf.sect[0])); if (!fmap->u.elf.sect) goto done; diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 2642f28..2afed79 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -74,6 +74,7 @@ struct image_file_map { enum module_type modtype; + unsigned addr_size; /* either 16 (not used), 32 or 64 */ union { struct elf_file_map diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 79a4d90..f43d971 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -224,6 +224,12 @@ static BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_ty if (!(nthdr = RtlImageNtHeader(mapping))) goto error; memcpy(&fmap->u.pe.ntheader, nthdr, sizeof(fmap->u.pe.ntheader)); + switch (nthdr->OptionalHeader.Magic) + { + case 0x10b: fmap->addr_size = 32; break; + case 0x20b: fmap->addr_size = 64; break; + default: return FALSE; + } section = (IMAGE_SECTION_HEADER*) ((char*)&nthdr->OptionalHeader + nthdr->FileHeader.SizeOfOptionalHeader); fmap->u.pe.sect = HeapAlloc(GetProcessHeap(), 0,

1 0

Alexandre Julliard : gdi32: Don' t clip to the visible rectangle for screen DCs.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: b3ab012a424b953c9a8918aa2c1863d9fc760c0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ab012a424b953c9a8918aa2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 13 22:09:23 2012 +0100 gdi32: Don't clip to the visible rectangle for screen DCs. --- dlls/gdi32/clipping.c | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index bb50bec..ef2dc12 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -32,11 +32,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipping); /* return the DC visible rectangle if not empty */ static inline BOOL get_dc_visrect( DC *dc, RECT *rect ) { + if (dc->header.type != OBJ_MEMDC) return FALSE; rect->left = 0; rect->top = 0; rect->right = dc->vis_rect.right - dc->vis_rect.left; rect->bottom = dc->vis_rect.bottom - dc->vis_rect.top; - return !is_rect_empty( rect ); + return TRUE; } /*********************************************************************** @@ -114,19 +115,16 @@ void update_dc_clipping( DC * dc ) */ static inline void create_default_clip_region( DC * dc ) { - UINT width, height; + RECT rect; - if (dc->header.type == OBJ_MEMDC) - { - width = dc->vis_rect.right - dc->vis_rect.left; - height = dc->vis_rect.bottom - dc->vis_rect.top; - } - else + if (!get_dc_visrect( dc, &rect )) { - width = GetDeviceCaps( dc->hSelf, DESKTOPHORZRES ); - height = GetDeviceCaps( dc->hSelf, DESKTOPVERTRES ); + rect.left = 0; + rect.top = 0; + rect.right = GetDeviceCaps( dc->hSelf, DESKTOPHORZRES ); + rect.bottom = GetDeviceCaps( dc->hSelf, DESKTOPVERTRES ); } - dc->hClipRgn = CreateRectRgn( 0, 0, width, height ); + dc->hClipRgn = CreateRectRgnIndirect( &rect ); } @@ -363,9 +361,9 @@ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) pt.y = y; LPtoDP( hdc, &pt, 1 ); update_dc( dc ); - ret = (get_dc_visrect( dc, &visrect ) && - pt.x >= visrect.left && pt.x < visrect.right && - pt.y >= visrect.top && pt.y < visrect.bottom); + ret = (!get_dc_visrect( dc, &visrect ) || + (pt.x >= visrect.left && pt.x < visrect.right && + pt.y >= visrect.top && pt.y < visrect.bottom)); if (ret && get_dc_region( dc )) ret = PtInRegion( get_dc_region( dc ), pt.x, pt.y ); release_dc_ptr( dc ); return ret; @@ -387,7 +385,7 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) LPtoDP( hdc, (POINT *)&tmpRect, 2 ); update_dc( dc ); - ret = (get_dc_visrect( dc, &visrect ) && intersect_rect( &visrect, &visrect, &tmpRect )); + ret = (!get_dc_visrect( dc, &visrect ) || intersect_rect( &visrect, &visrect, &tmpRect )); if (ret && get_dc_region( dc )) ret = RectInRegion( get_dc_region( dc ), &tmpRect ); release_dc_ptr( dc ); return ret;

1 0

Alexandre Julliard : winex11: Make sure the clip window is created as soon as possible.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: fdef173ce0394c65330e5154b6e43d63a80e2bb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdef173ce0394c65330e5154b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 13 20:52:03 2012 +0100 winex11: Make sure the clip window is created as soon as possible. --- dlls/winex11.drv/window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index fa5022b..30593a9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2016,6 +2016,7 @@ BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) wine_tsx11_lock(); data->clip_window = XCreateWindow( data->display, root_window, 0, 0, 1, 1, 0, 0, InputOnly, visual, CWOverrideRedirect | CWEventMask, &attr ); + XFlush( data->display ); wine_tsx11_unlock(); SetPropA( hwnd, clip_window_prop, (HANDLE)data->clip_window ); }

1 0

André Hentschel : Wine 1.4-rc3 freigegeben
by Jeremy Newman 14 Feb '12

14 Feb '12

Module: website Branch: master Commit: 0421051e1ac17d90b6faca35d96ad78366a8c9f0 URL: http://source.winehq.org/git/website.git/?a=commit;h=0421051e1ac17d90b6faca… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 13 23:37:41 2012 +0100 Wine 1.4-rc3 freigegeben --- news/de/2012021101.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/de/2012021101.xml b/news/de/2012021101.xml new file mode 100644 index 0000000..310129e --- /dev/null +++ b/news/de/2012021101.xml @@ -0,0 +1,12 @@ +<news> +<date>11. Februar 2012</date> +<title>Wine 1.4-rc3 freigegeben</title> +<body> + Die Entwicklungsversion 1.4-rc3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.4-rc3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerbehebungen, da wir uns im Code-Freeze befinden.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc3.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: 2e901886757821b9aa24e3fcfc9e093a8fdc3ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e901886757821b9aa24e3fcf… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Feb 13 22:30:23 2012 +0900 po: Update Korean translation. --- po/ko.po | 36 ++++++++++++++---------------------- 1 files changed, 14 insertions(+), 22 deletions(-) diff --git a/po/ko.po b/po/ko.po index 0da900d..e742a2b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -9532,7 +9532,6 @@ msgstr "" "경우 아무 일도 안 합니다.\n" #: cmd.rc:176 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9551,27 +9550,20 @@ msgid "" "/L Show end-user license.\n" "/? Display this help and exit.\n" msgstr "" -"풀그림을 실행시키거나, 보통 파일 확장자에서 사용되는 풀그림으로 문서 열기\n" +"프로그램을 실행시키거나, 보통 파일 확장자에서 사용되는 프로그램으로 문서 열기\n" "사용법:\n" -"start [옵션] 풀그림이나 파일 이름 [...]\n" +"start [옵션] 프로그램이나 파일 이름 [...]\n" "start [옵션] 문서 파일 이름\n" "\n" "옵션:\n" -"/M[inimized] 풀그림 최소화 상태로 실행.\n" -"/MAX[imized] 풀그림 최대화 상태로 실행.\n" -"/R[estored] 풀그림을 보통상태로 시작시키기 (최소화도 아니고 최대화도 아" -"님).\n" -"/W[ait] 시작된 풀그림이 끝날 때까지 기다림, 끝날 때 종료코드를 '남김.\n" +"/M[inimized] 프로그램을 최소화 상태로 실행.\n" +"/MAX[imized] 프로그램을 최대화 상태로 실행.\n" +"/R[estored] 프로그램을 보통상태로 시작시키기 (최소화도 아니고 최대화도 아님).\n" +"/W[ait] 시작된 풀그림이 끝날 때까지 기다림, 끝날 때 종료코드를 남김.\n" "/Unix 윈도우 탐색기같이 유닉스 파일이름을 사용해서 시작.\n" "/ProgIDOpen 지정한 progID를 사용해서 문서 열기.\n" -"/L 사용자 라이센스 보여줌\n" -"/? \t\t 도움말을 보여주고 끝내기.\n" -"\n" -"start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" -"Start는 보증이 없이 제공됩니다; /L 옵션과 함께 실행시키면 자세한 내용을 볼 " -"수 있습니다.\n" -"이것은 자유 소프트웨어이고, 당신은 특정 조건하에서 재배포를 환영\n" -"합니다; 'start /L'을 실행시키면 자세한 것을 볼 수 있습니다.\n" +"/L 최종 사용자 라이센스 보여줌\n" +"/? 도움말을 보여주고 끝내기.\n" #: cmd.rc:201 msgid "TIME sets or shows the current system time.\n" @@ -9718,7 +9710,6 @@ msgstr "" "호출한 셀로 돌아갑니다.\n" #: cmd.rc:305 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -9764,10 +9755,10 @@ msgstr "" "ATTRIB\t\t도스 파일 속성 보여주거나 바꾸기\n" "CALL\t\tI배치 파일 안에서 다른 파일 불러오기\n" "CD (CHDIR)\t현재 기본 디렉토리 바꾸기\n" -"CHOICE\t\t목록에서 키를 선택할 때까지 기다림\n" -"CLS\t\t콘솔 화면 깨끗하게\n" +"CHOICE\t\t선택가능한 목록에서 키를 선택할 때까지 기다림\n" +"CLS\t\t콘솔 화면 깨끗하게 하기\n" "COPY\t\t파일 복사\n" -"CTTY\t\t입출력 장치 바꾸기\n" +"CTTY\t\t입/출력 장치 바꾸기\n" "DATE\t\t시스템 날짜 보여주거나 바꾸기\n" "DEL (ERASE)\t하나의 파일이나 여러 파일을 지우기\n" "DIR\t\t디렉토리 내용 보여주기\n" @@ -9787,6 +9778,7 @@ msgstr "" "RD (RMDIR)\t하위 디렉토리 지우기\n" "SET\t\t환경 변수 보여주거나 바꾸기\n" "SETLOCAL\t배치 파일에서 환경변수의 지역화 시작을 알려줌\n" +"START\t\t프로그램을 실행시키거나,연결된 프로그램으로 문서 열기\n" "TIME\t\t시스템 날짜 바꾸거나 보여주기\n" "TITLE\t\tCMD 세션의 창 제목 설정\n" "TYPE\t\t텍스트 파일의 내용 보여주기\n" @@ -12295,11 +12287,11 @@ msgstr "실행중" #: taskmgr.rc:325 msgid "Task" -msgstr "태스크" +msgstr "작" #: uninstaller.rc:26 msgid "Wine Application Uninstaller" -msgstr "Wine 어플리케이션 제거하기" +msgstr "Wine 응용프로그램 제거하기" #: uninstaller.rc:27 msgid ""

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: d5a352cc0727a6902dc6c666a5643d6b8ef091f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a352cc0727a6902dc6c666a… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Feb 12 07:43:19 2012 +0100 po: Update Polish translation. --- po/pl.po | 90 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 45 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5a352cc0727a6902dc6c…

1 0

Michael Stefaniuc : po: Halve the number of fuzzy entries in the Romanian translation.
by Alexandre Julliard 13 Feb '12

13 Feb '12

Module: wine Branch: master Commit: ce54ecfe4cbec2343ec484e741c2bce6ac8027e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce54ecfe4cbec2343ec484e74… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Feb 12 23:38:18 2012 +0100 po: Halve the number of fuzzy entries in the Romanian translation. --- po/ro.po | 1127 +++++++++++++++++--------------------------------------------- 1 files changed, 307 insertions(+), 820 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce54ecfe4cbec2343ec48…

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
45
Older →

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 February 2012