December 2007 - Wine-commits

Jacek Caban : urlmon: Use flag to store protocol lock state.
by Alexandre Julliard 17 Dec '07

17 Dec '07

Module: wine Branch: master Commit: 7d093afc6612f138117fcb3851fae772165ab20e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d093afc6612f138117fcb385… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 01:38:50 2007 +0100 urlmon: Use flag to store protocol lock state. --- dlls/urlmon/binding.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 23f665d..5f5471d 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -51,6 +51,8 @@ typedef enum { END_DOWNLOAD } download_state_t; +#define BINDING_LOCKED 0x0001 + struct Binding { const IBindingVtbl *lpBindingVtbl; const IInternetProtocolSinkVtbl *lpInternetProtocolSinkVtbl; @@ -71,7 +73,7 @@ struct Binding { LPWSTR url; BOOL report_mime; DWORD continue_call; - BOOL request_locked; + DWORD state; download_state_t download_state; DWORD apartment_thread; @@ -838,9 +840,10 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres BINDSTATUS_DOWNLOADINGDATA, This->url); } - if(!This->request_locked) { + if(!(This->state & BINDING_LOCKED)) { HRESULT hres = IInternetProtocol_LockRequest(This->protocol, 0); - This->request_locked = SUCCEEDED(hres); + if(SUCCEEDED(hres)) + This->state |= BINDING_LOCKED; } formatetc.cfFormat = This->clipboard_format; @@ -896,9 +899,9 @@ static void report_result_proc(Binding *binding, task_header_t *t) { IInternetProtocol_Terminate(binding->protocol, 0); - if(binding->request_locked) { + if(binding->state & BINDING_LOCKED) { IInternetProtocol_UnlockRequest(binding->protocol); - binding->request_locked = FALSE; + binding->state &= ~BINDING_LOCKED; } heap_free(t); @@ -1186,7 +1189,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->notif_hwnd = get_notif_hwnd(); ret->report_mime = TRUE; ret->continue_call = 0; - ret->request_locked = FALSE; + ret->state = 0; ret->download_state = BEFORE_DOWNLOAD; ret->task_queue_head = ret->task_queue_tail = NULL; @@ -1284,7 +1287,7 @@ HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) } if(binding->stream->init_buf) { - if(binding->request_locked) + if(binding->state & BINDING_LOCKED) IInternetProtocol_UnlockRequest(binding->protocol); IStream_AddRef(STREAM(binding->stream));

1 0

Andrey Turkin : server: I/ O completion ports can only be used with overlapped I/O.
by Alexandre Julliard 17 Dec '07

17 Dec '07

