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

Józef Kucia : wined3d: Add missing system-value semantics.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 9a2a73780749882ab38e2cc079d4ba947f8d05c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a2a73780749882ab38e2cc07… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:27 2016 +0200 wined3d: Add missing system-value semantics. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 3 +++ include/wine/wined3d.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 700b7c1..eb95136 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -253,6 +253,9 @@ sysval_semantic_names[] = { {WINED3D_SV_POSITION, "SV_Position"}, {WINED3D_SV_CLIP_DISTANCE, "SV_ClipDistance"}, + {WINED3D_SV_CULL_DISTANCE, "SV_CullDistance"}, + {WINED3D_SV_RENDER_TARGET_ARRAY_INDEX, "SV_RenderTargetArrayIndex"}, + {WINED3D_SV_VIEWPORT_ARRAY_INDEX, "SV_ViewportArrayIndex"}, {WINED3D_SV_VERTEX_ID, "SV_VertexID"}, {WINED3D_SV_INSTANCE_ID, "SV_InstanceID"}, {WINED3D_SV_PRIMITIVE_ID, "SV_PrimitiveID"}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1c0a61b..a425ac5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -745,6 +745,9 @@ enum wined3d_sysval_semantic { WINED3D_SV_POSITION = 1, WINED3D_SV_CLIP_DISTANCE = 2, + WINED3D_SV_CULL_DISTANCE = 3, + WINED3D_SV_RENDER_TARGET_ARRAY_INDEX = 4, + WINED3D_SV_VIEWPORT_ARRAY_INDEX = 5, WINED3D_SV_VERTEX_ID = 6, WINED3D_SV_PRIMITIVE_ID = 7, WINED3D_SV_INSTANCE_ID = 8,

1 0

Józef Kucia : d3d10core/tests: Avoid using -1 in place of unsigned integer.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 53126c3e1787da7dc1a2a1952eb54141dcd46172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53126c3e1787da7dc1a2a1952… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:25 2016 +0200 d3d10core/tests: Avoid using -1 in place of unsigned integer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 270 +++++++++++++++++++++--------------------- 1 file changed, 135 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53126c3e1787da7dc1a2a…

1 0

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

July 4, 2016

Module: wine Branch: master Commit: 098adff646f7c5d639a974924f9294787db17bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098adff646f7c5d639a974924… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 10:55:39 2016 +0200 wordpad: Use InflateRect() 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 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 3b78ffa..6c7c4f6 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -881,10 +881,7 @@ static LRESULT print_preview(HWND hwndPreview) draw_margin_lines(hdc, x, y, preview.zoomratio); } else { - background.left += 2; - background.right -= 2; - background.top += 2; - background.bottom -= 2; + InflateRect(&background, -2, -2); FillRect(hdc, &background, GetStockObject(WHITE_BRUSH)); } }

1 0

