wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Charles Davis : ntdll: Implement DVD_GetRegion() on both Linux and Mac OS.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: ca786887a2bc1311f892d74a1430c58d0bf96b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca786887a2bc1311f892d74a1… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Oct 19 12:15:24 2009 -0600 ntdll: Implement DVD_GetRegion() on both Linux and Mac OS. --- dlls/ntdll/cdrom.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 64 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index d3dd54b..70fc1d1 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -2348,13 +2348,73 @@ static NTSTATUS DVD_ReadKey(int fd, PDVD_COPY_PROTECT_KEY key) /****************************************************************** * DVD_GetRegion * - * + * This IOCTL combines information from both IOCTL_DVD_READ_KEY + * with key type DvdGetRpcKey and IOCTL_DVD_READ_STRUCTURE with + * structure type DvdCopyrightInformation into one structure. */ -static NTSTATUS DVD_GetRegion(int dev, PDVD_REGION region) +static NTSTATUS DVD_GetRegion(int fd, PDVD_REGION region) { - FIXME("\n"); - return STATUS_SUCCESS; +#if defined(linux) + NTSTATUS ret = STATUS_NOT_SUPPORTED; + dvd_struct dvd; + dvd_authinfo auth_info; + + dvd.type = DVD_STRUCT_COPYRIGHT; + dvd.copyright.layer_num = 0; + auth_info.type = DVD_LU_SEND_RPC_STATE; + + ret = CDROM_GetStatusCode(ioctl( fd, DVD_AUTH, &auth_info )); + if (ret == STATUS_SUCCESS) + { + ret = CDROM_GetStatusCode(ioctl( fd, DVD_READ_STRUCT, &dvd )); + + if (ret == STATUS_SUCCESS) + { + region->CopySystem = dvd.copyright.cpst; + region->RegionData = dvd.copyright.rmi; + region->SystemRegion = auth_info.lrpcs.region_mask; + region->ResetCount = auth_info.lrpcs.ucca; + } + } + return ret; +#elif defined(__FreeBSD__) || defined(__NetBSD__) + TRACE("bsd\n"); + return STATUS_NOT_SUPPORTED; +#elif defined(__APPLE__) + dk_dvd_report_key_t key; + dk_dvd_read_structure_t dvd; + DVDRegionPlaybackControlInfo rpc; + DVDCopyrightInfo copy; + NTSTATUS ret = STATUS_NOT_SUPPORTED; + + key.format = kDVDKeyFormatRegionState; + key.keyClass = kDVDKeyClassCSS_CPPM_CPRM; + key.bufferLength = sizeof(rpc); + key.buffer = &rpc; + dvd.format = kDVDStructureFormatCopyrightInfo; + dvd.bufferLength = sizeof(copy); + dvd.buffer = © + + ret = CDROM_GetStatusCode(ioctl( fd, DKIOCDVDREPORTKEY, &key )); + + if (ret == STATUS_SUCCESS) + { + ret = CDROM_GetStatusCode(ioctl( fd, DKIOCDVDREADSTRUCTURE, &dvd )); + + if (ret == STATUS_SUCCESS) + { + region->CopySystem = copy.copyrightProtectionSystemType; + region->RegionData = copy.regionMask; + region->SystemRegion = rpc.driveRegion; + region->ResetCount = rpc.numberUserResets; + } + } + return ret; +#else + FIXME("\n"); + return STATUS_NOT_SUPPORTED; +#endif } /******************************************************************

1 0

Charles Davis : ntdll: Implement CDROM_ScsiGetCaps() on Mac OS.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 816a78b0cf9412793ff5d3ab8b8bbcd5e92f9ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=816a78b0cf9412793ff5d3ab8… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Oct 19 12:15:18 2009 -0600 ntdll: Implement CDROM_ScsiGetCaps() on Mac OS. --- dlls/ntdll/cdrom.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index d9ab7e2..d3dd54b 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1892,12 +1892,12 @@ static NTSTATUS CDROM_ScsiPassThrough(int fd, PSCSI_PASS_THROUGH pPacket) * * */ -static NTSTATUS CDROM_ScsiGetCaps(PIO_SCSI_CAPABILITIES caps) +static NTSTATUS CDROM_ScsiGetCaps(int fd, PIO_SCSI_CAPABILITIES caps) { NTSTATUS ret = STATUS_NOT_IMPLEMENTED; - caps->Length = sizeof(*caps); #ifdef SG_SCATTER_SZ + caps->Length = sizeof(*caps); caps->MaximumTransferLength = SG_SCATTER_SZ; /* FIXME */ caps->MaximumPhysicalPages = SG_SCATTER_SZ / getpagesize(); caps->SupportedAsynchronousEvents = TRUE; @@ -1906,6 +1906,23 @@ static NTSTATUS CDROM_ScsiGetCaps(PIO_SCSI_CAPABILITIES caps) caps->AdapterScansDown = FALSE; /* FIXME ? */ caps->AdapterUsesPio = FALSE; /* FIXME ? */ ret = STATUS_SUCCESS; +#elif defined __APPLE__ + uint64_t bytesr, bytesw, align; + int io = ioctl(fd, DKIOCGETMAXBYTECOUNTREAD, &bytesr); + if (io != 0) return CDROM_GetStatusCode(io); + io = ioctl(fd, DKIOCGETMAXBYTECOUNTWRITE, &bytesw); + if (io != 0) return CDROM_GetStatusCode(io); + io = ioctl(fd, DKIOCGETMINSEGMENTALIGNMENTBYTECOUNT, &align); + if (io != 0) return CDROM_GetStatusCode(io); + caps->Length = sizeof(*caps); + caps->MaximumTransferLength = bytesr < bytesw ? bytesr : bytesw; + caps->MaximumPhysicalPages = caps->MaximumTransferLength / getpagesize(); + caps->SupportedAsynchronousEvents = TRUE; + caps->AlignmentMask = align-1; + caps->TaggedQueuing = FALSE; /* we could check that it works and answer TRUE */ + caps->AdapterScansDown = FALSE; /* FIXME ? */ + caps->AdapterUsesPio = FALSE; /* FIXME ? */ + ret = STATUS_SUCCESS; #else FIXME("Unimplemented\n"); #endif @@ -2882,7 +2899,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, sz = sizeof(IO_SCSI_CAPABILITIES); if (lpOutBuffer == NULL) status = STATUS_INVALID_PARAMETER; else if (nOutBufferSize < sizeof(IO_SCSI_CAPABILITIES)) status = STATUS_BUFFER_TOO_SMALL; - else status = CDROM_ScsiGetCaps(lpOutBuffer); + else status = CDROM_ScsiGetCaps(fd, lpOutBuffer); break; case IOCTL_DVD_START_SESSION: sz = sizeof(DVD_SESSION_ID);

1 0

Charles Davis : ntdll: Partially implement CDROM_GetControl() on Mac OS.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: d22abc20a325bd54497319018a926e58db4792f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22abc20a325bd54497319018… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Oct 19 12:15:11 2009 -0600 ntdll: Partially implement CDROM_GetControl() on Mac OS. Only the speed is returned. --- dlls/ntdll/cdrom.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 3e520ec..d9ab7e2 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -670,10 +670,20 @@ static NTSTATUS CDROM_GetStatusCode(int io) * CDROM_GetControl * */ -static NTSTATUS CDROM_GetControl(int dev, CDROM_AUDIO_CONTROL* cac) +static NTSTATUS CDROM_GetControl(int dev, int fd, CDROM_AUDIO_CONTROL* cac) { - cac->LbaFormat = 0; /* FIXME */ +#ifdef __APPLE__ + uint16_t speed; + int io = ioctl( fd, DKIOCCDGETSPEED, &speed ); + if (io != 0) return CDROM_GetStatusCode( io ); + /* DKIOCCDGETSPEED returns the speed in kilobytes per second, + * so convert to logical blocks (assumed to be ~2 KB). + */ + cac->LogicalBlocksPerSecond = speed/2; +#else cac->LogicalBlocksPerSecond = 1; /* FIXME */ +#endif + cac->LbaFormat = 0; /* FIXME */ return STATUS_NOT_SUPPORTED; } @@ -2762,7 +2772,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, sz = sizeof(CDROM_AUDIO_CONTROL); if (lpInBuffer != NULL || nInBufferSize != 0) status = STATUS_INVALID_PARAMETER; else if (nOutBufferSize < sz) status = STATUS_BUFFER_TOO_SMALL; - else status = CDROM_GetControl(dev, lpOutBuffer); + else status = CDROM_GetControl(dev, fd, lpOutBuffer); break; case IOCTL_CDROM_GET_DRIVE_GEOMETRY:

1 0

Stefan Dösinger : wined3d: Use ARB constant limits in ARB.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 122ed40c2b47a48f708bd16007595b8bfe31df5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=122ed40c2b47a48f708bd1600… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 7 21:41:59 2009 +0200 wined3d: Use ARB constant limits in ARB. --- dlls/wined3d/arb_program_shader.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c588c13..1141d4c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -84,10 +84,10 @@ static inline BOOL ffp_clip_emul(IWineD3DStateBlockImpl *stateblock) return stateblock->lowest_disabled_stage < 7; } -/* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, +/* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vs_arb_constantsF) - 1, * so upload them above that */ -#define ARB_SHADER_PRIVCONST_BASE (GL_LIMITS(vshader_constantsF) - 1) +#define ARB_SHADER_PRIVCONST_BASE (GL_LIMITS(vs_arb_constantsF) - 1) #define ARB_SHADER_PRIVCONST_POS ARB_SHADER_PRIVCONST_BASE + 0 /* ARB_program_shader private data */ @@ -634,11 +634,11 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s * and don't know which are actually used. */ if(pshader) { - max_constantsF = GL_LIMITS(pshader_constantsF); + max_constantsF = GL_LIMITS(ps_arb_constantsF); } else { if(This->baseShader.reg_maps.usesrelconstF) { DWORD highest_constf = 0, clip_limit; - max_constantsF = GL_LIMITS(vshader_constantsF) - reserved_vs_const(iface, gl_info); + max_constantsF = GL_LIMITS(vs_arb_constantsF) - reserved_vs_const(iface, gl_info); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); for(i = 0; i < This->baseShader.limits.constant_float; i++) @@ -668,7 +668,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s { if(ctx->target_version >= NV2) *num_clipplanes = GL_LIMITS(clipplanes); else *num_clipplanes = min(GL_LIMITS(clipplanes), 4); - max_constantsF = GL_LIMITS(vshader_constantsF); + max_constantsF = GL_LIMITS(vs_arb_constantsF); } } @@ -4527,7 +4527,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); TRACE_(d3d_caps)("Hardware vertex shader version 3.0 enabled (NV_VERTEX_PROGRAM3)\n"); } - else if(GL_LIMITS(vshader_constantsF) >= 256) + else if(GL_LIMITS(vs_arb_constantsF) >= 256) { /* Shader Model 2.0 requires at least 256 vertex shader constants */ pCaps->VertexShaderVersion = WINED3DVS_VERSION(2,0); @@ -4538,7 +4538,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1); TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); } - pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF); + pCaps->MaxVertexShaderConst = GL_LIMITS(vs_arb_constantsF); } if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { @@ -4547,7 +4547,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0); TRACE_(d3d_caps)("Hardware pixel shader version 3.0 enabled (NV_FRAGMENT_PROGRAM2)\n"); } - else if(GL_LIMITS(pshader_constantsF) >= 32) + else if(GL_LIMITS(ps_arb_constantsF) >= 32) { /* Shader Model 2.0 requires at least 32 pixel shader constants */ pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0); @@ -4559,7 +4559,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_ TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); } pCaps->PixelShader1xMaxValue = 8.0f; - pCaps->MaxPixelShaderConst = GL_LIMITS(pshader_constantsF); + pCaps->MaxPixelShaderConst = GL_LIMITS(ps_arb_constantsF); } pCaps->VSClipping = use_nv_clip(gl_info);

1 0

Stefan Dösinger : wined3d: Use GLSL constant limits in GLSL.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 435646550b68509bba56e246fef7f0969706795f URL: http://source.winehq.org/git/wine.git/?a=commit;h=435646550b68509bba56e246f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 7 21:41:50 2009 +0200 wined3d: Use GLSL constant limits in GLSL. --- dlls/wined3d/glsl_shader.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9402432..6bf4144 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -844,7 +844,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont */ if(pshader) { /* No indirect addressing here */ - max_constantsF = GL_LIMITS(pshader_constantsF); + max_constantsF = GL_LIMITS(ps_glsl_constantsF); } else { if(This->baseShader.reg_maps.usesrelconstF) { /* Subtract the other potential uniforms from the max available (bools, ints, and 1 row of projection matrix). @@ -854,7 +854,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont * * Writing gl_ClipPos requires one uniform for each clipplane as well. */ - max_constantsF = GL_LIMITS(vshader_constantsF) - 3 - GL_LIMITS(clipplanes); + max_constantsF = GL_LIMITS(vs_glsl_constantsF) - 3 - GL_LIMITS(clipplanes); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); /* Strictly speaking a bool only uses one scalar, but the nvidia(Linux) compiler doesn't pack them properly, * so each scalar requires a full vec4. We could work around this by packing the booleans ourselves, but @@ -864,7 +864,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont /* Set by driver quirks in directx.c */ max_constantsF -= GLINFO_LOCATION.reserved_glsl_constants; } else { - max_constantsF = GL_LIMITS(vshader_constantsF); + max_constantsF = GL_LIMITS(vs_glsl_constantsF); } } max_constantsF = min(This->baseShader.limits.constant_float, max_constantsF); @@ -923,7 +923,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont srgb_cmp); } if(reg_maps->vpos || reg_maps->usesdsy) { - if(This->baseShader.limits.constant_float + extra_constants_needed + 1 < GL_LIMITS(pshader_constantsF)) { + if(This->baseShader.limits.constant_float + extra_constants_needed + 1 < GL_LIMITS(ps_glsl_constantsF)) { shader_addline(buffer, "uniform vec4 ycorrection;\n"); ((IWineD3DPixelShaderImpl *) This)->vpos_uniform = 1; extra_constants_needed++; @@ -4132,8 +4132,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, GL_EXTCALL(glLinkProgramARB(programId)); print_glsl_info_log(&GLINFO_LOCATION, programId); - entry->vuniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * GL_LIMITS(vshader_constantsF)); - for (i = 0; i < GL_LIMITS(vshader_constantsF); ++i) { + entry->vuniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * GL_LIMITS(vs_glsl_constantsF)); + for (i = 0; i < GL_LIMITS(vs_glsl_constantsF); ++i) { snprintf(glsl_name, sizeof(glsl_name), "VC[%i]", i); entry->vuniformF_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); } @@ -4141,8 +4141,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, snprintf(glsl_name, sizeof(glsl_name), "VI[%i]", i); entry->vuniformI_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); } - entry->puniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * GL_LIMITS(pshader_constantsF)); - for (i = 0; i < GL_LIMITS(pshader_constantsF); ++i) { + entry->puniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * GL_LIMITS(ps_glsl_constantsF)); + for (i = 0; i < GL_LIMITS(ps_glsl_constantsF); ++i) { snprintf(glsl_name, sizeof(glsl_name), "PC[%i]", i); entry->puniformF_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); } @@ -4521,7 +4521,7 @@ static HRESULT shader_glsl_alloc(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; struct shader_glsl_priv *priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_glsl_priv)); - SIZE_T stack_size = wined3d_log2i(max(GL_LIMITS(vshader_constantsF), GL_LIMITS(pshader_constantsF))) + 1; + SIZE_T stack_size = wined3d_log2i(max(GL_LIMITS(vs_glsl_constantsF), GL_LIMITS(ps_glsl_constantsF))) + 1; if (!shader_buffer_init(&priv->shader_buffer)) { @@ -4536,13 +4536,13 @@ static HRESULT shader_glsl_alloc(IWineD3DDevice *iface) { goto fail; } - if (!constant_heap_init(&priv->vconst_heap, GL_LIMITS(vshader_constantsF))) + if (!constant_heap_init(&priv->vconst_heap, GL_LIMITS(vs_glsl_constantsF))) { ERR("Failed to initialize vertex shader constant heap\n"); goto fail; } - if (!constant_heap_init(&priv->pconst_heap, GL_LIMITS(pshader_constantsF))) + if (!constant_heap_init(&priv->pconst_heap, GL_LIMITS(ps_glsl_constantsF))) { ERR("Failed to initialize pixel shader constant heap\n"); goto fail; @@ -4616,7 +4616,7 @@ static void shader_glsl_get_caps(WINED3DDEVTYPE devtype, else pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); TRACE_(d3d_caps)("Hardware vertex shader version %d.%d enabled (GLSL)\n", (pCaps->VertexShaderVersion >> 8) & 0xff, pCaps->VertexShaderVersion & 0xff); - pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF); + pCaps->MaxVertexShaderConst = GL_LIMITS(vs_glsl_constantsF); /* Older DX9-class videocards (GeforceFX / Radeon >9500/X*00) only support pixel shader 2.0/2.0a/2.0b. * In OpenGL the extensions related to GLSL abstract lowlevel GL info away which is needed @@ -4635,7 +4635,7 @@ static void shader_glsl_get_caps(WINED3DDEVTYPE devtype, else pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0); - pCaps->MaxPixelShaderConst = GL_LIMITS(pshader_constantsF); + pCaps->MaxPixelShaderConst = GL_LIMITS(ps_glsl_constantsF); /* FIXME: The following line is card dependent. -8.0 to 8.0 is the * Direct3D minimum requirement.

1 0

Stefan Dösinger : wined3d: Make shader specific constants accessible via GL_LIMITS.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 2d802af4d9ca1c0da6442a9bf40961196959cb9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d802af4d9ca1c0da6442a9bf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 7 21:38:25 2009 +0200 wined3d: Make shader specific constants accessible via GL_LIMITS. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/directx.c | 82 ++++++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/wined3d_gl.h | 18 ++++---- 4 files changed, 53 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d802af4d9ca1c0da6442…

1 0

Hans Leidekker : msi: Open the database read/write in MSI_OpenPackageW.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: afcd2c535894c1768e3fc007277f86400b2067aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=afcd2c535894c1768e3fc0072… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 20 14:10:19 2009 +0200 msi: Open the database read/write in MSI_OpenPackageW. Fixes transforms that add binary streams. --- dlls/msi/package.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 1ab2afd..13091d9 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -966,7 +966,11 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) return GetLastError(); } - r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY, &db ); + /* transforms that add binary streams require that we open the database + * read/write, which is safe because we always create a copy that is thrown + * away when we're done. + */ + r = MSI_OpenDatabaseW( file, MSIDBOPEN_DIRECT, &db ); if( r != ERROR_SUCCESS ) { if (file != szPackage)

1 0

Hans Leidekker : msi: Create the local copy before opening the database.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 8dd3d389b02a6477e78aa9af1ccc310fa3a562a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd3d389b02a6477e78aa9af1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 20 14:09:53 2009 +0200 msi: Create the local copy before opening the database. --- dlls/msi/action.c | 61 ++------------------------------------------------ dlls/msi/database.c | 5 ++++ dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 49 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 57 insertions(+), 59 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e108701..b9b8199 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3802,63 +3802,6 @@ static UINT ACTION_UnpublishFeatures(MSIPACKAGE *package) return ERROR_SUCCESS; } -static UINT msi_get_local_package_name( LPWSTR path ) -{ - static const WCHAR szInstaller[] = { - '\\','I','n','s','t','a','l','l','e','r','\\',0}; - static const WCHAR fmt[] = { '%','x','.','m','s','i',0}; - DWORD time, len, i; - HANDLE handle; - - time = GetTickCount(); - GetWindowsDirectoryW( path, MAX_PATH ); - lstrcatW( path, szInstaller ); - CreateDirectoryW( path, NULL ); - - len = lstrlenW(path); - for (i=0; i<0x10000; i++) - { - snprintfW( &path[len], MAX_PATH - len, fmt, (time+i)&0xffff ); - handle = CreateFileW( path, GENERIC_WRITE, 0, NULL, - CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0 ); - if (handle != INVALID_HANDLE_VALUE) - { - CloseHandle(handle); - break; - } - if (GetLastError() != ERROR_FILE_EXISTS && - GetLastError() != ERROR_SHARING_VIOLATION) - return ERROR_FUNCTION_FAILED; - } - - return ERROR_SUCCESS; -} - -static UINT msi_make_package_local( MSIPACKAGE *package, HKEY hkey ) -{ - WCHAR packagefile[MAX_PATH]; - UINT r; - - r = msi_get_local_package_name( packagefile ); - if (r != ERROR_SUCCESS) - return r; - - TRACE("Copying to local package %s\n",debugstr_w(packagefile)); - - r = CopyFileW( package->db->path, packagefile, FALSE); - - if (!r) - { - ERR("Unable to copy package (%s -> %s) (error %d)\n", - debugstr_w(package->db->path), debugstr_w(packagefile), GetLastError()); - return ERROR_FUNCTION_FAILED; - } - - msi_reg_set_val_str( hkey, INSTALLPROPERTY_LOCALPACKAGEW, packagefile ); - - return ERROR_SUCCESS; -} - static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey) { LPWSTR prop, val, key; @@ -3990,7 +3933,9 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) goto done; - msi_make_package_local(package, props); + msi_reg_set_val_str( props, INSTALLPROPERTY_LOCALPACKAGEW, package->db->localfile ); + msi_free( package->db->localfile ); + package->db->localfile = NULL; rc = msi_publish_install_properties(package, hkey); if (rc != ERROR_SUCCESS) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 8d0ee42..a75b8a8 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -65,6 +65,11 @@ static VOID MSI_CloseDatabase( MSIOBJECTHDR *arg ) DeleteFileW( db->deletefile ); msi_free( db->deletefile ); } + if (db->localfile) + { + DeleteFileW( db->localfile ); + msi_free( db->localfile ); + } } UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 296e87d..9692b64 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -76,6 +76,7 @@ typedef struct tagMSIDATABASE UINT bytes_per_strref; LPWSTR path; LPWSTR deletefile; + LPWSTR localfile; LPCWSTR mode; struct list tables; struct list transforms; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 1d34770..1ab2afd 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -870,6 +870,38 @@ LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename ) return filename; } +static UINT msi_get_local_package_name( LPWSTR path ) +{ + static const WCHAR szInstaller[] = { + '\\','I','n','s','t','a','l','l','e','r','\\',0}; + static const WCHAR fmt[] = { '%','x','.','m','s','i',0}; + DWORD time, len, i; + HANDLE handle; + + time = GetTickCount(); + GetWindowsDirectoryW( path, MAX_PATH ); + strcatW( path, szInstaller ); + CreateDirectoryW( path, NULL ); + + len = strlenW(path); + for (i = 0; i < 0x10000; i++) + { + snprintfW( &path[len], MAX_PATH - len, fmt, (time + i)&0xffff ); + handle = CreateFileW( path, GENERIC_WRITE, 0, NULL, + CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0 ); + if (handle != INVALID_HANDLE_VALUE) + { + CloseHandle(handle); + break; + } + if (GetLastError() != ERROR_FILE_EXISTS && + GetLastError() != ERROR_SHARING_VIOLATION) + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; +} + UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) { static const WCHAR OriginalDatabase[] = @@ -880,7 +912,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) MSIHANDLE handle; LPWSTR ptr, base_url = NULL; UINT r; - WCHAR temppath[MAX_PATH]; + WCHAR temppath[MAX_PATH], localfile[MAX_PATH]; LPCWSTR file = szPackage; TRACE("%s %p\n", debugstr_w(szPackage), pPackage); @@ -921,6 +953,19 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) else file = copy_package_to_temp( szPackage, temppath ); + r = msi_get_local_package_name( localfile ); + if (r != ERROR_SUCCESS) + return r; + + TRACE("Copying to local package %s\n", debugstr_w(localfile)); + + if (!CopyFileW( file, localfile, FALSE )) + { + ERR("Unable to copy package (%s -> %s) (error %u)\n", + debugstr_w(file), debugstr_w(localfile), GetLastError()); + return GetLastError(); + } + r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY, &db ); if( r != ERROR_SUCCESS ) { @@ -932,6 +977,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) return r; } + + db->localfile = strdupW( localfile ); } package = MSI_CreatePackage( db, base_url );

