May 2011 - Wine-Commits - list.winehq.org

Andrew Nguyen : mmdevapi: Remove a stray semicolon in macro definition.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: a67941d3936ef9db9c56db816393ec8187c91274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67941d3936ef9db9c56db816… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:17:48 2011 -0500 mmdevapi: Remove a stray semicolon in macro definition. --- dlls/mmdevapi/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index f87ad2e..ed0039a 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -72,7 +72,7 @@ static BOOL load_driver(const WCHAR *name) } #define LDFC(n) do { drvs.p##n = (void*)GetProcAddress(drvs.module, #n);\ - if(!drvs.p##n) { FreeLibrary(drvs.module); return FALSE; } } while(0); + if(!drvs.p##n) { FreeLibrary(drvs.module); return FALSE; } } while(0) LDFC(GetEndpointIDs); LDFC(GetAudioEndpoint); #undef LDFC

1 0

Andrew Nguyen : advapi32: Add stubs for GetNamedSecurityInfoExA/W.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 4d154d007dbe643bc4c1408c3b1e59d96d75c5e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d154d007dbe643bc4c1408c3… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:15:19 2011 -0500 advapi32: Add stubs for GetNamedSecurityInfoExA/W. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/security.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e01217f..d27db95 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -260,8 +260,8 @@ # @ stub GetMultipleTrusteeOperationW # @ stub GetMultipleTrusteeW @ stdcall GetNamedSecurityInfoA (str long long ptr ptr ptr ptr ptr) -# @ stub GetNamedSecurityInfoExA -# @ stub GetNamedSecurityInfoExW +@ stdcall GetNamedSecurityInfoExA(str long long str str ptr ptr ptr ptr) +@ stdcall GetNamedSecurityInfoExW(wstr long long wstr wstr ptr ptr ptr ptr) @ stdcall GetNamedSecurityInfoW (wstr long long ptr ptr ptr ptr ptr) @ stdcall GetNumberOfEventLogRecords (long ptr) @ stdcall GetOldestEventLogRecord (long ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 2dcb8fa..c3454a8 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5495,6 +5495,30 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, } /****************************************************************************** + * GetNamedSecurityInfoExW [ADVAPI32.@] + */ +DWORD WINAPI GetNamedSecurityInfoExW( LPCWSTR object, SE_OBJECT_TYPE type, + SECURITY_INFORMATION info, LPCWSTR provider, LPCWSTR property, + PACTRL_ACCESSW* access_list, PACTRL_AUDITW* audit_list, LPWSTR* owner, LPWSTR* group ) +{ + FIXME("(%s, %d, %d, %s, %s, %p, %p, %p, %p) stub\n", debugstr_w(object), type, info, + debugstr_w(provider), debugstr_w(property), access_list, audit_list, owner, group); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * GetNamedSecurityInfoExA [ADVAPI32.@] + */ +DWORD WINAPI GetNamedSecurityInfoExA( LPCSTR object, SE_OBJECT_TYPE type, + SECURITY_INFORMATION info, LPCSTR provider, LPCSTR property, + PACTRL_ACCESSA* access_list, PACTRL_AUDITA* audit_list, LPSTR* owner, LPSTR* group ) +{ + FIXME("(%s, %d, %d, %s, %s, %p, %p, %p, %p) stub\n", debugstr_a(object), type, info, + debugstr_a(provider), debugstr_a(property), access_list, audit_list, owner, group); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** * DecryptFileW [ADVAPI32.@] */ BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved)

1 0

