October 2012 - Wine-commits

Piotr Caban : msvcp60: Copy correct number of characters in basic_string:: _Grow.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 9d6c003cd7bb059777b5c931c4843be68560218b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6c003cd7bb059777b5c931c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 17:15:49 2012 +0200 msvcp60: Copy correct number of characters in basic_string::_Grow. --- dlls/msvcp60/string.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 591ffdf..ed4391c 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -203,13 +203,16 @@ MSVCP_bool __thiscall basic_string_char__Grow(basic_string_char *this, MSVCP_siz return FALSE; } + if(len > new_res) + len = new_res; + *ptr = 0; if(this->ptr) - char_traits_char__Copy_s(ptr+1, new_size, this->ptr, this->size); + char_traits_char__Copy_s(ptr+1, new_size, this->ptr, len); basic_string_char__Tidy(this, TRUE); this->ptr = ptr+1; this->res = new_res; - basic_string_char__Eos(this, len>new_res ? new_res : len); + basic_string_char__Eos(this, len); } return new_size>0; @@ -1911,13 +1914,16 @@ MSVCP_bool __thiscall basic_string_wchar__Grow(basic_string_wchar *this, MSVCP_s return FALSE; } + if(len > new_res) + len = new_res; + *ptr = 0; if(this->ptr) - char_traits_wchar__Copy_s(ptr+1, new_size, this->ptr, this->size); + char_traits_wchar__Copy_s(ptr+1, new_size, this->ptr, len); basic_string_wchar__Tidy(this, TRUE); this->ptr = ptr+1; this->res = new_res; - basic_string_wchar__Eos(this, len>new_res ? new_res : len); + basic_string_wchar__Eos(this, len); } return new_size>0;

1 0

Alexandre Julliard : winex11: Never use a surface for embedded windows, even for the parents.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 5fae649bdf14fb63b8d44984eda6edd1094a3314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fae649bdf14fb63b8d44984e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 21 12:18:16 2012 +0200 winex11: Never use a surface for embedded windows, even for the parents. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 59957a4..7819a54 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2043,7 +2043,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag /* create the window surface if necessary */ - if (!data->whole_window) goto done; + if (!data->whole_window && !data->embedded) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done; if (data->vis.visualid != default_visual.visualid) goto done;

1 0

Alexandre Julliard : gdi32: Update the ref count of stock objects when deleting a DC.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: b0ba7c765e3002eda3e1286c9e2cc502ea6b6a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ba7c765e3002eda3e1286c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 21 12:18:46 2012 +0200 gdi32: Update the ref count of stock objects when deleting a DC. --- dlls/gdi32/dc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 8d4cde0..be9b016 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -162,6 +162,10 @@ void free_dc_ptr( DC *dc ) dc->physDev = physdev->next; physdev->funcs->pDeleteDC( physdev ); } + GDI_dec_ref_count( dc->hPen ); + GDI_dec_ref_count( dc->hBrush ); + GDI_dec_ref_count( dc->hFont ); + if (dc->hBitmap) GDI_dec_ref_count( dc->hBitmap ); free_gdi_handle( dc->hSelf ); free_dc_state( dc ); }

1 0

Ken Thomases : winemenubuilder: Use proper marker (negative index) for unused icon slot.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 26007056951bf3d16a948fefe95fe709cb6d73d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26007056951bf3d16a948fefe… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Oct 19 23:59:29 2012 -0500 winemenubuilder: Use proper marker (negative index) for unused icon slot. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 468a5e2..96ec29d 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1150,7 +1150,7 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico for (i = CLASSIC_SLOT+1; i < ICNS_SLOTS; i++) if (best[i].index >= 0 && !best[i].scaled) { - best[CLASSIC_SLOT].index = 0; + best[CLASSIC_SLOT].index = -1; break; } }

1 0

Ken Thomases : winex11: Fix name of extension WGL_NV_render_texture_rectangle.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 60c60ece8065bc4114d5d048ee114dfe0999434b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c60ece8065bc4114d5d048e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Oct 20 02:04:58 2012 -0500 winex11: Fix name of extension WGL_NV_render_texture_rectangle. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index cf99876..7c30ce0 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3011,7 +3011,7 @@ static void X11DRV_WineGL_LoadExtensions(void) /* Again there's no GLX equivalent for this extension, so depend on the required GL extension */ if (has_extension(WineGLInfo.glExtensions, "GL_NV_texture_rectangle")) - register_extension("WGL_NV_texture_rectangle"); + register_extension("WGL_NV_render_texture_rectangle"); } /* EXT Extensions */

