Changeset 23571 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/query.c
- Timestamp:
- Oct 6, 2009 6:07:06 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/query.c
r19678 r23571 67 67 68 68 if (ref == 0) { 69 EnterCriticalSection(&d3d9_cs);69 wined3d_mutex_lock(); 70 70 IWineD3DQuery_Release(This->wineD3DQuery); 71 LeaveCriticalSection(&d3d9_cs); 71 wined3d_mutex_unlock(); 72 72 73 IDirect3DDevice9Ex_Release(This->parentDevice); 73 74 HeapFree(GetProcessHeap(), 0, This); … … 84 85 TRACE("(%p) Relay\n", This); 85 86 86 EnterCriticalSection(&d3d9_cs);87 wined3d_mutex_lock(); 87 88 hr = IWineD3DQuery_GetDevice(This->wineD3DQuery, &pDevice); 88 89 if(hr != D3D_OK){ … … 92 93 IWineD3DDevice_Release(pDevice); 93 94 } 94 LeaveCriticalSection(&d3d9_cs); 95 wined3d_mutex_unlock(); 96 95 97 return hr; 96 98 } … … 101 103 TRACE("(%p) Relay\n", This); 102 104 103 EnterCriticalSection(&d3d9_cs);105 wined3d_mutex_lock(); 104 106 hr = IWineD3DQuery_GetType(This->wineD3DQuery); 105 LeaveCriticalSection(&d3d9_cs); 107 wined3d_mutex_unlock(); 108 106 109 return hr; 107 110 } … … 112 115 TRACE("(%p) Relay\n", This); 113 116 114 EnterCriticalSection(&d3d9_cs);117 wined3d_mutex_lock(); 115 118 ret = IWineD3DQuery_GetDataSize(This->wineD3DQuery); 116 LeaveCriticalSection(&d3d9_cs); 119 wined3d_mutex_unlock(); 120 117 121 return ret; 118 122 } … … 123 127 TRACE("(%p) Relay\n", This); 124 128 125 EnterCriticalSection(&d3d9_cs);129 wined3d_mutex_lock(); 126 130 hr = IWineD3DQuery_Issue(This->wineD3DQuery, dwIssueFlags); 127 LeaveCriticalSection(&d3d9_cs); 131 wined3d_mutex_unlock(); 132 128 133 return hr; 129 134 } … … 134 139 TRACE("(%p) Relay\n", This); 135 140 136 EnterCriticalSection(&d3d9_cs);141 wined3d_mutex_lock(); 137 142 hr = IWineD3DQuery_GetData(This->wineD3DQuery, pData, dwSize, dwGetDataFlags); 138 LeaveCriticalSection(&d3d9_cs); 143 wined3d_mutex_unlock(); 144 139 145 return hr; 140 146 } … … 164 170 if (!ppQuery) 165 171 { 166 EnterCriticalSection(&d3d9_cs);172 wined3d_mutex_lock(); 167 173 hr = IWineD3DDevice_CreateQuery(This->WineD3DDevice, Type, NULL, NULL); 168 LeaveCriticalSection(&d3d9_cs); 174 wined3d_mutex_unlock(); 175 169 176 return hr; 170 177 } … … 179 186 object->lpVtbl = &Direct3DQuery9_Vtbl; 180 187 object->ref = 1; 181 EnterCriticalSection(&d3d9_cs); 188 189 wined3d_mutex_lock(); 182 190 hr = IWineD3DDevice_CreateQuery(This->WineD3DDevice, Type, &object->wineD3DQuery, (IUnknown *)object); 183 LeaveCriticalSection(&d3d9_cs);191 wined3d_mutex_unlock(); 184 192 185 193 if (FAILED(hr)) {
Note:
See TracChangeset
for help on using the changeset viewer.
