October 2010 - Wine-Commits

Erich Hoover : winex11: Add support for animated cursors in X11 driver.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: e84eb16c05559fea55f2219ea1a08e2efc0244ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84eb16c05559fea55f2219ea… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Oct 5 12:06:18 2010 -0600 winex11: Add support for animated cursors in X11 driver. --- dlls/winex11.drv/mouse.c | 168 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 130 insertions(+), 38 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 4103a80..485a50d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -32,6 +32,9 @@ static void *xcursor_handle; MAKE_FUNCPTR(XcursorImageCreate); MAKE_FUNCPTR(XcursorImageDestroy); MAKE_FUNCPTR(XcursorImageLoadCursor); +MAKE_FUNCPTR(XcursorImagesCreate); +MAKE_FUNCPTR(XcursorImagesDestroy); +MAKE_FUNCPTR(XcursorImagesLoadCursor); # undef MAKE_FUNCPTR #endif /* SONAME_LIBXCURSOR */ @@ -114,6 +117,9 @@ void X11DRV_Xcursor_Init(void) LOAD_FUNCPTR(XcursorImageCreate); LOAD_FUNCPTR(XcursorImageDestroy); LOAD_FUNCPTR(XcursorImageLoadCursor); + LOAD_FUNCPTR(XcursorImagesCreate); + LOAD_FUNCPTR(XcursorImagesDestroy); + LOAD_FUNCPTR(XcursorImagesLoadCursor); #undef LOAD_FUNCPTR #endif /* SONAME_LIBXCURSOR */ } @@ -460,73 +466,159 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, #ifdef SONAME_LIBXCURSOR /*********************************************************************** - * create_xcursor_cursor + * create_xcursor_frame * - * Use Xcursor to create an X cursor from a Windows one. + * Use Xcursor to create a frame of an X cursor from a Windows one. */ -static Cursor create_xcursor_cursor( HDC hdc, ICONINFO *icon, int width, int height ) +static XcursorImage *create_xcursor_frame( HDC hdc, ICONINFO *iinfo, HANDLE icon, + HBITMAP hbmColor, unsigned char *color_bits, int color_size, + HBITMAP hbmMask, unsigned char *mask_bits, int mask_size, + int width, int height, int istep ) { + XcursorImage *image, *ret = NULL; int x, y, i, has_alpha; - BITMAPINFO *info; - Cursor cursor; - XcursorImage *image; XcursorPixel *ptr; - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) return 0; - wine_tsx11_lock(); image = pXcursorImageCreate( width, height ); wine_tsx11_unlock(); if (!image) { - HeapFree( GetProcessHeap(), 0, info ); - return 0; + ERR("X11 failed to produce a cursor frame!\n"); + goto cleanup; + } + + image->xhot = iinfo->xHotspot; + image->yhot = iinfo->yHotspot; + image->delay = 100; /* TODO: find a way to get the proper delay */ + + /* draw the cursor frame to a temporary buffer then copy it into the XcursorImage */ + memset( color_bits, 0x00, color_size ); + SelectObject( hdc, hbmColor ); + if (!DrawIconEx( hdc, 0, 0, icon, width, height, istep, NULL, DI_NORMAL )) + { + TRACE("Could not draw frame %d (walk past end of frames).\n", istep); + goto cleanup; + } + memcpy( image->pixels, color_bits, color_size ); + + /* check if the cursor frame was drawn with an alpha channel */ + for (i = 0, ptr = image->pixels; i < width * height; i++, ptr++) + if ((has_alpha = (*ptr & 0xff000000) != 0)) break; + + /* if no alpha channel was drawn then generate it from the mask */ + if (!has_alpha) + { + unsigned int width_bytes = (width + 31) / 32 * 4; + + /* draw the cursor mask to a temporary buffer */ + memset( mask_bits, 0xFF, mask_size ); + SelectObject( hdc, hbmMask ); + if (!DrawIconEx( hdc, 0, 0, icon, width, height, istep, NULL, DI_MASK )) + { + ERR("Failed to draw frame mask %d.\n", istep); + goto cleanup; + } + /* use the buffer to directly modify the XcursorImage alpha channel */ + for (y = 0, ptr = image->pixels; y < height; y++) + for (x = 0; x < width; x++, ptr++) + if (!((mask_bits[y * width_bytes + x / 8] << (x % 8)) & 0x80)) + *ptr |= 0xff000000; } + ret = image; + +cleanup: + if (ret == NULL) pXcursorImageDestroy( image ); + return ret; +} + +/*********************************************************************** + * create_xcursor_cursor + * + * Use Xcursor to create an X cursor from a Windows one. + */ +static Cursor create_xcursor_cursor( HDC hdc, ICONINFO *iinfo, HANDLE icon, int width, int height ) +{ + unsigned char *color_bits, *mask_bits; + HBITMAP hbmColor = 0, hbmMask = 0; + XcursorImage **imgs, *image; + int color_size, mask_size; + BITMAPINFO *info = NULL; + XcursorImages *images; + Cursor cursor = 0; + int nFrames = 0; - image->xhot = icon->xHotspot; - image->yhot = icon->yHotspot; - image->delay = 0; + if (!(imgs = HeapAlloc( GetProcessHeap(), 0, sizeof(XcursorImage*) ))) return 0; + /* Allocate all of the resources necessary to obtain a cursor frame */ + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto cleanup; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biWidth = width; info->bmiHeader.biHeight = -height; info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = 32; info->bmiHeader.biCompression = BI_RGB; - info->bmiHeader.biSizeImage = width * height * 4; info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - GetDIBits( hdc, icon->hbmColor, 0, height, image->pixels, info, DIB_RGB_COLORS ); - - for (i = 0, ptr = image->pixels; i < width * height; i++, ptr++) - if ((has_alpha = (*ptr & 0xff000000) != 0)) break; + info->bmiHeader.biBitCount = 32; + color_size = width * height * 4; + info->bmiHeader.biSizeImage = color_size; + hbmColor = CreateDIBSection( hdc, info, DIB_RGB_COLORS, (VOID **) &color_bits, NULL, 0); + if (!hbmColor) + { + ERR("Failed to create DIB section for cursor color data!\n"); + goto cleanup; + } + info->bmiHeader.biBitCount = 1; + mask_size = ((width + 31) / 32 * 4) * height; /* width_bytes * height */ + info->bmiHeader.biSizeImage = mask_size; + hbmMask = CreateDIBSection( hdc, info, DIB_RGB_COLORS, (VOID **) &mask_bits, NULL, 0); + if (!hbmMask) + { + ERR("Failed to create DIB section for cursor mask data!\n"); + goto cleanup; + } - if (!has_alpha) + /* Create an XcursorImage for each frame of the cursor */ + while (1) { - unsigned char *mask_bits; - unsigned int width_bytes = (width + 31) / 32 * 4; + XcursorImage **imgstmp; - /* generate alpha channel from the mask */ - info->bmiHeader.biBitCount = 1; - info->bmiHeader.biSizeImage = width_bytes * height; - if ((mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) - { - GetDIBits( hdc, icon->hbmMask, 0, height, mask_bits, info, DIB_RGB_COLORS ); - for (y = 0, ptr = image->pixels; y < height; y++) - for (x = 0; x < width; x++, ptr++) - if (!((mask_bits[y * width_bytes + x / 8] << (x % 8)) & 0x80)) - *ptr |= 0xff000000; - HeapFree( GetProcessHeap(), 0, mask_bits ); - } + image = create_xcursor_frame( hdc, iinfo, icon, + hbmColor, color_bits, color_size, + hbmMask, mask_bits, mask_size, + width, height, nFrames ); + if (!image) break; /* no more drawable frames */ + + imgs[nFrames++] = image; + if (!(imgstmp = HeapReAlloc( GetProcessHeap(), 0, imgs, (nFrames+1)*sizeof(XcursorImage*) ))) goto cleanup; + imgs = imgstmp; } - HeapFree( GetProcessHeap(), 0, info ); + /* Build an X cursor out of all of the frames */ + if (!(images = pXcursorImagesCreate( nFrames ))) goto cleanup; + for (images->nimage = 0; images->nimage < nFrames; images->nimage++) + images->images[images->nimage] = imgs[images->nimage]; wine_tsx11_lock(); - cursor = pXcursorImageLoadCursor( gdi_display, image ); - pXcursorImageDestroy( image ); + cursor = pXcursorImagesLoadCursor( gdi_display, images ); wine_tsx11_unlock(); + pXcursorImagesDestroy( images ); /* Note: this frees each individual frame (calls XcursorImageDestroy) */ + HeapFree( GetProcessHeap(), 0, imgs ); + imgs = NULL; + +cleanup: + if (imgs) + { + /* Failed to produce a cursor, free previously allocated frames */ + for (nFrames--; nFrames >= 0; nFrames--) + pXcursorImageDestroy( imgs[nFrames] ); + HeapFree( GetProcessHeap(), 0, imgs ); + } + /* Cleanup all of the resources used to obtain the frame data */ + if (hbmColor) DeleteObject( hbmColor ); + if (hbmMask) DeleteObject( hbmMask ); + HeapFree( GetProcessHeap(), 0, info ); return cursor; } @@ -764,7 +856,7 @@ static Cursor create_cursor( HANDLE handle ) if (info.hbmColor) { #ifdef SONAME_LIBXCURSOR - if (pXcursorImageLoadCursor) cursor = create_xcursor_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); + if (pXcursorImagesLoadCursor) cursor = create_xcursor_cursor( hdc, &info, handle, bm.bmWidth, bm.bmHeight ); #endif if (!cursor) cursor = create_xlib_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); DeleteObject( info.hbmColor );

