June 2007 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Added support for coexisting different Gecko versions installation.
by Alexandre Julliard June 7, 2007

June 7, 2007

Module: wine Branch: master Commit: d795c283bd9a7a2a70cb128be29095176b8c648c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d795c283bd9a7a2a70cb128be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 6 19:44:20 2007 +0200 mshtml: Added support for coexisting different Gecko versions installation. --- dlls/mshtml/install.c | 52 ++++++++++++++++++++++++++++++++-------- dlls/mshtml/nsembed.c | 59 +++++++++++++++++++++++++++++++++++----------- dlls/mshtml/nsiface.idl | 3 ++ 3 files changed, 89 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 07f83e7..845598e 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -31,6 +31,8 @@ #include "ole2.h" #include "commctrl.h" #include "advpub.h" +#include "wininet.h" +#include "shellapi.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -76,20 +78,26 @@ static void set_status(DWORD id) static void set_registry(LPCSTR install_dir) { + WCHAR mshtml_key[100]; LPWSTR gecko_path; HKEY hkey; DWORD res, len, size; static const WCHAR wszMshtmlKey[] = { 'S','o','f','t','w','a','r','e','\\','W','i','n','e', - '\\','M','S','H','T','M','L',0}; + '\\','M','S','H','T','M','L','\\'}; static const WCHAR wszGeckoPath[] = {'G','e','c','k','o','P','a','t','h',0}; static const WCHAR wszWineGecko[] = {'w','i','n','e','_','g','e','c','k','o',0}; - /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ - res = RegOpenKeyW(HKEY_CURRENT_USER, wszMshtmlKey, &hkey); + memcpy(mshtml_key, wszMshtmlKey, sizeof(wszMshtmlKey)); + MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, sizeof(GECKO_VERSION), + mshtml_key+sizeof(wszMshtmlKey)/sizeof(WCHAR), + (sizeof(mshtml_key)-sizeof(wszMshtmlKey))/sizeof(WCHAR)); + + /* @@ Wine registry key: HKCU\Software\Wine\MSHTML\<version> */ + res = RegCreateKeyW(HKEY_CURRENT_USER, mshtml_key, &hkey); if(res != ERROR_SUCCESS) { - ERR("Faild to open MSHTML key: %d\n", res); + ERR("Faild to create MSHTML key: %d\n", res); return; } @@ -189,8 +197,9 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, LPSTR file_name; DWORD len; HMODULE advpack; - char program_files[MAX_PATH]; + char install_dir[MAX_PATH]; typeof(ExtractFilesA) *pExtractFilesA; + BOOL res; HRESULT hres; static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; @@ -206,6 +215,21 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, set_status(IDS_INSTALLING); + GetWindowsDirectoryA(install_dir, sizeof(install_dir)); + strcat(install_dir, "\\gecko\\"); + res = CreateDirectoryA(install_dir, NULL); + if(!res && GetLastError() != ERROR_ALREADY_EXISTS) { + ERR("Could not create directory: %08u\n", GetLastError()); + return S_OK; + } + + strcat(install_dir, GECKO_VERSION); + res = CreateDirectoryA(install_dir, NULL); + if(!res && GetLastError() != ERROR_ALREADY_EXISTS) { + ERR("Could not create directory: %08u\n", GetLastError()); + return S_OK; + } + advpack = LoadLibraryW(wszAdvpack); pExtractFilesA = (typeof(ExtractFilesA)*)GetProcAddress(advpack, "ExtractFiles"); @@ -213,10 +237,8 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, file_name = mshtml_alloc(len); WideCharToMultiByte(CP_ACP, 0, tmp_file_name, -1, file_name, -1, NULL, NULL); - GetEnvironmentVariableA("ProgramFiles", program_files, sizeof(program_files)); - /* FIXME: Use unicode version (not yet implemented) */ - hres = pExtractFilesA(file_name, program_files, 0, NULL, NULL, 0); + hres = pExtractFilesA(file_name, install_dir, 0, NULL, NULL, 0); FreeLibrary(advpack); mshtml_free(file_name); if(FAILED(hres)) { @@ -224,7 +246,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, clean_up(); } - set_registry(program_files); + set_registry(install_dir); clean_up(); return S_OK; @@ -283,13 +305,15 @@ static LPWSTR get_url(void) { HKEY hkey; DWORD res, type; - DWORD size = 512*sizeof(WCHAR); + DWORD size = INTERNET_MAX_URL_LENGTH*sizeof(WCHAR); LPWSTR url; static const WCHAR wszMshtmlKey[] = { 'S','o','f','t','w','a','r','e','\\','W','i','n','e', '\\','M','S','H','T','M','L',0}; static const WCHAR wszGeckoUrl[] = {'G','e','c','k','o','U','r','l',0}; + static const WCHAR httpW[] = {'h','t','t','p'}; + static const WCHAR v_formatW[] = {'?','v','=',0}; /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ res = RegOpenKeyW(HKEY_CURRENT_USER, wszMshtmlKey, &hkey); @@ -305,6 +329,12 @@ static LPWSTR get_url(void) return NULL; } + if(size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) { + strcatW(url, v_formatW); + MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, url+strlenW(url), -1); + } + + TRACE("Got URL %s\n", debugstr_w(url)); return url; } @@ -369,7 +399,7 @@ BOOL install_wine_gecko(void) WaitForSingleObject(hsem, INFINITE); }else { if((url = get_url())) - DialogBoxW(hInst, MAKEINTRESOURCEW(ID_DWL_DIALOG), 0, installer_proc); + DialogBoxW(hInst, MAKEINTRESOURCEW(ID_DWL_DIALOG), 0, installer_proc); } ReleaseSemaphore(hsem, 1, NULL); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9cebe47..c7acfde 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -165,7 +165,7 @@ static BOOL load_xpcom(const PRUnichar *gre_path) return TRUE; } -static void check_version(LPCWSTR gre_path) +static BOOL check_version(LPCWSTR gre_path, const char *version_string) { WCHAR file_name[MAX_PATH]; char version[128]; @@ -180,42 +180,73 @@ static void check_version(LPCWSTR gre_path) hfile = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hfile == INVALID_HANDLE_VALUE) { - TRACE("unknown version\n"); - return; + ERR("Could not open VERSION file\n"); + return FALSE; } ReadFile(hfile, version, sizeof(version), &read, NULL); version[read] = 0; + CloseHandle(hfile); TRACE("%s\n", debugstr_a(version)); - CloseHandle(hfile); + if(strcmp(version, version_string)) { + ERR("Unexpected version %s, expected %s\n", debugstr_a(version), + debugstr_a(version_string)); + return FALSE; + } + + return TRUE; +} + +static BOOL load_wine_gecko_v(PRUnichar *gre_path, HKEY mshtml_key, + const char *version, const char *version_string) +{ + DWORD res, type, size = MAX_PATH; + HKEY hkey = mshtml_key; + + static const WCHAR wszGeckoPath[] = + {'G','e','c','k','o','P','a','t','h',0}; + + if(version) { + /* @@ Wine registry key: HKCU\Software\Wine\MSHTML\<version> */ + res = RegOpenKeyA(mshtml_key, version, &hkey); + if(res != ERROR_SUCCESS) + return FALSE; + } + + res = RegQueryValueExW(hkey, wszGeckoPath, NULL, &type, (LPBYTE)gre_path, &size); + if(hkey != mshtml_key) + RegCloseKey(hkey); + if(res != ERROR_SUCCESS || type != REG_SZ) + return FALSE; + + if(!check_version(gre_path, version_string)) + return FALSE; + + return load_xpcom(gre_path); } static BOOL load_wine_gecko(PRUnichar *gre_path) { HKEY hkey; - DWORD res, type, size = MAX_PATH; + DWORD res; + BOOL ret; static const WCHAR wszMshtmlKey[] = { 'S','o','f','t','w','a','r','e','\\','W','i','n','e', '\\','M','S','H','T','M','L',0}; - static const WCHAR wszGeckoPath[] = - {'G','e','c','k','o','P','a','t','h',0}; /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ res = RegOpenKeyW(HKEY_CURRENT_USER, wszMshtmlKey, &hkey); if(res != ERROR_SUCCESS) return FALSE; - res = RegQueryValueExW(hkey, wszGeckoPath, NULL, &type, (LPBYTE)gre_path, &size); - if(res != ERROR_SUCCESS || type != REG_SZ) - return FALSE; - - if(TRACE_ON(mshtml)) - check_version(gre_path); + ret = load_wine_gecko_v(gre_path, hkey, GECKO_VERSION, GECKO_VERSION_STRING) + || load_wine_gecko_v(gre_path, hkey, NULL, "Wine Gecko 0.0.1\n"); - return load_xpcom(gre_path); + RegCloseKey(hkey); + return ret; } static void set_profile(void) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 817030b..2a22b23 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -23,6 +23,9 @@ * useable in C code. */ +cpp_quote("#define GECKO_VERSION \"0.0.1\""); +cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION \"\n\""); + import "wtypes.idl"; typedef HRESULT nsresult;

