September 2011 - Wine-Commits

Henri Verbeet : wined3d: Get rid of some redundant else statements in IWineD3DSurfaceImpl_BltOverride ().
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: ca69a23d52551b571d292fa707b25e6ce48d8028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca69a23d52551b571d292fa70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:20:55 2011 +0200 wined3d: Get rid of some redundant else statements in IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 619bc92..b8ff92d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5411,14 +5411,21 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa TRACE("Unsupported blit between buffers on the same swapchain\n"); return WINED3DERR_INVALIDCALL; - } else if(dstSwapchain && dstSwapchain == srcSwapchain) { + } + + if (dstSwapchain && dstSwapchain == srcSwapchain) + { FIXME("Implement hardware blit between two surfaces on the same swapchain\n"); return WINED3DERR_INVALIDCALL; - } else if(dstSwapchain && srcSwapchain) { + } + + if (dstSwapchain && srcSwapchain) + { FIXME("Implement hardware blit between two different swapchains\n"); return WINED3DERR_INVALIDCALL; } - else if (dstSwapchain) + + if (dstSwapchain) { /* Handled with regular texture -> swapchain blit */ if (src_surface == device->fb.render_targets[0])

1 0

Henri Verbeet : wined3d: Print a FIXME for any flags passed to wined3d_surface_flip().
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: cc10600b5233fa94b8a684c60f6407c018182038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc10600b5233fa94b8a684c60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:20:53 2011 +0200 wined3d: Print a FIXME for any flags passed to wined3d_surface_flip(). --- dlls/wined3d/surface.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4d7e35e..a06030b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3748,6 +3748,15 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined TRACE("surface %p, override %p, flags %#x.\n", surface, override, flags); + if (flags) + { + static UINT once; + if (!once++) + FIXME("Ignoring flags %#x.\n", flags); + else + WARN("Ignoring flags %#x.\n", flags); + } + /* FIXME: This will also prevent overlay flips, since overlays aren't on * a swapchain either. */ if (surface->container.type != WINED3D_CONTAINER_SWAPCHAIN) @@ -3775,20 +3784,6 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined return WINED3D_OK; } - /* Just overwrite the swapchain presentation interval. This is ok because - * only ddraw apps can call Flip, and only d3d8 and d3d9 applications - * specify the presentation interval. */ - if (!(flags & (WINEDDFLIP_NOVSYNC | WINEDDFLIP_INTERVAL2 | WINEDDFLIP_INTERVAL3 | WINEDDFLIP_INTERVAL4))) - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_ONE; - else if (flags & WINEDDFLIP_NOVSYNC) - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_IMMEDIATE; - else if (flags & WINEDDFLIP_INTERVAL2) - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_TWO; - else if (flags & WINEDDFLIP_INTERVAL3) - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_THREE; - else - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_FOUR; - return wined3d_swapchain_present(swapchain, NULL, NULL, swapchain->win_handle, NULL, 0); }

1 0

