wine-commits October 2007

wine-commits@winehq.org

4 participants
996 discussions

Marcus Meissner : imm32: Avoid spamming the debug output.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: a84f9e6f69666f70d025e3071a2fbe394ed23662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84f9e6f69666f70d025e3071… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Oct 12 09:11:43 2007 +0200 imm32: Avoid spamming the debug output. --- dlls/imm32/imm.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index b95b257..4f5f658 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1057,7 +1057,12 @@ BOOL WINAPI ImmGetConversionStatus( */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { - FIXME("(%p - %p %p ): semi-stub\n", hWnd,hwndDefault, root_context); + static int shown = 0; + + if (!shown) { + FIXME("(%p - %p %p ): semi-stub\n", hWnd,hwndDefault, root_context); + shown = 1; + } if (hwndDefault == NULL) { @@ -1517,9 +1522,13 @@ BOOL WINAPI ImmRegisterWordW( */ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) { - FIXME("(%p, %p): stub\n", hWnd, hIMC); + static int shown = 0; - return TRUE; + if (!shown) { + FIXME("(%p, %p): stub\n", hWnd, hIMC); + shown = 1; + } + return TRUE; } /*********************************************************************** @@ -1731,9 +1740,14 @@ BOOL WINAPI ImmSetCompositionWindow( BOOL WINAPI ImmSetConversionStatus( HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) { - FIXME("(%p, %d, %d): stub\n", - hIMC, fdwConversion, fdwSentence - ); + static int shown = 0; + + if (!shown) { + FIXME("(%p, %d, %d): stub\n", + hIMC, fdwConversion, fdwSentence + ); + shown = 1; + } SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; }

1 0

Roderick Colenbrander : wined3d: Use a fragment shader to do P8 palette conversion in hardware.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 134aa67ec9fc9f761e6da15a816f770d8a30c455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134aa67ec9fc9f761e6da15a8… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Oct 11 23:11:37 2007 +0200 wined3d: Use a fragment shader to do P8 palette conversion in hardware. --- dlls/wined3d/device.c | 5 +++ dlls/wined3d/surface.c | 64 ++++++++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 65 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3857ebd..a7a586d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2117,6 +2117,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D } } + /* Delete the palette conversion shader if it is around */ + if(This->paletteConversionShader) { + GL_EXTCALL(glDeleteProgramsARB(1, &This->paletteConversionShader)); + } + /* Delete the pbuffer context if there is any */ if(This->pbufferContext) DestroyContext(This, This->pbufferContext); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bbf51c7..fc1b10d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1413,7 +1413,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ /* Use conversion when the paletted texture extension is not available, or when it is available make sure it is used * for texturing as it won't work for calls like glDraw-/glReadPixels and further also use conversion in case of color keying. */ - if(!GL_SUPPORT(EXT_PALETTED_TEXTURE) || colorkey_active || (!use_texturing && GL_SUPPORT(EXT_PALETTED_TEXTURE)) ) { + if( !(GL_SUPPORT(EXT_PALETTED_TEXTURE) || GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) || colorkey_active || (!use_texturing && GL_SUPPORT(EXT_PALETTED_TEXTURE)) ) { *format = GL_RGBA; *internal = GL_RGBA; *type = GL_UNSIGNED_BYTE; @@ -1424,6 +1424,12 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *convert = CONVERT_PALETTED; } } + else if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { + *format = GL_RED; + *internal = GL_RGBA; + *type = GL_UNSIGNED_BYTE; + *target_bpp = 1; + } break; @@ -1969,16 +1975,64 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE (*table)[4], } } +const char *fragment_palette_conversion = + "!!ARBfp1.0\n" + "TEMP index;\n" + "PARAM constants = { 0.996, 0.00195, 0, 0 };\n" /* { 255/256, 0.5/255*255/256, 0, 0 } */ + "TEX index.x, fragment.texcoord[0], texture[0], 2D;\n" /* store the red-component of the current pixel */ + "MUL index.x, index.x, constants.x;\n" /* Scale the index by 255/256 */ + "ADD index.x, index.x, constants.y;\n" /* Add a bias of '0.5' in order to sample in the middle */ + "TEX result.color, index, texture[1], 1D;\n" /* use the red-component as a index in the palette to get the final color */ + "END"; + /* This function is used in case of 8bit paletted textures to upload the palette. - For now it only supports GL_EXT_paletted_texture extension but support for other - extensions like ARB_fragment_program and ATI_fragment_shaders will be added as well. + It supports GL_EXT_paletted_texture and GL_ARB_fragment_program, support for other + extensions like ATI_fragment_shaders is possible. */ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; BYTE table[256][4]; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; d3dfmt_p8_init_palette(This, table, (convert == CONVERT_PALETTED_CK)); - GL_EXTCALL(glColorTableEXT(GL_TEXTURE_2D,GL_RGBA,256,GL_RGBA,GL_UNSIGNED_BYTE, table)); + + /* Try to use the paletted texture extension */ + if(GL_SUPPORT(EXT_PALETTED_TEXTURE)) + { + TRACE("Using GL_EXT_PALETTED_TEXTURE for 8-bit paletted texture support\n"); + GL_EXTCALL(glColorTableEXT(GL_TEXTURE_2D,GL_RGBA,256,GL_RGBA,GL_UNSIGNED_BYTE, table)); + } + else + { + /* Let a fragment shader do the color conversion by uploading the palette to a 1D texture. + * The 8bit pixel data will be used as an index in this palette texture to retrieve the final color. */ + TRACE("Using fragment shaders for emulating 8-bit paletted texture support\n"); + + /* Create the fragment program if we don't have it */ + if(!device->paletteConversionShader) + { + glEnable(GL_FRAGMENT_PROGRAM_ARB); + GL_EXTCALL(glGenProgramsARB(1, &device->paletteConversionShader)); + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, device->paletteConversionShader)); + GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(fragment_palette_conversion), (const GLbyte *)fragment_palette_conversion)); + glDisable(GL_FRAGMENT_PROGRAM_ARB); + } + + glEnable(GL_FRAGMENT_PROGRAM_ARB); + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, device->paletteConversionShader)); + + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE1)); + glEnable(GL_TEXTURE_1D); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + + glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); /* Make sure we have discrete color levels. */ + glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexImage1D(GL_TEXTURE_1D, 0, GL_RGBA, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, table); /* Upload the palette */ + + /* Switch back to unit 0 in which the 2D texture will be stored. */ + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0)); + } } static BOOL palette9_changed(IWineD3DSurfaceImpl *This) { @@ -2150,7 +2204,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, width, height, outpitch, convert, This); This->Flags |= SFLAG_CONVERTED; - } else if (This->resource.format == WINED3DFMT_P8 && GL_SUPPORT(EXT_PALETTED_TEXTURE)) { + } else if( (This->resource.format == WINED3DFMT_P8) && (GL_SUPPORT(EXT_PALETTED_TEXTURE) || GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) ) { d3dfmt_p8_upload_palette(iface, convert); This->Flags &= ~SFLAG_CONVERTED; mem = This->resource.allocatedMemory; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 431160d..446f2a9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -699,6 +699,7 @@ struct IWineD3DDeviceImpl /* palettes texture management */ PALETTEENTRY palettes[MAX_PALETTES][256]; UINT currentPalette; + UINT paletteConversionShader; /* For rendering to a texture using glCopyTexImage */ BOOL render_offscreen;

1 0

Roderick Colenbrander : wined3d: Fix inverse palette lookup for P8 surfaces .
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 5749dd40518aed6fff7abea8f5283fe324c55e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5749dd40518aed6fff7abea8f… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Oct 11 22:04:48 2007 +0200 wined3d: Fix inverse palette lookup for P8 surfaces. The previous method didn't take into account duplicate entries for the same color. --- dlls/wined3d/surface.c | 76 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 54 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 938df0d..bbf51c7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -487,24 +487,32 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v { case WINED3DFMT_P8: { - /* GL can't return palettized data, so read ARGB pixels into a - * separate block of memory and convert them into palettized format - * in software. Slow, but if the app means to use palettized render - * targets and locks it... - * - * Use GL_RGB, GL_UNSIGNED_BYTE to read the surface for performance reasons - * Don't use GL_BGR as in the WINED3DFMT_R8G8B8 case, instead watch out - * for the color channels when palettizing the colors. - */ - fmt = GL_RGB; - type = GL_UNSIGNED_BYTE; - pitch *= 3; - mem = HeapAlloc(GetProcessHeap(), 0, This->resource.size * 3); - if(!mem) { - ERR("Out of memory\n"); - return; + if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { + /* In case of P8 render targets the index is stored in the alpha component */ + fmt = GL_ALPHA; + type = GL_UNSIGNED_BYTE; + mem = dest; + bpp = This->bytesPerPixel; + } else { + /* GL can't return palettized data, so read ARGB pixels into a + * separate block of memory and convert them into palettized format + * in software. Slow, but if the app means to use palettized render + * targets and locks it... + * + * Use GL_RGB, GL_UNSIGNED_BYTE to read the surface for performance reasons + * Don't use GL_BGR as in the WINED3DFMT_R8G8B8 case, instead watch out + * for the color channels when palettizing the colors. + */ + fmt = GL_RGB; + type = GL_UNSIGNED_BYTE; + pitch *= 3; + mem = HeapAlloc(GetProcessHeap(), 0, This->resource.size * 3); + if(!mem) { + ERR("Out of memory\n"); + return; + } + bpp = This->bytesPerPixel * 3; } - bpp = This->bytesPerPixel * 3; } break; @@ -576,7 +584,12 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v } } - if(This->resource.format == WINED3DFMT_P8) { + /* For P8 textures we need to perform an inverse palette lookup. This is done by searching for a palette + * index which matches the RGB value. Note this isn't guaranteed to work when there are multiple entries for + * the same color but we have no choice. + * In case of render targets, the index is stored in the alpha component so no conversion is needed. + */ + if((This->resource.format == WINED3DFMT_P8) && !(This->resource.usage & WINED3DUSAGE_RENDERTARGET)) { PALETTEENTRY *pal; DWORD width = pitch / 3; int x, y, c; @@ -1892,18 +1905,33 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE (*table)[4], BOOL colorkey) { IWineD3DPaletteImpl* pal = This->palette; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + BOOL index_in_alpha = FALSE; int i; + /* Old games like StarCraft, C&C, Red Alert and others use P8 render targets. + * Reading back the RGB output each lockrect (each frame as they lock the whole screen) + * is slow. Further RGB->P8 conversion is not possible because palettes can have + * duplicate entries. Store the color key in the unused alpha component to speed the + * download up and to make conversion unneeded. */ + if (device->render_targets && device->render_targets[0]) { + IWineD3DSurfaceImpl* render_target = (IWineD3DSurfaceImpl*)device->render_targets[0]; + + if(render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) + index_in_alpha = TRUE; + } + if (pal == NULL) { /* Still no palette? Use the device's palette */ /* Get the surface's palette */ for (i = 0; i < 256; i++) { - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - table[i][0] = device->palettes[device->currentPalette][i].peRed; table[i][1] = device->palettes[device->currentPalette][i].peGreen; table[i][2] = device->palettes[device->currentPalette][i].peBlue; - if (colorkey && + + if(index_in_alpha) { + table[i][3] = i; + } else if (colorkey && (i >= This->SrcBltCKey.dwColorSpaceLowValue) && (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { /* We should maybe here put a more 'neutral' color than the standard bright purple @@ -1921,7 +1949,11 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE (*table)[4], table[i][0] = pal->palents[i].peRed; table[i][1] = pal->palents[i].peGreen; table[i][2] = pal->palents[i].peBlue; - if (colorkey && + + if(index_in_alpha) { + table[i][3] = i; + } + else if (colorkey && (i >= This->SrcBltCKey.dwColorSpaceLowValue) && (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { /* We should maybe here put a more 'neutral' color than the standard bright purple

1 0

Juan Lang : setupapi: Implement SetupDiCreateDevRegKeyW.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: cb1d6517c77455a1d0b36ff9983a8de052b779cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1d6517c77455a1d0b36ff99… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 11 13:25:52 2007 -0700 setupapi: Implement SetupDiCreateDevRegKeyW. --- dlls/setupapi/devinst.c | 79 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5d6d6ef..9ad0c03 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -424,6 +424,32 @@ static HKEY SETUPDI_CreateDevKey(struct DeviceInfo *devInfo) return key; } +static HKEY SETUPDI_CreateDrvKey(struct DeviceInfo *devInfo) +{ + static const WCHAR slash[] = { '\\',0 }; + WCHAR classKeyPath[MAX_PATH]; + HKEY classKey, key = INVALID_HANDLE_VALUE; + LONG l; + + lstrcpyW(classKeyPath, ControlClass); + lstrcatW(classKeyPath, slash); + SETUPDI_GuidToString(&devInfo->set->ClassGuid, + classKeyPath + lstrlenW(classKeyPath)); + l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, classKeyPath, 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &classKey, NULL); + if (!l) + { + static const WCHAR fmt[] = { '%','0','4','d',0 }; + WCHAR devId[5]; + + sprintfW(devId, fmt, devInfo->devId); + RegCreateKeyExW(classKey, devId, 0, NULL, 0, KEY_READ | KEY_WRITE, + NULL, &key, NULL); + RegCloseKey(classKey); + } + return key; +} + static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set, DWORD devId, LPCWSTR instanceId, BOOL phantom) { @@ -1209,9 +1235,58 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( HINF InfHandle, PCWSTR InfSectionName) { - FIXME("%p %p %d %d %d %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *devInfo; + HKEY key = INVALID_HANDLE_VALUE; + + TRACE("%p %p %d %d %d %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); - return INVALID_HANDLE_VALUE; + + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return INVALID_HANDLE_VALUE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return INVALID_HANDLE_VALUE; + } + if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) + || !DeviceInfoData->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + if (devInfo->set != set) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + if (devInfo->phantom) + { + SetLastError(ERROR_DEVINFO_NOT_REGISTERED); + return INVALID_HANDLE_VALUE; + } + if (Scope != DICS_FLAG_GLOBAL) + FIXME("unimplemented for scope %d\n", Scope); + switch (KeyType) + { + case DIREG_DEV: + key = SETUPDI_CreateDevKey(devInfo); + break; + case DIREG_DRV: + key = SETUPDI_CreateDrvKey(devInfo); + break; + default: + WARN("unknown KeyType %d\n", KeyType); + } + if (InfHandle) + SetupInstallFromInfSectionW(NULL, InfHandle, InfSectionName, SPINST_ALL, + NULL, NULL, SP_COPY_NEWER_ONLY, NULL, NULL, DeviceInfoSet, + DeviceInfoData); + return key; } /***********************************************************************

1 0

Juan Lang : setupapi: Add a device ID member to DeviceInfo.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 732b968b227b6bb490547d5e4424020ed3710ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=732b968b227b6bb490547d5e4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 11 13:25:29 2007 -0700 setupapi: Add a device ID member to DeviceInfo. --- dlls/setupapi/devinst.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index a25bc29..5d6d6ef 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -127,6 +127,7 @@ struct DeviceInfo struct DeviceInfoSet *set; HKEY key; BOOL phantom; + DWORD devId; LPWSTR instanceId; struct list interfaces; }; @@ -424,7 +425,7 @@ static HKEY SETUPDI_CreateDevKey(struct DeviceInfo *devInfo) } static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set, - LPCWSTR instanceId, BOOL phantom) + DWORD devId, LPCWSTR instanceId, BOOL phantom) { struct DeviceInfo *devInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInfo)); @@ -432,6 +433,7 @@ static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set, if (devInfo) { devInfo->set = set; + devInfo->devId = devId; devInfo->instanceId = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(instanceId) + 1) * sizeof(WCHAR)); if (devInfo->instanceId) @@ -501,8 +503,8 @@ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set, SP_DEVINFO_DATA **dev) { BOOL ret = FALSE; - struct DeviceInfo *devInfo = SETUPDI_AllocateDeviceInfo(set, instanceId, - phantom); + struct DeviceInfo *devInfo = SETUPDI_AllocateDeviceInfo(set, set->cDevices, + instanceId, phantom); TRACE("%p, %s, %d, %s, %d\n", set, debugstr_guid(guid), devInst, debugstr_w(instanceId), phantom);

1 0

Juan Lang : setupapi: Don' t require caller to pass a SP_DEVINFO_DATA pointer to SETUPDI_AddDeviceToSet .
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 0d39a07ecaa35f06689cd658b852562621f708ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d39a07ecaa35f06689cd658b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 11 13:25:08 2007 -0700 setupapi: Don't require caller to pass a SP_DEVINFO_DATA pointer to SETUPDI_AddDeviceToSet. --- dlls/setupapi/devinst.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index d549562..a25bc29 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -518,16 +518,18 @@ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set, if (set->devices) { WCHAR classGuidStr[39]; + SP_DEVINFO_DATA *DeviceInfoData = &set->devices[set->cDevices++]; - *dev = &set->devices[set->cDevices++]; - (*dev)->cbSize = sizeof(SP_DEVINFO_DATA); - memcpy(&(*dev)->ClassGuid, guid, sizeof(GUID)); - (*dev)->DevInst = devInst; - (*dev)->Reserved = (ULONG_PTR)devInfo; + DeviceInfoData->cbSize = sizeof(SP_DEVINFO_DATA); + memcpy(&DeviceInfoData->ClassGuid, guid, sizeof(GUID)); + DeviceInfoData->DevInst = devInst; + DeviceInfoData->Reserved = (ULONG_PTR)devInfo; SETUPDI_GuidToString(guid, classGuidStr); SetupDiSetDeviceRegistryPropertyW((HDEVINFO)set, - *dev, SPDRP_CLASSGUID, (const BYTE *)classGuidStr, + DeviceInfoData, SPDRP_CLASSGUID, (const BYTE *)classGuidStr, lstrlenW(classGuidStr) * sizeof(WCHAR)); + if (dev) + *dev = DeviceInfoData; ret = TRUE; } else @@ -2090,12 +2092,10 @@ static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet, * sizeof(WCHAR)); if (instanceId) { - SP_DEVINFO_DATA *dev; - sprintfW(instanceId, fmt, parent, subKeyName); SETUPDI_AddDeviceToSet(set, &deviceClass, 0 /* FIXME: DevInst */, instanceId, - FALSE, &dev); + FALSE, NULL); HeapFree(GetProcessHeap(), 0, instanceId); } }

1 0

Juan Lang : setupapi: Add helper function to open a device's hardware key.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 22724c2c8b6859f450778c9b5705cb14f0aa3c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22724c2c8b6859f450778c9b5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 11 13:24:42 2007 -0700 setupapi: Add helper function to open a device's hardware key. --- dlls/setupapi/devinst.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 1f3d3b9..d549562 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -407,6 +407,22 @@ static BOOL SETUPDI_SetInterfaceSymbolicLink(SP_DEVICE_INTERFACE_DATA *iface, return ret; } +static HKEY SETUPDI_CreateDevKey(struct DeviceInfo *devInfo) +{ + HKEY enumKey, key = INVALID_HANDLE_VALUE; + LONG l; + + l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_ALL_ACCESS, + NULL, &enumKey, NULL); + if (!l) + { + RegCreateKeyExW(enumKey, devInfo->instanceId, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + RegCloseKey(enumKey); + } + return key; +} + static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set, LPCWSTR instanceId, BOOL phantom) { @@ -420,23 +436,16 @@ static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set, (lstrlenW(instanceId) + 1) * sizeof(WCHAR)); if (devInfo->instanceId) { - HKEY enumKey; - LONG l; - devInfo->key = INVALID_HANDLE_VALUE; devInfo->phantom = phantom; lstrcpyW(devInfo->instanceId, instanceId); struprW(devInfo->instanceId); - l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &enumKey, NULL); - if (!l) + devInfo->key = SETUPDI_CreateDevKey(devInfo); + if (devInfo->key != INVALID_HANDLE_VALUE) { - RegCreateKeyExW(enumKey, devInfo->instanceId, 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &devInfo->key, NULL); if (phantom) RegSetValueExW(devInfo->key, Phantom, 0, REG_DWORD, (LPBYTE)&phantom, sizeof(phantom)); - RegCloseKey(enumKey); } list_init(&devInfo->interfaces); }

1 0

Juan Lang : setupapi: Implement SetupDiCreateDevRegKeyA on top of SetupDiCreateDevRegKeyW.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: e6a9eb6b85aaf5eaec9ab14832212db877f5d55f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a9eb6b85aaf5eaec9ab1483… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 11 13:24:19 2007 -0700 setupapi: Implement SetupDiCreateDevRegKeyA on top of SetupDiCreateDevRegKeyW. --- dlls/setupapi/devinst.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7f9826c..1f3d3b9 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1159,9 +1159,29 @@ HKEY WINAPI SetupDiCreateDevRegKeyA( HINF InfHandle, PCSTR InfSectionName) { - FIXME("%p %p %d %d %d %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, + PWSTR InfSectionNameW = NULL; + HKEY key; + + TRACE("%p %p %d %d %d %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType, InfHandle, debugstr_a(InfSectionName)); - return INVALID_HANDLE_VALUE; + + if (InfHandle) + { + if (!InfSectionName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + else + { + InfSectionNameW = MultiByteToUnicode(InfSectionName, CP_ACP); + if (InfSectionNameW == NULL) return INVALID_HANDLE_VALUE; + } + } + key = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, Scope, + HwProfile, KeyType, InfHandle, InfSectionNameW); + MyFree(InfSectionNameW); + return key; } /***********************************************************************

1 0

Juan Lang : setupapi: Add stubs for SetupDiCreateDevRegKeyA/W.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 0138ea49ed24c972733b6523112c251c2e95dbf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0138ea49ed24c972733b65231… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 11 13:23:56 2007 -0700 setupapi: Add stubs for SetupDiCreateDevRegKeyA/W. --- dlls/setupapi/devinst.c | 34 ++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 ++-- include/setupapi.h | 4 ++-- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index a9d9aa3..7f9826c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1148,6 +1148,40 @@ SetupDiCreateDeviceInfoListExW(const GUID *ClassGuid, } /*********************************************************************** + * SetupDiCreateDevRegKeyA (SETUPAPI.@) + */ +HKEY WINAPI SetupDiCreateDevRegKeyA( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Scope, + DWORD HwProfile, + DWORD KeyType, + HINF InfHandle, + PCSTR InfSectionName) +{ + FIXME("%p %p %d %d %d %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, + HwProfile, KeyType, InfHandle, debugstr_a(InfSectionName)); + return INVALID_HANDLE_VALUE; +} + +/*********************************************************************** + * SetupDiCreateDevRegKeyW (SETUPAPI.@) + */ +HKEY WINAPI SetupDiCreateDevRegKeyW( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Scope, + DWORD HwProfile, + DWORD KeyType, + HINF InfHandle, + PCWSTR InfSectionName) +{ + FIXME("%p %p %d %d %d %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, + HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); + return INVALID_HANDLE_VALUE; +} + +/*********************************************************************** * SetupDiCreateDeviceInfoA (SETUPAPI.@) */ BOOL WINAPI SetupDiCreateDeviceInfoA( diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index f9589b1..f6ed8ed 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -281,8 +281,8 @@ @ stdcall SetupDiClassNameFromGuidExA(ptr str long ptr wstr ptr) @ stdcall SetupDiClassNameFromGuidExW(ptr wstr long ptr wstr ptr) @ stdcall SetupDiClassNameFromGuidW(ptr wstr long ptr) -@ stub SetupDiCreateDevRegKeyA -@ stub SetupDiCreateDevRegKeyW +@ stdcall SetupDiCreateDevRegKeyA(ptr ptr long long long ptr str) +@ stdcall SetupDiCreateDevRegKeyW(ptr ptr long long long ptr wstr) @ stdcall SetupDiCreateDeviceInfoA(long str ptr str long long ptr) @ stdcall SetupDiCreateDeviceInfoList(ptr ptr) @ stdcall SetupDiCreateDeviceInfoListExA(ptr long str ptr) diff --git a/include/setupapi.h b/include/setupapi.h index 3169807..9379725 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1463,8 +1463,8 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceW(HDEVINFO, PSP_DEVINFO_DATA, const HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DWORD, REGSAM, HINF, PCSTR); HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DWORD, REGSAM, HINF, PCWSTR); #define SetupDiCreateDeviceInterfaceRegKey WINELIB_NAME_AW(SetupDiCreateDeviceInterfaceRegKey) -BOOL WINAPI SetupDiCreateDevRegKeyA(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, HINF, PCSTR); -BOOL WINAPI SetupDiCreateDevRegKeyW(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, HINF, PCWSTR); +HKEY WINAPI SetupDiCreateDevRegKeyA(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, HINF, PCSTR); +HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, HINF, PCWSTR); #define SetupDiCreateDevRegKey WINELIB_NAME_AW(SetupDiCreateDevRegKey) BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO, PSP_DEVINFO_DATA); BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO, PSP_DEVICE_INTERFACE_DATA);

1 0

Juan Lang : setupapi: Install more items when installing a class.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 33c2d032fec7ab53b8035f164a50a5268f399519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c2d032fec7ab53b8035f164… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 11 13:23:21 2007 -0700 setupapi: Install more items when installing a class. --- dlls/setupapi/devinst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index f57634c..a9d9aa3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3198,7 +3198,7 @@ BOOL WINAPI SetupDiInstallClassW( SetupInstallFromInfSectionW(NULL, hInf, SectionName, - SPINST_REGISTRY, + SPINST_COPYINF | SPINST_FILES | SPINST_REGISTRY, hClassKey, NULL, 0,

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 2007