1 0

H. Verbeet : wined3d: Get rid of the pBaseVertexIndex parameter to IWineD3DDeviceImpl_GetIndices , use GetBaseVertexIndex instead.
by Alexandre Julliard June 7, 2007

June 7, 2007

Module: wine Branch: master Commit: 6ee356fca048dd6d0b5bb61ce178f8e3c76bf611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee356fca048dd6d0b5bb61ce… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jun 6 18:40:09 2007 +0200 wined3d: Get rid of the pBaseVertexIndex parameter to IWineD3DDeviceImpl_GetIndices, use GetBaseVertexIndex instead. --- dlls/d3d8/device.c | 7 ++++--- dlls/d3d9/device.c | 9 ++++----- dlls/wined3d/device.c | 7 +++---- include/wine/wined3d_interface.h | 4 ++-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9b718a4..366694f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1460,12 +1460,13 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetIndices(LPDIRECT3DDEVICE8 iface, I return D3DERR_INVALIDCALL; } - rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData, pBaseVertexIndex); - if (D3D_OK == rc && NULL != retIndexData) { + IWineD3DDevice_GetBaseVertexIndex(This->WineD3DDevice, pBaseVertexIndex); + rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData); + if (SUCCEEDED(rc) && retIndexData) { IWineD3DIndexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); IWineD3DIndexBuffer_Release(retIndexData); } else { - if(rc != D3D_OK) FIXME("Call to GetIndices failed\n"); + if (FAILED(rc)) FIXME("Call to GetIndices failed\n"); *ppIndexData = NULL; } return rc; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 436b2a1..65535db 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -918,7 +918,6 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(LPDIRECT3DDEVICE9 iface, IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IWineD3DIndexBuffer *retIndexData = NULL; HRESULT rc = D3D_OK; - UINT tmp; TRACE("(%p) Relay\n", This); @@ -926,12 +925,12 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(LPDIRECT3DDEVICE9 iface, return D3DERR_INVALIDCALL; } - rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData, &tmp); - if (rc == D3D_OK && NULL != retIndexData) { + rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData); + if (SUCCEEDED(rc) && retIndexData) { IWineD3DIndexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); IWineD3DIndexBuffer_Release(retIndexData); - }else{ - if(rc != D3D_OK) FIXME("Call to GetIndices failed\n"); + } else { + if (FAILED(rc)) FIXME("Call to GetIndices failed\n"); *ppIndexData = NULL; } return rc; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 28116af..528f6bd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2774,7 +2774,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetIndices(IWineD3DDevice *iface, IWine return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetIndices(IWineD3DDevice *iface, IWineD3DIndexBuffer** ppIndexData, UINT* pBaseVertexIndex) { +static HRESULT WINAPI IWineD3DDeviceImpl_GetIndices(IWineD3DDevice *iface, IWineD3DIndexBuffer** ppIndexData) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; *ppIndexData = This->stateBlock->pIndexData; @@ -2782,12 +2782,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetIndices(IWineD3DDevice *iface, IWine /* up ref count on ppindexdata */ if (*ppIndexData) { IWineD3DIndexBuffer_AddRef(*ppIndexData); - *pBaseVertexIndex = This->stateBlock->baseVertexIndex; - TRACE("(%p) index data set to %p + %u\n", This, ppIndexData, This->stateBlock->baseVertexIndex); + TRACE("(%p) index data set to %p\n", This, ppIndexData); }else{ TRACE("(%p) No index data set\n", This); } - TRACE("Returning %p %d\n", *ppIndexData, *pBaseVertexIndex); + TRACE("Returning %p\n", *ppIndexData); return WINED3D_OK; } diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 6402829..b6dd6cb 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -404,7 +404,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) STDMETHOD_(void, SetGammaRamp)(THIS_ UINT iSwapChain, DWORD Flags, CONST WINED3DGAMMARAMP* pRamp) PURE; STDMETHOD_(void, GetGammaRamp)(THIS_ UINT iSwapChain, WINED3DGAMMARAMP* pRamp) PURE; STDMETHOD(SetIndices)(THIS_ struct IWineD3DIndexBuffer * pIndexData) PURE; - STDMETHOD(GetIndices)(THIS_ struct IWineD3DIndexBuffer ** ppIndexData,UINT * pBaseVertexIndex) PURE; + STDMETHOD(GetIndices)(THIS_ struct IWineD3DIndexBuffer ** ppIndexData) PURE; STDMETHOD(SetBaseVertexIndex)(THIS_ UINT baseIndex); STDMETHOD(GetBaseVertexIndex)(THIS_ UINT *baseIndex); STDMETHOD(SetLight)(THIS_ DWORD Index,CONST WINED3DLIGHT * pLight) PURE; @@ -541,7 +541,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) #define IWineD3DDevice_SetGammaRamp(p,a,b,c) (p)->lpVtbl->SetGammaRamp(p,a,b,c) #define IWineD3DDevice_GetGammaRamp(p,a,b) (p)->lpVtbl->GetGammaRamp(p,a,b) #define IWineD3DDevice_SetIndices(p,a) (p)->lpVtbl->SetIndices(p,a) -#define IWineD3DDevice_GetIndices(p,a,b) (p)->lpVtbl->GetIndices(p,a,b) +#define IWineD3DDevice_GetIndices(p,a) (p)->lpVtbl->GetIndices(p,a) #define IWineD3DDevice_SetBaseVertexIndex(p, a) (p)->lpVtbl->SetBaseVertexIndex(p, a) #define IWineD3DDevice_GetBaseVertexIndex(p,a) (p)->lpVtbl->GetBaseVertexIndex(p,a) #define IWineD3DDevice_SetLight(p,a,b) (p)->lpVtbl->SetLight(p,a,b)