1 0

Yaron Shahrabani : shdocvw: Added Hebrew translation.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 50925228d6e0a88597b276c50884c38de2e29765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50925228d6e0a88597b276c50… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Oct 7 12:42:42 2010 +0200 shdocvw: Added Hebrew translation. --- dlls/shdocvw/He.rc | 90 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/Makefile.in | 1 + 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/He.rc b/dlls/shdocvw/He.rc new file mode 100644 index 0000000..a2789df --- /dev/null +++ b/dlls/shdocvw/He.rc @@ -0,0 +1,90 @@ +/* + * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "פתיחת כתובת" +FONT 8, "MS Shell Dlg" +{ + LTEXT "נא לציין את הכתובת אותה ברצונך לפתוח באמצעות Internet Explorer",-1,25, 5, 150,15 + LTEXT "פתיחה:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "&אישור", IDOK, 25, 50, 50, 15 + PUSHBUTTON "&ביטול", IDCANCEL, 85, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&קובץ" + { + POPUP "&חדש" + { + MENUITEM "&חלון" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&פתיחה...", ID_BROWSE_OPEN + MENUITEM "&שמירה", ID_BROWSE_SAVE + MENUITEM "שמירה &בשם...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&תצורת ההדפסה...", ID_BROWSE_PRINT_FORMAT + MENUITEM "ה&דפסה...", ID_BROWSE_PRINT + MENUITEM "תצוגה מ&קדימה להדפסה...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "מ&אפיינים...", ID_BROWSE_PROPERTIES + MENUITEM "&סגירה", ID_BROWSE_QUIT + } + POPUP "&תצוגה" + { + POPUP "&סרגלי כלים" + { + MENUITEM "סרגל הכלים ה&רגיל" ID_BROWSE_BAR_STD + MENUITEM "סרגל ה&כתובות" ID_BROWSE_BAR_ADDR + } + } + POPUP "&מועדפים" + { + MENUITEM "הו&ספה למועדפים..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "ע&זרה" + { + MENUITEM "על &אודות Internet Explorer...", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "חזרה" + IDS_TB_FORWARD "קדימה" + IDS_TB_STOP "עצירה" + IDS_TB_REFRESH "רענון" + IDS_TB_HOME "דף הבית" + IDS_TB_PRINT "הדפסה" +} + +STRINGTABLE +{ + IDS_ADDRESS "כתובת" +} diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 23abb53..df46487 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -29,6 +29,7 @@ RC_SRCS = \ En.rc \ Es.rc \ Fr.rc \ + He.rc \ It.rc \ Ko.rc \ Lt.rc \

1 0

Yaron Shahrabani : appwiz.cpl: Added Hebrew translation.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 3f27cedabf659f8c6f33b29bcf09dd85e24c34a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f27cedabf659f8c6f33b29bc… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Oct 7 12:33:02 2010 +0200 appwiz.cpl: Added Hebrew translation. --- dlls/appwiz.cpl/He.rc | 89 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Makefile.in | 1 + 2 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/He.rc b/dlls/appwiz.cpl/He.rc new file mode 100644 index 0000000..3103016 --- /dev/null +++ b/dlls/appwiz.cpl/He.rc @@ -0,0 +1,89 @@ +/* +* Add/Remove Programs Hebrew resources +* +* Copyright 2001-2002, 2008 Owen Rudge +* Copyright 2010, Yaron Shahrabani <sh.yaron(a)gmail.com> +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +* +*/ + +#include "res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CPL_TITLE, "הוספה/הסרה של תכניות" + IDS_CPL_DESC, "תכנית זו מאפשר לך להתקין תכניות חדשות או להסיר תכניות קיימות מהמחשב שלך." + IDS_TAB1_TITLE, "יישומים" + + IDS_UNINSTALL_FAILED, "לא ניתן להפעיל את תכנית ההסרה, '%s'. האם ברצונך להסיר את הרשומה של תכנית זו מרישום המערכת?" + IDS_NOT_SPECIFIED, "לא מוגדר" + + IDS_COLUMN_NAME, "שם" + IDS_COLUMN_PUBLISHER, "מפיץ" + IDS_COLUMN_VERSION, "גרסה" + IDS_INSTALL_FILTER, "תכניות התקנה\0*instal*.exe;*setup*.exe;*.msi\0תכניות (*.exe)\0*.exe\0כל הקבצים (*.*)\0*.*\0\0" + + IDS_REMOVE, "ה&סרה..." + IDS_MODIFY_REMOVE, "&שינוי/הסרה..." +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "התקנה/הסרה" +FONT 8, "MS Shell Dlg" +{ + CONTROL "כדי להתקין תכנית חדש מתקליטון, כונן תקליטורים או הכונן הקשיח שלך יש ללחוץ על התקנה.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "ה&תקנה...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "ניתן להסיר אוטומטית את התכניות הבאות. כדי להסיר תכנית או כדי לשנות את רכיביה המותקנים, יש לבחור בה מהרשימה וללחוץ על שינוי/הסרה.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "&פרטי תמיכה...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "&שינוי...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "ה&סרה...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "פרטי תמיכה" +FONT 8, "MS Shell Dlg" +{ + CONTROL "אישור", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "ניתן להשתמש בפרטים שלהלן כדי לקבל תמיכה טכנית עבור %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "מפיץ:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "גרסה:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "פרטי קשר:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "פרטי תמיכה:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "טלפון לתמיכה:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "מידע לקריאה:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "עדכוני המוצר:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "הערות:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index b185581..a009310 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -10,6 +10,7 @@ RC_SRCS = \ En.rc \ Es.rc \ Fr.rc \ + He.rc \ Hu.rc \ It.rc \ Ja.rc \

