Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[greatlrd] 30732: import wine directx d3d9 version 0.9.49

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Nov 25 15:13:33 2007 New Revision: 30732 URL: http://svn.reactos.org/svn/reactos?rev=30732&view=rev Log: import wine directx d3d9 version 0.9.49 Added: trunk/reactos/dll/directx/wine/d3d9/ trunk/reactos/dll/directx/wine/d3d9/Makefile.in (with props) trunk/reactos/dll/directx/wine/d3d9/basetexture.c (with props) trunk/reactos/dll/directx/wine/d3d9/cubetexture.c (with props) trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild (with props) trunk/reactos/dll/directx/wine/d3d9/d3d9.spec (with props) trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c (with props) trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h (with props) trunk/reactos/dll/directx/wine/d3d9/device.c (with props) trunk/reactos/dll/directx/wine/d3d9/directx.c (with props) trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c (with props) trunk/reactos/dll/directx/wine/d3d9/pixelshader.c (with props) trunk/reactos/dll/directx/wine/d3d9/query.c (with props) trunk/reactos/dll/directx/wine/d3d9/resource.c (with props) trunk/reactos/dll/directx/wine/d3d9/stateblock.c (with props) trunk/reactos/dll/directx/wine/d3d9/surface.c (with props) trunk/reactos/dll/directx/wine/d3d9/swapchain.c (with props) trunk/reactos/dll/directx/wine/d3d9/texture.c (with props) trunk/reactos/dll/directx/wine/d3d9/version.rc (with props) trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c (with props) trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c (with props) trunk/reactos/dll/directx/wine/d3d9/vertexshader.c (with props) trunk/reactos/dll/directx/wine/d3d9/volume.c (with props) trunk/reactos/dll/directx/wine/d3d9/volumetexture.c (with props) Modified: trunk/reactos/dll/directx/wine/wine.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/directx/wine/d3d9/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/Make… Added: trunk/reactos/dll/directx/wine/d3d9/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/base… Added: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Added: trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Added: trunk/reactos/dll/directx/wine/d3d9/d3d9.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Added: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Added: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Added: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Added: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Added: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Added: trunk/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/pixe… Added: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Added: trunk/reactos/dll/directx/wine/d3d9/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/reso… Added: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Added: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Added: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Added: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Added: trunk/reactos/dll/directx/wine/d3d9/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vers… Added: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Added: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Added: trunk/reactos/dll/directx/wine/d3d9/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Added: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Added: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/wine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wine.rbui…

16 years, 9 months

[greatlrd] 30731: fix compiling warings for d3d9 that I got local.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Nov 25 15:08:36 2007 New Revision: 30731 URL: http://svn.reactos.org/svn/reactos?rev=30731&view=rev Log: fix compiling warings for d3d9 that I got local. Modified: trunk/reactos/include/psdk/d3d9types.h Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9types.h?r… ============================================================================== --- trunk/reactos/include/psdk/d3d9types.h (original) +++ trunk/reactos/include/psdk/d3d9types.h Sun Nov 25 15:08:36 2007 @@ -191,9 +191,11 @@ #define D3DVERTEXTEXTURESAMPLER2 (D3DDMAPSAMPLER+3) #define D3DVERTEXTEXTURESAMPLER3 (D3DDMAPSAMPLER+4) +#ifndef MAKEFOURCC #define MAKEFOURCC(ch0, ch1, ch2, ch3) \ ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) +#endif /* Constants used by D3DPRESENT_PARAMETERS. when creating a device or swapchain */

16 years, 9 months

