Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[fireball] 32264: - Update winesync status.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 10 16:52:47 2008 New Revision: 32264 URL: http://svn.reactos.org/svn/reactos?rev=32264&view=rev Log: - Update winesync status. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Sun Feb 10 16:52:47 2008 @@ -70,7 +70,7 @@ reactos/dll/win32/powrprof # Autosync reactos/dll/win32/riched20 # Autosync reactos/dll/win32/riched32 # Autosync -reactos/dll/win32/rpcrt4 # Synced to Wine-20080105 +reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_55 reactos/dll/win32/rsabase # Autosync reactos/dll/win32/rsaenh # Autosync reactos/dll/win32/schannel # Autosync

16 years, 8 months

[fireball] 32263: Winesync to Wine-0.9.55.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 10 16:51:59 2008 New Revision: 32263 URL: http://svn.reactos.org/svn/reactos?rev=32263&view=rev Log: Winesync to Wine-0.9.55. Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_binding.h (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_binding.h Sun Feb 10 16:51:59 2008 @@ -41,6 +41,7 @@ /* our copy of NT auth identity structure, if the authentication service * takes an NT auth identity */ SEC_WINNT_AUTH_IDENTITY_W *nt_identity; + LPWSTR server_principal_name; } RpcAuthInfo; typedef struct _RpcQualityOfService @@ -73,6 +74,7 @@ /* client-only */ struct list conn_pool_entry; ULONG assoc_group_id; /* association group returned during binding */ + RPC_ASYNC_STATE *async_state; /* server-only */ /* The active interface bound to server. */ @@ -92,6 +94,7 @@ int (*write)(RpcConnection *conn, const void *buffer, unsigned int len); int (*close)(RpcConnection *conn); void (*cancel_call)(RpcConnection *conn); + int (*wait_for_incoming_data)(RpcConnection *conn); size_t (*get_top_of_tower)(unsigned char *tower_data, const char *networkaddr, const char *endpoint); RPC_STATUS (*parse_top_of_tower)(const unsigned char *tower_data, size_t tower_size, char **networkaddr, char **endpoint); }; Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_server.c (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_server.c Sun Feb 10 16:51:59 2008 @@ -391,6 +391,7 @@ packet = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcPacket)); if (!packet) { + I_RpcFree(msg->Buffer); HeapFree(GetProcessHeap(), 0, msg); break; } @@ -399,6 +400,7 @@ packet->msg = msg; if (!QueueUserWorkItem(RPCRT4_worker_thread, packet, WT_EXECUTELONGFUNCTION)) { ERR("couldn't queue work item for worker thread, error was %d\n", GetLastError()); + I_RpcFree(msg->Buffer); HeapFree(GetProcessHeap(), 0, msg); HeapFree(GetProcessHeap(), 0, packet); break; Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_transport.c (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c Sun Feb 10 16:51:59 2008 @@ -434,6 +434,12 @@ /* FIXME: implement when named pipe writes use overlapped I/O */ } +static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *Connection) +{ + /* FIXME: implement when named pipe writes use overlapped I/O */ + return -1; +} + static size_t rpcrt4_ncacn_np_get_top_of_tower(unsigned char *tower_data, const char *networkaddr, const char *endpoint) @@ -1074,6 +1080,32 @@ TRACE("%p\n", Connection); write(tcpc->cancel_fds[1], &dummy, 1); +} + +static int rpcrt4_conn_tcp_wait_for_incoming_data(RpcConnection *Connection) +{ + RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; + struct pollfd pfds[2]; + + TRACE("%p\n", Connection); + + pfds[0].fd = tcpc->sock; + pfds[0].events = POLLIN; + pfds[1].fd = tcpc->cancel_fds[0]; + pfds[1].events = POLLIN; + if (poll(pfds, 2, -1 /* infinite */) == -1 && errno != EINTR) + { + ERR("poll() failed: %s\n", strerror(errno)); + return -1; + } + if (pfds[1].revents & POLLIN) /* canceled */ + { + char dummy; + read(pfds[1].fd, &dummy, sizeof(dummy)); + return -1; + } + + return 0; } static size_t rpcrt4_ncacn_ip_tcp_get_top_of_tower(unsigned char *tower_data, @@ -1361,6 +1393,7 @@ rpcrt4_conn_np_write, rpcrt4_conn_np_close, rpcrt4_conn_np_cancel_call, + rpcrt4_conn_np_wait_for_incoming_data, rpcrt4_ncacn_np_get_top_of_tower, rpcrt4_ncacn_np_parse_top_of_tower, }, @@ -1373,6 +1406,7 @@ rpcrt4_conn_np_write, rpcrt4_conn_np_close, rpcrt4_conn_np_cancel_call, + rpcrt4_conn_np_wait_for_incoming_data, rpcrt4_ncalrpc_get_top_of_tower, rpcrt4_ncalrpc_parse_top_of_tower, }, @@ -1385,6 +1419,7 @@ rpcrt4_conn_tcp_write, rpcrt4_conn_tcp_close, rpcrt4_conn_tcp_cancel_call, + rpcrt4_conn_tcp_wait_for_incoming_data, rpcrt4_ncacn_ip_tcp_get_top_of_tower, rpcrt4_ncacn_ip_tcp_parse_top_of_tower, } @@ -1501,6 +1536,7 @@ NewConnection->QOS = QOS; list_init(&NewConnection->conn_pool_entry); + NewConnection->async_state = NULL; TRACE("connection: %p\n", NewConnection); *Connection = NewConnection; Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild Sun Feb 10 16:51:59 2008 @@ -16,6 +16,7 @@ <library>uuid</library> <library>ntdll</library> <library>kernel32</library> + <library>user32</library> <library>advapi32</library> <library>secur32</library> <library>iphlpapi</library> Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Sun Feb 10 16:51:59 2008 @@ -21,7 +21,6 @@ @ stdcall I_RpcAbortAsyncCall(ptr long) I_RpcAsyncAbortCall @ stdcall I_RpcAllocate(long) @ stdcall I_RpcAsyncAbortCall(ptr long) -@ stub I_RpcAsyncSendReceive # NT4 @ stdcall I_RpcAsyncSetHandle(ptr ptr) @ stub I_RpcBCacheAllocate @ stub I_RpcBCacheFree @@ -39,7 +38,6 @@ @ stdcall I_RpcBindingSetAsync(ptr ptr) @ stub I_RpcBindingToStaticStringBindingW @ stub I_RpcClearMutex -@ stub I_RpcConnectionInqSockBuffSize2 @ stub I_RpcConnectionInqSockBuffSize @ stub I_RpcConnectionSetSockBuffSize @ stub I_RpcDeleteMutex @@ -48,19 +46,13 @@ @ stdcall I_RpcFree(ptr) @ stdcall I_RpcFreeBuffer(ptr) @ stub I_RpcFreePipeBuffer -@ stub I_RpcGetAssociationContext @ stdcall I_RpcGetBuffer(ptr) @ stub I_RpcGetBufferWithObject @ stdcall I_RpcGetCurrentCallHandle() @ stub I_RpcGetExtendedError -@ stub I_RpcGetServerContextList -@ stub I_RpcGetThreadEvent # win9x -@ stub I_RpcGetThreadWindowHandle # win9x @ stub I_RpcIfInqTransferSyntaxes -@ stub I_RpcLaunchDatagramReceiveThread # win9x @ stub I_RpcLogEvent @ stdcall I_RpcMapWin32Status(long) -@ stub I_RpcMonitorAssociation @ stub I_RpcNegotiateTransferSyntax # wxp @ stub I_RpcNsBindingSetEntryName @ stub I_RpcNsBindingSetEntryNameA @@ -83,46 +75,24 @@ @ stub I_RpcServerSetAddressChangeFn @ stdcall I_RpcServerStartListening(ptr) # win9x @ stdcall I_RpcServerStopListening() # win9x -@ stub I_RpcServerUnregisterEndpointA # win9x -@ stub I_RpcServerUnregisterEndpointW # win9x @ stub I_RpcServerUseProtseq2A @ stub I_RpcServerUseProtseq2W @ stub I_RpcServerUseProtseqEp2A @ stub I_RpcServerUseProtseqEp2W -@ stub I_RpcSetAssociationContext # win9x @ stub I_RpcSetAsyncHandle -@ stub I_RpcSetServerContextList -@ stub I_RpcSetThreadParams # win9x -@ stub I_RpcSetWMsgEndpoint # NT4 @ stub I_RpcSsDontSerializeContext -@ stub I_RpcStopMonitorAssociation @ stub I_RpcSystemFunction001 # wxp (oh, brother!) -@ stub I_RpcTransCancelMigration # win9x -@ stub I_RpcTransClientMaxFrag # win9x -@ stub I_RpcTransClientReallocBuffer # win9x @ stub I_RpcTransConnectionAllocatePacket @ stub I_RpcTransConnectionFreePacket @ stub I_RpcTransConnectionReallocPacket @ stub I_RpcTransDatagramAllocate2 @ stub I_RpcTransDatagramAllocate @ stub I_RpcTransDatagramFree -@ stub I_RpcTransGetAddressList @ stub I_RpcTransGetThreadEvent @ stub I_RpcTransIoCancelled -@ stub I_RpcTransMaybeMakeReceiveAny # win9x -@ stub I_RpcTransMaybeMakeReceiveDirect # win9x -@ stub I_RpcTransPingServer # win9x -@ stub I_RpcTransServerFindConnection # win9x -@ stub I_RpcTransServerFreeBuffer # win9x -@ stub I_RpcTransServerMaxFrag # win9x @ stub I_RpcTransServerNewConnection -@ stub I_RpcTransServerProtectThread # win9x -@ stub I_RpcTransServerReallocBuffer # win9x -@ stub I_RpcTransServerReceiveDirectReady # win9x -@ stub I_RpcTransServerUnprotectThread # win9x @ stub I_RpcTurnOnEEInfoPropagation # wxp @ stdcall I_RpcWindowProc(ptr long long long) # win9x -@ stub I_RpcltDebugSetPDUFilter @ stub I_UuidCreate @ stub MIDL_wchar_strcpy @ stub MIDL_wchar_strlen @@ -135,8 +105,6 @@ @ stub MesHandleFree @ stub MesIncrementalHandleReset @ stub MesInqProcEncodingId -@ stub MqGetContext # win9x -@ stub MqRegisterQueue # win9x @ stdcall NDRCContextBinding(ptr) @ stdcall NDRCContextMarshall(ptr ptr) @ stdcall NDRCContextUnmarshall(ptr ptr ptr long) @@ -361,7 +329,6 @@ @ stub NdrpReleaseTypeGenCookie # wxp @ stub NdrpSetRpcSsDefaults @ stub NdrpVarVtOfTypeDesc # wxp -@ stub PerformRpcInitialization @ stdcall RpcAbortAsyncCall(ptr long) RpcAsyncAbortCall @ stdcall RpcAsyncAbortCall(ptr long) @ stdcall RpcAsyncCancelCall(ptr long) @@ -421,8 +388,6 @@ @ stub RpcIfInqId @ stdcall RpcImpersonateClient(ptr) @ stdcall RpcInitializeAsyncHandle(ptr long) RpcAsyncInitializeHandle -@ stub RpcMgmtBindingInqParameter # win9x -@ stub RpcMgmtBindingSetParameter # win9x @ stdcall RpcMgmtEnableIdleCleanup() @ stdcall RpcMgmtEpEltInqBegin(ptr long ptr long ptr ptr) @ stub RpcMgmtEpEltInqDone @@ -432,7 +397,6 @@ @ stub RpcMgmtInqComTimeout @ stub RpcMgmtInqDefaultProtectLevel @ stdcall RpcMgmtInqIfIds(ptr ptr) -@ stub RpcMgmtInqParameter # win9x @ stub RpcMgmtInqServerPrincNameA @ stub RpcMgmtInqServerPrincNameW @ stub RpcMgmtInqStats @@ -440,7 +404,6 @@ @ stub RpcMgmtSetAuthorizationFn @ stdcall RpcMgmtSetCancelTimeout(long) @ stdcall RpcMgmtSetComTimeout(ptr long) -@ stub RpcMgmtSetParameter # win9x @ stdcall RpcMgmtSetServerStackSize(long) @ stub RpcMgmtStatsVectorFree @ stdcall RpcMgmtStopServerListening(ptr) @@ -526,7 +489,6 @@ @ stub SimpleTypeAlignment # wxp @ stub SimpleTypeBufferSize # wxp @ stub SimpleTypeMemorySize # wxp -@ stub StartServiceIfNecessary # win9x @ stdcall TowerConstruct(ptr ptr ptr ptr ptr ptr) @ stdcall TowerExplode(ptr ptr ptr ptr ptr ptr) @ stdcall UuidCompare(ptr ptr ptr)

16 years, 8 months

[fireball] 32262: Winesync to Wine-0.9.55.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 10 16:22:36 2008 New Revision: 32262 URL: http://svn.reactos.org/svn/reactos?rev=32262&view=rev Log: Winesync to Wine-0.9.55. Added: trunk/rostests/winetests/msi/automation.c (with props) trunk/rostests/winetests/msi/source.c (with props) Modified: trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/format.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/msi.rbuild trunk/rostests/winetests/msi/package.c trunk/rostests/winetests/msi/record.c trunk/rostests/winetests/msi/suminfo.c trunk/rostests/winetests/msi/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=32… Modified: trunk/rostests/winetests/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/format.c?re… Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=3… Modified: trunk/rostests/winetests/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.rbuild?… Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… Modified: trunk/rostests/winetests/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/record.c?re… Added: trunk/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/source.c?re… Modified: trunk/rostests/winetests/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/suminfo.c?r… Modified: trunk/rostests/winetests/msi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/testlist.c?…

16 years, 8 months

