February 2017 - Wine-commits

Akihiro Sagawa : d3d9/tests: Add LockRect tests with dynamic textures.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 87fe9779ec91937211dc26c3a30c8ac93b8a0720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fe9779ec91937211dc26c3a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 4 19:56:53 2017 +0900 d3d9/tests: Add LockRect tests with dynamic textures. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 601461f..824e2de 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17290,8 +17290,10 @@ static void add_dirty_rect_test_draw(IDirect3DDevice9 *device) static void add_dirty_rect_test(void) { HRESULT hr; - IDirect3DTexture9 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, *tex_managed; - IDirect3DSurface9 *surface_dst2, *surface_src_green, *surface_src_red, *surface_managed; + IDirect3DTexture9 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, + *tex_managed, *tex_dynamic; + IDirect3DSurface9 *surface_dst2, *surface_src_green, *surface_src_red, + *surface_managed, *surface_dynamic; IDirect3DDevice9 *device; IDirect3D9 *d3d; unsigned int i; @@ -17328,6 +17330,9 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &tex_managed, NULL); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 1, D3DUSAGE_DYNAMIC, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex_dynamic, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_dst2, 0, &surface_dst2); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); @@ -17337,6 +17342,8 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_managed, 0, &surface_managed); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); fill_surface(surface_src_red, 0x00ff0000, 0); fill_surface(surface_src_green, 0x0000ff00, 0); @@ -17529,6 +17536,7 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* Tests with managed textures. */ fill_surface(surface_managed, 0x00ff0000, 0); hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_managed); ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); @@ -17563,7 +17571,6 @@ static void add_dirty_rect_test(void) /* So does EvictManagedResources. */ fill_surface(surface_managed, 0x000000ff, D3DLOCK_NO_DIRTY_UPDATE); - ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); hr = IDirect3DDevice9_EvictManagedResources(device); ok(SUCCEEDED(hr), "Failed to evict managed resources, hr %#x.\n", hr); add_dirty_rect_test_draw(device); @@ -17573,6 +17580,26 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* Tests with dynamic textures */ + fill_surface(surface_dynamic, 0x0000ffff, 0); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_dynamic); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ffff, 1), + "Expected color 0x0000ffff, got 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + /* Dynamic textures don't honor D3DLOCK_NO_DIRTY_UPDATE. */ + fill_surface(surface_dynamic, 0x00ffff00, D3DLOCK_NO_DIRTY_UPDATE); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00ffff00, 1), + "Expected color 0x00ffff00, got 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* AddDirtyRect on a locked texture is allowed. */ hr = IDirect3DTexture9_LockRect(tex_src_red, 0, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); @@ -17595,11 +17622,13 @@ static void add_dirty_rect_test(void) IDirect3DSurface9_Release(surface_managed); IDirect3DSurface9_Release(surface_src_red); IDirect3DSurface9_Release(surface_src_green); + IDirect3DSurface9_Release(surface_dynamic); IDirect3DTexture9_Release(tex_src_red); IDirect3DTexture9_Release(tex_src_green); IDirect3DTexture9_Release(tex_dst1); IDirect3DTexture9_Release(tex_dst2); IDirect3DTexture9_Release(tex_managed); + IDirect3DTexture9_Release(tex_dynamic); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d);

1 0

