May 2010 - Wine-Commits - list.winehq.org

Andrew Nguyen : regsvr32: Continue processing DLL list if an export is not found for a DLL.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 6fc4954457b70f1e7f07936216b9773f4f9f4101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc4954457b70f1e7f0793621… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun May 2 01:24:40 2010 -0500 regsvr32: Continue processing DLL list if an export is not found for a DLL. --- programs/regsvr32/regsvr32.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 75cc9c9..ac8760b 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -100,7 +100,7 @@ static VOID *LoadProc(const char* strDll, const char* procName, HMODULE* DllHand if(!Silent) printf("%s not implemented in DLL %s\n", procName, strDll); FreeLibrary(*DllHandle); - ExitProcess(1); + return NULL; } return proc; } @@ -112,6 +112,8 @@ static int RegisterDll(const char* strDll) HMODULE DllHandle = NULL; pfRegister = LoadProc(strDll, "DllRegisterServer", &DllHandle); + if (!pfRegister) + return 0; hr = pfRegister(); if(FAILED(hr)) @@ -136,6 +138,9 @@ static int UnregisterDll(char* strDll) HMODULE DllHandle = NULL; pfUnregister = LoadProc(strDll, "DllUnregisterServer", &DllHandle); + if (!pfUnregister) + return 0; + hr = pfUnregister(); if(FAILED(hr)) { @@ -159,6 +164,9 @@ static int InstallDll(BOOL install, char *strDll, WCHAR *command_line) HMODULE DllHandle = NULL; pfInstall = LoadProc(strDll, "DllInstall", &DllHandle); + if (!pfInstall) + return 0; + hr = pfInstall(install, command_line); if(FAILED(hr)) {

1 0

Gerald Pfeifer : crypt32/tests: Tighten tests in testPortPublicKeyInfo.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: abae415487b9198dca5a918a09832a47008c1005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abae415487b9198dca5a918a0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 02:42:11 2010 +0200 crypt32/tests: Tighten tests in testPortPublicKeyInfo. --- dlls/crypt32/tests/encode.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 0f8ae7f..1c33aee 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7964,6 +7964,7 @@ static void testPortPublicKeyInfo(void) CRYPT_DELETEKEYSET); ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV, PROV_RSA_FULL, CRYPT_NEWKEYSET); + ok(ret,"CryptAcquireContextA failed"); testExportPublicKey(csp, &info); testImportPublicKey(csp, info); @@ -7972,6 +7973,7 @@ static void testPortPublicKeyInfo(void) CryptReleaseContext(csp, 0); ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + ok(ret,"CryptAcquireContextA failed"); } START_TEST(encode)

1 0

