July 2006 - Wine-commits - list.winehq.org

Andrew Talbot : dnsapi/tests: Write-strings warnings fix.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 4f608f0bbb9d5fef7859cd1c3ce4e5d446df4f1b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f608f0bbb9d5fef7859cd1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jul 19 21:05:49 2006 +0100 dnsapi/tests: Write-strings warnings fix. --- dlls/dnsapi/tests/name.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index 708c48d..fb65e18 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -44,7 +44,7 @@ static BOOL init_function_ptrs( void ) static const struct { - LPSTR name; + LPCSTR name; DNS_NAME_FORMAT format; DNS_STATUS status; }

1 0

Kovács András : dinput: joydev_enum_deviceA now returns the correct value.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 71924d7da67b094af9c9333c13db8fd7f87629a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=71924d7da67b094af9c9333… Author: Kovács András <andras(a)csevego.net> Date: Thu Jul 20 07:21:35 2006 +0200 dinput: joydev_enum_deviceA now returns the correct value. --- dlls/dinput/joystick_linuxinput.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index c88ac78..0956e7c 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -333,7 +333,7 @@ static BOOL joydev_enum_deviceW(DWORD dw find_joydevs(); if (id >= have_joydevs) { - return -1; + return FALSE; } if (!((dwDevType == 0) ||

1 0

H. Verbeet : wined3d: Compilation fixes.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: a8f2c1075aced3d8f705de340270412ceba20f95 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a8f2c1075aced3d8f705de3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jul 19 23:49:37 2006 +0200 wined3d: Compilation fixes. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 27 +++++++++++---------------- dlls/wined3d/wined3d_private.h | 3 +-- include/wine/wined3d_gl.h | 4 +++- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 776e626..0a0e4e6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2061,7 +2061,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl * with Default values */ - ((IWineD3DImpl *) This->wineD3D)->isGLInfoValid = IWineD3DImpl_FillGLCaps( &((IWineD3DImpl *) This->wineD3D)->gl_info, swapchain->display); + ((IWineD3DImpl *) This->wineD3D)->isGLInfoValid = IWineD3DImpl_FillGLCaps( This->wineD3D, swapchain->display); /* Setup all the devices defaults */ IWineD3DStateBlock_InitStartupStateBlock((IWineD3DStateBlock *)This->stateBlock); #if 0 diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f757265..35542af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -253,7 +253,10 @@ static void select_shader_mode( * IWineD3D parts follows **********************************************************/ -BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display) { +BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) { + IWineD3DImpl *This = (IWineD3DImpl *)iface; + WineD3D_GL_Info *gl_info = &This->gl_info; + const char *GL_Extensions = NULL; const char *GLX_Extensions = NULL; const char *gl_string = NULL; @@ -492,8 +495,9 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_ gl_info->vs_ati_version = VS_VERSION_NOT_SUPPORTED; /* Now work out what GL support this card really has */ -#define USE_GL_FUNC(type, pfn) gl_info->pfn = NULL; +#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) glXGetProcAddressARB( (const GLubyte *) #pfn); GL_EXT_FUNCS_GEN; + GLX_EXT_FUNCS_GEN; #undef USE_GL_FUNC /* Retrieve opengl defaults */ @@ -541,7 +545,7 @@ #undef USE_GL_FUNC glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &gl_max); TRACE_(d3d_caps)(" FOUND: ARB Pixel Shader support - GL_MAX_TEXTURE_IMAGE_UNITS_ARB=%u\n", gl_max); gl_info->max_samplers = min(MAX_SAMPLERS, gl_max); - glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max); + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); TRACE_(d3d_caps)(" FOUND: ARB Pixel Shader support - max float constants=%u\n", gl_max); gl_info->ps_arb_constantsF = gl_max; } else if (strcmp(ThisExtn, "GL_ARB_imaging") == 0) { @@ -602,7 +606,7 @@ #undef USE_GL_FUNC gl_info->vs_arb_version = VS_VERSION_11; TRACE_(d3d_caps)(" FOUND: ARB Vertex Shader support - version=%02x\n", gl_info->vs_arb_version); gl_info->supported[ARB_VERTEX_PROGRAM] = TRUE; - glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max); + GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); TRACE_(d3d_caps)(" FOUND: ARB Vertex Shader support - max float constants=%u\n", gl_max); gl_info->vs_arb_constantsF = gl_max; } else if (strcmp(ThisExtn, "GL_ARB_vertex_blend") == 0) { @@ -783,11 +787,6 @@ #undef USE_GL_FUNC /* TODO: config lookups */ - -#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) glXGetProcAddressARB( (const GLubyte *) #pfn); - GL_EXT_FUNCS_GEN; -#undef USE_GL_FUNC - if (display != NULL) { GLX_Extensions = glXQueryExtensionsString(display, DefaultScreen(display)); TRACE_(d3d_caps)("GLX_Extensions reported:\n"); @@ -810,10 +809,6 @@ #undef USE_GL_FUNC } } -#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) glXGetProcAddressARB( (const GLubyte *) #pfn); - GLX_EXT_FUNCS_GEN; -#undef USE_GL_FUNC - /* If we created a dummy context, throw it away */ if (NULL != fake_ctx) WineD3D_ReleaseFakeGLContext(fake_ctx); @@ -1095,7 +1090,7 @@ static HRESULT WINAPI IWineD3DImpl_GetAd WineD3D_Context *fake_ctx = NULL; if (glXGetCurrentContext() == NULL) fake_ctx = WineD3D_CreateFakeGLContext(); /* If we don't know the device settings, go query them now */ - isGLInfoValid = IWineD3DImpl_FillGLCaps(&This->gl_info, IWineD3DImpl_GetAdapterDisplay(iface, Adapter)); + isGLInfoValid = IWineD3DImpl_FillGLCaps(iface, IWineD3DImpl_GetAdapterDisplay(iface, Adapter)); if (fake_ctx != NULL) WineD3D_ReleaseFakeGLContext(fake_ctx); } @@ -1526,7 +1521,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDe /* If we don't know the device settings, go query them now */ if (This->isGLInfoValid == FALSE) { /* use the desktop window to fill gl caps */ - BOOL rc = IWineD3DImpl_FillGLCaps(&This->gl_info, IWineD3DImpl_GetAdapterDisplay(iface, Adapter)); + BOOL rc = IWineD3DImpl_FillGLCaps(iface, IWineD3DImpl_GetAdapterDisplay(iface, Adapter)); /* We are running off a real context, save the values */ if (rc) This->isGLInfoValid = TRUE; @@ -1915,7 +1910,7 @@ static HRESULT WINAPI IWineD3DImpl_Crea /* Setup some defaults for creating the implicit swapchain */ ENTER_GL(); /* FIXME: both of those should be made per adapter */ - IWineD3DImpl_FillGLCaps(&This->gl_info, IWineD3DImpl_GetAdapterDisplay(iface, Adapter)); + IWineD3DImpl_FillGLCaps(iface, IWineD3DImpl_GetAdapterDisplay(iface, Adapter)); LEAVE_GL(); select_shader_mode(&This->gl_info, DeviceType, &wined3d_settings.ps_selected_mode, &wined3d_settings.vs_selected_mode); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fc2fc4a..daedc52 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -390,8 +390,7 @@ #define GET_TEXCOORD_SIZE_FROM_FVF(d3dvt (((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1) /* Routine to fill gl caps for swapchains and IWineD3D */ -BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, - Display* display); +BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display); /***************************************************************************** * Internal representation of a light diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 9616e73..7937626 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -690,6 +690,7 @@ #endif #ifndef GL_ARB_vertex_shader #define GL_ARB_vertex_shader 1 #define GL_VERTEX_SHADER_ARB 0x8B31 +#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A #define GL_PROGRAM_OBJECT_ARB 0x8B40 #define GL_SHADER_OBJECT_ARB 0x8B48 #define GL_OBJECT_TYPE_ARB 0x8B4E @@ -1474,7 +1475,7 @@ #define GL_EXT_FUNCS_GEN \ USE_GL_FUNC(PGLFNGLSECONDARYCOLOR3FEXTPROC, glSecondaryColor3fEXT); \ USE_GL_FUNC(PGLFNGLSECONDARYCOLOR3FVEXTPROC, glSecondaryColor3fvEXT); \ USE_GL_FUNC(PGLFNGLSECONDARYCOLORPOINTEREXTPROC, glSecondaryColorPointerEXT); \ - /* GL_EXT_secondary_color */ \ + /* GL_ARB_vertex_program */ \ USE_GL_FUNC(PGLFNGENPROGRAMSARBPROC, glGenProgramsARB); \ USE_GL_FUNC(PGLFNBINDPROGRAMARBPROC, glBindProgramARB); \ USE_GL_FUNC(PGLFNPROGRAMSTRINGARBPROC, glProgramStringARB); \ @@ -1483,6 +1484,7 @@ #define GL_EXT_FUNCS_GEN \ USE_GL_FUNC(PGLFNVERTEXATTRIBPOINTERARBPROC, glVertexAttribPointerARB); \ USE_GL_FUNC(PGLFNENABLEVERTEXATTRIBARRAYARBPROC, glEnableVertexAttribArrayARB); \ USE_GL_FUNC(PGLFNDISABLEVERTEXATTRIBARRAYARBPROC, glDisableVertexAttribArrayARB); \ + USE_GL_FUNC(PGLFNGETPROGRAMIVARBPROC, glGetProgramivARB); \ /* GL_ARB_shader_objects */ \ USE_GL_FUNC(WINED3D_PFNGLGETOBJECTPARAMETERIVARBPROC, glGetObjectParameterivARB); \ USE_GL_FUNC(WINED3D_PFNGLGETOBJECTPARAMETERFVARBPROC, glGetObjectParameterfvARB); \

1 0

Andrew Talbot : comctl32/tests: Write-strings warnings fix.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 8d1e492ad3dfb5321d555dfad4512f2627c959b9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d1e492ad3dfb5321d555df… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jul 19 19:17:56 2006 +0100 comctl32/tests: Write-strings warnings fix. --- dlls/comctl32/tests/listview.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index df747b6..dd99df9 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -97,6 +97,9 @@ static void test_checkboxes(void) HWND hwnd, hwndparent = 0; LVITEMA item; DWORD r; + static CHAR text[] = "Text", + text2[] = "Text2", + text3[] = "Text3"; hwnd = CreateWindowEx(0, "SysListView32", "foo", LVS_REPORT, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); @@ -108,7 +111,7 @@ static void test_checkboxes(void) item.state = 0xfccc; item.iItem = 0; item.iSubItem = 0; - item.pszText = "Text"; + item.pszText = text; r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); ok(r == 0, "ret %ld\n", r); @@ -124,7 +127,7 @@ static void test_checkboxes(void) item.state = 0xfccc; item.iItem = 1; item.iSubItem = 0; - item.pszText = "Text"; + item.pszText = text; r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); ok(r == 1, "ret %ld\n", r); @@ -136,7 +139,7 @@ static void test_checkboxes(void) r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES); ok(r == 0, "should return zero\n"); - + /* Having turned on checkboxes, check that all existing items are set to 0x1000 (unchecked) */ item.iItem = 0; item.mask = LVIF_STATE; @@ -148,7 +151,7 @@ static void test_checkboxes(void) item.iItem = 2; item.mask = LVIF_TEXT; item.state = 0; - item.pszText = "Text2"; + item.pszText = text2; r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); ok(r == 2, "ret %ld\n", r); @@ -163,7 +166,7 @@ static void test_checkboxes(void) item.mask = LVIF_TEXT | LVIF_STATE; item.stateMask = 0xffff; item.state = 0x2aaa; - item.pszText = "Text3"; + item.pszText = text3; r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); ok(r == 3, "ret %ld\n", r); @@ -189,7 +192,7 @@ static void test_checkboxes(void) /* Set the style again and check that doesn't change an item's state */ r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES); ok(r == LVS_EX_CHECKBOXES, "ret %lx\n", r); - + item.iItem = 3; item.mask = LVIF_STATE; item.stateMask = 0xffff; @@ -209,14 +212,13 @@ static void test_checkboxes(void) /* Now setting the style again will change an item's state */ r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES); ok(r == 0, "ret %lx\n", r); - + item.iItem = 3; item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); ok(item.state == 0x1aaa, "state %x\n", item.state); - DestroyWindow(hwnd); }