[fireball] 32261: Winesync to Wine-0.9.55.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 10 16:16:32 2008 New Revision: 32261 URL: http://svn.reactos.org/svn/reactos?rev=32261&view=rev Log: Winesync to Wine-0.9.55. Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/format.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/streams.c Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c (original) +++ trunk/reactos/dll/win32/msi/action.c Sun Feb 10 16:16:32 2008 @@ -2240,6 +2240,7 @@ DWORD *size) { LPSTR data = NULL; + if (value[0]=='#' && value[1]!='#' && value[1]!='%') { if (value[1]=='x') @@ -2321,6 +2322,7 @@ { static const WCHAR szMulti[] = {'[','~',']',0}; LPCWSTR ptr; + LPWSTR newdata; *type=REG_SZ; if (value[0]=='#') @@ -2339,7 +2341,29 @@ if (strstrW(value,szMulti)) *type = REG_MULTI_SZ; + /* remove initial delimiter */ + if (!strncmpW(value, szMulti, 3)) + ptr = value + 3; + *size = deformat_string(package, ptr,(LPWSTR*)&data); + + /* add double NULL terminator */ + if (*type == REG_MULTI_SZ) + { + *size += sizeof(WCHAR); + newdata = msi_alloc(*size); + if (!newdata) + { + msi_free(data); + return NULL; + } + + memcpy(newdata, data, *size - 1); + newdata[*size] = '\0'; + + msi_free(data); + data = (LPSTR)newdata; + } } return data; } Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/database.c (original) +++ trunk/reactos/dll/win32/msi/database.c Sun Feb 10 16:16:32 2008 @@ -408,6 +408,10 @@ else type = type_long; break; + default: + ERR("Unknown type: %c\n", types[i][0]); + msi_free(columns); + return NULL; } sprintfW(expanded, column_fmt, columns_data[i], type, size, extra, comma); Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/files.c (original) +++ trunk/reactos/dll/win32/msi/files.c Sun Feb 10 16:16:32 2008 @@ -901,12 +901,10 @@ } dest = build_directory_name(2, dest_path, dest_name); - create_full_pathW(dest); + create_full_pathW(dest_path); TRACE("Duplicating file %s to %s\n",debugstr_w(file->TargetPath), debugstr_w(dest)); - - CreateDirectoryW(dest_path, NULL); if (strcmpW(file->TargetPath,dest)) rc = !CopyFileW(file->TargetPath,dest,TRUE); Modified: trunk/reactos/dll/win32/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/format.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/format.c (original) +++ trunk/reactos/dll/win32/msi/format.c Sun Feb 10 16:16:32 2008 @@ -19,10 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* -http://msdn.microsoft.com/library/default.asp?url=/library/en-us/msi/setup/msiformatrecord.asp - */ - #include <stdarg.h> #include <stdio.h> @@ -43,11 +39,288 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); - -static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, - WCHAR** data, DWORD len, MSIRECORD* record, - BOOL* in_group); - +/* types arranged by precedence */ +#define FORMAT_NULL 0x0001 +#define FORMAT_LITERAL 0x0002 +#define FORMAT_NUMBER 0x0004 +#define FORMAT_LBRACK 0x0010 +#define FORMAT_LBRACE 0x0020 +#define FORMAT_RBRACK 0x0011 +#define FORMAT_RBRACE 0x0021 +#define FORMAT_ESCAPE 0x0040 +#define FORMAT_PROPNULL 0x0080 +#define FORMAT_ERROR 0x1000 +#define FORMAT_FAIL 0x2000 + +#define left_type(x) (x & 0xF0) + +typedef struct _tagFORMAT +{ + MSIPACKAGE *package; + MSIRECORD *record; + LPWSTR deformatted; + int len; + int n; + BOOL propfailed; + BOOL groupfailed; + int groups; +} FORMAT; + +typedef struct _tagFORMSTR +{ + struct list entry; + int n; + int len; + int type; + BOOL propfound; + BOOL nonprop; +} FORMSTR; + +typedef struct _tagSTACK +{ + struct list items; +} STACK; + +static STACK *create_stack(void) +{ + STACK *stack = msi_alloc(sizeof(STACK)); + list_init(&stack->items); + return stack; +} + +static void free_stack(STACK *stack) +{ + while (!list_empty(&stack->items)) + { + FORMSTR *str = LIST_ENTRY(list_head(&stack->items), FORMSTR, entry); + list_remove(&str->entry); + msi_free(str); + } + + msi_free(stack); +} + +static void stack_push(STACK *stack, FORMSTR *str) +{ + list_add_head(&stack->items, &str->entry); +} + +static FORMSTR *stack_pop(STACK *stack) +{ + FORMSTR *ret; + + if (list_empty(&stack->items)) + return NULL; + + ret = LIST_ENTRY(list_head(&stack->items), FORMSTR, entry); + list_remove(&ret->entry); + return ret; +} + +static FORMSTR *stack_find(STACK *stack, int type) +{ + FORMSTR *str; + + LIST_FOR_EACH_ENTRY(str, &stack->items, FORMSTR, entry) + { + if (str->type == type) + return str; + } + + return NULL; +} + +static FORMSTR *stack_peek(STACK *stack) +{ + return LIST_ENTRY(list_head(&stack->items), FORMSTR, entry); +} + +static LPCWSTR get_formstr_data(FORMAT *format, FORMSTR *str) +{ + return &format->deformatted[str->n]; +} + +static LPWSTR dup_formstr(FORMAT *format, FORMSTR *str) +{ + LPWSTR val; + LPCWSTR data; + + if (str->len == 0) + return NULL; + + val = msi_alloc((str->len + 1) * sizeof(WCHAR)); + data = get_formstr_data(format, str); + lstrcpynW(val, data, str->len + 1); + + return val; +} + +static LPWSTR deformat_index(FORMAT *format, FORMSTR *str) +{ + LPWSTR val, ret; + + val = msi_alloc((str->len + 1) * sizeof(WCHAR)); + lstrcpynW(val, get_formstr_data(format, str), str->len + 1); + + ret = msi_dup_record_field(format->record, atoiW(val)); + + msi_free(val); + return ret; +} + +static LPWSTR deformat_property(FORMAT *format, FORMSTR *str) +{ + LPWSTR val, ret; + + val = msi_alloc((str->len + 1) * sizeof(WCHAR)); + lstrcpynW(val, get_formstr_data(format, str), str->len + 1); + + ret = msi_dup_property(format->package, val); + + msi_free(val); + return ret; +} + +static LPWSTR deformat_component(FORMAT *format, FORMSTR *str) +{ + LPWSTR key, ret = NULL; + MSICOMPONENT *comp; + BOOL source; + + key = msi_alloc((str->len + 1) * sizeof(WCHAR)); + lstrcpynW(key, get_formstr_data(format, str), str->len + 1); + + comp = get_loaded_component(format->package, key); + if (!comp) + goto done; + + source = (comp->Action == INSTALLSTATE_SOURCE) ? TRUE : FALSE; + ret = resolve_folder(format->package, comp->Directory, source, FALSE, TRUE, NULL); + +done: + msi_free(key); + return ret; +} + +static LPWSTR deformat_file(FORMAT *format, FORMSTR *str, BOOL shortname) +{ + LPWSTR key, ret = NULL; + MSIFILE *file; + DWORD size; + + key = msi_alloc((str->len + 1) * sizeof(WCHAR)); + lstrcpynW(key, get_formstr_data(format, str), str->len + 1); + + file = get_loaded_file(format->package, key); + if (!file) + goto done; + + if (!shortname) + { + ret = strdupW(file->TargetPath); + goto done; + } + + size = GetShortPathNameW(file->TargetPath, NULL, 0); + if (size <= 0) + { + ret = strdupW(file->TargetPath); + goto done; + } + + size++; + ret = msi_alloc(size * sizeof(WCHAR)); + GetShortPathNameW(file->TargetPath, ret, size); + +done: + msi_free(key); + return ret; +} + +static LPWSTR deformat_environment(FORMAT *format, FORMSTR *str) +{ + LPWSTR key, ret = NULL; + DWORD sz; + + key = msi_alloc((str->len + 1) * sizeof(WCHAR)); + lstrcpynW(key, get_formstr_data(format, str), str->len + 1); + + sz = GetEnvironmentVariableW(key, NULL ,0); + if (sz <= 0) + goto done; + + sz++; + ret = msi_alloc(sz * sizeof(WCHAR)); + GetEnvironmentVariableW(key, ret, sz); + +done: + msi_free(key); + return ret; +} + +static LPWSTR deformat_literal(FORMAT *format, FORMSTR *str, BOOL *propfound, + BOOL *nonprop, int *type) +{ + LPCWSTR data = get_formstr_data(format, str); + LPWSTR replaced = NULL; + char ch = data[0]; + + if (ch == '\\') + { + str->n++; + if (str->len == 1) + { + str->len = 0; + replaced = NULL; + } + else + { + str->len = 1; + replaced = dup_formstr(format, str); + } + } + else if (ch == '~') + { + if (str->len != 1) + replaced = NULL; + else + { + replaced = msi_alloc(sizeof(WCHAR)); + *replaced = '\0'; + } + } + else if (ch == '%' || ch == '#' || ch == '!' || ch == '$') + { + str->n++; + str->len--; + + switch (ch) + { + case '%': + replaced = deformat_environment(format, str); break; + case '#': + replaced = deformat_file(format, str, FALSE); break; + case '!': + replaced = deformat_file(format, str, TRUE); break; + case '$': + replaced = deformat_component(format, str); break; + } + + *type = FORMAT_LITERAL; + } + else + { + replaced = deformat_property(format, str); + *type = FORMAT_LITERAL; + + if (replaced) + *propfound = TRUE; + else + format->propfailed = TRUE; + } + + return replaced; +} static LPWSTR build_default_format(const MSIRECORD* record) { @@ -70,7 +343,7 @@ size = 1; for (i = 1; i <= count; i++) { - sprintfW(index,fmt_index,i); + sprintfW(index, fmt_index, i); str = MSI_RecordGetString(record, i); len = (str) ? lstrlenW(str) : 0; len += (sizeof(fmt_null) - 3) + lstrlenW(index); @@ -84,9 +357,9 @@ } if (str) - sprintfW(buf,fmt,i,str); + sprintfW(buf, fmt, i, str); else - sprintfW(buf,fmt_null,i); + sprintfW(buf, fmt_null, i); if (!rc) { @@ -99,516 +372,493 @@ lstrcatW(rc, buf); } } + msi_free(buf); return rc; } -static const WCHAR* scanW(LPCWSTR buf, WCHAR token, DWORD len) -{ - DWORD i; - for (i = 0; i < len; i++) - if (buf[i] == token) - return &buf[i]; - return NULL; -} - -/* break out helper functions for deformating */ -static LPWSTR deformat_component(MSIPACKAGE* package, LPCWSTR key, DWORD* sz) -{ - LPWSTR value = NULL; - MSICOMPONENT *comp; - BOOL source; - - *sz = 0; - if (!package) +static BOOL format_is_number(WCHAR x) +{ + return ((x >= '0') && (x <= '9')); +} + +static BOOL format_str_is_number(LPWSTR str) +{ + LPWSTR ptr; + + for (ptr = str; *ptr; ptr++) + if (!format_is_number(*ptr)) + return FALSE; + + return TRUE; +} + +static BOOL format_is_alpha(WCHAR x) +{ + return (!format_is_number(x) && x != '\0' && + x != '[' && x != ']' && x != '{' && x != '}'); +} + +static BOOL format_is_literal(WCHAR x) +{ + return (format_is_alpha(x) || format_is_number(x)); +} + +static int format_lex(FORMAT *format, FORMSTR **out) +{ + int type, len = 1; + FORMSTR *str; + LPCWSTR data; + WCHAR ch; + + *out = NULL; + + if (!format->deformatted) + return FORMAT_NULL; + + *out = msi_alloc_zero(sizeof(FORMSTR)); + if (!*out) + return FORMAT_FAIL; + + str = *out; + str->n = format->n; + str->len = 1; + data = get_formstr_data(format, str); + + ch = data[0]; + switch (ch) + { + case '{': type = FORMAT_LBRACE; break; + case '}': type = FORMAT_RBRACE; break; + case '[': type = FORMAT_LBRACK; break; + case ']': type = FORMAT_RBRACK; break; + case '~': type = FORMAT_PROPNULL; break; + case '\0': type = FORMAT_NULL; break; + + default: + type = 0; + } + + if (type) + { + str->type = type; + format->n++; + return type; + } + + if (ch == '\\') + { + while (data[len] && data[len] != ']') + len++; + + type = FORMAT_ESCAPE; + } + else if (format_is_alpha(ch)) + { + while (format_is_literal(data[len])) + len++; + + type = FORMAT_LITERAL; + } + else if (format_is_number(ch)) + { + while (format_is_number(data[len])) + len++; + + type = FORMAT_NUMBER; + + if (data[len] != ']') + { + while (format_is_literal(data[len])) + len++; + + type = FORMAT_LITERAL; + } + } + else + { + ERR("Got unknown character %c(%x)\n", ch, ch); + return FORMAT_ERROR; + } + + format->n += len; + str->len = len; + str->type = type; + + return type; +} + +static FORMSTR *format_replace(FORMAT *format, BOOL propfound, BOOL nonprop, + int oldsize, int type, LPWSTR replace) +{ + FORMSTR *ret; + LPWSTR str, ptr; + DWORD size = 0; + int n; + + if (replace) + { + if (!*replace) + size = 1; + else + size = lstrlenW(replace); + } + + size -= oldsize; + size = format->len + size + 1; + + if (size <= 1) + { + msi_free(format->deformatted); + format->deformatted = NULL; + format->len = 0; return NULL; - - comp = get_loaded_component(package,key); - if (comp) - { - source = (comp->Action == INSTALLSTATE_SOURCE) ? TRUE : FALSE; - value = resolve_folder(package, comp->Directory, source, FALSE, TRUE, NULL); - *sz = (strlenW(value)) * sizeof(WCHAR); - } - - return value; -} - -static LPWSTR deformat_file(MSIPACKAGE* package, LPCWSTR key, DWORD* sz, - BOOL shortname) -{ - LPWSTR value = NULL; - MSIFILE *file; - - *sz = 0; - - if (!package) + } + + str = msi_alloc(size * sizeof(WCHAR)); + if (!str) return NULL; - file = get_loaded_file( package, key ); - if (file) - { - if (!shortname) - { - value = strdupW( file->TargetPath ); - *sz = (strlenW(value)) * sizeof(WCHAR); + str[0] = '\0'; + memcpy(str, format->deformatted, format->n * sizeof(WCHAR)); + n = format->n; + + if (replace) + { + if (!*replace) + { + str[n] = '\0'; + n++; } else { - DWORD size = 0; - size = GetShortPathNameW( file->TargetPath, NULL, 0 ); - - if (size > 0) - { - *sz = (size-1) * sizeof (WCHAR); - size ++; - value = msi_alloc(size * sizeof(WCHAR)); - GetShortPathNameW( file->TargetPath, value, size ); - } - else - { - value = strdupW( file->TargetPath ); - *sz = (lstrlenW(value)) * sizeof(WCHAR); - } - } - } - - return value; -} - -static LPWSTR deformat_environment(MSIPACKAGE* package, LPCWSTR key, - DWORD* chunk) -{ - LPWSTR value = NULL; - DWORD sz; - - sz = GetEnvironmentVariableW(key,NULL,0); - if (sz > 0) - { - sz++; - value = msi_alloc(sz * sizeof(WCHAR)); - GetEnvironmentVariableW(key,value,sz); - *chunk = (strlenW(value)) * sizeof(WCHAR); + lstrcpyW(&str[n], replace); + n += lstrlenW(replace); + } + } + + ptr = &format->deformatted[format->n + oldsize]; + memcpy(&str[n], ptr, (lstrlenW(ptr) + 1) * sizeof(WCHAR)); + + msi_free(format->deformatted); + format->deformatted = str; + format->len = size - 1; + + if (!replace) + return NULL; + + ret = msi_alloc_zero(sizeof(FORMSTR)); + if (!ret) + return NULL; + + ret->len = lstrlenW(replace); + ret->type = type; + ret->n = format->n; + ret->propfound = propfound; + ret->nonprop = nonprop; + + return ret; +} + +static LPWSTR replace_stack_group(FORMAT *format, STACK *values, + BOOL *propfound, BOOL *nonprop, + int *oldsize, int *type) +{ + LPWSTR replaced = NULL; + FORMSTR *content; + FORMSTR *node; + int n; + + *nonprop = FALSE; + *propfound = FALSE; + + node = stack_pop(values); + n = node->n; + *oldsize = node->len; + msi_free(node); + + while ((node = stack_pop(values))) + { + *oldsize += node->len; + + if (node->nonprop) + *nonprop = TRUE; + + if (node->propfound) + *propfound = TRUE; + + msi_free(node); + } + + content = msi_alloc_zero(sizeof(FORMSTR)); + content->n = n; + content->len = *oldsize; + content->type = FORMAT_LITERAL; + + if (!format->groupfailed && (*oldsize == 2 || + (format->propfailed && !*nonprop))) + { + msi_free(content); + return NULL; + } + else if (format->deformatted[content->n + 1] == '{' && + format->deformatted[content->n + content->len - 2] == '}') + { + format->groupfailed = FALSE; + content->len = 0; + } + else if (*propfound && !*nonprop && + !format->groupfailed && format->groups == 0) + { + content->n++; + content->len -= 2; } else { - WARN("Unknown environment variable %s\n", debugstr_w(key)); - *chunk = 0; - value = NULL; - } - return value; -} - - -static LPWSTR deformat_NULL(DWORD* chunk) -{ - LPWSTR value; - - value = msi_alloc(sizeof(WCHAR)*2); - value[0] = 0; - *chunk = sizeof(WCHAR); - return value; -} - -static LPWSTR deformat_escape(LPCWSTR key, DWORD* chunk) -{ - LPWSTR value; - - value = msi_alloc(sizeof(WCHAR)*2); - value[0] = key[0]; - *chunk = sizeof(WCHAR); - - return value; -} - - -static BOOL is_key_number(LPCWSTR key) -{ - INT index = 0; - if (key[0] == 0) - return FALSE; - - while (isdigitW(key[index])) index++; - if (key[index] == 0) - return TRUE; + if (format->groups != 0) + format->groupfailed = TRUE; + + *nonprop = TRUE; + } + + replaced = dup_formstr(format, content); + *type = content->type; + msi_free(content); + + if (format->groups == 0) + format->propfailed = FALSE; + + return replaced; +} + +static LPWSTR replace_stack_prop(FORMAT *format, STACK *values, + BOOL *propfound, BOOL *nonprop, + int *oldsize, int *type) +{ + LPWSTR replaced = NULL; + FORMSTR *content; + FORMSTR *node; + int n; + + *propfound = FALSE; + *nonprop = FALSE; + + node = stack_pop(values); + n = node->n; + *oldsize = node->len; + *type = stack_peek(values)->type; + msi_free(node); + + while ((node = stack_pop(values))) + { + *oldsize += node->len; + + if (*type != FORMAT_ESCAPE && + stack_peek(values) && node->type != *type) + *type = FORMAT_LITERAL; + + msi_free(node); + } + + content = msi_alloc_zero(sizeof(FORMSTR)); + content->n = n + 1; + content->len = *oldsize - 2; + content->type = *type; + + if (*type == FORMAT_NUMBER) + { + replaced = deformat_index(format, content); + if (replaced) + *propfound = TRUE; + else + format->propfailed = TRUE; + + if (replaced) + *type = format_str_is_number(replaced) ? + FORMAT_NUMBER : FORMAT_LITERAL; + } + else if (format->package) + { + replaced = deformat_literal(format, content, propfound, nonprop, type); + } else - return FALSE; -} - -static LPWSTR deformat_index(MSIRECORD* record, LPCWSTR key, DWORD* chunk ) -{ - INT index; - LPWSTR value; - - index = atoiW(key); - TRACE("record index %i\n",index); - value = msi_dup_record_field(record,index); - if (value) - *chunk = strlenW(value) * sizeof(WCHAR); - else - { - value = NULL; - *chunk = 0; - } - return value; -} - -static LPWSTR deformat_property(MSIPACKAGE* package, LPCWSTR key, DWORD* chunk) -{ - LPWSTR value; - - if (!package) - return NULL; - - value = msi_dup_property( package, key ); - - if (value) - *chunk = (strlenW(value)) * sizeof(WCHAR); - - return value; -} - -/* - * Groups cannot be nested. They are just treated as from { to next } - */ -static BOOL find_next_group(LPCWSTR source, DWORD len_remaining, - LPWSTR *group, LPCWSTR *mark, - LPCWSTR* mark2) -{ - int i; - BOOL found = FALSE; - - *mark = scanW(source,'{',len_remaining); - if (!*mark) - return FALSE; - - for (i = 1; (*mark - source) + i < len_remaining; i++) - { - if ((*mark)[i] == '}') - { - found = TRUE; - break; - } - } - if (! found) - return FALSE; - - *mark2 = &(*mark)[i]; - - i = *mark2 - *mark; - *group = msi_alloc(i*sizeof(WCHAR)); - - i -= 1; - memcpy(*group,&(*mark)[1],i*sizeof(WCHAR)); - (*group)[i] = 0; - - TRACE("Found group %s\n",debugstr_w(*group)); - return TRUE; -} - - -static BOOL find_next_outermost_key(LPCWSTR source, DWORD len_remaining, - LPWSTR *key, LPCWSTR *mark, LPCWSTR* mark2, - BOOL *nested) -{ - INT count = 0; - INT total_count = 0; - int i; - - *nested = FALSE; - *mark = scanW(source,'[',len_remaining); - if (!*mark) - return FALSE; - - count = 1; - total_count = 1; - for (i = 1; (*mark - source) + i < len_remaining && count > 0; i++) - { - if ((*mark)[i] == '[' && (*mark)[i-1] != '\\') - { - count ++; - total_count ++; - *nested = TRUE; - } - else if ((*mark)[i] == ']' && (*mark)[i-1] != '\\') - { - count --; - } + { + *nonprop = TRUE; + content->n--; + content->len += 2; + replaced = dup_formstr(format, content); + } + + msi_free(content); + return replaced; +} + +static UINT replace_stack(FORMAT *format, STACK *stack, STACK *values) +{ + LPWSTR replaced = NULL; + FORMSTR *beg; + FORMSTR *top; + FORMSTR *node; + BOOL propfound = FALSE; + BOOL nonprop = FALSE; + BOOL group = FALSE; + int oldsize = 0; + int type, n; + + node = stack_peek(values); + type = node->type; + n = node->n; + + if (type == FORMAT_LBRACK) + replaced = replace_stack_prop(format, values, &propfound, + &nonprop, &oldsize, &type); + else if (type == FORMAT_LBRACE) + { + replaced = replace_stack_group(format, values, &propfound, + &nonprop, &oldsize, &type); + group = TRUE; + } + + format->n = n; + beg = format_replace(format, propfound, nonprop, oldsize, type, replaced); + if (!beg) + return ERROR_SUCCESS; + + msi_free(replaced); + format->n = beg->n + beg->len; + + if (type == FORMAT_PROPNULL) + format->n++; + + top = stack_peek(stack); + if (top) + { + type = top->type; + + if ((type == FORMAT_LITERAL || type == FORMAT_NUMBER) && + type == beg->type) + { + top->len += beg->len; + + if (group) + top->nonprop = FALSE; + + if (type == FORMAT_LITERAL) + top->nonprop = beg->nonprop; + + if (beg->propfound) + top->propfound = TRUE; + + msi_free(beg); + return ERROR_SUCCESS; + } + } + + stack_push(stack, beg); + return ERROR_SUCCESS; +} + +static BOOL verify_format(LPWSTR data) +{ + int count = 0; + + while (*data) + { + if (*data == '[' && *(data - 1) != '\\') + count++; + else if (*data == ']') + count--; + + data++; } if (count > 0) return FALSE; - *mark2 = &(*mark)[i-1]; - - i = *mark2 - *mark; - *key = msi_alloc(i*sizeof(WCHAR)); - /* do not have the [] in the key */ - i -= 1; - memcpy(*key,&(*mark)[1],i*sizeof(WCHAR)); - (*key)[i] = 0; - - TRACE("Found Key %s\n",debugstr_w(*key)); return TRUE; } -static LPWSTR deformat_group(MSIPACKAGE* package, LPWSTR group, DWORD len, - MSIRECORD* record, DWORD* size) -{ - LPWSTR value = NULL; - LPCWSTR mark, mark2; - LPWSTR key; - BOOL nested; - INT failcount; - static const WCHAR fmt[] = {'{','%','s','}',0}; - UINT sz; - - if (!group || group[0] == 0) - { - *size = 0; - return NULL; - } - /* if no [] then group is returned as is */ - - if (!find_next_outermost_key(group, len, &key, &mark, &mark2, &nested)) - { - *size = (len+2)*sizeof(WCHAR); - value = msi_alloc(*size); - sprintfW(value,fmt,group); - /* do not return size of the null at the end */ - *size = (len+1)*sizeof(WCHAR); - return value; - } - - msi_free(key); - failcount = 0; - sz = deformat_string_internal(package, group, &value, strlenW(group), - record, &failcount); - if (failcount==0) - { - *size = sz * sizeof(WCHAR); - return value; - } - else if (failcount < 0) - { - LPWSTR v2; - - v2 = msi_alloc((sz+2)*sizeof(WCHAR)); - v2[0] = '{'; - memcpy(&v2[1],value,sz*sizeof(WCHAR)); - v2[sz+1]='}'; - msi_free(value); - - *size = (sz+2)*sizeof(WCHAR); - return v2; - } - else - { - msi_free(value); - *size = 0; - return NULL; - } -} - - -/* - * len is in WCHARs - * return is also in WCHARs - */ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, - WCHAR** data, DWORD len, MSIRECORD* record, - INT* failcount) -{ - LPCWSTR mark = NULL; - LPCWSTR mark2 = NULL; - DWORD size=0; - DWORD chunk=0; - LPWSTR key; - LPWSTR value = NULL; - DWORD sz; - LPBYTE newdata = NULL; - const WCHAR* progress = NULL; - BOOL nested = FALSE; - - if (ptr==NULL) - { - TRACE("Deformatting NULL string\n"); + WCHAR** data, DWORD *len, + MSIRECORD* record, INT* failcount) +{ + FORMAT format; + FORMSTR *str = NULL; + STACK *stack, *temp; + FORMSTR *node; + int type; + + if (!ptr) + { *data = NULL; - return 0; - } - - TRACE("Starting with %s\n",debugstr_wn(ptr,len)); - - /* scan for special characters... fast exit */ - if ((!scanW(ptr,'[',len) || (scanW(ptr,'[',len) && !scanW(ptr,']',len))) && - (scanW(ptr,'{',len) && !scanW(ptr,'}',len))) - { - /* not formatted */ - *data = msi_alloc((len*sizeof(WCHAR))); - memcpy(*data,ptr,len*sizeof(WCHAR)); - TRACE("Returning %s\n",debugstr_wn(*data,len)); - return len; - } - - progress = ptr; - - while (progress - ptr < len) - { - /* seek out first group if existing */ - if (find_next_group(progress, len - (progress - ptr), &key, - &mark, &mark2)) - { - value = deformat_group(package, key, strlenW(key)+1, record, - &chunk); - msi_free( key ); - key = NULL; - nested = FALSE; - } - /* formatted string located */ - else if (!find_next_outermost_key(progress, len - (progress - ptr), - &key, &mark, &mark2, &nested)) - { - LPBYTE nd2; - - TRACE("after value %s\n", debugstr_wn((LPWSTR)newdata, - size/sizeof(WCHAR))); - chunk = (len - (progress - ptr)) * sizeof(WCHAR); - TRACE("after chunk is %i + %i\n",size,chunk); - if (size) - nd2 = msi_realloc(newdata,(size+chunk)); - else - nd2 = msi_alloc(chunk); - - newdata = nd2; - memcpy(&newdata[size],progress,chunk); - size+=chunk; - break; - } - - if (mark != progress) - { - LPBYTE tgt; - DWORD old_size = size; - INT cnt = (mark - progress); - TRACE("%i (%i) characters before marker\n",cnt,(mark-progress)); - size += cnt * sizeof(WCHAR); - if (!old_size) - tgt = msi_alloc(size); - else - tgt = msi_realloc(newdata,size); - newdata = tgt; - memcpy(&newdata[old_size],progress,(cnt * sizeof(WCHAR))); - } - - progress = mark; - - if (nested) - { - TRACE("Nested key... %s\n",debugstr_w(key)); - deformat_string_internal(package, key, &value, strlenW(key)+1, - record, failcount); - - msi_free(key); - key = value; - } - - TRACE("Current %s .. %s\n",debugstr_wn((LPWSTR)newdata, - size/sizeof(WCHAR)),debugstr_w(key)); - - if (!package) - { - /* only deformat number indexs */ - if (key && is_key_number(key)) + *len = 0; + return ERROR_SUCCESS; + } + + *data = strdupW(ptr); + *len = lstrlenW(ptr); + + ZeroMemory(&format, sizeof(FORMAT)); + format.package = package; + format.record = record; + format.deformatted = *data; + format.len = *len; + + stack = create_stack(); + temp = create_stack(); + + if (!verify_format(*data)) + return ERROR_SUCCESS; + + while ((type = format_lex(&format, &str)) != FORMAT_NULL) + { + if (type == FORMAT_LBRACK || type == FORMAT_LBRACE || + type == FORMAT_LITERAL || type == FORMAT_NUMBER || + type == FORMAT_ESCAPE || type == FORMAT_PROPNULL) + { + if (type == FORMAT_LBRACE) { - value = deformat_index(record,key,&chunk); - if (!chunk && failcount && *failcount >= 0) - (*failcount)++; + format.propfailed = FALSE; + format.groups++; } - else + else if (type == FORMAT_ESCAPE && + !stack_find(stack, FORMAT_LBRACK)) { - if (failcount) - *failcount = -1; - if(key) + format.n -= str->len - 1; + str->len = 1; + } + + stack_push(stack, str); + } + else if (type == FORMAT_RBRACK || type == FORMAT_RBRACE) + { + if (type == FORMAT_RBRACE) + format.groups--; + + stack_push(stack, str); + + if (stack_find(stack, left_type(type))) + { + do { - DWORD keylen = strlenW(key); - chunk = (keylen + 2)*sizeof(WCHAR); - value = msi_alloc(chunk); - value[0] = '['; - memcpy(&value[1],key,keylen*sizeof(WCHAR)); - value[1+keylen] = ']'; - } + node = stack_pop(stack); + stack_push(temp, node); + } while (node->type != left_type(type)); + + replace_stack(&format, stack, temp); } } - else - { - sz = 0; - if (key) switch (key[0]) - { - case '~': - value = deformat_NULL(&chunk); - break; - case '$': - value = deformat_component(package,&key[1],&chunk); - break; - case '#': - value = deformat_file(package,&key[1], &chunk, FALSE); - break; - case '!': /* should be short path */ - value = deformat_file(package,&key[1], &chunk, TRUE); - break; - case '\\': - value = deformat_escape(&key[1],&chunk); - break; - case '%': - value = deformat_environment(package,&key[1],&chunk); - break; - default: - /* index keys cannot be nested */ - if (is_key_number(key)) - if (!nested) - value = deformat_index(record,key,&chunk); - else - { - static const WCHAR fmt[] = {'[','%','s',']',0}; - value = msi_alloc(10); - sprintfW(value,fmt,key); - chunk = strlenW(value)*sizeof(WCHAR); - } - else - value = deformat_property(package,key,&chunk); - break; - } - } - - msi_free(key); - - if (value!=NULL) - { - LPBYTE nd2; - TRACE("value %s, chunk %i size %i\n",debugstr_w(value), - chunk, size); - if (size) - nd2= msi_realloc(newdata,(size + chunk)); - else - nd2= msi_alloc(chunk); - newdata = nd2; - memcpy(&newdata[size],value,chunk); - size+=chunk; - msi_free(value); - } - else if (failcount && *failcount >=0 ) - (*failcount)++; - - progress = mark2+1; - } - - TRACE("after everything %s\n",debugstr_wn((LPWSTR)newdata, - size/sizeof(WCHAR))); - - *data = (LPWSTR)newdata; - return size / sizeof(WCHAR); -} - + } + + *data = format.deformatted; + *len = format.len; + + msi_free(str); + free_stack(stack); + free_stack(temp); + + return ERROR_SUCCESS; +} UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, LPDWORD size ) @@ -626,9 +876,7 @@ TRACE("(%s)\n",debugstr_w(rec)); - len = deformat_string_internal(package,rec,&deformated, - rec ? strlenW(rec) : 0, record, NULL); - + deformat_string_internal(package, rec, &deformated, &len, record, NULL); if (buffer) { if (*size>len) @@ -770,8 +1018,8 @@ goto done; save = len + 1; - len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, value, -1, szResult, *sz, NULL, NULL); + len = WideCharToMultiByte(CP_ACP, 0, value, len + 1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, value, len, szResult, *sz, NULL, NULL); if (szResult && len > *sz) { Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=32… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.c (original) +++ trunk/reactos/dll/win32/msi/msi.c Sun Feb 10 16:16:32 2008 @@ -1519,6 +1519,10 @@ LPWSTR szwFilePath = NULL, lpwVersionBuff = NULL, lpwLangBuff = NULL; UINT ret = ERROR_OUTOFMEMORY; + if ((lpVersionBuf && !pcchVersionBuf) || + (lpLangBuf && !pcchLangBuf)) + return ERROR_INVALID_PARAMETER; + if( szFilePath ) { szwFilePath = strdupAtoW( szFilePath ); @@ -1543,12 +1547,12 @@ ret = MsiGetFileVersionW(szwFilePath, lpwVersionBuff, pcchVersionBuf, lpwLangBuff, pcchLangBuf); - if( lpwVersionBuff ) + if( (ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && lpwVersionBuff ) WideCharToMultiByte(CP_ACP, 0, lpwVersionBuff, -1, - lpVersionBuf, *pcchVersionBuf, NULL, NULL); - if( lpwLangBuff ) + lpVersionBuf, *pcchVersionBuf + 1, NULL, NULL); + if( (ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && lpwLangBuff ) WideCharToMultiByte(CP_ACP, 0, lpwLangBuff, -1, - lpLangBuf, *pcchLangBuf, NULL, NULL); + lpLangBuf, *pcchLangBuf + 1, NULL, NULL); end: msi_free(szwFilePath); @@ -1569,7 +1573,7 @@ '%','d','.','%','d','.','%','d','.','%','d',0}; static const WCHAR szLangFormat[] = {'%','d',0}; UINT ret = 0; - DWORD dwVerLen; + DWORD dwVerLen, gle; LPVOID lpVer = NULL; VS_FIXEDFILEINFO *ffi; UINT puLen; @@ -1579,9 +1583,21 @@ lpVersionBuf, pcchVersionBuf?*pcchVersionBuf:0, lpLangBuf, pcchLangBuf?*pcchLangBuf:0); + if ((lpVersionBuf && !pcchVersionBuf) || + (lpLangBuf && !pcchLangBuf)) + return ERROR_INVALID_PARAMETER; + dwVerLen = GetFileVersionInfoSizeW(szFilePath, NULL); if( !dwVerLen ) - return GetLastError(); + { + gle = GetLastError(); + if (gle == ERROR_BAD_PATHNAME) + return ERROR_FILE_NOT_FOUND; + else if (gle == ERROR_RESOURCE_DATA_NOT_FOUND) + return ERROR_FILE_INVALID; + + return gle; + } lpVer = msi_alloc(dwVerLen); if( !lpVer ) @@ -1595,7 +1611,8 @@ ret = GetLastError(); goto end; } - if( lpVersionBuf && pcchVersionBuf && *pcchVersionBuf ) + + if (pcchVersionBuf) { if( VerQueryValueW(lpVer, szVersionResource, (LPVOID*)&ffi, &puLen) && (puLen > 0) ) @@ -1603,24 +1620,32 @@ wsprintfW(tmp, szVersionFormat, HIWORD(ffi->dwFileVersionMS), LOWORD(ffi->dwFileVersionMS), HIWORD(ffi->dwFileVersionLS), LOWORD(ffi->dwFileVersionLS)); - lstrcpynW(lpVersionBuf, tmp, *pcchVersionBuf); - *pcchVersionBuf = lstrlenW(lpVersionBuf); + if (lpVersionBuf) lstrcpynW(lpVersionBuf, tmp, *pcchVersionBuf); + + if (lstrlenW(tmp) >= *pcchVersionBuf) + ret = ERROR_MORE_DATA; + + *pcchVersionBuf = lstrlenW(tmp); } else { - *lpVersionBuf = 0; + if (lpVersionBuf) *lpVersionBuf = 0; *pcchVersionBuf = 0; } } - if( lpLangBuf && pcchLangBuf && *pcchLangBuf ) + if (pcchLangBuf) { DWORD lang = GetUserDefaultLangID(); FIXME("Retrieve language from file\n"); wsprintfW(tmp, szLangFormat, lang); - lstrcpynW(lpLangBuf, tmp, *pcchLangBuf); - *pcchLangBuf = lstrlenW(lpLangBuf); + if (lpLangBuf) lstrcpynW(lpLangBuf, tmp, *pcchLangBuf); + + if (lstrlenW(tmp) >= *pcchLangBuf) + ret = ERROR_MORE_DATA; + + *pcchLangBuf = lstrlenW(tmp); } end: Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c (original) +++ trunk/reactos/dll/win32/msi/registry.c Sun Feb 10 16:16:32 2008 @@ -478,21 +478,17 @@ return ERROR_FUNCTION_FAILED; size = sizeof(buf); - if (!GetTokenInformation(token, TokenUser, (void *)buf, size, &size)) - { + if (!GetTokenInformation(token, TokenUser, (void *)buf, size, &size)) { CloseHandle(token); return ERROR_FUNCTION_FAILED; } user = (PTOKEN_USER)buf; - if (!ConvertSidToStringSidW(user->User.Sid, usersid)) - { + if (!ConvertSidToStringSidW(user->User.Sid, usersid)) { CloseHandle(token); return ERROR_FUNCTION_FAILED; } - CloseHandle(token); - return ERROR_SUCCESS; } @@ -666,7 +662,7 @@ else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -743,7 +739,7 @@ else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -768,7 +764,7 @@ sprintfW(keypath, szUserDataComp_fmt, usersid, comp); - msi_free(usersid); + LocalFree(usersid); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } @@ -798,7 +794,7 @@ else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -828,7 +824,7 @@ else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -853,7 +849,7 @@ sprintfW(keypath, szUserDataProd_fmt, usersid, squished_pc); - msi_free(usersid); + LocalFree(usersid); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } @@ -1043,7 +1039,7 @@ } sprintfW(keypath, szInstaller_LocalManagedProd_fmt, usersid, squished_pc); - msi_free(usersid); + LocalFree(usersid); if (create) return RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); Modified: trunk/reactos/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/streams.c (original) +++ trunk/reactos/dll/win32/msi/streams.c Sun Feb 10 16:16:32 2008 @@ -54,9 +54,9 @@ UINT row_size; } MSISTREAMSVIEW; -static BOOL add_stream_to_table(MSISTREAMSVIEW *sv, STREAM *stream, int index) -{ - if (index >= sv->max_streams) +static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, int size) +{ + if (size >= sv->max_streams) { sv->max_streams *= 2; sv->streams = msi_realloc(sv->streams, sv->max_streams * sizeof(STREAM *)); @@ -64,7 +64,6 @@ return FALSE; } - sv->streams[index] = stream; return TRUE; } @@ -139,12 +138,6 @@ } static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask) -{ - FIXME("(%p, %d, %p, %d): stub!\n", view, row, rec, mask); - return ERROR_SUCCESS; -} - -static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, BOOL temporary) { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; STREAM *stream; @@ -156,7 +149,10 @@ ULONG count; UINT r = ERROR_FUNCTION_FAILED; - TRACE("(%p, %p, %d)\n", view, rec, temporary); + TRACE("(%p, %p)\n", view, rec); + + if (row > sv->num_rows) + return ERROR_FUNCTION_FAILED; r = MSI_RecordGetIStream(rec, 2, &stm); if (r != ERROR_SUCCESS) @@ -201,8 +197,7 @@ IStorage_OpenStream(sv->db->storage, name, 0, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); - if (!add_stream_to_table(sv, stream, sv->num_rows++)) - goto done; + sv->streams[row] = stream; done: msi_free(name); @@ -211,6 +206,16 @@ IStream_Release(stm); return r; +} + +static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, BOOL temporary) +{ + MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + + if (!streams_set_table_size(sv, ++sv->num_rows)) + return ERROR_FUNCTION_FAILED; + + return STREAMS_set_row(view, sv->num_rows - 1, rec, 0); } static UINT STREAMS_delete_row(struct tagMSIVIEW *view, UINT row) @@ -278,6 +283,52 @@ return ERROR_SUCCESS; } +static UINT streams_find_row(MSISTREAMSVIEW *sv, MSIRECORD *rec, UINT *row) +{ + LPCWSTR str; + UINT i, id, data; + + str = MSI_RecordGetString(rec, 1); + msi_string2idW(sv->db->strings, str, &id); + + for (i = 0; i < sv->num_rows; i++) + { + STREAMS_fetch_int(&sv->view, i, 1, &data); + + if (data == id) + { + *row = i; + return ERROR_SUCCESS; + } + } + + return ERROR_FUNCTION_FAILED; +} + +static UINT streams_modify_update(struct tagMSIVIEW *view, MSIRECORD *rec) +{ + MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + UINT r, row; + + r = streams_find_row(sv, rec, &row); + if (r != ERROR_SUCCESS) + return ERROR_FUNCTION_FAILED; + + return STREAMS_set_row(view, row, rec, 0); +} + +static UINT streams_modify_assign(struct tagMSIVIEW *view, MSIRECORD *rec) +{ + MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + UINT r, row; + + r = streams_find_row(sv, rec, &row); + if (r == ERROR_SUCCESS) + return streams_modify_update(view, rec); + + return STREAMS_insert_row(view, rec, FALSE); +} + static UINT STREAMS_modify(struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row) { UINT r; @@ -286,15 +337,21 @@ switch (eModifyMode) { + case MSIMODIFY_ASSIGN: + r = streams_modify_assign(view, rec); + break; + case MSIMODIFY_INSERT: r = STREAMS_insert_row(view, rec, FALSE); break; + case MSIMODIFY_UPDATE: + r = streams_modify_update(view, rec); + break; + case MSIMODIFY_VALIDATE_NEW: case MSIMODIFY_INSERT_TEMPORARY: - case MSIMODIFY_UPDATE: case MSIMODIFY_REFRESH: - case MSIMODIFY_ASSIGN: case MSIMODIFY_REPLACE: case MSIMODIFY_MERGE: case MSIMODIFY_DELETE: @@ -425,11 +482,13 @@ STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); CoTaskMemFree(stat.pwcsName); - if (!add_stream_to_table(sv, stream, count++)) + if (!streams_set_table_size(sv, ++count)) { count = -1; break; } + + sv->streams[count - 1] = stream; } IEnumSTATSTG_Release(stgenum);

