May 2008 - Wine-commits - list.winehq.org

Kirill K. Smirnov : winhelp: Updated Russian translation.
by Alexandre Julliard 09 May '08

09 May '08

Module: wine Branch: master Commit: 2ed647a12c9582889e4301b5ccf3b40550a51695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed647a12c9582889e4301b5c… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu May 8 17:07:36 2008 +0400 winhelp: Updated Russian translation. --- programs/winhelp/Ru.rc | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/Ru.rc b/programs/winhelp/Ru.rc index 8f885c7..4f760a7 100644 --- a/programs/winhelp/Ru.rc +++ b/programs/winhelp/Ru.rc @@ -76,5 +76,28 @@ STID_TOPICS, "& STID_ALL_FILES, "�� (*.*)" STID_HELP_FILES_HLP, "�� (*.hlp)" STID_FILE_NOT_FOUND_s "�� '%s'. �� ?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_NO_RICHEDIT "�� richedit" } + +CONTEXT_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +BEGIN + POPUP "" + BEGIN + MENUITEM "��...", MNID_CTXT_ANNOTATE + MENUITEM "��", MNID_CTXT_COPY + MENUITEM "��...", MNID_CTXT_PRINT + POPUP "��" + BEGIN + MENUITEM "��", MNID_CTXT_FONTS_SMALL + MENUITEM "��", MNID_CTXT_FONTS_NORMAL + MENUITEM "��", MNID_CTXT_FONTS_LARGE + END + POPUP "�� " + BEGIN + MENUITEM "�� ", MNID_CTXT_HELP_DEFAULT + MENUITEM "��", MNID_CTXT_HELP_VISIBLE + MENUITEM "�� ", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "�� ", MNID_CTXT_SYSTEM_COLORS + END +END

1 0

Alexandre Julliard : services: Send the service name in the control requests.
by Alexandre Julliard 09 May '08

09 May '08

Module: wine Branch: master Commit: 33914a1bf426f0d0d0670263b5b9f6fb24a87251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33914a1bf426f0d0d0670263b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 8 18:08:41 2008 +0200 services: Send the service name in the control requests. Only start a single dispatcher thread for all services. --- dlls/advapi32/service.c | 185 ++++++++++++++++++++++++------------------ include/wine/svcctl.idl | 21 +++-- programs/services/rpc.c | 23 ++++-- programs/services/services.c | 25 +++--- 4 files changed, 148 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33914a1bf426f0d0d0670…

1 0

Alexandre Julliard : user32: The client rectangle is in screen coordinates for the initial WM_NCCALCSIZE .
by Alexandre Julliard 08 May '08

08 May '08

Module: wine Branch: master Commit: 5714c4deee6f3c0cc30098d056fa4ce39a333878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5714c4deee6f3c0cc30098d05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 8 11:12:03 2008 +0200 user32: The client rectangle is in screen coordinates for the initial WM_NCCALCSIZE. --- dlls/user32/tests/win.c | 9 +++++++++ dlls/user32/win.c | 7 +++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 26ceb55..21119d5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3929,6 +3929,15 @@ static LRESULT CALLBACK winsizes_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM expected_rect.left, expected_rect.top, expected_rect.right, expected_rect.bottom ); return DefWindowProc(hwnd, msg, wp, lp); } + case WM_NCCALCSIZE: + { + RECT rect, *r = (RECT *)lp; + GetWindowRect( hwnd, &rect ); + ok( !memcmp( &rect, r, sizeof(rect) ), + "passed rect %d,%d-%d,%d doesn't match window rect %d,%d-%d,%d\n", + r->left, r->top, r->right, r->bottom, rect.left, rect.top, rect.right, rect.bottom ); + return DefWindowProc(hwnd, msg, wp, lp); + } default: return DefWindowProc(hwnd, msg, wp, lp); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a1f3024..8214fd5 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1139,11 +1139,18 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, LPCWSTR className, UINT flags if ((wndPtr = WIN_GetPtr(hwnd))) { /* yes, even if the CBT hook was called with HWND_TOP */ + POINT pt; HWND insert_after = (wndPtr->dwStyle & WS_CHILD) ? HWND_BOTTOM : HWND_TOP; RECT window_rect = wndPtr->rectWindow; RECT client_rect = window_rect; WIN_ReleasePtr( wndPtr ); + + /* the rectangle is in screen coords for WM_NCCALCSIZE when wparam is FALSE */ + pt.x = pt.y = 0; + MapWindowPoints( parent, 0, &pt, 1 ); + OffsetRect( &client_rect, pt.x, pt.y ); SendMessageW( hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&client_rect ); + OffsetRect( &client_rect, -pt.x, -pt.y ); set_window_pos( hwnd, insert_after, SWP_NOACTIVATE, &window_rect, &client_rect, NULL ); } else return 0;

1 0

Paul Vriens : services.exe: Spelling fixes.
by Alexandre Julliard 08 May '08

08 May '08

