February 2013 - Wine-commits

Ken Thomases : secur32: On Mac, add support for cipher suites defined in 10 .8 SDK.
by Alexandre Julliard 07 Feb '13

07 Feb '13

Module: wine Branch: master Commit: 7494f5bc5e4945e4b7828a04f202f06660ab98f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7494f5bc5e4945e4b7828a04f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Feb 7 09:11:24 2013 -0600 secur32: On Mac, add support for cipher suites defined in 10.8 SDK. --- dlls/secur32/schannel_macosx.c | 143 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 140 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7494f5bc5e4945e4b7828…

1 0

André Hentschel : ntdll: Set TPIDRURW to TEB on thread init for ARM.
by Alexandre Julliard 07 Feb '13

07 Feb '13

Module: wine Branch: master Commit: b288f7be1860c6373555b3d412fe849a656fe165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b288f7be1860c6373555b3d41… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 6 22:00:59 2013 +0100 ntdll: Set TPIDRURW to TEB on thread init for ARM. --- dlls/ntdll/signal_arm.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 5ad4016..6abd76b 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -832,6 +832,21 @@ void signal_free_thread( TEB *teb ) NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } +/********************************************************************** + * set_tpidrurw + * + * Win32/ARM applications expect the TEB pointer to be in the TPIDRURW register. + */ +#ifdef __ARM_ARCH_7A__ +extern void set_tpidrurw( TEB *teb ); +__ASM_GLOBAL_FUNC( set_tpidrurw, + "mcr p15, 0, r0, c13, c0, 2\n\t" /* TEB -> TPIDRURW */ + "blx lr" ) +#else +void set_tpidrurw( TEB *teb ) +{ +} +#endif /********************************************************************** * signal_init_thread @@ -845,6 +860,7 @@ void signal_init_thread( TEB *teb ) pthread_key_create( &teb_key, NULL ); init_done = 1; } + set_tpidrurw( teb ); pthread_setspecific( teb_key, teb ); }

1 0

Daniel Jelinski : comctl32/listview: Do not touch icon spacing if set explicitly.
by Alexandre Julliard 07 Feb '13

07 Feb '13

Module: wine Branch: master Commit: f9c3a612af058429ce92aff3bdd9b942efe0f998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c3a612af058429ce92aff3b… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Feb 4 20:49:55 2013 +0100 comctl32/listview: Do not touch icon spacing if set explicitly. --- dlls/comctl32/listview.c | 10 ++++++++-- dlls/comctl32/tests/listview.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 96863f9..bc8997a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -55,7 +55,6 @@ * -- LVA_SNAPTOGRID not implemented * -- LISTVIEW_ApproximateViewRect partially implemented * -- LISTVIEW_SetColumnWidth ignores header images & bitmap - * -- LISTVIEW_SetIconSpacing is incomplete * -- LISTVIEW_StyleChanged doesn't handle some changes too well * * Speedups @@ -290,6 +289,7 @@ typedef struct tagLISTVIEW_INFO HIMAGELIST himlSmall; HIMAGELIST himlState; SIZE iconSize; + BOOL autoSpacing; SIZE iconSpacing; SIZE iconStateSize; POINT currIconPos; /* this is the position next icon will be placed */ @@ -8594,11 +8594,15 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) /* set to defaults, if instructed to */ if (cx == -1 && cy == -1) { + infoPtr->autoSpacing = TRUE; if (infoPtr->himlNormal) ImageList_GetIconSize(infoPtr->himlNormal, &iconWidth, &iconHeight); cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON) + iconWidth; cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON) + iconHeight; } + else + infoPtr->autoSpacing = FALSE; + /* if 0 then keep width */ if (cx != 0) infoPtr->iconSpacing.cx = cx; @@ -8660,7 +8664,8 @@ static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *infoPtr, INT nType, HIMAG himlOld = infoPtr->himlNormal; infoPtr->himlNormal = himl; if (infoPtr->uView == LV_VIEW_ICON) set_icon_size(&infoPtr->iconSize, himl, FALSE); - LISTVIEW_SetIconSpacing(infoPtr, -1, -1); + if (infoPtr->autoSpacing) + LISTVIEW_SetIconSpacing(infoPtr, -1, -1); break; case LVSIL_SMALL: @@ -9374,6 +9379,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->bRedraw = TRUE; infoPtr->bNoItemMetrics = TRUE; infoPtr->bDoChangeNotify = TRUE; + infoPtr->autoSpacing = TRUE; infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); infoPtr->nEditLabelItem = -1; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c46fe42..98ca495 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4643,6 +4643,23 @@ static void test_getitemspacing(void) SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* set size returned */ + expect(100, LOWORD(ret)); + expect(100, HIWORD(ret)); + + /* spacing = 0 - keep previous value */ + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(0, -1)); + expect(100, LOWORD(ret)); + expect(100, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); /* spacing + icon size returned */ expect(cx + 40, LOWORD(ret)); expect(cy + 40, HIWORD(ret));

