December 2008 - Wine-commits

Henri Verbeet : wined3d: Add functions to initialize and free shader buffers.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: 4997bee1bf51017df665588886e50cd42853b1e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4997bee1bf51017df66558888… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 9 09:52:38 2008 +0100 wined3d: Add functions to initialize and free shader buffers. --- dlls/wined3d/arb_program_shader.c | 22 ++++++++-------------- dlls/wined3d/baseshader.c | 14 ++++++++++++++ dlls/wined3d/glsl_shader.c | 7 ++----- dlls/wined3d/pixelshader.c | 9 ++------- dlls/wined3d/vertexshader.c | 9 ++------- dlls/wined3d/wined3d_private.h | 2 ++ 6 files changed, 30 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9d51250..3faa17c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2694,10 +2694,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi } /* Shader header */ - buffer.bsize = 0; - buffer.lineNo = 0; - buffer.newline = TRUE; - buffer.buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SHADER_PGMSIZE); + shader_buffer_init(&buffer); shader_addline(&buffer, "!!ARBfp1.0\n"); @@ -2888,7 +2885,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); return ret; } @@ -3426,10 +3423,7 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu struct arbfp_blit_priv *priv = (struct arbfp_blit_priv *) device->blit_priv; /* Shader header */ - buffer.bsize = 0; - buffer.lineNo = 0; - buffer.newline = TRUE; - buffer.buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SHADER_PGMSIZE); + shader_buffer_init(&buffer); ENTER_GL(); GL_EXTCALL(glGenProgramsARB(1, &shader)); @@ -3438,7 +3432,7 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)"); LEAVE_GL(); if(!shader) { - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); return 0; } @@ -3493,7 +3487,7 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu case YUV_FIXUP_YUY2: if (!gen_planar_yuv_read(&buffer, yuv_fixup, textype, &luminance_component)) { - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); return 0; } break; @@ -3501,14 +3495,14 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu case YUV_FIXUP_YV12: if (!gen_yv12_read(&buffer, textype, &luminance_component)) { - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); return 0; } break; default: FIXME("Unsupported YUV fixup %#x\n", yuv_fixup); - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); return 0; } @@ -3533,7 +3527,7 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); LEAVE_GL(); switch (yuv_fixup) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index c0b149f..9414292 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -40,6 +40,20 @@ static inline BOOL shader_is_version_token(DWORD token) { shader_is_vshader_version(token); } +void shader_buffer_init(struct SHADER_BUFFER *buffer) +{ + buffer->buffer = HeapAlloc(GetProcessHeap(), 0, SHADER_PGMSIZE); + buffer->buffer[0] = '\0'; + buffer->bsize = 0; + buffer->lineNo = 0; + buffer->newline = TRUE; +} + +void shader_buffer_free(struct SHADER_BUFFER *buffer) +{ + HeapFree(GetProcessHeap(), 0, buffer->buffer); +} + int shader_addline( SHADER_BUFFER* buffer, const char *format, ...) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4c1d223..f1a0f95 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2958,10 +2958,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs char reg_mask[6]; const struct semantic *semantics_out, *semantics_in; - buffer.buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SHADER_PGMSIZE); - buffer.bsize = 0; - buffer.lineNo = 0; - buffer.newline = TRUE; + shader_buffer_init(&buffer); shader_addline(&buffer, "#version 120\n"); @@ -3093,7 +3090,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs GL_EXTCALL(glCompileShaderARB(ret)); checkGLcall("glCompileShaderARB(ret)"); - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); return ret; } diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 6a4d7d5..09a99dc 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -277,14 +277,9 @@ static inline GLuint IWineD3DPixelShaderImpl_GenerateShader( SHADER_BUFFER buffer; GLuint shader; - buffer.buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SHADER_PGMSIZE); - buffer.bsize = 0; - buffer.lineNo = 0; - buffer.newline = TRUE; - + shader_buffer_init(&buffer); shader = ((IWineD3DDeviceImpl *)This->baseShader.device)->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, &buffer); - - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); return shader; } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 3180262..9c47930 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -325,14 +325,9 @@ static void IWineD3DVertexShaderImpl_GenerateShader(IWineD3DVertexShader *iface, find_swizzled_attribs(decl, This); - buffer.buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SHADER_PGMSIZE); - buffer.bsize = 0; - buffer.lineNo = 0; - buffer.newline = TRUE; - + shader_buffer_init(&buffer); ((IWineD3DDeviceImpl *)This->baseShader.device)->shader_backend->shader_generate_vshader(iface, &buffer); - - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); } /* ******************************************* diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 359be44..b4464f9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2229,6 +2229,8 @@ typedef struct IWineD3DBaseShaderImpl { HRESULT WINAPI IWineD3DBaseShaderImpl_QueryInterface(IWineD3DBaseShader *iface, REFIID riid, LPVOID *ppobj); ULONG WINAPI IWineD3DBaseShaderImpl_AddRef(IWineD3DBaseShader *iface); ULONG WINAPI IWineD3DBaseShaderImpl_Release(IWineD3DBaseShader *iface); +void shader_buffer_init(struct SHADER_BUFFER *buffer); +void shader_buffer_free(struct SHADER_BUFFER *buffer); extern HRESULT shader_get_registers_used( IWineD3DBaseShader *iface,

