February 2015 - Wine-Commits

Piotr Caban : winmm: Add RIFF creation tests.
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: f6b46db1c7b0e21b4c02deafee2c015a6fbbb4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b46db1c7b0e21b4c02deafe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 20 15:42:19 2015 +0100 winmm: Add RIFF creation tests. --- dlls/winmm/tests/mmio.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index cf02c0d..89146ef 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -906,6 +906,88 @@ static void test_mmio_buffer_pointer(void) DeleteFileA(test_file); } +static void test_riff_write(void) +{ + static const DWORD test_write_data[] = + { + FOURCC_RIFF, 0x28, mmioFOURCC('W','A','V','E'), mmioFOURCC('d','a','t','a'), + 0x1b, 0xdededede, 0xdededede, 0xefefefef, + 0xefefefef, 0xbabababa, 0xbabababa, 0xefefef + }; + + char name[] = "test_write.wav"; + char buf[256]; + MMCKINFO chunk_info[2]; + MMIOINFO info; + HMMIO mmio; + MMRESULT ret; + LONG written; + DWORD read; + HANDLE h; + + memset(chunk_info, 0, sizeof(chunk_info)); + + mmio = mmioOpenA(name, NULL, MMIO_ALLOCBUF|MMIO_CREATE|MMIO_READWRITE); + ok(mmio != NULL, "mmioOpen failed\n"); + + chunk_info[0].fccType = mmioFOURCC('W','A','V','E'); + ret = mmioCreateChunk(mmio, chunk_info, MMIO_CREATERIFF); + ok(ret == MMSYSERR_NOERROR, "mmioCreateChunk failed %x\n", ret); + ok(chunk_info[0].ckid == FOURCC_RIFF, "chunk_info[0].ckid = %x\n", chunk_info[0].ckid); + ok(chunk_info[0].cksize == 0, "chunk_info[0].cksize = %d\n", chunk_info[0].cksize); + ok(chunk_info[0].dwDataOffset == 8, "chunk_info[0].dwDataOffset = %d\n", chunk_info[0].dwDataOffset); + ok(chunk_info[0].dwFlags == MMIO_DIRTY, "chunk_info[0].dwFlags = %x\n", chunk_info[0].dwFlags); + + chunk_info[1].ckid = mmioFOURCC('d','a','t','a'); + ret = mmioCreateChunk(mmio, chunk_info+1, 0); + ok(ret == MMSYSERR_NOERROR, "mmioCreateChunk failed %x\n", ret); + ok(chunk_info[1].ckid == mmioFOURCC('d','a','t','a'), "chunk_info[1].ckid = %x\n", chunk_info[1].ckid); + ok(chunk_info[1].cksize == 0, "chunk_info[1].cksize = %d\n", chunk_info[1].cksize); + ok(chunk_info[1].dwDataOffset == 20, "chunk_info[1].dwDataOffset = %d\n", chunk_info[1].dwDataOffset); + ok(chunk_info[1].dwFlags == MMIO_DIRTY, "chunk_info[1].dwFlags = %x\n", chunk_info[1].dwFlags); + + memset(buf, 0xde, sizeof(buf)); + written = mmioWrite(mmio, buf, 8); + ok(written == 8, "mmioWrite failed %x\n", ret); + + ret = mmioGetInfo(mmio, &info, 0); + ok(ret == MMSYSERR_NOERROR, "mmioGetInfo failed %x\n", ret); + + memset(info.pchNext, 0xef, 8); + info.pchNext += 8; + ret = mmioAdvance(mmio, &info, 1); + ok(ret == MMSYSERR_NOERROR, "mmioAdvance failed %x\n", ret); + ok(info.lBufOffset == 36, "info.lBufOffset = %d\n", info.lBufOffset); + + info.dwFlags |= MMIO_DIRTY; + memset(info.pchNext, 0xba, 8); + info.pchNext += 8; + ret = mmioAdvance(mmio, &info, 1); + ok(ret == MMSYSERR_NOERROR, "mmioAdvance failed %x\n", ret); + ok(info.lBufOffset == 44, "info.lBufOffset = %d\n", info.lBufOffset); + + info.dwFlags |= MMIO_DIRTY; + memset(info.pchNext, 0xef, 3); + info.pchNext += 3; + ret = mmioSetInfo(mmio, &info, 0); + ok(ret == MMSYSERR_NOERROR, "mmioSetInfo failed %x\n", ret); + + ret = mmioAscend(mmio, chunk_info+1, 0); + ok(ret == MMSYSERR_NOERROR, "mmioAscend failed %x\n", ret); + ret = mmioAscend(mmio, chunk_info, 0); + ok(ret == MMSYSERR_NOERROR, "mmioAscend failed %x\n", ret); + ret = mmioClose(mmio, 0); + ok(ret == MMSYSERR_NOERROR, "mmioClose failed %x\n", ret); + + h = CreateFileA("test_write.wav", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(h != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + ok(ReadFile(h, buf, sizeof(buf), &read, NULL), "ReadFile failed\n"); + CloseHandle(h); + ok(!memcmp(buf, test_write_data, sizeof(test_write_data)), "created file is incorrect\n"); + + DeleteFileA("test_write.wav"); +} + START_TEST(mmio) { /* Make it possible to run the tests against a specific AVI file in @@ -924,4 +1006,5 @@ START_TEST(mmio) test_mmioSeek(); test_mmio_end_of_file(); test_mmio_buffer_pointer(); + test_riff_write(); }

1 0

Michael Stefaniuc : appwiz.cpl: Use the proper type to hold the return value (PVS-Studio).
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: c3c272c4c5de5874f008271b78648394bb55fb04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c272c4c5de5874f008271b7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:23:29 2015 +0100 appwiz.cpl: Use the proper type to hold the return value (PVS-Studio). --- dlls/appwiz.cpl/addons.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 3a7d35d..3704c56 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -307,7 +307,7 @@ static enum install_res install_from_default_dir(void) const char *data_dir, *package_dir; char *dir_buf = NULL; int len; - BOOL ret; + enum install_res ret; if((data_dir = wine_get_data_dir())) { package_dir = data_dir;

1 0

Michael Stefaniuc : oledlg: RT_DIALOG is already an int resource ( PVS-Studio).
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: b9d5074aaab1d874c329ef848d4522c225743baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9d5074aaab1d874c329ef848… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:00:53 2015 +0100 oledlg: RT_DIALOG is already an int resource (PVS-Studio). --- dlls/oledlg/pastespl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index f136438..4d31488 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -711,7 +711,7 @@ UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW ps) HRSRC hrsrc; if(name == NULL) return OLEUI_ERR_LPSZTEMPLATEINVALID; - hrsrc = FindResourceW(hInst, name, MAKEINTRESOURCEW(RT_DIALOG)); + hrsrc = FindResourceW(hInst, name, (LPWSTR)RT_DIALOG); if(!hrsrc) return OLEUI_ERR_FINDTEMPLATEFAILURE; dlg_templ = LoadResource(hInst, hrsrc); if(!dlg_templ) return OLEUI_ERR_LOADTEMPLATEFAILURE;

1 0

Nikolay Sivov : dwrite: Use FreeType CMAP cache system instead of parsing tables manually.
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: 6ff14a92138ea10f38a29215731d4e63c1acec26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ff14a92138ea10f38a292157… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 20 13:47:30 2015 +0300 dwrite: Use FreeType CMAP cache system instead of parsing tables manually. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 9 +--- dlls/dwrite/freetype.c | 26 ++++++++++- dlls/dwrite/opentype.c | 100 ------------------------------------------- 4 files changed, 28 insertions(+), 109 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 9a27a5e..9481c74 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -126,7 +126,6 @@ extern HRESULT get_family_names_from_stream(IDWriteFontFileStream*,UINT32,DWRITE /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_table(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,UINT32,const void**,void**,UINT32*,BOOL*) DECLSPEC_HIDDEN; -extern void opentype_cmap_get_glyphindex(void*,UINT32,UINT16*) DECLSPEC_HIDDEN; extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANGE*,UINT32*) DECLSPEC_HIDDEN; extern void opentype_get_font_properties(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,DWRITE_FONT_STRETCH*, DWRITE_FONT_WEIGHT*,DWRITE_FONT_STYLE*) DECLSPEC_HIDDEN; @@ -162,6 +161,7 @@ extern void freetype_notify_cacheremove(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern BOOL freetype_is_monospaced(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern HRESULT freetype_get_glyph_outline(IDWriteFontFace2*,FLOAT,UINT16,USHORT,struct glyph_outline**) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphcount(IDWriteFontFace2*) DECLSPEC_HIDDEN; +extern UINT16 freetype_get_glyphindex(IDWriteFontFace2*,UINT32) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2092576..12ce3ca 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -388,17 +388,12 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace2 *iface, UI UINT32 count, UINT16 *glyph_indices) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - unsigned int i; - void *data; + UINT32 i; TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyph_indices); - data = get_fontface_cmap(This); - if (!data) - return E_FAIL; - for (i = 0; i < count; i++) - opentype_cmap_get_glyphindex(data, codepoints[i], &glyph_indices[i]); + glyph_indices[i] = freetype_get_glyphindex(iface, codepoints[i]); return S_OK; } diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 3b9681d..84c9cad 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -53,6 +53,7 @@ static CRITICAL_SECTION freetype_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static void *ft_handle = NULL; static FT_Library library = 0; static FTC_Manager cache_manager = 0; +static FTC_CMapCache cmap_cache = 0; typedef struct { FT_Int major; @@ -67,6 +68,8 @@ MAKE_FUNCPTR(FT_Library_Version); MAKE_FUNCPTR(FT_Load_Glyph); MAKE_FUNCPTR(FT_New_Memory_Face); MAKE_FUNCPTR(FT_Outline_Transform); +MAKE_FUNCPTR(FTC_CMapCache_Lookup); +MAKE_FUNCPTR(FTC_CMapCache_New); MAKE_FUNCPTR(FTC_Manager_New); MAKE_FUNCPTR(FTC_Manager_Done); MAKE_FUNCPTR(FTC_Manager_LookupFace); @@ -137,6 +140,8 @@ BOOL init_freetype(void) LOAD_FUNCPTR(FT_Load_Glyph) LOAD_FUNCPTR(FT_New_Memory_Face) LOAD_FUNCPTR(FT_Outline_Transform) + LOAD_FUNCPTR(FTC_CMapCache_Lookup) + LOAD_FUNCPTR(FTC_CMapCache_New) LOAD_FUNCPTR(FTC_Manager_New) LOAD_FUNCPTR(FTC_Manager_Done) LOAD_FUNCPTR(FTC_Manager_LookupFace) @@ -153,8 +158,11 @@ BOOL init_freetype(void) pFT_Library_Version(library, &FT_Version.major, &FT_Version.minor, &FT_Version.patch); /* init cache manager */ - if (pFTC_Manager_New(library, 0, 0, 0, &face_requester, NULL, &cache_manager) != 0) { + if (pFTC_Manager_New(library, 0, 0, 0, &face_requester, NULL, &cache_manager) != 0 || + pFTC_CMapCache_New(cache_manager, &cmap_cache) != 0) { + ERR("Failed to init FreeType cache\n"); + pFTC_Manager_Done(cache_manager); pFT_Done_FreeType(library); wine_dlclose(ft_handle, NULL, 0); ft_handle = NULL; @@ -388,6 +396,17 @@ UINT16 freetype_get_glyphcount(IDWriteFontFace2 *fontface) return count; } +UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint) +{ + UINT16 glyph; + + EnterCriticalSection(&freetype_cs); + glyph = pFTC_CMapCache_Lookup(cmap_cache, fontface, -1, codepoint); + LeaveCriticalSection(&freetype_cs); + + return glyph; +} + #else /* HAVE_FREETYPE */ BOOL init_freetype(void) @@ -424,4 +443,9 @@ UINT16 freetype_get_glyphcount(IDWriteFontFace2 *fontface) return 0; } +UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint) +{ + return 0; +} + #endif /* HAVE_FREETYPE */ diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index aabc049..cbc5090 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -757,106 +757,6 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_ * CMAP **********/ -static int compare_group(const void *a, const void* b) -{ - const DWORD *chr = a; - const CMAP_SegmentedCoverage_group *group = b; - - if (*chr < GET_BE_DWORD(group->startCharCode)) - return -1; - if (*chr > GET_BE_DWORD(group->endCharCode)) - return 1; - return 0; -} - -static void CMAP4_GetGlyphIndex(CMAP_SegmentMapping_0* format, UINT32 utf32c, UINT16 *pgi) -{ - WORD *startCode; - SHORT *idDelta; - WORD *idRangeOffset; - int segment; - - int segment_count = GET_BE_WORD(format->segCountX2)/2; - /* This is correct because of the padding before startCode */ - startCode = (WORD*)((BYTE*)format + sizeof(CMAP_SegmentMapping_0) + (sizeof(WORD) * segment_count)); - idDelta = (SHORT*)(((BYTE*)startCode) + (sizeof(WORD) * segment_count)); - idRangeOffset = (WORD*)(((BYTE*)idDelta) + (sizeof(WORD) * segment_count)); - - segment = 0; - while(GET_BE_WORD(format->endCode[segment]) < 0xffff) - { - if (utf32c <= GET_BE_WORD(format->endCode[segment])) - break; - segment++; - } - if (segment >= segment_count) - return; - TRACE("Segment %i of %i\n",segment, segment_count); - if (GET_BE_WORD(startCode[segment]) > utf32c) - return; - TRACE("In range %i -> %i\n", GET_BE_WORD(startCode[segment]), GET_BE_WORD(format->endCode[segment])); - if (GET_BE_WORD(idRangeOffset[segment]) == 0) - { - *pgi = (SHORT)(GET_BE_WORD(idDelta[segment])) + utf32c; - } - else - { - WORD ro = GET_BE_WORD(idRangeOffset[segment])/2; - WORD co = (utf32c - GET_BE_WORD(startCode[segment])); - WORD *index = (WORD*)((BYTE*)&idRangeOffset[segment] + (ro + co)); - *pgi = GET_BE_WORD(*index); - } -} - -static void CMAP12_GetGlyphIndex(CMAP_SegmentedCoverage* format, UINT32 utf32c, UINT16 *pgi) -{ - CMAP_SegmentedCoverage_group *group; - - group = bsearch(&utf32c, format->groups, GET_BE_DWORD(format->nGroups), - sizeof(CMAP_SegmentedCoverage_group), compare_group); - - if (group) - { - DWORD offset = utf32c - GET_BE_DWORD(group->startCharCode); - *pgi = GET_BE_DWORD(group->startGlyphID) + offset; - } -} - -void opentype_cmap_get_glyphindex(void *data, UINT32 utf32c, UINT16 *pgi) -{ - CMAP_Header *CMAP_Table = data; - int i; - - *pgi = 0; - - for (i = 0; i < GET_BE_WORD(CMAP_Table->numTables); i++) - { - WORD type; - WORD *table; - - if (GET_BE_WORD(CMAP_Table->tables[i].platformID) != 3) - continue; - - table = (WORD*)(((BYTE*)CMAP_Table) + GET_BE_DWORD(CMAP_Table->tables[i].offset)); - type = GET_BE_WORD(*table); - TRACE("table type %i\n", type); - - switch (type) - { - case OPENTYPE_CMAP_TABLE_SEGMENT_MAPPING: - CMAP4_GetGlyphIndex((CMAP_SegmentMapping_0*) table, utf32c, pgi); - break; - case OPENTYPE_CMAP_TABLE_SEGMENTED_COVERAGE: - CMAP12_GetGlyphIndex((CMAP_SegmentedCoverage*) table, utf32c, pgi); - break; - default: - TRACE("table type %i unhandled.\n", type); - } - - if (*pgi) return; - } -} - static UINT32 opentype_cmap_get_unicode_ranges_count(const CMAP_Header *CMAP_Table) { UINT32 count = 0;

1 0

Jacek Caban : hhctrl.ocx: Store WebBrowser container struct instead of interfaces in HHInfo.
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: efe4be6571eaa68f6433e3e02ac80c720884c67a URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe4be6571eaa68f6433e3e02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 20 14:32:49 2015 +0100 hhctrl.ocx: Store WebBrowser container struct instead of interfaces in HHInfo. --- dlls/hhctrl.ocx/help.c | 14 ++-- dlls/hhctrl.ocx/hhctrl.h | 17 +++- dlls/hhctrl.ocx/webbrowser.c | 186 ++++++++++++++++++------------------------- 3 files changed, 97 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efe4be6571eaa68f6433e…

1 0

André Hentschel : taskmgr: Remove dead code.
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: 68d85cc7f8004c7d08584336ba24b18bf908ff9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d85cc7f8004c7d08584336b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 21 14:58:27 2015 +0100 taskmgr: Remove dead code. --- programs/taskmgr/taskmgr.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index b876cbf..80dc81c 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -184,26 +184,13 @@ static BOOL OnCreate(HWND hWnd) GetClientRect(hWnd, &rc); nOldWidth = rc.right; nOldHeight = rc.bottom; - /* nOldStartX = rc.left; */ - /*nOldStartY = rc.top; */ - -#define PAGE_OFFSET_LEFT 17 -#define PAGE_OFFSET_TOP 72 -#define PAGE_OFFSET_WIDTH (PAGE_OFFSET_LEFT*2) -#define PAGE_OFFSET_HEIGHT (PAGE_OFFSET_TOP+32) if ((TaskManagerSettings.Left != 0) || (TaskManagerSettings.Top != 0) || (TaskManagerSettings.Right != 0) || (TaskManagerSettings.Bottom != 0)) - { MoveWindow(hWnd, TaskManagerSettings.Left, TaskManagerSettings.Top, TaskManagerSettings.Right - TaskManagerSettings.Left, TaskManagerSettings.Bottom - TaskManagerSettings.Top, TRUE); -#ifdef __GNUC__TEST__ - MoveWindow(hApplicationPage, TaskManagerSettings.Left + PAGE_OFFSET_LEFT, TaskManagerSettings.Top + PAGE_OFFSET_TOP, TaskManagerSettings.Right - TaskManagerSettings.Left - PAGE_OFFSET_WIDTH, TaskManagerSettings.Bottom - TaskManagerSettings.Top - PAGE_OFFSET_HEIGHT, FALSE); - MoveWindow(hProcessPage, TaskManagerSettings.Left + PAGE_OFFSET_LEFT, TaskManagerSettings.Top + PAGE_OFFSET_TOP, TaskManagerSettings.Right - TaskManagerSettings.Left - PAGE_OFFSET_WIDTH, TaskManagerSettings.Bottom - TaskManagerSettings.Top - PAGE_OFFSET_HEIGHT, FALSE); - MoveWindow(hPerformancePage, TaskManagerSettings.Left + PAGE_OFFSET_LEFT, TaskManagerSettings.Top + PAGE_OFFSET_TOP, TaskManagerSettings.Right - TaskManagerSettings.Left - PAGE_OFFSET_WIDTH, TaskManagerSettings.Bottom - TaskManagerSettings.Top - PAGE_OFFSET_HEIGHT, FALSE); -#endif - } + if (TaskManagerSettings.Maximized) ShowWindow(hWnd, SW_MAXIMIZE); @@ -297,19 +284,6 @@ static BOOL OnCreate(HWND hWnd) return TRUE; } -/* OnMove() - * This function handles all the moving events for the application - * It moves every child window that needs moving - */ -static void OnMove( UINT nType, int cx, int cy ) -{ -#ifdef __GNUC__TEST__ - MoveWindow(hApplicationPage, TaskManagerSettings.Left + PAGE_OFFSET_LEFT, TaskManagerSettings.Top + PAGE_OFFSET_TOP, TaskManagerSettings.Right - TaskManagerSettings.Left - PAGE_OFFSET_WIDTH, TaskManagerSettings.Bottom - TaskManagerSettings.Top - PAGE_OFFSET_HEIGHT, FALSE); - MoveWindow(hProcessPage, TaskManagerSettings.Left + PAGE_OFFSET_LEFT, TaskManagerSettings.Top + PAGE_OFFSET_TOP, TaskManagerSettings.Right - TaskManagerSettings.Left - PAGE_OFFSET_WIDTH, TaskManagerSettings.Bottom - TaskManagerSettings.Top - PAGE_OFFSET_HEIGHT, FALSE); - MoveWindow(hPerformancePage, TaskManagerSettings.Left + PAGE_OFFSET_LEFT, TaskManagerSettings.Top + PAGE_OFFSET_TOP, TaskManagerSettings.Right - TaskManagerSettings.Left - PAGE_OFFSET_WIDTH, TaskManagerSettings.Bottom - TaskManagerSettings.Top - PAGE_OFFSET_HEIGHT, FALSE); -#endif -} - /* OnSize() * This function handles all the sizing events for the application * It re-sizes every window, and child window that needs re-sizing @@ -1011,11 +985,6 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) OnSize(wParam, LOWORD(lParam), HIWORD(lParam)); break; - case WM_MOVE: - /* Handle the window moving in its own function */ - OnMove(wParam, LOWORD(lParam), HIWORD(lParam)); - break; - case WM_DESTROY: ShowWindow(hDlg, SW_HIDE); TrayIcon_ShellRemoveTrayIcon();

1 0

Michael Stefaniuc : mshtml/tests: Remove an always true conditional subexpression (PVS-Studio).
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: 9dc35ac468f9c6e805a0eb1c57d043cabfe87a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dc35ac468f9c6e805a0eb1c5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:04:34 2015 +0100 mshtml/tests: Remove an always true conditional subexpression (PVS-Studio). --- dlls/mshtml/tests/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 64c0556..8f4e15e 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1412,7 +1412,7 @@ static void pump_msgs(BOOL *b) DispatchMessageW(&msg); } }else { - while(!b && PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { + while(PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); DispatchMessageW(&msg); }

1 0

Nikolay Sivov : dwrite/tests: Fixed font instance leak.
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: 0067be66bb3026c173d38a0df762a4bb33b11fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0067be66bb3026c173d38a0df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 20 13:48:37 2015 +0300 dwrite/tests: Fixed font instance leak. --- dlls/dwrite/tests/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d171411..95ba5aa 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2240,6 +2240,7 @@ static void test_GetGdiInterop(void) hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop2, &logfont, &font); ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); IDWriteGdiInterop_Release(interop2); IDWriteGdiInterop_Release(interop);

1 0

André Hentschel : ole32: Remove unused macros.
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: 8af03fef9a298df6140a012466d0e8a76dcd0b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8af03fef9a298df6140a01246… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 21 14:58:33 2015 +0100 ole32: Remove unused macros. --- dlls/ole32/clipboard.c | 2 -- dlls/ole32/filelockbytes.c | 4 ---- dlls/ole32/ole2impl.c | 2 -- 3 files changed, 8 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 38df750..d40ee59 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -83,8 +83,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -#define HANDLE_ERROR(err) do { hr = err; TRACE("(HRESULT=%x)\n", (HRESULT)err); goto CLEANUP; } while (0) - /* Structure of 'Ole Private Data' clipboard format */ typedef struct { diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index 605b5df..7dc4843 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -65,10 +65,6 @@ static inline FileLockBytesImpl *impl_from_ILockBytes(ILockBytes *iface) * Prototypes for private methods */ -/* Note that this evaluates a and b multiple times, so don't - * pass expressions with side effects. */ -#define ROUND_UP(a, b) ((((a) + (b) - 1)/(b))*(b)) - /**************************************************************************** * GetProtectMode * diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index 5d92fec..152132b 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -36,8 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -#define MAX_CLIPFORMAT_NAME 80 - /****************************************************************************** * OleQueryCreateFromData [OLE32.@] *

1 0

André Hentschel : strmbase: Remove unused macro.
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: 72eefcb5c0a9d9c19407a279afc5810116ae78b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72eefcb5c0a9d9c19407a279a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 21 14:58:31 2015 +0100 strmbase: Remove unused macro. --- dlls/strmbase/dllfunc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 61ec283..195a409 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -51,7 +51,6 @@ static LONG server_locks = 0; /* * defines and constants */ -#define MAX_KEY_LEN 260 static const WCHAR clsid_keyname[] = {'C','L','S','I','D',0 }; static const WCHAR ips32_keyname[] = {'I','n','P','r','o','c','S','e','r','v','e','r','3','2',0};

1 0