Andrew Nguyen : taskmgr: Remove all TCHAR macro usage in debug channel dialog code.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 1d9b7bda822d9620737d2e860695d2e205902f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9b7bda822d9620737d2e860… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:06:29 2011 -0500 taskmgr: Remove all TCHAR macro usage in debug channel dialog code. --- programs/taskmgr/Makefile.in | 2 +- programs/taskmgr/dbgchnl.c | 31 +++++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 38ce0ed..ca2bc8d 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -2,7 +2,7 @@ MODULE = taskmgr.exe APPMODE = -mwindows -mno-cygwin IMPORTS = psapi shell32 comctl32 user32 gdi32 advapi32 EXTRAINCL = -I$(top_srcdir)/include/msvcrt -EXTRADEFS = -DNO_LIBWINE_PORT +EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS MODCFLAGS = @BUILTINFLAG@ C_SRCS = \ diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 9ad5739..6b7b325 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -81,26 +81,27 @@ BOOL AreDebugChannelsSupported(void) static DWORD get_selected_pid(void) { - LVITEM lvitem; - ULONG Index; + LVITEMW lvitem; + ULONG Index, Count; DWORD dwProcessId; - for (Index = 0; Index < (ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0); + for (Index = 0; Index < Count; Index++) { lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; lvitem.iSubItem = 0; - SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); + SendMessageW(hProcessPageListCtrl, LVM_GETITEMW, 0, (LPARAM) &lvitem); if (lvitem.state & LVIS_SELECTED) break; } + Count = SendMessageW(hProcessPageListCtrl, LVM_GETSELECTEDCOUNT, 0, 0); dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + if ((Count != 1) || (dwProcessId == 0)) return 0; return dwProcessId; } @@ -108,17 +109,19 @@ static DWORD get_selected_pid(void) static int list_channel_CB(HANDLE hProcess, void* addr, struct __wine_debug_channel* channel, void* user) { int j; - WCHAR val[2]; - LVITEMA lvitem; + WCHAR nameW[sizeof(channel->name)], val[2]; + LVITEMW lvitem; int index; HWND hChannelLV = user; + MultiByteToWideChar(CP_ACP, 0, channel->name, sizeof(channel->name), nameW, sizeof(nameW)/sizeof(WCHAR)); + lvitem.mask = LVIF_TEXT; - lvitem.pszText = channel->name; + lvitem.pszText = nameW; lvitem.iItem = 0; lvitem.iSubItem = 0; - index = ListView_InsertItem(hChannelLV, &lvitem); + index = ListView_InsertItemW(hChannelLV, &lvitem); if (index == -1) return 0; val[1] = '\0'; @@ -209,13 +212,13 @@ static void DebugChannels_FillList(HWND hChannelLV) { HANDLE hProcess; - SendMessage(hChannelLV, LVM_DELETEALLITEMS, 0, 0); + SendMessageW(hChannelLV, LVM_DELETEALLITEMS, 0, 0); hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_OPERATION | PROCESS_VM_READ, FALSE, get_selected_pid()); if (!hProcess) return; /* FIXME messagebox */ - SendMessage(hChannelLV, WM_SETREDRAW, FALSE, 0); + SendMessageW(hChannelLV, WM_SETREDRAW, FALSE, 0); enum_channel(hProcess, list_channel_CB, (void*)hChannelLV); - SendMessage(hChannelLV, WM_SETREDRAW, TRUE, 0); + SendMessageW(hChannelLV, WM_SETREDRAW, TRUE, 0); CloseHandle(hProcess); } @@ -287,7 +290,7 @@ static void DebugChannels_OnNotify(HWND hDlg, LPARAM lParam) if (!hProcess) return; /* FIXME message box */ lhti.pt = nmia->ptAction; hChannelLV = GetDlgItem(hDlg, IDC_DEBUG_CHANNELS_LIST); - SendMessage(hChannelLV, LVM_SUBITEMHITTEST, 0, (LPARAM)&lhti); + SendMessageW(hChannelLV, LVM_SUBITEMHITTEST, 0, (LPARAM)&lhti); if (nmia->iSubItem >= 1 && nmia->iSubItem <= 4) { WCHAR val[2];

1 0

Alexandre Julliard : oleaut32: Reallocate in BSTR_UserUnmarshal to avoid changing the pointer if the string didn 't change.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 38a797990c8f55e96baa15c82004eff3abf96f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a797990c8f55e96baa15c82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 18 11:35:17 2011 +0200 oleaut32: Reallocate in BSTR_UserUnmarshal to avoid changing the pointer if the string didn't change. --- dlls/oleaut32/usrmarshal.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index b553f40..97bfef7 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -167,11 +167,12 @@ unsigned char * WINAPI BSTR_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, if(header->len != header->len2) FIXME("len %08x != len2 %08x\n", header->len, header->len2); - SysFreeString(*pstr); - *pstr = NULL; - - if(header->byte_len != 0xffffffff) - *pstr = SysAllocStringByteLen((char*)(header + 1), header->byte_len); + if (header->byte_len == 0xffffffff) + { + SysFreeString(*pstr); + *pstr = NULL; + } + else SysReAllocStringLen( pstr, (OLECHAR *)(header + 1), header->len ); if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); return Buffer + sizeof(*header) + sizeof(OLECHAR) * header->len;

1 0

