May 2008 - Wine-commits - list.winehq.org

Alexander Dorofeyev : ddraw: Fix some texture blending modes.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 30221f7bcdc2a31cebfac227a20a3a4b0098404e URL: http://source.winehq.org/git/wine.git/?a=commit;h=30221f7bcdc2a31cebfac227a… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon May 5 01:06:00 2008 +0300 ddraw: Fix some texture blending modes. --- dlls/ddraw/device.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a2030aa..70a3cf6 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2710,6 +2710,14 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, break; } + case D3DTBLEND_ADD: + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLOROP, WINED3DTOP_ADD); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG2, WINED3DTA_CURRENT); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_SELECTARG2); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG2, WINED3DTA_CURRENT); + break; + case D3DTBLEND_MODULATEALPHA: IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); @@ -2719,6 +2727,7 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_MODULATE); break; + case D3DTBLEND_COPY: case D3DTBLEND_DECAL: IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); @@ -2727,11 +2736,11 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, break; case D3DTBLEND_DECALALPHA: + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLOROP, WINED3DTOP_BLENDTEXTUREALPHA); IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); - IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG2, WINED3DTA_CURRENT); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_SELECTARG2); IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG2, WINED3DTA_CURRENT); - IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLOROP, WINED3DTOP_SELECTARG1); - IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_MODULATE); break; default:

1 0

Maarten Lankhorst : winex11.drv: Fix a compiler warning.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 2d50b5cef5e0c9296cc9855477615b69ed1d337c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d50b5cef5e0c9296cc985547… Author: Maarten Lankhorst <crumb(a)virgo23.smo.corp.google.com> Date: Mon May 5 10:02:36 2008 -0700 winex11.drv: Fix a compiler warning. --- dlls/winex11.drv/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 197ee21..6b6055f 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1491,9 +1491,9 @@ static unsigned char *get_icm_profile( unsigned long *size ) XGetWindowProperty( gdi_display, DefaultRootWindow(gdi_display), x11drv_atom(_ICC_PROFILE), 0, ~0UL, False, AnyPropertyType, &type, &format, &count, &remaining, &profile ); + *size = get_property_size( format, count ); if (format && count) { - *size = get_property_size( format, count ); if ((ret = HeapAlloc( GetProcessHeap(), 0, *size ))) memcpy( ret, profile, *size ); XFree( profile ); }

1 0

