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

Henri Verbeet : d3d9: Simplify reset_enum_callback().
by Alexandre Julliard 05 May '11

05 May '11

Module: wine Branch: master Commit: 99092e8a0a74a77efec0526c0ccad61c9ebe3544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99092e8a0a74a77efec0526c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 4 22:18:43 2011 +0200 d3d9: Simplify reset_enum_callback(). Note that the existing code wouldn't work for volumes, since volumes aren't proper resources in d3d9. --- dlls/d3d9/device.c | 68 ++++++++++++++++------------------------------------ 1 files changed, 21 insertions(+), 47 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 915fdf0..c7ebfc9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -540,61 +540,35 @@ static UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(IDirect3DDevice9Ex static HRESULT WINAPI reset_enum_callback(struct wined3d_resource *resource, void *data) { + struct wined3d_resource_desc desc; BOOL *resources_ok = data; - D3DRESOURCETYPE type; - HRESULT ret = S_OK; - D3DSURFACE_DESC surface_desc; - D3DVOLUME_DESC volume_desc; - D3DINDEXBUFFER_DESC index_desc; - D3DVERTEXBUFFER_DESC vertex_desc; - WINED3DPOOL pool; - IDirect3DResource9 *parent; - - parent = wined3d_resource_get_parent(resource); - type = IDirect3DResource9_GetType(parent); - switch(type) { - case D3DRTYPE_SURFACE: - IDirect3DSurface9_GetDesc((IDirect3DSurface9 *)parent, &surface_desc); - pool = surface_desc.Pool; - break; - - case D3DRTYPE_VOLUME: - IDirect3DVolume9_GetDesc((IDirect3DVolume9 *)parent, &volume_desc); - pool = volume_desc.Pool; - break; - - case D3DRTYPE_INDEXBUFFER: - IDirect3DIndexBuffer9_GetDesc((IDirect3DIndexBuffer9 *) parent, &index_desc); - pool = index_desc.Pool; - break; - - case D3DRTYPE_VERTEXBUFFER: - IDirect3DVertexBuffer9_GetDesc((IDirect3DVertexBuffer9 *)parent, &vertex_desc); - pool = vertex_desc.Pool; - break; - - /* No need to check for textures. If there is a D3DPOOL_DEFAULT texture, there - * is a D3DPOOL_DEFAULT surface or volume as well - */ - default: - pool = WINED3DPOOL_SCRATCH; /* a harmless pool */ - break; - } - if (pool == WINED3DPOOL_DEFAULT) + wined3d_resource_get_desc(resource, &desc); + if (desc.pool == WINED3DPOOL_DEFAULT) { - IDirect3DResource9_AddRef(parent); - if (IUnknown_Release(parent) == 0) + IDirect3DSurface9 *surface; + + if (desc.resource_type != WINED3DRTYPE_SURFACE) { - TRACE("Parent %p is an implicit resource with ref 0\n", parent); - } else { - WARN("Resource %p(wineD3D %p) with pool D3DPOOL_DEFAULT blocks the Reset call\n", parent, resource); - ret = S_FALSE; + WARN("Resource %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", resource); *resources_ok = FALSE; + return S_FALSE; } + + surface = wined3d_resource_get_parent(resource); + + IDirect3DSurface9_AddRef(surface); + if (IDirect3DSurface9_Release(surface)) + { + WARN("Surface %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", surface, resource); + *resources_ok = FALSE; + return S_FALSE; + } + + WARN("Surface %p (resource %p) is an implicit resource with ref 0.\n", surface, resource); } - return ret; + return S_OK; } static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(IDirect3DDevice9Ex *iface,

1 0

Henri Verbeet : d3d9/tests: Add a volume texture test to test_reset().
by Alexandre Julliard 05 May '11

05 May '11

Module: wine Branch: master Commit: 4a7ff5fc3577a5d5e79c034cabedbc8da60fa7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7ff5fc3577a5d5e79c034ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 4 22:18:44 2011 +0200 d3d9/tests: Add a volume texture test to test_reset(). --- dlls/d3d9/tests/device.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 4d6703f..0aef4b8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -861,6 +861,7 @@ static void test_reset(void) D3DLOCKED_RECT lockrect; IDirect3DDevice9 *device1 = NULL; IDirect3DDevice9 *device2 = NULL; + D3DCAPS9 caps; struct { UINT w; @@ -933,6 +934,9 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(device1); ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after creation returned %#x\n", hr); + hr = IDirect3DDevice9_GetDeviceCaps(device1, &caps); + ok(SUCCEEDED(hr), "GetDeviceCaps failed, hr %#x.\n", hr); + width = GetSystemMetrics(SM_CXSCREEN); height = GetSystemMetrics(SM_CYSCREEN); ok(width == modes[i].w, "Screen width is %u, expected %u\n", width, modes[i].w); @@ -1067,6 +1071,29 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(device1); ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); + if (caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) + { + IDirect3DVolumeTexture9 *volume_texture; + + hr = IDirect3DDevice9_CreateVolumeTexture(device1, 16, 16, 4, 1, 0, + D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &volume_texture, NULL); + ok(SUCCEEDED(hr), "CreateVolumeTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(hr == D3DERR_INVALIDCALL, "Reset returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + hr = IDirect3DDevice9_TestCooperativeLevel(device1); + ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", + hr, D3DERR_DEVICENOTRESET); + IDirect3DVolumeTexture9_Release(volume_texture); + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(SUCCEEDED(hr), "Reset failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_TestCooperativeLevel(device1); + ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); + } + else + { + skip("Volume textures not supported.\n"); + } + /* Scratch, sysmem and managed pools are fine */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device1, 16, 16, D3DFMT_R5G6B5, D3DPOOL_SCRATCH, &surface, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface returned %08x\n", hr);

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetVertexShader().
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 35bff043f22a9bb740b086210a76def563a68bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35bff043f22a9bb740b086210… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 4 09:40:59 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetVertexShader(). --- dlls/d3dx9_36/effect.c | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 22f6993..5ad078e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -326,6 +326,7 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) break; case D3DXPT_PIXELSHADER: + case D3DXPT_VERTEXSHADER: if (*(IUnknown **)param->data) IUnknown_Release(*(IUnknown **)param->data); break; @@ -997,7 +998,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXH if (data && param && param->data && param->bytes <= bytes) { - if (param->type == D3DXPT_PIXELSHADER) + if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER) { UINT i; @@ -1346,10 +1347,23 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetPixelShader(ID3DXBaseEffect *iface, static HRESULT WINAPI ID3DXBaseEffectImpl_GetVertexShader(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 *vshader) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, vshader %p stub\n", This, parameter, vshader); + TRACE("iface %p, parameter %p, vshader %p\n", This, parameter, vshader); - return E_NOTIMPL; + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (vshader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER) + { + *vshader = *(LPDIRECT3DVERTEXSHADER9 *)param->data; + if (*vshader) IDirect3DVertexShader9_AddRef(*vshader); + TRACE("Returning %p\n", *vshader); + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetArrayRange(ID3DXBaseEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) @@ -3086,6 +3100,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons { case D3DXPT_STRING: case D3DXPT_PIXELSHADER: + case D3DXPT_VERTEXSHADER: read_dword(ptr, &id); TRACE("Id: %u\n", id); param->base->objects[id] = get_parameter_handle(param); @@ -3191,6 +3206,15 @@ static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr) } break; + case D3DXPT_VERTEXSHADER: + hr = IDirect3DDevice9_CreateVertexShader(param->base->effect->device, (DWORD *)*ptr, (LPDIRECT3DVERTEXSHADER9 *)param->data); + if (hr != D3D_OK) + { + WARN("Failed to create vertex shader\n"); + return hr; + } + break; + case D3DXPT_PIXELSHADER: hr = IDirect3DDevice9_CreatePixelShader(param->base->effect->device, (DWORD *)*ptr, (LPDIRECT3DPIXELSHADER9 *)param->data); if (hr != D3D_OK) @@ -3292,6 +3316,10 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch param->bytes = sizeof(LPDIRECT3DPIXELSHADER9); break; + case D3DXPT_VERTEXSHADER: + param->bytes = sizeof(LPDIRECT3DVERTEXSHADER9); + break; + default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); break;

1 0

John Edmonds : d3d9/tests: Added a test for resetting an invisible, inactive window to fullscreen mode.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 1772a043db3ee0c1f807eb1cec6ee64c5a1e168c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1772a043db3ee0c1f807eb1ce… Author: John Edmonds <pocketcookies2(a)gmail.com> Date: Tue May 3 20:22:12 2011 -0400 d3d9/tests: Added a test for resetting an invisible, inactive window to fullscreen mode. --- dlls/d3d9/tests/device.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 27eae10..576e61f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2814,6 +2814,63 @@ done: UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_reset_fullscreen(void) +{ + WNDCLASSEX wc = {0}; + IDirect3DDevice9 *device = NULL; + IDirect3D9 *d3d = NULL; + static const struct message messages[] = + { + {WM_ACTIVATEAPP, FOCUS_WINDOW}, + {0, 0}, + }; + + d3d = pDirect3DCreate9(D3D_SDK_VERSION); + ok(d3d != NULL, "Failed to create an IDirect3D object.\n"); + expect_messages = messages; + + wc.cbSize = sizeof(WNDCLASSEX); + wc.lpfnWndProc = test_proc; + wc.lpszClassName = "test_reset_fullscreen"; + + ok(RegisterClassEx(&wc), "Failed to register a new window class. GetLastError:%d\n", GetLastError()); + + device_window = focus_window = CreateWindowEx(0, wc.lpszClassName, "Test Reset Fullscreen", 0, 0, 0, screen_width, screen_height, NULL, NULL, NULL, NULL); + ok(device_window != NULL, "Failed to create a window. GetLastError:%d\n", GetLastError()); + + /* + * Create a device in windowed mode. + * Since the device is windowed and we haven't called any methods that + * could show the window (such as ShowWindow or SetWindowPos) yet, + * WM_ACTIVATEAPP will not have been sent. + */ + device = create_device(d3d, device_window, focus_window, TRUE); + if (!device) + { + skip("Unable to create device. Skipping test."); + goto cleanup; + } + + /* + * Switch to fullscreen mode. + * This will force the window to be shown and will cause the WM_ACTIVATEAPP + * message to be sent. + */ + ok(SUCCEEDED(reset_device(device, device_window, FALSE)), "Failed to reset device.\n"); + + flush_events(); + todo_wine ok(expect_messages->message == 0, "Expected to receive message %#x.\n", expect_messages->message); + expect_messages = NULL; + +cleanup: + if (device) IDirect3DDevice9_Release(device); + if (d3d) IDirect3D9_Release(d3d); + DestroyWindow(device_window); + device_window = focus_window = NULL; + UnregisterClass(wc.lpszClassName, GetModuleHandle(NULL)); +} + + static inline void set_fpu_cw(WORD cw) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) @@ -3007,6 +3064,7 @@ START_TEST(device) test_mipmap_levels(); test_checkdevicemultisampletype(); test_cursor(); + test_reset_fullscreen(); test_reset(); test_scene(); test_limits();

1 0

John Edmonds : wined3d: Turn off message filtering temporarily in the Reset () method to allow certain messages (e.g. WM_ACTIVATEAPP) through.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: d9f8cba50f4c2fc9f138d35c73ba5afc30d15866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f8cba50f4c2fc9f138d35c7… Author: John Edmonds <pocketcookies2(a)gmail.com> Date: Tue May 3 20:22:32 2011 -0400 wined3d: Turn off message filtering temporarily in the Reset() method to allow certain messages (e.g. WM_ACTIVATEAPP) through. --- dlls/d3d9/tests/device.c | 2 +- dlls/wined3d/device.c | 6 ------ 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 576e61f..4d6703f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2859,7 +2859,7 @@ static void test_reset_fullscreen(void) ok(SUCCEEDED(reset_device(device, device_window, FALSE)), "Failed to reset device.\n"); flush_events(); - todo_wine ok(expect_messages->message == 0, "Expected to receive message %#x.\n", expect_messages->message); + ok(expect_messages->message == 0, "Expected to receive message %#x.\n", expect_messages->message); expect_messages = NULL; cleanup: diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a57ce5e..5638e99 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6544,9 +6544,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface, if (!pPresentationParameters->Windowed != !swapchain->presentParms.Windowed || DisplayModeChanged) { - BOOL filter = This->filter_messages; - This->filter_messages = TRUE; - IWineD3DDevice_SetDisplayMode(iface, 0, &mode); if (!pPresentationParameters->Windowed) @@ -6559,7 +6556,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface, { ERR("Failed to acquire focus window, hr %#x.\n", hr); wined3d_swapchain_decref(swapchain); - This->filter_messages = filter; return hr; } @@ -6583,8 +6579,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface, IWineD3DDevice_ReleaseFocusWindow(iface); } swapchain->presentParms.Windowed = pPresentationParameters->Windowed; - - This->filter_messages = filter; } else if (!pPresentationParameters->Windowed) {

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 42b68b7ef4b99748272ff38abb6f174f6248cb81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b68b7ef4b99748272ff38ab… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue May 3 21:50:07 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/po/lt.po b/po/lt.po index 275cf2f..2392b80 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-30 14:43+0300\n" +"PO-Revision-Date: 2011-05-03 21:49+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -9231,9 +9231,8 @@ msgid "&Export Registry File..." msgstr "E&ksportuoti registro failą..." #: regedit.rc:42 regedit.rc:87 -#, fuzzy msgid "&Modify..." -msgstr "&Modifikuoti" +msgstr "&Modifikuoti..." #: regedit.rc:46 regedit.rc:97 msgid "&Key" @@ -9297,9 +9296,8 @@ msgid "&About Registry Editor" msgstr "&Apie Registro tvarkytuvę" #: regedit.rc:88 -#, fuzzy msgid "Modify Binary Data..." -msgstr "Modifikuoti dvejetainius duomenis" +msgstr "Modifikuoti dvejetainius duomenis..." #: regedit.rc:109 msgid "&Export..." @@ -10233,9 +10231,8 @@ msgid "Regular Metafile Viewer" msgstr "Įprastinė metafailų žiūryklė" #: winecfg.rc:32 -#, fuzzy msgid "Configure..." -msgstr "Konfigūruoti" +msgstr "Konfigūruoti..." #: winecfg.rc:39 msgid "Libraries" @@ -10375,9 +10372,8 @@ msgid "None" msgstr "Nėra" #: winecfg.rc:81 -#, fuzzy msgid "Autodetect..." -msgstr "Automatiškai aptikti" +msgstr "Automatiškai aptikti..." #: winecfg.rc:82 msgid "Local hard disk" @@ -10782,9 +10778,8 @@ msgid "Re&name..." msgstr "Per&vadinti..." #: winefile.rc:31 -#, fuzzy msgid "Propert&ies\tAlt+Enter" -msgstr "Savy&bės...\tAlt+Enter" +msgstr "Savy&bės\tAlt+Enter" #: winefile.rc:33 msgid "&Run..." @@ -10803,9 +10798,8 @@ msgid "&Disk" msgstr "&Diskas" #: winefile.rc:45 -#, fuzzy msgid "Connect &Network Drive..." -msgstr "Pri&jungti tinklo diską" +msgstr "Pri&jungti tinklo diską..." #: winefile.rc:46 msgid "&Disconnect Network Drive" @@ -10836,9 +10830,8 @@ msgid "Sort by &Date" msgstr "Rikiuoti pagal d&atą" #: winefile.rc:60 -#, fuzzy msgid "Filter by&..." -msgstr "&Filtruoti pagal..." +msgstr "Filtruoti pagal&..." #: winefile.rc:67 msgid "&Drivebar"

1 0

Akihiro Sagawa : appwiz.cpl: Update Japanese translation.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 879fcebcadad508e3cba11298820e10149cbb12b URL: http://source.winehq.org/git/wine.git/?a=commit;h=879fcebcadad508e3cba11298… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 4 19:58:23 2011 +0900 appwiz.cpl: Update Japanese translation. --- dlls/appwiz.cpl/Ja.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/Ja.rc b/dlls/appwiz.cpl/Ja.rc index 99ba597..15669c8 100644 --- a/dlls/appwiz.cpl/Ja.rc +++ b/dlls/appwiz.cpl/Ja.rc @@ -37,9 +37,9 @@ FONT 9, "MS Shell Dlg" CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 CONTROL "以下のソフトウェアを自動的に削除できます。プログラムを削除またはインストールされたコンポーネントを変更するには、リストからプログラムを選択し [変更と削除] をクリックしてください。", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "サポート情報(&S)...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "サポート情報(&S)", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 CONTROL "変更(&M)...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 - CONTROL "削除(&R)...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL "削除(&R)", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 }

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 3f4973f92ec89d47c6fdb5c962af81d4225fec8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4973f92ec89d47c6fdb5c96… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 4 19:58:19 2011 +0900 po: Update Japanese translation. --- po/ja.po | 57 +++++++++++++++++++-------------------------------------- 1 files changed, 19 insertions(+), 38 deletions(-) diff --git a/po/ja.po b/po/ja.po index 0ab95bc..6838508 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-21 22:22+0900\n" +"PO-Revision-Date: 2011-05-04 19:31+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -67,14 +67,12 @@ msgid "All files (*.*)" msgstr "すべてのファイル (*.*)" #: appwiz.rc:42 -#, fuzzy msgid "&Remove" -msgstr "削除(&R)..." +msgstr "削除(&R)" #: appwiz.rc:43 -#, fuzzy msgid "&Modify/Remove" -msgstr "変更と削除(&M)..." +msgstr "変更と削除(&M)" #: appwiz.rc:48 msgid "Downloading..." @@ -133,7 +131,6 @@ msgid "Separator" msgstr "区切り" #: comctl32.rc:44 progman.rc:78 -#, fuzzy msgctxt "hotkey" msgid "None" msgstr "なし" @@ -359,7 +356,6 @@ msgstr "" "余白を再入力してください。" #: comdlg32.rc:74 -#, fuzzy msgid "The 'Number of copies' field cannot be empty." msgstr "部数は、空にできません。" @@ -689,7 +685,6 @@ msgid "Unstructured Address" msgstr "構造化されていない住所" #: crypt32.rc:51 -#, fuzzy msgid "S/MIME Capabilities" msgstr "S/MIME機能" @@ -1246,7 +1241,6 @@ msgid "Path Length Constraint=" msgstr "Path Length Constraint=" #: crypt32.rc:198 -#, fuzzy msgctxt "path length" msgid "None" msgstr "なし" @@ -2041,7 +2035,6 @@ msgid "&Forward" msgstr "進む(&F)" #: hhctrl.rc:73 -#, fuzzy msgctxt "table of contents" msgid "&Home" msgstr "ホーム(&H)" @@ -2103,7 +2096,6 @@ msgid "Back" msgstr "戻る" #: hhctrl.rc:44 -#, fuzzy msgctxt "table of contents" msgid "Home" msgstr "ホーム" @@ -6252,9 +6244,8 @@ msgid "Pr&int..." msgstr "印刷(&I)..." #: shdocvw.rc:37 wordpad.rc:34 -#, fuzzy msgid "Print previe&w" -msgstr "印刷プレビュー(&W)..." +msgstr "印刷プレビュー(&W)" #: shdocvw.rc:40 oleview.rc:80 taskmgr.rc:139 msgid "&Close" @@ -6292,12 +6283,10 @@ msgid "&Help" msgstr "ヘルプ(&H)" #: shdocvw.rc:57 -#, fuzzy msgid "&About Internet Explorer" -msgstr "バージョン情報(&A)..." +msgstr "バージョン情報(&A)" #: shdocvw.rc:67 -#, fuzzy msgctxt "home page" msgid "Home" msgstr "ホーム" @@ -9220,9 +9209,8 @@ msgid "&Export Registry File..." msgstr "レジストリのエクスポート(&E)..." #: regedit.rc:42 regedit.rc:87 -#, fuzzy msgid "&Modify..." -msgstr "変更(&M)" +msgstr "変更(&M)..." #: regedit.rc:46 regedit.rc:97 msgid "&Key" @@ -9281,9 +9269,8 @@ msgid "&About Registry Editor" msgstr "バージョン情報(&A)" #: regedit.rc:88 -#, fuzzy msgid "Modify Binary Data..." -msgstr "バイナリデータを変更" +msgstr "バイナリデータを変更..." #: regedit.rc:109 msgid "&Export..." @@ -10213,9 +10200,8 @@ msgid "Regular Metafile Viewer" msgstr "標準メタファイルビュアー" #: winecfg.rc:32 -#, fuzzy msgid "Configure..." -msgstr "Configure" +msgstr "設定..." #: winecfg.rc:39 msgid "Libraries" @@ -10350,15 +10336,13 @@ msgid "Hardware" msgstr "ハードウェア" #: winecfg.rc:76 -#, fuzzy msgctxt "vertex shader mode" msgid "None" msgstr "なし" #: winecfg.rc:81 -#, fuzzy msgid "Autodetect..." -msgstr "自動検出" +msgstr "自動検出..." #: winecfg.rc:82 msgid "Local hard disk" @@ -10766,9 +10750,8 @@ msgid "Re&name..." msgstr "名前の変更(&N)..." #: winefile.rc:31 -#, fuzzy msgid "Propert&ies\tAlt+Enter" -msgstr "プロパティ(&I)...\tAlt+Enter" +msgstr "プロパティ(&I)\tAlt+Enter" #: winefile.rc:33 msgid "&Run..." @@ -10787,9 +10770,8 @@ msgid "&Disk" msgstr "ディスク(&D)" #: winefile.rc:45 -#, fuzzy msgid "Connect &Network Drive..." -msgstr "ネットワークドライブに接続(&N)" +msgstr "ネットワークドライブに接続(&N)..." #: winefile.rc:46 msgid "&Disconnect Network Drive" @@ -10820,9 +10802,8 @@ msgid "Sort by &Date" msgstr "日付で並べ替え(&D)" #: winefile.rc:60 -#, fuzzy msgid "Filter by&..." -msgstr "Filter by &..." +msgstr "フィルタ(&.)..." #: winefile.rc:67 msgid "&Drivebar" @@ -10846,7 +10827,7 @@ msgstr "左右に並べて表示(&V)\tCtrl+F4" #: winefile.rc:81 msgid "Arrange &Symbols" -msgstr "Arrange &Symbols" +msgstr "アイコンを整列(&S)" #: winefile.rc:87 msgid "&About Wine File" @@ -10854,11 +10835,11 @@ msgstr "バージョン情報(&A)" #: winefile.rc:93 msgid "Applying font settings" -msgstr "Applying font settings" +msgstr "フォント設定の適用" #: winefile.rc:94 msgid "Error while selecting new font." -msgstr "Error while selecting new font." +msgstr "新しいフォントの選択中にエラーが発生しました。" #: winefile.rc:99 msgid "Wine File Manager" @@ -10890,15 +10871,15 @@ msgstr "Wine File" #: winefile.rc:114 msgid "CDate" -msgstr "CDate" +msgstr "作成日" #: winefile.rc:115 msgid "ADate" -msgstr "ADate" +msgstr "アクセス日" #: winefile.rc:116 msgid "MDate" -msgstr "MDate" +msgstr "変更日" #: winefile.rc:117 msgid "Index/Inode" @@ -10910,7 +10891,7 @@ msgstr "セキュリティ" #: winefile.rc:122 msgid "%s of %s free" -msgstr "%s of %s free" +msgstr "%s の空き (全容量 %s)" #: winemine.rc:34 msgid "&Game"

1 0

Andrej Znidarsic : po: Update Slovenian translation.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 54ad1dd4fd3059cb7da39f4d0cea49ccc74ca979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ad1dd4fd3059cb7da39f4d0… Author: Andrej Znidarsic <andrej.znidarsic(a)gmail.com> Date: Wed May 4 17:35:01 2011 +0200 po: Update Slovenian translation. --- po/sl.po | 4846 ++++++++++++++++++++++++++++---------------------------------- 1 files changed, 2221 insertions(+), 2625 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54ad1dd4fd3059cb7da39…

1 0

Akihiro Sagawa : gdi32/tests: Add more tests for GetGlyphOutlineA.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: d8db1b301df65707abc0cc1319825a98b1c089c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8db1b301df65707abc0cc131… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 4 19:58:13 2011 +0900 gdi32/tests: Add more tests for GetGlyphOutlineA. --- dlls/gdi32/tests/font.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 2d4efff..900177e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3241,11 +3241,24 @@ static void test_GetGlyphOutline(void) old_hfont = SelectObject(hdc, hfont); + /* expected to ignore superfluous bytes (sigle-byte character) */ ret = GetGlyphOutlineA(hdc, 0x8041, GGO_BITMAP, &gm, 0, NULL, &mat); ret2 = GetGlyphOutlineA(hdc, 0x41, GGO_BITMAP, &gm2, 0, NULL, &mat); ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, "%d %d\n", ret, ret2); + ret = GetGlyphOutlineA(hdc, 0xcc8041, GGO_BITMAP, &gm, 0, NULL, &mat); + todo_wine + ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, + "Expected to ignore superfluous bytes, got %d %d\n", ret, ret2); + + /* expected to ignore superfluous bytes (double-byte character) */ ret = GetGlyphOutlineA(hdc, c[i].a, GGO_BITMAP, &gm, 0, NULL, &mat); + ret2 = GetGlyphOutlineA(hdc, c[i].a | 0xdead0000, GGO_BITMAP, &gm2, 0, NULL, &mat); + todo_wine + ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, + "Expected to ignore superfluous bytes, got %d %d\n", ret, ret2); + + /* expected to match wide-char version results */ ret2 = GetGlyphOutlineW(hdc, c[i].w, GGO_BITMAP, &gm2, 0, NULL, &mat); ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, "%d %d\n", ret, ret2);

1 0