November 2010 - Wine-commits

Eryk Wieliczko : msvcrt: Implement _wfindfirst64i32.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 7d50809705d83e55b05e857c7a785bc4e8a3b7d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d50809705d83e55b05e857c7… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Sat Nov 20 14:49:54 2010 +0100 msvcrt: Implement _wfindfirst64i32. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 1 + 5 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a305cb2..c35e42b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1341,7 +1341,7 @@ @ stub _wfindfirst32 @ stub _wfindfirst32i64 @ stub _wfindfirst64 -@ stub _wfindfirst64i32 +@ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 @ stub _wfindnext64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 36f522c..abc7db0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1194,7 +1194,7 @@ @ stub _wfindfirst32 @ stub _wfindfirst32i64 @ stub _wfindfirst64 -@ stub _wfindfirst64i32 +@ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 @ stub _wfindnext64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 33bfb33..2d5cc32 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1181,7 +1181,7 @@ @ stub _wfindfirst32 @ stub _wfindfirst32i64 @ stub _wfindfirst64 -@ stub _wfindfirst64i32 +@ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 @ stub _wfindnext64 diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index f175ac0..415c9eb 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -156,6 +156,26 @@ static void msvcrt_wfttofdi64( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfindd strcpyW(ft->name, fd->cFileName); } +/* INTERNAL: Translate WIN32_FIND_DATAW to wfinddata64i32_t */ +static void msvcrt_wfttofd64i32( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfinddata64i32_t* ft) +{ + DWORD dw; + + if (fd->dwFileAttributes == FILE_ATTRIBUTE_NORMAL) + ft->attrib = 0; + else + ft->attrib = fd->dwFileAttributes; + + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftCreationTime, &dw ); + ft->time_create = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastAccessTime, &dw ); + ft->time_access = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastWriteTime, &dw ); + ft->time_write = dw; + ft->size = fd->nFileSizeLow; + strcpyW(ft->name, fd->cFileName); +} + /********************************************************************* * _chdir (MSVCRT.@) * @@ -370,6 +390,27 @@ MSVCRT_intptr_t CDECL MSVCRT__findfirst64i32(const char * fspec, struct MSVCRT__ } /********************************************************************* + * _wfindfirst64i32 (MSVCRT.@) + * + * Unicode version of _findfirst64i32. + */ +MSVCRT_intptr_t CDECL MSVCRT__wfindfirst64i32(const MSVCRT_wchar_t * fspec, struct MSVCRT__wfinddata64i32_t* ft) +{ + WIN32_FIND_DATAW find_data; + HANDLE hfind; + + hfind = FindFirstFileW(fspec, &find_data); + if (hfind == INVALID_HANDLE_VALUE) + { + msvcrt_set_errno(GetLastError()); + return -1; + } + msvcrt_wfttofd64i32(&find_data,ft); + TRACE(":got handle %p\n",hfind); + return (MSVCRT_intptr_t)hfind; +} + +/********************************************************************* * _wfindfirsti64 (MSVCRT.@) * * Unicode version of _findfirsti64. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e65c152..de3dded 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1114,6 +1114,7 @@ @ cdecl _wfindfirst(wstr ptr) MSVCRT__wfindfirst # stub _wfindfirst64 @ cdecl _wfindfirsti64(wstr ptr) MSVCRT__wfindfirsti64 +@ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 @ cdecl _wfindnext(long ptr) MSVCRT__wfindnext # stub _wfindnext64 @ cdecl _wfindnexti64(long ptr) MSVCRT__wfindnexti64

1 0

Eryk Wieliczko : msvcrt: Implement _wfindnext64i32.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 40874d91d9651a9f70394588e1e3e5a773b2625b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40874d91d9651a9f70394588e… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Sat Nov 20 15:15:00 2010 +0100 msvcrt: Implement _wfindnext64i32. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 19 +++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 1 + 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c35e42b..8e71b31 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1345,7 +1345,7 @@ @ stub _wfindnext32 @ stub _wfindnext32i64 @ stub _wfindnext64 -@ stub _wfindnext64i32 +@ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index abc7db0..5e52a28 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1198,7 +1198,7 @@ @ stub _wfindnext32 @ stub _wfindnext32i64 @ stub _wfindnext64 -@ stub _wfindnext64i32 +@ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2d5cc32..6b2d664 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1185,7 +1185,7 @@ @ stub _wfindnext32 @ stub _wfindnext32i64 @ stub _wfindnext64 -@ stub _wfindnext64i32 +@ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 415c9eb..1e8fd8d 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -557,6 +557,25 @@ int CDECL MSVCRT__wfindnexti64(MSVCRT_intptr_t hand, struct MSVCRT__wfinddatai64 } /********************************************************************* + * _wfindnext64i32 (MSVCRT.@) + * + * Unicode version of _findnext64i32. + */ +int CDECL MSVCRT__wfindnext64i32(MSVCRT_intptr_t hand, struct MSVCRT__wfinddata64i32_t * ft) +{ + WIN32_FIND_DATAW find_data; + + if (!FindNextFileW((HANDLE)hand, &find_data)) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } + + msvcrt_wfttofd64i32(&find_data,ft); + return 0; +} + +/********************************************************************* * _getcwd (MSVCRT.@) * * Get the current working directory. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index de3dded..11d0a49 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1117,6 +1117,7 @@ @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 @ cdecl _wfindnext(long ptr) MSVCRT__wfindnext # stub _wfindnext64 +@ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 @ cdecl _wfindnexti64(long ptr) MSVCRT__wfindnexti64 @ cdecl _wfopen(wstr wstr) MSVCRT__wfopen @ cdecl _wfopen_s(ptr wstr wstr) MSVCRT__wfopen_s

1 0

Vijay Kiran Kamuju : include: Add missing clsids in d3drmobj.h.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 06563403944222fe1b6299566b4e259e41265a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06563403944222fe1b6299566… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Nov 6 14:03:00 2010 -0400 include: Add missing clsids in d3drmobj.h. --- include/d3drmobj.h | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index d0c8367..f272ba5 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -29,9 +29,32 @@ extern "C" { #endif -/***************************************************************************** - * Predeclare the interfaces - */ +/* Direct3DRM object CLSIDs */ + +DEFINE_GUID(CLSID_CDirect3DRMDevice, 0x4fa3568e, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMViewport, 0x4fa3568f, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMFrame, 0x4fa35690, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMMesh, 0x4fa35691, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMMeshBuilder, 0x4fa35692, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMFace, 0x4fa35693, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMLight, 0x4fa35694, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMTexture, 0x4fa35695, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMWrap, 0x4fa35696, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMMaterial, 0x4fa35697, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMAnimation, 0x4fa35698, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMAnimationSet, 0x4fa35699, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMUserVisual, 0x4fa3569a, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMShadow, 0x4fa3569b, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(CLSID_CDirect3DRMViewportInterpolator, 0xde9eaa1, 0x3b84, 0x11d0, 0x9b, 0x6d, 0x0, 0x0, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(CLSID_CDirect3DRMFrameInterpolator, 0xde9eaa2, 0x3b84, 0x11d0, 0x9b, 0x6d, 0x0, 0x0, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(CLSID_CDirect3DRMMeshInterpolator, 0xde9eaa3, 0x3b84, 0x11d0, 0x9b, 0x6d, 0x0, 0x0, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(CLSID_CDirect3DRMLightInterpolator, 0xde9eaa6, 0x3b84, 0x11d0, 0x9b, 0x6d, 0x0, 0x0, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(CLSID_CDirect3DRMMaterialInterpolator, 0xde9eaa7, 0x3b84, 0x11d0, 0x9b, 0x6d, 0x0, 0x0, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(CLSID_CDirect3DRMTextureInterpolator, 0xde9eaa8, 0x3b84, 0x11d0, 0x9b, 0x6d, 0x0, 0x0, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(CLSID_CDirect3DRMProgressiveMesh, 0x4516ec40, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(CLSID_CDirect3DRMClippedVisual, 0x5434e72d, 0x6d66, 0x11d1, 0xbb, 0xb, 0x0, 0x0, 0xf8, 0x75, 0x86, 0x5a); + +/* Direct3DRM object interface GUIDs */ DEFINE_GUID(IID_IDirect3DRMObject, 0xeb16cb00, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); DEFINE_GUID(IID_IDirect3DRMObject2, 0x4516ec7c, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); @@ -78,6 +101,10 @@ DEFINE_GUID(IID_IDirect3DRMProgressiveMesh, 0x4516ec79, 0x8f20, 0x11d0, 0x9b, 0x DEFINE_GUID(IID_IDirect3DRMPicked2Array, 0x4516ec7b, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); DEFINE_GUID(IID_IDirect3DRMClippedVisual, 0x5434e733, 0x6d66, 0x11d1, 0xbb, 0x0b, 0x00, 0x00, 0xf8, 0x75, 0x86, 0x5a); +/***************************************************************************** + * Predeclare the interfaces + */ + typedef struct IDirect3DRMObject *LPDIRECT3DRMOBJECT, **LPLPDIRECT3DRMOBJECT; typedef struct IDirect3DRMObject2 *LPDIRECT3DRMOBJECT2, **LPLPDIRECT3DRMOBJECT2; typedef struct IDirect3DRMDevice *LPDIRECT3DRMDEVICE, **LPLPDIRECT3DRMDEVICE;

1 0

Paul Vriens : comctl32/tests: Fix shell32 test failures on NT4/W2K.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: a9c31ed90e83540f12725d19adc515d23ae51cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c31ed90e83540f12725d19a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Nov 20 17:42:38 2010 +0100 comctl32/tests: Fix shell32 test failures on NT4/W2K. --- dlls/comctl32/tests/propsheet.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index d687003..42cb4c8 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -621,12 +621,12 @@ static const struct message property_sheet_seq[] = { { WM_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/ - { WM_ACTIVATE, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, + /*{ WM_ACTIVATE, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_ACTIVATE, sent|id, 0, 0, RECEIVER_PAGE }, { WM_ACTIVATEAPP, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_ACTIVATEAPP, sent|id, 0, 0, RECEIVER_PAGE }, { WM_DESTROY, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, - { WM_DESTROY, sent|id, 0, 0, RECEIVER_PAGE }, + { WM_DESTROY, sent|id, 0, 0, RECEIVER_PAGE },*/ /*{ WM_NCDESTROY, sent|id, 0, 0, RECEIVER_PAGE }, { WM_NCDESTROY, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/ { 0 } @@ -663,13 +663,6 @@ static LRESULT CALLBACK sheet_callback_messages_proc (HWND hwnd, UINT msg, WPARA { save_message(hwnd, msg, wParam, lParam, RECEIVER_SHEET_WINPROC); - switch (msg) - { - case WM_CTLCOLORSTATIC: - keybd_event(VK_ESCAPE, 0, 0, 0); - break; - } - return CallWindowProc (oldWndProc, hwnd, msg, wParam, lParam); } @@ -719,7 +712,7 @@ static void test_messages(void) memset(&psh, 0, sizeof(psh)); psh.dwSize = sizeof(psh); psh.dwFlags = PSH_NOAPPLYNOW | PSH_WIZARD | PSH_USECALLBACK - /*| PSH_MODELESS */ | PSH_USEICONID; + | PSH_MODELESS | PSH_USEICONID; psh.pszCaption = "test caption"; psh.nPages = 1; psh.hwndParent = GetDesktopWindow();

1 0

Matteo Bruni : d3dx9/tests: Remove a D3DXPlaneNormalize test.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 8c0a8ac514ea27a604f69be507bc5d6278691b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0a8ac514ea27a604f69be50… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sat Nov 20 17:13:15 2010 +0100 d3dx9/tests: Remove a D3DXPlaneNormalize test. --- dlls/d3dx9_36/tests/math.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 6d192f9..e455a96 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -617,10 +617,6 @@ static void D3DXPlaneTest(void) expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; D3DXPlaneNormalize(&gotplane, &nulplane); expect_plane(expectedplane, gotplane); - nulplane.a = 0.0; nulplane.b = 0.0f, nulplane.c = 0.0f; nulplane.d = 4.3f; - expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; - D3DXPlaneNormalize(&gotplane, &nulplane); - expect_plane(expectedplane, gotplane); /*_______________D3DXPlaneTransform____________*/ expectedplane.a = 49.0f; expectedplane.b = -98.0f; expectedplane.c = 55.0f; expectedplane.d = -165.0f;

1 0

Greg Geldorp : winetest: Add "-u" command line option so TestBot can include a URL in the report.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 5d7cc36dd9f3b00b22ea8580548ff46c1493c2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7cc36dd9f3b00b22ea85805… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Nov 21 16:43:18 2010 +0100 winetest: Add "-u" command line option so TestBot can include a URL in the report. --- programs/winetest/main.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 021ec96..883006c 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -49,6 +49,7 @@ struct wine_test char *tag = NULL; char *description = NULL; +char *url = NULL; char *email = NULL; BOOL aborting = FALSE; static struct wine_test *wine_tests; @@ -250,6 +251,8 @@ static void print_version (void) xprintf (" Submitter=%s\n", email ); if (description) xprintf (" Description=%s\n", description ); + if (url) + xprintf (" URL=%s\n", url ); xprintf (" dwMajorVersion=%u\n dwMinorVersion=%u\n" " dwBuildNumber=%u\n PlatformId=%u\n szCSDVersion=%s\n", ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber, @@ -1015,6 +1018,7 @@ usage (void) " -o FILE put report into FILE, do not submit\n" " -s FILE submit FILE, do not run tests\n" " -t TAG include TAG of characters [-.0-9a-zA-Z] in the report\n" +" -u URL include TestBot URL in the report\n" " -x DIR Extract tests to DIR (default: .\\wct) and exit\n"); } @@ -1117,6 +1121,13 @@ int main( int argc, char *argv[] ) exit (2); } break; + case 'u': + if (!(url = argv[++i])) + { + usage(); + exit( 2 ); + } + break; case 'x': report (R_TEXTMODE); if (!(extract = argv[++i]))

1 0

Stefan Leichter : ntoskrnl.exe: Add stub for PoSetPowerState.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: b9e676febd53888f9780ffda7fe65bf19fce180b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e676febd53888f9780ffda7… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Nov 21 16:58:54 2010 +0100 ntoskrnl.exe: Add stub for PoSetPowerState. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 18317e2..d2c0340 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1541,6 +1541,15 @@ VOID WINAPI READ_REGISTER_BUFFER_UCHAR(PUCHAR Register, PUCHAR Buffer, ULONG Cou } /***************************************************** + * PoSetPowerState (NTOSKRNL.EXE.@) + */ +POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT DeviceObject, POWER_STATE_TYPE Type, POWER_STATE State) +{ + FIXME("(%p %u %u) stub\n", DeviceObject, Type, State.DeviceState); + return State; +} + +/***************************************************** * DllMain */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 74c53e9..06976fd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -830,7 +830,7 @@ @ stub PoRequestPowerIrp @ stub PoRequestShutdownEvent @ stub PoSetHiberRange -@ stub PoSetPowerState +@ stdcall PoSetPowerState(ptr long long) @ stub PoSetSystemState @ stub PoShutdownBugCheck @ stub PoStartNextPowerIrp diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 3fa355f..950d93a 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1129,6 +1129,7 @@ MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); +POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT,POWER_STATE_TYPE,POWER_STATE); NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID); #define PsGetCurrentProcess() IoGetCurrentProcess() #define PsGetCurrentThread() ((PETHREAD)KeGetCurrentThread())

1 0

Amine Khaldi : shdocvw: Fix translations.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: ecd2e603e2cb6485ed6f78feaf8aec3e5415188c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd2e603e2cb6485ed6f78fea… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sun Nov 21 19:59:18 2010 +0100 shdocvw: Fix translations. --- dlls/shdocvw/De.rc | 8 ++++---- dlls/shdocvw/En.rc | 8 ++++---- dlls/shdocvw/Es.rc | 8 ++++---- dlls/shdocvw/Fr.rc | 8 ++++---- dlls/shdocvw/He.rc | 8 ++++---- dlls/shdocvw/It.rc | 8 ++++---- dlls/shdocvw/Ko.rc | 8 ++++---- dlls/shdocvw/Lt.rc | 8 ++++---- dlls/shdocvw/Nl.rc | 8 ++++---- dlls/shdocvw/Pl.rc | 8 ++++---- dlls/shdocvw/Pt.rc | 8 ++++---- dlls/shdocvw/Ro.rc | 2 +- dlls/shdocvw/Si.rc | 10 +++++----- dlls/shdocvw/Sr.rc | 16 ++++++++-------- dlls/shdocvw/Sv.rc | 8 ++++---- dlls/shdocvw/Uk.rc | 8 ++++---- 16 files changed, 66 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecd2e603e2cb6485ed6f7…

1 0

Eric Pouech : winedbg: Rename 'info exception' into 'info frame' ( which is somehow closer to what it does).
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 9261ef2d0a5d9fa31aa304c53d73f814900547e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9261ef2d0a5d9fa31aa304c53… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 21 22:19:34 2010 +0100 winedbg: Rename 'info exception' into 'info frame' (which is somehow closer to what it does). --- programs/winedbg/dbg.y | 4 ++-- programs/winedbg/debug.l | 2 +- programs/winedbg/debugger.h | 2 +- programs/winedbg/info.c | 4 ++-- programs/winedbg/winedbg.man.in | 6 ++++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 336f993..3fec9b7 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -287,8 +287,8 @@ info_command: | tINFO '*' tWND expr_rvalue { info_win32_window((HWND)$4, TRUE); } | tINFO tPROCESS { info_win32_processes(); } | tINFO tTHREAD { info_win32_threads(); } - | tINFO tEXCEPTION { info_win32_exceptions(dbg_curr_tid); } - | tINFO tEXCEPTION expr_rvalue { info_win32_exceptions($3); } + | tINFO tFRAME { info_win32_frame_exceptions(dbg_curr_tid); } + | tINFO tFRAME expr_rvalue { info_win32_frame_exceptions($3); } | tINFO tMAPS { info_win32_virtual(dbg_curr_pid); } | tINFO tMAPS expr_rvalue { info_win32_virtual($3); } ; diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 2e87ddb..4348140 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -166,7 +166,7 @@ STRING \"[^\n"]+\" <INITIAL,NOPROCESS>info|inf|in { BEGIN(INFO_CMD); return tINFO; } <INITIAL>up { BEGIN(NOCMD); return tUP; } <INITIAL>down|dow|do { BEGIN(NOCMD); return tDOWN; } -<INITIAL>frame|fram|fra|fr { BEGIN(NOCMD); return tFRAME; } +<INITIAL,INFO_CMD>frame|fram|fra|fr { BEGIN(NOCMD); return tFRAME; } <INITIAL>list|lis|li|l { BEGIN(PATH_ACCEPTED); return tLIST; } <INITIAL>enable|enabl|enab|ena { BEGIN(BD_CMD); return tENABLE;} <INITIAL>disable|disabl|disab|disa|dis { BEGIN(BD_CMD); return tDISABLE; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ae949f2..807a341 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -351,7 +351,7 @@ extern void info_win32_class(HWND hWnd, const char* clsName); extern void info_win32_window(HWND hWnd, BOOL detailed); extern void info_win32_processes(void); extern void info_win32_threads(void); -extern void info_win32_exceptions(DWORD tid); +extern void info_win32_frame_exceptions(DWORD tid); extern void info_win32_virtual(DWORD pid); extern void info_win32_segments(DWORD start, int length); extern void info_wine_dbg_channel(BOOL add, const char* chnl, const char* name); diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index a09af5d..844bcbc 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -543,11 +543,11 @@ void info_win32_threads(void) } /*********************************************************************** - * info_win32_exceptions + * info_win32_frame_exceptions * * Get info on the exception frames of a given thread. */ -void info_win32_exceptions(DWORD tid) +void info_win32_frame_exceptions(DWORD tid) { struct dbg_thread* thread; void* next_frame; diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index fb91d6b..8b26e32 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -366,8 +366,10 @@ Prints information of Window of handle \fBN\fR Lists all w-processes in Wine session .IP \fBinfo\ thread\fR Lists all w-threads in Wine session -.IP \fBinfo\ exception\fR -Lists the exception frames (starting from current stack frame) +.IP \fBinfo\ frame\fR +Lists the exception frames (starting from current stack frame). You +can also pass, as optional argument, a thread id (instead of current +thread) to examine its exception frames. .PP Debug messages can be turned on and off as you are debugging using the \fBset\fR command, but only for channels initialized with the

1 0

Piotr Caban : msvcp90/tests: Fix typo in loaded function name.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: 40894dabb03c22d48902ce01ced8cfa0b3959a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40894dabb03c22d48902ce01c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 20 15:07:22 2010 +0100 msvcp90/tests: Fix typo in loaded function name. --- dlls/msvcp90/tests/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 15e46a4..7a9dabc 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -286,7 +286,7 @@ static BOOL init(void) p_basic_string_char_append = (void*)GetProcAddress(msvcp, "?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@@Z"); p_basic_string_char_append_substr = (void*)GetProcAddress(msvcp, - "?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@_K1(a)Z "); + "?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@_K1(a)Z"); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)XZ");

1 0