[greatlrd] 30730: update d3d8 to wine 0.9.49

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Nov 25 14:16:27 2007 New Revision: 30730 URL: http://svn.reactos.org/svn/reactos?rev=30730&view=rev Log: update d3d8 to wine 0.9.49 Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/stateblock.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/volume.c Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c Sun Nov 25 14:16:27 2007 @@ -75,11 +75,11 @@ * ValidateVertexShader (D3D8.@) * * I've seen reserved1 and reserved2 always passed as 0's - * bool seems always passed as 0 or 1, but other values work as well.... + * bool seems always passed as 0 or 1, but other values work as well.... * toto result? */ HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto) -{ +{ HRESULT ret; FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, bool, toto); @@ -91,7 +91,7 @@ switch(*vertexshader) { case 0xFFFE0101: - case 0xFFFE0100: + case 0xFFFE0100: ret=S_OK; break; default: @@ -112,12 +112,12 @@ { HRESULT ret; FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, bool, toto); - + if (!pixelshader) return E_FAIL; if (reserved1) - return E_FAIL; + return E_FAIL; switch(*pixelshader) { case 0xFFFF0100: Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/device.c (original) +++ trunk/reactos/dll/directx/wine/d3d8/device.c Sun Nov 25 14:16:27 2007 @@ -463,7 +463,7 @@ LeaveCriticalSection(&d3d8_cs); if (FAILED(hrc)) { - /* free up object */ + /* free up object */ FIXME("(%p) call to IWineD3DDevice_CreateTexture failed\n", This); HeapFree(GetProcessHeap(), 0, object); /* *ppTexture = NULL; */ @@ -477,8 +477,8 @@ return hrc; } -static HRESULT WINAPI IDirect3DDevice8Impl_CreateVolumeTexture(LPDIRECT3DDEVICE8 iface, - UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, +static HRESULT WINAPI IDirect3DDevice8Impl_CreateVolumeTexture(LPDIRECT3DDEVICE8 iface, + UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DVolumeTexture8** ppVolumeTexture) { IDirect3DVolumeTexture8Impl *object; @@ -518,7 +518,7 @@ return hrc; } -static HRESULT WINAPI IDirect3DDevice8Impl_CreateCubeTexture(LPDIRECT3DDEVICE8 iface, UINT EdgeLength, UINT Levels, DWORD Usage, +static HRESULT WINAPI IDirect3DDevice8Impl_CreateCubeTexture(LPDIRECT3DDEVICE8 iface, UINT EdgeLength, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DCubeTexture8** ppCubeTexture) { IDirect3DCubeTexture8Impl *object; @@ -634,7 +634,7 @@ IDirect3DSurface8Impl *object; IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); - if(MultisampleQuality < 0) { + if(MultisampleQuality < 0) { FIXME("MultisampleQuality out of range %d, substituting 0\n", MultisampleQuality); /*FIXME: Find out what windows does with a MultisampleQuality < 0 */ MultisampleQuality=0; @@ -989,7 +989,7 @@ IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; TRACE("(%p) Relay\n" , This); - + /* Note: D3DLIGHT8 is compatible with WINED3DLIGHT */ EnterCriticalSection(&d3d8_cs); hr = IWineD3DDevice_SetLight(This->WineD3DDevice, Index, (const WINED3DLIGHT *)pLight); @@ -1413,7 +1413,7 @@ } static HRESULT WINAPI IDirect3DDevice8Impl_DrawPrimitive(LPDIRECT3DDEVICE8 iface, D3DPRIMITIVETYPE PrimitiveType, UINT StartVertex, UINT PrimitiveCount) { - IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; TRACE("(%p) Relay\n" , This); @@ -1803,6 +1803,12 @@ TRACE("(%p) Relay\n", This); EnterCriticalSection(&d3d8_cs); + /* WineD3D takes an INT(due to d3d9), but d3d8 uses UINTs. Do I have to add a check here that + * the UINT doesn't cause an overflow in the INT? It seems rather unlikely because such large + * vertex buffers can't be created to address them with an index that requires the 32nd bit + * (4 Byte minimum vertex size * 2^31-1 -> 8 gb buffer. The index sign would be the least + * problem) + */ IWineD3DDevice_SetBaseVertexIndex(This->WineD3DDevice, baseVertexIndex); hr = IWineD3DDevice_SetIndices(This->WineD3DDevice, pIndexData ? ((IDirect3DIndexBuffer8Impl *)pIndexData)->wineD3DIndexBuffer : NULL); @@ -1822,7 +1828,8 @@ } EnterCriticalSection(&d3d8_cs); - IWineD3DDevice_GetBaseVertexIndex(This->WineD3DDevice, pBaseVertexIndex); + /* The case from UINT to INT is safe because d3d8 will never set negative values */ + IWineD3DDevice_GetBaseVertexIndex(This->WineD3DDevice, (INT *) pBaseVertexIndex); rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData); if (SUCCEEDED(rc) && retIndexData) { IWineD3DIndexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/directx.c (original) +++ trunk/reactos/dll/directx/wine/d3d8/directx.c Sun Nov 25 14:16:27 2007 @@ -109,8 +109,8 @@ TRACE("(%p)->(%d,%08x, %p\n", This, Adapter, Flags, pIdentifier); EnterCriticalSection(&d3d8_cs); - /* dx8 and dx9 have different structures to be filled in, with incompatible - layouts so pass in pointers to the places to be filled via an internal + /* dx8 and dx9 have different structures to be filled in, with incompatible + layouts so pass in pointers to the places to be filled via an internal structure */ adapter_id.Driver = pIdentifier->Driver; adapter_id.Description = pIdentifier->Description; @@ -203,7 +203,7 @@ return hr; } -static HRESULT WINAPI IDirect3D8Impl_CheckDepthStencilMatch(LPDIRECT3D8 iface, +static HRESULT WINAPI IDirect3D8Impl_CheckDepthStencilMatch(LPDIRECT3D8 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; @@ -269,8 +269,8 @@ IDirect3DSurface8Impl *d3dSurface = NULL; TRACE("(%p) call back\n", device); - res = IDirect3DDevice8_CreateRenderTarget((IDirect3DDevice8 *)device, Width, Height, - (D3DFORMAT)Format, MultiSample, Lockable, + res = IDirect3DDevice8_CreateRenderTarget((IDirect3DDevice8 *)device, Width, Height, + (D3DFORMAT)Format, MultiSample, Lockable, (IDirect3DSurface8 **)&d3dSurface); if (SUCCEEDED(res)) { @@ -365,7 +365,7 @@ IDirect3DSurface8Impl *d3dSurface = NULL; TRACE("(%p) call back\n", device); - res = IDirect3DDevice8_CreateDepthStencilSurface((IDirect3DDevice8 *)device, Width, Height, + res = IDirect3DDevice8_CreateDepthStencilSurface((IDirect3DDevice8 *)device, Width, Height, (D3DFORMAT)Format, MultiSample, (IDirect3DSurface8 **)&d3dSurface); if (SUCCEEDED(res)) { *ppSurface = d3dSurface->wineD3DSurface; Modified: trunk/reactos/dll/directx/wine/d3d8/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/stat… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/stateblock.c (original) +++ trunk/reactos/dll/directx/wine/d3d8/stateblock.c Sun Nov 25 14:16:27 2007 @@ -67,19 +67,19 @@ /* IDirect3DStateBlock8 Interface follow: */ static HRESULT WINAPI IDirect3DStateBlock8Impl_GetDevice(IDirect3DStateBlock8 *iface, IDirect3DDevice8 **ppDevice) { IDirect3DStateBlock8Impl *This = (IDirect3DStateBlock8Impl *)iface; - TRACE("(%p) Relay\n", This); + TRACE("(%p) Relay\n", This); return IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); } static HRESULT WINAPI IDirect3DStateBlock8Impl_Capture(IDirect3DStateBlock8 *iface) { IDirect3DStateBlock8Impl *This = (IDirect3DStateBlock8Impl *)iface; - TRACE("(%p) Relay\n", This); + TRACE("(%p) Relay\n", This); return IWineD3DStateBlock_Capture(This->wineD3DStateBlock); } static HRESULT WINAPI IDirect3DStateBlock8Impl_Apply(IDirect3DStateBlock8 *iface) { IDirect3DStateBlock8Impl *This = (IDirect3DStateBlock8Impl *)iface; - TRACE("(%p) Relay\n", This); + TRACE("(%p) Relay\n", This); return IWineD3DStateBlock_Apply(This->wineD3DStateBlock); } Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c (original) +++ trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c Sun Nov 25 14:16:27 2007 @@ -284,7 +284,7 @@ TRACE("d3d8_elements %p, wined3d_elements %p\n", d3d8_elements, wined3d_elements); /* 128 should be enough for anyone... */ - *wined3d_elements = HeapAlloc(GetProcessHeap(), 0, 128 * sizeof(WINED3DVERTEXELEMENT)); + *wined3d_elements = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 128 * sizeof(WINED3DVERTEXELEMENT)); while (D3DVSD_END() != *token) { token_type = ((*token & D3DVSD_TOKENTYPEMASK) >> D3DVSD_TOKENTYPESHIFT); Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/volume.c (original) +++ trunk/reactos/dll/directx/wine/d3d8/volume.c Sun Nov 25 14:16:27 2007 @@ -229,10 +229,10 @@ object->lpVtbl = &Direct3DVolume8_Vtbl; object->ref = 1; - hrc = IWineD3DDevice_CreateVolume(This->WineD3DDevice, Width, Height, Depth, Usage, Format, + hrc = IWineD3DDevice_CreateVolume(This->WineD3DDevice, Width, Height, Depth, Usage, Format, Pool, &object->wineD3DVolume, pSharedHandle, (IUnknown *)object); if (hrc != D3D_OK) { - /* free up object */ + /* free up object */ FIXME("(%p) call to IWineD3DDevice_CreateVolume failed\n", This); HeapFree(GetProcessHeap(), 0, object); *ppVolume = NULL;