Akihiro Sagawa : d3d8/tests: Add LockRect tests with dynamic textures.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 49f9e545fbb523d0f61ce9676a23513318d3e6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f9e545fbb523d0f61ce9676… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 4 19:56:55 2017 +0900 d3d8/tests: Add LockRect tests with dynamic textures. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 57c8917..b7b6e2a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5216,8 +5216,10 @@ static void add_dirty_rect_test_draw(IDirect3DDevice8 *device) static void add_dirty_rect_test(void) { - IDirect3DSurface8 *surface_dst2, *surface_src_green, *surface_src_red, *surface_managed; - IDirect3DTexture8 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, *tex_managed; + IDirect3DTexture8 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, + *tex_managed, *tex_dynamic; + IDirect3DSurface8 *surface_dst2, *surface_src_green, *surface_src_red, + *surface_managed, *surface_dynamic; D3DLOCKED_RECT locked_rect; IDirect3DDevice8 *device; IDirect3D8 *d3d; @@ -5254,6 +5256,9 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &tex_managed); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 1, D3DUSAGE_DYNAMIC, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex_dynamic); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = IDirect3DTexture8_GetSurfaceLevel(tex_dst2, 0, &surface_dst2); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); @@ -5263,6 +5268,8 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); hr = IDirect3DTexture8_GetSurfaceLevel(tex_managed, 0, &surface_managed); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); fill_surface(surface_src_red, 0x00ff0000, 0); fill_surface(surface_src_green, 0x0000ff00, 0); @@ -5455,6 +5462,7 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* Tests with managed textures. */ fill_surface(surface_managed, 0x00ff0000, 0); hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_managed); ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); @@ -5489,7 +5497,6 @@ static void add_dirty_rect_test(void) /* So does ResourceManagerDiscardBytes. */ fill_surface(surface_managed, 0x000000ff, D3DLOCK_NO_DIRTY_UPDATE); - ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); hr = IDirect3DDevice8_ResourceManagerDiscardBytes(device, 0); ok(SUCCEEDED(hr), "Failed to evict managed resources, hr %#x.\n", hr); add_dirty_rect_test_draw(device); @@ -5499,6 +5506,26 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* Tests with dynamic textures */ + fill_surface(surface_dynamic, 0x0000ffff, 0); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_dynamic); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ffff, 1), + "Expected color 0x0000ffff, got 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + /* Dynamic textures don't honor D3DLOCK_NO_DIRTY_UPDATE. */ + fill_surface(surface_dynamic, 0x00ffff00, D3DLOCK_NO_DIRTY_UPDATE); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00ffff00, 1), + "Expected color 0x00ffff00, got 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* AddDirtyRect on a locked texture is allowed. */ hr = IDirect3DTexture8_LockRect(tex_src_red, 0, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); @@ -5517,11 +5544,13 @@ static void add_dirty_rect_test(void) IDirect3DSurface8_Release(surface_managed); IDirect3DSurface8_Release(surface_src_red); IDirect3DSurface8_Release(surface_src_green); + IDirect3DSurface8_Release(surface_dynamic); IDirect3DTexture8_Release(tex_src_red); IDirect3DTexture8_Release(tex_src_green); IDirect3DTexture8_Release(tex_dst1); IDirect3DTexture8_Release(tex_dst2); IDirect3DTexture8_Release(tex_managed); + IDirect3DTexture8_Release(tex_dynamic); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done:

1 0

Akihiro Sagawa : wined3d: Upload textures if NO_DIRTY_UPDATE flag is set when locking dynamic textures.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 6cf2dc67e1eb06b5c5483c82b16ed55dd0272d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf2dc67e1eb06b5c5483c82b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 4 19:56:57 2017 +0900 wined3d: Upload textures if NO_DIRTY_UPDATE flag is set when locking dynamic textures. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/texture.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index b7b6e2a..b477ab7 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5521,7 +5521,7 @@ static void add_dirty_rect_test(void) fill_surface(surface_dynamic, 0x00ffff00, D3DLOCK_NO_DIRTY_UPDATE); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ffff00, 1), + ok(color_match(color, 0x00ffff00, 1), "Expected color 0x00ffff00, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 824e2de..75c6020 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17595,7 +17595,7 @@ static void add_dirty_rect_test(void) fill_surface(surface_dynamic, 0x00ffff00, D3DLOCK_NO_DIRTY_UPDATE); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ffff00, 1), + ok(color_match(color, 0x00ffff00, 1), "Expected color 0x00ffff00, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 63577d7..0d9fadf 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1752,7 +1752,8 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour return E_OUTOFMEMORY; } - if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) + if (!(flags & WINED3D_MAP_READONLY) + && (!(flags & WINED3D_MAP_NO_DIRTY_UPDATE) || (resource->usage & WINED3DUSAGE_DYNAMIC))) wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding);

