wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Henri Verbeet : wined3d: Move the material to wined3d_state.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: 5f6ced27670409e921123de123ad98c616885db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6ced27670409e921123de12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 16 11:19:55 2010 +0200 wined3d: Move the material to wined3d_state. --- dlls/wined3d/device.c | 4 +- dlls/wined3d/state.c | 47 +++++++++++++++++++++------------------ dlls/wined3d/stateblock.c | 8 +++--- dlls/wined3d/wined3d_private.h | 4 +-- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 15df5ab..ab7e2ed 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2873,7 +2873,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetMaterial(IWineD3DDevice *iface, CONS IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; This->updateStateBlock->changed.material = TRUE; - This->updateStateBlock->material = *pMaterial; + This->updateStateBlock->state.material = *pMaterial; /* Handle recording of state blocks */ if (This->isRecordingState) { @@ -2887,7 +2887,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetMaterial(IWineD3DDevice *iface, CONS static HRESULT WINAPI IWineD3DDeviceImpl_GetMaterial(IWineD3DDevice *iface, WINED3DMATERIAL* pMaterial) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - *pMaterial = This->updateStateBlock->material; + *pMaterial = This->updateStateBlock->state.material; TRACE("(%p) : Diffuse (%f,%f,%f,%f)\n", This, pMaterial->Diffuse.r, pMaterial->Diffuse.g, pMaterial->Diffuse.b, pMaterial->Diffuse.a); TRACE("(%p) : Ambient (%f,%f,%f,%f)\n", This, pMaterial->Ambient.r, pMaterial->Ambient.g, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 50447b8..a37f8ee 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -716,10 +716,10 @@ static void state_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock TRACE("Setting specular enable state and materials\n"); if (stateblock->state.render_states[WINED3DRS_SPECULARENABLE]) { - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*) &stateblock->material.Specular); + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float *)&stateblock->state.material.Specular); checkGLcall("glMaterialfv"); - if (stateblock->material.Power > gl_info->limits.shininess) + if (stateblock->state.material.Power > gl_info->limits.shininess) { /* glMaterialf man page says that the material says that GL_SHININESS must be between 0.0 * and 128.0, although in d3d neither -1 nor 129 produce an error. GL_NV_max_light_exponent @@ -727,10 +727,12 @@ static void state_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock * value reported by the extension, otherwise 128. For values > gl_info->limits.shininess clamp * them, it should be safe to do so without major visual distortions. */ - WARN("Material power = %f, limit %f\n", stateblock->material.Power, gl_info->limits.shininess); + WARN("Material power = %f, limit %f\n", stateblock->state.material.Power, gl_info->limits.shininess); glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, gl_info->limits.shininess); - } else { - glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, stateblock->material.Power); + } + else + { + glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, stateblock->state.material.Power); } checkGLcall("glMaterialf(GL_SHININESS)"); @@ -775,23 +777,23 @@ static void state_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock } TRACE("(%p) : Diffuse {%.8e, %.8e, %.8e, %.8e}\n", stateblock->device, - stateblock->material.Diffuse.r, stateblock->material.Diffuse.g, - stateblock->material.Diffuse.b, stateblock->material.Diffuse.a); + stateblock->state.material.Diffuse.r, stateblock->state.material.Diffuse.g, + stateblock->state.material.Diffuse.b, stateblock->state.material.Diffuse.a); TRACE("(%p) : Ambient {%.8e, %.8e, %.8e, %.8e}\n", stateblock->device, - stateblock->material.Ambient.r, stateblock->material.Ambient.g, - stateblock->material.Ambient.b, stateblock->material.Ambient.a); + stateblock->state.material.Ambient.r, stateblock->state.material.Ambient.g, + stateblock->state.material.Ambient.b, stateblock->state.material.Ambient.a); TRACE("(%p) : Specular {%.8e, %.8e, %.8e, %.8e}\n", stateblock->device, - stateblock->material.Specular.r, stateblock->material.Specular.g, - stateblock->material.Specular.b, stateblock->material.Specular.a); + stateblock->state.material.Specular.r, stateblock->state.material.Specular.g, + stateblock->state.material.Specular.b, stateblock->state.material.Specular.a); TRACE("(%p) : Emissive {%.8e, %.8e, %.8e, %.8e}\n", stateblock->device, - stateblock->material.Emissive.r, stateblock->material.Emissive.g, - stateblock->material.Emissive.b, stateblock->material.Emissive.a); + stateblock->state.material.Emissive.r, stateblock->state.material.Emissive.g, + stateblock->state.material.Emissive.b, stateblock->state.material.Emissive.a); - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float*) &stateblock->material.Ambient); + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&stateblock->state.material.Ambient); checkGLcall("glMaterialfv(GL_AMBIENT)"); - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float*) &stateblock->material.Diffuse); + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *)&stateblock->state.material.Diffuse); checkGLcall("glMaterialfv(GL_DIFFUSE)"); - glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float*) &stateblock->material.Emissive); + glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float *)&stateblock->state.material.Emissive); checkGLcall("glMaterialfv(GL_EMISSION)"); } @@ -1317,23 +1319,23 @@ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, stru * tracking with glColorMaterial, so apply those here. */ switch (context->tracking_parm) { case GL_AMBIENT_AND_DIFFUSE: - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float*)&device->updateStateBlock->material.Ambient); - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float*)&device->updateStateBlock->material.Diffuse); + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&device->updateStateBlock->state.material.Ambient); + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *)&device->updateStateBlock->state.material.Diffuse); checkGLcall("glMaterialfv"); break; case GL_DIFFUSE: - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float*)&device->updateStateBlock->material.Diffuse); + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *)&device->updateStateBlock->state.material.Diffuse); checkGLcall("glMaterialfv"); break; case GL_AMBIENT: - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float*)&device->updateStateBlock->material.Ambient); + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&device->updateStateBlock->state.material.Ambient); checkGLcall("glMaterialfv"); break; case GL_EMISSION: - glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float*)&device->updateStateBlock->material.Emissive); + glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float *)&device->updateStateBlock->state.material.Emissive); checkGLcall("glMaterialfv"); break; @@ -1341,7 +1343,8 @@ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, stru /* Only change material color if specular is enabled, otherwise it is set to black */ if (device->stateBlock->state.render_states[WINED3DRS_SPECULARENABLE]) { - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*)&device->updateStateBlock->material.Specular); + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, + (float *)&device->updateStateBlock->state.material.Specular); checkGLcall("glMaterialfv"); } else { static const GLfloat black[] = {0.0f, 0.0f, 0.0f, 0.0f}; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 5a6d58e..13abfde 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -739,12 +739,12 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->vertexDecl = targetStateBlock->vertexDecl; } - if (This->changed.material - && memcmp(&targetStateBlock->material, &This->material, sizeof(This->material))) + if (This->changed.material && memcmp(&targetStateBlock->state.material, + &This->state.material, sizeof(This->state.material))) { TRACE("Updating material.\n"); - This->material = targetStateBlock->material; + This->state.material = targetStateBlock->state.material; } if (This->changed.viewport && memcmp(&targetStateBlock->state.viewport, @@ -990,7 +990,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Apply(IWineD3DStateBlock *iface) if (This->changed.material) { - IWineD3DDevice_SetMaterial(device, &This->material); + IWineD3DDevice_SetMaterial(device, &This->state.material); } if (This->changed.viewport) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 49e741a..b3c2617 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2349,6 +2349,7 @@ struct wined3d_stream_state struct wined3d_state { + WINED3DMATERIAL material; WINED3DVIEWPORT viewport; RECT scissor_rect; @@ -2405,9 +2406,6 @@ struct IWineD3DStateBlockImpl double clipplane[MAX_CLIPPLANES][4]; WINED3DCLIPSTATUS clip_status; - /* Material */ - WINED3DMATERIAL material; - /* Pixel Shader */ IWineD3DPixelShader *pixelShader;

1 0

Kovács András : dinput: Return an error in IDirectInputDevice2AImpl_GetProperty().
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: cde699b286789a5dc563333ddddec821187a14a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde699b286789a5dc563333dd… Author: Kovács András <andras(a)csevego.net> Date: Wed Sep 15 23:48:12 2010 -0500 dinput: Return an error in IDirectInputDevice2AImpl_GetProperty(). --- dlls/dinput/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a5c61ab..430351e 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -887,8 +887,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty( break; } default: - WARN("Unknown property %s\n", debugstr_guid(rguid)); - break; + FIXME("Unknown property %s\n", debugstr_guid(rguid)); + return DIERR_INVALIDPARAM; } return DI_OK;

1 0

Nikolay Sivov : msxml3/tests: Don' t raise a test error on first try to create a document.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: e5cd19a4cb7fa7cc1f8d19af19d40d836647f62b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5cd19a4cb7fa7cc1f8d19af1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 16 08:29:08 2010 +0400 msxml3/tests: Don't raise a test error on first try to create a document. --- dlls/msxml3/tests/domdoc.c | 140 ++++++++++++++++++++++---------------------- 1 files changed, 70 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5cd19a4cb7fa7cc1f8d1…

1 0

Alexandre Julliard : krnl386.exe: Remove 16 suffix on Get/ SetProcessDword since there's no 32-bit version.
by Alexandre Julliard 16 Sep '10

16 Sep '10

Module: wine Branch: master Commit: 5b6a24cc7c17d0d11fb234047569549cbcaf3056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b6a24cc7c17d0d11fb234047… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 16 10:03:26 2010 -0500 krnl386.exe: Remove 16 suffix on Get/SetProcessDword since there's no 32-bit version. --- dlls/krnl386.exe16/kernel.c | 4 ++-- dlls/krnl386.exe16/krnl386.exe16.spec | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/krnl386.exe16/kernel.c b/dlls/krnl386.exe16/kernel.c index 437eed1..a1f7fff 100644 --- a/dlls/krnl386.exe16/kernel.c +++ b/dlls/krnl386.exe16/kernel.c @@ -643,7 +643,7 @@ DWORD WINAPI MapProcessHandle( HANDLE hProcess ) * SetProcessDword (KERNEL.484) * 'Of course you cannot directly access Windows internal structures' */ -void WINAPI SetProcessDword16( DWORD dwProcessID, INT offset, DWORD value ) +void WINAPI SetProcessDword( DWORD dwProcessID, INT offset, DWORD value ) { TRACE("(%d, %d)\n", dwProcessID, offset ); @@ -684,7 +684,7 @@ void WINAPI SetProcessDword16( DWORD dwProcessID, INT offset, DWORD value ) * GetProcessDword (KERNEL.485) * 'Of course you cannot directly access Windows internal structures' */ -DWORD WINAPI GetProcessDword16( DWORD dwProcessID, INT offset ) +DWORD WINAPI GetProcessDword( DWORD dwProcessID, INT offset ) { DWORD x, y; STARTUPINFOW siw; diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index f3dbbea..f80cfcc 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -386,8 +386,8 @@ 481 pascal -ret16 _LeaveWin16Lock() _LeaveWin16Lock 482 pascal LoadSystemLibrary32(str) LoadLibrary32_16 # FIXME! 483 pascal MapProcessHandle(long) MapProcessHandle -484 pascal SetProcessDword(long s_word long) SetProcessDword16 -485 pascal GetProcessDword(long s_word) GetProcessDword16 +484 pascal SetProcessDword(long s_word long) SetProcessDword +485 pascal GetProcessDword(long s_word) GetProcessDword 486 pascal FreeLibrary32(long) FreeLibrary32_16 487 pascal GetModuleFileName32(long str word) GetModuleFileName32_16 488 pascal GetModuleHandle32(str) GetModuleHandle32_16 @@ -566,7 +566,7 @@ @ varargs -arch=win32 k32wsprintfA(str str) @ stdcall -arch=win32 k32wvsprintfA(ptr str ptr) @ stdcall -arch=win32 -register CommonUnimpStub() -@ stdcall -arch=win32 GetProcessDword16(long long) +@ stdcall -arch=win32 GetProcessDword(long long) @ stdcall -arch=win32 DosFileHandleToWin32Handle(long) @ stdcall -arch=win32 Win32HandleToDosFileHandle(long) @ stdcall -arch=win32 DisposeLZ32Handle(long)

1 0

Vincent Povirk : ws2_32: Add a test for selecting invalid sockets.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: e1705151a95949cef15f3cb583831ca0e2323a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1705151a95949cef15f3cb58… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Sep 12 16:17:09 2010 -0500 ws2_32: Add a test for selecting invalid sockets. --- dlls/ws2_32/tests/sock.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 631fcda..16c6fcb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1939,6 +1939,32 @@ static void test_select(void) broken(thread_params.ReadKilled == 0), /*Win98*/ "closesocket did not wakeup select\n"); + /* Test selecting invalid handles */ + FD_ZERO(&readfds); + FD_ZERO(&writefds); + FD_ZERO(&exceptfds); + FD_SET(INVALID_SOCKET, &readfds); + SetLastError(0); + ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); + todo_wine ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); + ok ( !FD_ISSET(fdRead, &readfds), "FD should not be set\n"); + + FD_ZERO(&readfds); + FD_SET(INVALID_SOCKET, &writefds); + SetLastError(0); + ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); + todo_wine ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); + ok ( !FD_ISSET(fdRead, &writefds), "FD should not be set\n"); + + FD_ZERO(&writefds); + FD_SET(INVALID_SOCKET, &exceptfds); + SetLastError(0); + ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); + todo_wine ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); + ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); } static DWORD WINAPI AcceptKillThread(select_thread_params *par)

