November 2007 - Wine-commits

Rob Shearman : ole32: Store the dispatch parameters in the message state structure to allow them to be initialised earlier in the sequence of IRpcChannelBuffer calls .
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 6262230a4b51f1541987c374e9d513c5ab73a1dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6262230a4b51f1541987c374e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 26 22:50:32 2007 +0000 ole32: Store the dispatch parameters in the message state structure to allow them to be initialised earlier in the sequence of IRpcChannelBuffer calls. --- dlls/ole32/rpc.c | 47 ++++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 57570c1..d4e6bfd 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -127,6 +127,9 @@ struct message_state RPC_BINDING_HANDLE binding_handle; ULONG prefix_data_len; SChannelHookCallInfo channel_hook_info; + + /* client only */ + struct dispatch_params params; }; typedef struct @@ -600,6 +603,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, message_state->channel_hook_info.dwServerPid = This->server_pid; message_state->channel_hook_info.iMethod = msg->ProcNum; message_state->channel_hook_info.pObject = NULL; /* only present on server-side */ + memset(&message_state->params, 0, sizeof(message_state->params)); extensions_size = ChannelHooks_ClientGetSize(&message_state->channel_hook_info, &channel_hook_data, &channel_hook_count, &extension_count); @@ -731,7 +735,6 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg; RPC_STATUS status; DWORD index; - struct dispatch_params *params; APARTMENT *apt = NULL; IPID ipid; struct message_state *message_state; @@ -762,18 +765,15 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac return RPC_E_CANTCALLOUT_ININPUTSYNCCALL; } - params = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*params)); - if (!params) return E_OUTOFMEMORY; - message_state = (struct message_state *)msg->Handle; /* restore the binding handle and the real start of data */ msg->Handle = message_state->binding_handle; msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; msg->BufferLength += message_state->prefix_data_len; - params->msg = olemsg; - params->status = RPC_S_OK; - params->hr = S_OK; + message_state->params.msg = olemsg; + message_state->params.status = RPC_S_OK; + message_state->params.hr = S_OK; /* Note: this is an optimization in the Microsoft OLE runtime that we need * to copy, as shown by the test_no_couninitialize_client test. without @@ -783,14 +783,17 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac * from DllMain */ RpcBindingInqObject(message_state->binding_handle, &ipid); - hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan, - &params->iid, &params->iface); - params->handle = ClientRpcChannelBuffer_GetEventHandle(This); + hr = ipid_get_dispatch_params(&ipid, &apt, &message_state->params.stub, + &message_state->params.chan, + &message_state->params.iid, + &message_state->params.iface); + message_state->params.handle = ClientRpcChannelBuffer_GetEventHandle(This); if ((hr == S_OK) && !apt->multi_threaded) { TRACE("Calling apartment thread 0x%08x...\n", apt->tid); - if (!PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params)) + if (!PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, + (LPARAM)&message_state->params)) { ERR("PostMessage failed with error %u\n", GetLastError()); hr = HRESULT_FROM_WIN32(GetLastError()); @@ -802,10 +805,10 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac { /* otherwise, we go via RPC runtime so the stub and channel aren't * needed here */ - IRpcStubBuffer_Release(params->stub); - params->stub = NULL; - IRpcChannelBuffer_Release(params->chan); - params->chan = NULL; + IRpcStubBuffer_Release(message_state->params.stub); + message_state->params.stub = NULL; + IRpcChannelBuffer_Release(message_state->params.chan); + message_state->params.chan = NULL; } /* we use a separate thread here because we need to be able to @@ -814,7 +817,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac * and re-enter this STA from an incoming server thread will * deadlock. InstallShield is an example of that. */ - if (!QueueUserWorkItem(rpc_sendreceive_thread, params, WT_EXECUTEDEFAULT)) + if (!QueueUserWorkItem(rpc_sendreceive_thread, &message_state->params, WT_EXECUTEDEFAULT)) { ERR("QueueUserWorkItem failed with error %u\n", GetLastError()); hr = E_UNEXPECTED; @@ -826,22 +829,20 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac if (hr == S_OK) { - if (WaitForSingleObject(params->handle, 0)) + if (WaitForSingleObject(message_state->params.handle, 0)) { COM_CurrentInfo()->pending_call_count_client++; - hr = CoWaitForMultipleHandles(0, INFINITE, 1, &params->handle, &index); + hr = CoWaitForMultipleHandles(0, INFINITE, 1, &message_state->params.handle, &index); COM_CurrentInfo()->pending_call_count_client--; } } - ClientRpcChannelBuffer_ReleaseEventHandle(This, params->handle); + ClientRpcChannelBuffer_ReleaseEventHandle(This, message_state->params.handle); /* for WM shortcut, faults are returned in params->hr */ if (hr == S_OK) - hrFault = params->hr; + hrFault = message_state->params.hr; - status = params->status; - HeapFree(GetProcessHeap(), 0, params); - params = NULL; + status = message_state->params.status; orpcthat.flags = ORPCF_NULL; orpcthat.extensions = NULL;

1 0

Rob Shearman : ole32: Clean up properly in ClientRpcChannelBuffer_SendReceive in the case where PostMessageW fails .
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: ddf59f50f77448f7ba2d240e93eb3e8ed535c1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf59f50f77448f7ba2d240e9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 26 22:50:48 2007 +0000 ole32: Clean up properly in ClientRpcChannelBuffer_SendReceive in the case where PostMessageW fails. --- dlls/ole32/rpc.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index d4e6bfd..40330d4 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -796,6 +796,14 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac (LPARAM)&message_state->params)) { ERR("PostMessage failed with error %u\n", GetLastError()); + + IRpcStubBuffer_Release(message_state->params.stub); + message_state->params.stub = NULL; + IRpcChannelBuffer_Release(message_state->params.chan); + message_state->params.chan = NULL; + /* Note: message_state->params.iface doesn't have a reference and + * so doesn't need to be released */ + hr = HRESULT_FROM_WIN32(GetLastError()); } }