16 years, 9 months

[greatlrd] 30729: fix some of wine d3d8 waring at compiling. no waring are show in d3d8 now.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Nov 25 14:14:43 2007 New Revision: 30729 URL: http://svn.reactos.org/svn/reactos?rev=30729&view=rev Log: fix some of wine d3d8 waring at compiling. no waring are show in d3d8 now. Modified: trunk/reactos/include/psdk/d3d8types.h Modified: trunk/reactos/include/psdk/d3d8types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d8types.h?r… ============================================================================== --- trunk/reactos/include/psdk/d3d8types.h (original) +++ trunk/reactos/include/psdk/d3d8types.h Sun Nov 25 14:14:43 2007 @@ -148,11 +148,11 @@ #define D3DCOLORWRITEENABLE_ALPHA (1L<<3) - +#ifndef MAKEFOURCC #define MAKEFOURCC(ch0, ch1, ch2, ch3) \ ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) - +#endif /**************************** * Vertex Shaders Declaration

16 years, 9 months

[fireball] 30728: - Guard MSVC's intrinsics with #ifdefs. Proper solution is to move those functions to intrin.h once host tools including target headers problem is solved. libcntpr now builds with MSVC8.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Nov 25 00:28:11 2007 New Revision: 30728 URL: http://svn.reactos.org/svn/reactos?rev=30728&view=rev Log: - Guard MSVC's intrinsics with #ifdefs. Proper solution is to move those functions to intrin.h once host tools including target headers problem is solved. libcntpr now builds with MSVC8. Modified: trunk/reactos/lib/sdk/crt/math/abs.c trunk/reactos/lib/sdk/crt/math/labs.c trunk/reactos/lib/sdk/crt/string/ctype.c trunk/reactos/lib/sdk/crt/string/sscanf.c trunk/reactos/lib/sdk/crt/string/strset.c trunk/reactos/lib/sdk/crt/wstring/wcsset.c Modified: trunk/reactos/lib/sdk/crt/math/abs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/abs.c?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/abs.c (original) +++ trunk/reactos/lib/sdk/crt/math/abs.c Sun Nov 25 00:28:11 2007 @@ -4,8 +4,10 @@ /* * @implemented */ +#ifndef _MSC_VER int abs(int j) { return j<0 ? -j : j; } +#endif Modified: trunk/reactos/lib/sdk/crt/math/labs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/labs.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/labs.c (original) +++ trunk/reactos/lib/sdk/crt/math/labs.c Sun Nov 25 00:28:11 2007 @@ -4,8 +4,10 @@ /* * @implemented */ +#ifndef _MSC_VER long labs(long j) { return j<0 ? -j : j; } +#endif Modified: trunk/reactos/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/ctype.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/ctype.c (original) +++ trunk/reactos/lib/sdk/crt/string/ctype.c Sun Nov 25 00:28:11 2007 @@ -2,6 +2,24 @@ #include <ctype.h> #undef _pctype + +/* MS's CRT header defines all that, and we actually implement that */ +#undef iswalnum +#undef __isascii +#undef iswascii +#undef __iscsym +#undef __iscsymf +#undef iswalpha +#undef iswcntrl +#undef iswdigit +#undef iswgraph +#undef iswprint +#undef iswpunct +#undef iswlower +#undef iswupper +#undef iswspace +#undef iswxdigit +#undef __toascii #define upalpha ('A' - 'a') Modified: trunk/reactos/lib/sdk/crt/string/sscanf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/sscanf.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/sscanf.c (original) +++ trunk/reactos/lib/sdk/crt/string/sscanf.c Sun Nov 25 00:28:11 2007 @@ -6,6 +6,9 @@ #define NDEBUG #include <internal/debug.h> +#ifndef TRACE +#define TRACE DPRINT +#endif #define WARN DPRINT1 @@ -26,6 +29,11 @@ #undef WIDE_SCANF #undef CONSOLE #define STRING 1 + +#ifdef _MSC_VER +#define debugstr_a(x) x +#endif + #include "wine/scanf.h" int sscanf(const char *str, const char *format, ...) Modified: trunk/reactos/lib/sdk/crt/string/strset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strset.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strset.c (original) +++ trunk/reactos/lib/sdk/crt/string/strset.c Sun Nov 25 00:28:11 2007 @@ -30,6 +30,7 @@ /* * @implemented */ +#ifndef _MSC_VER char* _strset(char* szToFill, int szFill) { char *t = szToFill; @@ -41,3 +42,4 @@ } return t; } +#endif Modified: trunk/reactos/lib/sdk/crt/wstring/wcsset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcsset… ============================================================================== --- trunk/reactos/lib/sdk/crt/wstring/wcsset.c (original) +++ trunk/reactos/lib/sdk/crt/wstring/wcsset.c Sun Nov 25 00:28:11 2007 @@ -30,6 +30,7 @@ /* * @implemented */ +#ifndef _MSC_VER wchar_t* _wcsset (wchar_t* wsToFill, wchar_t wcFill) { wchar_t *t = wsToFill; @@ -41,3 +42,4 @@ } return t; } +#endif