Module: wine Branch: master Commit: f1dcf4bf3aef126e0fadb192c091fd390dc6c4e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1dcf4bf3aef126e0fadb192c… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Dec 17 02:02:12 2007 +0300 server: I/O completion ports can only be used with overlapped I/O. --- dlls/ntdll/tests/file.c | 34 ++++++++++++++++++++++++++++------ server/fd.c | 2 +- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 846448e..4e1833c 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -498,17 +498,39 @@ static void test_iocp_fileio(HANDLE h) { static const char pipe_name[] = "\\\\.\\pipe\\iocompletiontestnamedpipe"; - HANDLE hPipeSrv = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); - HANDLE hPipeClt = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); - ok( hPipeSrv != INVALID_HANDLE_VALUE && hPipeClt != INVALID_HANDLE_VALUE, "Cannot create or connect to pipe\n" ); - if (hPipeSrv != INVALID_HANDLE_VALUE && hPipeClt != INVALID_HANDLE_VALUE) + IO_STATUS_BLOCK iosb; + FILE_COMPLETION_INFORMATION fci = {h, CKEY_SECOND}; + HANDLE hPipeSrv, hPipeClt; + NTSTATUS res; + + hPipeSrv = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); + ok( hPipeSrv != INVALID_HANDLE_VALUE, "Cannot create named pipe\n" ); + if (hPipeSrv != INVALID_HANDLE_VALUE ) + { + hPipeClt = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); + ok( hPipeClt != INVALID_HANDLE_VALUE, "Cannot connect to pipe\n" ); + if (hPipeClt != INVALID_HANDLE_VALUE) + { + res = pNtSetInformationFile( hPipeSrv, &iosb, &fci, sizeof(fci), FileCompletionInformation ); + ok( res == STATUS_INVALID_PARAMETER, "Unexpected NtSetInformationFile on non-overlapped handle: %x\n", res ); + CloseHandle(hPipeClt); + } + CloseHandle( hPipeSrv ); + } + + hPipeSrv = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); + ok( hPipeSrv != INVALID_HANDLE_VALUE, "Cannot create named pipe\n" ); + if (hPipeSrv == INVALID_HANDLE_VALUE ) + return; + + hPipeClt = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); + ok( hPipeClt != INVALID_HANDLE_VALUE, "Cannot connect to pipe\n" ); + if (hPipeClt != INVALID_HANDLE_VALUE) { OVERLAPPED o = {0,}; BYTE buf[3]; DWORD read; long count; - FILE_COMPLETION_INFORMATION fci = {h, CKEY_SECOND}; - IO_STATUS_BLOCK iosb; NTSTATUS res = pNtSetInformationFile( hPipeSrv, &iosb, &fci, sizeof(fci), FileCompletionInformation ); ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %x\n", res ); diff --git a/server/fd.c b/server/fd.c index efa575d..95a0520 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2050,7 +2050,7 @@ DECL_HANDLER(set_completion_info) if (fd) { - if (!fd->completion) + if (!(fd->options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && !fd->completion) { fd->completion = get_completion_obj( current->process, req->chandle, IO_COMPLETION_MODIFY_STATE ); fd->comp_key = req->ckey;

1 0

Jacek Caban : mshtml: Remove not used argument in nsAString_GetData.
by Alexandre Julliard 17 Dec '07

17 Dec '07

Module: wine Branch: master Commit: 559649c443a212cb39ef0bbf7db960bfd51c1649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=559649c443a212cb39ef0bbf7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 01:38:30 2007 +0100 mshtml: Remove not used argument in nsAString_GetData. --- dlls/mshtml/editor.c | 6 +++--- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmldoc5.c | 2 +- dlls/mshtml/htmlelem.c | 14 +++++++------- dlls/mshtml/htmlelem2.c | 2 +- dlls/mshtml/htmlinput.c | 6 +++--- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmloption.c | 4 ++-- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/htmltextarea.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsembed.c | 4 ++-- dlls/mshtml/nsservice.c | 2 +- dlls/mshtml/persist.c | 2 +- dlls/mshtml/txtrange.c | 8 ++++---- 16 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=559649c443a212cb39ef0…

1 0

Jacek Caban : mshtml: Remove not used argument of nsACString_GetData.
by Alexandre Julliard 17 Dec '07

17 Dec '07

Module: wine Branch: master Commit: 72d097103424677102aac4f366feb3212edbed84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d097103424677102aac4f36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 01:38:15 2007 +0100 mshtml: Remove not used argument of nsACString_GetData. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsembed.c | 6 +++--- dlls/mshtml/nsio.c | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4e76924..fed9f66 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -408,7 +408,7 @@ void nsfree(void*); void nsACString_Init(nsACString*,const char*); void nsACString_SetData(nsACString*,const char*); -PRUint32 nsACString_GetData(const nsACString*,const char**,PRBool*); +PRUint32 nsACString_GetData(const nsACString*,const char**); void nsACString_Finish(nsACString*); void nsAString_Init(nsAString*,const PRUnichar*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fc8ccbf..5c8c1ec 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -472,9 +472,9 @@ void nsACString_SetData(nsACString *str, const char *data) NS_CStringSetData(str, data, PR_UINT32_MAX); } -PRUint32 nsACString_GetData(const nsACString *str, const char **data, PRBool *termited) +PRUint32 nsACString_GetData(const nsACString *str, const char **data) { - return NS_CStringGetData(str, data, termited); + return NS_CStringGetData(str, data, NULL); } void nsACString_Finish(nsACString *str) @@ -1104,7 +1104,7 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener nsACString_Init(&spec_str, NULL); nsIURI_GetSpec(aURI, &spec_str); - nsACString_GetData(&spec_str, &spec, NULL); + nsACString_GetData(&spec_str, &spec); TRACE("(%p)->(%p(%s) %p)\n", This, aURI, debugstr_a(spec), _retval); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 72ad814..2568b35 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -505,7 +505,7 @@ static nsresult NSAPI nsChannel_GetContentCharset(nsIHttpChannel *iface, if(This->channel) { nsresult nsres = nsIChannel_GetContentCharset(This->channel, aContentCharset); const char *ch; - nsACString_GetData(aContentCharset, &ch, NULL); + nsACString_GetData(aContentCharset, &ch); return nsres; } @@ -589,7 +589,7 @@ static BOOL do_load_from_moniker_hack(nsChannel *This) if(NS_SUCCEEDED(nsres)) { const char *scheme; - nsACString_GetData(&scheme_str, &scheme, NULL); + nsACString_GetData(&scheme_str, &scheme); ret = !strcmp(scheme, "wine"); } @@ -1101,7 +1101,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, nsIInputStream_Release(This->post_data_stream); if(aContentType) { - nsACString_GetData(aContentType, &content_type, NULL); + nsACString_GetData(aContentType, &content_type); if(*content_type) FIXME("Unsupported aContentType argument: %s\n", debugstr_a(content_type)); } @@ -1982,7 +1982,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * BOOL is_wine_uri = FALSE; nsresult nsres; - nsACString_GetData(aSpec, &spec, NULL); + nsACString_GetData(aSpec, &spec); TRACE("(%p(%s) %s %p %p)\n", aSpec, debugstr_a(spec), debugstr_a(aOriginCharset), aBaseURI, _retval); @@ -2003,7 +2003,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * nsres = nsIURI_GetSpec(aBaseURI, &base_uri_str); if(NS_SUCCEEDED(nsres)) { - nsACString_GetData(&base_uri_str, &base_uri, NULL); + nsACString_GetData(&base_uri_str, &base_uri); TRACE("base_uri=%s\n", debugstr_a(base_uri)); }else { ERR("GetSpec failed: %08x\n", nsres);

1 0

James Hawkins : msi: Set the text color after calling the window proc.
by Alexandre Julliard 17 Dec '07

17 Dec '07

Module: wine Branch: master Commit: b1ce93f9449b3fcc78b9efc4ff4233da5fa2a9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ce93f9449b3fcc78b9efc4f… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 16 20:32:39 2007 -0600 msi: Set the text color after calling the window proc. --- dlls/msi/dialog.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 97e042e..ccb6acc 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -714,9 +714,6 @@ MSIText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) info = GetPropW(hWnd, szButtonData); - if ( info->font ) - SetTextColor( (HDC)wParam, info->font->color ); - if( msg == WM_CTLCOLORSTATIC && ( info->attributes & msidbControlAttributesTransparent ) ) { @@ -725,6 +722,8 @@ MSIText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) } r = CallWindowProcW(info->oldproc, hWnd, msg, wParam, lParam); + if ( info->font ) + SetTextColor( (HDC)wParam, info->font->color ); switch( msg ) {

1 0

James Hawkins : msi: The line control has a height of exactly 2 device units.
by Alexandre Julliard 17 Dec '07

17 Dec '07

Module: wine Branch: master Commit: b1cc87cb6565fe9cd44bd7c4bfb3804bce190417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1cc87cb6565fe9cd44bd7c4b… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 16 20:31:49 2007 -0600 msi: The line control has a height of exactly 2 device units. --- dlls/msi/dialog.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 078ceda..97e042e 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -871,12 +871,60 @@ static UINT msi_dialog_checkbox_control( msi_dialog *dialog, MSIRECORD *rec ) static UINT msi_dialog_line_control( msi_dialog *dialog, MSIRECORD *rec ) { + DWORD attributes; + LPCWSTR name; + DWORD style, exstyle = 0; + DWORD x, y, width, height; + msi_control *control; + TRACE("%p %p\n", dialog, rec); - /* line is exactly 2 units in height */ - MSI_RecordSetInteger( rec, 7, 2 ); + style = WS_CHILD | SS_ETCHEDHORZ | SS_SUNKEN; + + name = MSI_RecordGetString( rec, 2 ); + attributes = MSI_RecordGetInteger( rec, 8 ); + + if( attributes & msidbControlAttributesVisible ) + style |= WS_VISIBLE; + if( ~attributes & msidbControlAttributesEnabled ) + style |= WS_DISABLED; + if( attributes & msidbControlAttributesSunken ) + exstyle |= WS_EX_CLIENTEDGE; + + msi_dialog_map_events(dialog, name); + + control = msi_alloc( sizeof(*control) + strlenW(name) * sizeof(WCHAR) ); + if (!control) + return ERROR_OUTOFMEMORY; + + strcpyW( control->name, name ); + list_add_head( &dialog->controls, &control->entry ); + control->handler = NULL; + control->property = NULL; + control->value = NULL; + control->hBitmap = NULL; + control->hIcon = NULL; + control->hDll = NULL; + control->tabnext = strdupW( MSI_RecordGetString( rec, 11) ); + control->type = strdupW( MSI_RecordGetString( rec, 3 ) ); + control->progress_current = 0; + control->progress_max = 100; + + x = MSI_RecordGetInteger( rec, 4 ); + y = MSI_RecordGetInteger( rec, 5 ); + width = MSI_RecordGetInteger( rec, 6 ); + + x = msi_dialog_scale_unit( dialog, x ); + y = msi_dialog_scale_unit( dialog, y ); + width = msi_dialog_scale_unit( dialog, width ); + height = 2; /* line is exactly 2 units in height */ + + control->hwnd = CreateWindowExW( exstyle, szStatic, NULL, style, + x, y, width, height, dialog->hwnd, NULL, NULL, NULL ); + + TRACE("Dialog %s control %s hwnd %p\n", + debugstr_w(dialog->name), debugstr_w(name), control->hwnd ); - msi_dialog_add_control( dialog, rec, szStatic, SS_ETCHEDHORZ | SS_SUNKEN ); return ERROR_SUCCESS; }

1 0

James Hawkins : msi: Return ERROR_INVALID_PARAMETER if the product list is empty and index is not zero .
by Alexandre Julliard 17 Dec '07

17 Dec '07

Module: wine Branch: master Commit: 4295ce4fb63c833cd30b9f351897fd4302cf4c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4295ce4fb63c833cd30b9f351… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 16 20:30:14 2007 -0600 msi: Return ERROR_INVALID_PARAMETER if the product list is empty and index is not zero. --- dlls/msi/registry.c | 4 ++++ dlls/msi/tests/msi.c | 10 ++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index c80247a..12d2c9a 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1327,6 +1327,10 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) if (r != ERROR_SUCCESS) { RegCloseKey(hkeyComp); + + if (index != 0) + return ERROR_INVALID_PARAMETER; + return ERROR_UNKNOWN_COMPONENT; } diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index c46d651..b31d88f 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1649,10 +1649,7 @@ static void test_MsiEnumClients(void) /* index > 0, no products exist */ product[0] = '\0'; r = MsiEnumClientsA(component, 1, product); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"C:\\imapath", 10); @@ -1722,10 +1719,7 @@ static void test_MsiEnumClients(void) /* index > 0, no products exist */ product[0] = '\0'; r = MsiEnumClientsA(component, 1, product); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"C:\\imapath", 10);