1 0

Rob Shearman : ole32: Add tests for WdtpInterfacePointer_* functions.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: c111c2d6859a18331b361aedd6cd5460ed54ef58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c111c2d6859a18331b361aedd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 26 22:52:07 2007 +0000 ole32: Add tests for WdtpInterfacePointer_* functions. Add stubs for these so that the tests link. --- dlls/ole32/ole32.spec | 8 ++-- dlls/ole32/tests/usrmarshal.c | 113 +++++++++++++++++++++++++++++++++++++++++ dlls/ole32/usrmarshal.c | 94 ++++++++++++++++++++++++++++++++++ 3 files changed, 211 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 1643484..25a1955 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -267,10 +267,10 @@ @ stub UtConvertDvtd32toDvtd16 @ stub UtGetDvtd16Info @ stub UtGetDvtd32Info -@ stub WdtpInterfacePointer_UserFree -@ stub WdtpInterfacePointer_UserMarshal -@ stub WdtpInterfacePointer_UserSize -@ stub WdtpInterfacePointer_UserUnmarshal +@ stdcall WdtpInterfacePointer_UserFree(ptr) +@ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr) +@ stdcall WdtpInterfacePointer_UserSize(ptr long ptr long ptr) +@ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) @ stdcall WriteClassStg(ptr ptr) @ stdcall WriteClassStm(ptr ptr) @ stdcall WriteFmtUserTypeStg(ptr long ptr) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 28c6687..281f9a0 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -366,6 +366,118 @@ static void test_marshal_HMETAFILEPICT(void) HMETAFILEPICT_UserFree(&flags, &hmfp2); } +static HRESULT WINAPI Test_IUnknown_QueryInterface( + LPUNKNOWN iface, + REFIID riid, + LPVOID *ppvObj) +{ + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown)) + { + *ppvObj = (LPVOID)iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *ppvObj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Test_IUnknown_AddRef(LPUNKNOWN iface) +{ + return 2; /* non-heap-based object */ +} + +static ULONG WINAPI Test_IUnknown_Release(LPUNKNOWN iface) +{ + return 1; /* non-heap-based object */ +} + +static const IUnknownVtbl TestUnknown_Vtbl = +{ + Test_IUnknown_QueryInterface, + Test_IUnknown_AddRef, + Test_IUnknown_Release, +}; + +static IUnknown Test_Unknown = { &TestUnknown_Vtbl }; + +ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *, ULONG, ULONG, IUnknown *, REFIID); +unsigned char * __RPC_USER WdtpInterfacePointer_UserMarshal(ULONG *, ULONG, unsigned char *, IUnknown *, REFIID); +unsigned char * __RPC_USER WdtpInterfacePointer_UserUnmarshal(ULONG *, unsigned char *, IUnknown **, REFIID); +void __RPC_USER WdtpInterfacePointer_UserFree(IUnknown *); + +static void test_marshal_WdtpInterfacePointer(void) +{ + unsigned char *buffer, *buffer_end; + ULONG size; + MIDL_STUB_MESSAGE stubmsg; + USER_MARSHAL_CB umcb; + IUnknown *unk; + IUnknown *unk2; + unsigned char *wireip; + const IID *iid; + + memset(&stubmsg, 0xcc, sizeof(stubmsg)); + stubmsg.dwDestContext = MSHCTX_INPROC; + stubmsg.pvDestContext = NULL; + + memset(&umcb, 0xcc, sizeof(umcb)); + umcb.Flags = MAKELONG(MSHCTX_INPROC, NDR_LOCAL_DATA_REPRESENTATION); + umcb.pStubMsg = &stubmsg; + + /* shows that the WdtpInterfacePointer functions don't marshal anything for + * NULL pointers, so code using these functions must handle that case + * itself */ + unk = NULL; + size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, unk, &IID_IUnknown); + ok(size == 0, "size should be 0 bytes, not %d\n", size); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, buffer, unk, &IID_IUnknown); + wireip = buffer; + HeapFree(GetProcessHeap(), 0, buffer); + + unk = &Test_Unknown; + size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, unk, &IID_IUnknown); + todo_wine + ok(size == 108, "size should be 108 bytes, not %d\n", size); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, buffer, unk, &IID_IUnknown); + wireip = buffer; + if (size >= 28) + { + ok(*(DWORD *)wireip == 0x44, "wireip + 0x0 should be 0x4c instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 0x44, "wireip + 0x8 should be 0x4c instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 0x574f454d /* 'MEOW' */, "wireip + 0xc should be 0x574f454d instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 0x1, "wireip + 0x10 should be 0x1 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + iid = (const IID *)buffer; + ok(!IsEqualIID(iid, &IID_IUnknown), + "wireip + 0x14 should be IID_IUnknown instead of {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + iid->Data1, iid->Data2, iid->Data3, + iid->Data4[0], iid->Data4[1], iid->Data4[2], iid->Data4[3], + iid->Data4[4], iid->Data4[5], iid->Data4[6], iid->Data4[7]); + ok(*(DWORD *)wireip == 0, "wireip + 0x14 should be 0 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(IID); + ok(*(DWORD *)wireip == 0, "wireip + 0x20 should be 0 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 5, "wireip + 0x24 should be 5 instead of %d\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + /* the rest is dynamic so can't really be tested */ + } + + unk2 = NULL; + WdtpInterfacePointer_UserUnmarshal(&umcb.Flags, buffer, &unk2, &IID_IUnknown); + todo_wine + ok(unk2 != NULL, "IUnknown object didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + WdtpInterfacePointer_UserFree(unk2); +} + START_TEST(usrmarshal) { CoInitialize(NULL); @@ -376,6 +488,7 @@ START_TEST(usrmarshal) test_marshal_HENHMETAFILE(); test_marshal_HMETAFILE(); test_marshal_HMETAFILEPICT(); + test_marshal_WdtpInterfacePointer(); CoUninitialize(); } diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index a1e1d89..c25b86a 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1434,6 +1434,100 @@ void __RPC_USER HMETAFILEPICT_UserFree(ULONG *pFlags, HMETAFILEPICT *phMfp) } /****************************************************************************** + * WdtpInterfacePointer_UserSize [OLE32.@] + * + * Calculates the buffer size required to marshal an interface pointer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * RealFlags [I] The MSHCTX to use when marshaling the interface. + * punk [I] Interface pointer to size. + * StartingSize [I] Starting size of the buffer. This value is added on to + * the buffer size required for the clip format. + * riid [I] ID of interface to size. + * + * RETURNS + * The buffer size required to marshal an interface pointer plus the starting size. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + */ +ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *pFlags, ULONG RealFlags, IUnknown *punk, ULONG StartingSize, REFIID riid) +{ + FIXME("(%s, 0%x, %p, %d, %s): stub\n", debugstr_user_flags(pFlags), RealFlags, punk, StartingSize, debugstr_guid(riid)); + return 0; +} + +/****************************************************************************** + * WdtpInterfacePointer_UserMarshal [OLE32.@] + * + * Marshals an interface pointer into a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * RealFlags [I] The MSHCTX to use when marshaling the interface. + * pBuffer [I] Buffer to marshal the clip format into. + * punk [I] Interface pointer to marshal. + * riid [I] ID of interface to marshal. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + */ +unsigned char * WINAPI WdtpInterfacePointer_UserMarshal(ULONG *pFlags, ULONG RealFlags, unsigned char *pBuffer, IUnknown *punk, REFIID riid) +{ + FIXME("(%s, 0x%x, %p, &%p, %s): stub\n", debugstr_user_flags(pFlags), RealFlags, pBuffer, punk, debugstr_guid(riid)); + return NULL; +} + +/****************************************************************************** + * WdtpInterfacePointer_UserUnmarshal [OLE32.@] + * + * Unmarshals an interface pointer from a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format from. + * ppunk [I/O] Address that receives the unmarshaled interface pointer. + * riid [I] ID of interface to unmarshal. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to an ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is an ULONG. + */ +unsigned char * WINAPI WdtpInterfacePointer_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, IUnknown **ppunk, REFIID riid) +{ + FIXME("(%s, %p, %p, %s): stub\n", debugstr_user_flags(pFlags), pBuffer, ppunk, debugstr_guid(riid)); + return NULL; +} + +/****************************************************************************** + * WdtpInterfacePointer_UserFree [OLE32.@] + * + * Frees an unmarshaled interface pointer. + * + * PARAMS + * punk [I] Interface pointer to free. + * + * RETURNS + * Nothing. + */ +void WINAPI WdtpInterfacePointer_UserFree(IUnknown *punk) +{ + FIXME("(%p): stub\n", punk); +} + +/****************************************************************************** * STGMEDIUM_UserSize [OLE32.@] * * Calculates the buffer size required to marshal an STGMEDIUM.

1 0

Huw Davies : inetcomm: Store a header's parameters as a list.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 0bcd30773e95f60998b8d642cbfe70a0cf7814a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bcd30773e95f60998b8d642c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 26 12:03:08 2007 +0000 inetcomm: Store a header's parameters as a list. --- dlls/inetcomm/mimeole.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 8e4df70..71c621f 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -79,8 +79,16 @@ static const property_t default_props[] = typedef struct { struct list entry; + char *name; + char *value; +} param_t; + +typedef struct +{ + struct list entry; const property_t *prop; PROPVARIANT value; + struct list params; } header_t; typedef struct MimeBody @@ -223,6 +231,7 @@ static header_t *read_prop(MimeBody *body, char **ptr) ret = HeapAlloc(GetProcessHeap(), 0, sizeof(*ret)); ret->prop = prop; PropVariantInit(&ret->value); + list_init(&ret->params); *ptr = colon + 1; return ret; @@ -253,6 +262,57 @@ static void unfold_header(char *header, int len) *(start - 1) = '\0'; } +static void add_param(header_t *header, const char *p) +{ + const char *key = p, *value, *cp = p; + param_t *param; + char *name; + + TRACE("got param %s\n", p); + + while (*key == ' ' || *key == '\t' ) key++; + + cp = strchr(key, '='); + if(!cp) + { + WARN("malformed parameter - skipping\n"); + return; + } + + name = HeapAlloc(GetProcessHeap(), 0, cp - key + 1); + memcpy(name, key, cp - key); + name[cp - key] = '\0'; + + value = cp + 1; + + param = HeapAlloc(GetProcessHeap(), 0, sizeof(*param)); + param->name = name; + param->value = strdupA(value); + list_add_tail(&header->params, &param->entry); +} + +static void split_params(header_t *header, char *value) +{ + char *cp = value, *start = value; + int in_quote = 0; + int done_value = 0; + + while(*cp) + { + if(!in_quote && *cp == ';') + { + *cp = '\0'; + if(done_value) add_param(header, start); + done_value = 1; + start = cp + 1; + } + else if(*cp == '"') + in_quote = !in_quote; + cp++; + } + if(done_value) add_param(header, start); +} + static void read_value(header_t *header, char **cur) { char *end = *cur, *value; @@ -271,6 +331,12 @@ static void read_value(header_t *header, char **cur) unfold_header(value, len); TRACE("value %s\n", debugstr_a(value)); + if(header->prop->flags & MPF_HASPARAMS) + { + split_params(header, value); + TRACE("value w/o params %s\n", debugstr_a(value)); + } + header->value.vt = VT_LPSTR; header->value.pszVal = value; @@ -297,6 +363,19 @@ static HRESULT parse_headers(MimeBody *body, IStream *stm) return hr; } +static void emptry_param_list(struct list *list) +{ + param_t *param, *cursor2; + + LIST_FOR_EACH_ENTRY_SAFE(param, cursor2, list, param_t, entry) + { + list_remove(&param->entry); + HeapFree(GetProcessHeap(), 0, param->name); + HeapFree(GetProcessHeap(), 0, param->value); + HeapFree(GetProcessHeap(), 0, param); + } +} + static void empty_header_list(struct list *list) { header_t *header, *cursor2; @@ -305,6 +384,7 @@ static void empty_header_list(struct list *list) { list_remove(&header->entry); PropVariantClear(&header->value); + emptry_param_list(&header->params); HeapFree(GetProcessHeap(), 0, header); } }

1 0

Huw Davies : inetcomm: Implement IMimeBody:IsContentType.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 19cb4bcd3640694c8901622d343f47bb08ec99f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19cb4bcd3640694c8901622d3… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 26 12:03:35 2007 +0000 inetcomm: Implement IMimeBody:IsContentType. --- dlls/inetcomm/mimeole.c | 53 +++++++++++++++++++++++++++++++++++++++- dlls/inetcomm/tests/mimeole.c | 7 +++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 71c621f..dea1597 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -101,6 +101,8 @@ typedef struct MimeBody struct list headers; struct list new_props; /* FIXME: This should be in a PropertySchema */ DWORD next_prop_id; + char *content_pri_type; + char *content_sub_type; } MimeBody; static inline MimeBody *impl_from_IMimeBody( IMimeBody *iface ) @@ -343,6 +345,30 @@ static void read_value(header_t *header, char **cur) *cur = end; } +static void init_content_type(MimeBody *body, header_t *header) +{ + char *slash; + DWORD len; + + if(header->prop->id != PID_HDR_CNTTYPE) + { + ERR("called with header %s\n", header->prop->name); + return; + } + + slash = strchr(header->value.pszVal, '/'); + if(!slash) + { + WARN("malformed context type value\n"); + return; + } + len = slash - header->value.pszVal; + body->content_pri_type = HeapAlloc(GetProcessHeap(), 0, len + 1); + memcpy(body->content_pri_type, header->value.pszVal, len); + body->content_pri_type[len] = '\0'; + body->content_sub_type = strdupA(slash + 1); +} + static HRESULT parse_headers(MimeBody *body, IStream *stm) { char *header_buf, *cur_header_ptr; @@ -357,6 +383,9 @@ static HRESULT parse_headers(MimeBody *body, IStream *stm) { read_value(header, &cur_header_ptr); list_add_tail(&body->headers, &header->entry); + + if(header->prop->id == PID_HDR_CNTTYPE) + init_content_type(body, header); } HeapFree(GetProcessHeap(), 0, header_buf); @@ -448,6 +477,8 @@ static ULONG WINAPI MimeBody_Release(IMimeBody* iface) empty_header_list(&This->headers); empty_new_prop_list(&This->new_props); + HeapFree(GetProcessHeap(), 0, This->content_pri_type); + HeapFree(GetProcessHeap(), 0, This->content_sub_type); HeapFree(GetProcessHeap(), 0, This); } @@ -631,8 +662,24 @@ static HRESULT WINAPI MimeBody_IsContentType( LPCSTR pszPriType, LPCSTR pszSubType) { - FIXME("stub\n"); - return E_NOTIMPL; + MimeBody *This = impl_from_IMimeBody(iface); + + TRACE("(%p)->(%s, %s)\n", This, debugstr_a(pszPriType), debugstr_a(pszSubType)); + if(pszPriType) + { + const char *pri = This->content_pri_type; + if(!pri) pri = "text"; + if(strcasecmp(pri, pszPriType)) return S_FALSE; + } + + if(pszSubType) + { + const char *sub = This->content_sub_type; + if(!sub) sub = "plain"; + if(strcasecmp(sub, pszSubType)) return S_FALSE; + } + + return S_OK; } static HRESULT WINAPI MimeBody_BindToObject( @@ -875,6 +922,8 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) list_init(&This->headers); list_init(&This->new_props); This->next_prop_id = FIRST_CUSTOM_PROP_ID; + This->content_pri_type = NULL; + This->content_sub_type = NULL; *obj = (IMimeBody *)&This->lpVtbl; return S_OK; diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 0683356..2c814d2 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -113,6 +113,13 @@ static void test_CreateBody(void) IStream_Seek(in, off, STREAM_SEEK_CUR, &pos); ok(pos.LowPart == 328, "pos %u\n", pos.LowPart); + hr = IMimeBody_IsContentType(body, "multipart", "mixed"); + ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_IsContentType(body, "text", "plain"); + ok(hr == S_FALSE, "ret %08x\n", hr); + hr = IMimeBody_IsContentType(body, NULL, "mixed"); + ok(hr == S_OK, "ret %08x\n", hr); + IMimeBody_Release(body); }