1 0

Hwang YunSong(황윤성) : comctl32: Updated Korean resource.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: c872bd5fedae0108321867f852c97ff5afc352f9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c872bd5fedae0108321867f… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Jul 20 08:40:59 2006 +0900 comctl32: Updated Korean resource. --- dlls/comctl32/comctl_Ko.rc | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comctl_Ko.rc b/dlls/comctl32/comctl_Ko.rc index cf7f723..95de29a 100644 --- a/dlls/comctl32/comctl_Ko.rc +++ b/dlls/comctl32/comctl_Ko.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "�Ӽ� %s" +CAPTION "%s �Ӽ�" FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Ȯ��", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP @@ -54,11 +54,11 @@ CAPTION "�� " FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "�ݱ�(&C)", IDCANCEL,308,6,44,14 - PUSHBUTTON "�ٽ�(&e)", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "�ٽ�(&E)", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "��(&H)", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "�� ̵�(&U)", IDC_MOVEUP_BTN,308,74,44,14 PUSHBUTTON "�Ʒ�� ̵�(&D)", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "�� ư(&v)", -1,4,5,84,10 + LTEXT "�� ư(&V)", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "��ϱ�(&A) ->", IDOK, 131, 42, 44, 14 PUSHBUTTON "<- ��ϱ�(&R)", IDC_REMOVE_BTN,131,62,44,14 @@ -81,3 +81,8 @@ STRINGTABLE DISCARDABLE { IDS_SEPARATOR "�и��" } + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "��" +}