1 0

James Hawkins : msi: Return ERROR_UNKNOWN_COMPONENT if no products exist.
by Alexandre Julliard 17 Dec '07

17 Dec '07

Module: wine Branch: master Commit: 88d51ad12280dffee3fad6a6002524e2436c6896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d51ad12280dffee3fad6a60… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 16 20:29:36 2007 -0600 msi: Return ERROR_UNKNOWN_COMPONENT if no products exist. --- dlls/msi/registry.c | 9 +++++++++ dlls/msi/tests/msi.c | 10 ++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 7423658..c80247a 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1321,6 +1321,15 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) MSIREG_OpenLocalSystemComponentKey(szComponent, &hkeyComp, FALSE) != ERROR_SUCCESS) return ERROR_UNKNOWN_COMPONENT; + /* see if there are any products at all */ + sz = SQUISH_GUID_SIZE; + r = RegEnumValueW(hkeyComp, 0, szValName, &sz, NULL, NULL, NULL, NULL); + if (r != ERROR_SUCCESS) + { + RegCloseKey(hkeyComp); + return ERROR_UNKNOWN_COMPONENT; + } + sz = SQUISH_GUID_SIZE; r = RegEnumValueW(hkeyComp, index, szValName, &sz, NULL, NULL, NULL, NULL); if( r == ERROR_SUCCESS ) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index d85d972..c46d651 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1643,10 +1643,7 @@ static void test_MsiEnumClients(void) /* user unmanaged component key exists */ product[0] = '\0'; r = MsiEnumClientsA(component, 0, product); - todo_wine - { - ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); - } + ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); /* index > 0, no products exist */ @@ -1719,10 +1716,7 @@ static void test_MsiEnumClients(void) /* user local component key exists */ product[0] = '\0'; r = MsiEnumClientsA(component, 0, product); - todo_wine - { - ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); - } + ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); /* index > 0, no products exist */