1 0

Yaron Shahrabani : shell32: Added Hebrew translation.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 9c8422c9fe9ade5a129fa8b071acea157f81276a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8422c9fe9ade5a129fa8b07… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Oct 7 14:43:40 2010 +0200 shell32: Added Hebrew translation. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/shell32_He.rc | 336 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 337 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c8422c9fe9ade5a129fa…

1 0

Damjan Jovanovic : windowscodecs: Load PNGs incrementally.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: d53e1a71f48e1456cd99965fdf0f40eeb805b8e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53e1a71f48e1456cd99965fd… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Oct 7 14:28:33 2010 +0200 windowscodecs: Load PNGs incrementally. --- dlls/windowscodecs/pngformat.c | 185 +++++++++++++++++++++------------------- 1 files changed, 98 insertions(+), 87 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index a3c7730..791df56 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -56,8 +56,11 @@ MAKE_FUNCPTR(png_get_image_height); MAKE_FUNCPTR(png_get_image_width); MAKE_FUNCPTR(png_get_io_ptr); MAKE_FUNCPTR(png_get_pHYs); +MAKE_FUNCPTR(png_get_progressive_ptr); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); +MAKE_FUNCPTR(png_process_data); +MAKE_FUNCPTR(png_progressive_combine_row); MAKE_FUNCPTR(png_set_bgr); MAKE_FUNCPTR(png_set_error_fn); #if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 @@ -69,6 +72,7 @@ MAKE_FUNCPTR(png_set_filler); MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_IHDR); MAKE_FUNCPTR(png_set_pHYs); +MAKE_FUNCPTR(png_set_progressive_read_fn); MAKE_FUNCPTR(png_set_read_fn); MAKE_FUNCPTR(png_set_strip_16); MAKE_FUNCPTR(png_set_tRNS_to_alpha); @@ -76,6 +80,7 @@ MAKE_FUNCPTR(png_set_write_fn); MAKE_FUNCPTR(png_read_end); MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); +MAKE_FUNCPTR(png_read_update_info); MAKE_FUNCPTR(png_write_end); MAKE_FUNCPTR(png_write_info); MAKE_FUNCPTR(png_write_rows); @@ -103,8 +108,11 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_image_width); LOAD_FUNCPTR(png_get_io_ptr); LOAD_FUNCPTR(png_get_pHYs); + LOAD_FUNCPTR(png_get_progressive_ptr); LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); + LOAD_FUNCPTR(png_process_data); + LOAD_FUNCPTR(png_progressive_combine_row); LOAD_FUNCPTR(png_set_bgr); LOAD_FUNCPTR(png_set_error_fn); #if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 @@ -116,6 +124,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_set_gray_to_rgb); LOAD_FUNCPTR(png_set_IHDR); LOAD_FUNCPTR(png_set_pHYs); + LOAD_FUNCPTR(png_set_progressive_read_fn); LOAD_FUNCPTR(png_set_read_fn); LOAD_FUNCPTR(png_set_strip_16); LOAD_FUNCPTR(png_set_tRNS_to_alpha); @@ -123,6 +132,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_read_end); LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); + LOAD_FUNCPTR(png_read_update_info); LOAD_FUNCPTR(png_write_end); LOAD_FUNCPTR(png_write_info); LOAD_FUNCPTR(png_write_rows); @@ -155,7 +165,6 @@ typedef struct { LONG ref; png_structp png_ptr; png_infop info_ptr; - png_infop end_info; BOOL initialized; int bpp; int width, height; @@ -214,7 +223,7 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { if (This->png_ptr) - ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); + ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, NULL); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This->image_bits); @@ -231,86 +240,18 @@ static HRESULT WINAPI PngDecoder_QueryCapability(IWICBitmapDecoder *iface, IStre return E_NOTIMPL; } -static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) +static void info_callback(png_structp png_ptr, png_infop info) { - IStream *stream = ppng_get_io_ptr(png_ptr); - HRESULT hr; - ULONG bytesread; - - hr = IStream_Read(stream, data, length, &bytesread); - if (FAILED(hr) || bytesread != length) - { - ppng_error(png_ptr, "failed reading data"); - } -} - -static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, - WICDecodeOptions cacheOptions) -{ - PngDecoder *This = (PngDecoder*)iface; - LARGE_INTEGER seek; - HRESULT hr=S_OK; - png_bytep *row_pointers=NULL; - UINT image_size; - UINT i; int color_type, bit_depth; png_bytep trans; int num_trans; png_uint_32 transparency; png_color_16p trans_values; - jmp_buf jmpbuf; - - TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); - - EnterCriticalSection(&This->lock); - - /* initialize libpng */ - This->png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (!This->png_ptr) - { - hr = E_FAIL; - goto end; - } - - This->info_ptr = ppng_create_info_struct(This->png_ptr); - if (!This->info_ptr) - { - ppng_destroy_read_struct(&This->png_ptr, NULL, NULL); - This->png_ptr = NULL; - hr = E_FAIL; - goto end; - } - - This->end_info = ppng_create_info_struct(This->png_ptr); - if (!This->info_ptr) - { - ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, NULL); - This->png_ptr = NULL; - hr = E_FAIL; - goto end; - } - - /* set up setjmp/longjmp error handling */ - if (setjmp(jmpbuf)) - { - ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); - HeapFree(GetProcessHeap(), 0, row_pointers); - This->png_ptr = NULL; - hr = E_FAIL; - goto end; - } - ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); - - /* seek to the start of the stream */ - seek.QuadPart = 0; - hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) goto end; - - /* set up custom i/o handling */ - ppng_set_read_fn(This->png_ptr, pIStream, user_read_data); + UINT image_size; + HRESULT hr = S_OK; + PngDecoder *This; - /* read the header */ - ppng_read_info(This->png_ptr, This->info_ptr); + This = (PngDecoder*) ppng_get_progressive_ptr(png_ptr); /* choose a pixel format */ color_type = ppng_get_color_type(This->png_ptr, This->info_ptr); @@ -409,7 +350,6 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p goto end; } - /* read the image data */ This->width = ppng_get_image_width(This->png_ptr, This->info_ptr); This->height = ppng_get_image_height(This->png_ptr, This->info_ptr); This->stride = This->width * This->bpp; @@ -422,24 +362,96 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p goto end; } - row_pointers = HeapAlloc(GetProcessHeap(), 0, sizeof(png_bytep)*This->height); - if (!row_pointers) + ppng_read_update_info(This->png_ptr, This->info_ptr); + This->initialized = TRUE; + +end: + if (FAILED(hr)) + ERR("PNG info parsing failed, hr=0x%08X\n", hr); +} + +static void row_callback(png_structp png_ptr, png_bytep new_row, + png_uint_32 row_num, int pass) +{ + png_bytep old_row; + PngDecoder *This; + + This = (PngDecoder*) ppng_get_progressive_ptr(png_ptr); + if (!This->initialized) + return; + + old_row = ((png_bytep)This->image_bits) + row_num*This->stride; + ppng_progressive_combine_row(png_ptr, old_row, new_row); +} + +static void end_callback(png_structp png_ptr, png_infop info) +{ +} + +static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, + WICDecodeOptions cacheOptions) +{ + PngDecoder *This = (PngDecoder*)iface; + LARGE_INTEGER seek; + HRESULT hr=S_OK; + png_bytep *row_pointers=NULL; + jmp_buf jmpbuf; + BYTE buffer[8096]; + ULONG bytesRead = 0; + + TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); + + EnterCriticalSection(&This->lock); + + /* initialize libpng */ + This->png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!This->png_ptr) { - hr = E_OUTOFMEMORY; + hr = E_FAIL; goto end; } - for (i=0; i<This->height; i++) - row_pointers[i] = This->image_bits + i * This->stride; + This->info_ptr = ppng_create_info_struct(This->png_ptr); + if (!This->info_ptr) + { + ppng_destroy_read_struct(&This->png_ptr, NULL, NULL); + This->png_ptr = NULL; + hr = E_FAIL; + goto end; + } - ppng_read_image(This->png_ptr, row_pointers); + /* set up setjmp/longjmp error handling */ + if (setjmp(jmpbuf)) + { + ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, NULL); + HeapFree(GetProcessHeap(), 0, row_pointers); + This->png_ptr = NULL; + hr = E_FAIL; + goto end; + } + ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); - HeapFree(GetProcessHeap(), 0, row_pointers); - row_pointers = NULL; + /* seek to the start of the stream */ + seek.QuadPart = 0; + hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) goto end; - ppng_read_end(This->png_ptr, This->end_info); + /* set up progressive loading */ + ppng_set_progressive_read_fn(This->png_ptr, (void*)This, + info_callback, row_callback, end_callback); - This->initialized = TRUE; + do + { + hr = IStream_Read(pIStream, buffer, sizeof(buffer), &bytesRead); + if (SUCCEEDED(hr)) + ppng_process_data(This->png_ptr, This->info_ptr, buffer, bytesRead); + } while (bytesRead == sizeof(buffer)); + if (hr == S_FALSE) + hr = S_OK; + if (FAILED(hr)) + ERR("reading PNG file failed, error 0x%08X\n", hr); + if (!This->initialized) + hr = E_FAIL; end: @@ -751,7 +763,6 @@ HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->ref = 1; This->png_ptr = NULL; This->info_ptr = NULL; - This->end_info = NULL; This->initialized = FALSE; This->image_bits = NULL; InitializeCriticalSection(&This->lock);

