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

Andrew Talbot : dmsynth: Sign-compare warning fix.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 634b688f5c11c643cba0abdf24ef6c020173de06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=634b688f5c11c643cba0abdf2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 30 22:35:59 2008 +0100 dmsynth: Sign-compare warning fix. --- dlls/dmsynth/dmsynth_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 372bee5..0a52544 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -525,7 +525,8 @@ const char *debugstr_dmreturn (DWORD code) { /* generic flag-dumping function */ const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i, size = sizeof(buffer); + unsigned int i; + int size = sizeof(buffer); for (i=0; i < num_names; i++) {

1 0

Andrew Talbot : dmusic: Sign-compare warning fix.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 7e5985311ccef1f4d6b428131f97eb069674b54f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e5985311ccef1f4d6b428131… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 30 22:36:02 2008 +0100 dmusic: Sign-compare warning fix. --- dlls/dmusic/dmusic_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index c4a231c..89f8eb1 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -549,7 +549,8 @@ const char *debugstr_dmreturn (DWORD code) { /* generic flag-dumping function */ const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i, size = sizeof(buffer); + unsigned int i; + int size = sizeof(buffer); for (i=0; i < num_names; i++) {

1 0

Rob Shearman : rpcrt4: Validate the uuid portion of the string passed to RpcStringBindingParseA/W .
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 1eaea13ebbd388d9727f879055f6a1357ad8e4ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eaea13ebbd388d9727f87905… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jul 31 08:19:32 2008 +0100 rpcrt4: Validate the uuid portion of the string passed to RpcStringBindingParseA/W. --- dlls/rpcrt4/rpc_binding.c | 26 ++++++++++++++++++++++++-- dlls/rpcrt4/tests/rpc.c | 2 -- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index e42b8f9..a439bc3 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -481,7 +481,18 @@ RPC_STATUS WINAPI RpcStringBindingParseA( RPC_CSTR StringBinding, RPC_CSTR *ObjU next = strchr(data, '@'); if (next) { - if (ObjUuid) *ObjUuid = (unsigned char*)RPCRT4_strndupA(data, next - data); + UUID uuid; + RPC_STATUS status; + RPC_CSTR str_uuid = (unsigned char*)RPCRT4_strndupA(data, next - data); + status = UuidFromStringA(str_uuid, &uuid); + if (status != RPC_S_OK) { + HeapFree(GetProcessHeap(), 0, str_uuid); + return status; + } + if (ObjUuid) + *ObjUuid = str_uuid; + else + HeapFree(GetProcessHeap(), 0, str_uuid); data = next+1; } @@ -579,7 +590,18 @@ RPC_STATUS WINAPI RpcStringBindingParseW( RPC_WSTR StringBinding, RPC_WSTR *ObjU next = strchrW(data, '@'); if (next) { - if (ObjUuid) *ObjUuid = RPCRT4_strndupW(data, next - data); + UUID uuid; + RPC_STATUS status; + RPC_WSTR str_uuid = RPCRT4_strndupW(data, next - data); + status = UuidFromStringW(str_uuid, &uuid); + if (status != RPC_S_OK) { + HeapFree(GetProcessHeap(), 0, str_uuid); + return status; + } + if (ObjUuid) + *ObjUuid = str_uuid; + else + HeapFree(GetProcessHeap(), 0, str_uuid); data = next+1; } diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 671159d..19a0a94 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -611,9 +611,7 @@ static void test_RpcStringBindingParseA(void) /* test with invalid uuid */ status = RpcStringBindingParseA(invalid_uuid_binding, NULL, &protseq, NULL, NULL, NULL); - todo_wine ok(status == RPC_S_INVALID_STRING_UUID, "RpcStringBindingParseA should have returned RPC_S_INVALID_STRING_UUID instead of %ld\n", status); - todo_wine ok(protseq == NULL, "protseq was %p instead of NULL\n", protseq); /* test with invalid endpoint */

1 0

Damjan Jovanovic : shdocvw: Add IUniformResourceLocator declarations to intshcut.h.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 22a17e027e994576aecc3eb2c6e9f18e006d9d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a17e027e994576aecc3eb2c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jul 31 07:47:03 2008 +0200 shdocvw: Add IUniformResourceLocator declarations to intshcut.h. --- include/intshcut.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 1 deletions(-) diff --git a/include/intshcut.h b/include/intshcut.h index 54c2f2d..71c7514 100644 --- a/include/intshcut.h +++ b/include/intshcut.h @@ -19,7 +19,7 @@ #ifndef __WINE_INTSHCUT_H #define __WINE_INTSHCUT_H -/* FIXME: #include <isguids.h> */ +#include <isguids.h> #define INTSHCUTAPI @@ -27,6 +27,74 @@ extern "C" { #endif +#define E_FLAGS MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x1000) +#define IS_E_EXEC_FAILED MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x2002) +#define URL_E_INVALID_SYNTAX MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x1001) +#define URL_E_UNREGISTERED_PROTOCOL MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x1002) + +typedef enum iurl_seturl_flags { + IURL_SETURL_FL_GUESS_PROTOCOL=1, + IURL_SETURL_FL_USE_DEFAULT_PROTOCOL, + ALL_IURL_SETURL_FLAGS=(IURL_SETURL_FL_GUESS_PROTOCOL|IURL_SETURL_FL_USE_DEFAULT_PROTOCOL) +} IURL_SETURL_FLAGS; + +typedef enum iurl_invokecommand_flags { + IURL_INVOKECOMMAND_FL_ALLOW_UI=1, + IURL_INVOKECOMMAND_FL_USE_DEFAULT_VERB, + ALL_IURL_INVOKECOMMAND_FLAGS=(IURL_INVOKECOMMAND_FL_ALLOW_UI|IURL_INVOKECOMMAND_FL_USE_DEFAULT_VERB) +} IURL_INVOKECOMMAND_FLAGS; + +typedef struct urlinvokecommandinfoA { + DWORD dwcbSize; + DWORD dwFlags; + HWND hwndParent; + LPCSTR pcszVerb; +} URLINVOKECOMMANDINFOA, *PURLINVOKECOMMANDINFOA; +typedef const URLINVOKECOMMANDINFOA CURLINVOKECOMMANDINFOA; +typedef const URLINVOKECOMMANDINFOA *PCURLINVOKECOMMANDINFOA; + +typedef struct urlinvokecommandinfoW { + DWORD dwcbSize; + DWORD dwFlags; + HWND hwndParent; + LPCWSTR pcszVerb; +} URLINVOKECOMMANDINFOW, *PURLINVOKECOMMANDINFOW; +typedef const URLINVOKECOMMANDINFOW CURLINVOKECOMMANDINFOW; +typedef const URLINVOKECOMMANDINFOW *PCURLINVOKECOMMANDINFOW; + +#define INTERFACE IUniformResourceLocatorA +DECLARE_INTERFACE_(IUniformResourceLocatorA,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, VOID **ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IUniformResourceLocatorA methods ***/ + STDMETHOD(SetURL)(THIS_ LPCSTR pcszURL, DWORD dwInFlags) PURE; + STDMETHOD(GetURL)(THIS_ LPSTR *ppszURL) PURE; + STDMETHOD(InvokeCommand)(THIS_ PURLINVOKECOMMANDINFOA pURLCommandInfo) PURE; +}; +#undef INTERFACE + +#define INTERFACE IUniformResourceLocatorW +DECLARE_INTERFACE_(IUniformResourceLocatorW,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, VOID **ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IUniformResourceLocatorW methods ***/ + STDMETHOD(SetURL)(THIS_ LPCWSTR pcszURL, DWORD dwInFlags) PURE; + STDMETHOD(GetURL)(THIS_ LPWSTR *ppszURL) PURE; + STDMETHOD(InvokeCommand)(THIS_ PURLINVOKECOMMANDINFOW pURLCommandInfo) PURE; +}; +#undef INTERFACE + +DECL_WINELIB_TYPE_AW(URLINVOKECOMMANDINFO) +DECL_WINELIB_TYPE_AW(PURLINVOKECOMMANDINFO) +DECL_WINELIB_TYPE_AW(CURLINVOKECOMMANDINFO) +DECL_WINELIB_TYPE_AW(PCURLINVOKECOMMANDINFO) + BOOL WINAPI InetIsOffline(DWORD); #ifdef __cplusplus

1 0

Andrew Talbot : dmcompos: Sign-compare warning fix.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 9d67a983a82b25aecfc8d027b2e6e26b51bcdfdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d67a983a82b25aecfc8d027b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 30 22:35:48 2008 +0100 dmcompos: Sign-compare warning fix. --- dlls/dmcompos/dmcompos_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 36244de..a70c292 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -693,7 +693,8 @@ const char *debugstr_dmreturn (DWORD code) { /* generic flag-dumping function */ const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i, size = sizeof(buffer); + unsigned int i; + int size = sizeof(buffer); for (i=0; i < num_names; i++) {

1 0

James Hawkins : msi: Add tests for MsiOpenProduct.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 68e6be45e124e57fe0b5d00612500fa5a7a8944f URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e6be45e124e57fe0b5d0061… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Jul 31 00:42:45 2008 -0500 msi: Add tests for MsiOpenProduct. --- dlls/msi/tests/msi.c | 419 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 419 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68e6be45e124e57fe0b5d…

1 0

James Hawkins : msi: Reimplement MsiOpenProduct.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 9b426be0eee9ddeb1dd18fc75374d5f4304077bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b426be0eee9ddeb1dd18fc75… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Jul 31 00:42:07 2008 -0500 msi: Reimplement MsiOpenProduct. --- dlls/msi/msi.c | 127 +++++++++++++++++++++++++++++--------------------------- 1 files changed, 66 insertions(+), 61 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 359698a..c5dd57d 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -45,25 +45,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0}; -/* FIXME: user-managed installs not located */ static UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context) { HKEY hkey = NULL; - UINT r; *context = MSIINSTALLCONTEXT_NONE; - r = MSIREG_OpenLocalClassesProductKey(szProduct, &hkey, FALSE); - if (r == ERROR_SUCCESS) + if (MSIREG_OpenLocalManagedProductKey(szProduct, &hkey, FALSE) == ERROR_SUCCESS) + *context = MSIINSTALLCONTEXT_USERMANAGED; + else if (MSIREG_OpenLocalClassesProductKey(szProduct, &hkey, FALSE) == ERROR_SUCCESS) *context = MSIINSTALLCONTEXT_MACHINE; - else - { - r = MSIREG_OpenUserProductsKey(szProduct, &hkey, FALSE); - if (r == ERROR_SUCCESS) - *context = MSIINSTALLCONTEXT_USERUNMANAGED; - } + else if (MSIREG_OpenUserProductsKey(szProduct, &hkey, FALSE) == ERROR_SUCCESS) + *context = MSIINSTALLCONTEXT_USERUNMANAGED; RegCloseKey(hkey); + + if (*context == MSIINSTALLCONTEXT_NONE) + return ERROR_UNKNOWN_PRODUCT; + return ERROR_SUCCESS; } @@ -88,69 +87,78 @@ UINT WINAPI MsiOpenProductA(LPCSTR szProduct, MSIHANDLE *phProduct) return r; } -static UINT MSI_OpenProductW( LPCWSTR szProduct, MSIPACKAGE **ppackage ) +static UINT MSI_OpenProductW(LPCWSTR szProduct, MSIPACKAGE **package) { - LPWSTR path = NULL; UINT r; - HKEY hKeyProduct = NULL; - DWORD count, type; + HKEY props; + LPWSTR path; + MSIINSTALLCONTEXT context; - TRACE("%s %p\n", debugstr_w(szProduct), ppackage ); + static const WCHAR managed[] = { + 'M','a','n','a','g','e','d','L','o','c','a','l','P','a','c','k','a','g','e',0}; + static const WCHAR local[] = {'L','o','c','a','l','P','a','c','k','a','g','e',0}; - r = MSIREG_OpenUninstallKey(szProduct,&hKeyProduct,FALSE); - if( r != ERROR_SUCCESS ) - { - r = ERROR_UNKNOWN_PRODUCT; - goto end; - } + TRACE("%s %p\n", debugstr_w(szProduct), package); - /* find the size of the path */ - type = count = 0; - r = RegQueryValueExW( hKeyProduct, INSTALLPROPERTY_LOCALPACKAGEW, - NULL, &type, NULL, &count ); - if( r != ERROR_SUCCESS ) - { - r = ERROR_UNKNOWN_PRODUCT; - goto end; - } + r = msi_locate_product(szProduct, &context); + if (r != ERROR_SUCCESS) + return r; - /* now alloc and fetch the path of the database to open */ - path = msi_alloc( count ); - if( !path ) - goto end; + if (context == MSIINSTALLCONTEXT_MACHINE) + r = MSIREG_OpenLocalSystemInstallProps(szProduct, &props, FALSE); + else if (context == MSIINSTALLCONTEXT_USERMANAGED || + context == MSIINSTALLCONTEXT_USERUNMANAGED) + r = MSIREG_OpenCurrentUserInstallProps(szProduct, &props, FALSE); + + if (r != ERROR_SUCCESS) + return ERROR_UNKNOWN_PRODUCT; + + if (context == MSIINSTALLCONTEXT_USERMANAGED) + path = msi_reg_get_val_str(props, managed); + else + path = msi_reg_get_val_str(props, local); + + r = ERROR_UNKNOWN_PRODUCT; + + if (!path || GetFileAttributesW(path) == INVALID_FILE_ATTRIBUTES) + goto done; - r = RegQueryValueExW( hKeyProduct, INSTALLPROPERTY_LOCALPACKAGEW, - NULL, &type, (LPBYTE) path, &count ); - if( r != ERROR_SUCCESS ) + if (PathIsRelativeW(path)) { - r = ERROR_UNKNOWN_PRODUCT; - goto end; + r = ERROR_INSTALL_PACKAGE_OPEN_FAILED; + goto done; } - r = MSI_OpenPackageW( path, ppackage ); - -end: - msi_free( path ); - if( hKeyProduct ) - RegCloseKey( hKeyProduct ); + r = MSI_OpenPackageW(path, package); +done: + RegCloseKey(props); + msi_free(path); return r; } -UINT WINAPI MsiOpenProductW( LPCWSTR szProduct, MSIHANDLE *phProduct ) +UINT WINAPI MsiOpenProductW(LPCWSTR szProduct, MSIHANDLE *phProduct) { - MSIPACKAGE *package = NULL; - UINT r; + MSIPACKAGE *package = NULL; + WCHAR squished_pc[GUID_SIZE]; + UINT r; + + if (!szProduct || !squash_guid(szProduct, squished_pc)) + return ERROR_INVALID_PARAMETER; - r = MSI_OpenProductW( szProduct, &package ); - if( r == ERROR_SUCCESS ) - { - *phProduct = alloc_msihandle( &package->hdr ); - if (! *phProduct) - r = ERROR_NOT_ENOUGH_MEMORY; - msiobj_release( &package->hdr ); - } - return r; + if (!phProduct) + return ERROR_INVALID_PARAMETER; + + r = MSI_OpenProductW(szProduct, &package); + if (r != ERROR_SUCCESS) + return r; + + *phProduct = alloc_msihandle(&package->hdr); + if (!*phProduct) + r = ERROR_NOT_ENOUGH_MEMORY; + + msiobj_release(&package->hdr); + return r; } UINT WINAPI MsiAdvertiseProductA(LPCSTR szPackagePath, LPCSTR szScriptfilePath, @@ -399,9 +407,6 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, if (r != ERROR_SUCCESS) return r; - if (context == MSIINSTALLCONTEXT_NONE) - return ERROR_UNKNOWN_PRODUCT; - sz = sizeof(sourcepath); MsiSourceListGetInfoW(szProduct, NULL, context, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz);

1 0

Detlef Riekenberg : shell32/tests: Do not crash on Win9x when testing shlfileop.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 4da745be5c430b37f43f6712a34abeb2f4cc6659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4da745be5c430b37f43f6712a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 31 00:48:49 2008 +0200 shell32/tests: Do not crash on Win9x when testing shlfileop. --- dlls/shell32/tests/shlfileop.c | 93 +++++++++++++++++++++++----------------- 1 files changed, 54 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 30d3f24..9b5220a 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -319,14 +319,17 @@ static void test_delete(void) ok(file_exists("test1.txt"), "test1.txt should not have been removed\n"); /* try to delete an invalid filename */ - init_shfo_tests(); - shfo.pFrom = "\0"; - shfo.fFlags &= ~FOF_FILESONLY; - shfo.fAnyOperationsAborted = FALSE; - ret = SHFileOperation(&shfo); - ok(ret == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", ret); - ok(!shfo.fAnyOperationsAborted, "Expected no aborted operations\n"); - ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + if (0) { + /* this crashes on win9x */ + init_shfo_tests(); + shfo.pFrom = "\0"; + shfo.fFlags &= ~FOF_FILESONLY; + shfo.fAnyOperationsAborted = FALSE; + ret = SHFileOperation(&shfo); + ok(ret == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", ret); + ok(!shfo.fAnyOperationsAborted, "Expected no aborted operations\n"); + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + } /* try an invalid function */ init_shfo_tests(); @@ -337,18 +340,22 @@ static void test_delete(void) ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); /* try an invalid list, only one null terminator */ - init_shfo_tests(); - shfo.pFrom = ""; - shfo.wFunc = FO_DELETE; - ret = SHFileOperation(&shfo); - ok(ret == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", ret); - ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + if (0) { + /* this crashes on win9x */ + init_shfo_tests(); + shfo.pFrom = ""; + shfo.wFunc = FO_DELETE; + ret = SHFileOperation(&shfo); + ok(ret == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", ret); + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + } /* delete a dir, and then a file inside the dir, same as * deleting a nonexistent file */ init_shfo_tests(); shfo.pFrom = "testdir2\0testdir2\\one.txt\0"; + shfo.wFunc = FO_DELETE; ret = SHFileOperation(&shfo); ok(ret == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", ret); ok(!file_exists("testdir2"), "Expected testdir2 to not exist\n"); @@ -595,6 +602,8 @@ static void test_copy(void) init_shfo_tests(); shfo.pFrom = from; shfo.pTo = to; + /* suppress the error-dialog in win9x here */ + shfo.fFlags |= FOF_NOERRORUI; set_curr_dir_path(from, "test1.txt\0test2.txt\0"); set_curr_dir_path(to, "test3.txt\0"); retval = SHFileOperation(&shfo); @@ -604,6 +613,7 @@ static void test_copy(void) /* try to copy many files to nonexistent directory */ DeleteFile(to); + shfo.fFlags &= ~FOF_NOERRORUI; shfo.fAnyOperationsAborted = FALSE; retval = SHFileOperation(&shfo); ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); @@ -956,32 +966,37 @@ static void test_copy(void) ok(DeleteFileA("two.txt"), "Expected file to exist\n"); ok(RemoveDirectoryA("threedir"), "Expected dir to exist\n"); - createTestFile("one.txt"); - createTestFile("two.txt"); - - /* pTo contains bogus 2nd name longer than MAX_PATH, - * multiple source files, FOF_MULTIDESTFILES - * dest dir does not exist - */ - memset(to, 'a', 2 * MAX_PATH); - memset(to+MAX_PATH*2, 0, 2); - lstrcpyA(to, "threedir"); - shfo.pFrom = "one.txt\0two.txt\0"; - shfo.pTo = to; - shfo.fFlags = FOF_MULTIDESTFILES | FOF_NOCONFIRMATION | - FOF_SILENT | FOF_NOERRORUI; - retval = SHFileOperation(&shfo); - ok(retval == ERROR_CANCELLED || - retval == ERROR_SUCCESS, /* win2k3 */ - "Expected ERROR_CANCELLED or ERROR_SUCCESS, got %d\n", retval); - ok(!DeleteFileA("threedir\\one.txt"), "Expected file to not exist\n"); - ok(!DeleteFileA("threedir\\two.txt"), "Expected file to not exist\n"); - ok(DeleteFileA("one.txt"), "Expected file to exist\n"); - ok(DeleteFileA("two.txt"), "Expected file to exist\n"); - ok(!RemoveDirectoryA("threedir"), "Expected dir to not exist\n"); + if (0) { + /* this crashes on win9x */ + createTestFile("one.txt"); + createTestFile("two.txt"); + + /* pTo contains bogus 2nd name longer than MAX_PATH, + * multiple source files, FOF_MULTIDESTFILES + * dest dir does not exist + */ + + memset(to, 'a', 2 * MAX_PATH); + memset(to+MAX_PATH*2, 0, 2); + lstrcpyA(to, "threedir"); + shfo.pFrom = "one.txt\0two.txt\0"; + shfo.pTo = to; + shfo.fFlags = FOF_MULTIDESTFILES | FOF_NOCONFIRMATION | + FOF_SILENT | FOF_NOERRORUI; + retval = SHFileOperation(&shfo); + ok(retval == ERROR_CANCELLED || + retval == ERROR_SUCCESS, /* win2k3 */ + "Expected ERROR_CANCELLED or ERROR_SUCCESS, got %d\n", retval); + ok(!DeleteFileA("threedir\\one.txt"), "Expected file to not exist\n"); + ok(!DeleteFileA("threedir\\two.txt"), "Expected file to not exist\n"); + ok(DeleteFileA("one.txt"), "Expected file to exist\n"); + ok(DeleteFileA("two.txt"), "Expected file to exist\n"); + ok(!RemoveDirectoryA("threedir"), "Expected dir to not exist\n"); + + /* file exists in win2k */ + DeleteFileA("threedir"); + } - /* file exists in win2k */ - DeleteFileA("threedir"); createTestFile("one.txt"); createTestFile("two.txt");

1 0

Nikolay Sivov : gdiplus: Implemented Gdip[Get/Set]PenMode.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 1ac791287437c3fb9be3ca850d7aa370ba6b55ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac791287437c3fb9be3ca850… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 31 09:08:32 2008 +0400 gdiplus: Implemented Gdip[Get/Set]PenMode. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/pen.c | 15 ++++++++++++--- include/gdiplusflat.h | 2 ++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 661cb8f..48d46a3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -363,7 +363,7 @@ @ stub GdipGetPenFillType @ stdcall GdipGetPenLineJoin(ptr ptr) @ stdcall GdipGetPenMiterLimit(ptr ptr) -@ stub GdipGetPenMode +@ stdcall GdipGetPenMode(ptr ptr) @ stdcall GdipGetPenStartCap(ptr ptr) @ stub GdipGetPenTransform @ stdcall GdipGetPenUnit(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index b445a58..8fe8862 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -72,6 +72,7 @@ struct GpPen{ INT numdashes; REAL offset; /* dash offset */ GpBrush *brush; + GpPenAlignment align; }; struct GpGraphics{ diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index df2d040..829b191 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -237,6 +237,16 @@ GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen *pen, GpLineJoin *lineJoin) return Ok; } +GpStatus WINGDIPAPI GdipGetPenMode(GpPen *pen, GpPenAlignment *mode) +{ + if(!pen || !mode) + return InvalidParameter; + + *mode = pen->align; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen *pen, REAL *miterLimit) { if(!pen || !miterLimit) @@ -481,12 +491,11 @@ GpStatus WINGDIPAPI GdipSetPenWidth(GpPen *pen, REAL width) return Ok; } - -GpStatus WINGDIPAPI GdipSetPenMode(GpPen *pen, GpPenAlignment penAlignment) +GpStatus WINGDIPAPI GdipSetPenMode(GpPen *pen, GpPenAlignment mode) { if(!pen) return InvalidParameter; - FIXME("stub (%d)\n", penAlignment); + pen->align = mode; return Ok; } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index f5705a7..2e0d743 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -37,6 +37,7 @@ GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen*,REAL*,INT); GpStatus WINGDIPAPI GdipGetPenDashCount(GpPen*,INT*); GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen*,REAL*); GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); +GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); GpStatus WINGDIPAPI GdipSetPenColor(GpPen*,ARGB); GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen*,GpCustomLineCap*); @@ -48,6 +49,7 @@ GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen*,GpDashStyle); GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen*,GpLineCap); GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen*,GpLineCap,GpLineCap,GpDashCap); GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen*,GpLineJoin); +GpStatus WINGDIPAPI GdipSetPenMode(GpPen*,GpPenAlignment); GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen*,REAL); GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap); GpStatus WINGDIPAPI GdipSetPenWidth(GpPen*,REAL);