1 0

James Eder : ntdll: Add support for cpuid on x86_64.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 1ce0c9578a3708b19967e6e1a8ccb6771823306f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce0c9578a3708b19967e6e1a… Author: James Eder <jimportal(a)gmail.com> Date: Sat Oct 20 18:40:43 2012 -0600 ntdll: Add support for cpuid on x86_64. --- dlls/ntdll/nt.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 878c58b..972277d 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -827,6 +827,13 @@ static inline void do_cpuid(unsigned int ax, unsigned int *p) "popl %%ebx" : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) : "0" (ax)); +#elif defined(__x86_64__) + __asm__("push %%rbx\n\t" + "cpuid\n\t" + "movq %%rbx, %%rsi\n\t" + "pop %%rbx" + : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) + : "0" (ax)); #endif } @@ -848,6 +855,8 @@ static inline int have_cpuid(void) : "=&r" (f1), "=&r" (f2) : "ir" (0x00200000)); return ((f1^f2) & 0x00200000) != 0; +#elif defined(__x86_64__) + return 1; #else return 0; #endif

1 0

James Eder : ntdll: Add more feature detection in get_cpuinfo().
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 925fd2a223c91fddc7edc634439017d84a1a5807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=925fd2a223c91fddc7edc6344… Author: James Eder <jimportal(a)gmail.com> Date: Sat Oct 20 18:40:44 2012 -0600 ntdll: Add more feature detection in get_cpuinfo(). --- dlls/ntdll/nt.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 972277d..155fb23 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -815,6 +815,10 @@ static SYSTEM_CPU_INFORMATION cached_sci; #define ENTI 0x69746e65 /* "enti" */ #define CAMD 0x444d4163 /* "cAMD" */ +#define GENU 0x756e6547 /* "Genu" */ +#define INEI 0x49656e69 /* "ineI" */ +#define NTEL 0x6c65746e /* "ntel" */ + /* Calls cpuid with an eax of 'ax' and returns the 16 bytes in *p * We are compiled with -fPIC, so we can't clobber ebx. */ @@ -866,6 +870,10 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) { unsigned int regs[4], regs2[4]; + /* We're at least a 386 */ + info->FeatureSet = CPU_FEATURE_VME | CPU_FEATURE_X86 | CPU_FEATURE_PGE; + info->Level = 3; + if (!have_cpuid()) return; do_cpuid(0x00000000, regs); /* get standard cpuid level and vendor name */ @@ -885,6 +893,19 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) info->Level = 3; break; } + + if(regs2[3] & (1 << 3 )) info->FeatureSet |= CPU_FEATURE_PSE; + if(regs2[3] & (1 << 4 )) info->FeatureSet |= CPU_FEATURE_TSC; + if(regs2[3] & (1 << 8 )) info->FeatureSet |= CPU_FEATURE_CX8; + if(regs2[3] & (1 << 11)) info->FeatureSet |= CPU_FEATURE_SEP; + if(regs2[3] & (1 << 12)) info->FeatureSet |= CPU_FEATURE_MTRR; + if(regs2[3] & (1 << 15)) info->FeatureSet |= CPU_FEATURE_CMOV; + if(regs2[3] & (1 << 16)) info->FeatureSet |= CPU_FEATURE_PAT; + if(regs2[3] & (1 << 23)) info->FeatureSet |= CPU_FEATURE_MMX; + if(regs2[3] & (1 << 24)) info->FeatureSet |= CPU_FEATURE_FXSR; + if(regs2[3] & (1 << 25)) info->FeatureSet |= CPU_FEATURE_SSE; + if(regs2[3] & (1 << 26)) info->FeatureSet |= CPU_FEATURE_SSE2; + user_shared_data->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = !(regs2[3] & 1); user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] & (1 << 4 )) >> 4; user_shared_data->ProcessorFeatures[PF_PAE_ENABLED] = (regs2[3] & (1 << 6 )) >> 6; @@ -892,6 +913,9 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) user_shared_data->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 23)) >> 23; user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 25)) >> 25; user_shared_data->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 26)) >> 26; + user_shared_data->ProcessorFeatures[PF_SSE3_INSTRUCTIONS_AVAILABLE] = regs2[2] & 1; + user_shared_data->ProcessorFeatures[PF_XSAVE_ENABLED] = (regs2[2] & (1 << 27)) >> 27; + user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE128] = (regs2[2] & (1 << 13)) >> 13; if (regs[1] == AUTH && regs[3] == ENTI && regs[2] == CAMD) { @@ -899,7 +923,22 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) if (regs[0] >= 0x80000001) { do_cpuid(0x80000001, regs2); /* get vendor features */ + user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] & (1 << 2 )) >> 2; + user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] & (1 << 20 )) >> 20; user_shared_data->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 31 )) >> 31; + if(regs2[3] & (1 << 31)) info->FeatureSet |= CPU_FEATURE_3DNOW; + } + } + else if (regs[1] == GENU && regs[3] == INEI && regs[2] == NTEL) + { + if(regs2[3] & (1 << 21)) info->FeatureSet |= CPU_FEATURE_DS; + user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] & (1 << 5 )) >> 5; + + do_cpuid(0x80000000, regs); /* get vendor cpuid level */ + if (regs[0] >= 0x80000001) + { + do_cpuid(0x80000001, regs2); /* get vendor features */ + user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] & (1 << 20 )) >> 20; } } }