Gerald Pfeifer : comctl32/tests: Remove variables cx and cy which are not really used from test_approximate_viewrect .
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: b021128c4b4ea0defc61ed252179b5e9e23d71de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b021128c4b4ea0defc61ed252… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 01:11:36 2010 +0200 comctl32/tests: Remove variables cx and cy which are not really used from test_approximate_viewrect. --- dlls/comctl32/tests/listview.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a5dae75..0910b59 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4120,15 +4120,11 @@ static void test_approximate_viewrect(void) { HWND hwnd; DWORD ret; - INT cx, cy; HIMAGELIST himl; HBITMAP hbmp; LVITEMA itema; static CHAR test[] = "abracadabra, a very long item label"; - cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); - cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); - hwnd = create_listview_control(LVS_ICON); himl = ImageList_Create(40, 40, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n");

1 0

Gerald Pfeifer : jscript: Remove variable length which is not really used from JSGlobal_parseFloat.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 3d310f03c306f73b939aa7f15494c8781343d548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d310f03c306f73b939aa7f15… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 01:28:58 2010 +0200 jscript: Remove variable length which is not really used from JSGlobal_parseFloat. --- dlls/jscript/global.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index af142ed..92a0cbe 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -550,7 +550,7 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { LONGLONG d = 0, hlp; - int exp = 0, length; + int exp = 0; VARIANT *arg; WCHAR *str; BSTR val_str = NULL; @@ -569,7 +569,6 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag return hres; str = val_str; - length = SysStringLen(val_str); while(isspaceW(*str)) str++;

1 0

Gerald Pfeifer : msacm32/tests: Simplify check_count and msacm_tests.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: bf9d6f2dfdd1a9c4824ed93db20d3def2e52ee44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9d6f2dfdd1a9c4824ed93db… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 01:39:29 2010 +0200 msacm32/tests: Simplify check_count and msacm_tests. --- dlls/msacm32/tests/msacm.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index b68ff8c..a961067 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -423,7 +423,7 @@ static const char * get_metric(UINT uMetric) return "UNKNOWN"; } -static DWORD check_count(UINT uMetric) +static void check_count(UINT uMetric) { DWORD dwMetric; MMRESULT rc; @@ -452,14 +452,11 @@ static DWORD check_count(UINT uMetric) if (rc == MMSYSERR_NOERROR && winetest_interactive) trace("%s: %u\n", get_metric(uMetric), dwMetric); - - return dwMetric; } static void msacm_tests(void) { MMRESULT rc; - DWORD dwCount; DWORD dwACMVersion = acmGetVersion(); if (winetest_interactive) { @@ -470,17 +467,17 @@ static void msacm_tests(void) LOWORD(dwACMVersion) == 0 ? " (Retail)" : ""); } - dwCount = check_count(ACM_METRIC_COUNT_CODECS); - dwCount = check_count(ACM_METRIC_COUNT_CONVERTERS); - dwCount = check_count(ACM_METRIC_COUNT_DISABLED); - dwCount = check_count(ACM_METRIC_COUNT_DRIVERS); - dwCount = check_count(ACM_METRIC_COUNT_FILTERS); - dwCount = check_count(ACM_METRIC_COUNT_HARDWARE); - dwCount = check_count(ACM_METRIC_COUNT_LOCAL_CODECS); - dwCount = check_count(ACM_METRIC_COUNT_LOCAL_CONVERTERS); - dwCount = check_count(ACM_METRIC_COUNT_LOCAL_DISABLED); - dwCount = check_count(ACM_METRIC_COUNT_LOCAL_DRIVERS); - dwCount = check_count(ACM_METRIC_COUNT_LOCAL_FILTERS); + check_count(ACM_METRIC_COUNT_CODECS); + check_count(ACM_METRIC_COUNT_CONVERTERS); + check_count(ACM_METRIC_COUNT_DISABLED); + check_count(ACM_METRIC_COUNT_DRIVERS); + check_count(ACM_METRIC_COUNT_FILTERS); + check_count(ACM_METRIC_COUNT_HARDWARE); + check_count(ACM_METRIC_COUNT_LOCAL_CODECS); + check_count(ACM_METRIC_COUNT_LOCAL_CONVERTERS); + check_count(ACM_METRIC_COUNT_LOCAL_DISABLED); + check_count(ACM_METRIC_COUNT_LOCAL_DRIVERS); + check_count(ACM_METRIC_COUNT_LOCAL_FILTERS); if (winetest_interactive) trace("enabled drivers:\n");

1 0

Gerald Pfeifer : gdiplus/tests: Remove variable path which is not really used from test_linei.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 448a8bb5946e00a97f9955c08304b201ef8cbad6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=448a8bb5946e00a97f9955c08… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 01:24:40 2010 +0200 gdiplus/tests: Remove variable path which is not really used from test_linei. --- dlls/gdiplus/tests/graphicspath.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 5f4a92e..2343e9c 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -560,12 +560,6 @@ static void test_linei(void) { GpStatus status; GpPath *path; - GpPointF points[2]; - - points[0].X = 7.0; - points[0].Y = 11.0; - points[1].X = 13.0; - points[1].Y = 17.0; GdipCreatePath(FillModeAlternate, &path); status = GdipAddPathLineI(path, 5.0, 5.0, 6.0, 8.0);

1 0

Andrew Nguyen : rundll32: Rename a few internal helpers for consistency.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: dd4221fc2cffc5bd2c803c901df6d1cc06759b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd4221fc2cffc5bd2c803c901… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat May 1 23:08:10 2010 -0500 rundll32: Rename a few internal helpers for consistency. --- programs/rundll32/rundll32.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index b360bed..f3105c4 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -61,7 +61,7 @@ static FARPROC16 (WINAPI *pGetProcAddress16)(HMODULE16 hModule, LPCSTR name); static void (WINAPI *pRunDLL_CallEntry16)( FARPROC proc, HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT cmdshow ); -static ATOM MyRegisterClass(HINSTANCE hInstance) +static ATOM register_class(void) { WNDCLASSEX wcex; @@ -71,7 +71,7 @@ static ATOM MyRegisterClass(HINSTANCE hInstance) wcex.lpfnWndProc = DefWindowProc; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; - wcex.hInstance = hInstance; + wcex.hInstance = NULL; wcex.hIcon = NULL; wcex.hCursor = LoadCursor(NULL, IDC_ARROW); wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); @@ -132,7 +132,7 @@ static void *get_entry_point32( HMODULE module, LPCWSTR entry, BOOL *unicode ) return ret; } -static LPWSTR GetNextArg(LPWSTR *cmdline) +static LPWSTR get_next_arg(LPWSTR *cmdline) { LPWSTR s; LPWSTR arg,d; @@ -226,7 +226,7 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPSTR szCmdArgs, szDllName=NULL; /* Initialize the rundll32 class */ - MyRegisterClass( NULL ); + register_class(); hWnd = CreateWindow(szWindowClass, szTitle, WS_OVERLAPPEDWINDOW|WS_VISIBLE, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, NULL, NULL); @@ -234,20 +234,20 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPSTR szCmdArgs, /* Skip the rundll32.exe path */ szCmdLine=GetCommandLineW(); WINE_TRACE("CmdLine=%s\n",wine_dbgstr_w(szCmdLine)); - szDllName=GetNextArg(&szCmdLine); + szDllName = get_next_arg(&szCmdLine); if (!szDllName || *szDllName==0) goto CLEANUP; HeapFree(GetProcessHeap(),0,szDllName); /* Get the dll name and API EntryPoint */ - szDllName=GetNextArg(&szCmdLine); + szDllName = get_next_arg(&szCmdLine); if (!szDllName || *szDllName==0) goto CLEANUP; WINE_TRACE("DllName=%s\n",wine_dbgstr_w(szDllName)); if ((szEntryPoint = strchrW(szDllName, ',' ))) *szEntryPoint++=0; else - szEntryPoint = GetNextArg(&szCmdLine); + szEntryPoint = get_next_arg(&szCmdLine); WINE_TRACE("EntryPoint=%s\n",wine_dbgstr_w(szEntryPoint)); /* Load the library */

1 0

Gerald Pfeifer : oleaut32: Remove variable iLengthScanLineColor which is not really used from serializeIcon .
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: c85eb7809034f0211f668ddf874c1bca87d74fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c85eb7809034f0211f668ddf8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 01:54:49 2010 +0200 oleaut32: Remove variable iLengthScanLineColor which is not really used from serializeIcon. --- dlls/oleaut32/olepicture.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index c7a3411..3f431fd 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1594,12 +1594,10 @@ static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) unsigned int iOffsetColorData; unsigned int iOffsetMaskData; - unsigned int iLengthScanLineColor; unsigned int iLengthScanLineMask; unsigned int iNumEntriesPalette; iLengthScanLineMask = ((pInfoBitmap->bmiHeader.biWidth + 31) >> 5) << 2; - iLengthScanLineColor = ((pInfoBitmap->bmiHeader.biWidth * pInfoBitmap->bmiHeader.biBitCount + 31) >> 5) << 2; /* FIXME("DEBUG: bitmap size is %d x %d\n", pInfoBitmap->bmiHeader.biWidth,

1 0

André Hentschel : rsaenh: Fix a testfailure which occures on some Win7 setups.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: d89c5a3f4c8b41357d0fb95423d33304c37dd970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d89c5a3f4c8b41357d0fb9542… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 30 18:09:15 2010 +0200 rsaenh: Fix a testfailure which occures on some Win7 setups. --- dlls/rsaenh/tests/rsaenh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index d2ababf..a07ab69 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -135,6 +135,7 @@ static int init_base_environment(DWORD dwKeyFlags) if (!CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, 0)) { ok(GetLastError()==NTE_BAD_KEYSET || + broken(GetLastError() == NTE_TEMPORARY_PROFILE /* some Win7 setups */) || broken(GetLastError() == NTE_KEYSET_NOT_DEF /* Win9x/NT4 */), "%08x\n", GetLastError()); if (GetLastError()!=NTE_BAD_KEYSET)

