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 July 22, 2011

July 22, 2011

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 July 22, 2011

July 22, 2011

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

Jacek Caban : mshtml: Return NS_BINDING_ABORTED for canceled binding in AsyncOpen.
by Alexandre Julliard July 22, 2011

July 22, 2011

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 July 22, 2011

July 22, 2011

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

Akihiro Sagawa : dsound: Don't copy the position notify on duplicate.
by Alexandre Julliard July 22, 2011

July 22, 2011

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/tests: Add tests to check notifications after duplicate.
by Alexandre Julliard July 22, 2011

July 22, 2011

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 : urlmon: Added support for javascript URIs.
by Alexandre Julliard July 22, 2011

July 22, 2011

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 notify object on duplicate.
by Alexandre Julliard July 22, 2011

July 22, 2011

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

Alexandre Julliard : user32/tests: Fix some last error tests that fail on Windows.
by Alexandre Julliard July 22, 2011

July 22, 2011

Module: wine Branch: master Commit: a900fe7c9e751222e02b3dd031334b01b087ac23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a900fe7c9e751222e02b3dd03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 12:00:12 2011 +0200 user32/tests: Fix some last error tests that fail on Windows. --- dlls/user32/tests/msg.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 01933b8..5fbf440 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13169,7 +13169,8 @@ static void test_hotkey(void) SetLastError(0xdeadbeef); ret = UnregisterHotKey(NULL, 0); ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); if (ret == TRUE) { @@ -13185,7 +13186,8 @@ static void test_hotkey(void) SetLastError(0xdeadbeef); ret = UnregisterHotKey(test_window, 0); ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); /* Search for a Windows Key + letter combination that hasn't been registered */ for (hotkey_letter = 0x41; hotkey_letter <= 0x51; hotkey_letter ++) @@ -13199,7 +13201,8 @@ static void test_hotkey(void) } else { - ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); } } @@ -13216,19 +13219,22 @@ static void test_hotkey(void) SetLastError(0xdeadbeef); ret = RegisterHotKey(test_window, 4, MOD_WIN, hotkey_letter); ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); /* Same key combination, different window */ SetLastError(0xdeadbeef); ret = RegisterHotKey(NULL, 5, MOD_WIN, hotkey_letter); ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); /* Register the same hotkey twice */ SetLastError(0xdeadbeef); ret = RegisterHotKey(test_window, 5, MOD_WIN, hotkey_letter); ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); /* Window on another thread */ taskbar_window = FindWindowA("Shell_TrayWnd", NULL); @@ -13241,7 +13247,8 @@ static void test_hotkey(void) SetLastError(0xdeadbeef); ret = RegisterHotKey(taskbar_window, 5, 0, hotkey_letter); ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_WINDOW_OF_OTHER_THREAD, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_WINDOW_OF_OTHER_THREAD || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); } /* Inject the appropriate key sequence */ @@ -13345,7 +13352,8 @@ static void test_hotkey(void) SetLastError(0xdeadbeef); ret = UnregisterHotKey(test_window, 5); ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED, "unexpected error %d\n", GetLastError()); + ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); /* Register thread hotkey */ ret = RegisterHotKey(NULL, 5, MOD_WIN, hotkey_letter);

1 0

Lucas Fialho Zawacki : dinput: SetActionMap setting the axis range according to the action format.
by Alexandre Julliard July 22, 2011

July 22, 2011

Module: wine Branch: master Commit: 8cc44cb8c38e390d9fa5ae9ed69764f31a6c8513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cc44cb8c38e390d9fa5ae9ed… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Jul 21 15:37:15 2011 -0300 dinput: SetActionMap setting the axis range according to the action format. --- dlls/dinput/device.c | 8 ++++++++ dlls/dinput8/tests/device.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 2bd5d6c..58d4e14 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1483,9 +1483,17 @@ HRESULT WINAPI IDirectInputDevice8WImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface DWORD dwFlags) { DIPROPDWORD dp; + DIPROPRANGE dpr; FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + dpr.diph.dwSize = sizeof(DIPROPRANGE); + dpr.lMin = lpdiaf->lAxisMin; + dpr.lMax = lpdiaf->lAxisMax; + dpr.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dpr.diph.dwHow = DIPH_DEVICE; + IDirectInputDevice8_SetProperty(iface, DIPROP_RANGE, &dpr.diph); + if (lpdiaf->dwBufferSize > 0) { dp.diph.dwSize = sizeof(DIPROPDWORD); diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index cedad80..31e2e3f 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -132,6 +132,7 @@ static BOOL CALLBACK enumeration_callback( { HRESULT hr; DIPROPDWORD dp; + DIPROPRANGE dpr; struct enum_data *data = pvRef; if (!data) return DIENUM_CONTINUE; @@ -179,6 +180,20 @@ static BOOL CALLBACK enumeration_callback( ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); ok (dp.dwData == data->lpdiaf->dwBufferSize, "SetActionMap must set the buffer, buffersize=%d\n", dp.dwData); + /* Test axis range */ + memset(&dpr, 0, sizeof(dpr)); + dpr.diph.dwSize = sizeof(dpr); + dpr.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dpr.diph.dwHow = DIPH_DEVICE; + + hr = IDirectInputDevice_GetProperty(lpdid, DIPROP_RANGE, &dpr.diph); + /* Only test if device supports the range property */ + if (SUCCEEDED(hr)) + { + ok (dpr.lMin == data->lpdiaf->lAxisMin, "SetActionMap must set the min axis range expected=%d got=%d\n", data->lpdiaf->lAxisMin, dpr.lMin); + ok (dpr.lMax == data->lpdiaf->lAxisMax, "SetActionMap must set the max axis range expected=%d got=%d\n", data->lpdiaf->lAxisMax, dpr.lMax); + } + /* SetActionMap has set the data format so now it should work */ hr = IDirectInputDevice8_Acquire(lpdid); ok (SUCCEEDED(hr), "Acquire failed hr=%08x\n", hr);

1 0