March 2007 - Wine-commits - list.winehq.org

Dmitry Timoshkov : riched20: Add a test that shows that under Win9x RichEdit20W windows are not unicode , but always expect to see unicode input.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 11e01b17de059881c0d99262ef8fd89c0c65832d URL: http://source.winehq.org/git/wine.git/?a=commit;h=11e01b17de059881c0d99262e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Mar 21 18:26:19 2007 +0800 riched20: Add a test that shows that under Win9x RichEdit20W windows are not unicode, but always expect to see unicode input. --- dlls/riched20/editor.c | 66 ++++++++++++++++++++------------ dlls/riched20/editor.h | 1 - dlls/riched20/tests/editor.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 26 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c9e9246..6b09b26 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -237,12 +237,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); +static BOOL ME_RegisterEditorClass(HINSTANCE); + +static const WCHAR RichEdit20W[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '2', '0', 'W', 0}; +static const WCHAR RichEdit50W[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', '0', 'W', 0}; +static const WCHAR REListBox20W[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; +static const WCHAR REComboBox20W[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; + int me_debug = 0; HANDLE me_heap = NULL; static BOOL ME_ListBoxRegistered = FALSE; static BOOL ME_ComboBoxRegistered = FALSE; +static inline int is_version_nt(void) +{ + return !(GetVersion() & 0x80000000); +} + static ME_TextBuffer *ME_MakeText(void) { ME_TextBuffer *buf = ALLOC_OBJ(ME_TextBuffer); @@ -1232,11 +1244,6 @@ void ME_DestroyEditor(ME_TextEditor *editor) FREE_OBJ(editor); } -static const WCHAR wszClassName[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '2', '0', 'W', 0}; -static const WCHAR wszClassName50[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', '0', 'W', 0}; -static const WCHAR wszClassNameListBox[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; -static const WCHAR wszClassNameComboBox[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("\n"); @@ -1245,19 +1252,19 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); me_heap = HeapCreate (0, 0x10000, 0); - ME_RegisterEditorClass(hinstDLL); + if (!ME_RegisterEditorClass(hinstDLL)) return FALSE; LookupInit(); break; case DLL_PROCESS_DETACH: - UnregisterClassW(wszClassName, 0); - UnregisterClassW(wszClassName50, 0); + UnregisterClassW(RichEdit20W, 0); + UnregisterClassW(RichEdit50W, 0); UnregisterClassA("RichEdit20A", 0); UnregisterClassA("RichEdit50A", 0); if (ME_ListBoxRegistered) - UnregisterClassW(wszClassNameListBox, 0); + UnregisterClassW(REListBox20W, 0); if (ME_ComboBoxRegistered) - UnregisterClassW(wszClassNameComboBox, 0); + UnregisterClassW(REComboBox20W, 0); LookupCleanup(); HeapDestroy (me_heap); me_heap = NULL; @@ -1901,7 +1908,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP ME_EmptyUndoStack(editor); ME_SetSelection(editor, 0, 0); ME_UpdateRepaint(editor); - return 0; + return 1; } case EM_CANPASTE: { @@ -2703,9 +2710,8 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int nStart, int nChars, in return nWritten; } -void ME_RegisterEditorClass(HINSTANCE hInstance) +static BOOL ME_RegisterEditorClass(HINSTANCE hInstance) { - BOOL bResult; WNDCLASSW wcW; WNDCLASSA wcA; @@ -2718,12 +2724,22 @@ void ME_RegisterEditorClass(HINSTANCE hInstance) wcW.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); wcW.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); wcW.lpszMenuName = NULL; - wcW.lpszClassName = wszClassName; - bResult = RegisterClassW(&wcW); - assert(bResult); - wcW.lpszClassName = wszClassName50; - bResult = RegisterClassW(&wcW); - assert(bResult); + + if (is_version_nt()) + { + wcW.lpszClassName = RichEdit20W; + if (!RegisterClassW(&wcW)) return FALSE; + wcW.lpszClassName = RichEdit50W; + if (!RegisterClassW(&wcW)) return FALSE; + } + else + { + /* WNDCLASSA/W have the same layout */ + wcW.lpszClassName = (LPCWSTR)"RichEdit20W"; + if (!RegisterClassA((WNDCLASSA *)&wcW)) return FALSE; + wcW.lpszClassName = (LPCWSTR)"RichEdit50W"; + if (!RegisterClassA((WNDCLASSA *)&wcW)) return FALSE; + } wcA.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wcA.lpfnWndProc = RichEditANSIWndProc; @@ -2735,11 +2751,11 @@ void ME_RegisterEditorClass(HINSTANCE hInstance) wcA.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); wcA.lpszMenuName = NULL; wcA.lpszClassName = "RichEdit20A"; - bResult = RegisterClassA(&wcA); - assert(bResult); + if (!RegisterClassA(&wcA)) return FALSE; wcA.lpszClassName = "RichEdit50A"; - bResult = RegisterClassA(&wcA); - assert(bResult); + if (!RegisterClassA(&wcA)) return FALSE; + + return TRUE; } LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -2781,7 +2797,7 @@ LRESULT WINAPI REExtendedRegisterClass(void) { wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS; wcW.lpfnWndProc = REListWndProc; - wcW.lpszClassName = wszClassNameListBox; + wcW.lpszClassName = REListBox20W; if (RegisterClassW(&wcW)) ME_ListBoxRegistered = TRUE; } @@ -2789,7 +2805,7 @@ LRESULT WINAPI REExtendedRegisterClass(void) { wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW; wcW.lpfnWndProc = REComboWndProc; - wcW.lpszClassName = wszClassNameComboBox; + wcW.lpszClassName = REComboBox20W; if (RegisterClassW(&wcW)) ME_ComboBoxRegistered = TRUE; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index ec56e3f..8329203 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -266,7 +266,6 @@ extern LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *); /* wintest.c */ /* editor.c */ -void ME_RegisterEditorClass(HINSTANCE hInstance); ME_TextEditor *ME_MakeEditor(HWND hWnd); void ME_DestroyEditor(ME_TextEditor *editor); void ME_SendOldNotify(ME_TextEditor *editor, int nCode); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 60ab7ab..2d66f74 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1562,6 +1562,89 @@ static void test_EM_StreamIn_Undo(void) } +static void test_unicode_conversions(void) +{ + static const WCHAR textW[] = {'t','e','s','t',0}; + static const char textA[] = "test"; + char bufA[64]; + WCHAR bufW[64]; + HWND hwnd; + int is_win9x, ret; + + is_win9x = GetVersion() & 0x80000000; + +#define set_textA(hwnd, txt) \ + do { \ + ret = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)txt); \ + ok(ret, "SendMessageA(WM_SETTEXT) error %u\n", GetLastError()); \ + } while(0) +#define expect_textA(hwnd, txt, todo) \ + do { \ + memset(bufA, 0xAA, sizeof(bufA)); \ + ret = SendMessageA(hwnd, WM_GETTEXT, 64, (LPARAM)bufA); \ + ok(ret, "SendMessageA(WM_GETTEXT) error %u\n", GetLastError()); \ + ret = lstrcmpA(bufA, txt); \ + if (todo) \ + todo_wine ok(!ret, "strings not match: expected %s got %s\n", txt, bufA); \ + else \ + ok(!ret, "strings not match: expected %s got %s\n", txt, bufA); \ + } while(0) + +#define set_textW(hwnd, txt) \ + do { \ + ret = SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)txt); \ + ok(ret, "SendMessageW(WM_SETTEXT) error %u\n", GetLastError()); \ + } while(0) +#define expect_textW(hwnd, txt) \ + do { \ + memset(bufW, 0xAA, sizeof(bufW)); \ + ret = SendMessageW(hwnd, WM_GETTEXT, 64, (LPARAM)bufW); \ + ok(ret, "SendMessageW(WM_GETTEXT) error %u\n", GetLastError()); \ + ret = lstrcmpW(bufW, txt); \ + ok(!ret, "strings not match\n"); \ + } while(0) + + hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP, + 0, 0, 200, 60, 0, 0, 0, 0); + ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + + ret = IsWindowUnicode(hwnd); + if (is_win9x) + ok(!ret, "RichEdit20W should NOT be unicode under Win9x\n"); + else + ok(ret, "RichEdit20W should be unicode under NT\n"); + + if (is_win9x) + set_textA(hwnd, textW); + else + set_textA(hwnd, textA); + expect_textA(hwnd, textA, is_win9x); + + if (!is_win9x) + { + set_textW(hwnd, textW); + expect_textW(hwnd, textW); + } + DestroyWindow(hwnd); + + hwnd = CreateWindowExA(0, "RichEdit20A", NULL, WS_POPUP, + 0, 0, 200, 60, 0, 0, 0, 0); + ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + + ret = IsWindowUnicode(hwnd); + ok(!ret, "RichEdit20A should NOT be unicode\n"); + + set_textA(hwnd, textA); + expect_textA(hwnd, textA, FALSE); + + if (!is_win9x) + { + set_textW(hwnd, textW); + expect_textW(hwnd, textW); + } + DestroyWindow(hwnd); +} + START_TEST( editor ) { MSG msg; @@ -1571,6 +1654,7 @@ START_TEST( editor ) * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibrary("RICHED20.DLL"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + test_EM_FINDTEXT(); test_EM_GETLINE(); test_EM_SCROLLCARET(); @@ -1591,6 +1675,7 @@ START_TEST( editor ) test_EM_EXSETSEL(); test_WM_PASTE(); test_EM_StreamIn_Undo(); + test_unicode_conversions(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Alexandre Julliard : winex11.drv: Relax the bitmap depth check in CreateBitmap to accept some compatible formats .
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: f14301003854352b9c67714d9e878ea862d5f9cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f14301003854352b9c67714d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 21 15:56:10 2007 +0100 winex11.drv: Relax the bitmap depth check in CreateBitmap to accept some compatible formats. --- dlls/winex11.drv/bitmap.c | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 75623e4..053c959 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -121,7 +121,13 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBit /* Check parameters */ if (bitmap.bmPlanes != 1) return FALSE; - if ((bitmap.bmBitsPixel != 1) && (bitmap.bmBitsPixel != screen_depth)) + /* check if bpp is compatible with screen depth */ + if (!((bitmap.bmBitsPixel == 1) || + (bitmap.bmBitsPixel == screen_depth) || + (bitmap.bmBitsPixel == 24 && screen_depth == 32) || + (bitmap.bmBitsPixel == 32 && screen_depth == 24) || + (bitmap.bmBitsPixel == 15 && screen_depth == 16) || + (bitmap.bmBitsPixel == 16 && screen_depth == 15))) { ERR("Trying to make bitmap with planes=%d, bpp=%d\n", bitmap.bmPlanes, bitmap.bmBitsPixel); @@ -139,9 +145,9 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBit /* Create the pixmap */ wine_tsx11_lock(); - physBitmap->pixmap_depth = bitmap.bmBitsPixel; + physBitmap->pixmap_depth = (bitmap.bmBitsPixel == 1) ? 1 : screen_depth; physBitmap->pixmap = XCreatePixmap(gdi_display, root_window, - bitmap.bmWidth, bitmap.bmHeight, bitmap.bmBitsPixel); + bitmap.bmWidth, bitmap.bmHeight, physBitmap->pixmap_depth); wine_tsx11_unlock(); if (!physBitmap->pixmap) { @@ -178,7 +184,7 @@ LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ) { BITMAP bitmap; X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap ); - LONG old_height, height; + LONG height; XImage *image; LPBYTE tbuf, startline; int h, w; @@ -188,21 +194,14 @@ LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ) TRACE("(bmp=%p, buffer=%p, count=0x%x)\n", hbitmap, buffer, count); wine_tsx11_lock(); - - /* Hack: change the bitmap height temporarily to avoid */ - /* getting unnecessary bitmap rows. */ - - old_height = bitmap.bmHeight; - height = bitmap.bmHeight = count / bitmap.bmWidthBytes; - + height = count / bitmap.bmWidthBytes; image = XGetImage( gdi_display, physBitmap->pixmap, 0, 0, - bitmap.bmWidth, bitmap.bmHeight, AllPlanes, ZPixmap ); - bitmap.bmHeight = old_height; + bitmap.bmWidth, height, AllPlanes, ZPixmap ); /* copy XImage to 16 bit padded image buffer with real bitsperpixel */ startline = buffer; - switch (physBitmap->pixmap_depth) + switch (bitmap.bmBitsPixel) { case 1: for (h=0;h<height;h++) @@ -288,7 +287,7 @@ LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ) } break; default: - FIXME("Unhandled bits:%d\n", physBitmap->pixmap_depth); + FIXME("Unhandled bits:%d\n", bitmap.bmBitsPixel); } XDestroyImage( image ); wine_tsx11_unlock(); @@ -334,7 +333,7 @@ LONG X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ) startline = bits; - switch (physBitmap->pixmap_depth) + switch (bitmap.bmBitsPixel) { case 1: for (h=0;h<height;h++) @@ -408,7 +407,7 @@ LONG X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ) } break; default: - FIXME("Unhandled bits:%d\n", physBitmap->pixmap_depth); + FIXME("Unhandled bits:%d\n", bitmap.bmBitsPixel); } XPutImage( gdi_display, physBitmap->pixmap, BITMAP_GC(physBitmap),

1 0

Alexandre Julliard : ws2_32: Move the signalling of the completion event to the server.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 2b6d1fa59b6467fa7ad322fa352acb2cc0be283c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6d1fa59b6467fa7ad322fa3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 21 14:29:35 2007 +0100 ws2_32: Move the signalling of the completion event to the server. --- dlls/ws2_32/socket.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 679dffc..9be5535 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1049,8 +1049,6 @@ static void CALLBACK ws2_async_terminate(ws2_async* as, IO_STATUS_BLOCK* iosb) { TRACE( "as: %p uovl %p ovl %p\n", as, as->user_overlapped, iosb ); - if (as->event) NtSetEvent( as->event, NULL ); - if (as->completion_func) as->completion_func( NtStatusToWSAError (iosb->u.Status), iosb->Information, as->user_overlapped, as->flags ); @@ -1118,10 +1116,7 @@ WS2_make_async(SOCKET s, enum ws2_mode mode, struct iovec *iovec, DWORD dwBuffer { *piosb = (IO_STATUS_BLOCK*)lpOverlapped; if (!lpCompletionRoutine) - { wsa->event = lpOverlapped->hEvent; - NtResetEvent(wsa->event, NULL); - } } else if (!(*piosb = HeapAlloc( GetProcessHeap(), 0, sizeof(IO_STATUS_BLOCK)))) goto error; @@ -1161,6 +1156,7 @@ static ULONG ws2_queue_async(struct ws2_async* wsa, IO_STATUS_BLOCK* iosb) req->async.callback = apc; req->async.iosb = iosb; req->async.arg = wsa; + req->async.event = wsa->event; req->type = type; req->count = iosb->Information; status = wine_server_call( req );

1 0

Alexandre Julliard : server: Move the signalling of the named pipe completion event to the server.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: a133ad56f913b13d95bfd217aa627fdda50d5cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a133ad56f913b13d95bfd217a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 21 14:31:54 2007 +0100 server: Move the signalling of the named pipe completion event to the server. --- dlls/ntdll/file.c | 41 +++++++++++++++-------------------------- server/named_pipe.c | 26 +++++++++----------------- 2 files changed, 24 insertions(+), 43 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index c25e229..0b22583 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -920,14 +920,10 @@ NTSTATUS WINAPI NtDeviceIoControlFile(HANDLE handle, HANDLE event, /*********************************************************************** * pipe_completion_wait (Internal) */ -static void CALLBACK pipe_completion_wait(HANDLE event, PIO_STATUS_BLOCK iosb, ULONG status) +static void CALLBACK pipe_completion_wait(void *arg, PIO_STATUS_BLOCK iosb, ULONG status) { - TRACE("for %p/%p, status=%08x\n", event, iosb, status); - - if (iosb) - iosb->u.Status = status; - NtSetEvent(event, NULL); - TRACE("done\n"); + TRACE("for %p, status=%08x\n", iosb, status); + iosb->u.Status = status; } /************************************************************************** @@ -982,20 +978,17 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc req->handle = handle; req->async.callback = pipe_completion_wait; req->async.iosb = io; - req->async.arg = event ? event : internal_event; + req->async.arg = NULL; + req->async.event = event ? event : internal_event; io->u.Status = wine_server_call(req); } SERVER_END_REQ; - if(io->u.Status == STATUS_SUCCESS) + if (!event && io->u.Status == STATUS_PENDING) { - if(event) io->u.Status = STATUS_PENDING; - else - { - do - io->u.Status = NtWaitForSingleObject(internal_event, TRUE, NULL); - while(io->u.Status == STATUS_USER_APC); - } + do + io->u.Status = NtWaitForSingleObject(internal_event, TRUE, NULL); + while(io->u.Status == STATUS_USER_APC); } if (internal_event) NtClose(internal_event); } @@ -1018,22 +1011,18 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc : NMPWAIT_USE_DEFAULT_WAIT; req->async.callback = pipe_completion_wait; req->async.iosb = io; - req->async.arg = event ? event : internal_event; + req->async.arg = NULL; + req->async.event = event ? event : internal_event; wine_server_add_data( req, buff->Name, buff->NameLength ); io->u.Status = wine_server_call( req ); } SERVER_END_REQ; - if(io->u.Status == STATUS_SUCCESS) + if (!event && io->u.Status == STATUS_PENDING) { - if(event) - io->u.Status = STATUS_PENDING; - else - { - do - io->u.Status = NtWaitForSingleObject(internal_event, TRUE, NULL); - while(io->u.Status == STATUS_USER_APC); - } + do + io->u.Status = NtWaitForSingleObject(internal_event, TRUE, NULL); + while(io->u.Status == STATUS_USER_APC); } if (internal_event) NtClose(internal_event); } diff --git a/server/named_pipe.c b/server/named_pipe.c index 61ddd37..a9ca5b1 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -826,6 +826,7 @@ DECL_HANDLER(connect_named_pipe) server->state = ps_wait_open; create_async( current, NULL, &server->wait_q, &req->async ); async_terminate_queue( &server->pipe->waiters, STATUS_SUCCESS ); + set_error( STATUS_PENDING ); break; case ps_connected_server: assert( server->fd ); @@ -865,32 +866,23 @@ DECL_HANDLER(wait_named_pipe) return; } server = find_server( pipe, ps_wait_open ); - if (server) - { - apc_call_t data; - - /* there's already a server waiting for a client to connect */ - memset( &data, 0, sizeof(data) ); - data.type = APC_ASYNC_IO; - data.async_io.func = req->async.callback; - data.async_io.user = req->async.arg; - data.async_io.sb = req->async.iosb; - data.async_io.status = STATUS_SUCCESS; - thread_queue_apc( current, NULL, &data ); - release_object( server ); - } - else + if (!server) { if (req->timeout == NMPWAIT_WAIT_FOREVER) - create_async( current, NULL, &pipe->waiters, &req->async ); + { + if (create_async( current, NULL, &pipe->waiters, &req->async )) + set_error( STATUS_PENDING ); + } else { struct timeval when = current_time; if (req->timeout == NMPWAIT_USE_DEFAULT_WAIT) add_timeout( &when, pipe->timeout ); else add_timeout( &when, req->timeout ); - create_async( current, &when, &pipe->waiters, &req->async ); + if (create_async( current, &when, &pipe->waiters, &req->async )) + set_error( STATUS_PENDING ); } } + else release_object( server ); release_object( pipe ); }

1 0

Alexandre Julliard : server: Add support for storing an event to signal upon async I/O completion.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: fa4679fea6c5a6227d5d40e410d93af3d01d984c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4679fea6c5a6227d5d40e41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 21 14:27:52 2007 +0100 server: Add support for storing an event to signal upon async I/O completion. --- include/wine/server_protocol.h | 3 ++- server/async.c | 16 ++++++++++++++-- server/protocol.def | 1 + server/trace.c | 3 ++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b97e39a..68cc112 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -162,6 +162,7 @@ typedef struct void *callback; void *iosb; void *arg; + obj_handle_t event; } async_data_t; @@ -4699,6 +4700,6 @@ union generic_reply struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; }; -#define SERVER_PROTOCOL_VERSION 283 +#define SERVER_PROTOCOL_VERSION 284 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/async.c b/server/async.c index b88f8f5..bc5893a 100644 --- a/server/async.c +++ b/server/async.c @@ -38,6 +38,7 @@ struct async struct thread *thread; /* owning thread */ struct list queue_entry; /* entry in file descriptor queue */ struct timeout_user *timeout; + struct event *event; async_data_t data; /* data for async I/O call */ }; @@ -73,6 +74,7 @@ static void async_destroy( struct object *obj ) assert( obj->ops == &async_ops ); if (async->timeout) remove_timeout_user( async->timeout ); + if (async->event) release_object( async->event ); release_object( async->thread ); } @@ -109,11 +111,20 @@ static void async_timeout( void *private ) struct async *create_async( struct thread *thread, const struct timeval *timeout, struct list *queue, const async_data_t *data ) { - struct async *async = alloc_object( &async_ops ); + struct event *event = NULL; + struct async *async; - if (!async) return NULL; + if (data->event && !(event = get_event_obj( thread->process, data->event, EVENT_MODIFY_STATE ))) + return NULL; + + if (!(async = alloc_object( &async_ops ))) + { + if (event) release_object( event ); + return NULL; + } async->thread = (struct thread *)grab_object( thread ); + async->event = event; async->data = *data; list_add_tail( queue, &async->queue_entry ); @@ -121,6 +132,7 @@ struct async *create_async( struct thread *thread, const struct timeval *timeout if (timeout) async->timeout = add_timeout_user( timeout, async_timeout, async ); else async->timeout = NULL; + if (event) reset_event( event ); return async; } diff --git a/server/protocol.def b/server/protocol.def index 145fbeb..3d0618a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -178,6 +178,7 @@ typedef struct void *callback; /* client-side callback to call upon end of async */ void *iosb; /* I/O status block in client addr space */ void *arg; /* opaque user data to pass to callback */ + obj_handle_t event; /* event to signal when done */ } async_data_t; /* structures for extra message data */ diff --git a/server/trace.c b/server/trace.c index a840c13..d04c4c5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -245,7 +245,8 @@ static void dump_apc_result( const apc_result_t *result ) static void dump_async_data( const async_data_t *data ) { - fprintf( stderr, "{callback=%p,iosb=%p,arg=%p}", data->callback, data->iosb, data->arg ); + fprintf( stderr, "{callback=%p,iosb=%p,arg=%p,event=%p}", + data->callback, data->iosb, data->arg, data->event ); } static void dump_luid( const luid_t *luid )

