September 2011 - Wine-commits

Francois Gouget : po: Remove English strings from the Esperanto translation .
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 736d6369648313104f2da6ab89b6f4b24e2522ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=736d6369648313104f2da6ab8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 21:55:01 2011 +0200 po: Remove English strings from the Esperanto translation. --- po/eo.po | 30 +++++++++--------------------- 1 files changed, 9 insertions(+), 21 deletions(-) diff --git a/po/eo.po b/po/eo.po index 8035822..99fb3ea 100644 --- a/po/eo.po +++ b/po/eo.po @@ -5472,8 +5472,6 @@ msgid "" "The specified installation package could not be opened. Please check the " "file path and try again." msgstr "" -"The specified installation package could not be opened. Please check the " -"file path and try again." #: msi.rc:28 msgid "path %s not found" @@ -6417,11 +6415,11 @@ msgstr "Original location" #: shell32.rc:146 msgid "Date deleted" -msgstr "Date deleted" +msgstr "" #: shell32.rc:156 msgid "Control Panel" -msgstr "Control Panel" +msgstr "" #: shell32.rc:163 msgid "Select" @@ -6681,32 +6679,27 @@ msgid "" "\n" "Do you want to replace it?" msgstr "" -"This folder already contains a file called '%1'.\n" -"\n" -"Do you want to replace it?" #: shell32.rc:172 msgid "Are you sure you want to delete the selected item(s)?" -msgstr "Are you sure you want to delete the selected item(s)?" +msgstr "" #: shell32.rc:174 msgid "" "Are you sure that you want to send '%1' and all its content to the Trash?" msgstr "" -"Are you sure that you want to send '%1' and all its content to the Trash?" #: shell32.rc:173 msgid "Are you sure that you want to send '%1' to the Trash?" -msgstr "Are you sure that you want to send '%1' to the Trash?" +msgstr "" #: shell32.rc:175 msgid "Are you sure that you want to send these %1 items to the Trash?" -msgstr "Are you sure that you want to send these %1 items to the Trash?" +msgstr "" #: shell32.rc:176 msgid "The item '%1' can't be sent to Trash. Do you want to delete it instead?" msgstr "" -"The item '%1' can't be sent to Trash. Do you want to delete it instead?" #: shell32.rc:183 msgid "" @@ -6716,19 +6709,14 @@ msgid "" "selected folder they will be replaced. Do you still want to move or copy\n" "the folder?" msgstr "" -"This folder already contains a folder named '%1'.\n" -"\n" -"If the files in the destination folder have the same names as files in the\n" -"selected folder they will be replaced. Do you still want to move or copy\n" -"the folder?" #: shell32.rc:248 msgid "New Folder" -msgstr "New Folder" +msgstr "" #: shell32.rc:250 msgid "Wine Control Panel" -msgstr "Wine Control Panel" +msgstr "" #: shell32.rc:192 msgid "Unable to display Run File dialog box (internal error)" @@ -10776,11 +10764,11 @@ msgstr "Helpaj dosieroj (*.hlp)" #: winhlp32.rc:89 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "Cannot find '%s'. Do you want to find this file yourself?" +msgstr "" #: winhlp32.rc:90 msgid "Cannot find a richedit implementation... Aborting" -msgstr "Cannot find a richedit implementation... Aborting" +msgstr "" #: winhlp32.rc:91 msgid "Help topics: "

1 0

Francois Gouget : po: Remove English strings from the Danish translation.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 718837171242e189e701c6960555904c22436ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=718837171242e189e701c6960… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 21:56:31 2011 +0200 po: Remove English strings from the Danish translation. --- po/da.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 94fee7f..470e65f 100644 --- a/po/da.po +++ b/po/da.po @@ -5076,15 +5076,15 @@ msgstr "Adresse fejl\n" #: winerror.mc:3261 msgid "Floating-point divide-by-zero\n" -msgstr "Floating-point divide-by-zero\n" +msgstr "" #: winerror.mc:3266 msgid "Floating-point underflow\n" -msgstr "Floating-point underflow\n" +msgstr "" #: winerror.mc:3271 msgid "Floating-point overflow\n" -msgstr "Floating-point overflow\n" +msgstr "" #: winerror.mc:3276 msgid "No more entries\n" @@ -9891,6 +9891,7 @@ msgstr "" "under visse betingelser; kør 'start /L' for yderligere oplysninger.\n" #: start.rc:64 +#, fuzzy msgid "" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "This program is free software; you can redistribute it and/or\n"