1 0

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: fd9e7d0f8c3de265ab7a64545418a67d28e0766b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9e7d0f8c3de265ab7a64545… Author: Can Taşan <betax34(a)hotmail.com> Date: Mon Feb 6 17:55:03 2017 +0100 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.tr | 15 ++++++------ po/tr.po | 62 +++++++++++++++++-------------------------------- 2 files changed, 29 insertions(+), 48 deletions(-) diff --git a/documentation/README.tr b/documentation/README.tr index aa11353..1ddce37 100644 --- a/documentation/README.tr +++ b/documentation/README.tr @@ -124,7 +124,7 @@ bir dosya adı belirtebilirsiniz. Örneğin: Not Defteri'ni çalıştırmak için: wine notepad (dosyaları konumlandırmak için config - wine notepad.exe (dosyasındaki Path arama yolunu kullanarak) + wine notepad.exe dosyasındaki Path arama yolunu kullanarak) wine c:\\windows\\notepad.exe (DOS dosya adı sözdizimi ile) @@ -145,17 +145,18 @@ WWW: Wine hakkında geniş bilgiyi WineHQ sitesine http://www.winehq.org/ başlangıç noktasıdır. SSS: Wine hakkında sıkça sorulan sorulara buradan ulaşabilirsiniz: + http://www.winehq.org/FAQ Hatalar: - Hatalarınızı http://bugs.winehq.org adresinden Wine Bugzilla - ile bildirebilirsiniz. Lütfen bir hata bildirmeden önce - hatanın önceden girilip girilmediğini öğrenmek için bugzilla'da + Karşılaştığınız hataları http://bugs.winehq.org adresinden Wine + Bugzilla ile bildirebilirsiniz. Lütfen bir hata bildirmeden önce + hatanın önceden girilip girilmediğini öğrenmek için Bugzilla'da arama yapınız. IRC: irc.freenode.net sunucusundan #WineHQ kanalı ile çevrimiçi yardım alabilirsiniz. -Git: Geçerli Wine geliştirme ağacına Git üzerinden erişilebilir. +Git: Geçerli Wine geliştirme ağacına Git üzerinden erişim sağlanabilir. Daha fazla bilgi için http://www.winehq.org/git adresine gidiniz. E-posta listeleri: @@ -163,8 +164,8 @@ E-posta listeleri: Daha fazla bilgi için http://www.winehq.org/forums adresine gidiniz. Eğer bir şey eklemek veya hata düzeltmek istiyorsanız, lütfen sonraki -sürümde içerilmesi için wine-patches(a)winehq.org e-posta listesine bir yama -('diff -u' biçiminde) gönderiniz. +sürümde yer alabilmesii için wine-patches(a)winehq.org e-posta listesine bir +yama ('diff -u' biçiminde) gönderiniz. -- Alexandre Julliard diff --git a/po/tr.po b/po/tr.po index 21ae5f6..5ab170a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8358,10 +8358,8 @@ msgid "Wine Control Panel" msgstr "Wine Denetim Masası" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "Dosya Çalıştır iletişim kutusu görüntülenemedi (dahili hata)" +msgstr "Çalıştır iletişim kutusu görüntülenemedi (dahili hata)" #: shell32.rc:196 msgid "Unable to display Browse dialog box (internal error)" @@ -9132,7 +9130,7 @@ msgid "" "until the device is free, and then try again." msgstr "" "Geçerli dalga aygıtı kullanımda olduğundan yürütme için açılamıyor. Aygıt " -"boşalana kadar bekleyin ve yeniden deneyin." +"lana kadar bekleyin ve yeniden deneyin." #: winmm.rc:114 msgid "" @@ -11882,7 +11880,7 @@ msgstr "Veri" #: regedit.rc:132 msgid "Registry Editor" -msgstr "Kayıt DÜzenleyici" +msgstr "Kayıt Düzenleyici" #: regedit.rc:194 msgid "Import Registry File" @@ -11906,55 +11904,47 @@ msgstr "(değer görüntülenemiyor)" #: regedit.rc:207 msgid "(unknown %d)" -msgstr "(%d bilinmiyor)" +msgstr "(bilinmeyen %d)" #: regedit.rc:212 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: '%1' kayıt anahtarı açılamıyor.\n" +msgstr "Seçilen kayıt değeri değiştirilemiyor." #: regedit.rc:213 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: '%1' kayıt anahtarı açılamıyor.\n" +msgstr "Yeni bir kayıt anahtarı oluşturulamıyor." #: regedit.rc:214 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: '%1' kayıt anahtarı açılamıyor.\n" +msgstr "Yeni bir kayıt değeri oluşturulamıyor." #: regedit.rc:215 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"'%1' anahtarı yeniden adlandırılamıyor.\n" +"Belirtilen anahtar adı zaten var." #: regedit.rc:216 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"'%1' değeri yeniden adlandırılamıyor.\n" +"Belirtilen değer adı zaten var." #: regedit.rc:217 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: '%1' kayıt anahtarı açılamıyor.\n" +msgstr "Seçilen kayıt anahtarı silinemiyor." #: regedit.rc:218 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: '%1' kayıt anahtarı açılamıyor.\n" +msgstr "Seçilen kayıt anahtarı yeniden adlandırılamıyor." #: regedit.rc:219 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: '%1' kayıt anahtarı açılamıyor.\n" +msgstr "Seçilen kayıt değeri yeniden adlandırılamıyor." #: regedit.rc:371 msgid "" @@ -12191,32 +12181,24 @@ msgid "Displays program information, version number and copyright" msgstr "Program bilgisini, sürüm numarasını ve telif hakkını gösterir" #: regedit.rc:181 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: '%1' kayıt anahtarı açılamıyor.\n" +msgstr "'%1' kayıt değeri sorgulanamıyor." #: regedit.rc:182 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "Bu tür (%u) anahtarlar değiştirilemez" +msgstr "Bu tür (%1!u!) kayıt anahtarları değiştirilemez." #: regedit.rc:183 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "Değer çok büyük (%u)" +msgstr "Değer çok büyük (%1!u!)." #: regedit.rc:184 msgid "Confirm Value Delete" -msgstr "Değer silmeyi onayla" +msgstr "Değer Silmeyi Onayla" #: regedit.rc:189 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Arama dizesi '%s' bulunamadı" +msgstr "Arama tamamlandı. '%1' dizesi bulunamadı." #: regedit.rc:186 msgid "Are you sure you want to delete these values?" @@ -12231,10 +12213,8 @@ msgid "New Value #%d" msgstr "Yeni Değer #%d" #: regedit.rc:180 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: '%1' kayıt anahtarı açılamıyor.\n" +msgstr "'%1' kayıt anahtarı sorgulanamıyor." #: regedit.rc:152 msgid "Adds a new multi-string value" @@ -13180,7 +13160,7 @@ msgstr "İşlem İlişkisine Erişme veya Ayarlama Başarısız" #: taskmgr.rc:322 msgid "System Idle Process" -msgstr "Sistem Boşta İşlemi" +msgstr "Boş Sistem İşlemi" #: taskmgr.rc:323 msgid "Not Responding"

