October 2010 - Wine-Commits

Matteo Bruni : d3dx9/tests: Fix a shader test failure.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: b4736bd7673496cd44244ff06a19b752ae23b818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4736bd7673496cd44244ff06… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 1 23:50:55 2010 +0200 d3dx9/tests: Fix a shader test failure. --- dlls/d3dx9_36/tests/shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 6bf0de3..3615279 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -131,7 +131,8 @@ static void test_get_shader_constant_table_ex(void) /* With invalid CTAB data */ hr = D3DXGetShaderConstantTableEx(shader_with_invalid_ctab, 0, &constant_table); - ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); + ok(hr == D3DXERR_INVALIDDATA || broken(hr == D3D_OK), /* winxp 64-bit, w2k3 64-bit */ + "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); if (constant_table) ID3DXConstantTable_Release(constant_table); hr = D3DXGetShaderConstantTableEx(shader_with_ctab, 0, &constant_table);

1 0

Yaron Shahrabani : regedit: Updated Hebrew translation.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 6cbb8fc200e925420ff5673ca8df860b486fc40c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cbb8fc200e925420ff5673ca… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Wed Oct 13 02:47:33 2010 +0200 regedit: Updated Hebrew translation. --- programs/regedit/He.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/He.rc b/programs/regedit/He.rc index 231dd5a..c19b696 100644 --- a/programs/regedit/He.rc +++ b/programs/regedit/He.rc @@ -260,6 +260,7 @@ BEGIN ID_VIEW_MENU "מכיל פקודות להתאמת חלון רישום המערכת" ID_FAVORITES_MENU "מכיל פקודות לגישה למפתחות הנמצאים בשימוש תדיר" ID_HELP_MENU "מכיל פקודות להצגת עזרה ומידע על אודות עורך רישום המערכת" + ID_EDIT_NEW_MENU "מכיל פקודות ליצירת מפתחות או ערכים חדשים" END STRINGTABLE

1 0

Detlef Riekenberg : winspool: Implement SetDefaultPrinterA/W.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 178294a42305f1a3f7c67a58b081020037cb3f64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=178294a42305f1a3f7c67a58b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 13 00:25:17 2010 +0200 winspool: Implement SetDefaultPrinterA/W. --- dlls/winspool.drv/info.c | 98 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 92 insertions(+), 6 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 92098f1..2f3c347 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5258,11 +5258,91 @@ end: */ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) { + WCHAR default_printer[MAX_PATH]; + LPWSTR buffer = NULL; + HKEY hreg; + DWORD size; + DWORD namelen; + LONG lres; TRACE("(%s)\n", debugstr_w(pszPrinter)); + if ((pszPrinter == NULL) || (pszPrinter[0] == '\0')) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + default_printer[0] = '\0'; + size = sizeof(default_printer)/sizeof(WCHAR); + + /* if we have a default Printer, do nothing. */ + if (GetDefaultPrinterW(default_printer, &size)) + return TRUE; + + pszPrinter = NULL; + /* we have no default Printer: search local Printers and use the first */ + if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE, PrintersW, 0, KEY_READ, &hreg)) { + + default_printer[0] = '\0'; + size = sizeof(default_printer)/sizeof(WCHAR); + if (!RegEnumKeyExW(hreg, 0, default_printer, &size, NULL, NULL, NULL, NULL)) { + + pszPrinter = default_printer; + TRACE("using %s\n", debugstr_w(pszPrinter)); + } + RegCloseKey(hreg); + } + + if (pszPrinter == NULL) { + TRACE("no local printer found\n"); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + } + + /* "pszPrinter" is never empty or NULL here. */ + namelen = lstrlenW(pszPrinter); + size = namelen + (MAX_PATH * 2) + 3; /* printer,driver,port and a 0 */ + buffer = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (!buffer || + (RegOpenKeyExW(HKEY_CURRENT_USER, user_printers_reg_key, 0, KEY_READ, &hreg) != ERROR_SUCCESS)) { + HeapFree(GetProcessHeap(), 0, buffer); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + /* read the devices entry for the printer (driver,port) to build the string for the + default device entry (printer,driver,port) */ + memcpy(buffer, pszPrinter, namelen * sizeof(WCHAR)); + buffer[namelen] = ','; + namelen++; /* move index to the start of the driver */ + + size = ((MAX_PATH * 2) + 2) * sizeof(WCHAR); /* driver,port and a 0 */ + lres = RegQueryValueExW(hreg, pszPrinter, NULL, NULL, (LPBYTE) (&buffer[namelen]), &size); + if (!lres) { + TRACE("set device to %s\n", debugstr_w(buffer)); + + if (!WriteProfileStringW(windowsW, deviceW, buffer)) { + TRACE("failed to set the device entry: %d\n", GetLastError()); + lres = ERROR_INVALID_PRINTER_NAME; + } + + /* remove the next section, when INIFileMapping is implemented */ + { + HKEY hdev; + if (!RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hdev)) { + RegSetValueExW(hdev, deviceW, 0, REG_SZ, (LPBYTE)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR)); + RegCloseKey(hdev); + } + } + } + else + { + if (lres != ERROR_FILE_NOT_FOUND) + FIXME("RegQueryValueExW failed with %d for %s\n", lres, debugstr_w(pszPrinter)); + + SetLastError(ERROR_INVALID_PRINTER_NAME); + } + + RegCloseKey(hreg); + HeapFree(GetProcessHeap(), 0, buffer); + return (lres == ERROR_SUCCESS); } /****************************************************************************** @@ -5273,14 +5353,20 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) */ BOOL WINAPI SetDefaultPrinterA(LPCSTR pszPrinter) { + LPWSTR bufferW = NULL; + BOOL res; TRACE("(%s)\n", debugstr_a(pszPrinter)); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + if(pszPrinter) { + INT len = MultiByteToWideChar(CP_ACP, 0, pszPrinter, -1, NULL, 0); + bufferW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (bufferW) MultiByteToWideChar(CP_ACP, 0, pszPrinter, -1, bufferW, len); + } + res = SetDefaultPrinterW(bufferW); + HeapFree(GetProcessHeap(), 0, bufferW); + return res; } - /****************************************************************************** * SetPrinterDataExA (WINSPOOL.@) */