16 years, 9 months

[weiden] 30727: Support hiding keyboard cues and focus rectangles See issue #2839 for more details.

by weiden＠svn.reactos.org

Author: weiden Date: Sat Nov 24 23:49:20 2007 New Revision: 30727 URL: http://svn.reactos.org/svn/reactos?rev=30727&view=rev Log: Support hiding keyboard cues and focus rectangles See issue #2839 for more details. Modified: trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/static.c trunk/reactos/dll/win32/user32/include/controls.h Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c (original) +++ trunk/reactos/dll/win32/user32/controls/button.c Sat Nov 24 23:49:20 2007 @@ -72,7 +72,8 @@ #define STATE_GWL_OFFSET 0 #define HFONT_GWL_OFFSET (sizeof(LONG)) #define HIMAGE_GWL_OFFSET (HFONT_GWL_OFFSET+sizeof(HFONT)) -#define NB_EXTRA_BYTES (HIMAGE_GWL_OFFSET+sizeof(HANDLE)) +#define UISTATE_GWL_OFFSET (HIMAGE_GWL_OFFSET+sizeof(HFONT)) +#define NB_EXTRA_BYTES (UISTATE_GWL_OFFSET+sizeof(LONG)) /* Button state values */ #define BUTTON_UNCHECKED 0x00 @@ -179,6 +180,16 @@ SetWindowLongW( hwnd, STATE_GWL_OFFSET, state ); } +static __inline void set_ui_state( HWND hwnd, LONG flags ) +{ + SetWindowLongW( hwnd, UISTATE_GWL_OFFSET, flags ); +} + +static __inline LONG get_ui_state( HWND hwnd ) +{ + return GetWindowLongPtrW( hwnd, UISTATE_GWL_OFFSET ); +} + __inline static HFONT get_button_font( HWND hwnd ) { return (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); @@ -212,6 +223,27 @@ WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); if (buffer) InternalGetWindowText( hwnd, buffer, len + 1 ); return buffer; +} + +/* Retrieve the UI state for the control */ +static BOOL button_update_uistate(HWND hwnd, BOOL unicode) +{ + LONG flags, prevflags; + + if (unicode) + flags = DefWindowProcW(hwnd, WM_QUERYUISTATE, 0, 0); + else + flags = DefWindowProcA(hwnd, WM_QUERYUISTATE, 0, 0); + + prevflags = get_ui_state(hwnd); + + if (prevflags != flags) + { + set_ui_state(hwnd, flags); + return TRUE; + } + + return FALSE; } /*********************************************************************** @@ -260,6 +292,7 @@ if (btn_type >= MAX_BTN_TYPE) return -1; /* abort */ set_button_state( hWnd, BUTTON_UNCHECKED ); + button_update_uistate( hWnd, unicode ); return 0; case WM_ERASEBKGND: @@ -530,6 +563,16 @@ paint_button( hWnd, btn_type, ODA_SELECT ); break; + case WM_UPDATEUISTATE: + if (unicode) + DefWindowProcW(hWnd, uMsg, wParam, lParam); + else + DefWindowProcA(hWnd, uMsg, wParam, lParam); + + if (button_update_uistate(hWnd, unicode)) + paint_button( hWnd, btn_type, ODA_DRAWENTIRE ); + break; + case WM_NCHITTEST: if(btn_type == BS_GROUPBOX) return HTTRANSPARENT; /* fall through */ @@ -539,6 +582,7 @@ } return 0; } + /*********************************************************************** * ButtonWndProcW @@ -643,6 +687,9 @@ } DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT); HeapFree( GetProcessHeap(), 0, text ); + + if (get_ui_state( hwnd ) & UISF_HIDEACCEL) + dtStyle |= DT_HIDEPREFIX; break; case BS_ICON: @@ -760,6 +807,9 @@ if (!(text = get_button_text( hwnd ))) return; lp = (LPARAM)text; wp = (WPARAM)dtFlags; + + if (dtFlags & DT_HIDEPREFIX) + flags |= DSS_HIDEPREFIX; break; case BS_ICON: @@ -858,9 +908,12 @@ if (state & BUTTON_HASFOCUS) { - InflateRect( &focus_rect, -1, -1 ); - IntersectRect(&focus_rect, &focus_rect, &rc); - DrawFocusRect( hDC, &focus_rect ); + if (!(get_ui_state(hwnd) & UISF_HIDEFOCUS)) + { + InflateRect( &focus_rect, -1, -1 ); + IntersectRect(&focus_rect, &focus_rect, &rc); + DrawFocusRect( hDC, &focus_rect ); + } } cleanup: @@ -990,10 +1043,13 @@ if ((action == ODA_FOCUS) || ((action == ODA_DRAWENTIRE) && (state & BUTTON_HASFOCUS))) { - rtext.left--; - rtext.right++; - IntersectRect(&rtext, &rtext, &client); - DrawFocusRect( hDC, &rtext ); + if (!(get_ui_state(hwnd) & UISF_HIDEFOCUS)) + { + rtext.left--; + rtext.right++; + IntersectRect(&rtext, &rtext, &client); + DrawFocusRect( hDC, &rtext ); + } } } @@ -1099,7 +1155,10 @@ FillRect( hDC, &rc, hBrush ); if ((action == ODA_FOCUS) || ((action == ODA_DRAWENTIRE) && (state & BUTTON_HASFOCUS))) - DrawFocusRect( hDC, &rc ); + { + if (!(get_ui_state(hwnd) & UISF_HIDEFOCUS)) + DrawFocusRect( hDC, &rc ); + } } Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c Sat Nov 24 23:49:20 2007 @@ -139,6 +139,17 @@ return FALSE; } + +/* Retrieve the UI state for the control */ +static BOOL COMBO_update_uistate(LPHEADCOMBO lphc) +{ + LONG prev_flags; + + prev_flags = lphc->UIState; + lphc->UIState = DefWindowProcW(lphc->self, WM_QUERYUISTATE, 0, 0); + return prev_flags != lphc->UIState; +} + /*********************************************************************** * COMBO_NCCreate */ @@ -150,6 +161,8 @@ { lphc->self = hwnd; SetWindowLongPtrW( hwnd, 0, (LONG_PTR)lphc ); + + COMBO_update_uistate(lphc); /* some braindead apps do try to use scrollbar/border flags */ @@ -817,7 +830,8 @@ &rectEdit, pText ? pText : empty_stringW , size, NULL ); - if(lphc->wState & CBF_FOCUSED && !(lphc->wState & CBF_DROPPED)) + if(lphc->wState & CBF_FOCUSED && !(lphc->wState & CBF_DROPPED) && + !(lphc->UIState & UISF_HIDEFOCUS)) DrawFocusRect( hdc, &rectEdit ); } @@ -2337,6 +2351,21 @@ if( lphc->wState & CBF_EDIT ) return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); break; + + case WM_UPDATEUISTATE: + if (unicode) + DefWindowProcW(lphc->self, message, wParam, lParam); + else + DefWindowProcA(lphc->self, message, wParam, lParam); + + if (COMBO_update_uistate(lphc)) + { + /* redraw text */ + if( !(lphc->wState & CBF_EDIT) ) + NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE); + } + break; + default: if (message >= WM_USER) WARN("unknown msg WM_USER+%04x wp=%04x lp=%08lx\n", Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c Sat Nov 24 23:49:20 2007 @@ -106,6 +106,7 @@ HFONT font; /* Current font */ LCID locale; /* Current locale for string comparisons */ LPHEADCOMBO lphc; /* ComboLBox */ + LONG UIState; } LB_DESCR; @@ -603,7 +604,10 @@ if (!item) { if (action == ODA_FOCUS) - DrawFocusRect( hdc, rect ); + { + if (!(descr->UIState & UISF_HIDEFOCUS)) + DrawFocusRect( hdc, rect ); + } else FIXME("called with an out of bounds index %d(%d) in owner draw, Not good.\n",index,descr->nb_items); return; @@ -643,7 +647,8 @@ if (action == ODA_FOCUS) { - DrawFocusRect( hdc, rect ); + if (!(descr->UIState & UISF_HIDEFOCUS)) + DrawFocusRect( hdc, rect ); return; } if (item && item->selected) @@ -678,7 +683,8 @@ } if (!ignoreFocus && (descr->focus_item == index) && (descr->caret_on) && - (descr->in_focus)) DrawFocusRect( hdc, rect ); + (descr->in_focus) && + !(descr->UIState & UISF_HIDEFOCUS)) DrawFocusRect( hdc, rect ); } } @@ -2545,6 +2551,16 @@ return 0; } +/* Retrieve the UI state for the control */ +static BOOL LISTBOX_update_uistate(LB_DESCR *descr) +{ + LONG prev_flags; + + prev_flags = descr->UIState; + descr->UIState = DefWindowProcW(descr->self, WM_QUERYUISTATE, 0, 0); + return prev_flags != descr->UIState; +} + /*********************************************************************** * LISTBOX_Create @@ -2604,6 +2620,8 @@ } SetWindowLongPtrW( descr->self, 0, (LONG_PTR)descr ); + + LISTBOX_update_uistate(descr); /* if (wnd->dwExStyle & WS_EX_NOPARENTNOTIFY) descr->style &= ~LBS_NOTIFY; */ @@ -3405,6 +3423,20 @@ if (lphc) return 0; break; + case WM_UPDATEUISTATE: + if (unicode) + DefWindowProcW(descr->self, msg, wParam, lParam); + else + DefWindowProcA(descr->self, msg, wParam, lParam); + + if (LISTBOX_update_uistate(descr)) + { + /* redraw text */ + if (descr->focus_item != -1) + LISTBOX_DrawFocusRect( descr, descr->in_focus ); + } + break; + default: if ((msg >= WM_USER) && (msg < 0xc000)) WARN("[%p]: unknown msg %04x wp %08x lp %08lx\n", Modified: trunk/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c (original) +++ trunk/reactos/dll/win32/user32/controls/static.c Sat Nov 24 23:49:20 2007 @@ -63,7 +63,8 @@ /* offsets for GetWindowLong for static private information */ #define HFONT_GWL_OFFSET 0 #define HICON_GWL_OFFSET (sizeof(HFONT)) -#define STATIC_EXTRA_BYTES (HICON_GWL_OFFSET + sizeof(HICON)) +#define UISTATE_GWL_OFFSET (HICON_GWL_OFFSET+sizeof(HICON)) +#define STATIC_EXTRA_BYTES (UISTATE_GWL_OFFSET + sizeof(LONG)) typedef void (*pfPaint)( HWND hwnd, HDC hdc, DWORD style ); @@ -115,6 +116,16 @@ #endif }; +static __inline void set_ui_state( HWND hwnd, LONG flags ) +{ + SetWindowLongW( hwnd, UISTATE_GWL_OFFSET, flags ); +} + +static __inline LONG get_ui_state( HWND hwnd ) +{ + return GetWindowLongPtrW( hwnd, UISTATE_GWL_OFFSET ); +} + static void setup_clipping(HWND hwnd, HDC hdc, HRGN *orig) { RECT rc; @@ -141,6 +152,27 @@ SelectClipRgn(hdc, hrgn); if (hrgn != NULL) DeleteObject(hrgn); +} + +/* Retrieve the UI state for the control */ +static BOOL STATIC_update_uistate(HWND hwnd, BOOL unicode) +{ + LONG flags, prevflags; + + if (unicode) + flags = DefWindowProcW(hwnd, WM_QUERYUISTATE, 0, 0); + else + flags = DefWindowProcA(hwnd, WM_QUERYUISTATE, 0, 0); + + prevflags = get_ui_state(hwnd); + + if (prevflags != flags) + { + set_ui_state(hwnd, flags); + return TRUE; + } + + return FALSE; } /*********************************************************************** @@ -424,6 +456,7 @@ ERR("Unknown style 0x%02lx\n", style ); return -1; } + STATIC_update_uistate(hwnd, unicode); STATIC_InitColours(); break; @@ -613,6 +646,18 @@ STATIC_TryPaintFcn( hwnd, full_style ); break; + case WM_UPDATEUISTATE: + if (unicode) + DefWindowProcW(hwnd, uMsg, wParam, lParam); + else + DefWindowProcA(hwnd, uMsg, wParam, lParam); + + if (STATIC_update_uistate(hwnd, unicode) && hasTextStyle( full_style )) + { + RedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); + } + break; + default: return unicode ? DefWindowProcW(hwnd, uMsg, wParam, lParam) : DefWindowProcA(hwnd, uMsg, wParam, lParam); @@ -666,7 +711,7 @@ RECT rc; HBRUSH hBrush; HFONT hFont, hOldFont = NULL; - WORD wFormat; + DWORD wFormat; INT len, buf_size; WCHAR *text; @@ -700,6 +745,8 @@ if (style & SS_NOPREFIX) wFormat |= DT_NOPREFIX; + else if (get_ui_state(hwnd) & UISF_HIDEACCEL) + wFormat |= DT_HIDEPREFIX; if ((style & SS_TYPEMASK) != SS_SIMPLE) { Modified: trunk/reactos/dll/win32/user32/include/controls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/c… ============================================================================== --- trunk/reactos/dll/win32/user32/include/controls.h (original) +++ trunk/reactos/dll/win32/user32/include/controls.h Sat Nov 24 23:49:20 2007 @@ -103,6 +103,7 @@ INT fixedOwnerDrawHeight; INT droppedWidth; /* last two are not used unless set */ INT editHeight; /* explicitly */ + LONG UIState; } HEADCOMBO,*LPHEADCOMBO; /* Note, that CBS_DROPDOWNLIST style is actually (CBS_SIMPLE | CBS_DROPDOWN) */

