January 2012 - Wine-commits

Francois Gouget : po: Fix some typography issues in the Czech translation.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 1cbc4140fa2f6dd443f813e9d7b2f925c4709c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cbc4140fa2f6dd443f813e9d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 25 02:24:04 2012 +0100 po: Fix some typography issues in the Czech translation. --- po/cs.po | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/po/cs.po b/po/cs.po index 3d22aa8..97c4811 100644 --- a/po/cs.po +++ b/po/cs.po @@ -450,7 +450,7 @@ msgstr "&Zadané stránky" #: comdlg32.rc:206 comdlg32.rc:228 msgid "&Setup" -msgstr "&Nastavit..." +msgstr "&Nastavit" #: comdlg32.rc:207 msgid "&From:" @@ -529,8 +529,9 @@ msgid "Font St&yle:" msgstr "St&yl:" #: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:280 +#, fuzzy msgid "&Size:" -msgstr "Velikost" +msgstr "Velikost:" #: comdlg32.rc:260 msgid "Effects" @@ -545,6 +546,7 @@ msgid "&Underline" msgstr "&Podtržení" #: comdlg32.rc:263 winecfg.rc:278 +#, fuzzy msgid "&Color:" msgstr "Barva:" @@ -2201,8 +2203,9 @@ msgid "&File name:" msgstr "&Název souboru:" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 +#, fuzzy msgid "B&rowse..." -msgstr "Procházet" +msgstr "Procházet..." #: cryptui.rc:294 msgid "" @@ -6754,7 +6757,7 @@ msgstr "Heslo" #: mpr.rc:44 msgid "&Save this password (Insecure)" -msgstr "&Uložit toto heslo (Není bezpečné) ?" +msgstr "&Uložit toto heslo (Není bezpečné)" #: mpr.rc:27 msgid "Entire Network" @@ -6766,7 +6769,7 @@ msgstr "Výběr zvuku" #: msacm32.rc:36 winedbg.rc:73 msgid "&Save As..." -msgstr "&Uložit jako" +msgstr "&Uložit jako..." #: msacm32.rc:39 msgid "&Format:" @@ -7877,8 +7880,9 @@ msgid "&About Control Panel" msgstr "" #: shell32.rc:270 shell32.rc:285 +#, fuzzy msgid "Browse for Folder" -msgstr "Procházet..." +msgstr "Procházet" #: shell32.rc:290 #, fuzzy @@ -7937,7 +7941,7 @@ msgstr "&Otevřít:" #: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:136 msgid "&Browse..." -msgstr "&Procházet" +msgstr "&Procházet..." #: shell32.rc:135 shell32.rc:139 winefile.rc:111 msgid "Size" @@ -8464,7 +8468,7 @@ msgstr "Plné jméno" #: wininet.rc:46 wininet.rc:66 msgid "&Save this password (insecure)" -msgstr "&Uložit toto heslo (nebezpečné) ?" +msgstr "&Uložit toto heslo (nebezpečné)" #: wininet.rc:54 msgid "Authentication Required" @@ -8538,9 +8542,8 @@ msgid "The specified device handle is invalid." msgstr "Ukazatel na zařízení je neplatný." #: winmm.rc:34 -#, fuzzy msgid "There is no driver installed on your system!" -msgstr "V systému není nainstalován žádný ovladač !\n" +msgstr "V systému není nainstalován žádný ovladač!" #: winmm.rc:35 winmm.rc:61 msgid "" @@ -9522,7 +9525,7 @@ msgstr "" "\n" "V programu cmd není třeba zdvojovat znak % před proměnnou při použití " "příkazu\n" -" FOR v dávkovém souboru.\n" +"FOR v dávkovém souboru.\n" #: cmd.rc:81 msgid "" @@ -12715,7 +12718,7 @@ msgstr "Stávající náhrady:" #: winecfg.rc:190 msgid "&Edit..." -msgstr "&Upravit" +msgstr "&Upravit..." #: winecfg.rc:196 msgid "Edit Override" @@ -12768,7 +12771,7 @@ msgstr "Přid&at..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "Auto&detekce..." +msgstr "Auto&detekce" #: winecfg.rc:232 msgid "&Path:"

1 0

