July 2006 - Wine-commits - list.winehq.org

Ivan Gyurdiev : wined3d: Move register count pass to SetFunction.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 276609e1e53f4636e8b1d5b03423f5691ae30eaf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=276609e1e53f4636e8b1d5b… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Jul 4 02:01:46 2006 -0600 wined3d: Move register count pass to SetFunction. Move semantics pointers out of the reg_maps, make them persistent data in the shader (again, for future software shaders). --- dlls/wined3d/arb_program_shader.c | 12 +++++++----- dlls/wined3d/baseshader.c | 6 ++++-- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 12 ++++++------ dlls/wined3d/pixelshader.c | 32 +++++++++++++++----------------- dlls/wined3d/vertexshader.c | 33 +++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 17 +++++++++-------- 7 files changed, 57 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=276609e1e53f4636e8b…

1 0

Ivan Gyurdiev : wined3d: Add missing PSIZE register for decl8->9 conversion .
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: e260e9fd98266645ede54ab460d6e19d360ed9b1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e260e9fd98266645ede54ab… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Jul 4 01:25:11 2006 -0600 wined3d: Add missing PSIZE register for decl8->9 conversion. --- dlls/wined3d/vertexdeclaration.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 5cd014f..8ec4555 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -269,6 +269,7 @@ #define MAKE_LOOKUP(_reg,_usage,_usagein MAKE_LOOKUP(D3DVSDE_TEXCOORD5, D3DDECLUSAGE_TEXCOORD, 5); MAKE_LOOKUP(D3DVSDE_TEXCOORD6, D3DDECLUSAGE_TEXCOORD, 6); MAKE_LOOKUP(D3DVSDE_TEXCOORD7, D3DDECLUSAGE_TEXCOORD, 7); + MAKE_LOOKUP(D3DVSDE_PSIZE, D3DDECLUSAGE_PSIZE, 0); #undef MAKE_LOOKUP TRACE("(%p) : pDecl(%p)\n", This, pDecl);

1 0

Ivan Gyurdiev : wined3d: Rework shader mode selection.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 771623692ea6a7f8070b2f96fda46d0debce42e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=771623692ea6a7f8070b2f9… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Jul 4 01:21:53 2006 -0600 wined3d: Rework shader mode selection. - currently half the shader selection code (GLSL vs ARB) is in fillGLcaps. The parts that check for software shaders are in GetDeviceCaps. That placement, will work, but is definitely not optimal. FillGLcaps should detect support - it should not make decision as to what's used, because that's not what the purpose of the function is. GetDeviceCaps should report support as it has already been selected. Instead, select shader mode in its own function, called in the appropriate places. - unifying pixel and vertex shaders into a single selection is a mistake. A software vertex shader can be coupled with a hardware arb or glsl pixel shader, or no shader at all. Split them back into two and add a SHADER_NONE variant. - drawprim is doing support checks for ARB_PROGRAM, and making shader decisions based on that - that's wrong, support has already been checked, and decided upon, and shaders can be implemented via software, ARB_PROGRAm or GLSL, so that support check isn't valid. - Store the shader selected mode into the shader itself. Different types of shaders can be combined, so this is an improvement. In fact, storing the mode into the settings globally is a mistake as well - it should be done per device, since different cards have different capabilities. --- dlls/wined3d/baseshader.c | 13 ++++- dlls/wined3d/device.c | 4 +- dlls/wined3d/directx.c | 95 ++++++++++++++++++++++++++-------------- dlls/wined3d/drawprim.c | 38 ++++++++-------- dlls/wined3d/pixelshader.c | 9 ++-- dlls/wined3d/vertexshader.c | 10 +++- dlls/wined3d/wined3d_private.h | 8 +++ 7 files changed, 108 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=771623692ea6a7f8070…

1 0

