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

Francois Gouget : shlwapi: Don' t use Unix functions for case sensitive string comparisons.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: e0338be2d44a285cb1079be7576bba2ae2bfc2e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0338be2d44a285cb1079be75… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 26 14:07:44 2008 +0200 shlwapi: Don't use Unix functions for case sensitive string comparisons. --- dlls/shlwapi/string.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 4537ac2..abbfdba 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -511,7 +511,7 @@ LPWSTR WINAPI StrCpyNW(LPWSTR lpszStr, LPCWSTR lpszSrc, int iLen) * Internal implementation of StrStrA/StrStrIA */ static LPSTR SHLWAPI_StrStrHelperA(LPCSTR lpszStr, LPCSTR lpszSearch, - int (*pStrCmpFn)(LPCSTR,LPCSTR,size_t)) + INT (WINAPI *pStrCmpFn)(LPCSTR,LPCSTR,INT)) { size_t iLen; @@ -545,7 +545,7 @@ LPSTR WINAPI StrStrA(LPCSTR lpszStr, LPCSTR lpszSearch) { TRACE("(%s,%s)\n", debugstr_a(lpszStr), debugstr_a(lpszSearch)); - return SHLWAPI_StrStrHelperA(lpszStr, lpszSearch, strncmp); + return SHLWAPI_StrStrHelperA(lpszStr, lpszSearch, StrCmpNA); } /************************************************************************* @@ -650,7 +650,7 @@ LPSTR WINAPI StrStrIA(LPCSTR lpszStr, LPCSTR lpszSearch) { TRACE("(%s,%s)\n", debugstr_a(lpszStr), debugstr_a(lpszSearch)); - return SHLWAPI_StrStrHelperA(lpszStr, lpszSearch, strncasecmp); + return SHLWAPI_StrStrHelperA(lpszStr, lpszSearch, StrCmpNIA); } /*************************************************************************

1 0

Francois Gouget : wined3d: Add a trailing '\n' to a couple of shader_addline() calls.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 756b401f8dbdd19c9bef564cd49b450e2bb30d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756b401f8dbdd19c9bef564cd… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 26 14:08:59 2008 +0200 wined3d: Add a trailing '\n' to a couple of shader_addline() calls. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6729977..1f5df18 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2834,8 +2834,8 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, semantic *semantics_in, sema if (!semantics_out) { /* Save gl_FrontColor & gl_FrontSecondaryColor before overwriting them. */ - shader_addline(buffer, "vec4 front_color = gl_FrontColor;"); - shader_addline(buffer, "vec4 front_secondary_color = gl_FrontSecondaryColor;"); + shader_addline(buffer, "vec4 front_color = gl_FrontColor;\n"); + shader_addline(buffer, "vec4 front_secondary_color = gl_FrontSecondaryColor;\n"); } for(i = 0; i < MAX_REG_INPUT; i++) {

1 0

Detlef Riekenberg : rpcrt4: Add a stub for I_RpcBindingInqTransportType.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 74b78100f3a7d78bc70c6f96f9d8b272d2f9bd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b78100f3a7d78bc70c6f96f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jun 26 00:01:55 2008 +0200 rpcrt4: Add a stub for I_RpcBindingInqTransportType. --- dlls/rpcrt4/rpc_binding.c | 11 +++++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 333de3d..e42b8f9 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -820,6 +820,17 @@ RPC_STATUS WINAPI RpcBindingToStringBindingW( RPC_BINDING_HANDLE Binding, RPC_WS } /*********************************************************************** + * I_RpcBindingInqTransportType (RPCRT4.@) + */ +RPC_STATUS WINAPI I_RpcBindingInqTransportType( RPC_BINDING_HANDLE Binding, unsigned int * Type ) +{ + + FIXME( "(%p,%p): stub\n", Binding, Type); + *Type = TRANSPORT_TYPE_LPC; + return RPC_S_OK; +} + +/*********************************************************************** * I_RpcBindingSetAsync (RPCRT4.@) * NOTES * Exists in win9x and winNT, but with different number of arguments diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index bbf5a01..95f13d8 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -31,7 +31,7 @@ @ stub I_RpcBindingInqDynamicEndPointW @ stub I_RpcBindingInqLocalClientPID # wxp @ stub I_RpcBindingInqSecurityContext -@ stub I_RpcBindingInqTransportType +@ stdcall I_RpcBindingInqTransportType(ptr ptr) @ stub I_RpcBindingInqWireIdForSnego @ stub I_RpcBindingIsClientLocal # 9x version of I_RpcBindingSetAsync has 3 arguments, not 2

1 0

Dan Hipschman : riched20: Implement ITextDocument_fnGetSelection.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 36aa6c4c447f2ec2fe1b086eb9c4ace3567ea4af URL: http://source.winehq.org/git/wine.git/?a=commit;h=36aa6c4c447f2ec2fe1b086eb… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Jun 25 16:31:39 2008 -0700 riched20: Implement ITextDocument_fnGetSelection. --- dlls/riched20/richole.c | 1001 ++++++++++++++++++++++++++++++++++++++- dlls/riched20/tests/Makefile.in | 2 +- dlls/riched20/tests/richole.c | 33 ++ 3 files changed, 1033 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36aa6c4c447f2ec2fe1b0…

1 0

Lei Zhang : mshtml: Remove unneeded variable.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: f023be8aa7890a7301bda88e92ca7515e1b77a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f023be8aa7890a7301bda88e9… Author: Lei Zhang <thestig(a)google.com> Date: Wed Jun 25 20:40:21 2008 -0700 mshtml: Remove unneeded variable. --- dlls/mshtml/nsio.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 53ad33e..f23254a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2040,7 +2040,6 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * const char *aOriginCharset, nsIURI *aBaseURI, nsIURI **_retval) { const char *spec = NULL; - nsACString spec_str; NSContainer *nscontainer = NULL; nsIURI *uri = NULL; LPCWSTR base_wine_url = NULL; @@ -2078,9 +2077,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * nsACString_Finish(&base_uri_str); } - nsACString_Init(&spec_str, spec); - nsres = nsIIOService_NewURI(nsio, &spec_str, aOriginCharset, aBaseURI, &uri); - nsACString_Finish(&spec_str); + nsres = nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, &uri); if(NS_FAILED(nsres)) TRACE("NewURI failed: %08x\n", nsres);

1 0

Zac Brown : winealsa.drv: Initialize a variable in MIX_close.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 7bd0c43f0384e835bb4f26c7f810fb3bf5172461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bd0c43f0384e835bb4f26c7f… Author: Zac Brown <zac(a)zacbrown.org> Date: Wed Jun 25 09:57:14 2008 -0700 winealsa.drv: Initialize a variable in MIX_close. --- dlls/winealsa.drv/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index cc38f8f..ee67eef 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -762,7 +762,7 @@ static DWORD MIX_Open(UINT wDevID, LPMIXEROPENDESC desc, DWORD_PTR flags) static DWORD MIX_Close(UINT wDevID) { - int x; + int x = 0; mixer *mmixer = MIX_GetMix(wDevID); if (!mmixer) return MMSYSERR_BADDEVICEID;

1 0

Andrew Talbot : mpr: Fix some memory leaks.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 69789d58918fefa59e6b49535899e336ea746c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69789d58918fefa59e6b49535… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jun 25 22:42:04 2008 +0100 mpr: Fix some memory leaks. --- dlls/mpr/wnet.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 32bc255..bf4ddb8 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1312,6 +1312,7 @@ DWORD WINAPI WNetGetResourceInformationA( LPNETRESOURCEA lpNetResource, ret = _thunkNetResourceArrayAToW(lpNetResource, &count, lpNetResourceW, &size); if (ret == WN_MORE_DATA) { + HeapFree(GetProcessHeap(), 0, lpNetResourceW); lpNetResourceW = HeapAlloc(GetProcessHeap(), 0, size); if (lpNetResourceW) ret = _thunkNetResourceArrayAToW(lpNetResource, @@ -1343,6 +1344,7 @@ DWORD WINAPI WNetGetResourceInformationA( LPNETRESOURCEA lpNetResource, { ret = _thunkNetResourceArrayWToA(lpBufferW, &count, lpBuffer, cbBuffer); + HeapFree(GetProcessHeap(), 0, lpNetResourceW); lpNetResourceW = lpBufferW; size = sizeof(NETRESOURCEA); size += WideCharToMultiByte(CP_ACP, 0, lpNetResourceW->lpRemoteName,

1 0

Alexandre Julliard : server: Fix a potential desktop reference leak.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 42e2c99ce2ed61f4bd2261d8627629e374007724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e2c99ce2ed61f4bd2261d86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 26 16:49:23 2008 +0200 server: Fix a potential desktop reference leak. --- server/window.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/window.c b/server/window.c index 303a6cf..1879b7c 100644 --- a/server/window.c +++ b/server/window.c @@ -1963,6 +1963,9 @@ DECL_HANDLER(get_window_children) atom_t atom = req->atom; struct desktop *desktop = NULL; + get_req_unicode_str( &cls_name ); + if (cls_name.len && !(atom = find_global_atom( NULL, &cls_name ))) return; + if (req->desktop) { if (!(desktop = get_desktop_obj( current->process, req->desktop, DESKTOP_ENUMERATE ))) return; @@ -1974,9 +1977,6 @@ DECL_HANDLER(get_window_children) if (!parent && !(desktop = get_thread_desktop( current, 0 ))) return; } - get_req_unicode_str( &cls_name ); - if (cls_name.len && !(atom = find_global_atom( NULL, &cls_name ))) return; - if (parent) total = get_children_windows( parent, atom, req->tid, NULL, 0 ); else

1 0

Alexandre Julliard : winex11: Don' t create a win data structure for HWND_MESSAGE windows.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 93a02e7f652b2b0ac405dc25ea6cc2293fd50bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a02e7f652b2b0ac405dc25e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 26 16:49:09 2008 +0200 winex11: Don't create a win data structure for HWND_MESSAGE windows. --- dlls/winex11.drv/window.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 2ab49d8..0b416d9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1662,6 +1662,9 @@ struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ) if (!(parent = GetAncestor( hwnd, GA_PARENT ))) return NULL; /* desktop */ + /* don't create win data for HWND_MESSAGE windows */ + if (parent != GetDesktopWindow() && !GetAncestor( parent, GA_PARENT )) return NULL; + display = thread_init_display(); if (!(data = alloc_win_data( display, hwnd ))) return NULL;

1 0

Alexandre Julliard : winex11: Explicitly request creation of the thread display where necessary.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: e7044cb8f83f85a9f821052d2b229756737f2ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7044cb8f83f85a9f821052d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 26 16:47:42 2008 +0200 winex11: Explicitly request creation of the thread display where necessary. --- dlls/winex11.drv/clipboard.c | 12 ++++++++---- dlls/winex11.drv/desktop.c | 2 +- dlls/winex11.drv/keyboard.c | 11 ++++++----- dlls/winex11.drv/mouse.c | 4 ++-- dlls/winex11.drv/systray.c | 2 +- dlls/winex11.drv/window.c | 27 +++++++++++++++++---------- dlls/winex11.drv/x11ddraw.c | 5 +++-- dlls/winex11.drv/x11drv.h | 14 +++++++++++++- 8 files changed, 51 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7044cb8f83f85a9f8210…

1 0