1 0

Detlef Riekenberg : winspool: Use CUPS for printing.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: f69a4ef07f7b1b0017e1bf335db27751c59b6d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69a4ef07f7b1b0017e1bf335… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 13 00:27:20 2010 +0200 winspool: Use CUPS for printing. --- dlls/winspool.drv/info.c | 10 +++++----- include/winspool.h | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2f3c347..135f8a3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -458,9 +458,8 @@ static BOOL CUPS_LoadPrinters(void) nrofdests = pcupsGetDests(&dests); TRACE("Found %d CUPS %s:\n", nrofdests, (nrofdests == 1) ? "printer" : "printers"); for (i=0;i<nrofdests;i++) { - /* FIXME: replace "LPR:" with "CUPS:". Fix printing output first */ - port = HeapAlloc(GetProcessHeap(), 0, strlen("LPR:") + strlen(dests[i].name)+1); - sprintf(port,"LPR:%s", dests[i].name); + port = HeapAlloc(GetProcessHeap(), 0, strlen("CUPS:") + strlen(dests[i].name)+1); + sprintf(port,"CUPS:%s", dests[i].name); /* FIXME: remove extension. Fix gdi32/drivers and comdlg32/printdlg first */ devline = HeapAlloc(GetProcessHeap(), 0, sizeof("WINEPS.DRV,,15,45") + strlen(port)); sprintf(devline, "WINEPS.DRV,%s", port); @@ -484,6 +483,7 @@ static BOOL CUPS_LoadPrinters(void) /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters and continue */ TRACE("Printer already exists\n"); + RegSetValueExA(hkeyPrinter, "Port", 0, REG_SZ, (LPBYTE)port, strlen(port) + 1); /* overwrite LPR:* port */ RegDeleteValueW(hkeyPrinter, May_Delete_Value); RegCloseKey(hkeyPrinter); } else { @@ -518,12 +518,12 @@ static BOOL CUPS_LoadPrinters(void) hadprinter = TRUE; if (dests[i].is_default) { - WINSPOOL_SetDefaultPrinter(dests[i].name, dests[i].name, TRUE); + SetDefaultPrinterA(dests[i].name); haddefault = TRUE; } } if (hadprinter & !haddefault) - WINSPOOL_SetDefaultPrinter(dests[0].name, dests[0].name, TRUE); + SetDefaultPrinterA(dests[0].name); pcupsFreeDests(nrofdests, dests); RegCloseKey(hkeyPrinters); return hadprinter; diff --git a/include/winspool.h b/include/winspool.h index fcbcd0a..f436bea 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -1541,6 +1541,10 @@ BOOL WINAPI GetDefaultPrinterA(LPSTR pName, LPDWORD pcbNameSize); BOOL WINAPI GetDefaultPrinterW(LPWSTR pName, LPDWORD pcbNameSize); #define GetDefaultPrinter WINELIB_NAME_AW(GetDefaultPrinter) +BOOL WINAPI SetDefaultPrinterA(LPCSTR); +BOOL WINAPI SetDefaultPrinterW(LPCWSTR); +#define SetDefaultPrinter WINELIB_NAME_AW(SetDefaultPrinter) + BOOL WINAPI DeletePrinterDriverA(LPSTR pName, LPSTR pEnvironment, LPSTR pDriverName); BOOL WINAPI DeletePrinterDriverW(LPWSTR pName, LPWSTR pEnvironment,

