January 2013 - Wine-Commits

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 8cd903aa102a5d1b1a455ee69b2a7ac46c81ab05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cd903aa102a5d1b1a455ee69… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Dec 31 11:31:04 2012 +0900 po: Update Korean translation. --- po/ko.po | 52 ++++++++++++++++++++++------------------------------ 1 files changed, 22 insertions(+), 30 deletions(-) diff --git a/po/ko.po b/po/ko.po index 23fc4b3..f256050 100644 --- a/po/ko.po +++ b/po/ko.po @@ -10082,27 +10082,27 @@ msgstr "'%1'을 내부나 외부 명령어,나 배치 스크립트로 인식할 #: cmd.rc:357 msgid "Division by zero error.\n" -msgstr "" +msgstr "0으로 나눈 에러가 발생했습니다.\n" #: cmd.rc:358 msgid "Expected an operand.\n" -msgstr "" +msgstr "피연산자가 요구됩니다.\n" #: cmd.rc:359 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" -msgstr "예기치 않은 네트워크 오류.\n" +msgstr "연산자가 요구됩니다.\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" -msgstr "" +msgstr "괄호가 일치하지 않습니다\n" #: cmd.rc:361 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" +"잘못된 형식의 숫자 - 십진수(12)나,\n" +"16진수(0x34)나 팔진수(056)중의 하나이어야 합니다.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10323,77 +10323,69 @@ msgstr "다음 서비스가 실행중임:\n" #: netstat.rc:27 msgid "CLOSED" -msgstr "" +msgstr "CLOSED" #: netstat.rc:28 msgid "LISTENING" -msgstr "" +msgstr "LISTENING" #: netstat.rc:29 msgid "SYN_SENT" -msgstr "" +msgstr "SYN_SENT" #: netstat.rc:30 msgid "SYN_RCVD" -msgstr "" +msgstr "SYN_RCVD" #: netstat.rc:31 msgid "ESTABLISHED" -msgstr "" +msgstr "ESTABLISHED" #: netstat.rc:32 msgid "FIN_WAIT1" -msgstr "" +msgstr "FIN_WAIT1" #: netstat.rc:33 msgid "FIN_WAIT2" -msgstr "" +msgstr "FIN_WAIT2" #: netstat.rc:34 msgid "CLOSE_WAIT" -msgstr "" +msgstr "CLOSE_WAIT" #: netstat.rc:35 msgid "CLOSING" -msgstr "" +msgstr "CLOSING" #: netstat.rc:36 msgid "LAST_ACK" -msgstr "" +msgstr "LAST_ACK" #: netstat.rc:37 msgid "TIME_WAIT" -msgstr "" +msgstr "TIME_WAIT" #: netstat.rc:38 msgid "DELETE_TCB" -msgstr "" +msgstr "DELETE_TCB" #: netstat.rc:40 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "랜 연결" +msgstr "활성화된 연결" #: netstat.rc:41 msgid "Proto" -msgstr "" +msgstr "프로토콜" #: netstat.rc:42 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "이메일 주소" +msgstr "지역 주소" #: netstat.rc:43 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "거리 주소" +msgstr "외부 주소" #: netstat.rc:44 -#, fuzzy -#| msgid "Status" msgid "State" msgstr "상태"

1 0

