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

Christoph Frick : dinput/joystick_linuxinput: Add POV detection and reporting.
by Alexandre Julliard March 13, 2006

March 13, 2006

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 : kernel: Implement QueueUserWorkItem.
by Alexandre Julliard March 13, 2006

March 13, 2006

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 March 13, 2006

March 13, 2006

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 March 13, 2006

March 13, 2006

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

Stefan Dösinger : wined3d: Add WINED3DVERTEXBUFFER_DESC to wined3d_types.h.
by Alexandre Julliard March 13, 2006

March 13, 2006

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

Robert Shearman : wininet: InternetCrackUrl should set nPort to the default port if not specified.
by Alexandre Julliard March 13, 2006

March 13, 2006

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

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

March 13, 2006

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 March 13, 2006

March 13, 2006

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 March 13, 2006

March 13, 2006

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 March 13, 2006

March 13, 2006

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