wine-commits December 2008

wine-commits@winehq.org

2 participants
1225 discussions

Henri Verbeet : wined3d: IWineD3DBaseTexture and IWineD3DResource don' t need Vtbl's.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: 89241081f65b8354339ddde183ec100ef4c39361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89241081f65b8354339ddde18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 15:32:15 2008 +0100 wined3d: IWineD3DBaseTexture and IWineD3DResource don't need Vtbl's. --- dlls/wined3d/basetexture.c | 35 ----------------------------------- dlls/wined3d/resource.c | 19 ------------------- 2 files changed, 0 insertions(+), 54 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 98d9de4..5f7d7c4 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -487,38 +487,3 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface This->baseTexture.states[WINED3DTEXSTA_MAXANISOTROPY] = samplerStates[WINED3DSAMP_MAXANISOTROPY]; } } - - -static const IWineD3DBaseTextureVtbl IWineD3DBaseTexture_Vtbl = -{ - /* IUnknown */ - IWineD3DBaseTextureImpl_QueryInterface, - IWineD3DBaseTextureImpl_AddRef, - IWineD3DBaseTextureImpl_Release, - /* IWineD3DResource */ - IWineD3DBaseTextureImpl_GetParent, - IWineD3DBaseTextureImpl_GetDevice, - IWineD3DBaseTextureImpl_SetPrivateData, - IWineD3DBaseTextureImpl_GetPrivateData, - IWineD3DBaseTextureImpl_FreePrivateData, - IWineD3DBaseTextureImpl_SetPriority, - IWineD3DBaseTextureImpl_GetPriority, - IWineD3DBaseTextureImpl_PreLoad, - IWineD3DBaseTextureImpl_UnLoad, - IWineD3DBaseTextureImpl_GetType, - /*IWineD3DBaseTexture*/ - IWineD3DBaseTextureImpl_SetLOD, - IWineD3DBaseTextureImpl_GetLOD, - IWineD3DBaseTextureImpl_GetLevelCount, - IWineD3DBaseTextureImpl_SetAutoGenFilterType, - IWineD3DBaseTextureImpl_GetAutoGenFilterType, - IWineD3DBaseTextureImpl_GenerateMipSubLevels, - IWineD3DBaseTextureImpl_SetDirty, - IWineD3DBaseTextureImpl_GetDirty, - /* internal */ - IWineD3DBaseTextureImpl_BindTexture, - IWineD3DBaseTextureImpl_GetTextureDimensions, - IWineD3DBaseTextureImpl_IsCondNP2, - IWineD3DBaseTextureImpl_ApplyStateChanges - -}; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index c75e09d..a642fa5 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -262,22 +262,3 @@ void dumpResources(struct list *list) { FIXME("Leftover resource %p with type %d,%s\n", resource, IWineD3DResource_GetType((IWineD3DResource *) resource), debug_d3dresourcetype(IWineD3DResource_GetType((IWineD3DResource *) resource))); } } - -static const IWineD3DResourceVtbl IWineD3DResource_Vtbl = -{ - /* IUnknown */ - IWineD3DResourceImpl_QueryInterface, - IWineD3DResourceImpl_AddRef, - IWineD3DResourceImpl_Release, - /* IWineD3DResource */ - IWineD3DResourceImpl_GetParent, - IWineD3DResourceImpl_GetDevice, - IWineD3DResourceImpl_SetPrivateData, - IWineD3DResourceImpl_GetPrivateData, - IWineD3DResourceImpl_FreePrivateData, - IWineD3DResourceImpl_SetPriority, - IWineD3DResourceImpl_GetPriority, - IWineD3DResourceImpl_PreLoad, - IWineD3DResourceImpl_UnLoad, - IWineD3DResourceImpl_GetType -};

1 0

Henri Verbeet : wined3d: Const correctness fixes.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: 5532c990b62999d156a97302466f0e2a08e1aacd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5532c990b62999d156a973024… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 15:32:15 2008 +0100 wined3d: Const correctness fixes. --- dlls/wined3d/device.c | 11 +++++++++-- dlls/wined3d/pixelshader.c | 6 ++++-- dlls/wined3d/stateblock.c | 9 +++------ dlls/wined3d/surface_gdi.c | 4 ++-- dlls/wined3d/swapchain_gdi.c | 3 ++- dlls/wined3d/utils.c | 6 +++--- dlls/wined3d/vertexbuffer.c | 12 +++++++----- dlls/wined3d/vertexshader.c | 10 ++++------ dlls/wined3d/wined3d_private.h | 17 +++++++---------- include/wine/wined3d.idl | 4 ++-- 10 files changed, 43 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5532c990b62999d156a97…

