wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

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

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: 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

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

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 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 : crypt32: Fix filetime_to_str() for the case where it is called twice for a single trace.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: def2863d609bf1d05192baec3cfd7b5f85b6daf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=def2863d609bf1d05192baec3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 22:55:20 2011 +0200 crypt32: Fix filetime_to_str() for the case where it is called twice for a single trace. --- dlls/crypt32/chain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 4bc2d05..2c6732d 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1664,7 +1664,7 @@ static void dump_extension(const CERT_EXTENSION *ext) static LPCSTR filetime_to_str(const FILETIME *time) { - static char date[80]; + char date[80]; char dateFmt[80]; /* sufficient for all versions of LOCALE_SSHORTDATE */ SYSTEMTIME sysTime; @@ -1675,7 +1675,7 @@ static LPCSTR filetime_to_str(const FILETIME *time) FileTimeToSystemTime(time, &sysTime); GetDateFormatA(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, sizeof(date) / sizeof(date[0])); - return date; + return wine_dbg_sprintf("%s", date); } static void dump_element(PCCERT_CONTEXT cert)

1 0

Francois Gouget : shell32: Use wine_dbgstr_rect() to trace a potentially NULL rect struct.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 6454ec7f5dd016ba7cc9752337886d2aca31670c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6454ec7f5dd016ba7cc975233… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 22:52:58 2011 +0200 shell32: Use wine_dbgstr_rect() to trace a potentially NULL rect struct. --- dlls/shell32/shlview.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 3f18256..ff5f05c 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2095,9 +2095,7 @@ static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView2 *iface, TRACE("-- psvPrev %p, pfs %p, psbOwner %p, prcView %p\n", view_params->psvPrev, view_params->pfs, view_params->psbOwner, view_params->prcView); - TRACE("-- vmode %#x, flags %#x, left %d, top %d, right %d, bottom %d\n", - view_params->pfs->ViewMode, view_params->pfs->fFlags, view_params->prcView->left, - view_params->prcView->top, view_params->prcView->right, view_params->prcView->bottom); + TRACE("-- vmode %#x, flags %#x, view %s\n", view_params->pfs->ViewMode, view_params->pfs->fFlags, wine_dbgstr_rect(view_params->prcView)); if (!view_params->psbOwner) return E_UNEXPECTED;

1 0

