September 2011 - Wine-Commits

Michael Stefaniuc : shell32: Pass the object instead of the iface to helper functions.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 87b3644256fb822540234dd689f488abc91f8069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b3644256fb822540234dd68… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 26 11:58:35 2011 +0200 shell32: Pass the object instead of the iface to helper functions. --- dlls/shell32/shellpath.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index b35cbbf..25ba4be 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3333,10 +3333,9 @@ static HRESULT WINAPI knownfolder_QueryInterface( } static HRESULT knownfolder_set_id( - IKnownFolder *iface, + struct knownfolder *knownfolder, const KNOWNFOLDERID *kfid) { - struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); HKEY hKey; HRESULT hr; @@ -3636,7 +3635,7 @@ static const struct IKnownFolderVtbl knownfolder_vtbl = knownfolder_GetFolderDefinition }; -static HRESULT knownfolder_create( void **ppv ) +static HRESULT knownfolder_create( struct knownfolder **knownfolder ) { struct knownfolder *kf; @@ -3648,9 +3647,9 @@ static HRESULT knownfolder_create( void **ppv ) memset( &kf->id, 0, sizeof(kf->id) ); kf->registryPath = NULL; - *ppv = &kf->IKnownFolder_iface.lpVtbl; + *knownfolder = kf; - TRACE("returning iface %p\n", *ppv); + TRACE("returning iface %p\n", &kf->IKnownFolder_iface); return S_OK; } @@ -3783,6 +3782,7 @@ static HRESULT WINAPI foldermanager_GetFolder( IKnownFolder **ppkf) { struct foldermanager *fm = impl_from_IKnownFolderManager( iface ); + struct knownfolder *kf; HRESULT hr; TRACE("%s, %p\n", debugstr_guid(rfid), ppkf); @@ -3792,9 +3792,14 @@ static HRESULT WINAPI foldermanager_GetFolder( WARN("unknown folder\n"); return E_INVALIDARG; } - hr = knownfolder_create( (void **)ppkf ); + hr = knownfolder_create( &kf ); if (SUCCEEDED( hr )) - hr = knownfolder_set_id( *ppkf, rfid ); + { + hr = knownfolder_set_id( kf, rfid ); + *ppkf = &kf->IKnownFolder_iface; + } + else + *ppkf = NULL; return hr; }

1 0

Francois Gouget : oleview: Separate the file filters with a space.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

1 0

