February 2006 - Wine-Commits

Robert Shearman : wininet: Documentation fixes.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 7a2357a480dc1395e60a0b1a6ff4f168ae588773 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a2357a480dc1395e60a0b1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 14 11:34:14 2006 +0100 wininet: Documentation fixes. --- dlls/wininet/gopher.c | 10 +++++----- dlls/wininet/http.c | 10 +++++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/gopher.c b/dlls/wininet/gopher.c index 4c49527..a599ad8 100644 --- a/dlls/wininet/gopher.c +++ b/dlls/wininet/gopher.c @@ -66,7 +66,7 @@ BOOL WINAPI GopherCreateLocatorA( /*********************************************************************** * GopherCreateLocatorW (WININET.@) * - * Unicode version of GopherCreateLocatorA + * See GopherCreateLocatorA. */ BOOL WINAPI GopherCreateLocatorW( LPCWSTR lpszHost, @@ -118,7 +118,7 @@ HINTERNET WINAPI GopherFindFirstFileA( /*********************************************************************** * GopherFindFirstFileW (WININET.@) * - * Unicode version of GopherFindFirstFileA + * See GopherFindFirstFileA. */ HINTERNET WINAPI GopherFindFirstFileW( HINTERNET hConnect, @@ -162,7 +162,7 @@ BOOL WINAPI GopherGetAttributeA( /*********************************************************************** * GopherGetAttributeW (WININET.@) * - * Unicode version of GopherGetAttributeA + * See GopherGetAttributeA. */ BOOL WINAPI GopherGetAttributeW( HINTERNET hConnect, @@ -202,7 +202,7 @@ BOOL WINAPI GopherGetLocatorTypeA(LPCSTR /*********************************************************************** * GopherGetLocatorTypeW (WININET.@) * - * Unicode version of GopherGetLocatorTypeA + * See GopherGetLocatorTypeA. */ BOOL WINAPI GopherGetLocatorTypeW(LPCWSTR lpszLocator, LPDWORD lpdwGopherType) { @@ -241,7 +241,7 @@ HINTERNET WINAPI GopherOpenFileA( /*********************************************************************** * GopherOpenFileW (WININET.@) * - * Unicode version of GopherOpenFileA + * See GopherOpenFileA. */ HINTERNET WINAPI GopherOpenFileW( HINTERNET hConnect, diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1312380..9e74001 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1699,7 +1699,11 @@ BOOL WINAPI HttpQueryInfoA(HINTERNET hHt * HttpSendRequestExA (WININET.@) * * Sends the specified request to the HTTP server and allows chunked - * transfers + * transfers. + * + * RETURNS + * Success: TRUE + * Failure: FALSE, call GetLastError() for more information. */ BOOL WINAPI HttpSendRequestExA(HINTERNET hRequest, LPINTERNET_BUFFERSA lpBuffersIn, @@ -1753,6 +1757,10 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET * * Sends the specified request to the HTTP server and allows chunked * transfers + * + * RETURNS + * Success: TRUE + * Failure: FALSE, call GetLastError() for more information. */ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, LPINTERNET_BUFFERSW lpBuffersIn,

1 0

Robert Shearman : oleaut32: Free connection point on destruction of the picture object.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: d16c0dc6ce9588f1fabde529390092cb5a2e04df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d16c0dc6ce9588f1fabde52… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 14 11:34:00 2006 +0100 oleaut32: Free connection point on destruction of the picture object. Handle failure of CreateConnectionPoint on construction. --- dlls/oleaut32/olepicture.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 07b0bb1..b11bc40 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -279,7 +279,13 @@ static OLEPictureImpl* OLEPictureImpl_Co newObject->lpvtblIPersistStream = &OLEPictureImpl_IPersistStream_VTable; newObject->lpvtblIConnectionPointContainer = &OLEPictureImpl_IConnectionPointContainer_VTable; + newObject->pCP = NULL; CreateConnectionPoint((IUnknown*)newObject,&IID_IPropertyNotifySink,&newObject->pCP); + if (!newObject->pCP) + { + HeapFree(GetProcessHeap(), 0, newObject); + return NULL; + } /* * Start with one reference count. The caller of this function @@ -349,6 +355,9 @@ static void OLEPictureImpl_Destroy(OLEPi { TRACE("(%p)\n", Obj); + if (Obj->pCP) + IConnectionPoint_Release(Obj->pCP); + if(Obj->fOwn) { /* We need to destroy the picture */ switch(Obj->desc.picType) { case PICTYPE_BITMAP:

1 0

Robert Shearman : oleaut32: Fix returning Typelib file name.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 1ce38682fb7d4904d4baaf19945881b8730c49d3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1ce38682fb7d4904d4baaf1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 14 11:33:40 2006 +0100 oleaut32: Fix returning Typelib file name. We can't use GetModuleFileName on a resource-only module, so the best we can do is to copy the original name we used to find the type library. Fix a couple of places where we were incorrectly using the file name, rather than the path. --- dlls/oleaut32/typelib.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6999dfd..317b44c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2147,6 +2147,8 @@ static int TLB_ReadTypeLib(LPCWSTR pszFi *ppTypeLib = NULL; + lstrcpynW(pszPath, pszFileName, cchPath); + /* first try loading as a dll and access the typelib as a resource */ hinstDLL = LoadLibraryExW(pszFileName, 0, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE | LOAD_WITH_ALTERED_SEARCH_PATH); @@ -2158,8 +2160,6 @@ static int TLB_ReadTypeLib(LPCWSTR pszFi if(pIndexStr && pIndexStr != pszFileName && *++pIndexStr != '\0') { index = atoiW(pIndexStr); - memcpy(pszPath, pszFileName, - (pIndexStr - pszFileName - 1) * sizeof(WCHAR)); pszPath[pIndexStr - pszFileName - 1] = '\0'; hinstDLL = LoadLibraryExW(pszPath, 0, DONT_RESOLVE_DLL_REFERENCES | @@ -2168,9 +2168,7 @@ static int TLB_ReadTypeLib(LPCWSTR pszFi } /* get the path to the specified typelib file */ - if (hinstDLL) - GetModuleFileNameW(hinstDLL, pszPath, cchPath); - else + if (!hinstDLL) { /* otherwise, try loading as a regular file */ if (!SearchPathW(NULL, pszFileName, NULL, cchPath, pszPath, NULL)) @@ -2225,7 +2223,7 @@ static int TLB_ReadTypeLib(LPCWSTR pszFi } else { - HANDLE hFile = CreateFileW( pszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + HANDLE hFile = CreateFileW(pszPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); if (INVALID_HANDLE_VALUE != hFile) { HANDLE hMapping = CreateFileMappingW( hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL ); @@ -2255,8 +2253,8 @@ static int TLB_ReadTypeLib(LPCWSTR pszFi ITypeLibImpl *impl = (ITypeLibImpl*)*ppTypeLib; TRACE("adding to cache\n"); - impl->path = HeapAlloc(GetProcessHeap(), 0, (strlenW(pszFileName)+1) * sizeof(WCHAR)); - lstrcpyW(impl->path, pszFileName); + impl->path = HeapAlloc(GetProcessHeap(), 0, (strlenW(pszPath)+1) * sizeof(WCHAR)); + lstrcpyW(impl->path, pszPath); /* We should really canonicalise the path here. */ impl->index = index;

1 0

Robert Shearman : oleaut32: Free the connection points on destruction of the font object.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 1891e137da05777f670880a19d82ee2cd87f7e83 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1891e137da05777f670880a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 14 11:33:18 2006 +0100 oleaut32: Free the connection points on destruction of the font object. Free the connection points on destruction of the font object and cope with failure of CreateConnectionPoint on construction. --- dlls/oleaut32/olefont.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 2a121cc..b213f50 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -511,8 +511,18 @@ static OLEFontImpl* OLEFontImpl_Construc newObject->fontLock = 0; newObject->cyLogical = 72L; newObject->cyHimetric = 2540L; + newObject->pPropertyNotifyCP = NULL; + newObject->pFontEventsCP = NULL; + CreateConnectionPoint((IUnknown*)newObject, &IID_IPropertyNotifySink, &newObject->pPropertyNotifyCP); CreateConnectionPoint((IUnknown*)newObject, &IID_IFontEventsDisp, &newObject->pFontEventsCP); + + if (!newObject->pPropertyNotifyCP || !newObject->pFontEventsCP) + { + OLEFontImpl_Destroy(newObject); + return NULL; + } + TRACE("returning %p\n", newObject); return newObject; } @@ -533,6 +543,11 @@ static void OLEFontImpl_Destroy(OLEFontI if (fontDesc->gdiFont!=0) DeleteObject(fontDesc->gdiFont); + if (fontDesc->pPropertyNotifyCP) + IConnectionPoint_Release(fontDesc->pPropertyNotifyCP); + if (fontDesc->pFontEventsCP) + IConnectionPoint_Release(fontDesc->pFontEventsCP); + HeapFree(GetProcessHeap(), 0, fontDesc); }

1 0

Robert Shearman : oleaut32: Don' t try to release NULL COM objects in the typelib
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 9030ff2c13a76b8750a7f97291141b10998467cb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9030ff2c13a76b8750a7f97… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 14 11:33:03 2006 +0100 oleaut32: Don't try to release NULL COM objects in the typelib marshaler. --- dlls/oleaut32/tmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 9e4b612..249524a 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -676,14 +676,14 @@ serialize_param( if (debugout) TRACE_(olerelay)("unk(0x%lx)",*arg); if (writeit) hres = _marshal_interface(buf,&IID_IUnknown,(LPUNKNOWN)*arg); - if (dealloc) + if (dealloc && *(IUnknown **)arg) IUnknown_Release((LPUNKNOWN)*arg); return hres; case VT_DISPATCH: if (debugout) TRACE_(olerelay)("idisp(0x%lx)",*arg); if (writeit) hres = _marshal_interface(buf,&IID_IDispatch,(LPUNKNOWN)*arg); - if (dealloc) + if (dealloc && *(IUnknown **)arg) IUnknown_Release((LPUNKNOWN)*arg); return hres; case VT_VOID:

1 0

Robert Shearman : oleaut32: Fix flag comparison in Picture Invoke.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 792d89f53a6a4dbe6ff097e772538b451b8faa50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=792d89f53a6a4dbe6ff097e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 14 11:32:53 2006 +0100 oleaut32: Fix flag comparison in Picture Invoke. One or more invoke flags can be passed into IDispatch::Invoke, but we only care if INVOKEFLAG_PROPERTYGET is specified, and don't about any others. --- dlls/oleaut32/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index e24fc2a..07b0bb1 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2033,7 +2033,7 @@ static HRESULT WINAPI OLEPictureImpl_Inv if (dispIdMember == DISPID_PICT_TYPE) { TRACE("DISPID_PICT_TYPE\n"); - if (wFlags & ~INVOKE_PROPERTYGET) + if (!(wFlags & INVOKE_PROPERTYGET)) return DISP_E_PARAMNOTFOUND; if (pDispParams->cArgs != 0) return DISP_E_BADPARAMCOUNT;

1 0

Alexandre Julliard : server: Try to update the input key state even when the message is
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 5d282dc89106e2d4190b43a66aa0b8206f91d8ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d282dc89106e2d4190b43a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 14 10:43:15 2006 +0100 server: Try to update the input key state even when the message is dropped in queue_hardware_message. This should fix some problems with the Alt key getting "stuck" after Alt-Tab. --- server/queue.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/queue.c b/server/queue.c index 57b94b8..2b3f89c 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1222,14 +1222,14 @@ static void queue_hardware_message( stru { user_handle_t win; struct thread *thread; - struct thread_input *input; + struct thread_input *input = queue ? queue->input : foreground_input; unsigned int msg_code; last_input_time = get_tick_count(); - - win = find_hardware_message_window( queue ? queue->input : foreground_input, msg, &msg_code ); + win = find_hardware_message_window( input, msg, &msg_code ); if (!win || !(thread = get_window_thread(win))) { + if (input) update_input_key_state( input, msg ); free( msg ); return; }

1 0

Francois Gouget : include: Add missing LANG_xxx and SUBLANG_xxx constants.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 90aaf6ba8fde7470a37a4a069ccb3aa70a12c86a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=90aaf6ba8fde7470a37a4a0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 14 10:42:12 2006 +0100 include: Add missing LANG_xxx and SUBLANG_xxx constants. --- dlls/kernel/locale_rc.rc | 14 +-- dlls/oleaut32/hash.c | 4 - include/winnt.h | 222 +++++++++++++++++++++++++++++++++++++++++----- tools/widl/hash.c | 4 - tools/wine.inf | 20 ++-- 5 files changed, 221 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=90aaf6ba8fde7470a37…

1 0

Michael Jung : winecfg: Cleaned up various control positions on the German version of
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 78298049eb3d1a9f330b9ffa2b6077d901c3881e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78298049eb3d1a9f330b9ff… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Tue Feb 14 10:41:44 2006 +0100 winecfg: Cleaned up various control positions on the German version of the audio tab. --- programs/winecfg/De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 74c725c..75eacf6 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -160,8 +160,8 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Treiber Auswahl ",IDC_STATIC,8,4,244,195 - LTEXT "W�hlen Sie einen Sound Treiber durch das Ausw�hlen eines verf�gbaren Treibers. Der Sound wird deaktiviert, wenn kein Treiber ausgew�hlt wird. Die Auswahl mehrer Treiber ist nicht empfohlen. Der Treiber kann durch einen Rechtsklick konfiguriert werden.",IDC_STATIC,15,20,227,30 - CONTROL "Ger�te",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,50,140,140 + LTEXT "W�hlen Sie einen Sound Treiber durch das Ausw�hlen eines verf�gbaren Treibers. Der Sound wird deaktiviert, wenn kein Treiber ausgew�hlt wird. Die Auswahl mehrer Treiber ist nicht empfohlen. Der Treiber kann durch einen Rechtsklick konfiguriert werden.",IDC_STATIC,15,15,227,35 + CONTROL "Ger�te",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 PUSHBUTTON "Kontrollschirm",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Hardware Beschleunigung: ", IDC_STATIC,15,215,90,10

1 0

Michael Jung : shell32: Register 'LocalizedString' values for shellfolder classes.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: bbca134a3c0ff3cd62a2065bea0c2bb785eac0c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bbca134a3c0ff3cd62a2065… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Tue Feb 14 10:41:33 2006 +0100 shell32: Register 'LocalizedString' values for shellfolder classes. --- dlls/shell32/regsvr.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index f150bb8..ac8144c 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -32,6 +32,7 @@ #include "shlguid.h" #include "shell32_main.h" #include "shfldr.h" +#include "shresdef.h" #include "wine/debug.h" @@ -62,6 +63,7 @@ struct regsvr_coclass { CLSID const *clsid; /* NULL for end of list */ LPCSTR name; /* can be NULL to omit */ + UINT idName; /* can be 0 to omit */ LPCSTR ips; /* can be NULL to omit */ LPCSTR ips32; /* can be NULL to omit */ LPCSTR ips32_tmodel; /* can be NULL to omit */ @@ -128,6 +130,7 @@ static char const tmodel_valuename[] = " static char const wfparsing_valuename[] = "WantsFORPARSING"; static char const attributes_valuename[] = "Attributes"; static char const cfattributes_valuename[] = "CallForAttributes"; +static char const localized_valuename[] = "LocalizedString"; /*********************************************************************** * static helper functions @@ -264,6 +267,14 @@ static HRESULT register_coclasses(struct if (res != ERROR_SUCCESS) goto error_close_clsid_key; } + if (list->idName) { + char buffer[64] = "@%SYSTEMROOT%\\system32\\shell32.dll,-"; + sprintf(buffer+strlen(buffer), "%u", list->idName); + res = RegSetValueExA(clsid_key, localized_valuename, 0, REG_EXPAND_SZ, + (CONST BYTE*)(buffer), strlen(buffer)+1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + if (list->ips) { res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); if (res != ERROR_SUCCESS) goto error_close_clsid_key; @@ -576,24 +587,28 @@ static GUID const CLSID_Shortcut = { static struct regsvr_coclass const coclass_list[] = { { &CLSID_Desktop, "Desktop", + IDS_DESKTOP, NULL, "shell32.dll", "Apartment" }, { &CLSID_DragDropHelper, "Shell Drag and Drop Helper", + 0, NULL, "shell32.dll", "Apartment" }, { &CLSID_MyComputer, "My Computer", + IDS_MYCOMPUTER, NULL, "shell32.dll", "Apartment" }, { &CLSID_Shortcut, "Shortcut", + 0, NULL, "shell32.dll", "Apartment", @@ -601,12 +616,14 @@ static struct regsvr_coclass const cocla }, { &CLSID_AutoComplete, "AutoComplete", + 0, NULL, "shell32.dll", "Apartment", }, { &CLSID_UnixFolder, "/", + 0, NULL, "shell32.dll", "Apartment", @@ -614,6 +631,7 @@ static struct regsvr_coclass const cocla }, { &CLSID_UnixDosFolder, "/", + 0, NULL, "shell32.dll", "Apartment", @@ -623,6 +641,7 @@ static struct regsvr_coclass const cocla }, { &CLSID_FolderShortcut, "Foldershortcut", + 0, NULL, "shell32.dll", "Apartment", @@ -632,6 +651,7 @@ static struct regsvr_coclass const cocla }, { &CLSID_MyDocuments, "My Documents", + IDS_PERSONAL, NULL, "shell32.dll", "Apartment",

1 0