1 0

Alexandre Julliard : server: Notify the async object when the APC call completed.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 8adce7765a55e356e6dddd672f312ef9c6acdd5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8adce7765a55e356e6dddd672… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 21 14:28:23 2007 +0100 server: Notify the async object when the APC call completed. --- server/async.c | 17 +++++++++++++++++ server/file.h | 1 + server/thread.c | 4 ++++ 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/server/async.c b/server/async.c index bc5893a..2d8018a 100644 --- a/server/async.c +++ b/server/async.c @@ -136,6 +136,23 @@ struct async *create_async( struct thread *thread, const struct timeval *timeout return async; } +/* store the result of the client-side async callback */ +void async_set_result( struct object *obj, unsigned int status ) +{ + struct async *async = (struct async *)obj; + + if (obj->ops != &async_ops) return; /* in case the client messed up the APC results */ + + if (status == STATUS_PENDING) + { + /* FIXME: restart the async operation */ + } + else + { + if (async->event) set_event( async->event ); + } +} + /* terminate the async operation at the head of the queue */ void async_terminate_head( struct list *queue, unsigned int status ) { diff --git a/server/file.h b/server/file.h index ae98cf1..de5bf3a 100644 --- a/server/file.h +++ b/server/file.h @@ -124,6 +124,7 @@ extern struct object *create_serial( struct fd *fd, unsigned int options ); /* async I/O functions */ extern struct async *create_async( struct thread *thread, const struct timeval *timeout, struct list *queue, const async_data_t *data ); +extern void async_set_result( struct object *obj, unsigned int status ); extern void async_terminate_head( struct list *queue, unsigned int status ); extern void async_terminate_queue( struct list *queue, unsigned int status ); diff --git a/server/thread.c b/server/thread.c index 6323110..dfa7411 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1246,6 +1246,10 @@ DECL_HANDLER(get_apc) apc->result.create_thread.handle = handle; clear_error(); /* ignore errors from the above calls */ } + else if (apc->result.type == APC_ASYNC_IO) + { + if (apc->owner) async_set_result( apc->owner, apc->result.async_io.status ); + } wake_up( &apc->obj, 0 ); close_handle( current->process, req->prev ); release_object( apc );

