February 2008 - Wine-commits

Rob Shearman : shell32: Memory allocated by CommandLineToArgvW should be that got from LocalAlloc/ LocalReAlloc, not from GlobalAlloc.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 4510346b4f69e91c05cf28f9b80604352fbb6772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4510346b4f69e91c05cf28f9b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 14 14:38:58 2008 +0000 shell32: Memory allocated by CommandLineToArgvW should be that got from LocalAlloc/LocalReAlloc, not from GlobalAlloc. Use LMEM_FIXED instead of 0 in calls to LocalAlloc to emphasise that we're getting a direct pointer, not a handle to memory. Remove hargv as it is confusing and unnecessary. --- dlls/shell32/shell32_main.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index a64381f..336a519 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -85,7 +85,6 @@ extern const char * const SHELL_Authors[]; LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) { DWORD argc; - HGLOBAL hargv; LPWSTR *argv; LPCWSTR cs; LPWSTR arg,s,d; @@ -97,20 +96,18 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) /* Return the path to the executable */ DWORD len, size=16; - hargv=LocalAlloc(0, size); - argv=LocalLock(hargv); + argv=LocalAlloc(LMEM_FIXED, size); for (;;) { len = GetModuleFileNameW(0, (LPWSTR)(argv+1), (size-sizeof(LPWSTR))/sizeof(WCHAR)); if (!len) { - LocalFree(hargv); + LocalFree(argv); return NULL; } if (len < size) break; size*=2; - hargv=LocalReAlloc(hargv, size, 0); - argv=LocalLock(hargv); + argv=LocalReAlloc(argv, size, 0); } argv[0]=(LPWSTR)(argv+1); if (numargs) @@ -160,8 +157,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) /* Allocate in a single lump, the string array, and the strings that go with it. * This way the caller can make a single GlobalFree call to free both, as per MSDN. */ - hargv=GlobalAlloc(0, argc*sizeof(LPWSTR)+(strlenW(lpCmdline)+1)*sizeof(WCHAR)); - argv=GlobalLock(hargv); + argv=LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(strlenW(lpCmdline)+1)*sizeof(WCHAR)); if (!argv) return NULL; cmdline=(LPWSTR)(argv+argc);

1 0