Module: wine Branch: master Commit: df2120e5869b48a5270d7945940456cabef6a994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df2120e5869b48a5270d79459… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu May 8 08:21:19 2008 +0200 services.exe: Spelling fixes. --- programs/services/services.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 0a23fc8..5b5fbc0 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -274,7 +274,7 @@ BOOL validate_service_config(struct service_entry *entry) { if (entry->config.dwServiceType & SERVICE_WIN32 && (entry->config.lpBinaryPathName == NULL || !entry->config.lpBinaryPathName[0])) { - WINE_ERR("Service %s is Win32 but have no image path set\n", wine_dbgstr_w(entry->name)); + WINE_ERR("Service %s is Win32 but has no image path set\n", wine_dbgstr_w(entry->name)); return FALSE; } @@ -296,18 +296,18 @@ BOOL validate_service_config(struct service_entry *entry) } break; default: - WINE_ERR("Service %s have unknown service type\n", wine_dbgstr_w(entry->name)); + WINE_ERR("Service %s has an unknown service type\n", wine_dbgstr_w(entry->name)); return FALSE; } /* StartType can only be a single value (if several values are mixed the result is probably not what was intended) */ if (entry->config.dwStartType > SERVICE_DISABLED) { - WINE_ERR("Service %s have unknown start type\n", wine_dbgstr_w(entry->name)); + WINE_ERR("Service %s has an unknown start type\n", wine_dbgstr_w(entry->name)); return FALSE; } - /* SERVICE_BOOT_START and SERVICE_SYSTEM_START or only allowed for driver services */ + /* SERVICE_BOOT_START and SERVICE_SYSTEM_START are only allowed for driver services */ if (((entry->config.dwStartType == SERVICE_BOOT_START) || (entry->config.dwStartType == SERVICE_SYSTEM_START)) && ((entry->config.dwServiceType & SERVICE_WIN32_OWN_PROCESS) || (entry->config.dwServiceType & SERVICE_WIN32_SHARE_PROCESS))) {

1 0

John Klehm : winex11.drv: Move hardware tablet proximity into x11 layer.
by Alexandre Julliard 08 May '08

08 May '08

Module: wine Branch: master Commit: cd550bf6b4f52b6d5bcc4b62ca7f21a7831eb500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd550bf6b4f52b6d5bcc4b62c… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Wed May 7 15:58:49 2008 -0500 winex11.drv: Move hardware tablet proximity into x11 layer. --- dlls/winex11.drv/wintab.c | 16 ++++++++++++++-- dlls/wintab32/wintab32.c | 8 ++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index d4d7109..333e0b8 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -879,12 +879,15 @@ static void proximity_event( HWND hwnd, XEvent *event ) XProximityNotifyEvent *proximity = (XProximityNotifyEvent *) event; LPWTI_CURSORS_INFO cursor; int curnum = cursor_from_device(proximity->deviceid, &cursor); + LPARAM proximity_info; + + TRACE("hwnd=%p\n", hwnd); + if (curnum < 0) return; memset(&gMsgPacket,0,sizeof(WTPACKET)); - TRACE("Received tablet proximity event\n"); /* Set cursor to inverted if cursor is the eraser */ gMsgPacket.pkStatus = (cursor->TYPE == CSR_TYPE_ERASER ? TPS_INVERT:0); gMsgPacket.pkStatus |= (event->type==proximity_out_type)?TPS_PROXIMITY:0; @@ -900,7 +903,16 @@ static void proximity_event( HWND hwnd, XEvent *event ) gMsgPacket.pkNormalPressure = proximity->axis_data[2]; gMsgPacket.pkButtons = get_button_state(curnum); - SendMessageW(hwndTabletDefault, WT_PROXIMITY, (event->type == proximity_in_type), (LPARAM)hwnd); + /* FIXME: LPARAM loword is true when cursor entering context, false when leaving context + * This needs to be handled here or in wintab32. Using the proximity_in_type is not correct + * but kept for now. + * LPARAM hiword is "non-zero when the cursor is leaving or entering hardware proximity" + * WPARAM contains context handle. + * HWND to HCTX is handled by wintab32. + */ + proximity_info = MAKELPARAM((event->type == proximity_in_type), + (event->type == proximity_in_type) || (event->type == proximity_out_type)); + SendMessageW(hwndTabletDefault, WT_PROXIMITY, (WPARAM)hwnd, proximity_info); } /*********************************************************************** diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 1ef19d9..5f2afb1 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -136,15 +136,11 @@ static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, { WTPACKET packet; LPOPENCONTEXT handler; - LPARAM prox; pGetCurrentPacket(&packet); - handler = AddPacketToContextQueue(&packet,(HWND)lParam); + handler = AddPacketToContextQueue(&packet,(HWND)wParam); if (handler) - { - prox = MAKELPARAM( wParam, 1 ); TABLET_PostTabletMessage(handler, WT_PROXIMITY, - (WPARAM)handler->handle, prox, TRUE); - } + (WPARAM)handler->handle, lParam, TRUE); break; } }

1 0

Maarten Lankhorst : kernel32: Fix temporary path test.
by Alexandre Julliard 08 May '08

08 May '08

Module: wine Branch: master Commit: 864e24d2e586b796c2069576ca6d8fe4e7b8cef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=864e24d2e586b796c2069576c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 7 16:31:02 2008 -0700 kernel32: Fix temporary path test. --- dlls/kernel32/tests/path.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 44a936e..d158df1 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1202,13 +1202,14 @@ static void test_drive_letter_case(void) ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); + /* TEMP is an environment variable, so it can't be tested for case-sensitivity */ memset(buf, 0, sizeof(buf)); SetLastError(0xdeadbeef); ret = GetTempPath(sizeof(buf), buf); ok(ret, "GetTempPath error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); - ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); + ok(buf[strlen(buf)-1] == '\\', "Temporary path (%s) doesn't end in a slash\n", buf); memset(buf, 0, sizeof(buf)); SetLastError(0xdeadbeef);

1 0

Dylan Smith : wordpad: Empty the richedit undo buffer on creation.
by Alexandre Julliard 08 May '08

08 May '08

Module: wine Branch: master Commit: 2b52dd845097f16076c0185b02a003f63898dcab URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b52dd845097f16076c0185b0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu May 8 00:07:59 2008 -0400 wordpad: Empty the richedit undo buffer on creation. --- programs/wordpad/wordpad.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index cec080c..4fa8009 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2419,6 +2419,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar set_caption(NULL); set_bar_states(); set_fileformat(SF_RTF); + SendMessageW(hEditorWnd, EM_EMPTYUNDOBUFFER, 0, 0); hPopupMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_POPUP)); get_default_printer_opts(); target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]);