Francois Gouget : regedit: Make get_token() static.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 5da8ad93a03ca70d18015f389921699443d56285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da8ad93a03ca70d18015f389… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:59:09 2016 +0200 regedit: Make get_token() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 201eb4f..cbe3616 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -139,7 +139,7 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, char **argv, int *i) return TRUE; } -char *get_token(char *input, char **next) +static char *get_token(char *input, char **next) { char *ch = input; char *str;

1 0

Francois Gouget : exdisp.idl: Fix a typo in a method name.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 5880f5c55604363fdb6a521f304290ae3be58cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5880f5c55604363fdb6a521f3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:57:24 2016 +0200 exdisp.idl: Fix a typo in a method name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/exdisp.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 5ee9960..b665ce3 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -486,7 +486,7 @@ dispinterface DWebBrowserEvents2 [in] BSTR bstrWorkerLabel); [id(DISPID_WEBWORKERFINISHED)] - void WebWorkerFinsihed([in] DWORD dwUniqueID); + void WebWorkerFinished([in] DWORD dwUniqueID); } [

1 0

Huw Davies : riched20: Pass the correct range to the EN_LINK notification when the link is wrapped.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 65feea4e5aae1e0674743f4816528f27d10efe7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=65feea4e5aae1e0674743f481… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 4 08:43:23 2016 +0100 riched20: Pass the correct range to the EN_LINK notification when the link is wrapped. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 81ef55d..13a2857 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2627,6 +2627,11 @@ static int ME_CalculateClickCount(ME_TextEditor *editor, UINT msg, WPARAM wParam return clickNum; } +static BOOL is_link( ME_Run *run ) +{ + return (run->style->fmt.dwMask & CFM_LINK) && (run->style->fmt.dwEffects & CFE_LINK); +} + static BOOL ME_SetCursor(ME_TextEditor *editor) { ME_Cursor cursor; @@ -2692,8 +2697,7 @@ static BOOL ME_SetCursor(ME_TextEditor *editor) ME_Run *run; run = &cursor.pRun->member.run; - if (run->style->fmt.dwMask & CFM_LINK && - run->style->fmt.dwEffects & CFE_LINK) + if (is_link( run )) { ITextHost_TxSetCursor(editor->texthost, LoadCursorW(NULL, (WCHAR*)IDC_HAND), @@ -3128,8 +3132,7 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM ME_CharFromPos(editor, x, y, &cursor, &isExact); if (!isExact) return; - if (cursor.pRun->member.run.style->fmt.dwMask & CFM_LINK && - cursor.pRun->member.run.style->fmt.dwEffects & CFE_LINK) + if (is_link( &cursor.pRun->member.run )) { /* The clicked run has CFE_LINK set */ ME_DisplayItem *di; @@ -3143,21 +3146,15 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM /* find the first contiguous run with CFE_LINK set */ info.chrg.cpMin = ME_GetCursorOfs(&cursor); - for (di = cursor.pRun->prev; - di && di->type == diRun && (di->member.run.style->fmt.dwMask & CFM_LINK) && (di->member.run.style->fmt.dwEffects & CFE_LINK); - di = di->prev) - { - info.chrg.cpMin -= di->member.run.len; - } + di = cursor.pRun; + while (ME_PrevRun( NULL, &di, FALSE ) && is_link( &di->member.run )) + info.chrg.cpMin -= di->member.run.len; /* find the last contiguous run with CFE_LINK set */ info.chrg.cpMax = ME_GetCursorOfs(&cursor) + cursor.pRun->member.run.len; - for (di = cursor.pRun->next; - di && di->type == diRun && (di->member.run.style->fmt.dwMask & CFM_LINK) && (di->member.run.style->fmt.dwEffects & CFE_LINK); - di = di->next) - { - info.chrg.cpMax += di->member.run.len; - } + di = cursor.pRun; + while (ME_NextRun( NULL, &di, FALSE ) && is_link( &di->member.run )) + info.chrg.cpMax += di->member.run.len; ITextHost_TxNotify(editor->texthost, info.nmhdr.code, &info); }

1 0

Michael Stefaniuc : msimtf: 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: c65325c584a5cecec49721ba7e0f643075bc6321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65325c584a5cecec49721ba7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:29:06 2016 +0200 msimtf: 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/msimtf/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index daae817..78c26cb 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -141,7 +141,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) ActiveIMMApp_Constructor, }; - return IClassFactory_QueryInterface((IClassFactory*)&cf, riid, ppv); + return IClassFactory_QueryInterface(&cf.IClassFactory_iface, riid, ppv); } FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);

1 0

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

July 4, 2016

Module: wine Branch: master Commit: 3ad882ff24d5bc12e8b37573ed46091f4f43a811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad882ff24d5bc12e8b37573e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:43:35 2016 +0200 comdlg32: Use InflateRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/printdlg.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index a389e53..83335a9 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3617,11 +3617,8 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default_page_paint_hook(hWnd, WM_PSD_MARGINRECT, (WPARAM)hdc, (LPARAM)&rcMargin, data); /* give text a bit of a space from the frame */ - rcMargin.left += 2; - rcMargin.top += 2; - rcMargin.right -= 2; - rcMargin.bottom -= 2; - + InflateRect(&rcMargin, -2, -2); + /* if the space is too small then we make sure to not draw anything */ rcMargin.left = min(rcMargin.left, rcMargin.right); rcMargin.top = min(rcMargin.top, rcMargin.bottom);

1 0

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

July 4, 2016

Module: wine Branch: master Commit: 1f74c0a0d16f68d2759779199dd0ad7b74d604bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f74c0a0d16f68d2759779199… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:40:37 2016 +0200 comctl32: Use InflateRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tab.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index fb999ce..d228c07 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1609,12 +1609,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect } } else - { - drawRect->left += 2; - drawRect->top += 2; - drawRect->right -= 2; - drawRect->bottom -= 2; - } + InflateRect(drawRect, -2, -2); } else {

1 0

Francois Gouget : kernel32: Fix typos in a couple of comments.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: c8d1fbc6d2170d935301e7c54244af5ab873c7ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d1fbc6d2170d935301e7c54… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 12:00:39 2016 +0200 kernel32: Fix typos in a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/volume.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 39769ff..fefa373 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -915,7 +915,7 @@ void LOCALE_InitRegistry(void) /*********************************************************************** * get_mac_locale * - * Return a locale identifer string reflecting the Mac locale, in a form + * Return a locale identifier string reflecting the Mac locale, in a form * that parse_locale_name() will understand. So, strip out unusual * things like script, variant, etc. Or, rather, just construct it as * <lang>[_<country>].UTF-8. diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 4f01c99..68cc762 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -416,7 +416,7 @@ static enum fs_type VOLUME_ReadCDSuperblock( HANDLE handle, BYTE *buff ) /* Check UDF first as UDF and ISO9660 structures can coexist on the same medium * Starting from sector 16, we may find : * - a CD-ROM Volume Descriptor Set (ISO9660) containing one or more Volume Descriptors - * - an Extented Area (UDF) -- [E] 2/8.3.1 and [U] 2.1.7 + * - an Extended Area (UDF) -- [E] 2/8.3.1 and [U] 2.1.7 * There is no explicit end so read 16 sectors and then give up */ for( i=16; i<16+16; i++) {

1 0