16 years, 8 months

[fireball] 32260: - Fix a leakage during DC deletion (introduced in revision 773), spotted by Samuel Serapion.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 10 16:06:53 2008 New Revision: 32260 URL: http://svn.reactos.org/svn/reactos?rev=32260&view=rev Log: - Fix a leakage during DC deletion (introduced in revision 773), spotted by Samuel Serapion. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sun Feb 10 16:06:53 2008 @@ -997,9 +997,7 @@ { NtGdiDeleteObject (DCToDelete->w.hGCClipRgn); } -#if 0 /* FIXME */ PATH_DestroyGdiPath (&DCToDelete->w.path); -#endif DC_UnlockDc( DCToDelete ); DC_FreeDC ( hDC );

16 years, 8 months

[fireball] 32259: - Add LSTATUS definition.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 10 16:00:31 2008 New Revision: 32259 URL: http://svn.reactos.org/svn/reactos?rev=32259&view=rev Log: - Add LSTATUS definition. Modified: trunk/reactos/include/psdk/winreg.h Modified: trunk/reactos/include/psdk/winreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winreg.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winreg.h (original) +++ trunk/reactos/include/psdk/winreg.h Sun Feb 10 16:00:31 2008 @@ -54,6 +54,7 @@ #ifndef RC_INVOKED typedef ACCESS_MASK REGSAM; +typedef LONG LSTATUS; typedef struct value_entA { LPSTR ve_valuename; DWORD ve_valuelen;

