February 2012 - Wine-commits

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: b0bc037d36e7fa83e9d5395dd916daee1a96e375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0bc037d36e7fa83e9d5395dd… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Feb 9 21:15:19 2012 +0900 po: Update Korean translation. --- po/ko.po | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/po/ko.po b/po/ko.po index c9affcd..7c58a75 100644 --- a/po/ko.po +++ b/po/ko.po @@ -9191,7 +9191,6 @@ msgid "&Always on Top" msgstr "항상 앞에 (&A)" #: clock.rc:42 -#, fuzzy msgid "&About Clock" msgstr "시계 정보(&A)"

1 0

Austin English : wine.inf: Add CurrentControlSet\Control\VirtualDeviceDrivers registry key.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: 1235b0151800ecaa8bff1db4cee19cba4006af16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1235b0151800ecaa8bff1db4c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 8 15:23:07 2012 -0800 wine.inf: Add CurrentControlSet\Control\VirtualDeviceDrivers registry key. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 3ea3025..14e9245 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -691,6 +691,7 @@ HKLM,Software\Microsoft\Transaction Server,,16 HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\Lsa,,16 +HKLM,System\CurrentControlSet\Control\VirtualDeviceDrivers,,16 HKLM,System\CurrentControlSet\Control\VMM32Files,,16 HKCU,AppEvents\Schemes\Apps\Explorer\Navigating\.Current,,,"" HKCU,Software\Microsoft\Protected Storage System Provider,,16

1 0

Christian Costa : d3dx9_36: Turn FIXME into TRACE since function is implemented. Not supported formats are caught by final FIXME.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: 17b18218254cdd52f4e40ca6bd0f50777293d576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b18218254cdd52f4e40ca6b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Feb 9 01:09:32 2012 +0100 d3dx9_36: Turn FIXME into TRACE since function is implemented. Not supported formats are caught by final FIXME. --- dlls/d3dx9_36/surface.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index c3796ee..8049efc 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -59,10 +59,8 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D IWICStream *stream; HRESULT hr; HRESULT initresult; - static int warn_once; - if (!warn_once++) - FIXME("(%p, %d, %p): partially implemented\n", data, datasize, info); + TRACE("(%p, %d, %p)\n", data, datasize, info); /* TODO: Add support for (or at least detect) DDS, PPM and DIB */

1 0

Christian Costa : include: Add missing formats in D3DXIMAGE_FILEFORMAT enum .
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: f36f49fae3ab2b5a57e29f9e23526becb9d17f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36f49fae3ab2b5a57e29f9e2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Feb 8 19:19:36 2012 +0100 include: Add missing formats in D3DXIMAGE_FILEFORMAT enum. --- include/d3dx9tex.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index 8e553e0..0f8fe68 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -52,7 +52,7 @@ #define D3DX_CHANNEL_LUMINANCE 0x00000010 /********************************************** - **************** Typedefs **************** + ****************** Typedefs ****************** **********************************************/ typedef enum _D3DXIMAGE_FILEFORMAT { @@ -63,6 +63,8 @@ typedef enum _D3DXIMAGE_FILEFORMAT D3DXIFF_DDS, D3DXIFF_PPM, D3DXIFF_DIB, + D3DXIFF_HDR, + D3DXIFF_PFM, D3DXIFF_FORCE_DWORD = 0x7fffffff } D3DXIMAGE_FILEFORMAT;

1 0

Huw Davies : gdi32: Rename a shadow variable.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: 1eca24bd6bd7598b9d6b039b81fc4b31b72e119a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eca24bd6bd7598b9d6b039b8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 9 11:19:01 2012 +0000 gdi32: Rename a shadow variable. --- dlls/gdi32/font.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 71e0857..03314a8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2340,21 +2340,21 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if(!(flags & ETO_OPAQUE) || x < rc.left || x + width.x >= rc.right || y - tm.tmAscent < rc.top || y + tm.tmDescent >= rc.bottom) { - RECT rc; - rc.left = x; - rc.right = x + width.x; - rc.top = y - tm.tmAscent; - rc.bottom = y + tm.tmDescent; + RECT text_box; + text_box.left = x; + text_box.right = x + width.x; + text_box.top = y - tm.tmAscent; + text_box.bottom = y + tm.tmDescent; if(flags & ETO_CLIPPED) { - rc.left = max(lprect->left, rc.left); - rc.right = min(lprect->right, rc.right); - rc.top = max(lprect->top, rc.top); - rc.bottom = min(lprect->bottom, rc.bottom); + text_box.left = max(lprect->left, text_box.left); + text_box.right = min(lprect->right, text_box.right); + text_box.top = max(lprect->top, text_box.top); + text_box.bottom = min(lprect->bottom, text_box.bottom); } - if(rc.left < rc.right && rc.top < rc.bottom) - physdev->funcs->pExtTextOut( physdev, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL ); + if(text_box.left < text_box.right && text_box.top < text_box.bottom) + physdev->funcs->pExtTextOut( physdev, 0, 0, ETO_OPAQUE, &text_box, NULL, 0, NULL ); } } }