1 0

H. Verbeet : wined3d: Add IWineD3DDevice_GetBaseVertexIndex to retrieve the base vertex index.
by Alexandre Julliard June 7, 2007

June 7, 2007

Module: wine Branch: master Commit: 262240adced015599e9a275b60590260781777f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=262240adced015599e9a275b6… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jun 6 18:40:02 2007 +0200 wined3d: Add IWineD3DDevice_GetBaseVertexIndex to retrieve the base vertex index. --- dlls/wined3d/device.c | 12 ++++++++++++ include/wine/wined3d_interface.h | 2 ++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index afa34c5..28116af 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2813,6 +2813,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetBaseVertexIndex(IWineD3DDevice *ifac return WINED3D_OK; } +static HRESULT WINAPI IWineD3DDeviceImpl_GetBaseVertexIndex(IWineD3DDevice *iface, UINT* base_index) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + TRACE("(%p) : base_index %p\n", This, base_index); + + *base_index = This->stateBlock->baseVertexIndex; + + TRACE("Returning %u\n", *base_index); + + return WINED3D_OK; +} + /***** * Get / Set Viewports *****/ @@ -6369,6 +6380,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_SetIndices, IWineD3DDeviceImpl_GetIndices, IWineD3DDeviceImpl_SetBaseVertexIndex, + IWineD3DDeviceImpl_GetBaseVertexIndex, IWineD3DDeviceImpl_SetLight, IWineD3DDeviceImpl_GetLight, IWineD3DDeviceImpl_SetLightEnable, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index abefdaf..6402829 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -406,6 +406,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) STDMETHOD(SetIndices)(THIS_ struct IWineD3DIndexBuffer * pIndexData) PURE; STDMETHOD(GetIndices)(THIS_ struct IWineD3DIndexBuffer ** ppIndexData,UINT * pBaseVertexIndex) PURE; STDMETHOD(SetBaseVertexIndex)(THIS_ UINT baseIndex); + STDMETHOD(GetBaseVertexIndex)(THIS_ UINT *baseIndex); STDMETHOD(SetLight)(THIS_ DWORD Index,CONST WINED3DLIGHT * pLight) PURE; STDMETHOD(GetLight)(THIS_ DWORD Index,WINED3DLIGHT * pLight) PURE; STDMETHOD(SetLightEnable)(THIS_ DWORD Index,BOOL Enable) PURE; @@ -542,6 +543,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) #define IWineD3DDevice_SetIndices(p,a) (p)->lpVtbl->SetIndices(p,a) #define IWineD3DDevice_GetIndices(p,a,b) (p)->lpVtbl->GetIndices(p,a,b) #define IWineD3DDevice_SetBaseVertexIndex(p, a) (p)->lpVtbl->SetBaseVertexIndex(p, a) +#define IWineD3DDevice_GetBaseVertexIndex(p,a) (p)->lpVtbl->GetBaseVertexIndex(p,a) #define IWineD3DDevice_SetLight(p,a,b) (p)->lpVtbl->SetLight(p,a,b) #define IWineD3DDevice_GetLight(p,a,b) (p)->lpVtbl->GetLight(p,a,b) #define IWineD3DDevice_SetLightEnable(p,a,b) (p)->lpVtbl->SetLightEnable(p,a,b)

