wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: d31d2074ab0eb01e52b8e8e2c4360cc7f532b053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31d2074ab0eb01e52b8e8e2c… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Jun 17 11:09:28 2011 +0900 po: Update Korean translation. --- po/ko.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ko.po b/po/ko.po index 4f92679..8d64369 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6192,7 +6192,7 @@ msgstr "오른쪽으로 스크롤" #: shdoclc.rc:25 msgid "Wine Internet Explorer" -msgstr "Wine 인터넷 익스폴로어r" +msgstr "Wine 인터넷 익스폴로어" #: shdoclc.rc:30 msgid "&w&bPage &p" @@ -6377,9 +6377,8 @@ msgid "E&xit" msgstr "끝내기(&X)" #: shell32.rc:115 -#, fuzzy msgid "&About Control Panel" -msgstr "제어판 정보(&A)..." +msgstr "제어판 정보(&A)" #: shell32.rc:123 shell32.rc:127 winefile.rc:113 msgid "Size" @@ -8372,9 +8371,8 @@ msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" msgstr "사용법: dxdiag [/whql:off | /whql:on] [/t 파일이름 | /x 파일이름]" #: explorer.rc:28 -#, fuzzy msgid "Wine Explorer" -msgstr "Wine 인터넷 익스폴로어r" +msgstr "Wine 탐색기" #: hostname.rc:27 msgid "Usage: hostname\n"

1 0

Hwang YunSong : shell32: Update Korean resource.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 77515d3b3a50325f5554ba7c1aedad2f29c2fdc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77515d3b3a50325f5554ba7c1… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jun 16 19:43:37 2011 +0900 shell32: Update Korean resource. --- dlls/shell32/shell32_Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index 744283c..67d4d81 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 1998 Juergen Schmied - * Copyright 2006, 2007,2010 YunSong Hwang + * Copyright 2006, 2007,2010,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -76,7 +76,7 @@ CAPTION " %s 정보" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "확인", IDOK, 153, 133, 60, 12, WS_TABSTOP - PUSHBUTTON "Wine 라이센스(&l)...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + PUSHBUTTON "Wine 라이센스(&l)", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 42, 10, 170, 10

1 0

Hwang YunSong : msvfw32: Update Korean resource.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 1a03d7edca36be4d17c2358c34eccb04f80708d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a03d7edca36be4d17c2358c3… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jun 16 19:37:02 2011 +0900 msvfw32: Update Korean resource. --- dlls/msvfw32/msvfw32_Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Ko.rc b/dlls/msvfw32/msvfw32_Ko.rc index 07d395d..4278eee 100644 --- a/dlls/msvfw32/msvfw32_Ko.rc +++ b/dlls/msvfw32/msvfw32_Ko.rc @@ -35,7 +35,7 @@ FONT 9, "MS Shell Dlg" COMBOBOX IDC_COMP_LIST,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP PUSHBUTTON "설정(&F)...",IDC_CONFIGURE,129,36,49,14 - PUSHBUTTON "정보(&A)...",IDC_ABOUT,129,52,49,14 + PUSHBUTTON "정보(&A)",IDC_ABOUT,129,52,49,14 SCROLLBAR IDC_QUALITY_SCROLL,9,44,111,9,WS_TABSTOP

1 0

