wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

Ken Thomases : winemac: Use GetDIBits to retrieve the bitmap header when exporting a bitmap.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 1837210159522a06aaad0c758a5d77bca319f262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1837210159522a06aaad0c758… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:27 2016 -0500 winemac: Use GetDIBits to retrieve the bitmap header when exporting a bitmap. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 87 ++++++++++---------------------------------- 1 file changed, 19 insertions(+), 68 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 4c66b9f..75563ad 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -410,77 +410,28 @@ static int bitmap_info_size(const BITMAPINFO *info, WORD coloruse) * * Allocates a packed DIB and copies the bitmap data into it. */ -static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp) +static HGLOBAL create_dib_from_bitmap(HBITMAP bitmap) { - BITMAP bmp; - HDC hdc; - HGLOBAL hPackedDIB; - LPBYTE pPackedDIB; - LPBITMAPINFOHEADER pbmiHeader; - unsigned int cDataSize, cPackedSize, OffsetBits; - int nLinesCopied; - - if (!GetObjectW(hBmp, sizeof(bmp), &bmp)) return 0; - - /* - * A packed DIB contains a BITMAPINFO structure followed immediately by - * an optional color palette and the pixel data. - */ - - /* Calculate the size of the packed DIB */ - cDataSize = abs(bmp.bmHeight) * (((bmp.bmWidth * bmp.bmBitsPixel + 31) / 8) & ~3); - cPackedSize = sizeof(BITMAPINFOHEADER) - + ((bmp.bmBitsPixel <= 8) ? (sizeof(RGBQUAD) * (1 << bmp.bmBitsPixel)) : 0) - + cDataSize; - /* Get the offset to the bits */ - OffsetBits = cPackedSize - cDataSize; - - /* Allocate the packed DIB */ - TRACE("\tAllocating packed DIB of size %d\n", cPackedSize); - hPackedDIB = GlobalAlloc(GMEM_FIXED, cPackedSize); - if (!hPackedDIB) - { - WARN("Could not allocate packed DIB!\n"); - return 0; - } + HANDLE ret = 0; + BITMAPINFOHEADER header; + HDC hdc = GetDC(0); + DWORD header_size; + BITMAPINFO *bmi; - /* A packed DIB starts with a BITMAPINFOHEADER */ - pPackedDIB = GlobalLock(hPackedDIB); - pbmiHeader = (LPBITMAPINFOHEADER)pPackedDIB; - - /* Init the BITMAPINFOHEADER */ - pbmiHeader->biSize = sizeof(BITMAPINFOHEADER); - pbmiHeader->biWidth = bmp.bmWidth; - pbmiHeader->biHeight = bmp.bmHeight; - pbmiHeader->biPlanes = 1; - pbmiHeader->biBitCount = bmp.bmBitsPixel; - pbmiHeader->biCompression = BI_RGB; - pbmiHeader->biSizeImage = 0; - pbmiHeader->biXPelsPerMeter = pbmiHeader->biYPelsPerMeter = 0; - pbmiHeader->biClrUsed = 0; - pbmiHeader->biClrImportant = 0; - - /* Retrieve the DIB bits from the bitmap and fill in the - * DIB color table if present */ - hdc = GetDC(0); - nLinesCopied = GetDIBits(hdc, /* Handle to device context */ - hBmp, /* Handle to bitmap */ - 0, /* First scan line to set in dest bitmap */ - bmp.bmHeight, /* Number of scan lines to copy */ - pPackedDIB + OffsetBits, /* [out] Address of array for bitmap bits */ - (LPBITMAPINFO) pbmiHeader, /* [out] Address of BITMAPINFO structure */ - 0); /* RGB or palette index */ - GlobalUnlock(hPackedDIB); - ReleaseDC(0, hdc); + memset(&header, 0, sizeof(header)); + header.biSize = sizeof(header); + if (!GetDIBits(hdc, bitmap, 0, 0, NULL, (BITMAPINFO *)&header, DIB_RGB_COLORS)) goto done; - /* Cleanup if GetDIBits failed */ - if (nLinesCopied != bmp.bmHeight) - { - TRACE("\tGetDIBits returned %d. Actual lines=%d\n", nLinesCopied, bmp.bmHeight); - GlobalFree(hPackedDIB); - hPackedDIB = 0; - } - return hPackedDIB; + header_size = bitmap_info_size((BITMAPINFO *)&header, DIB_RGB_COLORS); + if (!(ret = GlobalAlloc(GMEM_FIXED, header_size + header.biSizeImage))) goto done; + bmi = (BITMAPINFO *)ret; + memset(bmi, 0, header_size); + memcpy(bmi, &header, header.biSize); + GetDIBits(hdc, bitmap, 0, abs(header.biHeight), (char *)bmi + header_size, bmi, DIB_RGB_COLORS); + +done: + ReleaseDC(0, hdc); + return ret; }

