wine-commits January 2007

wine-commits@winehq.org

4 participants
893 discussions

Paul Vriens : crypt32/tests: Cast-qual warning fixes.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 259c06ffc93d690fa5105b1451e519aa1c92b72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=259c06ffc93d690fa5105b145… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jan 12 15:51:02 2007 +0100 crypt32/tests: Cast-qual warning fixes. --- dlls/crypt32/tests/cert.c | 113 ++++++++++++++++++++++----------------------- 1 files changed, 56 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=259c06ffc93d690fa5105…

1 0

Paul Vriens : mshtml/tests: Cast-qual warning fix.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 6338caa9eda8eda98dad9a89a8e71c6ea37bd168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6338caa9eda8eda98dad9a89a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jan 12 14:26:05 2007 +0100 mshtml/tests: Cast-qual warning fix. --- dlls/mshtml/tests/htmldoc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ac26ca8..0815c01 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1803,11 +1803,12 @@ static void test_Load(IPersistMoniker *p { IBindCtx *bind; HRESULT hres; + static WCHAR sz_html_clientsite_objectparam[] = SZ_HTML_CLIENTSITE_OBJECTPARAM; test_readyState((IUnknown*)persist); CreateBindCtx(0, &bind); - IBindCtx_RegisterObjectParam(bind, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, + IBindCtx_RegisterObjectParam(bind, sz_html_clientsite_objectparam, (IUnknown*)&ClientSite); SET_EXPECT(GetDisplayName);

1 0

Paul Vriens : rpcrt4/tests: Cast-qual warning fixes.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: c21d65cfb224ddbba52da093d64804af53b08a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21d65cfb224ddbba52da093d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jan 12 14:09:59 2007 +0100 rpcrt4/tests: Cast-qual warning fixes. --- dlls/rpcrt4/tests/rpc.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 36bf4ef..023741f 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -178,11 +178,13 @@ static void TestDceErrorInqText (void) static void test_rpc_ncacn_ip_tcp(void) { RPC_STATUS status; + static unsigned char foo[] = "foo"; + static unsigned char ncacn_ip_tcp[] = "ncacn_ip_tcp"; - status = RpcNetworkIsProtseqValid((unsigned char*)"foo"); + status = RpcNetworkIsProtseqValid(foo); ok(status == RPC_S_INVALID_RPC_PROTSEQ, "return wrong\n"); - status = RpcNetworkIsProtseqValid((unsigned char*)"ncacn_ip_tcp"); + status = RpcNetworkIsProtseqValid(ncacn_ip_tcp); ok(status == RPC_S_OK, "return wrong\n"); }

1 0

Paul Vriens : secur32/tests: Cast-qual warning fixes.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 6c3efd1c32b1f9054e82a684da6ab54a599f252d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3efd1c32b1f9054e82a684d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jan 12 14:01:16 2007 +0100 secur32/tests: Cast-qual warning fixes. --- dlls/secur32/tests/schannel.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index ca870f4..0bbd96b 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -42,9 +42,9 @@ static const BYTE bigCert[] = { 0x30, 0x 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, 0x07, 0x30, 0x02, 0x06, 0x00, 0x03, 0x01, 0x00, 0xa3, 0x16, 0x30, 0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, 0xff, 0x02, 0x01, 0x01 }; -static const WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e', +static WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e', 'm','p',0 }; -static const BYTE privKey[] = { +static BYTE privKey[] = { 0x07, 0x02, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x52, 0x53, 0x41, 0x32, 0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x79, 0x10, 0x1c, 0xd0, 0x6b, 0x10, 0x18, 0x30, 0x94, 0x61, 0xdc, 0x0e, 0xcb, 0x96, 0x4e, 0x21, 0x3f, 0x79, 0xcd, @@ -116,12 +116,13 @@ static void testAcquireSecurityContext(v PCCERT_CONTEXT certs[2]; HCRYPTPROV csp; static CHAR unisp_name_a[] = UNISP_NAME_A; + static WCHAR ms_def_prov_w[] = MS_DEF_PROV_W; BOOL ret; HCRYPTKEY key; CRYPT_KEY_PROV_INFO keyProvInfo; - keyProvInfo.pwszContainerName = (LPWSTR)cspNameW; - keyProvInfo.pwszProvName = (LPWSTR)MS_DEF_PROV_W; + keyProvInfo.pwszContainerName = cspNameW; + keyProvInfo.pwszProvName = ms_def_prov_w; keyProvInfo.dwProvType = PROV_RSA_FULL; keyProvInfo.dwFlags = 0; keyProvInfo.cProvParam = 0; @@ -253,7 +254,7 @@ static void testAcquireSecurityContext(v ret = CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_NEWKEYSET); ok(ret, "CryptAcquireContextW failed: %08x\n", GetLastError()); - ret = CryptImportKey(csp, (LPBYTE)privKey, sizeof(privKey), 0, 0, &key); + ret = CryptImportKey(csp, privKey, sizeof(privKey), 0, 0, &key); ok(ret, "CryptImportKey failed: %08x\n", GetLastError()); if (ret) {

1 0

Paul Vriens : user32/tests: Cast-qual warning fixes.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 53b225b7ab9cc884226412cd64ad70b57c5fdb1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b225b7ab9cc884226412cd6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jan 12 13:49:08 2007 +0100 user32/tests: Cast-qual warning fixes. --- dlls/user32/tests/win.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3dde99a..a420e28 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1056,7 +1056,7 @@ static void test_shell_window(void) /************** MDI test ****************/ -static const char mdi_lParam_test_message[] = "just a test string"; +static char mdi_lParam_test_message[] = "just a test string"; static void test_MDI_create(HWND parent, HWND mdi_client, INT first_id) {

1 0

Paul Vriens : oleaut32/tests: Cast-qual warnings fixes.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 23bbca535fcd5906cd8a2e7d3814925adbe1c210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23bbca535fcd5906cd8a2e7d3… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jan 12 13:25:24 2007 +0100 oleaut32/tests: Cast-qual warnings fixes. --- dlls/oleaut32/tests/olefont.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 5a02502..7fc0422 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -40,6 +40,10 @@ #include <olectl.h> #include <ocidl.h> +static WCHAR MSSansSerif_font[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f',0}; +static WCHAR system_font[] = { 'S','y','s','t','e','m',0 }; +static WCHAR arial_font[] = { 'A','r','i','a','l',0 }; + static HMODULE hOleaut32; static HRESULT (WINAPI *pOleCreateFontIndirect)(LPFONTDESC,REFIID,LPVOID*); @@ -56,7 +60,6 @@ static void test_ifont_sizes(long lo_siz long hfont_height, const char * test_name) { FONTDESC fd; - static const WCHAR fname[] = { 'S','y','s','t','e','m',0 }; LPVOID pvObj = NULL; IFont* ifnt = NULL; HFONT hfont; @@ -65,7 +68,7 @@ static void test_ifont_sizes(long lo_siz HRESULT hres; fd.cbSizeofstruct = sizeof(FONTDESC); - fd.lpstrName = (WCHAR*)fname; + fd.lpstrName = system_font; S(fd.cySize).Lo = lo_size; S(fd.cySize).Hi = hi_size; fd.sWeight = 0; @@ -262,12 +265,11 @@ static void test_font_events_disp(void) HRESULT hr; DWORD dwCookie; IFontDisp *pFontDisp; - static const WCHAR wszMSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f',0}; DISPPARAMS dispparams; VARIANTARG vararg; fontdesc.cbSizeofstruct = sizeof(fontdesc); - fontdesc.lpstrName = (LPOLESTR)wszMSSansSerif; + fontdesc.lpstrName = MSSansSerif_font; fontdesc.cySize.int64 = 12 * 10000; /* 12 pt */ fontdesc.sWeight = FW_NORMAL; fontdesc.sCharset = 0; @@ -484,8 +486,6 @@ static void test_Invoke(void) static void test_IsEqual() { FONTDESC fd; - static const WCHAR system_font[] = { 'S','y','s','t','e','m',0 }; - static const WCHAR arial_font[] = { 'A','r','i','a','l',0 }; LPVOID pvObj = NULL; LPVOID pvObj2 = NULL; IFont* ifnt = NULL; @@ -494,7 +494,7 @@ static void test_IsEqual() /* Basic font description */ fd.cbSizeofstruct = sizeof(FONTDESC); - fd.lpstrName = (WCHAR*)system_font; + fd.lpstrName = system_font; S(fd.cySize).Lo = 100; S(fd.cySize).Hi = 100; fd.sWeight = 0; @@ -521,12 +521,12 @@ static void test_IsEqual() "IFont_IsEqual: (NULL) Expected 0x80004003 but got 0x%08x\n",hres); /* Test strName */ - fd.lpstrName = (WCHAR*)arial_font; + fd.lpstrName = arial_font; pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (strName) Expected S_FALSE but got 0x%08x\n",hres); - fd.lpstrName = (WCHAR*)system_font; + fd.lpstrName = system_font; IFont_Release(ifnt2); /* Test lo font size */ @@ -602,8 +602,6 @@ static void test_IsEqual() static void test_ReleaseHfont(void) { FONTDESC fd; - static const WCHAR system_font[] = { 'S','y','s','t','e','m',0 }; - static const WCHAR arial_font[] = { 'A','r','i','a','l',0 }; LPVOID pvObj1 = NULL; LPVOID pvObj2 = NULL; IFont* ifnt1 = NULL; @@ -614,7 +612,7 @@ static void test_ReleaseHfont(void) /* Basic font description */ fd.cbSizeofstruct = sizeof(FONTDESC); - fd.lpstrName = (WCHAR*)system_font; + fd.lpstrName = system_font; S(fd.cySize).Lo = 100; S(fd.cySize).Hi = 100; fd.sWeight = 0; @@ -627,7 +625,7 @@ static void test_ReleaseHfont(void) pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj1); ifnt1 = pvObj1; IFont_get_hFont(ifnt1,&hfnt1); - fd.lpstrName = (WCHAR*)arial_font; + fd.lpstrName = arial_font; pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); ifnt2 = pvObj2; IFont_get_hFont(ifnt2,&hfnt2); @@ -674,8 +672,6 @@ static void test_ReleaseHfont(void) static void test_AddRefHfont(void) { FONTDESC fd; - static const WCHAR system_font[] = { 'S','y','s','t','e','m',0 }; - static const WCHAR arial_font[] = { 'A','r','i','a','l',0 }; LPVOID pvObj1 = NULL; LPVOID pvObj2 = NULL; LPVOID pvObj3 = NULL; @@ -689,7 +685,7 @@ static void test_AddRefHfont(void) /* Basic font description */ fd.cbSizeofstruct = sizeof(FONTDESC); - fd.lpstrName = (WCHAR*)system_font; + fd.lpstrName = system_font; S(fd.cySize).Lo = 100; S(fd.cySize).Hi = 100; fd.sWeight = 0; @@ -702,7 +698,7 @@ static void test_AddRefHfont(void) pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj1); ifnt1 = pvObj1; IFont_get_hFont(ifnt1,&hfnt1); - fd.lpstrName = (WCHAR*)arial_font; + fd.lpstrName = arial_font; pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); ifnt2 = pvObj2; IFont_get_hFont(ifnt2,&hfnt2);

1 0

Hans Leidekker : usp10: Initialise the caller supplied ABC structure in ScriptPlace.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: fb46c5f1c1e3f6bb7c21010fd2741d9082b80f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb46c5f1c1e3f6bb7c21010fd… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Jan 12 13:13:10 2007 +0100 usp10: Initialise the caller supplied ABC structure in ScriptPlace. Fixes a regression found by Lei Zhang. --- dlls/usp10/usp10.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 35cf0b2..4aab525 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1244,6 +1244,8 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRI if (!(lpABC = usp_zero_alloc(sizeof(ABC) * cGlyphs))) return E_OUTOFMEMORY; + memset(pABC, 0, sizeof(ABC)); + /* FIXME: set pGoffset to more reasonable values */ if (!GetCharABCWidthsI(((ScriptCache *)*psc)->hdc, 0, cGlyphs, (WORD *) pwGlyphs, lpABC )) {

1 0

Jacek Caban : urlmon: Added mk protocol stub implementation.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 76ce82374e81fce1cc5cad8bd728f33b965706f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ce82374e81fce1cc5cad8bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 12 12:31:54 2007 +0100 urlmon: Added mk protocol stub implementation. --- dlls/urlmon/Makefile.in | 1 + dlls/urlmon/mk.c | 205 ++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/tests/protocol.c | 32 +++++++ dlls/urlmon/urlmon_main.c | 4 + dlls/urlmon/urlmon_main.h | 1 + 5 files changed, 243 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76ce82374e81fce1cc5ca…

1 0

Jacek Caban : urlmon: Code clean up.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 243549c5b2011bc810663c9e445f97a612e63026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=243549c5b2011bc810663c9e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 12 12:31:04 2007 +0100 urlmon: Code clean up. --- dlls/urlmon/tests/url.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 0cd1e04..b1cb8f3 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -604,7 +604,7 @@ static void test_CreateAsyncBindCtxEx(vo IBindCtx_Release(bctx); } -static void test_BindToStorage(void) +static void test_BindToStorage(int protocol, BOOL emul) { IMoniker *mon; HRESULT hres; @@ -615,6 +615,9 @@ static void test_BindToStorage(void) IUnknown *unk = (IUnknown*)0x00ff00ff; IBinding *bind; + test_protocol = protocol; + emulate_protocol = emul; + hres = CreateAsyncBindCtx(0, &bsc, NULL, &bctx); ok(SUCCEEDED(hres), "CreateAsyncBindCtx failed: %08x\n\n", hres); if(FAILED(hres)) @@ -779,33 +782,24 @@ START_TEST(url) test_CreateAsyncBindCtxEx(); trace("http test...\n"); - emulate_protocol = FALSE; - test_protocol = HTTP_TEST; - test_BindToStorage(); + test_BindToStorage(HTTP_TEST, FALSE); trace("about test...\n"); - test_protocol = ABOUT_TEST; CoInitialize(NULL); - test_BindToStorage(); + test_BindToStorage(ABOUT_TEST, FALSE); CoUninitialize(); trace("emulated about test...\n"); - emulate_protocol = TRUE; - test_protocol = ABOUT_TEST; - test_BindToStorage(); + test_BindToStorage(ABOUT_TEST, TRUE); trace("file test...\n"); create_file(); - emulate_protocol = FALSE; - test_protocol = FILE_TEST; - test_BindToStorage(); + test_BindToStorage(FILE_TEST, FALSE); DeleteFileW(wszIndexHtml); trace("emulated file test...\n"); set_file_url(); - emulate_protocol = TRUE; - test_protocol = FILE_TEST; - test_BindToStorage(); + test_BindToStorage(FILE_TEST, TRUE); test_BindToStorage_fail(); }

1 0

Alexandre Julliard : ntdll: Make the virtual. c critical section uninterruptible by signals.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 146fb0de02f705837a1cf52936fe02b41b8d5ffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=146fb0de02f705837a1cf5293… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 12 20:15:52 2007 +0100 ntdll: Make the virtual.c critical section uninterruptible by signals. Based on a patch by Thomas Kho. --- dlls/ntdll/ntdll_misc.h | 3 ++ dlls/ntdll/server.c | 20 +++++++++++++++ dlls/ntdll/virtual.c | 61 +++++++++++++++++++++++++++------------------- 3 files changed, 59 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=146fb0de02f705837a1cf…

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2007