November 2007 - Wine-Commits

Juan Lang : setupapi: Correct a return value.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 13ff6e7a1bc7518e75ec15ce4d928bf26841ec27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ff6e7a1bc7518e75ec15ce4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 5 09:57:04 2007 -0800 setupapi: Correct a return value. --- dlls/setupapi/query.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 68193d7..b4fc60a 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -664,7 +664,8 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW( if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo)) { ERR("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize); - return ERROR_INVALID_USER_BUFFER; + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; } inf_path = (LPWSTR)&InfInformation->VersionData[0];

1 0

Juan Lang : setupapi: Don't convert strings past NULL-terminator.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 2593ee873d6c4dd0d694f376e71e123d9c94e8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2593ee873d6c4dd0d694f376e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 5 10:12:25 2007 -0800 setupapi: Don't convert strings past NULL-terminator. --- dlls/setupapi/query.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 179797f..c5dce78 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -635,9 +635,9 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationA( AlternativePlatformInfo, &OriginalFileInfoW); if (ret) { - WideCharToMultiByte(CP_ACP, 0, OriginalFileInfoW.OriginalInfName, MAX_PATH, + WideCharToMultiByte(CP_ACP, 0, OriginalFileInfoW.OriginalInfName, -1, OriginalFileInfo->OriginalInfName, MAX_PATH, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, OriginalFileInfoW.OriginalCatalogName, MAX_PATH, + WideCharToMultiByte(CP_ACP, 0, OriginalFileInfoW.OriginalCatalogName, -1, OriginalFileInfo->OriginalCatalogName, MAX_PATH, NULL, NULL); }

1 0

Juan Lang : setupapi: Downgrade an ERR to a WARN.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 1d2e0672b7e4159c113ad0442057d44e9232333d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d2e0672b7e4159c113ad0442… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 5 09:58:00 2007 -0800 setupapi: Downgrade an ERR to a WARN. --- dlls/setupapi/query.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index b4fc60a..179797f 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -625,7 +625,7 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationA( if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo)) { - ERR("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize); + WARN("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize); SetLastError( ERROR_INVALID_USER_BUFFER ); return FALSE; } @@ -663,7 +663,7 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW( if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo)) { - ERR("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize); + WARN("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize); SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; }

1 0

Juan Lang : setupapi: Fix a leak.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 0a5e09d794acacbdaf7dcf12f772963c40ca3ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5e09d794acacbdaf7dcf12f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 5 09:52:16 2007 -0800 setupapi: Fix a leak. --- dlls/setupapi/devinst.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9f27333..4819495 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -164,6 +164,7 @@ static void SETUPDI_FreeInterfaceInstances(struct InterfaceInstances *instances) } HeapFree(GetProcessHeap(), 0, ifaceInfo->referenceString); HeapFree(GetProcessHeap(), 0, ifaceInfo->symbolicLink); + HeapFree(GetProcessHeap(), 0, ifaceInfo); } HeapFree(GetProcessHeap(), 0, instances->instances); }

1 0

Kovács András : dwmapi: Add DwmEnableComposition stub.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 21f5afa6ade069cd9ae1443a26002cb341f4ccb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21f5afa6ade069cd9ae1443a2… Author: Kovács András <andras(a)csevego.net> Date: Tue Nov 6 01:00:58 2007 +0100 dwmapi: Add DwmEnableComposition stub. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index ebe7494..d6d675a 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -1,6 +1,6 @@ 100 stub @ 101 stub @ -102 stub DwmEnableComposition +102 stdcall DwmEnableComposition (long) 103 stub @ 104 stub @ 105 stub @ diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 009f194..dd8714b 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -59,3 +59,13 @@ HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) *enabled = FALSE; return S_OK; } + +/********************************************************************** + * DwmEnableComposition (DWMAPI.102) + */ +HRESULT WINAPI DwmEnableComposition(UINT uCompositionAction) +{ + FIXME("(%d) stub\n", uCompositionAction); + + return S_OK; +}

1 0