1 0

Alexandre Julliard : server: Move the signalling of the completion event for NtRead/ WriteFile to the server.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: ed016f9bb6b592bf8498501a288121f9f66631e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed016f9bb6b592bf8498501a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 21 14:29:19 2007 +0100 server: Move the signalling of the completion event for NtRead/WriteFile to the server. --- dlls/ntdll/file.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b15e5b5..c25e229 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -299,8 +299,6 @@ static void fileio_terminate(async_fileio *fileio, IO_STATUS_BLOCK* iosb) { TRACE("data: %p\n", fileio); - if (fileio->event) NtSetEvent( fileio->event, NULL ); - if (fileio->apc && (iosb->u.Status == STATUS_SUCCESS || fileio->queue_apc_on_error)) fileio->apc( fileio->apc_user, iosb, iosb->Information ); @@ -321,6 +319,7 @@ static ULONG fileio_queue_async(async_fileio* fileio, IO_STATUS_BLOCK* iosb, req->async.callback = apc; req->async.iosb = iosb; req->async.arg = fileio; + req->async.event = fileio->event; req->type = do_read ? ASYNC_TYPE_READ : ASYNC_TYPE_WRITE; req->count = (fileio->count < iosb->Information) ? 0 : fileio->count - iosb->Information; @@ -573,7 +572,6 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, fileio->queue_apc_on_error = 0; fileio->avail_mode = (flags & FD_FLAG_AVAILABLE); fileio->event = hEvent; - if (hEvent) NtResetEvent(hEvent, NULL); if (needs_close) close( unix_handle ); io_status->u.Status = STATUS_PENDING; @@ -804,7 +802,6 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, fileio->queue_apc_on_error = 0; fileio->avail_mode = (flags & FD_FLAG_AVAILABLE); fileio->event = hEvent; - if (hEvent) NtResetEvent(hEvent, NULL); if (needs_close) close( unix_handle ); io_status->Information = 0;

1 0

lostwages/templates/en fun_projects.template
by Jeremy Newman 21 Mar '07

21 Mar '07

ChangeSet ID: 30990 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/03/21 15:55:09 Modified files: templates/en : fun_projects.template Log message: Detlef Riekenberg <wine.dev(a)web.de> Add anchor to all "Fun Projects" Patch: http://cvs.winehq.org/patch.py?id=30990 Old revision New revision Changes Path 1.31 1.32 +30 -30 lostwages/templates/en/fun_projects.template

1 0

bugzilla/ ./defparams.pl Bugzilla/BugMail.pm
by Jeremy Newman 21 Mar '07

21 Mar '07

ChangeSet ID: 30989 CVSROOT: /opt/cvs-commit Module name: bugzilla Changes by: jnewman(a)winehq.org 2007/03/21 15:53:07 Modified files: . : defparams.pl Bugzilla : BugMail.pm Log message: Jan Zerebecki <jan.wine(a)zerebecki.de> Add product and component header in notification mails. Patch: http://cvs.winehq.org/patch.py?id=30989 Old revision New revision Changes Path 1.3 1.4 +2 -0 bugzilla/defparams.pl 1.1.1.1 1.2 +2 -0 bugzilla/Bugzilla/BugMail.pm Index: bugzilla/defparams.pl diff -u -p bugzilla/defparams.pl:1.3 bugzilla/defparams.pl:1.4 --- bugzilla/defparams.pl:1.3 21 Mar 2007 20:53: 7 -0000 +++ bugzilla/defparams.pl 21 Mar 2007 20:53: 7 -0000 @@ -494,6 +494,8 @@ To use the wonders of Bugzilla, you can To: %to% Subject: [Bug %bugid%] %neworchanged%%summary% X-Bugzilla-Reason: %reasonsheader% +X-Bugzilla-Product: %product% +X-Bugzilla-Component: %component% %urlbase%show_bug.cgi?id=%bugid% Index: bugzilla/Bugzilla/BugMail.pm diff -u -p bugzilla/Bugzilla/BugMail.pm:1.1.1.1 bugzilla/Bugzilla/BugMail.pm:1.2 --- bugzilla/Bugzilla/BugMail.pm:1.1.1.1 21 Mar 2007 20:53: 7 -0000 +++ bugzilla/Bugzilla/BugMail.pm 21 Mar 2007 20:53: 7 -0000 @@ -855,6 +855,8 @@ sub NewProcessOnePerson ($$$$$$$$$$$$$) } else { $substs{"diffs"} = $difftext . "\n\n" . $newcomments; } + $substs{"product"} = $values{'product'}; + $substs{"component"} = $values{'component'}; $substs{"summary"} = $values{'short_desc'}; $substs{"reasonsheader"} = join(" ", @reasons); $substs{"reasonsbody"} = $reasonsbody;

1 0

Alexandre Julliard : setupapi: Add support for .inf files in utf-8 format.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 31ade1eb67e6b55f1b0c09ef7a806cd53652b1e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ade1eb67e6b55f1b0c09ef7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 21 13:52:43 2007 +0100 setupapi: Add support for .inf files in utf-8 format. --- dlls/setupapi/parser.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 3ebb86a..f77b1a1 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -959,10 +959,21 @@ static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, UINT *err if (!RtlIsTextUnicode( buffer, size, NULL )) { - WCHAR *new_buff = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ); - if (new_buff) + static const BYTE utf8_bom[3] = { 0xef, 0xbb, 0xbf }; + WCHAR *new_buff; + UINT codepage = CP_ACP; + UINT offset = 0; + + if (size > sizeof(utf8_bom) && !memcmp( buffer, utf8_bom, sizeof(utf8_bom) )) + { + codepage = CP_UTF8; + offset = sizeof(utf8_bom); + } + + if ((new_buff = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) { - DWORD len = MultiByteToWideChar( CP_ACP, 0, buffer, size, new_buff, size ); + DWORD len = MultiByteToWideChar( codepage, 0, (char *)buffer + offset, + size - offset, new_buff, size ); err = parse_buffer( file, new_buff, new_buff + len, error_line ); HeapFree( GetProcessHeap(), 0, new_buff ); }

1 0