Francois Gouget : po: Fix a couple of formatting directives in the Slovenian translation.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 1e9eda5ca3d266d7b88451b9d39d6dc112f347ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e9eda5ca3d266d7b88451b9d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 25 02:29:29 2012 +0100 po: Fix a couple of formatting directives in the Slovenian translation. --- po/sl.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 6e123bc..e95f334 100644 --- a/po/sl.po +++ b/po/sl.po @@ -11531,13 +11531,13 @@ msgstr "Napaka: možnosti /im in /pid se medsebojno izključujeta.\n" msgid "Close message sent to top-level windows of process with PID %1!u!.\n" msgstr "" "Zapri sporočilo poslano na okna po zaprtju je bilo poslano oknom opravila s " -"PID %u.\n" +"PID %1!u!.\n" #: taskkill.rc:34 msgid "" "Close message sent to top-level windows of process \"%1\" with PID %2!u!.\n" msgstr "" -"Sporočilo z zahtevo po zaprtju je bilo poslano oknom opravila \"%s\" s PID " +"Sporočilo z zahtevo po zaprtju je bilo poslano oknom opravila \"%1\" s PID " "%2!u! vrhnje ravni.\n" #: taskkill.rc:35

1 0

Francois Gouget : po: Fix some typography issues in the Thai translation.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 1d74ac2286d5c587bf1beacc9629a10c696e097d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d74ac2286d5c587bf1beacc9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 25 02:33:10 2012 +0100 po: Fix some typography issues in the Thai translation. --- po/th.po | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/po/th.po b/po/th.po index 7b25973..e784160 100644 --- a/po/th.po +++ b/po/th.po @@ -3058,7 +3058,7 @@ msgstr "" #: hhctrl.rc:62 winhlp32.rc:31 #, fuzzy msgid "&Print..." -msgstr "พิมพ์\tCtrl+P" +msgstr "พิมพ์...\tCtrl+P" #: hhctrl.rc:28 taskmgr.rc:89 msgid "&Contents" @@ -9859,7 +9859,7 @@ msgstr "บันทืก\tCtrl+S" #: notepad.rc:32 regedit.rc:36 wordpad.rc:33 msgid "&Print...\tCtrl+P" -msgstr "พิมพ์\tCtrl+P" +msgstr "พิมพ์...\tCtrl+P" #: notepad.rc:33 wordpad.rc:35 msgid "Page Se&tup..." @@ -9908,7 +9908,7 @@ msgstr "ห่อบรรทัดยาว" #: notepad.rc:53 msgid "&Search...\tCtrl+F" -msgstr "ค้นหา\tCtrl+F" +msgstr "ค้นหา...\tCtrl+F" #: notepad.rc:54 msgid "&Search next\tF3" @@ -10038,7 +10038,8 @@ msgid "" "Do you want to create a new file?" msgstr "" "ไม่พบแฟ้ม '%s' ที่ต้องการเปิด\n" -"คุณต้องการสร้างใหม่ไม่ ?" +"\n" +"คุณต้องการสร้างใหม่ไม่?" #: notepad.rc:79 msgid "" @@ -10046,11 +10047,9 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"มีการเปลี่ยนแปลงกับเอกสาร\n" -"\n" -"'%s'\n" +"มีการเปลี่ยนแปลงกับเอกสาร '%s'\n" "\n" -"คุณต้องการบันทึกมันหรือไม่ ?" +"คุณต้องการบันทึกมันหรือไม่?" #: notepad.rc:80 msgid "'%s' could not be found."

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: fb9d6851e6cf654aee57efde1bdb3c0fcf08229a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9d6851e6cf654aee57efde1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 10:55:55 2012 +0300 po: Update Russian translation. --- po/ru.po | 147 ++++++++++++++++++++----------------------------------------- 1 files changed, 48 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb9d6851e6cf654aee57e…

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 63263a3bf953c266f33a084ccaf82c9a92f96c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63263a3bf953c266f33a084cc… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Jan 24 23:23:37 2012 +0900 po: Updated Korean translation. --- po/ko.po | 188 ++++++++++++++++++++++++-------------------------------------- 1 files changed, 72 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63263a3bf953c266f33a0…

1 0