André Hentschel : wer: Add stub for WerReportAddDump.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 504931d8618ba3996e17f132f5f628863540271f URL: http://source.winehq.org/git/wine.git/?a=commit;h=504931d8618ba3996e17f132f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 25 20:31:11 2011 +0200 wer: Add stub for WerReportAddDump. --- dlls/wer/main.c | 29 +++++++++++++++++++++++++++++ dlls/wer/wer.spec | 2 +- include/werapi.h | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index 0d43c0e..d68d652 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -170,6 +170,35 @@ HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR exeName, BOOL allUsers) } /*********************************************************************** + * WerReportAddDump (wer.@) + * + * Add a dump of dumpType to hReportHandle. + * + * PARAMS + * hReportHandle [i] error reporting handle to add the dump + * hProcess [i] handle to the regarding process + * hThread [o] handle to the regarding thread + * dumpType [i] type of the dump + * pExceptionParam [o] pointer to a WER_EXCEPTION_INFORMATION + * pDumpCustomOptions [o] pointer to a WER_DUMP_CUSTOM_OPTIONS + * dwFlags [i] flag to control the heap dump + * + * RETURNS + * Success: S_OK + * Failure: A HRESULT error code + * + */ +HRESULT WINAPI WerReportAddDump(HREPORT hReportHandle, HANDLE hProcess, HANDLE hThread, + WER_DUMP_TYPE dumpType, PWER_EXCEPTION_INFORMATION pExceptionParam, + PWER_DUMP_CUSTOM_OPTIONS pDumpCustomOptions, DWORD dwFlags) +{ + FIXME("(%p, %p, %p, %d, %p, %p, %u) :stub\n", hReportHandle, hProcess, hThread, dumpType, + pExceptionParam, pDumpCustomOptions, dwFlags); + + return E_NOTIMPL; +} + +/*********************************************************************** * WerReportCloseHandle (wer.@) * * Close an error reporting handle and free associated resources diff --git a/dlls/wer/wer.spec b/dlls/wer/wer.spec index 4303c20..bfc39e4 100644 --- a/dlls/wer/wer.spec +++ b/dlls/wer/wer.spec @@ -63,7 +63,7 @@ @ stub WerpSvcReportFromMachineQueue @ stdcall WerAddExcludedApplication(wstr long) @ stdcall WerRemoveExcludedApplication(wstr long) -@ stub WerReportAddDump +@ stdcall WerReportAddDump(ptr ptr ptr long ptr ptr long) @ stub WerReportAddFile @ stdcall WerReportCloseHandle(ptr) @ stdcall WerReportCreate(wstr long ptr ptr) diff --git a/include/werapi.h b/include/werapi.h index 2486d3d..e8ec487 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -54,6 +54,9 @@ extern "C" { #define WER_SUBMIT_ARCHIVE_PARAMETERS_ONLY 0x1000 #define WER_SUBMIT_REPORT_MACHINE_ID 0x2000 +#define WER_MAX_PREFERRED_MODULES 128 +#define WER_MAX_PREFERRED_MODULES_BUFFER 256 + /* #### */ typedef HANDLE HREPORT; @@ -110,6 +113,38 @@ typedef enum _WER_SUBMIT_RESULT WerCustomAction } WER_SUBMIT_RESULT, *PWER_SUBMIT_RESULT; +typedef enum _WER_DUMP_TYPE +{ + WerDumpTypeMicroDump = 1, + WerDumpTypeMiniDump, + WerDumpTypeHeapDump, + WerDumpTypeMax +} WER_DUMP_TYPE; + +/* #### */ + +typedef struct _WER_DUMP_CUSTOM_OPTIONS +{ + DWORD dwSize; + DWORD dwMask; + DWORD dwDumpFlags; + BOOL bOnlyThisThread; + DWORD dwExceptionThreadFlags; + DWORD dwOtherThreadFlags; + DWORD dwExceptionThreadExFlags; + DWORD dwOtherThreadExFlags; + DWORD dwPreferredModuleFlags; + DWORD dwOtherModuleFlags; + WCHAR wzPreferredModuleList[WER_MAX_PREFERRED_MODULES_BUFFER]; + +} WER_DUMP_CUSTOM_OPTIONS, *PWER_DUMP_CUSTOM_OPTIONS; + +typedef struct _WER_EXCEPTION_INFORMATION +{ + PEXCEPTION_POINTERS pExceptionPointers; + BOOL bClientPointers; +} WER_EXCEPTION_INFORMATION, *PWER_EXCEPTION_INFORMATION; + /* #### */ HRESULT WINAPI WerAddExcludedApplication(PCWSTR, BOOL);

1 0

André Hentschel : gdi32: Add traces for the gamma functions.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 3373e1e587720e11c441ad88c3a0c67a710151e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3373e1e587720e11c441ad88c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 25 21:22:52 2011 +0200 gdi32: Add traces for the gamma functions. --- dlls/gdi32/dc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 65cc3f7..b50ea70 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1286,6 +1286,7 @@ BOOL WINAPI GetDeviceGammaRamp(HDC hDC, LPVOID ptr) BOOL ret = FALSE; DC *dc = get_dc_ptr( hDC ); + TRACE("%p, %p\n", hDC, ptr); if( dc ) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetDeviceGammaRamp ); @@ -1303,6 +1304,7 @@ BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr) BOOL ret = FALSE; DC *dc = get_dc_ptr( hDC ); + TRACE("%p, %p\n", hDC, ptr); if( dc ) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceGammaRamp ); @@ -1317,7 +1319,7 @@ BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr) */ HCOLORSPACE WINAPI GetColorSpace(HDC hdc) { -/*FIXME Need to to whatever GetColorSpace actually does */ +/*FIXME Need to do whatever GetColorSpace actually does */ return 0; }