Andrew Talbot : shell32: Constify some variables.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: efdc116856426808f126e813152846c60bd703ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=efdc116856426808f126e8131… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 5 22:03:14 2007 +0000 shell32: Constify some variables. --- dlls/shell32/trash.c | 4 ++-- dlls/shell32/xdg.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 8a6de4c..14d6f90 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -138,7 +138,7 @@ static BOOL TRASH_EnsureInitialized(void) return TRUE; } -static BOOL file_good_for_bucket(TRASH_BUCKET *pBucket, struct stat *file_stat) +static BOOL file_good_for_bucket(const TRASH_BUCKET *pBucket, const struct stat *file_stat) { if (pBucket->device != file_stat->st_dev) return FALSE; @@ -486,7 +486,7 @@ static INT CALLBACK free_item_callback(void *item, void *lParam) return TRUE; } -static HDPA enum_bucket_trashinfos(TRASH_BUCKET *bucket, int *count) +static HDPA enum_bucket_trashinfos(const TRASH_BUCKET *bucket, int *count) { HDPA ret = DPA_Create(32); struct dirent *entry; diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 108d92a..3b1a1bc 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -508,7 +508,7 @@ struct tagXDG_PARSED_FILE PARSED_GROUP *groups; }; -static BOOL parsed_str_eq(PARSED_STRING *str1, const char *str2) +static BOOL parsed_str_eq(const PARSED_STRING *str1, const char *str2) { if (strncmp(str1->str, str2, str1->len) != 0) return FALSE;

1 0

Detlef Riekenberg : winspool: Error check in add_printer_driver() was to strict.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: d6d0239f733639873bd136e7283f3bab3368fcb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d0239f733639873bd136e72… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Nov 5 22:48:07 2007 +0100 winspool: Error check in add_printer_driver() was to strict. Reported by Dan Sawyer. --- dlls/winspool.drv/info.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e560f6a..c4381d4 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -486,18 +486,21 @@ static BOOL add_printer_driver(const char *name) di3a.pConfigFile = driver_nt; di3a.pDefaultDataType = default_data_type; - if (AddPrinterDriverA(NULL, 3, (LPBYTE)&di3a)) + if (AddPrinterDriverA(NULL, 3, (LPBYTE)&di3a) || + (GetLastError() == ERROR_PRINTER_DRIVER_ALREADY_INSTALLED )) { di3a.cVersion = 0; di3a.pEnvironment = env_9x; di3a.pDriverPath = driver_9x; di3a.pConfigFile = driver_9x; - if (AddPrinterDriverA(NULL, 3, (LPBYTE)&di3a)) + if (AddPrinterDriverA(NULL, 3, (LPBYTE)&di3a) || + (GetLastError() == ERROR_PRINTER_DRIVER_ALREADY_INSTALLED )) { return TRUE; } } - ERR("Failed adding driver %s: %u\n", debugstr_a(di3a.pDriverPath), GetLastError()); + ERR("Failed adding driver %s (%s): %u\n", debugstr_a(di3a.pDriverPath), + debugstr_a(di3a.pEnvironment), GetLastError()); return FALSE; }

1 0

Dan Hipschman : widl: Don' t rely on type_memsize to return 0 for all conformant arrays.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: a0ac63961d4b43e67a5aa2b58092f717d2c90ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ac63961d4b43e67a5aa2b58… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Nov 5 17:23:26 2007 -0800 widl: Don't rely on type_memsize to return 0 for all conformant arrays. --- dlls/rpcrt4/tests/server.c | 12 ++++++++++++ dlls/rpcrt4/tests/server.idl | 1 + tools/widl/typegen.c | 4 +--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index b01967d..ad0dd73 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -487,6 +487,16 @@ s_sum_pcarr2(int n, int **pa) return s_sum_conf_array(*pa, n); } +int +s_sum_L1_norms(int n, vector_t *vs) +{ + int i; + int sum = 0; + for (i = 0; i < n; ++i) + sum += abs(vs[i].x) + abs(vs[i].y) + abs(vs[i].z); + return sum; +} + void s_stop(void) { @@ -983,6 +993,8 @@ array_tests(void) make_pyramid_doub_carr(4, &dc); ok(check_pyramid_doub_carr(dc), "RPC make_pyramid_doub_carr\n"); free_pyramid_doub_carr(dc); + + ok(sum_L1_norms(2, vs) == 21, "RPC sum_L1_norms\n"); } static void diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index c566b8f..c054196 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -298,6 +298,7 @@ cpp_quote("#endif") void get_name([in,out] name_t *name); int sum_pcarr2(int n, [size_is(, n)] int **pa); + int sum_L1_norms(int n, [size_is(n)] vector_t *vs); void stop(void); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2cb8dc9..bb75a0a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1535,9 +1535,7 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type has_pointer = TRUE; align = 0; - size = type_memsize(type, &align); - if (size == 0) /* conformant array */ - size = type_memsize(type->ref, &align); + size = type_memsize((is_conformant_array(type) ? type->ref : type), &align); start_offset = *typestring_offset; update_tfsoff(type, start_offset, file);

1 0