1 0

Henri Verbeet : wined3d: Recognize the SM4 div opcode.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: b53d346d35e49ea22f4ccfb887a0a2ca80e5b4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53d346d35e49ea22f4ccfb88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 13 12:26:29 2010 +0200 wined3d: Recognize the SM4 div opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c609291..e1f4be5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4948,6 +4948,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DEF */ NULL, /* WINED3DSIH_DEFB */ NULL, /* WINED3DSIH_DEFI */ NULL, + /* WINED3DSIH_DIV */ NULL, /* WINED3DSIH_DP2ADD */ pshader_hw_dp2add, /* WINED3DSIH_DP3 */ shader_hw_map2gl, /* WINED3DSIH_DP4 */ shader_hw_map2gl, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3390848..62a4f7b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5006,6 +5006,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DEF */ NULL, /* WINED3DSIH_DEFB */ NULL, /* WINED3DSIH_DEFI */ NULL, + /* WINED3DSIH_DIV */ NULL, /* WINED3DSIH_DP2ADD */ shader_glsl_dp2add, /* WINED3DSIH_DP3 */ shader_glsl_dot, /* WINED3DSIH_DP4 */ shader_glsl_dot, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1febf56..096fc13 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -52,6 +52,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DEF */ "def", /* WINED3DSIH_DEFB */ "defb", /* WINED3DSIH_DEFI */ "defi", + /* WINED3DSIH_DIV */ "div", /* WINED3DSIH_DP2ADD */ "dp2add", /* WINED3DSIH_DP3 */ "dp3", /* WINED3DSIH_DP4 */ "dp4", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index e32178e..c0a8292 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -57,6 +57,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_BREAK = 0x02, WINED3D_SM4_OP_BREAKC = 0x03, WINED3D_SM4_OP_CUT = 0x09, + WINED3D_SM4_OP_DIV = 0x0e, WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_EMIT = 0x13, @@ -132,6 +133,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_BREAK, WINED3DSIH_BREAK, 0, 0}, {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, 0, 1}, {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, 0, 0}, + {WINED3D_SM4_OP_DIV, WINED3DSIH_DIV, 1, 2}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2}, {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, 0, 0}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7959c8e..13526f8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -421,6 +421,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DEF, WINED3DSIH_DEFB, WINED3DSIH_DEFI, + WINED3DSIH_DIV, WINED3DSIH_DP2ADD, WINED3DSIH_DP3, WINED3DSIH_DP4,

1 0

Christian Costa : d3dx9: Constant table parsing foundations.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 128cf64371a385eb75642af6b6ef6342bec9ceba URL: http://source.winehq.org/git/wine.git/?a=commit;h=128cf64371a385eb75642af6b… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Sep 10 18:42:45 2010 +0200 d3dx9: Constant table parsing foundations. --- dlls/d3dx9_36/shader.c | 139 ++++++++++++++++++++++++++++++++++++++--- dlls/d3dx9_36/tests/shader.c | 105 +++++++++++++++++++++++++++++++ 2 files changed, 233 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=128cf64371a385eb75642…

1 0

