wine-devel July 2018

wine-devel@winehq.org

74 participants
637 discussions

[PATCH v9 1/7] ntdll/tests: Add SystemFirmwareTableInformation tests
by Alex Henrie 12 Jul '18

12 Jul '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/tests/info.c | 60 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 7d60b94f15..3af8fdd0c0 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -54,6 +54,11 @@ static DWORD one_before_last_pid = 0; } \ } while(0) +/* Firmware table providers */ +#define ACPI 0x41435049 +#define FIRM 0x4649524D +#define RSMB 0x52534D42 + static BOOL InitFunctionPtrs(void) { /* All needed functions are NT based, so using GetModuleHandle is a good check */ @@ -826,6 +831,57 @@ static void test_query_logicalprocex(void) } } +static void test_query_firmware(void) +{ + static const ULONG min_sfti_len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); + ULONG len1, len2; + NTSTATUS status; + SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti; + + sfti = HeapAlloc(GetProcessHeap(), 0, min_sfti_len); + ok(!!sfti, "Failed to allocate memory\n"); + + sfti->ProviderSignature = 0; + sfti->Action = 0; + sfti->TableID = 0; + + status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len - 1, &len1); +todo_wine + ok(status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* xp */, + "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + if (len1 == 0) /* xp, 2003 */ + { + skip("SystemFirmwareTableInformation is not available\n"); + HeapFree(GetProcessHeap(), 0, sfti); + return; + } + ok(len1 == min_sfti_len, "Expected length %u, got %u\n", min_sfti_len, len1); + + status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len, &len1); + ok(status == STATUS_NOT_IMPLEMENTED, "Expected STATUS_NOT_IMPLEMENTED, got %08x\n", status); + ok(len1 == 0, "Expected length 0, got %u\n", len1); + + sfti->ProviderSignature = RSMB; + sfti->Action = SystemFirmwareTable_Get; + + status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len, &len1); + ok(status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status); + ok(len1 >= min_sfti_len, "Expected length >= %u, got %u\n", min_sfti_len, len1); + ok(sfti->TableBufferLength == len1 - min_sfti_len, + "Expected length %u, got %u\n", len1 - min_sfti_len, sfti->TableBufferLength); + + sfti = HeapReAlloc(GetProcessHeap(), 0, sfti, len1); + ok(!!sfti, "Failed to allocate memory\n"); + + status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, len1, &len2); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(len2 == len1, "Expected length %u, got %u\n", len1, len2); + ok(sfti->TableBufferLength == len1 - min_sfti_len, + "Expected length %u, got %u\n", len1 - min_sfti_len, sfti->TableBufferLength); + + HeapFree(GetProcessHeap(), 0, sfti); +} + static void test_query_processor_power_info(void) { NTSTATUS status; @@ -2277,6 +2333,10 @@ START_TEST(info) trace("Starting test_process_debug_flags()\n"); test_query_process_debug_flags(argc, argv); + /* 0x4C SystemFirmwareTableInformation */ + trace("Starting test_query_firmware()\n"); + test_query_firmware(); + /* belongs to its own file */ trace("Starting test_readvirtualmemory()\n"); test_readvirtualmemory(); -- 2.18.0

2 13

[PATCH 4/7] winspool.drv: Add performance counters service stubs.
by Dmitry Timoshkov 12 Jul '18

12 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winspool.drv/info.c | 29 +++++++++++++++++++++++++++++ dlls/winspool.drv/winspool.drv.spec | 6 +++--- loader/wine.inf.in | 7 +++++++ 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9c24256b51..4d8134b314 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8681,3 +8681,32 @@ HRESULT WINAPI UploadPrinterDriverPackageW( LPCWSTR server, LPCWSTR path, LPCWST flags, hwnd, dst, dstlen); return E_NOTIMPL; } + +/***************************************************************************** + * PerfOpen [WINSPOOL.@] + */ +DWORD WINAPI PerfOpen(LPWSTR context) +{ + FIXME("%s: stub\n", debugstr_w(context)); + return ERROR_SUCCESS; +} + +/***************************************************************************** + * PerfClose [WINSPOOL.@] + */ +DWORD WINAPI PerfClose(void) +{ + FIXME("stub\n"); + return ERROR_SUCCESS; +} + +/***************************************************************************** + * PerfCollect [WINSPOOL.@] + */ +DWORD WINAPI PerfCollect(LPWSTR query, LPVOID *data, LPDWORD size, LPDWORD obj_count) +{ + FIXME("%s,%p,%p,%p: stub\n", debugstr_w(query), data, size, obj_count); + *size = 0; + *obj_count = 0; + return ERROR_SUCCESS; +} diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index 58dc60bcc9..a23ea2ced9 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -2,9 +2,9 @@ 101 stub -noname ClusterSplOpen 102 stub -noname ClusterSplClose 103 stub -noname ClusterSplIsAlive -104 stub PerfClose -105 stub PerfCollect -106 stub PerfOpen +104 stdcall PerfClose() +105 stdcall PerfCollect(wstr ptr ptr ptr) +106 stdcall PerfOpen(wstr) 201 stdcall GetDefaultPrinterA(ptr ptr) 202 stdcall SetDefaultPrinterA(str) 203 stdcall GetDefaultPrinterW(ptr ptr) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 735d965366..9a76509983 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3309,6 +3309,7 @@ StartType=3 ErrorControl=1 [SpoolerService] +AddReg=SpoolerServiceKeys Description="Loads files to memory for later printing" DisplayName="Print Spooler" ServiceBinary="%11%\spoolsv.exe" @@ -3317,6 +3318,12 @@ StartType=3 ErrorControl=1 LoadOrderGroup="SpoolerGroup" +[SpoolerServiceKeys] +HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Library",,"winspool.drv" +HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Open",,"PerfOpen" +HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Close",,"PerfClose" +HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Collect",,"PerfCollect" + [TerminalServices] Description="Remote desktop access" DisplayName="Terminal Services" -- 2.17.1

