wine-commits November 2005

wine-commits@winehq.org

4 participants
575 discussions

wine/programs/explorer explorer.c
by Alexandre Julliard 17 Nov '05

17 Nov '05

ChangeSet ID: 21310 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:06:06 Modified files: programs/explorer: explorer.c Log message: Fixed invalid C syntax. Patch: http://cvs.winehq.org/patch.py?id=21310 Old revision New revision Changes Path 1.1 1.2 +1 -2 wine/programs/explorer/explorer.c Index: wine/programs/explorer/explorer.c diff -u -p wine/programs/explorer/explorer.c:1.1 wine/programs/explorer/explorer.c:1.2 --- wine/programs/explorer/explorer.c:1.1 17 Nov 2005 11: 6: 6 -0000 +++ wine/programs/explorer/explorer.c 17 Nov 2005 11: 6: 6 -0000 @@ -33,8 +33,7 @@ static int CopyPathString(LPWSTR target, CHAR temp_buf[MAX_PATH]; INT i = 0; - while isspace(*source) - source++; + while (isspace(*source)) source++; if (*source == '\"') {

1 0

wine/dlls/kernel profile.c
by Alexandre Julliard 17 Nov '05

17 Nov '05

ChangeSet ID: 21309 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:05:46 Modified files: dlls/kernel : profile.c Log message: Robert Shearman <rob(a)codeweavers.com> The BOM doesn't need a DWORD sized variable, only a WCHAR one. Don't increment the szFile pointer since we removed the BOM earlier and it will cause the first real character of the INI file to be skipped. Patch: http://cvs.winehq.org/patch.py?id=21309 Old revision New revision Changes Path 1.29 1.30 +3 -3 wine/dlls/kernel/profile.c Index: wine/dlls/kernel/profile.c diff -u -p wine/dlls/kernel/profile.c:1.29 wine/dlls/kernel/profile.c:1.30 --- wine/dlls/kernel/profile.c:1.29 17 Nov 2005 11: 5:46 -0000 +++ wine/dlls/kernel/profile.c 17 Nov 2005 11: 5:46 -0000 @@ -132,7 +132,7 @@ static inline void PROFILE_ByteSwapShort static inline void PROFILE_WriteMarker(HANDLE hFile, ENCODING encoding) { DWORD dwBytesWritten; - DWORD bom; + WCHAR bom; switch (encoding) { case ENCODING_ANSI: @@ -373,12 +373,12 @@ static PROFILESECTION *PROFILE_Load(HAND break; case ENCODING_UTF16LE: TRACE("UTF16 Little Endian encoding\n"); - szFile = (WCHAR *)pBuffer + 1; + szFile = (WCHAR *)pBuffer; szEnd = (WCHAR *)((char *)pBuffer + dwFileSize); break; case ENCODING_UTF16BE: TRACE("UTF16 Big Endian encoding\n"); - szFile = (WCHAR *)pBuffer + 1; + szFile = (WCHAR *)pBuffer; szEnd = (WCHAR *)((char *)pBuffer + dwFileSize); PROFILE_ByteSwapShortBuffer(szFile, dwFileSize / sizeof(WCHAR)); break;

1 0

wine/programs/winefile winefile.h winefile.c
by Alexandre Julliard 17 Nov '05

17 Nov '05