16 years, 8 months

[greatlrd] 32258: Finsh ks.h header time to test it in trunk before it merges down

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Feb 10 15:58:54 2008 New Revision: 32258 URL: http://svn.reactos.org/svn/reactos?rev=32258&view=rev Log: Finsh ks.h header time to test it in trunk before it merges down Modified: branches/reactx/reactos/include/dxsdk/ks.h Modified: branches/reactx/reactos/include/dxsdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks… ============================================================================== --- branches/reactx/reactos/include/dxsdk/ks.h (original) +++ branches/reactx/reactos/include/dxsdk/ks.h Sun Feb 10 15:58:54 2008 @@ -3281,6 +3281,204 @@ KSDDKAPI KSOBJECTTYPE NTAPI KsGetObjectTypeFromFileObject(IN PFILE_OBJECT FileObject); + + KSDDKAPI PKSGATE NTAPI + KsFilterGetAndGate(IN PKSFILTER Filter); + + KSDDKAPI void NTAPI + KsFilterAcquireProcessingMutex(IN PKSFILTER Filter); + + KSDDKAPI void NTAPI + KsFilterReleaseProcessingMutex(IN PKSFILTER Filter); + + KSDDKAPI void NTAPI + KsFilterAttemptProcessing(IN PKSFILTER Filter, + IN BOOLEAN Asynchronous); + + KSDDKAPI PKSGATE NTAPI + KsPinGetAndGate(IN PKSPIN Pin); + + KSDDKAPI void NTAPI + KsPinAttachAndGate(IN PKSPIN Pin, + IN PKSGATE AndGate OPTIONAL); + + KSDDKAPI void NTAPI + KsPinAttachOrGate(IN PKSPIN Pin, + IN PKSGATE OrGate OPTIONAL); + + KSDDKAPI void NTAPI + KsPinAcquireProcessingMutex(IN PKSPIN Pin); + + KSDDKAPI void NTAPI + KsPinReleaseProcessingMutex(IN PKSPIN Pin); + + KSDDKAPI BOOLEAN NTAPI + KsProcessPinUpdate(IN PKSPROCESSPIN ProcessPin); + + KSDDKAPI void NTAPI + KsPinGetCopyRelationships(IN PKSPIN Pin, + OUT PKSPIN* CopySource, + OUT PKSPIN* DelegateBranch); + + KSDDKAPI void NTAPI + KsPinAttemptProcessing(IN PKSPIN Pin, + IN BOOLEAN Asynchronous); + + KSDDKAPI PVOID NTAPI + KsGetParent(IN PVOID Object); + + KSDDKAPI PKSFILTER NTAPI + KsPinGetParentFilter(IN PKSPIN Pin); + + KSDDKAPI PVOID NTAPI + KsGetFirstChild(IN PVOID Object); + + KSDDKAPI ULONG NTAPI + KsFilterGetChildPinCount(IN PKSFILTER Filter, + IN ULONG PinId); + + KSDDKAPI PKSPIN NTAPI + KsFilterGetFirstChildPin(IN PKSFILTER Filter, + IN ULONG PinId); + + KSDDKAPI PVOID NTAPI + KsGetNextSibling(IN PVOID Object); + + KSDDKAPI PKSPIN NTAPI + KsPinGetNextSiblingPin(IN PKSPIN Pin); + + KSDDKAPI PKSDEVICE NTAPI + KsGetDevice(IN PVOID Object); + + KSDDKAPI PKSFILTER NTAPI + KsGetFilterFromIrp(IN PIRP Irp); + + KSDDKAPI PKSPIN NTAPI + KsGetPinFromIrp(IN PIRP Irp); + + KSDDKAPI ULONG NTAPI + KsGetNodeIdFromIrp(IN PIRP Irp); + + KSDDKAPI void NTAPI + KsAcquireControl(IN PVOID Object); + + KSDDKAPI void NTAPI + KsReleaseControl(IN PVOID Object); + + KSDDKAPI NTSTATUS NTAPI + KsAddItemToObjectBag(IN KSOBJECT_BAG ObjectBag, + IN PVOID Item, + IN PFNKSFREE Free OPTIONAL); + + KSDDKAPI ULONG NTAPI + KsRemoveItemFromObjectBag(IN KSOBJECT_BAG ObjectBag, + IN PVOID Item, + IN BOOLEAN Free); + + KSDDKAPI NTSTATUS NTAPI + KsAllocateObjectBag(IN PKSDEVICE Device, + OUT KSOBJECT_BAG* ObjectBag); + + KSDDKAPI void NTAPI + KsFreeObjectBag(IN KSOBJECT_BAG ObjectBag); + + KSDDKAPI NTSTATUS NTAPI + KsCopyObjectBagItems(IN KSOBJECT_BAG ObjectBagDestination, + IN KSOBJECT_BAG ObjectBagSource); + + KSDDKAPI NTSTATUS NTAPI + _KsEdit(IN KSOBJECT_BAG ObjectBag, + IN OUT PVOID* PointerToPointerToItem, + IN ULONG NewSize, + IN ULONG OldSize, + IN ULONG Tag); + + KSDDKAPI NTSTATUS NTAPI + KsRegisterFilterWithNoKSPins(IN PDEVICE_OBJECT DeviceObject, + IN const GUID * InterfaceClassGUID, + IN ULONG PinCount, + IN BOOL * PinDirection, + IN KSPIN_MEDIUM * MediumList, + IN OPTIONAL GUID * CategoryList); + + KSDDKAPI NTSTATUS NTAPI + KsFilterCreatePinFactory (IN PKSFILTER Filter, + IN const KSPIN_DESCRIPTOR_EX *const PinDescriptor, + OUT PULONG PinID); + + KSDDKAPI NTSTATUS NTAPI + KsFilterCreateNode (IN PKSFILTER Filter, + IN const KSNODE_DESCRIPTOR *const NodeDescriptor, + OUT PULONG NodeID); + + KSDDKAPI NTSTATUS NTAPI + KsFilterAddTopologyConnections (IN PKSFILTER Filter, + IN ULONG NewConnectionsCount, + IN const KSTOPOLOGY_CONNECTION *const NewTopologyConnections); + + KSDDKAPI NTSTATUS NTAPI + KsPinGetConnectedPinInterface(IN PKSPIN Pin, + IN const GUID* InterfaceId, + OUT PVOID* Interface); + + KSDDKAPI PFILE_OBJECT NTAPI + KsPinGetConnectedPinFileObject(IN PKSPIN Pin); + + KSDDKAPI PDEVICE_OBJECT NTAPI + KsPinGetConnectedPinDeviceObject(IN PKSPIN Pin); + + KSDDKAPI NTSTATUS NTAPI + KsPinGetConnectedFilterInterface(IN PKSPIN Pin, + IN const GUID* InterfaceId, + OUT PVOID* Interface); + + KSDDKAPI VOID NTAPI + KsPinSetPinClockTime(IN PKSPIN Pin, + IN LONGLONG Time); + + KSDDKAPI NTSTATUS NTAPI + KsPinSubmitFrame(IN PKSPIN Pin, + IN PVOID Data OPTIONAL, + IN ULONG Size OPTIONAL, + IN PKSSTREAM_HEADER StreamHeader OPTIONAL, + IN PVOID Context OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsPinSubmitFrameMdl(IN PKSPIN Pin, + IN PMDL Mdl OPTIONAL, + IN PKSSTREAM_HEADER StreamHeader OPTIONAL, + IN PVOID Context OPTIONAL); + + KSDDKAPI void NTAPI + KsPinRegisterFrameReturnCallback(IN PKSPIN Pin, + IN PFNKSPINFRAMERETURN FrameReturn); + + KSDDKAPI void NTAPI + KsPinRegisterIrpCompletionCallback(IN PKSPIN Pin, + IN PFNKSPINIRPCOMPLETION IrpCompletion); + + KSDDKAPI void NTAPI + KsPinRegisterHandshakeCallback(IN PKSPIN Pin, + IN PFNKSPINHANDSHAKE Handshake); + + KSDDKAPI void NTAPI + KsFilterRegisterPowerCallbacks(IN PKSFILTER Filter, + IN PFNKSFILTERPOWER Sleep OPTIONAL, + IN PFNKSFILTERPOWER Wake OPTIONAL); + + KSDDKAPI void NTAPI + KsPinRegisterPowerCallbacks(IN PKSPIN Pin, + IN PFNKSPINPOWER Sleep OPTIONAL, + IN PFNKSPINPOWER Wake OPTIONAL); + + #define KsDispatchFastWriteFailure KsDispatchFastReadFailure + #define KsDeleteFilterFactory(FilterFactory) KsFreeObjectCreateItemsByContext(\ + *(KSDEVICE_HEADER *)(KsFilterFactoryGetParentDevice(FilterFactory)->FunctionalDeviceObject->DeviceExtension), FilterFactory) + + #define KsEdit(Object,PointerToPointer,Tag) _KsEdit((Object)->Bag, (PVOID*)(PointerToPointer), sizeof(**(PointerToPointer)), sizeof(**(PointerToPointer)), (Tag)) + #define KsEditSized(Object,PointerToPointer,NewSize,OldSize,Tag) _KsEdit((Object)->Bag,(PVOID*)(PointerToPointer),(NewSize),(OldSize),(Tag)) + + #define KsDiscard(Object,Pointer) KsRemoveItemFromObjectBag((Object)->Bag, (PVOID)(Pointer), TRUE) void _inline KsFilterAddEvent(IN PKSFILTER Filter, IN PKSEVENT_ENTRY EventEntry) @@ -3306,18 +3504,160 @@ KsGenerateEvents(Pin, EventSet, EventId, DataSize, Data, CallBack, CallBackContext); } - - - - - - - - -#define KsDispatchFastWriteFailure KsDispatchFastReadFailure -#define KsDeleteFilterFactory(FilterFactory) KsFreeObjectCreateItemsByContext(\ - *(KSDEVICE_HEADER *)(KsFilterFactoryGetParentDevice(FilterFactory)->FunctionalDeviceObject->DeviceExtension), FilterFactory) - + PKSFILTER __inline KsGetFilterFromFileObject(IN PFILE_OBJECT FileObject) + { + return (PKSFILTER) KsGetObjectFromFileObject(FileObject); + } + + PKSPIN __inline KsGetPinFromFileObject(IN PFILE_OBJECT FileObject) + { + return (PKSPIN) KsGetObjectFromFileObject(FileObject); + } + + PKSDEVICE __inline KsFilterFactoryGetParentDevice(IN PKSFILTERFACTORY FilterFactory) + { + return (PKSDEVICE) KsGetParent((PVOID) FilterFactory); + } + + PKSFILTERFACTORY __inline KsFilterGetParentFilterFactory(IN PKSFILTER Filter) + { + return (PKSFILTERFACTORY) KsGetParent((PVOID) Filter); + } + + PKSFILTERFACTORY __inline KsDeviceGetFirstChildFilterFactory(IN PKSDEVICE Device) + { + return (PKSFILTERFACTORY) KsGetFirstChild((PVOID) Device); + } + + PKSFILTER __inline KsFilterFactoryGetFirstChildFilter(IN PKSFILTERFACTORY FilterFactory) + { + return (PKSFILTER) KsGetFirstChild((PVOID) FilterFactory); + } + + + PKSFILTERFACTORY __inline KsFilterFactoryGetNextSiblingFilterFactory(IN PKSFILTERFACTORY FilterFactory) + { + return (PKSFILTERFACTORY) KsGetNextSibling((PVOID) FilterFactory); + } + + PKSFILTER __inline KsFilterGetNextSiblingFilter(IN PKSFILTER Filter) + { + return (PKSFILTER) KsGetNextSibling((PVOID) Filter); + } + + PKSDEVICE __inline KsFilterFactoryGetDevice(IN PKSFILTERFACTORY FilterFactory) + { + return KsGetDevice((PVOID) FilterFactory); + } + + PKSDEVICE __inline KsFilterGetDevice(IN PKSFILTER Filter) + { + return KsGetDevice((PVOID) Filter); + } + + PKSDEVICE __inline KsPinGetDevice(IN PKSPIN Pin) + { + return KsGetDevice((PVOID) Pin); + } + + void __inline KsFilterAcquireControl(IN PKSFILTER Filter) + { + KsAcquireControl((PVOID) Filter); + } + + void __inline KsFilterReleaseControl(IN PKSFILTER Filter) + { + KsReleaseControl((PVOID) Filter); + } + + void __inline KsPinAcquireControl(IN PKSPIN Pin) + { + KsAcquireControl((PVOID) Pin); + } + + void __inline KsPinReleaseControl(IN PKSPIN Pin) + { + KsReleaseControl((PVOID) Pin); + } + + #if defined(_UNKNOWN_H_) || defined(__IUnknown_INTERFACE_DEFINED__) + + KSDDKAPI NTSTATUS NTAPI + KsPinGetReferenceClockInterface(IN PKSPIN Pin, + OUT PIKSREFERENCECLOCK* Interface); + + KSDDKAPI PUNKNOWN NTAPI + KsRegisterAggregatedClientUnknown(IN PVOID Object, + IN PUNKNOWN ClientUnknown); + + KSDDKAPI PUNKNOWN NTAPI + KsGetOuterUnknown(IN PVOID Object); + + PUNKNOWN __inline KsDeviceRegisterAggregatedClientUnknown(IN PKSDEVICE Device, IN PUNKNOWN ClientUnknown) + { + return KsRegisterAggregatedClientUnknown((PVOID) Device,ClientUnknown); + } + + PUNKNOWN __inline KsDeviceGetOuterUnknown(IN PKSDEVICE Device) + { + return KsGetOuterUnknown((PVOID) Device); + } + + PUNKNOWN __inline KsFilterFactoryRegisterAggregatedClientUnknown(IN PKSFILTERFACTORY FilterFactory, IN PUNKNOWN ClientUnknown) + { + return KsRegisterAggregatedClientUnknown((PVOID) FilterFactory,ClientUnknown); + } + + PUNKNOWN __inline KsFilterFactoryGetOuterUnknown(IN PKSFILTERFACTORY FilterFactory) + { + return KsGetOuterUnknown((PVOID) FilterFactory); + } + + PUNKNOWN __inline KsFilterRegisterAggregatedClientUnknown(IN PKSFILTER Filter, IN PUNKNOWN ClientUnknown) + { + return KsRegisterAggregatedClientUnknown((PVOID) Filter,ClientUnknown); + } + + PUNKNOWN __inline KsFilterGetOuterUnknown(IN PKSFILTER Filter) + { + return KsGetOuterUnknown((PVOID) Filter); + } + + PUNKNOWN __inline KsPinRegisterAggregatedClientUnknown(IN PKSPIN Pin, IN PUNKNOWN ClientUnknown ) + { + return KsRegisterAggregatedClientUnknown((PVOID) Pin,ClientUnknown); + } + + PUNKNOWN __inline KsPinGetOuterUnknown(IN PKSPIN Pin) + { + return KsGetOuterUnknown((PVOID) Pin); + } + #endif +#else + #if !defined( KS_NO_CREATE_FUNCTIONS ) + + KSDDKAPI DWORD WINAPI + KsCreateAllocator(IN HANDLE ConnectionHandle, + IN PKSALLOCATOR_FRAMING AllocatorFraming, + OUT PHANDLE AllocatorHandle); + + KSDDKAPI DWORD NTAPI + KsCreateClock(IN HANDLE ConnectionHandle, + IN PKSCLOCK_CREATE ClockCreate, + OUT PHANDLE ClockHandle); + + KSDDKAPI DWORD WINAPI + KsCreatePin(IN HANDLE FilterHandle, + IN PKSPIN_CONNECT Connect, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE ConnectionHandle); + + KSDDKAPI DWORD WINAPI + KsCreateTopologyNode(IN HANDLE ParentHandle, + IN PKSNODE_CREATE NodeCreate, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE NodeHandle); + #endif #endif @@ -3327,4 +3667,8 @@ } #endif +#define DENY_USERMODE_ACCESS( pIrp, CompleteRequest ) if ( pIrp->RequestorMode != KernelMode ) { pIrp->IoStatus.Information = 0; \ + pIrp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; if ( CompleteRequest ) IoCompleteRequest ( pIrp, IO_NO_INCREMENT ); \ + return STATUS_INVALID_DEVICE_REQUEST; } + #endif // _KS_