Hwang YunSong : cmdlgtst: Update Korean resource.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: e29fb9696bdf6e03f53265ef99362e2839204a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29fb9696bdf6e03f53265ef9… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jun 16 18:49:20 2011 +0900 cmdlgtst: Update Korean resource. --- programs/cmdlgtst/Ko.rc | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/programs/cmdlgtst/Ko.rc b/programs/cmdlgtst/Ko.rc index e659e06..ce39ddd 100644 --- a/programs/cmdlgtst/Ko.rc +++ b/programs/cmdlgtst/Ko.rc @@ -3,7 +3,7 @@ * Korean Language Support * * Copyright (c) 1999 Eric Williams. - * Copyright 2005,2007,2010 YunSong Hwang + * Copyright 2005,2007,2010,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,30 +35,30 @@ CmdlgtstMenu MENU POPUP "공통 대화상자(&C)" { - MENUITEM "열기(&O)", CM_U_OPEN - MENUITEM "저장(&S)", CM_U_SAVE + MENUITEM "열기(&O)...", CM_U_OPEN + MENUITEM "다른 이름으로 저장(&S)...", CM_U_SAVE MENUITEM SEPARATOR - MENUITEM "색상(&C)", CM_U_COLOR - MENUITEM "글꼴(&F)", CM_U_FONT + MENUITEM "색상(&C)...", CM_U_COLOR + MENUITEM "글꼴(&F)...", CM_U_FONT MENUITEM SEPARATOR - MENUITEM "텍스트 찾기(&T)", CM_U_FIND - MENUITEM "텍스트 바꾸기(&R)", CM_U_REPLACE + MENUITEM "텍스트 찾기(&T)...", CM_U_FIND + MENUITEM "텍스트 바꾸기(&R)...", CM_U_REPLACE MENUITEM SEPARATOR - MENUITEM "인쇄(&R)", CM_U_PRINT - MENUITEM "인쇄 설정(&G)", CM_U_PAGESETUP + MENUITEM "인쇄(&R)...", CM_U_PRINT + MENUITEM "인쇄 설정(&G)...", CM_U_PAGESETUP } POPUP "플래그(&L)" { - MENUITEM "파일(&E)", CM_F_FILE + MENUITEM "파일(&E)...", CM_F_FILE MENUITEM SEPARATOR - MENUITEM "색상(&C)", CM_F_COLOR - MENUITEM "글꼴(&F)", CM_F_FONT + MENUITEM "색상(&C)...", CM_F_COLOR + MENUITEM "글꼴(&F)...", CM_F_FONT MENUITEM SEPARATOR - MENUITEM "찾기/바꾸기(&R)", CM_F_FINDREPLACE + MENUITEM "찾기/바꾸기(&R)...", CM_F_FINDREPLACE MENUITEM SEPARATOR - MENUITEM "인쇄(&R)", CM_F_PRINT - MENUITEM "인쇄 설정(&G)", CM_F_PAGESETUP + MENUITEM "인쇄(&R)...", CM_F_PRINT + MENUITEM "인쇄 설정(&G)...", CM_F_PAGESETUP } POPUP "도움말(&H)" @@ -247,7 +247,7 @@ CAPTION "정보" FONT 9, "MS Shell Dlg" { DEFPUSHBUTTON "확인", IDOK, 72, 96, 50, 14 - LTEXT "공통 대화상자 테스트 지그 액서사이저, 버젼 1.20", -1, 13, 36, 168, 12 + LTEXT "공통 대화상자 테스트 지그 액서사이저, 버젼 1.20", -1, 13, 36, 168, 15 LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. 코드를 숨기기 않는다면... 나누자!", -1, 18, 60, 157, 24 ICON "AboutIcon", -1, 84, 12, 18, 20 }

1 0

Jonas Maebe : dinput: Hook up joysticks to DirectInput event queue on Mac OS X.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 90d8608185e44c4c1973d163568f60eba661f055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d8608185e44c4c1973d1635… Author: Jonas Maebe <jonas.bugzilla(a)gmail.com> Date: Thu Jun 16 21:11:46 2011 +0200 dinput: Hook up joysticks to DirectInput event queue on Mac OS X. --- dlls/dinput/joystick_osx.c | 61 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 29c7856..439c8ad 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -516,12 +516,13 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) int button_idx = 0; int pov_idx = 0; int slider_idx = 0; + int inst_id; CFIndex idx, cnt = CFArrayGetCount( gElementCFArrayRef ); for ( idx = 0; idx < cnt; idx++ ) { IOHIDValueRef valueRef; - int val; + int val, oldVal, newVal; IOHIDElementRef tIOHIDElementRef = ( IOHIDElementRef ) CFArrayGetValueAtIndex( gElementCFArrayRef, idx ); int eleType = IOHIDElementGetType( tIOHIDElementRef ); @@ -532,7 +533,14 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) { IOHIDDeviceGetValue(tIOHIDDeviceRef, tIOHIDElementRef, &valueRef); val = IOHIDValueGetIntegerValue(valueRef); - device->generic.js.rgbButtons[button_idx] = val ? 0x80 : 0x00; + newVal = val ? 0x80 : 0x0; + oldVal = device->generic.js.rgbButtons[button_idx]; + device->generic.js.rgbButtons[button_idx] = newVal; + if (oldVal != newVal) + { + inst_id = DIDFT_MAKEINSTANCE(button_idx) | DIDFT_PSHBUTTON; + queue_event(iface,inst_id,newVal,GetCurrentTime(),device->generic.base.dinput->evsequence++); + } button_idx ++; } break; @@ -545,10 +553,17 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) { IOHIDDeviceGetValue(tIOHIDDeviceRef, tIOHIDElementRef, &valueRef); val = IOHIDValueGetIntegerValue(valueRef); + oldVal = device->generic.js.rgdwPOV[pov_idx]; if (val >= 8) - device->generic.js.rgdwPOV[pov_idx] = -1; + newVal = -1; else - device->generic.js.rgdwPOV[pov_idx] = val * 4500; + newVal = val * 4500; + device->generic.js.rgdwPOV[pov_idx] = newVal; + if (oldVal != newVal) + { + inst_id = DIDFT_MAKEINSTANCE(pov_idx) | DIDFT_POV; + queue_event(iface,inst_id,newVal,GetCurrentTime(),device->generic.base.dinput->evsequence++); + } pov_idx ++; break; } @@ -560,33 +575,57 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) case kHIDUsage_GD_Rz: case kHIDUsage_GD_Slider: { + int wine_obj = -1; + IOHIDDeviceGetValue(tIOHIDDeviceRef, tIOHIDElementRef, &valueRef); val = IOHIDValueGetIntegerValue(valueRef); + newVal = joystick_map_axis(&device->generic.props[idx], val); switch (usage) { case kHIDUsage_GD_X: - device->generic.js.lX = joystick_map_axis(&device->generic.props[idx], val); + wine_obj = 0; + oldVal = device->generic.js.lX; + device->generic.js.lX = newVal; break; case kHIDUsage_GD_Y: - device->generic.js.lY = joystick_map_axis(&device->generic.props[idx], val); + wine_obj = 1; + oldVal = device->generic.js.lY; + device->generic.js.lY = newVal; break; case kHIDUsage_GD_Z: - device->generic.js.lZ = joystick_map_axis(&device->generic.props[idx], val); + wine_obj = 2; + oldVal = device->generic.js.lZ; + device->generic.js.lZ = newVal; break; case kHIDUsage_GD_Rx: - device->generic.js.lRx = joystick_map_axis(&device->generic.props[idx], val); + wine_obj = 3; + oldVal = device->generic.js.lRx; + device->generic.js.lRx = newVal; break; case kHIDUsage_GD_Ry: - device->generic.js.lRy = joystick_map_axis(&device->generic.props[idx], val); + wine_obj = 4; + oldVal = device->generic.js.lRy; + device->generic.js.lRy = newVal; break; case kHIDUsage_GD_Rz: - device->generic.js.lRz = joystick_map_axis(&device->generic.props[idx], val); + wine_obj = 5; + oldVal = device->generic.js.lRz; + device->generic.js.lRz = newVal; break; case kHIDUsage_GD_Slider: - device->generic.js.rglSlider[slider_idx] = joystick_map_axis(&device->generic.props[idx], val); + wine_obj = 6 + slider_idx; + oldVal = device->generic.js.rglSlider[slider_idx]; + device->generic.js.rglSlider[slider_idx] = newVal; slider_idx ++; break; } + if ((wine_obj != -1) && + (oldVal != newVal)) + { + inst_id = DIDFT_MAKEINSTANCE(wine_obj) | DIDFT_ABSAXIS; + queue_event(iface,inst_id,newVal,GetCurrentTime(),device->generic.base.dinput->evsequence++); + } + break; } default:

