November 2007 - Wine-Commits

Rob Shearman : rpcrt4: Hold the thread-data' s critical section while cancelling a call.
by Alexandre Julliard Nov. 19, 2007

Nov. 19, 2007

Module: wine Branch: master Commit: 8a15423ab7db1826f888759507801c04e36094b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a15423ab7db1826f88875950… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Nov 18 15:51:03 2007 +0000 rpcrt4: Hold the thread-data's critical section while cancelling a call. Check that there is a connection before trying to cancel it. --- dlls/rpcrt4/rpcrt4_main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index ac69d5b..d557664 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -926,7 +926,9 @@ RPC_STATUS RPC_ENTRY RpcCancelThread(void* ThreadHandle) LIST_FOR_EACH_ENTRY(tdata, &threaddata_list, struct threaddata, entry) if (tdata->thread_id == target_tid) { - rpcrt4_conn_cancel_call(tdata->connection); + EnterCriticalSection(&tdata->cs); + if (tdata->connection) rpcrt4_conn_cancel_call(tdata->connection); + LeaveCriticalSection(&tdata->cs); break; } LeaveCriticalSection(&threaddata_cs);

1 0

Michael Stefaniuc : localspl/tests: Use ANSI function declarations.
by Alexandre Julliard Nov. 19, 2007

Nov. 19, 2007

Module: wine Branch: master Commit: 17dc17487d963989ad6e6f51552cfffb0415f84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=17dc17487d963989ad6e6f515… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 19 00:18:55 2007 +0100 localspl/tests: Use ANSI function declarations. --- dlls/localspl/tests/localmon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 3126731..4d75a4c 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -339,7 +339,7 @@ static void test_AddPortEx(void) /* ########################### */ -static void test_ClosePort() +static void test_ClosePort(void) { HANDLE hPort; HANDLE hPort2; @@ -629,7 +629,7 @@ static void test_InitializePrintMonitor(void) /* ########################### */ -static void test_OpenPort() +static void test_OpenPort(void) { HANDLE hPort; HANDLE hPort2;

1 0

Rob Shearman : credui: Override the default banner if the caller specifies one to CredUIPromptForCredentialsW .
by Alexandre Julliard Nov. 19, 2007

Nov. 19, 2007

Module: wine Branch: master Commit: 0937f999f4eb69c517e159bbde0d4503a5e1c928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0937f999f4eb69c517e159bbd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Nov 18 21:08:39 2007 +0000 credui: Override the default banner if the caller specifies one to CredUIPromptForCredentialsW. --- dlls/credui/credui_main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index e61eac8..15da5f0 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -183,6 +183,11 @@ static BOOL CredDialogInit(HWND hwndDlg, struct cred_dialog_params *params) HWND hwndPassword = GetDlgItem(hwndDlg, IDC_PASSWORD); SetWindowLongPtrW(hwndDlg, DWLP_USER, (LONG_PTR)params); + + if (params->hbmBanner) + SendMessageW(GetDlgItem(hwndDlg, IDB_BANNER), STM_SETIMAGE, + IMAGE_BITMAP, (LPARAM)params->hbmBanner); + if (params->pszMessageText) SetDlgItemTextW(hwndDlg, IDC_MESSAGE, params->pszMessageText); else

1 0

Hans Leidekker : kernel32: Add stub implementations for FindFirstVolume{A, W}.
by Alexandre Julliard Nov. 19, 2007

Nov. 19, 2007

Module: wine Branch: master Commit: 23e995e3a77e09eb6615b08c535df653844fc203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e995e3a77e09eb6615b08c5… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Nov 18 21:44:25 2007 +0100 kernel32: Add stub implementations for FindFirstVolume{A, W}. --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/volume.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c9912fa..bc3ba3a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -371,10 +371,10 @@ @ stdcall FindFirstFileExA(str long ptr long ptr long) @ stdcall FindFirstFileExW(wstr long ptr long ptr long) @ stdcall FindFirstFileW(wstr ptr) -@ stub FindFirstVolumeA +@ stdcall FindFirstVolumeA(ptr long) @ stdcall FindFirstVolumeMountPointA(str ptr long) @ stdcall FindFirstVolumeMountPointW(wstr ptr long) -@ stub FindFirstVolumeW +@ stdcall FindFirstVolumeW(ptr long) @ stdcall FindNextChangeNotification(long) @ stdcall FindNextFileA(long ptr) @ stdcall FindNextFileW(long ptr) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 8d3251e..5ebe91f 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1388,6 +1388,26 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu } /*********************************************************************** + * FindFirstVolumeA (KERNEL32.@) + */ +HANDLE WINAPI FindFirstVolumeA(LPSTR volume, DWORD len) +{ + FIXME("(%p, %d), stub!\n", volume, len); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return INVALID_HANDLE_VALUE; +} + +/*********************************************************************** + * FindFirstVolumeW (KERNEL32.@) + */ +HANDLE WINAPI FindFirstVolumeW(LPWSTR volume, DWORD len) +{ + FIXME("(%p, %d), stub!\n", volume, len); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return INVALID_HANDLE_VALUE; +} + +/*********************************************************************** * FindFirstVolumeMountPointA (KERNEL32.@) */ HANDLE WINAPI FindFirstVolumeMountPointA(LPCSTR root, LPSTR mount_point, DWORD len)

1 0

Gerald Pfeifer : advapi32: Remove untriggerable check.
by Alexandre Julliard Nov. 19, 2007

Nov. 19, 2007

Module: wine Branch: master Commit: f874126becdd78c5ca4fd4a9261f1059dc7b94b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f874126becdd78c5ca4fd4a92… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Nov 18 07:03:09 2007 +0100 advapi32: Remove untriggerable check. --- dlls/advapi32/service.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 63fd076..3acab45 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2107,9 +2107,6 @@ QueryServiceConfigW( SC_HANDLE hService, n -= sizeof(WCHAR); } - if( n < 0 ) - ERR("Buffer overflow!\n"); - TRACE("Image path = %s\n", debugstr_w(lpServiceConfig->lpBinaryPathName) ); TRACE("Group = %s\n", debugstr_w(lpServiceConfig->lpLoadOrderGroup) ); TRACE("Dependencies = %s\n", debugstr_w(lpServiceConfig->lpDependencies) );

1 0

Hans Leidekker : wininet: Initialize path buffer in InternetSetCookie.
by Alexandre Julliard Nov. 19, 2007

Nov. 19, 2007

Module: wine Branch: master Commit: a0c3816dbf9935a81168a3fb4fce73d79f9b6e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c3816dbf9935a81168a3fb4… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Nov 18 18:29:37 2007 +0100 wininet: Initialize path buffer in InternetSetCookie. --- dlls/wininet/cookie.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index b44c4a6..2eef2d9 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -454,7 +454,7 @@ BOOL WINAPI InternetSetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, return FALSE; } - hostName[0] = 0; + hostName[0] = path[0] = 0; ret = COOKIE_crackUrlSimple(lpszUrl, hostName, sizeof(hostName)/sizeof(hostName[0]), path, sizeof(path)/sizeof(path[0])); if (!ret || !hostName[0]) return FALSE;