1 0

Luca Bennati : inetcpl.cpl: Add Italian translation.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 5fd0bfe364df6726e394dfadf6b65719662419fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd0bfe364df6726e394dfadf… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Sep 10 13:59:09 2010 +0200 inetcpl.cpl: Add Italian translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_It.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 93bf2ac..66151e7 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ RC_SRCS = \ cpl_De.rc \ cpl_En.rc \ + cpl_It.rc \ inetcpl.rc SVG_SRCS = \ diff --git a/dlls/inetcpl.cpl/cpl_It.rc b/dlls/inetcpl.cpl/cpl_It.rc new file mode 100644 index 0000000..81e3044 --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_It.rc @@ -0,0 +1,33 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Luca Bennati <lucak3(a)gmail.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +/* UTF-8 */ +#pragma codepage(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Impostazioni di Internet" + IDS_CPL_INFO "Configura il browser Internet di Wine e le relative impostazioni" +END

1 0

Detlef Riekenberg : inetcpl: Add German translation.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: c9d2fb352b177b86cb542f524fc70116cec2e38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d2fb352b177b86cb542f524… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 10 13:32:43 2010 +0200 inetcpl: Add German translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_De.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 294cdbf..93bf2ac 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ inetcpl.c RC_SRCS = \ + cpl_De.rc \ cpl_En.rc \ inetcpl.rc diff --git a/dlls/inetcpl.cpl/cpl_De.rc b/dlls/inetcpl.cpl/cpl_De.rc new file mode 100644 index 0000000..397f0cd --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_De.rc @@ -0,0 +1,32 @@ +/* + * German resources for the Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +#pragma code_page(65001) + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Internet Einstellungen" + IDS_CPL_INFO "Wine Internet Browser und zugehörige Einstellungen anpassen." +END

1 0

Detlef Riekenberg : inetcpl: Add an applet icon.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: da488eacb3180c39f3fb1ab53a181b3fda130391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da488eacb3180c39f3fb1ab53… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 10 13:23:10 2010 +0200 inetcpl: Add an applet icon. --- dlls/inetcpl.cpl/Makefile.in | 3 + dlls/inetcpl.cpl/inetcpl.c | 2 +- dlls/inetcpl.cpl/inetcpl.h | 3 + dlls/inetcpl.cpl/inetcpl.ico | Bin 0 -> 25214 bytes dlls/inetcpl.cpl/inetcpl.rc | 3 + dlls/inetcpl.cpl/inetcpl.svg | 265 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 275 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da488eacb3180c39f3fb1…

1 0

Detlef Riekenberg : inetcpl: Add initial applet.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: e9b8d71dfb4b94273af44c7ae3b8225df19e62a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9b8d71dfb4b94273af44c7ae… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 10 00:02:44 2010 +0200 inetcpl: Add initial applet. --- configure | 1 + configure.ac | 1 + dlls/inetcpl.cpl/Makefile.in | 14 +++++ dlls/inetcpl.cpl/cpl_En.rc | 30 +++++++++++ dlls/inetcpl.cpl/inetcpl.c | 98 +++++++++++++++++++++++++++++++++++++ dlls/inetcpl.cpl/inetcpl.cpl.spec | 25 +++++++++ dlls/inetcpl.cpl/inetcpl.h | 27 ++++++++++ dlls/inetcpl.cpl/inetcpl.rc | 34 +++++++++++++ 8 files changed, 230 insertions(+), 0 deletions(-) diff --git a/configure b/configure index c47168d..6ba2a56 100755 --- a/configure +++ b/configure @@ -14660,6 +14660,7 @@ wine_fn_config_dll imm32 enable_imm32 imm32 wine_fn_config_test dlls/imm32/tests imm32_test wine_fn_config_dll inetcomm enable_inetcomm inetcomm wine_fn_config_test dlls/inetcomm/tests inetcomm_test +wine_fn_config_dll inetcpl.cpl enable_inetcpl_cpl wine_fn_config_dll inetmib1 enable_inetmib1 wine_fn_config_test dlls/inetmib1/tests inetmib1_test wine_fn_config_dll infosoft enable_infosoft diff --git a/configure.ac b/configure.ac index 0fe8ebe..a7f6b2b 100644 --- a/configure.ac +++ b/configure.ac @@ -2439,6 +2439,7 @@ WINE_CONFIG_DLL(imm32,,[imm32]) WINE_CONFIG_TEST(dlls/imm32/tests) WINE_CONFIG_DLL(inetcomm,,[inetcomm]) WINE_CONFIG_TEST(dlls/inetcomm/tests) +WINE_CONFIG_DLL(inetcpl.cpl) WINE_CONFIG_DLL(inetmib1) WINE_CONFIG_TEST(dlls/inetmib1/tests) WINE_CONFIG_DLL(infosoft) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in new file mode 100644 index 0000000..653fa0f --- /dev/null +++ b/dlls/inetcpl.cpl/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = inetcpl.cpl + +C_SRCS = \ + inetcpl.c + +RC_SRCS = \ + cpl_En.rc \ + inetcpl.rc + +@MAKE_DLL_RULES@ diff --git a/dlls/inetcpl.cpl/cpl_En.rc b/dlls/inetcpl.cpl/cpl_En.rc new file mode 100644 index 0000000..9b2161f --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_En.rc @@ -0,0 +1,30 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Internet Settings" + IDS_CPL_INFO "Configure Wine Internet Browser and related settings" +END diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c new file mode 100644 index 0000000..1f1ca66 --- /dev/null +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -0,0 +1,98 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define NONAMELESSUNION + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <cpl.h> + +#include "wine/debug.h" + +#include "inetcpl.h" + + +WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); + +/********************************************************************* + * DllMain (inetcpl.@) + */ +BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %d, %p)\n", hdll, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hdll); + } + return TRUE; +} + +/********************************************************************* + * CPlApplet (inetcpl.@) + * + * Control Panel entry point + * + * PARAMS + * hWnd [I] Handle for the Control Panel Window + * command [I] CPL_* Command + * lParam1 [I] first extra Parameter + * lParam2 [I] second extra Parameter + * + * RETURNS + * Depends on the command + * + */ +LONG CALLBACK CPlApplet(HWND hWnd, UINT command, LPARAM lParam1, LPARAM lParam2) +{ + TRACE("(%p, %u, 0x%lx, 0x%lx)\n", hWnd, command, lParam1, lParam2); + + switch (command) + { + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return 1; + + case CPL_INQUIRE: + { + CPLINFO *appletInfo = (CPLINFO *) lParam2; + + appletInfo->idIcon = 0; + appletInfo->idName = IDS_CPL_NAME; + appletInfo->idInfo = IDS_CPL_INFO; + appletInfo->lData = 0; + return TRUE; + } + + case CPL_DBLCLK: + FIXME("not implemented yet\n"); + break; + } + + return FALSE; +} diff --git a/dlls/inetcpl.cpl/inetcpl.cpl.spec b/dlls/inetcpl.cpl/inetcpl.cpl.spec new file mode 100644 index 0000000..4394145 --- /dev/null +++ b/dlls/inetcpl.cpl/inetcpl.cpl.spec @@ -0,0 +1,25 @@ +@ stub ClearMyTracksByProcessW +@ stub AddInternetPropertySheets +@ stub AddInternetPropertySheetsEx +@ stdcall CPlApplet(long long long long) +@ stub DisplayPopupWindowManagementDialog +@ stub DllInstall +@ stub GetAddSitesDisplayUrl +@ stub ImportExportPFX +@ stub LaunchAddSitesDialog +@ stub LaunchConnectionDialog +@ stub LaunchInternetControlPanel +@ stub LaunchPerSitePrivacyActionDialog +@ stub LaunchPopupWindowManagementDialog +@ stub LaunchPrivacyDialog +@ stub LaunchSecurityDialog +@ stub LaunchSecurityDialogEx +@ stub LaunchSiteCertDialog +@ stub OpenFontsDialog +@ stub OpenFontsDialogEx +@ stub OpenLanguageDialog +@ stub ResetIEtoDefaults +@ stub ShowDeleteBrowsingHistoryDialog +@ stub ShowFeedOptionsDialog +@ stub ShowLanguageDialog +@ stub SiteCert_RunFromCmdLine diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h new file mode 100644 index 0000000..85b362e --- /dev/null +++ b/dlls/inetcpl.cpl/inetcpl.h @@ -0,0 +1,27 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <windef.h> +#include <winuser.h> + +/* strings */ +#define IDS_CPL_NAME 1 +#define IDS_CPL_INFO 2 diff --git a/dlls/inetcpl.cpl/inetcpl.rc b/dlls/inetcpl.cpl/inetcpl.rc new file mode 100644 index 0000000..8dea319 --- /dev/null +++ b/dlls/inetcpl.cpl/inetcpl.rc @@ -0,0 +1,34 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +#define WINE_FILENAME_STR "inetcpl.cpl" +#define WINE_FILEDESCRIPTION_STR "Internet Control Panel" + +/* Same Version as IE 8 on WinXP */ +#define WINE_FILEVERSION 8,0,6001,18939 +#define WINE_FILEVERSION_STR "8.00.6001.18939" + +#define WINE_PRODUCTVERSION 8,0,6001,18939 +#define WINE_PRODUCTVERSION_STR "8.00.6001.18939" + +#include "wine/wine_common_ver.rc"