2 3

[PATCH] winspool.drv: Add performance counters service stubs. (v2)
by Dmitry Timoshkov 12 Jul '18

12 Jul '18

Other patches in the series don't depend on this patch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winspool.drv/info.c | 29 +++++++++++++++++++++++++++++ dlls/winspool.drv/winspool.drv.spec | 6 +++--- loader/wine.inf.in | 7 +++++++ 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9c24256b51..f63f3f687b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8681,3 +8681,32 @@ HRESULT WINAPI UploadPrinterDriverPackageW( LPCWSTR server, LPCWSTR path, LPCWST flags, hwnd, dst, dstlen); return E_NOTIMPL; } + +/***************************************************************************** + * PerfOpen [WINSPOOL.@] + */ +DWORD WINAPI PerfOpen(LPWSTR context) +{ + FIXME("%s: stub\n", debugstr_w(context)); + return ERROR_SUCCESS; +} + +/***************************************************************************** + * PerfClose [WINSPOOL.@] + */ +DWORD WINAPI PerfClose(void) +{ + FIXME("stub\n"); + return ERROR_SUCCESS; +} + +/***************************************************************************** + * PerfCollect [WINSPOOL.@] + */ +DWORD WINAPI PerfCollect(LPWSTR query, LPVOID *data, LPDWORD size, LPDWORD obj_count) +{ + FIXME("%s, %p, %p, %p: stub\n", debugstr_w(query), data, size, obj_count); + *size = 0; + *obj_count = 0; + return ERROR_SUCCESS; +} diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index 58dc60bcc9..a23ea2ced9 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -2,9 +2,9 @@ 101 stub -noname ClusterSplOpen 102 stub -noname ClusterSplClose 103 stub -noname ClusterSplIsAlive -104 stub PerfClose -105 stub PerfCollect -106 stub PerfOpen +104 stdcall PerfClose() +105 stdcall PerfCollect(wstr ptr ptr ptr) +106 stdcall PerfOpen(wstr) 201 stdcall GetDefaultPrinterA(ptr ptr) 202 stdcall SetDefaultPrinterA(str) 203 stdcall GetDefaultPrinterW(ptr ptr) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 735d965366..9a76509983 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3309,6 +3309,7 @@ StartType=3 ErrorControl=1 [SpoolerService] +AddReg=SpoolerServiceKeys Description="Loads files to memory for later printing" DisplayName="Print Spooler" ServiceBinary="%11%\spoolsv.exe" @@ -3317,6 +3318,12 @@ StartType=3 ErrorControl=1 LoadOrderGroup="SpoolerGroup" +[SpoolerServiceKeys] +HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Library",,"winspool.drv" +HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Open",,"PerfOpen" +HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Close",,"PerfClose" +HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Collect",,"PerfCollect" + [TerminalServices] Description="Remote desktop access" DisplayName="Terminal Services" -- 2.17.1

1 0

[PATCH] include: Add more DSOP defines
by Alistair Leslie-Hughes 12 Jul '18

12 Jul '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/objsel.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/objsel.h b/include/objsel.h index c01d4c7..3dd3e5a 100644 --- a/include/objsel.h +++ b/include/objsel.h @@ -39,6 +39,8 @@ DEFINE_GUID(IID_IDsObjectPicker, 0x0c87e64e, 0x3b7a, 0x11d2, 0xb9,0xe0,0x00,0xc #define DSOP_FILTER_DOMAIN_LOCAL_GROUPS_SE (0x200) #define DSOP_FILTER_CONTACTS (0x400) #define DSOP_FILTER_COMPUTERS (0x800) +#define DSOP_FILTER_SERVICE_ACCOUNTS 0x00001000 +#define DSOP_FILTER_PASSWORDSETTINGS_OBJECTS 0x00002000 typedef struct _DSOP_UPLEVEL_FILTER_FLAGS { @@ -87,6 +89,8 @@ typedef struct _DSOP_FILTER_FLAGS #define DSOP_SCOPE_FLAG_DEFAULT_FILTER_GROUPS (0x80) #define DSOP_SCOPE_FLAG_DEFAULT_FILTER_COMPUTERS (0x100) #define DSOP_SCOPE_FLAG_DEFAULT_FILTER_CONTACTS (0x200) +#define DSOP_SCOPE_FLAG_DEFAULT_FILTER_SERVICE_ACCOUNTS 0x00000400 +#define DSOP_SCOPE_FLAG_DEFAULT_FILTER_PASSWORDSETTINGS_OBJECTS 0x00000800 typedef struct _DSOP_SCOPE_INIT_INFO { -- 1.9.1