André Hentschel : setupapi/tests: Fix wow64 failures.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 9c02760647a85cc7f2f77162d099e3ddc6b44f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c02760647a85cc7f2f77162d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 12 21:34:24 2010 +0200 setupapi/tests: Fix wow64 failures. --- dlls/setupapi/tests/devinst.c | 50 +++++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 17 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 4449d72..6177668 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -31,8 +31,9 @@ #include "wine/test.h" +static BOOL is_wow64; + /* function pointers */ -static HMODULE hSetupAPI; static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoList)(GUID*,HWND); static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCreateDeviceInterfaceA)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, PCSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); @@ -57,13 +58,15 @@ static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVIN static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); +static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); /* This is a unique guid for testing purposes */ static GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; static void init_function_pointers(void) { - hSetupAPI = GetModuleHandleA("setupapi.dll"); + HMODULE hSetupAPI = GetModuleHandleA("setupapi.dll"); + HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); pSetupDiCreateDeviceInfoA = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoA"); pSetupDiCreateDeviceInfoW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoW"); @@ -89,6 +92,7 @@ static void init_function_pointers(void) pSetupDiSetDeviceRegistryPropertyW = (void *)GetProcAddress(hSetupAPI, "SetupDiSetDeviceRegistryPropertyW"); pSetupDiGetDeviceRegistryPropertyA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceRegistryPropertyA"); pSetupDiGetDeviceRegistryPropertyW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceRegistryPropertyW"); + pIsWow64Process = (void *)GetProcAddress(hKernel32, "IsWow64Process"); } static void change_reg_permissions(const WCHAR *regkey) @@ -141,8 +145,12 @@ static BOOL remove_device(void) SetLastError(0xdeadbeef); ret = pSetupDiCallClassInstaller(DIF_REMOVE, set, &devInfo); - todo_wine - ok(ret, "SetupDiCallClassInstaller(DIF_REMOVE...) failed: %08x\n", GetLastError()); + if(is_wow64) + todo_wine ok(!ret && GetLastError() == ERROR_IN_WOW64, + "SetupDiCallClassInstaller(DIF_REMOVE...) succeeded: %08x\n", GetLastError()); + else + todo_wine ok(ret, + "SetupDiCallClassInstaller(DIF_REMOVE...) failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); ok(pSetupDiDestroyDeviceInfoList(set), @@ -1007,8 +1015,8 @@ static void testDevRegKey(void) /* Cleanup */ ret = remove_device(); - todo_wine - ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); + if(!is_wow64) + todo_wine ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); /* FIXME: Only do the RegDeleteKey, once Wine is fixed */ if (!ret) @@ -1091,8 +1099,10 @@ static void testRegisterAndGetDetail(void) { static const char path[] = "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; + static const char path_wow64[] = + "\\\\?\\root#legacy_bogus#0001#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; static const char path_w2k[] = - "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\"; + "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\"; PSP_DEVICE_INTERFACE_DETAIL_DATA_A detail = NULL; detail = HeapAlloc(GetProcessHeap(), 0, dwSize); @@ -1106,10 +1116,13 @@ static void testRegisterAndGetDetail(void) /* FIXME: This one only worked because old data wasn't removed properly. As soon * as all the tests are cleaned up correctly this has to be (or should be) fixed */ - todo_wine - ok(!lstrcmpiA(path, detail->DevicePath) || - !lstrcmpiA(path_w2k, detail->DevicePath), "Unexpected path %s\n", - detail->DevicePath); + if(is_wow64) + ok(!lstrcmpiA(path_wow64, detail->DevicePath), + "Unexpected path %s\n", detail->DevicePath); + else + todo_wine ok(!lstrcmpiA(path, detail->DevicePath) || + !lstrcmpiA(path_w2k, detail->DevicePath), + "Unexpected path %s\n", detail->DevicePath); HeapFree(GetProcessHeap(), 0, detail); } } @@ -1118,8 +1131,8 @@ static void testRegisterAndGetDetail(void) /* Cleanup */ ret = remove_device(); - todo_wine - ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); + if(!is_wow64) + todo_wine ok(ret, "Expected the device to be removed: %08x\n", GetLastError()); /* FIXME: Only do the RegDeleteKey, once Wine is fixed */ if (!ret) @@ -1228,8 +1241,8 @@ static void testDeviceRegistryPropertyA(void) pSetupDiDestroyDeviceInfoList(set); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, bogus, &key); - todo_wine - ok(res == ERROR_FILE_NOT_FOUND, "Expected key to not exist\n"); + if(!is_wow64) + todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Expected key to not exist\n"); /* FIXME: Remove when Wine is fixed */ if (res == ERROR_SUCCESS) { @@ -1334,8 +1347,8 @@ static void testDeviceRegistryPropertyW(void) pSetupDiDestroyDeviceInfoList(set); res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key); - todo_wine - ok(res == ERROR_FILE_NOT_FOUND, "Expected key to not exist\n"); + if(!is_wow64) + todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Expected key to not exist\n"); /* FIXME: Remove when Wine is fixed */ if (res == ERROR_SUCCESS) { @@ -1533,6 +1546,9 @@ START_TEST(devinst) return; } + if (pIsWow64Process) + pIsWow64Process(GetCurrentProcess(), &is_wow64); + if (pSetupDiCreateDeviceInfoListExW) test_SetupDiCreateDeviceInfoListEx(); else