1 0

Ken Thomases : winemac: Clamp the number of colors to <= 256 in bitmap_info_size().
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 12ea83acb501dc7a9641b7f8d2f5419a2637c5fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=12ea83acb501dc7a9641b7f8d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:26 2016 -0500 winemac: Clamp the number of colors to <= 256 in bitmap_info_size(). … as is done in user32's and gdi32's version of the same function. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 15f0992..4c66b9f 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -395,7 +395,7 @@ static int bitmap_info_size(const BITMAPINFO *info, WORD coloruse) } else /* assume BITMAPINFOHEADER */ { - colors = info->bmiHeader.biClrUsed; + colors = MIN(info->bmiHeader.biClrUsed, 256); if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3;

1 0

Ken Thomases : winemac: Don't export/import CF_TEXT or CF_OEMTEXT to/ from Mac-native data types.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 8b75e66a5b27082610725553e048da2c079b79d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b75e66a5b27082610725553e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:25 2016 -0500 winemac: Don't export/import CF_TEXT or CF_OEMTEXT to/from Mac-native data types. The relevant Mac-native types, public.utf16-plain-text and public.utf8-plain-text, are handled by CF_UNICODETEXT and user32 handles the synthesis of CF_TEXT and CF_OEMTEXT from that. CF_TEXT and CF_OEMTEXT are still exported and imported with a Wine-specific type to preserve cross-prefix copy/paste fidelity. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 275 +++++++++---------------------------------- 1 file changed, 55 insertions(+), 220 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b75e66a5b27082610725…

1 0

Ken Thomases : winemac: Don't export/import CF_BITMAP or CF_DIBV5 to/ from a Mac-native data type.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: c22590b69769c115c9b4f6dfb87e5db150e76d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c22590b69769c115c9b4f6dfb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:24 2016 -0500 winemac: Don't export/import CF_BITMAP or CF_DIBV5 to/from a Mac-native data type. The relevant Mac-native type, com.microsoft.bmp, is handled by CF_DIB and user32 handles the synthesis of CF_BITMAP and CF_DIBV5 from that. CF_BITMAP and CF_DIBV5 are still exported and imported with a Wine-specific type to preserve cross-prefix copy/paste fidelity. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 8737a56..b0c1e49 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -150,6 +150,8 @@ static const struct BOOL synthesized; } builtin_format_ids[] = { + { CF_BITMAP, CFSTR("org.winehq.builtin.bitmap"), import_bmp_to_bitmap, export_bitmap_to_bmp, FALSE }, + { CF_DIBV5, CFSTR("org.winehq.builtin.dibv5"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_DIF, CFSTR("org.winehq.builtin.dif"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_ENHMETAFILE, CFSTR("org.winehq.builtin.enhmetafile"), import_enhmetafile, export_enhmetafile, FALSE }, { CF_LOCALE, CFSTR("org.winehq.builtin.locale"), import_clipboard_data, export_clipboard_data, FALSE }, @@ -161,15 +163,9 @@ static const struct { CF_TIFF, CFSTR("public.tiff"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_WAVE, CFSTR("com.microsoft.waveform-audio"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_BITMAP, CFSTR("org.winehq.builtin.bitmap"), import_bmp_to_bitmap, export_bitmap_to_bmp, FALSE }, - { CF_BITMAP, CFSTR("com.microsoft.bmp"), import_bmp_to_bitmap, export_bitmap_to_bmp, TRUE }, - { CF_DIB, CFSTR("org.winehq.builtin.dib"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_DIB, CFSTR("com.microsoft.bmp"), import_bmp_to_dib, export_dib_to_bmp, TRUE }, - { CF_DIBV5, CFSTR("org.winehq.builtin.dibv5"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_DIBV5, CFSTR("com.microsoft.bmp"), import_bmp_to_dib, export_dib_to_bmp, TRUE }, - { CF_HDROP, CFSTR("org.winehq.builtin.hdrop"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_HDROP, CFSTR("NSFilenamesPboardType"), import_nsfilenames_to_hdrop, export_hdrop_to_filenames, TRUE },

1 0

Ken Thomases : winemac: Remove support for converting among standard clipboard formats.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 40eb776aaa0a4dd0cf6a8a10bc44d095397eb962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40eb776aaa0a4dd0cf6a8a10b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:23 2016 -0500 winemac: Remove support for converting among standard clipboard formats. User32 handles that now. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 227 +++---------------------------------------- 1 file changed, 14 insertions(+), 213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40eb776aaa0a4dd0cf6a8…

1 0

Ken Thomases : winemac: Remove support for owner-displayed clipboard formats.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: b47183812a857bd85f23fa2700a9a7866d5851a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47183812a857bd85f23fa270… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:22 2016 -0500 winemac: Remove support for owner-displayed clipboard formats. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index bdbd62e..9b5490e 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -161,12 +161,7 @@ static const struct } builtin_format_ids[] = { { CF_DIF, CFSTR("org.winehq.builtin.dif"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_DSPBITMAP, CFSTR("org.winehq.builtin.dspbitmap"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_DSPENHMETAFILE, CFSTR("org.winehq.builtin.dspenhmetafile"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_DSPMETAFILEPICT, CFSTR("org.winehq.builtin.dspmetafilepict"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_DSPTEXT, CFSTR("org.winehq.builtin.dsptext"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_LOCALE, CFSTR("org.winehq.builtin.locale"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_OWNERDISPLAY, CFSTR("org.winehq.builtin.ownerdisplay"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_PALETTE, CFSTR("org.winehq.builtin.palette"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_PENDATA, CFSTR("org.winehq.builtin.pendata"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_RIFF, CFSTR("org.winehq.builtin.riff"), import_clipboard_data, export_clipboard_data, FALSE },

1 0

Ken Thomases : winemac: Convert old-Mac-style line breaks (CR) to Windows-style CRLF when importing UTF-16.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: e846da321abc02560dadbd50435d0444f0575f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e846da321abc02560dadbd504… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:21 2016 -0500 winemac: Convert old-Mac-style line breaks (CR) to Windows-style CRLF when importing UTF-16. At least one Mac app, TextWrangler, puts UTF-16 data on the pasteboard with lines separated by CR (although it uses LF for the UTF-8 form of the same text). Other Mac apps handle it properly; we should, too. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 72aed3a..bdbd62e 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1176,6 +1176,8 @@ static HANDLE import_utf16_to_unicodetext(CFDataRef data) { if (src[i] == '\n') new_lines++; + else if (src[i] == '\r' && (i + 1 >= src_len || src[i + 1] != '\n')) + new_lines++; } if ((unicode_handle = GlobalAlloc(GMEM_FIXED, (src_len + new_lines + 1) * sizeof(WCHAR)))) @@ -1188,6 +1190,9 @@ static HANDLE import_utf16_to_unicodetext(CFDataRef data) dst[j++] = '\r'; dst[j++] = src[i]; + + if (src[i] == '\r' && (i + 1 >= src_len || src[i + 1] != '\n')) + dst[j++] = '\n'; } dst[j] = 0;

1 0

Ken Thomases : winemac: Allocate clipboard data as GMEM_FIXED.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 861541c5e646bdeec56f77eece6d86a6aaee74a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=861541c5e646bdeec56f77eec… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:20 2016 -0500 winemac: Allocate clipboard data as GMEM_FIXED. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 2082cad..72aed3a 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -461,7 +461,7 @@ static HANDLE convert_text(const void *src, int src_len, UINT src_cp, UINT dest_ if (dest_cp == (UINT)-1) { - handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, wstr_len * sizeof(WCHAR)); + handle = GlobalAlloc(GMEM_FIXED, wstr_len * sizeof(WCHAR)); if (handle && (p = GlobalLock(handle))) { memcpy(p, wstr, wstr_len * sizeof(WCHAR)); @@ -475,7 +475,7 @@ static HANDLE convert_text(const void *src, int src_len, UINT src_cp, UINT dest_ len = WideCharToMultiByte(dest_cp, 0, wstr, wstr_len, NULL, 0, NULL, NULL); if (!wstr_len || wstr[wstr_len - 1]) len += 1; - handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, len); + handle = GlobalAlloc(GMEM_FIXED, len); if (handle && (p = GlobalLock(handle))) { @@ -568,7 +568,7 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp) /* Allocate the packed DIB */ TRACE("\tAllocating packed DIB of size %d\n", cPackedSize); - hPackedDIB = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, cPackedSize); + hPackedDIB = GlobalAlloc(GMEM_FIXED, cPackedSize); if (!hPackedDIB) { WARN("Could not allocate packed DIB!\n"); @@ -660,7 +660,7 @@ static HANDLE import_clipboard_data(CFDataRef data) LPVOID p; /* Turn on the DDESHARE flag to enable shared 32 bit memory */ - data_handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, len); + data_handle = GlobalAlloc(GMEM_FIXED, len); if (!data_handle) return NULL; @@ -716,7 +716,7 @@ static HANDLE import_bmp_to_dib(CFDataRef data) BYTE* p; len -= sizeof(*bfh); - ret = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, len); + ret = GlobalAlloc(GMEM_FIXED, len); if (!ret || !(p = GlobalLock(ret))) { GlobalFree(ret); @@ -779,7 +779,7 @@ static HANDLE import_enhmetafile_to_metafilepict(CFDataRef data) HANDLE hemf; METAFILEPICT *mfp; - if ((hmf = GlobalAlloc(0, sizeof(*mfp))) && (hemf = import_enhmetafile(data))) + if ((hmf = GlobalAlloc(GMEM_FIXED, sizeof(*mfp))) && (hemf = import_enhmetafile(data))) { ENHMETAHEADER header; HDC hdc = CreateCompatibleDC(0); @@ -823,7 +823,7 @@ static HANDLE import_metafilepict(CFDataRef data) TRACE("data %s\n", debugstr_cf(data)); - if (len >= sizeof(*mfp) && (ret = GlobalAlloc(0, sizeof(*mfp)))) + if (len >= sizeof(*mfp) && (ret = GlobalAlloc(GMEM_FIXED, sizeof(*mfp)))) { const BYTE *bytes = (const BYTE*)CFDataGetBytePtr(data); @@ -940,7 +940,7 @@ static HANDLE import_nsfilenames_to_hdrop(CFDataRef data) for (i = 0; i < count; i++) len += strlenW(paths[i]) + 1; - hdrop = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, sizeof(*dropfiles) + len * sizeof(WCHAR)); + hdrop = GlobalAlloc(GMEM_FIXED, sizeof(*dropfiles) + len * sizeof(WCHAR)); if (!hdrop || !(dropfiles = GlobalLock(hdrop))) { WARN("failed to allocate HDROP\n"); @@ -1110,7 +1110,7 @@ static HANDLE import_utf8_to_unicodetext(CFDataRef data) dst[j] = 0; count = MultiByteToWideChar(CP_UTF8, 0, dst, -1, NULL, 0); - unicode_handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, count * sizeof(WCHAR)); + unicode_handle = GlobalAlloc(GMEM_FIXED, count * sizeof(WCHAR)); if (unicode_handle) { @@ -1178,7 +1178,7 @@ static HANDLE import_utf16_to_unicodetext(CFDataRef data) new_lines++; } - if ((unicode_handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (src_len + new_lines + 1) * sizeof(WCHAR)))) + if ((unicode_handle = GlobalAlloc(GMEM_FIXED, (src_len + new_lines + 1) * sizeof(WCHAR)))) { dst = GlobalLock(unicode_handle);

1 0

Hans Leidekker : wbemprox: Return the hardware UUID for Win32_ComputerSystemProduct.UUID on macOS.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 96c46b1ca7a0718c8b1796770593c4ad9cb3e850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c46b1ca7a0718c8b1796770… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 24 10:04:21 2016 +0200 wbemprox: Return the hardware UUID for Win32_ComputerSystemProduct.UUID on macOS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 51 +++++++++++++++++++++++++++++++++++++++------ dlls/wbemprox/tests/query.c | 40 +++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index c8c2f4c..ee47cc7 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -22,6 +22,9 @@ #include "config.h" #include <stdarg.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -414,7 +417,7 @@ static const struct column col_compsys[] = static const struct column col_compsysproduct[] = { { prop_identifyingnumberW, CIM_STRING|COL_FLAG_KEY }, - { prop_uuidW, CIM_STRING } + { prop_uuidW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_datafile[] = { @@ -1055,10 +1058,6 @@ static const struct record_bios data_bios[] = { bios_descriptionW, NULL, bios_manufacturerW, bios_nameW, bios_releasedateW, bios_serialnumberW, bios_smbiosbiosversionW, bios_versionW } }; -static const struct record_computersystemproduct data_compsysproduct[] = -{ - { compsysproduct_identifyingnumberW, compsysproduct_uuidW } -}; static const struct record_param data_param[] = { { class_processW, method_getownerW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, @@ -1321,6 +1320,46 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co return status; } +static WCHAR *get_compsysproduct_uuid(void) +{ +#ifdef __APPLE__ + unsigned char uuid[16]; + const struct timespec timeout = {1, 0}; + if (!gethostuuid( uuid, &timeout )) + { + static const WCHAR fmtW[] = + {'%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-', + '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', + '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X',0}; + WCHAR *ret = heap_alloc( 37 * sizeof(WCHAR) ); + if (!ret) return NULL; + sprintfW( ret, fmtW, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], + uuid[8], uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15] ); + return ret; + } +#endif + return heap_strdupW( compsysproduct_uuidW ); +} + +static enum fill_status fill_compsysproduct( struct table *table, const struct expr *cond ) +{ + struct record_computersystemproduct *rec; + enum fill_status status = FILL_STATUS_UNFILTERED; + UINT row = 0; + + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + rec = (struct record_computersystemproduct *)table->data; + rec->identifyingnumber = compsysproduct_identifyingnumberW; + rec->uuid = get_compsysproduct_uuid(); + if (!match_row( table, row, cond, &status )) free_row_values( table, row ); + else row++; + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + struct dirstack { WCHAR **dirs; @@ -3077,7 +3116,7 @@ static struct table builtin_classes[] = { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), 0, (BYTE *)data_bios }, { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, 0, 0, NULL, fill_cdromdrive }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, 0, NULL, fill_compsys }, - { class_compsysproductW, SIZEOF(col_compsysproduct), col_compsysproduct, SIZEOF(data_compsysproduct), 0, (BYTE *)data_compsysproduct }, + { class_compsysproductW, SIZEOF(col_compsysproduct), col_compsysproduct, 0, 0, NULL, fill_compsysproduct }, { class_datafileW, SIZEOF(col_datafile), col_datafile, 0, 0, NULL, fill_datafile }, { class_desktopmonitorW, SIZEOF(col_desktopmonitor), col_desktopmonitor, 0, 0, NULL, fill_desktopmonitor }, { class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index d41aa11..2513807 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1176,6 +1176,45 @@ static void test_OperatingSystem( IWbemServices *services ) SysFreeString( wql ); } +static void test_ComputerSystemProduct( IWbemServices *services ) +{ + static const WCHAR uuidW[] = {'U','U','I','D',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'C','o','m','p','u','t','e','r','S','y','s','t','e','m','P','r','o','d','u','c','t',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *service; + VARIANT value; + CIMTYPE type; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_ComputerSystemProduct not available\n" ); + return; + } + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( service, uuidW, 0, &value, &type, NULL ); + ok( hr == S_OK, "failed to get computer name %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "uuid %s\n", wine_dbgstr_w(V_BSTR(&value)) ); + VariantClear( &value ); + + IWbemClassObject_Release( service ); + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1214,6 +1253,7 @@ START_TEST(query) test_GetNames( services ); test_SystemSecurity( services ); test_OperatingSystem( services ); + test_ComputerSystemProduct( services ); SysFreeString( path ); IWbemServices_Release( services );

1 0

Hans Leidekker : wbemprox: Use the WS_ prefix to avoid conflicts with Unix headers.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: c8598a7309ae0c6bebdb5fcaa96c8142b8687340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8598a7309ae0c6bebdb5fcaa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 24 10:04:20 2016 +0200 wbemprox: Use the WS_ prefix to avoid conflicts with Unix headers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index f411898..e6dc995 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DUSE_WS_PREFIX MODULE = wbemprox.dll IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b344a12..c8c2f4c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2058,11 +2058,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e int physical; enum fill_status status = FILL_STATUS_UNFILTERED; - ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); + ret = GetAdaptersAddresses( WS_AF_UNSPEC, 0, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; - if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size )) + if (GetAdaptersAddresses( WS_AF_UNSPEC, 0, NULL, buffer, &size )) { heap_free( buffer ); return FILL_STATUS_FAILED; @@ -2111,11 +2111,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e static WCHAR *get_dnshostname( IP_ADAPTER_UNICAST_ADDRESS *addr ) { const SOCKET_ADDRESS *sa = &addr->Address; - WCHAR buf[NI_MAXHOST]; + WCHAR buf[WS_NI_MAXHOST]; if (!addr) return NULL; if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, sizeof(buf)/sizeof(buf[0]), NULL, - 0, NI_NAMEREQD )) return NULL; + 0, WS_NI_NAMEREQD )) return NULL; return heap_strdupW( buf ); } static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) @@ -2203,11 +2203,11 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st DWORD size = 0, ret; enum fill_status status = FILL_STATUS_UNFILTERED; - ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size ); + ret = GetAdaptersAddresses( WS_AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; - if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size )) + if (GetAdaptersAddresses( WS_AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size )) { heap_free( buffer ); return FILL_STATUS_FAILED;

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
46
Older →

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 October 2016