January 2012 - Wine-commits

Stefan Dösinger : wined3d: Relax depth blit requirements.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 038e308a4153b84c101659611bc2da261e965cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=038e308a4153b84c101659611… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 22 16:32:19 2012 +0100 wined3d: Relax depth blit requirements. --- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 63 ++++++++++++++++++++++++++++++++++++++++------ dlls/wined3d/surface.c | 32 ----------------------- 3 files changed, 56 insertions(+), 40 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 9feda66..5886618 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -173,6 +173,7 @@ typedef struct IDirect3DDevice9Impl unsigned int numConvertedDecls, declArraySize; BOOL notreset; + BOOL in_scene; } IDirect3DDevice9Impl; HRESULT device_init(IDirect3DDevice9Impl *device, IDirect3D9Impl *parent, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 631ba5a..39cd740 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1035,22 +1035,67 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetFrontBufferData(IDirect3DDevice9Ex return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_StretchRect(IDirect3DDevice9Ex *iface, IDirect3DSurface9 *pSourceSurface, - const RECT *pSourceRect, IDirect3DSurface9 *pDestSurface, const RECT *pDestRect, D3DTEXTUREFILTERTYPE Filter) +static HRESULT WINAPI IDirect3DDevice9Impl_StretchRect(IDirect3DDevice9Ex *iface, IDirect3DSurface9 *src_surface, + const RECT *src_rect, IDirect3DSurface9 *dst_surface, const RECT *dst_rect, D3DTEXTUREFILTERTYPE filter) { - IDirect3DSurface9Impl *src = unsafe_impl_from_IDirect3DSurface9(pSourceSurface); - IDirect3DSurface9Impl *dst = unsafe_impl_from_IDirect3DSurface9(pDestSurface); - HRESULT hr; + IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DSurface9Impl *src = unsafe_impl_from_IDirect3DSurface9(src_surface); + IDirect3DSurface9Impl *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface); + HRESULT hr = D3DERR_INVALIDCALL; + struct wined3d_resource_desc src_desc, dst_desc; + struct wined3d_resource *wined3d_resource; TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n", - iface, pSourceSurface, pSourceRect, pDestSurface, pDestRect, Filter); + iface, src_surface, src_rect, dst_surface, dst_rect, filter); wined3d_mutex_lock(); - hr = wined3d_surface_blt(dst->wined3d_surface, pDestRect, src->wined3d_surface, pSourceRect, 0, NULL, Filter); + wined3d_resource = wined3d_surface_get_resource(dst->wined3d_surface); + wined3d_resource_get_desc(wined3d_resource, &dst_desc); + + wined3d_resource = wined3d_surface_get_resource(src->wined3d_surface); + wined3d_resource_get_desc(wined3d_resource, &src_desc); + + if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + { + if (This->in_scene) + { + WARN("Rejecting depth / stencil blit while in scene.\n"); + goto done; + } + + if (src_rect) + { + if (src_rect->left || src_rect->top || src_rect->right != src_desc.width + || src_rect->bottom != src_desc.height) + { + WARN("Rejecting depth / stencil blit with invalid source rect %s.\n", + wine_dbgstr_rect(src_rect)); + goto done; + } + } + if (dst_rect) + { + if (dst_rect->left || dst_rect->top || dst_rect->right != dst_desc.width + || dst_rect->bottom != dst_desc.height) + { + WARN("Rejecting depth / stencil blit with invalid destination rect %s.\n", + wine_dbgstr_rect(dst_rect)); + goto done; + } + } + if (src_desc.width != dst_desc.width || src_desc.height != dst_desc.height) + { + WARN("Rejecting depth / stencil blit with mismatched surface sizes.\n"); + goto done; + } + } + + hr = wined3d_surface_blt(dst->wined3d_surface, dst_rect, src->wined3d_surface, src_rect, 0, NULL, filter); if (hr == WINEDDERR_INVALIDRECT) hr = D3DERR_INVALIDCALL; - wined3d_mutex_unlock(); +done: + wined3d_mutex_unlock(); return hr; } @@ -1245,6 +1290,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_BeginScene(IDirect3DDevice9Ex *iface) wined3d_mutex_lock(); hr = wined3d_device_begin_scene(This->wined3d_device); + if (SUCCEEDED(hr)) This->in_scene = TRUE; wined3d_mutex_unlock(); return hr; @@ -1259,6 +1305,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_EndScene(IDirect3DD wined3d_mutex_lock(); hr = wined3d_device_end_scene(This->wined3d_device); + if (SUCCEEDED(hr)) This->in_scene = FALSE; wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 023bf6a..e6b4cd8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1590,44 +1590,12 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC } else { - /* Accessing depth / stencil surfaces is supposed to fail while in - * a scene, except for fills, which seem to work. */ - if (device->inScene) - { - WARN("Rejecting depth / stencil access while in scene.\n"); - return WINED3DERR_INVALIDCALL; - } - if (src_ds_flags != dst_ds_flags) { WARN("Rejecting depth / stencil blit between incompatible formats.\n"); return WINED3DERR_INVALIDCALL; } - if (src_rect.top || src_rect.left - || src_rect.bottom != src_surface->resource.height - || src_rect.right != src_surface->resource.width) - { - WARN("Rejecting depth / stencil blit with invalid source rect %s.\n", - wine_dbgstr_rect(&src_rect)); - return WINED3DERR_INVALIDCALL; - } - - if (dst_rect.top || dst_rect.left - || dst_rect.bottom != dst_surface->resource.height - || dst_rect.right != dst_surface->resource.width) - { - WARN("Rejecting depth / stencil blit with invalid destination rect %s.\n", - wine_dbgstr_rect(&src_rect)); - return WINED3DERR_INVALIDCALL; - } - - if (scale) - { - WARN("Rejecting depth / stencil blit with mismatched surface sizes.\n"); - return WINED3DERR_INVALIDCALL; - } - if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, &src_rect, dst_surface, &dst_rect))) return WINED3D_OK; }

1 0

Alexandre Julliard : winex11: Ignore rectangles with invalid coordinates when converting region data.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: fe7d81dc1b1b27ba782676f60dca0aaef014d781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7d81dc1b1b27ba782676f60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 11:32:26 2012 +0100 winex11: Ignore rectangles with invalid coordinates when converting region data. --- dlls/winex11.drv/graphics.c | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 910dfea..afe2ff1 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -161,13 +161,24 @@ RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) { int j; /* need to start from the end */ + xrect += data->rdh.nCount; for (j = data->rdh.nCount-1; j >= 0; j--) { tmp = rect[j]; - xrect[j].x = max( min( tmp.left, SHRT_MAX), SHRT_MIN); - xrect[j].y = max( min( tmp.top, SHRT_MAX), SHRT_MIN); - xrect[j].width = max( min( tmp.right - xrect[j].x, USHRT_MAX), 0); - xrect[j].height = max( min( tmp.bottom - xrect[j].y, USHRT_MAX), 0); + if (tmp.left > SHRT_MAX) continue; + if (tmp.top > SHRT_MAX) continue; + if (tmp.right < SHRT_MIN) continue; + if (tmp.bottom < SHRT_MIN) continue; + xrect--; + xrect->x = max( min( tmp.left, SHRT_MAX), SHRT_MIN); + xrect->y = max( min( tmp.top, SHRT_MAX), SHRT_MIN); + xrect->width = max( min( tmp.right, SHRT_MAX ) - xrect->x, 0); + xrect->height = max( min( tmp.bottom, SHRT_MAX ) - xrect->y, 0); + } + if (xrect > (XRectangle *)data->Buffer) + { + data->rdh.nCount -= xrect - (XRectangle *)data->Buffer; + memmove( (XRectangle *)data->Buffer, xrect, data->rdh.nCount * sizeof(*xrect) ); } } else @@ -175,11 +186,17 @@ RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) for (i = 0; i < data->rdh.nCount; i++) { tmp = rect[i]; - xrect[i].x = max( min( tmp.left, SHRT_MAX), SHRT_MIN); - xrect[i].y = max( min( tmp.top, SHRT_MAX), SHRT_MIN); - xrect[i].width = max( min( tmp.right - xrect[i].x, USHRT_MAX), 0); - xrect[i].height = max( min( tmp.bottom - xrect[i].y, USHRT_MAX), 0); + if (tmp.left > SHRT_MAX) continue; + if (tmp.top > SHRT_MAX) continue; + if (tmp.right < SHRT_MIN) continue; + if (tmp.bottom < SHRT_MIN) continue; + xrect->x = max( min( tmp.left, SHRT_MAX), SHRT_MIN); + xrect->y = max( min( tmp.top, SHRT_MAX), SHRT_MIN); + xrect->width = max( min( tmp.right, SHRT_MAX ) - xrect->x, 0); + xrect->height = max( min( tmp.bottom, SHRT_MAX ) - xrect->y, 0); + xrect++; } + data->rdh.nCount = xrect - (XRectangle *)data->Buffer; } return data; }