1 0

Michael Stefaniuc : shell32: COM cleanup in shellpath.c.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 9e460675d602d20c6693cd423dac0dd89fa8052f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e460675d602d20c6693cd423… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 26 11:54:37 2011 +0200 shell32: COM cleanup in shellpath.c. --- dlls/shell32/shellpath.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 1c723a2..b35cbbf 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3277,7 +3277,7 @@ static HRESULT redirect_known_folder( struct knownfolder { - const struct IKnownFolderVtbl *vtbl; + IKnownFolder IKnownFolder_iface; LONG refs; KNOWNFOLDERID id; LPWSTR registryPath; @@ -3285,7 +3285,7 @@ struct knownfolder static inline struct knownfolder *impl_from_IKnownFolder( IKnownFolder *iface ) { - return (struct knownfolder *)((char *)iface - FIELD_OFFSET( struct knownfolder, vtbl )); + return CONTAINING_RECORD( iface, struct knownfolder, IKnownFolder_iface ); } static ULONG WINAPI knownfolder_AddRef( @@ -3643,12 +3643,12 @@ static HRESULT knownfolder_create( void **ppv ) kf = HeapAlloc( GetProcessHeap(), 0, sizeof(*kf) ); if (!kf) return E_OUTOFMEMORY; - kf->vtbl = &knownfolder_vtbl; + kf->IKnownFolder_iface.lpVtbl = &knownfolder_vtbl; kf->refs = 1; memset( &kf->id, 0, sizeof(kf->id) ); kf->registryPath = NULL; - *ppv = &kf->vtbl; + *ppv = &kf->IKnownFolder_iface.lpVtbl; TRACE("returning iface %p\n", *ppv); return S_OK; @@ -3656,7 +3656,7 @@ static HRESULT knownfolder_create( void **ppv ) struct foldermanager { - const struct IKnownFolderManagerVtbl *vtbl; + IKnownFolderManager IKnownFolderManager_iface; LONG refs; UINT num_ids; KNOWNFOLDERID *ids; @@ -3664,7 +3664,7 @@ struct foldermanager static inline struct foldermanager *impl_from_IKnownFolderManager( IKnownFolderManager *iface ) { - return (struct foldermanager *)((char *)iface - FIELD_OFFSET( struct foldermanager, vtbl )); + return CONTAINING_RECORD( iface, struct foldermanager, IKnownFolderManager_iface ); } static ULONG WINAPI foldermanager_AddRef( @@ -3938,7 +3938,7 @@ static HRESULT foldermanager_create( void **ppv ) fm = HeapAlloc( GetProcessHeap(), 0, sizeof(*fm) ); if (!fm) return E_OUTOFMEMORY; - fm->vtbl = &foldermanager_vtbl; + fm->IKnownFolderManager_iface.lpVtbl = &foldermanager_vtbl; fm->refs = 1; fm->num_ids = 0; @@ -3961,7 +3961,7 @@ static HRESULT foldermanager_create( void **ppv ) } } TRACE("found %u known folders\n", fm->num_ids); - *ppv = &fm->vtbl; + *ppv = &fm->IKnownFolderManager_iface; TRACE("returning iface %p\n", *ppv); return S_OK;

1 0

Michael Stefaniuc : krnl386.exe16: Don't open code CONTAINING_RECORD().
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 2ce0957e210174a3be681ada0605b638013819cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce0957e210174a3be681ada0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Sep 25 23:45:35 2011 +0200 krnl386.exe16: Don't open code CONTAINING_RECORD(). --- dlls/krnl386.exe16/wowthunk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index c6c28a3..feb882b 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -223,7 +223,7 @@ static DWORD call16_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RE if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) { /* unwinding: restore the stack pointer in the TEB, and leave the Win16 mutex */ - STACK32FRAME *frame32 = (STACK32FRAME *)((char *)frame - offsetof(STACK32FRAME,frame)); + STACK32FRAME *frame32 = CONTAINING_RECORD(frame, STACK32FRAME, frame); NtCurrentTeb()->WOW32Reserved = (void *)frame32->frame16; _LeaveWin16Lock(); }

1 0

Dylan Smith : richedit: Return number of chars inserted for EM_STREAMIN with SF_RTF.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: f61d417a3493c61d62f678995a363e8f9ae25291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f61d417a3493c61d62f678995… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Sep 25 22:17:28 2011 -0400 richedit: Return number of chars inserted for EM_STREAMIN with SF_RTF. --- dlls/riched20/editor.c | 4 ++++ dlls/riched20/tests/editor.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8051889..5dda1ea 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1470,6 +1470,8 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (!invalidRTF && !inStream.editstream->dwError) { if (format & SF_RTF) { + from = ME_GetCursorOfs(&editor->pCursors[0]); + /* setup the RTF parser */ memset(&parser, 0, sizeof parser); RTFSetEditStream(&parser, &inStream); @@ -1563,6 +1565,8 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre } } } + to = ME_GetCursorOfs(&editor->pCursors[0]); + num_read = to - from; style = parser.style; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5058b7a..c8d8e0d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5062,7 +5062,7 @@ static void test_EM_STREAMIN(void) es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); - todo_wine ok(result == 12, "got %ld, expected %d\n", result, 12); + ok(result == 12, "got %ld, expected %d\n", result, 12); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 12, @@ -5077,7 +5077,7 @@ static void test_EM_STREAMIN(void) es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); - todo_wine ok(result == 12, "got %ld, expected %d\n", result, 12); + ok(result == 12, "got %ld, expected %d\n", result, 12); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 12, @@ -5092,7 +5092,7 @@ static void test_EM_STREAMIN(void) es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); - todo_wine ok(result == 13, "got %ld, expected %d\n", result, 13); + ok(result == 13, "got %ld, expected %d\n", result, 13); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 14, @@ -5106,7 +5106,7 @@ static void test_EM_STREAMIN(void) es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); - todo_wine ok(result == 12, "got %ld, expected %d\n", result, 12); + ok(result == 12, "got %ld, expected %d\n", result, 12); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 12,