1 0

James Hawkins : msi: Validate the parameters of MsiEnumClients.
by Alexandre Julliard 17 Dec '07

17 Dec '07

Module: wine Branch: master Commit: 5f7b95daddd3984680595ae718c1930f75556354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7b95daddd3984680595ae71… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 16 20:27:22 2007 -0600 msi: Validate the parameters of MsiEnumClients. --- dlls/msi/registry.c | 5 ++++- dlls/msi/tests/msi.c | 10 ++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 1bee58d..daa01e3 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1284,6 +1284,9 @@ UINT WINAPI MsiEnumClientsA(LPCSTR szComponent, DWORD index, LPSTR szProduct) TRACE("%s %d %p\n", debugstr_a(szComponent), index, szProduct); + if ( !szProduct ) + return ERROR_INVALID_PARAMETER; + if( szComponent ) { szwComponent = strdupAtoW( szComponent ); @@ -1311,7 +1314,7 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) TRACE("%s %d %p\n", debugstr_w(szComponent), index, szProduct); - if (!szComponent || !szProduct) + if (!szComponent || !*szComponent || !szProduct) return ERROR_INVALID_PARAMETER; r = MSIREG_OpenComponentsKey(szComponent,&hkeyComp,FALSE); diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index e987884..61c7ddf 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1618,18 +1618,12 @@ static void test_MsiEnumClients(void) /* empty szComponent */ product[0] = '\0'; r = MsiEnumClientsA("", 0, product); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); /* NULL lpProductBuf */ r = MsiEnumClientsA(component, 0, NULL); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* all params correct, component missing */ product[0] = '\0';

