August 2006 - Wine-Commits - list.winehq.org

Andrew Talbot : msi: Write-strings warning fix.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: 92725e5299aa52c68ebb9dcb6f679451b66ccb05 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92725e5299aa52c68ebb9dc… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Aug 11 15:36:30 2006 +0100 msi: Write-strings warning fix. --- dlls/msi/files.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 7f1c4db..75238f1 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -283,6 +283,7 @@ static BOOL extract_cabinet_file(MSIPACK BOOL ret; char *cabinet; char *cab_path; + static CHAR empty[] = ""; CabData data; TRACE("Extracting %s to %s\n",debugstr_w(source), debugstr_w(path)); @@ -317,7 +318,7 @@ static BOOL extract_cabinet_file(MSIPACK data.package = package; data.cab_path = cab_path; - ret = FDICopy(hfdi, cabinet, "", 0, cabinet_notify, NULL, &data); + ret = FDICopy(hfdi, cabinet, empty, 0, cabinet_notify, NULL, &data); if (!ret) ERR("FDICopy failed\n");

1 0

Andrew Talbot : version: Write-strings warnings fix.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: b6f190ee429dc3d7a5131ba0b7494dfada0416d0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b6f190ee429dc3d7a5131ba… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Aug 11 14:53:25 2006 +0100 version: Write-strings warnings fix. --- dlls/version/install.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/version/install.c b/dlls/version/install.c index d33fc17..c7565af 100644 --- a/dlls/version/install.c +++ b/dlls/version/install.c @@ -454,6 +454,7 @@ DWORD WINAPI VerInstallFileA( buf2 = _fetch_versioninfo(tmpfn,&tmpvffi); if (buf2) { char *tbuf1,*tbuf2; + static CHAR trans_array[] = "\\VarFileInfo\\Translation"; UINT len1,len2; len1=len2=40; @@ -470,8 +471,8 @@ DWORD WINAPI VerInstallFileA( (destvffi->dwFileSubtype!=tmpvffi->dwFileSubtype) ) xret |= VIF_MISMATCH|VIF_DIFFTYPE; - if (VerQueryValueA(buf1,"\\VarFileInfo\\Translation",(LPVOID*)&tbuf1,&len1) && - VerQueryValueA(buf2,"\\VarFileInfo\\Translation",(LPVOID*)&tbuf2,&len2) + if (VerQueryValueA(buf1,trans_array,(LPVOID*)&tbuf1,&len1) && + VerQueryValueA(buf2,trans_array,(LPVOID*)&tbuf2,&len2) ) { /* Do something with tbuf1 and tbuf2 * generates DIFFLANG|MISMATCH

1 0

Juan Lang : crypt32/tests: Only load crypt32 once.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: ea79639b03685045122abb33c40e43bb42e31e62 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea79639b03685045122abb3… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Aug 11 07:23:05 2006 -0700 crypt32/tests: Only load crypt32 once. --- dlls/crypt32/tests/main.c | 178 ++++++++++++++++++++++----------------------- 1 files changed, 87 insertions(+), 91 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 0ce8e41..128120b 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -28,6 +28,8 @@ #include <winreg.h> #include "wine/test.h" +HMODULE hCrypt; + static void test_findAttribute(void) { PCRYPT_ATTRIBUTE ret; @@ -208,68 +210,64 @@ static I_CryptFreeTlsFunc pI_CryptFreeTl static void test_cryptTls(void) { - HMODULE lib = LoadLibraryA("crypt32.dll"); + DWORD index; + BOOL ret; - if (lib) - { - DWORD index; - BOOL ret; + if (!hCrypt) return; - pI_CryptAllocTls = (I_CryptAllocTlsFunc)GetProcAddress(lib, - "I_CryptAllocTls"); - pI_CryptDetachTls = (I_CryptDetachTlsFunc)GetProcAddress(lib, - "I_CryptDetachTls"); - pI_CryptGetTls = (I_CryptGetTlsFunc)GetProcAddress(lib, - "I_CryptGetTls"); - pI_CryptSetTls = (I_CryptSetTlsFunc)GetProcAddress(lib, - "I_CryptSetTls"); - pI_CryptFreeTls = (I_CryptFreeTlsFunc)GetProcAddress(lib, - "I_CryptFreeTls"); + pI_CryptAllocTls = (I_CryptAllocTlsFunc)GetProcAddress(hCrypt, + "I_CryptAllocTls"); + pI_CryptDetachTls = (I_CryptDetachTlsFunc)GetProcAddress(hCrypt, + "I_CryptDetachTls"); + pI_CryptGetTls = (I_CryptGetTlsFunc)GetProcAddress(hCrypt, + "I_CryptGetTls"); + pI_CryptSetTls = (I_CryptSetTlsFunc)GetProcAddress(hCrypt, + "I_CryptSetTls"); + pI_CryptFreeTls = (I_CryptFreeTlsFunc)GetProcAddress(hCrypt, + "I_CryptFreeTls"); - /* One normal pass */ - index = pI_CryptAllocTls(); - ok(index, "I_CryptAllocTls failed: %08lx\n", GetLastError()); - if (index) - { - LPVOID ptr; + /* One normal pass */ + index = pI_CryptAllocTls(); + ok(index, "I_CryptAllocTls failed: %08lx\n", GetLastError()); + if (index) + { + LPVOID ptr; - ptr = pI_CryptGetTls(index); - ok(!ptr, "Expected NULL\n"); - ret = pI_CryptSetTls(index, (LPVOID)0xdeadbeef); - ok(ret, "I_CryptSetTls failed: %08lx\n", GetLastError()); - ptr = pI_CryptGetTls(index); - ok(ptr == (LPVOID)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", ptr); - /* This crashes - ret = pI_CryptFreeTls(index, 1); - */ - ret = pI_CryptFreeTls(index, 0); - ok(ret, "I_CryptFreeTls failed: %08lx\n", GetLastError()); - ret = pI_CryptFreeTls(index, 0); - /* Not sure if this fails because TlsFree should fail, so leave as - * todo for now. - */ - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08lx\n", GetLastError()); - } - /* Similar pass, check I_CryptDetachTls */ - index = pI_CryptAllocTls(); - ok(index, "I_CryptAllocTls failed: %08lx\n", GetLastError()); - if (index) - { - LPVOID ptr; + ptr = pI_CryptGetTls(index); + ok(!ptr, "Expected NULL\n"); + ret = pI_CryptSetTls(index, (LPVOID)0xdeadbeef); + ok(ret, "I_CryptSetTls failed: %08lx\n", GetLastError()); + ptr = pI_CryptGetTls(index); + ok(ptr == (LPVOID)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", ptr); + /* This crashes + ret = pI_CryptFreeTls(index, 1); + */ + ret = pI_CryptFreeTls(index, 0); + ok(ret, "I_CryptFreeTls failed: %08lx\n", GetLastError()); + ret = pI_CryptFreeTls(index, 0); + /* Not sure if this fails because TlsFree should fail, so leave as + * todo for now. + */ + todo_wine ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08lx\n", GetLastError()); + } + /* Similar pass, check I_CryptDetachTls */ + index = pI_CryptAllocTls(); + ok(index, "I_CryptAllocTls failed: %08lx\n", GetLastError()); + if (index) + { + LPVOID ptr; - ptr = pI_CryptGetTls(index); - ok(!ptr, "Expected NULL\n"); - ret = pI_CryptSetTls(index, (LPVOID)0xdeadbeef); - ok(ret, "I_CryptSetTls failed: %08lx\n", GetLastError()); - ptr = pI_CryptGetTls(index); - ok(ptr == (LPVOID)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", ptr); - ptr = pI_CryptDetachTls(index); - ok(ptr == (LPVOID)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", ptr); - ptr = pI_CryptGetTls(index); - ok(!ptr, "Expected NULL\n"); - } - FreeLibrary(lib); + ptr = pI_CryptGetTls(index); + ok(!ptr, "Expected NULL\n"); + ret = pI_CryptSetTls(index, (LPVOID)0xdeadbeef); + ok(ret, "I_CryptSetTls failed: %08lx\n", GetLastError()); + ptr = pI_CryptGetTls(index); + ok(ptr == (LPVOID)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", ptr); + ptr = pI_CryptDetachTls(index); + ok(ptr == (LPVOID)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", ptr); + ptr = pI_CryptGetTls(index); + ok(!ptr, "Expected NULL\n"); } } @@ -278,51 +276,49 @@ typedef BOOL (WINAPI *I_CryptReadTrusted static void test_readTrustedPublisherDWORD(void) { - HMODULE lib = LoadLibraryA("crypt32.dll"); + I_CryptReadTrustedPublisherDWORDValueFromRegistryFunc pReadDWORD; - if (lib) + if (!hCrypt) return; + + pReadDWORD = + (I_CryptReadTrustedPublisherDWORDValueFromRegistryFunc)GetProcAddress( + hCrypt, "I_CryptReadTrustedPublisherDWORDValueFromRegistry"); + if (pReadDWORD) { - I_CryptReadTrustedPublisherDWORDValueFromRegistryFunc pReadDWORD = - (I_CryptReadTrustedPublisherDWORDValueFromRegistryFunc)GetProcAddress( - lib, "I_CryptReadTrustedPublisherDWORDValueFromRegistry"); + static const WCHAR safer[] = { + 'S','o','f','t','w','a','r','e','\\', + 'P','o','l','i','c','i','e','s','\\', + 'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m', + 'C','e','r','t','i','f','i','c','a','t','e','s','\\', + 'T','r','u','s','t','e','d','P','u','b','l','i','s','h','e','r', + '\\','S','a','f','e','r',0 }; + static const WCHAR authenticodeFlags[] = { 'A','u','t','h','e','n', + 't','i','c','o','d','e','F','l','a','g','s',0 }; + BOOL ret, exists = FALSE; + DWORD size, readFlags, returnedFlags; + HKEY key; + LONG rc; - if (pReadDWORD) + rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, safer, &key); + if (rc == ERROR_SUCCESS) { - static const WCHAR safer[] = { - 'S','o','f','t','w','a','r','e','\\', - 'P','o','l','i','c','i','e','s','\\', - 'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m', - 'C','e','r','t','i','f','i','c','a','t','e','s','\\', - 'T','r','u','s','t','e','d','P','u','b','l','i','s','h','e','r', - '\\','S','a','f','e','r',0 }; - static const WCHAR authenticodeFlags[] = { 'A','u','t','h','e','n', - 't','i','c','o','d','e','F','l','a','g','s',0 }; - BOOL ret, exists = FALSE; - DWORD size, readFlags, returnedFlags; - HKEY key; - LONG rc; - - rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, safer, &key); + size = sizeof(readFlags); + rc = RegQueryValueExW(key, authenticodeFlags, NULL, NULL, + (LPBYTE)&readFlags, &size); if (rc == ERROR_SUCCESS) - { - size = sizeof(readFlags); - rc = RegQueryValueExW(key, authenticodeFlags, NULL, NULL, - (LPBYTE)&readFlags, &size); - if (rc == ERROR_SUCCESS) - exists = TRUE; - } - ret = pReadDWORD(authenticodeFlags, &returnedFlags); - ok(ret == exists, "Unexpected return value\n"); - if (exists) - ok(readFlags == returnedFlags, - "Expected flags %08lx, got %08lx\n", readFlags, returnedFlags); + exists = TRUE; } - FreeLibrary(lib); + ret = pReadDWORD(authenticodeFlags, &returnedFlags); + ok(ret == exists, "Unexpected return value\n"); + if (exists) + ok(readFlags == returnedFlags, + "Expected flags %08lx, got %08lx\n", readFlags, returnedFlags); } } START_TEST(main) { + hCrypt = LoadLibraryA("crypt32.dll"); test_findAttribute(); test_findExtension(); test_findRDNAttr();

1 0

Robert Reif : lmaccess.h: Add some LOCALGROUP defines.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: e476cf8cbc9da38c9a1f01e83bcae36f840caafb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e476cf8cbc9da38c9a1f01e… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Aug 11 09:43:40 2006 -0400 lmaccess.h: Add some LOCALGROUP defines. --- include/lmaccess.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/include/lmaccess.h b/include/lmaccess.h index c1b1a7b..8e405ce 100644 --- a/include/lmaccess.h +++ b/include/lmaccess.h @@ -403,6 +403,46 @@ typedef struct _NET_DISPLAY_GROUP { DWORD grpi3_next_index; } NET_DISPLAY_GROUP, *PNET_DISPLAY_GROUP; +typedef struct _LOCALGROUP_INFO_0 { + LPWSTR lgrpi0_name; +} LOCALGROUP_INFO_0, *PLOCALGROUP_INFO_0, *LPLOCALGROUP_INFO_0; + +typedef struct _LOCALGROUP_INFO_1 { + LPWSTR lgrpi1_name; + LPWSTR lgrpi1_comment; +} LOCALGROUP_INFO_1, *PLOCALGROUP_INFO_1, *LPLOCALGROUP_INFO_1; + +typedef struct _LOCALGROUP_INFO_1002 { + LPWSTR lgrpi1002_comment; +} LOCALGROUP_INFO_1002, *PLOCALGROUP_INFO_1002, *LPLOCALGROUP_INFO_1002; + +typedef struct _LOCALGROUP_MEMBERS_INFO_0 { + PSID lgrmi0_sid; +} LOCALGROUP_MEMBERS_INFO_0, *PLOCALGROUP_MEMBERS_INFO_0, *LPLOCALGROUP_MEMBERS_INFO_0; + +typedef struct _LOCALGROUP_MEMBERS_INFO_1 { + PSID lgrmi1_sid; + SID_NAME_USE lgrmi1_sidusage; + LPWSTR lgrmi1_name; +} LOCALGROUP_MEMBERS_INFO_1, *PLOCALGROUP_MEMBERS_INFO_1, *LPLOCALGROUP_MEMBERS_INFO_1; + +typedef struct _LOCALGROUP_MEMBERS_INFO_2 { + PSID lgrmi2_sid; + SID_NAME_USE lgrmi2_sidusage; + LPWSTR lgrmi2_domainandname; +} LOCALGROUP_MEMBERS_INFO_2, *PLOCALGROUP_MEMBERS_INFO_2, *LPLOCALGROUP_MEMBERS_INFO_2; + +typedef struct _LOCALGROUP_MEMBERS_INFO_3 { + LPWSTR lgrmi3_domainandname; +} LOCALGROUP_MEMBERS_INFO_3, *PLOCALGROUP_MEMBERS_INFO_3, *LPLOCALGROUP_MEMBERS_INFO_3; + +typedef struct _LOCALGROUP_USERS_INFO_0 { + LPWSTR lgrui0_name; +} LOCALGROUP_USERS_INFO_0, *PLOCALGROUP_USERS_INFO_0, *LPLOCALGROUP_USERS_INFO_0; + +#define LOCALGROUP_NAME_PARMNUM 1 +#define LOCALGROUP_COMMENT_PARMNUM 2 + NET_API_STATUS WINAPI NetGetDCName(LPCWSTR,LPCWSTR,LPBYTE*); NET_API_STATUS WINAPI NetLocalGroupAdd(LPCWSTR,DWORD,LPBYTE,LPDWORD); NET_API_STATUS WINAPI NetLocalGroupAddMember(LPCWSTR,LPCWSTR,PSID);

1 0

Robert Reif : kernel32: Add IsWow64Process.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: 611eb3fa8aa27241853d043007c4d2ee0cf10033 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=611eb3fa8aa27241853d043… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Aug 11 09:42:19 2006 -0400 kernel32: Add IsWow64Process. --- dlls/kernel/kernel32.spec | 2 +- dlls/kernel/process.c | 11 +++++++++++ include/winbase.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 7369b59..f3e4dcb 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -736,7 +736,7 @@ # @ stub IsProcessInJob @ stdcall IsValidLanguageGroup(long long) @ stdcall IsValidLocale(long long) # @ stub IsValidUILanguage -# @ stub IsWow64Process +@ stdcall IsWow64Process(ptr ptr) @ stdcall -i386 -register K32Thk1632Epilog() @ stdcall -i386 -register K32Thk1632Prolog() @ stdcall LCMapStringA(long long str long ptr long) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 7092d2c..9f80411 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -2793,6 +2793,17 @@ DWORD WINAPI RegisterServiceProcess(DWOR } +/********************************************************************** + * IsWow64Process (KERNEL32.@) + */ +BOOL WINAPI IsWow64Process(HANDLE hProcess, PBOOL Wow64Process) +{ + FIXME("(%p %p) stub!\n", hProcess, Wow64Process); + *Wow64Process = FALSE; + return TRUE; +} + + /*********************************************************************** * GetCurrentProcess (KERNEL32.@) * diff --git a/include/winbase.h b/include/winbase.h index 8c3f1a3..f2165d4 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1747,6 +1747,7 @@ BOOL WINAPI IsValidAcl(PACL); BOOL WINAPI IsValidSecurityDescriptor(PSECURITY_DESCRIPTOR); BOOL WINAPI IsValidSid(PSID); BOOL WINAPI IsWellKnownSid(PSID,WELL_KNOWN_SID_TYPE); +BOOL WINAPI IsWow64Process(HANDLE,PBOOL); BOOL WINAPI ImpersonateLoggedOnUser(HANDLE); BOOL WINAPI ImpersonateNamedPipeClient(HANDLE); BOOL WINAPI ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL);

1 0

Andrew Talbot : wldap32: Write-strings warnings fix.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: 96b6d3351913e4290bffe9feaa802afe73fc8248 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=96b6d3351913e4290bffe9f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Aug 11 13:42:06 2006 +0100 wldap32: Write-strings warnings fix. --- dlls/wldap32/ber.c | 3 ++- dlls/wldap32/init.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index c037a16..159c128 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -373,7 +373,8 @@ #ifdef HAVE_LDAP { char *str = va_arg( list, char * ); int len = va_arg( list, int ); - ret = ber_printf( berelement, "B" /* 'X' is deprecated */, str, len ); + new_fmt[0] = 'B'; /* 'X' is deprecated */ + ret = ber_printf( berelement, new_fmt, str, len ); break; } case 'n': diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index b4e78c5..920e169 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -132,7 +132,7 @@ static int has_ldap_scheme( char *url ) * Prepend a given scheme and append a given portnumber to each hostname * if necessary. */ -static char *join_hostnames( char *scheme, char **hostnames, ULONG portnumber ) +static char *join_hostnames( const char *scheme, char **hostnames, ULONG portnumber ) { char *res, *p, *q, **v; unsigned int i = 0, size = 0; @@ -196,7 +196,7 @@ static char *join_hostnames( char *schem return res; } -static char *urlify_hostnames( char *scheme, char *hostnames, ULONG port ) +static char *urlify_hostnames( const char *scheme, char *hostnames, ULONG port ) { char *url = NULL, **strarray;

1 0

Francois Gouget : shdocvw: Set the CLSID_Internet shell folder's attributes .
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: c62f428d1da1d29b8d1c3fa1dcb7b65d009ca2c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c62f428d1da1d29b8d1c3fa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 11 14:18:02 2006 +0200 shdocvw: Set the CLSID_Internet shell folder's attributes. --- dlls/shdocvw/regsvr.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/regsvr.c b/dlls/shdocvw/regsvr.c index 307fc51..ea4fbaa 100644 --- a/dlls/shdocvw/regsvr.c +++ b/dlls/shdocvw/regsvr.c @@ -64,8 +64,17 @@ struct regsvr_coclass LPCSTR progid; /* can be NULL to omit */ LPCSTR viprogid; /* can be NULL to omit */ LPCSTR progid_extra; /* can be NULL to omit */ + DWORD flags; + DWORD dwAttributes; + DWORD dwCallForAttributes; }; +/* flags for regsvr_coclass.flags */ +#define SHELLEX_MAYCHANGEDEFAULTMENU 0x00000001 +#define SHELLFOLDER_WANTSFORPARSING 0x00000002 +#define SHELLFOLDER_ATTRIBUTES 0x00000004 +#define SHELLFOLDER_CALLFORATTRIBUTES 0x00000008 + static HRESULT register_coclasses(struct regsvr_coclass const *list); static HRESULT unregister_coclasses(struct regsvr_coclass const *list); @@ -101,7 +110,17 @@ static WCHAR const viprogid_keyname[25] 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const shellex_keyname[8] = { + 's', 'h', 'e', 'l', 'l', 'e', 'x', 0 }; +static WCHAR const shellfolder_keyname[12] = { + 'S', 'h', 'e', 'l', 'l', 'F', 'o', 'l', 'd', 'e', 'r', 0 }; +static WCHAR const mcdm_keyname[21] = { + 'M', 'a', 'y', 'C', 'h', 'a', 'n', 'g', 'e', 'D', 'e', 'f', + 'a', 'u', 'l', 't', 'M', 'e', 'n', 'u', 0 }; static char const tmodel_valuename[] = "ThreadingModel"; +static char const wfparsing_valuename[] = "WantsFORPARSING"; +static char const attributes_valuename[] = "Attributes"; +static char const cfattributes_valuename[] = "CallForAttributes"; static WCHAR const lcs32_keyname[] = { 'L','o','c','a','l','S','e','r','v','e','r','3','2',0 }; static const WCHAR szIERelPath[] = { @@ -270,6 +289,42 @@ static HRESULT register_coclasses(struct if (res != ERROR_SUCCESS) goto error_close_clsid_key; } + if (list->flags & SHELLEX_MAYCHANGEDEFAULTMENU) { + HKEY shellex_key, mcdm_key; + + res = RegCreateKeyExW(clsid_key, shellex_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &shellex_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + res = RegCreateKeyExW(shellex_key, mcdm_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &mcdm_key, NULL); + RegCloseKey(shellex_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + RegCloseKey(mcdm_key); + } + + if (list->flags & + (SHELLFOLDER_WANTSFORPARSING|SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_CALLFORATTRIBUTES)) + { + HKEY shellfolder_key; + + res = RegCreateKeyExW(clsid_key, shellfolder_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &shellfolder_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + if (list->flags & SHELLFOLDER_WANTSFORPARSING) + res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, (LPBYTE)"", 1); + if (list->flags & SHELLFOLDER_ATTRIBUTES) + res = RegSetValueExA(shellfolder_key, attributes_valuename, 0, REG_DWORD, + (LPBYTE)&list->dwAttributes, sizeof(DWORD)); + if (list->flags & SHELLFOLDER_CALLFORATTRIBUTES) + res = RegSetValueExA(shellfolder_key, cfattributes_valuename, 0, REG_DWORD, + (LPBYTE)&list->dwCallForAttributes, sizeof(DWORD)); + RegCloseKey(shellfolder_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + if (list->progid) { res = register_key_defvalueA(clsid_key, progid_keyname, list->progid); @@ -618,7 +673,10 @@ static struct regsvr_coclass const cocla "shdocvw.dll", "Apartment", NULL, - NULL + NULL, + NULL, + SHELLFOLDER_ATTRIBUTES, + SFGAO_CANDELETE|SFGAO_CANLINK }, { NULL } /* list terminator */ };

1 0

Mike McCormack : include: Rename indexsvr.idl to indexsrv.idl.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: d7371fc49dfeb2b0dc146e43b3e6b063f5798c75 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d7371fc49dfeb2b0dc146e4… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Aug 11 20:21:46 2006 +0900 include: Rename indexsvr.idl to indexsrv.idl. --- dlls/infosoft/infosoft_main.c | 2 - dlls/infosoft/wordbreaker.c | 2 - dlls/uuid/uuid.c | 2 - include/.gitignore | 2 - include/Makefile.in | 2 - include/indexsrv.idl | 126 +++++++++++++++++++++++++++++++++++++++++ include/indexsvr.idl | 126 ----------------------------------------- 7 files changed, 131 insertions(+), 131 deletions(-) create mode 100644 include/indexsrv.idl delete mode 100644 include/indexsvr.idl diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index c13334c..6dfc8e3 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -30,7 +30,7 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" #include "ole2.h" -#include "indexsvr.h" +#include "indexsrv.h" #include "initguid.h" #include "wine/debug.h" diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index 89d0b36..d2fa5b6 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -29,7 +29,7 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" #include "ole2.h" -#include "indexsvr.h" +#include "indexsrv.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index a933923..c1d7cee 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -65,7 +65,7 @@ #include "downloadmgr.h" #include "objsel.h" #include "hlink.h" #include "optary.h" -#include "indexsvr.h" +#include "indexsrv.h" #include "htiframe.h" /* FIXME: cguids declares GUIDs but does not define their values */ diff --git a/include/.gitignore b/include/.gitignore index a267815..4276dd8 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -13,7 +13,7 @@ /hlink.h /htiframe.h /iads.h -/indexsvr.h +/indexsrv.h /mediaobj.h /mimeinfo.h /mlang.h diff --git a/include/Makefile.in b/include/Makefile.in index c550a19..88e93ed 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -19,7 +19,7 @@ WINDOWS_IDL_SRCS = \ hlink.idl \ htiframe.idl \ iads.idl \ - indexsvr.idl \ + indexsrv.idl \ mediaobj.idl \ mimeinfo.idl \ mlang.idl \ diff --git a/include/indexsrv.idl b/include/indexsrv.idl new file mode 100644 index 0000000..e7b9919 --- /dev/null +++ b/include/indexsrv.idl @@ -0,0 +1,126 @@ +/* + * Copyright 2006 Mike McCormack + * + * 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 + */ + +import "unknwn.idl"; + +/* + * widl doesn't like the declaration of PFNFILLTEXTBUFFER, so work around it... + * Not sure that function pointers are even legal in idl. + */ +cpp_quote("struct tagTEXT_SOURCE;") +cpp_quote("typedef HRESULT (WINAPI *PFNFILLTEXTBUFFER)(struct tagTEXT_SOURCE *pTextSource);") +cpp_quote("#if 0") +typedef void* PFNFILLTEXTBUFFER; +cpp_quote("#endif") + +typedef struct tagTEXT_SOURCE +{ + PFNFILLTEXTBUFFER pfnFillTextBuffer; + const WCHAR *awcBuffer; + ULONG iEnd; + ULONG iCur; +} TEXT_SOURCE; + +typedef enum tagWORDREP_BREAK_TYPE +{ + WORDREP_BREAK_EOW = 0, + WORDREP_BREAK_EOS = 1, + WORDREP_BREAK_EOP = 2, + WORDREP_BREAK_EOC = 3 +} WORDREP_BREAK_TYPE; + + +/***************************************************************************** + * IWordSink interface + */ +[ + unique, + uuid(cc907054-c058-101a-b554-08002b33b0e6), + object, + local +] +interface IWordSink : IUnknown +{ + HRESULT PutWord( + [in] ULONG cwc, + [size_is(cwcSrcLen)][in] const WCHAR *pwcInBuf, + [in] ULONG cwcSrcLen, + [in] ULONG cwcSrcPos); + HRESULT PutAltWord( + [in] ULONG cwc, + [size_is(cwcSrcLen)][in] const WCHAR *pwcInBuf, + [in] ULONG cwcSrcLen, + [in] ULONG cwcSrcPos); + HRESULT StartAltPhrase(void); + HRESULT EndAltPhrase(void); + HRESULT PutBreak( + [in] WORDREP_BREAK_TYPE breakType); +} + +/***************************************************************************** + * IPhraseSink interface + */ +[ + unique, + uuid(cc906ff0-c058-101a-b554-08002b33b0e6), + object, + local +] +interface IPhraseSink: IUnknown +{ + HRESULT PutSmallPhrase( + [size_is(cwcNoun)][in] const WCHAR *pwcNoun, + [in] ULONG cwcNoun, + [size_is(cwcModifier)][in] const WCHAR *pwcModifier, + [in] ULONG cwcModifier, + [in] ULONG ulAttachmentType); + HRESULT PutPhrase( + [size_is(cwcPhrase)][in] const WCHAR *pwcPhrase, + [in] ULONG cwcPhrase); +} + +/***************************************************************************** + * IWordBreaker interface + */ +[ + unique, + uuid(d53552c8-77e3-101a-b552-08002b33b0e6), + object, + local +] +interface IWordBreaker: IUnknown +{ + HRESULT Init( + [in] BOOL fQuery, + [in] ULONG ulMaxTokenSize, + [out] BOOL *pfLicense); + HRESULT BreakText( + [in] TEXT_SOURCE *pTextSource, + [in] IWordSink *pWordSink, + [in] IPhraseSink *pPhraseSink); + HRESULT ComposePhrase( + [size_is(cwcNoun)][in] const WCHAR *pwcNoun, + [in] ULONG cwcNoun, + [size_is(cwcModifier)][in] const WCHAR *pwcModifier, + [in] ULONG cwcModifier, + [in] ULONG ulAttachmentType, + [size_is(*pcwcPhrase)][out] WCHAR *pwcPhrase, + [out][in] ULONG *pcwcPhrase); + HRESULT GetLicenseToUse( + [string][out] const WCHAR **ppwcsLicense); +} diff --git a/include/indexsvr.idl b/include/indexsvr.idl deleted file mode 100644 index c62caf7..0000000 --- a/include/indexsvr.idl +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright 2006 Mike McCormack - * - * 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 - */ - -import "unknwn.idl"; - -/* - * widl doesn't like the declaration of PFNFILLTEXTBUFFER, so work around it... - * Not sure that function pointers are even legal in idl. - */ -cpp_quote("struct tagTEXT_SOURCE;") -cpp_quote("typedef HRESULT (WINAPI *PFNFILLTEXTBUFFER)(struct tagTEXT_SOURCE *pTextSource);") -cpp_quote("#if 0") -typedef void* PFNFILLTEXTBUFFER; -cpp_quote("#endif") - -typedef struct tagTEXT_SOURCE -{ - PFNFILLTEXTBUFFER pfnFillTextBuffer; - const WCHAR *awcBuffer; - ULONG iEnd; - ULONG iCur; -} TEXT_SOURCE; - -typedef enum tagWORDREP_BREAK_TYPE -{ - WORDREP_BREAK_EOW = 0, - WORDREP_BREAK_EOS = 1, - WORDREP_BREAK_EOP = 2, - WORDREP_BREAK_EOC = 3 -} WORDREP_BREAK_TYPE; - - -/***************************************************************************** - * IWordSink interface - */ -[ - unique, - uuid(cc907054-c058-101a-b554-08002b33b0e6), - object, - local -] -interface IWordSink : IUnknown -{ - HRESULT PutWord( - [in] ULONG cwc, - [size_is(cwcSrcLen)][in] const WCHAR *pwcInBuf, - [in] ULONG cwcSrcLen, - [in] ULONG cwcSrcPos); - HRESULT PutAltWord( - [in] ULONG cwc, - [size_is(cwcSrcLen)][in] const WCHAR *pwcInBuf, - [in] ULONG cwcSrcLen, - [in] ULONG cwcSrcPos); - HRESULT StartAltPhrase(void); - HRESULT EndAltPhrase(void); - HRESULT PutBreak( - [in] WORDREP_BREAK_TYPE breakType); -} - -/***************************************************************************** - * IPhraseSink interface - */ -[ - unique, - uuid(cc906ff0-c058-101a-b554-08002b33b0e6), - object, - local -] -interface IPhraseSink: IUnknown -{ - HRESULT PutSmallPhrase( - [size_is(cwcNoun)][in] const WCHAR *pwcNoun, - [in] ULONG cwcNoun, - [size_is(cwcModifier)][in] const WCHAR *pwcModifier, - [in] ULONG cwcModifier, - [in] ULONG ulAttachmentType); - HRESULT PutPhrase( - [size_is(cwcPhrase)][in] const WCHAR *pwcPhrase, - [in] ULONG cwcPhrase); -} - -/***************************************************************************** - * IWordBreaker interface - */ -[ - unique, - uuid(d53552c8-77e3-101a-b552-08002b33b0e6), - object, - local -] -interface IWordBreaker: IUnknown -{ - HRESULT Init( - [in] BOOL fQuery, - [in] ULONG ulMaxTokenSize, - [out] BOOL *pfLicense); - HRESULT BreakText( - [in] TEXT_SOURCE *pTextSource, - [in] IWordSink *pWordSink, - [in] IPhraseSink *pPhraseSink); - HRESULT ComposePhrase( - [size_is(cwcNoun)][in] const WCHAR *pwcNoun, - [in] ULONG cwcNoun, - [size_is(cwcModifier)][in] const WCHAR *pwcModifier, - [in] ULONG cwcModifier, - [in] ULONG ulAttachmentType, - [size_is(*pcwcPhrase)][out] WCHAR *pwcPhrase, - [out][in] ULONG *pcwcPhrase); - HRESULT GetLicenseToUse( - [string][out] const WCHAR **ppwcsLicense); -}

1 0

Aric Stewart : user: Implement MNS_NOTIFYBYPOS.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: 26985e6bec8016a44dcbf8dfb9ac621013edb602 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=26985e6bec8016a44dcbf8d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 10 10:25:49 2006 -0500 user: Implement MNS_NOTIFYBYPOS. --- dlls/user/menu.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index eb8632a..a28eff7 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -37,7 +37,6 @@ * - MNS_AUTODISMISS * - MNS_DRAGDROP * - MNS_MODELESS - * - MNS_NOTIFYBYPOS */ #include "config.h" @@ -2450,7 +2449,13 @@ static INT MENU_ExecFocusedItem( MTRACKE PostMessageW( pmt->hOwnerWnd, WM_SYSCOMMAND, item->wID, MAKELPARAM((INT16)pmt->pt.x, (INT16)pmt->pt.y) ); else - PostMessageW( pmt->hOwnerWnd, WM_COMMAND, item->wID, 0 ); + { + if (menu->dwStyle & MNS_NOTIFYBYPOS) + PostMessageW( pmt->hOwnerWnd, WM_MENUCOMMAND, menu->FocusedItem, + (LPARAM)hMenu); + else + PostMessageW( pmt->hOwnerWnd, WM_COMMAND, item->wID, 0 ); + } } return item->wID; } @@ -4901,7 +4906,7 @@ BOOL WINAPI SetMenuInfo (HMENU hMenu, LP if (menu->dwStyle & MNS_AUTODISMISS) FIXME("MNS_AUTODISMISS unimplemented\n"); if (menu->dwStyle & MNS_DRAGDROP) FIXME("MNS_DRAGDROP unimplemented\n"); if (menu->dwStyle & MNS_MODELESS) FIXME("MNS_MODELESS unimplemented\n"); - if (menu->dwStyle & MNS_NOTIFYBYPOS) FIXME("MNS_NOTIFYBYPOS unimplemented\n"); + if (menu->dwStyle & MNS_NOTIFYBYPOS) FIXME("MNS_NOTIFYBYPOS partially implemented\n"); } return TRUE;

1 0

Mike McCormack : infosoft: Use the pfnFillTextBuffer function to refresh the buffer.
by Alexandre Julliard Aug. 11, 2006

Aug. 11, 2006

Module: wine Branch: master Commit: c4c35d33b52dcf68c39a5f1caf9aeb77a073845c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4c35d33b52dcf68c39a5f1… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Aug 11 20:08:25 2006 +0900 infosoft: Use the pfnFillTextBuffer function to refresh the buffer. --- dlls/infosoft/wordbreaker.c | 76 +++++++++++++++++++++++++++++++------------ 1 files changed, 54 insertions(+), 22 deletions(-) diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index 7b3ac95..89d0b36 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -87,35 +87,67 @@ static HRESULT WINAPI wb_Init( IWordBrea return S_OK; } -static HRESULT WINAPI wb_BreakText( IWordBreaker *iface, - TEXT_SOURCE *pTextSource, IWordSink *pWordSink, IPhraseSink *pPhraseSink) +static HRESULT call_sink( IWordSink *pWordSink, TEXT_SOURCE *ts, UINT len ) { - LPCWSTR p, q; - DWORD len; + HRESULT r; - FIXME("%p %p %p\n", pTextSource, pWordSink, pPhraseSink); + if (!len) + return S_OK; - p = pTextSource->awcBuffer; + TRACE("%d %s\n", len, debugstr_w(&ts->awcBuffer[ts->iCur])); - while (*p) - { - /* skip spaces and punctuation */ - while(ispunctW(*p) || isspaceW(*p)) - p++; + r = IWordSink_PutWord( pWordSink, len, &ts->awcBuffer[ts->iCur], len, ts->iCur ); + ts->iCur += len; + + return r; +} - /* find the end of the word */ - q = p; - while(*q && !ispunctW(*q) && !isspaceW(*q)) - q++; +static HRESULT WINAPI wb_BreakText( IWordBreaker *iface, + TEXT_SOURCE *ts, IWordSink *pWordSink, IPhraseSink *pPhraseSink) +{ + UINT len, state = 0; + WCHAR ch; - len = q - p; - if (!len) - break; + TRACE("%p %p %p\n", ts, pWordSink, pPhraseSink); - IWordSink_PutWord( pWordSink, len, p, len, p - pTextSource->awcBuffer ); + if (pPhraseSink) + FIXME("IPhraseSink won't be called\n"); + + do + { + len = 0; + while ((ts->iCur + len) < ts->iEnd) + { + ch = ts->awcBuffer[ts->iCur + len]; + + switch (state) + { + case 0: /* skip spaces and punctuation */ + + if (!ch || ispunctW(ch) || isspaceW(ch)) + ts->iCur ++; + else + state = 1; + break; + + case 1: /* find the end of the word */ + + if (ch && !ispunctW(ch) && !isspaceW(ch)) + len++; + else + { + call_sink( pWordSink, ts, len ); + len = 0; + state = 0; + } + break; + + } + } + call_sink( pWordSink, ts, len ); + + } while (S_OK == ts->pfnFillTextBuffer( ts )); - p = q; - } return S_OK; } @@ -152,7 +184,7 @@ HRESULT WINAPI wb_Constructor(IUnknown* wordbreaker_impl *This; IWordBreaker *wb; - FIXME("%p %s %p\n", pUnkOuter, debugstr_guid(riid), ppvObject); + TRACE("%p %s %p\n", pUnkOuter, debugstr_guid(riid), ppvObject); This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); if (!This)

1 0