ChangeSet ID: 21308 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:05:35 Modified files: programs/winefile: winefile.h winefile.c Log message: Martin Fuchs <martin-fuchs(a)gmx.net> Use command line for initial directory selection. Remove useless hwndParent variable. Patch: http://cvs.winehq.org/patch.py?id=21308 Old revision New revision Changes Path 1.16 1.17 +0 -1 wine/programs/winefile/winefile.h 1.62 1.63 +24 -15 wine/programs/winefile/winefile.c Index: wine/programs/winefile/winefile.h diff -u -p wine/programs/winefile/winefile.h:1.16 wine/programs/winefile/winefile.h:1.17 --- wine/programs/winefile/winefile.h:1.16 17 Nov 2005 11: 5:35 -0000 +++ wine/programs/winefile/winefile.h 17 Nov 2005 11: 5:35 -0000 @@ -113,7 +113,6 @@ typedef struct HANDLE hInstance; HACCEL haccel; ATOM hframeClass; - HWND hwndParent; HWND hMainWnd; HMENU hMenuFrame; Index: wine/programs/winefile/winefile.c diff -u -p wine/programs/winefile/winefile.c:1.62 wine/programs/winefile/winefile.c:1.63 --- wine/programs/winefile/winefile.c:1.62 17 Nov 2005 11: 5:35 -0000 +++ wine/programs/winefile/winefile.c 17 Nov 2005 11: 5:35 -0000 @@ -2143,9 +2143,7 @@ static LRESULT CALLBACK FrameWndProc(HWN break; case WM_DESTROY: - /* don't exit desktop when closing file manager window */ - if (!Globals.hwndParent) - PostQuitMessage(0); + PostQuitMessage(0); break; case WM_INITMENUPOPUP: { @@ -4654,11 +4652,11 @@ static void InitInstance(HINSTANCE hinst } -static void show_frame(HWND hwndParent, int cmdshow) +static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) { static const TCHAR sMDICLIENT[] = {'M','D','I','C','L','I','E','N','T','\0'}; - TCHAR path[MAX_PATH], b1[BUFFER_LEN]; + TCHAR buffer[MAX_PATH], b1[BUFFER_LEN]; ChildWnd* child; HMENU hMenuFrame, hMenuWindow; @@ -4667,8 +4665,6 @@ static void show_frame(HWND hwndParent, if (Globals.hMainWnd) return; - Globals.hwndParent = hwndParent; - hMenuFrame = LoadMenu(Globals.hInstance, MAKEINTRESOURCE(IDM_WINEFILE)); hMenuWindow = GetSubMenu(hMenuFrame, GetMenuItemCount(hMenuFrame)-2); @@ -4723,7 +4719,11 @@ static void show_frame(HWND hwndParent, Globals.hMainWnd, (HMENU)IDW_STATUSBAR, hinstance, 0);*/ /*TODO: read paths and window placements from registry */ - GetCurrentDirectory(MAX_PATH, path); + + if (!path || !*path) { + GetCurrentDirectory(MAX_PATH, buffer); + path = buffer; + } ShowWindow(Globals.hMainWnd, cmdshow); @@ -4797,7 +4797,7 @@ static int find_window_class(LPCTSTR cla #endif -static int winefile_main(HINSTANCE hinstance, HWND hwndParent, int cmdshow) +static int winefile_main(HINSTANCE hinstance, int cmdshow, LPCTSTR path) { MSG msg; @@ -4807,7 +4807,7 @@ static int winefile_main(HINSTANCE hinst /*TODO: read window placement from registry */ cmdshow = SW_MAXIMIZE; - show_frame(hwndParent, cmdshow); + show_frame(0, cmdshow, path); while(GetMessage(&msg, 0, 0, 0)) { if (Globals.hmdiclient && TranslateMDISysAccel(Globals.hmdiclient, &msg)) @@ -4826,17 +4826,26 @@ static int winefile_main(HINSTANCE hinst } -int APIENTRY WinMain(HINSTANCE hinstance, - HINSTANCE previnstance, - LPSTR cmdline, - int cmdshow) +#if defined(UNICODE) && defined(_MSC_VER) +int APIENTRY wWinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPWSTR cmdline, int cmdshow) +#else +int APIENTRY WinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPSTR cmdline, int cmdshow) +#endif { #ifdef _NO_EXTENSIONS if (find_window_class(sWINEFILEFRAME)) return 1; #endif - winefile_main(hinstance, 0, cmdshow); +#if defined(UNICODE) && !defined(_MSC_VER) + { /* convert ANSI cmdline into WCS path string */ + TCHAR buffer[MAX_PATH]; + MultiByteToWideChar(CP_ACP, 0, cmdline, -1, buffer, MAX_PATH); + winefile_main(hinstance, cmdshow, buffer); + } +#else + winefile_main(hinstance, cmdshow, cmdline); +#endif return 0; }

1 0

wine/dlls/wined3d swapchain.c
by Alexandre Julliard 17 Nov '05

17 Nov '05

ChangeSet ID: 21307 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:05:12 Modified files: dlls/wined3d : swapchain.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Clear the z and stencil buffers at the end of the scene, this fixes a problem with the solid node bsp demo from www.codesampler.com as well as a lot of blank screens in some other demos. Patch: http://cvs.winehq.org/patch.py?id=21307 Old revision New revision Changes Path 1.11 1.12 +7 -2 wine/dlls/wined3d/swapchain.c Index: wine/dlls/wined3d/swapchain.c diff -u -p wine/dlls/wined3d/swapchain.c:1.11 wine/dlls/wined3d/swapchain.c:1.12 --- wine/dlls/wined3d/swapchain.c:1.11 17 Nov 2005 11: 5:12 -0000 +++ wine/dlls/wined3d/swapchain.c 17 Nov 2005 11: 5:12 -0000 @@ -315,10 +315,15 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Pre TRACE("Clearing\n"); - IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, D3DCLEAR_STENCIL|D3DCLEAR_ZBUFFER|D3DCLEAR_TARGET, 0x00, 1.0, 0); + IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, D3DCLEAR_STENCIL|D3DCLEAR_ZBUFFER|D3DCLEAR_TARGET, 0x00, 1.0, 0); + } else { + TRACE("Clearing z/stencil buffer\n"); + + IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, D3DCLEAR_STENCIL|D3DCLEAR_ZBUFFER, 0x00, 1.0, 0); } - TRACE("returning\n"); + + TRACE("returning\n"); return D3D_OK; }

1 0

wine/dlls/msvcrt/tests cpp.c
by Alexandre Julliard 17 Nov '05

17 Nov '05