1 0

James Hawkins : msi: Check the user component key for the clients.
by Alexandre Julliard 17 Dec '07

17 Dec '07

Module: wine Branch: master Commit: fced2fee2f153ce1e7f7ec4cff343870829e4f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fced2fee2f153ce1e7f7ec4cf… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 16 20:28:09 2007 -0600 msi: Check the user component key for the clients. --- dlls/msi/registry.c | 6 +++--- dlls/msi/tests/msi.c | 50 ++++++++++++++++++-------------------------------- 2 files changed, 21 insertions(+), 35 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index daa01e3..d81fb4e 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1317,9 +1317,9 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) if (!szComponent || !*szComponent || !szProduct) return ERROR_INVALID_PARAMETER; - r = MSIREG_OpenComponentsKey(szComponent,&hkeyComp,FALSE); - if( r != ERROR_SUCCESS ) - return ERROR_NO_MORE_ITEMS; + r = MSIREG_OpenUserDataComponentKey(szComponent, &hkeyComp, FALSE); + if (r != ERROR_SUCCESS) + return ERROR_UNKNOWN_COMPONENT; sz = SQUISH_GUID_SIZE; r = RegEnumValueW(hkeyComp, index, szValName, &sz, NULL, NULL, NULL, NULL); diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 61c7ddf..3cd7c29 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1628,10 +1628,7 @@ static void test_MsiEnumClients(void) /* all params correct, component missing */ product[0] = '\0'; r = MsiEnumClientsA(component, 0, product); - todo_wine - { - ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); - } + ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\"); @@ -1666,20 +1663,14 @@ static void test_MsiEnumClients(void) /* product value exists */ r = MsiEnumClientsA(component, 0, product); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product); /* try index 0 again */ product[0] = '\0'; r = MsiEnumClientsA(component, 0, product); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode), "Expected %s, got %s\n", prodcode, product); /* try index 1, second product value does not exist */ product[0] = '\0'; @@ -1696,27 +1687,22 @@ static void test_MsiEnumClients(void) todo_wine { ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); } - ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); /* start the enumeration over */ product[0] = '\0'; r = MsiEnumClientsA(component, 0, product); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2), - "Expected %s or %s, got %s\n", prodcode, prodcode2, product); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2), + "Expected %s or %s, got %s\n", prodcode, prodcode2, product); + /* correctly query second product */ product[0] = '\0'; r = MsiEnumClientsA(component, 1, product); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2), - "Expected %s or %s, got %s\n", prodcode, prodcode2, product); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(product, prodcode) || !lstrcmpA(product, prodcode2), + "Expected %s or %s, got %s\n", prodcode, prodcode2, product); RegDeleteValueA(compkey, prod_squashed); RegDeleteValueA(compkey, prod2_squashed); @@ -1733,10 +1719,7 @@ static void test_MsiEnumClients(void) /* user local component key exists */ product[0] = '\0'; r = MsiEnumClientsA(component, 0, product); - todo_wine - { - ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); - } + ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); /* index > 0, no products exist */ @@ -1772,7 +1755,10 @@ static void test_MsiEnumClients(void) /* try index 1, second product value does not exist */ product[0] = '\0'; r = MsiEnumClientsA(component, 1, product); - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + todo_wine + { + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + } ok(!lstrcmpA(product, ""), "Expected product to be unchanged, got %s\n", product); res = RegSetValueExA(compkey, prod2_squashed, 0, REG_SZ, (const BYTE *)"C:\\another", 10);

1 0