August 2006 - Wine-Commits - list.winehq.org

lostwages/templates/en/wineconf travel.template
by Jeremy Newman Aug. 2, 2006

Aug. 2, 2006

ChangeSet ID: 27062 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/08/02 14:03:43 Modified files: templates/en/wineconf: travel.template Log message: Robert Shearman <rob(a)codeweavers.com> Clarify that no refunds will be possible for university accomodation. Patch: http://cvs.winehq.org/patch.py?id=27062 Old revision New revision Changes Path 1.17 1.18 +2 -1 lostwages/templates/en/wineconf/travel.template Index: lostwages/templates/en/wineconf/travel.template diff -u -p lostwages/templates/en/wineconf/travel.template:1.17 lostwages/templates/en/wineconf/travel.template:1.18 --- lostwages/templates/en/wineconf/travel.template:1.17 2 Aug 2006 19: 3:43 -0000 +++ lostwages/templates/en/wineconf/travel.template 2 Aug 2006 19: 3:43 -0000 @@ -87,7 +87,8 @@ rooms will prioritised in the allocation Due to restrictions placed on us by the University of Reading everyone requesting a room at the university will have to pay for it by 12th August -2006. Also, due to tax reasons the only method of payment is to +2006 and no refunds will be possible once you have been allocated a room. +Also, due to tax reasons the only method of payment is to PayPal $75 US per night to the Wine fund using the button below. In your donation message, you need to indicate which nights you're staying, your name, a contact phone number and an email address.

1 0

lostwages/templates/en wineconf.template winec ...
by Jeremy Newman Aug. 2, 2006

Aug. 2, 2006

ChangeSet ID: 27061 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/08/02 13:48:28 Modified files: templates/en : wineconf.template templates/en/wineconf: travel.template Log message: Robert Shearman <rob(a)codeweavers.com> updated for WineConf 2006 Patch: http://cvs.winehq.org/patch.py?id=27061 Old revision New revision Changes Path 1.10 1.11 +46 -15 lostwages/templates/en/wineconf.template 1.16 1.17 +119 -1 lostwages/templates/en/wineconf/travel.template

1 0

lostwages/ templates/en/wineconf.template temp ...
by Jeremy Newman Aug. 2, 2006

Aug. 2, 2006

ChangeSet ID: 27060 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/08/02 10:23:46 Modified files: templates/en : wineconf.template templates/en/wineconf: rsvp.template rsvp_done.template rsvp_form.template travel.template Added files: images/wineconf: wineconf_logo.jpg Removed files: images/wineconf: wc05-map-composite.jpg wc05-map-germany.gif wc05-map-stuttgart.gif wc05-map-univ.gif wc05_logo.jpg wc06_logo.jpg templates/en/wineconf: survey06.template survey06_done.template survey06_form.template Log message: blank out the 05 information in prep for 06 Patch: http://cvs.winehq.org/patch.py?id=27060 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/images/wineconf/wineconf_logo.jpg 1.1 Removed +0 -0 lostwages/images/wineconf/wc05-map-composite.jpg 1.1 Removed +0 -0 lostwages/images/wineconf/wc05-map-germany.gif 1.1 Removed +0 -0 lostwages/images/wineconf/wc05-map-stuttgart.gif 1.2 Removed +0 -0 lostwages/images/wineconf/wc05-map-univ.gif 1.1 Removed +0 -0 lostwages/images/wineconf/wc05_logo.jpg 1.1 Removed +0 -0 lostwages/images/wineconf/wc06_logo.jpg 1.9 1.10 +27 -101 lostwages/templates/en/wineconf.template 1.1 1.2 +7 -4 lostwages/templates/en/wineconf/rsvp.template 1.1 1.2 +1 -2 lostwages/templates/en/wineconf/rsvp_done.template 1.2 1.3 +1 -1 lostwages/templates/en/wineconf/rsvp_form.template 1.15 1.16 +8 -195 lostwages/templates/en/wineconf/travel.template 1.2 Removed +0 -0 lostwages/templates/en/wineconf/survey06.template 1.2 Removed +0 -0 lostwages/templates/en/wineconf/survey06_done.template 1.2 Removed +0 -0 lostwages/templates/en/wineconf/survey06_form.template

1 0