1 0

Yaron Shahrabani : comctl32: Added Hebrew translation.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: d298ec1944a08998126cdd3fe23096bee01ea06b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d298ec1944a08998126cdd3fe… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Oct 7 14:40:02 2010 +0200 comctl32: Added Hebrew translation. --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/comctl_He.rc | 95 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 751fa03..b97ce39 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -52,6 +52,7 @@ RC_SRCS = \ comctl_Eo.rc \ comctl_Es.rc \ comctl_Fr.rc \ + comctl_He.rc \ comctl_Hu.rc \ comctl_It.rc \ comctl_Ja.rc \ diff --git a/dlls/comctl32/comctl_He.rc b/dlls/comctl32/comctl_He.rc new file mode 100644 index 0000000..3f557a2 --- /dev/null +++ b/dlls/comctl32/comctl_He.rc @@ -0,0 +1,95 @@ +/* + * Copyright 1999 Eric Kohl + * Copyright 2010 Yaron shahrabani <sh.yaron(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "comctl32.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "המאפיינים של %s" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "אישור", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "ביטול", IDCANCEL,58,122,50,14 + PUSHBUTTON "ה&חלה", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "עזרה", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< ה&קודם", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "ה&בא >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "סיום", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "ביטול", IDCANCEL,178,138,50,14 + PUSHBUTTON "עזרה", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "התאמת סרגל כלים" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&סגירה", IDCANCEL,308,6,44,14 + PUSHBUTTON "&איפוס", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "ע&זרה", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "הזזה למ&עלה", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "הזזה למ&טה", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "לחצנים &זמינים:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "הוס&פה ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- ה&סרה", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&לחצני סרגל הכלים:", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE +{ + IDS_CLOSE "סגירה" +} + +STRINGTABLE +{ + IDM_TODAY "היום:" + IDM_GOTODAY "מעבר ליום הנוכחי" +} + +STRINGTABLE +{ + IDS_SEPARATOR "מפריד" +} + +STRINGTABLE +{ + HKY_NONE "ללא" +}

1 0

Rudolf Mayerhofer : include: Add information class SystemLogicalProcessorInformation.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: ded24c0d1fb3138663ba336ac5dc74caf5cb5a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded24c0d1fb3138663ba336ac… Author: Rudolf Mayerhofer <rm(a)eightyfive.net> Date: Tue Oct 5 12:45:20 2010 +0200 include: Add information class SystemLogicalProcessorInformation. --- include/winternl.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index ee3dd98..d40c701 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -783,6 +783,26 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemVerifierInformation = 51, SystemAddVerifier = 52, SystemSessionProcessesInformation = 53, + Unknown54, + Unknown55, + Unknown56, + Unknown57, + Unknown58, + Unknown59, + Unknown60, + Unknown61, + Unknown62, + Unknown63, + Unknown64, + Unknown65, + Unknown66, + Unknown67, + Unknown68, + Unknown69, + Unknown70, + Unknown71, + Unknown72, + SystemLogicalProcessorInformation = 73, SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS;

1 0

Rico Schüller : d3dcompiler: Implement D3DGetDebugInfo ().
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: d52f2b63c048aeef904db56dfd954492dd20d800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d52f2b63c048aeef904db56df… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 3 15:12:17 2010 +0200 d3dcompiler: Implement D3DGetDebugInfo(). --- dlls/d3dcompiler_43/blob.c | 27 ++++++++++++++++++++++++--- dlls/d3dcompiler_43/d3dcompiler_43.spec | 2 +- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 7 +++++++ dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + include/d3dcompiler.h | 1 + 5 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index ca13f4b..8550dee 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -137,6 +137,10 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) if (tag == TAG_ISGN || tag == TAG_OSGN) add = TRUE; break; + case D3D_BLOB_DEBUG_INFO: + if (tag == TAG_SDBG) add = TRUE; + break; + default: FIXME("Unhandled D3D_BLOB_PART %s.\n", debug_d3dcompiler_d3d_blob_part(part)); break; @@ -204,6 +208,7 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P { case D3D_BLOB_INPUT_SIGNATURE_BLOB: case D3D_BLOB_OUTPUT_SIGNATURE_BLOB: + case D3D_BLOB_DEBUG_INFO: if (count != 1) count = 0; break; @@ -224,10 +229,26 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P return E_FAIL; } - hr = dxbc_write_blob(&dst_dxbc, blob); - if (FAILED(hr)) + /* some parts aren't full DXBCs, they contain only the data */ + if (count == 1 && (part == D3D_BLOB_DEBUG_INFO)) { - WARN("Failed to write blob part\n"); + hr = D3DCreateBlob(dst_dxbc.sections[0].data_size, blob); + if (SUCCEEDED(hr)) + { + memcpy(ID3D10Blob_GetBufferPointer(*blob), dst_dxbc.sections[0].data, dst_dxbc.sections[0].data_size); + } + else + { + WARN("Could not create blob\n"); + } + } + else + { + hr = dxbc_write_blob(&dst_dxbc, blob); + if (FAILED(hr)) + { + WARN("Failed to write blob part\n"); + } } dxbc_destroy(&src_dxbc); diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index e605e29..8077be7 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -7,7 +7,7 @@ @ stub D3DDisassemble10Effect @ stub D3DDisassemble @ stdcall D3DGetBlobPart(ptr long long long ptr) -@ stub D3DGetDebugInfo +@ stdcall D3DGetDebugInfo(ptr long ptr) @ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) @ stdcall D3DGetInputSignatureBlob(ptr long ptr) @ stdcall D3DGetOutputSignatureBlob(ptr long ptr) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index d199244..a7fabef 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -109,3 +109,10 @@ HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_s return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, blob); } + +HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + + return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_DEBUG_INFO, 0, blob); +} diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 41c4f5a..09d42fb 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -583,6 +583,7 @@ void SlDeleteShader(struct bwriter_shader *shader); #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') +#define TAG_SDBG MAKE_TAG('S', 'D', 'B', 'G') struct dxbc_section { diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 9079920..11ccf56 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -65,6 +65,7 @@ HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); +HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob);