Stefan Dösinger : wined3d: Make two variables unsigned .
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 1133991e8571b6317f3e2123af78b83087c3375e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1133991e8571b6317f3e2123a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 21:40:36 2011 +0200 wined3d: Make two variables unsigned. --- dlls/wined3d/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index da82bd8..8c344bd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -628,7 +628,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st else { BOOL color0_mov = FALSE; - int i, limit; + unsigned int i, limit; /* This will loop over all the registers and try to * make a bitmask of the ones we're interested in.

1 0

Marcus Meissner : msi: Check comp for NULL from msi_get_loaded_component ( Coverity).
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 97b82b0f18a38de0a638c9ad51444c75655e5286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b82b0f18a38de0a638c9ad5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed May 18 09:57:44 2011 +0200 msi: Check comp for NULL from msi_get_loaded_component (Coverity). --- dlls/msi/files.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index ff21604..06854be 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1180,6 +1180,9 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) install_mode = MSI_RecordGetInteger(row, 5); comp = msi_get_loaded_component(package, component); + if (!comp) + return ERROR_SUCCESS; + if (!comp->Enabled) { TRACE("component is disabled\n");

1 0

Stefan Dösinger : d3d8: Add a float to DWORD cast.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: e55b3bef0f74307f01310120212674fe8349a159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55b3bef0f74307f013101202… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 21:59:06 2011 +0200 d3d8: Add a float to DWORD cast. --- dlls/d3d8/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 11455ec..86e399a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1521,7 +1521,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetRenderState(IDirect3DDevice8 *ifac { case D3DRS_ZBIAS: hr = wined3d_device_get_render_state(This->wined3d_device, WINED3DRS_DEPTHBIAS, &wined3d_value.d); - if (SUCCEEDED(hr)) *pValue = wined3d_value.f / zbias_factor; + if (SUCCEEDED(hr)) *pValue = (DWORD)(wined3d_value.f / zbias_factor); break; default:

1 0

Dylan Smith : d3dx9: Implement ID3DXMesh::Optimize using OptimizeInplace.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: bf202cfdfd78c8b6e1fd0cff771df4e573b5c415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf202cfdfd78c8b6e1fd0cff7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed May 18 04:34:41 2011 -0400 d3dx9: Implement ID3DXMesh::Optimize using OptimizeInplace. --- dlls/d3dx9_36/mesh.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 0ed5030..b5504d5 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -646,10 +646,27 @@ static HRESULT WINAPI ID3DXMeshImpl_Optimize(ID3DXMesh *iface, DWORD flags, CONS DWORD *face_remap, LPD3DXBUFFER *vertex_remap, LPD3DXMESH *opt_mesh) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + HRESULT hr; + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE] = { D3DDECL_END() }; + ID3DXMesh *optimized_mesh; - FIXME("(%p)->(%u,%p,%p,%p,%p,%p): stub\n", This, flags, adjacency_in, adjacency_out, face_remap, vertex_remap, opt_mesh); + TRACE("(%p)->(%x,%p,%p,%p,%p,%p)\n", This, flags, adjacency_in, adjacency_out, face_remap, vertex_remap, opt_mesh); - return E_NOTIMPL; + if (!opt_mesh) + return D3DERR_INVALIDCALL; + + hr = iface->lpVtbl->GetDeclaration(iface, declaration); + if (FAILED(hr)) return hr; + + hr = iface->lpVtbl->CloneMesh(iface, This->options, declaration, This->device, &optimized_mesh); + if (FAILED(hr)) return hr; + + hr = optimized_mesh->lpVtbl->OptimizeInplace(optimized_mesh, flags, adjacency_in, adjacency_out, face_remap, vertex_remap); + if (SUCCEEDED(hr)) + *opt_mesh = optimized_mesh; + else + IUnknown_Release(optimized_mesh); + return hr; } /* Creates a vertex_remap that removes unused vertices.

1 0

Stefan Dösinger : d3d8: Stream indices are WORDs.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 6867393614327df1067ca59ae3791b751fff0506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6867393614327df1067ca59ae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 22:00:37 2011 +0200 d3d8: Stream indices are WORDs. --- dlls/d3d8/vertexdeclaration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 4994125..78a59d1 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -309,7 +309,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 WINED3DVERTEXELEMENT *element; D3DVSD_TOKENTYPE token_type; unsigned int element_count = 0; - DWORD stream = 0; + WORD stream = 0; int offset = 0; TRACE("d3d8_elements %p, wined3d_elements %p\n", d3d8_elements, wined3d_elements);

1 0

Stefan Dösinger : wined3d: Remove maxConcurrentLights from the device.
by Alexandre Julliard May 18, 2011

May 18, 2011

Module: wine Branch: master Commit: 5c6c0193404a5226daa4ad788d98d2a37803006f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c6c0193404a5226daa4ad788… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 18 09:12:40 2011 +0200 wined3d: Remove maxConcurrentLights from the device. --- dlls/wined3d/device.c | 7 +++---- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7570bca..b0cfc1d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1279,8 +1279,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, /* Initialize the current view state */ device->view_ident = 1; device->contexts[0]->last_was_rhw = 0; - glGetIntegerv(GL_MAX_LIGHTS, &device->maxConcurrentLights); - checkGLcall("glGetIntegerv(GL_MAX_LIGHTS, &device->maxConcurrentLights)"); switch (wined3d_settings.offscreen_rendering_mode) { @@ -2129,9 +2127,10 @@ HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UIN } else { - int i; + unsigned int i; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; /* Find a free GL light. */ - for (i = 0; i < device->maxConcurrentLights; ++i) + for (i = 0; i < gl_info->limits.lights; ++i) { if (!device->updateStateBlock->state.lights[i]) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 70e39d7..36cc891 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3859,7 +3859,7 @@ static void transform_view(DWORD state, struct wined3d_stateblock *stateblock, s checkGLcall("glLoadMatrixf(...)"); /* Reset lights. TODO: Call light apply func */ - for (k = 0; k < stateblock->device->maxConcurrentLights; ++k) + for (k = 0; k < gl_info->limits.lights; ++k) { light = stateblock->state.lights[k]; if(!light) continue; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 08a8469..cb221e4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1654,7 +1654,6 @@ struct wined3d_device LONG exStyle; /* X and GL Information */ - GLint maxConcurrentLights; GLenum offscreenBuffer; /* Selected capabilities */

1 0