1 0

Francois Gouget : xcopy: Remove a duplicated space.
by Alexandre Julliard 23 Jan '12

23 Jan '12

1 0

Francois Gouget : po: Fix a formatting directive in the Dutch translation.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 224358e63464b2f6d0a236fbab34626c3a741f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=224358e63464b2f6d0a236fba… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 00:39:49 2012 +0100 po: Fix a formatting directive in the Dutch translation. --- po/nl.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/nl.po b/po/nl.po index a9e1e9b..480bc82 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10457,7 +10457,7 @@ msgid "" msgstr "" "%1\n" "Dit bestand bevat Unicode tekens die verloren zullen gaan\n" -"als dit bestand wordt opgeslagen in de %1 codering.\n" +"als dit bestand wordt opgeslagen in de %2 codering.\n" "Klik op Annuleren om deze tekens te behouden, en selecteer\n" "daarna een van de Unicode-opties in de coderingskeuzelijst.\n" "Wilt u doorgaan?"

1 0

Francois Gouget : po: Fix some formatting directives in the Catalan translation.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 9229836f5193a5a13d9b2759e5f4e7f144ded989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9229836f5193a5a13d9b2759e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 00:40:01 2012 +0100 po: Fix some formatting directives in the Catalan translation. --- po/ca.po | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/po/ca.po b/po/ca.po index 3cc3651..da3820b 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1163,7 +1163,7 @@ msgstr "Connecta a %s" #: credui.rc:28 msgid "Connecting to %s" -msgstr "Connectant a $s" +msgstr "Connectant a %s" #: credui.rc:29 msgid "Logon unsuccessful" @@ -7175,6 +7175,7 @@ msgid "Inserts the contents of the clipboard into your document as %s." msgstr "Insereix el contingut del portapapers en el document com %s." #: oledlg.rc:35 +#, fuzzy msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s." @@ -7183,6 +7184,7 @@ msgstr "" "podeu activar mitjançant %s." #: oledlg.rc:36 +#, fuzzy msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s. It will be displayed as an icon." @@ -10033,7 +10035,7 @@ msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"El Nombre de Sèrie del Volum és %04x-%04x\n" +"El Nombre de Sèrie del Volum és %1!04x!-%2!04x!\n" "\n" #: cmd.rc:319 @@ -11578,7 +11580,7 @@ msgstr "El procès amb PID %1!u! s'ha terminat a la força.\n" #: taskkill.rc:36 msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n" -msgstr "El procès \"%1\" amb PID %u s'ha terminat a la força.\n" +msgstr "El procès \"%1\" amb PID %2!u! s'ha terminat a la força.\n" #: taskkill.rc:37 msgid "Error: Could not find process \"%1\".\n" @@ -14142,7 +14144,7 @@ msgstr "Sobreescriure %1? (Yes|No|All)\n" #: xcopy.rc:37 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "La còpia de '%1' a '%2' ha fallat amb r/c %d\n" +msgstr "La còpia de '%1' a '%2' ha fallat amb r/c %3!d!\n" #: xcopy.rc:39 msgid "Failed during reading of '%1'\n"