Hwang YunSong(황윤성 : winecfg: Updated Korean resource.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 80c822488dd8467c01619b168a6710cfbfd6d829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c822488dd8467c01619b168… Author: Hwang YunSong(황윤성 <hys545(a)dreamwiz.com> Date: Mon May 5 10:10:34 2008 +0900 winecfg: Updated Korean resource. --- programs/winecfg/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 9b97f0a..2210155 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -83,7 +83,7 @@ BEGIN CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15 EDITTEXT IDC_RES_DPIEDIT,204,161,23,13,ES_NUMBER|WS_TABSTOP LTEXT "dpi",IDC_STATIC,235,163,10,8 - LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,181,230,55 + LTEXT "�̰�� Tahoma 10 ��Ʈ�� Դϴ� ",IDC_RES_FONT_PREVIEW,15,181,230,55 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Dmitry Timoshkov : winoldap.mod: Wait until the 32-bit process starts up.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: dca9f314a880336b36f49cd51dcf8e13d2a59fa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca9f314a880336b36f49cd51… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue May 6 00:31:53 2008 +0900 winoldap.mod: Wait until the 32-bit process starts up. --- dlls/kernel32/kernel16.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c index 81c9bee..a330e57 100644 --- a/dlls/kernel32/kernel16.c +++ b/dlls/kernel32/kernel16.c @@ -28,6 +28,7 @@ #include "toolhelp.h" #include "kernel_private.h" #include "kernel16_private.h" +#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(module); @@ -134,6 +135,31 @@ HANDLE WINAPI CreateThread16( SECURITY_ATTRIBUTES *sa, DWORD stack, return CreateThread( sa, stack, start_thread16, args, flags, id ); } + +/*********************************************************************** + * wait_input_idle + * + * user32.WaitForInputIdle releases the win16 lock, so here is a replacement. + */ +static DWORD wait_input_idle( HANDLE process, DWORD timeout ) +{ + DWORD ret; + HANDLE handles[2]; + + handles[0] = process; + SERVER_START_REQ( get_process_idle_event ) + { + req->handle = process; + if (!(ret = wine_server_call_err( req ))) handles[1] = reply->event; + } + SERVER_END_REQ; + if (ret) return WAIT_FAILED; /* error */ + if (!handles[1]) return 0; /* no event to wait on */ + + return WaitForMultipleObjects( 2, handles, FALSE, timeout ); +} + + /************************************************************************** * WINOLDAP entry point */ @@ -157,20 +183,26 @@ void WINAPI WINOLDAP_EntryPoint( CONTEXT86 *context ) cmdline = HeapAlloc( GetProcessHeap(), 0, len + 1 ); memcpy( cmdline, psp->cmdLine + 1, len ); cmdline[len] = 0; - ReleaseThunkLock( &count ); memset( &startup, 0, sizeof(startup) ); startup.cb = sizeof(startup); - /* FIXME: Should this be WinExec instead of CreateProcess? */ if (CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info )) { + /* Give 10 seconds to the app to come up */ + if (wait_input_idle( info.hProcess, 10000 ) == WAIT_FAILED) + WARN("WaitForInputIdle failed: Error %d\n", GetLastError() ); + ReleaseThunkLock( &count ); + WaitForSingleObject( info.hProcess, INFINITE ); GetExitCodeProcess( info.hProcess, &exit_code ); CloseHandle( info.hThread ); CloseHandle( info.hProcess ); } + else + ReleaseThunkLock( &count ); + HeapFree( GetProcessHeap(), 0, cmdline ); ExitThread( exit_code ); }

1 0

Alexander Dorofeyev : ddraw/tests: Add test for deprecated render states in d3d7.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: d5db7615a28b526236def5b6858b60229170dd5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5db7615a28b526236def5b68… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun May 4 15:04:58 2008 +0300 ddraw/tests: Add test for deprecated render states in d3d7. --- dlls/ddraw/tests/d3d.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index b10993b..e81d802 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1590,6 +1590,32 @@ out: IDirect3DVertexBuffer7_Release(lpVBufSrc); } +static void D3D7_OldRenderStateTest(void) +{ + HRESULT rc; + DWORD val; + + /* Test reaction to some deprecated states in D3D7. + + * IDirect3DDevice7 in Wine currently relays such states to wined3d where they are do-nothing and return 0, instead + * of INVALIDPARAMS. Unless an app is found which cares this is probably ok. What this test shows is that these states + * need not to be handled in D3D7. + */ + todo_wine { + rc = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREHANDLE, 0); + ok(rc == DDERR_INVALIDPARAMS, "IDirect3DDevice7_SetRenderState returned %08x\n", rc); + + rc = IDirect3DDevice7_GetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREHANDLE, &val); + ok(rc == DDERR_INVALIDPARAMS, "IDirect3DDevice7_GetRenderState returned %08x\n", rc); + + rc = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); + ok(rc == DDERR_INVALIDPARAMS, "IDirect3DDevice7_SetRenderState returned %08x\n", rc); + + rc = IDirect3DDevice7_GetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREMAPBLEND, &val); + ok(rc == DDERR_INVALIDPARAMS, "IDirect3DDevice7_GetRenderState returned %08x\n", rc); + } +} + START_TEST(d3d) { @@ -1610,6 +1636,7 @@ START_TEST(d3d) D3D7EnumTest(); CapsTest(); VertexBufferDescTest(); + D3D7_OldRenderStateTest(); ReleaseDirect3D(); }

1 0