Mike McCormack : msi: Only ever write the long path for InProcServers.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: b73dca23023a6d405d1f986aca121b2aa9b42f1e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b73dca23023a6d405d1f986… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 2 13:41:13 2006 +0200 msi: Only ever write the long path for InProcServers. --- dlls/msi/classes.c | 74 +++++++++++++--------------------------------------- 1 files changed, 19 insertions(+), 55 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index e4cfcbb..9d9d7b2 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -797,7 +797,6 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE static const WCHAR szVIProgID[] = { 'V','e','r','s','i','o','n','I','n','d','e','p','e','n','d','e','n','t','P','r','o','g','I','D',0 }; static const WCHAR szAppID[] = { 'A','p','p','I','D',0 }; static const WCHAR szSpace[] = {' ',0}; - static const WCHAR szInprocServer32[] = {'I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; static const WCHAR szFileType_fmt[] = {'F','i','l','e','T','y','p','e','\\','%','s','\\','%','i',0}; HKEY hkey,hkey2,hkey3; MSICLASS *cls; @@ -811,7 +810,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE { MSICOMPONENT *comp; MSIFILE *file; - DWORD size, sz; + DWORD size; LPWSTR argument; MSIFEATURE *feature; @@ -846,64 +845,29 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE RegCreateKeyW( hkey2, cls->Context, &hkey3 ); file = get_loaded_file( package, comp->KeyPath ); - - /* the context server is a short path name - * except for if it is InprocServer32... + /* + * FIXME: Implement install on demand (advertised components). + * + * ole32.dll should call msi.MsiProvideComponentFromDescriptor() + * when it needs an InProcServer that doesn't exist. + * The component advertise string should be in the "InProcServer" value. */ - if (strcmpiW( cls->Context, szInprocServer32 )!=0) - { - sz = GetShortPathNameW( file->TargetPath, NULL, 0 ); - if (sz == 0) - { - ERR("Unable to find short path for CLSID COM Server\n"); - argument = NULL; - } - else - { - size = sz * sizeof(WCHAR); - - if (cls->Argument) - { - size += strlenW(cls->Argument) * sizeof(WCHAR); - size += sizeof(WCHAR); - } - - argument = msi_alloc( size + sizeof(WCHAR)); - GetShortPathNameW( file->TargetPath, argument, sz ); - - if (cls->Argument) - { - strcatW(argument,szSpace); - strcatW( argument, cls->Argument ); - } - } - } - else - { - size = lstrlenW( file->TargetPath ) * sizeof(WCHAR); - - if (cls->Argument) - { - size += strlenW(cls->Argument) * sizeof(WCHAR); - size += sizeof(WCHAR); - } - - argument = msi_alloc( size + sizeof(WCHAR)); - strcpyW( argument, file->TargetPath ); + size = lstrlenW( file->TargetPath )+1; + if (cls->Argument) + size += lstrlenW(cls->Argument)+1; - if (cls->Argument) - { - strcatW(argument,szSpace); - strcatW( argument, cls->Argument ); - } - } + argument = msi_alloc( size * sizeof(WCHAR) ); + lstrcpyW( argument, file->TargetPath ); - if (argument) + if (cls->Argument) { - msi_reg_set_val_str( hkey3, NULL, argument ); - msi_free(argument); + lstrcatW( argument, szSpace ); + lstrcatW( argument, cls->Argument ); } + msi_reg_set_val_str( hkey3, NULL, argument ); + msi_free(argument); + RegCloseKey(hkey3); if (cls->ProgID || cls->ProgIDText) @@ -925,7 +889,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE } if (cls->AppID) - { + { MSIAPPID *appid = cls->AppID; msi_reg_set_val_str( hkey2, szAppID, appid->AppID );

1 0

Mike McCormack : msi: Register advertised components too.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 244405af473be6bb1662ee261e5fcba7b22ee9a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=244405af473be6bb1662ee2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 2 13:41:06 2006 +0200 msi: Register advertised components too. --- dlls/msi/classes.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index e2daaf8..e4cfcbb 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -807,11 +807,6 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE if (rc != ERROR_SUCCESS) return ERROR_FUNCTION_FAILED; - /* install_on_demand should be set if OLE supports install on demand OLE - * servers. For now i am defaulting to FALSE because i do not know how to - * check, and i am told our builtin OLE does not support it - */ - LIST_FOR_EACH_ENTRY( cls, &package->classes, MSICLASS, entry ) { MSICOMPONENT *comp; @@ -826,17 +821,14 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE feature = cls->Feature; - /* - * yes. MSDN says that these are based on _Feature_ not on - * Component. So verify the feature is to be installed + /* + * MSDN says that these are based on Feature not on Component. */ - if (!ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_LOCAL )) - /* && !(install_on_demand && - ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_ADVERTISED ))) */ + if (!ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_LOCAL ) && + !ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_ADVERTISED )) { - TRACE("Skipping class %s reg due to disabled feature %s\n", - debugstr_w(cls->clsid), - debugstr_w(feature->Feature)); + TRACE("Skipping class %s reg due to disabled feature %s\n", + debugstr_w(cls->clsid), debugstr_w(feature->Feature)); continue; }

