June 2007 - Wine-commits - list.winehq.org

James Hawkins : msi: If the user product key exists, the product' s state is advertised.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: 15823e1acfab45d975a0239efd9fafa7e8dd741e URL: http://source.winehq.org/git/wine.git/?a=commit;h=15823e1acfab45d975a0239ef… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jun 26 16:36:02 2007 -0700 msi: If the user product key exists, the product's state is advertised. --- dlls/msi/msi.c | 17 +++++++++-------- dlls/msi/tests/msi.c | 15 +++------------ 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 05d3bbf..7240ea4 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -762,7 +762,7 @@ INSTALLSTATE WINAPI MsiQueryProductStateA(LPCSTR szProduct) INSTALLSTATE WINAPI MsiQueryProductStateW(LPCWSTR szProduct) { UINT rc; - INSTALLSTATE rrc = INSTALLSTATE_UNKNOWN; + INSTALLSTATE state = INSTALLSTATE_UNKNOWN; HKEY hkey = 0; DWORD sz; @@ -780,31 +780,32 @@ INSTALLSTATE WINAPI MsiQueryProductStateW(LPCWSTR szProduct) if (rc != ERROR_SUCCESS) goto end; + state = INSTALLSTATE_ADVERTISED; RegCloseKey(hkey); rc = MSIREG_OpenUninstallKey(szProduct,&hkey,FALSE); if (rc != ERROR_SUCCESS) goto end; - sz = sizeof(rrc); - rc = RegQueryValueExW(hkey,szWindowsInstaller,NULL,NULL,(LPVOID)&rrc, &sz); + sz = sizeof(state); + rc = RegQueryValueExW(hkey,szWindowsInstaller,NULL,NULL,(LPVOID)&state, &sz); if (rc != ERROR_SUCCESS) goto end; - switch (rrc) + switch (state) { case 1: /* default */ - rrc = INSTALLSTATE_DEFAULT; + state = INSTALLSTATE_DEFAULT; break; default: - FIXME("Unknown install state read from registry (%i)\n",rrc); - rrc = INSTALLSTATE_UNKNOWN; + FIXME("Unknown install state read from registry (%i)\n",state); + state = INSTALLSTATE_UNKNOWN; break; } end: RegCloseKey(hkey); - return rrc; + return state; } INSTALLUILEVEL WINAPI MsiSetInternalUI(INSTALLUILEVEL dwUILevel, HWND *phWnd) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 06c7276..9afa576 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -377,10 +377,7 @@ static void test_MsiQueryProductState(void) /* user product key exists */ state = MsiQueryProductStateA(prodcode); - todo_wine - { - ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - } + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\"); lstrcatA(keypath, usersid); @@ -392,20 +389,14 @@ static void test_MsiQueryProductState(void) /* local product key exists */ state = MsiQueryProductStateA(prodcode); - todo_wine - { - ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - } + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); res = RegCreateKeyA(localkey, "InstallProperties", &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* install properties key exists */ state = MsiQueryProductStateA(prodcode); - todo_wine - { - ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - } + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); data = 1; res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD));

1 0

James Hawkins : msi: Validate MsiQueryProductCode parameters.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: e92f66558a8f415cee051d8752438726dbd64bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e92f66558a8f415cee051d875… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jun 26 16:30:40 2007 -0700 msi: Validate MsiQueryProductCode parameters. --- dlls/msi/msi.c | 9 ++++++--- dlls/msi/tests/msi.c | 15 +++------------ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2042695..05d3bbf 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -764,13 +764,16 @@ INSTALLSTATE WINAPI MsiQueryProductStateW(LPCWSTR szProduct) UINT rc; INSTALLSTATE rrc = INSTALLSTATE_UNKNOWN; HKEY hkey = 0; - static const WCHAR szWindowsInstaller[] = { - 'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0 }; DWORD sz; + static const int GUID_LEN = 38; + static const WCHAR szWindowsInstaller[] = { + 'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0 + }; + TRACE("%s\n", debugstr_w(szProduct)); - if (!szProduct) + if (!szProduct || !*szProduct || lstrlenW(szProduct) != GUID_LEN) return INSTALLSTATE_INVALIDARG; rc = MSIREG_OpenUserProductsKey(szProduct,&hkey,FALSE); diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index d905824..06c7276 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -347,24 +347,15 @@ static void test_MsiQueryProductState(void) /* empty prodcode */ state = MsiQueryProductStateA(""); - todo_wine - { - ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); - } + ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); /* garbage prodcode */ state = MsiQueryProductStateA("garbage"); - todo_wine - { - ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); - } + ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); /* guid without brackets */ state = MsiQueryProductStateA("6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D"); - todo_wine - { - ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); - } + ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); /* guid with brackets */ state = MsiQueryProductStateA("{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}");