16 years, 9 months

[pschweitzer] 30726: Really cleanup code (Thanks to GedMurphy)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Nov 24 22:56:41 2007 New Revision: 30726 URL: http://svn.reactos.org/svn/reactos?rev=30726&view=rev Log: Really cleanup code (Thanks to GedMurphy) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Sat Nov 24 22:56:41 2007 @@ -126,37 +126,21 @@ ptr = wcstok(ptr, L"="); ptr2 = wcstok(NULL, L"="); if (wcscmp(ptr, L"_ROSBE_SHOWTIME") == 0) - { LoadedSettings->showtime = wcstol(ptr2, NULL, 2); - } else if (wcscmp(ptr, L"_ROSBE_USECCACHE") == 0) - { LoadedSettings->useccache = wcstol(ptr2, NULL, 2); - } else if (wcscmp(ptr, L"_ROSBE_STRIP") == 0) - { LoadedSettings->strip = wcstol(ptr2, NULL, 2); - } else if (wcscmp(ptr, L"_ROSBE_WRITELOG") == 0) - { LoadedSettings->writelog = wcstol(ptr2, NULL, 2); - } else if (wcscmp(ptr, L"_ROSBE_LOGDIR") == 0) - { wcsncpy(LoadedSettings->logdir, ptr2, wcslen(ptr2)-1); - } else if (wcscmp(ptr, L"_ROSBE_MINGWPATH") == 0) - { wcsncpy(LoadedSettings->mingwpath, ptr2, wcslen(ptr2)-1); - } else if (wcscmp(ptr, L"_ROSBE_OBJPATH") == 0) - { wcsncpy(LoadedSettings->objdir, ptr2, wcslen(ptr2)-1); - } else if (wcscmp(ptr, L"_ROSBE_OUTPATH") == 0) - { wcsncpy(LoadedSettings->outdir, ptr2, wcslen(ptr2)-1); - } } free(TTempLine); free(WTempLine); @@ -262,17 +246,27 @@ WCHAR HelpTxt[256]; hwndParent = GetParent(hwndChild); WindowID = GetWindowLong(hwndChild, GWL_ID); - if (WindowID == IDC_BACK) TextID = HLP_BACKCOLORC; - if (WindowID == IDC_FONT) TextID = HLP_FONTCOLORC; - if (WindowID == ID_SHOWBUILDTIME) TextID = HLP_SBUILDTIME; - if (WindowID == ID_USECCACHE) TextID = HLP_CCACHEUSED; - if (WindowID == ID_STRIP) TextID = HLP_STRIPEDEXE; - if ((WindowID == ID_MGWDIR) || (WindowID == ID_BROWSEMGW)) TextID = HLP_FINDMGWDIR; - if ((WindowID == ID_LOGDIR) || (WindowID == ID_BROWSE) || (WindowID == ID_SAVELOGS)) TextID = HLP_FINDLOGDIR; - if ((WindowID == ID_OBJDIR) || (WindowID == ID_BROWSEOBJ) || (WindowID == ID_OTHEROBJ)) TextID = HLP_FINDOBJDIR; - if ((WindowID == ID_OUTDIR) || (WindowID == ID_BROWSEOUT) || (WindowID == ID_OTHEROUT)) TextID = HLP_FINDOUTDIR; - if (WindowID == ID_OK) TextID = HLP_SAVEBUTTON; - if (WindowID == ID_CANCEL) TextID = HLP_QUITBUTTON; + switch(WindowID) + { + case IDC_BACK: TextID = HLP_BACKCOLORC; break; + case IDC_FONT: TextID = HLP_FONTCOLORC; break; + case ID_SHOWBUILDTIME: TextID = HLP_SBUILDTIME; break; + case ID_USECCACHE: TextID = HLP_CCACHEUSED; break; + case ID_STRIP: TextID = HLP_STRIPEDEXE; break; + case ID_MGWDIR: + case ID_BROWSEMGW: TextID = HLP_FINDMGWDIR; break; + case ID_LOGDIR: + case ID_BROWSE: + case ID_SAVELOGS: TextID = HLP_FINDLOGDIR; break; + case ID_OBJDIR: + case ID_BROWSEOBJ: + case ID_OTHEROBJ: TextID = HLP_FINDOBJDIR; break; + case ID_OUTDIR: + case ID_BROWSEOUT: + case ID_OTHEROUT: TextID = HLP_FINDOUTDIR; break; + case ID_OK: TextID = HLP_SAVEBUTTON; break; + case ID_CANCEL: TextID = HLP_QUITBUTTON; break; + } LoadString(hInstance, TextID, HelpTxt, 256); SetDlgItemText(hwndParent, ID_STATUSBAR, HelpTxt); return FALSE;