Alexander Dorofeyev : ddraw: Move handling of D3DRENDERSTATE_TEXTUREHANDLE from d3ddevice7 to d3ddevice3 .
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: edaaf63bd64b3cdceb088f396b843c9693623c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=edaaf63bd64b3cdceb088f396… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun May 4 15:05:02 2008 +0300 ddraw: Move handling of D3DRENDERSTATE_TEXTUREHANDLE from d3ddevice7 to d3ddevice3. As supported by tests, there is no reason for this state to be handled by d3ddevice7, and moving it to d3ddevice3 prepares for the changes in next patch (setting TEXTUREHANDLE state can then go through SetTexture of d3ddevice3). --- dlls/ddraw/device.c | 174 +++++++++++++++++++++++++++----------------------- 1 files changed, 94 insertions(+), 80 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9ff24f3..5d3a70b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2265,39 +2265,6 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, EnterCriticalSection(&ddraw_cs); switch(RenderStateType) { - case D3DRENDERSTATE_TEXTUREHANDLE: - { - /* This state is wrapped to SetTexture in SetRenderState, so - * it has to be wrapped to GetTexture here - */ - IWineD3DBaseTexture *tex = NULL; - *Value = 0; - - hr = IWineD3DDevice_GetTexture(This->wineD3DDevice, - 0, - &tex); - - if(hr == WINED3D_OK && tex) - { - IDirectDrawSurface7 *parent = NULL; - hr = IWineD3DBaseTexture_GetParent(tex, - (IUnknown **) &parent); - if(parent) - { - /* The parent of the texture is the IDirectDrawSurface7 interface - * of the ddraw surface - */ - IDirectDrawSurfaceImpl *texImpl = ICOM_OBJECT(IDirectDrawSurfaceImpl, - IDirectDrawSurface7, - parent); - *Value = texImpl->Handle; - IDirectDrawSurface7_Release(parent); - } - IWineD3DBaseTexture_Release(tex); - } - break; - } - case D3DRENDERSTATE_TEXTUREMAG: { WINED3DTEXTUREFILTERTYPE tex_mag; @@ -2367,15 +2334,55 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, } static HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface, - D3DRENDERSTATETYPE dwRenderStateType, - DWORD *lpdwRenderState) +IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface, + D3DRENDERSTATETYPE dwRenderStateType, + DWORD *lpdwRenderState) { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice3, iface); - TRACE_(ddraw_thunk)("(%p)->(%08x,%p) thunking to IDirect3DDevice7 interface.\n", This, dwRenderStateType, lpdwRenderState); - return IDirect3DDevice7_GetRenderState(ICOM_INTERFACE(This, IDirect3DDevice7), + HRESULT hr; + TRACE("(%p)->(%08x,%p)\n", This, dwRenderStateType, lpdwRenderState); + + switch(dwRenderStateType) + { + case D3DRENDERSTATE_TEXTUREHANDLE: + { + /* This state is wrapped to SetTexture in SetRenderState, so + * it has to be wrapped to GetTexture here + */ + IWineD3DBaseTexture *tex = NULL; + *lpdwRenderState = 0; + + hr = IWineD3DDevice_GetTexture(This->wineD3DDevice, + 0, + &tex); + + if(hr == WINED3D_OK && tex) + { + IDirectDrawSurface7 *parent = NULL; + hr = IWineD3DBaseTexture_GetParent(tex, + (IUnknown **) &parent); + if(parent) + { + /* The parent of the texture is the IDirectDrawSurface7 interface + * of the ddraw surface + */ + IDirectDrawSurfaceImpl *texImpl = ICOM_OBJECT(IDirectDrawSurfaceImpl, + IDirectDrawSurface7, + parent); + *lpdwRenderState = texImpl->Handle; + IDirectDrawSurface7_Release(parent); + } + IWineD3DBaseTexture_Release(tex); + } + + return hr; + } + + default: + return IDirect3DDevice7_GetRenderState(ICOM_INTERFACE(This, IDirect3DDevice7), dwRenderStateType, lpdwRenderState); + } } static HRESULT WINAPI @@ -2462,7 +2469,7 @@ IDirect3DDeviceImpl_2_GetRenderState(IDirect3DDevice2 *iface, } default: - return IDirect3DDevice7_GetRenderState(ICOM_INTERFACE(This, IDirect3DDevice7), + return IDirect3DDevice3_GetRenderState(ICOM_INTERFACE(This, IDirect3DDevice3), dwRenderStateType, lpdwRenderState); } @@ -2498,38 +2505,6 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, /* Some render states need special care */ switch(RenderStateType) { - case D3DRENDERSTATE_TEXTUREHANDLE: - { - if(Value == 0) - { - hr = IWineD3DDevice_SetTexture(This->wineD3DDevice, - 0, - NULL); - break; - } - - if(Value > This->numHandles) - { - FIXME("Specified handle %d out of range\n", Value); - hr = DDERR_INVALIDPARAMS; - break; - } - if(This->Handles[Value - 1].type != DDrawHandle_Texture) - { - FIXME("Handle %d isn't a texture handle\n", Value); - hr = DDERR_INVALIDPARAMS; - break; - } - else - { - IDirectDrawSurfaceImpl *surf = (IDirectDrawSurfaceImpl *) This->Handles[Value - 1].ptr; - hr = IWineD3DDevice_SetTexture(This->wineD3DDevice, - 0, - surf->wineD3DTexture); - break; - } - } - case D3DRENDERSTATE_TEXTUREMAG: { WINED3DTEXTUREFILTERTYPE tex_mag = WINED3DTEXF_NONE; @@ -2627,15 +2602,54 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, } static HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, - D3DRENDERSTATETYPE RenderStateType, - DWORD Value) +IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, + D3DRENDERSTATETYPE RenderStateType, + DWORD Value) { + HRESULT hr; ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice3, iface); - TRACE_(ddraw_thunk)("(%p)->(%08x,%08x) thunking to IDirect3DDevice7 interface.\n", This, RenderStateType, Value); - return IDirect3DDevice7_SetRenderState(ICOM_INTERFACE(This, IDirect3DDevice7), + TRACE("(%p)->(%08x,%d)\n", This, RenderStateType, Value); + + switch(RenderStateType) + { + case D3DRENDERSTATE_TEXTUREHANDLE: + { + if(Value == 0) + { + hr = IWineD3DDevice_SetTexture(This->wineD3DDevice, + 0, + NULL); + break; + } + + if(Value > This->numHandles) + { + FIXME("Specified handle %d out of range\n", Value); + hr = DDERR_INVALIDPARAMS; + break; + } + if(This->Handles[Value - 1].type != DDrawHandle_Texture) + { + FIXME("Handle %d isn't a texture handle\n", Value); + hr = DDERR_INVALIDPARAMS; + break; + } + else + { + IDirectDrawSurfaceImpl *surf = (IDirectDrawSurfaceImpl *) This->Handles[Value - 1].ptr; + hr = IDirect3DDevice3_SetTexture(iface, 0, ICOM_INTERFACE(surf, IDirect3DTexture2)); + break; + } + } + + default: + hr = IDirect3DDevice7_SetRenderState(ICOM_INTERFACE(This, IDirect3DDevice7), RenderStateType, Value); + break; + } + + return hr; } static HRESULT WINAPI @@ -2749,7 +2763,7 @@ IDirect3DDeviceImpl_2_SetRenderState(IDirect3DDevice2 *iface, IDirect3DDevice2_GetRenderState(iface, D3DRENDERSTATE_TEXTUREMAPBLEND, &texmapblend); - hr = IDirect3DDevice7_SetRenderState(ICOM_INTERFACE(This, IDirect3DDevice7), + hr = IDirect3DDevice3_SetRenderState(ICOM_INTERFACE(This, IDirect3DDevice3), D3DRENDERSTATE_TEXTUREHANDLE, Value); @@ -2799,7 +2813,7 @@ IDirect3DDeviceImpl_2_SetRenderState(IDirect3DDevice2 *iface, } default: - hr = IDirect3DDevice7_SetRenderState(ICOM_INTERFACE(This, IDirect3DDevice7), + hr = IDirect3DDevice3_SetRenderState(ICOM_INTERFACE(This, IDirect3DDevice3), RenderStateType, Value); break; @@ -5592,8 +5606,8 @@ const IDirect3DDevice3Vtbl IDirect3DDevice3_Vtbl = IDirect3DDeviceImpl_3_Vertex, IDirect3DDeviceImpl_3_Index, IDirect3DDeviceImpl_3_End, - Thunk_IDirect3DDeviceImpl_3_GetRenderState, - Thunk_IDirect3DDeviceImpl_3_SetRenderState, + IDirect3DDeviceImpl_3_GetRenderState, + IDirect3DDeviceImpl_3_SetRenderState, IDirect3DDeviceImpl_3_GetLightState, IDirect3DDeviceImpl_3_SetLightState, Thunk_IDirect3DDeviceImpl_3_SetTransform,

1 0

Hwang YunSong(황윤성 : winhelp: Updated Korean resource.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 78199009676237ea3015917ee8c6f991107f50eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=78199009676237ea3015917ee… Author: Hwang YunSong(황윤성 <hys545(a)dreamwiz.com> Date: Mon May 5 10:10:14 2008 +0900 winhelp: Updated Korean resource. --- programs/winhelp/Ko.rc | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/Ko.rc b/programs/winhelp/Ko.rc index 273acd7..b1152dc 100644 --- a/programs/winhelp/Ko.rc +++ b/programs/winhelp/Ko.rc @@ -82,3 +82,26 @@ STID_HELP_FILES_HLP, " STID_FILE_NOT_FOUND_s "%s�� ã�� ϴ�'. �� ã�ڽ��ϱ�?" STID_NO_RICHEDIT "richedit �� ã�� ϴ�.. ��" } + +CONTEXT_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +BEGIN + POPUP "" + BEGIN + MENUITEM "�ּ�...", MNID_CTXT_ANNOTATE + MENUITEM "��", MNID_CTXT_COPY + MENUITEM "�μ�...", MNID_CTXT_PRINT + POPUP "�۲�" + BEGIN + MENUITEM "��", MNID_CTXT_FONTS_SMALL + MENUITEM "��", MNID_CTXT_FONTS_NORMAL + MENUITEM "�а�", MNID_CTXT_FONTS_LARGE + END + POPUP "�� ׻� ��̱�" + BEGIN + MENUITEM "�⺻", MNID_CTXT_HELP_DEFAULT + MENUITEM "��̱�", MNID_CTXT_HELP_VISIBLE + MENUITEM "�� ̱�", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "�ý�� ", MNID_CTXT_SYSTEM_COLORS + END +END

1 0

Andrew Talbot : advapi32: Avoid giving variables same name as library functions.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 092a2b3efa5994aa6d84ea8ce09b28e8a1a72575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092a2b3efa5994aa6d84ea8ce… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon May 5 12:13:02 2008 +0100 advapi32: Avoid giving variables same name as library functions. --- dlls/advapi32/crypt.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 5dcb709..131c223 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -1196,23 +1196,23 @@ BOOL WINAPI CryptEnumProvidersA (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPSTR pszProvName, DWORD *pcbProvName) { PWSTR str = NULL; - DWORD strlen; + DWORD bufsize; BOOL ret; /* = FALSE; */ TRACE("(%d, %p, %08x, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszProvName, pcbProvName); - if(!CryptEnumProvidersW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &strlen)) + if(!CryptEnumProvidersW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &bufsize)) return FALSE; - if ( pszProvName && !(str = CRYPT_Alloc(strlen)) ) + if ( pszProvName && !(str = CRYPT_Alloc(bufsize)) ) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - ret = CryptEnumProvidersW(dwIndex, pdwReserved, dwFlags, pdwProvType, str, &strlen); + ret = CryptEnumProvidersW(dwIndex, pdwReserved, dwFlags, pdwProvType, str, &bufsize); if (str) CRYPT_UnicodeToANSI(str, &pszProvName, *pcbProvName); - *pcbProvName = strlen / sizeof(WCHAR); /* FIXME: not correct */ + *pcbProvName = bufsize / sizeof(WCHAR); /* FIXME: not correct */ if (str) { CRYPT_Free(str); @@ -1325,23 +1325,23 @@ BOOL WINAPI CryptEnumProviderTypesA (DWORD dwIndex, DWORD *pdwReserved, DWORD dwFlags, DWORD *pdwProvType, LPSTR pszTypeName, DWORD *pcbTypeName) { PWSTR str = NULL; - DWORD strlen; + DWORD bufsize; BOOL ret; TRACE("(%d, %p, %08x, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszTypeName, pcbTypeName); - if(!CryptEnumProviderTypesW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &strlen)) + if(!CryptEnumProviderTypesW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &bufsize)) return FALSE; - if ( pszTypeName && !(str = CRYPT_Alloc(strlen)) ) + if ( pszTypeName && !(str = CRYPT_Alloc(bufsize)) ) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - ret = CryptEnumProviderTypesW(dwIndex, pdwReserved, dwFlags, pdwProvType, str, &strlen); + ret = CryptEnumProviderTypesW(dwIndex, pdwReserved, dwFlags, pdwProvType, str, &bufsize); if (str) CRYPT_UnicodeToANSI(str, &pszTypeName, *pcbTypeName); - *pcbTypeName = strlen / sizeof(WCHAR); + *pcbTypeName = bufsize / sizeof(WCHAR); if (str) { CRYPT_Free(str); @@ -1525,21 +1525,21 @@ BOOL WINAPI CryptGetDefaultProviderA (DWORD dwProvType, DWORD *pdwReserved, DWORD dwFlags, LPSTR pszProvName, DWORD *pcbProvName) { PWSTR str = NULL; - DWORD strlen; + DWORD bufsize; BOOL ret = FALSE; TRACE("(%d, %p, %08x, %p, %p)\n", dwProvType, pdwReserved, dwFlags, pszProvName, pcbProvName); - CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, NULL, &strlen); - if ( pszProvName && !(str = CRYPT_Alloc(strlen)) ) + CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, NULL, &bufsize); + if ( pszProvName && !(str = CRYPT_Alloc(bufsize)) ) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - ret = CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, str, &strlen); + ret = CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, str, &bufsize); if (str) CRYPT_UnicodeToANSI(str, &pszProvName, *pcbProvName); - *pcbProvName = strlen / sizeof(WCHAR); + *pcbProvName = bufsize / sizeof(WCHAR); if (str) { CRYPT_Free(str);

1 0

Andrew Talbot : hlink: Remove unneeded address-of operators from function names.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 0695c568eb2921c3e877eac22f2ec96998e6907b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0695c568eb2921c3e877eac22… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon May 5 12:49:54 2008 +0100 hlink: Remove unneeded address-of operators from function names. --- dlls/hlink/hlink_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 43e9e7f..213506e 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -481,8 +481,8 @@ static const IClassFactoryVtbl hlcfvt = HLinkCF_fnLockServer }; -static CFImpl HLink_cf = { &hlcfvt, &HLink_Constructor }; -static CFImpl HLinkBrowseContext_cf = { &hlcfvt, &HLinkBrowseContext_Constructor }; +static CFImpl HLink_cf = { &hlcfvt, HLink_Constructor }; +static CFImpl HLinkBrowseContext_cf = { &hlcfvt, HLinkBrowseContext_Constructor }; /*********************************************************************** * DllGetClassObject (HLINK.@)

1 0

Andrew Talbot : d3d8: Dangling pointers fix.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: c8d495bac12db511822ff2f83038f1e6aaf82c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d495bac12db511822ff2f83… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon May 5 16:42:51 2008 +0100 d3d8: Dangling pointers fix. --- dlls/d3d8/device.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a846bf6..cf864cc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -472,9 +472,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateTexture(LPDIRECT3DDEVICE8 iface IUnknown_AddRef(iface); object->parentDevice = iface; *ppTexture = (LPDIRECT3DTEXTURE8) object; + TRACE("(%p) Created Texture %p, %p\n",This,object,object->wineD3DTexture); } - TRACE("(%p) Created Texture %p, %p\n",This,object,object->wineD3DTexture); return hrc; } @@ -1184,8 +1184,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateStateBlock(LPDIRECT3DDEVICE8 if *pToken = 0; } else { *pToken = (DWORD)object; + TRACE("(%p) returning token (ptr to stateblock) of %p\n", This, object); } - TRACE("(%p) returning token (ptr to stateblock) of %p\n", This, object); return hrc; } @@ -1584,10 +1584,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 *ppShader = (handle - This->shader_handles) + VS_HIGHESTFIXEDFXF + 1; load_local_constants(pDeclaration, object->wineD3DVertexShader); + TRACE("(%p) : returning %p (handle %#x)\n", This, object, *ppShader); } } LeaveCriticalSection(&d3d8_cs); - TRACE("(%p) : returning %p (handle %#x)\n", This, object, *ppShader); return hrc; } @@ -1890,12 +1890,12 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreatePixelShader(LPDIRECT3DDEVICE8 i object->handle = handle; *handle = object; *ppShader = (handle - This->shader_handles) + VS_HIGHESTFIXEDFXF + 1; + TRACE("(%p) : returning %p (handle %#x)\n", This, object, *ppShader); } } LeaveCriticalSection(&d3d8_cs); } - TRACE("(%p) : returning %p (handle %#x)\n", This, object, *ppShader); return hrc; }

1 0