1 0

Huw Davies : inetcomm: Copy RFC822 headers into a memory block for later parsing.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 98dfca50bbc4109a921c4fcf5aa7d7376abcb4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98dfca50bbc4109a921c4fcf5… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 26 12:01:12 2007 +0000 inetcomm: Copy RFC822 headers into a memory block for later parsing. --- dlls/inetcomm/mimeole.c | 90 +++++++++++++++++++++++++++++++++++++++-- dlls/inetcomm/tests/mimeole.c | 45 ++++++++++++++++++++ 2 files changed, 131 insertions(+), 4 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 56ee5d9..28460ba 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2,6 +2,7 @@ * MIME OLE Interfaces * * Copyright 2006 Robert Shearman for CodeWeavers + * Copyright 2007 Huw Davies for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -49,6 +50,86 @@ static inline MimeBody *impl_from_IMimeBody( IMimeBody *iface ) return (MimeBody *)((char*)iface - FIELD_OFFSET(MimeBody, lpVtbl)); } +#define PARSER_BUF_SIZE 1024 + +/***************************************************** + * copy_headers_to_buf [internal] + * + * Copies the headers into a '\0' terminated memory block and leave + * the stream's current position set to after the blank line. + */ +static HRESULT copy_headers_to_buf(IStream *stm, char **ptr) +{ + char *buf = NULL; + DWORD size = PARSER_BUF_SIZE, offset = 0, last_end = 0; + HRESULT hr; + int done = 0; + + *ptr = NULL; + + do + { + char *end; + DWORD read; + + if(!buf) + buf = HeapAlloc(GetProcessHeap(), 0, size + 1); + else + { + size *= 2; + buf = HeapReAlloc(GetProcessHeap(), 0, buf, size + 1); + } + if(!buf) + { + hr = E_OUTOFMEMORY; + goto fail; + } + + hr = IStream_Read(stm, buf + offset, size - offset, &read); + if(FAILED(hr)) goto fail; + + offset += read; + buf[offset] = '\0'; + + if(read == 0) done = 1; + + while(!done && (end = strstr(buf + last_end, "\r\n"))) + { + DWORD new_end = end - buf + 2; + if(new_end - last_end == 2) + { + LARGE_INTEGER off; + off.QuadPart = new_end; + IStream_Seek(stm, off, STREAM_SEEK_SET, NULL); + buf[new_end] = '\0'; + done = 1; + } + else + last_end = new_end; + } + } while(!done); + + *ptr = buf; + return S_OK; + +fail: + HeapFree(GetProcessHeap(), 0, buf); + return hr; +} + +static HRESULT parse_headers(MimeBody *body, IStream *stm) +{ + char *header_buf; + HRESULT hr; + + hr = copy_headers_to_buf(stm, &header_buf); + if(FAILED(hr)) return hr; + + HeapFree(GetProcessHeap(), 0, header_buf); + return hr; +} + + static HRESULT WINAPI MimeBody_QueryInterface(IMimeBody* iface, REFIID riid, void** ppvObject) @@ -119,8 +200,9 @@ static HRESULT WINAPI MimeBody_Load( IMimeBody* iface, LPSTREAM pStm) { - FIXME("(%p)->(%p): stub\n", iface, pStm); - return E_NOTIMPL; + MimeBody *This = impl_from_IMimeBody(iface); + TRACE("(%p)->(%p)\n", iface, pStm); + return parse_headers(This, pStm); } static HRESULT WINAPI MimeBody_Save( @@ -143,8 +225,8 @@ static HRESULT WINAPI MimeBody_GetSizeMax( static HRESULT WINAPI MimeBody_InitNew( IMimeBody* iface) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("%p->()\n", iface); + return S_OK; } static HRESULT WINAPI MimeBody_GetPropInfo( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 156884e..0683356 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -32,6 +32,32 @@ #include "wine/test.h" +static char msg1[] = + "MIME-Version: 1.0\r\n" + "Content-Type: multipart/mixed;\r\n" + " boundary=\"------------1.5.0.6\";\r\n" + " stuff=\"du;nno\"\r\n" + "foo: bar\r\n" + "From: Huw Davies <huw(a)codeweavers.com>\r\n" + "From: Me <xxx(a)codeweavers.com>\r\n" + "To: wine-patches <wine-patches(a)winehq.org>\r\n" + "Cc: Huw Davies <huw(a)codeweavers.com>,\r\n" + " \"Fred Bloggs\" <fred(a)bloggs.com>\r\n" + "foo: baz\r\n" + "bar: fum\r\n" + "\r\n" + "This is a multi-part message in MIME format.\r\n" + "--------------1.5.0.6\r\n" + "Content-Type: text/plain; format=fixed; charset=UTF-8\r\n" + "Content-Transfer-Encoding: 8bit\r\n" + "\r\n" + "Stuff\r\n" + "--------------1.5.0.6\r\n" + "Content-Type: text/plain; charset=\"us-ascii\"\r\n" + "Content-Transfer-Encoding: 7bit\r\n" + "\r\n" + "More stuff\r\n" + "--------------1.5.0.6--\r\n"; static void test_CreateVirtualStream(void) { @@ -60,6 +86,9 @@ static void test_CreateBody(void) HRESULT hr; IMimeBody *body; HBODY handle = (void *)0xdeadbeef; + IStream *in; + LARGE_INTEGER off; + ULARGE_INTEGER pos; hr = CoCreateInstance(&CLSID_IMimeBody, NULL, CLSCTX_INPROC_SERVER, &IID_IMimeBody, (void**)&body); ok(hr == S_OK, "ret %08x\n", hr); @@ -68,6 +97,22 @@ static void test_CreateBody(void) ok(hr == MIME_E_NO_DATA, "ret %08x\n", hr); ok(handle == NULL, "handle %p\n", handle); + hr = CreateStreamOnHGlobal(NULL, TRUE, &in); + ok(hr == S_OK, "ret %08x\n", hr); + IStream_Write(in, msg1, sizeof(msg1) - 1, NULL); + off.QuadPart = 0; + IStream_Seek(in, off, STREAM_SEEK_SET, NULL); + + /* Need to call InitNew before Load otherwise Load crashes with native inetcomm */ + hr = IMimeBody_InitNew(body); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_Load(body, in); + ok(hr == S_OK, "ret %08x\n", hr); + off.QuadPart = 0; + IStream_Seek(in, off, STREAM_SEEK_CUR, &pos); + ok(pos.LowPart == 328, "pos %u\n", pos.LowPart); + IMimeBody_Release(body); }