1 0

Henri Verbeet : wined3d: Const correctness fixes for state.c.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: 7c0cb8c0c3e661e0633c0f050f23fef95fec9432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0cb8c0c3e661e0633c0f050… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 15:32:14 2008 +0100 wined3d: Const correctness fixes for state.c. --- dlls/wined3d/state.c | 63 +++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 9 ++---- 2 files changed, 31 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c0cb8c0c3e661e0633c0…

1 0

Henri Verbeet : wined3d: Handle a few "silent" FIXMEs more consistent with the rest of the code.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: fec9820e56cf4520ba65cb07f0090d7f67cba21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec9820e56cf4520ba65cb07f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 15:32:14 2008 +0100 wined3d: Handle a few "silent" FIXMEs more consistent with the rest of the code. Also avoids needlessly initializing static variables. --- dlls/wined3d/device.c | 28 ++++++++++++++++------------ dlls/wined3d/drawprim.c | 18 +++++++++--------- dlls/wined3d/state.c | 13 +++++++------ dlls/wined3d/swapchain_base.c | 7 ++++--- 4 files changed, 36 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 855bea5..e73a4f6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5767,10 +5767,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetCurrentTexturePalette(IWineD3DDevi static HRESULT WINAPI IWineD3DDeviceImpl_SetSoftwareVertexProcessing(IWineD3DDevice *iface, BOOL bSoftware) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - static BOOL showFixmes = TRUE; - if (showFixmes) { + static BOOL warned; + if (!warned) + { FIXME("(%p) : stub\n", This); - showFixmes = FALSE; + warned = TRUE; } This->softwareVertexProcessing = bSoftware; @@ -5780,10 +5781,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetSoftwareVertexProcessing(IWineD3DD static BOOL WINAPI IWineD3DDeviceImpl_GetSoftwareVertexProcessing(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - static BOOL showFixmes = TRUE; - if (showFixmes) { + static BOOL warned; + if (!warned) + { FIXME("(%p) : stub\n", This); - showFixmes = FALSE; + warned = TRUE; } return This->softwareVertexProcessing; } @@ -5809,11 +5811,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetRasterStatus(IWineD3DDevice *iface static HRESULT WINAPI IWineD3DDeviceImpl_SetNPatchMode(IWineD3DDevice *iface, float nSegments) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - static BOOL showfixmes = TRUE; + static BOOL warned; if(nSegments != 0.0f) { - if( showfixmes) { + if (!warned) + { FIXME("(%p) : stub nSegments(%f)\n", This, nSegments); - showfixmes = FALSE; + warned = TRUE; } } return WINED3D_OK; @@ -5821,10 +5824,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetNPatchMode(IWineD3DDevice *iface, static float WINAPI IWineD3DDeviceImpl_GetNPatchMode(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - static BOOL showfixmes = TRUE; - if( showfixmes) { + static BOOL warned; + if (!warned) + { FIXME("(%p) : stub returning(%f)\n", This, 0.0f); - showfixmes = FALSE; + warned = TRUE; } return 0.0f; } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 0b4fc71..e169587 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -864,10 +864,10 @@ void drawPrimitive(IWineD3DDevice *iface, if(!use_vs(This)) { if(!This->strided_streams.u.s.position_transformed && This->activeContext->num_untracked_materials && This->stateBlock->renderState[WINED3DRS_LIGHTING]) { - static BOOL first = TRUE; - if(first) { + static BOOL warned; + if (!warned) { FIXME("Using software emulation because not all material properties could be tracked\n"); - first = FALSE; + warned = TRUE; } else { TRACE("Using software emulation because not all material properties could be tracked\n"); } @@ -877,10 +877,10 @@ void drawPrimitive(IWineD3DDevice *iface, /* Either write a pipeline replacement shader or convert the specular alpha from unsigned byte * to a float in the vertex buffer */ - static BOOL first = TRUE; - if(first) { + static BOOL warned; + if (!warned) { FIXME("Using software emulation because manual fog coordinates are provided\n"); - first = FALSE; + warned = TRUE; } else { TRACE("Using software emulation because manual fog coordinates are provided\n"); } @@ -897,10 +897,10 @@ void drawPrimitive(IWineD3DDevice *iface, if (This->useDrawStridedSlow || emulation) { /* Immediate mode drawing */ if(use_vs(This)) { - static BOOL first = TRUE; - if(first) { + static BOOL warned; + if (!warned) { FIXME("Using immediate mode with vertex shaders for half float emulation\n"); - first = FALSE; + warned = TRUE; } else { TRACE("Using immediate mode with vertex shaders for half float emulation\n"); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5d8d84a..1132fbc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1566,10 +1566,10 @@ static void state_lastpixel(DWORD state, IWineD3DStateBlockImpl *stateblock, Win if(stateblock->renderState[WINED3DRS_LASTPIXEL]) { TRACE("Last Pixel Drawing Enabled\n"); } else { - static BOOL first = TRUE; - if(first) { + static BOOL warned; + if (!warned) { FIXME("Last Pixel Drawing Disabled, not handled yet\n"); - first = FALSE; + warned = TRUE; } else { TRACE("Last Pixel Drawing Disabled, not handled yet\n"); } @@ -4127,10 +4127,11 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte checkGLcall("glWeightPointerARB"); if((sd->u.s.blendMatrixIndices.lpData) || (sd->u.s.blendMatrixIndices.VBO)){ - static BOOL showfixme = TRUE; - if(showfixme){ + static BOOL warned; + if (!warned) + { FIXME("blendMatrixIndices support\n"); - showfixme = FALSE; + warned = TRUE; } } } else { diff --git a/dlls/wined3d/swapchain_base.c b/dlls/wined3d/swapchain_base.c index 363331c..7272c95 100644 --- a/dlls/wined3d/swapchain_base.c +++ b/dlls/wined3d/swapchain_base.c @@ -122,13 +122,14 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetBackBuffer(IWineD3DSwapChain *iface, HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *iface, WINED3DRASTER_STATUS *pRasterStatus) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; - static BOOL showFixmes = TRUE; + static BOOL warned; pRasterStatus->InVBlank = TRUE; pRasterStatus->ScanLine = 0; /* No openGL equivalent */ - if(showFixmes) { + if (!warned) + { FIXME("(%p) : stub (once)\n", This); - showFixmes = FALSE; + warned = TRUE; } return WINED3D_OK; }

1 0

Hans Leidekker : wininet: Don' t increase index in HttpQueryInfo if requested level is HTTP_QUERY_STATUS_CODE .
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: d1076aeab488c5ce1716a2d3d0147da2d1159dcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1076aeab488c5ce1716a2d3d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 1 15:35:05 2008 +0100 wininet: Don't increase index in HttpQueryInfo if requested level is HTTP_QUERY_STATUS_CODE. Some apps depend on this quirk because they don't reset the index before subsequent calls to HttpQueryInfo. --- dlls/wininet/http.c | 3 +- dlls/wininet/tests/http.c | 118 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 56ffe63..9cb8985 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2334,8 +2334,7 @@ static BOOL HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLevel, return bSuccess; } - if (lpdwIndex) - (*lpdwIndex)++; + if (lpdwIndex && level != HTTP_QUERY_STATUS_CODE) (*lpdwIndex)++; /* coalesce value to requested type */ if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER && lpBuffer) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 01471ac..bc9ad33 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1279,6 +1279,15 @@ static const char okmsg[] = "Server: winetest\r\n" "\r\n"; +static const char okmsg2[] = +"HTTP/1.1 200 OK\r\n" +"Date: Mon, 01 Dec 2008 13:44:34 GMT\r\n" +"Server: winetest\r\n" +"Content-Length: 0\r\n" +"Set-Cookie: one\r\n" +"Set-Cookie: two\r\n" +"\r\n"; + static const char notokmsg[] = "HTTP/1.1 400 Bad Request\r\n" "Server: winetest\r\n" @@ -1468,6 +1477,10 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } + if (strstr(buffer, "/testD")) + { + send(c, okmsg2, sizeof okmsg2-1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg-1, 0); @@ -1869,6 +1882,110 @@ static void test_basic_authentication(int port) InternetCloseHandle(session); } +static void test_HttpQueryInfo(int port) +{ + HINTERNET hi, hc, hr; + DWORD size, index; + char buffer[1024]; + BOOL ret; + + hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(hi != NULL, "InternetOpen failed\n"); + + hc = InternetConnect(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(hc != NULL, "InternetConnect failed\n"); + + hr = HttpOpenRequest(hc, NULL, "/testD", NULL, NULL, NULL, 0, 0); + ok(hr != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(hr, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + index = 0; + size = sizeof(buffer); + ret = HttpQueryInfo(hr, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, &index); + ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); + ok(index == 1, "expected 1 got %u\n", index); + + index = 0; + size = sizeof(buffer); + ret = HttpQueryInfo(hr, HTTP_QUERY_DATE | HTTP_QUERY_FLAG_SYSTEMTIME, buffer, &size, &index); + ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); + ok(index == 1, "expected 1 got %u\n", index); + + index = 0; + size = sizeof(buffer); + ret = HttpQueryInfo(hr, HTTP_QUERY_RAW_HEADERS, buffer, &size, &index); + ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); + ok(index == 0, "expected 0 got %u\n", index); + + size = sizeof(buffer); + ret = HttpQueryInfo(hr, HTTP_QUERY_RAW_HEADERS, buffer, &size, &index); + ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); + ok(index == 0, "expected 0 got %u\n", index); + + size = sizeof(buffer); + ret = HttpQueryInfo(hr, HTTP_QUERY_RAW_HEADERS_CRLF, buffer, &size, &index); + ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); + ok(index == 0, "expected 0 got %u\n", index); + + size = sizeof(buffer); + ret = HttpQueryInfo(hr, HTTP_QUERY_STATUS_TEXT, buffer, &size, &index); + ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); + ok(index == 0, "expected 0 got %u\n", index); + + size = sizeof(buffer); + ret = HttpQueryInfo(hr, HTTP_QUERY_VERSION, buffer, &size, &index); + ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); + ok(index == 0, "expected 0 got %u\n", index); + + index = 0; + size = sizeof(buffer); + ret = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &size, &index); + ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); + ok(index == 0, "expected 0 got %u\n", index); + + index = 0; + size = sizeof(buffer); + ret = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, buffer, &size, &index); + ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); + ok(index == 0, "expected 0 got %u\n", index); + + index = 0xdeadbeef; + size = sizeof(buffer); + ret = HttpQueryInfo(hr, HTTP_QUERY_FORWARDED, buffer, &size, &index); + ok(!ret, "HttpQueryInfo succeeded\n"); + ok(index == 0xdeadbeef, "expected 0xdeadbeef got %u\n", index); + + index = 0; + size = sizeof(buffer); + ret = HttpQueryInfo(hr, HTTP_QUERY_SERVER, buffer, &size, &index); + ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); + ok(index == 1, "expected 1 got %u\n", index); + + index = 0; + size = sizeof(buffer); + strcpy(buffer, "Server"); + ret = HttpQueryInfo(hr, HTTP_QUERY_CUSTOM, buffer, &size, &index); + ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); + ok(index == 1, "expected 1 got %u\n", index); + + index = 0; + size = sizeof(buffer); + ret = HttpQueryInfo(hr, HTTP_QUERY_SET_COOKIE, buffer, &size, &index); + ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); + ok(index == 1, "expected 1 got %u\n", index); + + size = sizeof(buffer); + ret = HttpQueryInfo(hr, HTTP_QUERY_SET_COOKIE, buffer, &size, &index); + ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); + ok(index == 2, "expected 2 got %u\n", index); + + InternetCloseHandle(hr); + InternetCloseHandle(hc); + InternetCloseHandle(hi); +} + static void test_http_connection(void) { struct server_info si; @@ -1896,6 +2013,7 @@ static void test_http_connection(void) test_http1_1(si.port); test_cookie_header(si.port); test_basic_authentication(si.port); + test_HttpQueryInfo(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Alexandre Julliard : oleaut32: Use a dlldata. c file instead of maintaining the data manually.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: 8d8ff37ca316d520c13c294bef0e559d806049c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8ff37ca316d520c13c294be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 1 18:56:35 2008 +0100 oleaut32: Use a dlldata.c file instead of maintaining the data manually. --- dlls/oleaut32/Makefile.in | 5 ++++- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/usrmarshal.c | 22 ---------------------- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index 93b19d1..7ea6586 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ @@ -7,6 +6,8 @@ MODULE = oleaut32.dll IMPORTLIB = oleaut32 IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = comctl32 urlmon +EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H \ + -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_CLSID=CLSID_PSDispatch -DPROXY_DELEGATION C_SRCS = \ connpt.c \ @@ -42,6 +43,8 @@ IDL_P_SRCS = \ oleaut32_oaidl.idl \ oleaut32_ocidl.idl +EXTRA_OBJS = dlldata.o + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 4e636e3..1a36f7f 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -696,7 +696,7 @@ HRESULT WINAPI OleTranslateColor( return S_OK; } -extern HRESULT OLEAUTPS_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv); +extern HRESULT WINAPI OLEAUTPS_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; extern void _get_STDFONT_CF(LPVOID *); extern void _get_STDPIC_CF(LPVOID *); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index b31eb39..85faac4 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -25,7 +25,6 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define PROXY_DELEGATION #include "windef.h" #include "winbase.h" @@ -35,7 +34,6 @@ #include "ole2.h" #include "oleauto.h" -#include "rpcproxy.h" #include "typelib.h" #include "ocidl.h" #include "wine/debug.h" @@ -47,26 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #define ALIGN_LENGTH(_Len, _Align) _Len = ALIGNED_LENGTH(_Len, _Align) #define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align) -static CStdPSFactoryBuffer PSFactoryBuffer; - -CSTDSTUBBUFFERRELEASE(&PSFactoryBuffer) -CSTDSTUBBUFFER2RELEASE(&PSFactoryBuffer) - -extern const ExtendedProxyFileInfo oleaut32_oaidl_ProxyFileInfo; -extern const ExtendedProxyFileInfo oleaut32_ocidl_ProxyFileInfo; - -static const ProxyFileInfo *OLEAUT32_ProxyFileList[] = { - &oleaut32_oaidl_ProxyFileInfo, - &oleaut32_ocidl_ProxyFileInfo, - NULL -}; - -HRESULT OLEAUTPS_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) -{ - return NdrDllGetClassObject(rclsid, riid, ppv, OLEAUT32_ProxyFileList, - &CLSID_PSDispatch, &PSFactoryBuffer); -} - static void dump_user_flags(const ULONG *pFlags) { if (HIWORD(*pFlags) == NDR_LOCAL_DATA_REPRESENTATION)

1 0

Alexandre Julliard : ole32: Use a dlldata. c file instead of maintaining the data manually.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: 1bd26cca9410a750573ee2562cc1ab7f3701b884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd26cca9410a750573ee2562… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 1 18:56:15 2008 +0100 ole32: Use a dlldata.c file instead of maintaining the data manually. --- dlls/ole32/Makefile.in | 5 ++++- dlls/ole32/compobj_private.h | 3 +++ dlls/ole32/oleproxy.c | 21 +-------------------- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index e82b2ad..a38c965 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ @@ -6,6 +5,8 @@ VPATH = @srcdir@ MODULE = ole32.dll IMPORTLIB = ole32 IMPORTS = uuid advapi32 user32 gdi32 rpcrt4 kernel32 ntdll +EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H \ + -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer C_SRCS = \ antimoniker.c \ @@ -74,6 +75,8 @@ IDL_P_SRCS = \ ole32_oleidl.idl \ ole32_unknwn.idl +EXTRA_OBJS = dlldata.o + @MAKE_DLL_RULES@ ole2nls.spec.o: ole2nls.spec version16.res diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 4b88ad2..150c7c7 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -309,6 +309,9 @@ extern HINSTANCE OLE32_hInstance; /* FIXME: make static */ #define WINE_CLSCTX_DONT_HOST 0x80000000 +/* from dlldata.c */ +extern HRESULT WINAPI OLE32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) DECLSPEC_HIDDEN; + /* Exported non-interface Data Advise Holder functions */ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate); void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface); diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 99a86f0..dfc3bc1 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -36,7 +36,6 @@ #include "objbase.h" #include "ole2.h" #include "rpc.h" -#include "rpcproxy.h" #include "compobj_private.h" #include "moniker.h" @@ -46,23 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -static CStdPSFactoryBuffer PSFactoryBuffer; - -CSTDSTUBBUFFERRELEASE(&PSFactoryBuffer) - -extern const ExtendedProxyFileInfo dcom_ProxyFileInfo; -extern const ExtendedProxyFileInfo ole32_objidl_ProxyFileInfo; -extern const ExtendedProxyFileInfo ole32_oleidl_ProxyFileInfo; -extern const ExtendedProxyFileInfo ole32_unknwn_ProxyFileInfo; - -static const ProxyFileInfo *OLE32_ProxyFileList[] = { - &dcom_ProxyFileInfo, - &ole32_objidl_ProxyFileInfo, - &ole32_oleidl_ProxyFileInfo, - &ole32_unknwn_ProxyFileInfo, - NULL -}; - /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -92,6 +74,5 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) if (IsEqualGUID(rclsid, &CLSID_StdComponentCategoriesMgr)) return ComCatCF_Create(iid, ppv); - return NdrDllGetClassObject(rclsid, iid, ppv, OLE32_ProxyFileList, - &CLSID_PSFactoryBuffer, &PSFactoryBuffer); + return OLE32_DllGetClassObject(rclsid, iid, ppv); }

1 0

Alexandre Julliard : widl: Sort the proxy interfaces by iid and use a binary search in IID_Lookup.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: 9bf60549a51fedbf4aa064cc412055d4d910ed78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf60549a51fedbf4aa064cc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 1 16:25:45 2008 +0100 widl: Sort the proxy interfaces by iid and use a binary search in IID_Lookup. --- tools/widl/proxy.c | 95 ++++++++++++++++++++++++--------------------------- 1 files changed, 45 insertions(+), 50 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 860b383..a994fd7 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -703,23 +703,16 @@ static void write_proxy_stmts(const statement_list_t *stmts, unsigned int *proc_ } } -static void write_proxy_iface_name_format(const statement_list_t *stmts, const char *format) +static int cmp_iid( const void *ptr1, const void *ptr2 ) { - const statement_t *stmt; - if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) - { - if (stmt->type == STMT_LIBRARY) - write_proxy_iface_name_format(stmt->u.lib->stmts, format); - else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) - { - type_t *iface = stmt->u.type; - if (iface->ref && need_proxy(iface)) - fprintf(proxy, format, iface->name); - } - } + const type_t * const *iface1 = ptr1; + const type_t * const *iface2 = ptr2; + const UUID *uuid1 = get_attrp( (*iface1)->attrs, ATTR_UUID ); + const UUID *uuid2 = get_attrp( (*iface2)->attrs, ATTR_UUID ); + return memcmp( uuid1, uuid2, sizeof(UUID) ); } -static void write_proxy_iface_base_iids(const statement_list_t *stmts) +static void build_iface_list( const statement_list_t *stmts, type_t **ifaces[], int *count ) { const statement_t *stmt; @@ -727,50 +720,36 @@ static void write_proxy_iface_base_iids(const statement_list_t *stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) { if (stmt->type == STMT_LIBRARY) - write_proxy_iface_base_iids(stmt->u.lib->stmts); + build_iface_list(stmt->u.lib->stmts, ifaces, count); else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) { type_t *iface = stmt->u.type; if (iface->ref && need_proxy(iface)) { - if (need_delegation(iface)) - fprintf( proxy, " &IID_%s, /* %s */\n", iface->ref->name, iface->name ); - else - fprintf( proxy, " 0,\n" ); + *ifaces = xrealloc( *ifaces, (*count + 1) * sizeof(*ifaces) ); + (*ifaces)[(*count)++] = iface; } } } } -static void write_iid_lookup(const statement_list_t *stmts, const char *file_id, int *c) +static type_t **sort_interfaces( const statement_list_t *stmts, int *count ) { - const statement_t *stmt; - if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) - { - if (stmt->type == STMT_LIBRARY) - write_iid_lookup(stmt->u.lib->stmts, file_id, c); - else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) - { - type_t *iface = stmt->u.type; - if(iface->ref && need_proxy(iface)) - { - fprintf(proxy, " if (!_%s_CHECK_IID(%d))\n", file_id, *c); - fprintf(proxy, " {\n"); - fprintf(proxy, " *pIndex = %d;\n", *c); - fprintf(proxy, " return 1;\n"); - fprintf(proxy, " }\n"); - (*c)++; - } - } - } + type_t **ifaces = NULL; + + *count = 0; + build_iface_list( stmts, &ifaces, count ); + qsort( ifaces, *count, sizeof(*ifaces), cmp_iid ); + return ifaces; } void write_proxies(const statement_list_t *stmts) { int expr_eval_routines; char *file_id = proxy_token; - int c, have_baseiid; + int i, count, have_baseiid; unsigned int proc_offset = 0; + type_t **interfaces; if (!do_proxies) return; if (do_everything && !need_proxy_file(stmts)) return; @@ -793,23 +772,27 @@ void write_proxies(const statement_list_t *stmts) write_procformatstring(proxy, stmts, need_proxy); write_typeformatstring(proxy, stmts, need_proxy); + interfaces = sort_interfaces(stmts, &count); fprintf(proxy, "static const CInterfaceProxyVtbl* const _%s_ProxyVtblList[] =\n", file_id); fprintf(proxy, "{\n"); - write_proxy_iface_name_format(stmts, " (const CInterfaceProxyVtbl*)&_%sProxyVtbl,\n"); + for (i = 0; i < count; i++) + fprintf(proxy, " (const CInterfaceProxyVtbl*)&_%sProxyVtbl,\n", interfaces[i]->name); fprintf(proxy, " 0\n"); fprintf(proxy, "};\n"); fprintf(proxy, "\n"); fprintf(proxy, "static const CInterfaceStubVtbl* const _%s_StubVtblList[] =\n", file_id); fprintf(proxy, "{\n"); - write_proxy_iface_name_format(stmts, " &_%sStubVtbl,\n"); + for (i = 0; i < count; i++) + fprintf(proxy, " &_%sStubVtbl,\n", interfaces[i]->name); fprintf(proxy, " 0\n"); fprintf(proxy, "};\n"); fprintf(proxy, "\n"); fprintf(proxy, "static PCInterfaceName const _%s_InterfaceNamesList[] =\n", file_id); fprintf(proxy, "{\n"); - write_proxy_iface_name_format(stmts, " \"%s\",\n"); + for (i = 0; i < count; i++) + fprintf(proxy, " \"%s\",\n", interfaces[i]->name); fprintf(proxy, " 0\n"); fprintf(proxy, "};\n"); fprintf(proxy, "\n"); @@ -818,18 +801,30 @@ void write_proxies(const statement_list_t *stmts) { fprintf(proxy, "static const IID * _%s_BaseIIDList[] =\n", file_id); fprintf(proxy, "{\n"); - write_proxy_iface_base_iids(stmts); + for (i = 0; i < count; i++) + { + if (need_delegation(interfaces[i])) + fprintf( proxy, " &IID_%s, /* %s */\n", interfaces[i]->ref->name, interfaces[i]->name ); + else + fprintf( proxy, " 0,\n" ); + } fprintf(proxy, " 0\n"); fprintf(proxy, "};\n"); fprintf(proxy, "\n"); } - fprintf(proxy, "#define _%s_CHECK_IID(n) IID_GENERIC_CHECK_IID(_%s, pIID, n)\n", file_id, file_id); - fprintf(proxy, "\n"); - fprintf(proxy, "int __stdcall _%s_IID_Lookup(const IID* pIID, int* pIndex)\n", file_id); + fprintf(proxy, "static int __stdcall _%s_IID_Lookup(const IID* pIID, int* pIndex)\n", file_id); fprintf(proxy, "{\n"); - c = 0; - write_iid_lookup(stmts, file_id, &c); + fprintf(proxy, " int low = 0, high = %d;\n", count - 1); + fprintf(proxy, "\n"); + fprintf(proxy, " while (low <= high)\n"); + fprintf(proxy, " {\n"); + fprintf(proxy, " int pos = (low + high) / 2;\n"); + fprintf(proxy, " int res = IID_GENERIC_CHECK_IID(_%s, pIID, pos);\n", file_id); + fprintf(proxy, " if (!res) { *pIndex = pos; return 1; }\n"); + fprintf(proxy, " if (res > 0) low = pos + 1;\n"); + fprintf(proxy, " else high = pos - 1;\n"); + fprintf(proxy, " }\n"); fprintf(proxy, " return 0;\n"); fprintf(proxy, "}\n"); fprintf(proxy, "\n"); @@ -842,7 +837,7 @@ void write_proxies(const statement_list_t *stmts) if (have_baseiid) fprintf(proxy, " _%s_BaseIIDList,\n", file_id); else fprintf(proxy, " 0,\n"); fprintf(proxy, " &_%s_IID_Lookup,\n", file_id); - fprintf(proxy, " %d,\n", c); + fprintf(proxy, " %d,\n", count); fprintf(proxy, " 1,\n"); fprintf(proxy, " 0,\n"); fprintf(proxy, " 0,\n");

1 0

Alexandre Julliard : widl: Output vtable information even for interfaces that don' t define new functions.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: 61d600f42fc914947a6f37b1cc2dfd3b71b9e907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d600f42fc914947a6f37b1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 1 14:51:17 2008 +0100 widl: Output vtable information even for interfaces that don't define new functions. --- tools/widl/proxy.c | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 3c43aad..860b383 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -508,6 +508,18 @@ static void gen_stub(type_t *iface, const func_t *cur, const char *cas, print_proxy("\n"); } +static int count_methods(type_t *iface) +{ + const func_t *cur; + int count = 0; + + if (iface->ref) count = count_methods(iface->ref); + if (iface->funcs) + LIST_FOR_EACH_ENTRY( cur, iface->funcs, const func_t, entry ) + if (!is_callas(cur->def->attrs)) count++; + return count; +} + static int write_proxy_methods(type_t *iface, int skip) { const func_t *cur; @@ -548,17 +560,15 @@ static int write_stub_methods(type_t *iface, int skip) static void write_proxy(type_t *iface, unsigned int *proc_offset) { - int midx = -1, stubs; + int midx = -1, count; const func_t *cur; - if (!iface->funcs) return; - /* FIXME: check for [oleautomation], shouldn't generate proxies/stubs if specified */ fprintf(proxy, "/*****************************************************************************\n"); fprintf(proxy, " * %s interface\n", iface->name); fprintf(proxy, " */\n"); - LIST_FOR_EACH_ENTRY( cur, iface->funcs, const func_t, entry ) + if (iface->funcs) LIST_FOR_EACH_ENTRY( cur, iface->funcs, const func_t, entry ) { const var_t *def = cur->def; if (!is_local(def->attrs)) { @@ -583,8 +593,11 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) } } + count = count_methods(iface); + if (midx != -1 && midx != count) error("invalid count %u/%u\n", count, midx); + /* proxy vtable */ - print_proxy( "static const CINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", midx, iface->name); + print_proxy( "static const CINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", count, iface->name); print_proxy( "{\n"); indent++; print_proxy( "{\n", iface->name); @@ -606,7 +619,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) print_proxy( "static const PRPC_STUB_FUNCTION %s_table[] =\n", iface->name); print_proxy( "{\n"); indent++; - stubs = write_stub_methods(iface, FALSE); + write_stub_methods(iface, FALSE); fprintf(proxy, "\n"); indent--; fprintf(proxy, "};\n"); @@ -619,7 +632,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) indent++; print_proxy( "&IID_%s,\n", iface->name); print_proxy( "0,\n"); - print_proxy( "%d,\n", stubs+3); + print_proxy( "%d,\n", count); print_proxy( "&%s_table[-3],\n", iface->name); indent--; print_proxy( "},\n", iface->name); @@ -700,7 +713,7 @@ static void write_proxy_iface_name_format(const statement_list_t *stmts, const c else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) { type_t *iface = stmt->u.type; - if (iface->ref && iface->funcs && need_proxy(iface)) + if (iface->ref && need_proxy(iface)) fprintf(proxy, format, iface->name); } } @@ -718,7 +731,7 @@ static void write_proxy_iface_base_iids(const statement_list_t *stmts) else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) { type_t *iface = stmt->u.type; - if (iface->ref && iface->funcs && need_proxy(iface)) + if (iface->ref && need_proxy(iface)) { if (need_delegation(iface)) fprintf( proxy, " &IID_%s, /* %s */\n", iface->ref->name, iface->name ); @@ -739,7 +752,7 @@ static void write_iid_lookup(const statement_list_t *stmts, const char *file_id, else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) { type_t *iface = stmt->u.type; - if(iface->ref && iface->funcs && need_proxy(iface)) + if(iface->ref && need_proxy(iface)) { fprintf(proxy, " if (!_%s_CHECK_IID(%d))\n", file_id, *c); fprintf(proxy, " {\n");

1 0

Alexandre Julliard : widl: Don't define PROXY_DELEGATION unconditionally.
by Alexandre Julliard 02 Dec '08

02 Dec '08

Module: wine Branch: master Commit: 36519069b336700fc95590b4d6dfb0b7ab21d8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36519069b336700fc95590b4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 1 14:45:43 2008 +0100 widl: Don't define PROXY_DELEGATION unconditionally. --- tools/widl/widl.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index c49b009..9b14de2 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -253,7 +253,6 @@ static void write_dlldata_list(struct list *filenames) fprintf(dlldata, "/*** Autogenerated by WIDL %s ", PACKAGE_VERSION); fprintf(dlldata, "- Do not edit ***/\n\n"); - fprintf(dlldata, "#define PROXY_DELEGATION\n"); fprintf(dlldata, "#include <objbase.h>\n"); fprintf(dlldata, "#include <rpcproxy.h>\n\n"); start_cplusplus_guard(dlldata);

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 2008