April 2008 - Wine-commits - list.winehq.org

Michael Stefaniuc : start: Update the German translation.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 1cb8e96da9326faca581778769129870e9df1fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb8e96da9326faca58177876… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 24 01:04:40 2008 +0200 start: Update the German translation. --- programs/start/De.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/start/De.rc b/programs/start/De.rc index bf0f5c5..600de90 100644 --- a/programs/start/De.rc +++ b/programs/start/De.rc @@ -61,4 +61,6 @@ Schau in die Datei COPYING.LIB f " STRING_EXECFAIL "Es konnte keine Anwendung gestartet werden, oder es ist keine Anwendung mit der angegebenen Datei verkn�pft.\nShellExecuteEx gescheitert" + +STRING_UNIXFAIL "Der angegebene Unix Dateiname konnte nicht in einen DOS Dateinamen umgewandelt werden." }

1 0

James Hawkins : pdh: Fix two tests that fail on win2k3.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 6c59a15a1912e75e79f5ae661e8995493aa7c797 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c59a15a1912e75e79f5ae661… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 23 18:05:02 2008 -0500 pdh: Fix two tests that fail on win2k3. --- dlls/pdh/tests/pdh.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 7b31cb4..4b7c562 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -647,7 +647,9 @@ static void test_PdhLookupPerfNameByIndexA( void ) size = sizeof(buffer); ret = PdhLookupPerfNameByIndexA( NULL, 674, NULL, &size ); - ok(ret == PDH_INVALID_ARGUMENT, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); + ok(ret == PDH_INVALID_ARGUMENT || + ret == PDH_MORE_DATA, /* win2k3 */ + "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); size = sizeof(buffer); ret = PdhLookupPerfNameByIndexA( NULL, 674, buffer, &size ); @@ -677,7 +679,9 @@ static void test_PdhLookupPerfNameByIndexW( void ) size = sizeof(buffer) / sizeof(WCHAR); ret = PdhLookupPerfNameByIndexW( NULL, 674, NULL, &size ); - ok(ret == PDH_INVALID_ARGUMENT, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); + ok(ret == PDH_INVALID_ARGUMENT || + ret == PDH_MORE_DATA, /* win2k3 */ + "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); size = sizeof(buffer) / sizeof(WCHAR); ret = PdhLookupPerfNameByIndexW( NULL, 674, buffer, &size );

1 0