1 0

Rob Shearman : rpcrt4: Store the assoc_group_id in the connections.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: 67c8fa58ecb9a60de2fc2a718dbab6420110dc11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c8fa58ecb9a60de2fc2a718… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 26 22:28:18 2007 +0100 rpcrt4: Store the assoc_group_id in the connections. --- dlls/rpcrt4/rpc_binding.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 2097e86..79eceda 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -354,6 +354,7 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, /* FIXME: do more checks? */ NewConnection->MaxTransmissionSize = response_hdr->bind_ack.max_tsize; + NewConnection->assoc_group_id = response_hdr->bind_ack.assoc_gid; NewConnection->ActiveInterface = *InterfaceId; RPCRT4_FreeHeader(response_hdr); }

1 0

James Hawkins : msi: Add tests for MsiQueryProductState.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: db318ec9afd96b49950dc8f06dcfe6586f135263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db318ec9afd96b49950dc8f06… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jun 26 16:21:58 2007 -0700 msi: Add tests for MsiQueryProductState. --- dlls/msi/tests/msi.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 186 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 4e5db4f..d905824 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -22,6 +22,7 @@ #include <windows.h> #include <msi.h> #include <msiquery.h> +#include <sddl.h> #include "wine/test.h" @@ -260,6 +261,190 @@ static void test_filehash(void) DeleteFile(name); } +/* copied from dlls/msi/registry.c */ +BOOL squash_guid(LPCWSTR in, LPWSTR out) +{ + DWORD i,n=1; + GUID guid; + + if (FAILED(CLSIDFromString((LPOLESTR)in, &guid))) + return FALSE; + + for(i=0; i<8; i++) + out[7-i] = in[n++]; + n++; + for(i=0; i<4; i++) + out[11-i] = in[n++]; + n++; + for(i=0; i<4; i++) + out[15-i] = in[n++]; + n++; + for(i=0; i<2; i++) + { + out[17+i*2] = in[n++]; + out[16+i*2] = in[n++]; + } + n++; + for( ; i<8; i++) + { + out[17+i*2] = in[n++]; + out[16+i*2] = in[n++]; + } + out[32]=0; + return TRUE; +} + +static void create_test_guid(LPSTR prodcode, LPSTR squashed) +{ + WCHAR guidW[MAX_PATH]; + WCHAR squashedW[MAX_PATH]; + GUID guid; + HRESULT hr; + int size; + + hr = CoCreateGuid(&guid); + ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + + size = StringFromGUID2(&guid, (LPOLESTR)guidW, MAX_PATH); + ok(size == 39, "Expected 39, got %d\n", hr); + + WideCharToMultiByte(CP_ACP, 0, guidW, size, prodcode, MAX_PATH, NULL, NULL); + squash_guid(guidW, squashedW); + WideCharToMultiByte(CP_ACP, 0, squashedW, -1, squashed, MAX_PATH, NULL, NULL); +} + +static void get_user_sid(LPSTR *usersid) +{ + HANDLE token; + BYTE buf[1024]; + DWORD size; + PTOKEN_USER user; + + OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + size = sizeof(buf); + GetTokenInformation(token, TokenUser, (void *)buf, size, &size); + user = (PTOKEN_USER)buf; + ConvertSidToStringSid(user->User.Sid, usersid); +} + +static void test_MsiQueryProductState(void) +{ + CHAR prodcode[MAX_PATH]; + CHAR prod_squashed[MAX_PATH]; + CHAR keypath[MAX_PATH*2]; + LPSTR usersid; + INSTALLSTATE state; + LONG res; + HKEY userkey, localkey, props; + DWORD data; + + create_test_guid(prodcode, prod_squashed); + get_user_sid(&usersid); + + /* NULL prodcode */ + state = MsiQueryProductStateA(NULL); + ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); + + /* empty prodcode */ + state = MsiQueryProductStateA(""); + todo_wine + { + ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); + } + + /* garbage prodcode */ + state = MsiQueryProductStateA("garbage"); + todo_wine + { + ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); + } + + /* guid without brackets */ + state = MsiQueryProductStateA("6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D"); + todo_wine + { + ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); + } + + /* guid with brackets */ + state = MsiQueryProductStateA("{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}"); + ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + + /* same length as guid, but random */ + state = MsiQueryProductStateA("A938G02JF-2NF3N93-VN3-2NNF-3KGKALDNF93"); + ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + + /* created guid cannot possibly be an installed product code */ + state = MsiQueryProductStateA(prodcode); + ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + + lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\"); + lstrcatA(keypath, prod_squashed); + + res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* user product key exists */ + state = MsiQueryProductStateA(prodcode); + todo_wine + { + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); + } + + lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\"); + lstrcatA(keypath, usersid); + lstrcatA(keypath, "\\Products\\"); + lstrcatA(keypath, prod_squashed); + + res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &localkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* local product key exists */ + state = MsiQueryProductStateA(prodcode); + todo_wine + { + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); + } + + res = RegCreateKeyA(localkey, "InstallProperties", &props); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* install properties key exists */ + state = MsiQueryProductStateA(prodcode); + todo_wine + { + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); + } + + data = 1; + res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD)); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* WindowsInstaller value exists */ + state = MsiQueryProductStateA(prodcode); + todo_wine + { + ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); + } + + RegDeleteKeyA(userkey, ""); + + /* user product key does not exist */ + state = MsiQueryProductStateA(prodcode); + todo_wine + { + ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + } + + LocalFree(usersid); + RegDeleteValueA(props, "WindowsInstaller"); + RegDeleteKeyA(props, ""); + RegDeleteKeyA(localkey, ""); + RegCloseKey(userkey); + RegCloseKey(localkey); + RegCloseKey(props); +} + START_TEST(msi) { HMODULE hmod = GetModuleHandle("msi.dll"); @@ -278,4 +463,5 @@ START_TEST(msi) test_null(); test_getcomponentpath(); test_filehash(); + test_MsiQueryProductState(); }