Henri Verbeet : d3d10core/tests: Add a small test for ID3D10Device_CreateRasterizerState().
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 8e9f0af2a91bc68fb26aa2192a99e7626f6fa2e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9f0af2a91bc68fb26aa2192… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 2 12:07:28 2013 +0100 d3d10core/tests: Add a small test for ID3D10Device_CreateRasterizerState(). --- dlls/d3d10core/tests/device.c | 44 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index b045c50..1ed99a0 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -719,6 +719,49 @@ static void test_create_depthstencil_state(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_rasterizer_state(void) +{ + ID3D10RasterizerState *rast_state1, *rast_state2; + D3D10_RASTERIZER_DESC rast_desc; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_CreateRasterizerState(device, NULL, &rast_state1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + rast_desc.FillMode = D3D10_FILL_SOLID; + rast_desc.CullMode = D3D10_CULL_BACK; + rast_desc.FrontCounterClockwise = FALSE; + rast_desc.DepthBias = 0; + rast_desc.DepthBiasClamp = 0.0f; + rast_desc.SlopeScaledDepthBias = 0.0f; + rast_desc.DepthClipEnable = TRUE; + rast_desc.ScissorEnable = FALSE; + rast_desc.MultisampleEnable = FALSE; + rast_desc.AntialiasedLineEnable = FALSE; + + hr = ID3D10Device_CreateRasterizerState(device, &rast_desc, &rast_state1); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + hr = ID3D10Device_CreateRasterizerState(device, &rast_desc, &rast_state2); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ok(rast_state1 == rast_state2, "Got different rasterizer state objects.\n"); + + refcount = ID3D10RasterizerState_Release(rast_state2); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + refcount = ID3D10RasterizerState_Release(rast_state1); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_device_interfaces(); @@ -731,4 +774,5 @@ START_TEST(device) test_create_sampler_state(); test_create_blend_state(); test_create_depthstencil_state(); + test_create_rasterizer_state(); }

1 0

Henri Verbeet : d3d10core: Implement d3d10_rasterizer_state_GetDesc().
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 4f9814c5368cdbf4d3d745a34158e59a1f38defa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f9814c5368cdbf4d3d745a34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 2 12:07:26 2013 +0100 d3d10core: Implement d3d10_rasterizer_state_GetDesc(). --- dlls/d3d10core/d3d10core_private.h | 5 ++++- dlls/d3d10core/device.c | 6 ++++-- dlls/d3d10core/state.c | 9 +++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index b5ba293..ede3b7a 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -247,9 +247,12 @@ struct d3d10_rasterizer_state { ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount; + + D3D10_RASTERIZER_DESC desc; }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) DECLSPEC_HIDDEN; +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, + const D3D10_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; /* ID3D10SamplerState */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index bcf49da..3542d53 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1480,6 +1480,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); + if (!desc) + return E_INVALIDARG; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1487,8 +1490,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device return E_OUTOFMEMORY; } - hr = d3d10_rasterizer_state_init(object); - if (FAILED(hr)) + if (FAILED(hr = d3d10_rasterizer_state_init(object, desc))) { WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index b2aebdc..f49875d 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -392,7 +392,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface( static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDesc(ID3D10RasterizerState *iface, D3D10_RASTERIZER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = state->desc; } static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = @@ -410,10 +414,11 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = d3d10_rasterizer_state_GetDesc, }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, const D3D10_RASTERIZER_DESC *desc) { state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; + state->desc = *desc; return S_OK; }

1 0

Henri Verbeet : ddraw: Avoid LPD3DRECT.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 8f32358b0d7618eef2ead5a16a70b3a219f06706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f32358b0d7618eef2ead5a16… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 2 12:07:25 2013 +0100 ddraw: Avoid LPD3DRECT. --- include/d3d.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 6dbf3d8..33fbd50 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -661,7 +661,7 @@ DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; - STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; + STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags) PURE; STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; @@ -729,7 +729,7 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; - STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; + STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags) PURE; STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; @@ -805,7 +805,7 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; - STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; + STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags) PURE; STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; @@ -815,7 +815,7 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) /*** IDirect3DViewport3 methods ***/ STDMETHOD(SetBackgroundDepth2)(THIS_ IDirectDrawSurface4 *surface) PURE; STDMETHOD(GetBackgroundDepth2)(THIS_ IDirectDrawSurface4 **surface, BOOL *valid) PURE; - STDMETHOD(Clear2)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,DWORD dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE; + STDMETHOD(Clear2)(THIS_ DWORD count, D3DRECT *rects, DWORD flags, DWORD color, D3DVALUE z, DWORD stencil) PURE; }; #undef INTERFACE @@ -1303,7 +1303,7 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(GetDirect3D)(THIS_ IDirect3D7 **d3d) PURE; STDMETHOD(SetRenderTarget)(THIS_ IDirectDrawSurface7 *surface, DWORD flags) PURE; STDMETHOD(GetRenderTarget)(THIS_ IDirectDrawSurface7 **surface) PURE; - STDMETHOD(Clear)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,D3DCOLOR dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE; + STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags, D3DCOLOR color, D3DVALUE z, DWORD stencil) PURE; STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT7 lpData) PURE;

1 0

