July 2011 - Wine-commits - list.winehq.org

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: Fix the lines parameter of SetDIBits to be positive.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 3e5793e049ed661670565ca5e362acdc8a7b3844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5793e049ed661670565ca5e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 22 15:10:00 2011 +0100 gdi32: Fix the lines parameter of SetDIBits to be positive. --- dlls/gdi32/dib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 995c5d7..e9f0772 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -271,7 +271,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he bm.bmBitsPixel == bpp && bm.bmPlanes == planes) { /* fast path */ - return SetDIBits( dev->hdc, hBitmap, 0, height, bits, info, coloruse ); + return SetDIBits( dev->hdc, hBitmap, 0, abs( height ), bits, info, coloruse ); } } } @@ -295,7 +295,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he StretchBlt( hdcMem, xSrc, abs(height) - heightSrc - ySrc, widthSrc, heightSrc, dev->hdc, xDst, yDst, widthDst, heightDst, rop ); } - ret = SetDIBits( hdcMem, hBitmap, 0, height, bits, info, coloruse ); + ret = SetDIBits( hdcMem, hBitmap, 0, abs( height ), bits, info, coloruse ); if (ret) StretchBlt( dev->hdc, xDst, yDst, widthDst, heightDst, hdcMem, xSrc, abs(height) - heightSrc - ySrc, widthSrc, heightSrc, rop ); DeleteDC( hdcMem );

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

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: 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

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

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 : 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

Lucas Fialho Zawacki : dinput: BuildActionMap for all joysticks. For the moment only for buttons and axis.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 31fdae5b4cd0397107f3e32d9f2e073d12320c2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fdae5b4cd0397107f3e32d9… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Jul 21 15:36:31 2011 -0300 dinput: BuildActionMap for all joysticks. For the moment only for buttons and axis. --- dlls/dinput/device.c | 23 +++++++++++++++++++++++ dlls/dinput/device_private.h | 1 + dlls/dinput/dinput_private.h | 1 + dlls/dinput/joystick.c | 40 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 64 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 22632ea..2bd5d6c 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -366,6 +366,29 @@ static inline LPDIOBJECTDATAFORMAT dataformat_to_odf(LPCDIDATAFORMAT df, int idx return (LPDIOBJECTDATAFORMAT)((LPBYTE)df->rgodf + idx * df->dwObjSize); } +/* dataformat_to_odf_by_type + * Find the Nth object of the selected type in the DataFormat + */ +LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD type) +{ + int i, nfound = 0; + + for (i=0; i < df->dwNumObjs; i++) + { + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf(df, i); + + if (odf->dwType & type) + { + if (n == nfound) + return odf; + + nfound++; + } + } + + return NULL; +} + static HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *format) { DataTransform *dt; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 503698a..6c061b2 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -125,6 +125,7 @@ extern void _dump_DIDATAFORMAT(const DIDATAFORMAT *df) DECLSPEC_HIDDEN; extern const char *_dump_dinput_GUID(const GUID *guid) DECLSPEC_HIDDEN; extern DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) DECLSPEC_HIDDEN; +extern LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD type) DECLSPEC_HIDDEN; /* And the stubs */ extern HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 6573de0..3c4776e 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -71,5 +71,6 @@ extern void _copy_diactionformatWtoA(LPDIACTIONFORMATA, LPDIACTIONFORMATW) DECLS #define DIKEYBOARD_MASK 0x81000000 #define DIMOUSE_MASK 0x82000000 +#define DIGENRE_ANY 0xFF000000 #endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */ diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 68dcc6a..b5c028c 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -432,9 +432,47 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { + JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); + int i, j, has_actions = 0; + DWORD object_types[] = { DIDFT_AXIS, DIDFT_BUTTON }; + DWORD type_map[] = { DIDFT_RELAXIS, DIDFT_PSHBUTTON }; + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); - return DI_NOEFFECT; + for (i=0; i < lpdiaf->dwNumActions; i++) + { + DWORD inst = (0x000000ff & (lpdiaf->rgoAction[i].dwSemantic)) - 1; + DWORD type = 0x000000ff & (lpdiaf->rgoAction[i].dwSemantic >> 8); + DWORD genre = 0xff000000 & lpdiaf->rgoAction[i].dwSemantic; + + /* Only consider actions of the right genre */ + if (lpdiaf->dwGenre != genre && genre != DIGENRE_ANY) continue; + + for (j=0; j < sizeof(object_types)/sizeof(object_types[0]); j++) + { + if (type & object_types[j]) + { + /* Assure that the object exists */ + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf_by_type(This->base.data_format.wine_df, inst, DIDFT_BUTTON); + + if (odf != NULL) + { + lpdiaf->rgoAction[i].dwObjID = type_map[j] | (0x0000ff00 & (inst << 8)); + lpdiaf->rgoAction[i].guidInstance = This->base.guid; + lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT; + + has_actions = 1; + + /* No need to try other types if the action was already mapped */ + break; + } + } + } + } + + if (!has_actions) return DI_NOEFFECT; + + return IDirectInputDevice8WImpl_BuildActionMap(iface, lpdiaf, lpszUserName, dwFlags); } HRESULT WINAPI JoystickAGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface,