1 0

Huw Davies : gdi32: Intersect the background text box with the clip rectangle in device units.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: d3bfa44d53fc2afef2dd5d9bec017d8f0ebd9f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3bfa44d53fc2afef2dd5d9be… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 9 11:19:02 2012 +0000 gdi32: Intersect the background text box with the clip rectangle in device units. --- dlls/gdi32/font.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 03314a8..e17dd44 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2346,14 +2346,8 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, text_box.top = y - tm.tmAscent; text_box.bottom = y + tm.tmDescent; - if(flags & ETO_CLIPPED) - { - text_box.left = max(lprect->left, text_box.left); - text_box.right = min(lprect->right, text_box.right); - text_box.top = max(lprect->top, text_box.top); - text_box.bottom = min(lprect->bottom, text_box.bottom); - } - if(text_box.left < text_box.right && text_box.top < text_box.bottom) + if (flags & ETO_CLIPPED) intersect_rect( &text_box, &text_box, &rc ); + if (!is_rect_empty( &text_box )) physdev->funcs->pExtTextOut( physdev, 0, 0, ETO_OPAQUE, &text_box, NULL, 0, NULL ); } }

1 0

Jörg Höhle : mmdevapi/tests: Produce audible output.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: f9f704879884a0eb3587b5d8be2060016f61306d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f704879884a0eb3587b5d8b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 1 06:53:31 2012 +0100 mmdevapi/tests: Produce audible output. --- dlls/mmdevapi/tests/render.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 2427be7..928d93e 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -66,6 +66,32 @@ static inline const char *dbgstr_guid( const GUID *id ) return ret; } +#define PI 3.14159265358979323846L +static DWORD wave_generate_tone(PWAVEFORMATEX pwfx, BYTE* data, UINT32 frames) +{ + static double phase = 0.; /* normalized to unit, not 2*PI */ + PWAVEFORMATEXTENSIBLE wfxe = (PWAVEFORMATEXTENSIBLE)pwfx; + DWORD cn, i; + double delta, y; + + if(!winetest_interactive || wfxe->Format.wFormatTag != WAVE_FORMAT_EXTENSIBLE || + !IsEqualGUID(&wfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) + return AUDCLNT_BUFFERFLAGS_SILENT; + + for(delta = phase, cn = 0; cn < wfxe->Format.nChannels; + delta += .5/wfxe->Format.nChannels, cn++){ + for(i = 0; i < frames; i++){ + y = sin(2*PI*(440.* i / wfxe->Format.nSamplesPerSec + delta)); + /* assume alignment is granted */ + ((float*)data)[cn+i*wfxe->Format.nChannels] = y; + /* fixme: 16bit for exclusive mode */ + } + } + phase += 440.* frames / wfxe->Format.nSamplesPerSec; + phase -= floor(phase); + return 0; +} + static void test_uninitialized(IAudioClient *ac) { HRESULT hr; @@ -1590,7 +1616,15 @@ static void test_worst_case(void) hr = IAudioClock_GetPosition(acl, &pos, &pcpos0); ok(hr == S_OK, "GetPosition failed: %08x\n", hr); - /* XAudio2 prefills one period, we don't */ + /* XAudio2 prefills one period, play without it */ + if(winetest_debug>2){ + hr = IAudioRenderClient_GetBuffer(arc, fragment, &data); + ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + + hr = IAudioRenderClient_ReleaseBuffer(arc, fragment, AUDCLNT_BUFFERFLAGS_SILENT); + ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + } + hr = IAudioClient_Start(ac); ok(hr == S_OK, "Start failed: %08x\n", hr); @@ -1609,8 +1643,8 @@ static void test_worst_case(void) hr = IAudioRenderClient_GetBuffer(arc, fragment, &data); ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); - /* fixme: produce audible output */ - hr = IAudioRenderClient_ReleaseBuffer(arc, fragment, AUDCLNT_BUFFERFLAGS_SILENT); + hr = IAudioRenderClient_ReleaseBuffer(arc, fragment, + wave_generate_tone(pwfx, data, fragment)); ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); if(hr == S_OK) sum += fragment;