1 0

Dylan Smith : riched20/tests: Avoid using flaky method of simulating typing .
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: fdb2bc4be99ca9f98a283d1b61d48753b1558ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb2bc4be99ca9f98a283d1b6… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Sep 26 02:29:26 2011 -0400 riched20/tests: Avoid using flaky method of simulating typing. --- dlls/riched20/tests/editor.c | 91 ++++++++++++++--------------------------- 1 files changed, 31 insertions(+), 60 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c8d8e0d..2a61f5c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -92,27 +92,6 @@ static void keep_responsive(time_t delay_time) } } -static void processPendingMessages(void) -{ - MSG msg; - while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { - TranslateMessage(&msg); - DispatchMessage(&msg); - } -} - -static void pressKeyWithModifier(HWND hwnd, BYTE mod_vk, BYTE vk) -{ - BYTE mod_scan_code = MapVirtualKey(mod_vk, MAPVK_VK_TO_VSC); - BYTE scan_code = MapVirtualKey(vk, MAPVK_VK_TO_VSC); - SetFocus(hwnd); - keybd_event(mod_vk, mod_scan_code, 0, 0); - keybd_event(vk, scan_code, 0, 0); - keybd_event(vk, scan_code, KEYEVENTF_KEYUP, 0); - keybd_event(mod_vk, mod_scan_code, KEYEVENTF_KEYUP, 0); - processPendingMessages(); -} - static void simulate_typing_characters(HWND hwnd, const char* szChars) { int ret; @@ -4674,6 +4653,22 @@ static void test_EM_REPLACESEL(int redraw) DestroyWindow(hwndRichEdit); } +/* Native riched20 inspects the keyboard state (e.g. GetKeyState) + * to test the state of the modifiers (Ctrl/Alt/Shift). + * + * Therefore Ctrl-<key> keystrokes need to be simulated with + * keybd_event or by using SetKeyboardState to set the modifiers + * and SendMessage to simulate the keystrokes. + */ +static LRESULT send_ctrl_key(HWND hwnd, UINT key) +{ + LRESULT result; + hold_key(VK_CONTROL); + result = SendMessage(hwnd, WM_KEYDOWN, key, 1); + release_key(VK_CONTROL); + return result; +} + static void test_WM_PASTE(void) { int result; @@ -4686,34 +4681,19 @@ static void test_WM_PASTE(void) const char* text3 = "testing paste\r\npaste\r\ntesting paste"; HWND hwndRichEdit = new_richedit(NULL); - /* Native riched20 inspects the keyboard state (e.g. GetKeyState) - * to test the state of the modifiers (Ctrl/Alt/Shift). - * - * Therefore Ctrl-<key> keystrokes need to be simulated with - * keybd_event or by using SetKeyboardState to set the modifiers - * and SendMessage to simulate the keystrokes. - */ - - /* Sent keystrokes with keybd_event */ -#define SEND_CTRL_C(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'C') -#define SEND_CTRL_X(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'X') -#define SEND_CTRL_V(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'V') -#define SEND_CTRL_Z(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'Z') -#define SEND_CTRL_Y(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'Y') - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text1); SendMessage(hwndRichEdit, EM_SETSEL, 0, 14); - SEND_CTRL_C(hwndRichEdit); /* Copy */ + send_ctrl_key(hwndRichEdit, 'C'); /* Copy */ SendMessage(hwndRichEdit, EM_SETSEL, 14, 14); - SEND_CTRL_V(hwndRichEdit); /* Paste */ + send_ctrl_key(hwndRichEdit, 'V'); /* Paste */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Pasted text should be visible at this step */ result = strcmp(text1_step1, buffer); ok(result == 0, "test paste: strcmp = %i, text='%s'\n", result, buffer); - SEND_CTRL_Z(hwndRichEdit); /* Undo */ + send_ctrl_key(hwndRichEdit, 'Z'); /* Undo */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Text should be the same as before (except for \r -> \r\n conversion) */ result = strcmp(text1_after, buffer); @@ -4722,33 +4702,27 @@ static void test_WM_PASTE(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text2); SendMessage(hwndRichEdit, EM_SETSEL, 8, 13); - SEND_CTRL_C(hwndRichEdit); /* Copy */ + send_ctrl_key(hwndRichEdit, 'C'); /* Copy */ SendMessage(hwndRichEdit, EM_SETSEL, 14, 14); - SEND_CTRL_V(hwndRichEdit); /* Paste */ + send_ctrl_key(hwndRichEdit, 'V'); /* Paste */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Pasted text should be visible at this step */ result = strcmp(text3, buffer); ok(result == 0, "test paste: strcmp = %i\n", result); - SEND_CTRL_Z(hwndRichEdit); /* Undo */ + send_ctrl_key(hwndRichEdit, 'Z'); /* Undo */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Text should be the same as before (except for \r -> \r\n conversion) */ result = strcmp(text2_after, buffer); ok(result == 0, "test paste: strcmp = %i\n", result); - SEND_CTRL_Y(hwndRichEdit); /* Redo */ + send_ctrl_key(hwndRichEdit, 'Y'); /* Redo */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Text should revert to post-paste state */ result = strcmp(buffer,text3); ok(result == 0, "test paste: strcmp = %i\n", result); -#undef SEND_CTRL_C -#undef SEND_CTRL_X -#undef SEND_CTRL_V -#undef SEND_CTRL_Z -#undef SEND_CTRL_Y - SendMessage(hwndRichEdit, WM_SETTEXT, 0, 0); /* Send WM_CHAR to simulates Ctrl-V */ SendMessage(hwndRichEdit, WM_CHAR, 22, @@ -5962,9 +5936,6 @@ static LONG CALLBACK customWordBreakProc(WCHAR *text, int pos, int bytes, int co return 0; } -#define SEND_CTRL_LEFT(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, VK_LEFT) -#define SEND_CTRL_RIGHT(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, VK_RIGHT) - static void test_word_movement(void) { HWND hwnd; @@ -5980,25 +5951,25 @@ static void test_word_movement(void) SendMessage(hwnd, EM_SETSEL, 0, 0); /* |one two three */ - SEND_CTRL_RIGHT(hwnd); + send_ctrl_key(hwnd, VK_RIGHT); /* one |two three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); ok(sel_start == 4, "Cursor is at %d instead of %d\n", sel_start, 4); - SEND_CTRL_RIGHT(hwnd); + send_ctrl_key(hwnd, VK_RIGHT); /* one two |three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); ok(sel_start == 9, "Cursor is at %d instead of %d\n", sel_start, 9); - SEND_CTRL_LEFT(hwnd); + send_ctrl_key(hwnd, VK_LEFT); /* one |two three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); ok(sel_start == 4, "Cursor is at %d instead of %d\n", sel_start, 4); - SEND_CTRL_LEFT(hwnd); + send_ctrl_key(hwnd, VK_LEFT); /* |one two three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); @@ -6006,7 +5977,7 @@ static void test_word_movement(void) SendMessage(hwnd, EM_SETSEL, 8, 8); /* one two | three */ - SEND_CTRL_RIGHT(hwnd); + send_ctrl_key(hwnd, VK_RIGHT); /* one two |three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); @@ -6014,7 +5985,7 @@ static void test_word_movement(void) SendMessage(hwnd, EM_SETSEL, 11, 11); /* one two th|ree */ - SEND_CTRL_LEFT(hwnd); + send_ctrl_key(hwnd, VK_LEFT); /* one two |three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); @@ -6025,7 +5996,7 @@ static void test_word_movement(void) ok (result == TRUE, "Failed to clear the text.\n"); SendMessage(hwnd, EM_SETWORDBREAKPROC, 0, (LPARAM)customWordBreakProc); /* |one twoXthree */ - SEND_CTRL_RIGHT(hwnd); + send_ctrl_key(hwnd, VK_RIGHT); /* one twoX|three */ SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n"); @@ -6045,7 +6016,7 @@ static void test_word_movement(void) ok (result == TRUE, "Failed to clear the text.\n"); SendMessageW(hwnd, EM_SETWORDBREAKPROC, 0, (LPARAM)customWordBreakProc); /* |one twoXthree */ - SEND_CTRL_RIGHT(hwnd); + send_ctrl_key(hwnd, VK_RIGHT); /* one twoX|three */ SendMessageW(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "Selection should be empty\n");

1 0

Dylan Smith : richedit: Return number of bytes read for EM_STREAMIN with SF_TEXT.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: e060272de73d909fb39c7a8a1952a2fbd75141c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e060272de73d909fb39c7a8a1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Sep 25 22:17:19 2011 -0400 richedit: Return number of bytes read for EM_STREAMIN with SF_TEXT. --- dlls/riched20/editor.c | 17 +++++++++------ dlls/riched20/tests/editor.c | 46 ++++++++++++++++++++++++++++++++--------- 2 files changed, 46 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3c409e4..8051889 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -285,9 +285,10 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea { WCHAR wszText[STREAMIN_BUFFER_SIZE+1]; WCHAR *pText; - + LRESULT total_bytes_read = 0; + TRACE("%08x %p\n", dwFormat, stream); - + do { LONG nWideChars = 0; @@ -298,8 +299,9 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea break; if (!stream->dwSize) break; + total_bytes_read += stream->dwSize; } - + if (!(dwFormat & SF_UNICODE)) { /* FIXME? this is doomed to fail on true MBCS like UTF-8, luckily they're unlikely to be used as CP_ACP */ @@ -311,13 +313,13 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea nWideChars = stream->dwSize >> 1; pText = (WCHAR *)stream->buffer; } - + ME_InsertTextFromCursor(editor, 0, pText, nWideChars, style); if (stream->dwSize == 0) break; stream->dwSize = 0; } while(1); - return 0; + return total_bytes_read; } static void ME_ApplyBorderProperties(RTF_Info *info, @@ -1390,6 +1392,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ME_InStream inStream; BOOL invalidRTF = FALSE; ME_Cursor *selStart, *selEnd; + LRESULT num_read = 0; /* bytes read for SF_TEXT, non-control chars inserted for SF_RTF */ TRACE("stream==%p editor==%p format==0x%X\n", stream, editor, format); editor->nEventMask = 0; @@ -1564,7 +1567,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre style = parser.style; } else if (format & SF_TEXT) - ME_StreamInText(editor, format, &inStream, style); + num_read = ME_StreamInText(editor, format, &inStream, style); else ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); /* put the cursor at the top */ @@ -1594,7 +1597,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ME_SendSelChange(editor); ME_SendRequestResize(editor, FALSE); - return 0; + return num_read; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 77ce09e..5058b7a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5040,20 +5040,29 @@ static void test_EM_STREAMIN(void) const char * streamText3 = "RichEdit1"; - struct StringWithLength cookieForStream4; const char * streamText4 = "This text just needs to be long enough to cause run to be split onto " "two separate lines and make sure the null terminating character is " "handled properly.\0"; int length4 = strlen(streamText4) + 1; - cookieForStream4.buffer = (char *)streamText4; - cookieForStream4.length = length4; + struct StringWithLength cookieForStream4 = { + length4, + (char *)streamText4, + }; + + const WCHAR streamText5[] = { 'T', 'e', 's', 't', 'S', 'o', 'm', 'e', 'T', 'e', 'x', 't' }; + int length5 = sizeof(streamText5) / sizeof(WCHAR); + struct StringWithLength cookieForStream5 = { + sizeof(streamText5), + (char *)streamText5, + }; /* Minimal test without \par at the end */ es.dwCookie = (DWORD_PTR)&streamText0; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; - SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + todo_wine ok(result == 12, "got %ld, expected %d\n", result, 12); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 12, @@ -5067,7 +5076,8 @@ static void test_EM_STREAMIN(void) es.dwCookie = (DWORD_PTR)&streamText0a; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; - SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + todo_wine ok(result == 12, "got %ld, expected %d\n", result, 12); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 12, @@ -5081,7 +5091,8 @@ static void test_EM_STREAMIN(void) es.dwCookie = (DWORD_PTR)&streamText0b; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; - SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + todo_wine ok(result == 13, "got %ld, expected %d\n", result, 13); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 14, @@ -5094,7 +5105,8 @@ static void test_EM_STREAMIN(void) es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; - SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + todo_wine ok(result == 12, "got %ld, expected %d\n", result, 12); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 12, @@ -5106,7 +5118,8 @@ static void test_EM_STREAMIN(void) es.dwCookie = (DWORD_PTR)&streamText2; es.dwError = 0; - SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + ok(result == 0, "got %ld, expected %d\n", result, 0); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 0, @@ -5117,7 +5130,8 @@ static void test_EM_STREAMIN(void) es.dwCookie = (DWORD_PTR)&streamText3; es.dwError = 0; - SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + ok(result == 0, "got %ld, expected %d\n", result, 0); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 0, @@ -5129,13 +5143,25 @@ static void test_EM_STREAMIN(void) es.dwCookie = (DWORD_PTR)&cookieForStream4; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback2; - SendMessage(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); + ok(result == length4, "got %ld, expected %d\n", result, length4); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == length4, "EM_STREAMIN: Test 4 returned %ld, expected %d\n", result, length4); ok(es.dwError == 0, "EM_STREAMIN: Test 4 set error %d, expected %d\n", es.dwError, 0); + es.dwCookie = (DWORD_PTR)&cookieForStream5; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback2; + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_TEXT | SF_UNICODE, (LPARAM)&es); + ok(result == sizeof(streamText5), "got %ld, expected %u\n", result, (UINT)sizeof(streamText5)); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok (result == length5, + "EM_STREAMIN: Test 4 returned %ld, expected %d\n", result, length5); + ok(es.dwError == 0, "EM_STREAMIN: Test 5 set error %d, expected %d\n", es.dwError, 0); + DestroyWindow(hwndRichEdit); }