1 0

[PATCH 1/2] oleaut32: Move rendering a bitmap to a separate helper.
by Dmitry Timoshkov 12 Jul '18

12 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 103 +++++++++++++++++++++++-------------- 1 file changed, 64 insertions(+), 39 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index a2a54bdcd2..36fd7c21a9 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -610,6 +610,55 @@ static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface, return S_OK; } +static void render_masked_bitmap(OLEPictureImpl *This, HDC hdc, + LONG x, LONG y, LONG cx, LONG cy, OLE_XPOS_HIMETRIC xSrc, OLE_YPOS_HIMETRIC ySrc, + OLE_XSIZE_HIMETRIC cxSrc, OLE_YSIZE_HIMETRIC cySrc, HBITMAP hbmMask, HBITMAP hbmXor) +{ + HBITMAP hbmpOld; + HDC hdcBmp; + + /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. + * NB y-axis gets flipped + */ + + hdcBmp = CreateCompatibleDC(0); + SetMapMode(hdcBmp, MM_ANISOTROPIC); + SetWindowOrgEx(hdcBmp, 0, 0, NULL); + SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL); + SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); + SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); + + if (hbmMask) + { + HDC hdcMask = CreateCompatibleDC(0); + HBITMAP hOldbm = SelectObject(hdcMask, hbmMask); + + hbmpOld = SelectObject(hdcBmp, hbmXor); + + SetMapMode(hdcMask, MM_ANISOTROPIC); + SetWindowOrgEx(hdcMask, 0, 0, NULL); + SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); + SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); + SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); + + SetBkColor(hdc, RGB(255, 255, 255)); + SetTextColor(hdc, RGB(0, 0, 0)); + StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); + + SelectObject(hdcMask, hOldbm); + DeleteDC(hdcMask); + } + else + { + hbmpOld = SelectObject(hdcBmp, hbmXor); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); + } + + SelectObject(hdcBmp, hbmpOld); + DeleteDC(hdcBmp); +} + /************************************************************************ * OLEPictureImpl_Render */ @@ -643,48 +692,24 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, /* nothing to do */ return S_OK; case PICTYPE_BITMAP: - { - HBITMAP hbmpOld; - HDC hdcBmp; - - /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. - NB y-axis gets flipped */ - - hdcBmp = CreateCompatibleDC(0); - SetMapMode(hdcBmp, MM_ANISOTROPIC); - SetWindowOrgEx(hdcBmp, 0, 0, NULL); - SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); - SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); - - if (This->hbmMask) { - HDC hdcMask = CreateCompatibleDC(0); - HBITMAP hOldbm = SelectObject(hdcMask, This->hbmMask); - - hbmpOld = SelectObject(hdcBmp, This->hbmXor); - - SetMapMode(hdcMask, MM_ANISOTROPIC); - SetWindowOrgEx(hdcMask, 0, 0, NULL); - SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); - SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); - - SetBkColor(hdc, RGB(255, 255, 255)); - SetTextColor(hdc, RGB(0, 0, 0)); - StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); - - SelectObject(hdcMask, hOldbm); - DeleteDC(hdcMask); - } else { - hbmpOld = SelectObject(hdcBmp, This->desc.u.bmp.hbitmap); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); - } + { + HBITMAP hbmMask, hbmXor; - SelectObject(hdcBmp, hbmpOld); - DeleteDC(hdcBmp); + if (This->hbmMask) + { + hbmMask = This->hbmMask; + hbmXor = This->hbmXor; + } + else + { + hbmMask = 0; + hbmXor = This->desc.u.bmp.hbitmap; } + + render_masked_bitmap(This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, hbmMask, hbmXor); break; + } + case PICTYPE_ICON: FIXME("Not quite correct implementation of rendering icons...\n"); DrawIconEx(hdc, x, y, This->desc.u.icon.hicon, cx, cy, 0, NULL, DI_NORMAL); -- 2.17.1

1 0

[PATCH v8 1/9] ntdll/tests: Skip map protection tests when access is denied
by Alex Henrie 11 Jul '18