16 years, 9 months

[pschweitzer] 30725: Code cleanup

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Nov 24 22:28:28 2007 New Revision: 30725 URL: http://svn.reactos.org/svn/reactos?rev=30725&view=rev Log: Code cleanup Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Sat Nov 24 22:28:28 2007 @@ -258,79 +258,22 @@ { HWND hwndParent; LONG WindowID; + INT TextID = HLP_DEFAULTMSG; WCHAR HelpTxt[256]; hwndParent = GetParent(hwndChild); WindowID = GetWindowLong(hwndChild, GWL_ID); - switch(WindowID) - { - case IDC_BACK: - { - LoadString(hInstance, HLP_BACKCOLORC, HelpTxt, 256); - break; - } - case IDC_FONT: - { - LoadString(hInstance, HLP_FONTCOLORC, HelpTxt, 256); - break; - } - case ID_SHOWBUILDTIME: - { - LoadString(hInstance, HLP_SBUILDTIME, HelpTxt, 256); - break; - } - case ID_USECCACHE: - { - LoadString(hInstance, HLP_CCACHEUSED, HelpTxt, 256); - break; - } - case ID_STRIP: - { - LoadString(hInstance, HLP_STRIPEDEXE, HelpTxt, 256); - break; - } - case ID_MGWDIR: - case ID_BROWSEMGW: - { - LoadString(hInstance, HLP_FINDMGWDIR, HelpTxt, 256); - break; - } - case ID_LOGDIR: - case ID_BROWSE: - case ID_SAVELOGS: - { - LoadString(hInstance, HLP_FINDLOGDIR, HelpTxt, 256); - break; - } - case ID_OBJDIR: - case ID_BROWSEOBJ: - case ID_OTHEROBJ: - { - LoadString(hInstance, HLP_FINDOBJDIR, HelpTxt, 256); - break; - } - case ID_OUTDIR: - case ID_BROWSEOUT: - case ID_OTHEROUT: - { - LoadString(hInstance, HLP_FINDOUTDIR, HelpTxt, 256); - break; - } - case ID_OK: - { - LoadString(hInstance, HLP_SAVEBUTTON, HelpTxt, 256); - break; - } - case ID_CANCEL: - { - LoadString(hInstance, HLP_QUITBUTTON, HelpTxt, 256); - break; - } - default: - { - LoadString(hInstance, HLP_DEFAULTMSG, HelpTxt, 256); - break; - } - } + if (WindowID == IDC_BACK) TextID = HLP_BACKCOLORC; + if (WindowID == IDC_FONT) TextID = HLP_FONTCOLORC; + if (WindowID == ID_SHOWBUILDTIME) TextID = HLP_SBUILDTIME; + if (WindowID == ID_USECCACHE) TextID = HLP_CCACHEUSED; + if (WindowID == ID_STRIP) TextID = HLP_STRIPEDEXE; + if ((WindowID == ID_MGWDIR) || (WindowID == ID_BROWSEMGW)) TextID = HLP_FINDMGWDIR; + if ((WindowID == ID_LOGDIR) || (WindowID == ID_BROWSE) || (WindowID == ID_SAVELOGS)) TextID = HLP_FINDLOGDIR; + if ((WindowID == ID_OBJDIR) || (WindowID == ID_BROWSEOBJ) || (WindowID == ID_OTHEROBJ)) TextID = HLP_FINDOBJDIR; + if ((WindowID == ID_OUTDIR) || (WindowID == ID_BROWSEOUT) || (WindowID == ID_OTHEROUT)) TextID = HLP_FINDOUTDIR; + if (WindowID == ID_OK) TextID = HLP_SAVEBUTTON; + if (WindowID == ID_CANCEL) TextID = HLP_QUITBUTTON; + LoadString(hInstance, TextID, HelpTxt, 256); SetDlgItemText(hwndParent, ID_STATUSBAR, HelpTxt); return FALSE; }

