October 2006 - Wine-Commits

Dmitry Timoshkov : setupapi: Fix a typo.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: ab83183c03e0eccda67176f393ea0525b4d1ecf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab83183c03e0eccda67176f39… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 16 20:21:28 2006 +0900 setupapi: Fix a typo. --- dlls/setupapi/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 846f86c..f6a541b 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -286,7 +286,7 @@ static BOOL do_reg_operation( HKEY hkey, { BOOL exists = !RegQueryValueExW( hkey, value, NULL, NULL, NULL, NULL ); if (exists && (flags & FLG_ADDREG_NOCLOBBER)) return TRUE; - if (!exists & (flags & FLG_ADDREG_OVERWRITEONLY)) return TRUE; + if (!exists && (flags & FLG_ADDREG_OVERWRITEONLY)) return TRUE; } switch(flags & FLG_ADDREG_TYPE_MASK)

1 0

Hans Leidekker : winhelp: Cast-qual warnings fix.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 41f514570b07733324a844e66d9be86cd9714cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f514570b07733324a844e66… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Oct 16 14:42:32 2006 +0200 winhelp: Cast-qual warnings fix. --- programs/winhelp/winhelp.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 9cf7993..6f68f82 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -483,6 +483,7 @@ BOOL WINHELP_CreateHelpWindow(HLPFILE_PA HWND hWnd; BOOL bPrimary; BOOL bPopup; + LPSTR name; bPrimary = !lstrcmpi(wi->name, "main"); bPopup = wi->win_style & WS_POPUP; @@ -495,8 +496,9 @@ BOOL WINHELP_CreateHelpWindow(HLPFILE_PA win->next = Globals.win_list; Globals.win_list = win; - win->lpszName = (char*)win + sizeof(WINHELP_WINDOW); - lstrcpy((char*)win->lpszName, wi->name); + name = (char*)win + sizeof(WINHELP_WINDOW); + lstrcpy(name, wi->name); + win->lpszName = name; win->page = page; @@ -757,7 +759,7 @@ static LRESULT CALLBACK WINHELP_ButtonBo SIZE textsize; if (!button->hWnd) { - button->hWnd = CreateWindow(STRING_BUTTON, (LPSTR) button->lpszName, + button->hWnd = CreateWindow(STRING_BUTTON, button->lpszName, WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON, 0, 0, 0, 0, hWnd, (HMENU) button->wParam,

1 0

Stefan Dösinger : ddraw: Implement GetRenderState for D3DRENDERSTATE_TEXTURE[MIN/MAG].
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 116236f18c62ae31c5254509964c4428338375ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=116236f18c62ae31c52545099… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Oct 16 12:43:57 2006 +0200 ddraw: Implement GetRenderState for D3DRENDERSTATE_TEXTURE[MIN/MAG]. --- dlls/ddraw/device.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8b519a6..345e974 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2135,6 +2135,52 @@ IDirect3DDeviceImpl_7_GetRenderState(IDi return hr; } + case D3DRENDERSTATE_TEXTUREMAG: + { + WINED3DTEXTUREFILTERTYPE tex_mag; + + hr = IWineD3DDevice_GetSamplerState(This->wineD3DDevice, + 0, WINED3DSAMP_MAGFILTER, + &tex_mag); + + switch (tex_mag) + { + case WINED3DTEXF_POINT: + *Value = D3DFILTER_NEAREST; + break; + case WINED3DTEXF_LINEAR: + *Value = D3DFILTER_LINEAR; + break; + default: + ERR("Unhandled texture mag %d !\n",tex_mag); + *Value = 0; + } + return hr; + } + + case D3DRENDERSTATE_TEXTUREMIN: + { + WINED3DTEXTUREFILTERTYPE tex_min; + + hr = IWineD3DDevice_GetSamplerState(This->wineD3DDevice, + 0, WINED3DSAMP_MINFILTER, + &tex_min); + + switch (tex_min) + { + case WINED3DTEXF_POINT: + *Value = D3DFILTER_NEAREST; + break; + case WINED3DTEXF_LINEAR: + *Value = D3DFILTER_LINEAR; + break; + default: + ERR("Unhandled texture mag %d !\n",tex_min); + *Value = 0; + } + return hr; + } + case D3DRENDERSTATE_TEXTUREADDRESSU: case D3DRENDERSTATE_TEXTUREADDRESSV: case D3DRENDERSTATE_TEXTUREADDRESS:

1 0

Stefan Dösinger : ddraw: Implement GetRenderState for D3DRENDERSTATE_TEXTUREADDRESS[U/V].
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 1d65ade5fa5641a96c15e5a00b2243d73583f6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d65ade5fa5641a96c15e5a00… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Oct 16 12:40:51 2006 +0200 ddraw: Implement GetRenderState for D3DRENDERSTATE_TEXTUREADDRESS[U/V]. --- dlls/ddraw/device.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 09d2ca9..8b519a6 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2135,6 +2135,29 @@ IDirect3DDeviceImpl_7_GetRenderState(IDi return hr; } + case D3DRENDERSTATE_TEXTUREADDRESSU: + case D3DRENDERSTATE_TEXTUREADDRESSV: + case D3DRENDERSTATE_TEXTUREADDRESS: + { + WINED3DTEXTURESTAGESTATETYPE TexStageStateType; + + if (RenderStateType == D3DRENDERSTATE_TEXTUREADDRESS) + { + TexStageStateType = WINED3DTSS_ADDRESS; + } + else if (RenderStateType == D3DRENDERSTATE_TEXTUREADDRESSU) + { + TexStageStateType = WINED3DTSS_ADDRESSU; + } + else + { + TexStageStateType = WINED3DTSS_ADDRESSV; + } + return IWineD3DDevice_GetTextureStageState(This->wineD3DDevice, + 0, TexStageStateType, + Value); + } + default: /* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */ return IWineD3DDevice_GetRenderState(This->wineD3DDevice,

1 0

Kai Blin : secur32: Stop leaking the session key memory.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 306048bdeb6e38188e91ad3dbde81a37782dc271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=306048bdeb6e38188e91ad3db… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Oct 16 10:13:26 2006 +0200 secur32: Stop leaking the session key memory. --- dlls/secur32/dispatcher.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 27c1f9a..7b5d6af 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -256,9 +256,10 @@ void cleanup_helper(PNegoHelper helper) TRACE("Killing helper %p\n", helper); if( (helper == NULL) || (helper->helper_pid == 0)) return; - + HeapFree(GetProcessHeap(), 0, helper->password); HeapFree(GetProcessHeap(), 0, helper->com_buf); + HeapFree(GetProcessHeap(), 0, helper->session_key); /* closing stdin will terminate ntlm_auth */ close(helper->pipe_out);

1 0

Louis. Lenders : olepro32: Add version resource.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: a149839631f06292ddb3507698c4db825cd94bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a149839631f06292ddb350769… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 15 10:30:22 2006 +0100 olepro32: Add version resource. --- dlls/olepro32/Makefile.in | 2 ++ dlls/olepro32/version.rc | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/olepro32/Makefile.in b/dlls/olepro32/Makefile.in index ad92f6b..dd8c5e6 100644 --- a/dlls/olepro32/Makefile.in +++ b/dlls/olepro32/Makefile.in @@ -8,6 +8,8 @@ IMPORTS = oleaut32 kernel32 C_SRCS = olepro32stubs.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/olepro32/version.rc b/dlls/olepro32/version.rc new file mode 100644 index 0000000..a780976 --- /dev/null +++ b/dlls/olepro32/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2006 Louis Lenders + * + * 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 WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine olepro32.dll" +#define WINE_FILENAME_STR "olepro32.dll" +#define WINE_FILEVERSION 5,0,4522,0 +#define WINE_FILEVERSION_STR "5.0.4522" +#define WINE_PRODUCTVERSION 2,40,4522,0 +#define WINE_PRODUCTVERSION_STR "2.40" + +#include "wine/wine_common_ver.rc"

1 0

Alexandre Julliard : libuuid: Fixed typo in CLSID_SynchronizeContainer.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 8d0c928832e902fba350ac0d92d5b9e60dccecfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d0c928832e902fba350ac0d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 16 17:04:27 2006 +0200 libuuid: Fixed typo in CLSID_SynchronizeContainer. --- dlls/uuid/uuid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index c1d7cee..483eea5 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -104,4 +104,4 @@ DEFINE_GUID(CLSID_StdGlobalInterfaceTabl DEFINE_GUID(CLSID_ComBinding, 0x00000328,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_StdEvent, 0x0000032b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_SynchornizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);

1 0

Alexandre Julliard : server: A window timer id should be an unsigned long.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: 85f518ac6bd9f049a07cfb7a4fbfa5138ccb88cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f518ac6bd9f049a07cfb7a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 16 17:03:44 2006 +0200 server: A window timer id should be an unsigned long. --- include/wine/server_protocol.h | 8 ++++---- server/protocol.def | 6 +++--- server/queue.c | 8 ++++---- server/trace.c | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 2f5394c..894d5f3 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2355,14 +2355,14 @@ struct set_win_timer_request struct request_header __header; user_handle_t win; unsigned int msg; - unsigned int id; unsigned int rate; + unsigned long id; unsigned long lparam; }; struct set_win_timer_reply { struct reply_header __header; - unsigned int id; + unsigned long id; }; @@ -2372,7 +2372,7 @@ struct kill_win_timer_request struct request_header __header; user_handle_t win; unsigned int msg; - unsigned int id; + unsigned long id; }; struct kill_win_timer_reply { @@ -4426,6 +4426,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 254 +#define SERVER_PROTOCOL_VERSION 255 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 285da96..3acf366 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1687,11 +1687,11 @@ #define GET_MSG_SENT_ONLY 2 /* only g @REQ(set_win_timer) user_handle_t win; /* window handle */ unsigned int msg; /* message to post */ - unsigned int id; /* timer id */ unsigned int rate; /* timer rate in ms */ + unsigned long id; /* timer id */ unsigned long lparam; /* message lparam (callback proc) */ @REPLY - unsigned int id; /* timer id */ + unsigned long id; /* timer id */ @END @@ -1699,7 +1699,7 @@ #define GET_MSG_SENT_ONLY 2 /* only g @REQ(kill_win_timer) user_handle_t win; /* window handle */ unsigned int msg; /* message to post */ - unsigned int id; /* timer id */ + unsigned long id; /* timer id */ @END diff --git a/server/queue.c b/server/queue.c index cf7d10e..1efed55 100644 --- a/server/queue.c +++ b/server/queue.c @@ -89,7 +89,7 @@ struct timer unsigned int rate; /* timer rate in ms */ user_handle_t win; /* window handle */ unsigned int msg; /* message to post */ - unsigned int id; /* timer id */ + unsigned long id; /* timer id */ unsigned long lparam; /* lparam for message */ }; @@ -126,7 +126,7 @@ struct msg_queue struct message_result *recv_result; /* stack of received messages waiting for result */ struct list pending_timers; /* list of pending timers */ struct list expired_timers; /* list of expired timers */ - unsigned int next_timer_id; /* id for the next timer with a 0 window */ + unsigned long next_timer_id; /* id for the next timer with a 0 window */ struct timeout_user *timeout; /* timeout for next timer to expire */ struct thread_input *input; /* thread input descriptor */ struct hook_table *hooks; /* hook table */ @@ -966,7 +966,7 @@ static void set_next_timer( struct msg_q /* find a timer from its window and id */ static struct timer *find_timer( struct msg_queue *queue, user_handle_t win, - unsigned int msg, unsigned int id ) + unsigned int msg, unsigned long id ) { struct list *ptr; @@ -1832,7 +1832,7 @@ DECL_HANDLER(set_win_timer) struct msg_queue *queue; struct thread *thread = NULL; user_handle_t win = 0; - unsigned int id = req->id; + unsigned long id = req->id; if (req->win) { diff --git a/server/trace.c b/server/trace.c index 6e05882..be268d1 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2179,21 +2179,21 @@ static void dump_set_win_timer_request( { fprintf( stderr, " win=%p,", req->win ); fprintf( stderr, " msg=%08x,", req->msg ); - fprintf( stderr, " id=%08x,", req->id ); fprintf( stderr, " rate=%08x,", req->rate ); + fprintf( stderr, " id=%lx,", req->id ); fprintf( stderr, " lparam=%lx", req->lparam ); } static void dump_set_win_timer_reply( const struct set_win_timer_reply *req ) { - fprintf( stderr, " id=%08x", req->id ); + fprintf( stderr, " id=%lx", req->id ); } static void dump_kill_win_timer_request( const struct kill_win_timer_request *req ) { fprintf( stderr, " win=%p,", req->win ); fprintf( stderr, " msg=%08x,", req->msg ); - fprintf( stderr, " id=%08x", req->id ); + fprintf( stderr, " id=%lx", req->id ); } static void dump_get_serial_info_request( const struct get_serial_info_request *req )

1 0

Mikołaj Zalewski : user32: When calling TrackMouseEvent with TME_LEAVE the dwHoverTime may be uninitialized .
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: ce2b767f6add6d2d7e0db8044d1de433a5ada349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2b767f6add6d2d7e0db8044… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Oct 14 20:16:30 2006 +0200 user32: When calling TrackMouseEvent with TME_LEAVE the dwHoverTime may be uninitialized. --- dlls/user/input.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user/input.c b/dlls/user/input.c index ae64979..28930ee 100644 --- a/dlls/user/input.c +++ b/dlls/user/input.c @@ -921,8 +921,9 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) hover_time = ptme->dwHoverTime; - /* if HOVER_DEFAULT was specified replace this with the systems current value */ - if (hover_time == HOVER_DEFAULT || hover_time == 0) + /* if HOVER_DEFAULT was specified replace this with the systems current value. + * TME_LEAVE doesn't need to specify hover time so use default */ + if (hover_time == HOVER_DEFAULT || hover_time == 0 || !(ptme->dwHoverTime&TME_HOVER)) SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); GetCursorPos(&pos);

1 0

Mikołaj Zalewski : user32: Don' t create timers with nEventId == 0 in TrackMouseEvent.
by Alexandre Julliard Oct. 16, 2006

Oct. 16, 2006

Module: wine Branch: master Commit: e302fcfff440b242235ce53d7d2927c12ede933b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e302fcfff440b242235ce53d7… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Oct 14 20:04:53 2006 +0200 user32: Don't create timers with nEventId == 0 in TrackMouseEvent. --- dlls/user/input.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/input.c b/dlls/user/input.c index 2be1cf5..ae64979 100644 --- a/dlls/user/input.c +++ b/dlls/user/input.c @@ -967,7 +967,7 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) /* Initialize HoverInfo variables even if not hover tracking */ tracking_info.pos = pos; - timer = SetSystemTimer(tracking_info.tme.hwndTrack, 0, hover_time, TrackMouseEventProc); + timer = SetSystemTimer(tracking_info.tme.hwndTrack, (UINT_PTR)&tracking_info.tme, hover_time, TrackMouseEventProc); } }

1 0