1 0

H. Verbeet : wined3d: Call LoadLocation() on higher render targets as well, simplify some code in drawPrimitive.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: daa59e00be8a31f9e103ae9101182686173428d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa59e00be8a31f9e103ae910… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jul 30 23:16:34 2008 +0200 wined3d: Call LoadLocation() on higher render targets as well, simplify some code in drawPrimitive. It's probably rare for higher render targets to get locked or updated from sysmem, but this should still be more correct. It also makes the code simpler. --- dlls/wined3d/drawprim.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index fddf365..fd96ea2 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -930,17 +930,9 @@ void drawPrimitive(IWineD3DDevice *iface, /* Invalidate the back buffer memory so LockRect will read it the next time */ for(i = 0; i < GL_LIMITS(buffers); i++) { target = (IWineD3DSurfaceImpl *) This->render_targets[i]; - - /* TODO: Only do all that if we're going to change anything */ - if(target /*&& target->Flags & (SFLAG_INTEXTURE | SFLAG_INSYSMEM)*/) { - if(i == 0) { - /* Need the surface in the drawable! */ - IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); - IWineD3DSurface_ModifyLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, TRUE); - } else { - /* Must be an fbo render target */ - IWineD3DSurface_ModifyLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, TRUE); - } + if (target) { + IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, TRUE); } }

1 0