1 0

Anatoly Lyutin : cmd.exe: Update Russian translation.
by Alexandre Julliard June 7, 2007

June 7, 2007

Module: wine Branch: master Commit: b611b569471b1a0e4bfc983e74526bacdbfb130c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b611b569471b1a0e4bfc983e7… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Wed Jun 6 21:23:05 2007 +0400 cmd.exe: Update Russian translation. --- programs/cmd/Ru.rc | 66 ++++++++++++++++++++++++++-------------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/programs/cmd/Ru.rc b/programs/cmd/Ru.rc index 852f9ff..a9aa2f3 100644 --- a/programs/cmd/Ru.rc +++ b/programs/cmd/Ru.rc @@ -244,37 +244,37 @@ VOL\t\t�� \n\ EXIT\t\t�� CMD\n\n\ �� HELP <��> �� .\n" - WCMD_CONFIRM, "Are you sure" - WCMD_YES, "Y" - WCMD_NO, "N" - WCMD_NOASSOC, "File association missing for extension %s\n" - WCMD_NOFTYPE, "No open command associated with file type '%s'\n" - WCMD_OVERWRITE, "Overwrite %s" - WCMD_MORESTR, "More..." - WCMD_TRUNCATEDLINE, "Line in Batch processing possibly truncated. Using:\n" - WCMD_NYI, "Not Yet Implemented\n\n" - WCMD_NOARG, "Argument missing\n" - WCMD_SYNTAXERR, "Syntax error\n" - WCMD_FILENOTFOUND, "%s : File Not Found\n" - WCMD_NOCMDHELP, "No help available for %s\n" - WCMD_NOTARGET, "Target to GOTO not found\n" - WCMD_CURRENTDATE, "Current Date is %s\n" - WCMD_CURRENTTIME, "Current Time is %s\n" - WCMD_NEWDATE, "Enter new date: " - WCMD_NEWTIME, "Enter new time: " - WCMD_MISSINGENV, "Environment variable %s not defined\n" - WCMD_READFAIL, "Failed to open '%s'\n" - WCMD_CALLINSCRIPT, "Cannot call batch label outside of a batch script\n" - WCMD_ALL, "A" - WCMD_DELPROMPT, "%s, Delete" - WCMD_ECHOPROMPT, "Echo is %s\n" - WCMD_VERIFYPROMPT, "Verify is %s\n" - WCMD_VERIFYERR, "Verify must be ON or OFF\n"; - WCMD_ARGERR, "Parameter error\n" - WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n" - WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?" - WCMD_NOPATH, "PATH not found\n" - WCMD_ANYKEY,"Press Return key to continue: " - WCMD_CONSTITLE,"Wine Command Prompt" - WCMD_VERSION,"CMD Version %s\n\n" + WCMD_CONFIRM, "�� ?" + WCMD_YES, "�" + WCMD_NO, "�" + WCMD_NOASSOC, "��, �� %s,��\n" + WCMD_NOFTYPE, "�� , �� '%s'\n" + WCMD_OVERWRITE, "�� %s" + WCMD_MORESTR, "��..." + WCMD_TRUNCATEDLINE, "�� bat-�� . ��:\n" + WCMD_NYI, "�� \n\n" + WCMD_NOARG, "�� \n" + WCMD_SYNTAXERR, "�� \n" + WCMD_FILENOTFOUND, "%s : �� \n" + WCMD_NOCMDHELP, "�� %s ��\n" + WCMD_NOTARGET, "�� GOTO �� \n" + WCMD_CURRENTDATE, "�� %s\n" + WCMD_CURRENTTIME, "�� %s\n" + WCMD_NEWDATE, "�� : " + WCMD_NEWTIME, "�� : " + WCMD_MISSINGENV, "�� %s �� \n" + WCMD_READFAIL, "�� '%s'\n" + WCMD_CALLINSCRIPT, "�� bat-�� bat-��\n" + WCMD_ALL, "�" + WCMD_DELPROMPT, "%s, ��" + WCMD_ECHOPROMPT, "Echo �� %s\n" + WCMD_VERIFYPROMPT, "Verify �� %s\n" + WCMD_VERIFYERR, "Verify �� ON, �� OFF\n"; + WCMD_ARGERR, "�� \n" + WCMD_VOLUMEDETAIL, "�� %c %s\n �� %04x-%04x\n\n" + WCMD_VOLUMEPROMPT, "�� (11 ��, ENTER �� )?" + WCMD_NOPATH, "PATH �� \n" + WCMD_ANYKEY,"�� : " + WCMD_CONSTITLE,"�� Wine" + WCMD_VERSION,"�� CMD %s\n\n" }