Rob Shearman : crypt32: Fix function declaration - WINAPI should come after the return type.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: d9891887c7f24ad2fd99e5f3d06092d8ffc21db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9891887c7f24ad2fd99e5f3d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 14 15:35:33 2008 +0000 crypt32: Fix function declaration - WINAPI should come after the return type. --- dlls/crypt32/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 30c0ddb..94e1df8 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -109,7 +109,7 @@ static void CDataEncodeMsg_Close(HCRYPTMSG hCryptMsg) LocalFree(msg->bare_content); } -static WINAPI BOOL CRYPT_EncodeContentLength(DWORD dwCertEncodingType, +static BOOL WINAPI CRYPT_EncodeContentLength(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) {

1 0

Rob Shearman : widl: Remove unused headers.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: c233ba105e0ba741c4e5bd9451ad6f3aa97fd543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c233ba105e0ba741c4e5bd945… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 14 15:35:40 2008 +0000 widl: Remove unused headers. --- tools/widl/client.c | 2 -- tools/widl/header.c | 2 -- tools/widl/proxy.c | 2 -- tools/widl/server.c | 2 -- tools/widl/typegen.c | 1 - tools/widl/typelib.c | 2 -- 6 files changed, 0 insertions(+), 11 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 2eaa43c..2b102c8 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -25,9 +25,7 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <assert.h> #include <ctype.h> -#include <signal.h> #include "widl.h" #include "utils.h" diff --git a/tools/widl/header.c b/tools/widl/header.c index 0f697b8..0a28fd9 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -27,9 +27,7 @@ # include <unistd.h> #endif #include <string.h> -#include <assert.h> #include <ctype.h> -#include <signal.h> #include "widl.h" #include "utils.h" diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 217c64b..039f54e 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -28,9 +28,7 @@ # include <unistd.h> #endif #include <string.h> -#include <assert.h> #include <ctype.h> -#include <signal.h> #include "widl.h" #include "utils.h" diff --git a/tools/widl/server.c b/tools/widl/server.c index 53dd099..8203396 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -27,9 +27,7 @@ # include <unistd.h> #endif #include <string.h> -#include <assert.h> #include <ctype.h> -#include <signal.h> #include "widl.h" #include "utils.h" diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 41dd22f..f3af935 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -30,7 +30,6 @@ #include <string.h> #include <assert.h> #include <ctype.h> -#include <signal.h> #include <limits.h> #include "widl.h" diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 7130e50..1a56599 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -28,9 +28,7 @@ #include <stdarg.h> #include <unistd.h> #include <string.h> -#include <assert.h> #include <ctype.h> -#include <signal.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT

1 0

Rob Shearman : advapi32: The lpcbSecurityDescriptor parameter to RegGetKeySecurity isn't optional, so don't complicate the code by treating as though it is.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 7579145ae139753d76ccebb1a4d6805550de0353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7579145ae139753d76ccebb1a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 14 14:38:30 2008 +0000 advapi32: The lpcbSecurityDescriptor parameter to RegGetKeySecurity isn't optional, so don't complicate the code by treating as though it is. --- dlls/advapi32/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index dda68e2..1931ece 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2238,7 +2238,7 @@ LSTATUS WINAPI RegGetKeySecurity( HKEY hkey, SECURITY_INFORMATION SecurityInform LPDWORD lpcbSecurityDescriptor ) { TRACE("(%p,%d,%p,%d)\n",hkey,SecurityInformation,pSecurityDescriptor, - lpcbSecurityDescriptor?*lpcbSecurityDescriptor:0); + *lpcbSecurityDescriptor); if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE;

1 0

Rob Shearman : dbghelp: Fix a typo in SymLoadModuleExW that caused the wrong number of characters to be passed to lstrcpynW .
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: f48941a2a8ccbac7b3afeae96ac53c47f9e7c691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48941a2a8ccbac7b3afeae96… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 14 14:38:35 2008 +0000 dbghelp: Fix a typo in SymLoadModuleExW that caused the wrong number of characters to be passed to lstrcpynW. --- dlls/dbghelp/module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 8b2ece0..3f7fe7a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -555,7 +555,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (wModuleName) module_set_module(module, wModuleName); lstrcpynW(module->module.ImageName, wImageName, - sizeof(module->module.ImageName) / sizeof(CHAR)); + sizeof(module->module.ImageName) / sizeof(WCHAR)); return module->module.BaseOfImage; }

1 0