1 0

Huw Davies : inetcomm: Parse headers into a list.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 31297b6a3b20a73be36978b6036846a035b3fd07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31297b6a3b20a73be36978b60… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 26 12:01:52 2007 +0000 inetcomm: Parse headers into a list. --- dlls/inetcomm/mimeole.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 172 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 28460ba..5d33537 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -31,18 +31,68 @@ #include "ole2.h" #include "mimeole.h" +#include "wine/list.h" #include "wine/debug.h" #include "inetcomm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); +typedef struct +{ + LPCSTR name; + DWORD id; + DWORD flags; /* MIMEPROPFLAGS */ + VARTYPE default_vt; +} property_t; + +typedef struct +{ + struct list entry; + property_t prop; +} property_list_entry_t; + +static const property_t default_props[] = +{ + {"References", PID_HDR_REFS, 0, VT_LPSTR}, + {"Subject", PID_HDR_SUBJECT, 0, VT_LPSTR}, + {"From", PID_HDR_FROM, MPF_ADDRESS, VT_LPSTR}, + {"Message-ID", PID_HDR_MESSAGEID, 0, VT_LPSTR}, + {"Return-Path", PID_HDR_RETURNPATH, MPF_ADDRESS, VT_LPSTR}, + {"Date", PID_HDR_DATE, 0, VT_LPSTR}, + {"Received", PID_HDR_RECEIVED, 0, VT_LPSTR}, + {"Reply-To", PID_HDR_REPLYTO, MPF_ADDRESS, VT_LPSTR}, + {"X-Mailer", PID_HDR_XMAILER, 0, VT_LPSTR}, + {"Bcc", PID_HDR_BCC, MPF_ADDRESS, VT_LPSTR}, + {"MIME-Version", PID_HDR_MIMEVER, MPF_MIME, VT_LPSTR}, + {"Content-Type", PID_HDR_CNTTYPE, MPF_MIME | MPF_HASPARAMS, VT_LPSTR}, + {"Content-Transfer-Encoding", PID_HDR_CNTXFER, MPF_MIME, VT_LPSTR}, + {"Content-ID", PID_HDR_CNTID, MPF_MIME, VT_LPSTR}, + {"Content-Disposition", PID_HDR_CNTDISP, MPF_MIME, VT_LPSTR}, + {"To", PID_HDR_TO, MPF_ADDRESS, VT_LPSTR}, + {"Cc", PID_HDR_CC, MPF_ADDRESS, VT_LPSTR}, + {"Sender", PID_HDR_SENDER, MPF_ADDRESS, VT_LPSTR}, + {"In-Reply-To", PID_HDR_INREPLYTO, 0, VT_LPSTR}, + {NULL, 0, 0, 0} +}; + +typedef struct +{ + struct list entry; + const property_t *prop; + PROPVARIANT value; +} header_t; + typedef struct MimeBody { const IMimeBodyVtbl *lpVtbl; LONG refs; HBODY handle; + + struct list headers; + struct list new_props; /* FIXME: This should be in a PropertySchema */ + DWORD next_prop_id; } MimeBody; static inline MimeBody *impl_from_IMimeBody( IMimeBody *iface ) @@ -50,6 +100,15 @@ static inline MimeBody *impl_from_IMimeBody( IMimeBody *iface ) return (MimeBody *)((char*)iface - FIELD_OFFSET(MimeBody, lpVtbl)); } +static LPSTR strdupA(LPCSTR str) +{ + char *ret; + int len = strlen(str); + ret = HeapAlloc(GetProcessHeap(), 0, len + 1); + memcpy(ret, str, len + 1); + return ret; +} + #define PARSER_BUF_SIZE 1024 /***************************************************** @@ -117,18 +176,122 @@ fail: return hr; } +static header_t *read_prop(MimeBody *body, char **ptr) +{ + char *colon = strchr(*ptr, ':'); + const property_t *prop; + header_t *ret; + + if(!colon) return NULL; + + *colon = '\0'; + + for(prop = default_props; prop->name; prop++) + { + if(!strcasecmp(*ptr, prop->name)) + { + TRACE("%s: found match with default property id %d\n", *ptr, prop->id); + break; + } + } + + if(!prop->name) + { + property_list_entry_t *prop_entry; + LIST_FOR_EACH_ENTRY(prop_entry, &body->new_props, property_list_entry_t, entry) + { + if(!strcasecmp(*ptr, prop_entry->prop.name)) + { + TRACE("%s: found match with already added new property id %d\n", *ptr, prop_entry->prop.id); + prop = &prop_entry->prop; + break; + } + } + if(!prop->name) + { + prop_entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*prop_entry)); + prop_entry->prop.name = strdupA(*ptr); + prop_entry->prop.id = body->next_prop_id++; + prop_entry->prop.flags = 0; + prop_entry->prop.default_vt = VT_LPSTR; + list_add_tail(&body->new_props, &prop_entry->entry); + prop = &prop_entry->prop; + TRACE("%s: allocating new prop id %d\n", *ptr, prop_entry->prop.id); + } + } + + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(*ret)); + ret->prop = prop; + PropVariantInit(&ret->value); + *ptr = colon + 1; + + return ret; +} + +static void read_value(header_t *header, char **cur) +{ + char *end = *cur, *value; + DWORD len; + + do { + end = strstr(end, "\r\n"); + end += 2; + } while(*end == ' ' || *end == '\t'); + + len = end - *cur; + value = HeapAlloc(GetProcessHeap(), 0, len + 1); + memcpy(value, *cur, len); + value[len] = '\0'; + + header->value.vt = VT_LPSTR; + header->value.pszVal = value; + + *cur = end; +} + static HRESULT parse_headers(MimeBody *body, IStream *stm) { - char *header_buf; + char *header_buf, *cur_header_ptr; HRESULT hr; + header_t *header; hr = copy_headers_to_buf(stm, &header_buf); if(FAILED(hr)) return hr; + cur_header_ptr = header_buf; + while((header = read_prop(body, &cur_header_ptr))) + { + read_value(header, &cur_header_ptr); + list_add_tail(&body->headers, &header->entry); + } + HeapFree(GetProcessHeap(), 0, header_buf); return hr; } +static void empty_header_list(struct list *list) +{ + header_t *header, *cursor2; + + LIST_FOR_EACH_ENTRY_SAFE(header, cursor2, list, header_t, entry) + { + list_remove(&header->entry); + PropVariantClear(&header->value); + HeapFree(GetProcessHeap(), 0, header); + } +} + +static void empty_new_prop_list(struct list *list) +{ + property_list_entry_t *prop, *cursor2; + + LIST_FOR_EACH_ENTRY_SAFE(prop, cursor2, list, property_list_entry_t, entry) + { + list_remove(&prop->entry); + HeapFree(GetProcessHeap(), 0, (char *)prop->prop.name); + HeapFree(GetProcessHeap(), 0, prop); + } +} static HRESULT WINAPI MimeBody_QueryInterface(IMimeBody* iface, REFIID riid, @@ -174,6 +337,9 @@ static ULONG WINAPI MimeBody_Release(IMimeBody* iface) refs = InterlockedDecrement(&This->refs); if (!refs) { + empty_header_list(&This->headers); + empty_new_prop_list(&This->new_props); + HeapFree(GetProcessHeap(), 0, This); } @@ -582,6 +748,8 @@ static IMimeBodyVtbl body_vtbl = MimeBody_GetHandle }; +#define FIRST_CUSTOM_PROP_ID 0x100 + HRESULT MimeBody_create(IUnknown *outer, void **obj) { MimeBody *This; @@ -596,6 +764,9 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) This->lpVtbl = &body_vtbl; This->refs = 1; This->handle = NULL; + list_init(&This->headers); + list_init(&This->new_props); + This->next_prop_id = FIRST_CUSTOM_PROP_ID; *obj = (IMimeBody *)&This->lpVtbl; return S_OK;