1 0

Alexandre Julliard : uxtheme: Make some variables static.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 5234c8c94bdbcb9e65fb044c33d99c7770434459 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5234c8c94bdbcb9e65fb044… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 2 13:33:01 2006 +0200 uxtheme: Make some variables static. --- dlls/uxtheme/system.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index c834c52..4799072 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -57,17 +57,17 @@ static const WCHAR szDllName[] = {'D','l static const WCHAR szIniDocumentation[] = {'d','o','c','u','m','e','n','t','a','t','i','o','n','\0'}; HINSTANCE hDllInst; - -DWORD dwThemeAppProperties = STAP_ALLOW_NONCLIENT | STAP_ALLOW_CONTROLS; -ATOM atWindowTheme; -ATOM atSubAppName; -ATOM atSubIdList; ATOM atDialogThemeEnabled; -BOOL bThemeActive = FALSE; -WCHAR szCurrentTheme[MAX_PATH]; -WCHAR szCurrentColor[64]; -WCHAR szCurrentSize[64]; +static DWORD dwThemeAppProperties = STAP_ALLOW_NONCLIENT | STAP_ALLOW_CONTROLS; +static ATOM atWindowTheme; +static ATOM atSubAppName; +static ATOM atSubIdList; + +static BOOL bThemeActive = FALSE; +static WCHAR szCurrentTheme[MAX_PATH]; +static WCHAR szCurrentColor[64]; +static WCHAR szCurrentSize[64]; /***********************************************************************/

1 0

Alexandre Julliard : oledlg: Make a string static.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 7d5da234633031aa03f27d46f35e595bfcf6867c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7d5da234633031aa03f27d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 2 13:32:34 2006 +0200 oledlg: Make a string static. --- dlls/oledlg/insobjdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index e13917c..8928b35 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -73,7 +73,7 @@ static void UIINSERTOBJECTDLG_AddControl typedef HRESULT (*DLLREGISTER) (void); extern HINSTANCE OLEDLG_hInstance; -const char *OleUIInsertObjectInfoStr = "OleUIInsertObjectInfoStr"; +static const char OleUIInsertObjectInfoStr[] = "OleUIInsertObjectInfoStr"; /*********************************************************************** * OleUIInsertObjectA (OLEDLG.3)

1 0

Alexandre Julliard : kernel32: Make the keymap entries const.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: ae1f6982a0b31c697ccf60dc6c396bf16f5f1bc6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae1f6982a0b31c697ccf60d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 2 13:32:05 2006 +0200 kernel32: Make the keymap entries const. --- dlls/kernel/editline.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel/editline.c b/dlls/kernel/editline.c index af7eb2a..13c9697 100644 --- a/dlls/kernel/editline.c +++ b/dlls/kernel/editline.c @@ -46,7 +46,7 @@ typedef struct { DWORD keyState; /* keyState (from INPUT_RECORD) to match */ BOOL chkChar; /* check vk or char */ - KeyEntry* entries; /* array of entries */ + const KeyEntry* entries; /* array of entries */ } KeyMap; typedef struct WCEL_Context { @@ -648,7 +648,7 @@ #endif * ====================================================================*/ #define CTRL(x) ((x) - '@') -static KeyEntry StdKeyMap[] = +static const KeyEntry StdKeyMap[] = { {/*BACK*/0x08, WCEL_DeletePrevChar }, {/*RETURN*/0x0d, WCEL_Done }, @@ -656,14 +656,14 @@ static KeyEntry StdKeyMap[] = { 0, NULL } }; -static KeyEntry Win32ExtraStdKeyMap[] = +static const KeyEntry Win32ExtraStdKeyMap[] = { {/*VK_F8*/ 0x77, WCEL_FindPrevInHist }, { 0, NULL } }; -static KeyEntry EmacsKeyMapCtrl[] = +static const KeyEntry EmacsKeyMapCtrl[] = { { CTRL('@'), WCEL_SetMark }, { CTRL('A'), WCEL_MoveToBeg }, @@ -695,7 +695,7 @@ static KeyEntry EmacsKeyMapCtrl[] = { 0, NULL } }; -static KeyEntry EmacsKeyMapAlt[] = +static const KeyEntry EmacsKeyMapAlt[] = { {/*DEL*/127, WCEL_DeleteLeftWord }, { '<', WCEL_MoveToFirstHist }, @@ -712,7 +712,7 @@ static KeyEntry EmacsKeyMapAlt[] = { 0, NULL } }; -static KeyEntry EmacsKeyMapExtended[] = +static const KeyEntry EmacsKeyMapExtended[] = { {/*RETURN*/ 0x0d, WCEL_Done }, {/*VK_PRIOR*/0x21, WCEL_MoveToPrevHist }, @@ -725,7 +725,7 @@ static KeyEntry EmacsKeyMapExtended[] = { 0, NULL } }; -static KeyMap EmacsKeyMap[] = +static const KeyMap EmacsKeyMap[] = { {0x00000000, 1, StdKeyMap}, {0x00000001, 1, EmacsKeyMapAlt}, /* left alt */ @@ -736,7 +736,7 @@ static KeyMap EmacsKeyMap[] = {0, 0, 0} }; -static KeyEntry Win32KeyMapExtended[] = +static const KeyEntry Win32KeyMapExtended[] = { {/*VK_LEFT*/ 0x25, WCEL_MoveLeft }, {/*VK_RIGHT*/0x27, WCEL_MoveRight }, @@ -748,7 +748,7 @@ static KeyEntry Win32KeyMapExtended[] = { 0, NULL } }; -static KeyEntry Win32KeyMapCtrlExtended[] = +static const KeyEntry Win32KeyMapCtrlExtended[] = { {/*VK_LEFT*/ 0x25, WCEL_MoveToLeftWord }, {/*VK_RIGHT*/0x27, WCEL_MoveToRightWord }, @@ -756,7 +756,7 @@ static KeyEntry Win32KeyMapCtrlExtended[ { 0, NULL } }; -KeyMap Win32KeyMap[] = +static const KeyMap Win32KeyMap[] = { {0x00000000, 1, StdKeyMap}, {0x00000000, 0, Win32ExtraStdKeyMap}, @@ -777,8 +777,8 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleI { WCEL_Context ctx; INPUT_RECORD ir; - KeyMap* km; - KeyEntry* ke; + const KeyMap* km; + const KeyEntry* ke; unsigned ofs; void (*func)(struct WCEL_Context* ctx); DWORD ks;

1 0

Alexandre Julliard : ole32: Make some functions and variables static.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 518ee99f6f6df485c7f86149dc5ff330d8767cb7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=518ee99f6f6df485c7f8614… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 2 13:31:26 2006 +0200 ole32: Make some functions and variables static. --- dlls/ole32/compobj.c | 2 dlls/ole32/compobj_private.h | 1 dlls/ole32/git.c | 3 - dlls/ole32/ole2.c | 28 +++--- dlls/ole32/storage32.c | 195 +++++++++++++++++++++++++++--------------- dlls/ole32/storage32.h | 192 ----------------------------------------- 6 files changed, 142 insertions(+), 279 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=518ee99f6f6df485c7f…

1 0

Alexandre Julliard : msxml3: Make some functions and variables static.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 0b8c80351aee5528890924dab94fc08fa52b78f4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b8c80351aee5528890924d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 2 13:28:36 2006 +0200 msxml3: Make some functions and variables static. --- dlls/msxml3/domdoc.c | 6 +++--- dlls/msxml3/factory.c | 2 +- dlls/msxml3/nodelist.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index b837288..c617fb7 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -144,7 +144,7 @@ static HRESULT WINAPI bsc_OnObjectAvaila return S_OK; } -const struct IBindStatusCallbackVtbl bsc_vtbl = +static const struct IBindStatusCallbackVtbl bsc_vtbl = { bsc_QueryInterface, bsc_AddRef, @@ -1055,7 +1055,7 @@ static HRESULT WINAPI domdoc_abort( } -BOOL bstr_to_utf8( BSTR bstr, char **pstr, int *plen ) +static BOOL bstr_to_utf8( BSTR bstr, char **pstr, int *plen ) { UINT len, blen = SysStringLen( bstr ); LPSTR str; @@ -1233,7 +1233,7 @@ static HRESULT WINAPI domdoc_put_onTrans return E_NOTIMPL; } -const struct IXMLDOMDocumentVtbl domdoc_vtbl = +static const struct IXMLDOMDocumentVtbl domdoc_vtbl = { domdoc_QueryInterface, domdoc_AddRef, diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 8496a0f..5d15751 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -115,7 +115,7 @@ static HRESULT WINAPI xmlcf_LockServer( return S_OK; } -const struct IClassFactoryVtbl xmlcf_vtbl = +static const struct IClassFactoryVtbl xmlcf_vtbl = { xmlcf_QueryInterface, xmlcf_AddRef, diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index a4cf434..6dd2d21 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -77,8 +77,8 @@ static int create_xslt_parser( struct xs return 0; return 1; } - -void free_xslt_info( struct xslt_info *info ) + +static void free_xslt_info( struct xslt_info *info ) { if (info->pattern) xsltFreeCompMatchList( info->pattern );

1 0