Ivan Gyurdiev : wined3d: Allow mix of SW vertex and GLSL pixel shader.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: b324fc0fdb3fe79b5ad3388e5f6aebe5541cf5c8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b324fc0fdb3fe79b5ad3388… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Jul 4 01:23:18 2006 -0600 wined3d: Allow mix of SW vertex and GLSL pixel shader. Do not attach non-GLSL shaders to the GLSL program, that will cause a crash. Mix with ARB shaders is never going to happen, because the selection code will always choose GLSL for both or ARB for both. --- dlls/wined3d/device.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2d6a1f3..edaa221 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -287,7 +287,7 @@ void set_glsl_shader_program(IWineD3DDev This->stateBlock->shaderPrgId = 0; return; } - + ptr = list_head( &This->glsl_shader_progs ); while (ptr) { /* At least one program exists - see if it matches our ps/vs combination */ @@ -302,17 +302,23 @@ void set_glsl_shader_program(IWineD3DDev /* This isn't the entry we need - try the next one */ ptr = list_next( &This->glsl_shader_progs, ptr ); } - + /* If we get to this point, then no matching program exists, so we create one */ programId = GL_EXTCALL(glCreateProgramObjectARB()); TRACE_(d3d_shader)("Created new GLSL shader program %u\n", programId); This->stateBlock->shaderPrgId = programId; - - if (NULL != vshader) { + + /* Allocate a new link for the list of programs */ + newLink = HeapAlloc(GetProcessHeap(), 0, sizeof(struct glsl_shader_prog_link)); + newLink->programId = programId; + + /* Attach GLSL vshader */ + if (NULL != vshader && wined3d_settings.vs_selected_mode == SHADER_GLSL) { int i; int max_attribs = 16; /* TODO: Will this always be the case? It is at the moment... */ char tmp_name[10]; - + + TRACE("Attaching vertex shader to GLSL program\n"); attach_glsl_shader(iface, (IWineD3DBaseShader*)vshader); /* Bind vertex attributes to a corresponding index number to match @@ -329,28 +335,21 @@ void set_glsl_shader_program(IWineD3DDev GL_EXTCALL(glBindAttribLocationARB(programId, i, tmp_name)); } checkGLcall("glBindAttribLocationARB"); + newLink->vertexShader = vshader; } - if (NULL != pshader) { + /* Attach GLSL pshader */ + if (NULL != pshader && wined3d_settings.ps_selected_mode == SHADER_GLSL) { + TRACE("Attaching pixel shader to GLSL program\n"); attach_glsl_shader(iface, (IWineD3DBaseShader*)pshader); - } - + newLink->pixelShader = pshader; + } + /* Link the program */ TRACE_(d3d_shader)("Linking GLSL shader program %u\n", programId); GL_EXTCALL(glLinkProgramARB(programId)); print_glsl_info_log(&GLINFO_LOCATION, programId); - - /* Now, we add a list item to associate this program with the vertex and - * pixel shaders that it is attached to. - * - * These list items will be deleted when the device is released. - */ - newLink = HeapAlloc(GetProcessHeap(), 0, sizeof(struct glsl_shader_prog_link)); - newLink->programId = programId; - newLink->pixelShader = pshader; - newLink->vertexShader = vshader; list_add_head( &This->glsl_shader_progs, &newLink->entry); - return; }

1 0

Jacek Caban : shdocvw: Added test of IProvideClassInfo.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 010f5729dd6bf8d13f8eb68a88a335b48f634cf9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=010f5729dd6bf8d13f8eb68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 12:29:14 2006 +0200 shdocvw: Added test of IProvideClassInfo. --- dlls/shdocvw/tests/.gitignore | 1 dlls/shdocvw/tests/Makefile.in | 3 + dlls/shdocvw/tests/webbrowser.c | 86 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletions(-) create mode 100644 dlls/shdocvw/tests/webbrowser.c diff --git a/dlls/shdocvw/tests/.gitignore b/dlls/shdocvw/tests/.gitignore index acc365b..0ee8f83 100644 --- a/dlls/shdocvw/tests/.gitignore +++ b/dlls/shdocvw/tests/.gitignore @@ -1,3 +1,4 @@ Makefile shortcut.ok testlist.c +webbrowser.ok diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in index b31efb9..ac61218 100644 --- a/dlls/shdocvw/tests/Makefile.in +++ b/dlls/shdocvw/tests/Makefile.in @@ -7,7 +7,8 @@ IMPORTS = shell32 ole32 advapi32 kerne EXTRALIBS = -luuid CTESTS = \ - shortcut.c + shortcut.c \ + webbrowser.c @MAKE_TEST_RULES@ diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c new file mode 100644 index 0000000..a895062 --- /dev/null +++ b/dlls/shdocvw/tests/webbrowser.c @@ -0,0 +1,86 @@ +/* + * Copyright 2006 Jacek Caban for CodeWeavers + * + * 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 + */ + +#define COBJMACROS + +#include <wine/test.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "exdisp.h" + +static void test_ClassInfo(IUnknown *unk) +{ + IProvideClassInfo2 *class_info; + GUID guid; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IProvideClassInfo2, (void**)&class_info); + ok(hres == S_OK, "QueryInterface(IID_IProvideClassInfo) failed: %08lx\n", hres); + if(FAILED(hres)) + return; + + hres = IProvideClassInfo2_GetGUID(class_info, GUIDKIND_DEFAULT_SOURCE_DISP_IID, &guid); + ok(hres == S_OK, "GetGUID failed: %08lx\n", hres); + ok(IsEqualGUID(&DIID_DWebBrowserEvents2, &guid), "wrong guid\n"); + + hres = IProvideClassInfo2_GetGUID(class_info, 0, &guid); + ok(hres == E_FAIL, "GetGUID failed: %08lx, expected E_FAIL\n", hres); + ok(IsEqualGUID(&IID_NULL, &guid), "wrong guid\n"); + + hres = IProvideClassInfo2_GetGUID(class_info, 2, &guid); + ok(hres == E_FAIL, "GetGUID failed: %08lx, expected E_FAIL\n", hres); + ok(IsEqualGUID(&IID_NULL, &guid), "wrong guid\n"); + + hres = IProvideClassInfo2_GetGUID(class_info, GUIDKIND_DEFAULT_SOURCE_DISP_IID, NULL); + ok(hres == E_POINTER, "GetGUID failed: %08lx, expected E_POINTER\n", hres); + + hres = IProvideClassInfo2_GetGUID(class_info, 0, NULL); + ok(hres == E_POINTER, "GetGUID failed: %08lx, expected E_POINTER\n", hres); + + IProvideClassInfo2_Release(class_info); +} + +static void test_WebBrowser(void) +{ + IUnknown *unk = NULL; + ULONG ref; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CoCreateInterface failed: %08lx\n", hres); + if(FAILED(hres)) + return; + + test_ClassInfo(unk); + + ref = IUnknown_Release(unk); + ok(ref == 0, "ref=%ld, expected 0\n", ref); +} + +START_TEST(webbrowser) +{ + OleInitialize(NULL); + + test_WebBrowser(); + + OleUninitialize(); +}

1 0

Mike McCormack : msi: Features may be published but absent.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: abfe2486333b0ab541cd7a7c03fcfcfadcf43c34 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=abfe2486333b0ab541cd7a7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jul 6 19:01:50 2006 +0900 msi: Features may be published but absent. --- dlls/msi/msi.c | 43 +++++++++++++++++++++++++++++++++---------- 1 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index a628155..81c531b 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1123,15 +1123,25 @@ end: /****************************************************************** * MsiQueryFeatureStateW [MSI.@] * - * This does not verify that the Feature is functional. So i am only going to - * check the existence of the key in the registry. This should tell me if it is - * installed. + * Checks the state of a feature + * + * PARAMS + * szProduct [I] Product's GUID string + * szFeature [I] Feature's GUID string + * + * RETURNS + * INSTALLSTATE_LOCAL Feature is installed and useable + * INSTALLSTATE_ABSENT Feature is absent + * INSTALLSTATE_ADVERTISED Feature should be installed on demand + * INSTALLSTATE_UNKNOWN An error occured + * INSTALLSTATE_INVALIDARG One of the GUIDs was invalid + * */ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) { - WCHAR squishProduct[GUID_SIZE]; + WCHAR squishProduct[GUID_SIZE], buffer[MAX_FEATURE_CHARS+2]; UINT rc; - DWORD sz = 0; + DWORD sz, type; HKEY hkey; TRACE("%s %s\n", debugstr_w(szProduct), debugstr_w(szFeature)); @@ -1142,17 +1152,30 @@ INSTALLSTATE WINAPI MsiQueryFeatureState if (!squash_guid( szProduct, squishProduct )) return INSTALLSTATE_INVALIDARG; - rc = MSIREG_OpenFeaturesKey(szProduct, &hkey, FALSE); + rc = MSIREG_OpenUserFeaturesKey(szProduct, &hkey, FALSE); if (rc != ERROR_SUCCESS) return INSTALLSTATE_UNKNOWN; - rc = RegQueryValueExW( hkey, szFeature, NULL, NULL, NULL, &sz); + buffer[0] = 0; + sz = sizeof buffer; + type = 0; + rc = RegQueryValueExW(hkey, szFeature, NULL, &type, (LPBYTE) buffer, &sz); RegCloseKey(hkey); - if (rc == ERROR_SUCCESS) - return INSTALLSTATE_LOCAL; + TRACE("rc = %d buffer = %s\n", rc, debugstr_w(buffer)); + + if (rc != ERROR_SUCCESS || sz == 0 || type != REG_SZ) + return INSTALLSTATE_UNKNOWN; + + if (buffer[0] == 6) + return INSTALLSTATE_ABSENT; + + /* FIXME: + * Return INSTALLSTATE_ADVERTISED when + * the components exist in the registry, but not on the disk. + */ - return INSTALLSTATE_UNKNOWN; + return INSTALLSTATE_LOCAL; } /******************************************************************

1 0

Ge van Geldorp : configure: Allow relocation on x86_64.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 2adeefe38897ec138f623a68e36e249de40c0943 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2adeefe38897ec138f623a6… Author: Ge van Geldorp <ge(a)gse.nl> Date: Fri Jun 30 21:37:34 2006 +0200 configure: Allow relocation on x86_64. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 7b53f6b..ece71b4 100755 --- a/configure +++ b/configure @@ -16915,7 +16915,7 @@ echo "${ECHO_T}$ac_cv_ld_rpath" >&6; } fi case $host_cpu in - *i[3456789]86*) + *i[3456789]86* | x86_64) { echo "$as_me:$LINENO: checking whether we can relocate the executable to 0x7bf00000" >&5 echo $ECHO_N "checking whether we can relocate the executable to 0x7bf00000... $ECHO_C" >&6; } if test "${ac_cv_ld_reloc_exec+set}" = set; then diff --git a/configure.ac b/configure.ac index be376f2..3c55d8c 100644 --- a/configure.ac +++ b/configure.ac @@ -1121,7 +1121,7 @@ case $host_os in fi case $host_cpu in - *i[[3456789]]86*) + *i[[3456789]]86* | x86_64) AC_CACHE_CHECK([whether we can relocate the executable to 0x7bf00000], ac_cv_ld_reloc_exec, [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400], ac_cv_ld_reloc_exec="yes", ac_cv_ld_reloc_exec="no")])

1 0

Mike McCormack : msi: Use msi_strcpy_to_awstring to return the string in MsiComponentGetPath.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 4c0e72ecebb75290625cf0e09a8302fd775026d5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4c0e72ecebb75290625cf0e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jul 6 19:00:45 2006 +0900 msi: Use msi_strcpy_to_awstring to return the string in MsiComponentGetPath. --- dlls/msi/msi.c | 149 ++++++++++++++++++++++++++------------------------------ 1 files changed, 70 insertions(+), 79 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 119a4f9..d3c2179 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -974,58 +974,8 @@ UINT WINAPI MsiVerifyPackageW( LPCWSTR s return r; } -INSTALLSTATE WINAPI MsiGetComponentPathA(LPCSTR szProduct, LPCSTR szComponent, - LPSTR lpPathBuf, DWORD* pcchBuf) -{ - LPWSTR szwProduct = NULL, szwComponent = NULL, lpwPathBuf= NULL; - INSTALLSTATE rc; - UINT incoming_len; - - if( szProduct ) - { - szwProduct = strdupAtoW( szProduct ); - if( !szwProduct) - return ERROR_OUTOFMEMORY; - } - - if( szComponent ) - { - szwComponent = strdupAtoW( szComponent ); - if( !szwComponent ) - { - msi_free( szwProduct); - return ERROR_OUTOFMEMORY; - } - } - - if( pcchBuf && *pcchBuf > 0 ) - { - lpwPathBuf = msi_alloc( *pcchBuf * sizeof(WCHAR)); - incoming_len = *pcchBuf; - } - else - { - lpwPathBuf = NULL; - incoming_len = 0; - } - - rc = MsiGetComponentPathW(szwProduct, szwComponent, lpwPathBuf, pcchBuf); - - msi_free( szwProduct); - msi_free( szwComponent); - if (lpwPathBuf) - { - if (rc != INSTALLSTATE_UNKNOWN) - WideCharToMultiByte(CP_ACP, 0, lpwPathBuf, incoming_len, - lpPathBuf, incoming_len, NULL, NULL); - msi_free( lpwPathBuf); - } - - return rc; -} - -INSTALLSTATE WINAPI MsiGetComponentPathW(LPCWSTR szProduct, LPCWSTR szComponent, - LPWSTR lpPathBuf, DWORD* pcchBuf) +INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, + awstring* lpPathBuf, DWORD* pcchBuf) { WCHAR squished_pc[GUID_SIZE]; UINT rc; @@ -1042,38 +992,44 @@ INSTALLSTATE WINAPI MsiGetComponentPathW if( lpPathBuf && !pcchBuf ) return INSTALLSTATE_INVALIDARG; - squash_guid(szProduct,squished_pc); + squash_guid( szProduct, squished_pc ); rc = MSIREG_OpenProductsKey( szProduct, &hkey, FALSE); if( rc != ERROR_SUCCESS ) - goto end; + return INSTALLSTATE_UNKNOWN; RegCloseKey(hkey); rc = MSIREG_OpenComponentsKey( szComponent, &hkey, FALSE); if( rc != ERROR_SUCCESS ) - goto end; + return INSTALLSTATE_UNKNOWN; sz = 0; type = 0; rc = RegQueryValueExW( hkey, squished_pc, NULL, &type, NULL, &sz ); - if( rc != ERROR_SUCCESS ) - goto end; - if( type != REG_SZ ) - goto end; - - sz += sizeof(WCHAR); - path = msi_alloc( sz ); - if( !path ) - goto end; - - rc = RegQueryValueExW( hkey, squished_pc, NULL, NULL, (LPVOID) path, &sz ); - if( rc != ERROR_SUCCESS ) - goto end; + if( rc == ERROR_SUCCESS && type == REG_SZ ) + { + sz += sizeof(WCHAR); + path = msi_alloc( sz ); + if( path ) + { + path[0] = 0; + rc = RegQueryValueExW( hkey, squished_pc, NULL, NULL, (LPVOID) path, &sz ); + if( rc != ERROR_SUCCESS ) + { + msi_free( path ); + path = NULL; + } + } + } + RegCloseKey(hkey); TRACE("found path of (%s:%s)(%s)\n", debugstr_w(szComponent), debugstr_w(szProduct), debugstr_w(path)); + if (!path) + return INSTALLSTATE_UNKNOWN; + if (path[0]=='0') { FIXME("Registry entry.. check entry\n"); @@ -1081,28 +1037,63 @@ INSTALLSTATE WINAPI MsiGetComponentPathW } else { - /* PROBABLY a file */ if ( GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES ) rrc = INSTALLSTATE_LOCAL; else rrc = INSTALLSTATE_ABSENT; } - if( pcchBuf ) - { - sz = sz / sizeof(WCHAR); - if( *pcchBuf >= sz ) - lstrcpyW( lpPathBuf, path ); - *pcchBuf = sz; - } + msi_strcpy_to_awstring( path, lpPathBuf, pcchBuf ); -end: - msi_free(path ); - RegCloseKey(hkey); + msi_free( path ); return rrc; } /****************************************************************** + * MsiGetComponentPathW [MSI.@] + */ +INSTALLSTATE WINAPI MsiGetComponentPathW(LPCWSTR szProduct, LPCWSTR szComponent, + LPWSTR lpPathBuf, DWORD* pcchBuf) +{ + awstring path; + + path.unicode = TRUE; + path.str.w = lpPathBuf; + + return MSI_GetComponentPath( szProduct, szComponent, &path, pcchBuf ); +} + +/****************************************************************** + * MsiGetComponentPathA [MSI.@] + */ +INSTALLSTATE WINAPI MsiGetComponentPathA(LPCSTR szProduct, LPCSTR szComponent, + LPSTR lpPathBuf, DWORD* pcchBuf) +{ + LPWSTR szwProduct, szwComponent = NULL; + INSTALLSTATE r = INSTALLSTATE_UNKNOWN; + awstring path; + + szwProduct = strdupAtoW( szProduct ); + if( szProduct && !szwProduct) + goto end; + + szwComponent = strdupAtoW( szComponent ); + if( szComponent && !szwComponent ) + goto end; + + path.unicode = FALSE; + path.str.a = lpPathBuf; + + r = MSI_GetComponentPath( szwProduct, szwComponent, &path, pcchBuf ); + +end: + msi_free( szwProduct ); + msi_free( szwComponent ); + + return r; +} + +/****************************************************************** * MsiQueryFeatureStateA [MSI.@] */ INSTALLSTATE WINAPI MsiQueryFeatureStateA(LPCSTR szProduct, LPCSTR szFeature)

