wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Huw Davies : gdi32: Add a helper to fill out the colour table from the current palette.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 8cc8552a01728036db1890c9d8821d0f235faabe URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cc8552a01728036db1890c9d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 22 15:09:59 2011 +0100 gdi32: Add a helper to fill out the colour table from the current palette. --- dlls/gdi32/dib.c | 37 +++++++++++++++++++++++++------------ 1 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 85a8992..995c5d7 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -209,6 +209,30 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * return TRUE; } +static int fill_color_table_from_palette( BITMAPINFO *info, DC *dc ) +{ + PALETTEENTRY palEntry[256]; + int i, colors = (info->bmiHeader.biBitCount > 8) ? 0 : 1 << info->bmiHeader.biBitCount; + + if (info->bmiHeader.biClrUsed) colors = info->bmiHeader.biClrUsed; + + if (!colors) return 0; + + memset( palEntry, 0, sizeof(palEntry) ); + if (!GetPaletteEntries( dc->hPalette, 0, colors, palEntry )) + return 0; + + for (i = 0; i < colors; i++) + { + info->bmiColors[i].rgbRed = palEntry[i].peRed; + info->bmiColors[i].rgbGreen = palEntry[i].peGreen; + info->bmiColors[i].rgbBlue = palEntry[i].peBlue; + info->bmiColors[i].rgbReserved = 0; + } + + return colors; +} + /* nulldrv fallback implementation using SetDIBits/StretchBlt */ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits, @@ -715,22 +739,11 @@ INT WINAPI GetDIBits( case we'll fix up the indices after the format conversion. */ else if ( (bpp > 1 && bpp == bmp->bitmap.bmBitsPixel) || coloruse == DIB_PAL_COLORS ) { - PALETTEENTRY palEntry[256]; - - memset( palEntry, 0, sizeof(palEntry) ); - if (!GetPaletteEntries( dc->hPalette, 0, colors, palEntry )) + if (!fill_color_table_from_palette( dst_info, dc )) { lines = 0; goto done; } - - for (i = 0; i < colors; i++) - { - dst_info->bmiColors[i].rgbRed = palEntry[i].peRed; - dst_info->bmiColors[i].rgbGreen = palEntry[i].peGreen; - dst_info->bmiColors[i].rgbBlue = palEntry[i].peBlue; - dst_info->bmiColors[i].rgbReserved = 0; - } } else fill_default_color_table( dst_info );

1 0

Huw Davies : gdi32: Add a helper to sanitize a BITMAPINFO structure.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 6ce6f890bef2257af50a78e7deee86bdce052189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce6f890bef2257af50a78e7d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 22 15:09:58 2011 +0100 gdi32: Add a helper to sanitize a BITMAPINFO structure. --- dlls/gdi32/dib.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 7e5354b..85a8992 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -136,6 +136,79 @@ int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, return -1; } +/******************************************************************************************* + * Fill out a true BITMAPINFO from a variable sized BITMAPINFO / BITMAPCOREINFO. + */ +static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *info, UINT coloruse ) +{ + LONG width, height; + WORD planes, bpp; + DWORD compr, size; + void *src_colors = (char *)info + info->bmiHeader.biSize; + unsigned int colors; + int bitmap_type = DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, &planes, &bpp, &compr, &size ); + + if (bitmap_type == -1) return FALSE; + + colors = (bpp > 8) ? 0 : 1 << bpp; + + if (bitmap_type == 1) + { + dst->bmiHeader = info->bmiHeader; + dst->bmiHeader.biSize = sizeof(dst->bmiHeader); + + if (info->bmiHeader.biClrUsed) colors = info->bmiHeader.biClrUsed; + + if (info->bmiHeader.biCompression == BI_BITFIELDS) + /* bitfields are always at bmiColors even in larger structures */ + memcpy( dst->bmiColors, info->bmiColors, 3 * sizeof(DWORD) ); + else if (colors) + { + unsigned int size; + + if (coloruse == DIB_PAL_COLORS) + size = colors * sizeof(WORD); + else + size = colors * sizeof(RGBQUAD); + memcpy( dst->bmiColors, src_colors, size ); + } + } + else + { + dst->bmiHeader.biSize = sizeof(dst->bmiHeader); + dst->bmiHeader.biWidth = width; + dst->bmiHeader.biHeight = height; + dst->bmiHeader.biPlanes = planes; + dst->bmiHeader.biBitCount = bpp; + dst->bmiHeader.biCompression = compr; + dst->bmiHeader.biSizeImage = size; + dst->bmiHeader.biXPelsPerMeter = 0; + dst->bmiHeader.biYPelsPerMeter = 0; + dst->bmiHeader.biClrUsed = 0; + dst->bmiHeader.biClrImportant = 0; + + if (colors) + { + if (coloruse == DIB_PAL_COLORS) + memcpy( dst->bmiColors, src_colors, colors * sizeof(WORD) ); + else + { + unsigned int i; + RGBTRIPLE *triple = (RGBTRIPLE *)src_colors; + for (i = 0; i < colors; i++) + { + dst->bmiColors[i].rgbRed = triple[i].rgbtRed; + dst->bmiColors[i].rgbGreen = triple[i].rgbtGreen; + dst->bmiColors[i].rgbBlue = triple[i].rgbtBlue; + dst->bmiColors[i].rgbReserved = 0; + } + } + } + } + + return TRUE; +} + /* nulldrv fallback implementation using SetDIBits/StretchBlt */ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits, @@ -256,6 +329,8 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, BOOL delete_hdc = FALSE; PHYSDEV physdev; BITMAPOBJ *bitmap; + char src_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *src_info = (BITMAPINFO *)src_bmibuf; INT result = 0; if (coloruse == DIB_RGB_COLORS && !dc) @@ -276,10 +351,14 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, return 0; } + if (!bitmapinfo_from_user_bitmapinfo( src_info, info, coloruse )) goto done; + physdev = GET_DC_PHYSDEV( dc, pSetDIBits ); - if (BITMAP_SetOwnerDC( hbitmap, physdev )) - result = physdev->funcs->pSetDIBits( physdev, hbitmap, startscan, lines, bits, info, coloruse ); + if (!BITMAP_SetOwnerDC( hbitmap, physdev )) goto done; + result = physdev->funcs->pSetDIBits( physdev, hbitmap, startscan, lines, bits, src_info, coloruse ); + +done: GDI_ReleaseObj( hbitmap ); release_dc_ptr( dc ); if (delete_hdc) DeleteDC(hdc);