1 0

Rob Shearman : rpcrt4: Remove the unused AuthInfo field from the RpcAssoc structure and Used from RpcConnection .
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: 680e35643df0a43a5bb38d508bbd8d0ef58569ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=680e35643df0a43a5bb38d508… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 26 22:26:09 2007 +0100 rpcrt4: Remove the unused AuthInfo field from the RpcAssoc structure and Used from RpcConnection. --- dlls/rpcrt4/rpc_binding.c | 2 +- dlls/rpcrt4/rpc_binding.h | 4 +--- dlls/rpcrt4/rpc_transport.c | 14 +++++--------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 611041c..2097e86 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -302,7 +302,7 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, status = RPCRT4_CreateConnection(&NewConnection, Binding->server, Binding->Protseq, Binding->NetworkAddr, Binding->Endpoint, Binding->NetworkOptions, - Binding->AuthInfo, Binding->QOS, Binding); + Binding->AuthInfo, Binding->QOS); if (status != RPC_S_OK) return status; diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 69b4001..58f2d06 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -58,7 +58,6 @@ typedef struct _RpcAssoc LPSTR NetworkAddr; LPSTR Endpoint; LPWSTR NetworkOptions; - RpcAuthInfo *AuthInfo; /* id of this association group */ ULONG assoc_group_id; @@ -72,7 +71,6 @@ struct connection_ops; typedef struct _RpcConnection { struct _RpcConnection* Next; - struct _RpcBinding* Used; BOOL server; LPSTR NetworkAddr; LPSTR Endpoint; @@ -152,7 +150,7 @@ RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDEN void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection); ULONG RpcAssoc_Release(RpcAssoc *assoc); -RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS, RpcBinding* Binding); +RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS); RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index b03d3ea..2bb891d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -250,7 +250,7 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq RpcConnection *Connection; r = RPCRT4_CreateConnection(&Connection, TRUE, protseq->Protseq, NULL, - endpoint, NULL, NULL, NULL, NULL); + endpoint, NULL, NULL, NULL); if (r != RPC_S_OK) return r; @@ -297,7 +297,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse RpcConnection *Connection; r = RPCRT4_CreateConnection(&Connection, TRUE, protseq->Protseq, NULL, - endpoint, NULL, NULL, NULL, NULL); + endpoint, NULL, NULL, NULL); if (r != RPC_S_OK) return r; @@ -857,8 +857,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr } create_status = RPCRT4_CreateConnection((RpcConnection **)&tcpc, TRUE, protseq->Protseq, NULL, - endpoint, NULL, NULL, NULL, - NULL); + endpoint, NULL, NULL, NULL); if (create_status != RPC_S_OK) { close(sock); @@ -1354,8 +1353,7 @@ RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection) RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, - LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS, - RpcBinding* Binding) + LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS) { const struct connection_ops *ops; RpcConnection* NewConnection; @@ -1374,7 +1372,6 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, NewConnection->NetworkAddr = RPCRT4_strdupA(NetworkAddr); NewConnection->Endpoint = RPCRT4_strdupA(Endpoint); NewConnection->NetworkOptions = RPCRT4_strdupW(NetworkOptions); - NewConnection->Used = Binding; NewConnection->MaxTransmissionSize = RPC_MAX_PACKET_SIZE; memset(&NewConnection->ActiveInterface, 0, sizeof(NewConnection->ActiveInterface)); NewConnection->NextCallId = 1; @@ -1518,8 +1515,7 @@ RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* Old rpcrt4_conn_get_name(OldConnection), OldConnection->NetworkAddr, OldConnection->Endpoint, NULL, - OldConnection->AuthInfo, OldConnection->QOS, - NULL); + OldConnection->AuthInfo, OldConnection->QOS); if (err == RPC_S_OK) rpcrt4_conn_handoff(OldConnection, *Connection); return err;