Piotr Caban : propsys/tests: Added PropVariantToGUID tests.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 208de163affef0b79e10df796147424e5a5ab760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=208de163affef0b79e10df796… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 19 10:56:15 2011 +0200 propsys/tests: Added PropVariantToGUID tests. --- dlls/propsys/tests/propsys.c | 72 ++++++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 2 + 2 files changed, 74 insertions(+), 0 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index caff25e..850d3d2 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -40,6 +40,11 @@ DEFINE_GUID(expect_guid, 0x12345678, 0x1234, 0x1234, 0x12, 0x34, 0x12, 0x34, 0x5 static char *show_guid(const GUID *guid, char *buf) { + static char static_buf[40]; + + if(!buf) + buf = static_buf; + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", guid->Data1, guid->Data2, guid->Data3, @@ -562,6 +567,72 @@ static void test_InitPropVariantFromBuffer(void) VariantClear(&var); } +static void test_PropVariantToGUID(void) +{ + PROPVARIANT propvar; + VARIANT var; + GUID guid; + HRESULT hres; + + hres = InitPropVariantFromGUIDAsString(&IID_NULL, &propvar); + ok(hres == S_OK, "InitPropVariantFromGUIDAsString failed %x\n", hres); + + hres = PropVariantToGUID(&propvar, &guid); + ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); + ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + PropVariantClear(&propvar); + + hres = InitPropVariantFromGUIDAsString(&dummy_guid, &propvar); + ok(hres == S_OK, "InitPropVariantFromGUIDAsString failed %x\n", hres); + + hres = PropVariantToGUID(&propvar, &guid); + ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); + ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + + ok(propvar.vt == VT_LPWSTR, "incorrect PROPVARIANT type: %d\n", propvar.vt); + propvar.u.pwszVal[1] = 'd'; + propvar.u.pwszVal[2] = 'E'; + propvar.u.pwszVal[3] = 'a'; + hres = PropVariantToGUID(&propvar, &guid); + ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); + ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + + propvar.u.pwszVal[1] = 'z'; + hres = PropVariantToGUID(&propvar, &guid); + ok(hres == E_INVALIDARG, "PropVariantToGUID returned %x\n", hres); + PropVariantClear(&propvar); + + + hres = InitVariantFromGUIDAsString(&IID_NULL, &var); + ok(hres == S_OK, "InitVariantFromGUIDAsString failed %x\n", hres); + + hres = VariantToGUID(&var, &guid); + ok(hres == S_OK, "VariantToGUID failed %x\n", hres); + ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + VariantClear(&var); + + hres = InitVariantFromGUIDAsString(&dummy_guid, &var); + ok(hres == S_OK, "InitVariantFromGUIDAsString failed %x\n", hres); + + hres = VariantToGUID(&var, &guid); + ok(hres == S_OK, "VariantToGUID failed %x\n", hres); + ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + + ok(V_VT(&var) == VT_BSTR, "incorrect VARIANT type: %d\n", V_VT(&var)); + V_BSTR(&var)[1] = 'z'; + hres = VariantToGUID(&var, &guid); + ok(hres == E_FAIL, "VariantToGUID returned %x\n", hres); + + V_BSTR(&var)[1] = 'd'; + propvar.vt = V_VT(&var); + propvar.u.bstrVal = V_BSTR(&var); + V_VT(&var) = VT_EMPTY; + hres = PropVariantToGUID(&propvar, &guid); + ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); + ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL)); + PropVariantClear(&propvar); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -569,4 +640,5 @@ START_TEST(propsys) test_PSRefreshPropertySchema(); test_InitPropVariantFromGUIDAsString(); test_InitPropVariantFromBuffer(); + test_PropVariantToGUID(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index f7d2e82..fe7ab94 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -41,6 +41,8 @@ HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropv HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar); +HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid); +HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid); #ifdef __cplusplus

1 0

Piotr Caban : propsys: Added partial PropVariantToGUID implementation.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 4646ed19aec15fffb9c690ca3376e945a8bfb9a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4646ed19aec15fffb9c690ca3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 19 10:56:05 2011 +0200 propsys: Added partial PropVariantToGUID implementation. --- dlls/propsys/propsys.spec | 4 +- dlls/propsys/propvar.c | 106 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 2 + 3 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 5bcb483..4b617ea 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -119,7 +119,7 @@ @ stub PropVariantToFileTime @ stub PropVariantToFileTimeVector @ stub PropVariantToFileTimeVectorAlloc -@ stub PropVariantToGUID +@ stdcall PropVariantToGUID(ptr ptr) @ stub PropVariantToInt16 @ stub PropVariantToInt16Vector @ stub PropVariantToInt16VectorAlloc @@ -175,7 +175,7 @@ @ stub VariantToDoubleArrayAlloc @ stub VariantToDoubleWithDefault @ stub VariantToFileTime -@ stub VariantToGUID +@ stdcall VariantToGUID(ptr ptr) @ stub VariantToInt16 @ stub VariantToInt16Array @ stub VariantToInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 01a1d5f..4ea01d9 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -177,3 +177,109 @@ HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar) V_ARRAY(pvar) = arr; return S_OK; } + +static inline DWORD PROPVAR_HexToNum(const WCHAR *hex) +{ + DWORD ret; + + if(hex[0]>='0' && hex[0]<='9') + ret = hex[0]-'0'; + else if(hex[0]>='a' && hex[0]<='f') + ret = hex[0]-'a'+10; + else if(hex[0]>='A' && hex[0]<='F') + ret = hex[0]-'A'+10; + else + return -1; + + ret <<= 4; + if(hex[1]>='0' && hex[1]<='9') + return ret + hex[1]-'0'; + else if(hex[1]>='a' && hex[1]<='f') + return ret + hex[1]-'a'+10; + else if(hex[1]>='A' && hex[1]<='F') + return ret + hex[1]-'A'+10; + else + return -1; +} + +static inline HRESULT PROPVAR_WCHARToGUID(const WCHAR *str, int len, GUID *guid) +{ + DWORD i, val=0; + const WCHAR *p; + + memset(guid, 0, sizeof(GUID)); + + if(len!=38 || str[0]!='{' || str[9]!='-' || str[14]!='-' + || str[19]!='-' || str[24]!='-' || str[37]!='}') { + WARN("Error parsing %s\n", debugstr_w(str)); + return E_INVALIDARG; + } + + p = str+1; + for(i=0; i<4 && val!=-1; i++) { + val = PROPVAR_HexToNum(p); + guid->Data1 = (guid->Data1<<8) + val; + p += 2; + } + p++; + for(i=0; i<2 && val!=-1; i++) { + val = PROPVAR_HexToNum(p); + guid->Data2 = (guid->Data2<<8) + val; + p += 2; + } + p++; + for(i=0; i<2 && val!=-1; i++) { + val = PROPVAR_HexToNum(p); + guid->Data3 = (guid->Data3<<8) + val; + p += 2; + } + p++; + for(i=0; i<8 && val!=-1; i++) { + if(i == 2) + p++; + + val = guid->Data4[i] = PROPVAR_HexToNum(p); + p += 2; + } + + if(val == -1) { + WARN("Error parsing %s\n", debugstr_w(str)); + memset(guid, 0, sizeof(GUID)); + return E_INVALIDARG; + } + return S_OK; +} + +HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid) +{ + TRACE("%p %p)\n", ppropvar, guid); + + switch(ppropvar->vt) { + case VT_BSTR: + return PROPVAR_WCHARToGUID(ppropvar->u.bstrVal, SysStringLen(ppropvar->u.bstrVal), guid); + case VT_LPWSTR: + return PROPVAR_WCHARToGUID(ppropvar->u.pwszVal, strlenW(ppropvar->u.pwszVal), guid); + + default: + FIXME("unsupported vt: %d\n", ppropvar->vt); + return E_NOTIMPL; + } +} + +HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid) +{ + TRACE("(%p %p)\n", pvar, guid); + + switch(V_VT(pvar)) { + case VT_BSTR: { + HRESULT hres = PROPVAR_WCHARToGUID(V_BSTR(pvar), SysStringLen(V_BSTR(pvar)), guid); + if(hres == E_INVALIDARG) + return E_FAIL; + return hres; + } + + default: + FIXME("unsupported vt: %d\n", V_VT(pvar)); + return E_NOTIMPL; + } +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 76bf718..d3867e1 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -96,8 +96,10 @@ @ stub ZonesReInit 111 stdcall @(wstr) IsProtectedModeURL +329 stdcall @(ptr ptr) propsys.VariantToGUID 331 stdcall @(ptr long ptr) propsys.InitPropVariantFromBuffer 335 stdcall @(ptr long ptr) propsys.InitVariantFromBuffer +350 stdcall @(ptr ptr) propsys.PropVariantToGUID 362 stdcall @(ptr ptr) propsys.InitVariantFromGUIDAsString 410 stdcall @(long long) URLMON_410 423 stdcall @(long long long long) URLMON_423

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011