Michael Stefaniuc : msi: COM cleanup for the IEnumVARIANT iface.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: f0be3d81397c683d98e366304f35f3bc080a2e62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0be3d81397c683d98e366304… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 2 10:24:01 2011 +0200 msi: COM cleanup for the IEnumVARIANT iface. --- dlls/msi/automation.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 8dc1e44..26ed87f 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -88,10 +88,7 @@ struct AutomationObject { */ typedef struct { - /* VTables */ - const IEnumVARIANTVtbl *lpVtbl; - - /* Object reference count */ + IEnumVARIANT IEnumVARIANT_iface; LONG ref; /* Current position and pointer to AutomationObject that stores actual data */ @@ -202,7 +199,7 @@ static HRESULT create_list_enumerator(IUnknown *pUnkOuter, LPVOID *ppObj, Automa object = msi_alloc_zero( sizeof(ListEnumerator) ); /* Set all the VTable references */ - object->lpVtbl = &ListEnumerator_Vtbl; + object->IEnumVARIANT_iface.lpVtbl = &ListEnumerator_Vtbl; object->ref = 1; /* Store data that was passed */ @@ -560,10 +557,16 @@ static const IProvideMultipleClassInfoVtbl AutomationObject_IProvideMultipleClas * ListEnumerator methods */ +static inline ListEnumerator *impl_from_IEnumVARIANT(IEnumVARIANT* iface) +{ + return CONTAINING_RECORD(iface, ListEnumerator, IEnumVARIANT_iface); +} + /*** IUnknown methods ***/ -static HRESULT WINAPI ListEnumerator_QueryInterface(IEnumVARIANT* iface, REFIID riid, void** ppvObject) +static HRESULT WINAPI ListEnumerator_QueryInterface(IEnumVARIANT* iface, REFIID riid, + void** ppvObject) { - ListEnumerator *This = (ListEnumerator *)iface; + ListEnumerator *This = impl_from_IEnumVARIANT(iface); TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); @@ -586,7 +589,7 @@ static HRESULT WINAPI ListEnumerator_QueryInterface(IEnumVARIANT* iface, REFIID static ULONG WINAPI ListEnumerator_AddRef(IEnumVARIANT* iface) { - ListEnumerator *This = (ListEnumerator *)iface; + ListEnumerator *This = impl_from_IEnumVARIANT(iface); TRACE("(%p/%p)\n", iface, This); @@ -595,7 +598,7 @@ static ULONG WINAPI ListEnumerator_AddRef(IEnumVARIANT* iface) static ULONG WINAPI ListEnumerator_Release(IEnumVARIANT* iface) { - ListEnumerator *This = (ListEnumerator *)iface; + ListEnumerator *This = impl_from_IEnumVARIANT(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p/%p)\n", iface, This); @@ -611,9 +614,10 @@ static ULONG WINAPI ListEnumerator_Release(IEnumVARIANT* iface) /* IEnumVARIANT methods */ -static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIANT* rgVar, + ULONG* pCeltFetched) { - ListEnumerator *This = (ListEnumerator *)iface; + ListEnumerator *This = impl_from_IEnumVARIANT(iface); ListData *data = private_data(This->pObj); ULONG idx, local; @@ -640,7 +644,7 @@ static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIA static HRESULT WINAPI ListEnumerator_Skip(IEnumVARIANT* iface, ULONG celt) { - ListEnumerator *This = (ListEnumerator *)iface; + ListEnumerator *This = impl_from_IEnumVARIANT(iface); ListData *data = private_data(This->pObj); TRACE("(%p,%uld)\n", iface, celt); @@ -656,7 +660,7 @@ static HRESULT WINAPI ListEnumerator_Skip(IEnumVARIANT* iface, ULONG celt) static HRESULT WINAPI ListEnumerator_Reset(IEnumVARIANT* iface) { - ListEnumerator *This = (ListEnumerator *)iface; + ListEnumerator *This = impl_from_IEnumVARIANT(iface); TRACE("(%p)\n", iface); @@ -666,7 +670,7 @@ static HRESULT WINAPI ListEnumerator_Reset(IEnumVARIANT* iface) static HRESULT WINAPI ListEnumerator_Clone(IEnumVARIANT* iface, IEnumVARIANT **ppEnum) { - ListEnumerator *This = (ListEnumerator *)iface; + ListEnumerator *This = impl_from_IEnumVARIANT(iface); HRESULT hr; TRACE("(%p,%p)\n", iface, ppEnum);

1 0

Henri Verbeet : mmdevapi: Include space for the terminating zero in info_device_ps_GetValue().
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: a4fddf5fc8129c794558ea0380f5ffdbed03163a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fddf5fc8129c794558ea038… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 21:54:53 2011 +0200 mmdevapi: Include space for the terminating zero in info_device_ps_GetValue(). --- dlls/mmdevapi/devenum.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 0cb471b..2f6c809 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1246,11 +1246,12 @@ static HRESULT WINAPI info_device_ps_GetValue(IPropertyStore *iface, if (IsEqualPropertyKey(*key, DEVPKEY_Device_Driver)) { + INT size = (lstrlenW(drvs.module_name) + 1) * sizeof(WCHAR); pv->vt = VT_LPWSTR; - pv->u.pwszVal = CoTaskMemAlloc(lstrlenW(drvs.module_name) * sizeof(WCHAR)); + pv->u.pwszVal = CoTaskMemAlloc(size); if (!pv->u.pwszVal) return E_OUTOFMEMORY; - lstrcpyW(pv->u.pwszVal, drvs.module_name); + memcpy(pv->u.pwszVal, drvs.module_name, size); return S_OK; }

1 0

Henri Verbeet : mmdevapi: Add a TRACE to info_device_ps_GetValue().
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 748efc34c43caf9889d5a6061b18d00a6fb57ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=748efc34c43caf9889d5a6061… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 21:54:54 2011 +0200 mmdevapi: Add a TRACE to info_device_ps_GetValue(). --- dlls/mmdevapi/devenum.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 2f6c809..bedd2e4 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1237,6 +1237,7 @@ static HRESULT WINAPI info_device_ps_GetValue(IPropertyStore *iface, REFPROPERTYKEY key, PROPVARIANT *pv) { MMDevPropStore *This = impl_from_IPropertyStore(iface); + TRACE("(%p)->(\"%s,%u\", %p)\n", This, debugstr_guid(&key->fmtid), key ? key->pid : 0, pv); if (!key || !pv) return E_POINTER;

1 0

Henri Verbeet : wined3d: Remove a redundant compare in IWineD3DSurfaceImpl_BltOverride().
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 179d6f8087ba2b052a2d34c9c1ffc9fd6a710c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=179d6f8087ba2b052a2d34c9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:20:54 2011 +0200 wined3d: Remove a redundant compare in IWineD3DSurfaceImpl_BltOverride(). If the source surface isn't on the destination swapchain it can't be a backbuffer there either. --- dlls/wined3d/surface.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a06030b..619bc92 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5312,8 +5312,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa return WINED3DERR_INVALIDCALL; } - /* The only case where both surfaces on a swapchain are supported is a back buffer -> front buffer blit on the same swapchain */ - if (dstSwapchain && dstSwapchain == srcSwapchain && dstSwapchain->back_buffers + /* The only case where both surfaces on a swapchain are supported is a + * back buffer -> front buffer blit on the same swapchain. */ + if (dstSwapchain && dstSwapchain->back_buffers && dst_surface == dstSwapchain->front_buffer && src_surface == dstSwapchain->back_buffers[0]) {

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_light_enable() const.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 3659d5d72925692dd79fcac0c72af41c3693246c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3659d5d72925692dd79fcac0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:20:56 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_light_enable() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c64ac9e..dfa96f6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2213,7 +2213,7 @@ HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UIN return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_light_enable(struct wined3d_device *device, UINT light_idx, BOOL *enable) +HRESULT CDECL wined3d_device_get_light_enable(const struct wined3d_device *device, UINT light_idx, BOOL *enable) { UINT hash_idx = LIGHTMAP_HASHFUNC(light_idx); struct wined3d_light_info *light_info = NULL; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7b9a576..e22feb5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2223,7 +2223,7 @@ HRESULT __cdecl wined3d_device_get_front_buffer_data(struct wined3d_device *devi void __cdecl wined3d_device_get_gamma_ramp(struct wined3d_device *device, UINT swapchain_idx, WINED3DGAMMARAMP *ramp); HRESULT __cdecl wined3d_device_get_index_buffer(struct wined3d_device *device, struct wined3d_buffer **index_buffer); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, WINED3DLIGHT *light); -HRESULT __cdecl wined3d_device_get_light_enable(struct wined3d_device *device, UINT light_idx, BOOL *enable); +HRESULT __cdecl wined3d_device_get_light_enable(const struct wined3d_device *device, UINT light_idx, BOOL *enable); HRESULT __cdecl wined3d_device_get_material(struct wined3d_device *device, WINED3DMATERIAL *material); float __cdecl wined3d_device_get_npatch_mode(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_palette_entries(struct wined3d_device *device,

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: 5affb49c9600f272945cb33155b26647bc141af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5affb49c9600f272945cb3315… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Aug 31 16:51:36 2011 +0900 po: Updated Korean translation. --- po/ko.po | 38 +++++++++++++++++++++++++++++++------- 1 files changed, 31 insertions(+), 7 deletions(-) diff --git a/po/ko.po b/po/ko.po index 48f51c2..99fd7d7 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8076,6 +8076,14 @@ msgid "" "Specifying no file type after the equal sign removes the current " "association, if any.\n" msgstr "" +"ASSOC는 파일 확장자 연결보여주거나 고침\n" +"\n" +"형식:ASSOC[파일확장자[=[파일종류]]\n" +"\n" +"매개변수가 없으면, 현재 파일 연결을 보여줍니다\n" +"만약 파일 확장자만 사용된다면, 현재 연결 상태를 보여줍니다.\n" +"= 다음에 파일 종류가 지정되지 않으면 현재 연결상태에 가능한 것을 제거합니" +"다.\n" #: cmd.rc:243 msgid "" @@ -8090,6 +8098,15 @@ msgid "" "Specifying no open command after the equal sign removes the command string " "associated to the specified file type.\n" msgstr "" +"FTYPE은 파일 형식과 관련한 열기 명령을 보여주거나 고침\n" +"\n" +"형식:FSTYPE[파일형식[=[열기명령]]]\n" +"\n" +"매개변수가 없으면, 열기 명령 문자열에 현재 정의된 파일 형식을 보여 줍니다\n" +"만약 파일 형식만 사용된다면, 열기 명령 문자열에 연결된 가능 한 것을 보여줍니" +"다.\n" +"= 다음에 열기 명령이 지정되지 않으면 지정된 파일 형식에 연결된 명령어 문자열" +"을 제거 합니다.\n" #: cmd.rc:245 msgid "MORE displays output of files or piped input in pages.\n" @@ -8115,7 +8132,6 @@ msgstr "" "호출한 셀로 돌아갑니다.\n" #: cmd.rc:288 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8430,7 +8446,6 @@ msgid "Default gateway" msgstr "기본 게이트웨이" #: net.rc:27 -#, fuzzy msgid "" "The syntax of this command is:\n" "\n" @@ -8442,12 +8457,11 @@ msgid "" msgstr "" "명령어 문법:\n" "\n" -"NET HELP 명령어\n" +"NET 명령어[매개변수]\n" " -or-\n" "NET 명령어 /HELP\n" "\n" -" 가능한 명령어:\n" -" NET HELP NET START NET STOP NET USE\n" +"명령어에 들어갈 수 있는 것은 HELP, START, STOP이나 USE중의 하나임\n" #: net.rc:28 msgid "" @@ -8458,6 +8472,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" +"명령어의 문법:\n" +"\n" +"NET START [서비스]\n" +"\n" +" '서비스'가 생략하는 경우 실행 중인 서비스 목록을 표시합니다. 그렇지 않으면 " +"'서비스'는 시작할 서비스의 이름입니다.\n" #: net.rc:29 msgid "" @@ -8467,6 +8487,11 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" +"명령어의 문법:\n" +"\n" +"NET STOP 서비스\n" +"\n" +"'서비스'는 정지할 서비스의 이름입니다.\n" #: net.rc:30 msgid "Stopping dependent service: %s\n" @@ -8551,9 +8576,8 @@ msgid "Reconnecting" msgstr "다시 연결중" #: net.rc:40 -#, fuzzy msgid "The following services are running:\n" -msgstr "의존하고 있는 서비스가 실행중입니다\n" +msgstr "의존하고 있는 서비스가 실행중임\n" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard Sept. 2, 2011

Sept. 2, 2011

Module: wine Branch: master Commit: ccb05ceed92c0e1b234c7e2cb441f7d4057e7417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccb05ceed92c0e1b234c7e2cb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 1 21:03:29 2011 +0200 po: Update German translation. --- po/de.po | 248 ++++++++++++++++++++----------------------------------------- 1 files changed, 81 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccb05ceed92c0e1b234c7…

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.27
by Jeremy Newman Sept. 1, 2011

Sept. 1, 2011

Module: website Branch: master Commit: 85fab50e00c07110f85a02674a114ee603926646 URL: http://source.winehq.org/git/website.git/?a=commit;h=85fab50e00c07110f85a02… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Aug 28 10:51:30 2011 +0200 Polish translation for release 1.3.27 --- news/pl/2011082601.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2011082601.xml b/news/pl/2011082601.xml new file mode 100644 index 0000000..6b24a30 --- /dev/null +++ b/news/pl/2011082601.xml @@ -0,0 +1,17 @@ +<news> +<date>Sierpień 26, 2011</date> +<title>Wydano Wine 1.3.27</title> +<body> + Wydanie rozwojowe Wine 1.3.27 jest już dostępne. + <a href="{$root}/announce/1.3.27">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla wielokrotnego próbkowania w Direct3D.</li> + <li>Nowa wersja silnika Gecko.</li> + <li>Ulepszenia w obsłudze pośrednika sieciowego.</li> + <li>Lepsze wsparcie zapisu w MSXML.</li> + <li>Manifesty jeden przy drugim we wbudowanych bibliotekach.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.27.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0