1 0

Francois Gouget : po: Fix some formatting directives in the Korean translation.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 173d486df2f67cf9aff85ac6dd90ff0b75aac8cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=173d486df2f67cf9aff85ac6d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 00:39:53 2012 +0100 po: Fix some formatting directives in the Korean translation. --- po/ko.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index e6db6e8..591cc71 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4147,7 +4147,7 @@ msgstr "재배치 체인이 %1의 세그맨트 제한 도달\n" #: winerror.mc:801 msgid "Infinite loop in relocation chain in %1\n" -msgstr "% 1에 재배치 체인의 무한 루프\n" +msgstr "%1에 재배치 체인의 무한 루프\n" #: winerror.mc:806 msgid "Environment variable not found\n" @@ -9864,7 +9864,7 @@ msgstr "현재 날짜는 %1임\n" #: cmd.rc:306 msgid "Current Time is %1\n" -msgstr "현재 시간은 %s임\n" +msgstr "현재 시간은 %1임\n" #: cmd.rc:307 msgid "Enter new date: " @@ -10348,7 +10348,7 @@ msgid "" "one of the Unicode options in the Encoding drop down list.\n" "Continue?" msgstr "" -"%s\n" +"%1\n" "유니코드 문자를 포함하고 있는 이 파일은 만약 당신이 %2 인코딩으로\n" "파일을 저장하면 문자의 손실이 있을 것입니다.\n" "이 문자를 보존하려면 취소를 클릭하고, 인코딩 드롭다운목록의 유니코드\n"

