December 2009 - Wine-Commits

Alexandre Julliard : winedbg: Use the explicit name for all A/W function.
by Alexandre Julliard Dec. 10, 2009

Dec. 10, 2009

Module: wine Branch: master Commit: c09ac7a41fb3be425d869b560feb784d7d38762e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09ac7a41fb3be425d869b560… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 18:14:07 2009 +0100 winedbg: Use the explicit name for all A/W function. --- programs/winedbg/Makefile.in | 1 + programs/winedbg/dbg.y | 6 +++--- programs/winedbg/debugger.h | 2 +- programs/winedbg/gdbproxy.c | 8 ++++---- programs/winedbg/info.c | 34 +++++++++++++++++----------------- programs/winedbg/source.c | 10 +++++----- programs/winedbg/tgt_active.c | 8 ++++---- programs/winedbg/tgt_minidump.c | 4 ++-- programs/winedbg/winedbg.c | 12 ++++++------ 9 files changed, 43 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c09ac7a41fb3be425d869…

1 0

Alexandre Julliard : cmd: Use the explicit name for all A/W function.
by Alexandre Julliard Dec. 10, 2009

Dec. 10, 2009

Module: wine Branch: master Commit: 79b00726f28824ec299c02c9d04473061cee7710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b00726f28824ec299c02c9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 18:52:40 2009 +0100 cmd: Use the explicit name for all A/W function. --- programs/cmd/Makefile.in | 2 +- programs/cmd/batch.c | 24 ++--- programs/cmd/builtins.c | 264 ++++++++++++++++++++++----------------------- programs/cmd/directory.c | 48 ++++---- programs/cmd/wcmdmain.c | 168 +++++++++++++++--------------- 5 files changed, 249 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79b00726f28824ec299c0…

1 0

Alexandre Julliard : net: Use the explicit name for all A/W function.
by Alexandre Julliard Dec. 10, 2009

Dec. 10, 2009