Jacek Caban : mshtml: Added AcceptLanguage handling.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: a3717bff1855f5c6a1c5ecbfae137dfb9deaf968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3717bff1855f5c6a1c5ecbfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 4 17:04:41 2007 +0100 mshtml: Added AcceptLanguage handling. --- dlls/mshtml/nsembed.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/nsiface.idl | 27 +++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 8cead97..9b8740d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -45,6 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NS_EDITORCONTROLLER_CONTRACTID "@mozilla.org/editor/editorcontroller;1" #define NS_ARRAY_CONTRACTID "@mozilla.org/array;1" #define NS_VARIANT_CONTRACTID "@mozilla.org/variant;1" +#define NS_PREFERENCES_CONTRACTID "@mozilla.org/preferences;1" #define APPSTARTUP_TOPIC "app-startup" @@ -253,8 +254,39 @@ static BOOL load_wine_gecko(PRUnichar *gre_path) return ret; } +static void set_lang(nsIPrefBranch *pref) +{ + char langs[100]; + DWORD res, size, type; + HKEY hkey; + nsresult nsres; + + static const WCHAR international_keyW[] = + {'S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r', + '\\','I','n','t','e','r','n','a','t','i','o','n','a','l',0}; + + res = RegOpenKeyW(HKEY_CURRENT_USER, international_keyW, &hkey); + if(res != ERROR_SUCCESS) + return; + + size = sizeof(langs); + res = RegQueryValueExA(hkey, "AcceptLanguage", 0, &type, (LPBYTE)langs, &size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS || type != REG_SZ) + return; + + TRACE("Setting lang %s\n", debugstr_a(langs)); + + nsres = nsIPrefBranch_SetCharPref(pref, "intl.accept_languages", langs); + if(NS_FAILED(nsres)) + ERR("SetCharPref failed: %08x\n", nsres); +} + static void set_profile(void) { + nsIPrefBranch *pref; nsIProfile *profile; PRBool exists = FALSE; nsresult nsres; @@ -280,6 +312,17 @@ static void set_profile(void) ERR("SetCurrentProfile failed: %08x\n", nsres); nsIProfile_Release(profile); + + nsres = nsIServiceManager_GetServiceByContractID(pServMgr, NS_PREFERENCES_CONTRACTID, + &IID_nsIPrefBranch, (void**)&pref); + if(NS_FAILED(nsres)) { + ERR("Could not get preference service: %08x\n", nsres); + return; + } + + set_lang(pref); + + nsIPrefBranch_Release(pref); } static BOOL init_xpcom(const PRUnichar *gre_path) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 8b00fbd..aac9a87 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1506,6 +1506,33 @@ interface nsIFile : nsISupports [ object, + uuid(56c35506-f14b-11d3-99d3-ddbfac2ccf65) + /* FROZEN */ +] +interface nsIPrefBranch : nsISupports +{ + nsresult GetRoot(char **aRoot); + nsresult GetPrefType(const char *aPrefName, PRInt32 *_retval); + nsresult GetBoolPref(const char *aPrefName, PRBool *_retval); + nsresult SetBoolPref(const char *aPrefName, PRInt32 aValue); + nsresult GetCharPref(const char *aPrefName, char **_retval); + nsresult SetCharPref(const char *aPrefName, const char *aValue); + nsresult GetIntPref(const char *aPrefName, PRInt32 *_retval); + nsresult SetIntPref(const char *aPrefName, PRInt32 aValue); + nsresult GetComplexValue(const char *aPrefName, const nsIID *aType, void **aValue); + nsresult SetComplexValue(const char *aPrefName, const nsIID *aType, nsISupports *aValue); + nsresult ClearUserPref(const char *aPrefName); + nsresult LockPref(const char *aPrefName); + nsresult PrefHasUserValue(const char *aPrefName, PRBool *_retval); + nsresult PrefIsLocked(const char *aPrefName, PRBool *_retval); + nsresult UnlockPref(const char *aPrefName); + nsresult DeleteBranch(const char *aStartingAt); + nsresult GetChildList(const char *aStartingAt, PRUint32 *aCount, char ***aChildArray); + nsresult ResetBranch(const char *aStartingAt); +} + +[ + object, uuid(15fd6940-8ea7-11d3-93ad-00104ba0fd40) /* FROZEN */ ]

1 0

Jacek Caban : mshtml: Call Exec(CGID_ShellDocView, 84) in start_binding.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 57b876dd0de27477b5815d7426916dc9851954bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b876dd0de27477b5815d742… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 19:54:22 2007 +0100 mshtml: Call Exec(CGID_ShellDocView, 84) in start_binding. --- dlls/mshtml/navigate.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 85fb2e5..5e05a64 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -689,6 +689,27 @@ BSCallback *create_bscallback(IMoniker *mon) return ret; } +/* Calls undocumented 84 cmd of CGID_ShellDocView */ +static void call_docview_84(HTMLDocument *doc) +{ + IOleCommandTarget *olecmd; + VARIANT var; + HRESULT hres; + + if(!doc->client) + return; + + hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(FAILED(hres)) + return; + + VariantInit(&var); + hres = IOleCommandTarget_Exec(olecmd, &CGID_ShellDocView, 84, 0, NULL, &var); + IOleCommandTarget_Release(olecmd); + if(SUCCEEDED(hres) && V_VT(&var) != VT_NULL) + FIXME("handle result\n"); +} + static void parse_post_data(nsIInputStream *post_data_stream, LPWSTR *headers_ret, HGLOBAL *post_data_ret, ULONG *post_data_len_ret) { @@ -815,6 +836,7 @@ HRESULT start_binding(HTMLDocument *doc, BSCallback *bscallback) HRESULT hres; bscallback->doc = doc; + call_docview_84(bscallback->doc); hres = CreateAsyncBindCtx(0, STATUSCLB(bscallback), NULL, &bctx); if(FAILED(hres)) {

1 0