January 2012 - Wine-Commits

André Hentschel : comctl32: Test and fix WM_GETTEXTLENGTH for statusbars.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 80d9017e037b580e7736cf984151da3a89005403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d9017e037b580e7736cf984… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 19:33:10 2012 +0100 comctl32: Test and fix WM_GETTEXTLENGTH for statusbars. --- dlls/comctl32/status.c | 2 +- dlls/comctl32/tests/status.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 43b65aa..19d671d 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -1284,7 +1284,7 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) return STATUSBAR_WMGetText (infoPtr, (INT)wParam, (LPWSTR)lParam); case WM_GETTEXTLENGTH: - return STATUSBAR_GetTextLength (infoPtr, 0); + return LOWORD(STATUSBAR_GetTextLength (infoPtr, 0)); case WM_LBUTTONDBLCLK: return STATUSBAR_SendMouseNotify(infoPtr, NM_DBLCLK, msg, wParam, lParam); diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 6e5a3e7..d8b3dbe 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -267,11 +267,11 @@ static void test_status_control(void) /* Divide into parts and set text */ r = SendMessage(hWndStatus, SB_SETPARTS, 3, (LPARAM)nParts); expect(TRUE,r); - r = SendMessage(hWndStatus, SB_SETTEXT, 0, (LPARAM)"First"); + r = SendMessage(hWndStatus, SB_SETTEXT, SBT_POPOUT|0, (LPARAM)"First"); expect(TRUE,r); - r = SendMessage(hWndStatus, SB_SETTEXT, 1, (LPARAM)"Second"); + r = SendMessage(hWndStatus, SB_SETTEXT, SBT_OWNERDRAW|1, (LPARAM)"Second"); expect(TRUE,r); - r = SendMessage(hWndStatus, SB_SETTEXT, 2, (LPARAM)"Third"); + r = SendMessage(hWndStatus, SB_SETTEXT, SBT_NOBORDERS|2, (LPARAM)"Third"); expect(TRUE,r); /* Get RECT Information */ @@ -287,13 +287,21 @@ static void test_status_control(void) r = SendMessage(hWndStatus, SB_GETRECT, 3, (LPARAM)&rc); expect(FALSE,r); /* Get text length and text */ + r = SendMessage(hWndStatus, SB_GETTEXTLENGTH, 0, 0); + expect(5,LOWORD(r)); + expect(SBT_POPOUT,HIWORD(r)); + r = SendMessageW(hWndStatus, WM_GETTEXTLENGTH, 0, 0); + ok(r == 5 || broken(0x02000005 /* NT4 */), "Expected 5, got %d\n", r); + r = SendMessage(hWndStatus, SB_GETTEXTLENGTH, 1, 0); + expect(0,LOWORD(r)); + expect(SBT_OWNERDRAW,HIWORD(r)); r = SendMessage(hWndStatus, SB_GETTEXTLENGTH, 2, 0); expect(5,LOWORD(r)); - expect(0,HIWORD(r)); + expect(SBT_NOBORDERS,HIWORD(r)); r = SendMessage(hWndStatus, SB_GETTEXT, 2, (LPARAM) charArray); ok(strcmp(charArray,"Third") == 0, "Expected Third, got %s\n", charArray); expect(5,LOWORD(r)); - expect(0,HIWORD(r)); + expect(SBT_NOBORDERS,HIWORD(r)); /* Get parts and borders */ r = SendMessage(hWndStatus, SB_GETPARTS, 3, (LPARAM)checkParts);

1 0

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

Jan. 23, 2012

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

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

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

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

Jan. 23, 2012

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