1 0

Jacek Caban : mshtml: Return NS_BINDING_ABORTED for canceled binding in AsyncOpen.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 69f900688943f6df6abdac22d2d21127c20a15f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f900688943f6df6abdac22d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 22 15:35:47 2011 +0200 mshtml: Return NS_BINDING_ABORTED for canceled binding in AsyncOpen. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e9f7092..ca2b763 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -997,7 +997,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen nsres = before_async_open(This, window->doc_obj->nscontainer, &cancel); if(NS_SUCCEEDED(nsres) && cancel) { TRACE("canceled\n"); - nsres = NS_ERROR_UNEXPECTED; + nsres = NS_BINDING_ABORTED; } } }

1 0

Jacek Caban : mshtml: Make execScript tests more generic.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 041d7d229631029845431dcbf1003f8a2373abd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=041d7d229631029845431dcbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 22 15:00:18 2011 +0200 mshtml: Make execScript tests more generic. --- dlls/mshtml/tests/script.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 092d4a7..93183d0 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -181,6 +181,9 @@ static BSTR a2bstr(const char *str) BSTR ret; int len; + if(!str) + return NULL; + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); ret = SysAllocStringLen(NULL, len); MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); @@ -2454,7 +2457,7 @@ static const char simple_script_str[] = "<script language=\"TestScript\">simple script</script>" "</body></html>"; -static void test_exec_script(IHTMLDocument2 *doc) +static void test_exec_script(IHTMLDocument2 *doc, const char *codea, const char *langa) { IHTMLWindow2 *window; BSTR code, lang; @@ -2464,8 +2467,8 @@ static void test_exec_script(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_parentWindow(doc, &window); ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); - code = a2bstr("execScript call"); - lang = a2bstr("TestScript"); + code = a2bstr(codea); + lang = a2bstr(langa); SET_EXPECT(ParseScriptText_execScript); hres = IHTMLWindow2_execScript(window, code, lang, &v); @@ -2524,7 +2527,7 @@ static void test_simple_script(void) CHECK_CALLED(ParseScriptText_script); CHECK_CALLED(SetScriptState_CONNECTED); - test_exec_script(doc); + test_exec_script(doc, "execScript call", "TestScript"); if(site) IActiveScriptSite_Release(site);

1 0

Jacek Caban : urlmon: Added support for javascript URIs.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: e722268d53f27c5e219b901f6c88b7643c38f5f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e722268d53f27c5e219b901f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 22 14:44:26 2011 +0200 urlmon: Added support for javascript URIs. --- dlls/urlmon/tests/uri.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 18 +++++++++++ 2 files changed, 93 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 477722f..a11b9d0 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4192,7 +4192,81 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, - + { "javascript:void", 0, S_OK, FALSE, + { + {"javascript:void",S_OK}, + {"",S_FALSE}, + {"javascript:void",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"void",S_OK}, + {"void",S_OK}, + {"",S_FALSE}, + {"javascript:void",S_OK}, + {"javascript",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_JAVASCRIPT,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "javascript://undefined", 0, S_OK, FALSE, + { + {"javascript://undefined",S_OK}, + {"",S_FALSE}, + {"javascript://undefined",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"//undefined",S_OK}, + {"//undefined",S_OK}, + {"",S_FALSE}, + {"javascript://undefined",S_OK}, + {"javascript",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_JAVASCRIPT,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "JavaSCript:escape('/\\?#?')", 0, S_OK, FALSE, + { + {"javascript:escape('/\\?#?')",S_OK}, + {"",S_FALSE}, + {"javascript:escape('/\\?#?')",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"escape('/\\?#?')",S_OK}, + {"escape('/\\?#?')",S_OK}, + {"",S_FALSE}, + {"JavaSCript:escape('/\\?#?')",S_OK}, + {"javascript",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_JAVASCRIPT,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + } }; typedef struct _invalid_uri { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 33d0eb2..4586f9d 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -2068,6 +2068,15 @@ static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) static BOOL parse_hierpart(const WCHAR **ptr, parse_data *data, DWORD flags) { const WCHAR *start = *ptr; + /* For javascript: URIs, simply set everything as a path */ + if(data->scheme_type == URL_SCHEME_JAVASCRIPT) { + data->path = *ptr; + data->path_len = strlenW(*ptr); + data->is_opaque = TRUE; + *ptr += data->path_len; + return TRUE; + } + /* Checks if the authority information needs to be parsed. */ if(is_hierarchical_uri(ptr, data)) { /* Only treat it as a hierarchical URI if the scheme_type is known or @@ -3079,6 +3088,15 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla uri->path_start = uri->canon_len; + /* For javascript: URIs, simply copy path part withoutany canonicalization */ + if(data->scheme_type == URL_SCHEME_JAVASCRIPT) { + if(!computeOnly) + memcpy(uri->canon_uri+uri->canon_len, data->path, data->path_len*sizeof(WCHAR)); + uri->path_len = data->path_len; + uri->canon_len += data->path_len; + return TRUE; + } + /* Windows doesn't allow a "//" to appear after the scheme * of a URI, if it's an opaque URI. */

1 0

Akihiro Sagawa : dsound: Don't copy the position notify on duplicate.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 2ab3d22663818eeb3cc586f9531f1ca55233dac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab3d22663818eeb3cc586f95… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 21 21:53:48 2011 +0900 dsound: Don't copy the position notify on duplicate. --- dlls/dsound/buffer.c | 2 ++ dlls/dsound/tests/dsound.c | 7 +------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index dbec55d..eb8e372 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1214,6 +1214,8 @@ HRESULT IDirectSoundBufferImpl_Duplicate( dsb->state = STATE_STOPPED; dsb->buf_mixpos = dsb->sec_mixpos = 0; dsb->notify = NULL; + dsb->notifies = NULL; + dsb->nrofnotifies = 0; dsb->device = device; dsb->ds3db = NULL; dsb->iks = NULL; /* FIXME? */ diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 1eef7fb..64b188c 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1063,12 +1063,7 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb, return rc; ret=WaitForMultipleObjects(count,event,FALSE,0); - if (expected != WAIT_OBJECT_0+1) { - todo_wine - ok(ret==expected,"expected %d. got %d\n",expected,ret); - } - else - ok(ret==expected,"expected %d. got %d\n",expected,ret); + ok(ret==expected,"expected %d. got %d\n",expected,ret); return rc; }

1 0

Akihiro Sagawa : dsound: Don't copy the notify object on duplicate.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 3c9bd6ba2afef7f91a8bb18f8b55b3877790369a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9bd6ba2afef7f91a8bb18f8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 21 21:53:46 2011 +0900 dsound: Don't copy the notify object on duplicate. --- dlls/dsound/buffer.c | 1 + dlls/dsound/tests/dsound.c | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 4c25402..dbec55d 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1213,6 +1213,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( dsb->ref = 0; dsb->state = STATE_STOPPED; dsb->buf_mixpos = dsb->sec_mixpos = 0; + dsb->notify = NULL; dsb->device = device; dsb->ds3db = NULL; dsb->iks = NULL; /* FIXME? */ diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 7eb882d..1eef7fb 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1185,7 +1185,6 @@ static HRESULT test_duplicate(LPGUID lpGuid) event,WAIT_OBJECT_0+1); ref=IDirectSoundNotify_Release(dup_notify); - todo_wine ok(ref==0,"IDirectSoundNotify_Release() has %d references, " "should have 0\n",ref); }

1 0

Akihiro Sagawa : dsound/tests: Add tests to check notifications after duplicate.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 223406fa17a57af3d6420b1a9d60ad5e282cd35f URL: http://source.winehq.org/git/wine.git/?a=commit;h=223406fa17a57af3d6420b1a9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 21 21:53:43 2011 +0900 dsound/tests: Add tests to check notifications after duplicate. --- dlls/dsound/tests/dsound.c | 186 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 186 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index f8b7aeb..7eb882d 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1039,6 +1039,191 @@ EXIT: return rc; } +static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb, + DWORD count, LPHANDLE event, + DWORD expected) +{ + HRESULT rc; + DWORD ret; + + rc=IDirectSoundBuffer_SetCurrentPosition(dsb,0); + ok(rc==DS_OK, + "IDirectSoundBuffer_SetCurrentPosition failed %08x\n",rc); + if(rc!=DS_OK) + return rc; + + rc=IDirectSoundBuffer_Play(dsb,0,0,0); + ok(rc==DS_OK,"IDirectSoundBuffer_Play failed %08x\n",rc); + if(rc!=DS_OK) + return rc; + + rc=IDirectSoundBuffer_Stop(dsb); + ok(rc==DS_OK,"IDirectSoundBuffer_Stop failed %08x\n",rc); + if(rc!=DS_OK) + return rc; + + ret=WaitForMultipleObjects(count,event,FALSE,0); + if (expected != WAIT_OBJECT_0+1) { + todo_wine + ok(ret==expected,"expected %d. got %d\n",expected,ret); + } + else + ok(ret==expected,"expected %d. got %d\n",expected,ret); + return rc; +} + +static HRESULT test_duplicate(LPGUID lpGuid) +{ + HRESULT rc; + LPDIRECTSOUND dso=NULL; + LPDIRECTSOUNDBUFFER primary=NULL; + DSBUFFERDESC bufdesc; + int ref; + + /* Create the DirectSound object */ + rc=pDirectSoundCreate(lpGuid,&dso,NULL); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, + "DirectSoundCreate() failed: %08x\n",rc); + if (rc!=DS_OK) + return rc; + + /* We must call SetCooperativeLevel before creating primary buffer */ + /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ + rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + if (rc!=DS_OK) + goto EXIT; + + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize=sizeof(bufdesc); + bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; + rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); + ok(rc==DS_OK && primary!=NULL,"IDirectSound_CreateSoundBuffer() failed " + "to create a primary buffer %08x\n",rc); + + if (rc==DS_OK && primary!=NULL) { + LPDIRECTSOUNDBUFFER original=NULL; + WAVEFORMATEX wfx; + + init_format(&wfx,WAVE_FORMAT_PCM,22050,16,1); + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize=sizeof(bufdesc); + bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2|DSBCAPS_CTRLPOSITIONNOTIFY; + bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec/100; /* very short buffer */ + bufdesc.lpwfxFormat=&wfx; + rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&original,NULL); + ok(rc==DS_OK && original!=NULL, + "IDirectSound_CreateSoundBuffer() failed to create a original " + "buffer %08x\n",rc); + if (rc==DS_OK && original!=NULL) { + LPDIRECTSOUNDBUFFER duplicated=NULL; + LPDIRECTSOUNDNOTIFY notify=NULL; + HANDLE event[2]; + LPVOID buf=NULL; + DWORD bufsize; + int i; + + /* Prepare notify events */ + for (i=0;i<sizeof(event)/sizeof(event[0]);i++) { + event[i] = CreateEvent(NULL,FALSE,FALSE,NULL); + } + + /* Make silent buffer */ + rc=IDirectSoundBuffer_Lock(original,0,0,&buf,&bufsize, + NULL,NULL,DSBLOCK_ENTIREBUFFER); + ok(rc==DS_OK && buf!=NULL, + "IDirectSoundBuffer_Lock failed to lock the buffer %08x\n",rc); + if (rc==DS_OK && buf!=NULL) { + ZeroMemory(buf,bufsize); + rc=IDirectSoundBuffer_Unlock(original,buf,bufsize, + NULL,0); + ok(rc==DS_OK,"IDirectSoundBuffer_Unlock failed to unlock " + "%08x\n",rc); + } + + rc=IDirectSoundBuffer_QueryInterface(original, + &IID_IDirectSoundNotify, + (void**)&notify); + ok(rc==DS_OK && notify!=NULL, + "IDirectSoundBuffer_QueryInterface() failed to create a " + "notification %08x\n",rc); + if (rc==DS_OK && notify!=NULL) { + DSBPOSITIONNOTIFY dsbpn; + LPDIRECTSOUNDNOTIFY dup_notify=NULL; + + dsbpn.dwOffset=DSBPN_OFFSETSTOP; + dsbpn.hEventNotify=event[0]; + rc=IDirectSoundNotify_SetNotificationPositions(notify, + 1,&dsbpn); + ok(rc==DS_OK,"IDirectSoundNotify_SetNotificationPositions " + "failed %08x\n",rc); + + rc=IDirectSound_DuplicateSoundBuffer(dso,original,&duplicated); + ok(rc==DS_OK && duplicated!=NULL, + "IDirectSound_DuplicateSoundBuffer failed %08x\n",rc); + + trace("testing duplicated buffer without notifications.\n"); + test_notify(duplicated,sizeof(event)/sizeof(event[0]), + event,WAIT_TIMEOUT); + + rc=IDirectSoundBuffer_QueryInterface(duplicated, + &IID_IDirectSoundNotify, + (void**)&dup_notify); + ok(rc==DS_OK&&dup_notify!=NULL, + "IDirectSoundBuffer_QueryInterface() failed to create a " + "notification %08x\n",rc); + if(rc==DS_OK&&dup_notify!=NULL) { + dsbpn.dwOffset=DSBPN_OFFSETSTOP; + dsbpn.hEventNotify=event[1]; + rc=IDirectSoundNotify_SetNotificationPositions(dup_notify, + 1,&dsbpn); + ok(rc==DS_OK,"IDirectSoundNotify_SetNotificationPositions " + "failed %08x\n",rc); + + trace("testing duplicated buffer with a notification.\n"); + test_notify(duplicated,sizeof(event)/sizeof(event[0]), + event,WAIT_OBJECT_0+1); + + ref=IDirectSoundNotify_Release(dup_notify); + todo_wine + ok(ref==0,"IDirectSoundNotify_Release() has %d references, " + "should have 0\n",ref); + } + ref=IDirectSoundNotify_Release(notify); + ok(ref==0,"IDirectSoundNotify_Release() has %d references, " + "should have 0\n",ref); + + trace("testing original buffer with a notification.\n"); + test_notify(original,sizeof(event)/sizeof(event[0]), + event,WAIT_OBJECT_0); + + ref=IDirectSoundBuffer_Release(duplicated); + ok(ref==0,"IDirectSoundBuffer_Release() has %d references, " + "should have 0\n",ref); + } + ref=IDirectSoundBuffer_Release(original); + ok(ref==0,"IDirectSoundBuffer_Release() has %d references, " + "should have 0\n",ref); + } + ref=IDirectSoundBuffer_Release(primary); + ok(ref==0,"IDirectSoundBuffer_Release() has %d references, " + "should have 0\n",ref); + } + + /* Set the CooperativeLevel back to normal */ + /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ + rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + +EXIT: + ref=IDirectSound_Release(dso); + ok(ref==0,"IDirectSound_Release() has %d references, should have 0\n",ref); + if (ref!=0) + return DSERR_GENERIC; + + return rc; +} + static unsigned int number; static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, @@ -1067,6 +1252,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, test_primary_secondary(lpGuid); test_secondary(lpGuid); test_frequency(lpGuid); + test_duplicate(lpGuid); } return 1;

1 0

Jacek Caban : mshtml: Added IHTMLStyle2::direction property implementation.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: adf1310f4acfc1d4cf48d30ca0ffc32c14dee4aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf1310f4acfc1d4cf48d30ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 22 11:40:17 2011 +0200 mshtml: Added IHTMLStyle2::direction property implementation. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle2.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 17 +++++++++++++++++ 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 5c6157b..ae2cf93 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -97,6 +97,8 @@ static const WCHAR attrColor[] = {'c','o','l','o','r',0}; static const WCHAR attrCursor[] = {'c','u','r','s','o','r',0}; +static const WCHAR attrDirection[] = + {'d','i','r','e','c','t','i','o','n',0}; static const WCHAR attrDisplay[] = {'d','i','s','p','l','a','y',0}; static const WCHAR attrFilter[] = @@ -207,6 +209,7 @@ static const struct{ {attrClip, DISPID_IHTMLSTYLE_CLIP}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, + {attrDirection, DISPID_IHTMLSTYLE2_DIRECTION}, {attrDisplay, DISPID_IHTMLSTYLE_DISPLAY}, {attrFilter, DISPID_IHTMLSTYLE_FILTER}, {attrFontFamily, DISPID_IHTMLSTYLE_FONTFAMILY}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index b4d9662..f23d911 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -62,6 +62,7 @@ typedef enum { STYLEID_CLIP, STYLEID_COLOR, STYLEID_CURSOR, + STYLEID_DIRECTION, STYLEID_DISPLAY, STYLEID_FILTER, STYLEID_FONT_FAMILY, diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index db44581..a270833 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -121,15 +121,19 @@ static HRESULT WINAPI HTMLStyle2_get_borderCollapse(IHTMLStyle2 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle2_put_direction(IHTMLStyle2 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_DIRECTION, v, 0); } static HRESULT WINAPI HTMLStyle2_get_direction(IHTMLStyle2 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_DIRECTION, p, 0); } static HRESULT WINAPI HTMLStyle2_put_behavior(IHTMLStyle2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index e9061a2..d4d9a20 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -277,6 +277,23 @@ static void test_style2(IHTMLStyle2 *style2) ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!strcmp_wa(V_BSTR(&v), "3px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + + /* direction */ + str = (void*)0xdeadbeef; + hres = IHTMLStyle2_get_direction(style2, &str); + ok(hres == S_OK, "get_direction failed: %08x\n", hres); + ok(!str, "str = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("ltr"); + hres = IHTMLStyle2_put_direction(style2, str); + ok(hres == S_OK, "put_direction failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle2_get_direction(style2, &str); + ok(hres == S_OK, "get_direction failed: %08x\n", hres); + ok(!strcmp_wa(str, "ltr"), "str = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); } static void test_style3(IHTMLStyle3 *style3)

1 0

Francois Gouget : po: A French translation fixe and a tweak.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 51b3100aa60d29b2269c47f968a9df271471caee URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b3100aa60d29b2269c47f96… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 22 10:37:21 2011 +0200 po: A French translation fixe and a tweak. --- po/fr.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index b06d632..bc1215d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9698,7 +9698,7 @@ msgstr "" "/? Afficher cette aide et se terminer.\n" "\n" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" -"Start est fourni sans AUCUNE GARANTIE ; pour plus de détails lancez le avec\n" +"Start est fourni sans AUCUNE GARANTIE ; pour plus de détails lancez-le avec\n" "l'option /L.\n" "Ceci est un logiciel libre, et vous êtes invité à le redistribuer\n" "sous certaines conditions ; lancez « start /L » pour plus de détails.\n" @@ -11032,7 +11032,7 @@ msgstr "Gestionnaire de fichiers de Wine" #: winefile.rc:101 msgid "root fs" -msgstr "fs racine" +msgstr "dossier racine" #: winefile.rc:102 msgid "unixfs"

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
84
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 July 2011