ChangeSet ID: 21306 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:05:01 Modified files: dlls/msvcrt/tests: cpp.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Provide a sample of the joy of MSC symbol mangling. Patch: http://cvs.winehq.org/patch.py?id=21306 Old revision New revision Changes Path 1.7 1.8 +113 -8 wine/dlls/msvcrt/tests/cpp.c Index: wine/dlls/msvcrt/tests/cpp.c diff -u -p wine/dlls/msvcrt/tests/cpp.c:1.7 wine/dlls/msvcrt/tests/cpp.c:1.8 --- wine/dlls/msvcrt/tests/cpp.c:1.7 17 Nov 2005 11: 5: 1 -0000 +++ wine/dlls/msvcrt/tests/cpp.c 17 Nov 2005 11: 5: 1 -0000 @@ -824,7 +824,7 @@ struct _demangle { BOOL test_in_wine; }; -static void test_demangle(void) +static void test_demangle_datatype(void) { char * name; struct _demangle demangle[]={ @@ -839,17 +839,121 @@ static void test_demangle(void) }; int i, num_test = (sizeof(demangle)/sizeof(struct _demangle)); - for (i=0; i < num_test; i++) { - - name = NULL; - name = p__unDName(0, demangle[i].mangled, 0,pmalloc,pfree,0x2800); - if ( demangle[i].test_in_wine) - ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\"\n", name); + for (i = 0; i < num_test; i++) + { + name = p__unDName(0, demangle[i].mangled, 0, pmalloc, pfree, 0x2800); + if (demangle[i].test_in_wine) + ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); else - todo_wine ok(name != NULL && !strcmp(name,demangle[i].result), "Got name %s\n", name); + todo_wine ok(name != NULL && !strcmp(name,demangle[i].result), "Got name %s for %d\n", name, i); } } +static void test_demangle(void) +{ + static struct {const char* in; const char* out;} test[] = { +{"??0bad_alloc@std@@QAE@ABV01@@Z", "public: __thiscall std::bad_alloc::bad_alloc(class std::bad_alloc const &)"}, +{"??0bad_alloc@std@@QAE@PBD@Z", "public: __thiscall std::bad_alloc::bad_alloc(char const *)"}, +{"??0bad_cast@@AAE@PBQBD@Z", "private: __thiscall bad_cast::bad_cast(char const * const *)"}, +{"??0bad_cast@@QAE@ABQBD@Z", "public: __thiscall bad_cast::bad_cast(char const * const &)"}, +{"??0bad_cast@@QAE@ABV0@@Z", "public: __thiscall bad_cast::bad_cast(class bad_cast const &)"}, +{"??0bad_exception@std@@QAE@ABV01@@Z", "public: __thiscall std::bad_exception::bad_exception(class std::bad_exception const &)"}, +{"??0bad_exception@std@@QAE@PBD@Z", "public: __thiscall std::bad_exception::bad_exception(char const *)"}, +{"??0?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAE@ABV01@@Z", "public: __thiscall std::basic_filebuf<char,struct std::char_traits<char> >::basic_filebuf<char,struct std::char_traits<char> >(class std::basic_filebuf<char,struct std::char_traits<char> > const &)"}, +{"??0?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAE@PAU_iobuf@@@Z", "public: __thiscall std::basic_filebuf<char,struct std::char_traits<char> >::basic_filebuf<char,struct std::char_traits<char> >(struct _iobuf *)"}, +{"??0?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAE@W4_Uninitialized@1@@Z", "public: __thiscall std::basic_filebuf<char,struct std::char_traits<char> >::basic_filebuf<char,struct std::char_traits<char> >(enum std::_Uninitialized)"}, +{"??0?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAE@ABV01@@Z", "public: __thiscall std::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> >::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> >(class std::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> > const &)"}, +{"??0?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAE@PAU_iobuf@@@Z", "public: __thiscall std::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> >::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> >(struct _iobuf *)"}, +{"??0?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAE@W4_Uninitialized@1@@Z", "public: __thiscall std::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> >::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> >(enum std::_Uninitialized)"}, +{"??0?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z", "public: __thiscall std::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >(class std::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> > const &)"}, +{"??0?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@H@Z", "public: __thiscall std::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &,int)"}, +{"??0?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@H@Z", "public: __thiscall std::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >(int)"}, +{"??0?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV01@@Z", "public: __thiscall std::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >(class std::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > const &)"}, +{"??0?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@H@Z", "public: __thiscall std::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >(class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > const &,int)"}, +{"??0?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@H@Z", "public: __thiscall std::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >(int)"}, +{"??0?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QAE@ABV_Locinfo@1@I@Z", "public: __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >(class std::_Locinfo const &,unsigned int)"}, +{"??0?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QAE@I@Z", "public: __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >(unsigned int)"}, +{"??0?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@QAE@ABV_Locinfo@1@I@Z", "public: __thiscall std::num_get<unsigned short,class std::istreambuf_iterator<unsigned short,struct std::char_traits<unsigned short> > >::num_get<unsigned short,class std::istreambuf_iterator<unsigned short,struct std::char_traits<unsigned short> > >(class std::_Locinfo const &,unsigned int)"}, +{"??0?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@QAE@I@Z", "public: __thiscall std::num_get<unsigned short,class std::istreambuf_iterator<unsigned short,struct std::char_traits<unsigned short> > >::num_get<unsigned short,class std::istreambuf_iterator<unsigned short,struct std::char_traits<unsigned short> > >(unsigned int)"}, +{"??0streambuf@@QAE@ABV0@@Z", "public: __thiscall streambuf::streambuf(class streambuf const &)"}, +{"??0strstreambuf@@QAE@ABV0@@Z", "public: __thiscall strstreambuf::strstreambuf(class strstreambuf const &)"}, +{"??0strstreambuf@@QAE@H@Z", "public: __thiscall strstreambuf::strstreambuf(int)"}, +{"??0strstreambuf@@QAE@P6APAXJ@ZP6AXPAX@Z@Z", "public: __thiscall strstreambuf::strstreambuf(void * (__cdecl*)(long),void (__cdecl*)(void *))"}, +{"??0strstreambuf@@QAE@PADH0@Z", "public: __thiscall strstreambuf::strstreambuf(char *,int,char *)"}, +{"??0strstreambuf@@QAE@PAEH0@Z", "public: __thiscall strstreambuf::strstreambuf(unsigned char *,int,unsigned char *)"}, +{"??0strstreambuf@@QAE@XZ", "public: __thiscall strstreambuf::strstreambuf(void)"}, +{"??1__non_rtti_object@std@@UAE@XZ", "public: virtual __thiscall std::__non_rtti_object::~__non_rtti_object(void)"}, +{"??1__non_rtti_object@@UAE@XZ", "public: virtual __thiscall __non_rtti_object::~__non_rtti_object(void)"}, +{"??1?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@UAE@XZ", "public: virtual __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::~num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >(void)"}, +{"??1?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@UAE@XZ", "public: virtual __thiscall std::num_get<unsigned short,class std::istreambuf_iterator<unsigned short,struct std::char_traits<unsigned short> > >::~num_get<unsigned short,class std::istreambuf_iterator<unsigned short,struct std::char_traits<unsigned short> > >(void)"}, +{"??4istream_withassign@@QAEAAV0@ABV0@@Z", "public: class istream_withassign & __thiscall istream_withassign::operator=(class istream_withassign const &)"}, +{"??4istream_withassign@@QAEAAVistream@@ABV1@@Z", "public: class istream & __thiscall istream_withassign::operator=(class istream const &)"}, +{"??4istream_withassign@@QAEAAVistream@@PAVstreambuf@@@Z", "public: class istream & __thiscall istream_withassign::operator=(class streambuf *)"}, +{"??5std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAC@Z", "class std::basic_istream<char,struct std::char_traits<char> > & __cdecl std::operator>>(class std::basic_istream<char,struct std::char_traits<char> > &,signed char &)"}, +{"??5std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAD@Z", "class std::basic_istream<char,struct std::char_traits<char> > & __cdecl std::operator>>(class std::basic_istream<char,struct std::char_traits<char> > &,char &)"}, +{"??5std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAE@Z", "class std::basic_istream<char,struct std::char_traits<char> > & __cdecl std::operator>>(class std::basic_istream<char,struct std::char_traits<char> > &,unsigned char &)"}, +{"??6?$basic_ostream@GU?$char_traits@G@std@@@std@@QAEAAV01@P6AAAVios_base@1@AAV21@@Z@Z", "public: class std::basic_ostream<unsigned short,struct std::char_traits<unsigned short> > & __thiscall std::basic_ostream<unsigned short,struct std::char_traits<unsigned short> >::operator<<(class std::ios_base & (__cdecl*)(class std::ios_base &))"}, +{"??6?$basic_ostream@GU?$char_traits@G@std@@@std@@QAEAAV01@PAV?$basic_streambuf@GU?$char_traits@G@std@@@1@@Z", "public: class std::basic_ostream<unsigned short,struct std::char_traits<unsigned short> > & __thiscall std::basic_ostream<unsigned short,struct std::char_traits<unsigned short> >::operator<<(class std::basic_streambuf<unsigned short,struct std::char_traits<unsigned short> > *)"}, +{"??6?$basic_ostream@GU?$char_traits@G@std@@@std@@QAEAAV01@PBX@Z", "public: class std::basic_ostream<unsigned short,struct std::char_traits<unsigned short> > & __thiscall std::basic_ostream<unsigned short,struct std::char_traits<unsigned short> >::operator<<(void const *)"}, +{"??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@", "const std::basic_fstream<char,struct std::char_traits<char> >::`vbtable'{for `std::basic_ostream<char,struct std::char_traits<char> >'}"}, +{"??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@", "const std::basic_fstream<unsigned short,struct std::char_traits<unsigned short> >::`vbtable'{for `std::basic_istream<unsigned short,struct std::char_traits<unsigned short> >'}"}, +{"??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@", "const std::basic_fstream<unsigned short,struct std::char_traits<unsigned short> >::`vbtable'{for `std::basic_ostream<unsigned short,struct std::char_traits<unsigned short> >'}"}, +{"??9std@@YA_NPBDABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z", "bool __cdecl std::operator!=(char const *,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &)"}, +{"??9std@@YA_NPBGABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z", "bool __cdecl std::operator!=(unsigned short const *,class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > const &)"}, +{"??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAADI@Z", "public: char & __thiscall std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >::operator[](unsigned int)"}, +{"??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEABDI@Z", "public: char const & __thiscall std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >::operator[](unsigned int)const "}, +{"??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAGI@Z", "public: unsigned short & __thiscall std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::operator[](unsigned int)"}, +{"??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEABGI@Z", "public: unsigned short const & __thiscall std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::operator[](unsigned int)const "}, +{"?abs@std@@YAMABV?$complex@M@1@@Z", "float __cdecl std::abs(class std::complex<float> const &)"}, +{"?abs@std@@YANABV?$complex@N@1@@Z", "double __cdecl std::abs(class std::complex<double> const &)"}, +{"?abs@std@@YAOABV?$complex@O@1@@Z", "long double __cdecl std::abs(class std::complex<long double> const &)"}, +{"?cin@std@@3V?$basic_istream@DU?$char_traits@D@std@@@1@A", "class std::basic_istream<char,struct std::char_traits<char> > std::cin"}, +{"?do_get@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHAAG@Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,unsigned short &)const "}, +{"?do_get@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHAAI@Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,unsigned int &)const "}, +{"?do_get@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHAAJ@Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,long &)const "}, +{"?do_get@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHAAK@Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,unsigned long &)const "}, +{"?do_get@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHAAM@Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,float &)const "}, +{"?_query_new_handler@@YAP6AHI@ZXZ", "int (__cdecl*__cdecl _query_new_handler(void))(unsigned int)"}, +{"?register_callback@ios_base@std@@QAEXP6AXW4event@12@AAV12@H@ZH@Z", "public: void __thiscall std::ios_base::register_callback(void (__cdecl*)(enum std::ios_base::event,class std::ios_base &,int),int)"}, +{"?seekg@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@JW4seekdir@ios_base@2@@Z", "public: class std::basic_istream<char,struct std::char_traits<char> > & __thiscall std::basic_istream<char,struct std::char_traits<char> >::seekg(long,enum std::ios_base::seekdir)"}, +{"?seekg@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@V?$fpos@H@2@@Z", "public: class std::basic_istream<char,struct std::char_traits<char> > & __thiscall std::basic_istream<char,struct std::char_traits<char> >::seekg(class std::fpos<int>)"}, +{"?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@JW4seekdir@ios_base@2@@Z", "public: class std::basic_istream<unsigned short,struct std::char_traits<unsigned short> > & __thiscall std::basic_istream<unsigned short,struct std::char_traits<unsigned short> >::seekg(long,enum std::ios_base::seekdir)"}, +{"?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@V?$fpos@H@2@@Z", "public: class std::basic_istream<unsigned short,struct std::char_traits<unsigned short> > & __thiscall std::basic_istream<unsigned short,struct std::char_traits<unsigned short> >::seekg(class std::fpos<int>)"}, +{"?seekoff@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z", "protected: virtual class std::fpos<int> __thiscall std::basic_filebuf<char,struct std::char_traits<char> >::seekoff(long,enum std::ios_base::seekdir,int)"}, +{"?seekoff@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z", "protected: virtual class std::fpos<int> __thiscall std::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> >::seekoff(long,enum std::ios_base::seekdir,int)"}, +{"?set_new_handler@@YAP6AXXZP6AXXZ@Z", "void (__cdecl*__cdecl set_new_handler(void (__cdecl*)(void)))(void)"}, +{"?str@?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z", "public: void __thiscall std::basic_istringstream<char,struct std::char_traits<char>,class std::allocator<char> >::str(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &)"}, +{"?str@?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ", "public: class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > __thiscall std::basic_istringstream<char,struct std::char_traits<char>,class std::allocator<char> >::str(void)const "}, +{"?str@?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@@Z", "public: void __thiscall std::basic_istringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > const &)"}, +{"?str@?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ", "public: class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > __thiscall std::basic_istringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(void)const "}, +{"?str@?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z", "public: void __thiscall std::basic_ostringstream<char,struct std::char_traits<char>,class std::allocator<char> >::str(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &)"}, +{"?str@?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ", "public: class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > __thiscall std::basic_ostringstream<char,struct std::char_traits<char>,class std::allocator<char> >::str(void)const "}, +{"?str@?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@@Z", "public: void __thiscall std::basic_ostringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > const &)"}, +{"?str@?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ", "public: class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > __thiscall std::basic_ostringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(void)const "}, +{"?str@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z", "public: void __thiscall std::basic_stringbuf<char,struct std::char_traits<char>,class std::allocator<char> >::str(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &)"}, +{"?str@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ", "public: class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > __thiscall std::basic_stringbuf<char,struct std::char_traits<char>,class std::allocator<char> >::str(void)const "}, +{"?str@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@@Z", "public: void __thiscall std::basic_stringbuf<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > const &)"}, +{"?str@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ", "public: class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > __thiscall std::basic_stringbuf<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(void)const "}, +{"?str@?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z", "public: void __thiscall std::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >::str(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &)"}, +{"?str@?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ", "public: class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > __thiscall std::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >::str(void)const "}, +{"?str@?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@@Z", "public: void __thiscall std::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > const &)"}, +{"?str@?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ", "public: class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > __thiscall std::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(void)const "}, +{"?_Sync@ios_base@std@@0_NA", "private: static bool std::ios_base::_Sync"}, +{"??_U@YAPAXI@Z", "void * __cdecl operator new[](unsigned int)"}, +{"??_V@YAXPAX@Z", "void __cdecl operator delete[](void *)"}, +{"??X?$_Complex_base@M@std@@QAEAAV01@ABM@Z", "public: class std::_Complex_base<float> & __thiscall std::_Complex_base<float>::operator*=(float const &)"}, +{"??Xstd@@YAAAV?$complex@M@0@AAV10@ABV10@@Z", "class std::complex<float> & __cdecl std::operator*=(class std::complex<float> &,class std::complex<float> const &)"}, + }; + int i, num_test = (sizeof(test)/sizeof(test[0])); + char* name; + + for (i = 0; i < num_test; i++) + { + name = p__unDName(0, test[i].in, 0, pmalloc, pfree, 0); + ok(name != NULL && !strcmp(name, test[i].out), "Got name \"%s\" for %d\n", name, i); + pfree(name); + } +} START_TEST(cpp) { @@ -861,6 +965,7 @@ START_TEST(cpp) test___non_rtti_object(); test_type_info(); test_rtti(); + test_demangle_datatype(); test_demangle(); if (hMsvcrt)