Rob Shearman : dxdiagn: Fix the character count passed to snprintfW in DXDiag_AddFileDescContainer and DXDiag_InitDXDiagDisplayContainer .
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 806dc4249c884feaa622a342262cd49590abda1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=806dc4249c884feaa622a3422… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 14 14:38:40 2008 +0000 dxdiagn: Fix the character count passed to snprintfW in DXDiag_AddFileDescContainer and DXDiag_InitDXDiagDisplayContainer. --- dlls/dxdiagn/provider.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index fb18a35..4c19d02 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -221,7 +221,7 @@ static HRESULT DXDiag_AddFileDescContainer(IDxDiagContainer* pSubCont, const WCH VariantClear(&v); if (boolret) { - snprintfW(szVersion_v, sizeof(szVersion_v), + snprintfW(szVersion_v, sizeof(szVersion_v)/sizeof(szVersion_v[0]), szVersionFormat, HIWORD(pFileInfo->dwFileVersionMS), LOWORD(pFileInfo->dwFileVersionMS), @@ -466,7 +466,7 @@ static HRESULT DXDiag_InitDXDiagDisplayContainer(IDxDiagContainer* pSubCont) { static const WCHAR mem_fmt[] = {'%','.','1','f',' ','M','B',0}; - snprintfW( buffer, sizeof(buffer), mem_fmt, ((float)tmp) / 1000000.0 ); + snprintfW( buffer, sizeof(buffer)/sizeof(buffer[0]), mem_fmt, ((float)tmp) / 1000000.0 ); add_prop_str( pDisplayAdapterSubCont, szDisplayMemoryLocalized, buffer ); add_prop_str( pDisplayAdapterSubCont, szDisplayMemoryEnglish, buffer ); }

1 0

Rob Shearman : msrle32: Fix the character count passed into LoadStringW in About.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 9ca4680fce20e556dbf445e9b6c0e07f20905b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca4680fce20e556dbf445e9b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 14 14:38:49 2008 +0000 msrle32: Fix the character count passed into LoadStringW in About. --- dlls/msrle32/msrle32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index bf611dd..4f0226a 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1225,8 +1225,8 @@ static LRESULT About(CodecInfo *pi, HWND hWnd) /* pre-condition */ assert(MSRLE32_hModule != 0); - LoadStringW(MSRLE32_hModule, IDS_NAME, szTitle, sizeof(szTitle)); - LoadStringW(MSRLE32_hModule, IDS_ABOUT, szAbout, sizeof(szAbout)); + LoadStringW(MSRLE32_hModule, IDS_NAME, szTitle, sizeof(szTitle)/sizeof(szTitle[0])); + LoadStringW(MSRLE32_hModule, IDS_ABOUT, szAbout, sizeof(szAbout)/sizeof(szAbout[0])); MessageBoxW(hWnd, szAbout, szTitle, MB_OK|MB_ICONINFORMATION);

1 0

Rob Shearman : hhctrl.ocx: Fix the character count passed to GetFullPathNameW in OpenCHM and NavigateToChm .
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: cedf6308aab64e0490cfac4213209c51af6a38de URL: http://source.winehq.org/git/wine.git/?a=commit;h=cedf6308aab64e0490cfac421… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 14 14:38:44 2008 +0000 hhctrl.ocx: Fix the character count passed to GetFullPathNameW in OpenCHM and NavigateToChm. --- dlls/hhctrl.ocx/chm.c | 2 +- dlls/hhctrl.ocx/help.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 2a4bfa8..710013e 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -342,7 +342,7 @@ CHMInfo *OpenCHM(LPCWSTR szFile) CHMInfo *ret = heap_alloc_zero(sizeof(CHMInfo)); - res = GetFullPathNameW(szFile, sizeof(file), file, NULL); + res = GetFullPathNameW(szFile, sizeof(file)/sizeof(file[0]), file, NULL); ret->szFile = strdupW(file); hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index c49d3cf..3f6a080 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -115,7 +115,7 @@ BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) if (!info->web_browser) return FALSE; - if(!GetFullPathNameW(file, sizeof(full_path), full_path, NULL)) { + if(!GetFullPathNameW(file, sizeof(full_path)/sizeof(full_path[0]), full_path, NULL)) { WARN("GetFullPathName failed: %u\n", GetLastError()); return FALSE; }

1 0

Rob Shearman : ole32: Fix the character count passed to GetClipboardFormatNameW in WriteFmtUserTypeStg .
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 96fafe1661318a83c61e757b39c27f9fc2873203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96fafe1661318a83c61e757b3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 14 14:38:53 2008 +0000 ole32: Fix the character count passed to GetClipboardFormatNameW in WriteFmtUserTypeStg. --- dlls/ole32/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a83c729..ac0cbbf 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7116,7 +7116,7 @@ HRESULT WINAPI WriteFmtUserTypeStg( TRACE("(%p,%x,%s)\n",pstg,cf,debugstr_w(lpszUserType)); /* get the clipboard format name */ - n = GetClipboardFormatNameW( cf, szwClipName, sizeof(szwClipName) ); + n = GetClipboardFormatNameW( cf, szwClipName, sizeof(szwClipName)/sizeof(szwClipName[0]) ); szwClipName[n]=0; TRACE("Clipboard name is %s\n", debugstr_w(szwClipName));

1 0

Rob Shearman : shlwapi: IID_IInternetSecurityMgrSite is now defined so remove the local definition from IUnknown_GetWindow .
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 151cc8bd05f899b53bd61e2736aaeeb6373b2937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151cc8bd05f899b53bd61e273… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 14 14:39:02 2008 +0000 shlwapi: IID_IInternetSecurityMgrSite is now defined so remove the local definition from IUnknown_GetWindow. --- dlls/shlwapi/ordinal.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index c4b45c0..6aca53d 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1284,9 +1284,6 @@ BOOL WINAPI SHIsSameObject(IUnknown* lpInt1, IUnknown* lpInt2) */ HRESULT WINAPI IUnknown_GetWindow(IUnknown *lpUnknown, HWND *lphWnd) { - /* FIXME: Wine has no header for this object */ - static const GUID IID_IInternetSecurityMgrSite = { 0x79eac9ed, - 0xbaf9, 0x11ce, { 0x8c, 0x82, 0x00, 0xaa, 0x00, 0x4b, 0xa9, 0x0b }}; IUnknown *lpOle; HRESULT hRet = E_FAIL;

1 0