1 0

Francois Gouget : po: Fix a formatting directive in the Japanese translation.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 737231d9ddb53a46ba3bab10aeae58f428e0dea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=737231d9ddb53a46ba3bab10a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 00:40:07 2012 +0100 po: Fix a formatting directive in the Japanese translation. --- po/ja.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ja.po b/po/ja.po index daeecd5..c14001a 100644 --- a/po/ja.po +++ b/po/ja.po @@ -14014,7 +14014,7 @@ msgstr "%1 を上書きしますか? (Yes|No|All)\n" #: xcopy.rc:37 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "'%1' から '%2' へのコピーは失敗しました。戻り値 %d\n" +msgstr "'%1' から '%2' へのコピーは失敗しました。戻り値 %3!d!\n" #: xcopy.rc:39 msgid "Failed during reading of '%1'\n"

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 0c870edd05f06eaa995cee5a95718ca3a5f00355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c870edd05f06eaa995cee5a9… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Jan 22 23:06:19 2012 +0900 po: Updated Korean translation. --- po/ko.po | 45 +++++++++++++++++---------------------------- 1 files changed, 17 insertions(+), 28 deletions(-) diff --git a/po/ko.po b/po/ko.po index 591cc71..e306405 100644 --- a/po/ko.po +++ b/po/ko.po @@ -39,9 +39,8 @@ msgstr "" "프로그램을 지우려면 , 추가/삭제 목록에서 선택하십시오.." #: appwiz.rc:64 -#, fuzzy msgid "&Support Information" -msgstr "지원 정보" +msgstr "지원 정보(&S)" #: appwiz.rc:65 regedit.rc:42 regedit.rc:87 msgid "&Modify..." @@ -3462,12 +3461,11 @@ msgstr "루프 바깥에는 'continue'를 사용할 수 없음" #: jscript.rc:40 msgid "Label redefined" -msgstr "" +msgstr "라벨이 정의되지 않음" #: jscript.rc:41 -#, fuzzy msgid "Label not found" -msgstr "파일을 찾을 수 없음" +msgstr "라벨을 찾을 수 없음" #: jscript.rc:42 msgid "Conditional compilation is turned off" @@ -9889,7 +9887,7 @@ msgstr "배치 스크립트 밖의 배치 라벨은 불러올수 없습니다\n" #: cmd.rc:312 xcopy.rc:42 msgctxt "All key" msgid "A" -msgstr "" +msgstr "A" #: cmd.rc:313 msgid "%1, Delete" @@ -12405,7 +12403,7 @@ msgstr "화면 해상도 " #: winecfg.rc:175 msgid "This is a sample text using 10 point Tahoma" -msgstr "" +msgstr "이것은 10 포인트 타호마 글꼴을 사용한 예제 글자입니다" #: winecfg.rc:182 msgid "DLL overrides" @@ -12417,8 +12415,8 @@ msgid "" "(provided by Wine) or native (taken from Windows or provided by the " "application)." msgstr "" -"동적 링크 라이브러리는 개별적으로 내장(Wine에 의해 제공)이나 네이티브(윈도우" -"즈나 프로그램에 의해 제공)으로 지정될수 있습니다." +"동적 링크 라이브러리는 개별적으로 내장(Wine에 의해 제공)이나 네이티브(윈도우즈" +"나 프로그램에 의해 제공)으로 지정될수 있습니다." #: winecfg.rc:185 msgid "&New override for library:" @@ -12930,7 +12928,6 @@ msgid "Command history" msgstr "명령 히스토리" #: wineconsole.rc:73 -#, fuzzy msgid "&Number of recalled commands:" msgstr "다시 부르는 명령의 갯수(&N):" @@ -12955,12 +12952,10 @@ msgid "Buffer zone" msgstr "버퍼 존" #: wineconsole.rc:101 -#, fuzzy msgid "&Width:" msgstr "너비(&W) :" #: wineconsole.rc:104 -#, fuzzy msgid "&Height:" msgstr "높이(&H) :" @@ -12969,12 +12964,10 @@ msgid "Window size" msgstr "창 크기" #: wineconsole.rc:109 -#, fuzzy msgid "W&idth:" msgstr "너비(&I) :" #: wineconsole.rc:112 -#, fuzzy msgid "H&eight:" msgstr "높이(&E) :" @@ -13126,29 +13119,22 @@ msgstr "" "을 끼쳐드린 거에 대하여 유감을 표함니다." #: winedbg.rc:55 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " "Database</a> for tips about running this application." msgstr "" -"이 문제는 프로그램의 문제나 Wine의 결함으로 위해 발생할 수 있습니다. 당신은실" +"이 문제는 프로그램의 문제나 Wine의 결함으로 인해 발생할 수 있습니다. 당신은 실" "행한 프로그램에 대하여 <a href=\"http://appdb.winehq.org\">Application " -"Database</a> 에서 관련 팁을 살펴 볼 수 있습니다.\n" -"\n" -"만약 이 문제가 윈도우에서는 존재하지 않고, 아직 버그로 보고되지 않았으면 , 당" -"신은 <a href=\"http://wiki.winehq.org/Bugs\">파일을 버그로 보고할 수 있습니다" -"</a>." +"Database</a> 에서 관련 팁을 살펴 볼 수 있습니다." #: winedbg.rc:58 -#, fuzzy msgid "Show &Details" -msgstr "자세히(&D)" +msgstr "자세히 보여주기(&D)" #: winedbg.rc:63 -#, fuzzy msgid "Program Error Details" -msgstr "프로그램 에러" +msgstr "자세한 프로그램 에러" #: winedbg.rc:70 msgid "" @@ -13157,6 +13143,10 @@ msgid "" "button, then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" +"만약 이 문제가 윈도우즈에는 존재하지 않고 아직 보고되지 않았다면," +"당신은 \"다른 이름으로 저장\" 버튼을 사용해서 자세한 정보를 파일로 저장해서, " +"<a href=\"http://wiki.winehq.org/Bugs\">버그 보고 파일</a>로 가서" +"보고서에 파일을 같이 올리수 있습니다." #: winedbg.rc:35 msgid "Wine program crash" @@ -13171,13 +13161,12 @@ msgid "(unidentified)" msgstr "(알수 없음)" #: winedbg.rc:40 -#, fuzzy msgid "Saving failed" -msgstr "만들기 실패함\n" +msgstr "저장 실패함" #: winedbg.rc:41 msgid "Loading detailed information, please wait..." -msgstr "" +msgstr "자세한 정보를 불러오는 중입니다, 잠시만 기다리십시오..." #: winefile.rc:26 msgid "&Open\tEnter"