1 0

Huw Davies : inetcomm: Unfold headers.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 03ca389550d97f2c3408bf02eeb818e38b656dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ca389550d97f2c3408bf02e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 26 12:02:35 2007 +0000 inetcomm: Unfold headers. --- dlls/inetcomm/mimeole.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 5d33537..8e4df70 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -228,6 +228,31 @@ static header_t *read_prop(MimeBody *body, char **ptr) return ret; } +static void unfold_header(char *header, int len) +{ + char *start = header, *cp = header; + + do { + while(*cp == ' ' || *cp == '\t') + { + cp++; + len--; + } + if(cp != start) + memmove(start, cp, len + 1); + + cp = strstr(start, "\r\n"); + len -= (cp - start); + start = cp; + *start = ' '; + start++; + len--; + cp += 2; + } while(*cp == ' ' || *cp == '\t'); + + *(start - 1) = '\0'; +} + static void read_value(header_t *header, char **cur) { char *end = *cur, *value; @@ -243,6 +268,9 @@ static void read_value(header_t *header, char **cur) memcpy(value, *cur, len); value[len] = '\0'; + unfold_header(value, len); + TRACE("value %s\n", debugstr_a(value)); + header->value.vt = VT_LPSTR; header->value.pszVal = value;

1 0

Alexander Nicolaysen Sørnes : distribution: Make tables sortable
by Chris Morgan 27 Nov '07

27 Nov '07

Module: appdb Branch: master Commit: 6361b26cb206e1d973987aec585931d852d9dab1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6361b26cb206e1d973987aec… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Nov 26 23:43:27 2007 +0100 distribution: Make tables sortable --- include/distribution.php | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/distribution.php b/include/distribution.php index e82ab54..ef2c5be 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -492,9 +492,9 @@ class distribution { function objectGetHeader() { - $oTableRow = new TableRow(); + $oTableRow = new TableRowSortable(); - $oTableRow->AddTextCell("Distribution name"); + $oTableRow->AddSortableTextCell("Distribution name", "name"); $oTableRow->AddTextCell("Distribution url"); @@ -505,7 +505,12 @@ class distribution { return $oTableRow; } - function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0) + public static function objectGetSortableFields() + { + return array('name'); + } + + function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0, $sOrderBy = "name", $bAscending = TRUE) { /* Not implemented */ if($bRejected) @@ -516,12 +521,14 @@ class distribution { if($bQueued && !distribution::canEdit()) return NULL; + $sOrder = $bAscending ? "ASC" : "DESC"; + /* If row limit is 0 we want to fetch all rows */ if(!$iRows) $iRows = distribution::objectGetEntriesCount($bQueued, $bRejected); $sQuery = "SELECT * FROM distributions - WHERE queued = '?' ORDER BY name LIMIT ?,?"; + WHERE queued = '?' ORDER BY $sOrderBy $sOrder LIMIT ?,?"; return query_parameters($sQuery, $bQueued ? "true" : "false", $iStart, $iRows);

1 0

Alexander Nicolaysen Sørnes : vendor: Make tables sortable
by Chris Morgan 27 Nov '07

27 Nov '07

Module: appdb Branch: master Commit: 9d5882d8008df54680183d656a092b76fb693895 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9d5882d8008df54680183d65… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Nov 26 23:47:51 2007 +0100 vendor: Make tables sortable --- include/vendor.php | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/vendor.php b/include/vendor.php index 4ec6597..409467f 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -213,7 +213,12 @@ class Vendor { echo '<input type="hidden" name="iVendorId" value="'.$this->iVendorId.'">',"\n"; } - function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0) + public static function objectGetSortableFields() + { + return array('vendorName'); + } + + function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0, $sOrderBy = 'vendorName', $bAscending = TRUE) { /* Vendor queueing is not implemented yet */ if($bQueued) @@ -223,11 +228,13 @@ class Vendor { if($bRejected) return FALSE; + $sOrder = $bAscending ? 'ASC' : 'DESC'; + if(!$iRows) $iRows = Vendor::objectGetEntriesCount($bQueued, $bRejected); $hResult = query_parameters("SELECT * FROM vendor - ORDER BY vendorName LIMIT ?,?", + ORDER BY $sOrderBy $sOrder LIMIT ?,?", $iStart, $iRows); if(!$hResult) @@ -238,9 +245,9 @@ class Vendor { function objectGetHeader() { - $oTableRow = new TableRow(); + $oTableRow = new TableRowSortable(); - $oTableRow->AddTextCell("Name"); + $oTableRow->AddSortableTextCell('Name', 'vendorName'); $oTableRow->AddTextCell("Website");

1 0