André Hentschel : d3drm/tests: Add more tests.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 8eae13fd4cc28521d157bca8bb120704bc366ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eae13fd4cc28521d157bca8b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 22 18:38:49 2012 +0100 d3drm/tests: Add more tests. --- dlls/d3drm/tests/d3drm.c | 54 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 43 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f021e2c..ff2986b 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -180,31 +180,32 @@ static void test_MeshBuilder3(void) if (FAILED(hr)) { win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr); + IDirect3DRM_Release(pD3DRM); return; } - hr = IDirect3DRM_CreateMeshBuilder(pD3DRM3, &pMeshBuilder3); + hr = IDirect3DRM3_CreateMeshBuilder(pD3DRM3, &pMeshBuilder3); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr); info.lpMemory = data_bad_version; info.dSize = strlen(data_bad_version); - hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr); info.lpMemory = data_no_mesh; info.dSize = strlen(data_no_mesh); - hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr); info.lpMemory = data_ok; info.dSize = strlen(data_ok); - hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); - val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder3); + val = IDirect3DRMMeshBuilder3_GetVertexCount(pMeshBuilder3); ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val); - val = IDirect3DRMMeshBuilder_GetFaceCount(pMeshBuilder3); + val = IDirect3DRMMeshBuilder3_GetFaceCount(pMeshBuilder3); ok(val == 3, "Wrong number of faces %d (must be 3)\n", val); hr = IDirect3DRMMeshBuilder3_GetVertices(pMeshBuilder3, 0, &val1, NULL); @@ -230,9 +231,9 @@ static void test_MeshBuilder3(void) todo_wine ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); todo_wine ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); - IDirect3DRMMeshBuilder_Release(pMeshBuilder3); - - IDirect3DRM_Release(pD3DRM3); + IDirect3DRMMeshBuilder3_Release(pMeshBuilder3); + IDirect3DRM3_Release(pD3DRM3); + IDirect3DRM_Release(pD3DRM); } static void test_Frame(void) @@ -270,10 +271,19 @@ static void test_Frame(void) IDirect3DRMFrameArray_Release(pArray); } - /* Add child to first parent */ hr = IDirect3DRM_CreateFrame(pD3DRM, NULL, &pFrameP1); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + /* [Add/Delete]Child with NULL pointer */ + hr = IDirect3DRMFrame_AddChild(pFrameP1, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 1); + + hr = IDirect3DRMFrame_DeleteChild(pFrameP1, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 1); + + /* Add child to first parent */ pFrameTmp = (void*)0xdeadbeef; hr = IDirect3DRMFrame_GetParent(pFrameP1, &pFrameTmp); todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); @@ -370,9 +380,31 @@ static void test_Frame(void) todo_wine ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); todo_wine ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); + /* Add two children */ + hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); + todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + todo_wine CHECK_REFCOUNT(pFrameC, 2); + + hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameP1); + todo_wine ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + todo_wine CHECK_REFCOUNT(pFrameP1, 3); + + pArray = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP2, &pArray); + todo_wine ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (pArray) + { + count = IDirect3DRMFrameArray_GetSize(pArray); + ok(count == 2, "count = %u\n", count); + IDirect3DRMFrameArray_Release(pArray); + } + + IDirect3DRMMeshBuilder_Release(pFrameP2); + todo_wine CHECK_REFCOUNT(pFrameC, 2); + todo_wine CHECK_REFCOUNT(pFrameP1, 3); + IDirect3DRMMeshBuilder_Release(pFrameC); IDirect3DRMMeshBuilder_Release(pFrameP1); - IDirect3DRMMeshBuilder_Release(pFrameP2); IDirect3DRM_Release(pD3DRM); }

1 0

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

Jan. 23, 2012

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

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

Jan. 23, 2012

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

Nikolay Sivov : msxml3: Replace macro with another enum entry.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: b1480630319c3ae30e8ab59cc79601ff478b5475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1480630319c3ae30e8ab59cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 23 07:28:21 2012 +0300 msxml3: Replace macro with another enum entry. --- dlls/msxml3/element.c | 2 ++ dlls/msxml3/msxml_private.h | 4 ++-- dlls/msxml3/schema.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 2d920cd..e760c84 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -644,6 +644,8 @@ static inline HRESULT variant_from_dt(XDR_DT dt, xmlChar* str, VARIANT* v) return E_OUTOFMEMORY; handled = TRUE; break; + default: + WARN("unknown type %d\n", dt); } if (!handled) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 813584a..6c9edfe 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -124,9 +124,9 @@ typedef enum _XDR_DT { DT_UI4, DT_UI8, DT_URI, - DT_UUID + DT_UUID, + LAST_DT } XDR_DT; -#define DT__N_TYPES (DT_UUID+1) extern HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; extern void release_typelib(void) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index a147105..9de3768 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -391,7 +391,7 @@ static DWORD dt_hash_bstr(OLECHAR const* bstr, int len /* calculated if -1 */) return hval; } -static const xmlChar *const DT_string_table[DT__N_TYPES] = +static const xmlChar *const DT_string_table[LAST_DT] = { DT_bin_base64, DT_bin_hex, @@ -431,7 +431,7 @@ static const xmlChar *const DT_string_table[DT__N_TYPES] = DT_uuid }; -static const WCHAR *const DT_wstring_table[DT__N_TYPES] = +static const WCHAR *const DT_wstring_table[LAST_DT] = { wDT_bin_base64, wDT_bin_hex,

1 0

Christian Costa : dmusic: Fix memory leak in Direct Music object.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: d3fb586024cad4d2f9e7bb3a51346f9e7e1cb7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3fb586024cad4d2f9e7bb3a5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Jan 22 15:10:28 2012 +0100 dmusic: Fix memory leak in Direct Music object. --- dlls/dmusic/dmusic.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 09c63ea..e4678e1 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -56,6 +56,7 @@ static ULONG WINAPI IDirectMusic8Impl_Release (LPDIRECTMUSIC8 iface) { TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); if (!refCount) { + HeapFree(GetProcessHeap(), 0, This->ppPorts); HeapFree(GetProcessHeap(), 0, This); }

1 0

Francois Gouget : po: Mark an incorrect No rwegian Bokmål translation as fuzzy.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: baca3472cdd654caf764d254a1864f143b76d71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=baca3472cdd654caf764d254a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 00:41:40 2012 +0100 po: Mark an incorrect Norwegian Bokmål translation as fuzzy. --- po/sv.po | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/sv.po b/po/sv.po index a8261b2..6eb27e2 100644 --- a/po/sv.po +++ b/po/sv.po @@ -13466,6 +13466,7 @@ msgid "Error while selecting new font." msgstr "Ett fel uppstod när ett nytt teckensnitt valdes." #: winefile.rc:99 +#, fuzzy msgid "Wine File Manager" msgstr "Winefile"

1 0