1 0

Yaron Shahrabani : localui: Added Hebrew translation.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: b15c015a2ee5e39f2df28e0c5fc024250dc5f16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15c015a2ee5e39f2df28e0c5… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Wed Oct 13 02:22:15 2010 +0200 localui: Added Hebrew translation. --- dlls/localui/Makefile.in | 1 + dlls/localui/ui_He.rc | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in index 2ea946d..ef7c315 100644 --- a/dlls/localui/Makefile.in +++ b/dlls/localui/Makefile.in @@ -11,6 +11,7 @@ RC_SRCS = \ ui_En.rc \ ui_Es.rc \ ui_Fr.rc \ + ui_He.rc \ ui_Hu.rc \ ui_It.rc \ ui_Ja.rc \ diff --git a/dlls/localui/ui_He.rc b/dlls/localui/ui_He.rc new file mode 100644 index 0000000..8054f5b --- /dev/null +++ b/dlls/localui/ui_He.rc @@ -0,0 +1,61 @@ +/* + * Hebrew resources for localui + * + * Copyright 2007 Detlef Riekenberg + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "localui.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "הוספת פתחה מקומית" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "נא להזין את &שם הפתחה להוספה:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "אישור", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "ביטול", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "הגדרת פתחת LPT" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "זמן לתפוגה (שניות)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "ניסיון &שינוע חוזר:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "אישור", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "ביטול", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE +{ + IDS_LOCALPORT "פתחה מקומית" + IDS_INVALIDNAME "'%s' אינו שם תקני לפתחה" + IDS_PORTEXISTS "הפתחה %s כבר קיימת" + IDS_NOTHINGTOCONFIG "לפתחה זו אין אפשרויות להגדרה" +}

1 0

Yaron Shahrabani : winspool: Added Hebrew translation.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: feb0e0820d7f411382c568ac21f65fbf1919c0dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb0e0820d7f411382c568ac2… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Wed Oct 13 02:18:27 2010 +0200 winspool: Added Hebrew translation. --- dlls/winspool.drv/He.rc | 45 +++++++++++++++++++++++++++++++++++++++++ dlls/winspool.drv/Makefile.in | 1 + 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/He.rc b/dlls/winspool.drv/He.rc new file mode 100644 index 0000000..6f65694 --- /dev/null +++ b/dlls/winspool.drv/He.rc @@ -0,0 +1,45 @@ +/* + * Hebrew resources for winspool + * + * Copyright 2005 Huw Davies + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wspool.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +FILENAME_DIALOG DIALOG 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "הדפסה לקובץ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "שם קובץ ה&פלט:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "אישור", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "ביטול", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + +STRINGTABLE +{ + IDS_CAPTION "פתחה מקומית" + IDS_FILE_EXISTS "קובץ הפלט כבר קיים. יש ללחוץ על אישור כדי לשכתב עליו." + IDS_CANNOT_OPEN "לא ניתן ליצור את קובץ הפלט." +} diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index 3d8612b..0b69c9c 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -17,6 +17,7 @@ RC_SRCS = \ Es.rc \ Fi.rc \ Fr.rc \ + He.rc \ Hu.rc \ It.rc \ Ja.rc \

1 0

Yaron Shahrabani : winhlp32: Hebrew translation fixed.
by Alexandre Julliard Oct. 13, 2010

Oct. 13, 2010

Module: wine Branch: master Commit: 338b7edcedd043f2d2629ee948448ebeec039210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=338b7edcedd043f2d2629ee94… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Oct 7 17:12:36 2010 +0200 winhlp32: Hebrew translation fixed. --- programs/winhlp32/He.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/He.rc b/programs/winhlp32/He.rc index f3d82ae..a354a16 100644 --- a/programs/winhlp32/He.rc +++ b/programs/winhlp32/He.rc @@ -104,7 +104,7 @@ STID_INDEX, "מ&פתח" STID_CONTENTS, "תקציר" STID_BACK, "&חזרה" STID_ALL_FILES, "כל הקבצים (*.*)" -STID_HELP_FILES_HLP, "קובצי העזרה (*.hlp)" +STID_HELP_FILES_HLP, "קובצי עזרה (*.hlp)" STID_FILE_NOT_FOUND_s "לא ניתן למצוא את '%s'. האם ברצונך למצוא קובץ זה בעצמך?" STID_NO_RICHEDIT "לא ניתן למצוא יישום של richedit... התכנית תצא" STID_PSH_INDEX, "נושאי העזרה: "

1 0