1 0

Gerald Pfeifer : configure: Fix typos in warning messages.
by Alexandre Julliard Nov. 19, 2007

Nov. 19, 2007

Module: wine Branch: master Commit: 5736c30c216df799a62286b21d7b6dd5e6783bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5736c30c216df799a62286b21… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Nov 17 00:48:44 2007 +0100 configure: Fix typos in warning messages. --- configure | 6 +++--- configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 6e3b3ae..63ae523 100755 --- a/configure +++ b/configure @@ -10482,7 +10482,7 @@ echo "${ECHO_T}not found" >&6; } This probably prevents linking to OpenGL. Try deleting the file and restarting configure." else wine_warnings="$wine_warnings|No OpenGL library found on this system. -Wine will be build without OpenGL or Direct3D support." +Wine will be built without OpenGL or Direct3D support." fi else { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5 @@ -10571,11 +10571,11 @@ fi else wine_warnings="$wine_warnings|Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/) -Wine will be build without OpenGL or Direct3D support." +Wine will be built without OpenGL or Direct3D support." fi else wine_warnings="$wine_warnings|OpenGL development headers not found. -Wine will be build without OpenGL or Direct3D support." +Wine will be built without OpenGL or Direct3D support." fi fi diff --git a/configure.ac b/configure.ac index 3d62f45..7aa5d85 100644 --- a/configure.ac +++ b/configure.ac @@ -656,7 +656,7 @@ Wine will be built without XComposite support. (winex11.drv)]) This probably prevents linking to OpenGL. Try deleting the file and restarting configure.]) else WINE_WARNING([No OpenGL library found on this system. -Wine will be build without OpenGL or Direct3D support.]) +Wine will be built without OpenGL or Direct3D support.]) fi], $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) @@ -668,11 +668,11 @@ Wine will be build without OpenGL or Direct3D support.]) $OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) else WINE_WARNING([Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/) -Wine will be build without OpenGL or Direct3D support.]) +Wine will be built without OpenGL or Direct3D support.]) fi else WINE_WARNING([OpenGL development headers not found. -Wine will be build without OpenGL or Direct3D support.]) +Wine will be built without OpenGL or Direct3D support.]) fi fi

1 0

Gerald Pfeifer : rsaenh/tests: Fix const-ness of parameters to printBytes() .
by Alexandre Julliard Nov. 19, 2007

Nov. 19, 2007