Andrew Talbot : riched20: Remove unused variables.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 0ba867743012bd324377c47aaa358bcdb86165c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba867743012bd324377c47aa… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Apr 23 22:13:07 2008 +0100 riched20: Remove unused variables. --- dlls/riched20/editor.c | 3 --- dlls/riched20/paint.c | 3 +-- dlls/riched20/style.c | 3 +-- dlls/riched20/wrap.c | 4 +--- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9c4a013..c5a7554 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3531,7 +3531,6 @@ int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar) int car_pos = 0; int text_pos=-1; int URLmin, URLmax = 0; - CHARRANGE url; FINDTEXTA ft; CHARFORMAT2W cur_format; CHARFORMAT2W default_format; @@ -3585,8 +3584,6 @@ int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar) } if (text_pos != -1) { - url.cpMin=text_pos; - url.cpMax=car_pos-1; ME_SetCharFormat(editor, text_pos, (URLmax-text_pos), &link); ME_RewrapRepaint(editor); break; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index e6ec8ce..ddd7de7 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -479,7 +479,7 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { RECT rc, rcPara; int y = c->pt.y; int height = 0, baseline = 0, no=0, pno = 0; - int xs = 0, xe = 0; + int xe = 0; BOOL visible = FALSE; int nMargWidth = 0; @@ -494,7 +494,6 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { nMargWidth = ME_twips2pointsX(c, para->pFmt->dxStartIndent); if (pno != 0) nMargWidth += ME_twips2pointsX(c, para->pFmt->dxOffset); - xs = c->rcView.left+nMargWidth; xe = c->rcView.right - ME_twips2pointsX(c, para->pFmt->dxRightIndent); y += ME_DrawParaDecoration(c, para, y); break; diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 0ec822e..b483be0 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -327,10 +327,9 @@ ME_LogFontFromStyle(ME_Context* c, LOGFONTW *lf, const ME_Style *s) void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt) { - int rx, ry; + int ry; ME_InitCharFormat2W(fmt); - rx = GetDeviceCaps(hDC, LOGPIXELSX); ry = GetDeviceCaps(hDC, LOGPIXELSY); lstrcpyW(fmt->szFaceName, lf->lfFaceName); fmt->dwEffects = 0; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index a657b03..43d3d79 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -470,7 +470,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_DisplayItem *item; ME_Context c; BOOL bModified = FALSE; - int yStart = -1, yEnd = -1; + int yStart = -1; ME_InitContext(&c, editor, GetDC(editor->hWnd)); c.pt.x = 0; @@ -499,8 +499,6 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { bModified = bModified | bRedraw; c.pt.y += item->member.para.nHeight; - if (bRedraw) - yEnd = c.pt.y; item = item->member.para.next_para; } editor->sizeWindow.cx = c.rcView.right-c.rcView.left;

1 0

Andrew Talbot : quartz: Remove unused variables.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 523552fcc3fd88471755abc55598e01094986388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=523552fcc3fd88471755abc55… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Apr 23 22:13:04 2008 +0100 quartz: Remove unused variables. --- dlls/quartz/avidec.c | 2 -- dlls/quartz/mpegsplit.c | 5 +---- dlls/quartz/videorenderer.c | 9 --------- 3 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 83d212c..d449662 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -70,7 +70,6 @@ static HRESULT AVIDec_ProcessBegin(TransformFilterImpl* pTransformFilter) static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, IMediaSample *pSample) { AVIDecImpl* This = (AVIDecImpl*)pTransformFilter; - VIDEOINFOHEADER* format; AM_MEDIA_TYPE amt; HRESULT hr; DWORD res; @@ -96,7 +95,6 @@ static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, I ERR("Unable to retrieve media type\n"); goto error; } - format = (VIDEOINFOHEADER*)amt.pbFormat; /* Update input size to match sample size */ This->pBihIn->biSizeImage = cbSrcStream; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 395ce71..eb2cb4b 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -123,7 +123,7 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) { LONGLONG duration; - int bitrate_index, freq_index, mode_ext, emphasis, lsf = 1, mpeg1, layer, mode, padding, bitrate, length; + int bitrate_index, freq_index, lsf = 1, mpeg1, layer, padding, bitrate, length; if (!(header[0] == 0xff && ((header[1]>>5)&0x7) == 0x7 && ((header[1]>>1)&0x3) != 0 && ((header[2]>>4)&0xf) != 0xf && @@ -141,9 +141,6 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) bitrate_index = ((header[2]>>4)&0xf); freq_index = ((header[2]>>2)&0x3) + (mpeg1?(lsf*3):6); padding = ((header[2]>>1)&0x1); - mode = ((header[3]>>6)&0x3); - mode_ext = ((header[3]>>4)&0x3); - emphasis = ((header[3]>>0)&0x3); bitrate = tabsel_123[lsf][layer-1][bitrate_index] * 1000; if (!bitrate || layer != 3) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f49f8fb..97bb825 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -267,16 +267,11 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, { AM_MEDIA_TYPE amt; HRESULT hr = S_OK; - DDSURFACEDESC sdesc; - int width; - int height; - LPBYTE palette = NULL; HDC hDC; BITMAPINFOHEADER *bmiHeader; TRACE("%p %p %d\n", This, data, size); - sdesc.dwSize = sizeof(sdesc); hr = IPin_ConnectionMediaType(This->ppPins[0], &amt); if (FAILED(hr)) { ERR("Unable to retrieve media type\n"); @@ -306,10 +301,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4)); TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage); - width = bmiHeader->biWidth; - height = bmiHeader->biHeight; - palette = ((LPBYTE)bmiHeader) + bmiHeader->biSize; - if (!This->init) { if (!This->WindowPos.right || !This->WindowPos.bottom)

1 0

Andrew Talbot : qcap: Remove unused variable.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 1e52433f017a62c1241c2d86af5e0649c5abb789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e52433f017a62c1241c2d86a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Apr 23 22:13:01 2008 +0100 qcap: Remove unused variable. --- dlls/qcap/yuv.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/yuv.c b/dlls/qcap/yuv.c index 26048e1..29aa1f2 100644 --- a/dlls/qcap/yuv.c +++ b/dlls/qcap/yuv.c @@ -140,14 +140,13 @@ static void Parse_PYUV(unsigned char *destbuffer, const unsigned char *input, in /* We have 3 pointers, One to Y, one to Cb and 1 to Cr */ /* C19 *89* declaration block (Grr julliard for not allowing C99) */ - int uvjump, ysize, uvsize; + int ysize, uvsize; const unsigned char *pY, *pCb, *pCr; int swstep = 0, shstep = 0; int ypos = 0, xpos = 0; int indexUV = 0, cUv; /* End of Grr */ - uvjump = width / wstep; ysize = width * height; uvsize = (width / wstep) * (height / hstep); pY = input;

1 0

Rob Shearman : wintrust: Check that provider functions are not NULL before using them.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 91d5844f76df3dccd2537042538a7970c8642a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d5844f76df3dccd25370425… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 23 20:10:14 2008 +0100 wintrust: Check that provider functions are not NULL before using them. --- dlls/wintrust/wintrust_main.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 47c0865..f7fc3ca 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -111,19 +111,32 @@ static LONG WINTRUST_DefaultVerify(HWND hwnd, GUID *actionID, provData->pgActionID = actionID; WintrustGetRegPolicyFlags(&provData->dwRegPolicySettings); - err = provData->psPfns->pfnInitialize(provData); - if (err) - goto done; - err = provData->psPfns->pfnObjectTrust(provData); - if (err) - goto done; - err = provData->psPfns->pfnSignatureTrust(provData); - if (err) - goto done; - err = provData->psPfns->pfnCertificateTrust(provData); - if (err) - goto done; - err = provData->psPfns->pfnFinalPolicy(provData); + if (provData->psPfns->pfnInitialize) + { + err = provData->psPfns->pfnInitialize(provData); + if (err) + goto done; + } + if (provData->psPfns->pfnObjectTrust) + { + err = provData->psPfns->pfnObjectTrust(provData); + if (err) + goto done; + } + if (provData->psPfns->pfnSignatureTrust) + { + err = provData->psPfns->pfnSignatureTrust(provData); + if (err) + goto done; + } + if (provData->psPfns->pfnCertificateTrust) + { + err = provData->psPfns->pfnCertificateTrust(provData); + if (err) + goto done; + } + if (provData->psPfns->pfnFinalPolicy) + err = provData->psPfns->pfnFinalPolicy(provData); goto done; oom:

1 0

Rob Shearman : wintrust: Implement WTHelperGetProvPrivateDataFromChain.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 8e0f125f458fc935d0c6f1b88f46d5ab7eaf306a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e0f125f458fc935d0c6f1b88… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 23 20:09:19 2008 +0100 wintrust: Implement WTHelperGetProvPrivateDataFromChain. Also fill in pfnAddPrivData2Chain in WintrustLoadFunctionPointers, which is the complement of WTHelperGetProvPrivateDataFromChain. --- dlls/wintrust/register.c | 2 +- dlls/wintrust/wintrust.spec | 2 +- dlls/wintrust/wintrust_main.c | 57 +++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust_priv.h | 2 + include/wintrust.h | 1 + 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index e039ab4..05e48ef 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -862,7 +862,7 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, pPfns->pfnAddStore2Chain = WINTRUST_AddStore; pPfns->pfnAddSgnr2Chain = WINTRUST_AddSgnr; pPfns->pfnAddCert2Chain = WINTRUST_AddCert; - pPfns->pfnAddPrivData2Chain = NULL; + pPfns->pfnAddPrivData2Chain = WINTRUST_AddPrivData; pPfns->psUIpfns = NULL; pPfns->pfnInitialize = (PFN_PROVIDER_INIT_CALL)WINTRUST_ReadProviderFromReg(GuidString, Initialization); pPfns->pfnObjectTrust = (PFN_PROVIDER_OBJTRUST_CALL)WINTRUST_ReadProviderFromReg(GuidString, Message); diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 552cfdd..191e3d1 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -81,7 +81,7 @@ @ stdcall WTHelperGetFileName(ptr) @ stub WTHelperGetKnownUsages @ stdcall WTHelperGetProvCertFromChain(ptr long) -@ stub WTHelperGetProvPrivateDataFromChain +@ stdcall WTHelperGetProvPrivateDataFromChain(ptr ptr) @ stdcall WTHelperGetProvSignerFromChain(ptr long long long) @ stub WTHelperIsInRootStore @ stub WTHelperOpenKnownStores diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index c5b1612..47c0865 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -425,6 +425,25 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain( return cert; } +CRYPT_PROVIDER_PRIVDATA *WINAPI WTHelperGetProvPrivateDataFromChain( + CRYPT_PROVIDER_DATA* pProvData, + GUID* pgProviderID) +{ + CRYPT_PROVIDER_PRIVDATA *privdata = NULL; + DWORD i; + + TRACE("(%p, %s)\n", pProvData, debugstr_guid(pgProviderID)); + + for (i = 0; i < pProvData->csProvPrivData; i++) + if (IsEqualGUID(pgProviderID, &pProvData->pasProvPrivData[i].gProviderID)) + { + privdata = &pProvData->pasProvPrivData[i]; + break; + } + + return privdata; +} + /*********************************************************************** * WTHelperProvDataFromStateData (WINTRUST.@) */ @@ -649,3 +668,41 @@ BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, SetLastError(ERROR_OUTOFMEMORY); return ret; } + +BOOL WINAPI WINTRUST_AddPrivData(CRYPT_PROVIDER_DATA *data, + CRYPT_PROVIDER_PRIVDATA *pPrivData2Add) +{ + BOOL ret = FALSE; + + TRACE("(%p, %p)\n", data, pPrivData2Add); + + if (pPrivData2Add->cbStruct > sizeof(CRYPT_PROVIDER_PRIVDATA)) + { + SetLastError(ERROR_INVALID_PARAMETER); + WARN("invalid struct size\n"); + return FALSE; + } + if (data->csProvPrivData) + data->pasProvPrivData = WINTRUST_ReAlloc(data->pasProvPrivData, + (data->csProvPrivData + 1) * sizeof(CRYPT_PROVIDER_SGNR)); + else + { + data->pasProvPrivData = WINTRUST_Alloc(sizeof(CRYPT_PROVIDER_SGNR)); + data->csProvPrivData = 0; + } + if (data->pasProvPrivData) + { + DWORD i; + + for (i = 0; i < data->csProvPrivData; i++) + if (IsEqualGUID(&pPrivData2Add->gProviderID, &data->pasProvPrivData[i])) + break; + + data->pasProvPrivData[i] = *pPrivData2Add; + if (i == data->csProvPrivData) + data->csProvPrivData++; + } + else + SetLastError(ERROR_OUTOFMEMORY); + return ret; +} diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index 4519bd9..c73f666 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -26,5 +26,7 @@ BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr); BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add); +BOOL WINAPI WINTRUST_AddPrivData(CRYPT_PROVIDER_DATA *data, + CRYPT_PROVIDER_PRIVDATA *pPrivData2Add); #endif /* ndef __WINTRUST_PRIV_H__ */ diff --git a/include/wintrust.h b/include/wintrust.h index bc1c367..5408ad4 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -428,6 +428,7 @@ CRYPT_PROVIDER_SGNR * WINAPI WTHelperGetProvSignerFromChain( CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSigner, DWORD idxCounterSigner); CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData); +CRYPT_PROVIDER_PRIVDATA * WINAPI WTHelperGetProvPrivateDataFromChain(CRYPT_PROVIDER_DATA *,GUID *); #define SPC_INDIRECT_DATA_OBJID "1.3.6.1.4.1.311.2.1.4" #define SPC_SP_AGENCY_INFO_OBJID "1.3.6.1.4.1.311.2.1.10"

1 0

Reece Dunn : shlwapi/tests: Add 'res:' protocol tests for UrlCanonicalize.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 48f39dc9955de76502f534c6595444a7e359dcc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f39dc9955de76502f534c65… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Tue Apr 22 13:35:34 2008 +0100 shlwapi/tests: Add 'res:' protocol tests for UrlCanonicalize. --- dlls/shlwapi/tests/url.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 8a40cc2..cd7a5f2 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -87,6 +87,16 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"c:dir\\file", 0, S_OK, "file:///c:dir/file", FALSE}, {"c:\\tests\\foo bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar", FALSE}, {"c:\\tests\\foo bar", 0, S_OK, "file:///c:/tests/foo%20bar", FALSE}, + {"res:///c:/tests/foo%20bar", URL_UNESCAPE , S_OK, "res:///c:/tests/foo bar", FALSE}, + {"res:///c:/tests\\foo%20bar", URL_UNESCAPE , S_OK, "res:///c:/tests\\foo bar", TRUE}, + {"res:///c:/tests/foo%20bar", 0, S_OK, "res:///c:/tests/foo%20bar", FALSE}, + {"res:///c:/tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "res:///c:/tests/foo%20bar", TRUE}, + {"res://c:/tests/../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "res://c:/tests/foo%20bar", TRUE}, + {"res://c:/tests\\../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "res://c:/tests/foo%20bar", TRUE}, + {"res://c:/tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "res://c:/tests/foo%20bar", TRUE}, + {"res:///c://tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "res:///c://tests/foo%20bar", TRUE}, + {"res:///c:\\tests\\foo bar", 0, S_OK, "res:///c:\\tests\\foo bar", TRUE}, + {"res:///c:\\tests\\foo bar", URL_DONT_SIMPLIFY, S_OK, "res:///c:\\tests\\foo bar", TRUE}, {"A", 0, S_OK, "A", FALSE}, {"/uri-res/N2R?urn:sha1:B3K", URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/, S_OK, "/uri-res/N2R?urn:sha1:B3K", TRUE} /*LimeWire online installer calls this*/, {"", 0, S_OK, "", FALSE}

1 0

Rob Shearman : crypt32: Decode the message content on finishing in CDecodeMsg_Update for the streamed case as well as the non-streamed case .
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 3f2ea57013dc4f23073beb3d8c8b1aa7a94f1051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f2ea57013dc4f23073beb3d8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 23 20:08:50 2008 +0100 crypt32: Decode the message content on finishing in CDecodeMsg_Update for the streamed case as well as the non-streamed case. --- dlls/crypt32/msg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 056c698..0972436 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1673,6 +1673,9 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, { ret = CDecodeMsg_CopyData(msg, pbData, cbData); msg->base.state = MsgStateDataFinalized; + if (ret) + ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, + msg->type); } else {

1 0

Alex Villacís Lasso : riched20: Yet more tests for EM_STREAMIN.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: a9caca3edabec21f5c4d5de5fd25198cfa25b33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9caca3edabec21f5c4d5de5f… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Apr 23 09:52:14 2008 -0500 riched20: Yet more tests for EM_STREAMIN. --- dlls/riched20/tests/editor.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 69d9ac3..236a777 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2328,6 +2328,10 @@ static void test_EM_STREAMIN(void) EDITSTREAM es; char buffer[1024] = {0}; + const char * streamText0 = "{\\rtf1 TestSomeText}"; + const char * streamText0a = "{\\rtf1 TestSomeText\\par}"; + const char * streamText0b = "{\\rtf1 TestSomeText\\par\\par}"; + const char * streamText1 = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang12298{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 System;}}\r\n" \ "\\viewkind4\\uc1\\pard\\f0\\fs17 TestSomeText\\par\r\n" \ @@ -2345,6 +2349,56 @@ static void test_EM_STREAMIN(void) const char * streamText3 = "RichEdit1"; + /* Minimal test without \par at the end */ + es.dwCookie = (DWORD_PTR)&streamText0; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok (result == 12, + "EM_STREAMIN: Test 0 returned %ld, expected 12\n", result); + result = strcmp (buffer,"TestSomeText"); + ok (result == 0, + "EM_STREAMIN: Test 0 set wrong text: Result: %s\n",buffer); + + /* Native richedit 2.0 ignores last \par */ + es.dwCookie = (DWORD_PTR)&streamText0a; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + todo_wine { + ok (result == 12, + "EM_STREAMIN: Test 0-a returned %ld, expected 12\n", result); + } + result = strcmp (buffer,"TestSomeText"); + todo_wine { + ok (result == 0, + "EM_STREAMIN: Test 0-a set wrong text: Result: %s\n",buffer); + } + + /* Native richedit 2.0 ignores last \par, next-to-last \par appears */ + es.dwCookie = (DWORD_PTR)&streamText0b; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + todo_wine { + ok (result == 14, + "EM_STREAMIN: Test 0-b returned %ld, expected 14\n", result); + } + result = strcmp (buffer,"TestSomeText\r\n"); + todo_wine { + ok (result == 0, + "EM_STREAMIN: Test 0-b set wrong text: Result: %s\n",buffer); + } + es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback;

1 0