1 0

Guy Albertelli : listview: Return correct value from WM_NOTIFYFORMAT with test.
by Alexandre Julliard 08 May '08

08 May '08

Module: wine Branch: master Commit: 09cb415109447c4be086f1c756f8a168628457f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09cb415109447c4be086f1c75… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Thu May 8 00:46:38 2008 -0400 listview: Return correct value from WM_NOTIFYFORMAT with test. --- dlls/comctl32/listview.c | 9 ++++----- dlls/comctl32/tests/listview.c | 3 +++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e743531..26a9eb2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8972,11 +8972,10 @@ static LRESULT LISTVIEW_NotifyFormat(LISTVIEW_INFO *infoPtr, HWND hwndFrom, INT { TRACE("(hwndFrom=%p, nCommand=%d)\n", hwndFrom, nCommand); - if (nCommand != NF_REQUERY) return 0; - - infoPtr->notifyFormat = SendMessageW(hwndFrom, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); - - return 0; + if (nCommand == NF_REQUERY) + infoPtr->notifyFormat = SendMessageW(hwndFrom, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); + + return infoPtr->notifyFormat; } /*** diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 838691c..91f9d00 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -856,6 +856,9 @@ static void test_icon_spacing(void) hwnd = create_custom_listview_control(LVS_ICON); ok(hwnd != NULL, "failed to create a listview window\n"); + r = SendMessage(hwnd, WM_NOTIFYFORMAT, (WPARAM)hwndparent, (LPARAM)NF_REQUERY); + expect(NFR_ANSI, r); + flush_sequences(sequences, NUM_MSG_SEQUENCES); trace("test icon spacing\n");

1 0

Vitaly Lipatov : wineboot: Add missed short option -u.
by Alexandre Julliard 08 May '08

08 May '08

Module: wine Branch: master Commit: 6bca330d4d41b86a9703a124489196fd90eed9a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bca330d4d41b86a9703a1244… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Wed May 7 23:02:56 2008 +0400 wineboot: Add missed short option -u. --- programs/wineboot/wineboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index a682e65..717a175 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -798,7 +798,7 @@ static void usage(void) WINE_MESSAGE( " -u,--update Update the wineprefix directory\n" ); } -static const char short_options[] = "efhikrs"; +static const char short_options[] = "efhikrsu"; static const struct option long_options[] = {

1 0

Nikolay Sivov : gdiplus: Let GdipDrawArcI use float args version.
by Alexandre Julliard 08 May '08

08 May '08

Module: wine Branch: master Commit: a77dc34b41482c31989e9b664dc35bb7570c8692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77dc34b41482c31989e9b664… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu May 8 00:39:05 2008 +0400 gdiplus: Let GdipDrawArcI use float args version. --- dlls/gdiplus/graphics.c | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 416741c..a86a015 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -932,22 +932,7 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics *graphics, GpPen *pen, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) { - INT save_state, num_pts; - GpPointF points[MAX_ARC_PTS]; - GpStatus retval; - - if(!graphics || !pen || width <= 0 || height <= 0) - return InvalidParameter; - - num_pts = arc2polybezier(points, x, y, width, height, startAngle, sweepAngle); - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, points, num_pts, TRUE); - - restore_dc(graphics, save_state); - - return retval; + return GdipDrawArc(graphics,pen,(REAL)x,(REAL)y,(REAL)width,(REAL)height,startAngle,sweepAngle); } GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1,

1 0