1 0

Juan Lang : crypt32: Correct handling of empty output buffer in CertRDNValueToStr and CertNameToStr .
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 9bce49543b6b3ae6a7e9cbd06bd57ed244660458 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9bce49543b6b3ae6a7e9cbd… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jul 19 12:30:43 2006 -0700 crypt32: Correct handling of empty output buffer in CertRDNValueToStr and CertNameToStr. --- dlls/crypt32/str.c | 71 +++++++++++++++++++++++++--------------------- dlls/crypt32/tests/str.c | 6 ++++ 2 files changed, 45 insertions(+), 32 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index ef67a9a..3298652 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -62,6 +62,7 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dw } else ret++; + TRACE("returning %ld (%s)\n", ret, debugstr_a(psz)); return ret; } @@ -106,6 +107,7 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dw } else ret++; + TRACE("returning %ld (%s)\n", ret, debugstr_w(psz)); return ret; } @@ -116,20 +118,21 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dw */ static DWORD CRYPT_AddPrefixA(LPCSTR prefix, LPSTR psz, DWORD csz) { - DWORD chars = min(lstrlenA(prefix), csz); + DWORD chars; TRACE("(%s, %p, %ld)\n", debugstr_a(prefix), psz, csz); - if (psz && chars) - memcpy(psz, prefix, chars); - csz -= chars; - if (csz > 1) + if (psz) { - if (psz) - *(psz + chars) = '='; + chars = min(lstrlenA(prefix), csz); + memcpy(psz, prefix, chars); + csz -= chars; + *(psz + chars) = '='; chars++; csz--; } + else + chars = lstrlenA(prefix) + 1; return chars; } @@ -171,9 +174,9 @@ DWORD WINAPI CertNameToStrA(DWORD dwCert else rdnSep = plusSep; rdnSepLen = strlen(rdnSep); - for (i = 0; ret < csz && i < info->cRDN; i++) + for (i = 0; (!psz || ret < csz) && i < info->cRDN; i++) { - for (j = 0; ret < csz && j < info->rgRDN[i].cRDNAttr; j++) + for (j = 0; (!psz || ret < csz) && j < info->rgRDN[i].cRDNAttr; j++) { DWORD chars; char prefixBuf[10]; /* big enough for GivenName */ @@ -200,7 +203,8 @@ DWORD WINAPI CertNameToStrA(DWORD dwCert if (prefix) { /* - 1 is needed to account for the NULL terminator. */ - chars = CRYPT_AddPrefixA(prefix, psz + ret, csz - ret - 1); + chars = CRYPT_AddPrefixA(prefix, + psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; csz -= chars; } @@ -208,7 +212,7 @@ DWORD WINAPI CertNameToStrA(DWORD dwCert chars = CertRDNValueToStrA( info->rgRDN[i].rgRDNAttr[j].dwValueType, &info->rgRDN[i].rgRDNAttr[j].Value, psz ? psz + ret : NULL, - csz - ret - 1); + psz ? csz - ret : 0); if (chars) ret += chars - 1; if (j < info->rgRDN[i].cRDNAttr - 1) @@ -235,6 +239,7 @@ DWORD WINAPI CertNameToStrA(DWORD dwCert } else ret++; + TRACE("Returning %s\n", debugstr_a(psz)); return ret; } @@ -246,25 +251,24 @@ DWORD WINAPI CertNameToStrA(DWORD dwCert */ static DWORD CRYPT_AddPrefixAToW(LPCSTR prefix, LPWSTR psz, DWORD csz) { - DWORD chars = min(lstrlenA(prefix), csz); + DWORD chars; TRACE("(%s, %p, %ld)\n", debugstr_a(prefix), psz, csz); - if (psz && chars) + if (psz) { DWORD i; + chars = min(lstrlenA(prefix), csz); for (i = 0; i < chars; i++) *(psz + i) = prefix[i]; - } - csz -= chars; - if (csz > 1) - { - if (psz) - *(psz + chars) = '='; + csz -= chars; + *(psz + chars) = '='; chars++; csz--; } + else + chars = lstrlenA(prefix) + 1; return chars; } @@ -275,20 +279,21 @@ static DWORD CRYPT_AddPrefixAToW(LPCSTR */ static DWORD CRYPT_AddPrefixW(LPCWSTR prefix, LPWSTR psz, DWORD csz) { - DWORD chars = min(lstrlenW(prefix), csz); + DWORD chars; TRACE("(%s, %p, %ld)\n", debugstr_w(prefix), psz, csz); - if (psz && chars) - memcpy(psz, prefix, chars * sizeof(WCHAR)); - csz -= chars; - if (csz > 1) + if (psz) { - if (psz) - *(psz + chars) = '='; + chars = min(lstrlenW(prefix), csz); + memcpy(psz, prefix, chars * sizeof(WCHAR)); + csz -= chars; + *(psz + chars) = '='; chars++; csz--; } + else + chars = lstrlenW(prefix) + 1; return chars; } @@ -330,9 +335,9 @@ DWORD WINAPI CertNameToStrW(DWORD dwCert else rdnSep = plusSep; rdnSepLen = lstrlenW(rdnSep); - for (i = 0; ret < csz && i < info->cRDN; i++) + for (i = 0; (!psz || ret < csz) && i < info->cRDN; i++) { - for (j = 0; ret < csz && j < info->rgRDN[i].cRDNAttr; j++) + for (j = 0; (!psz || ret < csz) && j < info->rgRDN[i].cRDNAttr; j++) { DWORD chars; LPCSTR prefixA = NULL; @@ -355,15 +360,16 @@ DWORD WINAPI CertNameToStrW(DWORD dwCert if (prefixW) { /* - 1 is needed to account for the NULL terminator. */ - chars = CRYPT_AddPrefixW(prefixW, psz + ret, csz - ret - 1); + chars = CRYPT_AddPrefixW(prefixW, + psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; csz -= chars; } else if (prefixA) { /* - 1 is needed to account for the NULL terminator. */ - chars = CRYPT_AddPrefixAToW(prefixA, psz + ret, - csz - ret - 1); + chars = CRYPT_AddPrefixAToW(prefixA, + psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; csz -= chars; } @@ -371,7 +377,7 @@ DWORD WINAPI CertNameToStrW(DWORD dwCert chars = CertRDNValueToStrW( info->rgRDN[i].rgRDNAttr[j].dwValueType, &info->rgRDN[i].rgRDNAttr[j].Value, psz ? psz + ret : NULL, - csz - ret - 1); + psz ? csz - ret : 0); if (chars) ret += chars - 1; if (j < info->rgRDN[i].cRDNAttr - 1) @@ -398,6 +404,7 @@ DWORD WINAPI CertNameToStrW(DWORD dwCert } else ret++; + TRACE("Returning %s\n", debugstr_w(psz)); return ret; } diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index abece9c..15a8a2b 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -297,6 +297,9 @@ static void test_NameToStrConversionA(PC char buffer[2000] = { 0 }; DWORD i; + i = pCertNameToStrA(X509_ASN_ENCODING, pName, dwStrType, NULL, 0); + ok(i == strlen(expected) + 1, "Expected %d chars, got %ld\n", + lstrlenA(expected) + 1, i); i = pCertNameToStrA(X509_ASN_ENCODING,pName, dwStrType, buffer, sizeof(buffer)); ok(i == strlen(expected) + 1, "Expected %d chars, got %ld\n", @@ -363,6 +366,9 @@ static void test_NameToStrConversionW(PC WCHAR buffer[2000] = { 0 }; DWORD i; + i = pCertNameToStrW(X509_ASN_ENCODING,pName, dwStrType, NULL, 0); + ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %ld\n", + lstrlenW(expected) + 1, i); i = pCertNameToStrW(X509_ASN_ENCODING,pName, dwStrType, buffer, sizeof(buffer) / sizeof(buffer[0])); ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %ld\n",

1 0

Juan Lang : crypt32: Implement more string types for X509_NAME_VALUE.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 1eefa005da6aaf8d2edad75ac275d4c61434c74c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1eefa005da6aaf8d2edad75… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jul 19 16:46:37 2006 -0700 crypt32: Implement more string types for X509_NAME_VALUE. --- dlls/crypt32/decode.c | 127 ++++++++++++++------ dlls/crypt32/encode.c | 280 ++++++++++++++++++++++++------------------- dlls/crypt32/tests/encode.c | 127 ++++++++++++++++---- 3 files changed, 352 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1eefa005da6aaf8d2ed…

1 0

Alexandre Julliard : ntdll: Null-terminate strings returned by VFAT_IOCTL_READDIR_BOTH to work around a kernel bug .
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 3f2da592ad4e7f113f59b7df435a51ef1721af12 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f2da592ad4e7f113f59b7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 20:04:45 2006 +0200 ntdll: Null-terminate strings returned by VFAT_IOCTL_READDIR_BOTH to work around a kernel bug. --- dlls/ntdll/directory.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 14a71b4..faeca6c 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -911,6 +911,9 @@ static int read_directory_vfat( int fd, while (res != -1) { if (!de[0].d_reclen) break; + /* make sure names are null-terminated to work around an x86-64 kernel bug */ + if (de[0].d_reclen < sizeof(de[0].d_name)) de[0].d_name[de[0].d_reclen] = 0; + if (de[1].d_reclen < sizeof(de[1].d_name)) de[1].d_name[de[1].d_reclen] = 0; if (de[1].d_name[0]) info = append_entry( buffer, &io->Information, length, de[1].d_name, de[0].d_name, mask ); @@ -942,6 +945,9 @@ static int read_directory_vfat( int fd, while (res != -1) { if (!de[0].d_reclen) break; + /* make sure names are null-terminated to work around an x86-64 kernel bug */ + if (de[0].d_reclen < sizeof(de[0].d_name)) de[0].d_name[de[0].d_reclen] = 0; + if (de[1].d_reclen < sizeof(de[1].d_name)) de[1].d_name[de[1].d_reclen] = 0; if (de[1].d_name[0]) info = append_entry( buffer, &io->Information, length, de[1].d_name, de[0].d_name, mask ); @@ -1247,6 +1253,9 @@ #ifdef VFAT_IOCTL_READDIR_BOTH for (;;) { if (!de[0].d_reclen) break; + /* make sure names are null-terminated to work around an x86-64 kernel bug */ + if (de[0].d_reclen < sizeof(de[0].d_name)) de[0].d_name[de[0].d_reclen] = 0; + if (de[1].d_reclen < sizeof(de[1].d_name)) de[1].d_name[de[1].d_reclen] = 0; if (de[1].d_name[0]) {

1 0

Juan Lang : msi: Implement ACTION_AppSearchIni.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 07253473d40d431ef43555ad0ff4139f4cc819c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07253473d40d431ef43555a… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jul 19 10:42:50 2006 -0700 msi: Implement ACTION_AppSearchIni. --- dlls/msi/appsearch.c | 40 ++++++++++++++++++++++++++++++++++------ 1 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 83f8e5b..598965e 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -444,7 +444,9 @@ static UINT ACTION_AppSearchIni(MSIPACKA if (rc == ERROR_SUCCESS) { MSIRECORD *row = 0; - LPWSTR fileName; + LPWSTR fileName, section, key; + int field, type; + WCHAR buf[MAX_PATH]; rc = MSI_ViewExecute(view, 0); if (rc != ERROR_SUCCESS) @@ -460,11 +462,37 @@ static UINT ACTION_AppSearchIni(MSIPACKA goto end; } - /* get file name */ - fileName = msi_dup_record_field(row,2); - FIXME("AppSearch unimplemented for IniLocator (ini file name %s)\n", - debugstr_w(fileName)); - msi_free( fileName); + fileName = msi_dup_record_field(row, 2); + section = msi_dup_record_field(row, 3); + key = msi_dup_record_field(row, 4); + if ((field = MSI_RecordGetInteger(row, 5)) == MSI_NULL_INTEGER) + field = 0; + if ((type = MSI_RecordGetInteger(row, 6)) == MSI_NULL_INTEGER) + type = 0; + + GetPrivateProfileStringW(section, key, NULL, buf, + sizeof(buf) / sizeof(WCHAR), fileName); + if (buf[0]) + { + switch (type & 0x0f) + { + case msidbLocatorTypeDirectory: + FIXME("unimplemented for type Directory (dir: %s)\n", + debugstr_w(buf)); + break; + case msidbLocatorTypeFileName: + FIXME("unimplemented for type File (file: %s)\n", + debugstr_w(buf)); + break; + case msidbLocatorTypeRawValue: + *appValue = strdupW(buf); + break; + } + } + + msi_free(fileName); + msi_free(section); + msi_free(key); end: if (row)

1 0

appdb/include comment.php
by WineHQ 20 Jul '06

20 Jul '06

ChangeSet ID: 26671 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/19 22:52:02 Modified files: include : comment.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Attempt to capture the source of erroneous input to grab_comments() using error_log::logBackTrace() Patch: http://cvs.winehq.org/patch.py?id=26671 Old revision New revision Changes Path 1.28 1.29 +10 -0 appdb/include/comment.php Index: appdb/include/comment.php diff -u -p appdb/include/comment.php:1.28 appdb/include/comment.php:1.29 --- appdb/include/comment.php:1.28 20 Jul 2006 3:52: 2 -0000 +++ appdb/include/comment.php 20 Jul 2006 3:52: 2 -0000 @@ -254,6 +254,16 @@ class Comment { */ function grab_comments($iVersionId, $iParentId = null) { + /* TODO: remove the logging when we figure out where the */ + /* invalid $iVersionId is coming */ + /* if $iVersionId is invalid we should log where we came from */ + /* so we can debug the problem */ + if($iVersionId == "") + { + error_log::logBackTrace("logging iVersionId oddity"); + return NULL; + } + /* escape input so we can use query_appdb() without concern */ $iVersionId = mysql_real_escape_string($iVersionId); $iParentId = mysql_real_escape_string($iParentId);

1 0