1 0

Michael Stefaniuc : krnl386.exe16: Let C look like C.
by Alexandre Julliard 07 Feb '13

07 Feb '13

Module: wine Branch: master Commit: 68c447d87efe40c37ac668860dac2b334961cf63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c447d87efe40c37ac668860… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:08:42 2013 +0100 krnl386.exe16: Let C look like C. --- dlls/krnl386.exe16/int10.c | 10 +++++----- dlls/krnl386.exe16/int16.c | 2 +- dlls/krnl386.exe16/int67.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/krnl386.exe16/int10.c b/dlls/krnl386.exe16/int10.c index 0edfbd7..dfba761 100644 --- a/dlls/krnl386.exe16/int10.c +++ b/dlls/krnl386.exe16/int10.c @@ -1123,7 +1123,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x0b: - switch BH_reg(context) { + switch (BH_reg(context)) { case 0x00: /* SET BACKGROUND/BORDER COLOR */ /* In text modes, this sets only the border... */ /* According to the interrupt list and one of my books. */ @@ -1192,7 +1192,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x10: - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* SET SINGLE PALETTE REGISTER - A.C. */ TRACE("Set Single Palette Register - Reg 0x0%x Value 0x0%x\n", BL_reg(context),BH_reg(context)); @@ -1291,7 +1291,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) case 0x11: /* TEXT MODE CHARGEN */ /* Note that second subfunction is *almost* identical. */ /* See INTERRUPT.A for details. */ - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* LOAD USER SPECIFIED PATTERNS */ case 0x10: FIXME("Load User Specified Patterns - Not Supported\n"); @@ -1339,7 +1339,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x12: /* ALTERNATE FUNCTION SELECT */ - switch BL_reg(context) { + switch (BL_reg(context)) { case 0x10: /* GET EGA INFO */ TRACE("EGA info requested\n"); SET_BH( context, 0x00 ); /* Color screen */ @@ -1385,7 +1385,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x1a: - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* GET DISPLAY COMBINATION CODE */ TRACE("Get Display Combination Code\n"); SET_AL( context, 0x1a ); /* Function supported */ diff --git a/dlls/krnl386.exe16/int16.c b/dlls/krnl386.exe16/int16.c index 47e9d8e..f567ee7 100644 --- a/dlls/krnl386.exe16/int16.c +++ b/dlls/krnl386.exe16/int16.c @@ -52,7 +52,7 @@ void WINAPI DOSVM_Int16Handler( CONTEXT *context ) BIOSDATA *data = NULL; BYTE ascii, scan; - switch AH_reg(context) { + switch (AH_reg(context)) { case 0x00: /* Get Keystroke */ /* Returns: AH = Scan code diff --git a/dlls/krnl386.exe16/int67.c b/dlls/krnl386.exe16/int67.c index 3137bc9..019d379 100644 --- a/dlls/krnl386.exe16/int67.c +++ b/dlls/krnl386.exe16/int67.c @@ -149,7 +149,7 @@ static void EMS_access_name( CONTEXT *context ) return; } - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* get name */ ptr = PTR_REAL_TO_LIN(context->SegEs, DI_reg(context)); memcpy(ptr, EMS_record->handle[hindex].name, 8); @@ -326,7 +326,7 @@ static void EMS_restore_context( CONTEXT *context ) */ void WINAPI DOSVM_Int67Handler( CONTEXT *context ) { - switch AH_reg(context) { + switch (AH_reg(context)) { case 0x40: /* EMS - GET MANAGER STATUS */ SET_AH( context, 0 ); /* status: ok */ @@ -465,7 +465,7 @@ void EMS_Ioctl_Handler( CONTEXT *context ) { assert(AH_reg(context) == 0x44); - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* IOCTL - GET DEVICE INFORMATION */ RESET_CFLAG(context); /* operation was successful */ SET_DX( context, 0x4080 ); /* bit 14 (support ioctl read) and

1 0

Michael Stefaniuc : gphoto2.ds: Let C look like C.
by Alexandre Julliard 07 Feb '13

07 Feb '13

Module: wine Branch: master Commit: f59d0ac743184a9f584cba405951361a575b9d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59d0ac743184a9f584cba405… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:11:23 2013 +0100 gphoto2.ds: Let C look like C. --- dlls/gphoto2.ds/ui.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index df79875..0b21f2e 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -175,7 +175,7 @@ static INT_PTR CALLBACK DialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP } break; case WM_COMMAND: - switch LOWORD(wParam) + switch (LOWORD(wParam)) { case IDC_SKIP: on_disable_dialog_clicked(hwnd);

1 0

Michael Stefaniuc : iphlpapi: Let C look like C.
by Alexandre Julliard 07 Feb '13

07 Feb '13

Module: wine Branch: master Commit: 1cc6710aee05c646684323ee266455947a10ddfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc6710aee05c646684323ee2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:13:02 2013 +0100 iphlpapi: Let C look like C. --- dlls/iphlpapi/ipstats.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index f8191ba..966d24e 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -693,7 +693,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) } ret = GetIcmpStatistics(&ipv4stats); - if SUCCEEDED(ret) + if (SUCCEEDED(ret)) { stats->icmpInStats.dwMsgs = ipv4stats.stats.icmpInStats.dwMsgs; stats->icmpInStats.dwErrors = ipv4stats.stats.icmpInStats.dwErrors;

1 0

Michael Stefaniuc : qedit: Let C look like C.
by Alexandre Julliard 07 Feb '13

07 Feb '13

Module: wine Branch: master Commit: 2f67eb99ef0395e5905e6b4d928b372316765f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f67eb99ef0395e5905e6b4d9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:13:12 2013 +0100 qedit: Let C look like C. --- dlls/qedit/mediadet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index fea3aa4..7e90c31 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -79,7 +79,7 @@ static HRESULT WINAPI MediaDet_inner_QueryInterface(IUnknown *iface, REFIID riid *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) *ppv = &This->IUnknown_inner; - else if IsEqualIID(riid, &IID_IMediaDet) + else if (IsEqualIID(riid, &IID_IMediaDet)) *ppv = &This->IMediaDet_iface; else WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv);

1 0

Michael Stefaniuc : d3drm: Let C look like C.
by Alexandre Julliard 07 Feb '13

07 Feb '13

Module: wine Branch: master Commit: 9affa153fdc96dbeb36f502049a01e8cb1da9803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9affa153fdc96dbeb36f50204… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:10:01 2013 +0100 d3drm: Let C look like C. --- dlls/d3drm/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index f72dcaa..6ff4345 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -62,7 +62,7 @@ static HRESULT WINAPI IDirect3DRMTexture2Impl_QueryInterface(IDirect3DRMTexture2 { *object = &This->IDirect3DRMTexture2_iface; } - else if IsEqualGUID(riid, &IID_IDirect3DRMTexture3) + else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)) { *object = &This->IDirect3DRMTexture3_iface; } @@ -431,7 +431,7 @@ static HRESULT WINAPI IDirect3DRMTexture3Impl_QueryInterface(IDirect3DRMTexture3 { *object = &This->IDirect3DRMTexture2_iface; } - else if IsEqualGUID(riid, &IID_IDirect3DRMTexture3) + else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)) { *object = &This->IDirect3DRMTexture3_iface; }

1 0

Michael Stefaniuc : riched20: Let C look like C.
by Alexandre Julliard 07 Feb '13

07 Feb '13

Module: wine Branch: master Commit: 6c1b292f0b781c08041867f2508df5df164f61c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1b292f0b781c08041867f25… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:14:05 2013 +0100 riched20: Let C look like C. --- dlls/riched20/txtsrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index e9cc5e1..0e78c53 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -77,7 +77,7 @@ static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID r if (IsEqualIID(riid, &IID_IUnknown)) *ppv = &This->IUnknown_inner; - else if IsEqualIID(riid, &IID_ITextServices) + else if (IsEqualIID(riid, &IID_ITextServices)) *ppv = &This->ITextServices_iface; else { *ppv = NULL;

1 0

Michael Stefaniuc : usp10: Let C look like C.
by Alexandre Julliard 07 Feb '13

07 Feb '13

Module: wine Branch: master Commit: 9f6f8bfc0088f5b466d51067489cc29355924bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6f8bfc0088f5b466d510674… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:15:38 2013 +0100 usp10: Let C look like C. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 41a7f32..a08b047 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1878,7 +1878,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, hr = ScriptItemize(pString, cString, num_items, &sControl, &sState, analysis->pItem, &analysis->numItems); - if FAILED(hr) + if (FAILED(hr)) { if (hr == E_OUTOFMEMORY) hr = E_INVALIDARG;

1 0