November 2005 - Wine-Commits

wine/dlls/wininet http.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21470 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:03:21 Modified files: dlls/wininet : http.c Log message: Robert Shearman <rob(a)codeweavers.com> Add parsing of the Content-ID and Proxy-Connection headers. Sort the table of header to option number mappings correctly. Change a FIXME to a WARN because there are "X-..." headers that we aren't supposed to parse. Patch: http://cvs.winehq.org/patch.py?id=21470 Old revision New revision Changes Path 1.115 1.116 +13 -2 wine/dlls/wininet/http.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.115 wine/dlls/wininet/http.c:1.116 --- wine/dlls/wininet/http.c:1.115 28 Nov 2005 11: 3:21 -0000 +++ wine/dlls/wininet/http.c 28 Nov 2005 11: 3:21 -0000 @@ -2480,6 +2480,7 @@ static const WCHAR szCache_Control[] = { static const WCHAR szConnection[] = { 'C','o','n','n','e','c','t','i','o','n',0 }; static const WCHAR szContent_Base[] = { 'C','o','n','t','e','n','t','-','B','a','s','e',0 }; static const WCHAR szContent_Encoding[] = { 'C','o','n','t','e','n','t','-','E','n','c','o','d','i','n','g',0 }; +static const WCHAR szContent_ID[] = { 'C','o','n','t','e','n','t','-','I','D',0 }; static const WCHAR szContent_Language[] = { 'C','o','n','t','e','n','t','-','L','a','n','g','u','a','g','e',0 }; static const WCHAR szContent_Length[] = { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',0 }; static const WCHAR szContent_Location[] = { 'C','o','n','t','e','n','t','-','L','o','c','a','t','i','o','n',0 }; @@ -2506,6 +2507,7 @@ static const WCHAR szMime_Version[] = { static const WCHAR szPragma[] = { 'P','r','a','g','m','a',0 }; static const WCHAR szProxy_Authenticate[] = { 'P','r','o','x','y','-','A','u','t','h','e','n','t','i','c','a','t','e',0 }; static const WCHAR szProxy_Authorization[] = { 'P','r','o','x','y','-','A','u','t','h','o','r','i','z','a','t','i','o','n',0 }; +static const WCHAR szProxy_Connection[] = { 'P','r','o','x','y','-','C','o','n','n','e','c','t','i','o','n',0 }; static const WCHAR szPublic[] = { 'P','u','b','l','i','c',0 }; static const WCHAR szRange[] = { 'R','a','n','g','e',0 }; static const WCHAR szReferer[] = { 'R','e','f','e','r','e','r',0 }; @@ -2525,9 +2527,9 @@ static const WCHAR szWWW_Authenticate[] /* Note: Must be kept sorted! */ const std_hdr_data SORTED_STANDARD_HEADERS[] = { + {szAccept, HTTP_QUERY_ACCEPT, REQUEST_HDR,}, {szAccept_Charset, HTTP_QUERY_ACCEPT_CHARSET, REQUEST_HDR,}, {szAccept_Encoding, HTTP_QUERY_ACCEPT_ENCODING, REQUEST_HDR,}, - {szAccept, HTTP_QUERY_ACCEPT, REQUEST_HDR,}, {szAccept_Language, HTTP_QUERY_ACCEPT_LANGUAGE, REQUEST_HDR,}, {szAccept_Ranges, HTTP_QUERY_ACCEPT_RANGES, RESPONSE_HDR,}, {szAge, HTTP_QUERY_AGE, RESPONSE_HDR,}, @@ -2537,6 +2539,7 @@ const std_hdr_data SORTED_STANDARD_HEADE {szConnection, HTTP_QUERY_CONNECTION, REQ_RESP_HDR,}, {szContent_Base, HTTP_QUERY_CONTENT_BASE, REQ_RESP_HDR,}, {szContent_Encoding, HTTP_QUERY_CONTENT_ENCODING, REQ_RESP_HDR,}, + {szContent_ID, HTTP_QUERY_CONTENT_ID, REQ_RESP_HDR,}, {szContent_Language, HTTP_QUERY_CONTENT_LANGUAGE, REQ_RESP_HDR,}, {szContent_Length, HTTP_QUERY_CONTENT_LENGTH, REQ_RESP_HDR,}, {szContent_Location, HTTP_QUERY_CONTENT_LOCATION, REQ_RESP_HDR,}, @@ -2563,6 +2566,7 @@ const std_hdr_data SORTED_STANDARD_HEADE {szPragma, HTTP_QUERY_PRAGMA, REQ_RESP_HDR,}, {szProxy_Authenticate, HTTP_QUERY_PROXY_AUTHENTICATE, RESPONSE_HDR,}, {szProxy_Authorization, HTTP_QUERY_PROXY_AUTHORIZATION, REQUEST_HDR,}, + {szProxy_Connection, HTTP_QUERY_PROXY_CONNECTION, REQ_RESP_HDR,}, {szPublic, HTTP_QUERY_PUBLIC, RESPONSE_HDR,}, {szRange, HTTP_QUERY_RANGE, REQUEST_HDR,}, {szReferer, HTTP_QUERY_REFERER, REQUEST_HDR,}, @@ -2597,6 +2601,13 @@ static INT HTTP_GetStdHeaderIndex(LPCWST INT hi = sizeof(SORTED_STANDARD_HEADERS) / sizeof(std_hdr_data) -1; INT mid, inx; +#if 0 + INT i; + for (i = 0; i < sizeof(SORTED_STANDARD_HEADERS) / sizeof(std_hdr_data) -1; i++) + if (lstrcmpiW(SORTED_STANDARD_HEADERS[i].hdrStr, SORTED_STANDARD_HEADERS[i+1].hdrStr) > 0) + ERR("%s should be after %s\n", debugstr_w(SORTED_STANDARD_HEADERS[i].hdrStr), debugstr_w(SORTED_STANDARD_HEADERS[i+1].hdrStr)); +#endif + while (lo <= hi) { mid = (int) (lo + hi) / 2; inx = lstrcmpiW(lpszField, SORTED_STANDARD_HEADERS[mid].hdrStr); @@ -2607,7 +2618,7 @@ static INT HTTP_GetStdHeaderIndex(LPCWST else lo = mid+1; } - FIXME("Couldn't find %s in standard header table\n", debugstr_w(lpszField)); + WARN("Couldn't find %s in standard header table\n", debugstr_w(lpszField)); return -1; }

1 0

wine/include imagehlp.h
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21469 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:03:10 Modified files: include : imagehlp.h Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Add some 64 bit definitions. Patch: http://cvs.winehq.org/patch.py?id=21469 Old revision New revision Changes Path 1.23 1.24 +56 -0 wine/include/imagehlp.h Index: wine/include/imagehlp.h diff -u -p wine/include/imagehlp.h:1.23 wine/include/imagehlp.h:1.24 --- wine/include/imagehlp.h:1.23 28 Nov 2005 11: 3:10 -0000 +++ wine/include/imagehlp.h 28 Nov 2005 11: 3:10 -0000 @@ -236,6 +236,12 @@ typedef struct _ADDRESS { ADDRESS_MODE Mode; } ADDRESS, *PADDRESS; +typedef struct _ADDRESS64 { + DWORD64 Offset; + WORD Segment; + ADDRESS_MODE Mode; +} ADDRESS64, *LPADDRESS64; + typedef struct _KDHELP { DWORD Thread; DWORD ThCallbackStack; @@ -246,6 +252,18 @@ typedef struct _KDHELP { DWORD SystemRangeStart; } KDHELP, *PKDHELP; +typedef struct _KDHELP64 { + DWORD64 Thread; + DWORD ThCallbackStack; + DWORD ThCallbackBStore; + DWORD NextCallback; + DWORD FramePointer; + DWORD64 KiCallUserMode; + DWORD64 KeUserCallbackDispatcher; + DWORD64 SystemRangeStart; + DWORD64 Reserved[8]; +} KDHELP64, *PKDHELP64; + typedef struct _STACKFRAME { ADDRESS AddrPC; ADDRESS AddrReturn; @@ -259,6 +277,20 @@ typedef struct _STACKFRAME { KDHELP KdHelp; } STACKFRAME, *LPSTACKFRAME; +typedef struct _STACKFRAME64 { + ADDRESS64 AddrPC; + ADDRESS64 AddrReturn; + ADDRESS64 AddrFrame; + ADDRESS64 AddrStack; + ADDRESS64 AddrBStore; + PVOID FuncTableEntry; + DWORD64 Params[4]; + BOOL Far; + BOOL Virtual; + DWORD64 Reserved[3]; + KDHELP64 KdHelp; +} STACKFRAME64, *LPSTACKFRAME64; + typedef struct _SOURCEFILE { DWORD64 ModBase; PCHAR FileName; @@ -398,17 +430,33 @@ typedef BOOL (CALLBACK *PREAD_PROCESS_ME DWORD nSize, PDWORD lpNumberOfBytesRead ); +typedef BOOL (CALLBACK *PREAD_PROCESS_MEMORY_ROUTINE64)( + HANDLE hProcess, DWORD64 lpBaseAddress, PVOID lpBuffer, + DWORD nSize, LPDWORD lpNumberOfBytesRead +); + typedef PVOID (CALLBACK *PFUNCTION_TABLE_ACCESS_ROUTINE)( HANDLE hProcess, DWORD AddrBase ); +typedef PVOID (CALLBACK *PFUNCTION_TABLE_ACCESS_ROUTINE64)( + HANDLE hProcess, DWORD64 AddrBase +); + typedef DWORD (CALLBACK *PGET_MODULE_BASE_ROUTINE)( HANDLE hProcess, DWORD ReturnAddress); +typedef DWORD (CALLBACK *PGET_MODULE_BASE_ROUTINE64)( + HANDLE hProcess, DWORD64 ReturnAddress); + typedef DWORD (CALLBACK *PTRANSLATE_ADDRESS_ROUTINE)( HANDLE hProcess, HANDLE hThread, PADDRESS lpaddr ); +typedef DWORD (CALLBACK *PTRANSLATE_ADDRESS_ROUTINE64)( + HANDLE hProcess, HANDLE hThread, LPADDRESS64 lpaddr +); + /*********************************************************************** * Functions */ @@ -541,6 +589,14 @@ BOOL WINAPI StackWalk( PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine, PTRANSLATE_ADDRESS_ROUTINE TranslateAddress ); +BOOL WINAPI StackWalk64( + DWORD MachineType, HANDLE hProcess, HANDLE hThread, + LPSTACKFRAME64 StackFrame, PVOID ContextRecord, + PREAD_PROCESS_MEMORY_ROUTINE64 ReadMemoryRoutine, + PFUNCTION_TABLE_ACCESS_ROUTINE64 FunctionTableAccessRoutine, + PGET_MODULE_BASE_ROUTINE64 GetModuleBaseRoutine, + PTRANSLATE_ADDRESS_ROUTINE64 TranslateAddress +); BOOL WINAPI SymCleanup( HANDLE hProcess );

1 0

wine/dlls/wined3d device.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21468 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:03:05 Modified files: dlls/wined3d : device.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Stop reporting not having swapchain 0 as an error and add an internal variable instead of modifying a parameter. Patch: http://cvs.winehq.org/patch.py?id=21468 Old revision New revision Changes Path 1.100 1.101 +5 -4 wine/dlls/wined3d/device.c Index: wine/dlls/wined3d/device.c diff -u -p wine/dlls/wined3d/device.c:1.100 wine/dlls/wined3d/device.c:1.101 --- wine/dlls/wined3d/device.c:1.100 28 Nov 2005 11: 3: 5 -0000 +++ wine/dlls/wined3d/device.c 28 Nov 2005 11: 3: 5 -0000 @@ -1560,21 +1560,22 @@ UINT WINAPI IWineD3DDeviceImpl_GetN HRESULT WINAPI IWineD3DDeviceImpl_GetSwapChain(IWineD3DDevice *iface, UINT iSwapChain, IWineD3DSwapChain **pSwapChain) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; SwapChainList *swapchain; + int i = iSwapChain; HRESULT hr = D3DERR_INVALIDCALL; swapchain = This->swapchains; TRACE("(%p) : swapchain %d\n", This, iSwapChain); TRACE("(%p) Finding swapchain %d\n", This, iSwapChain); - while (iSwapChain > 0 && swapchain != NULL) { + while (i > 0 && swapchain != NULL) { swapchain = swapchain->next; - iSwapChain--; + --i; } - if (iSwapChain > 0 || swapchain == NULL) { + if (i > 0) { FIXME("(%p) Unable to find swapchain %d\n", This, iSwapChain); *pSwapChain = NULL; - } else { + } else if (swapchain != NULL) { /** TODO: move off to a linkesList implementation **/ *pSwapChain = swapchain->swapchain; IWineD3DSwapChain_AddRef(*pSwapChain);

1 0

wine/dlls/wined3d vertexdeclaration.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21467 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:02:40 Modified files: dlls/wined3d : vertexdeclaration.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Correct some errors in the way vertex declarations for directx 8 are parsed and add offset support. Patch: http://cvs.winehq.org/patch.py?id=21467 Old revision New revision Changes Path 1.12 1.13 +19 -14 wine/dlls/wined3d/vertexdeclaration.c Index: wine/dlls/wined3d/vertexdeclaration.c diff -u -p wine/dlls/wined3d/vertexdeclaration.c:1.12 wine/dlls/wined3d/vertexdeclaration.c:1.13 --- wine/dlls/wined3d/vertexdeclaration.c:1.12 28 Nov 2005 11: 2:40 -0000 +++ wine/dlls/wined3d/vertexdeclaration.c 28 Nov 2005 11: 2:40 -0000 @@ -270,25 +270,26 @@ IWineD3DVertexDeclarationImpl *This = (I DWORD tokenlen; DWORD tokentype; DWORD nTokens = 0; + DWORD offset = 0; D3DVERTEXELEMENT9 convTo9[128]; /* TODO: find out where rhw (or positionT) is for declaration8 */ Decl8to9Lookup decl8to9Lookup[MAX_D3DVSDE]; MAKE_LOOKUP(D3DVSDE_POSITION, D3DDECLUSAGE_POSITION, 0); MAKE_LOOKUP(D3DVSDE_POSITION2, D3DDECLUSAGE_POSITION, 1); MAKE_LOOKUP(D3DVSDE_BLENDWEIGHT, D3DDECLUSAGE_BLENDWEIGHT, 0); - MAKE_LOOKUP(D3DVSDE_BLENDINDICES, D3DDECLUSAGE_BLENDWEIGHT, 0); + MAKE_LOOKUP(D3DVSDE_BLENDINDICES, D3DDECLUSAGE_BLENDINDICES, 0); MAKE_LOOKUP(D3DVSDE_NORMAL, D3DDECLUSAGE_NORMAL, 0); MAKE_LOOKUP(D3DVSDE_NORMAL2, D3DDECLUSAGE_NORMAL, 1); MAKE_LOOKUP(D3DVSDE_DIFFUSE, D3DDECLUSAGE_COLOR, 0); MAKE_LOOKUP(D3DVSDE_SPECULAR, D3DDECLUSAGE_COLOR, 1); - MAKE_LOOKUP(D3DVSDE_TEXCOORD0, D3DDECLUSAGE_BLENDWEIGHT, 0); - MAKE_LOOKUP(D3DVSDE_TEXCOORD1, D3DDECLUSAGE_BLENDWEIGHT, 1); - MAKE_LOOKUP(D3DVSDE_TEXCOORD2, D3DDECLUSAGE_BLENDWEIGHT, 2); - MAKE_LOOKUP(D3DVSDE_TEXCOORD3, D3DDECLUSAGE_BLENDWEIGHT, 3); - MAKE_LOOKUP(D3DVSDE_TEXCOORD4, D3DDECLUSAGE_BLENDWEIGHT, 4); - MAKE_LOOKUP(D3DVSDE_TEXCOORD5, D3DDECLUSAGE_BLENDWEIGHT, 5); - MAKE_LOOKUP(D3DVSDE_TEXCOORD6, D3DDECLUSAGE_BLENDWEIGHT, 6); - MAKE_LOOKUP(D3DVSDE_TEXCOORD7, D3DDECLUSAGE_BLENDWEIGHT, 7); + MAKE_LOOKUP(D3DVSDE_TEXCOORD0, D3DDECLUSAGE_TEXCOORD, 0); + MAKE_LOOKUP(D3DVSDE_TEXCOORD1, D3DDECLUSAGE_TEXCOORD, 1); + MAKE_LOOKUP(D3DVSDE_TEXCOORD2, D3DDECLUSAGE_TEXCOORD, 2); + MAKE_LOOKUP(D3DVSDE_TEXCOORD3, D3DDECLUSAGE_TEXCOORD, 3); + MAKE_LOOKUP(D3DVSDE_TEXCOORD4, D3DDECLUSAGE_TEXCOORD, 4); + MAKE_LOOKUP(D3DVSDE_TEXCOORD5, D3DDECLUSAGE_TEXCOORD, 5); + MAKE_LOOKUP(D3DVSDE_TEXCOORD6, D3DDECLUSAGE_TEXCOORD, 6); + MAKE_LOOKUP(D3DVSDE_TEXCOORD7, D3DDECLUSAGE_TEXCOORD, 7); #undef MAKE_LOOKUP TRACE("(%p) : pDecl(%p)\n", This, pDecl); @@ -299,11 +300,12 @@ IWineD3DVertexDeclarationImpl *This = (I tokentype = ((token & D3DVSD_TOKENTYPEMASK) >> D3DVSD_TOKENTYPESHIFT); if (D3DVSD_TOKEN_STREAM == tokentype && 0 == (D3DVSD_STREAMTESSMASK & token)) { - /** - * how really works streams, - * in DolphinVS dx8 dsk sample they seems to decal reg numbers !!! - */ - stream = ((token & D3DVSD_STREAMNUMBERMASK) >> D3DVSD_STREAMNUMBERSHIFT); + /** + * how really works streams, + * in DolphinVS dx8 dsk sample they seems to decal reg numbers !!! + */ + stream = ((token & D3DVSD_STREAMNUMBERMASK) >> D3DVSD_STREAMNUMBERSHIFT); + offset = 0; } else if (D3DVSD_TOKEN_STREAMDATA == tokentype && 0 == (0x10000000 & tokentype)) { DWORD type = ((token & D3DVSD_DATATYPEMASK) >> D3DVSD_DATATYPESHIFT); @@ -314,6 +316,8 @@ IWineD3DVertexDeclarationImpl *This = (I convTo9[nTokens].Usage = decl8to9Lookup[reg].usage; convTo9[nTokens].UsageIndex = decl8to9Lookup[reg].usageIndex; convTo9[nTokens].Type = type; + convTo9[nTokens].Offset = offset; + offset += glTypeLookup[type][1] * glTypeLookup[type][4]; ++nTokens; }/* TODO: Constants. */ len += tokenlen; @@ -325,6 +329,7 @@ IWineD3DVertexDeclarationImpl *This = (I convTo9[nTokens].Stream = 0xFF; convTo9[nTokens].Type = D3DDECLTYPE_UNUSED; + ++nTokens; /* compute size */ This->declaration8Length = len * sizeof(DWORD);

1 0

wine/dlls/shell32 iconcache.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21466 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:02:32 Modified files: dlls/shell32 : iconcache.c Log message: Ge van Geldorp <gvg(a)reactos.org> Load shortcut icon by resource id instead of by icon index. Patch: http://cvs.winehq.org/patch.py?id=21466 Old revision New revision Changes Path 1.96 1.97 +4 -1 wine/dlls/shell32/iconcache.c Index: wine/dlls/shell32/iconcache.c diff -u -p wine/dlls/shell32/iconcache.c:1.96 wine/dlls/shell32/iconcache.c:1.97 --- wine/dlls/shell32/iconcache.c:1.96 28 Nov 2005 11: 2:32 -0000 +++ wine/dlls/shell32/iconcache.c 28 Nov 2005 11: 2:32 -0000 @@ -129,7 +129,10 @@ static HICON SIC_OverlayShortcutImage(HI /* search for the shortcut icon only once */ if (s_imgListIdx == -1) - s_imgListIdx = SIC_LoadOverlayIcon(29); /* icon index for IDI_SHELL_SHORTCUT */ + s_imgListIdx = SIC_LoadOverlayIcon(- IDI_SHELL_SHORTCUT); + /* FIXME should use icon index 29 instead of the + resource id, but not all icons are present yet + so we can't use icon indices */ if (s_imgListIdx != -1) {

1 0

wine/dlls/ole32 defaulthandler.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21465 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:02:25 Modified files: dlls/ole32 : defaulthandler.c Log message: Robert Shearman <rob(a)codeweavers.com> Call DefaultHandler_Stop if we fail to start the server running correctly and a few formatting fixes. Patch: http://cvs.winehq.org/patch.py?id=21465 Old revision New revision Changes Path 1.36 1.37 +11 -5 wine/dlls/ole32/defaulthandler.c Index: wine/dlls/ole32/defaulthandler.c diff -u -p wine/dlls/ole32/defaulthandler.c:1.36 wine/dlls/ole32/defaulthandler.c:1.37 --- wine/dlls/ole32/defaulthandler.c:1.36 28 Nov 2005 11: 2:25 -0000 +++ wine/dlls/ole32/defaulthandler.c 28 Nov 2005 11: 2:25 -0000 @@ -1254,24 +1254,29 @@ static HRESULT WINAPI DefaultHandler_Run if (This->pOleDelegate) return S_OK; - hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_LOCAL_SERVER, &IID_IOleObject, (void **)&This->pOleDelegate); + hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_LOCAL_SERVER, + &IID_IOleObject, (void **)&This->pOleDelegate); if (FAILED(hr)) return hr; - hr = IOleObject_Advise(This->pOleDelegate, (IAdviseSink *)&This->lpvtblIAdviseSink, &This->dwAdvConn); + hr = IOleObject_Advise(This->pOleDelegate, + (IAdviseSink *)&This->lpvtblIAdviseSink, + &This->dwAdvConn); if (SUCCEEDED(hr) && This->clientSite) hr = IOleObject_SetClientSite(This->pOleDelegate, This->clientSite); if (SUCCEEDED(hr)) { - IOleObject_QueryInterface(This->pOleDelegate, &IID_IPersistStorage, (void **)&This->pPSDelegate); + IOleObject_QueryInterface(This->pOleDelegate, &IID_IPersistStorage, + (void **)&This->pPSDelegate); if (This->pPSDelegate) hr = IPersistStorage_InitNew(This->pPSDelegate, NULL); } if (SUCCEEDED(hr) && This->containerApp) - hr = IOleObject_SetHostNames(This->pOleDelegate, This->containerApp, This->containerObj); + hr = IOleObject_SetHostNames(This->pOleDelegate, This->containerApp, + This->containerObj); /* FIXME: do more stuff here: * - IOleObject_GetMiscStatus @@ -1279,7 +1284,8 @@ static HRESULT WINAPI DefaultHandler_Run * - IOleCache_OnRun */ - /* FIXME: if we failed, Close the object */ + if (FAILED(hr)) + DefaultHandler_Stop(This); return hr; }

1 0

wine/dlls/rpcrt4 ndr_marshall.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21464 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:02:18 Modified files: dlls/rpcrt4 : ndr_marshall.c Log message: Robert Shearman <rob(a)codeweavers.com> Fix NdrConformantArrayBufferSize to include the size of the conformance value. Make NdrConformantArrayMemorySize do something more useful, like actually return the required memory. Conformance offset can be negative and should only be two bytes. Patch: http://cvs.winehq.org/patch.py?id=21464 Old revision New revision Changes Path 1.31 1.32 +14 -11 wine/dlls/rpcrt4/ndr_marshall.c Index: wine/dlls/rpcrt4/ndr_marshall.c diff -u -p wine/dlls/rpcrt4/ndr_marshall.c:1.31 wine/dlls/rpcrt4/ndr_marshall.c:1.32 --- wine/dlls/rpcrt4/ndr_marshall.c:1.31 28 Nov 2005 11: 2:18 -0000 +++ wine/dlls/rpcrt4/ndr_marshall.c 28 Nov 2005 11: 2:18 -0000 @@ -290,7 +290,7 @@ PFORMAT_STRING ComputeConformance(MIDL_S PFORMAT_STRING pFormat, ULONG_PTR def) { BYTE dtype = pFormat[0] & 0xf; - DWORD ofs = (DWORD)pFormat[2] | ((DWORD)pFormat[3] << 8); + short ofs = *(short *)&pFormat[2]; LPVOID ptr = NULL; DWORD data = 0; @@ -302,15 +302,15 @@ PFORMAT_STRING ComputeConformance(MIDL_S switch (pFormat[0] & 0xf0) { case RPC_FC_NORMAL_CONFORMANCE: - TRACE("normal conformance, ofs=%ld\n", ofs); + TRACE("normal conformance, ofs=%d\n", ofs); ptr = pMemory + ofs; break; case RPC_FC_POINTER_CONFORMANCE: - TRACE("pointer conformance, ofs=%ld\n", ofs); + TRACE("pointer conformance, ofs=%d\n", ofs); ptr = pStubMsg->Memory + ofs; break; case RPC_FC_TOP_LEVEL_CONFORMANCE: - TRACE("toplevel conformance, ofs=%ld\n", ofs); + TRACE("toplevel conformance, ofs=%d\n", ofs); if (pStubMsg->StackTop) { ptr = pStubMsg->StackTop + ofs; } @@ -325,7 +325,7 @@ PFORMAT_STRING ComputeConformance(MIDL_S pStubMsg->MaxCount = data; goto finish_conf; case RPC_FC_TOP_LEVEL_MULTID_CONFORMANCE: - FIXME("toplevel multidimensional conformance, ofs=%ld\n", ofs); + FIXME("toplevel multidimensional conformance, ofs=%d\n", ofs); if (pStubMsg->StackTop) { ptr = pStubMsg->StackTop + ofs; } @@ -1863,7 +1863,8 @@ void WINAPI NdrConformantArrayBufferSize pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); size = pStubMsg->MaxCount; - pStubMsg->BufferLength += size*esize; + /* conformance value plus array */ + pStubMsg->BufferLength += sizeof(DWORD) + size*esize; EmbeddedPointerBufferSize(pStubMsg, pMemory, pFormat); } @@ -1874,16 +1875,18 @@ void WINAPI NdrConformantArrayBufferSize unsigned long WINAPI NdrConformantArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - DWORD size = 0; - FIXME("(%p,%p): stub\n", pStubMsg, pFormat); + DWORD size = 0, esize = *(const WORD*)(pFormat+2); + unsigned char *buffer; + + TRACE("(%p,%p)\n", pStubMsg, pFormat); if (pFormat[0] != RPC_FC_CARRAY) FIXME("format=%d\n", pFormat[0]); + buffer = pStubMsg->Buffer; pFormat = ReadConformance(pStubMsg, pFormat+4); + pStubMsg->Buffer = buffer; size = pStubMsg->MaxCount; - EmbeddedPointerMemorySize(pStubMsg, pFormat); - - return 0; + return size*esize; } /***********************************************************************

1 0

wine/dlls/msvidc32 Makefile.in msvideo1.c msvi ...
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21463 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:02:08 Modified files: dlls/msvidc32 : Makefile.in msvideo1.c Added files: dlls/msvidc32 : msvidc32_En.rc msvidc32_private.h rsrc.rc Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Add support for ICM_GETINFO in msvidc32 codec (based on msrle32). Patch: http://cvs.winehq.org/patch.py?id=21463 Old revision New revision Changes Path 1.3 1.4 +3 -1 wine/dlls/msvidc32/Makefile.in 1.5 1.6 +46 -4 wine/dlls/msvidc32/msvideo1.c Added 1.1 +0 -0 wine/dlls/msvidc32/msvidc32_En.rc Added 1.1 +0 -0 wine/dlls/msvidc32/msvidc32_private.h Added 1.1 +0 -0 wine/dlls/msvidc32/rsrc.rc

1 0

wine/dlls/iccvid Makefile.in iccvid.c iccvid_E ...
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21462 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:01:56 Modified files: dlls/iccvid : Makefile.in iccvid.c Added files: dlls/iccvid : iccvid_En.rc iccvid_private.h rsrc.rc Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Add support for ICM_GETINFO in iccvid codec (based on msrle32). Patch: http://cvs.winehq.org/patch.py?id=21462 Old revision New revision Changes Path 1.3 1.4 +3 -1 wine/dlls/iccvid/Makefile.in 1.7 1.8 +43 -2 wine/dlls/iccvid/iccvid.c Added 1.1 +0 -0 wine/dlls/iccvid/iccvid_En.rc Added 1.1 +0 -0 wine/dlls/iccvid/iccvid_private.h Added 1.1 +0 -0 wine/dlls/iccvid/rsrc.rc Index: wine/dlls/iccvid/Makefile.in diff -u -p wine/dlls/iccvid/Makefile.in:1.3 wine/dlls/iccvid/Makefile.in:1.4 --- wine/dlls/iccvid/Makefile.in:1.3 28 Nov 2005 11: 1:56 -0000 +++ wine/dlls/iccvid/Makefile.in 28 Nov 2005 11: 1:56 -0000 @@ -3,11 +3,13 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = iccvid.dll -IMPORTS = kernel32 +IMPORTS = user32 kernel32 C_SRCS = \ iccvid.c +RC_SRCS = rsrc.rc + @MAKE_DLL_RULES@ ### Dependencies: Index: wine/dlls/iccvid/iccvid.c diff -u -p wine/dlls/iccvid/iccvid.c:1.7 wine/dlls/iccvid/iccvid.c:1.8 --- wine/dlls/iccvid/iccvid.c:1.7 28 Nov 2005 11: 1:56 -0000 +++ wine/dlls/iccvid/iccvid.c 28 Nov 2005 11: 1:56 -0000 @@ -47,13 +47,15 @@ #include "winuser.h" #include "commdlg.h" #include "vfw.h" - #include "mmsystem.h" +#include "iccvid_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(iccvid); +static HINSTANCE ICCVID_hModule; + #define ICCVID_MAGIC mmioFOURCC('c', 'v', 'i', 'd') #define DBUG 0 @@ -910,8 +912,27 @@ static LRESULT ICCVID_Close( ICCVID_Info return 1; } +static LRESULT ICCVID_GetInfo( ICCVID_Info *info, ICINFO *icinfo, DWORD dwSize ) +{ + if (!icinfo) return sizeof(ICINFO); + if (dwSize < sizeof(ICINFO)) return 0; + + icinfo->dwSize = sizeof(ICINFO); + icinfo->fccType = ICTYPE_VIDEO; + icinfo->fccHandler = info ? info->dwMagic : ICCVID_MAGIC; + icinfo->dwFlags = 0; + icinfo->dwVersion = 0x00010000; /* Version 1.0 build 0 */ + icinfo->dwVersionICM = 0x01040000; /* Version 1.4 build 0 */ + + LoadStringW(ICCVID_hModule, IDS_NAME, icinfo->szName, sizeof(icinfo->szName)/sizeof(WCHAR)); + LoadStringW(ICCVID_hModule, IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)/sizeof(WCHAR)); + /* msvfw32 will fill icinfo->szDriver for us */ + + return sizeof(ICINFO); +} + LRESULT WINAPI ICCVID_DriverProc( DWORD dwDriverId, HDRVR hdrvr, UINT msg, - LONG lParam1, LONG lParam2) + LPARAM lParam1, LPARAM lParam2) { ICCVID_Info *info = (ICCVID_Info *) dwDriverId; @@ -939,6 +960,9 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD } return (LRESULT) info; + case ICM_GETINFO: + return ICCVID_GetInfo( info, (ICINFO *)lParam1, (DWORD)lParam2 ); + case ICM_DECOMPRESS_QUERY: return ICCVID_DecompressQuery( info, (LPBITMAPINFO) lParam1, (LPBITMAPINFO) lParam2 ); @@ -963,3 +987,20 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD } return 0; } + +BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) +{ + TRACE("(%p,%ld,%p)\n", hModule, dwReason, lpReserved); + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hModule); + ICCVID_hModule = hModule; + break; + + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} Index: wine/dlls/iccvid/iccvid_En.rc diff -u -p /dev/null wine/dlls/iccvid/iccvid_En.rc:1.1 --- /dev/null 28 Nov 2005 11: 1:56 -0000 +++ wine/dlls/iccvid/iccvid_En.rc 28 Nov 2005 11: 1:56 -0000 @@ -0,0 +1,25 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Cinepak Video codec" + IDS_DESCRIPTION "Cinepak Video codec" +} Index: wine/dlls/iccvid/iccvid_private.h diff -u -p /dev/null wine/dlls/iccvid/iccvid_private.h:1.1 --- /dev/null 28 Nov 2005 11: 1:56 -0000 +++ wine/dlls/iccvid/iccvid_private.h 28 Nov 2005 11: 1:56 -0000 @@ -0,0 +1,25 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __ICCVID_PRIVATE_H +#define __ICCVID_PRIVATE_H + +#define IDS_NAME 100 +#define IDS_DESCRIPTION 101 + +#endif /* __ICCVID_PRIVATE_H */ Index: wine/dlls/iccvid/rsrc.rc diff -u -p /dev/null wine/dlls/iccvid/rsrc.rc:1.1 --- /dev/null 28 Nov 2005 11: 1:56 -0000 +++ wine/dlls/iccvid/rsrc.rc 28 Nov 2005 11: 1:56 -0000 @@ -0,0 +1,22 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "iccvid_private.h" + +#include "iccvid_En.rc"

1 0

wine/dlls msrle32/msrle32.c msvideo/msvideo_main.c
by Alexandre Julliard Nov. 28, 2005

Nov. 28, 2005

ChangeSet ID: 21461 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/28 05:01:46 Modified files: dlls/msrle32 : msrle32.c dlls/msvideo : msvideo_main.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Fix several bugs in msrle32 preventing it to load. Remove a hack in ICOpen compensating a bug in msrle32. Use MSVFW32_hModule directly in ICCompressorChoose, and avoid a convoluted GWLP_HINSTANCE hack. Patch: http://cvs.winehq.org/patch.py?id=21461 Old revision New revision Changes Path 1.14 1.15 +4 -19 wine/dlls/msrle32/msrle32.c 1.68 1.69 +3 -16 wine/dlls/msvideo/msvideo_main.c Index: wine/dlls/msrle32/msrle32.c diff -u -p wine/dlls/msrle32/msrle32.c:1.14 wine/dlls/msrle32/msrle32.c:1.15 --- wine/dlls/msrle32/msrle32.c:1.14 28 Nov 2005 11: 1:46 -0000 +++ wine/dlls/msrle32/msrle32.c 28 Nov 2005 11: 1:46 -0000 @@ -58,7 +58,6 @@ inline WORD Intensity(RGBQUAD clr) /* utility functions */ static BOOL isSupportedDIB(LPCBITMAPINFOHEADER lpbi); static BOOL isSupportedMRLE(LPCBITMAPINFOHEADER lpbi); -static void LoadWideString(UINT id, LPWSTR str, INT len); static BYTE MSRLE32_GetNearestPaletteIndex(UINT count, const RGBQUAD *clrs, RGBQUAD clr); /* compression functions */ @@ -98,14 +97,6 @@ static LRESULT DecompressGetPalette(Code /*****************************************************************************/ -static void LoadWideString(UINT id, LPWSTR str, INT len) -{ - char szTemp[80]; - - LoadStringA(MSRLE32_hModule, id, szTemp, sizeof(szTemp)); - MultiByteToWideChar(CP_ACP, 0, szTemp, -1, str, len); -} - static BOOL isSupportedMRLE(LPCBITMAPINFOHEADER lpbi) { /* pre-conditions */ @@ -1113,9 +1104,6 @@ static CodecInfo* Open(LPICOPEN icinfo) icinfo->fccHandler, (char*)&icinfo->fccHandler, icinfo->dwVersion,icinfo->dwFlags); - if (icinfo->fccType != ICTYPE_VIDEO) - return NULL; - switch (icinfo->fccHandler) { case FOURCC_RLE: case FOURCC_RLE4: @@ -1176,14 +1164,14 @@ static LRESULT GetInfo(CodecInfo *pi, IC return 0; icinfo->dwSize = sizeof(ICINFO); - icinfo->fccType = streamtypeVIDEO; + icinfo->fccType = ICTYPE_VIDEO; icinfo->fccHandler = (pi != NULL ? pi->fccHandler : FOURCC_MRLE); icinfo->dwFlags = VIDCF_QUALITY | VIDCF_TEMPORAL | VIDCF_CRUNCH | VIDCF_FASTTEMPORALC; icinfo->dwVersion = MSRLE32_VERSION; icinfo->dwVersionICM = 0x01040000; /* Version 1.4 build 0 */ - LoadWideString(IDS_NAME, icinfo->szName, sizeof(icinfo->szName)); - LoadWideString(IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)); + LoadStringW(MSRLE32_hModule, IDS_NAME, icinfo->szName, sizeof(icinfo->szName)/sizeof(WCHAR)); + LoadStringW(MSRLE32_hModule, IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)/sizeof(WCHAR)); return sizeof(ICINFO); } @@ -1796,9 +1784,6 @@ LRESULT CALLBACK MSRLE32_DriverProc(DWOR case DRV_LOAD: return DRVCNF_OK; case DRV_OPEN: - if (lParam2 == 0) - return (LRESULT)0xFFFF0000; - else return (LRESULT)Open((ICOPEN*)lParam2); case DRV_CLOSE: if (dwDrvID != 0xFFFF0000 && (LPVOID)dwDrvID != NULL) @@ -1910,7 +1895,7 @@ BOOL WINAPI DllMain(HINSTANCE hModule, D case DLL_PROCESS_DETACH: break; - }; + } return TRUE; } Index: wine/dlls/msvideo/msvideo_main.c diff -u -p wine/dlls/msvideo/msvideo_main.c:1.68 wine/dlls/msvideo/msvideo_main.c:1.69 --- wine/dlls/msvideo/msvideo_main.c:1.68 28 Nov 2005 11: 1:46 -0000 +++ wine/dlls/msvideo/msvideo_main.c 28 Nov 2005 11: 1:46 -0000 @@ -139,6 +139,7 @@ static BOOL enum_drivers(DWORD fccType, { for (s = buf; *s; s += strlen(s) + 1) { + TRACE("got %s\n", s); if (strncasecmp(s, fccTypeStr, 5) || s[9] != '=') continue; if ((result = handler(s, cnt++, param))) break; } @@ -349,20 +350,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD f hdrv = OpenDriver(codecname, drv32W, (LPARAM)&icopen); if (!hdrv) - { - if (fccType == streamtypeVIDEO) - { - codecname[0] = 'v'; - codecname[1] = 'i'; - codecname[2] = 'd'; - codecname[3] = 'c'; - - fccType = ICTYPE_VIDEO; - hdrv = OpenDriver(codecname, drv32W, (LPARAM)&icopen); - } - if (!hdrv) - return 0; - } + return 0; } else { /* The driver has been registered at runtime with its name */ hdrv = OpenDriver(driver->name, NULL, (LPARAM)&icopen); @@ -767,8 +755,7 @@ static INT_PTR CALLBACK icm_choose_compr if (choose_comp->title) SetWindowTextA(hdlg, choose_comp->title); - LoadStringW((HINSTANCE)GetWindowLongPtrW(hdlg, GWLP_HINSTANCE), - IDS_FULLFRAMES, buf, 128); + LoadStringW(MSVFW32_hModule, IDS_FULLFRAMES, buf, 128); SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_ADDSTRING, 0, (LPARAM)buf); enum_compressors(GetDlgItem(hdlg, IDC_COMP_LIST));

1 0