March 2011 - Wine-Commits - list.winehq.org

Marcus Meissner : shell32: Missing break in IDOK case.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 97efdc1e0d7501dcccb168c33423d0d30dbe806a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97efdc1e0d7501dcccb168c33… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 22:36:10 2011 +0100 shell32: Missing break in IDOK case. --- dlls/shell32/dialogs.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 8bc8062..84d8799 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -247,6 +247,7 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR EndDialog (hwnd, 0); } } + return TRUE; case IDCANCEL : EndDialog (hwnd, 0) ;

1 0

Marcus Meissner : comctl32: Added missing break (Coverity).
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: e766a132dba7ee8fd20c6b603c01208dc16a8520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e766a132dba7ee8fd20c6b603… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 23:27:04 2011 +0100 comctl32: Added missing break (Coverity). --- dlls/comctl32/tests/treeview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 653807f..71df978 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -999,6 +999,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, } } } + break; } case WM_DESTROY:

1 0

Marcus Meissner : dnsapi: Added missing breaks (Coverity).
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 409aae33ddabe413ef9aae5c63e1d994bfcbbcd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=409aae33ddabe413ef9aae5c6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 23:18:31 2011 +0100 dnsapi: Added missing breaks (Coverity). --- dlls/dnsapi/record.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 9755a3d..15efbf1 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -376,6 +376,7 @@ static LPVOID dns_strcpyX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) WARN( "unhandled target charset: %d\n", out ); break; } + break; } case DnsCharSetUtf8: switch (out) @@ -387,6 +388,7 @@ static LPVOID dns_strcpyX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) WARN( "unhandled target charset: %d\n", out ); break; } + break; case DnsCharSetAnsi: switch (out) { @@ -397,6 +399,7 @@ static LPVOID dns_strcpyX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) WARN( "unhandled target charset: %d\n", out ); break; } + break; default: WARN( "unhandled source charset: %d\n", in ); break;

1 0