1 0

James Eder : ntdll: Handle CPU Level (family) as a vendor specific component.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 6db42d3650d98b3b4c74936ff3a8f2c96b06cd56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db42d3650d98b3b4c74936ff… Author: James Eder <jimportal(a)gmail.com> Date: Sat Oct 20 18:40:45 2012 -0600 ntdll: Handle CPU Level (family) as a vendor specific component. --- dlls/ntdll/nt.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 155fb23..ec226ae 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -880,19 +880,6 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) if (regs[0]>=0x00000001) /* Check for supported cpuid version */ { do_cpuid(0x00000001, regs2); /* get cpu features */ - switch ((regs2[0] >> 8) & 0xf) /* cpu family */ - { - case 3: info->Level = 3; break; - case 4: info->Level = 4; break; - case 5: info->Level = 5; break; - case 15: /* PPro/2/3/4 has same info as P1 */ - case 6: info->Level = 6; break; - default: - FIXME("unknown cpu family %d, please report! (-> setting to 386)\n", - (regs2[0] >> 8)&0xf); - info->Level = 3; - break; - } if(regs2[3] & (1 << 3 )) info->FeatureSet |= CPU_FEATURE_PSE; if(regs2[3] & (1 << 4 )) info->FeatureSet |= CPU_FEATURE_TSC; @@ -919,6 +906,10 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) if (regs[1] == AUTH && regs[3] == ENTI && regs[2] == CAMD) { + info->Level = (regs2[0] >> 8) & 0xf; /* family */ + if (info->Level == 0xf) /* AMD says to add the extended family to the family if family is 0xf */ + info->Level += (regs2[0] >> 20) & 0xff; + do_cpuid(0x80000000, regs); /* get vendor cpuid level */ if (regs[0] >= 0x80000001) { @@ -931,6 +922,9 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) } else if (regs[1] == GENU && regs[3] == INEI && regs[2] == NTEL) { + info->Level = ((regs2[0] >> 8) & 0xf) + ((regs2[0] >> 20) & 0xff); /* family + extended family */ + if(info->Level == 15) info->Level = 6; + if(regs2[3] & (1 << 21)) info->FeatureSet |= CPU_FEATURE_DS; user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] & (1 << 5 )) >> 5; @@ -941,6 +935,10 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] & (1 << 20 )) >> 20; } } + else + { + info->Level = (regs2[0] >> 8) & 0xf; /* family */ + } } }

1 0