Module: wine Branch: master Commit: 305fcef612a20ca6fa74fb6cb5f3aa625ff0c8c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305fcef612a20ca6fa74fb6cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 18:52:46 2009 +0100 net: Use the explicit name for all A/W function. --- programs/net/Makefile.in | 1 + programs/net/net.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in index 4f6f6fc..cf30dce 100644 --- a/programs/net/Makefile.in +++ b/programs/net/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = net.exe APPMODE = -mconsole IMPORTS = netapi32 user32 advapi32 kernel32 +EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = net.c diff --git a/programs/net/net.c b/programs/net/net.c index 89279fd..e5e47c8 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -30,7 +30,7 @@ static int output_string(int msg, ...) char msg_buffer[8192]; va_list arguments; - LoadString(GetModuleHandle(NULL), msg, msg_buffer, sizeof(msg_buffer)); + LoadStringA(GetModuleHandleW(NULL), msg, msg_buffer, sizeof(msg_buffer)); va_start(arguments, msg); vprintf(msg_buffer, arguments); va_end(arguments); @@ -92,24 +92,24 @@ static BOOL net_use(int argc, char *argv[]) static BOOL StopService(SC_HANDLE SCManager, SC_HANDLE serviceHandle) { - LPENUM_SERVICE_STATUS dependencies = NULL; + LPENUM_SERVICE_STATUSW dependencies = NULL; DWORD buffer_size = 0; DWORD count = 0, counter; BOOL result; SC_HANDLE dependent_serviceHandle; SERVICE_STATUS_PROCESS ssp; - result = EnumDependentServices(serviceHandle, SERVICE_ACTIVE, dependencies, buffer_size, &buffer_size, &count); + result = EnumDependentServicesW(serviceHandle, SERVICE_ACTIVE, dependencies, buffer_size, &buffer_size, &count); if(!result && (GetLastError() == ERROR_MORE_DATA)) { dependencies = HeapAlloc(GetProcessHeap(), 0, buffer_size); - if(EnumDependentServices(serviceHandle, SERVICE_ACTIVE, dependencies, buffer_size, &buffer_size, &count)) + if(EnumDependentServicesW(serviceHandle, SERVICE_ACTIVE, dependencies, buffer_size, &buffer_size, &count)) { for(counter = 0; counter < count; counter++) { output_string(STRING_STOP_DEP, dependencies[counter].lpDisplayName); - dependent_serviceHandle = OpenService(SCManager, dependencies[counter].lpServiceName, SC_MANAGER_ALL_ACCESS); + dependent_serviceHandle = OpenServiceW(SCManager, dependencies[counter].lpServiceName, SC_MANAGER_ALL_ACCESS); if(dependent_serviceHandle) result = StopService(SCManager, dependent_serviceHandle); CloseServiceHandle(dependent_serviceHandle); if(!result) output_string(STRING_CANT_STOP, dependencies[counter].lpDisplayName); @@ -129,13 +129,13 @@ static BOOL net_service(int operation, char *service_name) char service_display_name[4096]; DWORD buffer_size = sizeof(service_display_name); - SCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + SCManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); if(!SCManager) { output_string(STRING_NO_SCM); return FALSE; } - serviceHandle = OpenService(SCManager, service_name, SC_MANAGER_ALL_ACCESS); + serviceHandle = OpenServiceA(SCManager, service_name, SC_MANAGER_ALL_ACCESS); if(!serviceHandle) { output_string(STRING_NO_SVCHANDLE); @@ -144,14 +144,14 @@ static BOOL net_service(int operation, char *service_name) } - GetServiceDisplayName(SCManager, service_name, service_display_name, &buffer_size); + GetServiceDisplayNameA(SCManager, service_name, service_display_name, &buffer_size); if (!service_display_name[0]) strcpy(service_display_name, service_name); switch(operation) { case NET_START: output_string(STRING_START_SVC, service_display_name); - result = StartService(serviceHandle, 0, NULL); + result = StartServiceW(serviceHandle, 0, NULL); if(result) output_string(STRING_START_SVC_SUCCESS, service_display_name); else

1 0

Jaime Rave : Added home spanish translation
by Jeremy Newman Dec. 9, 2009

Dec. 9, 2009

Module: website Branch: master Commit: 0a236572b7f841e1340e646277c9f471957d72c8 URL: http://source.winehq.org/git/website.git/?a=commit;h=0a236572b7f841e1340e64… Author: Jaime Rave <jaimerave(a)ubuntu-co.com> Date: Tue Dec 8 21:05:24 2009 -0500 Added home spanish translation --0016e6d977fdacec55047a421fca Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable --=20 Jaime Rave Torres Ingeniero de Sistemas Miembro de la Fundaci=F3n de Software Libre de Colombia http://www.fslcol.org/ http://sobrelibertad.blogspot.com/ 3003160361 <br clear="all"><br>-- <br>Jaime Rave Torres<br>Ingeniero de Sistemas<br>Miembro de la Fundación de Software Libre de Colombia <br><a href="http://www.fslcol.org/">http://www.fslcol.org/</a><br><a href="http://sobrelibertad.blogspot.com/">http://sobrelibertad.blogspot.com/</a><br> 3003160361<br> >From 2b09bc57162c4e0a979576a8cdd4e59b5b124c63 Mon Sep 17 00:00:00 2001 From: Jaime Rave <jaimerave(a)ubuntu-co.com> Date: Tue, 8 Dec 2009 20:59:36 -0500 Subject: Added home spanish translation --- templates/es/home.template | 90 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/templates/es/home.template b/templates/es/home.template new file mode 100644 index 0000000..da2c31e --- /dev/null +++ b/templates/es/home.template @@ -0,0 +1,90 @@ + + + + +<div id="main_left"> + + <div class="rbox"> + <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> + <div class="content" style="padding: 25px 10px 10px 60px; height: 445px; overflow: auto;"> + <ul class="winehq_menu"> + + <li class="info" onClick="document.location='{$root}/about/';"> + <div class="title"><a href="{$root}/about/">Acerca de</a></div> + <div class="subtitle">Aprende sobre el proyecto Wine.</div> + </li> + + <li class="dl" onClick="document.location='{$root}/download/';"> + <div class="title"><a href="{$root}/download/">Descarga</a></div> + <div class="subtitle">Instala la última versión de Wine.</div> + </li> + + <li class="help" onClick="document.location='{$root}/help/';"> + <div class="title"><a href="{$root}/help/">Soporte</a></div> + <div class="subtitle">Obtén ayuda para usar Wine.</div> + </li> + + <li class="devel" onClick="document.location='{$root}/devel/';"> + <div class="title"><a href="{$root}/devel/">Desarrollo</a></div> + <div class="subtitle">Conviértete en un desarrollador de Wine.</div> + </li> + + <li class="donate" onClick="document.donateForm.submit();"> + <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> + <div class="title"><a href="javascript:document.donateForm.submit();">Dona</a></div> + <input type="hidden" name="cmd" value="_xclick"> + <input type="hidden" name="business" value="donate(a)winehq.org"> + <input type="hidden" name="item_name" value="Wine donation"> + </form> + <div class="subtitle">Haz una donación al proyecto Wine.</div> + </li> + + </ul> + </div> + <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> + </div> + + +</div> +<div id="main_right"> + + <div class="rbox"> + <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> + <div class="content" style="padding: 5px 10px 5px 10px; height: 85px; overflow: auto;"> + + <h3 class="title" style="margin: 0;">Último lanzamiento</h3> + <table style="margin: 7px 0 0 15px; border-spacing: 0; border: 0;"> + <tr><td>Estable:</td> + <td style="padding-left: 15px; padding-bottom: 2px;"> + <b><a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a></b> + <span class="small"> + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">shortlog</a>) + </span> + </td></tr> + <tr><td>Desarrollo:</td> + <td style="padding-left: 15px;"> + <b><a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a></b> + <span class="small"> + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">shortlog</a>) + </span> + </td></tr> + </table> + </div> + <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> + </div> + + <div class="rbox" style="margin-top: 15px;"> + <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> + <div class="content" style="padding: 10px; height: 340px; overflow: auto;"> + + <h3 class="title"><a href="{$root}/news/">Noticias</a></h3> + +  + + <p><a href="{$root}/news/">más noticias...</a></p> + </div> + <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> + </div> + +</div> +

1 0

Kirill K. Smirnov : comctl32/treeview: Avoid a NULL pointer dereference.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: dc45e2c5130a9a95ea6ba456d696d38853b26416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc45e2c5130a9a95ea6ba456d… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Wed Dec 9 16:27:45 2009 +0300 comctl32/treeview: Avoid a NULL pointer dereference. --- dlls/comctl32/treeview.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 7cabef6..8752f86 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4091,7 +4091,8 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) InvalidateRect(infoPtr->hwnd, &tempItem->rect, TRUE); /* refresh the selected item to return the filled background */ - InvalidateRect(infoPtr->hwnd, &(infoPtr->selectedItem->rect), TRUE); + if (infoPtr->selectedItem) + InvalidateRect(infoPtr->hwnd, &(infoPtr->selectedItem->rect), TRUE); } return 0;

1 0

Huw Davies : ole32: Release the error info strings.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: 09db52884734bb98dca8a7d69f80de8a2cb3e975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09db52884734bb98dca8a7d69… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 9 14:06:03 2009 +0000 ole32: Release the error info strings. Found by Valgrind. --- dlls/ole32/errorinfo.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index f69635b..39751ab 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -237,6 +237,10 @@ static ULONG WINAPI IErrorInfoImpl_Release( if (!ref) { TRACE("-- destroying IErrorInfo(%p)\n",This); + + ERRORINFO_SysFreeString(This->bstrSource); + ERRORINFO_SysFreeString(This->bstrDescription); + ERRORINFO_SysFreeString(This->bstrHelpFile); HeapFree(GetProcessHeap(),0,This); return 0; }

1 0

Huw Davies : include: Add a few guids.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: 41af26b2e754f81bccb9c9a2f764799e0e4b2666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41af26b2e754f81bccb9c9a2f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 9 13:52:11 2009 +0000 include: Add a few guids. --- include/dbs.idl | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index 8b3bb0d..a2ed656 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -183,6 +183,11 @@ enum DBSTATUSENUM DBSTATUS_S_DEFAULT = 13 }; +cpp_quote("DEFINE_GUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_GUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_GUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_GUID(DBGUID_STREAM, 0xc8b522f9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") + typedef struct tagDBCOLUMNACCESS { void *pData;

1 0

Huw Davies : msxml3: Correctly test the variant returned by get_nodeValue.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: 318c7b24eecc0e3cf15cc7c820b30804f4d0b55d URL: http://source.winehq.org/git/wine.git/?a=commit;h=318c7b24eecc0e3cf15cc7c82… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 9 13:41:23 2009 +0000 msxml3: Correctly test the variant returned by get_nodeValue. Found by Valgrind. --- dlls/msxml3/tests/domdoc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index de78b65..87ad9b5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3085,6 +3085,8 @@ static void test_xmlTypes(void) IXMLDOMNode *pNextChild = (IXMLDOMNode *)0x1; VARIANT var; + VariantInit(&var); + hr = IXMLDOMCDATASection_QueryInterface(pCDataSec, &IID_IXMLDOMElement, (LPVOID*)&pElement); ok(hr == E_NOINTERFACE, "ret %08x\n", hr); @@ -3155,7 +3157,8 @@ static void test_xmlTypes(void) /* test get nodeValue */ hr = IXMLDOMCDATASection_get_nodeValue(pCDataSec, &var); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect text string\n"); + ok(V_VT(&var) == VT_BSTR, "got vt %04x\n", V_VT(&var)); + ok( !lstrcmpW( V_BSTR(&var), _bstr_("This &is a ; test <>\\") ), "incorrect text string\n"); VariantClear(&var); /* test get data */

1 0

Nikolay Sivov : shell32: Fix some trace typos.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: daf99d4bddb205236b36a97218888a090743729e URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf99d4bddb205236b36a9721… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 9 15:49:51 2009 +0300 shell32: Fix some trace typos. --- dlls/shell32/shlview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 47167a7..6deed53 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1321,7 +1321,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn break; case NM_RETURN: - TRACE("-- NM_DBLCLK %p\n",This); + TRACE("-- NM_RETURN %p\n",This); if (OnDefaultCommand(This) != S_OK) ShellView_OpenSelectedItems(This); break; @@ -1441,7 +1441,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn DWORD dwAttr = SFGAO_CANRENAME; pidl = (LPITEMIDLIST)lpdi->item.lParam; - TRACE("-- LVN_BEGINLABELEDITA %p\n",This); + TRACE("-- LVN_BEGINLABELEDITW %p\n",This); IShellFolder_GetAttributesOf(This->pSFParent, 1, (LPCITEMIDLIST*)&pidl, &dwAttr); if (SFGAO_CANRENAME & dwAttr)

1 0

Henri Verbeet : d3d9: Forward the volume's GetDevice() to the texture instead of the wined3d volume.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: c2cf1935635d348ea1ffdcfebbbe08b71b65d157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cf1935635d348ea1ffdcfeb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 11:51:17 2009 +0100 d3d9: Forward the volume's GetDevice() to the texture instead of the wined3d volume. --- dlls/d3d9/volume.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 0d83ce1..baa286b 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -94,21 +94,24 @@ static ULONG WINAPI IDirect3DVolume9Impl_Release(LPDIRECT3DVOLUME9 iface) { } /* IDirect3DVolume9 Interface follow: */ -static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(LPDIRECT3DVOLUME9 iface, IDirect3DDevice9** ppDevice) { +static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(IDirect3DVolume9 *iface, IDirect3DDevice9 **device) +{ IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - IWineD3DDevice *myDevice = NULL; + IDirect3DResource9 *resource; + HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - - IWineD3DVolume_GetDevice(This->wineD3DVolume, &myDevice); - IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); - IWineD3DDevice_Release(myDevice); + hr = IUnknown_QueryInterface(This->forwardReference, &IID_IDirect3DResource9, (void **)&resource); + if (SUCCEEDED(hr)) + { + hr = IDirect3DResource9_GetDevice(resource, device); + IDirect3DResource9_Release(resource); - wined3d_mutex_unlock(); + TRACE("Returning device %p.\n", *device); + } - return D3D_OK; + return hr; } static HRESULT WINAPI IDirect3DVolume9Impl_SetPrivateData(LPDIRECT3DVOLUME9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {

1 0