1 0

Francois Gouget : po: Remove English strings from the Bulgarian translation .
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 6025d9b90110e2af53008c227f30ac95c82faf05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6025d9b90110e2af53008c227… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 21:58:03 2011 +0200 po: Remove English strings from the Bulgarian translation. --- po/bg.po | 129 ++++++++++++++++---------------------------------------------- 1 files changed, 33 insertions(+), 96 deletions(-) diff --git a/po/bg.po b/po/bg.po index 5b93c2a..4294a0f 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2000,9 +2000,8 @@ msgid "Object" msgstr "" #: dxdiagn.rc:25 -#, fuzzy msgid "Regional Setting" -msgstr "Default Settings" +msgstr "" #: dxdiagn.rc:26 msgid "%uMB used, %uMB available" @@ -2193,9 +2192,8 @@ msgid "&Help" msgstr "&Помощ" #: ieframe.rc:57 -#, fuzzy msgid "&About Internet Explorer" -msgstr "&About Notepad" +msgstr "" #: ieframe.rc:67 msgctxt "home page" @@ -2386,9 +2384,8 @@ msgid "Invalid handle\n" msgstr "" #: winerror.mc:61 -#, fuzzy msgid "Memory trashed\n" -msgstr "Memory Monitor" +msgstr "" #: winerror.mc:66 #, fuzzy @@ -2479,14 +2476,12 @@ msgid "Out of paper\n" msgstr "Няма хартия; " #: winerror.mc:171 -#, fuzzy msgid "Write fault\n" -msgstr "Default" +msgstr "" #: winerror.mc:176 -#, fuzzy msgid "Read fault\n" -msgstr "Default" +msgstr "" #: winerror.mc:181 msgid "General failure\n" @@ -2535,9 +2530,8 @@ msgid "Bad network path\n" msgstr "" #: winerror.mc:236 -#, fuzzy msgid "Network busy\n" -msgstr "Network share" +msgstr "" #: winerror.mc:241 #, fuzzy @@ -2577,9 +2571,8 @@ msgid "Print cancelled\n" msgstr "" #: winerror.mc:286 -#, fuzzy msgid "Network name deleted\n" -msgstr "Date deleted" +msgstr "" #: winerror.mc:291 msgid "Network access denied\n" @@ -2590,9 +2583,8 @@ msgid "Bad device type\n" msgstr "" #: winerror.mc:301 -#, fuzzy msgid "Bad network name\n" -msgstr "Network share" +msgstr "" #: winerror.mc:306 msgid "Too many network names\n" @@ -2646,9 +2638,8 @@ msgid "Invalid parameter\n" msgstr "Невалидни знаци в пътя" #: winerror.mc:366 -#, fuzzy msgid "Net write fault\n" -msgstr "Default" +msgstr "" #: winerror.mc:371 msgid "No process slots\n" @@ -2817,9 +2808,8 @@ msgid "Drive is busy\n" msgstr "Устройства" #: winerror.mc:581 -#, fuzzy msgid "Same drive\n" -msgstr "System drive" +msgstr "" #: winerror.mc:586 msgid "Not toplevel directory\n" @@ -2906,9 +2896,8 @@ msgid "Lock failed\n" msgstr "" #: winerror.mc:691 -#, fuzzy msgid "Resource in use\n" -msgstr "Resource Failures" +msgstr "" #: winerror.mc:696 #, fuzzy @@ -3251,9 +3240,8 @@ msgid "Not registry file\n" msgstr "&Вмъкни файл в регистъра..." #: winerror.mc:1106 -#, fuzzy msgid "Key deleted\n" -msgstr "Date deleted" +msgstr "" #: winerror.mc:1111 msgid "No registry log space\n" @@ -3669,9 +3657,8 @@ msgid "Moving the replacement file failed\n" msgstr "" #: winerror.mc:1611 -#, fuzzy msgid "The journal is being deleted\n" -msgstr "Date deleted" +msgstr "" #: winerror.mc:1616 msgid "The journal is not active\n" @@ -3811,9 +3798,8 @@ msgid "Connection is active\n" msgstr "" #: winerror.mc:1786 -#, fuzzy msgid "Network unreachable\n" -msgstr "Network share" +msgstr "" #: winerror.mc:1791 msgid "Host unreachable\n" @@ -4907,9 +4893,8 @@ msgid "Unsupported name syntax\n" msgstr "" #: winerror.mc:3111 -#, fuzzy msgid "No network address\n" -msgstr "Network share" +msgstr "" #: winerror.mc:3116 msgid "Duplicate endpoint\n" @@ -5320,9 +5305,8 @@ msgid "Already awaiting printer handle\n" msgstr "" #: winerror.mc:3611 -#, fuzzy msgid "Printer deleted\n" -msgstr "Date deleted" +msgstr "" #: winerror.mc:3616 #, fuzzy @@ -5499,7 +5483,6 @@ msgid "insert disk %s" msgstr "поставете диск %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5531,35 +5514,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -5897,9 +5851,8 @@ msgid "" msgstr "" #: oledlg.rc:27 shell32.rc:194 -#, fuzzy msgid "Browse" -msgstr "&Browse View" +msgstr "" #: oledlg.rc:28 msgid "" @@ -5908,9 +5861,8 @@ msgid "" msgstr "" #: oledlg.rc:29 -#, fuzzy msgid "Add Control" -msgstr "Control" +msgstr "" #: oledlg.rc:34 msgid "Inserts the contents of the clipboard into your document as %s." @@ -6897,9 +6849,8 @@ msgid "&Close\tAlt-F4" msgstr "&Затвори\tAlt-F4" #: user32.rc:35 -#, fuzzy msgid "&About Wine" -msgstr "&About Notepad" +msgstr "" #: user32.rc:46 #, fuzzy @@ -7634,9 +7585,8 @@ msgid "Timeout" msgstr "" #: wldap32.rc:113 -#, fuzzy msgid "Auth Unknown" -msgstr "Context Unknown" +msgstr "" #: wldap32.rc:114 msgid "Filter Error" @@ -7744,9 +7694,8 @@ msgid "&Always on Top" msgstr "" #: clock.rc:42 -#, fuzzy msgid "&About Clock" -msgstr "&About Notepad" +msgstr "" #: clock.rc:48 msgid "Clock" @@ -8460,9 +8409,8 @@ msgid "Connection is being made" msgstr "LAN връзка" #: net.rc:49 -#, fuzzy msgid "Reconnecting" -msgstr "Default Settings" +msgstr "" #: net.rc:40 msgid "The following services are running:\n" @@ -8750,9 +8698,8 @@ msgid "&Refresh\tF5" msgstr "&Обнови\tF5" #: oleview.rc:71 -#, fuzzy msgid "&About OleView" -msgstr "&About Notepad" +msgstr "" #: oleview.rc:79 #, fuzzy @@ -9013,9 +8960,8 @@ msgid "&Arrange Icons" msgstr "" #: progman.rc:54 -#, fuzzy msgid "&About Program Manager" -msgstr "&About Notepad" +msgstr "" #: progman.rc:60 msgid "Program Manager" @@ -9264,9 +9210,8 @@ msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" #: regedit.rc:201 -#, fuzzy msgid "(Default)" -msgstr "Default" +msgstr "" #: regedit.rc:202 msgid "(value not set)" @@ -9614,9 +9559,8 @@ msgid "&Bring To Front" msgstr "" #: taskmgr.rc:90 -#, fuzzy msgid "&About Task Manager" -msgstr "&About Notepad" +msgstr "" #: taskmgr.rc:120 msgid "&Switch To" @@ -10292,9 +10236,8 @@ msgid "Controls Background" msgstr "&Копирай фона" #: winecfg.rc:96 -#, fuzzy msgid "Controls Text" -msgstr "Control" +msgstr "" #: winecfg.rc:98 #, fuzzy @@ -10376,9 +10319,8 @@ msgid "Inactive Border" msgstr "" #: winecfg.rc:116 -#, fuzzy msgid "Controls Shadow" -msgstr "Control Panel" +msgstr "" #: winecfg.rc:117 msgid "Gray Text" @@ -10393,9 +10335,8 @@ msgid "Controls Dark Shadow" msgstr "" #: winecfg.rc:120 -#, fuzzy msgid "Controls Light" -msgstr "Control" +msgstr "" #: winecfg.rc:121 msgid "Controls Alternate Background" @@ -10422,9 +10363,8 @@ msgid "Menu Bar" msgstr "" #: wineconsole.rc:26 -#, fuzzy msgid "Set &Defaults" -msgstr "Default" +msgstr "" #: wineconsole.rc:28 msgid "&Mark" @@ -10625,9 +10565,8 @@ msgid "Tile &Vertically\tCtrl+F4" msgstr "Маркирай &всичко\tCtrl+A" #: winefile.rc:87 -#, fuzzy msgid "&About Wine File Manager" -msgstr "&About Notepad" +msgstr "" #: winefile.rc:93 msgid "Applying font settings" @@ -10715,9 +10654,8 @@ msgid "&Fastest Times" msgstr "" #: winemine.rc:49 -#, fuzzy msgid "&About WineMine" -msgstr "&About Notepad" +msgstr "" #: winemine.rc:27 msgid "WineMine" @@ -10887,9 +10825,8 @@ msgid "&Statusbar" msgstr "" #: wordpad.rc:73 -#, fuzzy msgid "&Options..." -msgstr "&Options" +msgstr "" #: wordpad.rc:75 msgid "&Insert"