1 0

Lucas Fialho Zawacki : dinput: SetActionMap for joysticks.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 79bd7249e471bbdeb665547a1a3a75454c6c41f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79bd7249e471bbdeb665547a1… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Jul 21 15:38:43 2011 -0300 dinput: SetActionMap for joysticks. --- dlls/dinput/joystick.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index b5c028c..2d8a818 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -500,9 +500,67 @@ HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { + JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); + DIDATAFORMAT data_format; + DIOBJECTDATAFORMAT *obj_df = NULL; + int i, action = 0, num_actions = 0; + unsigned int offset = 0; + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); - return DI_NOEFFECT; + if (This->base.acquired) return DIERR_ACQUIRED; + + data_format.dwSize = sizeof(data_format); + data_format.dwObjSize = sizeof(DIOBJECTDATAFORMAT); + data_format.dwFlags = DIDF_RELAXIS; + data_format.dwDataSize = lpdiaf->dwDataSize; + + /* count the actions */ + for (i=0; i < lpdiaf->dwNumActions; i++) + if (IsEqualGUID(&This->base.guid, &lpdiaf->rgoAction[i].guidInstance)) + num_actions++; + + if (num_actions == 0) return DI_NOEFFECT; + + This->base.num_actions = num_actions; + + /* Construct the dataformat and actionmap */ + obj_df = HeapAlloc(GetProcessHeap(), 0, sizeof(DIOBJECTDATAFORMAT)*num_actions); + data_format.rgodf = (LPDIOBJECTDATAFORMAT)obj_df; + data_format.dwNumObjs = num_actions; + + This->base.action_map = HeapAlloc(GetProcessHeap(), 0, sizeof(ActionMap)*num_actions); + + for (i = 0; i < lpdiaf->dwNumActions; i++) + { + if (IsEqualGUID(&This->base.guid, &lpdiaf->rgoAction[i].guidInstance)) + { + LPDIDATAFORMAT df = This->base.data_format.wine_df; + DWORD inst = DIDFT_GETINSTANCE(lpdiaf->rgoAction[i].dwObjID); + DWORD type = DIDFT_GETTYPE(lpdiaf->rgoAction[i].dwObjID); + LPDIOBJECTDATAFORMAT obj; + + if (type == DIDFT_PSHBUTTON) type = DIDFT_BUTTON; + if (type == DIDFT_RELAXIS) type = DIDFT_AXIS; + + obj = dataformat_to_odf_by_type(df, inst, type); + + memcpy(&obj_df[action], obj, df->dwObjSize); + + This->base.action_map[action].uAppData = lpdiaf->rgoAction[i].uAppData; + This->base.action_map[action].offset = offset; + obj_df[action].dwOfs = offset; + offset += (type & DIDFT_BUTTON) ? 1 : 4; + + action++; + } + } + + IDirectInputDevice8_SetDataFormat(iface, &data_format); + + HeapFree(GetProcessHeap(), 0, obj_df); + + return IDirectInputDevice8WImpl_SetActionMap(iface, lpdiaf, lpszUserName, dwFlags); } HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,

1 0