1 0

Aric Stewart : shell32: Handle NULL pName in ShellLink fnSetDescription.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 2554a55b342ebda81fdc2468e38d32830c50345b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2554a55b342ebda81fdc2468e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 30 10:04:19 2010 -0500 shell32: Handle NULL pName in ShellLink fnSetDescription. --- dlls/shell32/shelllink.c | 26 ++++++++++++++++++-------- dlls/shell32/tests/shelllink.c | 9 +++++++++ 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index a7eb7f9..a052a18 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1469,9 +1469,14 @@ static HRESULT WINAPI IShellLinkA_fnSetDescription(IShellLinkA * iface, LPCSTR p TRACE("(%p)->(pName=%s)\n", This, pszName); HeapFree(GetProcessHeap(), 0, This->sDescription); - This->sDescription = HEAP_strdupAtoW( GetProcessHeap(), 0, pszName); - if ( !This->sDescription ) - return E_OUTOFMEMORY; + if (pszName) + { + This->sDescription = HEAP_strdupAtoW( GetProcessHeap(), 0, pszName); + if ( !This->sDescription ) + return E_OUTOFMEMORY; + } + else + This->sDescription = NULL; This->bDirty = TRUE; @@ -1852,12 +1857,17 @@ static HRESULT WINAPI IShellLinkW_fnSetDescription(IShellLinkW * iface, LPCWSTR TRACE("(%p)->(desc=%s)\n",This, debugstr_w(pszName)); HeapFree(GetProcessHeap(), 0, This->sDescription); - This->sDescription = HeapAlloc( GetProcessHeap(), 0, - (lstrlenW( pszName )+1)*sizeof(WCHAR) ); - if ( !This->sDescription ) - return E_OUTOFMEMORY; + if (pszName) + { + This->sDescription = HeapAlloc( GetProcessHeap(), 0, + (lstrlenW( pszName )+1)*sizeof(WCHAR) ); + if ( !This->sDescription ) + return E_OUTOFMEMORY; - lstrcpyW( This->sDescription, pszName ); + lstrcpyW( This->sDescription, pszName ); + } + else + This->sDescription = NULL; This->bDirty = TRUE; return S_OK; diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 6c020ae..1b38b0d 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -136,6 +136,15 @@ static void test_get_set(void) ok(r == S_OK, "GetDescription failed (0x%08x)\n", r); ok(lstrcmp(buffer,str)==0, "GetDescription returned '%s'\n", buffer); + r = IShellLinkA_SetDescription(sl, NULL); + ok(r == S_OK, "SetDescription failed (0x%08x)\n", r); + + strcpy(buffer,"garbage"); + r = IShellLinkA_GetDescription(sl, buffer, sizeof(buffer)); + ok(r == S_OK, "GetDescription failed (0x%08x)\n", r); + ok(*buffer=='\0' || broken(lstrcmp(buffer,str)==0), "GetDescription returned '%s'\n", buffer); /* NT4 */ + + /* Test Getting / Setting the work directory */ strcpy(buffer,"garbage"); r = IShellLinkA_GetWorkingDirectory(sl, buffer, sizeof(buffer));

1 0