July 2016 - Wine-Commits - list.winehq.org

Francois Gouget : mfdrv: Fix a typo in a comment.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: d7e18f6540244cc730e8f9dbbbc737ad6d0eda12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e18f6540244cc730e8f9dbb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:58:33 2016 +0200 mfdrv: Fix a typo in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/mfdrv/bitblt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/mfdrv/bitblt.c b/dlls/gdi32/mfdrv/bitblt.c index fd6c68f..9bf7ab5 100644 --- a/dlls/gdi32/mfdrv/bitblt.c +++ b/dlls/gdi32/mfdrv/bitblt.c @@ -161,7 +161,7 @@ INT MFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, /*********************************************************************** - * MFDRV_SetDIBitsToDeivce + * MFDRV_SetDIBitsToDevice */ INT MFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDst, INT yDst, DWORD cx, DWORD cy, INT xSrc, INT ySrc, UINT startscan,

1 0

Francois Gouget : ntdll: Fix typos in some comments.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 75c1622b01321df9b5016ec1f5b0505cce9e94dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c1622b01321df9b5016ec1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:57:56 2016 +0200 ntdll: Fix typos in some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 8af2181..0d03300 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -1209,7 +1209,7 @@ static NTSTATUS RTL_GetKeyHandle(ULONG RelativeTo, PCWSTR Path, PHANDLE handle) /************************************************************************* * RtlQueryRegistryValues [NTDLL.@] * - * Query multiple registry values with a signle call. + * Query multiple registry values with a single call. * * PARAMS * RelativeTo [I] Registry path that Path refers to @@ -1386,7 +1386,7 @@ out: /************************************************************************* * RtlCheckRegistryKey [NTDLL.@] * - * Query multiple registry values with a signle call. + * Query multiple registry values with a single call. * * PARAMS * RelativeTo [I] Registry path that Path refers to @@ -1416,7 +1416,7 @@ NTSTATUS WINAPI RtlCheckRegistryKey(IN ULONG RelativeTo, IN PWSTR Path) /************************************************************************* * RtlDeleteRegistryValue [NTDLL.@] * - * Query multiple registry values with a signle call. + * Query multiple registry values with a single call. * * PARAMS * RelativeTo [I] Registry path that Path refers to

1 0

Huw Davies : riched20: Add an option to constrain the run search to the current para.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 3d1d65bc2c6e1c1ece15f4021fe289be3ce1775d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d1d65bc2c6e1c1ece15f4021… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 4 08:43:22 2016 +0100 riched20: Add an option to constrain the run search to the current para. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 4 ++-- dlls/riched20/editor.c | 10 +++++----- dlls/riched20/editor.h | 4 ++-- dlls/riched20/list.c | 16 ++++++++++------ dlls/riched20/para.c | 2 +- dlls/riched20/writer.c | 2 +- 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 177f303..170363a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -331,7 +331,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, { /* We aren't deleting anything in this run, so we will go back to the * last run we are deleting text in. */ - ME_PrevRun(&c.pPara, &c.pRun); + ME_PrevRun(&c.pPara, &c.pRun, TRUE); c.nOffset = c.pRun->member.run.len; } run = &c.pRun->member.run; @@ -1245,7 +1245,7 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) int x = ME_GetXForArrow(editor, pCursor); if (editor->bCaretAtEnd && !pCursor->nOffset) - if (!ME_PrevRun(&pOldPara, &pRun)) + if (!ME_PrevRun(&pOldPara, &pRun, TRUE)) return; if (nRelOfs == -1) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a07dd7f..81ef55d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1863,7 +1863,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH cursor.nOffset++; if (cursor.nOffset == cursor.pRun->member.run.len) { - ME_NextRun(&cursor.pPara, &cursor.pRun); + ME_NextRun(&cursor.pPara, &cursor.pRun, TRUE); cursor.nOffset = 0; } } @@ -1889,7 +1889,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH if (nCurEnd == 0) { - ME_PrevRun(&pCurPara, &pCurItem); + ME_PrevRun(&pCurPara, &pCurItem, TRUE); nCurEnd = pCurItem->member.run.len; } @@ -1938,7 +1938,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH } if (nCurEnd - nMatched == 0) { - ME_PrevRun(&pCurPara, &pCurItem); + ME_PrevRun(&pCurPara, &pCurItem, TRUE); /* Don't care about pCurItem becoming NULL here; it's already taken * care of in the exterior loop condition */ nCurEnd = pCurItem->member.run.len + nMatched; @@ -1952,7 +1952,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH cursor.nOffset--; if (cursor.nOffset < 0) { - ME_PrevRun(&cursor.pPara, &cursor.pRun); + ME_PrevRun(&cursor.pPara, &cursor.pRun, TRUE); cursor.nOffset = cursor.pRun->member.run.len; } } @@ -5109,7 +5109,7 @@ static BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, } cursor.nOffset = 0; - if (!ME_NextRun(&cursor.pPara, &cursor.pRun)) + if (!ME_NextRun(&cursor.pPara, &cursor.pRun, TRUE)) goto done; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e9d1e47..cc1654a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -88,8 +88,8 @@ void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt) DE /* list.c */ void ME_InsertBefore(ME_DisplayItem *diWhere, ME_DisplayItem *diWhat) DECLSPEC_HIDDEN; void ME_Remove(ME_DisplayItem *diWhere) DECLSPEC_HIDDEN; -BOOL ME_NextRun(ME_DisplayItem **para, ME_DisplayItem **run) DECLSPEC_HIDDEN; -BOOL ME_PrevRun(ME_DisplayItem **para, ME_DisplayItem **run) DECLSPEC_HIDDEN; +BOOL ME_NextRun(ME_DisplayItem **para, ME_DisplayItem **run, BOOL all_para) DECLSPEC_HIDDEN; +BOOL ME_PrevRun(ME_DisplayItem **para, ME_DisplayItem **run, BOOL all_para) DECLSPEC_HIDDEN; ME_DisplayItem *ME_FindItemBack(ME_DisplayItem *di, ME_DIType nTypeOrClass) DECLSPEC_HIDDEN; ME_DisplayItem *ME_FindItemFwd(ME_DisplayItem *di, ME_DIType nTypeOrClass) DECLSPEC_HIDDEN; ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index c57e526..ce21c59 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -63,16 +63,18 @@ static BOOL ME_DITypesEqual(ME_DIType type, ME_DIType nTypeOrClass) } } -/* Modifies run pointer to point to the next run, and modify the - * paragraph pointer if moving into the next paragraph. +/* Modifies run pointer to point to the next run. + * If all_para is FALSE constrain the search to the current para, + * otherwise modify the paragraph pointer if moving into the next paragraph. * * Returns TRUE if next run is found, otherwise returns FALSE. */ -BOOL ME_NextRun(ME_DisplayItem **para, ME_DisplayItem **run) +BOOL ME_NextRun(ME_DisplayItem **para, ME_DisplayItem **run, BOOL all_para) { ME_DisplayItem *p = (*run)->next; while (p->type != diTextEnd) { if (p->type == diParagraph) { + if (!all_para) return FALSE; *para = p; } else if (p->type == diRun) { *run = p; @@ -83,16 +85,18 @@ BOOL ME_NextRun(ME_DisplayItem **para, ME_DisplayItem **run) return FALSE; } -/* Modifies run pointer to point to the previous run, and modify the - * paragraph pointer if moving into the previous paragraph. +/* Modifies run pointer to point to the previous run. + * If all_para is FALSE constrain the search to the current para, + * otherwise modify the paragraph pointer if moving into the previous paragraph. * * Returns TRUE if previous run is found, otherwise returns FALSE. */ -BOOL ME_PrevRun(ME_DisplayItem **para, ME_DisplayItem **run) +BOOL ME_PrevRun(ME_DisplayItem **para, ME_DisplayItem **run, BOOL all_para) { ME_DisplayItem *p = (*run)->prev; while (p->type != diTextStart) { if (p->type == diParagraph) { + if (!all_para) return FALSE; if (p->member.para.prev_para->type == diParagraph) *para = p->member.para.prev_para; } else if (p->type == diRun) { diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 6721698..c762cf0 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -364,7 +364,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, endCur.pRun = ME_FindItemFwd(pNext, diRun); endCur.nOffset = 0; startCur = endCur; - ME_PrevRun(&startCur.pPara, &startCur.pRun); + ME_PrevRun(&startCur.pPara, &startCur.pRun, TRUE); ME_SetCharFormat(editor, &startCur, &endCur, &fmt); if (!editor->bEmulateVersion10) { /* v4.1 */ diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index f76d5a5..5d74a34 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -981,7 +981,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, if (!ME_StreamOutPrint(pStream, "}")) return FALSE; } - } while (cursor.pRun != endCur.pRun && ME_NextRun(&cursor.pPara, &cursor.pRun)); + } while (cursor.pRun != endCur.pRun && ME_NextRun(&cursor.pPara, &cursor.pRun, TRUE)); if (!ME_StreamOutMove(pStream, "}\0", 2)) return FALSE;

1 0

Michael Stefaniuc : msctf: Get rid of a cast from a COM object to an iface.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 8e2db1dfe1201c5387771094e3708ce3dbf2fc25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2db1dfe1201c5387771094e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:29:56 2016 +0200 msctf: Get rid of a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/threadmgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index e645619..528414f 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1488,8 +1488,8 @@ static HRESULT EnumTfDocumentMgr_Constructor(struct list* head, IEnumTfDocumentM This->head = head; This->index = list_head(This->head); - TRACE("returning %p\n", This); - *ppOut = (IEnumTfDocumentMgrs*)This; + TRACE("returning %p\n", &This->IEnumTfDocumentMgrs_iface); + *ppOut = &This->IEnumTfDocumentMgrs_iface; return S_OK; }

1 0

Nikolay Sivov : dwrite: Improve script mapping generation.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: c38be91061500325911d231c77a9eaaa7da918c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38be91061500325911d231c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 4 10:44:47 2016 +0300 dwrite: Improve script mapping generation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 76 ++- dlls/dwrite/scripts.c | 1456 +++++++++++++++++++++++++----------------------- dlls/dwrite/scripts.h | 261 +++++---- tools/make_unicode | 185 ++++-- 4 files changed, 1055 insertions(+), 923 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c38be91061500325911d2…

1 0

Michael Stefaniuc : pstorec: Get rid of a cast from a COM object to an iface.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 14d3dfde67705f09d2c88013c97bd6ca45fff3de URL: http://source.winehq.org/git/wine.git/?a=commit;h=14d3dfde67705f09d2c88013c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:27:53 2016 +0200 pstorec: Get rid of a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pstorec/pstorec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index b100a08..269ebca 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -364,7 +364,7 @@ HRESULT WINAPI PStoreCreateInstance( IPStore** ppProvider, ips->IPStore_iface.lpVtbl = &pstores_vtbl; ips->ref = 1; - *ppProvider = (IPStore*) ips; + *ppProvider = &ips->IPStore_iface; return S_OK; }

1 0

Michael Stefaniuc : wordpad: Use SetRect() instead of open coding it.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 8e05ddb1f89f81803993d3d0e2b113979318f842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e05ddb1f89f81803993d3d0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 10:54:38 2016 +0200 wordpad: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/print.c | 46 ++++++++++++--------------------------------- programs/wordpad/registry.c | 7 +------ 2 files changed, 13 insertions(+), 40 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index b3ee579..3b78ffa 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -88,12 +88,7 @@ void registry_read_pagemargins(HKEY hKey) if(!hKey || RegQueryValueExW(hKey, var_pagemargin, 0, NULL, (LPBYTE)&margins, &size) != ERROR_SUCCESS || size != sizeof(RECT)) - { - margins.top = 1417; - margins.bottom = 1417; - margins.left = 1757; - margins.right = 1757; - } + SetRect(&margins, 1757, 1417, 1757, 1417); } void registry_set_previewpages(HKEY hKey) @@ -201,10 +196,7 @@ static RECT get_print_rect(HDC hdc) height = centmm_to_twips(27000); } - rc.left = margins.left; - rc.right = width - margins.right; - rc.top = margins.top; - rc.bottom = height - margins.bottom; + SetRect(&rc, margins.left, margins.top, width - margins.right, height - margins.bottom); return rc; } @@ -452,10 +444,7 @@ static void print(LPPRINTDLGW pd, LPWSTR wszFileName) fr.hdcTarget = pd->hDC; fr.rc = get_print_rect(fr.hdc); - fr.rcPage.left = 0; - fr.rcPage.right = fr.rc.right + margins.right; - fr.rcPage.top = 0; - fr.rcPage.bottom = fr.rc.bottom + margins.bottom; + SetRect(&fr.rcPage, 0, 0, fr.rc.right + margins.right, fr.rc.bottom + margins.bottom); ZeroMemory(&di, sizeof(di)); di.cbSize = sizeof(di); @@ -512,19 +501,15 @@ void dialog_printsetup(HWND hMainWnd) ps.lStructSize = sizeof(ps); ps.hwndOwner = hMainWnd; ps.Flags = PSD_INHUNDREDTHSOFMILLIMETERS | PSD_MARGINS; - ps.rtMargin.left = twips_to_centmm(margins.left); - ps.rtMargin.right = twips_to_centmm(margins.right); - ps.rtMargin.top = twips_to_centmm(margins.top); - ps.rtMargin.bottom = twips_to_centmm(margins.bottom); + SetRect(&ps.rtMargin, twips_to_centmm(margins.left), twips_to_centmm(margins.top), + twips_to_centmm(margins.right), twips_to_centmm(margins.bottom)); ps.hDevMode = devMode; ps.hDevNames = devNames; if(PageSetupDlgW(&ps)) { - margins.left = centmm_to_twips(ps.rtMargin.left); - margins.right = centmm_to_twips(ps.rtMargin.right); - margins.top = centmm_to_twips(ps.rtMargin.top); - margins.bottom = centmm_to_twips(ps.rtMargin.bottom); + SetRect(&margins, centmm_to_twips(ps.rtMargin.left), centmm_to_twips(ps.rtMargin.top), + centmm_to_twips(ps.rtMargin.right), centmm_to_twips(ps.rtMargin.bottom)); devMode = ps.hDevMode; devNames = ps.hDevNames; update_ruler(get_ruler_wnd(hMainWnd)); @@ -713,10 +698,8 @@ static void draw_margin_lines(HDC hdc, int x, int y, float ratio) dpi.cx = GetDeviceCaps(hdc, LOGPIXELSX); dpi.cy = GetDeviceCaps(hdc, LOGPIXELSY); - page_margin.left = preview.rcPage.left + margins.left; - page_margin.top = preview.rcPage.top + margins.top; - page_margin.bottom = preview.rcPage.bottom - margins.bottom; - page_margin.right = preview.rcPage.right - margins.right; + SetRect(&page_margin, preview.rcPage.left + margins.left, preview.rcPage.top + margins.top, + preview.rcPage.right - margins.right, preview.rcPage.bottom - margins.bottom); page_margin.left = (int)((float)twips_to_pixels(page_margin.left, dpi.cx) * ratio); page_margin.top = (int)((float)twips_to_pixels(page_margin.top, dpi.cy) * ratio); @@ -860,10 +843,8 @@ static LRESULT print_preview(HWND hwndPreview) /* draw page outlines */ hPen = CreatePen(PS_SOLID|PS_INSIDEFRAME, 2, RGB(0,0,0)); oldPen = SelectObject(hdc, hPen); - background.left = x - 2; - background.right = x + preview.bmScaledSize.cx + 2; - background.top = y - 2; - background.bottom = y + preview.bmScaledSize.cy + 2; + SetRect(&background, x - 2, y - 2, x + preview.bmScaledSize.cx + 2, + y + preview.bmScaledSize.cy + 2); Rectangle(hdc, background.left, background.top, background.right, background.bottom); excl_rgn = CreateRectRgnIndirect(&background); @@ -956,10 +937,7 @@ static void update_preview(HWND hMainWnd) fr.chrg.cpMin = 0; fr.chrg.cpMax = preview.textlength; - paper.left = 0; - paper.right = preview.bmSize.cx; - paper.top = 0; - paper.bottom = preview.bmSize.cy; + SetRect(&paper, 0, 0, preview.bmSize.cx, preview.bmSize.cy); if (!preview.hdc) { preview.hdc = CreateCompatibleDC(hdc); diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index d53b747..6f7f14b 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -114,12 +114,7 @@ void registry_read_winrect(RECT* rc) if(registry_get_handle(&hKey, 0, key_options) != ERROR_SUCCESS || RegQueryValueExW(hKey, var_framerect, 0, NULL, (LPBYTE)rc, &size) != ERROR_SUCCESS || size != sizeof(RECT)) - { - rc->top = 0; - rc->left = 0; - rc->bottom = 300; - rc->right = 600; - } + SetRect(rc, 0, 0, 600, 300); RegCloseKey(hKey); }

1 0

Michael Stefaniuc : winemine: Use SetRect() instead of open coding it.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 925217b8578472f66d70480d167e15049f670f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=925217b8578472f66d70480d1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 10:53:46 2016 +0200 winemine: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 706e208..71ff75e 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -313,10 +313,8 @@ static void CreateBoard( BOARD *p_board ) p_board->face_bmp = SMILE_BMP; p_board->time = 0; - wnd_rect.left = p_board->pos.x; - wnd_rect.right = p_board->pos.x + p_board->width; - wnd_rect.top = p_board->pos.y; - wnd_rect.bottom = p_board->pos.y + p_board->height; + SetRect(&wnd_rect, p_board->pos.x, p_board->pos.y, p_board->pos.x + p_board->width, + p_board->pos.y + p_board->height); AdjustWindowRect(&wnd_rect, wnd_style, TRUE); /* Make sure the window is completely on the screen */

1 0

Alexandre Julliard : tools: Update all makefiles in a single pass.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: c6cded7460539e77a00938d7bf769020066d994a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6cded7460539e77a00938d7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 4 11:04:49 2016 +0900 tools: Update all makefiles in a single pass. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_makefiles | 106 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 44 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 1a01666..4f1d882 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -51,10 +51,28 @@ my %ignored_source_files = ( "dlls/wineps.drv/afm2c.c" => 1, "dlls/wineps.drv/mkagl.c" => 1, "include/config.h.in" => 1, + "include/stamp-h.in" => 1, "programs/winetest/dist.rc" => 1, "tools/makedep.c" => 1, ); +my @source_vars = ( + "BISON_SRCS", + "C_SRCS", + "FONT_SRCS", + "HEADER_SRCS", + "IDL_SRCS", + "IN_SRCS", + "LEX_SRCS", + "MANPAGES", + "MC_SRCS", + "OBJC_SRCS", + "PO_SRCS", + "RC_SRCS", + "SVG_SRCS", + "XTEMPLATE_SRCS" +); + my (@makefiles, %makefiles); sub dirname($) @@ -123,64 +141,79 @@ sub replace_in_file($$$@) return update_file($file); } -# replace a variable in a makefile -sub replace_makefile_variable($$) +# replace all source variables in a makefile +sub replace_makefile_variables($) { - my ($file, $var) = @_; + my $file = shift; my $make = $makefiles{$file}; - my $replaced = 0; - my @values; - - if (defined ${$make}{"=$var"}) - { - @values = @{${$make}{"=$var"}}; - ${$make}{$var} = \@values; - } - else - { - return unless defined ${$make}{$var}; - undef ${$make}{$var}; - } + my $source_vars_regexp = join "|", @source_vars; + my $modified = 0; + my %replaced; open NEW_FILE, ">$file.in.new" or die "cannot create $file.in.new"; open OLD_FILE, "$file.in" or die "cannot open $file.in"; while (<OLD_FILE>) { - if (/^\s*($var\s*)=/) + if (/^\s*($source_vars_regexp)(\s*)=/) { # try to preserve formatting - my $prefix = $1; + my $var = $1; + my $spaces = $2; + my $replaced = 0; + my @values; + + if (defined ${$make}{"=$var"}) + { + @values = @{${$make}{"=$var"}}; + ${$make}{$var} = \@values; + } + else + { + undef ${$make}{$var}; + } my $multiline = /\\$/ || (@values > 1); + my $old_str = $_; while (/\\$/) { $_ = <OLD_FILE>; last unless $_; + $old_str .= $_; } + my $new_str = ""; if (!@values) { # nothing } elsif ($multiline) { - print NEW_FILE "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; + $new_str = "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; + print NEW_FILE $new_str; } else { - print NEW_FILE "$prefix= @values\n"; + $new_str = "$var$spaces= @values\n"; + print NEW_FILE $new_str; } - $replaced = 1; + $modified = 1 if ($old_str ne $new_str); + $replaced{$var} = 1; next; } - if (/^\@MAKE/ && !$replaced && @values) - { - print NEW_FILE "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; - } print NEW_FILE $_; } + foreach my $var (@source_vars) + { + next if defined $replaced{$var}; + next unless defined ${$make}{"=$var"}; + my @values = @{${$make}{"=$var"}}; + next unless @values; + print NEW_FILE "\n$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; + $modified = 1; + } close OLD_FILE; close NEW_FILE; - return update_file("$file.in"); + return update_file("$file.in") if $modified; + unlink "$file.in.new"; } # parse the specified makefile and load the variables @@ -211,7 +244,8 @@ sub parse_makefile($) ${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PO_SRCS|PROGRAMS|EXTRA_TARGETS|MANPAGES|EXTRA_OBJS|INSTALL_LIB|INSTALL_DEV)\s*=\s*(.*)/) + my $source_vars_regexp = join "|", @source_vars; + if (/^\s*($source_vars_regexp|PROGRAMS|EXTRA_TARGETS|EXTRA_OBJS|INSTALL_LIB|INSTALL_DEV)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); @@ -510,23 +544,7 @@ sub update_makefiles(@) # update the source variables in all the makefiles - foreach my $file (sort @_) - { - replace_makefile_variable( $file, "LEX_SRCS" ); - replace_makefile_variable( $file, "BISON_SRCS" ); - replace_makefile_variable( $file, "MC_SRCS" ); - replace_makefile_variable( $file, "SVG_SRCS" ); - replace_makefile_variable( $file, "FONT_SRCS" ); - replace_makefile_variable( $file, "C_SRCS" ); - replace_makefile_variable( $file, "OBJC_SRCS" ); - replace_makefile_variable( $file, "RC_SRCS" ); - replace_makefile_variable( $file, "IDL_SRCS" ); - replace_makefile_variable( $file, "HEADER_SRCS" ); - replace_makefile_variable( $file, "XTEMPLATE_SRCS" ); - replace_makefile_variable( $file, "PO_SRCS" ); - replace_makefile_variable( $file, "IN_SRCS" ); - replace_makefile_variable( $file, "MANPAGES" ); - } + foreach my $file (sort @_) { replace_makefile_variables( $file ); } push @lines, "dnl End of auto-generated output commands\n"; replace_in_file( "configure.ac", '^WINE_CONFIG_DLL', '^dnl End of auto-generated output commands\n$', @lines);

1 0

Francois Gouget : ws2_32/tests: Fix a typo in a comment.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 29ae5f8e9b1b202d002a16e1f9e6f01bde47d99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ae5f8e9b1b202d002a16e1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:57:41 2016 +0200 ws2_32/tests: Fix a typo in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6853279..ed31f25 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2652,7 +2652,7 @@ static void test_WSADuplicateSocket(void) closesocket(source); /* create a socket, bind it, duplicate it then send data on source and - * receve in the duplicated socket */ + * receive in the duplicated socket */ source = WSASocketA(AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, 0, 0); ok(source != INVALID_SOCKET, "WSASocketA should have succeeded\n");

1 0