Frédéric Delanoy : msi: Avoid dead code in parse_prop (Coverity).
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 8ef373a7f24788b1302c42a845273220deffc05f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef373a7f24788b1302c42a84… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 24 19:04:03 2012 +0100 msi: Avoid dead code in parse_prop (Coverity). --- dlls/msi/action.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 59e7b6d..665ca63 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -222,7 +222,6 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) switch (*p) { case ' ': - if (!count) goto done; in_quotes = 1; ignore = 1; len++;

1 0

Henri Verbeet : wined3d: Only take the wined3d mutex during the WM_DISPLAYCHANGE handler in device_process_message ().
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: d0347f51ed1304e61b856fd768ec404bd8dde709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0347f51ed1304e61b856fd76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 21:47:45 2012 +0100 wined3d: Only take the wined3d mutex during the WM_DISPLAYCHANGE handler in device_process_message(). We can deadlock if we send messages while holding the wined3d mutex and the message loop is on another thread. Ideally we probably shouldn't send messages while holding the wined3d mutex at all, but that may be hard to enforce with the way wined3d locking is currently set up. --- dlls/wined3d/device.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 348ee08..e5f3506 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1198,7 +1198,7 @@ HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, return E_FAIL; } - device->focus_window = window; + InterlockedExchangePointer((void **)&device->focus_window, window); SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); return WINED3D_OK; @@ -1209,7 +1209,7 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) TRACE("device %p.\n", device); if (device->focus_window) wined3d_unregister_window(device->focus_window); - device->focus_window = NULL; + InterlockedExchangePointer((void **)&device->focus_window, NULL); } HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, @@ -5890,12 +5890,8 @@ void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *w LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) { - wined3d_mutex_lock(); - if (device->filter_messages) { - wined3d_mutex_unlock(); - TRACE("Filtering message: window %p, message %#x, wparam %#lx, lparam %#lx.\n", window, message, wparam, lparam); if (unicode) @@ -5909,16 +5905,16 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL TRACE("unregister window %p.\n", window); wined3d_unregister_window(window); - if (device->focus_window == window) device->focus_window = NULL; - else ERR("Window %p is not the focus window for device %p.\n", window, device); + if (InterlockedCompareExchangePointer((void **)&device->focus_window, NULL, window) != window) + ERR("Window %p is not the focus window for device %p.\n", window, device); } else if (message == WM_DISPLAYCHANGE) { + wined3d_mutex_lock(); device->device_parent->ops->mode_changed(device->device_parent); + wined3d_mutex_unlock(); } - wined3d_mutex_unlock(); - if (unicode) return CallWindowProcW(proc, window, message, wparam, lparam); else

1 0

Henri Verbeet : d3d8: Remove COM from the vertex declaration implementation .
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: f056fe7bb5b9983f2c6bb208b41ae5e92176cc14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f056fe7bb5b9983f2c6bb208b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 21:47:46 2012 +0100 d3d8: Remove COM from the vertex declaration implementation. --- dlls/d3d8/d3d8_private.h | 37 ++++---------------- dlls/d3d8/device.c | 42 ++++++++++++---------- dlls/d3d8/shader.c | 12 +++--- dlls/d3d8/vertexdeclaration.c | 76 ++++++---------------------------------- 4 files changed, 48 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f056fe7bb5b9983f2c6bb…

1 0

Henri Verbeet : d3d8: Remove COM from the vertex shader implementation.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 483b17d410c1e9a323c9517d4323ec84a79ad995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483b17d410c1e9a323c9517d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 21:47:47 2012 +0100 d3d8: Remove COM from the vertex shader implementation. --- dlls/d3d8/d3d8_private.h | 34 ++----------------- dlls/d3d8/device.c | 17 ++++------ dlls/d3d8/shader.c | 81 ++++++--------------------------------------- 3 files changed, 22 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=483b17d410c1e9a323c95…

1 0

Henri Verbeet : d3d8: Remove COM from the pixel shader implementation.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 24d4a52e85a609f3c29e21df547477e0f1aab49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d4a52e85a609f3c29e21df5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 21:47:48 2012 +0100 d3d8: Remove COM from the pixel shader implementation. --- dlls/d3d8/d3d8_private.h | 38 +++-------------------- dlls/d3d8/device.c | 17 ++++------ dlls/d3d8/shader.c | 74 +++++----------------------------------------- 3 files changed, 20 insertions(+), 109 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index fb09314..40c803f 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -365,9 +365,6 @@ struct IDirect3DVolumeTexture8Impl HRESULT volumetexture_init(IDirect3DVolumeTexture8Impl *texture, IDirect3DDevice8Impl *device, UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; -DEFINE_GUID(IID_IDirect3DPixelShader8, -0x6d3bdbdc, 0x5b02, 0x4415, 0xb8, 0x52, 0xce, 0x5e, 0x8b, 0xcc, 0xb2, 0x89); - struct d3d8_vertex_declaration { DWORD *elements; @@ -382,28 +379,6 @@ HRESULT d3d8_vertex_declaration_init(struct d3d8_vertex_declaration *declaration HRESULT d3d8_vertex_declaration_init_fvf(struct d3d8_vertex_declaration *declaration, IDirect3DDevice8Impl *device, DWORD fvf) DECLSPEC_HIDDEN; -/***************************************************************************** - * IDirect3DPixelShader8 interface - */ -#define INTERFACE IDirect3DPixelShader8 -DECLARE_INTERFACE_(IDirect3DPixelShader8,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; -}; -#undef INTERFACE - -/*** IUnknown methods ***/ -#define IDirect3DPixelShader8_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IDirect3DPixelShader8_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IDirect3DPixelShader8_Release(p) (p)->lpVtbl->Release(p) - -/***************************************************************************** - * IDirect3DVertexShader implementation structure - */ - struct d3d8_vertex_shader { struct d3d8_vertex_declaration *vertex_declaration; @@ -416,17 +391,14 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, IDirect3DDevi #define D3D8_MAX_VERTEX_SHADER_CONSTANTF 256 -/***************************************************************************** - * IDirect3DPixelShader implementation structure - */ -typedef struct IDirect3DPixelShader8Impl { - IDirect3DPixelShader8 IDirect3DPixelShader8_iface; - LONG ref; +struct d3d8_pixel_shader +{ DWORD handle; struct wined3d_shader *wined3d_shader; -} IDirect3DPixelShader8Impl; +}; -HRESULT pixelshader_init(IDirect3DPixelShader8Impl *shader, IDirect3DDevice8Impl *device, +void d3d8_pixel_shader_destroy(struct d3d8_pixel_shader *shader) DECLSPEC_HIDDEN; +HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, IDirect3DDevice8Impl *device, const DWORD *byte_code, DWORD shader_handle) DECLSPEC_HIDDEN; D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e724824..5777fd5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2387,7 +2387,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreatePixelShader(IDirect3DDevice8 *i const DWORD *byte_code, DWORD *shader) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - IDirect3DPixelShader8Impl *object; + struct d3d8_pixel_shader *object; DWORD shader_handle; DWORD handle; HRESULT hr; @@ -2419,7 +2419,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreatePixelShader(IDirect3DDevice8 *i shader_handle = handle + VS_HIGHESTFIXEDFXF + 1; - hr = pixelshader_init(object, This, byte_code, shader_handle); + hr = d3d8_pixel_shader_init(object, This, byte_code, shader_handle); if (FAILED(hr)) { WARN("Failed to initialize pixel shader, hr %#x.\n", hr); @@ -2440,7 +2440,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreatePixelShader(IDirect3DDevice8 *i static HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShader(IDirect3DDevice8 *iface, DWORD pShader) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - IDirect3DPixelShader8Impl *shader; + struct d3d8_pixel_shader *shader; HRESULT hr; TRACE("iface %p, shader %#x.\n", iface, pShader); @@ -2485,7 +2485,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShader(IDirect3DDevice8 *ifac object = wined3d_device_get_pixel_shader(This->wined3d_device); if (object) { - IDirect3DPixelShader8Impl *d3d8_shader; + struct d3d8_pixel_shader *d3d8_shader; d3d8_shader = wined3d_shader_get_parent(object); wined3d_shader_decref(object); *ppShader = d3d8_shader->handle; @@ -2504,7 +2504,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShader(IDirect3DDevice8 *ifac static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(IDirect3DDevice8 *iface, DWORD pShader) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - IDirect3DPixelShader8Impl *shader; + struct d3d8_pixel_shader *shader; struct wined3d_shader *cur; TRACE("iface %p, shader %#x.\n", iface, pShader); @@ -2529,10 +2529,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(IDirect3DDevice8 *i wined3d_mutex_unlock(); - if (IDirect3DPixelShader8_Release(&shader->IDirect3DPixelShader8_iface)) - { - ERR("Shader %p has references left, this shouldn't happen.\n", shader); - } + d3d8_pixel_shader_destroy(shader); return D3D_OK; } @@ -2573,7 +2570,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShaderFunction(IDirect3DDevic DWORD pPixelShader, void *pData, DWORD *pSizeOfData) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - IDirect3DPixelShader8Impl *shader = NULL; + struct d3d8_pixel_shader *shader = NULL; HRESULT hr; TRACE("iface %p, shader %#x, data %p, data_size %p.\n", diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index 48d7a2b..546bf40 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -133,74 +133,18 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, IDirect3DDevi return D3D_OK; } -static inline IDirect3DPixelShader8Impl *impl_from_IDirect3DPixelShader8(IDirect3DPixelShader8 *iface) -{ - return CONTAINING_RECORD(iface, IDirect3DPixelShader8Impl, IDirect3DPixelShader8_iface); -} - -static HRESULT WINAPI d3d8_pixelshader_QueryInterface(IDirect3DPixelShader8 *iface, REFIID riid, void **object) -{ - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - - if (IsEqualGUID(riid, &IID_IDirect3DPixelShader8) - || IsEqualGUID(riid, &IID_IUnknown)) - { - IUnknown_AddRef(iface); - *object = iface; - return S_OK; - } - - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - - *object = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI d3d8_pixelshader_AddRef(IDirect3DPixelShader8 *iface) -{ - IDirect3DPixelShader8Impl *shader = impl_from_IDirect3DPixelShader8(iface); - ULONG refcount = InterlockedIncrement(&shader->ref); - - TRACE("%p increasing refcount to %u.\n", iface, refcount); - - if (refcount == 1) - { - wined3d_mutex_lock(); - wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); - } - - return refcount; -} - -static ULONG WINAPI d3d8_pixelshader_Release(IDirect3DPixelShader8 *iface) +static void STDMETHODCALLTYPE d3d8_pixelshader_wined3d_object_destroyed(void *parent) { - IDirect3DPixelShader8Impl *shader = impl_from_IDirect3DPixelShader8(iface); - ULONG refcount = InterlockedDecrement(&shader->ref); - - TRACE("%p decreasing refcount to %u.\n", iface, refcount); - - if (!refcount) - { - wined3d_mutex_lock(); - wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); - } - - return refcount; + HeapFree(GetProcessHeap(), 0, parent); } -static const IDirect3DPixelShader8Vtbl d3d8_pixelshader_vtbl = +void d3d8_pixel_shader_destroy(struct d3d8_pixel_shader *shader) { - /* IUnknown */ - d3d8_pixelshader_QueryInterface, - d3d8_pixelshader_AddRef, - d3d8_pixelshader_Release, -}; + TRACE("shader %p.\n", shader); -static void STDMETHODCALLTYPE d3d8_pixelshader_wined3d_object_destroyed(void *parent) -{ - HeapFree(GetProcessHeap(), 0, parent); + wined3d_mutex_lock(); + wined3d_shader_decref(shader->wined3d_shader); + wined3d_mutex_unlock(); } static const struct wined3d_parent_ops d3d8_pixelshader_wined3d_parent_ops = @@ -208,13 +152,11 @@ static const struct wined3d_parent_ops d3d8_pixelshader_wined3d_parent_ops = d3d8_pixelshader_wined3d_object_destroyed, }; -HRESULT pixelshader_init(IDirect3DPixelShader8Impl *shader, IDirect3DDevice8Impl *device, +HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, IDirect3DDevice8Impl *device, const DWORD *byte_code, DWORD shader_handle) { HRESULT hr; - shader->ref = 1; - shader->IDirect3DPixelShader8_iface.lpVtbl = &d3d8_pixelshader_vtbl; shader->handle = shader_handle; wined3d_mutex_lock();

1 0