1 0

wine/programs/winedbg symbol.c
by Alexandre Julliard 17 Nov '05

17 Nov '05

ChangeSet ID: 21305 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:04:39 Modified files: programs/winedbg: symbol.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> When a symbol name already contains a module name, we shouldn't search in other modules. Patch: http://cvs.winehq.org/patch.py?id=21305 Old revision New revision Changes Path 1.8 1.9 +24 -5 wine/programs/winedbg/symbol.c Index: wine/programs/winedbg/symbol.c diff -u -p wine/programs/winedbg/symbol.c:1.8 wine/programs/winedbg/symbol.c:1.9 --- wine/programs/winedbg/symbol.c:1.8 17 Nov 2005 11: 4:39 -0000 +++ wine/programs/winedbg/symbol.c 17 Nov 2005 11: 4:39 -0000 @@ -232,9 +232,16 @@ enum sym_get_lval symbol_get_lvalue(cons sgv.bp_disp = bp_disp ? TRUE : FALSE; sgv.do_thunks = DBG_IVAR(AlwaysShowThunks); - buffer[0] = '*'; - buffer[1] = '!'; - strcpy(&buffer[2], name); + if (strchr(name, '!')) + { + strcpy(buffer, name); + } + else + { + buffer[0] = '*'; + buffer[1] = '!'; + strcpy(&buffer[2], name); + } /* this is a wine specific options to return also ELF modules in the * enumeration @@ -248,8 +255,20 @@ enum sym_get_lval symbol_get_lvalue(cons if (!sgv.num && (name[0] != '_')) { - buffer[2] = '_'; - strcpy(&buffer[3], name); + char* ptr = strchr(name, '!'); + + if (ptr++) + { + memmove(ptr + 1, ptr, strlen(ptr)); + *ptr = '_'; + } + else + { + buffer[0] = '*'; + buffer[1] = '!'; + buffer[2] = '_'; + strcpy(&buffer[3], name); + } if (!SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv)) { SymSetOptions(opt);

