November 2007 - Wine-commits

EA Durbin : kernel32: Add stub implementation of GetConsoleInputExeNameW.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 6e6a2a58566e1bbb9287f3fc6d34c1183accae54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6a2a58566e1bbb9287f3fc6… Author: EA Durbin <ead1234(a)hotmail.com> Date: Sun Nov 11 12:26:41 2007 -0600 kernel32: Add stub implementation of GetConsoleInputExeNameW. --- dlls/kernel32/console.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index d8b46d1..f77de14 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -974,6 +974,16 @@ DWORD WINAPI GetConsoleInputExeNameA(DWORD BufferLength, LPSTR lpBuffer) } /*********************************************************************** + * GetConsoleInputExeNameW (KERNEL32.@) + */ +DWORD WINAPI GetConsoleInputExeNameW(DWORD BufferLength, LPWSTR lpBuffer) +{ + DWORD ret = 0; + FIXME( "stub %u %p\n", BufferLength, lpBuffer); + return ret; +} + +/*********************************************************************** * GetConsoleTitleA (KERNEL32.@) * * See GetConsoleTitleW. diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f996988..c6b0d9c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -458,7 +458,7 @@ @ stub GetConsoleFontSize @ stub GetConsoleHardwareState @ stdcall GetConsoleInputExeNameA(long ptr) -@ stub GetConsoleInputExeNameW +@ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleInputWaitHandle() @ stub GetConsoleKeyboardLayoutNameA @ stub GetConsoleKeyboardLayoutNameW

1 0

EA Durbin : kernel32: Add stub implementation of GetConsoleKeyboardLayoutNameA.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 592fc26b096f25d61497a79885b6d260722882db URL: http://source.winehq.org/git/wine.git/?a=commit;h=592fc26b096f25d61497a7988… Author: EA Durbin <ead1234(a)hotmail.com> Date: Sun Nov 11 12:28:00 2007 -0600 kernel32: Add stub implementation of GetConsoleKeyboardLayoutNameA. --- dlls/kernel32/console.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index f77de14..adbce45 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -963,6 +963,16 @@ BOOL WINAPI SetConsoleTitleA( LPCSTR title ) return ret; } + +/*********************************************************************** + * GetConsoleKeyboardLayoutNameA (KERNEL32.@) + */ +BOOL WINAPI GetConsoleKeyboardLayoutNameA(LPSTR layoutName) +{ + FIXME( "stub %p\n", layoutName); + return TRUE; +} + /*********************************************************************** * GetConsoleInputExeNameA (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c6b0d9c..07afbe7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -460,7 +460,7 @@ @ stdcall GetConsoleInputExeNameA(long ptr) @ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleInputWaitHandle() -@ stub GetConsoleKeyboardLayoutNameA +@ stdcall GetConsoleKeyboardLayoutNameA(ptr) @ stub GetConsoleKeyboardLayoutNameW @ stdcall GetConsoleMode(long ptr) @ stub GetConsoleNlsMode

1 0

Francois Gouget : ctapi32: Use quotes to include our headers. Fixes winapi_check warnings.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: d5fb2315cb86dbf0081280db3f40b97c20b6a271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5fb2315cb86dbf0081280db3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 13 09:32:20 2007 +0100 ctapi32: Use quotes to include our headers. Fixes winapi_check warnings. --- dlls/ctapi32/ctapi32.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c index 39fea9c..2af4632 100644 --- a/dlls/ctapi32/ctapi32.c +++ b/dlls/ctapi32/ctapi32.c @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> +#include "config.h" +#include "wine/port.h" #include <string.h> -#include <wine/library.h> -#include <wine/debug.h> -#include <windef.h> -#include <winreg.h> -#include <winnls.h> +#include "wine/library.h" +#include "wine/debug.h" +#include "windef.h" +#include "winreg.h" +#include "winnls.h" #include "ctapi.h" WINE_DEFAULT_DEBUG_CHANNEL(ctapi32);

1 0

Alistair Leslie-Hughes : msxml3: Return E_INVALIDARG on bad parameter.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 8de2d5290a8d2f61adc686e0b6dbc65b09229d71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de2d5290a8d2f61adc686e0b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 11 22:35:35 2007 +1100 msxml3: Return E_INVALIDARG on bad parameter. --- dlls/msxml3/domdoc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8f5f3cb..9a1dba7 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -671,7 +671,10 @@ static HRESULT WINAPI domdoc_get_documentElement( IXMLDOMNode *element_node; HRESULT hr; - TRACE("%p\n", This); + TRACE("%p %p\n", This, This->node); + + if(!DOMElement) + return E_INVALIDARG; *DOMElement = NULL;

1 0

Alistair Leslie-Hughes : msxml3: Enable test for bad argument / fix memory leak.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: fad20c9ce0d9d26526cc636ca9d71c11acfbff4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad20c9ce0d9d26526cc636ca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 11 22:36:07 2007 +1100 msxml3: Enable test for bad argument / fix memory leak. --- dlls/msxml3/tests/domdoc.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d2cd09c..ecedf06 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -405,12 +405,9 @@ static void test_domdoc( void ) ok( b == VARIANT_TRUE, "failed to load XML string\n"); SysFreeString( str ); - /* try with a null out pointer - crashes */ - if (0) - { - r = IXMLDOMDocument_get_documentElement( doc, NULL ); - ok( r == S_OK, "should be no document element\n"); - } + /* try with a null out pointer */ + r = IXMLDOMDocument_get_documentElement( doc, NULL ); + ok( r == E_INVALIDARG, "should be no document element\n"); /* check if nodename is correct */ r = IXMLDOMDocument_get_nodeName( doc, NULL ); @@ -704,6 +701,7 @@ todo_wine r = IXMLDOMNode_get_baseName( node, &str ); ok( r == S_OK, "get_baseName returned wrong code\n"); ok( lstrcmpW(str,szdl) == 0, "basename was wrong\n"); + SysFreeString( str ); r = IXMLDOMNode_get_nodeValue( node, &var ); ok( r == S_OK, "returns %08x\n", r );