1 0

Rico Schüller : d3dcompiler: Implement D3DGetBlobPart( ).
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: ec698dea664163aa6d7f77698575ca63ba271b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec698dea664163aa6d7f77698… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 3 15:11:54 2010 +0200 d3dcompiler: Implement D3DGetBlobPart(). --- dlls/d3dcompiler_43/Makefile.in | 3 +- dlls/d3dcompiler_43/blob.c | 38 ++++- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 5 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 49 ++++++- dlls/d3dcompiler_43/utils.c | 261 +++++++++++++++++++++++++++++ 5 files changed, 351 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec698dea664163aa6d7f7…

1 0

Rico Schüller : d3dcompiler: Add D3DGetBlobPart() stub .
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 033fd44aa12d7a57097617f9877d9a79120b3510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=033fd44aa12d7a57097617f98… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 3 15:11:47 2010 +0200 d3dcompiler: Add D3DGetBlobPart() stub. --- dlls/d3dcompiler_43/d3dcompiler_43.spec | 2 +- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 7 +++++++ include/d3dcompiler.h | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index ecd2d04..a54ddfb 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -6,7 +6,7 @@ @ stub D3DDecompressShaders @ stub D3DDisassemble10Effect @ stub D3DDisassemble -@ stub D3DGetBlobPart +@ stdcall D3DGetBlobPart(ptr long long long ptr) @ stub D3DGetDebugInfo @ stub D3DGetInputAndOutputSignatureBlob @ stub D3DGetInputSignatureBlob diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index fa331b9..f8ef255 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -80,3 +80,10 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) return S_OK; } + +HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) +{ + FIXME("data %p, data_size %lu, part %#x, flags %#x, blob %p stub!\n", data, data_size, part, flags, blob); + + return E_NOTIMPL; +} diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 3a44d7f..6e039b5 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -45,6 +45,24 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); +typedef enum D3D_BLOB_PART +{ + D3D_BLOB_INPUT_SIGNATURE_BLOB, + D3D_BLOB_OUTPUT_SIGNATURE_BLOB, + D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, + D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB, + D3D_BLOB_ALL_SIGNATURE_BLOB, + D3D_BLOB_DEBUG_INFO, + D3D_BLOB_LEGACY_SHADER, + D3D_BLOB_XNA_PREPASS_SHADER, + D3D_BLOB_XNA_SHADER, + D3D_BLOB_TEST_ALTERNATE_SHADER = 0x8000, + D3D_BLOB_TEST_COMPILE_DETAILS, + D3D_BLOB_TEST_COMPILE_PERF +} D3D_BLOB_PART; + +HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); + HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename,

1 0