1 0

Vladimir Panteleev : user32: Fix VK_RETURN handling in IsDialogMessage for dialogs without an IDOK.
by Alexandre Julliard 15 Sep '10

15 Sep '10

Module: wine Branch: master Commit: 592d994f0077c19dc9fa2db988f70d5d4c2a9cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=592d994f0077c19dc9fa2db98… Author: Vladimir Panteleev <vladimir(a)thecybershadow.net> Date: Tue Sep 14 16:46:55 2010 +0300 user32: Fix VK_RETURN handling in IsDialogMessage for dialogs without an IDOK. --- dlls/user32/dialog.c | 6 ++---- dlls/user32/tests/dialog.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index aac8a4d..052fbff 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1221,10 +1221,8 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) else if (DC_HASDEFID == HIWORD(dw = SendMessageW (hwndDlg, DM_GETDEFID, 0, 0))) { HWND hwndDef = GetDlgItem(hwndDlg, LOWORD(dw)); - if (!hwndDef || !IsWindowEnabled(hwndDef)) - return TRUE; - SendMessageW( hwndDlg, WM_COMMAND, MAKEWPARAM( LOWORD(dw), BN_CLICKED ), - (LPARAM)GetDlgItem(hwndDlg, LOWORD(dw))); + if (hwndDef ? IsWindowEnabled(hwndDef) : LOWORD(dw)==IDOK) + SendMessageW( hwndDlg, WM_COMMAND, MAKEWPARAM( LOWORD(dw), BN_CLICKED ), (LPARAM)hwndDef); } else { diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index b7727da..736c99d 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1000,6 +1000,28 @@ static INT_PTR CALLBACK TestDefButtonDlgProc (HWND hDlg, UINT uiMsg, return FALSE; } +static INT_PTR CALLBACK TestReturnKeyDlgProc (HWND hDlg, UINT uiMsg, + WPARAM wParam, LPARAM lParam) +{ + static int received_idok = 0; + switch (uiMsg) + { + case WM_INITDIALOG: + { + MSG msg = {hDlg, WM_KEYDOWN, VK_RETURN, 0x011c0001}; + IsDialogMessage(hDlg, &msg); + } + ok(received_idok, "WM_COMMAND not received\n"); + EndDialog(hDlg, 0); + return TRUE; + case WM_COMMAND: + ok(wParam==IDOK, "Expected IDOK\n"); + received_idok = 1; + return TRUE; + } + return FALSE; +} + static void test_DialogBoxParamA(void) { INT_PTR ret; @@ -1044,6 +1066,8 @@ static void test_DialogBoxParamA(void) ret = DialogBoxParamA(GetModuleHandle(NULL), "TEST_EMPTY_DIALOG", 0, TestDefButtonDlgProc, 0); ok(ret == IDOK, "Expected IDOK\n"); + + DialogBoxParamA(GetModuleHandle(NULL), "TEST_EMPTY_DIALOG", 0, TestReturnKeyDlgProc, 0); } static void test_DisabledDialogTest(void)

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
86
Older →

Jump to page:

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 September 2010