1 0

Nikolay Sivov : mmdevapi: Fix pointer type cast.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 054f1e8c1acceb99f866383e4a0524ee86144e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=054f1e8c1acceb99f866383e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 5 17:19:18 2017 +0300 mmdevapi: Fix pointer type cast. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 221fb39..b189e8e 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -613,7 +613,7 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls if (SUCCEEDED(hr)) { IPersistPropertyBag *ppb; - hr = IUnknown_QueryInterface((IUnknown*)*ppv, &IID_IPersistPropertyBag, (void*)&ppb); + hr = IUnknown_QueryInterface((IUnknown*)*ppv, &IID_IPersistPropertyBag, (void **)&ppb); if (SUCCEEDED(hr)) { /* ::Load cannot assume the interface stays alive after the function returns,

1 0

Nikolay Sivov : urlmon: Remove 'stub' from implemented functions trace message.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 1b04cf1e37f149ad28c78564f1e6a88bd1ee1042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b04cf1e37f149ad28c78564f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 5 17:15:29 2017 +0300 urlmon: Remove 'stub' from implemented functions trace message. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/internet.c | 2 +- dlls/urlmon/uri.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index d7deccc..28aaa0b 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -488,7 +488,7 @@ HRESULT WINAPI CoInternetQueryInfo(LPCWSTR pwzUrl, QUERYOPTION QueryOption, IInternetProtocolInfo *protocol_info; HRESULT hres; - TRACE("(%s, %x, %x, %p, %x, %p, %x): stub\n", debugstr_w(pwzUrl), + TRACE("(%s, %x, %x, %p, %x, %p, %x)\n", debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pvBuffer, cbBuffer, pcbBuffer, dwReserved); protocol_info = get_protocol_info(pwzUrl); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 79b073e..2b37dd9 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6768,7 +6768,7 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW HRESULT hr; IInternetProtocolInfo *info; - TRACE("(%p %s %x %p %x) stub\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, + TRACE("(%p %s %x %p %x)\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); if(!ppCombinedUri)

1 0

Nikolay Sivov : msctf: Return proper pointer to interface.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 7bcca927bc2d47fc9e6aec83221c996fb46cc89d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bcca927bc2d47fc9e6aec832… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 5 17:20:35 2017 +0300 msctf: Return proper pointer to interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 1982e2c..a19eaa1 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -180,7 +180,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) This->IClassFactory_iface.lpVtbl = &ClassFactoryVtbl; This->ref = 1; This->ctor = ctor; - *ppvOut = This; + *ppvOut = &This->IClassFactory_iface; TRACE("Created class factory %p\n", This); return S_OK; }

1 0

Nikolay Sivov : oleaut32/tests: Correctly return interface pointer.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 73a0ddfa4715defe3bc27c5f32f31e83db0f3208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a0ddfa4715defe3bc27c5f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 5 19:54:44 2017 +0300 oleaut32/tests: Correctly return interface pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olepicture.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index b716f25..4a81e2e 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1391,14 +1391,9 @@ static HRESULT WINAPI NoStatStreamImpl_QueryInterface( NoStatStreamImpl* const This = impl_from_IStream(iface); if (ppvObject==0) return E_INVALIDARG; *ppvObject = 0; - if (IsEqualIID(&IID_IUnknown, riid)) - { - *ppvObject = This; - } - else if (IsEqualIID(&IID_IStream, riid)) - { - *ppvObject = This; - } + + if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IStream, riid)) + *ppvObject = &This->IStream_iface; if ((*ppvObject)==0) return E_NOINTERFACE;

1 0

Nikolay Sivov : shell32: Added a stub for IShellImageDataFactory.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 3f4999cc6a3fc54dffae69e31e2dd18953a0586e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4999cc6a3fc54dffae69e31… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 5 22:25:09 2017 +0300 shell32: Added a stub for IShellImageDataFactory. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_classes.idl | 6 +++ dlls/shell32/shell32_main.h | 2 + dlls/shell32/shellole.c | 91 ++++++++++++++++++++++++++++++++++++++++ dlls/uuid/uuid.c | 3 ++ 4 files changed, 102 insertions(+) diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index 68ce2b5..cc57b2b 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -154,3 +154,9 @@ coclass KnownFolderManager { interface IKnownFolderManager; } threading(apartment), uuid(77f10cf0-3db5-4966-b520-b7c54fd35ed6) ] coclass DestinationList { interface ICustomDestinationList; } + +[ + helpstring("Shell Image Data Factory"), + threading(apartment), + uuid(66e4e4fb-f385-4dd0-8d74-a2efd1bc6178) +] coclass ShellImageDataFactory { interface IShellImageDataFactory; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 642fab7..10cd3a4 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -44,6 +44,8 @@ extern HMODULE huser32 DECLSPEC_HIDDEN; extern HINSTANCE shell32_hInstance DECLSPEC_HIDDEN; +extern CLSID CLSID_ShellImageDataFactory; + /* Iconcache */ #define INVALID_INDEX -1 void SIC_Destroy(void) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index dd54900..a68e73d 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -36,6 +36,7 @@ #include "shlobj.h" #include "shlguid.h" #include "shldisp.h" +#include "shimgdata.h" #include "winreg.h" #include "winerror.h" @@ -50,6 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); extern INT WINAPI SHStringFromGUIDW(REFGUID guid, LPWSTR lpszDest, INT cchMax); /* shlwapi.24 */ +static HRESULT WINAPI ShellImageDataFactory_Constructor(IUnknown *outer, REFIID riid, void **obj); /************************************************************************** * Default ClassFactory types @@ -84,6 +86,7 @@ static const struct { {&CLSID_KnownFolderManager, KnownFolderManager_Constructor}, {&CLSID_Shell, IShellDispatch_Constructor}, {&CLSID_DestinationList, CustomDestinationList_Constructor}, + {&CLSID_ShellImageDataFactory, ShellImageDataFactory_Constructor}, {NULL, NULL} }; @@ -807,3 +810,91 @@ HRESULT WINAPI SHCreateQueryCancelAutoPlayMoniker(IMoniker **moniker) if (!moniker) return E_INVALIDARG; return CreateClassMoniker(&CLSID_QueryCancelAutoPlay, moniker); } + +/* IShellImageDataFactory */ +static HRESULT WINAPI ShellImageDataFactory_QueryInterface(IShellImageDataFactory *iface, REFIID riid, void **obj) +{ + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(&IID_IShellImageDataFactory, riid) || IsEqualIID(&IID_IUnknown, riid)) + { + *obj = iface; + } + else + { + FIXME("not implemented for %s\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*obj); + return S_OK; +} + +static ULONG WINAPI ShellImageDataFactory_AddRef(IShellImageDataFactory *iface) +{ + TRACE("(%p)\n", iface); + + return 2; +} + +static ULONG WINAPI ShellImageDataFactory_Release(IShellImageDataFactory *iface) +{ + TRACE("(%p)\n", iface); + + return 1; +} + +static HRESULT WINAPI ShellImageDataFactory_CreateIShellImageData(IShellImageDataFactory *iface, IShellImageData **data) +{ + FIXME("%p, %p: stub\n", iface, data); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellImageDataFactory_CreateImageFromFile(IShellImageDataFactory *iface, const WCHAR *path, + IShellImageData **data) +{ + FIXME("%p, %s, %p: stub\n", iface, debugstr_w(path), data); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellImageDataFactory_CreateImageFromStream(IShellImageDataFactory *iface, IStream *stream, + IShellImageData **data) +{ + FIXME("%p, %p, %p: stub\n", iface, stream, data); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellImageDataFactory_GetDataFormatFromPath(IShellImageDataFactory *iface, const WCHAR *path, + GUID *format) +{ + FIXME("%p, %s, %p: stub\n", iface, debugstr_w(path), format); + + return E_NOTIMPL; +} + +static const IShellImageDataFactoryVtbl ShellImageDataFactoryVtbl = +{ + ShellImageDataFactory_QueryInterface, + ShellImageDataFactory_AddRef, + ShellImageDataFactory_Release, + ShellImageDataFactory_CreateIShellImageData, + ShellImageDataFactory_CreateImageFromFile, + ShellImageDataFactory_CreateImageFromStream, + ShellImageDataFactory_GetDataFormatFromPath, +}; + +static IShellImageDataFactory ShellImageDataFactory = { &ShellImageDataFactoryVtbl }; + +HRESULT WINAPI ShellImageDataFactory_Constructor(IUnknown *outer, REFIID riid, void **obj) +{ + TRACE("%p %s %p\n", outer, debugstr_guid(riid), obj); + + if (outer) + return CLASS_E_NOAGGREGATION; + + return IShellImageDataFactory_QueryInterface(&ShellImageDataFactory, riid, obj); +} diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index af96221..4834dee 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -87,6 +87,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "tlogstg.h" #include "msdasc.h" #include "netcfgx.h" +#include "shimgdata.h" /* FIXME: cguids declares GUIDs but does not define their values */ @@ -141,5 +142,7 @@ DEFINE_GUID(GUID_COMPARTMENT_PERSISTMENUENABLED, 0x575f3783,0x70c8,0x47c8,0xa DEFINE_GUID(GUID_COMPARTMENT_EMPTYCONTEXT, 0xd7487dbf,0x804e,0x41c5,0x89,0x4d,0xad,0x96,0xfd,0x4e,0xea,0x13); DEFINE_GUID(GUID_COMPARTMENT_TIPUISTATUS, 0x148ca3ec,0x0366,0x401c,0x8d,0x75,0xed,0x97,0x8d,0x85,0xfb,0xc9); +DEFINE_GUID(CLSID_ShellImageDataFactory, 0x66e4e4fb,0xf385,0x4dd0,0x8d,0x74,0xa2,0xef,0xd1,0xbc,0x61,0x78); + /* service identifiers not declared in headers */ DEFINE_GUID(SID_SContainerDispatch,0xb722be00,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70);

1 0

Nikolay Sivov : xmllite: Handle char references within text nodes.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 455f5f2380f6375539593778d321064bc9381de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=455f5f2380f6375539593778d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 6 01:19:30 2017 +0300 xmllite: Handle char references within text nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 16 +++++++++------- dlls/xmllite/tests/reader.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 1e3c7aa..9bb0d56 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2382,6 +2382,8 @@ static HRESULT reader_parse_chardata(xmlreader *reader) while (*ptr) { + static const WCHAR ampW[] = {'&',0}; + /* CDATA closing sequence ']]>' is not allowed */ if (ptr[0] == ']' && ptr[1] == ']' && ptr[2] == '>') return WC_E_CDSECTEND; @@ -2398,11 +2400,15 @@ static HRESULT reader_parse_chardata(xmlreader *reader) return S_OK; } - reader_skipn(reader, 1); - /* this covers a case when text has leading whitespace chars */ if (!is_wchar_space(*ptr)) reader->nodetype = XmlNodeType_Text; - ptr++; + + if (!reader_cmp(reader, ampW)) + reader_parse_reference(reader); + else + reader_skipn(reader, 1); + + ptr = reader_get_ptr(reader); } return S_OK; @@ -2413,7 +2419,6 @@ static HRESULT reader_parse_content(xmlreader *reader) { static const WCHAR cdstartW[] = {'<','!','[','C','D','A','T','A','[',0}; static const WCHAR etagW[] = {'<','/',0}; - static const WCHAR ampW[] = {'&',0}; if (reader->resumestate != XmlReadResumeState_Initial) { @@ -2448,9 +2453,6 @@ static HRESULT reader_parse_content(xmlreader *reader) if (!reader_cmp(reader, cdstartW)) return reader_parse_cdata(reader); - if (!reader_cmp(reader, ampW)) - return reader_parse_reference(reader); - if (!reader_cmp(reader, ltW)) return reader_parse_element(reader); diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index dc586e8..f7f738e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2049,6 +2049,43 @@ static void test_namespaceuri(void) IXmlReader_Release(reader); } +static void test_read_charref(void) +{ + static const char testA[] = "<a b=\"c\">ǳă</a>"; + static const WCHAR chardataW[] = {0x01f3,0x0103,0}; + const WCHAR *value; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + stream = create_stream_on_data(testA, sizeof(testA)); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Element, "Unexpected node type %d\n", type); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Text, "Unexpected node type %d\n", type); + + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(!lstrcmpW(value, chardataW), "Text value : %s\n", wine_dbgstr_w(value)); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_EndElement, "Unexpected node type %d\n", type); + + IXmlReader_Release(reader); + IStream_Release(stream); +} + START_TEST(reader) { test_reader_create(); @@ -2070,4 +2107,5 @@ START_TEST(reader) test_reader_properties(); test_prefix(); test_namespaceuri(); + test_read_charref(); }

1 0