James Eder : ntdll: Add detection for Revision in get_cpuinfo().
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: ebc7ffd5273292ed51108dd6b048db70a207223d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc7ffd5273292ed51108dd6b… Author: James Eder <jimportal(a)gmail.com> Date: Sat Oct 20 18:40:46 2012 -0600 ntdll: Add detection for Revision in get_cpuinfo(). --- dlls/ntdll/nt.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ec226ae..c1cf38b 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -910,6 +910,11 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) if (info->Level == 0xf) /* AMD says to add the extended family to the family if family is 0xf */ info->Level += (regs2[0] >> 20) & 0xff; + /* repack model and stepping to make a "revision" */ + info->Revision = ((regs2[0] >> 16) & 0xf) << 12; /* extended model */ + info->Revision |= ((regs2[0] >> 4 ) & 0xf) << 8; /* model */ + info->Revision |= regs2[0] & 0xf; /* stepping */ + do_cpuid(0x80000000, regs); /* get vendor cpuid level */ if (regs[0] >= 0x80000001) { @@ -925,6 +930,11 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) info->Level = ((regs2[0] >> 8) & 0xf) + ((regs2[0] >> 20) & 0xff); /* family + extended family */ if(info->Level == 15) info->Level = 6; + /* repack model and stepping to make a "revision" */ + info->Revision = ((regs2[0] >> 16) & 0xf) << 12; /* extended model */ + info->Revision |= ((regs2[0] >> 4 ) & 0xf) << 8; /* model */ + info->Revision |= regs2[0] & 0xf; /* stepping */ + if(regs2[3] & (1 << 21)) info->FeatureSet |= CPU_FEATURE_DS; user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] & (1 << 5 )) >> 5; @@ -938,6 +948,10 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) else { info->Level = (regs2[0] >> 8) & 0xf; /* family */ + + /* repack model and stepping to make a "revision" */ + info->Revision = ((regs2[0] >> 4 ) & 0xf) << 8; /* model */ + info->Revision |= regs2[0] & 0xf; /* stepping */ } } }

1 0

James Eder : ntdll: Add detection for PF_SSE_DAZ_MODE_AVAILABLE.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: a6eec2cf6a6285cd44408f051ef33f463ea1c0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6eec2cf6a6285cd44408f051… Author: James Eder <jimportal(a)gmail.com> Date: Sat Oct 20 18:40:47 2012 -0600 ntdll: Add detection for PF_SSE_DAZ_MODE_AVAILABLE. --- dlls/ntdll/nt.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c1cf38b..3f8e772 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -866,6 +866,49 @@ static inline int have_cpuid(void) #endif } +/* Detect if a SSE2 processor is capable of Denormals Are Zero (DAZ) mode. + * + * This function assumes you have already checked for SSE2/FXSAVE support. */ +static inline int have_sse_daz_mode(void) +{ +#ifdef __i386__ + typedef struct DECLSPEC_ALIGN(16) _M128A { + ULONGLONG Low; + LONGLONG High; + } M128A; + + typedef struct _XMM_SAVE_AREA32 { + WORD ControlWord; + WORD StatusWord; + BYTE TagWord; + BYTE Reserved1; + WORD ErrorOpcode; + DWORD ErrorOffset; + WORD ErrorSelector; + WORD Reserved2; + DWORD DataOffset; + WORD DataSelector; + WORD Reserved3; + DWORD MxCsr; + DWORD MxCsr_Mask; + M128A FloatRegisters[8]; + M128A XmmRegisters[16]; + BYTE Reserved4[96]; + } XMM_SAVE_AREA32; + + /* Intel says we need a zeroed 16-byte aligned buffer */ + char buffer[512 + 16]; + XMM_SAVE_AREA32 *state = (XMM_SAVE_AREA32 *)(((ULONG_PTR)buffer + 15) & ~15); + memset(buffer, 0, sizeof(buffer)); + + __asm__ __volatile__( "fxsave %0" : "=m" (*state) : "m" (*state) ); + + return (state->MxCsr_Mask & (1 << 6)) >> 6; +#else /* all x86_64 processors include SSE2 with DAZ mode */ + return 1; +#endif +} + static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) { unsigned int regs[4], regs2[4]; @@ -904,6 +947,9 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) user_shared_data->ProcessorFeatures[PF_XSAVE_ENABLED] = (regs2[2] & (1 << 27)) >> 27; user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE128] = (regs2[2] & (1 << 13)) >> 13; + if((regs2[3] & (1 << 26)) && (regs2[3] & (1 << 24))) /* has SSE2 and FXSAVE/FXRSTOR */ + user_shared_data->ProcessorFeatures[PF_SSE_DAZ_MODE_AVAILABLE] = have_sse_daz_mode(); + if (regs[1] == AUTH && regs[3] == ENTI && regs[2] == CAMD) { info->Level = (regs2[0] >> 8) & 0xf; /* family */

1 0