1 0

Hans Leidekker : msi: Always create a temporary copy of the package.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 33d9f37f4a34533a543446a54f69d4d212db89d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d9f37f4a34533a543446a54… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 20 14:09:08 2009 +0200 msi: Always create a temporary copy of the package. --- dlls/msi/package.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index fa0cd6f..1d34770 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -908,6 +908,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) if ( UrlIsW( szPackage, URLIS_URL ) ) { file = msi_download_file( szPackage, temppath ); + if ( file != szPackage ) + file = copy_package_to_temp( file, temppath ); base_url = strdupW( szPackage ); if ( !base_url )

1 0

Damjan Jovanovic : cfgmgr32.h: Define MAX_DEVICE_ID_LEN.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 47334849c3f6c07ca9c95e8696ede8c9d90f304e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47334849c3f6c07ca9c95e869… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Oct 20 13:44:41 2009 +0200 cfgmgr32.h: Define MAX_DEVICE_ID_LEN. --- include/cfgmgr32.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 9e99985..2b80534 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -97,6 +97,9 @@ typedef DWORD CONFIGRET; #define CR_INVALID_STRUCTURE_SIZE 0x3b #define NUM_CR_RESULTS 0x3c +#define MAX_DEVICE_ID_LEN 200 +#define MAX_DEVNODE_ID_LEN MAX_DEVICE_ID_LEN + #define MAX_CLASS_NAME_LEN 32 #define MAX_GUID_STRING_LEN 39 #define MAX_PROFILE_LEN 80

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009