1 0

Eric Pouech : dbghelp: Always ensure that 64bit module functions use real 64bit addresses.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 82d961e382d62c72d610e14ebdf7c2e3ecca5c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d961e382d62c72d610e14eb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 22 13:00:57 2012 +0100 dbghelp: Always ensure that 64bit module functions use real 64bit addresses. --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/module.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 0e2aae7..7f5eb3b 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -535,7 +535,7 @@ extern const WCHAR S_WineLoaderW[] DECLSPEC_HIDDEN; extern const WCHAR S_SlashW[] DECLSPEC_HIDDEN; extern struct module* - module_find_by_addr(const struct process* pcs, unsigned long addr, + module_find_by_addr(const struct process* pcs, DWORD64 addr, enum module_type type) DECLSPEC_HIDDEN; extern struct module* module_find_by_nameW(const struct process* pcs, diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 2a1471f..2436a0f 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -388,7 +388,7 @@ BOOL module_get_debug(struct module_pair* pair) * either the addr where module is loaded, or any address inside the * module */ -struct module* module_find_by_addr(const struct process* pcs, unsigned long addr, +struct module* module_find_by_addr(const struct process* pcs, DWORD64 addr, enum module_type type) { struct module* module; @@ -659,8 +659,8 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam DWORD64 WINAPI SymLoadModule64(HANDLE hProcess, HANDLE hFile, PCSTR ImageName, PCSTR ModuleName, DWORD64 BaseOfDll, DWORD SizeOfDll) { - if (!validate_addr64(BaseOfDll)) return FALSE; - return SymLoadModule(hProcess, hFile, ImageName, ModuleName, (DWORD)BaseOfDll, SizeOfDll); + return SymLoadModuleEx(hProcess, hFile, ImageName, ModuleName, BaseOfDll, SizeOfDll, + NULL, 0); } /****************************************************************** @@ -730,7 +730,7 @@ BOOL WINAPI SymUnloadModule64(HANDLE hProcess, DWORD64 BaseOfDll) pcs = process_find_by_handle(hProcess); if (!pcs) return FALSE; if (!validate_addr64(BaseOfDll)) return FALSE; - module = module_find_by_addr(pcs, (DWORD)BaseOfDll, DMT_UNKNOWN); + module = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); if (!module) return FALSE; return module_remove(pcs, module); }

1 0

Eric Pouech : dbghelp: Fix a couple of bugs in function table interpretation for x86-64 processors .
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: e40430cd16e3a131e67f639dfe5c4c8891fcc761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e40430cd16e3a131e67f639df… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 22 13:00:01 2012 +0100 dbghelp: Fix a couple of bugs in function table interpretation for x86-64 processors. --- dlls/dbghelp/cpu_x86_64.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 95570b6..6288d38 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -433,22 +433,22 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, break; case UWOP_SAVE_NONVOL: /* movq %reg,n(%rsp) */ off = newframe + *(USHORT*)&info->UnwindCode[i+1] * 8; - if (!sw_read_mem(csw, context->Rsp, &value, sizeof(DWORD64))) return FALSE; + if (!sw_read_mem(csw, off, &value, sizeof(DWORD64))) return FALSE; set_int_reg(context, info->UnwindCode[i].OpInfo, value); break; case UWOP_SAVE_NONVOL_FAR: /* movq %reg,nn(%rsp) */ off = newframe + *(DWORD*)&info->UnwindCode[i+1]; - if (!sw_read_mem(csw, context->Rsp, &value, sizeof(DWORD64))) return FALSE; + if (!sw_read_mem(csw, off, &value, sizeof(DWORD64))) return FALSE; set_int_reg(context, info->UnwindCode[i].OpInfo, value); break; case UWOP_SAVE_XMM128: /* movaps %xmmreg,n(%rsp) */ off = newframe + *(USHORT*)&info->UnwindCode[i+1] * 16; - if (!sw_read_mem(csw, context->Rsp, &floatvalue, sizeof(M128A))) return FALSE; + if (!sw_read_mem(csw, off, &floatvalue, sizeof(M128A))) return FALSE; set_float_reg(context, info->UnwindCode[i].OpInfo, floatvalue); break; case UWOP_SAVE_XMM128_FAR: /* movaps %xmmreg,nn(%rsp) */ off = newframe + *(DWORD*)&info->UnwindCode[i+1]; - if (!sw_read_mem(csw, context->Rsp, &floatvalue, sizeof(M128A))) return FALSE; + if (!sw_read_mem(csw, off, &floatvalue, sizeof(M128A))) return FALSE; set_float_reg(context, info->UnwindCode[i].OpInfo, floatvalue); break; case UWOP_PUSH_MACHFRAME:

1 0