January 2007 - Wine-Commits

Dmitry Timoshkov : kernel32: Skip the OpenProcess test under Win9x.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 3d01fc39aa084a6121ac5f2e07f73916a23a9116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d01fc39aa084a6121ac5f2e0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Jan 6 18:44:36 2007 +0800 kernel32: Skip the OpenProcess test under Win9x. --- dlls/kernel32/tests/process.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 52251a6..8a15722 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1313,6 +1313,12 @@ static void test_OpenProcess(void) addr1 = pVirtualAllocEx(hproc, 0, 0xFFFC, MEM_RESERVE, PAGE_NOACCESS); todo_wine { ok(!addr1, "VirtualAllocEx should fail\n"); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { /* Win9x */ + CloseHandle(hproc); + trace("VirtualAllocEx is not implemented, skipping the test\n"); + return; + } ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %d\n", GetLastError()); }

1 0

H. Verbeet : d3d8: IDirect3DDevice8Impl_GetVertexShaderDeclaration gets passed a handle instead of a pointer .
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: d73e5d6fc8e7bc5ae9f90a476f983680d85d62ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73e5d6fc8e7bc5ae9f90a476… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Jan 6 18:04:01 2007 +0100 d3d8: IDirect3DDevice8Impl_GetVertexShaderDeclaration gets passed a handle instead of a pointer. --- dlls/d3d8/device.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1f8bb6e..b6fde8f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1290,13 +1290,29 @@ static HRESULT WINAPI IDirect3DDevice8Im return IWineD3DDevice_GetVertexShaderConstantF(This->WineD3DDevice, Register, (float *)pConstantData, ConstantCount); } +/* FIXME: There currently isn't a proper way to retrieve the declaration from + * the wined3d shader. However, rather than simply adding this, the relation + * between d3d8 and wined3d shaders should be fixed. A d3d8 vertex shader + * should contain both a wined3d vertex shader and a wined3d vertex + * declaration, and eg. SetVertexShader in d3d8 should set both of them in + * wined3d. This would also allow us to get rid of the vertexDeclaration field + * in IWineD3DVertexShaderImpl */ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderDeclaration(LPDIRECT3DDEVICE8 iface, DWORD pVertexShader, void* pData, DWORD* pSizeOfData) { - IDirect3DVertexShader8Impl *This = (IDirect3DVertexShader8Impl *)pVertexShader; + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; + IDirect3DVertexShader8Impl *shader = NULL; - TRACE("(%p) : Relay\n", This); -/* return IWineD3DVertexShader_GetDeclaration(This->wineD3DVertexShader, pData, (UINT *)pSizeOfData); */ + TRACE("(%p) : pVertexShader %#x, pData %p, pSizeOfData %p\n", This, pVertexShader, pData, pSizeOfData); + + if (pVertexShader <= VS_HIGHESTFIXEDFXF || This->allocated_shader_handles <= pVertexShader - (VS_HIGHESTFIXEDFXF + 1)) { + ERR("Passed an invalid shader handle.\n"); + return D3DERR_INVALIDCALL; + } + + shader = This->shader_handles[pVertexShader - (VS_HIGHESTFIXEDFXF + 1)]; + FIXME("Unimplemented, returning D3DERR_INVALIDCALL\n"); return D3DERR_INVALIDCALL; } + static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderFunction(LPDIRECT3DDEVICE8 iface, DWORD pVertexShader, void* pData, DWORD* pSizeOfData) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DVertexShader8Impl *shader = NULL;

1 0