11 Jul '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/tests/info.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6c93c3cd58..b18f0d39d9 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1789,6 +1789,10 @@ static void test_mapprotection(void) } ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); + if (status == STATUS_ACCESS_DENIED) { + skip("Access to set ProcessExecuteFlags denied\n"); + return; + } ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); size.u.LowPart = 0x2000; -- 2.17.1

3 17

[PATCH 2/2] dmime: Reimplement the track form parser
by Michael Stefaniuc 11 Jul '18

11 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/segment.c | 239 +++++++++++++-------------------------------------- 1 file changed, 60 insertions(+), 179 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 48fd6438e1..dc460690f6 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -22,7 +22,6 @@ #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); -WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicSegmentImpl implementation @@ -622,195 +621,77 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { }; /* IDirectMusicSegment8Impl IPersistStream part: */ -static HRESULT load_track(IDirectMusicSegment8Impl *This, IStream *pClonedStream, - IDirectMusicTrack **ppTrack, DMUS_IO_TRACK_HEADER *pTrack_hdr) -{ - HRESULT hr = E_FAIL; - IPersistStream* pPersistStream = NULL; - - hr = CoCreateInstance (&pTrack_hdr->guidClassID, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (LPVOID*) ppTrack); - if (FAILED(hr)) { - ERR(": could not create object\n"); - return hr; - } - /* acquire PersistStream interface */ - hr = IDirectMusicTrack_QueryInterface (*ppTrack, &IID_IPersistStream, (LPVOID*) &pPersistStream); - if (FAILED(hr)) { - ERR(": could not acquire IPersistStream\n"); - return hr; - } - /* load */ - hr = IPersistStream_Load (pPersistStream, pClonedStream); - if (FAILED(hr)) { - ERR(": failed to load object\n"); - return hr; - } - - /* release all loading-related stuff */ - IPersistStream_Release (pPersistStream); - - hr = IDirectMusicSegment8_InsertTrack(&This->IDirectMusicSegment8_iface, *ppTrack, - pTrack_hdr->dwGroup); /* at dsPosition */ - if (FAILED(hr)) { - ERR(": could not insert track\n"); - return hr; - } - - return S_OK; -} - -static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DWORD size, IStream *pStm) +static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, + const struct chunk_entry *riff) { - HRESULT hr = E_FAIL; - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - - DMUS_IO_TRACK_HEADER track_hdr; - DMUS_IO_TRACK_EXTRAS_HEADER track_xhdr; - IDirectMusicTrack* pTrack = NULL; - - StreamSize = size - sizeof(FOURCC); - StreamCount = 0; + struct chunk_entry chunk = {.parent = riff}; + IDirectMusicTrack *track = NULL; + IPersistStream *ps = NULL; + IStream *clone; + DMUS_IO_TRACK_HEADER thdr; + HRESULT hr; - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - - switch (Chunk.fccID) { - case DMUS_FOURCC_TRACK_CHUNK: { - TRACE_(dmfile)(": track chunk\n"); - IStream_Read (pStm, &track_hdr, sizeof(DMUS_IO_TRACK_HEADER), NULL); - TRACE_(dmfile)(" - class: %s\n", debugstr_guid (&track_hdr.guidClassID)); - TRACE_(dmfile)(" - dwGroup: %d\n", track_hdr.dwGroup); - TRACE_(dmfile)(" - ckid: %s\n", debugstr_fourcc (track_hdr.ckid)); - TRACE_(dmfile)(" - fccType: %s\n", debugstr_fourcc (track_hdr.fccType)); - break; - } - case DMUS_FOURCC_TRACK_EXTRAS_CHUNK: { - TRACE_(dmfile)(": track extras chunk\n"); - IStream_Read (pStm, &track_xhdr, sizeof(DMUS_IO_TRACK_EXTRAS_HEADER), NULL); - break; - } + TRACE("Parsing track form in %p: %s\n", stream, debugstr_chunk(riff)); - case DMUS_FOURCC_COMMANDTRACK_CHUNK: { - TRACE_(dmfile)(": COMMANDTRACK track\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; + /* First chunk must be the track header */ + if (FAILED(hr = stream_get_chunk(stream, &chunk))) + return hr; + if (chunk.id != DMUS_FOURCC_TRACK_CHUNK) + return DMUS_E_TRACK_HDR_NOT_FIRST_CK; + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &thdr, sizeof(thdr)))) + return hr; + TRACE("Found DMUS_IO_TRACK_HEADER\n"); + TRACE("\tclass: %s\n", debugstr_guid (&thdr.guidClassID)); + TRACE("\tdwGroup: %d\n", thdr.dwGroup); + TRACE("\tckid: %s\n", debugstr_fourcc (thdr.ckid)); + TRACE("\tfccType: %s\n", debugstr_fourcc (thdr.fccType)); + + if (!!thdr.ckid == !!thdr.fccType) { + WARN("One and only one of the ckid (%s) and fccType (%s) need to be set\n", + debugstr_fourcc(thdr.ckid), debugstr_fourcc(thdr.fccType)); + return DMUS_E_INVALID_TRACK_HDR; } - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - if (Chunk.fccID == track_hdr.fccType && 0 == track_hdr.ckid) { - LPSTREAM pClonedStream = NULL; - - TRACE_(dmfile)(": TRACK list\n"); - - IStream_Clone (pStm, &pClonedStream); - - liMove.QuadPart = 0; - liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = load_track(This, pClonedStream, &pTrack, &track_hdr); - if (FAILED(hr)) { - ERR(": could not load track\n"); - return hr; - } - IStream_Release (pClonedStream); - - IDirectMusicTrack_Release(pTrack); pTrack = NULL; /* now we can release at as it inserted */ - - liMove.QuadPart = ListSize[0]; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - - } else { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - } - break; - } + /* Optional chunks */ + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + if ((thdr.ckid && chunk.id == thdr.ckid) || + (!thdr.ckid && (chunk.id == FOURCC_LIST || chunk.id == FOURCC_RIFF) && + chunk.type == thdr.fccType)) + break; - case FOURCC_RIFF: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": RIFF chunk of type %s\n", debugstr_fourcc(Chunk.fccID)); - - ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - - if (Chunk.fccID == track_hdr.fccType && 0 == track_hdr.ckid) { - LPSTREAM pClonedStream = NULL; - - TRACE_(dmfile)(": TRACK RIFF\n"); - - IStream_Clone (pStm, &pClonedStream); - - liMove.QuadPart = 0; - liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = load_track(This, pClonedStream, &pTrack, &track_hdr); - if (FAILED(hr)) { - ERR(": could not load track\n"); - return hr; - } - IStream_Release (pClonedStream); - - IDirectMusicTrack_Release(pTrack); pTrack = NULL; /* now we can release at as it inserted */ - - /** now safe move the cursor */ - liMove.QuadPart = ListSize[0]; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - - } else { - TRACE_(dmfile)(": unknown RIFF fmt (skipping)\n"); - liMove.QuadPart = ListSize[0]; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - } - break; + if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK) + FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not handled\n"); } + if (hr != S_OK) + return hr == S_FALSE ? DMUS_E_TRACK_NOT_FOUND : hr; - default: { - if (0 == track_hdr.fccType && Chunk.fccID == track_hdr.ckid) { - LPSTREAM pClonedStream = NULL; - - TRACE_(dmfile)(": TRACK solo\n"); - - IStream_Clone (pStm, &pClonedStream); - - liMove.QuadPart = 0; - liMove.QuadPart -= (sizeof(FOURCC) + sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); + /* Some DirectMusicTrack implementation expect the stream to start with their data chunk */ + if (FAILED(hr = IStream_Clone(stream, &clone))) + return hr; + stream_reset_chunk_start(clone, &chunk); - hr = load_track(This, pClonedStream, &pTrack, &track_hdr); - if (FAILED(hr)) { - ERR(": could not load track\n"); - return hr; - } - IStream_Release (pClonedStream); - - IDirectMusicTrack_Release(pTrack); pTrack = NULL; /* now we can release at as it inserted */ + /* Load the track */ + hr = CoCreateInstance(&thdr.guidClassID, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, + (void **)&track); + if (FAILED(hr)) + goto done; + hr = IDirectMusicTrack_QueryInterface(track, &IID_IPersistStream, (void **)&ps); + if (FAILED(hr)) + goto done; + hr = IPersistStream_Load(ps, clone); + if (FAILED(hr)) + goto done; - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); + hr = IDirectMusicSegment8_InsertTrack(&This->IDirectMusicSegment8_iface, track, thdr.dwGroup); - break; - } +done: + if (ps) + IPersistStream_Release(ps); + if (track) + IDirectMusicTrack_Release(track); + IStream_Release(clone); - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); - } while (StreamCount < StreamSize); - - return S_OK; + return hr; } static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, IStream *stream, @@ -823,7 +704,7 @@ static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, IStream *stream, while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) if (chunk.id == FOURCC_RIFF && chunk.type == DMUS_FOURCC_TRACK_FORM) - hr = parse_track_form(This, chunk.size, stream); + hr = parse_track_form(This, stream, &chunk); return SUCCEEDED(hr) ? S_OK : hr; } -- 2.14.4