1 0

Hans Leidekker : mlang: Implement IMultiLanguage::GetLcidFromRfc1766.
by Alexandre Julliard June 7, 2007

June 7, 2007

Module: wine Branch: master Commit: 4167e09f48dc7d600ce84aa1e1ed1830c2b6ca97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4167e09f48dc7d600ce84aa1e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Jun 6 22:36:15 2007 +0200 mlang: Implement IMultiLanguage::GetLcidFromRfc1766. --- dlls/mlang/mlang.c | 58 ++++++++++++++++++++++++++++++++++++++++++--- dlls/mlang/tests/mlang.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 6d5142b..b5b8e0d 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -740,6 +740,28 @@ HRESULT WINAPI LcidToRfc1766W( return S_FALSE; } +static HRESULT lcid_from_rfc1766(IEnumRfc1766 *iface, LCID *lcid, LPCWSTR rfc1766) +{ + RFC1766INFO info; + ULONG num; + + while (IEnumRfc1766_Next(iface, 1, &info, &num) == S_OK) + { + if (!strcmpW(info.wszRfc1766, rfc1766)) + { + *lcid = info.lcid; + return S_OK; + } + if (strlenW(rfc1766) == 2 && !memcmp(info.wszRfc1766, rfc1766, 2 * sizeof(WCHAR))) + { + *lcid = PRIMARYLANGID(info.lcid); + return S_OK; + } + } + + return E_FAIL; +} + /****************************************************************************** * MLANG ClassFactory */ @@ -1656,8 +1678,22 @@ static HRESULT WINAPI fnIMultiLanguage_GetLcidFromRfc1766( LCID* pLocale, BSTR bstrRfc1766) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hr; + IEnumRfc1766 *rfc1766; + + TRACE("%p %p %s\n", iface, pLocale, debugstr_w(bstrRfc1766)); + + if (!pLocale || !bstrRfc1766) + return E_INVALIDARG; + + hr = IMultiLanguage_EnumRfc1766(iface, &rfc1766); + if (FAILED(hr)) + return hr; + + hr = lcid_from_rfc1766(rfc1766, pLocale, bstrRfc1766); + + IEnumRfc1766_Release(rfc1766); + return hr; } /******************************************************************************/ @@ -2172,8 +2208,22 @@ static HRESULT WINAPI fnIMultiLanguage2_GetLcidFromRfc1766( LCID* pLocale, BSTR bstrRfc1766) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hr; + IEnumRfc1766 *rfc1766; + + TRACE("%p %p %s\n", iface, pLocale, debugstr_w(bstrRfc1766)); + + if (!pLocale || !bstrRfc1766) + return E_INVALIDARG; + + hr = IMultiLanguage2_EnumRfc1766(iface, 0, &rfc1766); + if (FAILED(hr)) + return hr; + + hr = lcid_from_rfc1766(rfc1766, pLocale, bstrRfc1766); + + IEnumRfc1766_Release(rfc1766); + return hr; } static HRESULT WINAPI fnIMultiLanguage2_EnumRfc1766( diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 53060fd..fb50e2e 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -679,6 +679,60 @@ static void test_rfc1766(IMultiLanguage2 *iML2) } } +static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) +{ + LCID lcid; + HRESULT ret; + + static WCHAR e[] = { 'e',0 }; + static WCHAR en[] = { 'e','n',0 }; + static WCHAR empty[] = { 0 }; + static WCHAR dash[] = { '-',0 }; + static WCHAR e_dash[] = { 'e','-',0 }; + static WCHAR en_gb[] = { 'e','n','-','g','b',0 }; + static WCHAR en_us[] = { 'e','n','-','u','s',0 }; + static WCHAR en_them[] = { 'e','n','-','t','h','e','m',0 }; + static WCHAR english[] = { 'e','n','g','l','i','s','h',0 }; + + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, NULL, en); + ok(ret == E_INVALIDARG, "GetLcidFromRfc1766 returned: %08x\n", ret); + + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, NULL); + ok(ret == E_INVALIDARG, "GetLcidFromRfc1766 returned: %08x\n", ret); + + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, e); + ok(ret == E_FAIL, "GetLcidFromRfc1766 returned: %08x\n", ret); + + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, empty); + ok(ret == E_FAIL, "GetLcidFromRfc1766 returned: %08x\n", ret); + + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, dash); + ok(ret == E_FAIL, "GetLcidFromRfc1766 returned: %08x\n", ret); + + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, e_dash); + ok(ret == E_FAIL, "GetLcidFromRfc1766 returned: %08x\n", ret); + + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, en_them); + ok(ret == E_FAIL, "GetLcidFromRfc1766 returned: %08x\n", ret); + + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, english); + ok(ret == E_FAIL, "GetLcidFromRfc1766 returned: %08x\n", ret); + + lcid = 0; + + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, en); + ok(ret == S_OK, "GetLcidFromRfc1766 returned: %08x\n", ret); + ok(lcid == 9, "got wrong lcid: %04x\n", lcid); + + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, en_gb); + ok(ret == S_OK, "GetLcidFromRfc1766 returned: %08x\n", ret); + ok(lcid == 0x809, "got wrong lcid: %04x\n", lcid); + + ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, en_us); + ok(ret == S_OK, "GetLcidFromRfc1766 returned: %08x\n", ret); + ok(lcid == 0x409, "got wrong lcid: %04x\n", lcid); +} + START_TEST(mlang) { IMultiLanguage2 *iML2 = NULL; @@ -696,6 +750,7 @@ START_TEST(mlang) if (ret != S_OK || !iML2) return; test_rfc1766(iML2); + test_GetLcidFromRfc1766(iML2); test_EnumCodePages(iML2, 0); test_EnumCodePages(iML2, MIMECONTF_MIME_LATEST);

1 0

Alexandre Julliard : winedevice: Accept the shutdown service control.
by Alexandre Julliard June 7, 2007

June 7, 2007

Module: wine Branch: master Commit: c2fed1752d4d49229c9e92af4f0c4a150db4d504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2fed1752d4d49229c9e92af4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 7 11:20:24 2007 +0200 winedevice: Accept the shutdown service control. --- programs/winedevice/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 226ba6b..9af85f4 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -204,7 +204,7 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) if (load_driver()) { status.dwCurrentState = SERVICE_RUNNING; - status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; SetServiceStatus( service_handle, &status ); wine_ntoskrnl_main_loop( stop_event );

1 0

Detlef Riekenberg : winspool: Remove outdated comment.
by Alexandre Julliard June 7, 2007

June 7, 2007

Module: wine Branch: master Commit: a2db0b83f79716bb8c10798ac18f5390d96f31bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2db0b83f79716bb8c10798ac… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jun 6 16:52:11 2007 +0200 winspool: Remove outdated comment. --- dlls/winspool.drv/info.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 3086d00..d78964b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2270,7 +2270,6 @@ BOOL WINAPI DeleteMonitorW (LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorNa return FALSE; } - /* change this, when advapi32.dll/RegDeleteTree is implemented */ if(RegDeleteTreeW(hroot, pMonitorName) == ERROR_SUCCESS) { TRACE("monitor %s deleted\n", debugstr_w(pMonitorName)); RegCloseKey(hroot);

1 0

Markus Goemmel : comctl32/listview.c: Ownerdraw font problem during focus change fixed.
by Alexandre Julliard June 7, 2007

June 7, 2007

Module: wine Branch: master Commit: 4b8d442477e7f762e3f36fffdd9fe447b7858879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b8d442477e7f762e3f36fffd… Author: Markus Goemmel <m.goemmel(a)compulab.de> Date: Wed Jun 6 12:51:50 2007 +0200 comctl32/listview.c: Ownerdraw font problem during focus change fixed. --- dlls/comctl32/listview.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ba94aec..7602217 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1771,6 +1771,9 @@ static void LISTVIEW_ShowFocusRect(const LISTVIEW_INFO *infoPtr, BOOL fShow) DRAWITEMSTRUCT dis; LVITEMW item; + HFONT hFont = infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont; + HFONT hOldFont = SelectObject(hdc, hFont); + item.iItem = infoPtr->nFocusedItem; item.iSubItem = 0; item.mask = LVIF_PARAM; @@ -1788,6 +1791,8 @@ static void LISTVIEW_ShowFocusRect(const LISTVIEW_INFO *infoPtr, BOOL fShow) dis.itemData = item.lParam; SendMessageW(infoPtr->hwndNotify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); + + SelectObject(hdc, hOldFont); } else {

1 0

Huw Davies : winex11.drv: XRenderCompositeText has a problem with 0x0 glyphs, so we'll pretend they' re 1x1.
by Alexandre Julliard June 7, 2007

June 7, 2007

Module: wine Branch: master Commit: c9fd5a265f4b1f9a52ba27d8f30ddf855aeba55c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fd5a265f4b1f9a52ba27d8f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 6 15:20:16 2007 +0100 winex11.drv: XRenderCompositeText has a problem with 0x0 glyphs, so we'll pretend they're 1x1. --- dlls/winex11.drv/xrender.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 612c048..74a7e2b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -633,6 +633,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) gsCacheEntryFormat *formatEntry; UINT ggo_format = GGO_GLYPH_INDEX; XRenderPictFormat pf; + const char zero = 0; switch(format) { case AA_Grey: @@ -790,7 +791,6 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) } } - memcpy(&formatEntry->gis[glyph], &gi, sizeof(gi)); if(formatEntry->glyphset) { if(format == AA_None && BitmapBitOrder(gdi_display) != MSBFirst) { @@ -809,14 +809,28 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) } } gid = glyph; + + /* + XRenderCompositeText seems to ignore 0x0 glyphs when + AA_None, which means we lose the advance width of glyphs + like the space. We'll pretend that such glyphs are 1x1 + bitmaps. + */ + + if(buflen == 0) + gi.width = gi.height = 1; + wine_tsx11_lock(); pXRenderAddGlyphs(gdi_display, formatEntry->glyphset, &gid, &gi, 1, - buf, buflen); + buflen ? buf : &zero, buflen ? buflen : 1); wine_tsx11_unlock(); HeapFree(GetProcessHeap(), 0, buf); } else { formatEntry->bitmaps[glyph] = buf; } + + memcpy(&formatEntry->gis[glyph], &gi, sizeof(gi)); + return TRUE; }

