September 2013 - Wine-commits

Henri Verbeet : wined3d: Allow WINED3DFMT_R8G8B8A8_UNORM render targets.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: 991e47e3c9f1a774d6e0f9e0c30343650e8ac132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991e47e3c9f1a774d6e0f9e0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 25 09:58:11 2013 +0200 wined3d: Allow WINED3DFMT_R8G8B8A8_UNORM render targets. --- dlls/wined3d/utils.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 920a2fc..ccb3da6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -792,7 +792,8 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_R8G8B8A8_UNORM, GL_RGBA8, GL_RGBA8, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_R8G8B8X8_UNORM, GL_RGB8, GL_RGB8, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0,

1 0

Henri Verbeet : d3d10core: Translate d3d10 bind flags / usage to wined3d usage for textures.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: cfe16a4bd137655a789279b5ba098391715eaf85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe16a4bd137655a789279b5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 25 09:58:12 2013 +0200 d3d10core: Translate d3d10 bind flags / usage to wined3d usage for textures. --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/texture.c | 7 ++----- dlls/d3d10core/utils.c | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 9916d63..820f170 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -59,6 +59,7 @@ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +DWORD wined3d_usage_from_d3d10core(UINT bind_flags, enum D3D10_USAGE usage) DECLSPEC_HIDDEN; static inline void read_dword(const char **ptr, DWORD *d) { diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 85c6d88..6fca08b 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -258,7 +258,6 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic } } - FIXME("Implement DXGI<->wined3d usage conversion\n"); if (desc->ArraySize != 1) FIXME("Array textures not implemented.\n"); if (desc->SampleDesc.Count > 1) @@ -268,7 +267,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic wined3d_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_desc.multisample_type = desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = desc->SampleDesc.Quality; - wined3d_desc.usage = desc->Usage; + wined3d_desc.usage = wined3d_usage_from_d3d10core(desc->BindFlags, desc->Usage); wined3d_desc.pool = WINED3D_POOL_DEFAULT; wined3d_desc.width = desc->Width; wined3d_desc.height = desc->Height; @@ -482,13 +481,11 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic texture->refcount = 1; texture->desc = *desc; - FIXME("Implement DXGI<->wined3d usage conversion.\n"); - wined3d_desc.resource_type = WINED3D_RTYPE_VOLUME_TEXTURE; wined3d_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; - wined3d_desc.usage = desc->Usage; + wined3d_desc.usage = wined3d_usage_from_d3d10core(desc->BindFlags, desc->Usage); wined3d_desc.pool = WINED3D_POOL_DEFAULT; wined3d_desc.width = desc->Width; wined3d_desc.height = desc->Height; diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index 813cae6..e0c6014 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -345,6 +345,28 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) } } +DWORD wined3d_usage_from_d3d10core(UINT bind_flags, enum D3D10_USAGE usage) +{ + static const DWORD handled = D3D10_BIND_SHADER_RESOURCE + | D3D10_BIND_RENDER_TARGET + | D3D10_BIND_DEPTH_STENCIL; + DWORD wined3d_usage = 0; + + if (bind_flags & D3D10_BIND_SHADER_RESOURCE) + wined3d_usage |= WINED3DUSAGE_TEXTURE; + if (bind_flags & D3D10_BIND_RENDER_TARGET) + wined3d_usage |= WINED3DUSAGE_RENDERTARGET; + if (bind_flags & D3D10_BIND_DEPTH_STENCIL) + wined3d_usage |= WINED3DUSAGE_DEPTHSTENCIL; + if (bind_flags & ~handled) + FIXME("Unhandled bind flags %#x.\n", usage & ~handled); + + if (usage == D3D10_USAGE_DYNAMIC) + wined3d_usage |= WINED3DUSAGE_DYNAMIC; + + return wined3d_usage; +} + void skip_dword_unknown(const char **ptr, unsigned int count) { unsigned int i;

1 0

Henri Verbeet : wined3d: Introduce a function to initialize swapchain specific device state.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: 8866d733e4296138071c0ceb85aabef51bd8781e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8866d733e4296138071c0ceb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 25 09:58:13 2013 +0200 wined3d: Introduce a function to initialize swapchain specific device state. --- dlls/wined3d/device.c | 51 ++++++++++++++++---------------------------- dlls/wined3d/stateblock.c | 5 +--- 2 files changed, 20 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1ab4a49..2014338 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -827,21 +827,23 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) InterlockedExchangePointer((void **)&device->focus_window, NULL); } -static void device_reset_viewport_scissor(struct wined3d_device *device, UINT width, UINT height) +static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { - struct wined3d_state *state = &device->state; + BOOL ds_enable = !!swapchain->desc.enable_auto_depth_stencil; + unsigned int i; - state->viewport.x = 0; - state->viewport.y = 0; - state->viewport.width = width; - state->viewport.height = height; - state->viewport.min_z = 0.0f; - state->viewport.max_z = 1.0f; + if (device->fb.render_targets) + { + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + { + wined3d_device_set_render_target(device, i, NULL, FALSE); + } + if (swapchain->back_buffers && swapchain->back_buffers[0]) + wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], TRUE); + } - state->scissor_rect.left = 0; - state->scissor_rect.top = 0; - state->scissor_rect.right = width; - state->scissor_rect.bottom = height; + wined3d_device_set_depth_stencil(device, ds_enable ? device->auto_depth_stencil : NULL); + wined3d_device_set_render_state(device, WINED3D_RS_ZENABLE, ds_enable); } HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, @@ -895,25 +897,8 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, } device->swapchains[0] = swapchain; - if (swapchain->back_buffers && swapchain->back_buffers[0]) - { - TRACE("Setting rendertarget to %p.\n", swapchain->back_buffers); - device->fb.render_targets[0] = swapchain->back_buffers[0]; - wined3d_surface_incref(device->fb.render_targets[0]); - clear_flags |= WINED3DCLEAR_TARGET; - } - - /* Depth Stencil support */ - device->fb.depth_stencil = device->auto_depth_stencil; - if (device->fb.depth_stencil) - wined3d_surface_incref(device->fb.depth_stencil); - - /* Set up some starting GL setup */ - - /* Setup all the devices defaults */ state_init_default(&device->state, device); - device_reset_viewport_scissor(device, swapchain->desc.backbuffer_width, - swapchain->desc.backbuffer_height); + device_init_swapchain_state(device, swapchain); context = context_acquire(device, swapchain->front_buffer); @@ -947,6 +932,8 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, context_release(context); /* Clear the screen */ + if (swapchain->back_buffers && swapchain->back_buffers[0]) + clear_flags |= WINED3DCLEAR_TARGET; if (swapchain_desc->enable_auto_depth_stencil) clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; if (clear_flags) @@ -4726,9 +4713,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (FAILED(hr = state_init(&device->state, &device->adapter->d3d_info))) ERR("Failed to initialize device state, hr %#x.\n", hr); state_init_default(&device->state, device); - device_reset_viewport_scissor(device, swapchain->desc.backbuffer_width, - swapchain->desc.backbuffer_height); device->update_state = &device->state; + + device_init_swapchain_state(device, swapchain); } else { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 04bedf1..6bdbb1b 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1203,10 +1203,7 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi TRACE("Render states\n"); /* Render states: */ - if (device->auto_depth_stencil) - state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_TRUE; - else - state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_FALSE; + state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_TRUE; state->render_states[WINED3D_RS_FILLMODE] = WINED3D_FILL_SOLID; state->render_states[WINED3D_RS_SHADEMODE] = WINED3D_SHADE_GOURAUD; lp.lp.repeat_factor = 0;

1 0

Henri Verbeet : d3dx9: Get rid of the ID3DXSkinInfoImpl typedef.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: 0a993f14b4e254617e408f961fcb8f9464dd6a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a993f14b4e254617e408f961… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 25 09:58:14 2013 +0200 d3dx9: Get rid of the ID3DXSkinInfoImpl typedef. --- dlls/d3dx9_36/skin.c | 318 ++++++++++++++++++++++++-------------------------- 1 files changed, 153 insertions(+), 165 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a993f14b4e254617e408…

1 0

Henri Verbeet : d3dx9: Get rid of the ID3DXSpriteImpl typedef.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: 0f965d16f008ee8d244c9cc25e2152dd5b515752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f965d16f008ee8d244c9cc25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 25 09:58:15 2013 +0200 d3dx9: Get rid of the ID3DXSpriteImpl typedef. --- dlls/d3dx9_36/sprite.c | 213 ++++++++++++++++++++++++++---------------------- 1 files changed, 115 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f965d16f008ee8d244c9…

1 0

Michael Stefaniuc : dlls: Replace the remaining CONSTs.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: 2a39cb377a3f788c67480d5d5dc38bf4ab20687c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a39cb377a3f788c67480d5d5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 25 10:39:19 2013 +0200 dlls: Replace the remaining CONSTs. --- dlls/comctl32/imagelist.c | 2 +- dlls/d3dxof/tests/d3dxof.c | 4 ++-- dlls/dmusic/tests/dmusic.c | 2 +- dlls/kernel32/console.c | 2 +- dlls/kernel32/tests/console.c | 2 +- dlls/krnl386.exe16/registry.c | 4 ++-- dlls/ntdll/rtl.c | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/ole32/comcat.c | 3 +-- dlls/secur32/tests/schannel.c | 2 +- dlls/serialui/confdlg.c | 2 +- dlls/user.exe16/message.c | 4 ++-- dlls/wininet/tests/internet.c | 4 ++-- 13 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 76d5709..ec8d08a 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3160,7 +3160,7 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count) */ UINT WINAPI -ImageList_SetColorTable (HIMAGELIST himl, UINT uStartIndex, UINT cEntries, CONST RGBQUAD * prgb) +ImageList_SetColorTable(HIMAGELIST himl, UINT uStartIndex, UINT cEntries, const RGBQUAD *prgb) { return SetDIBColorTable(himl->hdcImage, uStartIndex, cEntries, prgb); } diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index f115eb3..f4ab68a 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -40,7 +40,7 @@ #define SEMICOLON_5X TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON, TOKEN_SEMICOLON -static inline void debugstr_guid( char* buf, CONST GUID *id ) +static inline void debugstr_guid( char *buf, const GUID *id ) { sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", id->Data1, id->Data2, id->Data3, @@ -1119,7 +1119,7 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) HRESULT hr; char name[100]; GUID clsid; - CONST GUID* clsid_type = NULL; + const GUID *clsid_type = NULL; char str_clsid[40]; char str_clsid_type[40]; DWORD len = 100; diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 8d070b7..3174685 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -29,7 +29,7 @@ #include "dmusici.h" #include "dmksctrl.h" -static inline const char* debugstr_guid(CONST GUID *id) +static inline const char* debugstr_guid(const GUID *id) { static char string[39]; sprintf(string, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 8405f4f..9f2f528 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -690,7 +690,7 @@ BOOL WINAPI WriteConsoleOutputCharacterA( HANDLE hConsoleOutput, LPCSTR str, DWO * Failure: FALSE * */ -BOOL WINAPI WriteConsoleOutputAttribute( HANDLE hConsoleOutput, CONST WORD *attr, DWORD length, +BOOL WINAPI WriteConsoleOutputAttribute( HANDLE hConsoleOutput, const WORD *attr, DWORD length, COORD coord, LPDWORD lpNumAttrsWritten ) { BOOL ret; diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index df752f4..b02e723 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2001,7 +2001,7 @@ static void test_WriteConsoleOutputAttribute(HANDLE output_handle) const struct { HANDLE hConsoleOutput; - CONST WORD *attr; + const WORD *attr; DWORD length; COORD coord; LPDWORD lpNumAttrsWritten; diff --git a/dlls/krnl386.exe16/registry.c b/dlls/krnl386.exe16/registry.c index f64e490..397296a 100644 --- a/dlls/krnl386.exe16/registry.c +++ b/dlls/krnl386.exe16/registry.c @@ -42,7 +42,7 @@ static DWORD (WINAPI *pRegOpenKeyA)(HKEY,LPCSTR,PHKEY); static DWORD (WINAPI *pRegQueryValueA)(HKEY,LPCSTR,LPSTR,LPLONG); static DWORD (WINAPI *pRegQueryValueExA)(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); static DWORD (WINAPI *pRegSetValueA)(HKEY,LPCSTR,DWORD,LPCSTR,DWORD); -static DWORD (WINAPI *pRegSetValueExA)(HKEY,LPCSTR,DWORD,DWORD,CONST BYTE*,DWORD); +static DWORD (WINAPI *pRegSetValueExA)(HKEY,LPCSTR,DWORD,DWORD,const BYTE*,DWORD); static HMODULE advapi32; @@ -194,7 +194,7 @@ DWORD WINAPI RegQueryValueEx16( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWOR * RegSetValueEx [KERNEL.226] */ DWORD WINAPI RegSetValueEx16( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, - CONST BYTE *data, DWORD count ) + const BYTE *data, DWORD count ) { if (!advapi32) init_func_ptrs(); fix_win16_hkey( &hkey ); diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index bbcd454..abf2ba8 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -450,7 +450,7 @@ ULONG RtlNumberGenericTableElements(PVOID pTable) * Nothing. */ #undef RtlMoveMemory -VOID WINAPI RtlMoveMemory( VOID *Destination, CONST VOID *Source, SIZE_T Length ) +VOID WINAPI RtlMoveMemory( void *Destination, const void *Source, SIZE_T Length ) { memmove(Destination, Source, Length); } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2d8db4b..67feed0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -712,7 +712,7 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) /*********************************************************************** * IoGetDeviceInterfaces (NTOSKRNL.EXE.@) */ -NTSTATUS WINAPI IoGetDeviceInterfaces( CONST GUID *InterfaceClassGuid, +NTSTATUS WINAPI IoGetDeviceInterfaces( const GUID *InterfaceClassGuid, PDEVICE_OBJECT PhysicalDeviceObject, ULONG Flags, PWSTR *SymbolicLinkList ) { diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index 2882890..925938a 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -348,8 +348,7 @@ static HRESULT WINAPI COMCAT_ICatRegister_RegisterCategories( /* Set the value for this locale's description. */ wsprintfW(valname, fmt, rgci->lcid); - RegSetValueExW(cat_key, valname, 0, REG_SZ, - (CONST BYTE*)(rgci->szDescription), + RegSetValueExW(cat_key, valname, 0, REG_SZ, (const BYTE*)rgci->szDescription, (lstrlenW(rgci->szDescription) + 1) * sizeof(WCHAR)); RegCloseKey(cat_key); diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index e0d550c..34f2524 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -49,7 +49,7 @@ static PCCERT_CONTEXT (WINAPI *pCertEnumCertificatesInStore)(HCERTSTORE,PCCERT_C static BOOL (WINAPI *pCryptAcquireContextW)(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD); static BOOL (WINAPI *pCryptDestroyKey)(HCRYPTKEY); -static BOOL (WINAPI *pCryptImportKey)(HCRYPTPROV,CONST BYTE*,DWORD,HCRYPTKEY,DWORD,HCRYPTKEY*); +static BOOL (WINAPI *pCryptImportKey)(HCRYPTPROV,const BYTE*,DWORD,HCRYPTKEY,DWORD,HCRYPTKEY*); static BOOL (WINAPI *pCryptReleaseContext)(HCRYPTPROV,ULONG_PTR); static const BYTE bigCert[] = { 0x30, 0x7a, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06, diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index 2b92dac..da14472 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -102,7 +102,7 @@ BOOL WINAPI EnumPropPages(LPDEVICE_INFO pdi, LPFNADDPROPSHEETPAGE pfnAdd, LPARAM typedef struct tagPARAM2STRDATA { DWORD val; - CONST CHAR *name; + const CHAR *name; } PARAM2STRDATA, *LPPARAM2STRDATA; typedef struct tagPARAM2STR diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 89692c9..48799ab 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1849,7 +1849,7 @@ BOOL16 WINAPI IsDialogMessage16( HWND16 hwndDlg, MSG16 *msg16 ) /*********************************************************************** * MsgWaitForMultipleObjects (USER.640) */ -DWORD WINAPI MsgWaitForMultipleObjects16( DWORD count, CONST HANDLE *handles, +DWORD WINAPI MsgWaitForMultipleObjects16( DWORD count, const HANDLE *handles, BOOL wait_all, DWORD timeout, DWORD mask ) { return MsgWaitForMultipleObjectsEx( count, handles, timeout, mask, @@ -2632,7 +2632,7 @@ static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, /*********************************************************************** * wait_message16 */ -static DWORD wait_message16( DWORD count, CONST HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) +static DWORD wait_message16( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { DWORD lock, ret; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index bf5723c..fb24b15 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -34,8 +34,8 @@ static BOOL (WINAPI *pCreateUrlCacheContainerA)(DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD); static BOOL (WINAPI *pCreateUrlCacheContainerW)(DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD); -static BOOL (WINAPI *pInternetTimeFromSystemTimeA)(CONST SYSTEMTIME *,DWORD ,LPSTR ,DWORD); -static BOOL (WINAPI *pInternetTimeFromSystemTimeW)(CONST SYSTEMTIME *,DWORD ,LPWSTR ,DWORD); +static BOOL (WINAPI *pInternetTimeFromSystemTimeA)(const SYSTEMTIME *, DWORD, LPSTR, DWORD); +static BOOL (WINAPI *pInternetTimeFromSystemTimeW)(const SYSTEMTIME *, DWORD, LPWSTR, DWORD); static BOOL (WINAPI *pInternetTimeToSystemTimeA)(LPCSTR ,SYSTEMTIME *,DWORD); static BOOL (WINAPI *pInternetTimeToSystemTimeW)(LPCWSTR ,SYSTEMTIME *,DWORD); static BOOL (WINAPI *pIsDomainLegalCookieDomainW)(LPCWSTR, LPCWSTR);