Marcus Meissner : user32: Added missing break (Coverity).
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 3d44f4c8b35f0d244b59ad133734d3ace0088d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d44f4c8b35f0d244b59ad133… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 22:29:20 2011 +0100 user32: Added missing break (Coverity). --- dlls/user32/combo.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 3fc9112..9c22df6 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -2192,6 +2192,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar case CB_LIMITTEXT: if( lphc->wState & CBF_EDIT ) return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); + return TRUE; default: if (message >= WM_USER) WARN("unknown msg WM_USER+%04x wp=%04lx lp=%08lx\n",

1 0

Marcus Meissner : wined3d: Mark up fallthrough breaks (Coverity).
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 14d246665b474a5ab2b888b8ff27e669c6b3bbba URL: http://source.winehq.org/git/wine.git/?a=commit;h=14d246665b474a5ab2b888b8f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 22:20:36 2011 +0100 wined3d: Mark up fallthrough breaks (Coverity). --- dlls/wined3d/arb_program_shader.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 161e9ae..d53e008 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5812,12 +5812,14 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta case WINED3DTOP_SELECTARG2: arg1 = arg2; + /* FALLTHROUGH */ case WINED3DTOP_SELECTARG1: shader_addline(buffer, "MOV %s%s, %s;\n", dstreg, dstmask, arg1); break; case WINED3DTOP_MODULATE4X: mul = 2; + /* FALLTHROUGH */ case WINED3DTOP_MODULATE2X: mul *= 2; if (!strcmp(dstreg, "result.color")) @@ -5825,6 +5827,7 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta dstreg = "ret"; mul_final_dest = TRUE; } + /* FALLTHROUGH */ case WINED3DTOP_MODULATE: shader_addline(buffer, "MUL %s%s, %s, %s;\n", dstreg, dstmask, arg1, arg2); break; @@ -5836,9 +5839,11 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta dstreg = "ret"; mul_final_dest = TRUE; } + /* FALLTHROUGH */ case WINED3DTOP_ADDSIGNED: shader_addline(buffer, "SUB arg2, %s, const.w;\n", arg2); arg2 = "arg2"; + /* FALLTHROUGH */ case WINED3DTOP_ADD: shader_addline(buffer, "ADD_SAT %s%s, %s, %s;\n", dstreg, dstmask, arg1, arg2); break;

1 0

Marcus Meissner : winecfg: Added missing break (Coverity).
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: fd2fe2be0d6e6ec9387caae3837355e5024e6837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd2fe2be0d6e6ec9387caae38… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 22:07:45 2011 +0100 winecfg: Added missing break (Coverity). --- programs/winecfg/drivedetect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index b20b97c..c7e2f78 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -207,7 +207,7 @@ static void report_error(int code) MessageBox(NULL, "No virtual drive C mapped!\n", "", MB_OK | MB_ICONEXCLAMATION); else fprintf(stderr, "winecfg: no drive_c directory\n"); - + break; case NO_HOME: if (gui_mode) MessageBox(NULL, "Could not ensure that your home directory was mapped.\n\n"

1 0

Aric Stewart : usp10: Rewrite ScriptStringXtoCP to make use of ScriptXtoCP.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: f026616c2295ec05d35c9ae245b6b8fcc9a3e3ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f026616c2295ec05d35c9ae24… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 18 12:22:42 2011 -0500 usp10: Rewrite ScriptStringXtoCP to make use of ScriptXtoCP. --- dlls/usp10/usp10.c | 46 ++++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 89b7856..e177f33 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -991,14 +991,11 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai * ScriptStringXtoCP (USP10.@) * */ -HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, int* piTrailing) +HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, int* piTrailing) { StringAnalysis* analysis = ssa; int i; - int j; - int runningX = 0; int runningCp = 0; - int width; TRACE("(%p), %d, (%p), (%p)\n", ssa, iX, piCh, piTrailing); @@ -1022,24 +1019,33 @@ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, for(i=0; i<analysis->numItems; i++) { - for(j=0; j<analysis->glyphs[i].numGlyphs; j++) + int CP = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; + /* initialize max extents for uninitialized runs */ + if (analysis->glyphs[i].iMaxPosX == -1) { - width = analysis->glyphs[i].piAdvance[j]; - if(iX < (runningX + width)) - { - *piCh = runningCp; - if((iX - runningX) > width/2) - *piTrailing = TRUE; - else - *piTrailing = FALSE; - - if (analysis->pItem[i].a.fRTL) - *piTrailing = !*piTrailing; - return S_OK; - } - runningX += width; - runningCp++; + if (analysis->pItem[i].a.fRTL) + ScriptCPtoX(0, FALSE, CP, analysis->glyphs[i].numGlyphs, analysis->glyphs[i].pwLogClust, + analysis->glyphs[i].psva, analysis->glyphs[i].piAdvance, + &analysis->pItem[i].a, &analysis->glyphs[i].iMaxPosX); + else + ScriptCPtoX(CP, TRUE, CP, analysis->glyphs[i].numGlyphs, analysis->glyphs[i].pwLogClust, + analysis->glyphs[i].psva, analysis->glyphs[i].piAdvance, + &analysis->pItem[i].a, &analysis->glyphs[i].iMaxPosX); } + + if (iX > analysis->glyphs[i].iMaxPosX) + { + iX -= analysis->glyphs[i].iMaxPosX; + runningCp += CP; + continue; + } + + ScriptXtoCP(iX, CP, analysis->glyphs[i].numGlyphs, analysis->glyphs[i].pwLogClust, + analysis->glyphs[i].psva, analysis->glyphs[i].piAdvance, + &analysis->pItem[i].a, piCh, piTrailing); + *piCh += runningCp; + + return S_OK; } /* out of range */

1 0

Aric Stewart : usp10: Rewrite ScriptStringCPtoX to make use of ScriptCPtoX.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: d7ea24d56d692c94179d6796020306be1423dc17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ea24d56d692c94179d67960… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 18 12:22:31 2011 -0500 usp10: Rewrite ScriptStringCPtoX to make use of ScriptCPtoX. --- dlls/usp10/usp10.c | 50 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 9f1300d..89b7856 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -202,6 +202,7 @@ typedef struct { SCRIPT_VISATTR* psva; GOFFSET* pGoffset; ABC* abc; + int iMaxPosX; } StringGlyphs; typedef struct { @@ -824,6 +825,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, analysis->glyphs[i].psva = psva; analysis->glyphs[i].pGoffset = pGoffset; analysis->glyphs[i].abc = abc; + analysis->glyphs[i].iMaxPosX= -1; } *pssa = analysis; @@ -932,11 +934,9 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, */ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrailing, int* pX) { - int i, j; + int i; int runningX = 0; - int runningCp = 0; StringAnalysis* analysis = ssa; - BOOL itemTrailing; TRACE("(%p), %d, %d, (%p)\n", ssa, icp, fTrailing, pX); @@ -951,25 +951,35 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai for(i=0; i<analysis->numItems; i++) { - if (analysis->pItem[i].a.fRTL) - itemTrailing = !fTrailing; - else - itemTrailing = fTrailing; - for(j=0; j<analysis->glyphs[i].numGlyphs; j++) + int CP = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; + int offset; + /* initialize max extents for uninitialized runs */ + if (analysis->glyphs[i].iMaxPosX == -1) { - if(runningCp == icp && itemTrailing == FALSE) - { - *pX = runningX; - return S_OK; - } - runningX += analysis->glyphs[i].piAdvance[j]; - if(runningCp == icp && itemTrailing == TRUE) - { - *pX = runningX; - return S_OK; - } - runningCp++; + if (analysis->pItem[i].a.fRTL) + ScriptCPtoX(0, FALSE, CP, analysis->glyphs[i].numGlyphs, analysis->glyphs[i].pwLogClust, + analysis->glyphs[i].psva, analysis->glyphs[i].piAdvance, + &analysis->pItem[i].a, &analysis->glyphs[i].iMaxPosX); + else + ScriptCPtoX(CP, TRUE, CP, analysis->glyphs[i].numGlyphs, analysis->glyphs[i].pwLogClust, + analysis->glyphs[i].psva, analysis->glyphs[i].piAdvance, + &analysis->pItem[i].a, &analysis->glyphs[i].iMaxPosX); + } + + if (icp >= CP) + { + runningX += analysis->glyphs[i].iMaxPosX; + icp -= CP; + continue; } + + ScriptCPtoX(icp, fTrailing, CP, analysis->glyphs[i].numGlyphs, analysis->glyphs[i].pwLogClust, + analysis->glyphs[i].psva, analysis->glyphs[i].piAdvance, + &analysis->pItem[i].a, &offset); + runningX += offset; + + *pX = runningX; + return S_OK; } /* icp out of range */

1 0

Michael Stefaniuc : oleaut32/tests: Use a proper static COM object.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 289005a79f17abdd1c483de53505a829aee6e665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=289005a79f17abdd1c483de53… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 24 13:55:03 2011 +0100 oleaut32/tests: Use a proper static COM object. --- dlls/oleaut32/tests/safearray.c | 58 +++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 0c2b882..411b4bc 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1130,16 +1130,27 @@ static void test_SafeArrayGetPutElement_BSTR(void) SysFreeString(gotvalue); } -static int tunk_xref = 0; -static HRESULT WINAPI tunk_QueryInterface(LPUNKNOWN punk,REFIID riid, LPVOID *x) { - return E_FAIL; +struct xtunk_impl { + IUnknown IUnknown_iface; + LONG ref; +}; +static const IUnknownVtbl xtunk_vtbl; + +static struct xtunk_impl xtunk = {{&xtunk_vtbl}, 0}; + +static HRESULT WINAPI tunk_QueryInterface(IUnknown *punk, REFIID riid, void **x) +{ + return E_FAIL; } -static ULONG WINAPI tunk_AddRef(LPUNKNOWN punk) { - return ++tunk_xref; + +static ULONG WINAPI tunk_AddRef(IUnknown *punk) +{ + return ++xtunk.ref; } -static ULONG WINAPI tunk_Release(LPUNKNOWN punk) { - return --tunk_xref; +static ULONG WINAPI tunk_Release(IUnknown *punk) +{ + return --xtunk.ref; } static const IUnknownVtbl xtunk_vtbl = { @@ -1148,18 +1159,13 @@ static const IUnknownVtbl xtunk_vtbl = { tunk_Release }; -static struct xtunk_iface { - const IUnknownVtbl *lpvtbl; -} xtunk_iface; - - static void test_SafeArrayGetPutElement_IUnknown(void) { SAFEARRAYBOUND sab; LONG indices[1]; SAFEARRAY *sa; HRESULT hres; - LPUNKNOWN value = 0, gotvalue; + IUnknown *gotvalue; sab.lLbound = 1; sab.cElements = 1; @@ -1173,22 +1179,19 @@ static void test_SafeArrayGetPutElement_IUnknown(void) return; indices[0] = sab.lLbound; - xtunk_iface.lpvtbl = &xtunk_vtbl; - value = (LPUNKNOWN)&xtunk_iface; - tunk_xref = 1; - ok (value != NULL, "Expected non-NULL\n"); - hres = SafeArrayPutElement(sa, indices, value); + xtunk.ref = 1; + hres = SafeArrayPutElement(sa, indices, &xtunk.IUnknown_iface); ok(hres == S_OK, "Failed to put bstr element hres 0x%x\n", hres); - ok(tunk_xref == 2,"Failed to increment refcount of iface.\n"); + ok(xtunk.ref == 2,"Failed to increment refcount of iface.\n"); gotvalue = NULL; hres = SafeArrayGetElement(sa, indices, &gotvalue); - ok(tunk_xref == 3,"Failed to increment refcount of iface.\n"); + ok(xtunk.ref == 3,"Failed to increment refcount of iface.\n"); ok(hres == S_OK, "Failed to get bstr element at hres 0x%x\n", hres); if (hres == S_OK) - ok(value == gotvalue, "Got %p instead of %p\n", gotvalue, value); + ok(gotvalue == &xtunk.IUnknown_iface, "Got %p instead of %p\n", gotvalue, &xtunk.IUnknown_iface); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); - ok(tunk_xref == 2,"Failed to decrement refcount of iface.\n"); + ok(xtunk.ref == 2,"Failed to decrement refcount of iface.\n"); } static void test_SafeArrayRedim_IUnknown(void) @@ -1197,7 +1200,6 @@ static void test_SafeArrayRedim_IUnknown(void) LONG indices[1]; SAFEARRAY *sa; HRESULT hres; - LPUNKNOWN value; sab.lLbound = 1; sab.cElements = 2; @@ -1211,16 +1213,14 @@ static void test_SafeArrayRedim_IUnknown(void) return; indices[0] = 2; - xtunk_iface.lpvtbl = &xtunk_vtbl; - value = (LPUNKNOWN)&xtunk_iface; - tunk_xref = 1; - hres = SafeArrayPutElement(sa, indices, value); + xtunk.ref = 1; + hres = SafeArrayPutElement(sa, indices, &xtunk.IUnknown_iface); ok(hres == S_OK, "Failed to put IUnknown element hres 0x%x\n", hres); - ok(tunk_xref == 2,"Failed to increment refcount of iface.\n"); + ok(xtunk.ref == 2,"Failed to increment refcount of iface.\n"); sab.cElements = 1; hres = SafeArrayRedim(sa, &sab); ok(hres == S_OK, "Failed to shrink array hres 0x%x\n", hres); - ok(tunk_xref == 1, "Failed to decrement refcount\n"); + ok(xtunk.ref == 1, "Failed to decrement refcount\n"); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); }

1 0

Marcus Meissner : winedbg: Add missing break (Coverity).
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: d15a04bdce9cc22e200c03cfebf81482720fc0e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15a04bdce9cc22e200c03cfe… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 22:05:22 2011 +0100 winedbg: Add missing break (Coverity). --- programs/winedbg/be_i386.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 6f07e06..a602c7e 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -387,6 +387,7 @@ static BOOL fetch_value(const char* addr, unsigned sz, int* value) if (!dbg_read_memory(addr, &value16, sizeof(value16))) return FALSE; *value = value16; + break; case 32: if (!dbg_read_memory(addr, value, sizeof(*value))) return FALSE;

1 0