March 2006 - wine-commits

András Kovács : avifil32: Added Hungarian translation.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 64d5b80a02c54bbda7f6787737042c8e929e848b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64d5b80a02c54bbda7f6787… Author: András Kovács <andras(a)csevego.net> Date: Mon Mar 6 12:47:11 2006 +0100 avifil32: Added Hungarian translation. --- dlls/avifil32/avifile_Hu.rc | 50 +++++++++++++++++++++++++++++++++++++++++++ dlls/avifil32/rsrc.rc | 1 + 2 files changed, 51 insertions(+), 0 deletions(-) create mode 100644 dlls/avifil32/avifile_Hu.rc diff --git a/dlls/avifil32/avifile_Hu.rc b/dlls/avifil32/avifile_Hu.rc new file mode 100644 index 0000000..7fba293 --- /dev/null +++ b/dlls/avifil32/avifile_Hu.rc @@ -0,0 +1,50 @@ +/* + * Copyright 2006 Andras Kovacs + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "T�m�r�t�si be�ll�t�sok" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&V�lassuon folyamot:",-1,2,5,114,10 + COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "&Opci�k...",IDC_OPTIONS,145,17,45,14 + AUTOCHECKBOX "&Be�kel minden",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL + LTEXT "k�pkock�t",-1,104,43,36,9 + LTEXT "Jelenlegi form�tum:",-1,3,56,53,9 + LTEXT "Ez hely k�lcs�nz�sre",IDC_FORMATTEXT,55,56,90,26 + DEFPUSHBUTTON "OK",IDOK,145,42,45,14 + PUSHBUTTON "M�gse",IDCANCEL,145,61,45,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_WAVESTREAMFORMAT "Hull�mforma: %s" + IDS_WAVEFILETYPE "Hull�mforma" + IDS_ALLMULTIMEDIA "Minden multim�dia f�jl" + IDS_ALLFILES "Minden f�jl (*.*)(a)*.*" + IDS_VIDEO "video" + IDS_AUDIO "hang" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Wine AVI-alap�rtelmezett-f�jlkezel�" + IDS_UNCOMPRESSED "t�m�r�tetlen" +} diff --git a/dlls/avifil32/rsrc.rc b/dlls/avifil32/rsrc.rc index a420171..c29ee18 100644 --- a/dlls/avifil32/rsrc.rc +++ b/dlls/avifil32/rsrc.rc @@ -43,6 +43,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "avifile_En.rc" #include "avifile_Es.rc" #include "avifile_Fr.rc" +#include "avifile_Hu.rc" #include "avifile_It.rc" #include "avifile_Ja.rc" #include "avifile_Ko.rc"

1 0

Stefan Dösinger : wined3d: Add WINED3DINDEXBUFFER_DESC to wined3dtypes.h.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 6cc87406cfe423178622d8d7d19a918ededeaa84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6cc87406cfe423178622d8d… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Mar 14 23:14:40 2006 +0100 wined3d: Add WINED3DINDEXBUFFER_DESC to wined3dtypes.h. --- dlls/d3d8/indexbuffer.c | 2 +- dlls/d3d9/indexbuffer.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/indexbuffer.c | 2 +- include/wine/wined3d_interface.h | 2 +- include/wine/wined3d_types.h | 8 ++++++++ 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index 7d18a44..2f06cf9 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -126,7 +126,7 @@ HRESULT WINAPI IDirect3DIndexBuffer8Impl HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDesc(LPDIRECT3DINDEXBUFFER8 iface, D3DINDEXBUFFER_DESC *pDesc) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, pDesc); + return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, (WINED3DINDEXBUFFER_DESC *) pDesc); } diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c index 1b17ebd..5e5def0 100644 --- a/dlls/d3d9/indexbuffer.c +++ b/dlls/d3d9/indexbuffer.c @@ -127,7 +127,7 @@ HRESULT WINAPI IDirect3DIndexBuffer9Impl HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetDesc(LPDIRECT3DINDEXBUFFER9 iface, D3DINDEXBUFFER_DESC *pDesc) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, pDesc); + return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, (WINED3DINDEXBUFFER_DESC *) pDesc); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index eab7fbf..84b7d14 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5024,7 +5024,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Draw IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; UINT idxStride = 2; IWineD3DIndexBuffer *pIB; - D3DINDEXBUFFER_DESC IdxBufDsc; + WINED3DINDEXBUFFER_DESC IdxBufDsc; pIB = This->stateBlock->pIndexData; This->stateBlock->streamIsUP = FALSE; diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c index 834b79a..ffa55ce 100644 --- a/dlls/wined3d/indexbuffer.c +++ b/dlls/wined3d/indexbuffer.c @@ -116,7 +116,7 @@ HRESULT WINAPI IWineD3DIndexBuff TRACE("(%p) : stub\n", This); return D3D_OK; } -HRESULT WINAPI IWineD3DIndexBufferImpl_GetDesc(IWineD3DIndexBuffer *iface, D3DINDEXBUFFER_DESC *pDesc) { +HRESULT WINAPI IWineD3DIndexBufferImpl_GetDesc(IWineD3DIndexBuffer *iface, WINED3DINDEXBUFFER_DESC *pDesc) { IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface; TRACE("(%p)\n", This); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 7739225..f1ff945 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -684,7 +684,7 @@ DECLARE_INTERFACE_(IWineD3DIndexBuffer,I /*** IWineD3DIndexBuffer methods ***/ STDMETHOD(Lock)(THIS_ UINT OffsetToLock, UINT SizeToLock, BYTE ** ppbData, DWORD Flags) PURE; STDMETHOD(Unlock)(THIS) PURE; - STDMETHOD(GetDesc)(THIS_ D3DINDEXBUFFER_DESC * pDesc) PURE; + STDMETHOD(GetDesc)(THIS_ WINED3DINDEXBUFFER_DESC * pDesc) PURE; }; #undef INTERFACE diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 6b8a558..d5fe5f7 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -610,6 +610,14 @@ typedef struct _WINED3DVERTEXBUFFER_DESC DWORD FVF; } WINED3DVERTEXBUFFER_DESC; +typedef struct _WINED3DINDEXBUFFER_DESC { + WINED3DFORMAT Format; + WINED3DRESOURCETYPE Type; + DWORD Usage; + D3DPOOL Pool; + UINT Size; +} WINED3DINDEXBUFFER_DESC; + /* * The wined3dcaps structure */

1 0

Mike McCormack : comctl32: Fix some gcc 4.1 warnings.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: cba422261b8b4beec427093b4959f00555c20327 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cba422261b8b4beec427093… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 15 14:04:44 2006 +0900 comctl32: Fix some gcc 4.1 warnings. --- dlls/comctl32/tests/treeview.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 4cb1cbd..966dfef 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -94,36 +94,38 @@ static void FillRoot(void) static void DoTest1(void) { - TreeView_SelectItem(hTree, NULL); + BOOL r; + r = TreeView_SelectItem(hTree, NULL); Clear(); AddItem('1'); - TreeView_SelectItem(hTree, hRoot); + r = TreeView_SelectItem(hTree, hRoot); AddItem('2'); - TreeView_SelectItem(hTree, hRoot); + r = TreeView_SelectItem(hTree, hRoot); AddItem('3'); - TreeView_SelectItem(hTree, NULL); + r = TreeView_SelectItem(hTree, NULL); AddItem('4'); - TreeView_SelectItem(hTree, NULL); + r = TreeView_SelectItem(hTree, NULL); AddItem('5'); - TreeView_SelectItem(hTree, hRoot); + r = TreeView_SelectItem(hTree, hRoot); AddItem('.'); ok(!strcmp(sequence, "1(nR)nR23(Rn)Rn45(nR)nR."), "root-none select test\n"); } static void DoTest2(void) { - TreeView_SelectItem(hTree, NULL); + BOOL r; + r = TreeView_SelectItem(hTree, NULL); Clear(); AddItem('1'); - TreeView_SelectItem(hTree, hRoot); + r = TreeView_SelectItem(hTree, hRoot); AddItem('2'); - TreeView_SelectItem(hTree, hRoot); + r = TreeView_SelectItem(hTree, hRoot); AddItem('3'); - TreeView_SelectItem(hTree, hChild); + r = TreeView_SelectItem(hTree, hChild); AddItem('4'); - TreeView_SelectItem(hTree, hChild); + r = TreeView_SelectItem(hTree, hChild); AddItem('5'); - TreeView_SelectItem(hTree, hRoot); + r = TreeView_SelectItem(hTree, hRoot); AddItem('.'); ok(!strcmp(sequence, "1(nR)nR23(RC)RC45(CR)CR."), "root-child select test\n"); }

1 0

Robert Reif : dsound: Add info to failed tests.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: c460d9becf818d85fd8f65786a3d1b18a155efef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c460d9becf818d85fd8f657… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Mar 14 19:17:43 2006 -0500 dsound: Add info to failed tests. Print format for failed SetFormat calls. --- dlls/dsound/tests/ds3d.c | 4 ++-- dlls/dsound/tests/ds3d8.c | 4 ++-- dlls/dsound/tests/dsound.c | 4 ++-- dlls/dsound/tests/dsound8.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index ce7be84..3d0c434 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -378,8 +378,8 @@ void test_buffer(LPDIRECTSOUND dso, LPDI init_format(&wfx2,WAVE_FORMAT_PCM,11025,16,2); rc=IDirectSoundBuffer_SetFormat(*dsbo,&wfx2); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", + format_string(&wfx2), DXGetErrorString8(rc)); /* There is no garantee that SetFormat will actually change the * format to what we asked for. It depends on what the soundcard diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 6d440e2..c0c5d51 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -270,8 +270,8 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP init_format(&wfx2,WAVE_FORMAT_PCM,11025,16,2); rc=IDirectSoundBuffer_SetFormat(*dsbo,&wfx2); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", + format_string(&wfx2), DXGetErrorString8(rc)); /* There is no garantee that SetFormat will actually change the * format to what we asked for. It depends on what the soundcard diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 672ffe2..7905c99 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -550,8 +550,8 @@ static HRESULT test_primary_secondary(LP formats[f][2]); wfx2=wfx; rc=IDirectSoundBuffer_SetFormat(primary,&wfx); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", + format_string(&wfx), DXGetErrorString8(rc)); /* There is no garantee that SetFormat will actually change the * format to what we asked for. It depends on what the soundcard diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index b5dc483..7a58330 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -582,8 +582,8 @@ static HRESULT test_primary_secondary8(L formats[f][2]); wfx2=wfx; rc=IDirectSoundBuffer_SetFormat(primary,&wfx); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", + format_string(&wfx), DXGetErrorString8(rc)); /* There is no garantee that SetFormat will actually change the * format to what we asked for. It depends on what the soundcard

1 0

James Hawkins : advpack: Forward OpenINFEngineA and TranslateInfStringA to their
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 8efe95e70a4e111df91cf12696e8e721b2bb0795 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8efe95e70a4e111df91cf12… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 8 23:29:40 2006 -0600 advpack: Forward OpenINFEngineA and TranslateInfStringA to their unicode counterparts. --- dlls/advpack/advpack.c | 167 ++++++++++++++++++++++++++++++++++++--------- dlls/advpack/advpack.spec | 4 + 2 files changed, 136 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8efe95e70a4e111df91…

1 0

Aric Cyr : dplayx: Fix semaphore deadlock.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 75fc82c965611d8f71f93131008771f2252d18fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=75fc82c965611d8f71f9313… Author: Aric Cyr <aric.cyr(a)gmail.com> Date: Sat Mar 4 03:43:04 2006 +0900 dplayx: Fix semaphore deadlock. - Make sure to release the dplayx semaphore in for error cases as well. - Prevent race condition between creation of the semaphore and grabbing of the lock by creating the semaphore in the locked state instead of unlocked. --- dlls/dplayx/dplayx_global.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 5255f71..723b7e5 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -229,7 +229,7 @@ BOOL DPLAYX_ConstructData(void) s_attrib.lpSecurityDescriptor = NULL; s_attrib.nLength = sizeof(s_attrib); - hDplayxSema = CreateSemaphoreA( &s_attrib, 1, 1, lpszDplayxSemaName ); + hDplayxSema = CreateSemaphoreA( &s_attrib, 0, 1, lpszDplayxSemaName ); /* First instance creates the semaphore. Others just use it */ if( GetLastError() == ERROR_SUCCESS ) @@ -242,6 +242,7 @@ BOOL DPLAYX_ConstructData(void) else if ( GetLastError() == ERROR_ALREADY_EXISTS ) { TRACE( "Found semaphore handle %p\n", hDplayxSema ); + DPLAYX_AquireSemaphore(); } else { @@ -251,8 +252,6 @@ BOOL DPLAYX_ConstructData(void) SetLastError( ERROR_SUCCESS ); - DPLAYX_AquireSemaphore(); - hDplayxSharedMem = CreateFileMappingA( INVALID_HANDLE_VALUE, &s_attrib, PAGE_READWRITE | SEC_COMMIT, @@ -271,6 +270,7 @@ BOOL DPLAYX_ConstructData(void) else { ERR( ": unable to create shared memory (%ld)\n", GetLastError() ); + DPLAYX_ReleaseSemaphore(); return FALSE; } @@ -282,6 +282,7 @@ BOOL DPLAYX_ConstructData(void) { ERR( ": unable to map static data into process memory space (%ld)\n", GetLastError() ); + DPLAYX_ReleaseSemaphore(); return FALSE; } else

1 0

Vitaliy Margolen : x11drv: Fix one case of "glXChooseFBConfig returns NULL" problem.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: c04cbbfeae627cc20b55972df12f5dcc437ab10e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c04cbbfeae627cc20b55972… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Mar 4 22:27:11 2006 -0700 x11drv: Fix one case of "glXChooseFBConfig returns NULL" problem. Using alpha bits > 8 makes this function fail, while it should not. --- dlls/x11drv/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index eb58da9..3fc0231 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -226,7 +226,8 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV ADD2(GLX_ALPHA_SIZE, 8); } else { ADD2(GLX_BUFFER_SIZE, ppfd->cColorBits); - TEST_AND_ADD2(ppfd->cAlphaBits, GLX_ALPHA_SIZE, ppfd->cAlphaBits); + /* Some broken apps try to ask for more than 8 bits of alpha */ + TEST_AND_ADD2(ppfd->cAlphaBits, GLX_ALPHA_SIZE, min(ppfd->cAlphaBits,8)); } } TEST_AND_ADD2(ppfd->cStencilBits, GLX_STENCIL_SIZE, ppfd->cStencilBits);

1 0