1 0

Francois Gouget : po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Turkish translation .
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 9c0085aa26d865dd2022805af8bc9acab367332f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c0085aa26d865dd2022805af… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 26 02:28:16 2011 +0200 po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Turkish translation. --- po/tr.po | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index b69b3c8..07c3fce 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2468,9 +2468,8 @@ msgid "Invalid drive\n" msgstr "Geçersiz Sözdizimi" #: winerror.mc:106 -#, fuzzy msgid "Can't delete current directory\n" -msgstr "CHDIR hakkında yardım\n" +msgstr "" #: winerror.mc:111 msgid "Not same device\n" @@ -8048,12 +8047,14 @@ msgstr "" "kendisini çağıran tarafından miras alınır.\n" #: cmd.rc:40 +#, fuzzy msgid "" "CD <dir> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "CD hakkında yardım\n" #: cmd.rc:41 +#, fuzzy msgid "CHDIR <dir> changes the current default directory.\n" msgstr "CHDIR hakkında yardım\n" @@ -8062,22 +8063,27 @@ msgid "CLS clears the console screen.\n" msgstr "CLS konsol ekranını temizler\n" #: cmd.rc:45 +#, fuzzy msgid "COPY <filename> copies a file.\n" msgstr "COPY hakkında yardım\n" #: cmd.rc:46 +#, fuzzy msgid "CTTY changes the input/output device.\n" msgstr "CTTY hakkında yardım\n" #: cmd.rc:47 +#, fuzzy msgid "DATE shows or changes the system date.\n" msgstr "DATE hakkında yardım\n" #: cmd.rc:48 +#, fuzzy msgid "DEL <filename> deletes a file or set of files.\n" msgstr "DEL hakkında yardım\n" #: cmd.rc:49 +#, fuzzy msgid "DIR lists the contents of a directory.\n" msgstr "DIR hakkında yardım\n" @@ -8102,6 +8108,7 @@ msgstr "" "getirerek engelleyebilirsiniz.\n" #: cmd.rc:61 +#, fuzzy msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE hakkında yardım\n" @@ -8147,6 +8154,7 @@ msgstr "" "GOTO komutunun etkileşimli olarak kullanımının bir etkisi yoktur.\n" #: cmd.rc:84 +#, fuzzy msgid "" "HELP <command> shows brief help details on a topic.\n" "HELP without an argument shows all CMD built-in commands.\n" @@ -8188,10 +8196,12 @@ msgstr "" "Disk bölüm etiketini VOL komutu ile gösterebilirsiniz.\n" #: cmd.rc:103 +#, fuzzy msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" msgstr "MD hakkında yardım\n" #: cmd.rc:104 +#, fuzzy msgid "MKDIR <name> creates a subdirectory.\n" msgstr "MKDIR hakkında yardım\n" @@ -8301,6 +8311,7 @@ msgstr "" "açıklama olarak kullanılabilir.\n" #: cmd.rc:156 +#, fuzzy msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "REN hakkında yardım\n" @@ -8310,10 +8321,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME hakkında yardım\n" #: cmd.rc:159 +#, fuzzy msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgstr "RD hakkında yardım\n" #: cmd.rc:160 +#, fuzzy msgid "RMDIR <dir> deletes a subdirectory.\n" msgstr "RMDIR hakkında yardım\n" @@ -8363,6 +8376,7 @@ msgstr "" "çağrıldığında bir etkisi yoktur.\n" #: cmd.rc:185 +#, fuzzy msgid "TIME sets or shows the current system time.\n" msgstr "TIME hakkında yardım\n" @@ -8403,6 +8417,7 @@ msgid "VER displays the version of cmd you are running.\n" msgstr "VER kullandığınız cmd sürümünü gösterir\n" #: cmd.rc:205 +#, fuzzy msgid "VOL shows the volume label of a disk device.\n" msgstr "VOL hakkında yardım\n"

1 0