1 0

Henri Verbeet : d3d8: Implement IDirect3DIndexBuffer8 private data handling on top of wined3d_resource .
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 37d70103a1771969ddd8107633d436d8f090bfcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d70103a1771969ddd810763… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 22:38:29 2011 +0200 d3d8: Implement IDirect3DIndexBuffer8 private data handling on top of wined3d_resource. --- dlls/d3d8/buffer.c | 22 +++++++++++++++++----- dlls/wined3d/buffer.c | 17 ----------------- dlls/wined3d/wined3d.spec | 3 --- include/wine/wined3d.h | 5 ----- 4 files changed, 17 insertions(+), 30 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 74d81f4..6ca8829 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -297,6 +297,11 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer8Impl *buffer, IDirect3DDevice8Im return D3D_OK; } +static inline IDirect3DIndexBuffer8Impl *impl_from_IDirect3DIndexBuffer8(IDirect3DIndexBuffer8 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DIndexBuffer8Impl, lpVtbl); +} + static HRESULT WINAPI d3d8_indexbuffer_QueryInterface(IDirect3DIndexBuffer8 *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -371,14 +376,16 @@ static HRESULT WINAPI d3d8_indexbuffer_GetDevice(IDirect3DIndexBuffer8 *iface, I static HRESULT WINAPI d3d8_indexbuffer_SetPrivateData(IDirect3DIndexBuffer8 *iface, REFGUID guid, const void *data, DWORD data_size, DWORD flags) { + IDirect3DIndexBuffer8Impl *buffer = impl_from_IDirect3DIndexBuffer8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); wined3d_mutex_lock(); - hr = wined3d_buffer_set_private_data(((IDirect3DIndexBuffer8Impl *)iface)->wineD3DIndexBuffer, - guid, data, data_size, flags); + resource = wined3d_buffer_get_resource(buffer->wineD3DIndexBuffer); + hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); wined3d_mutex_unlock(); return hr; @@ -387,14 +394,16 @@ static HRESULT WINAPI d3d8_indexbuffer_SetPrivateData(IDirect3DIndexBuffer8 *ifa static HRESULT WINAPI d3d8_indexbuffer_GetPrivateData(IDirect3DIndexBuffer8 *iface, REFGUID guid, void *data, DWORD *data_size) { + IDirect3DIndexBuffer8Impl *buffer = impl_from_IDirect3DIndexBuffer8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); wined3d_mutex_lock(); - hr = wined3d_buffer_get_private_data(((IDirect3DIndexBuffer8Impl *)iface)->wineD3DIndexBuffer, - guid, data, data_size); + resource = wined3d_buffer_get_resource(buffer->wineD3DIndexBuffer); + hr = wined3d_resource_get_private_data(resource, guid, data, data_size); wined3d_mutex_unlock(); return hr; @@ -402,12 +411,15 @@ static HRESULT WINAPI d3d8_indexbuffer_GetPrivateData(IDirect3DIndexBuffer8 *ifa static HRESULT WINAPI d3d8_indexbuffer_FreePrivateData(IDirect3DIndexBuffer8 *iface, REFGUID guid) { + IDirect3DIndexBuffer8Impl *buffer = impl_from_IDirect3DIndexBuffer8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); wined3d_mutex_lock(); - hr = wined3d_buffer_free_private_data(((IDirect3DIndexBuffer8Impl *)iface)->wineD3DIndexBuffer, guid); + resource = wined3d_buffer_get_resource(buffer->wineD3DIndexBuffer); + hr = wined3d_resource_free_private_data(resource, guid); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 306849a..2f6ff2a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -585,23 +585,6 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) return buffer->resource.parent; } -HRESULT CDECL wined3d_buffer_set_private_data(struct wined3d_buffer *buffer, - REFGUID guid, const void *data, DWORD data_size, DWORD flags) -{ - return wined3d_resource_set_private_data(&buffer->resource, guid, data, data_size, flags); -} - -HRESULT CDECL wined3d_buffer_get_private_data(const struct wined3d_buffer *buffer, - REFGUID guid, void *data, DWORD *data_size) -{ - return wined3d_resource_get_private_data(&buffer->resource, guid, data, data_size); -} - -HRESULT CDECL wined3d_buffer_free_private_data(struct wined3d_buffer *buffer, REFGUID guid) -{ - return wined3d_resource_free_private_data(&buffer->resource, guid); -} - DWORD CDECL wined3d_buffer_set_priority(struct wined3d_buffer *buffer, DWORD priority) { return resource_set_priority(&buffer->resource, priority); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8956774..ab8d943 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -23,16 +23,13 @@ @ cdecl wined3d_buffer_create_ib(ptr long long long ptr ptr ptr) @ cdecl wined3d_buffer_create_vb(ptr long long long ptr ptr ptr) @ cdecl wined3d_buffer_decref(ptr) -@ cdecl wined3d_buffer_free_private_data(ptr ptr) @ cdecl wined3d_buffer_get_parent(ptr) @ cdecl wined3d_buffer_get_priority(ptr) -@ cdecl wined3d_buffer_get_private_data(ptr ptr ptr ptr) @ cdecl wined3d_buffer_get_resource(ptr) @ cdecl wined3d_buffer_incref(ptr) @ cdecl wined3d_buffer_map(ptr long long ptr long) @ cdecl wined3d_buffer_preload(ptr) @ cdecl wined3d_buffer_set_priority(ptr long) -@ cdecl wined3d_buffer_set_private_data(ptr ptr ptr long long) @ cdecl wined3d_buffer_unmap(ptr) @ cdecl wined3d_clipper_create() diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 87d219b..fccdaf3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2150,18 +2150,13 @@ HRESULT __cdecl wined3d_buffer_create_ib(struct wined3d_device *device, UINT len HRESULT __cdecl wined3d_buffer_create_vb(struct wined3d_device *device, UINT length, DWORD usage, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); ULONG __cdecl wined3d_buffer_decref(struct wined3d_buffer *buffer); -HRESULT __cdecl wined3d_buffer_free_private_data(struct wined3d_buffer *buffer, REFGUID guid); void * __cdecl wined3d_buffer_get_parent(const struct wined3d_buffer *buffer); DWORD __cdecl wined3d_buffer_get_priority(const struct wined3d_buffer *buffer); -HRESULT __cdecl wined3d_buffer_get_private_data(const struct wined3d_buffer *buffer, - REFGUID guid, void *data, DWORD *data_size); struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buffer *buffer); ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags); void __cdecl wined3d_buffer_preload(struct wined3d_buffer *buffer); DWORD __cdecl wined3d_buffer_set_priority(struct wined3d_buffer *buffer, DWORD new_priority); -HRESULT __cdecl wined3d_buffer_set_private_data(struct wined3d_buffer *buffer, - REFGUID guid, const void *data, DWORD data_size, DWORD flags); void __cdecl wined3d_buffer_unmap(struct wined3d_buffer *buffer); struct wined3d_clipper * __cdecl wined3d_clipper_create(void);

1 0

Henri Verbeet : d3d8: Implement IDirect3DVertexBuffer8 private data handling on top of wined3d_resource .
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: dc6581ce5eb4d1176d4c5b74bb6ea5a1556cd314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc6581ce5eb4d1176d4c5b74b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 22:38:28 2011 +0200 d3d8: Implement IDirect3DVertexBuffer8 private data handling on top of wined3d_resource. --- dlls/d3d8/buffer.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 8cf5531..74d81f4 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -21,6 +21,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); +static inline IDirect3DVertexBuffer8Impl *impl_from_IDirect3DVertexBuffer8(IDirect3DVertexBuffer8 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DVertexBuffer8Impl, lpVtbl); +} + static HRESULT WINAPI d3d8_vertexbuffer_QueryInterface(IDirect3DVertexBuffer8 *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -95,14 +100,16 @@ static HRESULT WINAPI d3d8_vertexbuffer_GetDevice(IDirect3DVertexBuffer8 *iface, static HRESULT WINAPI d3d8_vertexbuffer_SetPrivateData(IDirect3DVertexBuffer8 *iface, REFGUID guid, const void *data, DWORD data_size, DWORD flags) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); wined3d_mutex_lock(); - hr = wined3d_buffer_set_private_data(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer, - guid, data, data_size, flags); + resource = wined3d_buffer_get_resource(buffer->wineD3DVertexBuffer); + hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); wined3d_mutex_unlock(); return hr; @@ -111,14 +118,16 @@ static HRESULT WINAPI d3d8_vertexbuffer_SetPrivateData(IDirect3DVertexBuffer8 *i static HRESULT WINAPI d3d8_vertexbuffer_GetPrivateData(IDirect3DVertexBuffer8 *iface, REFGUID guid, void *data, DWORD *data_size) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); wined3d_mutex_lock(); - hr = wined3d_buffer_get_private_data(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer, - guid, data, data_size); + resource = wined3d_buffer_get_resource(buffer->wineD3DVertexBuffer); + hr = wined3d_resource_get_private_data(resource, guid, data, data_size); wined3d_mutex_unlock(); return hr; @@ -126,12 +135,15 @@ static HRESULT WINAPI d3d8_vertexbuffer_GetPrivateData(IDirect3DVertexBuffer8 *i static HRESULT WINAPI d3d8_vertexbuffer_FreePrivateData(IDirect3DVertexBuffer8 *iface, REFGUID guid) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); wined3d_mutex_lock(); - hr = wined3d_buffer_free_private_data(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer, guid); + resource = wined3d_buffer_get_resource(buffer->wineD3DVertexBuffer); + hr = wined3d_resource_free_private_data(resource, guid); wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d9: Implement IDirect3DIndexBuffer9 private data handling on top of wined3d_resource .
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: a5ee9f1938aa2e1a6443f37b990c53bf48670461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ee9f1938aa2e1a6443f37b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 22:38:27 2011 +0200 d3d9: Implement IDirect3DIndexBuffer9 private data handling on top of wined3d_resource. --- dlls/d3d9/buffer.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 2179e80..8a86e6e 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -299,6 +299,11 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Im return D3D_OK; } +static inline IDirect3DIndexBuffer9Impl *impl_from_IDirect3DIndexBuffer9(IDirect3DIndexBuffer9 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DIndexBuffer9Impl, lpVtbl); +} + static HRESULT WINAPI d3d9_indexbuffer_QueryInterface(IDirect3DIndexBuffer9 *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -373,14 +378,16 @@ static HRESULT WINAPI d3d9_indexbuffer_GetDevice(IDirect3DIndexBuffer9 *iface, I static HRESULT WINAPI d3d9_indexbuffer_SetPrivateData(IDirect3DIndexBuffer9 *iface, REFGUID guid, const void *data, DWORD data_size, DWORD flags) { + IDirect3DIndexBuffer9Impl *buffer = impl_from_IDirect3DIndexBuffer9(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); wined3d_mutex_lock(); - hr = wined3d_buffer_set_private_data(((IDirect3DIndexBuffer9Impl *)iface)->wineD3DIndexBuffer, - guid, data, data_size, flags); + resource = wined3d_buffer_get_resource(buffer->wineD3DIndexBuffer); + hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); wined3d_mutex_unlock(); return hr; @@ -389,14 +396,16 @@ static HRESULT WINAPI d3d9_indexbuffer_SetPrivateData(IDirect3DIndexBuffer9 *ifa static HRESULT WINAPI d3d9_indexbuffer_GetPrivateData(IDirect3DIndexBuffer9 *iface, REFGUID guid, void *data, DWORD *data_size) { + IDirect3DIndexBuffer9Impl *buffer = impl_from_IDirect3DIndexBuffer9(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); wined3d_mutex_lock(); - hr = wined3d_buffer_get_private_data(((IDirect3DIndexBuffer9Impl *)iface)->wineD3DIndexBuffer, - guid, data, data_size); + resource = wined3d_buffer_get_resource(buffer->wineD3DIndexBuffer); + hr = wined3d_resource_get_private_data(resource, guid, data, data_size); wined3d_mutex_unlock(); return hr; @@ -404,12 +413,15 @@ static HRESULT WINAPI d3d9_indexbuffer_GetPrivateData(IDirect3DIndexBuffer9 *ifa static HRESULT WINAPI d3d9_indexbuffer_FreePrivateData(IDirect3DIndexBuffer9 *iface, REFGUID guid) { + IDirect3DIndexBuffer9Impl *buffer = impl_from_IDirect3DIndexBuffer9(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); wined3d_mutex_lock(); - hr = wined3d_buffer_free_private_data(((IDirect3DIndexBuffer9Impl *)iface)->wineD3DIndexBuffer, guid); + resource = wined3d_buffer_get_resource(buffer->wineD3DIndexBuffer); + hr = wined3d_resource_free_private_data(resource, guid); wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d9: Implement IDirect3DVertexBuffer9 private data handling on top of wined3d_resource .
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 469eba24c002f242340b1c49d3a19f0cbb99e553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=469eba24c002f242340b1c49d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 22:38:26 2011 +0200 d3d9: Implement IDirect3DVertexBuffer9 private data handling on top of wined3d_resource. --- dlls/d3d9/buffer.c | 22 +++++++++++++++++----- dlls/wined3d/buffer.c | 6 +++--- dlls/wined3d/resource.c | 11 ++++++----- dlls/wined3d/surface.c | 6 +++--- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/volume.c | 6 +++--- dlls/wined3d/wined3d.spec | 3 +++ dlls/wined3d/wined3d_private.h | 5 ----- include/wine/wined3d.h | 5 +++++ 9 files changed, 43 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=469eba24c002f242340b1…

1 0

Henri Verbeet : wined3d: Only load the surface for partial updates in wined3d_device_update_surface ().
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 45a0e9596215589acf3b781ae6979fa41d4be7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a0e9596215589acf3b781ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 22:38:25 2011 +0200 wined3d: Only load the surface for partial updates in wined3d_device_update_surface(). --- dlls/wined3d/device.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 67c38aa..03f57ff 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4833,8 +4833,13 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, checkGLcall("glActiveTextureARB"); LEAVE_GL(); - /* Make sure the surface is loaded and up to date */ - surface_load_location(dst_surface, SFLAG_INTEXTURE, NULL); + /* Only load the surface for partial updates. For newly allocated texture + * the texture wouldn't be the current location, and we'd upload zeroes + * just to overwrite them again. */ + if (update_w == dst_w && update_h == dst_h) + surface_prepare_texture(dst_surface, gl_info, FALSE); + else + surface_load_location(dst_surface, SFLAG_INTEXTURE, NULL); surface_bind(dst_surface, gl_info, FALSE); data.buffer_object = 0;

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2011