December 2005 - Wine-commits

Stefan Leichter : shell32: Fix return value of PathProcessCommand.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: a4af4b95b5636a6202df2f0ea4d369551d7587cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a4af4b95b5636a6202df2f0… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Fri Dec 16 12:41:11 2005 +0100 shell32: Fix return value of PathProcessCommand. --- dlls/shell32/shellpath.c | 16 +++++++++------- include/shlobj.h | 1 + 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 80bb33c..e706dd9 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -700,7 +700,7 @@ BOOL WINAPI PathResolveAW( /************************************************************************* * PathProcessCommandA [SHELL32.653] */ -HRESULT WINAPI PathProcessCommandA ( +LONG WINAPI PathProcessCommandA ( LPCSTR lpszPath, LPSTR lpszBuff, DWORD dwBuffSize, @@ -708,14 +708,15 @@ HRESULT WINAPI PathProcessCommandA ( { FIXME("%s %p 0x%04lx 0x%04lx stub\n", lpszPath, lpszBuff, dwBuffSize, dwFlags); - strcpy(lpszBuff, lpszPath); - return 0; + if(!lpszPath) return -1; + if(lpszBuff) strcpy(lpszBuff, lpszPath); + return strlen(lpszPath); } /************************************************************************* * PathProcessCommandW */ -HRESULT WINAPI PathProcessCommandW ( +LONG WINAPI PathProcessCommandW ( LPCWSTR lpszPath, LPWSTR lpszBuff, DWORD dwBuffSize, @@ -723,14 +724,15 @@ HRESULT WINAPI PathProcessCommandW ( { FIXME("(%s, %p, 0x%04lx, 0x%04lx) stub\n", debugstr_w(lpszPath), lpszBuff, dwBuffSize, dwFlags); - strcpyW(lpszBuff, lpszPath); - return 0; + if(!lpszPath) return -1; + if(lpszBuff) strcpyW(lpszBuff, lpszPath); + return strlenW(lpszPath); } /************************************************************************* * PathProcessCommand (SHELL32.653) */ -HRESULT WINAPI PathProcessCommandAW ( +LONG WINAPI PathProcessCommandAW ( LPCVOID lpszPath, LPVOID lpszBuff, DWORD dwBuffSize, diff --git a/include/shlobj.h b/include/shlobj.h index 94f716c..94f0776 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1165,6 +1165,7 @@ BOOL WINAPI WriteCabinetState(CABINETSTA * Path Manipulation Routines */ VOID WINAPI PathGetShortPath(LPWSTR pszPath); +LONG WINAPI PathProcessCommand(LPCWSTR, LPWSTR, int, DWORD); /**************************************************************************** * Drag And Drop Routines

1 0

Jacek Caban : Added some declarations to mshtml.idl.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: a2363a3e5e48481572c0b42d93c1199d6d922185 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2363a3e5e48481572c0b42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 12:40:29 2005 +0100 Added some declarations to mshtml.idl. --- include/mshtmdid.h | 22 ++++ include/mshtml.idl | 279 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 280 insertions(+), 21 deletions(-)

1 0

Jacek Caban : urlmon: Fix BindToStorage test.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: 90c70f755ba90e289104bd5db315f6c67a11f4cb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=90c70f755ba90e289104bd5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 12:40:39 2005 +0100 urlmon: Fix BindToStorage test. --- dlls/urlmon/binding.c | 2 +- dlls/urlmon/tests/url.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 6b62c78..d94de61 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -401,7 +401,7 @@ static HRESULT get_callback(IBindCtx *pb hres = IBindCtx_GetObjectParam(pbc, wszBSCBHolder, (IUnknown**)callback); if(FAILED(hres)) - return INET_E_DATA_NOT_AVAILABLE; + return MK_E_SYNTAX; return S_OK; } diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index c8231d9..f73a59d 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -694,8 +694,7 @@ static void test_BindToStorage_fail(void ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08lx\n", hres); hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); - ok(hres == INET_E_DATA_NOT_AVAILABLE, - "hres=%08lx, expected INET_E_DATA_NOT_AVAILABLE\n", hres); + ok(hres == MK_E_SYNTAX, "hres=%08lx, expected INET_E_SYNTAX\n", hres); IBindCtx_Release(bctx);

1 0

Jacek Caban : widl: Added bindable and displaybind attributes handling.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: a3b35129ceb0df2e901956941e176e96bfee040b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a3b35129ceb0df2e9019569… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 12:40:17 2005 +0100 widl: Added bindable and displaybind attributes handling. --- tools/widl/parser.l | 1 + tools/widl/parser.y | 3 +++ tools/widl/widltypes.h | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index b8035cd..43ed190 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -210,6 +210,7 @@ static struct keyword { /* ... */ {"dispinterface", tDISPINTERFACE}, /* ... */ + {"displaybind", tDISPLAYBIND}, {"dllname", tDLLNAME}, {"double", tDOUBLE}, {"dual", tDUAL}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ef331a2..4fc19fb 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -133,6 +133,7 @@ static type_t std_uhyper = { "MIDL_uhype %token tCONTEXTHANDLESERIALIZE tCONTROL tCPPQUOTE %token tDEFAULT %token tDEFAULTVALUE +%token tDISPLAYBIND %token tDISPINTERFACE %token tDLLNAME tDOUBLE tDUAL %token tENDPOINT @@ -339,6 +340,7 @@ attrib_list: attribute attribute: tASYNC { $$ = make_attr(ATTR_ASYNC); } | tAUTOHANDLE { $$ = make_attr(ATTR_AUTO_HANDLE); } + | tBINDABLE { $$ = make_attr(ATTR_BINDABLE); } | tCALLAS '(' ident ')' { $$ = make_attrp(ATTR_CALLAS, $3); } | tCASE '(' expr_list_const ')' { $$ = make_attrp(ATTR_CASE, $3); } | tCONTEXTHANDLE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); } @@ -348,6 +350,7 @@ attribute: | tDEFAULT { $$ = make_attr(ATTR_DEFAULT); } | tDEFAULTVALUE '(' expr_const ')' { $$ = make_attrp(ATTR_DEFAULTVALUE_EXPR, $3); } | tDEFAULTVALUE '(' aSTRING ')' { $$ = make_attrp(ATTR_DEFAULTVALUE_STRING, $3); } + | tDISPLAYBIND { $$ = make_attr(ATTR_DISPLAYBIND); } | tDLLNAME '(' aSTRING ')' { $$ = make_attrp(ATTR_DLLNAME, $3); } | tDUAL { $$ = make_attr(ATTR_DUAL); } | tENDPOINT '(' aSTRING ')' { $$ = make_attrp(ATTR_ENDPOINT, $3); } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index dea60bb..487b4ad 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -58,6 +58,7 @@ enum attr_type { ATTR_ASYNC, ATTR_AUTO_HANDLE, + ATTR_BINDABLE, ATTR_CALLAS, ATTR_CASE, ATTR_CONTEXTHANDLE, @@ -66,6 +67,7 @@ enum attr_type ATTR_DEFAULTVALUE_EXPR, ATTR_DEFAULTVALUE_STRING, ATTR_DISPINTERFACE, + ATTR_DISPLAYBIND, ATTR_DLLNAME, ATTR_DUAL, ATTR_ENDPOINT,

1 0

Milko Krachounov : winecfg: Update Bulgarian resource.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: 9e65600971c5855c47da00ba64380a85c3dd9163 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e65600971c5855c47da00b… Author: Milko Krachounov <milko(a)3mhz.net> Date: Fri Dec 16 12:40:05 2005 +0100 winecfg: Update Bulgarian resource. --- programs/winecfg/Bg.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 0d005ee..aae116e 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -159,12 +159,12 @@ BEGIN PUSHBUTTON "��",IDC_AUDIO_AUTODETECT,170,20,69,14 PUSHBUTTON "��",IDC_AUDIO_CONFIGURE,170,40,69,14 PUSHBUTTON "�� ",IDC_AUDIO_CONTROL_PANEL,170,60,69,14 + CONTROL "��",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160 + GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 - GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120 - - LTEXT "�� : ",IDC_STATIC,15,85,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "�� ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + LTEXT "�� : ",IDC_STATIC,15,215,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "�� ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END

1 0

José Manuel Ferrer Ortiz : winecfg: Spanish translations update.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: efa1ae30a4a15bac422af95c0bba02f8135ef29a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=efa1ae30a4a15bac422af95… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Fri Dec 16 12:39:46 2005 +0100 winecfg: Spanish translations update. --- programs/winecfg/Es.rc | 195 +++++++++++++++++++++++++------------------ programs/winecfg/winecfg.rc | 2 2 files changed, 113 insertions(+), 84 deletions(-)

1 0

José Manuel Ferrer Ortiz : uninstaller: Spanish translations update.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: 7ec66682f8072b330c0fef48f87206c15c4b24f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ec66682f8072b330c0fef4… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Fri Dec 16 12:39:55 2005 +0100 uninstaller: Spanish translations update. --- programs/uninstaller/Es.rc | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/Es.rc b/programs/uninstaller/Es.rc index 1dc048f..21018ee 100644 --- a/programs/uninstaller/Es.rc +++ b/programs/uninstaller/Es.rc @@ -1,6 +1,7 @@ /* * Uninstaller (Spanish Resources) * + * Copyright 2005 Jos� Manuel Ferrer Ortiz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -15,12 +16,29 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Desinstalador de aplicaciones de Wine" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Por favor, elija la aplicaci�n que desee desinstalar:",IDC_PLEASESELECT,10,10,250,14 + EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL + LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | + LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Desinstalar",IDC_UNINSTALL,270,48,50,14 + PUSHBUTTON "&Acerca de",IDC_ABOUT,270,65,50,14 + PUSHBUTTON "&Salir",IDC_EXIT,270,81,50,14 +END + STRINGTABLE DISCARDABLE { - IDS_APPNAME, "Desinstalador" + IDS_APPNAME, "Desinstalador de aplicaciones de Wine" + IDS_ABOUT, "Desinstalador de aplicaciones de Wine (C) 2005 por Andreas Mohr, Hannu Valtonen y Jonathan Ernst." + IDS_ABOUTTITLE, "Acerca del desinstalador" + IDS_REGISTRYKEYNOTAVAILABLE, "�Clave de desinstalaci�n del registro no disponible (todav�a), nada que hacer!" + IDS_UNINSTALLFAILED, "Ejecuci�n del comando de desinstalaci�n '%s' ha fallado, tal vez se deba a que no exista el ejecutable.\r\n�Desea eliminar la entrada de desinstalaci�n de esta aplicaci�n del registro?" }

1 0

Rein Klazes : user32: Implement saving and fix reading of nonclient metrics.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: 13b9923165b7c1430d1acd1adbf05b35093d54d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13b9923165b7c1430d1acd1… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Fri Dec 16 12:38:06 2005 +0100 user32: Implement saving and fix reading of nonclient metrics. With conformance tests. --- dlls/user/sysparams.c | 161 +++++++++++++++------- dlls/user/tests/sysparams.c | 314 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 402 insertions(+), 73 deletions(-)

1 0

Oliver Stieber : wined3d: Vertex declaration recording state.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: 74e28a354f40bc1b03003056554883fb0c29b1de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=74e28a354f40bc1b0300305… Author: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Date: Fri Dec 16 12:38:24 2005 +0100 wined3d: Vertex declaration recording state. Stop SetVertexDeclaration from reference counting if a stateblock is being recorded. --- dlls/wined3d/device.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0ca6031..ba2bb8d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3727,16 +3727,21 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer TRACE("(%p) : pDecl=%p\n", This, pDecl); - /* TODO: what about recording stateblocks? */ + This->updateStateBlock->vertexDecl = pDecl; + This->updateStateBlock->changed.vertexDecl = TRUE; + This->updateStateBlock->set.vertexDecl = TRUE; + + if (This->isRecordingState) { + TRACE("Recording... not performing anything\n"); + return D3D_OK; + } + if (NULL != pDecl) { IWineD3DVertexDeclaration_AddRef(pDecl); } if (NULL != This->updateStateBlock->vertexDecl) { IWineD3DVertexDeclaration_Release(This->updateStateBlock->vertexDecl); } - This->updateStateBlock->vertexDecl = pDecl; - This->updateStateBlock->changed.vertexDecl = TRUE; - This->updateStateBlock->set.vertexDecl = TRUE; return D3D_OK; }

1 0

Ragnvald Despair Maartmann-Moe IV : wined3d: Fix matrix copy/paste bug.
by Alexandre Julliard 16 Dec '05

16 Dec '05

Module: wine Branch: refs/heads/master Commit: 3e495fe4659096a85e2a0f1322a3cabb0d129fab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3e495fe4659096a85e2a0f1… Author: Ragnvald "Despair" Maartmann-Moe IV <despair(a)adelphia.net> Date: Fri Dec 16 12:39:07 2005 +0100 wined3d: Fix matrix copy/paste bug. --- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 4f868ee..21cc284 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -363,7 +363,7 @@ void pshader_m4x3(WINED3DSHADERVECTOR* d void pshader_m3x4(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX43 mat) { d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z; - d->y = mat[2][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; + d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z; d->w = mat[3][0] * s0->x + mat[3][1] * s0->y + mat[3][2] * s0->z; PSTRACE(("executing m3x4(1): mat=(%f, %f, %f) s0=(%f) d=(%f) \n", mat[0][0], mat[0][1], mat[0][2], s0->x, d->x)); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index a343bcf..ed98c9d 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -315,7 +315,7 @@ void vshader_m4x3(WINED3DSHADERVECTOR* d void vshader_m3x4(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX43 mat) { d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z; - d->y = mat[2][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; + d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z; d->w = mat[3][0] * s0->x + mat[3][1] * s0->y + mat[3][2] * s0->z; VSTRACE(("executing m3x4(1): mat=(%f, %f, %f) s0=(%f) d=(%f) \n", mat[0][0], mat[0][1], mat[0][2], s0->x, d->x));

1 0