1 0

[PATCH 1/2] dmime: Simplify the track list parser
by Michael Stefaniuc 11 Jul '18

11 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/segment.c | 63 ++++++++++------------------------------------------ 1 file changed, 12 insertions(+), 51 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 77c94f173d..48fd6438e1 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -659,8 +659,7 @@ static HRESULT load_track(IDirectMusicSegment8Impl *This, IStream *pClonedStream return S_OK; } -static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) +static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DWORD size, IStream *pStm) { HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; @@ -671,12 +670,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU DMUS_IO_TRACK_EXTRAS_HEADER track_xhdr; IDirectMusicTrack* pTrack = NULL; - if (pChunk->fccID != DMUS_FOURCC_TRACK_FORM) { - ERR_(dmfile)(": %s chunk should be a TRACK form\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - StreamSize = pChunk->dwSize - sizeof(FOURCC); + StreamSize = size - sizeof(FOURCC); StreamCount = 0; do { @@ -819,52 +813,19 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU return S_OK; } -static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, DWORD StreamSize, IStream *pStm) +static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, IStream *stream, + const struct chunk_entry *trkl) { - HRESULT hr = E_FAIL; - DMUS_PRIVATE_CHUNK Chunk; - DWORD ListSize[3], ListCount[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ + struct chunk_entry chunk = {.parent = trkl}; + HRESULT hr; - ListSize[0] = StreamSize - sizeof(FOURCC); - ListCount[0] = 0; + TRACE("Parsing track list in %p: %s\n", stream, debugstr_chunk(trkl)); - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_RIFF: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID)); - StreamSize = Chunk.dwSize - sizeof(FOURCC); - switch (Chunk.fccID) { - case DMUS_FOURCC_TRACK_FORM: { - TRACE_(dmfile)(": TRACK form\n"); - hr = parse_track_form(This, &Chunk, pStm); - if (FAILED(hr)) return hr; - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = StreamSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) + if (chunk.id == FOURCC_RIFF && chunk.type == DMUS_FOURCC_TRACK_FORM) + hr = parse_track_form(This, chunk.size, stream); - return S_OK; + return SUCCEEDED(hr) ? S_OK : hr; } static inline void dump_segment_header(DMUS_IO_SEGMENT_HEADER *h, DWORD size) @@ -920,7 +881,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, IStream *strea break; case FOURCC_LIST: if (chunk.type == DMUS_FOURCC_TRACK_LIST) - if (FAILED(hr = parse_track_list(This, chunk.size, stream))) + if (FAILED(hr = parse_track_list(This, stream, &chunk))) return hr; break; case FOURCC_RIFF: -- 2.14.4

1 0

[PATCH] pdh: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 11 Jul '18

11 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/pdh/pdh_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index fb131bd354..b648d8b8e6 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -210,7 +210,7 @@ static const struct source counter_sources[] = static BOOL is_local_machine( const WCHAR *name, DWORD len ) { WCHAR buf[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD buflen = sizeof(buf) / sizeof(buf[0]); + DWORD buflen = ARRAY_SIZE(buf); if (!GetComputerNameW( buf, &buflen )) return FALSE; return len == buflen && !memicmpW( name, buf, buflen ); @@ -274,7 +274,7 @@ PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, } *hcounter = NULL; - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) { if (pdh_match_path( counter_sources[i].path, path )) { @@ -867,7 +867,7 @@ PDH_STATUS WINAPI PdhLookupPerfIndexByNameW( LPCWSTR machine, LPCWSTR name, LPDW FIXME("remote machine not supported\n"); return PDH_CSTATUS_NO_MACHINE; } - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) { if (pdh_match_path( counter_sources[i].path, name )) { @@ -886,7 +886,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR PDH_STATUS ret; WCHAR *machineW = NULL; WCHAR bufferW[PDH_MAX_COUNTER_NAME]; - DWORD sizeW = sizeof(bufferW) / sizeof(WCHAR); + DWORD sizeW = ARRAY_SIZE(bufferW); TRACE("%s %d %p %p\n", debugstr_a(machine), index, buffer, size); @@ -925,7 +925,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexW( LPCWSTR machine, DWORD index, LPWST if (!buffer || !size) return PDH_INVALID_ARGUMENT; if (!index) return ERROR_SUCCESS; - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) { if (counter_sources[i].index == index) { @@ -1077,7 +1077,7 @@ PDH_STATUS WINAPI PdhValidatePathW( LPCWSTR path ) if ((ret = validate_path( path ))) return ret; - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) if (pdh_match_path( counter_sources[i].path, path )) return ERROR_SUCCESS; return PDH_CSTATUS_NO_COUNTER; -- 2.14.4

1 0

[PATCH] mlang: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 11 Jul '18

11 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mlang/mlang.c | 76 +++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index bada104a36..fc162522af 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -494,35 +494,35 @@ static const struct mlang_data SCRIPT_ID sid; } mlang_data[] = { - { "Arabic",1256,sizeof(arabic_cp)/sizeof(arabic_cp[0]),arabic_cp, + { "Arabic", 1256, ARRAY_SIZE(arabic_cp), arabic_cp, "Simplified Arabic Fixed","Simplified Arabic", sidArabic }, - { "Baltic",1257,sizeof(baltic_cp)/sizeof(baltic_cp[0]),baltic_cp, + { "Baltic", 1257, ARRAY_SIZE(baltic_cp), baltic_cp, "Courier New","Arial", sidAsciiLatin }, - { "Chinese Simplified",936,sizeof(chinese_simplified_cp)/sizeof(chinese_simplified_cp[0]),chinese_simplified_cp, + { "Chinese Simplified", 936, ARRAY_SIZE(chinese_simplified_cp), chinese_simplified_cp, "Simsun","Simsun", sidHan }, - { "Chinese Traditional",950,sizeof(chinese_traditional_cp)/sizeof(chinese_traditional_cp[0]),chinese_traditional_cp, + { "Chinese Traditional", 950, ARRAY_SIZE(chinese_traditional_cp), chinese_traditional_cp, "MingLiu","New MingLiu", sidBopomofo }, - { "Central European",1250,sizeof(central_european_cp)/sizeof(central_european_cp[0]),central_european_cp, + { "Central European", 1250, ARRAY_SIZE(central_european_cp), central_european_cp, "Courier New","Arial", sidAsciiLatin }, - { "Cyrillic",1251,sizeof(cyrillic_cp)/sizeof(cyrillic_cp[0]),cyrillic_cp, + { "Cyrillic", 1251, ARRAY_SIZE(cyrillic_cp), cyrillic_cp, "Courier New","Arial", sidCyrillic }, - { "Greek",1253,sizeof(greek_cp)/sizeof(greek_cp[0]),greek_cp, + { "Greek", 1253, ARRAY_SIZE(greek_cp), greek_cp, "Courier New","Arial", sidGreek }, - { "Hebrew",1255,sizeof(hebrew_cp)/sizeof(hebrew_cp[0]),hebrew_cp, + { "Hebrew", 1255, ARRAY_SIZE(hebrew_cp), hebrew_cp, "Miriam Fixed","David", sidHebrew }, - { "Japanese",932,sizeof(japanese_cp)/sizeof(japanese_cp[0]),japanese_cp, + { "Japanese", 932, ARRAY_SIZE(japanese_cp), japanese_cp, "MS Gothic","MS PGothic", sidKana }, - { "Korean",949,sizeof(korean_cp)/sizeof(korean_cp[0]),korean_cp, + { "Korean", 949, ARRAY_SIZE(korean_cp), korean_cp, "GulimChe","Gulim", sidHangul }, - { "Thai",874,sizeof(thai_cp)/sizeof(thai_cp[0]),thai_cp, + { "Thai", 874, ARRAY_SIZE(thai_cp), thai_cp, "Tahoma","Tahoma", sidThai }, - { "Turkish",1254,sizeof(turkish_cp)/sizeof(turkish_cp[0]),turkish_cp, + { "Turkish", 1254, ARRAY_SIZE(turkish_cp), turkish_cp, "Courier New","Arial", sidAsciiLatin }, - { "Vietnamese",1258,sizeof(vietnamese_cp)/sizeof(vietnamese_cp[0]),vietnamese_cp, + { "Vietnamese", 1258, ARRAY_SIZE(vietnamese_cp), vietnamese_cp, "Courier New","Arial", sidAsciiLatin }, - { "Western European",1252,sizeof(western_cp)/sizeof(western_cp[0]),western_cp, + { "Western European", 1252, ARRAY_SIZE(western_cp), western_cp, "Courier New","Arial", sidAsciiLatin }, - { "Unicode",CP_UNICODE,sizeof(unicode_cp)/sizeof(unicode_cp[0]),unicode_cp, + { "Unicode", CP_UNICODE, ARRAY_SIZE(unicode_cp), unicode_cp, "Courier New","Arial" } }; @@ -1163,7 +1163,7 @@ static HRESULT GetFamilyCodePage( if (!puiFamilyCodePage) return S_FALSE; - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -1560,13 +1560,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) && ! IsEqualGUID( &IID_IUnknown, iid) ) return E_NOINTERFACE; - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; @@ -1767,7 +1767,7 @@ static HRESULT EnumCodePage_create( MLang_impl* mlang, DWORD grfFlags, ecp->ref = 1; ecp->pos = 0; ecp->total = 0; - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -1780,7 +1780,7 @@ static HRESULT EnumCodePage_create( MLang_impl* mlang, DWORD grfFlags, sizeof(MIMECPINFO) * ecp->total); cpinfo = ecp->cpinfo; - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -1944,7 +1944,7 @@ static HRESULT EnumScript_create( MLang_impl* mlang, DWORD dwFlags, es->ref = 1; es->pos = 0; /* do not enumerate unicode flavours */ - es->total = sizeof(mlang_data)/sizeof(mlang_data[0]) - 1; + es->total = ARRAY_SIZE(mlang_data) - 1; es->script_info = HeapAlloc(GetProcessHeap(), 0, sizeof(SCRIPTINFO) * es->total); for (i = 0; i < es->total; i++) @@ -2140,7 +2140,7 @@ static HRESULT WINAPI fnIMultiLanguage_GetCodePageInfo( TRACE("%p, %u, %p\n", This, uiCodePage, pCodePageInfo); - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -2669,18 +2669,18 @@ static void fill_cp_info(const struct mlang_data *ml_data, UINT index, MIMECPINF mime_cp_info->uiCodePage = ml_data->mime_cp_info[index].cp; mime_cp_info->uiFamilyCodePage = ml_data->family_codepage; MultiByteToWideChar(CP_ACP, 0, ml_data->mime_cp_info[index].description, -1, - mime_cp_info->wszDescription, sizeof(mime_cp_info->wszDescription)/sizeof(WCHAR)); + mime_cp_info->wszDescription, ARRAY_SIZE(mime_cp_info->wszDescription)); MultiByteToWideChar(CP_ACP, 0, ml_data->mime_cp_info[index].web_charset, -1, - mime_cp_info->wszWebCharset, sizeof(mime_cp_info->wszWebCharset)/sizeof(WCHAR)); + mime_cp_info->wszWebCharset, ARRAY_SIZE(mime_cp_info->wszWebCharset)); MultiByteToWideChar(CP_ACP, 0, ml_data->mime_cp_info[index].header_charset, -1, - mime_cp_info->wszHeaderCharset, sizeof(mime_cp_info->wszHeaderCharset)/sizeof(WCHAR)); + mime_cp_info->wszHeaderCharset, ARRAY_SIZE(mime_cp_info->wszHeaderCharset)); MultiByteToWideChar(CP_ACP, 0, ml_data->mime_cp_info[index].body_charset, -1, - mime_cp_info->wszBodyCharset, sizeof(mime_cp_info->wszBodyCharset)/sizeof(WCHAR)); + mime_cp_info->wszBodyCharset, ARRAY_SIZE(mime_cp_info->wszBodyCharset)); MultiByteToWideChar(CP_ACP, 0, ml_data->fixed_font, -1, - mime_cp_info->wszFixedWidthFont, sizeof(mime_cp_info->wszFixedWidthFont)/sizeof(WCHAR)); + mime_cp_info->wszFixedWidthFont, ARRAY_SIZE(mime_cp_info->wszFixedWidthFont)); MultiByteToWideChar(CP_ACP, 0, ml_data->proportional_font, -1, - mime_cp_info->wszProportionalFont, sizeof(mime_cp_info->wszProportionalFont)/sizeof(WCHAR)); + mime_cp_info->wszProportionalFont, ARRAY_SIZE(mime_cp_info->wszProportionalFont)); TRACE("%08x %u %u %s %s %s %s %s %s %d\n", mime_cp_info->dwFlags, mime_cp_info->uiCodePage, @@ -2705,7 +2705,7 @@ static HRESULT WINAPI fnIMultiLanguage3_GetCodePageInfo( TRACE("%p, %u, %04x, %p\n", This, uiCodePage, LangId, pCodePageInfo); - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -2753,7 +2753,7 @@ static HRESULT WINAPI fnIMultiLanguage3_GetCharsetInfo( if (!pCharsetInfo) return E_FAIL; - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -2782,7 +2782,7 @@ static HRESULT WINAPI fnIMultiLanguage3_GetCharsetInfo( * them in our database as a primary (web_charset) encoding this loop * does an attempt to 'approximate' charset name by header_charset. */ - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -3120,7 +3120,7 @@ static HRESULT WINAPI fnIMultiLanguage3_GetCodePageDescription( unsigned int i,n; TRACE ("%u, %04x, %p, %d\n", uiCodePage, lcid, lpWideCharStr, cchWideChar); - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -3198,7 +3198,7 @@ static HRESULT WINAPI fnIMultiLanguage3_ValidateCodePageEx( return S_OK; /* check for mlang supported code pages */ - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { UINT n; for (n = 0; n < mlang_data[i].number_of_cp; n++) @@ -3339,7 +3339,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* iface *ret_codepages = 0; - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { BOOL used_dc; CHAR buf; @@ -3559,7 +3559,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, if (!dwFlags) dwFlags = SCRIPTCONTF_PROPORTIONAL_FONT; - for (i = 0, j = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0, j = 0; i < ARRAY_SIZE(mlang_data); i++) { if (sid == mlang_data[i].sid) { @@ -3595,7 +3595,7 @@ static HRESULT WINAPI fnIMLangFontLink2_CodePageToScriptID(IMLangFontLink2* This if (uiCodePage == CP_UNICODE) return E_FAIL; - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { if (uiCodePage == mlang_data[i].family_codepage) { @@ -3884,11 +3884,11 @@ static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) mlang->IMLangLineBreakConsole_iface.lpVtbl = &IMLangLineBreakConsole_vtbl; mlang->total_cp = 0; - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) mlang->total_cp += mlang_data[i].number_of_cp; /* do not enumerate unicode flavours */ - mlang->total_scripts = sizeof(mlang_data)/sizeof(mlang_data[0]) - 1; + mlang->total_scripts = ARRAY_SIZE(mlang_data) - 1; mlang->ref = 1; *ppObj = &mlang->IMultiLanguage_iface; -- 2.14.4

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
64
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-devel July 2018