Rein Klazes : x11drv: Avoid unaligned 32 bit reads, and reads beyond the input pixel
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 883e0b0edc21d16da5eb2f6bf02d5a18ac31ce38 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=883e0b0edc21d16da5eb2f6… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Wed Mar 1 16:39:42 2006 +0100 x11drv: Avoid unaligned 32 bit reads, and reads beyond the input pixel buffer in the convert_888_to_0888_* functions. --- dlls/x11drv/dib_convert.c | 102 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 78 insertions(+), 24 deletions(-) diff --git a/dlls/x11drv/dib_convert.c b/dlls/x11drv/dib_convert.c index b504843..347e1b3 100644 --- a/dlls/x11drv/dib_convert.c +++ b/dlls/x11drv/dib_convert.c @@ -821,18 +821,36 @@ static void convert_888_to_0888_asis(int const DWORD* srcpixel; DWORD* dstpixel; int x,y; - int oddwidth; - - oddwidth=width & 3; - width=width/4; + int w1, w2, w3; + + w1 = min( (INT_PTR)srcbits & 3, width); + w2 = ( width - w1) / 4; + w3 = ( width - w1) & 3; for (y=0; y<height; y++) { srcpixel=srcbits; dstpixel=dstbits; - for (x=0; x<width; x++) { + /* advance w1 pixels to make srcpixel 32 bit alignd */ + srcpixel = (const DWORD*)((INT_PTR)srcpixel & ~3); + srcpixel += w1; + dstpixel += w1; + /* and do the w1 pixels */ + x = w1; + if( x) { + dstpixel[ -1] = ( srcpixel[ -1] >> 8); /* h4, g4, l4 */ + if( --x) { + dstpixel[ -2] = ( srcpixel[ -2] >> 16) | /* g3, l3 */ + ((srcpixel[ -1] << 16) & 0x00ff0000); /* h3 */ + if( --x) { + dstpixel[ -3] = ( srcpixel[ -3] >> 24) | /* l2 */ + ((srcpixel[ -2] << 8) & 0x00ffff00); /* h2, g2 */ + } + } + } + for (x=0; x < w2; x++) { /* Do 4 pixels at a time: 3 dwords in and 4 dwords out */ DWORD srcval1,srcval2; srcval1=srcpixel[0]; - dstpixel[0]=( srcval1 & 0x00ffffff); /* h1, g1, l1 */ + dstpixel[0]=( srcval1 & 0x00ffffff); /* h1, g1, l1 */ srcval2=srcpixel[1]; dstpixel[1]=( srcval1 >> 24) | /* l2 */ ((srcval2 << 8) & 0x00ffff00); /* h2, g2 */ @@ -843,12 +861,18 @@ static void convert_888_to_0888_asis(int srcpixel+=3; dstpixel+=4; } - /* And now up to 3 odd pixels */ - for (x=0; x<oddwidth; x++) { - DWORD srcval; - srcval=*srcpixel; - srcpixel=(const DWORD*)(((const char*)srcpixel)+3); - *dstpixel++=( srcval & 0x00ffffff); /* h, g, l */ + /* do last w3 pixels */ + x = w3; + if( x) { + dstpixel[0]=( srcpixel[0] & 0x00ffffff); /* h1, g1, l1 */ + if( --x) { + dstpixel[1]=( srcpixel[0]>> 24) | /* l2 */ + ((srcpixel[1]<< 8) & 0x00ffff00); /* h2, g2 */ + if( --x) { + dstpixel[2]=( srcpixel[1]>> 16) | /* g3, l3 */ + ((srcpixel[2]<< 16) & 0x00ff0000); /* h3 */ + } + } } srcbits = (const char*)srcbits + srclinebytes; dstbits = (char*)dstbits + dstlinebytes; @@ -862,14 +886,36 @@ static void convert_888_to_0888_reverse( const DWORD* srcpixel; DWORD* dstpixel; int x,y; - int oddwidth; + int w1, w2, w3; - oddwidth=width & 3; - width=width/4; + w1 = min( (INT_PTR)srcbits & 3, width); + w2 = ( width - w1) / 4; + w3 = ( width - w1) & 3; for (y=0; y<height; y++) { srcpixel=srcbits; dstpixel=dstbits; - for (x=0; x<width; x++) { + /* advance w1 pixels to make srcpixel 32 bit alignd */ + srcpixel = (const DWORD*)((INT_PTR)srcpixel & ~3); + srcpixel += w1; + dstpixel += w1; + /* and do the w1 pixels */ + x = w1; + if( x) { + dstpixel[ -1]=((srcpixel[ -1] >> 24) & 0x0000ff) | /* h4 */ + ((srcpixel[ -1] >> 8) & 0x00ff00) | /* g4 */ + ((srcpixel[ -1] << 8) & 0xff0000); /* l4 */ + if( --x) { + dstpixel[ -2]=( srcpixel[ -2] & 0xff0000) | /* l3 */ + ((srcpixel[ -2] >> 16) & 0x00ff00) | /* g3 */ + ( srcpixel[ -1] & 0x0000ff); /* h3 */ + if( --x) { + dstpixel[ -3]=((srcpixel[ -3] >> 8) & 0xff0000) | /* l2 */ + ((srcpixel[ -2] << 8) & 0x00ff00) | /* g2 */ + ((srcpixel[ -2] >> 8) & 0x0000ff); /* h2 */ + } + } + } + for (x=0; x < w2; x++) { /* Do 4 pixels at a time: 3 dwords in and 4 dwords out */ DWORD srcval1,srcval2; @@ -891,14 +937,22 @@ static void convert_888_to_0888_reverse( srcpixel+=3; dstpixel+=4; } - /* And now up to 3 odd pixels */ - for (x=0; x<oddwidth; x++) { - DWORD srcval; - srcval=*srcpixel; - srcpixel=(const DWORD*)(((const char*)srcpixel)+3); - *dstpixel++=((srcval >> 16) & 0x0000ff) | /* h */ - ( srcval & 0x00ff00) | /* g */ - ((srcval << 16) & 0xff0000); /* l */ + /* do last w3 pixels */ + x = w3; + if( x) { + dstpixel[0]=((srcpixel[0] >> 16) & 0x0000ff) | /* h1 */ + ( srcpixel[0] & 0x00ff00) | /* g1 */ + ((srcpixel[0] << 16) & 0xff0000); /* l1 */ + if( --x) { + dstpixel[1]=((srcpixel[0] >> 8) & 0xff0000) | /* l2 */ + ((srcpixel[1] << 8) & 0x00ff00) | /* g2 */ + ((srcpixel[1] >> 8) & 0x0000ff); /* h2 */ + if( --x) { + dstpixel[2]=( srcpixel[1] & 0xff0000) | /* l3 */ + ((srcpixel[1] >> 16) & 0x00ff00) | /* g3 */ + ( srcpixel[2] & 0x0000ff); /* h3 */ + } + } } srcbits = (const char*)srcbits + srclinebytes; dstbits = (char*)dstbits + dstlinebytes;

1 0

Alexandre Julliard : msvideo: Renamed the msvideo directory to msvfw32.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: ac3be957e4677895ab48ef46b81e45f2e10082eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac3be957e4677895ab48ef4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 10:04:53 2006 +0100 msvideo: Renamed the msvideo directory to msvfw32. --- configure | 4 configure.ac | 2 dlls/.gitignore | 1 dlls/Makefile.in | 18 dlls/msvfw32/.gitignore | 3 dlls/msvfw32/Makefile.in | 24 + dlls/msvfw32/drawdib.c | 501 +++++++++++++ dlls/msvfw32/mciwnd.c | 1434 ++++++++++++++++++++++++++++++++++++ dlls/msvfw32/msvfw32.spec | 51 + dlls/msvfw32/msvfw32_De.rc | 52 + dlls/msvfw32/msvfw32_En.rc | 51 + dlls/msvfw32/msvfw32_Ko.rc | 52 + dlls/msvfw32/msvfw32_No.rc | 51 + dlls/msvfw32/msvfw32_Tr.rc | 53 + dlls/msvfw32/msvideo.spec | 68 ++ dlls/msvfw32/msvideo16.c | 916 +++++++++++++++++++++++ dlls/msvfw32/msvideo_main.c | 1593 ++++++++++++++++++++++++++++++++++++++++ dlls/msvfw32/msvideo_private.h | 73 ++ dlls/msvfw32/rsrc.rc | 27 + dlls/msvfw32/vfw16.h | 130 +++ dlls/msvideo/.gitignore | 3 dlls/msvideo/Makefile.in | 24 - dlls/msvideo/drawdib.c | 501 ------------- dlls/msvideo/mciwnd.c | 1434 ------------------------------------ dlls/msvideo/msvfw32.spec | 51 - dlls/msvideo/msvfw32_De.rc | 52 - dlls/msvideo/msvfw32_En.rc | 51 - dlls/msvideo/msvfw32_Ko.rc | 52 - dlls/msvideo/msvfw32_No.rc | 51 - dlls/msvideo/msvfw32_Tr.rc | 53 - dlls/msvideo/msvideo.spec | 68 -- dlls/msvideo/msvideo16.c | 916 ----------------------- dlls/msvideo/msvideo_main.c | 1593 ---------------------------------------- dlls/msvideo/msvideo_private.h | 73 -- dlls/msvideo/rsrc.rc | 27 - dlls/msvideo/vfw16.h | 130 --- 36 files changed, 5089 insertions(+), 5094 deletions(-) create mode 100644 dlls/msvfw32/.gitignore create mode 100644 dlls/msvfw32/Makefile.in create mode 100644 dlls/msvfw32/drawdib.c create mode 100644 dlls/msvfw32/mciwnd.c create mode 100644 dlls/msvfw32/msvfw32.spec create mode 100644 dlls/msvfw32/msvfw32_De.rc create mode 100644 dlls/msvfw32/msvfw32_En.rc create mode 100644 dlls/msvfw32/msvfw32_Ko.rc create mode 100644 dlls/msvfw32/msvfw32_No.rc create mode 100644 dlls/msvfw32/msvfw32_Tr.rc create mode 100644 dlls/msvfw32/msvideo.spec create mode 100644 dlls/msvfw32/msvideo16.c create mode 100644 dlls/msvfw32/msvideo_main.c create mode 100644 dlls/msvfw32/msvideo_private.h create mode 100644 dlls/msvfw32/rsrc.rc create mode 100644 dlls/msvfw32/vfw16.h delete mode 100644 dlls/msvideo/.gitignore delete mode 100644 dlls/msvideo/Makefile.in delete mode 100644 dlls/msvideo/drawdib.c delete mode 100644 dlls/msvideo/mciwnd.c delete mode 100644 dlls/msvideo/msvfw32.spec delete mode 100644 dlls/msvideo/msvfw32_De.rc delete mode 100644 dlls/msvideo/msvfw32_En.rc delete mode 100644 dlls/msvideo/msvfw32_Ko.rc delete mode 100644 dlls/msvideo/msvfw32_No.rc delete mode 100644 dlls/msvideo/msvfw32_Tr.rc delete mode 100644 dlls/msvideo/msvideo.spec delete mode 100644 dlls/msvideo/msvideo16.c delete mode 100644 dlls/msvideo/msvideo_main.c delete mode 100644 dlls/msvideo/msvideo_private.h delete mode 100644 dlls/msvideo/rsrc.rc delete mode 100644 dlls/msvideo/vfw16.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ac3be957e4677895ab4…

1 0

Alexandre Julliard : win32s: Renamed the win32s directory to w32skrnl.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: 1a909d1929cb43d35340d2488549cd22c8182673 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a909d1929cb43d35340d24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 10:01:56 2006 +0100 win32s: Renamed the win32s directory to w32skrnl. --- configure | 4 + configure.ac | 2 - dlls/Makefile.in | 8 +-- dlls/w32skrnl/.gitignore | 1 dlls/w32skrnl/Makefile.in | 21 +++++++ dlls/w32skrnl/w32skernel.c | 59 +++++++++++++++++++ dlls/w32skrnl/w32skrnl.spec | 136 +++++++++++++++++++++++++++++++++++++++++++ dlls/w32skrnl/w32sys.c | 119 ++++++++++++++++++++++++++++++++++++++ dlls/w32skrnl/w32sys.spec | 12 ++++ dlls/w32skrnl/win32s16.c | 129 +++++++++++++++++++++++++++++++++++++++++ dlls/w32skrnl/win32s16.spec | 56 ++++++++++++++++++ dlls/win32s/.gitignore | 1 dlls/win32s/Makefile.in | 21 ------- dlls/win32s/w32skernel.c | 59 ------------------- dlls/win32s/w32skrnl.spec | 136 ------------------------------------------- dlls/win32s/w32sys.c | 119 -------------------------------------- dlls/win32s/w32sys.spec | 12 ---- dlls/win32s/win32s16.c | 129 ----------------------------------------- dlls/win32s/win32s16.spec | 56 ------------------ 19 files changed, 540 insertions(+), 540 deletions(-) create mode 100644 dlls/w32skrnl/.gitignore create mode 100644 dlls/w32skrnl/Makefile.in create mode 100644 dlls/w32skrnl/w32skernel.c create mode 100644 dlls/w32skrnl/w32skrnl.spec create mode 100644 dlls/w32skrnl/w32sys.c create mode 100644 dlls/w32skrnl/w32sys.spec create mode 100644 dlls/w32skrnl/win32s16.c create mode 100644 dlls/w32skrnl/win32s16.spec delete mode 100644 dlls/win32s/.gitignore delete mode 100644 dlls/win32s/Makefile.in delete mode 100644 dlls/win32s/w32skernel.c delete mode 100644 dlls/win32s/w32skrnl.spec delete mode 100644 dlls/win32s/w32sys.c delete mode 100644 dlls/win32s/w32sys.spec delete mode 100644 dlls/win32s/win32s16.c delete mode 100644 dlls/win32s/win32s16.spec Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1a909d1929cb43d3534…

1 0

Alexandre Julliard : winsock: Renamed the winsock directory to ws2_32.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: af781f398aa2dc98197f72dedada50f6fbd6d672 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=af781f398aa2dc98197f72d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 09:57:30 2006 +0100 winsock: Renamed the winsock directory to ws2_32. --- configure | 6 configure.ac | 4 dlls/.gitignore | 1 dlls/Makefile.in | 18 dlls/winsock/.gitignore | 3 dlls/winsock/Makefile.in | 27 dlls/winsock/async.c | 776 ------- dlls/winsock/protocol.c | 418 ---- dlls/winsock/socket.c | 4683 ---------------------------------------- dlls/winsock/socket16.c | 604 ----- dlls/winsock/tests/.gitignore | 4 dlls/winsock/tests/Makefile.in | 14 dlls/winsock/tests/protocol.c | 109 - dlls/winsock/tests/sock.c | 1443 ------------ dlls/winsock/version.rc | 26 dlls/winsock/winsock.spec | 48 dlls/winsock/ws2_32.spec | 119 - dlls/ws2_32/.gitignore | 3 dlls/ws2_32/Makefile.in | 27 dlls/ws2_32/async.c | 776 +++++++ dlls/ws2_32/protocol.c | 418 ++++ dlls/ws2_32/socket.c | 4683 ++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket16.c | 604 +++++ dlls/ws2_32/tests/.gitignore | 4 dlls/ws2_32/tests/Makefile.in | 14 dlls/ws2_32/tests/protocol.c | 109 + dlls/ws2_32/tests/sock.c | 1443 ++++++++++++ dlls/ws2_32/version.rc | 26 dlls/ws2_32/winsock.spec | 48 dlls/ws2_32/ws2_32.spec | 119 + programs/winetest/Makefile.in | 4 31 files changed, 8288 insertions(+), 8293 deletions(-) delete mode 100644 dlls/winsock/.gitignore delete mode 100644 dlls/winsock/Makefile.in delete mode 100644 dlls/winsock/async.c delete mode 100644 dlls/winsock/protocol.c delete mode 100644 dlls/winsock/socket.c delete mode 100644 dlls/winsock/socket16.c delete mode 100644 dlls/winsock/tests/.gitignore delete mode 100644 dlls/winsock/tests/Makefile.in delete mode 100644 dlls/winsock/tests/protocol.c delete mode 100644 dlls/winsock/tests/sock.c delete mode 100644 dlls/winsock/version.rc delete mode 100644 dlls/winsock/winsock.spec delete mode 100644 dlls/winsock/ws2_32.spec create mode 100644 dlls/ws2_32/.gitignore create mode 100644 dlls/ws2_32/Makefile.in create mode 100644 dlls/ws2_32/async.c create mode 100644 dlls/ws2_32/protocol.c create mode 100644 dlls/ws2_32/socket.c create mode 100644 dlls/ws2_32/socket16.c create mode 100644 dlls/ws2_32/tests/.gitignore create mode 100644 dlls/ws2_32/tests/Makefile.in create mode 100644 dlls/ws2_32/tests/protocol.c create mode 100644 dlls/ws2_32/tests/sock.c create mode 100644 dlls/ws2_32/version.rc create mode 100644 dlls/ws2_32/winsock.spec create mode 100644 dlls/ws2_32/ws2_32.spec Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=af781f398aa2dc98197…

1 0

Alexandre Julliard : wineprefixcreate: Fixed datadir path. Added dependency on relpath.
by Alexandre Julliard 15 Mar '06

15 Mar '06

Module: wine Branch: refs/heads/master Commit: b47f0593c8c43d0a2820b763981691d98c059bb5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b47f0593c8c43d0a2820b76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 09:54:19 2006 +0100 wineprefixcreate: Fixed datadir path. Added dependency on relpath. --- tools/Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index cb8337a..1fcc092 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -69,8 +69,8 @@ sfnt2fnt$(EXEEXT): sfnt2fnt.o bin2res$(EXEEXT): bin2res.o $(CC) $(CFLAGS) -o $@ bin2res.o $(LIBPORT) -wineprefixcreate: wineprefixcreate.in - sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) +wineprefixcreate: wineprefixcreate.in relpath$(EXEEXT) + sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)/wine`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) chmod +x wineprefixcreate install install-lib:: wineprefixcreate

1 0

bugzilla/template/en/default/bug edit.html.tmp ...
by Jeremy Newman 14 Mar '06

14 Mar '06

ChangeSet ID: 23553 CVSROOT: /opt/cvs-commit Module name: bugzilla Changes by: jnewman(a)winehq.org 2006/03/14 14:16:10 Modified files: template/en/default/bug: edit.html.tmpl template/en/default/bug/create: create.html.tmpl Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Add note to attach and not paste logs and back traces. Patch: http://cvs.winehq.org/patch.py?id=23553 Old revision New revision Changes Path 1.2 1.3 +1 -1 bugzilla/template/en/default/bug/edit.html.tmpl 1.1.1.1 1.2 +1 -1 bugzilla/template/en/default/bug/create/create.html.tmpl Index: bugzilla/template/en/default/bug/edit.html.tmpl diff -u -p bugzilla/template/en/default/bug/edit.html.tmpl:1.2 bugzilla/template/en/default/bug/edit.html.tmpl:1.3 --- bugzilla/template/en/default/bug/edit.html.tmpl:1.2 14 Mar 2006 20:16:10 -0000 +++ bugzilla/template/en/default/bug/edit.html.tmpl 14 Mar 2006 20:16:10 -0000 @@ -392,7 +392,7 @@ [%# *** Comments Groups *** %] <br> - <b>Additional <u>C</u>omments:</b> + <b>Additional <u>C</u>omments:</b><font size"-1"> Please do not PASTE logs and back traces, (attach them instead).<font> [% IF Param("insidergroup") && UserInGroup(Param("insidergroup")) %] <input type="checkbox" name="commentprivacy" value="1"> Private [% END %] Index: bugzilla/template/en/default/bug/create/create.html.tmpl diff -u -p bugzilla/template/en/default/bug/create/create.html.tmpl:1.1.1.1 bugzilla/template/en/default/bug/create/create.html.tmpl:1.2 --- bugzilla/template/en/default/bug/create/create.html.tmpl:1.1.1.1 14 Mar 2006 20:16:10 -0000 +++ bugzilla/template/en/default/bug/create/create.html.tmpl 14 Mar 2006 20:16:10 -0000 @@ -184,7 +184,7 @@ <input name="short_desc" size="60" value="[% short_desc FILTER html %]"> </td> </tr> - + <tr><td></td><td>Please do not PASTE logs and back traces (create an attachment instead)</td></tr> <tr><td align="right" valign="top"><strong>Description:</strong></td> <td colspan="3"> <textarea wrap="hard" name="comment" rows="10" cols="80">

1 0

Pierre d'Herbemont : wineprefixcreate: Make path searching relative.
by Alexandre Julliard 14 Mar '06

14 Mar '06

Module: wine Branch: refs/heads/master Commit: b1be72451102e46f3e44c94a3565eb546aebb541 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b1be72451102e46f3e44c94… Author: Pierre d'Herbemont <stegefin(a)free.fr> Date: Sat Mar 11 21:12:11 2006 +0100 wineprefixcreate: Make path searching relative. --- tools/Makefile.in | 2 +- tools/wineprefixcreate.in | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index c44525d..cb8337a 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -70,7 +70,7 @@ bin2res$(EXEEXT): bin2res.o $(CC) $(CFLAGS) -o $@ bin2res.o $(LIBPORT) wineprefixcreate: wineprefixcreate.in - sed -e 's,@dlldir\@,$(dlldir),g' -e 's,@datadir\@,$(datadir),g' $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) + sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) chmod +x wineprefixcreate install install-lib:: wineprefixcreate diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index 876a533..3effdb5 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -36,8 +36,31 @@ usage() set -e -dlldir="@dlldir@" -datadir="@datadir@/wine" +bindir="" +case "$0" in + */*) + # $0 contains a path, use it + bindir=`dirname "$0"` + ;; + *) + # no directory in $0, search in PATH + saved_ifs=$IFS + IFS=: + for d in $PATH + do + IFS=$saved_ifs + if [ -x "$d/$0" ] + then + bindir="$d" + break + fi + done + ;; +esac + +bindir=`cd "$bindir" && pwd` +dlldir="$bindir/@bintodlldir@" +datadir="$bindir/@bintodatadir@" do_wait=0 quiet=0

1 0

Dmitry Timoshkov : shell32: Add parameter formatting rule to the command line if there isn't any.
by Alexandre Julliard 14 Mar '06

14 Mar '06

Module: wine Branch: refs/heads/master Commit: 52645e11444cbbd62ad07efa0c6c7873facc35bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=52645e11444cbbd62ad07ef… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 13 13:44:41 2006 +0800 shell32: Add parameter formatting rule to the command line if there isn't any. --- dlls/shell32/shlexec.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index f5b1e88..1f4638a 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -848,7 +848,14 @@ static UINT_PTR execute_from_key(LPWSTR /* Is there a replace() function anywhere? */ cmdlen /= sizeof(WCHAR); cmd[cmdlen] = '\0'; - SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline); + if (!SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline)) + { + /* looks like there is no %1 param in the cmd, add one */ + static const WCHAR oneW[] = { ' ','\"','%','1','\"',0 }; + strcatW(cmd, oneW); + SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline); + } + TRACE("executing: %s\n", debugstr_w(param)); retval = execfunc(param, env, FALSE, psei, psei_out); } else

1 0

Robert Shearman : wininet: Move URL-related tests to a separate file.
by Alexandre Julliard 14 Mar '06

14 Mar '06

Module: wine Branch: refs/heads/master Commit: 74cb03247d3cfb5d4eae60348a403c726a914931 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=74cb03247d3cfb5d4eae603… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 14 18:49:19 2006 +0100 wininet: Move URL-related tests to a separate file. --- dlls/wininet/tests/.gitignore | 1 dlls/wininet/tests/Makefile.in | 3 dlls/wininet/tests/http.c | 655 --------------------------------------- dlls/wininet/tests/url.c | 671 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 675 insertions(+), 655 deletions(-) create mode 100644 dlls/wininet/tests/url.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=74cb03247d3cfb5d4ea…

1 0

Robert Shearman : wininet: Make InternetCrackUrlW set the components related to net_loc
by Alexandre Julliard 14 Mar '06

14 Mar '06

Module: wine Branch: refs/heads/master Commit: 366fc247fcc27a4208d6e8ec081138726462538d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=366fc247fcc27a4208d6e8e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 14 14:35:37 2006 +0000 wininet: Make InternetCrackUrlW set the components related to net_loc to NULL when net_loc isn't present in the input URL. --- dlls/wininet/internet.c | 22 +++++++++++++--------- dlls/wininet/tests/http.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 73c3a15..42eb61d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1337,13 +1337,13 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp break; } + lpUC->nScheme = INTERNET_SCHEME_UNKNOWN; + lpUC->nPort = INTERNET_INVALID_PORT_NUMBER; + /* Parse <params> */ lpszParam = strpbrkW(lpszap, lpszSeparators); - if (lpszParam != NULL) - { - SetUrlComponentValueW(&lpUC->lpszExtraInfo, &lpUC->dwExtraInfoLength, - lpszParam, dwUrlLength-(lpszParam-lpszUrl)); - } + SetUrlComponentValueW(&lpUC->lpszExtraInfo, &lpUC->dwExtraInfoLength, + lpszParam, lpszParam ? dwUrlLength-(lpszParam-lpszUrl) : 0); if (bIsAbsolute) /* Parse <protocol>:[//<net_loc>] */ { @@ -1425,7 +1425,6 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp { SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, lpszHost, lpszPort - lpszHost); - lpUC->nPort = 0; lpszcp=lpszNetLoc; } else @@ -1444,7 +1443,6 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp lpszcp=lpszHost; SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0); - lpUC->nPort = 0; } else { @@ -1467,7 +1465,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp lpUC->nPort = INTERNET_DEFAULT_GOPHER_PORT; break; default: - lpUC->nPort = INTERNET_INVALID_PORT_NUMBER; + break; } } } @@ -1478,9 +1476,15 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0); SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0); SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0); - lpUC->nPort = 0; } } + else + { + SetUrlComponentValueW(&lpUC->lpszScheme, &lpUC->dwSchemeLength, NULL, 0); + SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0); + SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0); + SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0); + } /* Here lpszcp points to: * diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 093fb74..6611572 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -683,6 +683,7 @@ static void InternetCrackUrlW_test(void) 'C','F','I','D','E','/','m','a','i','n','.','c','f','m','?','C','F','S','V','R', '=','I','D','E','&','A','C','T','I','O','N','=','I','D','E','_','D','E','F','A', 'U','L','T', 0 }; + static const WCHAR url2[] = { '.','.','/','R','i','t','z','.','x','m','l',0 }; URL_COMPONENTSW comp; WCHAR scheme[20], host[20], user[20], pwd[20], urlpart[50], extra[50]; BOOL r; @@ -762,6 +763,35 @@ static void InternetCrackUrlW_test(void) ok( comp.dwPasswordLength == 0, "password length wrong\n"); ok( comp.dwUrlPathLength == 15, "url length wrong\n"); ok( comp.dwExtraInfoLength == 29, "extra length wrong\n"); + + urlpart[0]=0; + scheme[0]=0; + extra[0]=0; + host[0]=0; + user[0]=0; + pwd[0]=0; + memset(&comp, 0, sizeof(comp)); + comp.dwStructSize = sizeof(comp); + comp.lpszScheme = scheme; + comp.dwSchemeLength = sizeof(scheme)/sizeof(scheme[0]); + comp.lpszHostName = host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); + comp.lpszUserName = user; + comp.dwUserNameLength = sizeof(user)/sizeof(user[0]); + comp.lpszPassword = pwd; + comp.dwPasswordLength = sizeof(pwd)/sizeof(pwd[0]); + comp.lpszUrlPath = urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); + comp.lpszExtraInfo = extra; + comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); + + r = InternetCrackUrlW(url2, 0, 0, &comp); + ok( r, "InternetCrackUrl failed, error %lx\n",GetLastError()); + ok(!comp.dwSchemeLength,".dwSchemeLength should be 0, but is %ld\n", comp.dwSchemeLength); + ok(!comp.dwHostNameLength,".dwHostNameLength should be 0, but is %ld\n", comp.dwHostNameLength); + ok(!comp.dwUserNameLength,".dwUserNameLength should be 0, but is %ld\n", comp.dwUserNameLength); + ok(!comp.dwPasswordLength,".dwPasswordLength should be 0, but is %ld\n", comp.dwPasswordLength); + ok(!comp.dwExtraInfoLength,".dwExtraInfoLength should be 0, but is %ld\n", comp.dwExtraInfoLength); } static void InternetTimeFromSystemTimeA_test(void)

1 0

Robert Shearman : wininet: Move cookie-related stubs to cookie.c
by Alexandre Julliard 14 Mar '06

14 Mar '06

Module: wine Branch: refs/heads/master Commit: 153aac019459745c8c5663d7c5e24beab31854f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=153aac019459745c8c5663d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 14 14:35:52 2006 +0000 wininet: Move cookie-related stubs to cookie.c --- dlls/wininet/cookie.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wininet/internet.c | 82 -------------------------- 2 files changed, 149 insertions(+), 82 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 043de1b..231faca 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -504,3 +504,152 @@ BOOL WINAPI InternetSetCookieA(LPCSTR lp return r; } + +/*********************************************************************** + * InternetSetCookieExA (WININET.@) + * + * See InternetSetCookieExW. + */ +DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR lpszCookieData, + DWORD dwFlags, DWORD_PTR dwReserved) +{ + FIXME("(%s, %s, %s, 0x%08lx, 0x%08lx) stub\n", + debugstr_a(lpszURL), debugstr_a(lpszCookieName), debugstr_a(lpszCookieData), + dwFlags, dwReserved); + return TRUE; +} + +/*********************************************************************** + * InternetSetCookieExW (WININET.@) + * + * Sets a cookie for the specified URL. + * + * RETURNS + * TRUE on success + * FALSE on failure + * + */ +DWORD WINAPI InternetSetCookieExW( LPCWSTR lpszURL, LPCWSTR lpszCookieName, LPCWSTR lpszCookieData, + DWORD dwFlags, DWORD_PTR dwReserved) +{ + FIXME("(%s, %s, %s, 0x%08lx, 0x%08lx) stub\n", + debugstr_w(lpszURL), debugstr_w(lpszCookieName), debugstr_w(lpszCookieData), + dwFlags, dwReserved); + return TRUE; +} + +/*********************************************************************** + * InternetGetCookieExA (WININET.@) + * + * See InternetGetCookieExW. + */ +BOOL WINAPI InternetGetCookieExA( LPCSTR pchURL, LPCSTR pchCookieName, LPSTR pchCookieData, + LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved) +{ + FIXME("(%s, %s, %s, %p, 0x%08lx, %p) stub\n", + debugstr_a(pchURL), debugstr_a(pchCookieName), debugstr_a(pchCookieData), + pcchCookieData, dwFlags, lpReserved); + return FALSE; +} + +/*********************************************************************** + * InternetGetCookieExW (WININET.@) + * + * Retrieve cookie for the specified URL. + * + * RETURNS + * TRUE on success + * FALSE on failure + * + */ +BOOL WINAPI InternetGetCookieExW( LPCWSTR pchURL, LPCWSTR pchCookieName, LPWSTR pchCookieData, + LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved) +{ + FIXME("(%s, %s, %s, %p, 0x%08lx, %p) stub\n", + debugstr_w(pchURL), debugstr_w(pchCookieName), debugstr_w(pchCookieData), + pcchCookieData, dwFlags, lpReserved); + return FALSE; +} + +/*********************************************************************** + * InternetClearAllPerSiteCookieDecisions (WININET.@) + * + * Clears all per-site decisions about cookies. + * + * RETURNS + * TRUE on success + * FALSE on failure + * + */ +BOOL WINAPI InternetClearAllPerSiteCookieDecisions( VOID ) +{ + FIXME("stub\n"); + return TRUE; +} + +/*********************************************************************** + * InternetEnumPerSiteCookieDecisionA (WININET.@) + * + * See InternetEnumPerSiteCookieDecisionW. + */ +BOOL WINAPI InternetEnumPerSiteCookieDecisionA( LPSTR pszSiteName, unsigned long *pcSiteNameSize, + unsigned long *pdwDecision, unsigned long dwIndex ) +{ + FIXME("(%s, %p, %p, 0x%08lx) stub\n", + debugstr_a(pszSiteName), pcSiteNameSize, pdwDecision, dwIndex); + return FALSE; +} + +/*********************************************************************** + * InternetEnumPerSiteCookieDecisionW (WININET.@) + * + * Enumerates all per-site decisions about cookies. + * + * RETURNS + * TRUE on success + * FALSE on failure + * + */ +BOOL WINAPI InternetEnumPerSiteCookieDecisionW( LPWSTR pszSiteName, unsigned long *pcSiteNameSize, + unsigned long *pdwDecision, unsigned long dwIndex ) +{ + FIXME("(%s, %p, %p, 0x%08lx) stub\n", + debugstr_w(pszSiteName), pcSiteNameSize, pdwDecision, dwIndex); + return FALSE; +} + +/*********************************************************************** + * InternetGetPerSiteCookieDecisionA (WININET.@) + */ +BOOL WINAPI InternetGetPerSiteCookieDecisionA( LPCSTR pwchHostName, unsigned long *pResult ) +{ + FIXME("(%s, %p) stub\n", debugstr_a(pwchHostName), pResult); + return FALSE; +} + +/*********************************************************************** + * InternetGetPerSiteCookieDecisionW (WININET.@) + */ +BOOL WINAPI InternetGetPerSiteCookieDecisionW( LPCWSTR pwchHostName, unsigned long *pResult ) +{ + FIXME("(%s, %p) stub\n", debugstr_w(pwchHostName), pResult); + return FALSE; +} + +/*********************************************************************** + * InternetSetPerSiteCookieDecisionA (WININET.@) + */ +BOOL WINAPI InternetSetPerSiteCookieDecisionA( LPCSTR pchHostName, DWORD dwDecision ) +{ + FIXME("(%s, 0x%08lx) stub\n", debugstr_a(pchHostName), dwDecision); + return FALSE; +} + +/*********************************************************************** + * InternetSetPerSiteCookieDecisionW (WININET.@) + */ +BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDecision ) +{ + FIXME("(%s, 0x%08lx) stub\n", debugstr_w(pchHostName), dwDecision); + return FALSE; +} diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f2d4ad3..73c3a15 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4139,88 +4139,6 @@ BOOL WINAPI CreateMD5SSOHash( PWSTR pszC return FALSE; } -BOOL WINAPI InternetClearAllPerSiteCookieDecisions( VOID ) -{ - FIXME("stub\n"); - return TRUE; -} - -BOOL WINAPI InternetEnumPerSiteCookieDecisionA( LPSTR pszSiteName, unsigned long *pcSiteNameSize, - unsigned long *pdwDecision, unsigned long dwIndex ) -{ - FIXME("(%s, %p, %p, 0x%08lx) stub\n", - debugstr_a(pszSiteName), pcSiteNameSize, pdwDecision, dwIndex); - return FALSE; -} - -BOOL WINAPI InternetEnumPerSiteCookieDecisionW( LPWSTR pszSiteName, unsigned long *pcSiteNameSize, - unsigned long *pdwDecision, unsigned long dwIndex ) -{ - FIXME("(%s, %p, %p, 0x%08lx) stub\n", - debugstr_w(pszSiteName), pcSiteNameSize, pdwDecision, dwIndex); - return FALSE; -} - -BOOL WINAPI InternetGetCookieExA( LPCSTR pchURL, LPCSTR pchCookieName, LPSTR pchCookieData, - LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved) -{ - FIXME("(%s, %s, %s, %p, 0x%08lx, %p) stub\n", - debugstr_a(pchURL), debugstr_a(pchCookieName), debugstr_a(pchCookieData), - pcchCookieData, dwFlags, lpReserved); - return FALSE; -} - -BOOL WINAPI InternetGetCookieExW( LPCWSTR pchURL, LPCWSTR pchCookieName, LPWSTR pchCookieData, - LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved) -{ - FIXME("(%s, %s, %s, %p, 0x%08lx, %p) stub\n", - debugstr_w(pchURL), debugstr_w(pchCookieName), debugstr_w(pchCookieData), - pcchCookieData, dwFlags, lpReserved); - return FALSE; -} - -BOOL WINAPI InternetGetPerSiteCookieDecisionA( LPCSTR pwchHostName, unsigned long *pResult ) -{ - FIXME("(%s, %p) stub\n", debugstr_a(pwchHostName), pResult); - return FALSE; -} - -BOOL WINAPI InternetGetPerSiteCookieDecisionW( LPCWSTR pwchHostName, unsigned long *pResult ) -{ - FIXME("(%s, %p) stub\n", debugstr_w(pwchHostName), pResult); - return FALSE; -} - -BOOL WINAPI InternetSetPerSiteCookieDecisionA( LPCSTR pchHostName, DWORD dwDecision ) -{ - FIXME("(%s, 0x%08lx) stub\n", debugstr_a(pchHostName), dwDecision); - return FALSE; -} - -BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDecision ) -{ - FIXME("(%s, 0x%08lx) stub\n", debugstr_w(pchHostName), dwDecision); - return FALSE; -} - -DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR lpszCookieData, - DWORD dwFlags, DWORD_PTR dwReserved) -{ - FIXME("(%s, %s, %s, 0x%08lx, 0x%08lx) stub\n", - debugstr_a(lpszURL), debugstr_a(lpszCookieName), debugstr_a(lpszCookieData), - dwFlags, dwReserved); - return TRUE; -} - -DWORD WINAPI InternetSetCookieExW( LPCWSTR lpszURL, LPCWSTR lpszCookieName, LPCWSTR lpszCookieData, - DWORD dwFlags, DWORD_PTR dwReserved) -{ - FIXME("(%s, %s, %s, 0x%08lx, 0x%08lx) stub\n", - debugstr_w(lpszURL), debugstr_w(lpszCookieName), debugstr_w(lpszCookieData), - dwFlags, dwReserved); - return TRUE; -} - BOOL WINAPI ResumeSuspendedDownload( HINTERNET hInternet, DWORD dwError ) { FIXME("(%p, 0x%08lx) stub\n", hInternet, dwError);

1 0

Robert Shearman : wininet: Implement setting of send and receive timeouts.
by Alexandre Julliard 14 Mar '06

14 Mar '06

Module: wine Branch: refs/heads/master Commit: 5b5d45586ed5b051b5bdbefbf43d08862e196b9f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5b5d45586ed5b051b5bdbef… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 14 14:36:11 2006 +0000 wininet: Implement setting of send and receive timeouts. --- dlls/wininet/internet.c | 26 ++++++++++++++++++++++---- dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 51db944..f2d4ad3 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2442,11 +2442,29 @@ BOOL WINAPI InternetSetOptionW(HINTERNET case INTERNET_OPTION_DISABLE_PASSPORT_AUTH: TRACE("Option INTERNET_OPTION_DISABLE_PASSPORT_AUTH: harmless stub, since not enabled\n"); break; - case INTERNET_OPTION_RECEIVE_TIMEOUT: - FIXME("Option INTERNET_OPTION_RECEIVE_TIMEOUT: STUB\n"); - break; case INTERNET_OPTION_SEND_TIMEOUT: - FIXME("Option INTERNET_OPTION_SEND_TIMEOUT: STUB\n"); + case INTERNET_OPTION_RECEIVE_TIMEOUT: + TRACE("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT\n"); + if (dwBufferLength == sizeof(DWORD)) + { + if (lpwhh->htype == WH_HHTTPREQ) + ret = NETCON_set_timeout( + &((LPWININETHTTPREQW)lpwhh)->netConnection, + dwOption == INTERNET_OPTION_SEND_TIMEOUT, + *(DWORD *)lpBuffer); + else + { + FIXME("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT not supported on protocol %d\n", + lpwhh->htype); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + } + } + else + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + } break; case INTERNET_OPTION_CONNECT_RETRIES: FIXME("Option INTERNET_OPTION_CONNECT_RETRIES: STUB\n"); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6399de9..8043e4c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -481,6 +481,7 @@ BOOL NETCON_recv(WININET_NETCONNECTION * int *recvd /* out */); BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPDWORD dwBuffer); LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection); +BOOL NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value); extern void URLCacheContainers_CreateDefaults(void); extern void URLCacheContainers_DeleteAll(void); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index e046e04..0c9d06f 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -714,3 +714,31 @@ LPCVOID NETCON_GetCert(WININET_NETCONNEC return NULL; #endif } + +BOOL NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value) +{ + int result; + struct timeval tv; + + /* FIXME: we should probably store the timeout in the connection to set + * when we do connect */ + if (!NETCON_connected(connection)) + return TRUE; + + /* value is in milliseconds, convert to struct timeval */ + tv.tv_sec = value / 1000; + tv.tv_usec = (value % 1000) * 1000; + + result = setsockopt(connection->socketFD, SOL_SOCKET, + send ? SO_SNDTIMEO : SO_RCVTIMEO, &tv, + sizeof(tv)); + + if (result == -1) + { + WARN("setsockopt failed (%s)\n", strerror(errno)); + INTERNET_SetLastError(sock_get_error(errno)); + return FALSE; + } + + return TRUE; +}

1 0

Robert Shearman : ntdll: Move the call to MODULE_DllThreadAttach from the kernel32
by Alexandre Julliard 14 Mar '06

14 Mar '06

Module: wine Branch: refs/heads/master Commit: ea6f3a4cc0ba4a8e0a30df259052c8bb3e25ba5b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea6f3a4cc0ba4a8e0a30df2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 14 14:35:21 2006 +0000 ntdll: Move the call to MODULE_DllThreadAttach from the kernel32 thread creation function to the NTDLL one. --- dlls/kernel/thread.c | 2 -- dlls/ntdll/ntdll.spec | 5 ----- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/thread.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/kernel/thread.c b/dlls/kernel/thread.c index 41a8ccf..2d83707 100644 --- a/dlls/kernel/thread.c +++ b/dlls/kernel/thread.c @@ -54,7 +54,6 @@ struct new_thread_info void *arg; }; -extern NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ); /* FIXME */ /*********************************************************************** * THREAD_Start @@ -74,7 +73,6 @@ static void CALLBACK THREAD_Start( void __TRY { - MODULE_DllThreadAttach( NULL ); ExitThread( func( arg ) ); } __EXCEPT(UnhandledExceptionFilter) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7ccbbfd..b2001ae 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1390,8 +1390,3 @@ @ cdecl wine_nt_to_unix_file_name(ptr ptr long long) @ cdecl wine_unix_to_nt_file_name(ptr ptr) @ cdecl __wine_init_windows_dir(wstr wstr) - -################################################################ -# Wine dll separation hacks, these will go away, don't use them -# -@ cdecl MODULE_DllThreadAttach(ptr) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index c32a246..35cbd5b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -60,6 +60,7 @@ extern void DECLSPEC_NORETURN server_exi extern void DECLSPEC_NORETURN server_abort_thread( int status ); /* module handling */ +extern NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ); extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ); extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 5bfdcee..6e3d019 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -39,6 +39,7 @@ #include "wine/pthread.h" #include "wine/debug.h" #include "ntdll_misc.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(thread); @@ -273,6 +274,26 @@ HANDLE thread_init(void) return exe_file; } +typedef ULONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); +static PUNHANDLED_EXCEPTION_FILTER get_unhandled_exception_filter(void) +{ + static PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter; + static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + UNICODE_STRING module_name; + ANSI_STRING func_name; + HMODULE kernel32_handle; + + if (unhandled_exception_filter) return unhandled_exception_filter; + + RtlInitUnicodeString(&module_name, kernel32W); + RtlInitAnsiString( &func_name, "UnhandledExceptionFilter" ); + + if (LdrGetDllHandle( 0, 0, &module_name, &kernel32_handle ) == STATUS_SUCCESS) + LdrGetProcedureAddress( kernel32_handle, &func_name, 0, + (void **)&unhandled_exception_filter ); + + return unhandled_exception_filter; +} /*********************************************************************** * start_thread @@ -316,6 +337,23 @@ static void start_thread( struct wine_pt InsertHeadList( &tls_links, &teb->TlsLinks ); RtlReleasePebLock(); + /* NOTE: Windows does not have an exception handler around the call to + * the thread attach. We do for ease of debugging */ + if (get_unhandled_exception_filter()) + { + __TRY + { + MODULE_DllThreadAttach( NULL ); + } + __EXCEPT(get_unhandled_exception_filter()) + { + NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); + } + __ENDTRY + } + else + MODULE_DllThreadAttach( NULL ); + func( arg ); }

1 0

Robert Reif : wineesd: Use pipe sync for events.
by Alexandre Julliard 14 Mar '06

14 Mar '06

Module: wine Branch: refs/heads/master Commit: 2d15c8fb75bcc124f0c0f3d6b92f12de5290e1e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d15c8fb75bcc124f0c0f3d… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Mar 14 07:28:53 2006 -0500 wineesd: Use pipe sync for events. Ues pipe sync code from OSS/ALSA rather than windows events. --- dlls/winmm/wineesd/audio.c | 55 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/wineesd/audio.c b/dlls/winmm/wineesd/audio.c index 70ddf17..6bb035b 100644 --- a/dlls/winmm/wineesd/audio.c +++ b/dlls/winmm/wineesd/audio.c @@ -44,6 +44,13 @@ # include <unistd.h> #endif #include <fcntl.h> +#ifdef HAVE_POLL_H +#include <poll.h> +#endif +#ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +#endif + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -65,6 +72,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); #include <esd.h> +/* unless someone makes a wineserver kernel module, Unix pipes are faster than win32 events */ +#define USE_PIPE_SYNC + /* define if you want to use esd_monitor_stream instead of * esd_record_stream for waveIn stream */ @@ -105,6 +115,21 @@ enum win_wm_message { WINE_WM_UPDATE, WINE_WM_BREAKLOOP, WINE_WM_CLOSING, WINE_WM_STARTING, WINE_WM_STOPPING }; +#ifdef USE_PIPE_SYNC +#define SIGNAL_OMR(mr) do { int x = 0; write((mr)->msg_pipe[1], &x, sizeof(x)); } while (0) +#define CLEAR_OMR(mr) do { int x = 0; read((mr)->msg_pipe[0], &x, sizeof(x)); } while (0) +#define RESET_OMR(mr) do { } while (0) +#define WAIT_OMR(mr, sleep) \ + do { struct pollfd pfd; pfd.fd = (mr)->msg_pipe[0]; \ + pfd.events = POLLIN; poll(&pfd, 1, sleep); } while (0) +#else +#define SIGNAL_OMR(mr) do { SetEvent((mr)->msg_event); } while (0) +#define CLEAR_OMR(mr) do { } while (0) +#define RESET_OMR(mr) do { ResetEvent((mr)->msg_event); } while (0) +#define WAIT_OMR(mr, sleep) \ + do { WaitForSingleObject((mr)->msg_event, sleep); } while (0) +#endif + typedef struct { enum win_wm_message msg; /* message identifier */ DWORD param; /* parameter for this message */ @@ -121,7 +146,11 @@ typedef struct { int ring_buffer_size; int msg_tosave; int msg_toget; - HANDLE msg_event; +#ifdef USE_PIPE_SYNC + int msg_pipe[2]; +#else + HANDLE msg_event; +#endif CRITICAL_SECTION msg_crst; } ESD_MSG_RING; @@ -508,7 +537,15 @@ static int ESD_InitRingMessage(ESD_MSG_R { mr->msg_toget = 0; mr->msg_tosave = 0; +#ifdef USE_PIPE_SYNC + if (pipe(mr->msg_pipe) < 0) { + mr->msg_pipe[0] = -1; + mr->msg_pipe[1] = -1; + ERR("could not create pipe, error=%s\n", strerror(errno)); + } +#else mr->msg_event = CreateEventW(NULL, FALSE, FALSE, NULL); +#endif mr->ring_buffer_size = ESD_RING_BUFFER_INCREMENT; mr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,mr->ring_buffer_size * sizeof(RING_MSG)); InitializeCriticalSection(&mr->msg_crst); @@ -522,7 +559,12 @@ static int ESD_InitRingMessage(ESD_MSG_R */ static int ESD_DestroyRingMessage(ESD_MSG_RING* mr) { +#ifdef USE_PIPE_SYNC + close(mr->msg_pipe[0]); + close(mr->msg_pipe[1]); +#else CloseHandle(mr->msg_event); +#endif HeapFree(GetProcessHeap(),0,mr->messages); mr->messages=NULL; DeleteCriticalSection(&mr->msg_crst); @@ -587,8 +629,8 @@ static int ESD_AddRingMessage(ESD_MSG_RI LeaveCriticalSection(&mr->msg_crst); - SetEvent(mr->msg_event); /* signal a new message */ - + /* signal a new message */ + SIGNAL_OMR(mr); if (wait) { /* wait for playback/record thread to have processed the message */ @@ -620,6 +662,7 @@ static int ESD_RetrieveRingMessage(ESD_M *param = mr->messages[mr->msg_toget].param; *hEvent = mr->messages[mr->msg_toget].hEvent; mr->msg_toget = (mr->msg_toget + 1) % mr->ring_buffer_size; + CLEAR_OMR(mr); LeaveCriticalSection(&mr->msg_crst); return 1; } @@ -943,7 +986,7 @@ static void wodPlayer_Reset(WINE_WAVEOUT wodNotifyClient(wwo, WOM_DONE, param, 0); } - ResetEvent(wwo->msgRing.msg_event); + RESET_OMR(&wwo->msgRing); LeaveCriticalSection(&wwo->msgRing.msg_crst); } else { if (wwo->lpLoopPtr) { @@ -1108,7 +1151,7 @@ static DWORD CALLBACK wodPlayer(LPVOID p */ dwSleepTime = min(dwNextFeedTime, dwNextNotifyTime); TRACE("waiting %lums (%lu,%lu)\n", dwSleepTime, dwNextFeedTime, dwNextNotifyTime); - WaitForSingleObject(wwo->msgRing.msg_event, dwSleepTime); + WAIT_OMR(&wwo->msgRing, dwSleepTime); wodPlayer_ProcessMessages(wwo); if (wwo->state == WINE_WS_PLAYING) { dwNextFeedTime = wodPlayer_FeedDSP(wwo); @@ -1696,7 +1739,7 @@ static DWORD CALLBACK widRecorder(LPVOID } /* wait for dwSleepTime or an event in thread's queue */ - WaitForSingleObject(wwi->msgRing.msg_event, dwSleepTime); + WAIT_OMR(&wwi->msgRing, dwSleepTime); while (ESD_RetrieveRingMessage(&wwi->msgRing, &msg, &param, &ev)) {

1 0

Jan Zerebecki : x11drv: Prevent out of bound access in DescribePixelFormat.
by Alexandre Julliard 14 Mar '06

14 Mar '06

Module: wine Branch: refs/heads/master Commit: 433196d21393449f9344e32ad2f4be9f598f2ea4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=433196d21393449f9344e32… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Mon Mar 13 14:06:14 2006 +0100 x11drv: Prevent out of bound access in DescribePixelFormat. --- dlls/x11drv/opengl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index a2a591e..eb58da9 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -369,9 +369,9 @@ int X11DRV_DescribePixelFormat(X11DRV_PD return 0; } - if (nCfgs < iPixelFormat) { - ERR("unexpected iPixelFormat(%d) > nFormats(%d), returns NULL\n", iPixelFormat, nCfgs); - return 0; /* unespected error */ + if (nCfgs < iPixelFormat || 1 > iPixelFormat) { + WARN("unexpected iPixelFormat(%d): not >=1 and <=nFormats(%d), returning NULL\n", iPixelFormat, nCfgs); + return 0; } ret = nCfgs;

1 0

Jan Zerebecki : wine.inf: Increase the DirectX version to that of the latest 9.0c .
by Alexandre Julliard 14 Mar '06

14 Mar '06

Module: wine Branch: refs/heads/master Commit: f2c8a537d78b7890bbd58014c76223173baf031a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f2c8a537d78b7890bbd5801… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Mon Mar 13 14:06:40 2006 +0100 wine.inf: Increase the DirectX version to that of the latest 9.0c . --- tools/wine.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 014fb00..580c3bb 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -176,7 +176,7 @@ HKCU,%Metrics%,"BorderWidth",2,"1" HKCU,%Metrics%,"Shell Icon Size",2,"32" [DirectX] -HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0903" +HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904" HKLM,Software\Microsoft\DirectMusic,GMFilePath,,"%12%\gm.dls" HKLM,Software\Microsoft\DirectMusic\Defaults,DefaultOutputPort,,"{58C2B4D0-46E7-11D1-89AC-00A0C9054129}" HKLM,Software\Microsoft\DirectMusic\SoftwareSynths\{58C2B4D0-46E7-11D1-89AC-00A0C9054129},Description,,"Microsoft Software Synthesizer"

1 0

lostwages/ news/2006031301.xml wwn/wn20060313_ ...
by WineHQ 14 Mar '06

14 Mar '06

ChangeSet ID: 23542 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/03/13 22:27:45 Added files: news : 2006031301.xml wwn : wn20060313_308.xml Log message: WWN #308 Patch: http://cvs.winehq.org/patch.py?id=23542 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006031301.xml Added 1.1 +0 -0 lostwages/wwn/wn20060313_308.xml

1 0

Alexandre Julliard : ddraw: Don't crash in d3d test if OpenGL is missing.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: db0aabca25189e78cff2e633e6f874cc895ffd12 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db0aabca25189e78cff2e63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 13 14:19:58 2006 +0100 ddraw: Don't crash in d3d test if OpenGL is missing. --- dlls/ddraw/tests/d3d.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 00d84d6..bdfc4dc 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -58,6 +58,7 @@ static BOOL CreateDirect3D(void) ok(rc==DD_OK, "SetCooperativeLevel returned: %lx\n", rc); rc = IDirectDraw7_QueryInterface(lpDD, &IID_IDirect3D7, (void**) &lpD3D); + if (rc == E_NOINTERFACE) return FALSE; ok(rc==DD_OK, "QueryInterface returned: %lx\n", rc); memset(&ddsd, 0, sizeof(ddsd));

1 0

Juan Lang : crypt32: Abstract contexts.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 0811851b942fcfd929c9bb54126c2a43f3057d9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0811851b942fcfd929c9bb5… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Mar 10 15:22:41 2006 -0800 crypt32: Abstract contexts. - create a base cert context, and make functions unaware whether they're dealing with the base or derived type - simplify stores as a result --- dlls/crypt32/store.c | 453 ++++++++++++++++++++++---------------------------- 1 files changed, 198 insertions(+), 255 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0811851b942fcfd929c…

1 0

Mike McCormack : shell32: Fix some gcc 4. 1 warnings caused by casts in macros.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 6f9dd397d23ea461a9509d63de09a979d21cd659 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6f9dd397d23ea461a9509d6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 14:43:37 2006 +0900 shell32: Fix some gcc 4.1 warnings caused by casts in macros. --- dlls/shell32/shlview.c | 57 +++++++++++++++++++++++++++--------------------- 1 files changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 2cce8eb..7364f42 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -342,12 +342,17 @@ static BOOL ShellView_CreateList (IShell This->ListViewSortInfo.nLastHeaderID = -1; if (This->FolderSettings.fFlags & FWF_DESKTOP) { - if (0) /* FIXME: look into registry vale HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ListviewShadow and activate drop shadows */ - ListView_SetTextBkColor(This->hWndList, CLR_NONE); + /* + * FIXME: look at the registry value + * HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ListviewShadow + * and activate drop shadows if necessary + */ + if (0) + SendMessageW(This->hWndList, LVM_SETTEXTBKCOLOR, 0, CLR_NONE); else - ListView_SetTextBkColor(This->hWndList, GetSysColor(COLOR_DESKTOP)); + SendMessageW(This->hWndList, LVM_SETTEXTBKCOLOR, 0, GetSysColor(COLOR_DESKTOP)); - ListView_SetTextColor(This->hWndList, RGB(255,255,255)); + SendMessageW(This->hWndList, LVM_SETTEXTCOLOR, 0, RGB(255,255,255)); } /* UpdateShellSettings(); */ @@ -368,7 +373,7 @@ static BOOL ShellView_InitList(IShellVie TRACE("%p\n",This); - ListView_DeleteAllItems(This->hWndList); + SendMessageW(This->hWndList, LVM_DELETEALLITEMS, 0, 0); lvColumn.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT; lvColumn.pszText = szTemp; @@ -382,7 +387,7 @@ static BOOL ShellView_InitList(IShellVie lvColumn.fmt = sd.fmt; lvColumn.cx = sd.cxChar*8; /* chars->pixel */ StrRetToStrNA( szTemp, 50, &sd.str, NULL); - ListView_InsertColumnA(This->hWndList, i, &lvColumn); + SendMessageW(This->hWndList, LVM_INSERTCOLUMNW, i, (LPARAM) &lvColumn); } } else @@ -390,8 +395,8 @@ static BOOL ShellView_InitList(IShellVie FIXME("no SF2\n"); } - ListView_SetImageList(This->hWndList, ShellSmallIconList, LVSIL_SMALL); - ListView_SetImageList(This->hWndList, ShellBigIconList, LVSIL_NORMAL); + SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ShellSmallIconList); + SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)ShellBigIconList); return TRUE; } @@ -524,7 +529,9 @@ static int LV_FindItemByPidl( LVITEMA lvItem; ZeroMemory(&lvItem, sizeof(LVITEMA)); lvItem.mask = LVIF_PARAM; - for(lvItem.iItem = 0; ListView_GetItemA(This->hWndList, &lvItem); lvItem.iItem++) + for(lvItem.iItem = 0; + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); + lvItem.iItem++) { LPITEMIDLIST currentpidl = (LPITEMIDLIST) lvItem.lParam; HRESULT hr = IShellFolder_CompareIDs(This->pSFParent, 0, pidl, currentpidl); @@ -583,14 +590,14 @@ static BOOLEAN LV_RenameItem(IShellViewI ZeroMemory(&lvItem, sizeof(lvItem)); /* create the listview item*/ lvItem.mask = LVIF_PARAM; /* only the pidl */ lvItem.iItem = nItem; - ListView_GetItemA(This->hWndList, &lvItem); + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); SHFree((LPITEMIDLIST)lvItem.lParam); lvItem.mask = LVIF_PARAM; lvItem.iItem = nItem; lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidlNew)); /* set the item's data */ - ListView_SetItemA(This->hWndList, &lvItem); - ListView_Update(This->hWndList, nItem); + SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); + SendMessageA(This->hWndList, LVM_UPDATE, nItem, 0); return TRUE; /* FIXME: better handling */ } return FALSE; @@ -1227,7 +1234,7 @@ static LRESULT ShellView_OnCommand(IShel This->ListViewSortInfo.nHeaderID = (LPARAM) (dwCmdID - 0x30); This->ListViewSortInfo.bIsAscending = TRUE; This->ListViewSortInfo.nLastHeaderID = This->ListViewSortInfo.nHeaderID; - ListView_SortItems(This->hWndList, ShellView_ListViewCompareItems, (LPARAM) (&(This->ListViewSortInfo))); + SendMessageA(This->hWndList, LVM_SORTITEMS, (WPARAM) &This->ListViewSortInfo, (LPARAM)ShellView_ListViewCompareItems); break; default: @@ -1323,7 +1330,7 @@ static LRESULT ShellView_OnNotify(IShell } This->ListViewSortInfo.nLastHeaderID = This->ListViewSortInfo.nHeaderID; - ListView_SortItems(lpnmlv->hdr.hwndFrom, ShellView_ListViewCompareItems, (LPARAM) (&(This->ListViewSortInfo))); + SendMessageA(lpnmlv->hdr.hwndFrom, LVM_SORTITEMS, (WPARAM) &This->ListViewSortInfo, (LPARAM)ShellView_ListViewCompareItems); break; case LVN_GETDISPINFOA: @@ -1423,7 +1430,7 @@ static LRESULT ShellView_OnNotify(IShell ZeroMemory(&lvItem, sizeof(LVITEMA)); lvItem.iItem = lpdi->item.iItem; lvItem.mask = LVIF_PARAM; - ListView_GetItemA(This->hWndList, &lvItem); + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); pidl = (LPITEMIDLIST)lpdi->item.lParam; if (!MultiByteToWideChar( CP_ACP, 0, lpdi->item.pszText, -1, wszNewName, MAX_PATH )) @@ -1434,7 +1441,7 @@ static LRESULT ShellView_OnNotify(IShell { lvItem.mask = LVIF_PARAM; lvItem.lParam = (LPARAM)pidl; - ListView_SetItemA(This->hWndList, &lvItem); + SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); return TRUE; } } @@ -1466,8 +1473,8 @@ static LRESULT ShellView_OnNotify(IShell i = ListView_GetNextItem(This->hWndList, -1, LVNI_SELECTED); - ListView_EnsureVisible(This->hWndList, i, 0); - ListView_EditLabelA(This->hWndList, i); + SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0); + SendMessageW(This->hWndList, LVM_EDITLABELW, i, 0); } } #if 0 @@ -1504,7 +1511,7 @@ static LRESULT ShellView_OnNotify(IShell item_index, LVNI_SELECTED); item.iItem = item_index; item.mask |= LVIF_PARAM; - ListView_GetItemA(This->hWndList, &item); + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &item); /* get item pidl */ pItems[i] = (LPITEMIDLIST)item.lParam; @@ -1817,7 +1824,7 @@ static HRESULT WINAPI IShellView_fnRefre TRACE("(%p)\n",This); - ListView_DeleteAllItems(This->hWndList); + SendMessageW(This->hWndList, LVM_DELETEALLITEMS, 0, 0); ShellView_FillList(This); return S_OK; @@ -1968,13 +1975,13 @@ static HRESULT WINAPI IShellView_fnSelec LVITEMA lvItem; if(uFlags & SVSI_ENSUREVISIBLE) - ListView_EnsureVisible(This->hWndList, i, 0); + SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0); ZeroMemory(&lvItem, sizeof(LVITEMA)); lvItem.mask = LVIF_STATE; lvItem.iItem = 0; - while(ListView_GetItemA(This->hWndList, &lvItem)) + while(SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem)) { if (lvItem.iItem == i) { @@ -1991,13 +1998,13 @@ static HRESULT WINAPI IShellView_fnSelec if (uFlags & SVSI_DESELECTOTHERS) lvItem.state &= ~LVIS_SELECTED; } - ListView_SetItemA(This->hWndList, &lvItem); + SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); lvItem.iItem++; } if(uFlags & SVSI_EDIT) - ListView_EditLabelA(This->hWndList, i); + SendMessageW(This->hWndList, LVM_EDITLABELW, i, 0); } return S_OK; @@ -2255,7 +2262,7 @@ static HRESULT drag_notify_subitem(IShel ZeroMemory(&lvItem, sizeof(lvItem)); lvItem.mask = LVIF_PARAM; lvItem.iItem = lResult; - ListView_GetItemA(This->hWndList, &lvItem); + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); /* ... and bind pCurDropTarget to the IDropTarget interface of an UIObject of this object */ hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWndList, 1,

1 0

Roderick Colenbrander : wined3d: Vertexdeclaration fix.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: d4836e1ce1a8c831d76eef2ee8c712539983c763 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4836e1ce1a8c831d76eef2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 12 16:27:31 2006 +0100 wined3d: Vertexdeclaration fix. In the old d3d8 code SetVertexShader stored the so called vertex declaration in the stateblock. In case of WineD3D this isn't done which breaks the drawPrimitive code. This patch stores the vertex declaration again in the stateblock which fixes Age Of Mythology. --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7ce1d59..eab7fbf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4046,6 +4046,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer IWineD3DVertexShader_Release(oldShader); } + if (pShader != NULL && ((IWineD3DVertexShaderImpl *)pShader)->vertexDeclaration != NULL) { + TRACE("(%p) : setting vertexDeclaration(%p)\n", This, ((IWineD3DVertexShaderImpl *)pShader)->vertexDeclaration); + IWineD3DDevice_SetVertexDeclaration(iface, ((IWineD3DVertexShaderImpl *)pShader)->vertexDeclaration); + } + TRACE("(%p) : setting pShader(%p)\n", This, pShader); /** * TODO: merge HAL shaders context switching from prototype

1 0

Hans Leidekker : advapi32: Add stub implementations for a bunch of documented Lsa APIs.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 93676b10c6dcffa7492416876f0bd705bebdfc31 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93676b10c6dcffa74924168… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Mar 11 11:54:54 2006 +0100 advapi32: Add stub implementations for a bunch of documented Lsa APIs. --- dlls/advapi32/advapi32.spec | 30 +++--- dlls/advapi32/lsa.c | 210 +++++++++++++++++++++++++++++++++++++++++++ include/ntsecapi.h | 76 ++++++++++++++++ 3 files changed, 302 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=93676b10c6dcffa7492…

1 0

Christoph Frick : dinput/joystick_linuxinput: Add POV detection and reporting.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 034a030d374674b14a95a606f5348eb22db2e456 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=034a030d374674b14a95a60… Author: Christoph Frick <rid(a)zefix.tv> Date: Fri Mar 10 09:58:14 2006 +0100 dinput/joystick_linuxinput: Add POV detection and reporting. Mapping of ABS_HAT[0-3][XY] to the four POV used by dinput. --- dlls/dinput/joystick_linuxinput.c | 75 +++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 5530c16..7de164d 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -67,6 +67,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); /* Wine joystick driver object instances */ #define WINE_JOYSTICK_AXIS_BASE 0 +#define WINE_JOYSTICK_POV_BASE 6 #define WINE_JOYSTICK_BUTTON_BASE 8 typedef struct EffectListItem EffectListItem; @@ -148,8 +149,9 @@ static GUID DInput_Wine_Joystick_GUID = static void fake_current_js_state(JoystickImpl *ji); static int find_property_offset(JoystickImpl *This, LPCDIPROPHEADER ph); +static DWORD map_pov(int event_value, int is_x); -#define test_bit(arr,bit) (((BYTE*)arr)[bit>>3]&(1<<(bit&7))) +#define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) static int joydev_have(BOOL require_ff) { @@ -618,6 +620,8 @@ map_axis(JoystickImpl* This, int axis, i */ static void fake_current_js_state(JoystickImpl *ji) { + int i; + /* center the axes */ ji->js.lX = map_axis(ji, ABS_X, ji->axes[ABS_X ][AXE_ABS]); ji->js.lY = map_axis(ji, ABS_Y, ji->axes[ABS_Y ][AXE_ABS]); ji->js.lZ = map_axis(ji, ABS_Z, ji->axes[ABS_Z ][AXE_ABS]); @@ -626,6 +630,35 @@ static void fake_current_js_state(Joysti ji->js.lRz = map_axis(ji, ABS_RZ, ji->axes[ABS_RZ][AXE_ABS]); ji->js.rglSlider[0] = map_axis(ji, ABS_THROTTLE, ji->axes[ABS_THROTTLE][AXE_ABS]); ji->js.rglSlider[1] = map_axis(ji, ABS_RUDDER, ji->axes[ABS_RUDDER ][AXE_ABS]); + /* POV center is -1 */ + for (i=0; i<4; i++) { + ji->js.rgdwPOV[i] = -1; + } +} + +/* + * Maps an event value to a DX "clock" position: + * 0 + * 27000 -1 9000 + * 18000 + */ +static DWORD map_pov(int event_value, int is_x) +{ + DWORD ret = -1; + if (is_x) { + if (event_value<0) { + ret = 27000; + } else if (event_value>0) { + ret = 9000; + } + } else { + if (event_value<0) { + ret = 0; + } else if (event_value>0) { + ret = 18000; + } + } + return ret; } static int find_property_offset(JoystickImpl *This, LPCDIPROPHEADER ph) @@ -717,6 +750,26 @@ static void joy_polldev(JoystickImpl *Th This->js.rglSlider[1] = map_axis(This,ABS_RUDDER,ie.value); GEN_EVENT(DIJOFS_SLIDER(1),This->js.rglSlider[1],ie.time.tv_usec,(This->dinput->evsequence)++); break; + case ABS_HAT0X: + case ABS_HAT0Y: + This->js.rgdwPOV[0] = map_pov(ie.value,ie.code==ABS_HAT0X); + GEN_EVENT(DIJOFS_POV(0),This->js.rgdwPOV[0],ie.time.tv_usec,(This->dinput->evsequence)++); + break; + case ABS_HAT1X: + case ABS_HAT1Y: + This->js.rgdwPOV[1] = map_pov(ie.value,ie.code==ABS_HAT1X); + GEN_EVENT(DIJOFS_POV(1),This->js.rgdwPOV[1],ie.time.tv_usec,(This->dinput->evsequence)++); + break; + case ABS_HAT2X: + case ABS_HAT2Y: + This->js.rgdwPOV[2] = map_pov(ie.value,ie.code==ABS_HAT2X); + GEN_EVENT(DIJOFS_POV(2),This->js.rgdwPOV[2],ie.time.tv_usec,(This->dinput->evsequence)++); + break; + case ABS_HAT3X: + case ABS_HAT3Y: + This->js.rgdwPOV[3] = map_pov(ie.value,ie.code==ABS_HAT3X); + GEN_EVENT(DIJOFS_POV(3),This->js.rgdwPOV[3],ie.time.tv_usec,(This->dinput->evsequence)++); + break; default: FIXME("unhandled joystick axe event (code %d, value %d)\n",ie.code,ie.value); break; @@ -1078,6 +1131,26 @@ static HRESULT WINAPI JoystickAImpl_Enum } if ((dwFlags == DIDFT_ALL) || + (dwFlags & DIDFT_POV)) { + int i; + ddoi.guidType = GUID_POV; + for (i=0; i<4; i++) { + if (test_bit(This->absbits,ABS_HAT0X+(i<<1)) && test_bit(This->absbits,ABS_HAT0Y+(i<<1))) { + ddoi.dwOfs = DIJOFS_POV(i); + ddoi.dwType = DIDFT_MAKEINSTANCE(i << WINE_JOYSTICK_POV_BASE) | DIDFT_POV; + sprintf(ddoi.tszName, "%d-POV", i); + _dump_OBJECTINSTANCEA(&ddoi); + if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) { + /* return to unaquired state if that's where we were */ + if (xfd == -1) + IDirectInputDevice8_Unacquire(iface); + return DI_OK; + } + } + } + } + + if ((dwFlags == DIDFT_ALL) || (dwFlags & DIDFT_BUTTON)) { int i, btncount=0;

1 0

Robert Shearman : ntdll: Very crude implementation of RtlQueueWorkItem.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: a18bdf13f7156ff96407a545170d74522171819f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a18bdf13f7156ff96407a54… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Mar 13 11:28:28 2006 +0000 ntdll: Very crude implementation of RtlQueueWorkItem. --- dlls/ntdll/Makefile.in | 1 dlls/ntdll/ntdll.spec | 2 - dlls/ntdll/threadpool.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 2 + 4 files changed, 111 insertions(+), 1 deletions(-) create mode 100644 dlls/ntdll/threadpool.c diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 73f2ef8..fa99da4 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -47,6 +47,7 @@ C_SRCS = \ tape.c \ version.c \ thread.c \ + threadpool.c \ time.c \ virtual.c \ wcstring.c diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8117197..7ccbbfd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -781,7 +781,7 @@ @ stub RtlQueryTagHeap @ stdcall RtlQueryTimeZoneInformation(ptr) @ stub RtlQueueApcWow64Thread -@ stub RtlQueueWorkItem +@ stdcall RtlQueueWorkItem(ptr ptr long) @ stdcall -register RtlRaiseException(ptr) @ stdcall RtlRaiseStatus(long) @ stdcall RtlRandom(ptr) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c new file mode 100644 index 0000000..10bda48 --- /dev/null +++ b/dlls/ntdll/threadpool.c @@ -0,0 +1,107 @@ +/* + * Thread pooling + * + * Copyright (c) 2006 Robert Shearman + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#define NONAMELESSUNION +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" + +#include "wine/debug.h" +#include "ntdll_misc.h" + +WINE_DEFAULT_DEBUG_CHANNEL(threadpool); + +struct work_item +{ + PRTL_WORK_ITEM_ROUTINE function; + PVOID context; +}; + +static void WINAPI worker_thread_proc(void * param) +{ + struct work_item *work_item_ptr = (struct work_item *)param; + struct work_item work_item; + + /* free the work item memory sooner to reduce memory usage */ + work_item = *work_item_ptr; + RtlFreeHeap(GetProcessHeap(), 0, work_item_ptr); + + TRACE("executing %p(%p)\n", work_item.function, work_item.context); + + /* do the work */ + work_item.function(work_item.context); + + RtlExitUserThread(0); + + /* never reached */ +} + +/*********************************************************************** + * RtlQueueWorkItem (NTDLL.@) + * + * Queues a work item into a thread in the thread pool. + * + * PARAMS + * Function [I] Work function to execute. + * Context [I] Context to pass to the work function when it is executed. + * Flags [I] Flags. See notes. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + * + * NOTES + * Flags can be one or more of the following: + *|WT_EXECUTEDEFAULT - Executes the work item in a non-I/O worker thread. + *|WT_EXECUTEINIOTHREAD - Executes the work item in an I/O worker thread. + *|WT_EXECUTEINPERSISTENTTHREAD - Executes the work item in a thread that is persistent. + *|WT_EXECUTELONGFUNCTION - Hints that the execution can take a long time. + *|WT_TRANSFER_IMPERSONATION - Executes the function with the current access token. + */ +NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE Function, PVOID Context, ULONG Flags) +{ + HANDLE thread; + NTSTATUS status; + struct work_item *work_item = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(struct work_item)); + + if (!work_item) + return STATUS_NO_MEMORY; + + work_item->function = Function; + work_item->context = Context; + + if (Flags != WT_EXECUTEDEFAULT) + FIXME("Flags 0x%lx not supported\n", Flags); + + /* FIXME: very crude implementation that doesn't support pooling at all */ + status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, + NULL, 0, 0, + worker_thread_proc, work_item, &thread, NULL ); + if (status != STATUS_SUCCESS) + { + RtlFreeHeap(GetProcessHeap(), 0, work_item); + return status; + } + NtClose( thread ); + + return STATUS_SUCCESS; +} diff --git a/include/winternl.h b/include/winternl.h index 6666294..e3548d4 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1429,6 +1429,7 @@ typedef struct _RTL_HANDLE_TABLE typedef void (CALLBACK *PNTAPCFUNC)(ULONG_PTR,ULONG_PTR,ULONG_PTR); /* FIXME: not the right name */ typedef void (CALLBACK *PRTL_THREAD_START_ROUTINE)(LPVOID); /* FIXME: not the right name */ +typedef DWORD (CALLBACK *PRTL_WORK_ITEM_ROUTINE)(LPVOID); /* FIXME: not the right name */ /* DbgPrintEx default levels */ @@ -2129,6 +2130,7 @@ NTSTATUS WINAPI RtlQueryInformationAcl( NTSTATUS WINAPI RtlQueryProcessDebugInformation(ULONG,ULONG,PDEBUG_BUFFER); NTSTATUS WINAPI RtlQueryRegistryValues(ULONG, PCWSTR, PRTL_QUERY_REGISTRY_TABLE, PVOID, PVOID); NTSTATUS WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION*); +NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE,PVOID,ULONG); void WINAPI RtlRaiseException(PEXCEPTION_RECORD); void WINAPI RtlRaiseStatus(NTSTATUS); ULONG WINAPI RtlRandom(PULONG);

1 0

Robert Shearman : kernel: Implement QueueUserWorkItem.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 44cb832ff3c3f789f0cda7476efda89897f1c201 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=44cb832ff3c3f789f0cda74… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Mar 13 11:29:04 2006 +0000 kernel: Implement QueueUserWorkItem. --- dlls/kernel/thread.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/thread.c b/dlls/kernel/thread.c index a695612..41a8ccf 100644 --- a/dlls/kernel/thread.c +++ b/dlls/kernel/thread.c @@ -506,8 +506,14 @@ DWORD WINAPI QueueUserAPC( PAPCFUNC func */ BOOL WINAPI QueueUserWorkItem( LPTHREAD_START_ROUTINE Function, PVOID Context, ULONG Flags ) { - FIXME("(%p,%p,0x%08lx): stub\n", Function, Context, Flags); - return FALSE; + NTSTATUS status; + + TRACE("(%p,%p,0x%08lx)\n", Function, Context, Flags); + + status = RtlQueueWorkItem( Function, Context, Flags ); + + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; } /**********************************************************************

1 0

Robert Shearman : wininet: Fix the conversion of NULL component values from InternetCreateUrlA.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 0252e5e875d6db0b774431c820029f98112e17a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0252e5e875d6db0b774431c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 11 18:11:25 2006 +0000 wininet: Fix the conversion of NULL component values from InternetCreateUrlA. --- dlls/wininet/internet.c | 7 +++++-- dlls/wininet/tests/http.c | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5e303ae..51db944 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1097,14 +1097,17 @@ static void ConvertUrlComponentValue(LPS LPWSTR lpwszComponent, DWORD dwwComponentLen, LPCSTR lpszStart, LPCWSTR lpwszStart) { - TRACE("%p %p %p %ld %p %p\n", lppszComponent, dwComponentLen, lpwszComponent, dwwComponentLen, lpszStart, lpwszStart); + TRACE("%p %ld %p %ld %p %p\n", lppszComponent, *dwComponentLen, lpwszComponent, dwwComponentLen, lpszStart, lpwszStart); if (*dwComponentLen != 0) { DWORD nASCIILength=WideCharToMultiByte(CP_ACP,0,lpwszComponent,dwwComponentLen,NULL,0,NULL,NULL); if (*lppszComponent == NULL) { int nASCIIOffset=WideCharToMultiByte(CP_ACP,0,lpwszStart,lpwszComponent-lpwszStart,NULL,0,NULL,NULL); - *lppszComponent = (LPSTR)lpszStart+nASCIIOffset; + if (lpwszComponent) + *lppszComponent = (LPSTR)lpszStart+nASCIIOffset; + else + *lppszComponent = NULL; *dwComponentLen = nASCIILength; } else diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 9c7e213..093fb74 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -610,11 +610,9 @@ static void InternetCrackUrl_test(void) ok(!strncmp(urlComponents.lpszHostName,TEST_URL_HOST,strlen(TEST_URL_HOST)),"lpszHostName should be %s but is %s\n", TEST_URL_HOST, urlComponents.lpszHostName); ok(urlComponents.nPort == INTERNET_DEFAULT_HTTP_PORT,"urlComponents->nPort should have been 80 instead of %d\n", urlComponents.nPort); ok(urlComponents.nScheme == INTERNET_SCHEME_HTTP,"urlComponents->nScheme should have been INTERNET_SCHEME_HTTP instead of %d\n", urlComponents.nScheme); - todo_wine { ok(!urlComponents.lpszUserName, ".lpszUserName should have been set to NULL\n"); ok(!urlComponents.lpszPassword, ".lpszPassword should have been set to NULL\n"); ok(!urlComponents.lpszExtraInfo, ".lpszExtraInfo should have been set to NULL\n"); - } ok(!urlComponents.dwUserNameLength,".dwUserNameLength should be 0, but is %ld\n", urlComponents.dwUserNameLength); ok(!urlComponents.dwPasswordLength,".dwPasswordLength should be 0, but is %ld\n", urlComponents.dwPasswordLength); ok(!urlComponents.dwExtraInfoLength,".dwExtraInfoLength should be 0, but is %ld\n", urlComponents.dwExtraInfoLength);

1 0

Robert Shearman : wininet: Host name isn't present when two slashes aren' t present in InternetCrackUrl.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: f18305b176b40bb9303aa2933855973b00e9270d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f18305b176b40bb9303aa29… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 11 18:10:57 2006 +0000 wininet: Host name isn't present when two slashes aren't present in InternetCrackUrl. The test for "about:" in InternetCrackUrlW should be more general so that only URLs without double slashes should also be assumed not to have a host name. Add another test for this case and remove an unreliable InternetCreateUrl test. --- dlls/wininet/internet.c | 31 ++++++++++--------------------- dlls/wininet/tests/http.c | 33 +++++++++++++++++++++++++-------- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index db6371b..5e303ae 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1345,7 +1345,6 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp if (bIsAbsolute) /* Parse <protocol>:[//<net_loc>] */ { LPCWSTR lpszNetLoc; - static const WCHAR wszAbout[]={'a','b','o','u','t',':',0}; /* Get scheme first. */ lpUC->nScheme = GetInternetSchemeW(lpszUrl, lpszcp - lpszUrl); @@ -1355,27 +1354,10 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp /* Eat ':' in protocol. */ lpszcp++; - /* if the scheme is "about", there is no host */ - if(strncmpW(wszAbout,lpszUrl, lpszcp - lpszUrl)==0) + /* double slash indicates the net_loc portion is present */ + if ((lpszcp[0] == '/') && (lpszcp[1] == '/')) { - SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0); - SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0); - SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0); - lpUC->nPort = 0; - } - else - { - /* Skip over slashes. */ - if (*lpszcp == '/') - { - lpszcp++; - if (*lpszcp == '/') - { - lpszcp++; - if (*lpszcp == '/') - lpszcp++; - } - } + lpszcp += 2; lpszNetLoc = strpbrkW(lpszcp, lpszSlash); if (lpszParam) @@ -1488,6 +1470,13 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp } } } + else + { + SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0); + SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0); + SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0); + lpUC->nPort = 0; + } } /* Here lpszcp points to: diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4b6a2ad..9c7e213 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -31,6 +31,7 @@ #include "wine/test.h" #define TEST_URL "http://www.winehq.org/site/about" +#define TEST_URL_HOST "www.winehq.org" #define TEST_URL_PATH "/site/about" #define TEST_URL2 "http://www.myserver.com/myscript.php?arg=1" #define TEST_URL2_SERVER "www.myserver.com" @@ -601,6 +602,23 @@ static void InternetCrackUrl_test(void) ok(urlComponents.nPort == INTERNET_DEFAULT_HTTP_PORT,"urlComponents->nPort should have been 80 instead of %d\n", urlComponents.nPort); ok(urlComponents.nScheme == INTERNET_SCHEME_HTTP,"urlComponents->nScheme should have been INTERNET_SCHEME_HTTP instead of %d\n", urlComponents.nScheme); + zero_compsA(&urlComponents, 1, 1, 1, 1, 1, 1); + ok(InternetCrackUrlA(TEST_URL, strlen(TEST_URL), 0, &urlComponents),"InternetCrackUrl failed with GLE 0x%lx\n",GetLastError()); + ok(urlComponents.dwUrlPathLength == strlen(TEST_URL_PATH),".dwUrlPathLength should be %d, but is %ld\n", strlen(TEST_URL_PATH), urlComponents.dwUrlPathLength); + ok(!strncmp(urlComponents.lpszUrlPath,TEST_URL_PATH,strlen(TEST_URL_PATH)),"lpszUrlPath should be %s but is %s\n", TEST_URL_PATH, urlComponents.lpszUrlPath); + ok(urlComponents.dwHostNameLength == strlen(TEST_URL_HOST),".dwHostNameLength should be %d, but is %ld\n", strlen(TEST_URL_HOST), urlComponents.dwHostNameLength); + ok(!strncmp(urlComponents.lpszHostName,TEST_URL_HOST,strlen(TEST_URL_HOST)),"lpszHostName should be %s but is %s\n", TEST_URL_HOST, urlComponents.lpszHostName); + ok(urlComponents.nPort == INTERNET_DEFAULT_HTTP_PORT,"urlComponents->nPort should have been 80 instead of %d\n", urlComponents.nPort); + ok(urlComponents.nScheme == INTERNET_SCHEME_HTTP,"urlComponents->nScheme should have been INTERNET_SCHEME_HTTP instead of %d\n", urlComponents.nScheme); + todo_wine { + ok(!urlComponents.lpszUserName, ".lpszUserName should have been set to NULL\n"); + ok(!urlComponents.lpszPassword, ".lpszPassword should have been set to NULL\n"); + ok(!urlComponents.lpszExtraInfo, ".lpszExtraInfo should have been set to NULL\n"); + } + ok(!urlComponents.dwUserNameLength,".dwUserNameLength should be 0, but is %ld\n", urlComponents.dwUserNameLength); + ok(!urlComponents.dwPasswordLength,".dwPasswordLength should be 0, but is %ld\n", urlComponents.dwPasswordLength); + ok(!urlComponents.dwExtraInfoLength,".dwExtraInfoLength should be 0, but is %ld\n", urlComponents.dwExtraInfoLength); + /*3. Check for %20 */ copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 1024); ok(InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents),"InternetCrackUrl failed with GLE 0x%lx\n",GetLastError()); @@ -651,6 +669,13 @@ static void InternetCrackUrl_test(void) ok(ret==0 && GLE==ERROR_INVALID_PARAMETER, "InternetCrackUrl returned %d with GLE=%ld (expected to return 0 and ERROR_INVALID_PARAMETER)\n", ret, GLE); + + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 1024); + ret = InternetCrackUrl("about://host/blank", 0,0,&urlComponents); + ok(ret, "InternetCrackUrl failed with %ld\n", GetLastError()); + ok(!strcmp(urlComponents.lpszScheme, "about"), "lpszScheme was \"%s\" instead of \"about\"\n", urlComponents.lpszScheme); + ok(!strcmp(urlComponents.lpszHostName, "host"), "lpszHostName was \"%s\" instead of \"host\"\n", urlComponents.lpszHostName); + ok(!strcmp(urlComponents.lpszUrlPath, "/blank"), "lpszUrlPath was \"%s\" instead of \"/blank\"\n", urlComponents.lpszUrlPath); } static void InternetCrackUrlW_test(void) @@ -860,14 +885,6 @@ static void InternetCreateUrlA_test(void "Expected 0xdeadbeef, got %ld\n", GetLastError()); ok(len == -1, "Expected len -1, got %ld\n", len); - /* test garbage lpUrlComponets */ - ret = InternetCreateUrlA(&urlComp, 0, NULL, &len); - SetLastError(0xdeadbeef); - ok(!ret, "Expected failure\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %ld\n", GetLastError()); - ok(len == -1, "Expected len -1, got %ld\n", len); - /* test zero'ed lpUrlComponents */ ZeroMemory(&urlComp, sizeof(URL_COMPONENTS)); SetLastError(0xdeadbeef);

1 0

Robert Shearman : wininet: InternetCrackUrl should set nPort to the default port if not specified.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: ae677d356c1771bf334f608cf00a1a9dda14445d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae677d356c1771bf334f608… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 11 18:09:21 2006 +0000 wininet: InternetCrackUrl should set nPort to the default port if not specified. --- dlls/wininet/internet.c | 19 +++++++++++++++++-- dlls/wininet/tests/http.c | 2 ++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 503c271..db6371b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1467,8 +1467,23 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp lpszHost, lpszPort - lpszHost); if (lpszPort != lpszNetLoc) lpUC->nPort = atoiW(++lpszPort); - else - lpUC->nPort = 0; + else switch (lpUC->nScheme) + { + case INTERNET_SCHEME_HTTP: + lpUC->nPort = INTERNET_DEFAULT_HTTP_PORT; + break; + case INTERNET_SCHEME_HTTPS: + lpUC->nPort = INTERNET_DEFAULT_HTTPS_PORT; + break; + case INTERNET_SCHEME_FTP: + lpUC->nPort = INTERNET_DEFAULT_FTP_PORT; + break; + case INTERNET_SCHEME_GOPHER: + lpUC->nPort = INTERNET_DEFAULT_GOPHER_PORT; + break; + default: + lpUC->nPort = INTERNET_INVALID_PORT_NUMBER; + } } } } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3f512cf..4b6a2ad 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -598,6 +598,8 @@ static void InternetCrackUrl_test(void) ok(!strncmp(urlComponents.lpszUrlPath,TEST_URL2_PATHEXTRA,strlen(TEST_URL2_PATHEXTRA)),"lpszUrlPath should be %s but is %s\n", TEST_URL2_PATHEXTRA, urlComponents.lpszUrlPath); ok(urlComponents.dwHostNameLength == strlen(TEST_URL2_SERVER),".dwHostNameLength should be %ld, but is %ld\n", (DWORD)strlen(TEST_URL2_SERVER), urlComponents.dwHostNameLength); ok(!strncmp(urlComponents.lpszHostName,TEST_URL2_SERVER,strlen(TEST_URL2_SERVER)),"lpszHostName should be %s but is %s\n", TEST_URL2_SERVER, urlComponents.lpszHostName); + ok(urlComponents.nPort == INTERNET_DEFAULT_HTTP_PORT,"urlComponents->nPort should have been 80 instead of %d\n", urlComponents.nPort); + ok(urlComponents.nScheme == INTERNET_SCHEME_HTTP,"urlComponents->nScheme should have been INTERNET_SCHEME_HTTP instead of %d\n", urlComponents.nScheme); /*3. Check for %20 */ copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 1024);

1 0

Stefan Dösinger : wined3d: Add WINED3DVERTEXBUFFER_DESC to wined3d_types.h.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 9f46792ba297f64ce72fc5d0ef11a52b1e045efa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f46792ba297f64ce72fc5d… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Mar 11 00:15:38 2006 +0100 wined3d: Add WINED3DVERTEXBUFFER_DESC to wined3d_types.h. --- dlls/d3d8/vertexbuffer.c | 2 +- dlls/d3d9/vertexbuffer.c | 2 +- dlls/wined3d/vertexbuffer.c | 2 +- include/wine/wined3d_interface.h | 2 +- include/wine/wined3d_types.h | 9 +++++++++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index 375a550..5ca8318 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -140,7 +140,7 @@ HRESULT WINAPI IDirect3DVertexBuffer8Imp IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, pDesc); + return IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, (WINED3DVERTEXBUFFER_DESC *) pDesc); } const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl = diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index d10ab3d..9c46783 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -129,7 +129,7 @@ HRESULT WINAPI IDirect3DVertexBuffer9Imp HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDesc(LPDIRECT3DVERTEXBUFFER9 iface, D3DVERTEXBUFFER_DESC* pDesc) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, pDesc); + return IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, (WINED3DVERTEXBUFFER_DESC *) pDesc); } const IDirect3DVertexBuffer9Vtbl Direct3DVertexBuffer9_Vtbl = diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 2a6719c..607338a 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -116,7 +116,7 @@ HRESULT WINAPI IWineD3DVertexBuf TRACE("(%p) : stub\n", This); return D3D_OK; } -HRESULT WINAPI IWineD3DVertexBufferImpl_GetDesc(IWineD3DVertexBuffer *iface, D3DVERTEXBUFFER_DESC *pDesc) { +HRESULT WINAPI IWineD3DVertexBufferImpl_GetDesc(IWineD3DVertexBuffer *iface, WINED3DVERTEXBUFFER_DESC *pDesc) { IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; TRACE("(%p)\n", This); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index d15dfce..7739225 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -634,7 +634,7 @@ DECLARE_INTERFACE_(IWineD3DVertexBuffer, /*** IWineD3DVertexBuffer methods ***/ STDMETHOD(Lock)(THIS_ UINT OffsetToLock, UINT SizeToLock, BYTE ** ppbData, DWORD Flags) PURE; STDMETHOD(Unlock)(THIS) PURE; - STDMETHOD(GetDesc)(THIS_ D3DVERTEXBUFFER_DESC * pDesc) PURE; + STDMETHOD(GetDesc)(THIS_ WINED3DVERTEXBUFFER_DESC * pDesc) PURE; }; #undef INTERFACE diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index a764a0d..6b8a558 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -601,6 +601,15 @@ typedef struct WINED3DDEVINFO_VCACHE { DWORD MagicNumber; } WINED3DDEVINFO_VCACHE; +typedef struct _WINED3DVERTEXBUFFER_DESC { + WINED3DFORMAT Format; + WINED3DRESOURCETYPE Type; + DWORD Usage; + D3DPOOL Pool; + UINT Size; + DWORD FVF; +} WINED3DVERTEXBUFFER_DESC; + /* * The wined3dcaps structure */

1 0

Vitaliy Margolen : wined3d: Don' t override variable that still has something we need.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: d2ef7869de08c8ec48971bb3f207a5ab5fb407ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d2ef7869de08c8ec48971bb… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Mar 12 13:45:47 2006 -0700 wined3d: Don't override variable that still has something we need. Use local temp variable instead. --- dlls/wined3d/pixelshader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 115795f..1b24f3d 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1417,8 +1417,8 @@ inline static VOID IWineD3DPixelShaderIm /* Generate lines that handle input modifier computation */ for (i = 1; i < curOpcode->num_params; ++i) { TRACE("(%p) : Param %ld token %lx\n", This, i, *(pToken + i)); - if (gen_input_modifier_line(*(pToken + i), i - 1, regs[i - 1], tmpLine, This->constants)) { - addline(&lineNum, pgmStr, &pgmLength, tmpLine); + if (gen_input_modifier_line(*(pToken + i), i - 1, regs[i - 1], tmpOp, This->constants)) { + addline(&lineNum, pgmStr, &pgmLength, tmpOp); } }

1 0

Vitaliy Margolen : wined3d: Add D3DSIO_TEXM3x3PAD to opcode list. We already handle it where we should.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 76e5e88fe7fe5ac4d476bbc525afcf84c4e4abda URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=76e5e88fe7fe5ac4d476bbc… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Mar 12 20:19:25 2006 -0700 wined3d: Add D3DSIO_TEXM3x3PAD to opcode list. We already handle it where we should. --- dlls/wined3d/pixelshader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index f534171..115795f 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -721,6 +721,7 @@ static CONST SHADER_OPCODE pshader_ins [ {D3DSIO_TEXREG2GB,"texreg2gb","undefined", 2, pshader_texreg2gb, D3DPS_VERSION(1,2), D3DPS_VERSION(1,3)}, {D3DSIO_TEXM3x2PAD, "texm3x2pad", "undefined", 2, pshader_texm3x2pad, D3DPS_VERSION(1,0), D3DPS_VERSION(1,3)}, {D3DSIO_TEXM3x2TEX, "texm3x2tex", "undefined", 2, pshader_texm3x2tex, D3DPS_VERSION(1,0), D3DPS_VERSION(1,3)}, + {D3DSIO_TEXM3x3PAD, "texm3x3pad", "undefined", 2, pshader_texm3x3pad, D3DPS_VERSION(1,0), D3DPS_VERSION(1,3)}, {D3DSIO_TEXM3x3DIFF, "texm3x3diff", GLNAME_REQUIRE_GLSL, 2, pshader_texm3x3diff, D3DPS_VERSION(0,0), D3DPS_VERSION(0,0)}, {D3DSIO_TEXM3x3SPEC, "texm3x3spec", "undefined", 3, pshader_texm3x3spec, D3DPS_VERSION(1,0), D3DPS_VERSION(1,3)}, {D3DSIO_TEXM3x3VSPEC, "texm3x3vspe", "undefined", 2, pshader_texm3x3vspec, D3DPS_VERSION(1,0), D3DPS_VERSION(1,3)},

1 0

Paul Vriens : wine.inf: Add RegisteredOwner and Org also to WindowsNT branch.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: b25474ffd66a3a75acbc2bd1fa5151be98e6d281 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b25474ffd66a3a75acbc2bd… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Sun Mar 12 14:00:50 2006 +0100 wine.inf: Add RegisteredOwner and Org also to WindowsNT branch. --- tools/wine.inf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index a86ab58..014fb00 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -146,6 +146,8 @@ HKLM,%CurrentVersion%\Controls Folder\Po HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"LastID",,"5" HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" +HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"Change preferred organization in ~/.wine/system.reg" +HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"Change preferred owner in ~/.wine/system.reg" HKLM,Software\Microsoft\Windows NT\CurrentVersion\Fonts,,,"" HKLM,Software\Microsoft\Windows NT\CurrentVersion\Hotfix\Q246009,"Installed",,"1"

1 0

Mike McCormack : avifil32: Use HeapAlloc instead of LocalAlloc.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 9d5b2ea5a2d328a87350e46f9caeb039d5f6b84b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d5b2ea5a2d328a87350e46… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 14:43:06 2006 +0900 avifil32: Use HeapAlloc instead of LocalAlloc. --- dlls/avifil32/avifile.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index d407445..c6f4827 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -240,7 +240,7 @@ HRESULT AVIFILE_CreateAVIFile(REFIID rii *ppv = NULL; - pfile = (IAVIFileImpl*)LocalAlloc(LPTR, sizeof(IAVIFileImpl)); + pfile = HeapAlloc(GetProcessHeap(), 0, sizeof(IAVIFileImpl)); if (pfile == NULL) return AVIERR_MEMORY; @@ -251,7 +251,7 @@ HRESULT AVIFILE_CreateAVIFile(REFIID rii hr = IAVIFile_QueryInterface((IAVIFile*)pfile, riid, ppv); if (FAILED(hr)) - LocalFree((HLOCAL)pfile); + HeapFree(GetProcessHeap(), 0, pfile); return hr; } @@ -310,7 +310,7 @@ static ULONG WINAPI IAVIFile_fnRelease(I This->ppStreams[i]->ref, i, This->ppStreams[i]); } AVIFILE_DestructAVIStream(This->ppStreams[i]); - LocalFree((HLOCAL)This->ppStreams[i]); + HeapFree(GetProcessHeap(), 0, This->ppStreams[i]); This->ppStreams[i] = NULL; } } @@ -328,7 +328,7 @@ static ULONG WINAPI IAVIFile_fnRelease(I } if (This->szFileName != NULL) { - LocalFree((HLOCAL)This->szFileName); + HeapFree(GetProcessHeap(), 0, This->szFileName); This->szFileName = NULL; } if (This->hmmio != NULL) { @@ -336,7 +336,7 @@ static ULONG WINAPI IAVIFile_fnRelease(I This->hmmio = NULL; } - LocalFree((HLOCAL)This); + HeapFree(GetProcessHeap(), 0, This); } return ref; } @@ -422,7 +422,7 @@ static HRESULT WINAPI IAVIFile_fnCreateS /* now it seems to be save to add the stream */ assert(This->ppStreams[n] == NULL); - This->ppStreams[n] = (IAVIStreamImpl*)LocalAlloc(LPTR, + This->ppStreams[n] = HeapAlloc(GetProcessHeap(), 0, sizeof(IAVIStreamImpl)); if (This->ppStreams[n] == NULL) return AVIERR_MEMORY; @@ -539,7 +539,7 @@ static HRESULT WINAPI IAVIFile_fnDeleteS if (nStream < This->fInfo.dwStreams && This->ppStreams[nStream] != NULL) { /* ... so delete it now */ - LocalFree((HLOCAL)This->ppStreams[nStream]); + HeapFree(GetProcessHeap(), 0, This->ppStreams[nStream]); if (This->fInfo.dwStreams - nStream > 0) memcpy(This->ppStreams + nStream, This->ppStreams + nStream + 1, @@ -630,7 +630,7 @@ static HRESULT WINAPI IPersistFile_fnLoa This->paf->uMode = dwMode; len = lstrlenW(pszFileName) + 1; - This->paf->szFileName = (LPWSTR)LocalAlloc(LPTR, len * sizeof(WCHAR)); + This->paf->szFileName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (This->paf->szFileName == NULL) return AVIERR_MEMORY; lstrcpyW(This->paf->szFileName, pszFileName); @@ -644,7 +644,7 @@ static HRESULT WINAPI IPersistFile_fnLoa len = WideCharToMultiByte(CP_ACP, 0, This->paf->szFileName, -1, NULL, 0, NULL, NULL); - szFileName = LocalAlloc(LPTR, len * sizeof(CHAR)); + szFileName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(CHAR)); if (szFileName == NULL) return AVIERR_MEMORY; @@ -652,7 +652,7 @@ static HRESULT WINAPI IPersistFile_fnLoa len, NULL, NULL); This->paf->hmmio = mmioOpenA(szFileName, NULL, MMIO_ALLOCBUF | dwMode); - LocalFree((HLOCAL)szFileName); + HeapFree(GetProcessHeap(), 0, szFileName); if (This->paf->hmmio == NULL) return AVIERR_FILEOPEN; } @@ -1676,7 +1676,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFile if (ckLIST2.ckid == FOURCC_LIST && ckLIST2.fccType == listtypeSTREAMHEADER) { pStream = This->ppStreams[nStream] = - (IAVIStreamImpl*)LocalAlloc(LPTR, sizeof(IAVIStreamImpl)); + HeapAlloc(GetProcessHeap(), 0, sizeof(IAVIStreamImpl)); if (pStream == NULL) return AVIERR_MEMORY; AVIFILE_ConstructAVIStream(This, nStream, NULL); @@ -1797,20 +1797,20 @@ static HRESULT AVIFILE_LoadFile(IAVIFile break; case ckidSTREAMNAME: { /* streamname will be saved as ASCII string */ - LPSTR str = (LPSTR)LocalAlloc(LMEM_FIXED, ck.cksize); + LPSTR str = HeapAlloc(GetProcessHeap(), 0, ck.cksize); if (str == NULL) return AVIERR_MEMORY; if (mmioRead(This->hmmio, (HPSTR)str, ck.cksize) != ck.cksize) { - LocalFree((HLOCAL)str); + HeapFree(GetProcessHeap(), 0, str); return AVIERR_FILEREAD; } MultiByteToWideChar(CP_ACP, 0, str, -1, pStream->sInfo.szName, sizeof(pStream->sInfo.szName)/sizeof(pStream->sInfo.szName[0])); - LocalFree((HLOCAL)str); + HeapFree(GetProcessHeap(), 0, str); } break; case ckidAVIPADDING: @@ -2250,18 +2250,18 @@ static HRESULT AVIFILE_SaveFile(IAVIFile return AVIERR_FILEWRITE; /* the streamname must be saved in ASCII not Unicode */ - str = (LPSTR)LocalAlloc(LPTR, ck.cksize); + str = HeapAlloc(GetProcessHeap(), 0, ck.cksize); if (str == NULL) return AVIERR_MEMORY; WideCharToMultiByte(CP_ACP, 0, pStream->sInfo.szName, -1, str, ck.cksize, NULL, NULL); if (mmioWrite(This->hmmio, (HPSTR)str, ck.cksize) != ck.cksize) { - LocalFree((HLOCAL)str); + HeapFree(GetProcessHeap(), 0, str); return AVIERR_FILEWRITE; } - LocalFree((HLOCAL)str); + HeapFree(GetProcessHeap(), 0, str); if (mmioAscend(This->hmmio, &ck, 0) != S_OK) return AVIERR_FILEWRITE; }

1 0

Mike McCormack : avifil32: Use HeapAlloc instead of Global/LocalAlloc.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: dfb5aaf31a26f82200f19dd7ba97805d27f5eee7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dfb5aaf31a26f82200f19dd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 14:42:50 2006 +0900 avifil32: Use HeapAlloc instead of Global/LocalAlloc. --- dlls/avifil32/editstream.c | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 29f6a4d..858ddb7 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -187,7 +187,7 @@ PAVIEDITSTREAM AVIFILE_CreateEditStream( { IAVIEditStreamImpl *pedit = NULL; - pedit = (IAVIEditStreamImpl*)LocalAlloc(LPTR,sizeof(IAVIEditStreamImpl)); + pedit = HeapAlloc(GetProcessHeap(), 0, sizeof(IAVIEditStreamImpl)); if (pedit == NULL) return NULL; @@ -329,11 +329,11 @@ static BOOL AVIFILE_FormatsEqual(PAVISTR return FALSE; /* sizes match, now get formats and compare them */ - fmt1 = GlobalLock(GlobalAlloc(GHND, size1)); + fmt1 = HeapAlloc(GetProcessHeap(), 0, size1); if (fmt1 == NULL) return FALSE; if (SUCCEEDED(AVIStreamReadFormat(avi1, start1, fmt1, &size1))) { - fmt2 = GlobalLock(GlobalAlloc(GHND, size1)); + fmt2 = HeapAlloc(GetProcessHeap(), 0, size1); if (fmt2 != NULL) { if (SUCCEEDED(AVIStreamReadFormat(avi2, start2, fmt2, &size1))) status = (memcmp(fmt1, fmt2, size1) == 0); @@ -341,12 +341,8 @@ static BOOL AVIFILE_FormatsEqual(PAVISTR } if (fmt2 != NULL) - { - GlobalUnlock(GlobalHandle(fmt2)); - GlobalFree(GlobalHandle(fmt2)); - } - GlobalUnlock(GlobalHandle(fmt1)); - GlobalFree(GlobalHandle(fmt1)); + HeapFree(GetProcessHeap(), 0, fmt2); + HeapFree(GetProcessHeap(), 0, fmt1); return status; } @@ -407,11 +403,10 @@ static ULONG WINAPI IAVIEditStream_fnR if (This->pStreams[i].pStream != NULL) IAVIStream_Release(This->pStreams[i].pStream); } - GlobalUnlock(GlobalHandle(This->pStreams)); - GlobalFree(GlobalHandle(This->pStreams)); + HeapFree(GetProcessHeap(), 0, This->pStreams); } - LocalFree((HLOCAL)This); + HeapFree(GetProcessHeap(), 0, This); return 0; } return ref; @@ -474,8 +469,8 @@ static HRESULT WINAPI IAVIEditStream_fnC } else { /* splitting */ if (This->nStreams + 1 >= This->nTableSize) { - GlobalUnlock(GlobalHandle(This->pStreams)); - This->pStreams = GlobalLock(GlobalReAlloc(GlobalHandle(This->pStreams), (This->nTableSize + 32) * sizeof(EditStreamTable), GMEM_SHARE|GHND)); + This->pStreams = HeapReAlloc(GetProcessHeap(), 0, This->pStreams, + (This->nTableSize + 32) * sizeof(EditStreamTable)); if (This->pStreams == NULL) return AVIERR_MEMORY; This->nTableSize += 32; @@ -666,8 +661,7 @@ static HRESULT WINAPI IAVIEditStream_fnP if (This->nStreams + nStreams + 1 > This->nTableSize) { n = This->nStreams + nStreams + 33; - GlobalUnlock(GlobalHandle(This->pStreams)); - This->pStreams = GlobalLock(GlobalReAlloc(GlobalHandle(This->pStreams), n * sizeof(EditStreamTable), GMEM_SHARE|GHND)); + This->pStreams = HeapReAlloc(GetProcessHeap(), 0, This->pStreams, n * sizeof(EditStreamTable)); if (This->pStreams == NULL) return AVIERR_MEMORY; This->nTableSize = n; @@ -756,8 +750,8 @@ static HRESULT WINAPI IAVIEditStream_fnC if (pEdit == NULL) return AVIERR_MEMORY; if (This->nStreams > pEdit->nTableSize) { - GlobalUnlock(GlobalHandle(pEdit->pStreams)); - pEdit->pStreams = GlobalLock(GlobalReAlloc(GlobalHandle(pEdit->pStreams), This->nStreams * sizeof(EditStreamTable), GMEM_SHARE|GHND)); + pEdit->pStreams = HeapReAlloc(GetProcessHeap(), 0, pEdit->pStreams, + This->nStreams * sizeof(EditStreamTable)); if (pEdit->pStreams == NULL) return AVIERR_MEMORY; pEdit->nTableSize = This->nStreams; @@ -845,8 +839,7 @@ static HRESULT WINAPI IEditAVIStream_fnC return AVIERR_ERROR; if (This->pStreams == NULL) { - This->pStreams = - GlobalLock(GlobalAlloc(GMEM_SHARE|GHND, 256 * sizeof(EditStreamTable))); + This->pStreams = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(EditStreamTable)); if (This->pStreams == NULL) return AVIERR_MEMORY; This->nTableSize = 256;

1 0

Mike McCormack : avifil32: Use HeapAlloc instead of Local Alloc.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 15c5dc12e8ff838a7391b9268c6e091593ac0163 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15c5dc12e8ff838a7391b92… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 14:42:01 2006 +0900 avifil32: Use HeapAlloc instead of Local Alloc. --- dlls/avifil32/extrachunk.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/avifil32/extrachunk.c b/dlls/avifil32/extrachunk.c index d66fd30..35197ae 100644 --- a/dlls/avifil32/extrachunk.c +++ b/dlls/avifil32/extrachunk.c @@ -23,7 +23,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "windowsx.h" #include "vfw.h" #include "wine/debug.h" @@ -81,9 +80,9 @@ HRESULT WriteExtraChunk(LPEXTRACHUNKS ex assert(size > 0); if (extra->lp) - lp = (LPDWORD)GlobalReAllocPtr(extra->lp, extra->cb + size + 2 * sizeof(DWORD), GHND); + lp = HeapReAlloc(GetProcessHeap(), 0, extra->lp, extra->cb + size + 2 * sizeof(DWORD)); else - lp = (LPDWORD)GlobalAllocPtr(GHND, size + 2 * sizeof(DWORD)); + lp = HeapAlloc(GetProcessHeap(), 0, size + 2 * sizeof(DWORD)); if (lp == NULL) return AVIERR_MEMORY; @@ -116,10 +115,10 @@ HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS cb = lpck->cksize + 2 * sizeof(DWORD); cb += (cb & 1); - if (extra->lp != NULL) { - lp = (LPDWORD)GlobalReAllocPtr(extra->lp, extra->cb + cb, GHND); - } else - lp = (LPDWORD)GlobalAllocPtr(GHND, cb); + if (extra->lp != NULL) + lp = HeapReAlloc(GetProcessHeap(), 0, extra->lp, extra->cb + cb); + else + lp = HeapAlloc(GetProcessHeap(), 0, cb); if (lp == NULL) return AVIERR_MEMORY;

1 0

Mike McCormack : avifil32: Use HeapAlloc instead of GlobalAlloc/LocalAlloc.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 4fa92f65e7ee498d687cacdb4ed06fb4c53dc53d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4fa92f65e7ee498d687cacd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 14:42:14 2006 +0900 avifil32: Use HeapAlloc instead of GlobalAlloc/LocalAlloc. --- dlls/avifil32/acmstream.c | 48 ++++++++++++++++----------------------------- 1 files changed, 17 insertions(+), 31 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 6ffe416..96d49b0 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -115,7 +115,7 @@ HRESULT AVIFILE_CreateACMStream(REFIID r *ppv = NULL; - pstream = (IAVIStreamImpl*)LocalAlloc(LPTR, sizeof(IAVIStreamImpl)); + pstream = HeapAlloc(GetProcessHeap(), 0, sizeof(IAVIStreamImpl)); if (pstream == NULL) return AVIERR_MEMORY; @@ -123,7 +123,7 @@ HRESULT AVIFILE_CreateACMStream(REFIID r hr = IAVIStream_QueryInterface((IAVIStream*)pstream, riid, ppv); if (FAILED(hr)) - LocalFree((HLOCAL)pstream); + HeapFree(GetProcessHeap(), 0, pstream); return hr; } @@ -176,24 +176,20 @@ static ULONG WINAPI ACMStream_fnRelease( This->has = NULL; } if (This->acmStreamHdr.pbSrc != NULL) { - GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbSrc)); - GlobalFree(GlobalHandle(This->acmStreamHdr.pbSrc)); + HeapFree(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc); This->acmStreamHdr.pbSrc = NULL; } if (This->acmStreamHdr.pbDst != NULL) { - GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbDst)); - GlobalFree(GlobalHandle(This->acmStreamHdr.pbDst)); + HeapFree(GetProcessHeap(), 0, This->acmStreamHdr.pbDst); This->acmStreamHdr.pbDst = NULL; } if (This->lpInFormat != NULL) { - GlobalUnlock(GlobalHandle(This->lpInFormat)); - GlobalFree(GlobalHandle(This->lpInFormat)); + HeapFree(GetProcessHeap(), 0, This->lpInFormat); This->lpInFormat = NULL; This->cbInFormat = 0; } if (This->lpOutFormat != NULL) { - GlobalUnlock(GlobalHandle(This->lpOutFormat)); - GlobalFree(GlobalHandle(This->lpOutFormat)); + HeapFree(GetProcessHeap(), 0, This->lpOutFormat); This->lpOutFormat = NULL; This->cbOutFormat = 0; } @@ -201,7 +197,7 @@ static ULONG WINAPI ACMStream_fnRelease( IAVIStream_Release(This->pStream); This->pStream = NULL; } - LocalFree((HLOCAL)This); + HeapFree(GetProcessHeap(), 0, This); return 0; } @@ -253,7 +249,7 @@ static HRESULT WINAPI ACMStream_fnCreate else This->cbOutFormat = sizeof(PCMWAVEFORMAT); - This->lpOutFormat = GlobalLock(GlobalAlloc(GHND, This->cbOutFormat)); + This->lpOutFormat = HeapAlloc(GetProcessHeap(), 0, This->cbOutFormat); if (This->lpOutFormat == NULL) return AVIERR_MEMORY; @@ -386,7 +382,7 @@ static HRESULT WINAPI ACMStream_fnSetFor if ((This->sInfo.dwCaps & AVIFILECAPS_CANWRITE) == 0) return AVIERR_READONLY; - This->lpInFormat = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, formatsize)); + This->lpInFormat = HeapAlloc(GetProcessHeap(), 0, formatsize); if (This->lpInFormat == NULL) return AVIERR_MEMORY; This->cbInFormat = formatsize; @@ -466,8 +462,7 @@ static HRESULT WINAPI ACMStream_fnRead(I /* Need to free destination buffer used for writing? */ if (This->acmStreamHdr.pbDst != NULL) { - GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbDst)); - GlobalFree(GlobalHandle(This->acmStreamHdr.pbDst)); + HeapFree(GetProcessHeap(), 0, This->acmStreamHdr.pbDst); This->acmStreamHdr.pbDst = NULL; This->acmStreamHdr.dwDstUser = 0; } @@ -476,13 +471,9 @@ static HRESULT WINAPI ACMStream_fnRead(I if (This->acmStreamHdr.pbSrc == NULL || This->acmStreamHdr.dwSrcUser < size) { if (This->acmStreamHdr.pbSrc == NULL) - This->acmStreamHdr.pbSrc = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, size)); + This->acmStreamHdr.pbSrc = HeapAlloc(GetProcessHeap(), 0, size); else - { - GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbSrc)); - This->acmStreamHdr.pbDst = GlobalReAlloc(GlobalHandle(This->acmStreamHdr.pbSrc), - size, GMEM_MOVEABLE); - } + This->acmStreamHdr.pbDst = HeapReAlloc(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc, size); if (This->acmStreamHdr.pbSrc == NULL) return AVIERR_MEMORY; This->acmStreamHdr.dwSrcUser = size; @@ -574,8 +565,7 @@ static HRESULT WINAPI ACMStream_fnWrite( /* Need to free source buffer used for reading? */ if (This->acmStreamHdr.pbSrc != NULL) { - GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbSrc)); - GlobalFree(GlobalHandle(This->acmStreamHdr.pbSrc)); + HeapFree(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc); This->acmStreamHdr.pbSrc = NULL; This->acmStreamHdr.dwSrcUser = 0; } @@ -584,13 +574,9 @@ static HRESULT WINAPI ACMStream_fnWrite( if (This->acmStreamHdr.pbDst == NULL || This->acmStreamHdr.dwDstUser < size) { if (This->acmStreamHdr.pbDst == NULL) - This->acmStreamHdr.pbDst = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, size)); + This->acmStreamHdr.pbDst = HeapAlloc(GetProcessHeap(), 0, size); else - { - GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbDst)); - This->acmStreamHdr.pbDst = GlobalReAlloc(GlobalHandle(This->acmStreamHdr.pbDst), - size, GMEM_MOVEABLE); - } + This->acmStreamHdr.pbDst = HeapReAlloc(GetProcessHeap(), 0, This->acmStreamHdr.pbDst, size); if (This->acmStreamHdr.pbDst == NULL) return AVIERR_MEMORY; This->acmStreamHdr.dwDstUser = size; @@ -714,7 +700,7 @@ static HRESULT AVIFILE_OpenCompressor(IA hr = AVIStreamFormatSize(This->pStream, This->sInfo.dwStart, &This->cbInFormat); if (FAILED(hr)) return hr; - This->lpInFormat = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, This->cbInFormat)); + This->lpInFormat = HeapAlloc(GetProcessHeap(), 0, This->cbInFormat); if (This->lpInFormat == NULL) return AVIERR_MEMORY; @@ -726,7 +712,7 @@ static HRESULT AVIFILE_OpenCompressor(IA if (This->lpOutFormat == NULL) { /* we must decode to default format */ This->cbOutFormat = sizeof(PCMWAVEFORMAT); - This->lpOutFormat = GlobalLock(GlobalAlloc(GHND, This->cbOutFormat)); + This->lpOutFormat = HeapAlloc(GetProcessHeap(), 0, This->cbOutFormat); if (This->lpOutFormat == NULL) return AVIERR_MEMORY;

1 0

Mike McCormack : avifil32: Use HeapAlloc/Free instead of LocalAlloc/Free.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: a4b816c7529a15b906f5d192120da67742a80a6c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a4b816c7529a15b906f5d19… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 14:41:16 2006 +0900 avifil32: Use HeapAlloc/Free instead of LocalAlloc/Free. --- dlls/avifil32/tmpfile.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index 5968103..95f691f 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -26,7 +26,6 @@ #include "winuser.h" #include "winnls.h" #include "winerror.h" -#include "windowsx.h" #include "mmsystem.h" #include "vfw.h" @@ -77,7 +76,7 @@ PAVIFILE AVIFILE_CreateAVITempFile(int n ITmpFileImpl *tmpFile; int i; - tmpFile = LocalAlloc(LPTR, sizeof(ITmpFileImpl)); + tmpFile = HeapAlloc(GetProcessHeap(), 0, sizeof(ITmpFileImpl)); if (tmpFile == NULL) return NULL; @@ -86,9 +85,9 @@ PAVIFILE AVIFILE_CreateAVITempFile(int n memset(&tmpFile->fInfo, 0, sizeof(tmpFile->fInfo)); tmpFile->fInfo.dwStreams = nStreams; - tmpFile->ppStreams = LocalAlloc(LPTR, nStreams * sizeof(PAVISTREAM)); + tmpFile->ppStreams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(PAVISTREAM)); if (tmpFile->ppStreams == NULL) { - LocalFree((HLOCAL)tmpFile); + HeapFree(GetProcessHeap(), 0, tmpFile); return NULL; } @@ -177,7 +176,7 @@ static ULONG WINAPI ITmpFile_fnRelease } } - LocalFree((HLOCAL)This); + HeapFree(GetProcessHeap(), 0, This); return 0; }

1 0

Mike McCormack : avifil32: Use HeapAlloc instead of LocalAlloc. Make sure to free the memory.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 8ed1ca3e4b6e1eeaa4419992843ad7f481b1c0cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ed1ca3e4b6e1eeaa441999… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 14:41:37 2006 +0900 avifil32: Use HeapAlloc instead of LocalAlloc. Make sure to free the memory. --- dlls/avifil32/factory.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index b1f95ab..c1fb3b3 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -75,7 +75,7 @@ static HRESULT AVIFILE_CreateClassFactor *ppv = NULL; - pClassFactory = (IClassFactoryImpl*)LocalAlloc(LPTR, sizeof(*pClassFactory)); + pClassFactory = HeapAlloc(GetProcessHeap(), 0, sizeof(*pClassFactory)); if (pClassFactory == NULL) return E_OUTOFMEMORY; @@ -85,7 +85,7 @@ static HRESULT AVIFILE_CreateClassFactor hr = IClassFactory_QueryInterface((IClassFactory*)pClassFactory, riid, ppv); if (FAILED(hr)) { - LocalFree((HLOCAL)pClassFactory); + HeapFree(GetProcessHeap(), 0, pClassFactory); *ppv = NULL; } @@ -124,6 +124,8 @@ static ULONG WINAPI IClassFactory_fnRele if ((--(This->dwRef)) > 0) return This->dwRef; + HeapFree(GetProcessHeap(), 0, This); + return 0; }

1 0

Alexandre Julliard : winefile: Refresh the drives and files upon WM_DEVICECHANGE.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 04dad6218f64776712653ecdc24126a4d61f0d59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04dad6218f64776712653ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 10 21:43:25 2006 +0100 winefile: Refresh the drives and files upon WM_DEVICECHANGE. --- programs/winefile/winefile.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index afaba10..60deaf2 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2521,6 +2521,10 @@ static LRESULT CALLBACK FrameWndProc(HWN resize_frame(hwnd, LOWORD(lparam), HIWORD(lparam)); break; /* do not pass message to DefFrameProc */ + case WM_DEVICECHANGE: + SendMessage(hwnd, WM_COMMAND, MAKELONG(ID_REFRESH,0), 0); + break; + #ifndef _NO_EXTENSIONS case WM_GETMINMAXINFO: { LPMINMAXINFO lpmmi = (LPMINMAXINFO)lparam;

1 0

Stefan Dösinger : wined3d: Consistently use WINED3DRESOURCETYPE.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 913df5b143ce1d3815d30c5f54c84fe4b2c7c81e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=913df5b143ce1d3815d30c5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Mar 9 23:21:16 2006 +0100 wined3d: Consistently use WINED3DRESOURCETYPE. --- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d8/volume.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/d3d9/volume.c | 2 +- dlls/d3d9/volumetexture.c | 2 +- dlls/wined3d/basetexture.c | 2 +- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 40 +++++++++++++++++++------------------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/drawprim.c | 8 ++++---- dlls/wined3d/indexbuffer.c | 2 +- dlls/wined3d/query.c | 2 +- dlls/wined3d/resource.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 18 +++++++++-------- dlls/wined3d/vertexbuffer.c | 2 +- dlls/wined3d/volume.c | 6 +++--- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++++---- include/wine/wined3d_interface.h | 22 ++++++++++----------- include/wine/wined3d_types.h | 34 ++++++++++++++++---------------- 27 files changed, 88 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=913df5b143ce1d3815d…

1 0

Mike McCormack : avifil32: Use CoTaskMemAlloc when allocating memory to return through
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 29212d8afdac2c5d970b68e15de69a72046bf8da URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29212d8afdac2c5d970b68e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 00:21:30 2006 +0900 avifil32: Use CoTaskMemAlloc when allocating memory to return through an OLE interface. --- dlls/avifil32/avifile.c | 2 +- dlls/avifil32/wavfile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index a045bf3..d407445 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -704,7 +704,7 @@ static HRESULT WINAPI IPersistFile_fnGet if (This->paf->szFileName != NULL) { int len = lstrlenW(This->paf->szFileName) + 1; - *ppszFileName = (LPOLESTR)GlobalAllocPtr(GHND, len * sizeof(WCHAR)); + *ppszFileName = CoTaskMemAlloc(len * sizeof(WCHAR)); if (*ppszFileName == NULL) return AVIERR_MEMORY; diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 4ed7e52..6ea7e44 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -662,7 +662,7 @@ static HRESULT WINAPI IPersistFile_fnGet if (This->paf->szFileName != NULL) { int len = lstrlenW(This->paf->szFileName) + 1; - *ppszFileName = GlobalAllocPtr(GHND, len * sizeof(WCHAR)); + *ppszFileName = CoTaskMemAlloc(len * sizeof(WCHAR)); if (*ppszFileName == NULL) return AVIERR_MEMORY;

1 0

Mike McCormack : avifil32: Fix some gcc 4.1 warnings cause by windowsx. h macros.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 610fc08e8d87d01306d58acad9f35dd11d6d5883 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=610fc08e8d87d01306d58ac… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 00:21:42 2006 +0900 avifil32: Fix some gcc 4.1 warnings cause by windowsx.h macros. --- dlls/avifil32/api.c | 62 ++++++++++++++++++++++----------------------- dlls/avifil32/avifile.c | 54 ++++++++++++++++++--------------------- dlls/avifil32/getframe.c | 20 ++++++--------- dlls/avifil32/icmstream.c | 36 ++++++++++++-------------- dlls/avifil32/wavfile.c | 28 +++++++++----------- 5 files changed, 92 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=610fc08e8d87d01306d…

1 0

Mike McCormack : comdlg32: Remove the property when destroy the dialog box.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: e1ca87732be8620ee9fce793d9b6743029e84b35 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e1ca87732be8620ee9fce79… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 10 12:26:50 2006 +0900 comdlg32: Remove the property when destroy the dialog box. --- dlls/commdlg/colordlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c index 022e83f..ca00593 100644 --- a/dlls/commdlg/colordlg.c +++ b/dlls/commdlg/colordlg.c @@ -1220,7 +1220,7 @@ static INT_PTR CALLBACK ColorDlgProc( HW DeleteDC(lpp->hdcMem); DeleteObject(lpp->hbmMem); HeapFree(GetProcessHeap(), 0, lpp); - SetPropW( hDlg, szColourDialogProp, 0 ); + RemovePropW( hDlg, szColourDialogProp ); break; case WM_COMMAND: if (CC_WMCommand( hDlg, wParam, lParam, HIWORD(wParam), (HWND) lParam))

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2006