1 0

Francois Gouget : rpcrt4: Add an API documentation stub to make winapi_check happy.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: b6ad7b5ef78bd73695d38ec1108f26c6f31394ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ad7b5ef78bd73695d38ec11… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 13 09:31:51 2007 +0100 rpcrt4: Add an API documentation stub to make winapi_check happy. --- dlls/rpcrt4/ndr_stubless.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index aff2e00..c21b809 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1442,6 +1442,9 @@ LONG WINAPI NdrStubCall2( return S_OK; } +/*********************************************************************** + * NdrServerCall2 [RPCRT4.@] + */ void WINAPI NdrServerCall2(PRPC_MESSAGE pRpcMsg) { DWORD dwPhase;

1 0

Francois Gouget : cfgmgr32: Flesh out cfgmgr32. h a bit more and fix the corresponding functions.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: b1c99668284b11dd9b8fbd8ae2ed84434acfb55f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c99668284b11dd9b8fbd8ae… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 13 09:32:13 2007 +0100 cfgmgr32: Flesh out cfgmgr32.h a bit more and fix the corresponding functions. --- dlls/setupapi/stubs.c | 17 ++++----- include/cfgmgr32.h | 94 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 96 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 7d73be2..130973a 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -26,6 +26,7 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include "cfgmgr32.h" #include "setupapi.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); @@ -52,10 +53,8 @@ DWORD WINAPI suErrorToIds16( WORD w1, WORD w2 ) /*********************************************************************** * CM_Connect_MachineW (SETUPAPI.@) */ -DWORD WINAPI CM_Connect_MachineW(LPCWSTR name, void * machine) +CONFIGRET WINAPI CM_Connect_MachineW(PCWSTR name, PHMACHINE machine) { -#define CR_SUCCESS 0x00000000 -#define CR_ACCESS_DENIED 0x00000033 FIXME("\n"); return CR_ACCESS_DENIED; } @@ -63,7 +62,7 @@ DWORD WINAPI CM_Connect_MachineW(LPCWSTR name, void * machine) /*********************************************************************** * CM_Disconnect_Machine (SETUPAPI.@) */ -DWORD WINAPI CM_Disconnect_Machine(DWORD handle) +CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE handle) { FIXME("\n"); return CR_SUCCESS; @@ -73,10 +72,10 @@ DWORD WINAPI CM_Disconnect_Machine(DWORD handle) /*********************************************************************** * CM_Get_Device_IDA (SETUPAPI.@) */ -DWORD WINAPI CM_Get_Device_IDA( LPVOID dnDevInst, LPSTR Buffer, +CONFIGRET WINAPI CM_Get_Device_IDA( DEVINST dnDevInst, PSTR Buffer, ULONG BufferLen, ULONG ulFlags) { - FIXME("%p, %p, %u %u\n",dnDevInst, Buffer, BufferLen, ulFlags); + FIXME("%x, %p, %u %u\n",dnDevInst, Buffer, BufferLen, ulFlags); Buffer[0] = 0; return CR_SUCCESS; } @@ -85,7 +84,7 @@ DWORD WINAPI CM_Get_Device_IDA( LPVOID dnDevInst, LPSTR Buffer, * CM_Get_Device_ID_ListA (SETUPAPI.@) */ -DWORD WINAPI CM_Get_Device_ID_ListA( +CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) { FIXME("%p %p %d %d\n", pszFilter, Buffer, BufferLen, ulFlags ); @@ -96,10 +95,10 @@ DWORD WINAPI CM_Get_Device_ID_ListA( /*********************************************************************** * CM_Get_Device_ID_Size (SETUPAPI.@) */ -DWORD WINAPI CM_Get_Device_ID_Size( ULONG* pulLen, LPVOID dnDevInst, +CONFIGRET WINAPI CM_Get_Device_ID_Size( PULONG pulLen, DEVINST dnDevInst, ULONG ulFlags) { - FIXME("%p %p %u\n",pulLen, dnDevInst, ulFlags); + FIXME("%p %x %u\n",pulLen, dnDevInst, ulFlags); *pulLen = 1; return CR_SUCCESS; } diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 3214c43..5862fa6 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -19,22 +19,104 @@ #ifndef _CFGMGR32_H_ #define _CFGMGR32_H_ +/* FIXME: #include <cfg.h> */ + +#define CMAPI typedef DWORD CONFIGRET; -#define CR_SUCCESS 0 +#define CR_SUCCESS 0x00 +#define CR_DEFAULT 0x01 +#define CR_OUT_OF_MEMORY 0x02 +#define CR_INVALID_POINTER 0x03 +#define CR_INVALID_FLAG 0x04 +#define CR_INVALID_DEVNODE 0x05 +#define CR_INVALID_DEVINST CR_INVALID_DEVNODE +#define CR_INVALID_RES_DES 0x06 +#define CR_INVALID_LOG_CONF 0x07 +#define CR_INVALID_ARBITRATOR 0x08 +#define CR_INVALID_NODELIST 0x09 +#define CR_DEVNODE_HAS_REQS 0x0a +#define CR_DEVINST_HAS_REQS CR_DEVNODE_HAS_REQS +#define CR_INVALID_RESOURCEID 0x0b +#define CR_DLVXD_NOT_FOUND 0x0c +#define CR_NO_SUCH_DEVNODE 0x0d +#define CR_NO_SUCH_DEVINST CR_NO_SUCH_DEVNODE +#define CR_NO_MORE_LOG_CONF 0x0e +#define CR_NO_MORE_RES_DES 0x0f +#define CR_ALREADY_SUCH_DEVNODE 0x10 +#define CR_ALREADY_SUCH_DEVINST CR_ALREADY_SUCH_DEVNODE +#define CR_INVALID_RANGE_LIST 0x11 +#define CR_INVALID_RANGE 0x12 +#define CR_FAILURE 0x13 +#define CR_NO_SUCH_LOGICAL_DEV 0x14 +#define CR_CREATE_BLOCKED 0x15 +#define CR_NOT_SYSTEM_VM 0x16 +#define CR_REMOVE_VETOED 0x17 +#define CR_APM_VETOED 0x18 +#define CR_INVALID_LOAD_TYPE 0x19 +#define CR_BUFFER_SMALL 0x1a +#define CR_NO_ARBITRATOR 0x1b +#define CR_NO_REGISTRY_HANDLE 0x1c +#define CR_REGISTRY_ERROR 0x1d +#define CR_INVALID_DEVICE_ID 0x1e +#define CR_INVALID_DATA 0x1f +#define CR_INVALID_API 0x20 +#define CR_DEVLOADER_NOT_READY 0x21 +#define CR_NEED_RESTART 0x22 +#define CR_NO_MORE_HW_PROFILES 0x23 +#define CR_DEVICE_NOT_THERE 0x24 +#define CR_NO_SUCH_VALUE 0x25 +#define CR_WRONG_TYPE 0x26 +#define CR_INVALID_PRIORITY 0x27 +#define CR_NOT_DISABLEABLE 0x28 +#define CR_FREE_RESOURCES 0x29 +#define CR_QUERY_VETOED 0x2a +#define CR_CANT_SHARE_IRQ 0x2b +#define CR_NO_DEPENDENT 0x2c +#define CR_SAME_RESOURCES 0x2d +#define CR_NO_SUCH_REGISTRY_KEY 0x2e +#define CR_INVALID_MACHINENAME 0x2f +#define CR_REMOTE_COMM_FAILURE 0x30 +#define CR_MACHINE_UNAVAILABLE 0x31 +#define CR_NO_CM_SERVICES 0x32 +#define CR_ACCESS_DENIED 0x33 +#define CR_CALL_NOT_IMPLEMENTED 0x34 +#define CR_INVALID_PROPERTY 0x35 +#define CR_DEVICE_INTERFACE_ACTIVE 0x36 +#define CR_NO_SUCH_DEVICE_INTERFACE 0x37 +#define CR_INVALID_REFERENCE_STRING 0x38 +#define CR_INVALID_CONFLICT_LIST 0x39 +#define CR_INVALID_INDEX 0x3a +#define CR_INVALID_STRUCTURE_SIZE 0x3b +#define NUM_CR_RESULTS 0x3c -#define MAX_CLASS_NAME_LEN 32 -#define MAX_GUID_STRING_LEN 39 -#define MAX_PROFILE_LEN 80 +#define MAX_CLASS_NAME_LEN 32 +#define MAX_GUID_STRING_LEN 39 +#define MAX_PROFILE_LEN 80 +typedef DWORD DEVINST, *PDEVINST; +typedef DWORD DEVNODE, *PDEVNODE; +typedef HANDLE HMACHINE, *PHMACHINE; #ifdef __cplusplus extern "C" { #endif -CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR, PCHAR, ULONG, ULONG ); -CONFIGRET WINAPI CM_Get_Device_ID_ListW( PCWSTR, PWCHAR, ULONG, ULONG ); +CMAPI CONFIGRET WINAPI CM_Connect_MachineA(PCSTR,PHMACHINE); +CMAPI CONFIGRET WINAPI CM_Connect_MachineW(PCWSTR,PHMACHINE); +#define CM_Connect_Machine WINELIB_NAME_AW(CM_Connect_Machine) +CMAPI CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_Device_IDA(DEVINST,PSTR,ULONG,ULONG); +CMAPI CONFIGRET WINAPI CM_Get_Device_IDW(DEVINST,PWSTR,ULONG,ULONG); +#define CM_Get_Device_ID WINELIB_NAME_AW(CM_Get_Device_ID) +CMAPI CONFIGRET WINAPI CM_Get_Device_ID_ListA(PCSTR,PCHAR,ULONG,ULONG); +CMAPI CONFIGRET WINAPI CM_Get_Device_ID_ListW(PCWSTR,PWCHAR,ULONG,ULONG); #define CM_Get_Device_ID_List WINELIB_NAME_AW(CM_Get_Device_ID_List) +CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExA(PCSTR,PCHAR,ULONG,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACHINE); +#define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) +CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); +CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); #ifdef __cplusplus }

1 0

Francois Gouget : acledit: Add wfext.h.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: b38b2d6dad0e2742ec423f63abef774c1e30fe99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b38b2d6dad0e2742ec423f63a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 13 09:30:29 2007 +0100 acledit: Add wfext.h. --- dlls/acledit/main.c | 1 + include/Makefile.in | 1 + include/wfext.h | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/acledit/main.c b/dlls/acledit/main.c index ec6166b..d1a9ac7 100644 --- a/dlls/acledit/main.c +++ b/dlls/acledit/main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "wfext.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/include/Makefile.in b/include/Makefile.in index d2ceb15..3b08d73 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -369,6 +369,7 @@ SRCDIR_INCLUDES = \ ver.h \ vfw.h \ vfwmsgs.h \ + wfext.h \ winbase.h \ wincon.h \ wincred.h \ diff --git a/include/wfext.h b/include/wfext.h new file mode 100644 index 0000000..366e49f --- /dev/null +++ b/include/wfext.h @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2007 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __WINE_WFEXT_H +#define __WINE_WFEXT_H + +#ifdef __cplusplus +extern "C" { +#endif + +LONG WINAPI FMExtensionProc(HWND,WORD,LONG); +LONG WINAPI FMExtensionProcW(HWND,WORD,LONG); + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Francois Gouget : d3dx8: Make d3dx8math.h C++ compatible.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: df17f1ead2a7ed9fd8fdcf56b61e62c8e79e5760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df17f1ead2a7ed9fd8fdcf56b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 13 09:29:57 2007 +0100 d3dx8: Make d3dx8math.h C++ compatible. --- include/d3dx8math.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index da0c8f3..cfe4845 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -259,6 +259,10 @@ typedef struct D3DXCOLOR FLOAT r, g, b, a; } D3DXCOLOR, *LPD3DXCOLOR; +#ifdef __cplusplus +extern "C" { +#endif + D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *pout, float scaling, D3DXVECTOR3 *rotationcenter, D3DXQUATERNION *rotation, D3DXVECTOR3 *translation); FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm); D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, CONST D3DXMATRIX *pm); @@ -314,6 +318,10 @@ D3DXVECTOR4* WINAPI D3DXVec4Hermite(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, C D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv); D3DXVECTOR4* WINAPI D3DXVec4Transform(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv, CONST D3DXMATRIX *pm); +#ifdef __cplusplus +} +#endif + #include <d3dx8math.inl> #endif /* __D3DX8MATH_H__ */

1 0

James Hawkins : msi: Implement the VolumeSelectCombo control.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 9459ef5ab1f3c7cc27649c4fbc44984e99669025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9459ef5ab1f3c7cc27649c4fb… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 13 00:50:14 2007 -0600 msi: Implement the VolumeSelectCombo control. --- dlls/msi/dialog.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index ff22f28..9241a66 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -143,6 +143,7 @@ static const WCHAR szListBox[] = { 'L','i','s','t','B','o','x',0 }; static const WCHAR szDirectoryCombo[] = { 'D','i','r','e','c','t','o','r','y','C','o','m','b','o',0 }; static const WCHAR szDirectoryList[] = { 'D','i','r','e','c','t','o','r','y','L','i','s','t',0 }; static const WCHAR szVolumeCostList[] = { 'V','o','l','u','m','e','C','o','s','t','L','i','s','t',0 }; +static const WCHAR szVolumeSelectCombo[] = { 'V','o','l','u','m','e','S','e','l','e','c','t','C','o','m','b','o',0 }; static const WCHAR szSelectionDescription[] = {'S','e','l','e','c','t','i','o','n','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; static const WCHAR szProperty[] = {'P','r','o','p','e','r','t','y',0}; @@ -2566,6 +2567,84 @@ static UINT msi_dialog_volumecost_list( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } +/******************** VolumeSelect Combo ***************************************/ + +static UINT msi_dialog_volsel_handler( msi_dialog *dialog, + msi_control *control, WPARAM param ) +{ + WCHAR text[MAX_PATH]; + LPWSTR prop; + BOOL indirect; + int index; + + if (HIWORD(param) != CBN_SELCHANGE) + return ERROR_SUCCESS; + + index = SendMessageW( control->hwnd, CB_GETCURSEL, 0, 0 ); + if ( index == CB_ERR ) + { + ERR("No ComboBox item selected!\n"); + return ERROR_FUNCTION_FAILED; + } + + SendMessageW( control->hwnd, CB_GETLBTEXT, index, (LPARAM)text ); + + indirect = control->attributes & msidbControlAttributesIndirect; + prop = msi_dialog_dup_property( dialog, control->property, indirect ); + + MSI_SetPropertyW( dialog->package, prop, text ); + + msi_free( prop ); + return ERROR_SUCCESS; +} + +static void msi_dialog_vsc_add_drives( msi_dialog *dialog, msi_control *control ) +{ + LPWSTR drives, ptr; + DWORD size; + + size = GetLogicalDriveStringsW( 0, NULL ); + if ( !size ) return; + + drives = msi_alloc( (size + 1) * sizeof(WCHAR) ); + if ( !drives ) return; + + GetLogicalDriveStringsW( size, drives ); + + ptr = drives; + while (*ptr) + { + SendMessageW( control->hwnd, CB_ADDSTRING, 0, (LPARAM)ptr ); + ptr += lstrlenW(ptr) + 1; + } + + msi_free( drives ); +} + +static UINT msi_dialog_volumeselect_combo( msi_dialog *dialog, MSIRECORD *rec ) +{ + msi_control *control; + LPCWSTR prop; + DWORD style; + + /* FIXME: CBS_OWNERDRAWFIXED */ + style = WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP | + CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS | + WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR; + control = msi_dialog_add_control( dialog, rec, WC_COMBOBOXW, style ); + if (!control) + return ERROR_FUNCTION_FAILED; + + control->attributes = MSI_RecordGetInteger( rec, 8 ); + control->handler = msi_dialog_volsel_handler; + prop = MSI_RecordGetString( rec, 9 ); + control->property = msi_dialog_dup_property( dialog, prop, FALSE ); + + msi_dialog_vsc_add_drives( dialog, control ); + + return ERROR_SUCCESS; +} + static const struct control_handler msi_dialog_handler[] = { { szText, msi_dialog_text_control }, @@ -2587,6 +2666,7 @@ static const struct control_handler msi_dialog_handler[] = { szDirectoryCombo, msi_dialog_directory_combo }, { szDirectoryList, msi_dialog_directory_list }, { szVolumeCostList, msi_dialog_volumecost_list }, + { szVolumeSelectCombo, msi_dialog_volumeselect_combo }, }; #define NUM_CONTROL_TYPES (sizeof msi_dialog_handler/sizeof msi_dialog_handler[0])

1 0