16 years, 9 months

[fireball] 30724: - Don't escape defines with a " -> " conversion, just omit the quotes.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Nov 24 20:13:30 2007 New Revision: 30724 URL: http://svn.reactos.org/svn/reactos?rev=30724&view=rev Log: - Don't escape defines with a " -> " conversion, just omit the quotes. Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sat Nov 24 20:13:30 2007 @@ -380,7 +380,7 @@ string unescaped = *it1; defines.erase(unescaped); - const string& escaped = _replace_str(unescaped, "\"","""); + const string& escaped = _replace_str(unescaped, "\"",""); defines.insert(escaped); fprintf ( OUT, "%s", escaped.c_str() );

16 years, 9 months

[fireball] 30723: - MS's crt headers define this as 'const'. Fixes an error with MSVC compilation.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Nov 24 19:51:05 2007 New Revision: 30723 URL: http://svn.reactos.org/svn/reactos?rev=30723&view=rev Log: - MS's crt headers define this as 'const'. Fixes an error with MSVC compilation. Modified: trunk/reactos/include/crt/ctype.h trunk/reactos/include/crt/wctype.h trunk/reactos/lib/sdk/crt/string/ctype.c Modified: trunk/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=30… ============================================================================== --- trunk/reactos/include/crt/ctype.h (original) +++ trunk/reactos/include/crt/ctype.h Sat Nov 24 19:51:05 2007 @@ -112,9 +112,9 @@ __MINGW_IMPORT unsigned short _ctype[]; # endif # ifdef __MSVCRT__ - __MINGW_IMPORT unsigned short* _pctype; + __MINGW_IMPORT const unsigned short* _pctype; # else /* CRTDLL */ - __MINGW_IMPORT unsigned short* _pctype_dll; + __MINGW_IMPORT const unsigned short* _pctype_dll; # define _pctype _pctype_dll # endif Modified: trunk/reactos/include/crt/wctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wctype.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/wctype.h (original) +++ trunk/reactos/include/crt/wctype.h Sat Nov 24 19:51:05 2007 @@ -99,9 +99,9 @@ __MINGW_IMPORT unsigned short _ctype[]; # endif # ifdef __MSVCRT__ - __MINGW_IMPORT unsigned short* _pctype; + __MINGW_IMPORT const unsigned short* _pctype; # else /* CRTDLL */ - __MINGW_IMPORT unsigned short* _pctype_dll; + __MINGW_IMPORT const unsigned short* _pctype_dll; # define _pctype _pctype_dll # endif Modified: trunk/reactos/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/ctype.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/ctype.c (original) +++ trunk/reactos/lib/sdk/crt/string/ctype.c Sat Nov 24 19:51:05 2007 @@ -266,13 +266,13 @@ 0 /* 0xff */ }; -unsigned short *_pctype = _ctype + 1; -unsigned short *_pwctype = _ctype + 1; - -/* - * @implemented - */ -unsigned short **__p__pctype(void) +const unsigned short *_pctype = _ctype + 1; +const unsigned short *_pwctype = _ctype + 1; + +/* + * @implemented + */ +const unsigned short **__p__pctype(void) { return &_pctype; } @@ -280,7 +280,7 @@ /* * @implemented */ -unsigned short **__p__pwctype(void) +const unsigned short **__p__pwctype(void) { return &_pwctype; }

16 years, 9 months

← Newer
1
...
17
18
19
20
21
22
23
...
89
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007