1 0

Alexandre Julliard : winex11: Explicitly clip to the visible rect when using the XRender SRCCOPY optimization .
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: cf4cd2973cbf35fccb8b067fe56f20f81ae2fb8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4cd2973cbf35fccb8b067fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 19 17:49:57 2011 +0200 winex11: Explicitly clip to the visible rect when using the XRender SRCCOPY optimization. --- dlls/winex11.drv/xrender.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index f85c5c1..9b8c9f4 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2333,7 +2333,7 @@ static void get_colors( struct xrender_physdev *physdev_src, struct xrender_phys } static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xrender_physdev *physdev_dst, - Drawable drawable, const struct bitblt_coords *src, + Drawable drawable, HRGN clip, const struct bitblt_coords *src, const struct bitblt_coords *dst ) { int width = abs( dst->width ); @@ -2344,6 +2344,7 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr Picture src_pict = 0, dst_pict, mask_pict = 0; BOOL use_repeat; double xscale, yscale; + RGNDATA *clip_data = NULL; use_repeat = use_source_repeat( physdev_src ); if (!use_repeat) @@ -2357,11 +2358,15 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr { XRenderPictureAttributes pa; + if (clip) clip_data = X11DRV_GetRegionData( clip, 0 ); x_dst = dst->x; y_dst = dst->y; pa.repeat = RepeatNone; wine_tsx11_lock(); dst_pict = pXRenderCreatePicture( gdi_display, drawable, physdev_dst->pict_format, CPRepeat, &pa ); + if (clip_data) + pXRenderSetPictureClipRectangles( gdi_display, dst_pict, 0, 0, + (XRectangle *)clip_data->Buffer, clip_data->rdh.nCount ); wine_tsx11_unlock(); } else @@ -2369,6 +2374,7 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr x_dst = physdev_dst->x11dev->dc_rect.left + dst->x; y_dst = physdev_dst->x11dev->dc_rect.top + dst->y; dst_pict = get_xrender_picture( physdev_dst ); + if (clip) clip_data = add_xrender_clipping_region( physdev_dst, clip ); } if (src->width < 0) x_src += src->width + 1; @@ -2421,6 +2427,9 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr pXRenderFreePicture( gdi_display, dst_pict ); wine_tsx11_unlock(); } + else update_xrender_clipping( physdev_dst, clip_data ); + + HeapFree( GetProcessHeap(), 0, clip_data ); } @@ -2485,7 +2494,7 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, tmp.visrect.bottom - tmp.visrect.top, physdev_dst->x11dev->depth ); wine_tsx11_unlock(); - xrender_stretch_blit( physdev_src, physdev_dst, tmp_pixmap, src, &tmp ); + xrender_stretch_blit( physdev_src, physdev_dst, tmp_pixmap, 0, src, &tmp ); execute_rop( physdev_dst->x11dev, tmp_pixmap, tmpGC, &dst->visrect, rop ); wine_tsx11_lock(); @@ -2493,7 +2502,12 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, XFreeGC( gdi_display, tmpGC ); wine_tsx11_unlock(); } - else xrender_stretch_blit( physdev_src, physdev_dst, 0, src, dst ); + else + { + HRGN rgn = CreateRectRgnIndirect( &dst->visrect ); + xrender_stretch_blit( physdev_src, physdev_dst, 0, rgn, src, dst ); + DeleteObject( rgn ); + } if (physdev_dst != physdev_src) X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); X11DRV_UnlockDIBSection( physdev_dst->x11dev, TRUE );