Eric Pouech : winedbg: In 'info proc' command, list hierarchy of processus, and get rid of printing parent pid.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 00b6d8ebb129c1bd9090532cbc8beb531f46ec1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b6d8ebb129c1bd9090532cb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 31 15:10:50 2012 +0100 winedbg: In 'info proc' command, list hierarchy of processus, and get rid of printing parent pid. --- programs/winedbg/info.c | 95 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 80 insertions(+), 15 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index bc59eed..fb60afe 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -449,30 +449,95 @@ void info_win32_window(HWND hWnd, BOOL detailed) dbg_printf("\n"); } +struct dump_proc_entry +{ + PROCESSENTRY32 proc; + unsigned children; /* index in dump_proc.entries of first child */ + unsigned sibling; /* index in dump_proc.entries of next sibling */ +}; + +struct dump_proc +{ + struct dump_proc_entry*entries; + unsigned count; + unsigned alloc; +}; + +static unsigned get_parent(const struct dump_proc* dp, unsigned idx) +{ + unsigned i; + + for (i = 0; i < dp->count; i++) + { + if (i != idx && dp->entries[i].proc.th32ProcessID == dp->entries[idx].proc.th32ParentProcessID) + return i; + } + return -1; +} + +static void dump_proc_info(const struct dump_proc* dp, unsigned idx, unsigned depth) +{ + struct dump_proc_entry* dpe; + for ( ; idx != -1; idx = dp->entries[idx].sibling) + { + assert(idx < dp->count); + dpe = &dp->entries[idx]; + dbg_printf("%c%08x %-8d ", + (dpe->proc.th32ProcessID == (dbg_curr_process ? + dbg_curr_process->pid : 0)) ? '>' : ' ', + dpe->proc.th32ProcessID, dpe->proc.cntThreads); + if (depth) + { + unsigned i; + for (i = 3 * (depth - 1); i > 0; i--) dbg_printf(" "); + dbg_printf("\\_ "); + } + dbg_printf("'%s'\n", dpe->proc.szExeFile); + dump_proc_info(dp, dpe->children, depth + 1); + } +} + void info_win32_processes(void) { HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); if (snap != INVALID_HANDLE_VALUE) { - PROCESSENTRY32 entry; - DWORD current = dbg_curr_process ? dbg_curr_process->pid : 0; - BOOL ok; + struct dump_proc dp; + unsigned i, first = -1; + BOOL ok; - entry.dwSize = sizeof(entry); - ok = Process32First(snap, &entry); + dp.count = 0; + dp.alloc = 16; + dp.entries = HeapAlloc(GetProcessHeap(), 0, sizeof(*dp.entries) * dp.alloc); + if (!dp.entries) return; + dp.entries[dp.count].proc.dwSize = sizeof(dp.entries[dp.count].proc); + ok = Process32First(snap, &dp.entries[dp.count].proc); - dbg_printf(" %-8.8s %-8.8s %-8.8s %s (all id:s are in hex)\n", - "pid", "threads", "parent", "executable"); + /* fetch all process information into dp (skipping this debugger) */ while (ok) { - if (entry.th32ProcessID != GetCurrentProcessId()) - dbg_printf("%c%08x %-8d %08x '%s'\n", - (entry.th32ProcessID == current) ? '>' : ' ', - entry.th32ProcessID, entry.cntThreads, - entry.th32ParentProcessID, entry.szExeFile); - ok = Process32Next(snap, &entry); + if (dp.entries[dp.count].proc.th32ProcessID != GetCurrentProcessId()) + dp.entries[dp.count++].children = -1; + if (dp.count >= dp.alloc) + { + dp.entries = HeapReAlloc(GetProcessHeap(), 0, dp.entries, sizeof(*dp.entries) * (dp.alloc *= 2)); + if (!dp.entries) return; + } + dp.entries[dp.count].proc.dwSize = sizeof(dp.entries[dp.count].proc); + ok = Process32Next(snap, &dp.entries[dp.count].proc); } CloseHandle(snap); + /* chain the siblings wrt. their parent */ + for (i = 0; i < dp.count; i++) + { + unsigned parent = get_parent(&dp, i); + unsigned *chain = parent == -1 ? &first : &dp.entries[parent].children; + dp.entries[i].sibling = *chain; + *chain = i; + } + dbg_printf(" %-8.8s %-8.8s %s (all id:s are in hex)\n", "pid", "threads", "executable"); + dump_proc_info(&dp, first, 0); + HeapFree(GetProcessHeap(), 0, dp.entries); } }

1 0

Andrew Eikum : winmm: Don't map the device if WAVE_FORMAT_DIRECT is given.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 93348b21f7fb4946d46d2006a9f8075e5fbfc0dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=93348b21f7fb4946d46d2006a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 28 15:37:39 2012 -0600 winmm: Don't map the device if WAVE_FORMAT_DIRECT is given. --- dlls/winmm/waveform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 207b6ca..ec230c9 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1137,7 +1137,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, AC_BUFLEN, 0, device->orig_fmt, &device->parent->session); if(FAILED(hr)){ - if(hr == AUDCLNT_E_UNSUPPORTED_FORMAT){ + if(hr == AUDCLNT_E_UNSUPPORTED_FORMAT && !(info->flags & WAVE_FORMAT_DIRECT)){ ret = WINMM_MapDevice(device, is_out); if(ret != MMSYSERR_NOERROR || info->flags & WAVE_FORMAT_QUERY) goto error;

1 0