1 0

Jörg Höhle : mmdevapi/tests: Fix errors and crashes in various native configurations.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: ac8360b3bfc081d50b23e2a4b6ea68f4027c7fab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8360b3bfc081d50b23e2a4b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 25 19:14:06 2012 +0100 mmdevapi/tests: Fix errors and crashes in various native configurations. --- dlls/mmdevapi/tests/render.c | 103 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 84 insertions(+), 19 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 928d93e..df0d177 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -237,8 +237,8 @@ static void test_audioclient(void) hexcl = S_OK; hr = IAudioClient_IsFormatSupported(ac, 0xffffffff, pwfx, NULL); - ok(hr == E_INVALIDARG || - hr == AUDCLNT_E_UNSUPPORTED_FORMAT, + ok(hr == E_INVALIDARG/*w32*/ || + broken(hr == AUDCLNT_E_UNSUPPORTED_FORMAT/*w64 response from exclusive mode driver */), "IsFormatSupported(0xffffffff) call returns %08x\n", hr); } @@ -250,7 +250,7 @@ static void test_audioclient(void) hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0xffffffff, 5000000, 0, pwfx, NULL); ok(hr == E_INVALIDARG, "Initialize with invalid flags returns %08x\n", hr); - /* It seems that if length > 2s or periodicity != 0 the length is ignored and call succeeds + /* A period != 0 is ignored and the call succeeds. * Since we can only initialize successfully once, skip those tests. */ hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, NULL, NULL); @@ -430,8 +430,9 @@ static void test_formats(AUDCLNT_SHAREMODE mode) /* Vista returns E_INVALIDARG upon AUDCLNT_STREAMFLAGS_RATEADJUST */ hr = IAudioClient_Initialize(ac, mode, 0, 5000000, 0, &fmt, NULL); if ((hrs == S_OK) ^ (hr == S_OK)) - trace("Initialize (%u , %ux%2ux%u) returns %08x unlike IsFormatSupported\n", - mode, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); + trace("Initialize (%s, %ux%2ux%u) returns %08x unlike IsFormatSupported\n", + mode == AUDCLNT_SHAREMODE_SHARED ? "shared " : "exclus.", + fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); if (mode == AUDCLNT_SHAREMODE_SHARED) ok(hrs == S_OK ? hr == S_OK : hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "Initialize(shared, %ux%2ux%u) returns %08x\n", @@ -443,10 +444,12 @@ static void test_formats(AUDCLNT_SHAREMODE mode) fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr, hrs); else /* On testbot 48000x16x1 claims support, but does not Initialize. - * Some cards Initialize 44100|48000x16x1 yet claim no support. */ + * Some cards Initialize 44100|48000x16x1 yet claim no support; + * F. Gouget's w7 bots do that for 12000|96000x8|16x1|2 */ ok(hrs == S_OK ? hr == S_OK || broken(hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED) : hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED || broken(hr == S_OK && - fmt.nChannels == 1 && pwfx->wBitsPerSample == fmt.wBitsPerSample), + ((fmt.nChannels == 1 && fmt.wBitsPerSample == 16) || + (fmt.nSamplesPerSec == 12000 || fmt.nSamplesPerSec == 96000))), "Initialize(exclus., %ux%2ux%u) returns %08x\n", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); @@ -599,6 +602,7 @@ static void test_event(void) { HANDLE event; HRESULT hr; + DWORD r; IAudioClient *ac; WAVEFORMATEX *pwfx; @@ -627,12 +631,41 @@ static void test_event(void) hr = IAudioClient_SetEventHandle(ac, event); ok(hr == S_OK, "SetEventHandle failed: %08x\n", hr); + hr = IAudioClient_SetEventHandle(ac, event); + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "SetEventHandle returns %08x\n", hr); + + r = WaitForSingleObject(event, 40); + ok(r == WAIT_TIMEOUT, "Wait(event) before Start gave %x\n", r); + hr = IAudioClient_Start(ac); ok(hr == S_OK, "Start failed: %08x\n", hr); + r = WaitForSingleObject(event, 20); + ok(r == WAIT_OBJECT_0, "Wait(event) after Start gave %x\n", r); + hr = IAudioClient_Stop(ac); ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(ResetEvent(event), "ResetEvent\n"); + + /* Still receiving events! */ + r = WaitForSingleObject(event, 20); + todo_wine ok(r == WAIT_OBJECT_0, "Wait(event) after Stop gave %x\n", r); + + hr = IAudioClient_Reset(ac); + ok(hr == S_OK, "Reset failed: %08x\n", hr); + + ok(ResetEvent(event), "ResetEvent\n"); + + r = WaitForSingleObject(event, 120); + todo_wine ok(r == WAIT_OBJECT_0, "Wait(event) after Reset gave %x\n", r); + + hr = IAudioClient_SetEventHandle(ac, NULL); + ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); + + r = WaitForSingleObject(event, 70); + todo_wine ok(r == WAIT_OBJECT_0, "Wait(NULL event) gave %x\n", r); + /* test releasing a playing stream */ hr = IAudioClient_Start(ac); ok(hr == S_OK, "Start failed: %08x\n", hr); @@ -889,14 +922,17 @@ static void test_session(void) 0, 5000000, 0, pwfx, &ses1_guid); ok(hr == S_OK, "Initialize failed: %08x\n", hr); - hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, - NULL, (void**)&ses1_ac2); - ok(hr == S_OK, "Activation failed with %08x\n", hr); - if(FAILED(hr)){ + if(hr == S_OK){ + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ses1_ac2); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + } + if(hr != S_OK){ skip("Unable to open the same device twice. Skipping session tests\n"); ref = IAudioClient_Release(ses1_ac1); ok(ref == 0, "AudioClient wasn't released: %u\n", ref); + CoTaskMemFree(pwfx); return; } @@ -1076,8 +1112,15 @@ static void test_streamvolume(void) 0, fmt, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); - hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + if(hr == S_OK){ + hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + } + if(hr != S_OK){ + IAudioClient_Release(ac); + CoTaskMemFree(fmt); + return; + } hr = IAudioStreamVolume_GetChannelCount(asv, NULL); ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08x\n", hr); @@ -1173,8 +1216,15 @@ static void test_channelvolume(void) AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); - hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&acv); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + if(hr == S_OK){ + hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&acv); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + } + if(hr != S_OK){ + IAudioClient_Release(ac); + CoTaskMemFree(fmt); + return; + } hr = IChannelAudioVolume_GetChannelCount(acv, NULL); ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); @@ -1273,8 +1323,15 @@ static void test_simplevolume(void) AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); - hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + if(hr == S_OK){ + hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + } + if(hr != S_OK){ + IAudioClient_Release(ac); + CoTaskMemFree(fmt); + return; + } hr = ISimpleAudioVolume_GetMasterVolume(sav, NULL); ok(hr == NULL_PTR_ERR, "GetMasterVolume gave wrong error: %08x\n", hr); @@ -1360,8 +1417,15 @@ static void test_volume_dependence(void) AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session); ok(hr == S_OK, "Initialize failed: %08x\n", hr); - hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService (SimpleAudioVolume) failed: %08x\n", hr); + if(hr == S_OK){ + hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); + ok(hr == S_OK, "GetService (SimpleAudioVolume) failed: %08x\n", hr); + } + if(hr != S_OK){ + IAudioClient_Release(ac); + CoTaskMemFree(fmt); + return; + } hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&cav); ok(hr == S_OK, "GetService (ChannelAudioVolme) failed: %08x\n", hr); @@ -1678,6 +1742,7 @@ static void test_worst_case(void) CoTaskMemFree(pwfx); IAudioClient_Release(ac); + IAudioClock_Release(acl); IAudioRenderClient_Release(arc); }

