December 2007 - Wine-commits

Louis Lenders : msvcrt40: Add DllMain.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 8946d462aaf9bcab0d87973f5ebced6de031138e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8946d462aaf9bcab0d87973f5… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Dec 4 22:13:18 2007 +0000 msvcrt40: Add DllMain. --- dlls/msvcrt40/Makefile.in | 3 +++ dlls/msvcrt40/msvcrt40.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt40/Makefile.in b/dlls/msvcrt40/Makefile.in index 6f33b83..862aa11 100644 --- a/dlls/msvcrt40/Makefile.in +++ b/dlls/msvcrt40/Makefile.in @@ -7,6 +7,9 @@ MODULE = msvcrt40.dll IMPORTLIB = libmsvcrt40.$(IMPLIBEXT) IMPORTS = msvcrt kernel32 +C_SRCS = \ + msvcrt40.c + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msvcrt40/msvcrt40.c b/dlls/msvcrt40/msvcrt40.c new file mode 100644 index 0000000..48e4af0 --- /dev/null +++ b/dlls/msvcrt40/msvcrt40.c @@ -0,0 +1,42 @@ +/* + * msvcrt40 main file + * + * Copyright (C) 2007 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msvcrt40); + +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +}

1 0

Kirill K. Smirnov : winhelp: Do not confuse caller application with bogus error when we really succeeded .
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 56ab4a20e0f245b0e5e762a5d37d398bddcdd374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56ab4a20e0f245b0e5e762a5d… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Wed Dec 5 00:39:04 2007 +0300 winhelp: Do not confuse caller application with bogus error when we really succeeded. --- programs/winhelp/winhelp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 44e640e..0b7e2dc 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -445,7 +445,8 @@ static LRESULT WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam) break; } } - return 0L; + /* Always return success for now */ + return 1; } /******************************************************************

1 0

Kirill K. Smirnov : winhelp: winhelp >3. 0 files always use 0x4000 as a divisor in TOPICPOS regardless of DecompressSize .
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: ae534def5400a7da2ef18bfff34addb6bbb81bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae534def5400a7da2ef18bfff… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Wed Dec 5 00:41:07 2007 +0300 winhelp: winhelp >3.0 files always use 0x4000 as a divisor in TOPICPOS regardless of DecompressSize. --- programs/winhelp/hlpfile.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index f9013e6..cd14193 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -354,8 +354,16 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) { BYTE* end; - index = (ref - 0x0C) / hlpfile->dsize; - offset = (ref - 0x0C) % hlpfile->dsize; + if (hlpfile->version <= 16) + { + index = (ref - 0x0C) / hlpfile->dsize; + offset = (ref - 0x0C) % hlpfile->dsize; + } + else + { + index = (ref - 0x0C) >> 14; + offset = (ref - 0x0C) & 0x3FFF; + } if (hlpfile->version <= 16 && index != old_index && index != 0) {

1 0

Jeremy Newman : Author: Zachary Goldberg <zgs@seas.upenn.edu>
by Jeremy Newman 04 Dec '07

04 Dec '07

Module: website Branch: master Commit: 78dc00233bf1b4b73ba6a67f30f2ba0e508ab339 URL: http://source.winehq.org/git/website.git/?a=commit;h=78dc00233bf1b4b73ba6a6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 4 16:55:48 2007 -0600 Author: Zachary Goldberg <zgs(a)seas.upenn.edu> adds some extra tags --- wwn/wn20071203_333.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wwn/wn20071203_333.xml b/wwn/wn20071203_333.xml index c16a7c0..9b90b7f 100644 --- a/wwn/wn20071203_333.xml +++ b/wwn/wn20071203_333.xml @@ -188,7 +188,7 @@ Its rare for the WWN to highlight individual commits however this one by Roderic posts="7" > <topic>Applications</topic> -We all know that of the many uses for wine gaming is one of the more popular ones. But just how many actual gamers are there using wine to play their favorite games? Well, lucky for us Valve has begun to conduct surveys of the hardware and software configurations of people using their Steam system. They've even been kind enough to respond to emails and give us some data. +We all know that of the many uses for wine gaming is one of the more popular ones. But just how many actual gamers are there using wine to play their favorite games? Well, lucky for us Valve has begun to conduct surveys of the hardware and software configurations of people using their Steam system. They've even been kind enough to respond to emails and give us some data. <quote who="Scott Ritchie"> Valve regularly runs surveys of steam users, where they profile many different things about the hardware. They're nice enough to publish the @@ -255,7 +255,7 @@ The numbers are now 0.13% of total reports coming from Wine users. posts="1" > <topic>Wine</topic> -Some of you may be very upset at the lack of a wine 0.9.50 last week. Unfortunately many of the dev's were out stuffing themselves with turkey and hence a release last week made no sense. However, this week has come and we have 0.9.50: +Some of you may be very upset at the lack of a wine 0.9.50 last week. Unfortunately many of the dev's were out stuffing themselves with turkey and hence a release last week made no sense. However, this week has come and we have 0.9.50: <quote who="Alexander Juillard"><pre> Wine 0.9.50 was released today, with the following main changes: @@ -413,7 +413,7 @@ Take care, posts="2" > <topic>Wine</topic> -Dan Kegel has written in with a bit of an update on the status of Wine 1.0 +Dan Kegel has written in with a bit of an update on the status of Wine 1.0 <quote who="Dan Kegel"> <pre>[putting on tastemaster hat] @@ -492,4 +492,4 @@ See <a href="http://bugs.winehq.org/show_bug.cgi?id=10273">http://bugs.winehq.or </section> -</kc> \ No newline at end of file +</kc>

1 0

Jeremy Newman : force pre tags to wrap in various browsers, fixes issues with pre tags in wwn issues with long strings.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: website Branch: master Commit: 988eca4f0763ef8dd8e94516ea3340a7e700974d URL: http://source.winehq.org/git/website.git/?a=commit;h=988eca4f0763ef8dd8e945… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 3 12:29:27 2007 -0600 force pre tags to wrap in various browsers, fixes issues with pre tags in wwn issues with long strings. --- winehq_styles.css | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/winehq_styles.css b/winehq_styles.css index 1f8241e..f9e024f 100644 --- a/winehq_styles.css +++ b/winehq_styles.css @@ -28,7 +28,12 @@ A.hidden { text-decoration: none; color: #000000; } OL,UL,P { font-size: 12px; } TD,TR,TH { font-size: 12px; } INPUT { font-size: 12px; } -PRE { font-family: monospace; font-size: 12px; } +PRE { + font-family: monospace; font-size: 12px; + white-space: pre-wrap; + white-space: -moz-pre-wrap !important; + word-wrap: break-word; + } /* Hn Sizes */ H1 { font-size: 180%; } @@ -147,4 +152,4 @@ p.indent { padding-left: 1em; padding-right: 1em;} /* App Support status */ .gold { background-color: wheat; } -.silver { background-color: silver; } \ No newline at end of file +.silver { background-color: silver; }

