wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Alexandre Julliard : user32: Refresh the desktop when the wallpaper is changed.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 124722584107ba99ac9f6f8882fa56e80eff69ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=124722584107ba99ac9f6f888… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 13:28:08 2012 +0100 user32: Refresh the desktop when the wallpaper is changed. --- dlls/user32/controls.h | 2 +- dlls/user32/desktop.c | 17 +++++++---------- dlls/user32/sysparams.c | 26 +++++++++++++++++++++----- programs/explorer/desktop.c | 7 ++++++- 4 files changed, 35 insertions(+), 17 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 6bd946b..e168f16 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -148,7 +148,7 @@ extern struct dce *set_class_dce( struct tagCLASS *class, struct dce *dce ) DECL extern HBRUSH DEFWND_ControlColor( HDC hDC, UINT ctlType ) DECLSPEC_HIDDEN; /* desktop */ -extern BOOL DESKTOP_SetPattern( LPCWSTR pattern ) DECLSPEC_HIDDEN; +extern BOOL update_wallpaper( const WCHAR *wallpaper, const WCHAR *pattern ) DECLSPEC_HIDDEN; /* icon title */ extern HWND ICONTITLE_Create( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index ddf812a..2204b77 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -56,12 +56,10 @@ const struct builtin_class_descr DESKTOP_builtin_class = /*********************************************************************** * DESKTOP_LoadBitmap */ -static HBITMAP DESKTOP_LoadBitmap(void) +static HBITMAP DESKTOP_LoadBitmap( const WCHAR *filename ) { HBITMAP hbitmap; - WCHAR filename[MAX_PATH]; - if (!SystemParametersInfoW( SPI_GETDESKWALLPAPER, MAX_PATH, filename, 0 )) return 0; if (!filename[0]) return 0; hbitmap = LoadImageW( 0, filename, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION | LR_LOADFROMFILE ); if (!hbitmap) @@ -78,9 +76,9 @@ static HBITMAP DESKTOP_LoadBitmap(void) /*********************************************************************** * init_wallpaper */ -static void init_wallpaper(void) +static void init_wallpaper( const WCHAR *wallpaper ) { - HBITMAP hbitmap = DESKTOP_LoadBitmap(); + HBITMAP hbitmap = DESKTOP_LoadBitmap( wallpaper ); if (hbitmapWallPaper) DeleteObject( hbitmapWallPaper ); hbitmapWallPaper = hbitmap; @@ -172,11 +170,9 @@ BOOL WINAPI SetDeskWallPaper( LPCSTR filename ) /*********************************************************************** - * DESKTOP_SetPattern - * - * Set the desktop pattern. + * update_wallpaper */ -BOOL DESKTOP_SetPattern( LPCWSTR pattern ) +BOOL update_wallpaper( const WCHAR *wallpaper, const WCHAR *pattern ) { int pat[8]; @@ -201,6 +197,7 @@ BOOL DESKTOP_SetPattern( LPCWSTR pattern ) DeleteObject( hbitmap ); } } - init_wallpaper(); + init_wallpaper( wallpaper ); + RedrawWindow( GetDesktopWindow(), 0, 0, RDW_INVALIDATE | RDW_ERASE | RDW_NOCHILDREN ); return TRUE; } diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 895b4eb..3e9a639 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1293,6 +1293,7 @@ static union sysparam_all_entry * const default_entries[] = (union sysparam_all_entry *)&entry_CAPTIONHEIGHT, (union sysparam_all_entry *)&entry_CAPTIONWIDTH, (union sysparam_all_entry *)&entry_CARETWIDTH, + (union sysparam_all_entry *)&entry_DESKWALLPAPER, (union sysparam_all_entry *)&entry_DOUBLECLICKTIME, (union sysparam_all_entry *)&entry_DOUBLECLKHEIGHT, (union sysparam_all_entry *)&entry_DOUBLECLKWIDTH, @@ -1374,6 +1375,23 @@ void SYSPARAMS_Init(void) } } +static BOOL update_desktop_wallpaper(void) +{ + DWORD pid; + + if (GetWindowThreadProcessId( GetDesktopWindow(), &pid ) && pid == GetCurrentProcessId()) + { + WCHAR wallpaper[MAX_PATH], pattern[256]; + + entry_DESKWALLPAPER.hdr.loaded = entry_DESKPATTERN.hdr.loaded = FALSE; + if (get_entry( &entry_DESKWALLPAPER, MAX_PATH, wallpaper ) && + get_entry( &entry_DESKPATTERN, 256, pattern )) + update_wallpaper( wallpaper, pattern ); + } + else SendMessageW( GetDesktopWindow(), WM_SETTINGCHANGE, SPI_SETDESKWALLPAPER, 0 ); + return TRUE; +} + /*********************************************************************** * SystemParametersInfoW (USER32.@) * @@ -1484,14 +1502,12 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, ret = set_entry( &entry_GRIDGRANULARITY, uiParam, pvParam, fWinIni ); break; case SPI_SETDESKWALLPAPER: - ret = set_entry( &entry_DESKWALLPAPER, uiParam, pvParam, fWinIni ); + if (!pvParam || set_entry( &entry_DESKWALLPAPER, uiParam, pvParam, fWinIni )) + ret = update_desktop_wallpaper(); break; case SPI_SETDESKPATTERN: if (!pvParam || set_entry( &entry_DESKPATTERN, uiParam, pvParam, fWinIni )) - { - WCHAR buf[256]; - ret = get_entry( &entry_DESKPATTERN, 256, buf ) && DESKTOP_SetPattern( buf ); - } + ret = update_desktop_wallpaper(); break; case SPI_GETKEYBOARDDELAY: ret = get_entry( &entry_KEYBOARDDELAY, uiParam, pvParam ); diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index fdb966f..12888d8 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -85,6 +85,11 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR if (!using_root) PaintDesktop( (HDC)wp ); return TRUE; + case WM_SETTINGCHANGE: + if (wp == SPI_SETDESKWALLPAPER) + SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); + return 0; + case WM_PAINT: { PAINTSTRUCT ps; @@ -311,7 +316,7 @@ void manage_desktop( WCHAR *arg ) SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); - SystemParametersInfoA( SPI_SETDESKPATTERN, -1, NULL, FALSE ); + SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); ClipCursor( NULL ); initialize_display_settings( hwnd ); initialize_appbar();

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 3a1f31ea67cdcf670b8b16bd2751cc221c863d04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1f31ea67cdcf670b8b16bd2… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Dec 1 10:25:38 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 576 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 282 insertions(+), 294 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a1f31ea67cdcf670b8b1…

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: e4bb71c191b767ab47c8b1d559b980ee411c42c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4bb71c191b767ab47c8b1d55… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Dec 3 11:25:18 2012 +0900 po: Update Korean translation. --- po/ko.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index 23014b5..6c96f6e 100644 --- a/po/ko.po +++ b/po/ko.po @@ -10044,10 +10044,8 @@ msgid "Wine Command Prompt" msgstr "Wine 명령 프롬프트" #: cmd.rc:349 -#, fuzzy -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" -msgstr "CMD 버젼 %1!S!\n" +msgstr "Wine CMD 버젼 %1!S!\n" #: cmd.rc:350 msgid "More? "

1 0

Detlef Riekenberg : advapi32/tests: Fix crash on 64bit windows for 64bit test.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 53bd69491bc6b71bd59e0442b84dbb6e3aee4944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53bd69491bc6b71bd59e0442b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Dec 2 22:55:00 2012 +0100 advapi32/tests: Fix crash on 64bit windows for 64bit test. --- dlls/advapi32/tests/security.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f53d50f..8c209bf 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3758,8 +3758,6 @@ static void test_GetSecurityInfo(void) ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } - LocalFree(pSD); - CloseHandle(obj); }

1 0

Henri Verbeet : wined3d: Add support for ARB_instanced_arrays.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 1835e2f5baa376eab95c760951fcc6a3612aa6cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1835e2f5baa376eab95c76095… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 2 18:53:20 2012 +0100 wined3d: Add support for ARB_instanced_arrays. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/drawprim.c | 7 +++++-- dlls/wined3d/state.c | 20 +++++++++++++++++--- dlls/wined3d/wined3d_gl.h | 3 +++ 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ccfcf4b..8d75045 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -105,6 +105,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_geometry_shader4", ARB_GEOMETRY_SHADER4 }, {"GL_ARB_half_float_pixel", ARB_HALF_FLOAT_PIXEL }, {"GL_ARB_half_float_vertex", ARB_HALF_FLOAT_VERTEX }, + {"GL_ARB_instanced_arrays", ARB_INSTANCED_ARRAYS, }, {"GL_ARB_map_buffer_alignment", ARB_MAP_BUFFER_ALIGNMENT }, {"GL_ARB_map_buffer_range", ARB_MAP_BUFFER_RANGE }, {"GL_ARB_multisample", ARB_MULTISAMPLE }, /* needs GLX_ARB_MULTISAMPLE as well */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 9443877..61f3f8b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -676,6 +676,9 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co struct wined3d_stream_info stridedlcl; UINT idx_size = 0; + if (device->instance_count) + instance_count = device->instance_count; + if (indexed) { if (!state->user_stream) @@ -753,11 +756,11 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co glPrimType, idx_data, idx_size, start_idx); } } - else if (device->instance_count) + else if (!gl_info->supported[ARB_INSTANCED_ARRAYS] && instance_count) { /* Instancing emulation with mixing immediate mode and arrays */ drawStridedInstanced(gl_info, state, stream_info, index_count, glPrimType, - idx_data, idx_size, start_idx, base_vertex_index, device->instance_count); + idx_data, idx_size, start_idx, base_vertex_index, instance_count); } else { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6f0c4f2..d0445c9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4101,6 +4101,8 @@ static inline void unload_numbered_array(struct wined3d_context *context, int i) GL_EXTCALL(glDisableVertexAttribArrayARB(i)); checkGLcall("glDisableVertexAttribArrayARB(reg)"); + if (gl_info->supported[ARB_INSTANCED_ARRAYS]) + GL_EXTCALL(glVertexAttribDivisorARB(i, 0)); context->numbered_array_mask &= ~(1 << i); } @@ -4143,13 +4145,25 @@ static void load_numbered_arrays(struct wined3d_context *context, stream = &state->streams[stream_info->elements[i].stream_idx]; - /* Do not load instance data. It will be specified using glTexCoord by drawprim */ if (stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) { if (!device->instance_count) device->instance_count = state->streams[0].frequency ? state->streams[0].frequency : 1; - if (context->numbered_array_mask & (1 << i)) unload_numbered_array(context, i); - continue; + + if (!gl_info->supported[ARB_INSTANCED_ARRAYS]) + { + /* Unload instanced arrays, they will be loaded using + * immediate mode instead. */ + if (context->numbered_array_mask & (1 << i)) + unload_numbered_array(context, i); + continue; + } + + GL_EXTCALL(glVertexAttribDivisorARB(i, 1)); + } + else if (gl_info->supported[ARB_INSTANCED_ARRAYS]) + { + GL_EXTCALL(glVertexAttribDivisorARB(i, 0)); } TRACE_(d3d_shader)("Loading array %u [VBO=%u]\n", i, stream_info->elements[i].data.buffer_object); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index fc0a68c..06b5274 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -57,6 +57,7 @@ enum wined3d_gl_extension ARB_GEOMETRY_SHADER4, ARB_HALF_FLOAT_PIXEL, ARB_HALF_FLOAT_VERTEX, + ARB_INSTANCED_ARRAYS, ARB_MAP_BUFFER_ALIGNMENT, ARB_MAP_BUFFER_RANGE, ARB_MULTISAMPLE, @@ -214,6 +215,8 @@ enum wined3d_gl_extension USE_GL_FUNC(glFramebufferTextureFaceARB) \ USE_GL_FUNC(glFramebufferTextureLayerARB) \ USE_GL_FUNC(glProgramParameteriARB) \ + /* GL_ARB_instanced_arrays */ \ + USE_GL_FUNC(glVertexAttribDivisorARB) \ /* GL_ARB_map_buffer_range */ \ USE_GL_FUNC(glFlushMappedBufferRange) \ USE_GL_FUNC(glMapBufferRange) \

1 0

Henri Verbeet : wined3d: Resolve the instance count for instanced arrays in load_numbered_arrays().
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 52c6abb48570acb6a67fd359030fb5136258f550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c6abb48570acb6a67fd3590… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 2 18:53:19 2012 +0100 wined3d: Resolve the instance count for instanced arrays in load_numbered_arrays(). --- dlls/wined3d/drawprim.c | 30 +++++++----------------------- dlls/wined3d/state.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 13 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 02d0144..9443877 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -494,12 +494,12 @@ static void drawStridedSlowVs(const struct wined3d_gl_info *gl_info, const struc /* GL locking is done by the caller */ static void drawStridedInstanced(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, const struct wined3d_stream_info *si, UINT numberOfVertices, GLenum glPrimitiveType, - const void *idxData, UINT idxSize, UINT startIdx, UINT base_vertex_index) + const void *idxData, UINT idxSize, UINT startIdx, UINT base_vertex_index, UINT instance_count) { - UINT numInstances = 0, i; int numInstancedAttribs = 0, j; UINT instancedData[sizeof(si->elements) / sizeof(*si->elements) /* 16 */]; GLenum idxtype = idxSize == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; + UINT i; if (!idxSize) { @@ -513,22 +513,6 @@ static void drawStridedInstanced(const struct wined3d_gl_info *gl_info, const st return; } - /* First, figure out how many instances we have to draw */ - for (i = 0; i < MAX_STREAMS; ++i) - { - /* Look at the streams and take the first one which matches */ - if (state->streams[i].buffer - && ((state->streams[i].flags & WINED3DSTREAMSOURCE_INSTANCEDATA) - || (state->streams[i].flags & WINED3DSTREAMSOURCE_INDEXEDDATA))) - { - /* Use the specified number of instances from the first matched - * stream. A streamFreq of 0 (with INSTANCEDATA or INDEXEDDATA) - * is handled as 1. See d3d9/tests/visual.c-> stream_test(). */ - numInstances = state->streams[i].frequency ? state->streams[i].frequency : 1; - break; - } - } - for (i = 0; i < sizeof(si->elements) / sizeof(*si->elements); ++i) { if (!(si->use_map & (1 << i))) continue; @@ -540,8 +524,8 @@ static void drawStridedInstanced(const struct wined3d_gl_info *gl_info, const st } } - /* now draw numInstances instances :-) */ - for(i = 0; i < numInstances; i++) { + for (i = 0; i < instance_count; ++i) + { /* Specify the instanced attributes using immediate mode calls */ for(j = 0; j < numInstancedAttribs; j++) { const BYTE *ptr = si->elements[instancedData[j]].data.addr @@ -769,11 +753,11 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co glPrimType, idx_data, idx_size, start_idx); } } - else if (device->instancedDraw) + else if (device->instance_count) { /* Instancing emulation with mixing immediate mode and arrays */ - drawStridedInstanced(gl_info, state, stream_info, index_count, - glPrimType, idx_data, idx_size, start_idx, base_vertex_index); + drawStridedInstanced(gl_info, state, stream_info, index_count, glPrimType, + idx_data, idx_size, start_idx, base_vertex_index, device->instance_count); } else { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fae7964..6f0c4f2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4126,7 +4126,7 @@ static void load_numbered_arrays(struct wined3d_context *context, int i; /* Default to no instancing */ - device->instancedDraw = FALSE; + device->instance_count = 0; for (i = 0; i < MAX_ATTRIBS; i++) { @@ -4146,8 +4146,9 @@ static void load_numbered_arrays(struct wined3d_context *context, /* Do not load instance data. It will be specified using glTexCoord by drawprim */ if (stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) { + if (!device->instance_count) + device->instance_count = state->streams[0].frequency ? state->streams[0].frequency : 1; if (context->numbered_array_mask & (1 << i)) unload_numbered_array(context, i); - device->instancedDraw = TRUE; continue; } @@ -4290,7 +4291,7 @@ static void load_vertex_data(const struct wined3d_context *context, TRACE("Using fast vertex array code\n"); /* This is fixed function pipeline only, and the fixed function pipeline doesn't do instancing */ - device->instancedDraw = FALSE; + device->instance_count = 0; /* Blend Data ---------------------------------------------- */ if ((si->use_map & (1 << WINED3D_FFP_BLENDWEIGHT)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3610fc3..ddf1fa2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1724,6 +1724,7 @@ struct wined3d_device UINT vs_version, gs_version, ps_version; DWORD d3d_vshader_constantF, d3d_pshader_constantF; /* Advertised d3d caps, not GL ones */ DWORD vs_clipping; + UINT instance_count; WORD view_ident : 1; /* true iff view matrix is identity */ WORD vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */ @@ -1734,9 +1735,8 @@ struct wined3d_device WORD inScene : 1; /* A flag to check for proper BeginScene / EndScene call pairs */ WORD softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ WORD useDrawStridedSlow : 1; - WORD instancedDraw : 1; WORD filter_messages : 1; - WORD padding : 5; + WORD padding : 6; BYTE fixed_function_usage_map; /* MAX_TEXTURES, 8 */

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXANIMATIONCONTROLLER.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: ff11a32f999610ff5e77aa09b42431d37faf6a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff11a32f999610ff5e77aa09b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 2 18:53:18 2012 +0100 d3dx9: Avoid LPD3DXANIMATIONCONTROLLER. --- include/d3dx9anim.h | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 84f80e8..f70faac 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -359,7 +359,7 @@ DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown) STDMETHOD(ValidateEvent)(THIS_ D3DXEVENTHANDLE event) PURE; STDMETHOD(GetEventDesc)(THIS_ D3DXEVENTHANDLE event, LPD3DXEVENT_DESC desc) PURE; STDMETHOD(CloneAnimationController)(THIS_ UINT max_num_anim_outputs, UINT max_num_anim_sets, - UINT max_num_tracks, UINT max_num_events, LPD3DXANIMATIONCONTROLLER *anim_controller) PURE; + UINT max_num_tracks, UINT max_num_events, ID3DXAnimationController **anim_controller) PURE; }; #undef INTERFACE @@ -378,20 +378,25 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(const void *data, DWORD data_s struct IDirect3DDevice9 *device, struct ID3DXAllocateHierarchy *alloc, struct ID3DXLoadUserData *user_data_loader, D3DXFRAME **frame_hierarchy, struct ID3DXAnimationController **animation_controller); -HRESULT WINAPI D3DXSaveMeshHierarchyToFileA(LPCSTR, DWORD, CONST D3DXFRAME*, LPD3DXANIMATIONCONTROLLER, LPD3DXSAVEUSERDATA); -HRESULT WINAPI D3DXSaveMeshHierarchyToFileW(LPCWSTR, DWORD, CONST D3DXFRAME*, LPD3DXANIMATIONCONTROLLER, LPD3DXSAVEUSERDATA); +HRESULT WINAPI D3DXSaveMeshHierarchyToFileA(const char *filename, DWORD format, + const D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller, + ID3DXSaveUserData *user_data_saver); +HRESULT WINAPI D3DXSaveMeshHierarchyToFileW(const WCHAR *filename, DWORD format, + const D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller, + ID3DXSaveUserData *user_data_saver); #define D3DXSaveMeshHierarchyToFile WINELIB_NAME_AW(D3DXSaveMeshHierarchyToFile) HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME, LPD3DXALLOCATEHIERARCHY); HRESULT WINAPI D3DXFrameAppendChild(LPD3DXFRAME, CONST D3DXFRAME*); LPD3DXFRAME WINAPI D3DXFrameFind(CONST D3DXFRAME*, LPCSTR); -HRESULT WINAPI D3DXFrameRegisterNamedMatrices(LPD3DXFRAME, LPD3DXANIMATIONCONTROLLER); +HRESULT WINAPI D3DXFrameRegisterNamedMatrices(D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller); UINT WINAPI D3DXFrameNumNamedMatrices(CONST D3DXFRAME *frame_root); HRESULT WINAPI D3DXFrameCalculateBoundingSphere(CONST D3DXFRAME*, LPD3DXVECTOR3, FLOAT*); HRESULT WINAPI D3DXCreateKeyframedAnimationSet(LPCSTR, DOUBLE, D3DXPLAYBACK_TYPE, UINT, UINT, CONST D3DXKEY_CALLBACK*, LPD3DXKEYFRAMEDANIMATIONSET*); HRESULT WINAPI D3DXCreateCompressedAnimationSet(const char *name, double ticks_per_second, D3DXPLAYBACK_TYPE playback_type, ID3DXBuffer *compressed_data, UINT callback_key_count, const D3DXKEY_CALLBACK *callback_keys, ID3DXCompressedAnimationSet **animation_set); -HRESULT WINAPI D3DXCreateAnimationController(UINT, UINT, UINT, UINT, LPD3DXANIMATIONCONTROLLER*); +HRESULT WINAPI D3DXCreateAnimationController(UINT max_animation_output_count, UINT max_animation_set_count, + UINT max_track_count, UINT max_event_count, ID3DXAnimationController **animation_controller); #ifdef __cplusplus }

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXBUFFER.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 36ac98df73a2a514008cea64325cce684977ae73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36ac98df73a2a514008cea643… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 2 18:53:17 2012 +0100 d3dx9: Avoid LPD3DXBUFFER. --- dlls/d3dx9_36/core.c | 2 +- dlls/d3dx9_36/effect.c | 2 +- dlls/d3dx9_36/mesh.c | 4 ++-- dlls/d3dx9_36/tests/asm.c | 4 ++-- include/d3dx9anim.h | 10 ++++++---- include/d3dx9effect.h | 2 +- include/d3dx9mesh.h | 15 ++++++++++----- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index 8947970..d322091 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -132,7 +132,7 @@ static HRESULT d3dx9_buffer_init(struct ID3DXBufferImpl *buffer, DWORD size) return D3D_OK; } -HRESULT WINAPI D3DXCreateBuffer(DWORD size, LPD3DXBUFFER *buffer) +HRESULT WINAPI D3DXCreateBuffer(DWORD size, ID3DXBuffer **buffer) { struct ID3DXBufferImpl *object; HRESULT hr; diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ec14f98..1681ea2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4395,7 +4395,7 @@ static HRESULT WINAPI ID3DXEffectCompilerImpl_GetLiteral(ID3DXEffectCompiler *if } static HRESULT WINAPI ID3DXEffectCompilerImpl_CompileEffect(ID3DXEffectCompiler *iface, DWORD flags, - LPD3DXBUFFER *effect, LPD3DXBUFFER *error_msgs) + ID3DXBuffer **effect, ID3DXBuffer **error_msgs) { struct ID3DXEffectCompilerImpl *This = impl_from_ID3DXEffectCompiler(iface); diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index b3a1966..ad7bfa7 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1628,8 +1628,8 @@ static HRESULT remap_faces_for_attrsort(ID3DXMeshImpl *This, const DWORD *indice return D3D_OK; } -static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flags, CONST DWORD *adjacency_in, DWORD *adjacency_out, - DWORD *face_remap_out, LPD3DXBUFFER *vertex_remap_out) +static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flags, const DWORD *adjacency_in, + DWORD *adjacency_out, DWORD *face_remap_out, ID3DXBuffer **vertex_remap_out) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); void *indices = NULL; diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 023236d..78335a7 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -123,7 +123,7 @@ static void assembleshader_test(void) { "#error \"wrong include\"\n" }; HRESULT hr; - LPD3DXBUFFER shader, messages; + ID3DXBuffer *shader, *messages; D3DXMACRO defines[] = { { "DEF1", "10 + 15" @@ -347,7 +347,7 @@ static void d3dxpreprocess_test(void) { "#error \"wrong include\"\n" }; HRESULT hr; - LPD3DXBUFFER shader, messages; + ID3DXBuffer *shader, *messages; HRESULT shader_vsh_res; struct D3DXIncludeImpl include = {{&D3DXInclude_Vtbl}}; diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index f5e5553..84f80e8 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -268,8 +268,8 @@ DECLARE_INTERFACE_(ID3DXKeyframedAnimationSet, ID3DXAnimationSet) UINT num_rotation_keys, UINT num_translation_keys, CONST D3DXKEY_VECTOR3 *scale_keys, CONST D3DXKEY_QUATERNION *rotation_keys, CONST D3DXKEY_VECTOR3 *translation_keys, DWORD *animation_index) PURE; - STDMETHOD(Compress)(THIS_ DWORD flags, FLOAT lossiness, LPD3DXFRAME hierarchy, - LPD3DXBUFFER *compressed_data) PURE; + STDMETHOD(Compress)(THIS_ DWORD flags, float lossiness, D3DXFRAME *hierarchy, + ID3DXBuffer **compressed_data) PURE; STDMETHOD(UnregisterAnimation)(THIS_ UINT index) PURE; }; #undef INTERFACE @@ -295,7 +295,7 @@ DECLARE_INTERFACE_(ID3DXCompressedAnimationSet, ID3DXAnimationSet) /*** ID3DXCompressedAnimationSet methods ***/ STDMETHOD_(D3DXPLAYBACK_TYPE, GetPlaybackType)(THIS) PURE; STDMETHOD_(DOUBLE, GetSourceTicksPerSecond)(THIS) PURE; - STDMETHOD(GetCompressedData)(THIS_ LPD3DXBUFFER *compressed_data) PURE; + STDMETHOD(GetCompressedData)(THIS_ ID3DXBuffer **compressed_data) PURE; STDMETHOD_(UINT, GetNumCallbackKeys)(THIS) PURE; STDMETHOD(GetCallbackKeys)(THIS_ LPD3DXKEY_CALLBACK callback_keys) PURE; }; @@ -388,7 +388,9 @@ HRESULT WINAPI D3DXFrameRegisterNamedMatrices(LPD3DXFRAME, LPD3DXANIMATIONCONTRO UINT WINAPI D3DXFrameNumNamedMatrices(CONST D3DXFRAME *frame_root); HRESULT WINAPI D3DXFrameCalculateBoundingSphere(CONST D3DXFRAME*, LPD3DXVECTOR3, FLOAT*); HRESULT WINAPI D3DXCreateKeyframedAnimationSet(LPCSTR, DOUBLE, D3DXPLAYBACK_TYPE, UINT, UINT, CONST D3DXKEY_CALLBACK*, LPD3DXKEYFRAMEDANIMATIONSET*); -HRESULT WINAPI D3DXCreateCompressedAnimationSet(LPCSTR, DOUBLE, D3DXPLAYBACK_TYPE, LPD3DXBUFFER, UINT, CONST D3DXKEY_CALLBACK*, LPD3DXCOMPRESSEDANIMATIONSET*); +HRESULT WINAPI D3DXCreateCompressedAnimationSet(const char *name, double ticks_per_second, + D3DXPLAYBACK_TYPE playback_type, ID3DXBuffer *compressed_data, UINT callback_key_count, + const D3DXKEY_CALLBACK *callback_keys, ID3DXCompressedAnimationSet **animation_set); HRESULT WINAPI D3DXCreateAnimationController(UINT, UINT, UINT, UINT, LPD3DXANIMATIONCONTROLLER*); #ifdef __cplusplus diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 5a04092..0fd27ff 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -353,7 +353,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) /*** ID3DXEffectCompiler methods ***/ STDMETHOD(SetLiteral)(THIS_ D3DXHANDLE parameter, BOOL literal) PURE; STDMETHOD(GetLiteral)(THIS_ D3DXHANDLE parameter, BOOL* literal) PURE; - STDMETHOD(CompileEffect)(THIS_ DWORD flags, LPD3DXBUFFER* effect, LPD3DXBUFFER* error_msgs) PURE; + STDMETHOD(CompileEffect)(THIS_ DWORD flags, ID3DXBuffer **effect, ID3DXBuffer **error_msgs) PURE; STDMETHOD(CompileShader)(THIS_ D3DXHANDLE function, const char *target, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_msgs, ID3DXConstantTable **constant_table) PURE; }; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 21261ab..8fee738 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -373,8 +373,8 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) STDMETHOD(UnlockAttributeBuffer)(THIS) PURE; STDMETHOD(Optimize)(THIS_ DWORD flags, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, ID3DXMesh **opt_mesh) PURE; - STDMETHOD(OptimizeInplace)(THIS_ DWORD flags, CONST DWORD* adjacency_in, DWORD* adjacency_out, - DWORD* face_remap, LPD3DXBUFFER* vertex_remap) PURE; + STDMETHOD(OptimizeInplace)(THIS_ DWORD flags, const DWORD *adjacency_in, DWORD *adjacency_out, + DWORD *face_remap, ID3DXBuffer **vertex_remap) PURE; STDMETHOD(SetAttributeTable)(THIS_ CONST D3DXATTRIBUTERANGE* attrib_table, DWORD attrib_table_size) PURE; }; #undef INTERFACE @@ -696,7 +696,7 @@ HRESULT WINAPI D3DXCreateMesh(DWORD face_count, DWORD vertex_count, DWORD flags, const D3DVERTEXELEMENT9 *declaration, struct IDirect3DDevice9 *device, struct ID3DXMesh **mesh); HRESULT WINAPI D3DXCreateMeshFVF(DWORD face_count, DWORD vertex_count, DWORD flags, DWORD fvf, struct IDirect3DDevice9 *device, struct ID3DXMesh **mesh); -HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*); +HRESULT WINAPI D3DXCreateBuffer(DWORD size, ID3DXBuffer **buffer); HRESULT WINAPI D3DXCreateSPMesh(ID3DXMesh *mesh, const DWORD *adjacency, const D3DXATTRIBUTEWEIGHTS *attribute_weights, const float *vertex_weights, ID3DXSPMesh **spmesh); HRESULT WINAPI D3DXCreatePMeshFromStream(struct IStream *stream, DWORD flags, struct IDirect3DDevice9 *device, @@ -812,7 +812,10 @@ HRESULT WINAPI D3DXOptimizeVertices(LPCVOID, UINT, UINT, BOOL, DWORD *); HRESULT WINAPI D3DXRectPatchSize(CONST FLOAT *, DWORD *, DWORD *); HRESULT WINAPI D3DXSHPRTCompSuperCluster(UINT *cluster_ids, ID3DXMesh *scene, UINT max_cluster_count, UINT cluster_count, UINT *scluster_ids, UINT *scluster_count); -HRESULT WINAPI D3DXSHPRTCompSplitMeshSC(UINT *, UINT, UINT, UINT *, UINT, LPVOID, BOOL, UINT, LPD3DXBUFFER *, UINT *, BOOL, LPD3DXBUFFER *, LPD3DXBUFFER *, UINT *, UINT *, D3DXSHPRTSPLITMESHCLUSTERDATA *); +HRESULT WINAPI D3DXSHPRTCompSplitMeshSC(UINT *cluster_idx, UINT vertex_count, UINT cluster_count, UINT *scluster_ids, + UINT scluster_count, void *index_buffer_in, BOOL ib_in_32bit, UINT face_count, ID3DXBuffer **index_buffer_out, + UINT *index_buffer_size, BOOL ib_out_32bit, ID3DXBuffer **face_remap, ID3DXBuffer **vertex_data, + UINT *vertex_data_length, UINT *sc_cluster_list, D3DXSHPRTSPLITMESHCLUSTERDATA *sc_data); HRESULT WINAPI D3DXSimplifyMesh(ID3DXMesh *mesh_in, const DWORD *adjacency, const D3DXATTRIBUTEWEIGHTS *attribute_weights, const float *vertex_weights, DWORD min_value, DWORD flags, ID3DXMesh **mesh_out); @@ -830,7 +833,9 @@ HRESULT WINAPI D3DXUVAtlasCreate(ID3DXMesh *mesh_in, UINT max_chart_count, float UINT width, UINT height, float gutter, DWORD texture_idx, const DWORD *adjacency, const DWORD *false_edges, const float *imt_array, LPD3DXUVATLASCB cb, float cb_freq, void *ctx, DWORD flags, ID3DXMesh **mesh_out, ID3DXBuffer **face_partitioning_out, ID3DXBuffer **vertex_remap_out, float *max_stretch_out, UINT *chart_count); -HRESULT WINAPI D3DXUVAtlasPack(ID3DXMesh *, UINT, UINT, FLOAT, DWORD, CONST DWORD *, LPD3DXUVATLASCB, FLOAT, LPVOID, DWORD, LPD3DXBUFFER); +HRESULT WINAPI D3DXUVAtlasPack(ID3DXMesh *mesh, UINT width, UINT height, float gutter, DWORD texture_idx, + const DWORD *partition_result_adjacency, LPD3DXUVATLASCB cb, float cb_freq, void *ctx, DWORD flags, + ID3DXBuffer *face_partitioning); HRESULT WINAPI D3DXUVAtlasPartition(ID3DXMesh *mesh_in, UINT max_chart_count, float max_stretch_in, DWORD texture_idx, const DWORD *adjacency, const DWORD *false_edges, const float *imt_array, LPD3DXUVATLASCB cb, float cb_freq, void *ctx, DWORD flags, ID3DXMesh **mesh_out,

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXLINE.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: d856b3a6d2b46d2289fb5856ec0e55bc0751ee3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d856b3a6d2b46d2289fb5856e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 2 18:53:16 2012 +0100 d3dx9: Avoid LPD3DXLINE. --- dlls/d3dx9_36/tests/line.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index 891de5a..b9eacee 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -58,7 +58,7 @@ do { \ static void test_create_line(IDirect3DDevice9* device) { HRESULT hr; - LPD3DXLINE line = NULL; + ID3DXLine *line = NULL; struct IDirect3DDevice9 *return_device; D3DXMATRIX world, identity, result; FLOAT r11, r12, r13, r14;

1 0

Stefan Dösinger : wined3d: Add an explicit break in case of unhandled BUMPENVMAP.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 483d025795356b3290ab86c3b4707308d2c0c4d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483d025795356b3290ab86c3b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 2 16:00:46 2012 +0100 wined3d: Add an explicit break in case of unhandled BUMPENVMAP. --- dlls/wined3d/nvidia_texture_shader.c | 29 ++++++++++++++++------------- dlls/wined3d/state.c | 5 +++++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 9a77e1d..52f4341 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -446,23 +446,26 @@ void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d case WINED3D_TOP_BUMPENVMAP_LUMINANCE: case WINED3D_TOP_BUMPENVMAP: - if (gl_info->supported[NV_TEXTURE_SHADER]) + if (!gl_info->supported[NV_TEXTURE_SHADER]) { - /* The bump map stage itself isn't exciting, just read the texture. But tell the next stage to - * perform bump mapping and source from the current stage. Pretty much a SELECTARG2. - * ARG2 is passed through unmodified(apps will most likely use D3DTA_CURRENT for arg2, arg1 - * (which will most likely be D3DTA_TEXTURE) is available as a texture shader input for the next stage - */ - GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV, - tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1])); - GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV, - GL_ZERO, GL_UNSIGNED_INVERT_NV, portion)); - /* Always pass through to CURRENT, ignore temp arg */ - GL_EXTCALL(glCombinerOutputNV(target, portion, GL_SPARE0_NV, GL_DISCARD_NV, - GL_DISCARD_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE)); + WARN("BUMPENVMAP requires GL_NV_texture_shader in this codepath\n"); break; } + /* The bump map stage itself isn't exciting, just read the texture. But tell the next stage to + * perform bump mapping and source from the current stage. Pretty much a SELECTARG2. + * ARG2 is passed through unmodified(apps will most likely use D3DTA_CURRENT for arg2, arg1 + * (which will most likely be D3DTA_TEXTURE) is available as a texture shader input for the + * next stage */ + GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_A_NV, + tex_op_args.input[1], tex_op_args.mapping[1], tex_op_args.component_usage[1])); + GL_EXTCALL(glCombinerInputNV(target, portion, GL_VARIABLE_B_NV, + GL_ZERO, GL_UNSIGNED_INVERT_NV, portion)); + /* Always pass through to CURRENT, ignore temp arg */ + GL_EXTCALL(glCombinerOutputNV(target, portion, GL_SPARE0_NV, GL_DISCARD_NV, + GL_DISCARD_NV, GL_NONE, GL_NONE, GL_FALSE, GL_FALSE, GL_FALSE)); + break; + default: FIXME("Unhandled texture op: stage %d, is_alpha %d, op %s (%#x), arg1 %#x, arg2 %#x, arg3 %#x, texture_idx %d.\n", stage, is_alpha, debug_d3dtop(op), op, arg1, arg2, arg3, texture_idx); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9b5d875..fae7964 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2628,6 +2628,8 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined case WINED3D_TOP_BUMPENVMAP: case WINED3D_TOP_BUMPENVMAP_LUMINANCE: FIXME("Implement bump environment mapping in GL_NV_texture_env_combine4 path\n"); + Handled = FALSE; + break; default: Handled = FALSE; @@ -3090,6 +3092,9 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined */ FIXME("Implement bump mapping with GL_NV_texture_shader in non register combiner path\n"); } + Handled = FALSE; + break; + default: Handled = FALSE; }

1 0

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 December 2012