H. Verbeet : d3d8: IDirect3DDevice8Impl_GetVertexShaderFunction gets passed a handle instead of a pointer .
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 6e3b732ffb287908a05d7781d3256feffa5cdd85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e3b732ffb287908a05d7781d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Jan 6 18:03:54 2007 +0100 d3d8: IDirect3DDevice8Impl_GetVertexShaderFunction gets passed a handle instead of a pointer. --- dlls/d3d8/device.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9aeb987..1f8bb6e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1298,10 +1298,18 @@ static HRESULT WINAPI IDirect3DDevice8Im return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderFunction(LPDIRECT3DDEVICE8 iface, DWORD pVertexShader, void* pData, DWORD* pSizeOfData) { - IDirect3DVertexShader8Impl *This = (IDirect3DVertexShader8Impl *)pVertexShader; + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; + IDirect3DVertexShader8Impl *shader = NULL; - TRACE("(%p) : Relay\n", This); - return IWineD3DVertexShader_GetFunction(This->wineD3DVertexShader, pData, (UINT *)pSizeOfData); + TRACE("(%p) : pVertexShader %#x, pData %p, pSizeOfData %p\n", This, pVertexShader, pData, pSizeOfData); + + if (pVertexShader <= VS_HIGHESTFIXEDFXF || This->allocated_shader_handles <= pVertexShader - (VS_HIGHESTFIXEDFXF + 1)) { + ERR("Passed an invalid shader handle.\n"); + return D3DERR_INVALIDCALL; + } + + shader = This->shader_handles[pVertexShader - (VS_HIGHESTFIXEDFXF + 1)]; + return IWineD3DVertexShader_GetFunction(shader->wineD3DVertexShader, pData, (UINT *)pSizeOfData); } static HRESULT WINAPI IDirect3DDevice8Impl_SetIndices(LPDIRECT3DDEVICE8 iface, IDirect3DIndexBuffer8* pIndexData, UINT baseVertexIndex) {

1 0

Jonathan Ernst : shdoclc: Update French translation.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 5e4f792eab7e72dbae6967ec407b5e4b1f4d7199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4f792eab7e72dbae6967ec4… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Sat Jan 6 15:11:25 2007 +0100 shdoclc: Update French translation. --- dlls/shdoclc/Fr.rc | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/shdoclc/Fr.rc b/dlls/shdoclc/Fr.rc index 0aa36b5..75aefc7 100644 --- a/dlls/shdoclc/Fr.rc +++ b/dlls/shdoclc/Fr.rc @@ -2,7 +2,7 @@ * MsHTML resources * French Language Support * - * Copyright 2005-2006 Jonathan Ernst + * Copyright 2005-2007 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +22,17 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + IDS_MESSAGE_BOX_TITLE, "Internet Explorer de Wine" +} + +STRINGTABLE DISCARDABLE +{ + IDS_PRINT_HEADER_TEMPLATE "&w&bPage &p" /* FIXME: should be "&w&bPage &p of &P" */ + IDS_PRINT_FOOTER_TEMPLATE "&u&b&d" +} + IDR_BROWSE_CONTEXT_MENU MENU { POPUP "Default"

1 0

H. Verbeet : d3d8: IDirect3DDevice8Impl_GetPixelShaderFunction gets passed a handle instead of a pointer .
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: cae630f92e14169be89caf1bb1ff74d0fd585e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae630f92e14169be89caf1bb… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Jan 6 18:03:49 2007 +0100 d3d8: IDirect3DDevice8Impl_GetPixelShaderFunction gets passed a handle instead of a pointer. --- dlls/d3d8/device.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b9aea7f..9aeb987 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1450,10 +1450,18 @@ static HRESULT WINAPI IDirect3DDevice8Im } static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShaderFunction(LPDIRECT3DDEVICE8 iface, DWORD pPixelShader, void* pData, DWORD* pSizeOfData) { - IDirect3DPixelShader8Impl *This = (IDirect3DPixelShader8Impl *)pPixelShader; + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; + IDirect3DPixelShader8Impl *shader = NULL; - TRACE("(%p) : Relay\n", This); - return IWineD3DPixelShader_GetFunction(This->wineD3DPixelShader, pData, (UINT *)pSizeOfData); + TRACE("(%p) : pPixelShader %#x, pData %p, pSizeOfData %p\n", This, pPixelShader, pData, pSizeOfData); + + if (pPixelShader <= VS_HIGHESTFIXEDFXF || This->allocated_shader_handles <= pPixelShader - (VS_HIGHESTFIXEDFXF + 1)) { + ERR("Passed an invalid shader handle.\n"); + return D3DERR_INVALIDCALL; + } + + shader = This->shader_handles[pPixelShader - (VS_HIGHESTFIXEDFXF + 1)]; + return IWineD3DPixelShader_GetFunction(shader->wineD3DPixelShader, pData, (UINT *)pSizeOfData); } static HRESULT WINAPI IDirect3DDevice8Impl_DrawRectPatch(LPDIRECT3DDEVICE8 iface, UINT Handle,CONST float* pNumSegs,CONST D3DRECTPATCH_INFO* pRectPatchInfo) {

1 0

Jacek Caban : shlwapi: Forward CLSIDFromProgIDWrap to ole32 (with test).
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: d159b332288000140c807bab4aad423150b90bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d159b332288000140c807bab4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 6 17:05:58 2007 +0100 shlwapi: Forward CLSIDFromProgIDWrap to ole32 (with test). --- dlls/shlwapi/shlwapi.spec | 2 +- dlls/shlwapi/tests/Makefile.in | 1 + dlls/shlwapi/tests/clsid.c | 26 +++++++++++++++++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 369e242..1a0be45 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -432,7 +432,7 @@ 432 stub -noname SHSendMessageBroadcastA 433 stub -noname SHSendMessageBroadcastW 434 stdcall @(long long long long long long ptr) user32.SendMessageTimeoutW -435 stub -noname CLSIDFromProgIDWrap +435 stdcall -noname CLSIDFromProgIDWrap(wstr ptr) ole32.CLSIDFromProgID 436 stdcall -noname CLSIDFromStringWrap(wstr ptr) 437 stdcall -noname IsOS(long) 438 stub -noname SHLoadRegUIStringA diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index 59b0e72..8d48932 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = shlwapi.dll IMPORTS = shlwapi advapi32 ole32 oleaut32 kernel32 +EXTRALIBS = -luuid CTESTS = \ clist.c \ diff --git a/dlls/shlwapi/tests/clsid.c b/dlls/shlwapi/tests/clsid.c index b4457ef..66712a5 100644 --- a/dlls/shlwapi/tests/clsid.c +++ b/dlls/shlwapi/tests/clsid.c @@ -19,7 +19,6 @@ #include <stdio.h> -#define INITGUID #include "wine/test.h" #include "winbase.h" #include "winerror.h" @@ -27,6 +26,10 @@ #include "winuser.h" #include "shlguid.h" #include "shobjidl.h" +#include "olectl.h" + +#define INITGUID +#include "initguid.h" /* Function ptrs for ordinal calls */ static HMODULE hShlwapi = 0; @@ -153,6 +156,26 @@ static void test_ClassIDs(void) ok(szBuff[0] == '{', "Didn't write to buffer with ok length\n"); } +static void test_CLSIDFromProgIDWrap(void) +{ + HRESULT (WINAPI *pCLSIDFromProgIDWrap)(LPCOLESTR,LPCLSID); + CLSID clsid = IID_NULL; + HRESULT hres; + + static const WCHAR wszStdPicture[] = {'S','t','d','P','i','c','t','u','r','e',0}; + + pCLSIDFromProgIDWrap = (void*)GetProcAddress(hShlwapi,(char*)435); + + hres = pCLSIDFromProgIDWrap(wszStdPicture, &clsid); + ok(hres == S_OK, "CLSIDFromProgIDWrap failed: %08x\n", hres); + ok(IsEqualGUID(&CLSID_StdPicture, &clsid), "wrong clsid\n"); + + hres = pCLSIDFromProgIDWrap(NULL, &clsid); + ok(hres == E_INVALIDARG, "CLSIDFromProgIDWrap failed: %08x, expected E_INVALIDARG\n", hres); + + hres = pCLSIDFromProgIDWrap(wszStdPicture, NULL); + ok(hres == E_INVALIDARG, "CLSIDFromProgIDWrap failed: %08x, expected E_INVALIDARG\n", hres); +} START_TEST(clsid) { @@ -165,6 +188,7 @@ START_TEST(clsid) } test_ClassIDs(); + test_CLSIDFromProgIDWrap(); if (hShlwapi) FreeLibrary(hShlwapi);

1 0

Jonathan Ernst : winecfg: Update French translation.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 3577c891007ef6a14a44007e6fb6542690812d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3577c891007ef6a14a44007e6… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Sat Jan 6 15:10:41 2007 +0100 winecfg: Update French translation. --- programs/winecfg/Fr.rc | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 3980f3f..3cd5dd4 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -2,7 +2,7 @@ * WineCfg resources * French Language Support * - * Copyright 2005-2006 Jonathan Ernst + * Copyright 2005-2007 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -285,3 +285,23 @@ BEGIN IDS_UNAVAILABLE_DRIVER "Un pilote non disponible a �t� trouv� dans la base de registre�!\n\nSouhaitez-vous supprimer ��%s�� de la base de registre�?" IDS_WARNING "Attention" END + +STRINGTABLE DISCARDABLE +BEGIN + IDC_SYSPARAMS_BUTTON "Contr�le le fond" + IDC_SYSPARAMS_BUTTON_TEXT "Contr�le le texte" + IDC_SYSPARAMS_DESKTOP "Bureau" + IDC_SYSPARAMS_MENU "Fond du menu" + IDC_SYSPARAMS_MENU_TEXT "Texte du menu" + IDC_SYSPARAMS_SCROLLBAR "Barre de d�filement" + IDC_SYSPARAMS_SELECTION "Fond de la s�lection" + IDC_SYSPARAMS_SELECTION_TEXT "Texte de la s�lection" + IDC_SYSPARAMS_TOOLTIP "Fond de l'infobulle" + IDC_SYSPARAMS_TOOLTIP_TEXT "Texte de l'infobulle" + IDC_SYSPARAMS_WINDOW "Fond de la fen�tre" + IDC_SYSPARAMS_WINDOW_TEXT "Texte de la fen�tre" + IDC_SYSPARAMS_ACTIVE_TITLE "Barre de titre active" + IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Texte de la barre de titre active" + IDC_SYSPARAMS_INACTIVE_TITLE "Barre de titre inactive" + IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Texte de la barre de titre inactive" +END

1 0

appdb/include downloadurl.php
by WineHQ Jan. 7, 2007

Jan. 7, 2007

ChangeSet ID: 30867 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/07 16:59:31 Modified files: include : downloadurl.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix editing of download URLs caused by a typo in a variable name. Patch: http://cvs.winehq.org/patch.py?id=30867 Old revision New revision Changes Path 1.4 1.5 +1 -1 appdb/include/downloadurl.php Index: appdb/include/downloadurl.php diff -u -p appdb/include/downloadurl.php:1.4 appdb/include/downloadurl.php:1.5 --- appdb/include/downloadurl.php:1.4 7 Jan 2007 22:59:31 -0000 +++ appdb/include/downloadurl.php 7 Jan 2007 22:59:31 -0000 @@ -158,7 +158,7 @@ class downloadurl if(!query_parameters("UPDATE appData SET description = '?', url = '?' WHERE id = '?'", $aValues["sDescription$oRow->id"], - $aValues["sURL$oRow->id"], $oRow->id)) + $aValues["sUrl$oRow->id"], $oRow->id)) return FALSE; $sWhatChangedModify .= "Modified\nOld URL: $oRow->url\nOld ".

1 0

appdb/include downloadurl.php
by WineHQ Jan. 7, 2007

Jan. 7, 2007

ChangeSet ID: 30866 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/07 14:50:12 Modified files: include : downloadurl.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fixes for download URL mails Patch: http://cvs.winehq.org/patch.py?id=30866 Old revision New revision Changes Path 1.3 1.4 +5 -4 appdb/include/downloadurl.php Index: appdb/include/downloadurl.php diff -u -p appdb/include/downloadurl.php:1.3 appdb/include/downloadurl.php:1.4 --- appdb/include/downloadurl.php:1.3 7 Jan 2007 20:50:12 -0000 +++ appdb/include/downloadurl.php 7 Jan 2007 20:50:12 -0000 @@ -163,7 +163,7 @@ class downloadurl $sWhatChangedModify .= "Modified\nOld URL: $oRow->url\nOld ". "Description: $oRow->description\nNew URL: ". - $aValues["sUrl$oRow->id"]." New Description: ". + $aValues["sUrl$oRow->id"]."\nNew Description: ". $aValues["sDescription$oRow->id"]."\n\n"; } } @@ -187,12 +187,13 @@ class downloadurl $sWhatChanged .= "$sWhatChangedRemove$sWhatChangedModify"; if($sWhatChanged && $sEmail = - User::get_notify_email_address_list($aValues['iAppId'])) + User::get_notify_email_address_list($aValues['iVersionId'])) { $oApp = new Application($aValues["iAppId"]); + $oVersion = new Version($aValues["iVersionId"]); - $sSubject = "Download URLs for $oApp->sName updated by ". - $_SESSION['current']->sRealname; + $sSubject = "Download URLs for $oApp->sName $oVersion->sName". + " updated by ".$_SESSION['current']->sRealname; $sMsg = APPDB_ROOT."appview.php?iVersionId=".$aValues['iVersionId']; $sMsg .= "\n\n";

1 0

appdb/include downloadurl.php
by WineHQ Jan. 7, 2007

Jan. 7, 2007

ChangeSet ID: 30865 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/07 14:48:46 Modified files: include : downloadurl.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix removal of download URLs. When checked, bRemove should have a value of "true". Patch: http://cvs.winehq.org/patch.py?id=30865 Old revision New revision Changes Path 1.2 1.3 +2 -1 appdb/include/downloadurl.php Index: appdb/include/downloadurl.php diff -u -p appdb/include/downloadurl.php:1.2 appdb/include/downloadurl.php:1.3 --- appdb/include/downloadurl.php:1.2 7 Jan 2007 20:48:46 -0000 +++ appdb/include/downloadurl.php 7 Jan 2007 20:48:46 -0000 @@ -87,7 +87,8 @@ class downloadurl for($i = 1; $oRow = mysql_fetch_object($hResult); $i++) { $sReturn .= html_tr(array( - "<input type=\"checkbox\" name=\"bRemove$oRow->id\" />", + "<input type=\"checkbox\" name=\"bRemove$oRow->id\" ". + "value=\"true\" />", "<input type=\"text\" size=\"45\" name=\"". "sDescription$oRow->id\" value=\"$oRow->description\" />", "<input type=\"text\" size=\"45\" name=\"sUrl$oRow->id\" ".

1 0