Module: wine Branch: master Commit: d9f5817e8ae88d492c5efece5f5c0dd47e153ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f5817e8ae88d492c5efece5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Nov 17 07:36:51 2007 +0100 rsaenh/tests: Fix const-ness of parameters to printBytes(). --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index d221647..a8c8c4f 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -54,7 +54,7 @@ static const cryptdata cTestData[4] = { 12,12,16} }; -static void printBytes(const char *heading, BYTE *pb, size_t cb) +static void printBytes(const char *heading, const BYTE *pb, size_t cb) { size_t i; printf("%s: ",heading);

1 0

Jacek Caban : shdocvw: Set default home and search page.
by Alexandre Julliard Nov. 19, 2007

Nov. 19, 2007

Module: wine Branch: master Commit: 909744a28d75c8dab254420382bb7310e21b3fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=909744a28d75c8dab25442038… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 17 20:03:20 2007 +0100 shdocvw: Set default home and search page. --- dlls/hlink/tests/hlink.c | 4 ---- dlls/shdocvw/shdocvw.inf | 12 +++++++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 4d3a3e2..2eb63dd 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -322,16 +322,12 @@ static void test_special_reference(void) HRESULT hres; hres = HlinkGetSpecialReference(HLSR_HOME, &ref); - todo_wine ok(hres == S_OK, "HlinkGetSpecialReference(HLSR_HOME) failed: %08x\n", hres); - todo_wine ok(ref != NULL, "ref == NULL\n"); CoTaskMemFree(ref); hres = HlinkGetSpecialReference(HLSR_SEARCHPAGE, &ref); - todo_wine ok(hres == S_OK, "HlinkGetSpecialReference(HLSR_SEARCHPAGE) failed: %08x\n", hres); - todo_wine ok(ref != NULL, "ref == NULL\n"); CoTaskMemFree(ref); diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index fd40df3..9c38a55 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -3,11 +3,11 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Classes.Reg +AddReg=Classes.Reg, Settings.Reg [UnregisterDll] -DelReg=Classes.Reg +DelReg=Classes.Reg, Settings.Reg [RegisterIE] @@ -120,9 +120,15 @@ HKCR,"InternetShortcut","NeverShowExt",, HKCR,"InternetShortcut\CLSID",,,"%CLSID_InteretShortcut%" HKCR,"InternetShortcut\DefaultIcon",,,"url.dll,0" HKCR,"InternetShortcut\shell\open\command",,,"rundll32.exe shdocvw.dll,OpenURL %l" -HKCR,"InternetShortcut\shell\print\command",,,rundll32.exe mshtml.dll,PrintHTML \"%1\"" +HKCR,"InternetShortcut\shell\print\command",,,"rundll32.exe mshtml.dll,PrintHTML \"%1\"" HKCR,"InternetShortcut\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML \"%1\" \"%2\" \"%3\" \"%4\"" + +[Settings.Reg] +HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",,"http://www.winehq.org" +HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",,"http://www.google.com" + + [IE.Reg] HKLM,"Software\Microsoft\Internet Explorer","Version",,"6.0.2900.2180"

1 0

Jacek Caban : include: Added isguids.h.
by Alexandre Julliard Nov. 19, 2007

Nov. 19, 2007

Module: wine Branch: master Commit: 7fdcc87def3b77e6e3b7f2cab96427054624e8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fdcc87def3b77e6e3b7f2cab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 17 20:02:28 2007 +0100 include: Added isguids.h. --- dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/isguids.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index e1aeaf4..7fd7c2c 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -69,6 +69,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "urlhist.h" #include "hlguids.h" #include "dimm.h" +#include "isguids.h" /* FIXME: cguids declares GUIDs but does not define their values */ diff --git a/include/Makefile.in b/include/Makefile.in index 3b08d73..e1d53da 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -204,6 +204,7 @@ SRCDIR_INCLUDES = \ ipifcons.h \ iprtrmib.h \ iptypes.h \ + isguids.h \ ks.h \ ksguid.h \ ksmedia.h \ diff --git a/include/isguids.h b/include/isguids.h new file mode 100644 index 0000000..daf5600 --- /dev/null +++ b/include/isguids.h @@ -0,0 +1,28 @@ +/* + * Copyright 2007 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _ISGUIDS_H_ +#define _ISGUIDS_H_ + +DEFINE_GUID(CLSID_InternetShortcut, 0xfbf23b40,0xe3f0,0x101b,0x84,0x88,0x00,0xaa,0x00,0x3e,0x56,0xf8); + +DEFINE_GUID(IID_IUniformResourceLocatorA, 0xfbf23b80,0xe3f0,0x101b,0x84,0x88,0x00,0xaa,0x00,0x3e,0x56,0xf8); +DEFINE_GUID(IID_IUniformResourceLocatorW, 0xcabb0da0,0xda57,0x11cf,0x99,0x74,0x00,0x20,0xaf,0xd7,0x97,0x62); +#define IID_IUniformResourceLocator WINELIB_NAME_AW(IID_IUniformResourceLocator) + +#endif

1 0