16 years, 8 months

[fireball] 32257: - Winesync to Wine-0.9.55.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 10 15:33:16 2008 New Revision: 32257 URL: http://svn.reactos.org/svn/reactos?rev=32257&view=rev Log: - Winesync to Wine-0.9.55. Modified: trunk/rostests/winetests/ole32/marshal.c trunk/rostests/winetests/ole32/moniker.c trunk/rostests/winetests/ole32/ole32.rbuild trunk/rostests/winetests/ole32/usrmarshal.c Modified: trunk/rostests/winetests/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/marshal.c… ============================================================================== --- trunk/rostests/winetests/ole32/marshal.c (original) +++ trunk/rostests/winetests/ole32/marshal.c Sun Feb 10 15:33:16 2008 @@ -1831,15 +1831,19 @@ } } -static void test_message_reentrancy(void) +static void register_test_window(void) { WNDCLASS wndclass; - MSG msg; memset(&wndclass, 0, sizeof(wndclass)); wndclass.lpfnWndProc = window_proc; wndclass.lpszClassName = "WineCOMTest"; RegisterClass(&wndclass); +} + +static void test_message_reentrancy(void) +{ + MSG msg; hwnd_app = CreateWindow("WineCOMTest", NULL, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, 0); ok(hwnd_app != NULL, "Window creation failed\n"); @@ -1852,6 +1856,7 @@ TranslateMessage(&msg); DispatchMessage(&msg); } + DestroyWindow(hwnd_app); } static HRESULT WINAPI TestMsg_IClassFactory_CreateInstance( @@ -1917,6 +1922,7 @@ TranslateMessage(&msg); DispatchMessage(&msg); } + DestroyWindow(hwnd_app); } static void test_WM_QUIT_handling(void) @@ -2569,7 +2575,7 @@ quit_event = CreateEvent(NULL, FALSE, FALSE, "Wine COM Test Quit Event"); SetEvent(quit_event); - WaitForSingleObject(process, INFINITE); + winetest_wait_child_process( process ); CloseHandle(quit_event); CloseHandle(process); } @@ -2873,7 +2879,6 @@ START_TEST(marshal) { - WNDCLASS wndclass; HMODULE hOle32 = GetModuleHandle("ole32"); int argc; char **argv; @@ -2890,11 +2895,7 @@ return; } - /* register a window class used in several tests */ - memset(&wndclass, 0, sizeof(wndclass)); - wndclass.lpfnWndProc = window_proc; - wndclass.lpszClassName = "WineCOMTest"; - RegisterClass(&wndclass); + register_test_window(); test_cocreateinstance_proxy(); Modified: trunk/rostests/winetests/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/moniker.c… ============================================================================== --- trunk/rostests/winetests/ole32/moniker.c (original) +++ trunk/rostests/winetests/ole32/moniker.c Sun Feb 10 15:33:16 2008 @@ -1311,7 +1311,7 @@ ok(hr == MK_E_UNAVAILABLE, "IMoniker_GetTimeOfLastChange should return MK_E_UNAVAILABLE, not 0x%08x\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); - ok_ole_success(hr, IMoniker_BindToStorage); + ok_ole_success(hr, IMoniker_BindToObject); IUnknown_Release(unknown); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); @@ -1589,6 +1589,113 @@ IMoniker_Release(moniker); } +static void test_pointer_moniker(void) +{ + HRESULT hr; + IMoniker *moniker; + DWORD moniker_type; + DWORD hash; + IBindCtx *bindctx; + FILETIME filetime; + IMoniker *inverse; + IUnknown *unknown; + IStream *stream; + IROTData *rotdata; + LPOLESTR display_name; + + cLocks = 0; + + hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, NULL); + ok(hr == E_INVALIDARG, "CreatePointerMoniker(x, NULL) should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); + ok_ole_success(hr, CreatePointerMoniker); + if (!moniker) return; + + ok_more_than_one_lock(); + + /* Display Name */ + + hr = CreateBindCtx(0, &bindctx); + ok_ole_success(hr, CreateBindCtx); + + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); + ok(hr == E_NOTIMPL, "IMoniker_GetDisplayName should have returned E_NOTIMPL instead of 0x%08x\n", hr); + + IBindCtx_Release(bindctx); + + hr = IMoniker_IsDirty(moniker); + ok(hr == S_FALSE, "IMoniker_IsDirty should return S_FALSE, not 0x%08x\n", hr); + + /* IROTData::GetComparisonData test */ + + hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata); + ok(hr == E_NOINTERFACE, "IMoniker_QueryInterface(IID_IROTData) should have returned E_NOINTERFACE instead of 0x%08x\n", hr); + + /* Saving */ + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok_ole_success(hr, CreateStreamOnHGlobal); + + hr = IMoniker_Save(moniker, stream, TRUE); + ok(hr == E_NOTIMPL, "IMoniker_Save should have returned E_NOTIMPL instead of 0x%08x\n", hr); + + IStream_Release(stream); + + /* Hashing */ + hr = IMoniker_Hash(moniker, &hash); + ok_ole_success(hr, IMoniker_Hash); + ok(hash == (DWORD)&Test_ClassFactory, + "Hash value should have been 0x%08x, instead of 0x%08x\n", + (DWORD)&Test_ClassFactory, hash); + + /* IsSystemMoniker test */ + hr = IMoniker_IsSystemMoniker(moniker, &moniker_type); + ok_ole_success(hr, IMoniker_IsSystemMoniker); + ok(moniker_type == MKSYS_POINTERMONIKER, + "dwMkSys != MKSYS_POINTERMONIKER, instead was 0x%08x\n", + moniker_type); + + hr = IMoniker_Inverse(moniker, &inverse); + ok_ole_success(hr, IMoniker_Inverse); + IMoniker_Release(inverse); + + hr = CreateBindCtx(0, &bindctx); + ok_ole_success(hr, CreateBindCtx); + + /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); + ok(hr == S_OK, "IMoniker_IsRunning should return S_OK, not 0x%08x\n", hr); + + hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); + ok(hr == E_NOTIMPL, "IMoniker_GetTimeOfLastChange should return E_NOTIMPL, not 0x%08x\n", hr); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok_ole_success(hr, IMoniker_BindToObject); + IUnknown_Release(unknown); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok_ole_success(hr, IMoniker_BindToStorage); + IUnknown_Release(unknown); + + IMoniker_Release(moniker); + + ok_no_locks(); + + hr = CreatePointerMoniker(NULL, &moniker); + ok_ole_success(hr, CreatePointerMoniker); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_UNEXPECTED, "IMoniker_BindToObject should have returned E_UNEXPECTED instead of 0x%08x\n", hr); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_UNEXPECTED, "IMoniker_BindToStorage should have returned E_UNEXPECTED instead of 0x%08x\n", hr); + + IBindCtx_Release(bindctx); + + IMoniker_Release(moniker); +} + static void test_bind_context(void) { HRESULT hr; @@ -1700,6 +1807,7 @@ test_item_moniker(); test_anti_moniker(); test_generic_composite_moniker(); + test_pointer_moniker(); /* FIXME: test moniker creation funcs and parsing other moniker formats */ Modified: trunk/rostests/winetests/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole32.rbu… ============================================================================== --- trunk/rostests/winetests/ole32/ole32.rbuild (original) +++ trunk/rostests/winetests/ole32/ole32.rbuild Sun Feb 10 15:33:16 2008 @@ -1,18 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="ole32_winetest" type="win32cui" installbase="bin" installname="ole32_winetest.exe" allowwarnings="true" entrypoint="0"> <include base="ole32_winetest">.</include> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> - <library>wine</library> - <library>oleaut32</library> - <library>ole32</library> - <library>user32</library> - <library>gdi32</library> - <library>advapi32</library> - <library>kernel32</library> - <library>uuid</library> - <library>ntdll</library> <file>clipboard.c</file> <file>compobj.c</file> <file>dragdrop.c</file> @@ -26,4 +18,14 @@ <file>storage32.c</file> <file>usrmarshal.c</file> <file>testlist.c</file> + <library>wine</library> + <library>oleaut32</library> + <library>ole32</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>uuid</library> + <library>ntdll</library> </module> +</group> Modified: trunk/rostests/winetests/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/usrmarsha… ============================================================================== --- trunk/rostests/winetests/ole32/usrmarshal.c (original) +++ trunk/rostests/winetests/ole32/usrmarshal.c Sun Feb 10 15:33:16 2008 @@ -441,31 +441,31 @@ 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); + ok(size > 28, "size should be > 28 bytes, not %d\n", size); + trace("WdtpInterfacePointer_UserSize returned %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", + ok(*(DWORD *)wireip == 0x44, "wireip + 0x0 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 0x44, "wireip + 0x4 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 0x574f454d /* 'MEOW' */, "wireip + 0x8 should be 0x574f454d instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 0x1, "wireip + 0xc should be 0x1 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + iid = (const IID *)wireip; + ok(IsEqualIID(iid, &IID_IUnknown), + "wireip + 0x10 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); + ok(*(DWORD *)wireip == 0, "wireip + 0x1c should be 0 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 5, "wireip + 0x20 should be 5 instead of %d\n", *(DWORD *)wireip); wireip += sizeof(DWORD); /* the rest is dynamic so can't really be tested */ }

