wine-commits July 2008

wine-commits@winehq.org

3 participants
1114 discussions

Andrew Talbot : shell32: Remove unneeded address-of operators from array names.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 7f80d8e0c9e7838a6976b9fd753d5f1ddccc96f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f80d8e0c9e7838a6976b9fd7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jul 14 18:44:17 2008 +0100 shell32: Remove unneeded address-of operators from array names. --- dlls/shell32/control.c | 2 +- dlls/shell32/cpanelfolder.c | 4 ++-- dlls/shell32/debughlp.c | 10 +++++----- dlls/shell32/pidl.c | 10 +++++----- dlls/shell32/shellord.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 2a58f67..dbebbd2 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -335,7 +335,7 @@ static void Control_RegisterRegistryApplets(HWND hWnd, CPanel *panel, HKEY hkey_ DWORD nameLen = MAX_PATH; DWORD valueLen = MAX_PATH; - if (RegEnumValueW(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)&value, &valueLen) != ERROR_SUCCESS) + if (RegEnumValueW(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)value, &valueLen) != ERROR_SUCCESS) break; Control_LoadApplet(hWnd, value, panel); diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index e3f9ffb..93a79c5 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -241,7 +241,7 @@ static LPITEMIDLIST _ILCreateCPanelApplet(LPCSTR name, LPCSTR displayName, PIDLCPanelStruct *p; LPITEMIDLIST pidl; PIDLDATA tmp; - int size0 = (char*)&tmp.u.cpanel.szName-(char*)&tmp.u.cpanel; + int size0 = (char*)tmp.u.cpanel.szName-(char*)&tmp.u.cpanel; int size = size0; int l; @@ -356,7 +356,7 @@ static int SHELL_RegisterRegistryCPanelApps(IEnumIDList* list, HKEY hkey_root, L DWORD nameLen = MAX_PATH; DWORD valueLen = MAX_PATH; - if (RegEnumValueA(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)&value, &valueLen) != ERROR_SUCCESS) + if (RegEnumValueA(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)value, &valueLen) != ERROR_SUCCESS) break; if (SHELL_RegisterCPanelApp(list, value)) diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c index 50bf0dc..3223839 100644 --- a/dlls/shell32/debughlp.c +++ b/dlls/shell32/debughlp.c @@ -60,7 +60,7 @@ static LPPIDLDATA _dbg_ILGetDataPointer(LPCITEMIDLIST pidl) { if(pidl && pidl->mkid.cb != 0x00) - return (LPPIDLDATA) &(pidl->mkid.abID); + return (LPPIDLDATA)pidl->mkid.abID; return NULL; } @@ -82,21 +82,21 @@ LPSTR _dbg_ILGetTextPointer(LPCITEMIDLIST pidl) case PT_DRIVE1: case PT_DRIVE2: case PT_DRIVE3: - return (LPSTR)&(pdata->u.drive.szDriveName); + return (LPSTR)pdata->u.drive.szDriveName; case PT_FOLDER: case PT_FOLDER1: case PT_VALUE: case PT_IESPECIAL1: case PT_IESPECIAL2: - return (LPSTR)&(pdata->u.file.szNames); + return (LPSTR)pdata->u.file.szNames; case PT_WORKGRP: case PT_COMP: case PT_NETWORK: case PT_NETPROVIDER: case PT_SHARE: - return (LPSTR)&(pdata->u.network.szNames); + return (LPSTR)pdata->u.network.szNames; } } return NULL; @@ -140,7 +140,7 @@ LPWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl) return NULL; case PT_VALUEW: - return (LPWSTR)&(pdata->u.file.szNames); + return (LPWSTR)pdata->u.file.szNames; } } return NULL; diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index a971067..9a9218e 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1886,7 +1886,7 @@ DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize) LPPIDLDATA _ILGetDataPointer(LPCITEMIDLIST pidl) { if(pidl && pidl->mkid.cb != 0x00) - return (LPPIDLDATA) &(pidl->mkid.abID); + return (LPPIDLDATA)pidl->mkid.abID; return NULL; } @@ -1934,7 +1934,7 @@ LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl) return NULL; case PT_VALUEW: - return (LPWSTR)&(pdata->u.file.szNames); + return (LPWSTR)pdata->u.file.szNames; } return NULL; } @@ -1964,21 +1964,21 @@ LPSTR _ILGetTextPointer(LPCITEMIDLIST pidl) case PT_DRIVE1: case PT_DRIVE2: case PT_DRIVE3: - return (LPSTR)&(pdata->u.drive.szDriveName); + return (LPSTR)pdata->u.drive.szDriveName; case PT_FOLDER: case PT_FOLDER1: case PT_VALUE: case PT_IESPECIAL1: case PT_IESPECIAL2: - return (LPSTR)&(pdata->u.file.szNames); + return (LPSTR)pdata->u.file.szNames; case PT_WORKGRP: case PT_COMP: case PT_NETWORK: case PT_NETPROVIDER: case PT_SHARE: - return (LPSTR)&(pdata->u.network.szNames); + return (LPSTR)pdata->u.network.szNames; } return NULL; } diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 5d1666b..0905bf9 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -718,7 +718,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) /* See if we need to do anything. */ datalen = 64; - ret=SHADD_get_policy( "NoRecentDocsHistory", &type, &data, &datalen); + ret=SHADD_get_policy( "NoRecentDocsHistory", &type, data, &datalen); if ((ret > 0) && (ret != ERROR_FILE_NOT_FOUND)) { ERR("Error %d getting policy \"NoRecentDocsHistory\"\n", ret); return;

1 0

Alexander Nicolaysen Sørnes : regedit: Update Norwegian Bokmål translation.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: bf76a39f3b0e303a3e9b8acb4085ab424e73c796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf76a39f3b0e303a3e9b8acb4… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jul 14 15:50:02 2008 +0200 regedit: Update Norwegian Bokmål translation. --- programs/regedit/No.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/regedit/No.rc b/programs/regedit/No.rc index b7b2beb..746dc0d 100644 --- a/programs/regedit/No.rc +++ b/programs/regedit/No.rc @@ -1,7 +1,7 @@ /* * Regedit Norwegian Bokm�l resources * - * Copyright 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -292,6 +292,7 @@ BEGIN IDS_TOO_BIG_VALUE "Verdien er for stor (%ld)" IDS_DELETE_BOX_TITLE "Bekreft sletting av verdi" IDS_DELETE_BOX_TEXT "Virkelig slette verdien '%s'?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Virkelig slette disse verdiene?" IDS_NEWKEY "Ny n�kkel #%d" IDS_NEWVALUE "Ny verdi #%d" IDS_NOTFOUND "Fant ikke s�kestrengen �%s�"

1 0

Jeremy Newman : WWN Issue 349 (news post)
by Jeremy Newman 16 Jul '08

16 Jul '08

Module: website Branch: master Commit: 8ce401fe77662e1b64807a95d38f2b845ed6aab1 URL: http://source.winehq.org/git/website.git/?a=commit;h=8ce401fe77662e1b64807a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jul 16 09:53:24 2008 -0500 WWN Issue 349 (news post) --- news/en/2008071301.xml | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/news/en/2008071301.xml b/news/en/2008071301.xml new file mode 100644 index 0000000..e359685 --- /dev/null +++ b/news/en/2008071301.xml @@ -0,0 +1,7 @@ +<news> + <date>July 13, 2008</date> + <title>Wine Weekly News Issue 349</title> + <body> + <a href="?issue=349">WWN Issue 349</a> was released today. + </body> +</news>

1 0

Jeremy Newman : remove unused support and development links
by Jeremy Newman 15 Jul '08

15 Jul '08

Module: website Branch: master Commit: 5e6670e18bc20ad16e201e6923b3df5a11562757 URL: http://source.winehq.org/git/website.git/?a=commit;h=5e6670e18bc20ad16e201e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 15 10:06:03 2008 -0500 remove unused support and development links --- templates/en/menu.xml | 2 -- templates/es/menu.xml | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/templates/en/menu.xml b/templates/en/menu.xml index 2eda534..e336feb 100644 --- a/templates/en/menu.xml +++ b/templates/en/menu.xml @@ -23,7 +23,6 @@ <sect name="spacer" template="spacer"/> </sect> <sect name="support" desc="Support" unfold="1" template="top"> - <sect name="support" desc="Support" link="{$root}/site/support" /> <sect name="getting_help" desc="Getting Help" link="{$root}/site/getting_help" /> <sect name="faq" desc="FAQ" link="http://wiki.winehq.org/FAQ" /> <sect name="documentation" desc="Documentation" link="{$root}/site/documentation" /> @@ -33,7 +32,6 @@ <sect name="spacer" template="spacer"/> </sect> <sect name="development" desc="Development" unfold="1" template="top"> - <sect name="development" desc="Development" link="{$root}/site/development" /> <sect name="devel_guide" desc="Developers Guide" link="{$root}/site/docs/winedev-guide/index" /> <sect name="forums" desc="Mailing Lists" link="{$root}/site/forums" /> <sect name="git" desc="GIT" link="{$root}/site/git" /> diff --git a/templates/es/menu.xml b/templates/es/menu.xml index 2eda534..e336feb 100644 --- a/templates/es/menu.xml +++ b/templates/es/menu.xml @@ -23,7 +23,6 @@ <sect name="spacer" template="spacer"/> </sect> <sect name="support" desc="Support" unfold="1" template="top"> - <sect name="support" desc="Support" link="{$root}/site/support" /> <sect name="getting_help" desc="Getting Help" link="{$root}/site/getting_help" /> <sect name="faq" desc="FAQ" link="http://wiki.winehq.org/FAQ" /> <sect name="documentation" desc="Documentation" link="{$root}/site/documentation" /> @@ -33,7 +32,6 @@ <sect name="spacer" template="spacer"/> </sect> <sect name="development" desc="Development" unfold="1" template="top"> - <sect name="development" desc="Development" link="{$root}/site/development" /> <sect name="devel_guide" desc="Developers Guide" link="{$root}/site/docs/winedev-guide/index" /> <sect name="forums" desc="Mailing Lists" link="{$root}/site/forums" /> <sect name="git" desc="GIT" link="{$root}/site/git" />

1 0

Scott Ritchie : explain these are development packages and clarify instructions for etch users
by Jeremy Newman 15 Jul '08

15 Jul '08

Module: website Branch: master Commit: bd1b490b2a40bea7d29aef0992d1833dac6ab961 URL: http://source.winehq.org/git/website.git/?a=commit;h=bd1b490b2a40bea7d29aef… Author: Scott Ritchie <scott(a)open-vote.org> Date: Tue Jul 15 09:19:29 2008 -0500 explain these are development packages and clarify instructions for etch users --- templates/en/download-deb.template | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/templates/en/download-deb.template b/templates/en/download-deb.template index de71dfb..daef8a8 100644 --- a/templates/en/download-deb.template +++ b/templates/en/download-deb.template @@ -9,7 +9,7 @@ for managing packages known as APT. APT is able to automagically install all of the needed dependencies for a software package, as well as keep the package up to date, by scanning what are known as APT repositories. Debian-based distributions have their own repositories of software that include Wine, -however we keep our own repository of the latest available packages here for +however we keep our own repository of the latest available beta packages here for download.</p> <p>There used to be graphical instructions here, however we have found that the @@ -17,11 +17,18 @@ terminal commands are actually simpler to describe and quicker for the user to input. Because the commands below use sudo, you may have to enter your user password after hitting enter.</p> +<h2>Warning: These are development packages</h2> + +<p><i>The packages here are development packages. This means they will +periodically suffer from <a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an update may break functionality in Wine. If the latest +stable release of Wine (currently Wine 1.0) works for you, then you may not want +to use the development packages.</i></p> + <h2>Adding the WineHQ APT Repository:</h2> -<p>First, open a terminal window (Applications->Accessories->Terminal). Then -add the repository's key to your system's list of trusted APT keys by copy and -pasting the following:</p> +<p>First, open a terminal window (Applications->Accessories->Terminal). On +Debian, you will need to open a root terminal. Then add the repository's key +to your system's list of trusted APT keys by copy and pasting the following:</p> <p><i>wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add -</i></p> @@ -34,9 +41,9 @@ pasting the following:</p> <p>Then update APT's package information by running '<b>sudo apt-get update</b>'. -<p>Now you can install Wine by <a href="apt://wine">clicking this link</a>. -Alternatively, you can install by going to Applications->Add/Remove and -searching for Wine.</p> +<p>If you are using Ubuntu, you can now install Wine by <a href="apt://wine"> +clicking this link</a>. Alternatively, you can install by going to +Applications->Add/Remove and searching for Wine.</p> <h2>Upgrading to a new version of Ubuntu</h2>

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/website
by Jeremy Newman 15 Jul '08

15 Jul '08

Module: website Branch: master Commit: 17bffefb59f95081703c323124f381125890f48c URL: http://source.winehq.org/git/website.git/?a=commit;h=17bffefb59f95081703c32… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 15 09:11:55 2008 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Zachary Goldberg : WWN 349
by Jeremy Newman 15 Jul '08

15 Jul '08

Module: website Branch: master Commit: de298b3e17e924e31e30240fcd91d61efa9c77da URL: http://source.winehq.org/git/website.git/?a=commit;h=de298b3e17e924e31e3024… Author: Zachary Goldberg <zgold(a)bluesata.com> Date: Mon Jul 14 18:30:34 2008 -0400 WWN 349 A new WWN 349 patch. Sorry for the delay. I don't have access to my WWN machine during the work day. --Zach --- wwn/en/wn20080714_349.xml | 5407 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 5407 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=de298b3e17e924e31e…

1 0

Francois Gouget : msxml3: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 6dd7f060a2964801fa8cf33d2d97c081bb71a9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd7f060a2964801fa8cf33d2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 14 09:51:38 2008 +0200 msxml3: Fix compilation on systems that don't support nameless unions. --- dlls/msxml3/domdoc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 588a2ab..59ea8c5 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define NONAMELESSUNION #include "config.h" @@ -264,7 +265,7 @@ static HRESULT WINAPI bsc_OnDataAvailable( do { - hr = IStream_Read(pstgmed->pstm, buf, sizeof(buf), &read); + hr = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &read); if(FAILED(hr)) break;

1 0

Rob Shearman : rpcrt4: Implement RpcCancelThreadEx.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 7551b82cca1240375ccdd0f3d574851efe3d70b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7551b82cca1240375ccdd0f3d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jul 14 08:08:03 2008 +0100 rpcrt4: Implement RpcCancelThreadEx. Implement RpcCancelThreadEx using existing code moved into a new function, rpc_ccancel_thread. Implement RpcCancelThread based on RpcCancelThreadEx with timeout of 0. --- dlls/rpcrt4/rpcrt4_main.c | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index f70892c..1f0b1bb 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -968,20 +968,10 @@ NDR_SCONTEXT RPCRT4_PopThreadContextHandle(void) return context_handle; } -/****************************************************************************** - * RpcCancelThread (rpcrt4.@) - */ -RPC_STATUS RPC_ENTRY RpcCancelThread(void* ThreadHandle) +static RPC_STATUS rpc_cancel_thread(DWORD target_tid) { - DWORD target_tid; struct threaddata *tdata; - TRACE("(%p)\n", ThreadHandle); - - target_tid = GetThreadId(ThreadHandle); - if (!target_tid) - return RPC_S_INVALID_ARG; - EnterCriticalSection(&threaddata_cs); LIST_FOR_EACH_ENTRY(tdata, &threaddata_list, struct threaddata, entry) if (tdata->thread_id == target_tid) @@ -997,10 +987,32 @@ RPC_STATUS RPC_ENTRY RpcCancelThread(void* ThreadHandle) } /****************************************************************************** + * RpcCancelThread (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcCancelThread(void* ThreadHandle) +{ + TRACE("(%p)\n", ThreadHandle); + return RpcCancelThreadEx(ThreadHandle, 0); +} + +/****************************************************************************** * RpcCancelThreadEx (rpcrt4.@) */ RPC_STATUS RPC_ENTRY RpcCancelThreadEx(void* ThreadHandle, LONG Timeout) { + DWORD target_tid; + FIXME("(%p, %d)\n", ThreadHandle, Timeout); - return RPC_S_OK; + + target_tid = GetThreadId(ThreadHandle); + if (!target_tid) + return RPC_S_INVALID_ARG; + + if (Timeout) + { + FIXME("(%p, %d)\n", ThreadHandle, Timeout); + return RPC_S_OK; + } + else + return rpc_cancel_thread(target_tid); }

1 0

Piotr Caban : msxml3: Fixed typo in create_bsc.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 4799f06f206c5e82c89ff35bc69673651ff71bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4799f06f206c5e82c89ff35bc… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 13 23:21:41 2008 +0200 msxml3: Fixed typo in create_bsc. --- dlls/msxml3/domdoc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a2d7243..588a2ab 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -299,12 +299,13 @@ static const struct IBindStatusCallbackVtbl bsc_vtbl = static bsc_t *create_bsc(domdoc *doc) { - bsc_t *bsc = HeapAlloc(GetProcessHeap(), 0, sizeof(bsc)); + bsc_t *bsc = HeapAlloc(GetProcessHeap(), 0, sizeof(bsc_t)); bsc->lpVtbl = &bsc_vtbl; bsc->ref = 1; bsc->doc = doc; bsc->binding = NULL; + bsc->memstream = NULL; return bsc; }

1 0

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 July 2008