1 0

Mike McCormack : msi: Add a test for MsiGetComponentPath and make it pass.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: ee3e0586550b073e68a31418cb39868679953588 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee3e0586550b073e68a3141… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jul 6 19:01:11 2006 +0900 msi: Add a test for MsiGetComponentPath and make it pass. --- dlls/msi/msi.c | 6 ++++-- dlls/msi/tests/msi.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index d3c2179..a628155 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -977,7 +977,7 @@ UINT WINAPI MsiVerifyPackageW( LPCWSTR s INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, awstring* lpPathBuf, DWORD* pcchBuf) { - WCHAR squished_pc[GUID_SIZE]; + WCHAR squished_pc[GUID_SIZE], squished_comp[GUID_SIZE]; UINT rc; INSTALLSTATE rrc = INSTALLSTATE_UNKNOWN; HKEY hkey = 0; @@ -992,7 +992,9 @@ INSTALLSTATE WINAPI MSI_GetComponentPath if( lpPathBuf && !pcchBuf ) return INSTALLSTATE_INVALIDARG; - squash_guid( szProduct, squished_pc ); + if (!squash_guid( szProduct, squished_pc ) || + !squash_guid( szComponent, squished_comp )) + return INSTALLSTATE_INVALIDARG; rc = MSIREG_OpenProductsKey( szProduct, &hkey, FALSE); if( rc != ERROR_SUCCESS ) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index b79f45d..4334675 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -31,6 +31,8 @@ typedef UINT (WINAPI *fnMsiOpenPackageEx fnMsiOpenPackageExA pMsiOpenPackageExA; typedef UINT (WINAPI *fnMsiOpenPackageExW)(LPCWSTR, DWORD, MSIHANDLE*); fnMsiOpenPackageExW pMsiOpenPackageExW; +typedef INSTALLSTATE (WINAPI *fnMsiGetComponentPathA)(LPCSTR, LPCSTR, LPSTR, DWORD*); +fnMsiGetComponentPathA pMsiGetComponentPathA; static void test_usefeature(void) { @@ -83,6 +85,46 @@ static void test_null(void) ok( r == ERROR_INVALID_PARAMETER,"wrong error\n"); } +static void test_getcomponentpath(void) +{ + INSTALLSTATE r; + char buffer[0x100]; + DWORD sz; + + if(!pMsiGetComponentPathA) + return; + + r = pMsiGetComponentPathA( NULL, NULL, NULL, NULL ); + ok( r == INSTALLSTATE_INVALIDARG, "wrong return value\n"); + + r = pMsiGetComponentPathA( "bogus", "bogus", NULL, NULL ); + ok( r == INSTALLSTATE_INVALIDARG, "wrong return value\n"); + + r = pMsiGetComponentPathA( "bogus", "{00000000-0000-0000-000000000000}", NULL, NULL ); + ok( r == INSTALLSTATE_INVALIDARG, "wrong return value\n"); + + sz = sizeof buffer; + buffer[0]=0; + r = pMsiGetComponentPathA( "bogus", "{00000000-0000-0000-000000000000}", buffer, &sz ); + ok( r == INSTALLSTATE_INVALIDARG, "wrong return value\n"); + + r = pMsiGetComponentPathA( "{00000000-78E1-11D2-B60F-006097C998E7}", + "{00000000-0000-0000-0000-000000000000}", buffer, &sz ); + ok( r == INSTALLSTATE_UNKNOWN, "wrong return value\n"); + + r = pMsiGetComponentPathA( "{00000409-78E1-11D2-B60F-006097C998E7}", + "{00000000-0000-0000-0000-00000000}", buffer, &sz ); + ok( r == INSTALLSTATE_INVALIDARG, "wrong return value\n"); + + r = pMsiGetComponentPathA( "{00000409-78E1-11D2-B60F-006097C998E7}", + "{029E403D-A86A-1D11-5B5B0006799C897E}", buffer, &sz ); + ok( r == INSTALLSTATE_INVALIDARG, "wrong return value\n"); + + r = pMsiGetComponentPathA( "{00000000-78E1-11D2-B60F-006097C9987e}", + "{00000000-A68A-11d1-5B5B-0006799C897E}", buffer, &sz ); + ok( r == INSTALLSTATE_UNKNOWN, "wrong return value\n"); +} + START_TEST(msi) { HMODULE hmod = GetModuleHandle("msi.dll"); @@ -92,7 +134,10 @@ START_TEST(msi) GetProcAddress(hmod, "MsiOpenPackageExA"); pMsiOpenPackageExW = (fnMsiOpenPackageExW) GetProcAddress(hmod, "MsiOpenPackageExW"); + pMsiGetComponentPathA = (fnMsiGetComponentPathA) + GetProcAddress(hmod, "MsiGetComponentPathA" ); test_usefeature(); test_null(); + test_getcomponentpath(); }

1 0

Jacek Caban : mshtml: Added get_text implementation.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 3c1f2d6cbe942fac816e2dd284a611f89ac5c06d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3c1f2d6cbe942fac816e2dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 5 22:38:20 2006 +0200 mshtml: Added get_text implementation. --- dlls/mshtml/txtrange.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index ea2319e..58b4391 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -152,8 +152,26 @@ static HRESULT WINAPI HTMLTxtRange_put_t static HRESULT WINAPI HTMLTxtRange_get_text(IHTMLTxtRange *iface, BSTR *p) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRUnichar *nstext = NULL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->nsselection) { + static const WCHAR empty[] = {0}; + *p = SysAllocString(empty); + return S_OK; + } + + nsres = nsISelection_ToString(This->nsselection, &nstext); + if(NS_FAILED(nsres) || !nstext) { + ERR("toString failed: %08lx\n", nsres); + return E_FAIL; + } + + *p = SysAllocString(nstext); + nsfree(nstext); + return S_OK; } static HRESULT WINAPI HTMLTxtRange_parentElement(IHTMLTxtRange *iface, IHTMLElement **parent)

1 0