16 years, 8 months

[fireball] 32256: Winesync to Wine-0.9.55.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 10 15:26:59 2008 New Revision: 32256 URL: http://svn.reactos.org/svn/reactos?rev=32256&view=rev Log: Winesync to Wine-0.9.55. Modified: trunk/reactos/dll/win32/oleaut32/oleaut.c trunk/reactos/dll/win32/oleaut32/olefont.c trunk/reactos/dll/win32/oleaut32/olepicture.c trunk/reactos/dll/win32/oleaut32/safearray.c trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/typelib.h trunk/reactos/dll/win32/oleaut32/typelib16.c trunk/reactos/dll/win32/oleaut32/typelib2.c trunk/reactos/dll/win32/oleaut32/variant.c Modified: trunk/reactos/dll/win32/oleaut32/oleaut.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut.… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut.c (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut.c Sun Feb 10 15:26:59 2008 @@ -837,7 +837,7 @@ switch (fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDll); - OLEAUT32_hModule = (HMODULE)hInstDll; + OLEAUT32_hModule = hInstDll; break; case DLL_PROCESS_DETACH: break; Modified: trunk/reactos/dll/win32/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olefont… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olefont.c (original) +++ trunk/reactos/dll/win32/oleaut32/olefont.c Sun Feb 10 15:26:59 2008 @@ -1215,6 +1215,7 @@ return hres; } hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IFontDisp, ppTInfo); + ITypeLib_Release(tl); if (FAILED(hres)) { FIXME("Did not IDispatch typeinfo from typelib, hres %x\n",hres); } Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepict… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olepicture.c (original) +++ trunk/reactos/dll/win32/oleaut32/olepicture.c Sun Feb 10 15:26:59 2008 @@ -1237,6 +1237,7 @@ This->desc.picType = PICTYPE_BITMAP; OLEPictureImpl_SetBitmap(This); DGifCloseFile(gif); + HeapFree(GetProcessHeap(),0,bmi); HeapFree(GetProcessHeap(),0,bytes); return S_OK; } @@ -1277,7 +1278,7 @@ jd.err = pjpeg_std_error(&jerr); /* jpeg_create_decompress is a macro that expands to jpeg_CreateDecompress - see jpeglib.h * jpeg_create_decompress(&jd); */ - pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, (size_t) sizeof(struct jpeg_decompress_struct)); + pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); jd.src = &xjsm; ret=pjpeg_read_header(&jd,TRUE); jd.out_color_space = JCS_RGB; Modified: trunk/reactos/dll/win32/oleaut32/safearray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/safearr… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/safearray.c (original) +++ trunk/reactos/dll/win32/oleaut32/safearray.c Sun Feb 10 15:26:59 2008 @@ -805,7 +805,7 @@ if (!psa) return E_INVALIDARG; - if ((LONG)InterlockedDecrement( (LONG*) &psa->cLocks) < 0) + if (InterlockedDecrement( (LONG*) &psa->cLocks) < 0) { WARN("Unlocked but no lock held!\n"); InterlockedIncrement( (LONG*) &psa->cLocks); Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/tmarshal.c (original) +++ trunk/reactos/dll/win32/oleaut32/tmarshal.c Sun Feb 10 15:26:59 2008 @@ -1468,6 +1468,7 @@ hres = remoteresult; exit: + IRpcChannelBuffer_FreeBuffer(chanbuf,&msg); for (i = 0; i < nrofnames; i++) SysFreeString(names[i]); HeapFree(GetProcessHeap(),0,buf.base); Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.c (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.c Sun Feb 10 15:26:59 2008 @@ -2587,7 +2587,7 @@ ITypeInfoImpl **ppTI = &(pTypeLibImpl->pTypeInfo); int i; - for(i = 0; i<(int)tlbHeader.nrtypeinfos; i++) + for(i = 0; i < tlbHeader.nrtypeinfos; i++) { *ppTI = MSFT_DoTypeInfo(&cx, i, pTypeLibImpl); @@ -6249,7 +6249,7 @@ if(ref_type->pImpTLInfo->pImpTypeLib) { TRACE("typeinfo in imported typelib that is already loaded\n"); pTLib = (ITypeLib*)ref_type->pImpTLInfo->pImpTypeLib; - ITypeLib2_AddRef((ITypeLib*) pTLib); + ITypeLib2_AddRef(pTLib); result = S_OK; } else { TRACE("typeinfo in imported typelib that isn't already loaded\n"); Modified: trunk/reactos/dll/win32/oleaut32/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.h (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.h Sun Feb 10 15:26:59 2008 @@ -96,13 +96,13 @@ /*1*/MSFT_pSeg pTypeInfoTab; /* each type info get an entry of 0x64 bytes */ /* (25 ints) */ /*2*/MSFT_pSeg pImpInfo; /* table with info for imported types */ -/*3*/MSFT_pSeg pImpFiles; /* import libaries */ +/*3*/MSFT_pSeg pImpFiles; /* import libraries */ /*4*/MSFT_pSeg pRefTab; /* References table */ -/*5*/MSFT_pSeg pLibtab; /* always exists, alway same size (0x80) */ +/*5*/MSFT_pSeg pLibtab; /* always exists, always same size (0x80) */ /* hash table w offsets to guid????? */ /*6*/MSFT_pSeg pGuidTab; /* all guids are stored here together with */ /* offset in some table???? */ -/*7*/MSFT_pSeg res07; /* always created, alway same size (0x200) */ +/*7*/MSFT_pSeg res07; /* always created, always same size (0x200) */ /* purpose largely unknown */ /*8*/MSFT_pSeg pNametab; /* name tables */ /*9*/MSFT_pSeg pStringtab; /* string table */ @@ -120,10 +120,10 @@ /* base type info data */ typedef struct tagMSFT_TypeInfoBase { /*000*/ INT typekind; /* it is the TKIND_xxx */ - /* some byte alignment stuf */ + /* some byte alignment stuff */ INT memoffset; /* points past the file, if no elements */ INT res2; /* zero if no element, N*0x40 */ - INT res3; /* -1 if no lement, (N-1)*0x38 */ + INT res3; /* -1 if no element, (N-1)*0x38 */ /*010*/ INT res4; /* always? 3 */ INT res5; /* always? zero */ INT cElement; /* counts elements, HI=cVars, LO=cFuncs */ Modified: trunk/reactos/dll/win32/oleaut32/typelib16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib16.c (original) +++ trunk/reactos/dll/win32/oleaut32/typelib16.c Sun Feb 10 15:26:59 2008 @@ -91,7 +91,7 @@ wMaj,wMin,lcid); } else { sprintf(xguid,"<guid 0x%08x>",(DWORD)guid); - FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,(DWORD)lcid,path); + FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path); return E_FAIL; } plen = sizeof(pathname); Modified: trunk/reactos/dll/win32/oleaut32/typelib2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib2.c (original) +++ trunk/reactos/dll/win32/oleaut32/typelib2.c Sun Feb 10 15:26:59 2008 @@ -1225,7 +1225,7 @@ This->typeinfo->flags = uTypeFlags; - if (uTypeFlags & 0x1000) { + if (uTypeFlags & TYPEFLAG_FDISPATCHABLE) { MSFT_GuidEntry foo; int guidoffset; int fileoffset; Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.c (original) +++ trunk/reactos/dll/win32/oleaut32/variant.c Sun Feb 10 15:26:59 2008 @@ -2654,7 +2654,7 @@ * left [I] First variant * right [I] Second variant * lcid [I] LCID (locale identifier) for the comparison - * flags [I] Flags to be used in the comparision: + * flags [I] Flags to be used in the comparison: * NORM_IGNORECASE, NORM_IGNORENONSPACE, NORM_IGNORESYMBOLS, * NORM_IGNOREWIDTH, NORM_IGNOREKANATYPE, NORM_IGNOREKASHIDA * @@ -2677,9 +2677,9 @@ * is not an EMPTY variant. All four VT_RESERVED combinations have a * different meaning: * - BSTR and other: BSTR is always greater than the other variant. - * - BSTR|VT_RESERVED and other: a string comparision is performed. + * - BSTR|VT_RESERVED and other: a string comparison is performed. * - BSTR and other|VT_RESERVED: If the BSTR is a number a numeric - * comparision will take place else the BSTR is always greater. + * comparison will take place else the BSTR is always greater. * - BSTR|VT_RESERVED and other|VT_RESERVED: It seems that the other * variant is ignored and the return value depends only on the sign * of the BSTR if it is a number else the BSTR is always greater. A @@ -2763,7 +2763,7 @@ /* No VT_RESERVED set ==> BSTR always greater */ rc = VARCMP_GT; else if (breserv && !nreserv) { - /* BSTR has VT_RESERVED set. Do a string comparision */ + /* BSTR has VT_RESERVED set. Do a string comparison */ rc = VariantChangeTypeEx(&rv,nonbv,lcid,0,VT_BSTR); if (FAILED(rc)) return rc; @@ -2780,7 +2780,7 @@ the BSTR number */ rc = (V_R8(&lv) >= 0) ? VARCMP_GT : VARCMP_LT; else - /* Numeric comparision, will be handled below. + /* Numeric comparison, will be handled below. VARCMP_NULL used only to break out. */ rc = VARCMP_NULL; VariantClear(&lv);