1 0

Dmitry Timoshkov : kernel32/tests: Add DuplicateHandle test to the file access tests.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: b4e375ecf4a1a21311634fb7a09c7e38dfcc2117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e375ecf4a1a21311634fb7a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 25 18:31:50 2013 +0900 kernel32/tests: Add DuplicateHandle test to the file access tests. --- dlls/kernel32/tests/file.c | 51 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index a428672..dc69193 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3890,11 +3890,27 @@ static void test_SetFileValidData(void) DeleteFile(filename); } +static unsigned file_map_access(unsigned access) +{ + if (access & GENERIC_READ) access |= FILE_GENERIC_READ; + if (access & GENERIC_WRITE) access |= FILE_GENERIC_WRITE; + if (access & GENERIC_EXECUTE) access |= FILE_GENERIC_EXECUTE; + if (access & GENERIC_ALL) access |= FILE_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + +static BOOL is_access_compatible(unsigned obj_access, unsigned desired_access) +{ + obj_access = file_map_access(obj_access); + desired_access = file_map_access(desired_access); + return (obj_access & desired_access) == desired_access; +} + static void test_file_access(void) { static const struct { - int access, create_error, write_error, read_error; + unsigned access, create_error, write_error, read_error; } td[] = { { GENERIC_READ | GENERIC_WRITE, 0, 0, 0 }, @@ -3910,8 +3926,8 @@ static void test_file_access(void) }; char path[MAX_PATH], fname[MAX_PATH]; unsigned char buf[16]; - HANDLE hfile; - DWORD i, ret, bytes; + HANDLE hfile, hdup; + DWORD i, j, ret, bytes; GetTempPath(MAX_PATH, path); GetTempFileName(path, "foo", 0, fname); @@ -3930,6 +3946,35 @@ static void test_file_access(void) else ok(hfile != INVALID_HANDLE_VALUE, "%d: CreateFile error %d\n", i, GetLastError()); + for (j = 0; j < sizeof(td)/sizeof(td[0]); j++) + { + SetLastError(0xdeadbeef); + ret = DuplicateHandle(GetCurrentProcess(), hfile, GetCurrentProcess(), &hdup, + td[j].access, 0, 0); + if (is_access_compatible(td[i].access, td[j].access)) + ok(ret, "DuplicateHandle(%#x => %#x) error %d\n", td[i].access, td[j].access, GetLastError()); + else + { + /* FIXME: Remove once Wine is fixed */ + if ((td[j].access & (GENERIC_READ | GENERIC_WRITE)) || + (!(td[i].access & (GENERIC_WRITE | FILE_WRITE_DATA)) && (td[j].access & FILE_WRITE_DATA)) || + (!(td[i].access & (GENERIC_READ | FILE_READ_DATA)) && (td[j].access & FILE_READ_DATA)) || + (!(td[i].access & (GENERIC_WRITE)) && (td[j].access & FILE_APPEND_DATA))) + { +todo_wine + ok(!ret, "DuplicateHandle(%#x => %#x) should fail\n", td[i].access, td[j].access); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + } + else + { + ok(!ret, "DuplicateHandle(%#x => %#x) should fail\n", td[i].access, td[j].access); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + } + } + if (ret) CloseHandle(hdup); + } + SetLastError(0xdeadbeef); bytes = 0xdeadbeef; ret = WriteFile(hfile, "\x5e\xa7", 2, &bytes, NULL);

1 0

Jacek Caban : winegecko.php: Added Wine Gecko 2.24.
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: tools Branch: master Commit: d76768cafc9e28dd9f65873fa326effd0aa987e1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d76768cafc9e28dd9f65873f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 14:16:48 2013 +0200 winegecko.php: Added Wine Gecko 2.24. --- winegecko.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/winegecko.php b/winegecko.php index 5120880..151a2d5 100644 --- a/winegecko.php +++ b/winegecko.php @@ -73,12 +73,12 @@ $aFileSizes = array( '1.8-x86_64'=>18238976, '1.9-x86'=>19060224, '1.9-x86_64'=>19622400, - '2.21-beta1-x86'=>20875264, - '2.21-beta1-x86_64'=>21648896, '2.21-x86'=>20871680, '2.21-x86_64'=>21646336, '2.24-beta1-x86'=>22354944, - '2.24-beta1-x86_64'=>23590400 + '2.24-beta1-x86_64'=>23590400, + '2.24-x86'=>22373888, + '2.24-x86_64'=>23608320 ); // Exact size of the file:

1 0

Francois Gouget : wined3d: Make device_invalidate_shader_constants() static .
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: cccba760913aa33c3ab7bdfdc68cebb53d9e9976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cccba760913aa33c3ab7bdfdc… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 24 17:36:21 2013 +0200 wined3d: Make device_invalidate_shader_constants() static. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9c3200e..1ab4a49 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2244,7 +2244,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3 return device->state.vs_sampler[idx]; } -void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) +static void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) { UINT i;

1 0

Dmitry Timoshkov : ntdll/tests: Use official path for temporary files instead of current directory.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 4544826291b6a5776d9ef1c91d7ccacd4b28cae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4544826291b6a5776d9ef1c91… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 17:12:39 2013 +0900 ntdll/tests: Use official path for temporary files instead of current directory. --- dlls/ntdll/tests/file.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ddfa562..73b4559 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1344,7 +1344,7 @@ static void test_file_both_information(void) static void test_file_disposition_information(void) { - char buffer[MAX_PATH + 16]; + char tmp_path[MAX_PATH], buffer[MAX_PATH + 16]; DWORD dirpos; HANDLE handle, handle2; NTSTATUS res; @@ -1352,8 +1352,10 @@ static void test_file_disposition_information(void) FILE_DISPOSITION_INFORMATION fdi; BOOL fileDeleted; + GetTempPathA( MAX_PATH, tmp_path ); + /* cannot set disposition on file not opened with delete access */ - GetTempFileNameA( ".", "dis", 0, buffer ); + GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); res = pNtQueryInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); @@ -1368,7 +1370,7 @@ static void test_file_disposition_information(void) DeleteFileA( buffer ); /* can set disposition on file opened with proper access */ - GetTempFileNameA( ".", "dis", 0, buffer ); + GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fdi.DoDeleteFile = TRUE; @@ -1382,7 +1384,7 @@ static void test_file_disposition_information(void) DeleteFileA( buffer ); /* cannot set disposition on readonly file */ - GetTempFileNameA( ".", "dis", 0, buffer ); + GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fdi.DoDeleteFile = TRUE; @@ -1396,7 +1398,7 @@ static void test_file_disposition_information(void) DeleteFileA( buffer ); /* can set disposition on file and then reset it */ - GetTempFileNameA( ".", "dis", 0, buffer ); + GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fdi.DoDeleteFile = TRUE; @@ -1413,7 +1415,7 @@ static void test_file_disposition_information(void) DeleteFileA( buffer ); /* Delete-on-close flag doesn't change file disposition until a handle is closed */ - GetTempFileNameA( ".", "dis", 0, buffer ); + GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fdi.DoDeleteFile = FALSE; @@ -1426,7 +1428,7 @@ static void test_file_disposition_information(void) DeleteFileA( buffer ); /* Delete-on-close flag sets disposition when a handle is closed and then it could be changed back */ - GetTempFileNameA( ".", "dis", 0, buffer ); + GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); ok( DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle2, 0, FALSE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed\n" ); @@ -1441,7 +1443,7 @@ static void test_file_disposition_information(void) DeleteFileA( buffer ); /* can set disposition on a directory opened with proper access */ - GetTempFileNameA( ".", "dis", 0, buffer ); + GetTempFileNameA( tmp_path, "dis", 0, buffer ); DeleteFileA( buffer ); ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); @@ -1457,7 +1459,7 @@ static void test_file_disposition_information(void) RemoveDirectoryA( buffer ); /* RemoveDirectory sets directory disposition and it can be undone */ - GetTempFileNameA( ".", "dis", 0, buffer ); + GetTempFileNameA( tmp_path, "dis", 0, buffer ); DeleteFileA( buffer ); ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); @@ -1473,7 +1475,7 @@ static void test_file_disposition_information(void) RemoveDirectoryA( buffer ); /* cannot set disposition on a non-empty directory */ - GetTempFileNameA( ".", "dis", 0, buffer ); + GetTempFileNameA( tmp_path, "dis", 0, buffer ); DeleteFileA( buffer ); ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);

1 0