1 0

Alexandre Julliard : winex11: Avoid passing color shifts to copy_image_bits .
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 3e5f87aee63f5a8d8fc8b94dbcabb5f6a1eaf850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5f87aee63f5a8d8fc8b94db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 19 14:18:23 2011 +0200 winex11: Avoid passing color shifts to copy_image_bits. --- dlls/winex11.drv/bitblt.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index baf5f89..486cfdc 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1534,8 +1534,13 @@ static BOOL matching_color_info( PHYSDEV dev, const ColorShifts *color_shifts, c return FALSE; } +static inline BOOL is_r8g8b8( int depth, const ColorShifts *color_shifts ) +{ + return depth == 24 && color_shifts->logicalBlue.shift == 0 && color_shifts->logicalRed.shift == 16; +} + /* copy the image bits, fixing up alignment and byte swapping as necessary */ -static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, XImage *image, +static DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, struct bitblt_coords *coords, const int *mapping, unsigned int zeropad_mask ) { @@ -1563,8 +1568,7 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, need_byteswap = (image->byte_order != client_byte_order); break; case 24: - need_byteswap = ((image->byte_order == LSBFirst && color_shifts->logicalBlue.shift == 16) || - (image->byte_order == MSBFirst && color_shifts->logicalBlue.shift == 0)); + need_byteswap = (image->byte_order == MSBFirst) ^ !is_r8g8b8; break; default: need_byteswap = FALSE; @@ -1737,7 +1741,7 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info mapping = X11DRV_PALETTE_PaletteToXPixel; } - ret = copy_image_bits( info, color_shifts, image, bits, &dst_bits, src, mapping, ~0u ); + ret = copy_image_bits( info, is_r8g8b8(depth,color_shifts), image, bits, &dst_bits, src, mapping, ~0u ); if (!ret) { @@ -1940,7 +1944,7 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, src_bits.ptr = image->data; src_bits.is_copy = TRUE; - ret = copy_image_bits( info, color_shifts, image, &src_bits, bits, src, mapping, + ret = copy_image_bits( info, is_r8g8b8(depth,color_shifts), image, &src_bits, bits, src, mapping, zeropad_masks[(width * image->bits_per_pixel) & 31] ); if (!ret && bits->ptr == image->data)

1 0

Alexandre Julliard : winex11: Implement a PutImage entry point in the XRender driver.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: d905ba5a33797d9d91c7c291223ee1590c9fc4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d905ba5a33797d9d91c7c2912… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 19 17:46:33 2011 +0200 winex11: Implement a PutImage entry point in the XRender driver. --- dlls/winex11.drv/bitblt.c | 6 +- dlls/winex11.drv/x11drv.h | 3 + dlls/winex11.drv/xrender.c | 295 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 289 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d905ba5a33797d9d91c7c…

1 0

Bernhard Loos : rpcrt4: Switch to non-overlapped named pipe operations and use a thread for the async listen operation .
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: c2feafb96cddc6e55b07964dcd7f7b8dcb33d666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2feafb96cddc6e55b07964dc… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Mon Sep 19 13:01:36 2011 +0200 rpcrt4: Switch to non-overlapped named pipe operations and use a thread for the async listen operation. --- dlls/rpcrt4/rpc_transport.c | 80 ++++++++++++++++++++++--------------------- 1 files changed, 41 insertions(+), 39 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index c2dac67..4632f4a 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -111,8 +111,7 @@ typedef struct _RpcConnection_np { RpcConnection common; HANDLE pipe; - OVERLAPPED read_ovl; - OVERLAPPED write_ovl; + HANDLE listen_thread; BOOL listening; } RpcConnection_np; @@ -122,25 +121,21 @@ static RpcConnection *rpcrt4_conn_np_alloc(void) return &npc->common; } -static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) +static DWORD CALLBACK listen_thread(void *arg) { - if (npc->listening) - return RPC_S_OK; - - npc->listening = TRUE; + RpcConnection_np *npc = arg; for (;;) { - if (ConnectNamedPipe(npc->pipe, &npc->read_ovl)) + if (ConnectNamedPipe(npc->pipe, NULL)) return RPC_S_OK; switch(GetLastError()) { case ERROR_PIPE_CONNECTED: - SetEvent(npc->read_ovl.hEvent); - return RPC_S_OK; - case ERROR_IO_PENDING: - /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ return RPC_S_OK; + case ERROR_HANDLES_CLOSED: + /* connection closed during listen */ + return RPC_S_NO_CONTEXT_AVAILABLE; case ERROR_NO_DATA_DETECTED: /* client has disconnected, retry */ DisconnectNamedPipe( npc->pipe ); @@ -153,12 +148,28 @@ static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) } } +static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) +{ + if (npc->listening) + return RPC_S_OK; + + npc->listening = TRUE; + npc->listen_thread = CreateThread(NULL, 0, listen_thread, npc, 0, NULL); + if (!npc->listen_thread) + { + npc->listening = FALSE; + ERR("Couldn't create listen thread (error was %d)\n", GetLastError()); + return RPC_S_OUT_OF_RESOURCES; + } + return RPC_S_OK; +} + static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) { RpcConnection_np *npc = (RpcConnection_np *) Connection; TRACE("listening on %s\n", pname); - npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, PIPE_UNLIMITED_INSTANCES, RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); @@ -170,9 +181,6 @@ static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pnam return RPC_S_CANT_CREATE_ENDPOINT; } - npc->read_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - npc->write_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - /* Note: we don't call ConnectNamedPipe here because it must be done in the * server thread as the thread must be alertable */ return RPC_S_OK; @@ -231,8 +239,6 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, /* pipe is connected; change to message-read mode. */ dwMode = PIPE_READMODE_MESSAGE; SetNamedPipeHandleState(pipe, &dwMode, NULL, NULL); - npc->read_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - npc->write_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); npc->pipe = pipe; return RPC_S_OK; @@ -360,11 +366,9 @@ static void rpcrt4_conn_np_handoff(RpcConnection_np *old_npc, RpcConnection_np * * to the child, then reopen the server binding to continue listening */ new_npc->pipe = old_npc->pipe; - new_npc->read_ovl = old_npc->read_ovl; - new_npc->write_ovl = old_npc->write_ovl; + new_npc->listen_thread = old_npc->listen_thread; old_npc->pipe = 0; - memset(&old_npc->read_ovl, 0, sizeof(old_npc->read_ovl)); - memset(&old_npc->write_ovl, 0, sizeof(old_npc->write_ovl)); + old_npc->listen_thread = 0; old_npc->listening = FALSE; } @@ -413,9 +417,7 @@ static int rpcrt4_conn_np_read(RpcConnection *Connection, while (bytes_left) { DWORD bytes_read; - ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &npc->read_ovl); - if (!ret && GetLastError() == ERROR_IO_PENDING) - ret = GetOverlappedResult(npc->pipe, &npc->read_ovl, &bytes_read, TRUE); + ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, NULL); if (!ret && GetLastError() == ERROR_MORE_DATA) ret = TRUE; if (!ret || !bytes_read) @@ -437,9 +439,7 @@ static int rpcrt4_conn_np_write(RpcConnection *Connection, while (bytes_left) { DWORD bytes_written; - ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, &npc->write_ovl); - if (!ret && GetLastError() == ERROR_IO_PENDING) - ret = GetOverlappedResult(npc->pipe, &npc->write_ovl, &bytes_written, TRUE); + ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, NULL); if (!ret || !bytes_written) break; bytes_left -= bytes_written; @@ -456,13 +456,9 @@ static int rpcrt4_conn_np_close(RpcConnection *Connection) CloseHandle(npc->pipe); npc->pipe = 0; } - if (npc->read_ovl.hEvent) { - CloseHandle(npc->read_ovl.hEvent); - npc->read_ovl.hEvent = 0; - } - if (npc->write_ovl.hEvent) { - CloseHandle(npc->write_ovl.hEvent); - npc->write_ovl.hEvent = 0; + if (npc->listen_thread) { + CloseHandle(npc->listen_thread); + npc->listen_thread = 0; } return 0; } @@ -666,7 +662,7 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { rpcrt4_conn_listen_pipe(conn); - if (conn->read_ovl.hEvent) + if (conn->listen_thread) (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } @@ -687,7 +683,7 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p *count = 1; conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { - if ((objs[*count] = conn->read_ovl.hEvent)) + if ((objs[*count] = conn->listen_thread)) (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } @@ -734,12 +730,18 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, EnterCriticalSection(&protseq->cs); conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { - if (b_handle == conn->read_ovl.hEvent) break; + if (b_handle == conn->listen_thread) break; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } cconn = NULL; if (conn) - RPCRT4_SpawnConnection(&cconn, &conn->common); + { + DWORD exit_code; + if (GetExitCodeThread(conn->listen_thread, &exit_code) && exit_code == RPC_S_OK) + RPCRT4_SpawnConnection(&cconn, &conn->common); + CloseHandle(conn->listen_thread); + conn->listen_thread = 0; + } else ERR("failed to locate connection for handle %p\n", b_handle); LeaveCriticalSection(&protseq->cs);

1 0

Jacek Caban : vbscript: Added more equality expressions parser/ compiler implementation.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: beef0956544ed66d3b12bbb1c6668581029a1351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beef0956544ed66d3b12bbb1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:07:12 2011 +0200 vbscript: Added more equality expressions parser/compiler implementation. --- dlls/vbscript/compile.c | 8 ++++++++ dlls/vbscript/interp.c | 24 ++++++++++++++++++++++++ dlls/vbscript/parse.h | 4 ++++ dlls/vbscript/parser.y | 4 ++++ dlls/vbscript/vbscript.h | 4 ++++ 5 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 60e4935..c939aea 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -381,10 +381,18 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eqv); case EXPR_EXP: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_exp); + case EXPR_GT: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gt); + case EXPR_GTEQ: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gteq); case EXPR_IDIV: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_idiv); case EXPR_IMP: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_imp); + case EXPR_LT: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lt); + case EXPR_LTEQ: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lteq); case EXPR_MEMBER: return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_MOD: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index c8e0514..9a49396 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -941,6 +941,30 @@ static HRESULT interp_nequal(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_gt(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_gteq(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_lt(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_lteq(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_concat(exec_ctx_t *ctx) { variant_val_t r, l; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index d121b72..ef7f139 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -27,8 +27,12 @@ typedef enum { EXPR_EQUAL, EXPR_EQV, EXPR_EXP, + EXPR_GT, + EXPR_GTEQ, EXPR_IDIV, EXPR_IMP, + EXPR_LT, + EXPR_LTEQ, EXPR_MEMBER, EXPR_MOD, EXPR_MUL, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index b1b385b..d0c3f70 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -248,6 +248,10 @@ EqualityExpression : ConcatExpression { $$ = $1; } | EqualityExpression '=' ConcatExpression { $$ = new_binary_expression(ctx, EXPR_EQUAL, $1, $3); CHECK_ERROR; } | EqualityExpression tNEQ ConcatExpression { $$ = new_binary_expression(ctx, EXPR_NEQUAL, $1, $3); CHECK_ERROR; } + | EqualityExpression '>' ConcatExpression { $$ = new_binary_expression(ctx, EXPR_GT, $1, $3); CHECK_ERROR; } + | EqualityExpression '<' ConcatExpression { $$ = new_binary_expression(ctx, EXPR_LT, $1, $3); CHECK_ERROR; } + | EqualityExpression tGTEQ ConcatExpression { $$ = new_binary_expression(ctx, EXPR_GTEQ, $1, $3); CHECK_ERROR; } + | EqualityExpression tLTEQ ConcatExpression { $$ = new_binary_expression(ctx, EXPR_LTEQ, $1, $3); CHECK_ERROR; } ConcatExpression : AdditiveExpression { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 12315ae..c73f11d 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -161,6 +161,8 @@ typedef enum { X(equal, 1, 0, 0) \ X(eqv, 1, 0, 0) \ X(exp, 1, 0, 0) \ + X(gt, 1, 0, 0) \ + X(gteq, 1, 0, 0) \ X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(idiv, 1, 0, 0) \ @@ -169,6 +171,8 @@ typedef enum { X(jmp_false, 0, ARG_ADDR, 0) \ X(jmp_true, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ + X(lt, 1, 0, 0) \ + X(lteq, 1, 0, 0) \ X(mcall, 1, ARG_BSTR, ARG_UINT) \ X(mcallv, 1, ARG_BSTR, ARG_UINT) \ X(mod, 1, 0, 0) \

1 0

Francois Gouget : ntdll: Don' t trace potentially uninitialized structures if we are not going to use them .
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: bee334003b85ba3c2d4cd57160ca08cc4a533023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee334003b85ba3c2d4cd5716… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 20:09:12 2011 +0200 ntdll: Don't trace potentially uninitialized structures if we are not going to use them. --- dlls/ntdll/om.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index c103ddd..18da18d 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -404,10 +404,10 @@ NTSTATUS WINAPI NtOpenDirectoryObject(PHANDLE DirectoryHandle, ACCESS_MASK Desir POBJECT_ATTRIBUTES ObjectAttributes) { NTSTATUS ret; - TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); if (!DirectoryHandle) return STATUS_ACCESS_VIOLATION; if (!ObjectAttributes) return STATUS_INVALID_PARAMETER; + TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); /* Have to test it here because server won't know difference between * ObjectName == NULL and ObjectName == "" */ if (!ObjectAttributes->ObjectName) @@ -452,9 +452,9 @@ NTSTATUS WINAPI NtCreateDirectoryObject(PHANDLE DirectoryHandle, ACCESS_MASK Des POBJECT_ATTRIBUTES ObjectAttributes) { NTSTATUS ret; - TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); if (!DirectoryHandle) return STATUS_ACCESS_VIOLATION; + TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); SERVER_START_REQ(create_directory) {

1 0

Henri Verbeet : ddraw: Get rid of IDirectDraw3.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: feb96511a92f0d4e9c9e05fbb1bfbc6eeb3f7d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb96511a92f0d4e9c9e05fbb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 18 21:05:27 2011 +0200 ddraw: Get rid of IDirectDraw3. --- dlls/ddraw/ddraw.c | 389 -------------------------------------------- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/main.c | 2 - 3 files changed, 0 insertions(+), 392 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=feb96511a92f0d4e9c9e0…

1 0