1 0

Rob Shearman : rpcrt4: Make pointers to RPCRT4_BuildBindHeader and RPCRT4_BuildBindAckHeader const .
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: 9787f12589d582f73037cf3f36a348872b510662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9787f12589d582f73037cf3f3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 26 22:26:58 2007 +0100 rpcrt4: Make pointers to RPCRT4_BuildBindHeader and RPCRT4_BuildBindAckHeader const. --- dlls/rpcrt4/rpc_message.c | 8 ++++---- dlls/rpcrt4/rpc_message.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index bdd9d12..6c32272 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -178,8 +178,8 @@ RpcPktHdr *RPCRT4_BuildBindHeader(unsigned long DataRepresentation, unsigned short MaxTransmissionSize, unsigned short MaxReceiveSize, unsigned long AssocGroupId, - RPC_SYNTAX_IDENTIFIER *AbstractId, - RPC_SYNTAX_IDENTIFIER *TransferId) + const RPC_SYNTAX_IDENTIFIER *AbstractId, + const RPC_SYNTAX_IDENTIFIER *TransferId) { RpcPktHdr *header; @@ -240,10 +240,10 @@ RpcPktHdr *RPCRT4_BuildBindNackHeader(unsigned long DataRepresentation, RpcPktHdr *RPCRT4_BuildBindAckHeader(unsigned long DataRepresentation, unsigned short MaxTransmissionSize, unsigned short MaxReceiveSize, - LPSTR ServerAddress, + LPCSTR ServerAddress, unsigned long Result, unsigned long Reason, - RPC_SYNTAX_IDENTIFIER *TransferId) + const RPC_SYNTAX_IDENTIFIER *TransferId) { RpcPktHdr *header; unsigned long header_size; diff --git a/dlls/rpcrt4/rpc_message.h b/dlls/rpcrt4/rpc_message.h index 7246592..a9a9f83 100644 --- a/dlls/rpcrt4/rpc_message.h +++ b/dlls/rpcrt4/rpc_message.h @@ -25,9 +25,9 @@ #include "rpc_defs.h" RpcPktHdr *RPCRT4_BuildFaultHeader(unsigned long DataRepresentation, RPC_STATUS Status); -RpcPktHdr *RPCRT4_BuildBindHeader(unsigned long DataRepresentation, unsigned short MaxTransmissionSize, unsigned short MaxReceiveSize, unsigned long AssocGroupId, RPC_SYNTAX_IDENTIFIER *AbstractId, RPC_SYNTAX_IDENTIFIER *TransferId); +RpcPktHdr *RPCRT4_BuildBindHeader(unsigned long DataRepresentation, unsigned short MaxTransmissionSize, unsigned short MaxReceiveSize, unsigned long AssocGroupId, const RPC_SYNTAX_IDENTIFIER *AbstractId, const RPC_SYNTAX_IDENTIFIER *TransferId); RpcPktHdr *RPCRT4_BuildBindNackHeader(unsigned long DataRepresentation, unsigned char RpcVersion, unsigned char RpcVersionMinor); -RpcPktHdr *RPCRT4_BuildBindAckHeader(unsigned long DataRepresentation, unsigned short MaxTransmissionSize, unsigned short MaxReceiveSize, LPSTR ServerAddress, unsigned long Result, unsigned long Reason, RPC_SYNTAX_IDENTIFIER *TransferId); +RpcPktHdr *RPCRT4_BuildBindAckHeader(unsigned long DataRepresentation, unsigned short MaxTransmissionSize, unsigned short MaxReceiveSize, LPCSTR ServerAddress, unsigned long Result, unsigned long Reason, const RPC_SYNTAX_IDENTIFIER *TransferId); VOID RPCRT4_FreeHeader(RpcPktHdr *Header); RPC_STATUS RPCRT4_Send(RpcConnection *Connection, RpcPktHdr *Header, void *Buffer, unsigned int BufferLength); RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, PRPC_MESSAGE pMsg);

1 0

Rob Shearman : msi: Fix loading string tables for databases that use 3-byte string references and that have a non-zero codepage (i.e. != CP_ACP).
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: 0876f7664a5b3e6bb8f8165d827e2401096bb6cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0876f7664a5b3e6bb8f8165d8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 26 22:24:05 2007 +0100 msi: Fix loading string tables for databases that use 3-byte string references and that have a non-zero codepage (i.e. != CP_ACP). --- dlls/msi/string.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 932b624..9008249 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -81,6 +81,12 @@ static string_table *init_stringtable( int entries, UINT codepage ) string_table *st; int i; + if (codepage != CP_ACP && !IsValidCodePage(codepage)) + { + ERR("invalid codepage %d\n", codepage); + return NULL; + } + st = msi_alloc( sizeof (string_table) ); if( !st ) return NULL; @@ -269,7 +275,6 @@ int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, UINT r str = msi_alloc( (len+1)*sizeof(WCHAR) ); if( !str ) return -1; - TRACE("%d\n",__LINE__); memcpy( str, data, len*sizeof(WCHAR) ); str[len] = 0; @@ -516,8 +521,6 @@ string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ) UINT r, datasize = 0, poolsize = 0, codepage; DWORD i, count, offset, len, n, refs; - static const USHORT large_str_sig[] = { 0x0000, 0x8000 }; - r = read_stream_data( stg, szStringPool, &pool, &poolsize ); if( r != ERROR_SUCCESS) goto end; @@ -525,18 +528,19 @@ string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ) if( r != ERROR_SUCCESS) goto end; - if ( !memcmp(pool, large_str_sig, sizeof(large_str_sig)) ) + if ( (poolsize > 4) && (pool[1] & 0x8000) ) *bytes_per_strref = LONG_STR_BYTES; else *bytes_per_strref = sizeof(USHORT); - /* FIXME: don't know where the codepage is in large str tables */ count = poolsize/4; - if( poolsize > 4 && *bytes_per_strref != LONG_STR_BYTES ) - codepage = pool[0] | ( pool[1] << 16 ); + if( poolsize > 4 ) + codepage = pool[0] | ( (pool[1] & ~0x8000) << 16 ); else codepage = CP_ACP; st = init_stringtable( count, codepage ); + if (!st) + goto end; offset = 0; n = 1;