1 0

wine/programs/winedbg debugger.h debug.l dbg.y
by Alexandre Julliard 17 Nov '05

17 Nov '05

ChangeSet ID: 21304 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:04:27 Modified files: programs/winedbg: debugger.h debug.l dbg.y Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Simplification of lex's input reading. Patch: http://cvs.winehq.org/patch.py?id=21304 Old revision New revision Changes Path 1.31 1.32 +1 -1 wine/programs/winedbg/debugger.h 1.16 1.17 +14 -11 wine/programs/winedbg/debug.l 1.28 1.29 +25 -55 wine/programs/winedbg/dbg.y Index: wine/programs/winedbg/debugger.h diff -u -p wine/programs/winedbg/debugger.h:1.31 wine/programs/winedbg/debugger.h:1.32 --- wine/programs/winedbg/debugger.h:1.31 17 Nov 2005 11: 4:27 -0000 +++ wine/programs/winedbg/debugger.h 17 Nov 2005 11: 4:27 -0000 @@ -268,7 +268,7 @@ extern int break_add_condit extern void parser(const char*); extern void parser_handle(HANDLE); extern int input_read_line(const char* pfx, char* buffer, int size); -extern int input_fetch_entire_line(const char* pfx, char** line, size_t* alloc, BOOL check_nl); +extern int input_fetch_entire_line(const char* pfx, char** line); /* debug.l */ extern void lexeme_flush(void); Index: wine/programs/winedbg/debug.l diff -u -p wine/programs/winedbg/debug.l:1.16 wine/programs/winedbg/debug.l:1.17 --- wine/programs/winedbg/debug.l:1.16 17 Nov 2005 11: 4:27 -0000 +++ wine/programs/winedbg/debug.l 17 Nov 2005 11: 4:27 -0000 @@ -33,24 +33,27 @@ static int read_input(const char* pfx, c { size_t len; static char* last_line = NULL; -static size_t last_line_size = 0; static size_t last_line_idx = 0; - /* first alloc of our current buffer */ - if (!last_line) - { - last_line = HeapAlloc(GetProcessHeap(), 0, last_line_size = 2); - assert(last_line); - last_line[0] = '\n'; - last_line[1] = '\0'; - } - /* try first to fetch the remaining of an existing line */ if (last_line_idx == 0) { + char* tmp = NULL; /* no remaining chars to be read from last line, grab a brand new line up to '\n' */ lexeme_flush(); - input_fetch_entire_line(pfx, &last_line, &last_line_size, TRUE); + len = input_fetch_entire_line(pfx, &tmp); + /* FIXME: should have a pair of buffers, and switch between the two, instead of + * reallocating a new one for each line + */ + if (len == 0 || (len == 1 && tmp[0] == '\n') || (len == 2 && tmp[0] == '\r' && tmp[1] == '\n')) + { + HeapFree(GetProcessHeap(), 0, tmp); + } + else + { + HeapFree(GetProcessHeap(), 0, last_line); + last_line = tmp; + } } len = min(strlen(last_line + last_line_idx), size - 1); Index: wine/programs/winedbg/dbg.y diff -u -p wine/programs/winedbg/dbg.y:1.28 wine/programs/winedbg/dbg.y:1.29 --- wine/programs/winedbg/dbg.y:1.28 17 Nov 2005 11: 4:27 -0000 +++ wine/programs/winedbg/dbg.y 17 Nov 2005 11: 4:27 -0000 @@ -428,70 +428,47 @@ static WINE_EXCEPTION_FILTER(wine_dbg_cm return EXCEPTION_EXECUTE_HANDLER; } -#ifndef whitespace -#define whitespace(c) (((c) == ' ') || ((c) == '\t')) -#endif - -/* Strip whitespace from the start and end of STRING. */ -static void stripwhite(char *string) -{ - int i, last; - - for (i = 0; whitespace(string[i]); i++); - if (i) strcpy(string, string + i); - - last = i = strlen(string) - 1; - if (string[last] == '\n') i--; - - while (i > 0 && whitespace(string[i])) i--; - if (string[last] == '\n') - string[++i] = '\n'; - string[++i] = '\0'; -} - static HANDLE dbg_parser_input; static HANDLE dbg_parser_output; -int input_fetch_entire_line(const char* pfx, char** line, size_t* alloc, BOOL check_nl) +int input_fetch_entire_line(const char* pfx, char** line) { - char buf_line[256]; - DWORD nread, nwritten; - size_t len; + char ch; + DWORD nread; + size_t len, alloc; /* as of today, console handles can be file handles... so better use file APIs rather than * console's */ - WriteFile(dbg_parser_output, pfx, strlen(pfx), &nwritten, NULL); + WriteFile(dbg_parser_output, pfx, strlen(pfx), &nread, NULL); + + if (*line) + { + alloc = HeapSize(GetProcessHeap(), 0, *line); + assert(alloc); + } + else + { + *line = HeapAlloc(GetProcessHeap(), 0, alloc = 16); + assert(*line); + } len = 0; do { - if (!ReadFile(dbg_parser_input, buf_line, sizeof(buf_line) - 1, &nread, NULL) || nread == 0) + if (!ReadFile(dbg_parser_input, &ch, 1, &nread, NULL) || nread == 0) break; - buf_line[nread] = '\0'; - - if (check_nl && len == 0 && nread == 1 && buf_line[0] == '\n') - return 0; - - /* store stuff at the end of last_line */ - if (len + nread + 1 > *alloc) + if (len + 2 > alloc) { - while (len + nread + 1 > *alloc) *alloc *= 2; - *line = dbg_heap_realloc(*line, *alloc); + while (len + 2 > alloc) alloc *= 2; + *line = dbg_heap_realloc(*line, alloc); } - strcpy(*line + len, buf_line); - len += nread; - } while (nread == 0 || buf_line[nread - 1] != '\n'); - - if (!len) - { - *line = HeapReAlloc(GetProcessHeap(), 0, *line, *alloc = 1); - **line = '\0'; + (*line)[len++] = ch; } + while (ch != '\n'); + (*line)[len] = '\0'; - /* Remove leading and trailing whitespace from the line */ - stripwhite(*line); - return 1; + return len; } int input_read_line(const char* pfx, char* buf, int size) @@ -499,14 +476,7 @@ int input_read_line(const char* pfx, cha char* line = NULL; size_t len = 0; - /* first alloc of our current buffer */ - line = HeapAlloc(GetProcessHeap(), 0, len = 2); - assert(line); - line[0] = '\n'; - line[1] = '\0'; - - input_fetch_entire_line(pfx, &line, &len, FALSE); - len = strlen(line); + len = input_fetch_entire_line(pfx, &line); /* remove trailing \n */ if (len > 0 && line[len - 1] == '\n') len--; len = min(size - 1, len);

1 0

wine/dlls/user/tests monitor.c
by Alexandre Julliard 17 Nov '05

17 Nov '05

ChangeSet ID: 21303 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:04:01 Modified files: dlls/user/tests: monitor.c Log message: Detlef Riekenberg <wine.dev(a)web.de> Made test loadable on win95 again (EnumDisplayDevicesA not present). Patch: http://cvs.winehq.org/patch.py?id=21303 Old revision New revision Changes Path 1.2 1.3 +4 -1 wine/dlls/user/tests/monitor.c Index: wine/dlls/user/tests/monitor.c diff -u -p wine/dlls/user/tests/monitor.c:1.2 wine/dlls/user/tests/monitor.c:1.3 --- wine/dlls/user/tests/monitor.c:1.2 17 Nov 2005 11: 4: 1 -0000 +++ wine/dlls/user/tests/monitor.c 17 Nov 2005 11: 4: 1 -0000 @@ -24,6 +24,7 @@ #include "winuser.h" static HMODULE hdll; +static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD); static BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); @@ -33,6 +34,7 @@ static void init_function_pointers(void) if(hdll) { + pEnumDisplayDevicesA = (void*)GetProcAddress(hdll, "EnumDisplayDevicesA"); pEnumDisplayMonitors = (void*)GetProcAddress(hdll, "EnumDisplayMonitors"); pGetMonitorInfoA = (void*)GetProcAddress(hdll, "GetMonitorInfoA"); } @@ -61,10 +63,11 @@ static void test_enumdisplaydevices(void DWORD primary_num = -1, num = 0; dd.cb = sizeof(dd); + if(pEnumDisplayDevicesA == NULL) return; while(1) { BOOL ret; - ret = EnumDisplayDevicesA(NULL, num, &dd, 0), "EnumDisplayDevices fails\n"; + ret = pEnumDisplayDevicesA(NULL, num, &dd, 0); ok(ret || num != 0, "EnumDisplayDevices fails with num == 0\n"); if(!ret) break; if(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)

1 0

wine/dlls/shdocvw webbrowser.c shdocvw.h clien ...
by Alexandre Julliard 17 Nov '05

17 Nov '05

ChangeSet ID: 21302 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:03:53 Modified files: dlls/shdocvw : webbrowser.c shdocvw.h client.c Makefile.in Added files: dlls/shdocvw : dochost.c Log message: Jacek Caban <jacek(a)codeweavers.com> Added stub implementation of IDocHostUIHandler. Patch: http://cvs.winehq.org/patch.py?id=21302 Old revision New revision Changes Path 1.23 1.24 +1 -0 wine/dlls/shdocvw/webbrowser.c 1.28 1.29 +5 -0 wine/dlls/shdocvw/shdocvw.h 1.2 1.3 +6 -0 wine/dlls/shdocvw/client.c 1.19 1.20 +1 -0 wine/dlls/shdocvw/Makefile.in Added 1.1 +0 -0 wine/dlls/shdocvw/dochost.c

1 0

wine/include mshtmhst.idl
by Alexandre Julliard 17 Nov '05

17 Nov '05

ChangeSet ID: 21301 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/17 05:03:25 Modified files: include : mshtmhst.idl Log message: Jacek Caban <jacek(a)codeweavers.com> Added IHTMLWindow forward declaration. Patch: http://cvs.winehq.org/patch.py?id=21301 Old revision New revision Changes Path 1.5 1.6 +5 -0 wine/include/mshtmhst.idl Index: wine/include/mshtmhst.idl diff -u -p wine/include/mshtmhst.idl:1.5 wine/include/mshtmhst.idl:1.6 --- wine/include/mshtmhst.idl:1.5 17 Nov 2005 11: 3:25 -0000 +++ wine/include/mshtmhst.idl 17 Nov 2005 11: 3:25 -0000 @@ -48,6 +48,11 @@ cpp_quote("#define HTMLDLG_VERIFY cpp_quote("#define PRINT_DONTBOTHERUSER 0x0001") cpp_quote("#define PRINT_WAITFORCOMPLETION 0x0002") +cpp_quote("#ifndef __IHTMLWindow2_FWD_DEFINED__") +cpp_quote("#define __IHTMLWindow2_FWD_DEFINED__") +cpp_quote("typedef interface IHTMLWindow2 IHTMLWindow2;") +cpp_quote("#endif") + /***************************************************************************** * IHostDialogHelper interface */

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
58
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 November 2005