1 0

Jacek Caban : urlmon: Properly handle combining relative mk: URIs containing full internal path.
by Alexandre Julliard 09 Feb '12

09 Feb '12

Module: wine Branch: master Commit: 9cbcbe8da69698b01b4e276715f8f8f317cb07f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cbcbe8da69698b01b4e27671… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 9 15:16:38 2012 +0100 urlmon: Properly handle combining relative mk: URIs containing full internal path. --- dlls/urlmon/uri.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 2710c7c..3d6bf8b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6389,13 +6389,25 @@ static HRESULT merge_paths(parse_data *data, const WCHAR *base, DWORD base_len, WCHAR *ptr; if(base_len) { - /* Find the characters that will be copied over from - * the base path. - */ - end = memrchrW(base, '/', base_len); - if(!end && data->scheme_type == URL_SCHEME_FILE) - /* Try looking for a '\\'. */ - end = memrchrW(base, '\\', base_len); + if(data->scheme_type == URL_SCHEME_MK && *relative == '/') { + /* Find '::' segment */ + for(end = base; end < base+base_len-1; end++) { + if(end[0] == ':' && end[1] == ':') { + end++; + break; + } + } + + /* If not found, try finding the end of @xxx: */ + if(end == base+base_len-1) + end = *base == '@' ? memchr(base, ':', base_len) : NULL; + }else { + /* Find the characters that will be copied over from the base path. */ + end = memrchrW(base, '/', base_len); + if(!end && data->scheme_type == URL_SCHEME_FILE) + /* Try looking for a '\\'. */ + end = memrchrW(base, '\\', base_len); + } } if(end) { @@ -6420,6 +6432,7 @@ static HRESULT merge_paths(parse_data *data, const WCHAR *base, DWORD base_len, *ptr = '\0'; *result_len = (ptr-*result); + TRACE("ret %s\n", debugstr_wn(*result, *result_len)); return S_OK; } @@ -6541,7 +6554,7 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, * relative path doesn't begin with a '/' then the base path and relative * path are merged together. */ - if(relative->path_len && *(relative->canon_uri+relative->path_start) == '/') { + if(relative->path_len && *(relative->canon_uri+relative->path_start) == '/' && data.scheme_type != URL_SCHEME_MK) { WCHAR *tmp = NULL; BOOL copy_drive_path = FALSE;

1 0

Frédéric Delanoy : po: Remove untranslated English strings from the Danish translation.
by Alexandre Julliard 08 Feb '12

08 Feb '12

Module: wine Branch: master Commit: 534f931cc7834b2a1d28ed3992116b058d66190d URL: http://source.winehq.org/git/wine.git/?a=commit;h=534f931cc7834b2a1d28ed399… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 8 18:52:18 2012 +0100 po: Remove untranslated English strings from the Danish translation. --- po/da.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/po/da.po b/po/da.po index fa832ee..4b2fb1c 100644 --- a/po/da.po +++ b/po/da.po @@ -484,7 +484,7 @@ msgstr "&Standardprinter" #: comdlg32.rc:223 msgid "[none]" -msgstr "[none]" +msgstr "" #: comdlg32.rc:224 msgid "Specific &Printer" @@ -608,7 +608,7 @@ msgstr "&Definer selvvalgt farve >>" #: comdlg32.rc:310 regedit.rc:223 regedit.rc:233 msgid "Find" -msgstr "Find" +msgstr "" #: comdlg32.rc:313 comdlg32.rc:332 msgid "Fi&nd What:" @@ -891,7 +891,7 @@ msgstr "Oliven" #: comdlg32.rc:121 wordpad.rc:118 msgid "Navy" -msgstr "Navy" +msgstr "" #: comdlg32.rc:122 wordpad.rc:119 msgid "Purple" @@ -4571,7 +4571,7 @@ msgstr "Service login mislykkedes\n" #: winerror.mc:1226 msgid "Service start-hang\n" -msgstr "Service start-hang\n" +msgstr "" #: winerror.mc:1231 msgid "Invalid service lock\n" @@ -6293,7 +6293,7 @@ msgstr "Kan ikke få fat i kald handle\n" #: winerror.mc:3311 msgid "Null reference pointer\n" -msgstr "Null reference pointer\n" +msgstr "" #: winerror.mc:3316 msgid "Enumeration value out of range\n" @@ -7427,7 +7427,7 @@ msgstr "Kopierer filer..." #: setupapi.rc:42 msgid "Destination:" -msgstr "Destination:" +msgstr "" #: setupapi.rc:49 msgid "Files Needed" @@ -10141,7 +10141,7 @@ msgstr "Tryk Return for at fortsætte: " #: cmd.rc:321 msgid "Wine Command Prompt" -msgstr "Wine Command Prompt" +msgstr "" #: cmd.rc:322 #, fuzzy @@ -11387,7 +11387,7 @@ msgstr "&Markeret del:" #: regedit.rc:226 msgid "Find:" -msgstr "Find:" +msgstr "" #: regedit.rc:228 msgid "Find in:" @@ -12879,7 +12879,7 @@ msgstr "Vis &advanceret" #: winecfg.rc:240 msgid "De&vice:" -msgstr "De&vice:" +msgstr "" #: winecfg.rc:242 msgid "Bro&wse..." @@ -12887,7 +12887,7 @@ msgstr "G&ennemse..." #: winecfg.rc:244 msgid "&Label:" -msgstr "&Label:" +msgstr "" #: winecfg.rc:246 msgid "S&erial:"

1 0