1 0

Rob Shearman : msi: Fix bytes_per_column for binary types when the database is using 3-byte string references .
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: bf67b14602bad98273458c8a6adecb04ab45c37e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf67b14602bad98273458c8a6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 26 22:24:47 2007 +0100 msi: Fix bytes_per_column for binary types when the database is using 3-byte string references. --- dlls/msi/table.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index cf706d8..359468a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -125,6 +125,8 @@ void msi_table_set_strref(UINT bytes_per_strref) static inline UINT bytes_per_column( const MSICOLUMNINFO *col ) { + if( MSITYPE_IS_BINARY(col->type) ) + return 2; if( col->type & MSITYPE_STRING ) return _Columns_cols[1].offset; if( (col->type & 0xff) > 4 )

1 0

Rob Shearman : msi: Fix transforms to work when the number of bytes per string reference differs to that of the database it is being applied to .
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: 2e2b17f340b2321dd67b3634afffd814bb25ce9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2b17f340b2321dd67b3634a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jun 26 22:25:28 2007 +0100 msi: Fix transforms to work when the number of bytes per string reference differs to that of the database it is being applied to. --- dlls/msi/msipriv.h | 2 +- dlls/msi/string.c | 4 +- dlls/msi/table.c | 118 +++++++++++++++++++++++++++++++++------------------- 3 files changed, 78 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e2b17f340b2321dd67b3…

1 0

H. Verbeet : wined3d: Cleanup GL extension detection.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: 61e1d1379ede69d0f2e102a2ab3312db3fc9a012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e1d1379ede69d0f2e102a2a… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 26 23:05:41 2007 +0200 wined3d: Cleanup GL extension detection. --- dlls/wined3d/directx.c | 490 +++++++++++++++++++-------------------------- include/wine/wined3d_gl.h | 4 + 2 files changed, 215 insertions(+), 279 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61e1d1379ede69d0f2e10…

1 0