16 years, 8 months

[fireball] 32255: Winesync to Wine-0.9.55.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 10 15:17:32 2008 New Revision: 32255 URL: http://svn.reactos.org/svn/reactos?rev=32255&view=rev Log: Winesync to Wine-0.9.55. Added: trunk/reactos/dll/win32/ole32/pointermoniker.c (with props) Modified: trunk/reactos/dll/win32/ole32/moniker.h trunk/reactos/dll/win32/ole32/ole32.rbuild trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/oleproxy.c trunk/reactos/dll/win32/ole32/regsvr.c trunk/reactos/dll/win32/ole32/rpc.c Modified: trunk/reactos/dll/win32/ole32/moniker.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.h?… ============================================================================== --- trunk/reactos/dll/win32/ole32/moniker.h (original) +++ trunk/reactos/dll/win32/ole32/moniker.h Sun Feb 10 15:17:32 2008 @@ -28,12 +28,14 @@ DEFINE_OLEGUID( CLSID_AntiMoniker, 0x305, 0, 0 ); DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 ); DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 ); +DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); HRESULT FileMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv); +HRESULT PointerMonikerCF_Create(REFIID riid, LPVOID *ppv); /* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable); Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.rbuild (original) +++ trunk/reactos/dll/win32/ole32/ole32.rbuild Sun Feb 10 15:17:32 2008 @@ -44,6 +44,7 @@ <file>ole32_main.c</file> <file>oleobj.c</file> <file>oleproxy.c</file> + <file>pointermoniker.c</file> <file>regsvr.c</file> <file>rpc.c</file> <file>stg_bigblockfile.c</file> Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec Sun Feb 10 15:17:32 2008 @@ -92,7 +92,7 @@ @ stdcall CreateItemMoniker(wstr wstr ptr) @ stub CreateObjrefMoniker @ stdcall CreateOleAdviseHolder(ptr) -@ stub CreatePointerMoniker #@ stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED +@ stdcall CreatePointerMoniker(ptr ptr) @ stdcall CreateStreamOnHGlobal(ptr long ptr) @ stdcall DllDebugObjectRPCHook(long ptr) @ stdcall -private DllGetClassObject (ptr ptr ptr) Modified: trunk/reactos/dll/win32/ole32/oleproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleproxy.c… ============================================================================== --- trunk/reactos/dll/win32/ole32/oleproxy.c (original) +++ trunk/reactos/dll/win32/ole32/oleproxy.c Sun Feb 10 15:17:32 2008 @@ -1030,6 +1030,8 @@ return CompositeMonikerCF_Create(iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker)) return ClassMonikerCF_Create(iid, ppv); + if (IsEqualCLSID(rclsid, &CLSID_PointerMoniker)) + return PointerMonikerCF_Create(iid, ppv); FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; Added: trunk/reactos/dll/win32/ole32/pointermoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/pointermon… ============================================================================== --- trunk/reactos/dll/win32/ole32/pointermoniker.c (added) +++ trunk/reactos/dll/win32/ole32/pointermoniker.c Sun Feb 10 15:17:32 2008 @@ -1,0 +1,654 @@ +/* + * Pointer Moniker Implementation + * + * Copyright 1999 Noomen Hamza + * Copyright 2008 Robert Shearman (for CodeWeavers) + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winuser.h" +#include "objbase.h" +#include "oleidl.h" +#include "wine/debug.h" +#include "moniker.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +/* PointerMoniker data structure */ +typedef struct PointerMonikerImpl{ + + const IMonikerVtbl* lpvtbl; /* VTable relative to the IMoniker interface.*/ + + LONG ref; /* reference counter for this object */ + + IUnknown *pObject; /* custom marshaler */ +} PointerMonikerImpl; + +static HRESULT WINAPI +PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + + TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + + /* Perform a sanity check on the parameters.*/ + if ( (This==0) || (ppvObject==0) ) + return E_INVALIDARG; + + /* Initialize the return parameter */ + *ppvObject = 0; + + /* Compare the riid with the interface IDs implemented by this object.*/ + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IPersist, riid) || + IsEqualIID(&IID_IPersistStream, riid) || + IsEqualIID(&IID_IMoniker, riid)) + *ppvObject = iface; + + /* Check that we obtained an interface.*/ + if ((*ppvObject)==0) + return E_NOINTERFACE; + + /* always increase the reference count by one when it is successful */ + IMoniker_AddRef(iface); + + return S_OK; +} + +/****************************************************************************** + * PointerMoniker_AddRef + ******************************************************************************/ +static ULONG WINAPI +PointerMonikerImpl_AddRef(IMoniker* iface) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + + TRACE("(%p)\n",This); + + return InterlockedIncrement(&This->ref); +} + +/****************************************************************************** + * PointerMoniker_Release + ******************************************************************************/ +static ULONG WINAPI +PointerMonikerImpl_Release(IMoniker* iface) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + ULONG ref; + + TRACE("(%p)\n",This); + + ref = InterlockedDecrement(&This->ref); + + /* destroy the object if there's no more reference on it */ + if (ref == 0) + { + if (This->pObject) IUnknown_Release(This->pObject); + HeapFree(GetProcessHeap(),0,This); + } + + return ref; +} + +/****************************************************************************** + * PointerMoniker_GetClassID + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID) +{ + TRACE("(%p,%p)\n",iface,pClassID); + + if (pClassID==NULL) + return E_POINTER; + + *pClassID = CLSID_PointerMoniker; + + return S_OK; +} + +/****************************************************************************** + * PointerMoniker_IsDirty + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_IsDirty(IMoniker* iface) +{ + /* Note that the OLE-provided implementations of the IPersistStream::IsDirty + method in the OLE-provided moniker interfaces always return S_FALSE because + their internal state never changes. */ + + TRACE("(%p)\n",iface); + + return S_FALSE; +} + +/****************************************************************************** + * PointerMoniker_Load + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_Load(IMoniker* iface,IStream* pStm) +{ + TRACE("(%p)\n", pStm); + + return E_NOTIMPL; +} + +/****************************************************************************** + * PointerMoniker_Save + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) +{ + TRACE("(%p, %d)\n", pStm, fClearDirty); + + return E_NOTIMPL; +} + +/****************************************************************************** + * PointerMoniker_GetSizeMax + * + * PARAMS + * pcbSize [out] Pointer to size of stream needed to save object + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize) +{ + TRACE("(%p,%p)\n",iface,pcbSize); + + if (!pcbSize) + return E_POINTER; + + pcbSize->u.LowPart = 0; + pcbSize->u.HighPart = 0; + + return E_NOTIMPL; +} + +/****************************************************************************** + * PointerMoniker_BindToObject + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, + REFIID riid, VOID** ppvResult) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + + TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + + if (!This->pObject) + return E_UNEXPECTED; + + return IUnknown_QueryInterface(This->pObject, riid, ppvResult); +} + +/****************************************************************************** + * PointerMoniker_BindToStorage + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, + REFIID riid, VOID** ppvResult) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + + TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + + if (!This->pObject) + return E_UNEXPECTED; + + return IUnknown_QueryInterface(This->pObject, riid, ppvResult); +} + +/****************************************************************************** + * PointerMoniker_Reduce + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, + IMoniker** ppmkToLeft, IMoniker** ppmkReduced) +{ + TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced); + + if (ppmkReduced==NULL) + return E_POINTER; + + PointerMonikerImpl_AddRef(iface); + + *ppmkReduced=iface; + + return MK_S_REDUCED_TO_SELF; +} +/****************************************************************************** + * PointerMoniker_ComposeWith + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, + BOOL fOnlyIfNotGeneric, IMoniker** ppmkComposite) +{ + + HRESULT res=S_OK; + DWORD mkSys,mkSys2; + IEnumMoniker* penumMk=0; + IMoniker *pmostLeftMk=0; + IMoniker* tempMkComposite=0; + + TRACE("(%p,%d,%p)\n", pmkRight, fOnlyIfNotGeneric, ppmkComposite); + + if ((ppmkComposite==NULL)||(pmkRight==NULL)) + return E_POINTER; + + *ppmkComposite=0; + + IMoniker_IsSystemMoniker(pmkRight,&mkSys); + + /* If pmkRight is an anti-moniker, the returned moniker is NULL */ + if(mkSys==MKSYS_ANTIMONIKER) + return res; + + else + /* if pmkRight is a composite whose leftmost component is an anti-moniker, */ + /* the returned moniker is the composite after the leftmost anti-moniker is removed. */ + + if(mkSys==MKSYS_GENERICCOMPOSITE){ + + res=IMoniker_Enum(pmkRight,TRUE,&penumMk); + + if (FAILED(res)) + return res; + + res=IEnumMoniker_Next(penumMk,1,&pmostLeftMk,NULL); + + IMoniker_IsSystemMoniker(pmostLeftMk,&mkSys2); + + if(mkSys2==MKSYS_ANTIMONIKER){ + + IMoniker_Release(pmostLeftMk); + + tempMkComposite=iface; + IMoniker_AddRef(iface); + + while(IEnumMoniker_Next(penumMk,1,&pmostLeftMk,NULL)==S_OK){ + + res=CreateGenericComposite(tempMkComposite,pmostLeftMk,ppmkComposite); + + IMoniker_Release(tempMkComposite); + IMoniker_Release(pmostLeftMk); + + tempMkComposite=*ppmkComposite; + IMoniker_AddRef(tempMkComposite); + } + return res; + } + else + return CreateGenericComposite(iface,pmkRight,ppmkComposite); + } + /* If pmkRight is not an anti-moniker, the method combines the two monikers into a generic + composite if fOnlyIfNotGeneric is FALSE; if fOnlyIfNotGeneric is TRUE, the method returns + a NULL moniker and a return value of MK_E_NEEDGENERIC */ + else + if (!fOnlyIfNotGeneric) + return CreateGenericComposite(iface,pmkRight,ppmkComposite); + + else + return MK_E_NEEDGENERIC; +} + +/****************************************************************************** + * PointerMoniker_Enum + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker) +{ + TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker); + + if (ppenumMoniker == NULL) + return E_POINTER; + + *ppenumMoniker = NULL; + + return S_OK; +} + +/****************************************************************************** + * PointerMoniker_IsEqual + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + DWORD mkSys; + + TRACE("(%p,%p)\n",iface,pmkOtherMoniker); + + if (pmkOtherMoniker==NULL) + return S_FALSE; + + IMoniker_IsSystemMoniker(pmkOtherMoniker,&mkSys); + + if (mkSys==MKSYS_POINTERMONIKER) + { + PointerMonikerImpl *pOtherMoniker = (PointerMonikerImpl *)pmkOtherMoniker; + return This->pObject == pOtherMoniker->pObject ? S_OK : S_FALSE; + } + else + return S_FALSE; +} + +/****************************************************************************** + * PointerMoniker_Hash + ******************************************************************************/ +static HRESULT WINAPI PointerMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + + if (pdwHash==NULL) + return E_POINTER; + + *pdwHash = (DWORD)This->pObject; + + return S_OK; +} + +/****************************************************************************** + * PointerMoniker_IsRunning + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_IsRunning(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, + IMoniker* pmkNewlyRunning) +{ + TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning); + + return S_OK; +} + +/****************************************************************************** + * PointerMoniker_GetTimeOfLastChange + ******************************************************************************/ +static HRESULT WINAPI PointerMonikerImpl_GetTimeOfLastChange(IMoniker* iface, + IBindCtx* pbc, + IMoniker* pmkToLeft, + FILETIME* pAntiTime) +{ + TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pAntiTime); + return E_NOTIMPL; +} + +/****************************************************************************** + * PointerMoniker_Inverse + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) +{ + TRACE("(%p,%p)\n",iface,ppmk); + + return CreateAntiMoniker(ppmk); +} + +/****************************************************************************** + * PointerMoniker_CommonPrefixWith + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) +{ + TRACE("(%p, %p)\n", pmkOther, ppmkPrefix); + + *ppmkPrefix = NULL; + + if (PointerMonikerImpl_IsEqual(iface, pmkOther)) + { + IMoniker_AddRef(iface); + + *ppmkPrefix=iface; + + return MK_S_US; + } + else + return MK_E_NOPREFIX; +} + +/****************************************************************************** + * PointerMoniker_RelativePathTo + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath) +{ + TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath); + + if (ppmkRelPath==NULL) + return E_POINTER; + + *ppmkRelPath = NULL; + + return E_NOTIMPL; +} + +/****************************************************************************** + * PointerMoniker_GetDisplayName + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, + IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName) +{ + TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName); + + if (ppszDisplayName==NULL) + return E_POINTER; + + *ppszDisplayName = NULL; + return E_NOTIMPL; +} + +/****************************************************************************** + * PointerMoniker_ParseDisplayName + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_ParseDisplayName(IMoniker* iface, IBindCtx* pbc, + IMoniker* pmkToLeft, LPOLESTR pszDisplayName, + ULONG* pchEaten, IMoniker** ppmkOut) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + HRESULT hr; + IParseDisplayName *pPDN; + + TRACE("(%p,%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pszDisplayName,pchEaten,ppmkOut); + + if (pmkToLeft) + return MK_E_SYNTAX; + + if (!This->pObject) + return E_UNEXPECTED; + + hr = IUnknown_QueryInterface(This->pObject, &IID_IParseDisplayName, (void **)&pPDN); + if (FAILED(hr)) + return hr; + + hr = IParseDisplayName_ParseDisplayName(pPDN, pbc, pszDisplayName, pchEaten, ppmkOut); + IParseDisplayName_Release(pPDN); + + return hr; +} + +/****************************************************************************** + * PointerMoniker_IsSystemMoniker + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) +{ + TRACE("(%p,%p)\n",iface,pwdMksys); + + if (!pwdMksys) + return E_POINTER; + + *pwdMksys = MKSYS_POINTERMONIKER; + + return S_OK; +} + +/********************************************************************************/ +/* Virtual function table for the PointerMonikerImpl class which include IPersist,*/ +/* IPersistStream and IMoniker functions. */ +static const IMonikerVtbl VT_PointerMonikerImpl = +{ + PointerMonikerImpl_QueryInterface, + PointerMonikerImpl_AddRef, + PointerMonikerImpl_Release, + PointerMonikerImpl_GetClassID, + PointerMonikerImpl_IsDirty, + PointerMonikerImpl_Load, + PointerMonikerImpl_Save, + PointerMonikerImpl_GetSizeMax, + PointerMonikerImpl_BindToObject, + PointerMonikerImpl_BindToStorage, + PointerMonikerImpl_Reduce, + PointerMonikerImpl_ComposeWith, + PointerMonikerImpl_Enum, + PointerMonikerImpl_IsEqual, + PointerMonikerImpl_Hash, + PointerMonikerImpl_IsRunning, + PointerMonikerImpl_GetTimeOfLastChange, + PointerMonikerImpl_Inverse, + PointerMonikerImpl_CommonPrefixWith, + PointerMonikerImpl_RelativePathTo, + PointerMonikerImpl_GetDisplayName, + PointerMonikerImpl_ParseDisplayName, + PointerMonikerImpl_IsSystemMoniker +}; + +/****************************************************************************** + * PointerMoniker_Construct (local function) + *******************************************************************************/ +static void PointerMonikerImpl_Construct(PointerMonikerImpl* This, IUnknown *punk) +{ + TRACE("(%p)\n",This); + + /* Initialize the virtual fgunction table. */ + This->lpvtbl = &VT_PointerMonikerImpl; + This->ref = 1; + if (punk) + IUnknown_AddRef(punk); + This->pObject = punk; +} + +/*********************************************************************** + * CreatePointerMoniker (OLE32.@) + * + * Creates a moniker which represents a pointer. + * + * PARAMS + * punk [I] Pointer to the object to represent. + * ppmk [O] Address that receives the pointer to the created moniker. + * + * RETURNS + * Success: S_OK. + * Failure: Any HRESULT code. + */ +HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER *ppmk) +{ + PointerMonikerImpl *This; + + FIXME("(%p, %p): stub\n", punk, ppmk); + + if (!ppmk) + return E_INVALIDARG; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + { + *ppmk = NULL; + return E_OUTOFMEMORY; + } + + PointerMonikerImpl_Construct(This, punk); + *ppmk = (IMoniker *)&This->lpvtbl; + return S_OK; +} + +static HRESULT WINAPI PointerMonikerCF_QueryInterface(LPCLASSFACTORY iface, + REFIID riid, LPVOID *ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI PointerMonikerCF_AddRef(LPCLASSFACTORY iface) +{ + return 2; /* non-heap based object */ +} + +static ULONG WINAPI PointerMonikerCF_Release(LPCLASSFACTORY iface) +{ + return 1; /* non-heap based object */ +} + +static HRESULT WINAPI PointerMonikerCF_CreateInstance(LPCLASSFACTORY iface, + LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +{ + IMoniker *pMoniker; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", pUnk, debugstr_guid(riid), ppv); + + *ppv = NULL; + + if (pUnk) + return CLASS_E_NOAGGREGATION; + + hr = CreatePointerMoniker(NULL, &pMoniker); + if (FAILED(hr)) + return hr; + + hr = IMoniker_QueryInterface(pMoniker, riid, ppv); + + if (FAILED(hr)) + IMoniker_Release(pMoniker); + + return hr; +} + +static HRESULT WINAPI PointerMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) +{ + FIXME("(%d), stub!\n",fLock); + return S_OK; +} + +static const IClassFactoryVtbl PointerMonikerCFVtbl = +{ + PointerMonikerCF_QueryInterface, + PointerMonikerCF_AddRef, + PointerMonikerCF_Release, + PointerMonikerCF_CreateInstance, + PointerMonikerCF_LockServer +}; +static const IClassFactoryVtbl *PointerMonikerCF = &PointerMonikerCFVtbl; + +HRESULT PointerMonikerCF_Create(REFIID riid, LPVOID *ppv) +{ + return IClassFactory_QueryInterface((IClassFactory *)&PointerMonikerCF, riid, ppv); +} Propchange: trunk/reactos/dll/win32/ole32/pointermoniker.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/ole32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/regsvr.c?r… ============================================================================== --- trunk/reactos/dll/win32/ole32/regsvr.c (original) +++ trunk/reactos/dll/win32/ole32/regsvr.c Sun Feb 10 15:17:32 2008 @@ -402,9 +402,6 @@ */ static GUID const CLSID_StdOleLink = { 0x00000300, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - -static GUID const CLSID_PointerMoniker = { - 0x00000306, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; static GUID const CLSID_PackagerMoniker = { 0x00000308, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/rpc.c (original) +++ trunk/reactos/dll/win32/ole32/rpc.c Sun Feb 10 15:17:32 2008 @@ -893,12 +893,8 @@ orpcthat.flags = ORPCF_NULL; orpcthat.extensions = NULL; - /* for normal RPC calls, faults are returned in first 4 bytes of the - * buffer */ TRACE("RPC call status: 0x%lx\n", status); - if (status == RPC_S_CALL_FAILED) - hrFault = *(HRESULT *)olemsg->Buffer; - else if (status != RPC_S_OK) + if (status != RPC_S_OK) hr = HRESULT_FROM_WIN32(status); TRACE("hrFault = 0x%08x\n", hrFault);

16 years, 8 months

← Newer
1
...
25
26
27
28
29
30
31
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2008