1 0

Zachary Goldberg : Wine Weekly Newsletter #333.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: website Branch: master Commit: 08301bbe2d696703513877bd55b01f93d8ba1143 URL: http://source.winehq.org/git/website.git/?a=commit;h=08301bbe2d696703513877… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon Dec 3 00:22:08 2007 -0500 Wine Weekly Newsletter #333. --- news/200712301.xml | 7 + wwn/wn20071203_333.xml | 495 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 502 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=08301bbe2d69670351…

1 0

Gerald Pfeifer : comctl32: Simplify condition based on WPARAM always being >= 0.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: 42677e25f754b39ec626e50eb2a1fbe2240ccdd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42677e25f754b39ec626e50eb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Dec 3 21:16:46 2007 +0100 comctl32: Simplify condition based on WPARAM always being >= 0. --- dlls/comctl32/rebar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 7cf11bf..f42c937 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2797,7 +2797,7 @@ REBAR_GetFont (const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) static LRESULT REBAR_PushChevron(const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - if (wParam >= 0 && (UINT)wParam < infoPtr->uNumBands) + if ((UINT)wParam < infoPtr->uNumBands) { NMREBARCHEVRON nmrbc; REBAR_BAND *lpBand = &infoPtr->bands[wParam];

1 0

Guido Barzini : iphlpapi: Restore lost initialisation of ptr-> AddressLength in GetAdaptersInfo.
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: 00a961c5d4f930afd3cd38bcbef2ddd4898ea5a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a961c5d4f930afd3cd38bcb… Author: Guido Barzini <gnb10(a)gnb10.uklinux.net> Date: Mon Dec 3 21:58:05 2007 +0000 iphlpapi: Restore lost initialisation of ptr->AddressLength in GetAdaptersInfo. --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 14a6fa4..43ea323 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -735,6 +735,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) /* on Win98 this is left empty, but whatever */ getInterfaceNameByIndex(table->indexes[ndx], ptr->AdapterName); + ptr->AddressLength = sizeof(ptr->Address); getInterfacePhysicalByIndex(table->indexes[ndx], &ptr->AddressLength, ptr->Address, &ptr->Type); ptr->Index = table->indexes[ndx];

1 0

Gerald Pfeifer : msvcrt: Fix error handling in _aligned_offset_realloc().
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: a030777f741e12fbd90d7bb6af3bfc52d06685b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a030777f741e12fbd90d7bb6a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Dec 3 22:56:37 2007 +0100 msvcrt: Fix error handling in _aligned_offset_realloc(). --- dlls/msvcrt/heap.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 06c9d56..2f7fb9f 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -443,13 +443,14 @@ void * CDECL _aligned_offset_realloc(void *memblock, MSVCRT_size_t size, /* It seems this function was called with an invalid pointer. Bail out. */ return NULL; } + /* Adjust old_size to get amount of actual data in old block. */ - old_size -= old_padding; - if (old_size < 0) + if (old_size < old_padding) { /* Shouldn't happen. Something's weird, so bail out. */ return NULL; } + old_size -= old_padding; temp = MSVCRT_realloc(*saved, size + alignment + sizeof(void *));

1 0

Gerald Pfeifer : wined3d: Fix error handling in transform_texture().
by Alexandre Julliard 04 Dec '07

04 Dec '07

Module: wine Branch: master Commit: 81f32c7a3804912f961e2effac5b9b6d97c3609c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f32c7a3804912f961e2effa… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Dec 4 01:34:55 2007 +0100 wined3d: Fix error handling in transform_texture(). --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9ff392c..5c0a7f5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1957,7 +1957,7 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W return; } - if (mapped_stage < 0) return; + if (mapped_stage == -1) return; if (GL_SUPPORT(ARB_MULTITEXTURE)) { if(mapped_stage >= GL_LIMITS(textures)) {

1 0