1 0

Paul Vriens : wintrust/tests: Use A instead of W-calls.
by Alexandre Julliard June 7, 2007

June 7, 2007

Module: wine Branch: master Commit: 0bb92b37a4b7e9958105fdaeb47c98be515264fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb92b37a4b7e9958105fdaeb… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jun 6 15:47:36 2007 +0200 wintrust/tests: Use A instead of W-calls. --- dlls/wintrust/tests/register.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index 8046a78..db5726c 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -298,16 +298,10 @@ static void test_RegPolicyFlags(void) * WTPF_OFFLINEOK_COM | * WTPF_OFFLINEOK_IND */ - static const WCHAR Software_Publishing[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'W','i','n','t','r','u','s','t','\\', - 'T','r','u','s','t',' ','P','r','o','v','i','d','e','r','s','\\', - 'S','o','f','t','w','a','r','e',' ', - 'P','u','b','l','i','s','h','i','n','g',0 }; - static const WCHAR State[] = { 'S','t','a','t','e',0 }; + static const CHAR Software_Publishing[] = + "Software\\Microsoft\\Windows\\CurrentVersion\\Wintrust\\" + "Trust Providers\\Software Publishing"; + static const CHAR State[] = "State"; WintrustGetRegPolicyFlagsFunc pGetFlags; WintrustSetRegPolicyFlagsFunc pSetFlags; HKEY key; @@ -322,12 +316,12 @@ static void test_RegPolicyFlags(void) if (!pGetFlags || !pSetFlags) skip("Policy flags functions not present\n"); - r = RegOpenKeyExW(HKEY_CURRENT_USER, Software_Publishing, 0, KEY_ALL_ACCESS, + r = RegOpenKeyExA(HKEY_CURRENT_USER, Software_Publishing, 0, KEY_ALL_ACCESS, &key); ok(!r, "RegOpenKeyEx failed: %d\n", r); size = sizeof(flags1); - r = RegQueryValueExW(key, State, NULL, NULL, (LPBYTE)&flags1, &size); + r = RegQueryValueExA(key, State, NULL, NULL, (LPBYTE)&flags1, &size); ok(!r, "RegQueryValueEx failed: %d\n", r); pGetFlags(&flags2); @@ -337,7 +331,7 @@ static void test_RegPolicyFlags(void) ret = pSetFlags(flags3); ok(ret, "pSetFlags failed: %d\n", GetLastError()); size = sizeof(flags1); - r = RegQueryValueExW(key, State, NULL, NULL, (LPBYTE)&flags1, &size); + r = RegQueryValueExA(key, State, NULL, NULL, (LPBYTE)&flags1, &size); ok(flags1 == flags3, "Didn't get expected flags\n"); pSetFlags(flags2);

1 0