1 0

James Hawkins : msi: Forward MsiGetProductPropertyA to MsiGetProductPropertyW.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: 06a438152c6dd8b9b17b87376074ac6fe5c1dc1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a438152c6dd8b9b17b87376… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Dec 9 00:21:35 2008 -0600 msi: Forward MsiGetProductPropertyA to MsiGetProductPropertyW. --- dlls/msi/msi.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index d53cc91..4160695 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1700,11 +1700,66 @@ HRESULT WINAPI MsiGetFileSignatureInformationW( LPCWSTR szSignedObjectPath, return ERROR_CALL_NOT_IMPLEMENTED; } -UINT WINAPI MsiGetProductPropertyA( MSIHANDLE hProduct, LPCSTR szProperty, - LPSTR szValue, LPDWORD pccbValue ) +/****************************************************************** + * MsiGetProductPropertyA [MSI.@] + */ +UINT WINAPI MsiGetProductPropertyA(MSIHANDLE hProduct, LPCSTR szProperty, + LPSTR szValue, LPDWORD pccbValue) { - FIXME("%ld %s %p %p\n", hProduct, debugstr_a(szProperty), szValue, pccbValue); - return ERROR_CALL_NOT_IMPLEMENTED; + LPWSTR prop = NULL, val = NULL; + DWORD len; + UINT r; + + TRACE("(%ld, %s, %p, %p)\n", hProduct, debugstr_a(szProperty), + szValue, pccbValue); + + if (szValue && !pccbValue) + return ERROR_INVALID_PARAMETER; + + if (szProperty) prop = strdupAtoW(szProperty); + + len = 0; + r = MsiGetProductPropertyW(hProduct, prop, NULL, &len); + if (r != ERROR_SUCCESS && r != ERROR_MORE_DATA) + goto done; + + if (r == ERROR_SUCCESS) + { + if (szValue) *szValue = '\0'; + if (pccbValue) *pccbValue = 0; + goto done; + } + + val = msi_alloc(++len * sizeof(WCHAR)); + if (!val) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + r = MsiGetProductPropertyW(hProduct, prop, val, &len); + if (r != ERROR_SUCCESS) + goto done; + + len = WideCharToMultiByte(CP_ACP, 0, val, -1, NULL, 0, NULL, NULL); + + if (szValue) + WideCharToMultiByte(CP_ACP, 0, val, -1, szValue, + *pccbValue, NULL, NULL); + + if (pccbValue) + { + if (len > *pccbValue) + r = ERROR_MORE_DATA; + + *pccbValue = len - 1; + } + +done: + msi_free(prop); + msi_free(val); + + return r; } UINT WINAPI MsiGetProductPropertyW( MSIHANDLE hProduct, LPCWSTR szProperty,

1 0

James Hawkins : msi: Implement MsiGetProductPropertyW.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: da783c3888d36a958f23e2e74dfa22fc2deb8c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da783c3888d36a958f23e2e74… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Dec 9 00:21:38 2008 -0600 msi: Implement MsiGetProductPropertyW. --- dlls/msi/msi.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 4160695..ef1b871 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1762,11 +1762,81 @@ done: return r; } -UINT WINAPI MsiGetProductPropertyW( MSIHANDLE hProduct, LPCWSTR szProperty, - LPWSTR szValue, LPDWORD pccbValue ) +/****************************************************************** + * MsiGetProductPropertyW [MSI.@] + */ +UINT WINAPI MsiGetProductPropertyW(MSIHANDLE hProduct, LPCWSTR szProperty, + LPWSTR szValue, LPDWORD pccbValue) { - FIXME("%ld %s %p %p\n", hProduct, debugstr_w(szProperty), szValue, pccbValue); - return ERROR_CALL_NOT_IMPLEMENTED; + MSIPACKAGE *package; + MSIQUERY *view = NULL; + MSIRECORD *rec = NULL; + LPCWSTR val; + UINT r; + + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','P','r','o','p','e','r','t','y','`',' ','W','H','E','R','E',' ', + '`','P','r','o','p','e','r','t','y','`','=','\'','%','s','\'',0}; + + TRACE("(%ld, %s, %p, %p)\n", hProduct, debugstr_w(szProperty), + szValue, pccbValue); + + if (!szProperty) + return ERROR_INVALID_PARAMETER; + + if (szValue && !pccbValue) + return ERROR_INVALID_PARAMETER; + + package = msihandle2msiinfo(hProduct, MSIHANDLETYPE_PACKAGE); + if (!package) + return ERROR_INVALID_HANDLE; + + r = MSI_OpenQuery(package->db, &view, query, szProperty); + if (r != ERROR_SUCCESS) + goto done; + + r = MSI_ViewExecute(view, 0); + if (r != ERROR_SUCCESS) + goto done; + + r = MSI_ViewFetch(view, &rec); + if (r != ERROR_SUCCESS) + goto done; + + val = MSI_RecordGetString(rec, 2); + if (!val) + goto done; + + if (lstrlenW(val) >= *pccbValue) + { + lstrcpynW(szValue, val, *pccbValue); + *pccbValue = lstrlenW(val); + r = ERROR_MORE_DATA; + } + else + { + lstrcpyW(szValue, val); + *pccbValue = lstrlenW(val); + r = ERROR_SUCCESS; + } + +done: + if (view) + { + MSI_ViewClose(view); + msiobj_release(&view->hdr); + if (rec) msiobj_release(&rec->hdr); + } + + if (!rec) + { + if (szValue) *szValue = '\0'; + if (pccbValue) *pccbValue = 0; + r = ERROR_SUCCESS; + } + + return r; } UINT WINAPI MsiVerifyPackageA( LPCSTR szPackage )

1 0

James Hawkins : msi: Add tests for MsiGetProductProperty.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: dfb8b664d69f03efaac76b099b5c098b16bea1cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb8b664d69f03efaac76b099… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Dec 9 00:21:47 2008 -0600 msi: Add tests for MsiGetProductProperty. --- dlls/msi/tests/package.c | 232 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 232 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 47ffa35..6645c06 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -149,6 +149,25 @@ static BOOL squash_guid(LPCWSTR in, LPWSTR out) 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 set_component_path(LPCSTR filename, MSIINSTALLCONTEXT context, LPCSTR guid, LPSTR usersid, BOOL dir) { @@ -9490,6 +9509,218 @@ static void test_emptypackage(void) MsiCloseHandle(hpkg); } +static void test_MsiGetProductProperty(void) +{ + MSIHANDLE hprod, hdb; + CHAR val[MAX_PATH]; + CHAR path[MAX_PATH]; + CHAR query[MAX_PATH]; + CHAR keypath[MAX_PATH*2]; + CHAR prodcode[MAX_PATH]; + CHAR prod_squashed[MAX_PATH]; + HKEY prodkey, userkey, props; + LPSTR usersid; + DWORD size; + LONG res; + UINT r; + + GetCurrentDirectoryA(MAX_PATH, path); + lstrcatA(path, "\\"); + + create_test_guid(prodcode, prod_squashed); + get_user_sid(&usersid); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiDatabaseCommit(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = set_summary_info(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = run_query(hdb, + "CREATE TABLE `Directory` ( " + "`Directory` CHAR(255) NOT NULL, " + "`Directory_Parent` CHAR(255), " + "`DefaultDir` CHAR(255) NOT NULL " + "PRIMARY KEY `Directory`)"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = run_query(hdb, + "CREATE TABLE `Property` ( " + "`Property` CHAR(72) NOT NULL, " + "`Value` CHAR(255) " + "PRIMARY KEY `Property`)"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + sprintf(query, "INSERT INTO `Property` " + "(`Property`, `Value`) " + "VALUES( 'ProductCode', '%s' )", prodcode); + r = run_query(hdb, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiDatabaseCommit(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hdb); + + lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\"); + lstrcatA(keypath, prod_squashed); + + res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\"); + lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\"); + lstrcatA(keypath, prod_squashed); + + res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &userkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegCreateKeyA(userkey, "InstallProperties", &props); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + lstrcpyA(val, path); + lstrcatA(val, "\\winetest.msi"); + res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ, + (const BYTE *)val, lstrlenA(val) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + hprod = 0xdeadbeef; + r = MsiOpenProductA(prodcode, &hprod); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(hprod != 0 && hprod != 0xdeadbeef, "Expected a valid product handle\n"); + + /* hProduct is invalid */ + size = MAX_PATH; + lstrcpyA(val, "apple"); + r = MsiGetProductPropertyA(0xdeadbeef, "ProductCode", val, &size); + ok(r == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", r); + ok(!lstrcmpA(val, "apple"), + "Expected val to be unchanged, got \"%s\"\n", val); + ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + + /* szProperty is NULL */ + size = MAX_PATH; + lstrcpyA(val, "apple"); + r = MsiGetProductPropertyA(hprod, NULL, val, &size); + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(!lstrcmpA(val, "apple"), + "Expected val to be unchanged, got \"%s\"\n", val); + ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + + /* szProperty is empty */ + size = MAX_PATH; + lstrcpyA(val, "apple"); + r = MsiGetProductPropertyA(hprod, "", val, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val); + ok(size == 0, "Expected 0, got %d\n", size); + + /* get the property */ + size = MAX_PATH; + lstrcpyA(val, "apple"); + r = MsiGetProductPropertyA(hprod, "ProductCode", val, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(val, prodcode), + "Expected \"%s\", got \"%s\"\n", prodcode, val); + ok(size == lstrlenA(prodcode), + "Expected %d, got %d\n", lstrlenA(prodcode), size); + + /* lpValueBuf is NULL */ + size = MAX_PATH; + r = MsiGetProductPropertyA(hprod, "ProductCode", NULL, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(size == lstrlenA(prodcode), + "Expected %d, got %d\n", lstrlenA(prodcode), size); + + /* pcchValueBuf is NULL */ + lstrcpyA(val, "apple"); + r = MsiGetProductPropertyA(hprod, "ProductCode", val, NULL); + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(!lstrcmpA(val, "apple"), + "Expected val to be unchanged, got \"%s\"\n", val); + ok(size == lstrlenA(prodcode), + "Expected %d, got %d\n", lstrlenA(prodcode), size); + + /* pcchValueBuf is too small */ + size = 4; + lstrcpyA(val, "apple"); + r = MsiGetProductPropertyA(hprod, "ProductCode", val, &size); + ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); + ok(!strncmp(val, prodcode, 3), + "Expected first 3 chars of \"%s\", got \"%s\"\n", prodcode, val); + ok(size == lstrlenA(prodcode), + "Expected %d, got %d\n", lstrlenA(prodcode), size); + + /* pcchValueBuf does not leave room for NULL terminator */ + size = lstrlenA(prodcode); + lstrcpyA(val, "apple"); + r = MsiGetProductPropertyA(hprod, "ProductCode", val, &size); + ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); + ok(!strncmp(val, prodcode, lstrlenA(prodcode) - 1), + "Expected first 37 chars of \"%s\", got \"%s\"\n", prodcode, val); + ok(size == lstrlenA(prodcode), + "Expected %d, got %d\n", lstrlenA(prodcode), size); + + /* pcchValueBuf has enough room for NULL terminator */ + size = lstrlenA(prodcode) + 1; + lstrcpyA(val, "apple"); + r = MsiGetProductPropertyA(hprod, "ProductCode", val, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(val, prodcode), + "Expected \"%s\", got \"%s\"\n", prodcode, val); + ok(size == lstrlenA(prodcode), + "Expected %d, got %d\n", lstrlenA(prodcode), size); + + /* nonexistent property */ + size = MAX_PATH; + lstrcpyA(val, "apple"); + r = MsiGetProductPropertyA(hprod, "IDontExist", val, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val); + ok(size == 0, "Expected 0, got %d\n", size); + + r = MsiSetPropertyA(hprod, "NewProperty", "value"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* non-product property set */ + size = MAX_PATH; + lstrcpyA(val, "apple"); + r = MsiGetProductPropertyA(hprod, "NewProperty", val, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val); + ok(size == 0, "Expected 0, got %d\n", size); + + r = MsiSetPropertyA(hprod, "ProductCode", "value"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* non-product property that is also a product property set */ + size = MAX_PATH; + lstrcpyA(val, "apple"); + r = MsiGetProductPropertyA(hprod, "ProductCode", val, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(val, prodcode), + "Expected \"%s\", got \"%s\"\n", prodcode, val); + ok(size == lstrlenA(prodcode), + "Expected %d, got %d\n", lstrlenA(prodcode), size); + + MsiCloseHandle(hprod); + + RegDeleteValueA(props, "LocalPackage"); + RegDeleteKeyA(props, ""); + RegCloseKey(props); + RegDeleteKeyA(userkey, ""); + RegCloseKey(userkey); + RegDeleteKeyA(prodkey, ""); + RegCloseKey(prodkey); + DeleteFileA(msifile); +} + START_TEST(package) { GetCurrentDirectoryA(MAX_PATH, CURR_DIR); @@ -9521,4 +9752,5 @@ START_TEST(package) test_sourcedir(); test_access(); test_emptypackage(); + test_MsiGetProductProperty(); }

1 0

Austin English : uxtheme: Fix a compiler warning.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: 0f361b802d8f02fb9115b41860221f9c4e341ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f361b802d8f02fb9115b4186… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 9 00:39:50 2008 -0600 uxtheme: Fix a compiler warning. --- dlls/uxtheme/msstyles.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 1ca4d26..3f2a054 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -685,9 +685,9 @@ static BOOL parse_handle_color_property (struct PARSECOLORSTATE* state, { int r,g,b; LPCWSTR lpValueEnd = lpValue + dwValueLen; - MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &r); - MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &g); - if(MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &b)) { + if(MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &r) && + MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &g) && + MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &b)) { state->colorElements[state->colorCount] = iPropertyId - TMT_FIRSTCOLOR; state->colorRgb[state->colorCount++] = RGB(r,g,b); switch (iPropertyId) @@ -1210,8 +1210,14 @@ HRESULT MSSTYLES_GetPropertyColor(PTHEME_PROPERTY tp, COLORREF *pColor) lpCur = tp->lpValue; lpEnd = tp->lpValue + tp->dwValueLen; - MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &red); - MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &green); + if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &red)) { + TRACE("Could not parse color property\n"); + return E_PROP_ID_UNSUPPORTED; + } + if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &green)) { + TRACE("Could not parse color property\n"); + return E_PROP_ID_UNSUPPORTED; + } if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &blue)) { TRACE("Could not parse color property\n"); return E_PROP_ID_UNSUPPORTED; @@ -1316,7 +1322,10 @@ HRESULT MSSTYLES_GetPropertyPosition(PTHEME_PROPERTY tp, POINT *pPoint) LPCWSTR lpCur = tp->lpValue; LPCWSTR lpEnd = tp->lpValue + tp->dwValueLen; - MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &x); + if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &x)) { + TRACE("Could not parse position property\n"); + return E_PROP_ID_UNSUPPORTED; + } if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &y)) { TRACE("Could not parse position property\n"); return E_PROP_ID_UNSUPPORTED;

1 0

James Hawkins : msi: Add tests for MsiEnumPatches.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: 61c94d281a1c44026ead08ba0e680129011f9b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c94d281a1c44026ead08ba0… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Dec 9 00:21:32 2008 -0600 msi: Add tests for MsiEnumPatches. --- dlls/msi/tests/msi.c | 629 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 629 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61c94d281a1c44026ead0…

1 0

James Hawkins : msi: Implement MsiEnumPatchesW.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: e07ed1a2eb73ed0cceaf47942a8eb07c6f704112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e07ed1a2eb73ed0cceaf47942… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Dec 9 00:21:28 2008 -0600 msi: Implement MsiEnumPatchesW. --- dlls/msi/registry.c | 156 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 114 insertions(+), 42 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index e7b093c..db9ec65 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1714,7 +1714,7 @@ done: static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, MSIINSTALLCONTEXT context, DWORD filter, DWORD index, DWORD *idx, LPWSTR patch, LPWSTR targetprod, MSIINSTALLCONTEXT *targetctx, - LPWSTR targetsid, DWORD *sidsize) + LPWSTR targetsid, DWORD *sidsize, LPWSTR *transforms) { MSIPATCHSTATE state; LPWSTR ptr, patches = NULL; @@ -1770,6 +1770,21 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, if (res != ERROR_SUCCESS) continue; + if (transforms) + { + *transforms = msi_alloc(size); + if (!*transforms) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + res = RegGetValueW(prod, szPatches, ptr, RRF_RT_REG_SZ, + &type, *transforms, &size); + if (res != ERROR_SUCCESS) + continue; + } + if (context == MSIINSTALLCONTEXT_USERMANAGED) { if (!(filter & MSIPATCHSTATE_APPLIED)) @@ -1838,7 +1853,8 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, } r = ERROR_SUCCESS; - lstrcpyW(targetprod, prodcode); + if (targetprod) + lstrcpyW(targetprod, prodcode); if (targetctx) *targetctx = context; @@ -1865,6 +1881,54 @@ done: return r; } +static UINT msi_enum_patches(LPCWSTR szProductCode, LPCWSTR szUserSid, + DWORD dwContext, DWORD dwFilter, DWORD dwIndex, DWORD *idx, + LPWSTR szPatchCode, LPWSTR szTargetProductCode, + MSIINSTALLCONTEXT *pdwTargetProductContext, LPWSTR szTargetUserSid, + LPDWORD pcchTargetUserSid, LPWSTR *szTransforms) +{ + UINT r; + + if (dwContext & MSIINSTALLCONTEXT_USERMANAGED) + { + r = msi_check_product_patches(szProductCode, szUserSid, + MSIINSTALLCONTEXT_USERMANAGED, dwFilter, + dwIndex, idx, szPatchCode, + szTargetProductCode, + pdwTargetProductContext, szTargetUserSid, + pcchTargetUserSid, szTransforms); + if (r != ERROR_NO_MORE_ITEMS) + goto done; + } + + if (dwContext & MSIINSTALLCONTEXT_USERUNMANAGED) + { + r = msi_check_product_patches(szProductCode, szUserSid, + MSIINSTALLCONTEXT_USERUNMANAGED, dwFilter, + dwIndex, idx, szPatchCode, + szTargetProductCode, + pdwTargetProductContext, szTargetUserSid, + pcchTargetUserSid, szTransforms); + if (r != ERROR_NO_MORE_ITEMS) + goto done; + } + + if (dwContext & MSIINSTALLCONTEXT_MACHINE) + { + r = msi_check_product_patches(szProductCode, szUserSid, + MSIINSTALLCONTEXT_MACHINE, dwFilter, + dwIndex, idx, szPatchCode, + szTargetProductCode, + pdwTargetProductContext, szTargetUserSid, + pcchTargetUserSid, szTransforms); + if (r != ERROR_NO_MORE_ITEMS) + goto done; + } + +done: + return r; +} + /*********************************************************************** * MsiEnumPatchesExW [MSI.@] */ @@ -1906,43 +1970,11 @@ UINT WINAPI MsiEnumPatchesExW(LPCWSTR szProductCode, LPCWSTR szUserSid, if (dwIndex == 0) last_index = 0; - if (dwContext & MSIINSTALLCONTEXT_USERMANAGED) - { - r = msi_check_product_patches(szProductCode, szUserSid, - MSIINSTALLCONTEXT_USERMANAGED, dwFilter, - dwIndex, &idx, szPatchCode, - szTargetProductCode, - pdwTargetProductContext, - szTargetUserSid, pcchTargetUserSid); - if (r != ERROR_NO_MORE_ITEMS) - goto done; - } - - if (dwContext & MSIINSTALLCONTEXT_USERUNMANAGED) - { - r = msi_check_product_patches(szProductCode, szUserSid, - MSIINSTALLCONTEXT_USERUNMANAGED, dwFilter, - dwIndex, &idx, szPatchCode, - szTargetProductCode, - pdwTargetProductContext, - szTargetUserSid, pcchTargetUserSid); - if (r != ERROR_NO_MORE_ITEMS) - goto done; - } - - if (dwContext & MSIINSTALLCONTEXT_MACHINE) - { - r = msi_check_product_patches(szProductCode, szUserSid, - MSIINSTALLCONTEXT_MACHINE, dwFilter, - dwIndex, &idx, szPatchCode, - szTargetProductCode, - pdwTargetProductContext, - szTargetUserSid, pcchTargetUserSid); - if (r != ERROR_NO_MORE_ITEMS) - goto done; - } + r = msi_enum_patches(szProductCode, szUserSid, dwContext, dwFilter, + dwIndex, &idx, szPatchCode, szTargetProductCode, + pdwTargetProductContext, szTargetUserSid, + pcchTargetUserSid, NULL); -done: if (r == ERROR_SUCCESS) last_index = dwIndex; @@ -2012,12 +2044,52 @@ done: /*********************************************************************** * MsiEnumPatchesW [MSI.@] */ -UINT WINAPI MsiEnumPatchesW( LPCWSTR szProduct, DWORD iPatchIndex, +UINT WINAPI MsiEnumPatchesW(LPCWSTR szProduct, DWORD iPatchIndex, LPWSTR lpPatchBuf, LPWSTR lpTransformsBuf, LPDWORD pcchTransformsBuf) { - FIXME("%s %d %p %p %p\n", debugstr_w(szProduct), - iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); - return ERROR_NO_MORE_ITEMS; + WCHAR squished_pc[GUID_SIZE]; + LPWSTR transforms = NULL; + HKEY prod; + DWORD idx = 0; + UINT r; + + TRACE("(%s %d %p %p %p)\n", debugstr_w(szProduct), iPatchIndex, + lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); + + if (!szProduct || !squash_guid(szProduct, squished_pc)) + return ERROR_INVALID_PARAMETER; + + if (!lpPatchBuf || !lpTransformsBuf || !pcchTransformsBuf) + return ERROR_INVALID_PARAMETER; + + if (MSIREG_OpenProductKey(szProduct, MSIINSTALLCONTEXT_USERMANAGED, + &prod, FALSE) != ERROR_SUCCESS && + MSIREG_OpenProductKey(szProduct, MSIINSTALLCONTEXT_USERUNMANAGED, + &prod, FALSE) != ERROR_SUCCESS && + MSIREG_OpenProductKey(szProduct, MSIINSTALLCONTEXT_MACHINE, + &prod, FALSE) != ERROR_SUCCESS) + return ERROR_UNKNOWN_PRODUCT; + + RegCloseKey(prod); + + r = msi_enum_patches(szProduct, NULL, MSIINSTALLCONTEXT_ALL, + MSIPATCHSTATE_ALL, iPatchIndex, &idx, lpPatchBuf, + NULL, NULL, NULL, NULL, &transforms); + if (r != ERROR_SUCCESS) + goto done; + + lstrcpynW(lpTransformsBuf, transforms, *pcchTransformsBuf); + if (*pcchTransformsBuf <= lstrlenW(transforms)) + { + r = ERROR_MORE_DATA; + *pcchTransformsBuf = lstrlenW(transforms) * sizeof(WCHAR); + } + else + *pcchTransformsBuf = lstrlenW(transforms); + +done: + msi_free(transforms); + return r; } UINT WINAPI MsiEnumProductsExA( LPCSTR szProductCode, LPCSTR szUserSid,

1 0

James Hawkins : msi: Add the ability to delete multiple users' component keys.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: a9e029093431f57d329ac0257279ff92e7fba5b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e029093431f57d329ac0257… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Dec 9 00:21:19 2008 -0600 msi: Add the ability to delete multiple users' component keys. --- dlls/msi/action.c | 4 ++-- dlls/msi/msipriv.h | 3 +-- dlls/msi/registry.c | 35 +++++++++++++---------------------- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index fd60505..654a7d0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2922,9 +2922,9 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) else if (ACTION_VerifyComponentForAction(comp, INSTALLSTATE_ABSENT)) { if (package->Context == MSIINSTALLCONTEXT_MACHINE) - MSIREG_DeleteLocalUserDataComponentKey(comp->ComponentId); + MSIREG_DeleteUserDataComponentKey(comp->ComponentId, szLocalSid); else - MSIREG_DeleteUserDataComponentKey(comp->ComponentId); + MSIREG_DeleteUserDataComponentKey(comp->ComponentId, NULL); } /* UI stuff */ diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 861cae8..99eff8f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -787,8 +787,7 @@ extern UINT MSIREG_DeleteProductKey(LPCWSTR szProduct); extern UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct); extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct); extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct); -extern UINT MSIREG_DeleteLocalUserDataComponentKey(LPCWSTR szComponent); -extern UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent); +extern UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid); extern UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode); extern UINT MSIREG_OpenClassesUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL create); extern UINT MSIREG_DeleteLocalClassesProductKey(LPCWSTR szProductCode); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 2808d7f..3d91626 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -733,20 +733,6 @@ UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) return rc; } -UINT MSIREG_DeleteLocalUserDataComponentKey(LPCWSTR szComponent) -{ - WCHAR comp[GUID_SIZE]; - WCHAR keypath[0x200]; - - TRACE("%s\n", debugstr_w(szComponent)); - if (!squash_guid(szComponent, comp)) - return ERROR_FUNCTION_FAILED; - TRACE("squished (%s)\n", debugstr_w(comp)); - - sprintfW(keypath, szUserDataComp_fmt, szLocalSid, comp); - return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); -} - UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, HKEY *key, BOOL create) { @@ -783,7 +769,7 @@ UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, return rc; } -UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent) +UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid) { UINT rc; WCHAR comp[GUID_SIZE]; @@ -795,16 +781,21 @@ UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent) return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(comp)); - rc = get_user_sid(&usersid); - if (rc != ERROR_SUCCESS || !usersid) + if (!szUserSid) { - ERR("Failed to retrieve user SID: %d\n", rc); - return rc; - } + rc = get_user_sid(&usersid); + if (rc != ERROR_SUCCESS || !usersid) + { + ERR("Failed to retrieve user SID: %d\n", rc); + return rc; + } - sprintfW(keypath, szUserDataComp_fmt, usersid, comp); + sprintfW(keypath, szUserDataComp_fmt, usersid, comp); + LocalFree(usersid); + } + else + sprintfW(keypath, szUserDataComp_fmt, szUserSid, comp); - LocalFree(usersid); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); }

1 0

James Hawkins : msi: Forward MsiEnumPatchesA to MsiEnumPatchesW.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: c46f2102c9c2dcec8fecc9903b766de77252ebf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46f2102c9c2dcec8fecc9903… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Dec 9 00:21:23 2008 -0600 msi: Forward MsiEnumPatchesA to MsiEnumPatchesW. --- dlls/msi/registry.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 3d91626..e7b093c 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1952,12 +1952,61 @@ done: /*********************************************************************** * MsiEnumPatchesA [MSI.@] */ -UINT WINAPI MsiEnumPatchesA( LPCSTR szProduct, DWORD iPatchIndex, +UINT WINAPI MsiEnumPatchesA(LPCSTR szProduct, DWORD iPatchIndex, LPSTR lpPatchBuf, LPSTR lpTransformsBuf, LPDWORD pcchTransformsBuf) { - FIXME("%s %d %p %p %p\n", debugstr_a(szProduct), - iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); - return ERROR_NO_MORE_ITEMS; + LPWSTR product, transforms = NULL; + WCHAR patch[GUID_SIZE]; + DWORD len; + UINT r; + + TRACE("(%s %d %p %p %p)\n", debugstr_a(szProduct), iPatchIndex, + lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); + + if (!szProduct || !lpPatchBuf || !lpTransformsBuf || !pcchTransformsBuf) + return ERROR_INVALID_PARAMETER; + + product = strdupAtoW(szProduct); + if (!product) + return ERROR_OUTOFMEMORY; + + len = 0; + r = MsiEnumPatchesW(product, iPatchIndex, patch, patch, &len); + if (r != ERROR_MORE_DATA) + goto done; + + transforms = msi_alloc(len); + if (!transforms) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + r = MsiEnumPatchesW(product, iPatchIndex, patch, transforms, &len); + if (r != ERROR_SUCCESS) + goto done; + + WideCharToMultiByte(CP_ACP, 0, patch, -1, lpPatchBuf, + GUID_SIZE, NULL, NULL); + + WideCharToMultiByte(CP_ACP, 0, transforms, -1, lpTransformsBuf, + *pcchTransformsBuf - 1, NULL, NULL); + + len = lstrlenW(transforms); + if (*pcchTransformsBuf < len + 1) + { + r = ERROR_MORE_DATA; + lpTransformsBuf[*pcchTransformsBuf - 1] = '\0'; + *pcchTransformsBuf = len * sizeof(WCHAR); + } + else + *pcchTransformsBuf = len; + +done: + msi_free(transforms); + msi_free(product); + + return r; } /***********************************************************************

1 0

James Hawkins : msi: Remove a duplicated function.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: bdf7da9bdcde72a0589c477bc96bd47e08f00601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf7da9bdcde72a0589c477bc… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Dec 9 00:21:15 2008 -0600 msi: Remove a duplicated function. --- dlls/msi/msi.c | 8 ++++---- dlls/msi/msipriv.h | 1 - dlls/msi/registry.c | 32 +------------------------------- 3 files changed, 5 insertions(+), 36 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 45fc728..d53cc91 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -619,7 +619,7 @@ UINT WINAPI MsiGetProductCodeW(LPCWSTR szComponent, LPWSTR szBuffer) return ERROR_INVALID_PARAMETER; if (MSIREG_OpenUserDataComponentKey(szComponent, NULL, &compkey, FALSE) != ERROR_SUCCESS && - MSIREG_OpenLocalSystemComponentKey(szComponent, &compkey, FALSE) != ERROR_SUCCESS) + MSIREG_OpenUserDataComponentKey(szComponent, szLocalSid, &compkey, FALSE) != ERROR_SUCCESS) { return ERROR_UNKNOWN_COMPONENT; } @@ -1324,7 +1324,7 @@ static BOOL msi_comp_find_prodcode(LPWSTR squished_pc, UINT r; if (context == MSIINSTALLCONTEXT_MACHINE) - r = MSIREG_OpenLocalSystemComponentKey(comp, &hkey, FALSE); + r = MSIREG_OpenUserDataComponentKey(comp, szLocalSid, &hkey, FALSE); else r = MSIREG_OpenUserDataComponentKey(comp, NULL, &hkey, FALSE); @@ -1776,7 +1776,7 @@ static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, state = INSTALLSTATE_UNKNOWN; - if (MSIREG_OpenLocalSystemComponentKey(szComponent, &hkey, FALSE) == ERROR_SUCCESS || + if (MSIREG_OpenUserDataComponentKey(szComponent, szLocalSid, &hkey, FALSE) == ERROR_SUCCESS || MSIREG_OpenUserDataComponentKey(szComponent, NULL, &hkey, FALSE) == ERROR_SUCCESS) { path = msi_reg_get_val_str(hkey, squished_pc); @@ -1802,7 +1802,7 @@ static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, { RegCloseKey(hkey); - if (MSIREG_OpenLocalSystemComponentKey(szComponent, &hkey, FALSE) == ERROR_SUCCESS || + if (MSIREG_OpenUserDataComponentKey(szComponent, szLocalSid, &hkey, FALSE) == ERROR_SUCCESS || MSIREG_OpenUserDataComponentKey(szComponent, NULL, &hkey, FALSE) == ERROR_SUCCESS) { msi_free(path); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 37d1d43..861cae8 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -786,7 +786,6 @@ extern UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL cr extern UINT MSIREG_DeleteProductKey(LPCWSTR szProduct); extern UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct); extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct); -extern UINT MSIREG_OpenLocalSystemComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create); extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct); extern UINT MSIREG_DeleteLocalUserDataComponentKey(LPCWSTR szComponent); extern UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index bd56a72..2808d7f 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -187,16 +187,6 @@ static const WCHAR szInstallProperties_fmt[] = { '%','s','\\','P','r','o','d','u','c','t','s','\\','%','s','\\', 'I','n','s','t','a','l','l','P','r','o','p','e','r','t','i','e','s',0}; -static const WCHAR szInstaller_LocalSystemComponent_fmt[] = { -'S','o','f','t','w','a','r','e','\\', -'M','i','c','r','o','s','o','f','t','\\', -'W','i','n','d','o','w','s','\\', -'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', -'I','n','s','t','a','l','l','e','r','\\', -'U','s','e','r','D','a','t','a','\\', -'S','-','1','-','5','-','1','8','\\', -'C','o','m','p','o','n','e','n','t','s','\\','%','s',0}; - static const WCHAR szInstaller_LocalClassesProd_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'C','l','a','s','s','e','s','\\', @@ -1039,26 +1029,6 @@ UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode) return RegDeleteTreeW(HKEY_CURRENT_USER, keypath); } -UINT MSIREG_OpenLocalSystemComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create) -{ - WCHAR squished_pc[GUID_SIZE]; - WCHAR keypath[0x200]; - - TRACE("%s\n", debugstr_w(szComponent)); - - if (!squash_guid(szComponent, squished_pc)) - return ERROR_FUNCTION_FAILED; - - TRACE("squished (%s)\n", debugstr_w(squished_pc)); - - sprintfW(keypath, szInstaller_LocalSystemComponent_fmt, squished_pc); - - if (create) - return RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); - - return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); -} - UINT MSIREG_DeleteLocalClassesProductKey(LPCWSTR szProductCode) { WCHAR squished_pc[GUID_SIZE]; @@ -1386,7 +1356,7 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) return ERROR_INVALID_PARAMETER; if (MSIREG_OpenUserDataComponentKey(szComponent, NULL, &hkeyComp, FALSE) != ERROR_SUCCESS && - MSIREG_OpenLocalSystemComponentKey(szComponent, &hkeyComp, FALSE) != ERROR_SUCCESS) + MSIREG_OpenUserDataComponentKey(szComponent, szLocalSid, &hkeyComp, FALSE) != ERROR_SUCCESS) return ERROR_UNKNOWN_COMPONENT; /* see if there are any products at all */

1 0